update: 获取设备可选地块

controller/agrController.js

@@ -8,7 +8,13 @@
 
 async function list(req, res, next) {
     try {
-        //
+        let search = { del: 0 };
+        let page = req.body.page || 1;
+        let pageSize = req.body.pageSize || 10;
+        let skip = (page - 1) * pageSize;
+        let count = await DB.AgrInRecord.countDoucments(search)
+        let list = await DB.AgrInRecord.find(search).skip(skip).limit(pageSize).lean().exec();
+        res.sendData({count, list});
     } catch (error) {
         next(error)
     }

controller/collectSMCController.js

@@ -32,6 +32,13 @@ async function list(req, res, next) {
                 $gte: req.body.time[0]
             }
         }
+        if(req.body.land) {
+            let devs = await DB.Device.find({land: req.body.land}).lean().exec();
+            if(devs && devs.length) {
+                let devNums = devs.map(o => {return o.deviceNumber});
+                search.deviceNumber = {$in: devNums}
+            }
+        }
         let page = req.body.page || 1;
         let pageSize = req.body.pageSize || 10;
         let skip = (page - 1) * pageSize;

controller/collectWSController.js

@@ -32,6 +32,13 @@ async function list(req, res, next) {
                 $gte: req.body.time[0]
             }
         }
+        if(req.body.land) {
+            let devs = await DB.Device.find({land: req.body.land}).lean().exec();
+            if(devs && devs.length) {
+                let devNums = devs.map(o => {return o.deviceNumber});
+                search.deviceNumber = {$in: devNums}
+            }
+        }
         let page = req.body.page || 1;
         let pageSize = req.body.pageSize || 10;
         let skip = (page - 1) * pageSize;

controller/deviceController.js

@@ -167,7 +167,22 @@ async function listThreshold(req, res, next) {
 
 
 
-
+async function getDeviceLand(req, res, next) {
+    try {
+        let search = { del: 0 };
+        search.deviceDPType = req.body.deviceDPType;
+        let list = await DB.Device.find(search).select('land').lean().exec();
+        let landIds = [];
+        for (let index = 0; index < list.length; index++) {
+            const element = list[index];
+            landIds.push(element.land);
+        }
+        let lands = await DB.Land.find({_id: {$in: landIds}, del:0 });
+        res.sendData(lands);
+    } catch (error) {
+        next(error);
+    }
+}
 
 
 
@@ -184,5 +199,5 @@ module.exports = {
     listAttribute,
     setThreshold,
     listThreshold,
-
+    getDeviceLand,
 }
\ No newline at end of file

router/deviceRouter.js

@@ -18,5 +18,7 @@ router.post('/threshold/list', deviceController.listThreshold); //获取设备
 
 router.post('/attribute/list', deviceController.listAttribute); //获取可设置属性列表
 
+router.post('/getDeviceLand', deviceController.getDeviceLand);
+
 
 module.exports = router;
\ No newline at end of file