明树Git Lab

Commit ec8b18c2 authored by zfp1's avatar zfp1

update

parent 4c46c197
...@@ -195,14 +195,14 @@ async function getJiankong(req, res, next) { ...@@ -195,14 +195,14 @@ async function getJiankong(req, res, next) {
//查询一下土壤采集数据 //查询一下土壤采集数据
if (traccode.agrOnOff) { if (traccode.agrOnOff) {
// 气象 土壤 // 气象 土壤
let ws = await DB.CollectWS.findOne({}).sort({time:-1}); let ws = await DB.CollectWS.findOne().sort({time:-1});
let smc = await DB.CollectSMC.findOne().sort({time:-1}); let smc = await DB.CollectSMC.findOne().sort({time:-1});
traccode.ws = ws;
traccode.smc = smc;
// //
let onlineArr = await deviceModule.getDeviceOnlineMap(); let onlineArr = await deviceModule.getDeviceOnlineMap();
smc.onLineState = onlineArr.includes(smc.deviceNumber) ? 1 : 0; smc.onLineState = onlineArr.includes(smc.deviceNumber) ? 1 : 0;
ws.onLineState = onlineArr.includes(ws.deviceNumber) ? 1 : 0; ws.onLineState = onlineArr.includes(ws.deviceNumber) ? 1 : 0;
traccode.smc = smc;
traccode.ws = ws;
} }
if (traccode.indEnvOnOff) { if (traccode.indEnvOnOff) {
// 工业环境 // 工业环境
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment