no message

serverConfig.xml

@@ -15,4 +15,6 @@
         <hqdzsblb>https://openapi-cn.growatt.com/v1/device/list</hqdzsblb>
     </dataCenterInterface>
     <xcxInterface>http://101.89.111.202:13281/zjnt/xcx/dataout/zzzmj</xcxInterface>
+    <!-- <xcxInterfaceGuiYu>http://192.168.0.105:13281/zjnt/xcx/dataout/guiyu</xcxInterfaceGuiYu> -->
+    <xcxInterfaceGuiYu>http://101.89.111.202:13281/zjnt/xcx/dataout/guiyu</xcxInterfaceGuiYu>
 </config>

src/biz/cyszhgl.ts

@@ -75,82 +75,6 @@ export function getData(req, res) {
     let trpsyqkyjlPackageData = keyValuePackage(excelData['投入品使用情况预警值'].dataList);
     ret['trpsyqkyjl'] = getKeyValueOut('投入品使用情况预警值', trpsyqkyjlPackageData);
 
-
-
-
-
-
-
-
-    // let sfdtrpsyjlPackageData = keyValuePackage(excelData['示范地投入品使用记录'].dataList);
-    // ret['sfdtrpsyjl'] = getKeyValueOut('示范地投入品使用记录', sfdtrpsyjlPackageData);
-
-    // let trpsyqkPackageData = onceYBarChartPackage( excelData['投入品使用情况'], '','');
-    // ret['trpsyqk'] = getOnceYBarChartOut('投入品使用情况', trpsyqkPackageData);
-
-    // let lsfkwzsyqkPackageData = doubleYBarCharPackage( excelData['绿色防控物资使用情况'], "亩次", '使用量','亩次');
-    // ret['lsfkwzsyqk'] = getDoubleYBarChartOut('绿色防控物资使用情况', lsfkwzsyqkPackageData);
-
-    // let fxyjPackageData = keyValuePackage(excelData['风险预警'].dataList);
-    // ret['fxyj'] = getKeyValueOut('风险预警', fxyjPackageData);
-
-    // let fxlxzbPackageData = keyValuePackage(excelData['风险类型占比'].dataList);
-    // ret['fxlxzb'] = getKeyValueOut('风险类型占比', fxlxzbPackageData);
-
-    // let yjxqgdTableData = tablePackage(excelData["预警详情工单"].headerList[0], excelData["预警详情工单"].bodyList);
-    // ret['yjxqgd'] = getTableOut( '预警详情工单', yjxqgdTableData);
-
-    // let znggfxPackageData = keyValuePackage(excelData['智能灌溉分析'].dataList);
-    // ret['znggfx'] = getKeyValueOut('智能灌溉分析', znggfxPackageData);
-
-    // let znggTableData = {};
-    // excelData["智能灌溉"].dataList.forEach( info => {
-    //     let {ntwz, trsd, ggsj, ggjgsj, sfxygg} = info;
-    //     info["img"] = `${systemConfig.imgPath}/监控/${ntwz}.png`;
-    //     znggTableData[ntwz] = info;
-    // })
-
-    // ret['zngg'] = {title:'智能灌溉', dataList:znggTableData};
-
-    // let gglqsfxPackageData = onceYBarChartPackage( excelData['灌溉量趋势分析'], '','');
-    // ret['gglqsfx'] = getOnceYBarChartOut('灌溉量趋势分析', gglqsfxPackageData);
-
-    // let scxyfxPackageData = onceYBarChartPackage(excelData['蔬菜效益分析'],  '日统计', '' );
-    // ret['scxyfx'] = getOnceYBarChartOut('蔬菜效益分析', scxyfxPackageData);
-
-    // let yyxyfxPackageData = onceYBarChartPackage(excelData['渔业效益分析'], '日统计', '' );
-    // ret['yyxyfx'] = getOnceYBarChartOut('渔业效益分析', yyxyfxPackageData);
-    
-    // let xyfxPackageData = onceYBarChartPackage(excelData['效益分析'], '元', '' );
-    // ret['xyfx'] = getOnceYBarChartOut('效益分析', xyfxPackageData);
-    
-    // let cyxlphPackageData = keyValuePackage(excelData['产业销量排行'].dataList);
-    // ret['cyxlph'] = getKeyValueOut('产业销量排行', cyxlphPackageData);
-
-    // let cpsyxxTableData = tablePackage(excelData["产品溯源信息"].headerList[0], excelData["产品溯源信息"].bodyList);
-    // ret['cpsyxx'] = getTableOut( '产品溯源信息', cpsyxxTableData);
-
-    // let aqglTableData = keyValuePackage(excelData["安全管理"].dataList);
-    // ret['aqgl'] = getKeyValueOut( '安全管理', aqglTableData);
-
-    // let ncpaqzljcPackageData = onceYBarChartPackage(excelData['农产品安全质量检测'], '日统计', '' );
-    // ret['ncpaqzljc'] = getOnceYBarChartOut('农产品安全质量检测', ncpaqzljcPackageData);
-
-                    
-    // let szcyPackageData = keyValuePackage(excelData['数字产业'].dataList);
-    // let szhglPackageData = keyValuePackage(excelData['数字化管理'].dataList);
-    // ret['szcy'] = getKeyValueOut('数字产业', szcyPackageData.concat(szhglPackageData));
-
-
-    
-    // let gglqsfxPackageData = {};
-    // excelData["灌溉量趋势分析"].forEach( info => {
-    //     let itemChart = onceYBarChartPackage( [info], '','');
-    //     gglqsfxPackageData[info.name] = getOnceYBarChartOut('投入品使用情况', itemChart);
-    // })
-
-    // ret['gglqsfx'] = {title:"灌溉量趋势分析", dataList:gglqsfxPackageData};
-                     
     res.send(ret);
 }
 

