no message

serverConfig.xml

@@ -50,7 +50,7 @@
         <token>09a98bc555474e058ef90b6cc6e23638</token>
     </mapView>
     <!-- 图片地址 这里填本机地址 -->
-    <imagePath>192.168.0.105</imagePath>
+    <imagePath>192.168.0.47</imagePath>
     <!-- 地图中心点 -->
     <mapCenter>
         <lng>121.183574</lng>

src/biz/control.ts

@@ -97,8 +97,27 @@ export async function initControlSocketServer(port) {
 export async function controlGetCarList(req, res) {
     let {enterpriseVehicleList} = await getInterfaceByInterfaceName(dataCenterInterfaceConfig.enterpriseVehicleList, {});
     //todo 最后加鉴权
-    let carList = controlGetOnlieCarList();//todo 改这里
-    res.send({carList});   
+    // let carList = controlGetOnlieCarList();//todo 改这里
+    let carList = [];
+    enterpriseVehicleList.forEach(info => {
+        let vehicleList = info.vehicleList
+        vehicleList.forEach(list => {
+            let {vin, enterprise, online} = list;
+            let isOnline = "";
+            switch (online) {
+                case 0:
+                    isOnline = "离线";
+                break;
+                case 1:
+                    isOnline = "在线";
+                break;
+            }
+            carList.push({vin, enterprise, isOnline});
+        })
+    })
+
+    // res.send({carList});
+    res.send({carList});
 }
 
 

src/biz/jgfwnl/data.ts

@@ -199,7 +199,7 @@ export async function carInfo(req, res) {
     alertData.list.forEach((item, index) => {
         if (index >= 10) return
         let { alertDuration, alertType, positionTime, velocity } = item;
-        let alertDurationStr = `${alertDuration}S`;
+        let alertDurationStr = `${alertDuration}`;
         let alertTypeStr = alertType == 1? '违规开启自动驾驶模式' : "手动模式";
         车辆违规列表.push([positionTime, alertTypeStr, alertDurationStr, `${velocity}km/h`]);
     });
@@ -225,6 +225,7 @@ export async function carInfo(req, res) {
     let isNull = false
     let 监控视频列表 = [];
     if (testVideoData && videoPictureData) {
+        
         let map = {};
         videoPictureData.vehiclePhotoList.forEach(info => {
             let { photo, photoChannel } = info;
@@ -251,3 +252,7 @@ export async function carInfo(req, res) {
 
     res.send(ret);
 }
+
+function isNull() {
+
+}
\ No newline at end of file

src/data/cronJob.ts

@@ -39,7 +39,7 @@ export async function getInterfaceByInterfaceName(url, body) {
 export async function getCarVideo(url, body) {
     let {err, res, reqData}:any = await get(url, body, {});
     if (reqData.code == 500) {
-        return {};
+        return false;
     }
     if (reqData.data || reqData.resultData) return reqData.data || reqData.resultData;
     // return reqData.data;
@@ -48,7 +48,7 @@ export async function getCarVideo(url, body) {
 
 
 function get(url:string, query?, headers?, timeOut?) {
-    timeOut = timeOut || 5000;
+    timeOut = timeOut || 10000;
     if (!url || (url.search(/http:/) && url.search(/https:/)) ) throw new BizError(!url ? "请求地址为空" : "请求地址错误");
     return new Promise((resolve, reject)=>{
         let paramater:any = { url, json:true, timeout:timeOut };

src/data/dataCenterInterface/csfxData.ts

@@ -9,9 +9,9 @@ import { getInterfaceByInterfaceName } from "../cronJob";
 //企业测试
 export async function getQycs() {
     const interfaceName = "企业历史里程及时长统计信息接口";
-    let startTime = moment().format("YYYY-MM") + "-01";
-    let endTime = moment().format('YYYY-MM-DD');
-    let data = await getInterfaceByInterfaceName( dataCenterInterfaceConfig.enterpriseTestStatus, { startTime, endTime } );
+    // let startTime = moment().format("YYYY-MM") + "-01";
+    // let endTime = moment().format('YYYY-MM-DD');
+    let data = await getInterfaceByInterfaceName( dataCenterInterfaceConfig.enterpriseTestStatus, {} );
     let { enterpriseTestStatusList } = data;
 
     if ( !Array.isArray(enterpriseTestStatusList) ) throw new SysError(SYSTEMERRORENUM.未按接口协议返回, interfaceName, "enterpriseTestStatusList 不是数组", enterpriseTestStatusList);