Merge branch 'master' of https://git.cocorobo.cn/CocoRoboLabs/pbl-api

pbl.js

@@ -164,7 +164,10 @@ router.route('/getUser').all((req, res, next) => {
     var json = queryString(req.url);
     getmysql(req, res, "selectUserDeail", json['uid']);
 });
-
+router.route('/selectUser').all((req, res, next) => {
+    var json = queryString(req.url);
+    getmysql(req, res, "selectUser",json['userid']);
+});
 //查询教师端消息
 router.route('/getNewsTeacher').all((req, res, next) => {
     var json = queryString(req.url);
@@ -627,17 +630,34 @@ router.route('/insertRoom').all((req, res, next) => {
     postmysql(req, res, "insertRoom");
 });
 
+//协同编辑 创建房间
+router.route('/insertRoomByFile').all((req, res, next) => {
+    var json = queryString(req.url);
+    getmysql(req, res, "insertRoomByFile",json["uid"],json["n"],json["d"]);
+});
+
 //思维网格 查询是否是重复房间号
 router.route('/checkRoomNum').all((req, res, next) => {
     var json = queryString(req.url);
     getmysql(req, res, "checkRoomNum", json['num']);
 });
 
+//协同编辑 查询是否是重复房间号
+router.route('/checkRoomNumByFile').all((req, res, next) => {
+    var json = queryString(req.url);
+    getmysql(req, res, "checkRoomNumByFile", json['num']);
+});
+
 //思维网格 根据房间号或者用户id查询房间信息
 router.route('/selectRoom').all((req, res, next) => {
     var json = queryString(req.url);
     getmysql(req, res, "selectRoom", json['uid']);
 });
+//协同编辑 根据房间号或者用户id查询房间信息
+router.route('/selectRoomByFile').all((req, res, next) => {
+    var json = queryString(req.url);
+    getmysql(req, res, "selectRoomByFile", json['uid']);
+});
 
 //思维网格 修改房间数据
 router.route('/updateRoomData').all((req, res, next) => {