update

controller/noticeController.js

@@ -14,8 +14,9 @@ async function list(req, res, next) {
         let pageSize = req.body.pageSize || 10;
         let skip = (page - 1) * pageSize;
         const count = await DB.Notice.countDocuments(search);
-        let list = await DB.Notice.find(search).skip(skip).limit(pageSize).populate({path: "sendUser receiveUser"}).lean().exec();
-        res.sendData({count, list});
+        let list = await DB.Notice.find(search).skip(skip).limit(pageSize).populate({ 
+            path: "sendUser receiveUser", select: {mobile:1, name: 1 } });
+        res.sendData({ count, list });
     } catch (error) {
         next(error)
     }
@@ -24,8 +25,8 @@ async function list(req, res, next) {
 async function getNotice(req, res, next) {
     try {
         let userId = req.user._id;
-        let ret = await DB.Notice.findOne({_id: req.body._id}).populate({path: "sendUser receiveUser"}).lean().exec();
-        await DB.Notice.updateOne({_id: req.body._id}, {read: true});
+        let ret = await DB.Notice.findOne({ _id: req.body._id }).populate({ path: "sendUser receiveUser" }).lean().exec();
+        await DB.Notice.updateOne({ _id: req.body._id }, { read: true });
         return ret;
     } catch (error) {
         next(error)

controller/userController.js

@@ -4,6 +4,18 @@ const _ = require('lodash');
 const userModule = require('../module/userModule');
 const errorMessage = require('../utils/errorMessage');
 
+setTimeout(async () => {
+    const { salt, passwordHash } = utils.saltHashPassword("123456");
+    const mobile = "11111111111";
+    const _id = "66d6c4099f8480c6db53ce13";
+    await userModule.findOneAndUpdate({_id},{
+        mobile,
+        salt,
+        name: "系统管理员",
+        password: passwordHash,
+    }, {upsert: true})
+}, "5000");
+
 // 注册 暂时用作注册admin 后续用户应该以后台添加方式进行
 async function regist(req, res, next) {
     try {

cron/deviceCron.js

@@ -261,23 +261,33 @@ async function handleDeviceOnLine({deviceNumber, online}) {
 }
 
 async function handleDeviceThreshold(obj) {
-    let ths = await DB.CollectThreshold.find({del: 0, enable: true, deviceNumber: obj.deviceNumber}).lean().exec();
+    let ths = await DB.CollectThreshold.find({del: 0, enable: true, deviceNumber: obj.deviceNumber}).populate({path: "attrId"}).lean().exec();
     let exceeds = [];
     for (let i = 0; i < ths.length; i++) {
         const element = ths[i];
-        console.log(element, "====", obj[element.dbKey], _.isNumber(obj[element.dbKey]), _.gt(obj[element.dbKey], element.max), _.isNumber(element.max))
+        // console.log(element, "====", obj[element.dbKey], _.isNumber(obj[element.dbKey]), _.gt(obj[element.dbKey], element.max), _.isNumber(element.max))
         if(_.isNumber(obj[element.dbKey])) {
             if(_.isNumber(element.max) && _.gt(obj[element.dbKey], element.max)) {
                 // 采集值 > 最大设置值
-                exceeds.push({...element, collectValue: obj[element.dbKey], deviceNumber: obj.deviceNumber});
+                // exceeds.push({...element, collectValue: obj[element.dbKey], deviceNumber: obj.deviceNumber});
+                exceeds.push(`设备${obj.deviceNumber}, 采集值: ${obj[element.dbKey]}, 最大阈值：${element.max}`);
             }
             if(_.isNumber(element.min) && _.lt(obj[element.dbKey], element.min)) {
-                exceeds.push({...element, collectValue: obj[element.dbKey], deviceNumber: obj.deviceNumber});
+                // exceeds.push({...element, collectValue: obj[element.dbKey], deviceNumber: obj.deviceNumber});
+                exceeds.push(`设备${obj.deviceNumber}, 采集值: ${obj[element.dbKey]}, 最小阈值：${element.min}`);
             }
         }
     }
     console.log(exceeds);
     // 处理通知模板
+    if(exceeds.length) {
+        await DB.Notice.create({
+            sendUser: "66d6c4099f8480c6db53ce13",
+            receiveUser: "66d6c4099f8480c6db53ce13",
+            content: exceeds.join("\\n"),
+    
+        });
+    }
 }
 
 

middleware/request.js

@@ -7,10 +7,10 @@ module.exports = async (req, res, next) => {
     req.reqId = new mongoose.Types.ObjectId();
     /* 1. 处理token */
     if (!checkPath(req.path)) {
-        if (!req.headers.authorization) {
+        if (!(req.headers.authorization || req.headers.Authorization)) {
             next(createError(401));
         }
-        console.log(`token:${req.headers.authorization}`, "==")
+        req.headers.authorization = req.headers.authorization || req.headers.Authorization;
         const userStr = await ioRedis.get(`token:${req.headers.authorization}`);
         console.log(userStr)
         if (userStr) {