src/biz/guiYu.ts

@@ -2,10 +2,12 @@
  * 鳜鱼
  */
 
+import { dataCenterInterfaceConfig } from "../config/serverConfig";
 import { getGuiYuLeftData } from "../data/interface/guiyu";
 import { guiYuTableData } from "../data/table/tableData";
 import { keyValuePackage, onceYBarChartPackage, tablePackage } from "../dataPackage/inFrontOut";
 import { getKeyValueOut, getOnceYBarChartOut, getTableOut } from "../dataPackage/out";
+import { post } from "../util/request";
 
 
 export async function getData(req, res) {
@@ -71,7 +73,11 @@ export async function getGuiYuExcel(req, res) {
     let qbcyclqsData = keyValuePackage(excelData["亲本成鱼近5年产量趋势"].dataList);
     ret['qbcyclqs'] = getKeyValueOut('亲本成鱼近5年产量趋势', qbcyclqsData);
 
-    let scyzData = keyValuePackage(excelData["水产养殖"].dataList);
+    let interfaceDataInfoGuiYu:any = await post(dataCenterInterfaceConfig.guiyuyangzhi, {}, {});
+    let interfaceDataInfo = interfaceDataInfoGuiYu.body.data;
+    
+    // let scyzData = keyValuePackage(excelData["水产养殖"].dataList);
+    let scyzData = keyValuePackage(interfaceDataInfo.scyz);
     ret['scyz'] = getKeyValueOut('水产养殖', scyzData);
 
     let scyz = excelData["养殖记录"].dataList;
@@ -80,10 +86,12 @@ export async function getGuiYuExcel(req, res) {
         let {yzzl, sl} = info;
         ymyzsl.push({key:yzzl, value:sl});
     });
-    let ymyzslData = keyValuePackage(ymyzsl);
+    // let ymyzslData = keyValuePackage(ymyzsl);
+    let ymyzslData = keyValuePackage(interfaceDataInfo.ymyzsl);
     ret['ymyzsl'] = getKeyValueOut('鱼苗养殖数量', ymyzslData);
 
-    let xsjlTableData = tablePackage(excelData["销售记录"].headerList[0], excelData["销售记录"].bodyList);
+    // let xsjlTableData = tablePackage(excelData["销售记录"].headerList[0], excelData["销售记录"].bodyList);
+    let xsjlTableData = tablePackage(excelData["销售记录"].headerList[0], interfaceDataInfo.xsjl);
     ret['xsjl'] = getTableOut( '销售记录', xsjlTableData);
 
     let scjl = {};
@@ -103,7 +111,9 @@ export async function getGuiYuExcel(req, res) {
         let kcsl = scjl[name].yzsl - scjl[name].xssl;
         kcjlData.push({key:name, value:kcsl, unit:"尾"});
     }
-    ret["ymkc"] = getKeyValueOut('鱼苗库存', kcjlData);
+    // ret["ymkc"] = getKeyValueOut('鱼苗库存', kcjlData);
+    let ymkcData = keyValuePackage(interfaceDataInfo.kcjlData);
+    ret["ymkc"] = getKeyValueOut('鱼苗库存', ymkcData);
 
     res.send(ret);
 }

src/config/serverConfig.ts

@@ -18,6 +18,7 @@ export let dataCenterInterfaceConfig = {
     hqmdzjbxx: "", //获取某电站基本信息
     hqdzsblb:"",//获取电站设备列表
     xcxzzcq:"",//小程序种植情况
+    guiyuyangzhi:"",//鳜鱼养殖
 }
 
 
@@ -30,13 +31,13 @@ export async function initConfig() {
 		if (!configInfo || !configInfo.config) console.log("xml中无配置加载");
 		else {
             //必要配置
-            let integralConfig = ["port", "token", "userName", "plantId", 
+            let integralConfig = ["port", "token", "userName", "plantId",
                 {"dataCenterInterface":["hqmdzsjgl", "hqsyyhdz", "hqmgyhddzlb", "hqmdzlsfdl", "hqmdzmytgl", "hqmdzjbxx"]}
             ];
             
             checkConfig(integralConfig, configInfo.config);
 
-			let {port, imgPath, token, userName, plantId, dataCenterInterface, xcxInterface} = configInfo.config;
+			let {port, imgPath, token, userName, plantId, dataCenterInterface, xcxInterface, xcxInterfaceGuiYu} = configInfo.config;
 
 			systemConfig.port = parseInt(port[0]);
             systemConfig.imgPath = imgPath[0];
@@ -53,6 +54,7 @@ export async function initConfig() {
             dataCenterInterfaceConfig.hqmdzjbxx = dataCenterInterface[0].hqmdzjbxx[0];
             dataCenterInterfaceConfig.hqdzsblb = dataCenterInterface[0].hqdzsblb[0];
             dataCenterInterfaceConfig.xcxzzcq = xcxInterface[0];
+            dataCenterInterfaceConfig.guiyuyangzhi = xcxInterfaceGuiYu[0];
             // console.log(dataCenterInterfaceConfig.hqmdzsjgl);
 		}