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

pbl.js

@@ -105,21 +105,21 @@ router.route('/login').all((req, res, next) => {
 router.route('/imgToBase64').all((req, res, next) => {
     var json = queryString(req.url);
     //mode的处理
-    https.get(json['img'], function (res2) {
+    https.get(json['img'], function(res2) {
         var chunks = [];
         var size = 0;
-        res2.on('data', function (chunk) {
+        res2.on('data', function(chunk) {
             chunks.push(chunk);
-            size += chunk.length;　　//累加缓冲数据的长度
+            size += chunk.length;　　 //累加缓冲数据的长度
         });
-        res2.on('end', function (err) {
+        res2.on('end', function(err) {
             var data = Buffer.concat(chunks, size);
             var base64Img = data.toString('base64');
             res.end(JSON.stringify([{ img: `data:image/png;base64,${base64Img}` }]));
         });
     });
 
-  
+
 
 });
 
@@ -475,7 +475,11 @@ router.route('/selectStudent2').all((req, res, next) => {
     var json = queryString(req.url);
     getmysql(req, res, "selectStudent2", json['oid'], json['cu'], json['cn'], json['cid'], json['page'], 8);
 });
-
+/* 查询教师 */
+router.route('/selectTeacher').all((req, res, next) => {
+    var json = queryString(req.url);
+    getmysql(req, res, "selectTeacher", json['org'], json['cu'], json['cn'], json['page'], 8);
+});
 /* 查询所有评价体系 */
 router.route('/selectAllEvaluation').all((req, res, next) => {
     var json = queryString(req.url);
@@ -935,6 +939,11 @@ router.route('/selectClassBySchool').all((req, res, next) => {
     var json = queryString(req.url);
     getmysql(req, res, "selectClassBySchool", json['oid']);
 });
+//查询组织底下的学校
+router.route('/selectSchoolByOrg').all((req, res, next) => {
+    var json = queryString(req.url);
+    getmysql(req, res, "selectSchoolByOrg", json['org']);
+});
 //学生注册接口
 router.route('/register_student').post(function(req, res, next) {
     //mode的处理
@@ -1152,6 +1161,15 @@ router.route('/selectNoteContent').all((req, res, next) => {
 router.route('/updateUserByEdu').all((req, res, next) => {
     postmysql(req, res, "updateUserByEdu");
 });
+//修改用户信息
+router.route('/updateUserByEdu1').all((req, res, next) => {
+    postmysql(req, res, "updateUserByEdu1");
+});
+//修改用户信息
+router.route('/updateUserByEduOid').all((req, res, next) => {
+    postmysql(req, res, "updateUserByEduOid");
+});
+
 //教师端data修改pbl用户信息
 router.route('/updatePblMessage').all((req, res, next) => {
     postmysql2(req, res, "updatePblMessage");
@@ -1642,43 +1660,10 @@ router.route('/deleteEvaluation').all((req, res, next) => {
     // id评价id
 });
 
-
+//批量添加学生
 router.route('/batchRegistrationMore').post(function(req, res, next) {
     let users = req.body[0];
     let arr = JSON.parse(req.body[0].arr);
-    //循环注册
-    // for (let j = 0; j < arr.length; j++) {
-    //     if (arr[j].phone && arr[j].phone != "") {
-    //         let _phonedata = [arr[j].phone];
-    //         _phonedata.unshift(_mysqlLabor[0], _mysqlLabor[1], "findPhone");
-    //         mysql.usselect(_phonedata, function(ret) {
-    //             if (ret[0].length > 0) {
-    //                 res.end(JSON.stringify({ type: 1 }));
-    //                 return;
-    //             }
-    //         });
-    //     }
-    //     if (arr[j].mail && arr[j].mail != "") {
-    //         let _maildata = [arr[j].mail];
-    //         _maildata.unshift(_mysqluser[0], _mysqluser[1], "findMail");
-    //         mysql.usselect(_maildata, function(ret) {
-    //             if (ret[0].length > 0) {
-    //                 res.end(JSON.stringify({ type: 2 }));
-    //                 return;
-    //             }
-    //         });
-    //     }
-    //     if (arr[j].sId && arr[j].sId != "") {
-    //         let _siddata = [arr[j].sId];
-    //         _siddata.unshift(_mysqlLabor[0], _mysqlLabor[1], "findSid");
-    //         mysql.usselect(_siddata, function(ret) {
-    //             if (ret[0].length > 0) {
-    //                 res.end(JSON.stringify({ type: 3 }));
-    //                 return;
-    //             }
-    //         });
-    //     }
-    // }
     for (let i = 0; i < arr.length; i++) {
         let _username = arr[i].name;
         let _mail = arr[i].mail;
@@ -1736,7 +1721,56 @@ router.route('/batchRegistrationMore').post(function(req, res, next) {
         });
     }
 });
-
+//批量添加教师
+router.route('/batchRegistrationMore1').post(function(req, res, next) {
+    let users = req.body[0];
+    let arr = JSON.parse(req.body[0].arr);
+    for (let i = 0; i < arr.length; i++) {
+        let _username = arr[i].name;
+        let _mail = arr[i].mail;
+        let _password = users.password || "123456";
+        let _alias = arr[i].name;
+        let _org = users.org;
+        let _oid = arr[i].school;
+        let _ph = arr[i].phone ? arr[i].phone : '';
+        let _class = arr[i].class;
+        let _sId = arr[i].sId;
+        //加密密碼
+        _password = bcrypt.hashSync(_password, bcrypt.genSaltSync(10));
+        //生成激活碼
+        let _hashstr = new Date().getTime() + "";
+        let _digest = crypto.createHash('sha256').update(_hashstr, 'utf8').digest('hex');
+        //用戶數據
+        let _userdata = [
+            _mail,
+            _password,
+            _alias,
+            "",
+            0, //0老师 1学生
+            _username,
+            "",
+            generateAPIKey(_username),
+            _digest,
+            "",
+            _username,
+            _sId,
+            1, //1老师 2学生
+            _org,
+            _oid,
+            _ph,
+            _class,
+            '',
+            "0",
+        ];
+        //參數拼接，註冊
+        _userdata.unshift(_mysqluser[0], _mysqluser[1], "pbl_add_batchregister_oid");
+        //用戶註冊處理
+        mysql.usselect(_userdata, function(ret) {
+            res.end(JSON.stringify({ success: 1 }));
+        });
+    }
+});
+//新增学生
 router.route('/batchRegistration').post(function(req, res, next) {
     var users = req.body[0];
     //循环注册
@@ -1782,6 +1816,54 @@ router.route('/batchRegistration').post(function(req, res, next) {
     });
 });
 
+//新增教师
+router.route('/batchRegistration1').post(function(req, res, next) {
+    var users = req.body[0];
+    //循环注册
+    var _username = users.alias;
+    var _mail = users.username;
+    var _password = users.password || "123456";
+    var _alias = users.alias;
+    var _org = users.org;
+    var _oid = users.oid;
+    var _ph = users.ph;
+    var _class = users.cid;
+    var _sId = users.sid;
+    //加密密碼
+    _password = bcrypt.hashSync(_password, bcrypt.genSaltSync(10));
+    //生成激活碼
+    let _hashstr = new Date().getTime() + "";
+    let _digest = crypto.createHash('sha256').update(_hashstr, 'utf8').digest('hex');
+    //用戶數據
+    var _userdata = [
+        _mail,
+        _password,
+        _alias,
+        "",
+        0,
+        _username,
+        "",
+        generateAPIKey(_username),
+        _digest,
+        "",
+        _username,
+        _sId,
+        1,
+        _org,
+        _oid,
+        _ph,
+        _class,
+        '',
+        "0",
+    ];
+    //參數拼接，註冊
+    _userdata.unshift(_mysqluser[0], _mysqluser[1], "pbl_add_batchregister1");
+    //用戶註冊處理
+    mysql.usselect(_userdata, function(ret) {
+        res.end(JSON.stringify({ uid: ret[1][0].uid, ph: _ph, oid: _oid, cid: _class, success: 1 }));
+    });
+});
+
 router.route('/batchRegistrationOrg').post(function(req, res, next) {
     var users = req.body[0];
     //循环注册