no message

serverConfig.xml

 <config>
-    <port>30001</port>
+    <port>30003</port>
     <sockentPort>30002</sockentPort>
     <rightView>http://10.51.50.136:8090/sql/execute</rightView>
     <leftView>

src/biz/jgfwnl/data.ts

 import { getChartOutData, getKeyValueNumberOutData, getListOutData } from "../../cal/out";
 import { separateDataAndUint } from "../../cal/privateTools";
 import { getHardware } from "../../data/interface/hardwareData";
-import { getCsgkBasicData, getTestAnalysis, getTestLicense, getTestTotalTime } from "../../data/interface/interfaceService";
+import { getCsgkBasicData, getDetachmentRatio, getTestAnalysis, getTestLicense, getTestTotalTime } from "../../data/interface/interfaceService";
 import { getMap } from "../../data/interface/mapInterfaceData";
 
 
@@ -142,32 +142,34 @@ export async function getCSFX(req, res) {
     let 月度测试里程分布data = {测试: {unit:'km', dataInfo: testMileage}, 功能测试: {unit:'km', dataInfo: functionTestMileage}};
     ret["api1"] = getChartOutData("月度测试里程分布", 月度测试里程分布data);
     
-    let {月度测试时长data, 企业测试时长data} = await getTestTotalTime();
+    // let {月度测试时长data, 企业测试时长data} = await getTestTotalTime();
 
-    let {testTime, functionTestTime} = 月度测试时长data;
-    let 月度测试时长分布data = {测试: {unit:'h', dataInfo: testTime}, 功能测试: {unit:'h', dataInfo: functionTestTime}};
-    ret["api2"] = getChartOutData("月度测试时长分布", 月度测试时长分布data);
+    // let {testTime, functionTestTime} = 月度测试时长data;
+    // let 月度测试时长分布data = {测试: {unit:'h', dataInfo: testTime}, 功能测试: {unit:'h', dataInfo: functionTestTime}};
+    // ret["api2"] = getChartOutData("月度测试时长分布", 月度测试时长分布data);
     
     let 企业测试里程分布data = {测试: {unit:'km', dataInfo: testMileageEnterprise}, 功能测试: {unit:'km', dataInfo: functionTestMileageEnterprise}};
     ret["api3"] = getChartOutData("企业测试里程分布", 企业测试里程分布data);
 
-    let {testTimeEnterprise, functionTestTimeEnterprise} = 企业测试时长data;
-    let 企业测试时长分布data = {测试: {unit:'h', dataInfo: testTimeEnterprise}, 功能测试: {unit:'h', dataInfo: functionTestTimeEnterprise}};
-    ret["api4"] = getChartOutData("企业测试时长分布", 企业测试时长分布data);
-
-    let 企业脱离自动驾驶比率data:any = [
-        {"企业名称":"滴滴", "次数":"29次", "里程":"139公里"},
-        {"企业名称":"商汤", "次数":"2次", "里程":"261公里"},
-        {"企业名称":"小马易车", "次数":"12次", "里程":"231公里"},
-        {"企业名称":"仙途", "次数":"10次", "里程":"176公里"},
-        {"企业名称":"上汽红岩", "次数":"21次", "里程":"139公里"},
-        {"企业名称":"初速度", "次数":"33次", "里程":"214公里"},
-        {"企业名称":"AutoX", "次数":"29次", "里程":"93公里"},
-        {"企业名称":"中车时代", "次数":"27次", "里程":"163公里"},
-        {"企业名称":"丰田", "次数":"17次", "里程":"139公里"},
-        {"企业名称":"大众", "次数":"19次", "里程":"93公里"},
-        {"企业名称":"宝马", "次数":"10次", "里程":"176公里"}
-    ]
+    // let {testTimeEnterprise, functionTestTimeEnterprise} = 企业测试时长data;
+    // let 企业测试时长分布data = {测试: {unit:'h', dataInfo: testTimeEnterprise}, 功能测试: {unit:'h', dataInfo: functionTestTimeEnterprise}};
+    // ret["api4"] = getChartOutData("企业测试时长分布", 企业测试时长分布data);
+
+    // let 企业脱离自动驾驶比率data:any = [
+    //     {"企业名称":"滴滴", "次数":"29次", "里程":"139公里"},
+    //     {"企业名称":"商汤", "次数":"2次", "里程":"261公里"},
+    //     {"企业名称":"小马易车", "次数":"12次", "里程":"231公里"},
+    //     {"企业名称":"仙途", "次数":"10次", "里程":"176公里"},
+    //     {"企业名称":"上汽红岩", "次数":"21次", "里程":"139公里"},
+    //     {"企业名称":"初速度", "次数":"33次", "里程":"214公里"},
+    //     {"企业名称":"AutoX", "次数":"29次", "里程":"93公里"},
+    //     {"企业名称":"中车时代", "次数":"27次", "里程":"163公里"},
+    //     {"企业名称":"丰田", "次数":"17次", "里程":"139公里"},
+    //     {"企业名称":"大众", "次数":"19次", "里程":"93公里"},
+    //     {"企业名称":"宝马", "次数":"10次", "里程":"176公里"}
+    // ]
+
+    let 企业脱离自动驾驶比率data = await getDetachmentRatio();
 
     企业脱离自动驾驶比率data.forEach( item => {
         let frequency = separateDataAndUint(item.次数).dataNum;

src/config/serverConfig.ts

@@ -4,7 +4,7 @@ import { BizError, SysError } from "../util/bizError";
 import { analysisXml } from "../util/myXML";
 import { SYSTEMERRORENUM } from "./errorEnum";
 
-export let port = Number(process.env.PORT) || Number(process.argv[3]);
+export let port = Number(process.env.PORT) || Number(process.argv[3]) || 30003;
 export let sockentPort;
 
 export let dbConfig;

src/data/interface/interfaceService.ts

@@ -91,6 +91,7 @@ export async function getTestLicense() {
  * disengagement 脱离次数
  */
 export async function getDetachmentRatio() {
+    let 企业脱离自动驾驶比率data = [];
     let requestParam = { st:moment().format("YYMM") + "01", et:moment().format("YYMMDD"), index:14};
     let result:any = await get(appConfig.rightView, requestParam);
     let list = [];
@@ -100,9 +101,43 @@ export async function getDetachmentRatio() {
         throw new SysError(SYSTEMERRORENUM.获取第三方接口数据失败, appConfig.rightView, JSON.stringify(requestParam) );
     }
 
+    let disengagementInfo = [];
+    let autoMileageInfo = [];
 
+    let disengagementData = list[0].result;
+    let autoMilegaeData = list[1].result;
+    disengagementData.forEach( disengagementItem => {
+        let {enterprise, vin, disengagement} = disengagementItem;
+        if (!disengagementInfo[enterprise]) disengagementInfo[enterprise] = {count: 0};
+        disengagementInfo[enterprise].count += disengagement;
+    });
+
+    autoMilegaeData.forEach( autoMilegaeItem => {
+        let {enterprise, vin, autoMileage} = autoMilegaeItem;
+        if (!autoMileageInfo[enterprise]) autoMileageInfo[enterprise] = {autoMileageCount: 0};
+        autoMileageInfo[enterprise].autoMileageCount += autoMileage;
+    });
 
+    let 企业脱离自动驾驶比率;
+    for (let key in disengagementInfo) {
+        let {count} = disengagementInfo[key];
+        企业脱离自动驾驶比率 = {"企业名称":key, "次数":count, "里程":0}
+        企业脱离自动驾驶比率data.push(企业脱离自动驾驶比率);
+    }
 
+    企业脱离自动驾驶比率data.forEach( enterprise => {
+        let {企业名称, 次数, 里程} = enterprise;
+        for (let key in autoMileageInfo) {
+            let {autoMileageCount} = autoMileageInfo[key];
+            if (企业名称 == key) {
+                enterprise.里程 = autoMileageCount;
+            }
+        }
+        
+        // 企业脱离自动驾驶比率data.push(企业脱离自动驾驶比率);
+    })
+    
+    return 企业脱离自动驾驶比率data;
 }
 
 //初始化测试时长分布
@@ -403,4 +438,10 @@ async function getInterfaceData(st, et, index) {
     } else {
         throw new SysError(SYSTEMERRORENUM.获取第三方接口数据失败, interfaceUrl, JSON.stringify(body) );
     }
-}
+}
\ No newline at end of file
+
+function getPreMonthDay(index) { 
+    let newDateArr;
+    let whereDateArr;
+    return {newDateArr, whereDateArr}
+}