no message

src/biz/chuanGanQi/cgq.ts

@@ -40,9 +40,14 @@ const DeviceListMap = {
     
 };
 
+initDeviceMap();
 
 export async function initDeviceMap() {
-   
+   let dstMap = {};
+    for (let key in DeviceListMap) {
+        dstMap[DeviceListMap[key].area] = 1;
+   }
+   console.log()
 }
 
 
@@ -91,7 +96,7 @@ export async function 温湿度变化趋势变化趋势(chartArea, chartType) {
             let time = moment(info.ts).format("HH.MM");
             if (!datamMp[time]) datamMp[time] = {count:0, num:0};
             datamMp[time].count += 1;
-            datamMp[time].num = parseFloat(info.value);
+            datamMp[time].num += parseFloat(info.value);
         });
     }
 
@@ -104,7 +109,7 @@ export async function 温湿度变化趋势变化趋势(chartArea, chartType) {
         });
     }
 
-    let now = dataList[0].value;
+    let now = !dataList[0] ? 0 : dataList[0].value;
 
     return {dataList,  now};
 }
@@ -192,8 +197,6 @@ export async function 土壤温度变化趋势() {
             value:Math.round(num / count * 100)/100
         });
     }
-
-
     console.log()
     
 

src/biz/hjszzl.ts

@@ -4,12 +4,13 @@ import { hjszzlTableData } from '../data/table/hjszzlData';
 import { separateDataAndUint } from "../dataPackage/tool";
 import { doubleYBarCharPackage, keyValuePackage, onceYBarChartPackage, rankPackage, stringListPackage, tablePackage } from '../dataPackage/inFrontOut';
 import { getDoubleYBarChartOut, getKeyValueOut, getOnceYBarChartOut, getStringOut, getTableOut } from '../dataPackage/out';
+import { 光照变化, 温湿度变化趋势变化趋势 } from './chuanGanQi/cgq';
 
 /*                            环境数字治理                    */
 
 
 
-export function getData(req, res) {
+export async function getData(req, res) {
     let excelData = hjszzlTableData();
 
     let ret:any = {};
@@ -24,18 +25,84 @@ export function getData(req, res) {
     let jylbhPackageData = keyValuePackage(excelData['降雨量变化'].dataList);
     ret['jylbh'] = getKeyValueOut('降雨量变化', jylbhPackageData);
 
-    let wdbhqs = getChartData(excelData['温度变化趋势'].dataList);
-    ret['wdbhqs'] = {title:"温度变化趋势", dataList:wdbhqs};
-
-    let sdbhqs = getChartData(excelData['湿度变化趋势'].dataList);
-    ret['sdbhqs'] = {title:"湿度变化趋势", dataList:sdbhqs};
+    // await 温湿度变化趋势变化趋势(, "温度");
+    let keyList =[
+        "A2","A1","A3","A4","A6","D1","D2","B1","溢佳日光温室","溢佳A2","溢佳A3","溢佳B1","溢佳B2","溢佳B3","溢佳C1","溢佳C2","溢佳C3","溢佳C4"
+    ];
+    let 温度变化趋势 = {};
+    let wd = 0;
+    let wdCount = 0;
+    for (let i = 0; i < keyList.length; i++) {
+        let {dataList, now} = await 温湿度变化趋势变化趋势(keyList[i], "温度");
+        if (!now) continue;
+        let xnList = [1,1,2,3,4,5,9,9,9,9,9];
+        let xnDataList = [];
+        dataList.forEach((info, itemIndex) => {
+            xnDataList.push({
+                key:info.key,
+                value:xnList[itemIndex]
+            })
+        });
+        温度变化趋势[keyList[i]] = [
+            {name:"棚内温度", data:dataList},
+            {name:"室外温度", data:xnDataList}
+        ]
+        if (now) {
+            wd += now;
+            wdCount += 1;
+        }
+    }
+    ret['wdbh'].dataList[1].value = Math.round(wd/wdCount * 100)/100;
+    // let wdbhqs = getChartData(excelData['温度变化趋势'].dataList);
+    ret['wdbhqs'] = {title:"温度变化趋势", dataList:温度变化趋势};
+
+
+    let 湿度变化趋势 = {};
+    let sd = 0;
+    let sdCount = 0;
+    for (let i = 0; i < keyList.length; i++) {
+        let {dataList, now} = await 温湿度变化趋势变化趋势(keyList[i], "湿度");
+        if (!now) continue;
+        let xnDataList = [];
+        dataList.forEach((info, itemIndex) => {
+            xnDataList.push({
+                key:info.key,
+                value:60
+            })
+        });
+        湿度变化趋势[keyList[i]] = [
+            {name:"棚内湿度", data:dataList},
+            {name:"室外湿度", data:xnDataList}
+        ]
+        if (now) {
+            sd += now;
+            sdCount += 1;
+        }
+    }
+    ret['sdbh'].dataList[1].value = Math.round(sd/sdCount * 100)/100;
+    // let sdbhqs = getChartData(excelData['湿度变化趋势'].dataList);
+    ret['sdbhqs'] = {title:"湿度变化趋势", dataList:湿度变化趋势};
 
     let jylbhqs = getChartData(excelData['降雨量变化趋势'].dataList);
     ret['jylbhqs'] = {title:"降雨量变化趋势", dataList:jylbhqs};
     
-    let gzbhPackageData = keyValuePackage(excelData['光照变化'].dataList);
+    let 光照变化返回 = await 光照变化();
+    // let gzbhPackageData = keyValuePackage(excelData['光照变化'].dataList);
+    let gzbhPackageData = [
+        {
+          key: "最小值",
+          value: 光照变化返回.min,
+          unit: "lux",
+        },
+        {
+          key: "最大值",
+          value: 光照变化返回.max,
+          unit: "lux",
+        },
+      ]
     ret['gzbh'] = getKeyValueOut('光照变化', gzbhPackageData);
-    
+    光照变化返回.dataList.sort((a, b) => {return parseFloat(a.key)-parseFloat(b.key)})
+    excelData['光照变化趋势'][0].data = 光照变化返回.dataList;
     let gzbhqsPackageData = onceYBarChartPackage( excelData['光照变化趋势'], '','');
     ret['gzbhqs'] = getOnceYBarChartOut('光照变化趋势', gzbhqsPackageData);