no message

src/biz/jgfwnl/wsData.ts

@@ -42,5 +42,6 @@ export async function initSocketServer(port) {
             });
 
         });
+        console.log('socket server listen on port:', port);
     });
 }
\ No newline at end of file

src/config/enum.ts

-export enum ERRORENUM {
-    参数错误=`参数错误`,
-}
-
 export enum INTERFACEREQUESTTYPEENUM {
     即时更新 = 1,
     定时更新

src/config/errorEnum.ts

 export enum ERRORENUM {
-    未找到数据 = "未找到数据",
+    未找到数据,
+}
+export enum SYSTEMERRORENUM {
+    初始化配置失败 = 1,
+}
+
+let bizErrorMsgMap = {};
+for (let key in ERRORENUM) {
+    bizErrorMsgMap[ERRORENUM[key]] = key;
 }
 
 let systemErrorMsgMap = {};
@@ -7,11 +15,10 @@ for (let key in ERRORENUM) {
     systemErrorMsgMap[ERRORENUM[key]] = key;
 }
 
-export function getMsg(param) {
-    let errMsg = "";
-    let logMsg = "";
-    
-    errMsg = systemErrorMsgMap[param];
-    logMsg = param;
-    return {errMsg, logMsg};
+export function getBizMsg(param) {
+    return bizErrorMsgMap[param];
+}
+
+export function getSysMsg(param) {
+    return systemErrorMsgMap[param];
 }
\ No newline at end of file

src/config/serverConfig.ts

 const path = require('path');
 import * as fs from "fs";
-import { BizError } from "../util/bizError";
+import { SysError } from "../util/bizError";
 import { analysisXml } from "../util/myXML";
+import { SYSTEMERRORENUM } from "./errorEnum";
 
-export let port = Number(process.env.PORT) || Number(process.argv[3]) || 30003; //如果xml里面没有配置 就会使用到这里的端口 30001
-export let cloudResource = "http://10.51.50.140:8080/api/static/PrivateCloudUsageStatics";
-export let physicalResource = "http://10.51.50.140:8080/api/v1/PrivateCloudCurrentUsages";
-export let mapPort = "http://10.51.48.213/nlink/v2/getAllDevicesInfo?prjid=0255e1f7515348cc87c7bb2cc6341fer&online=3&broken=3&token=09a98bc555474e058ef90b6cc6e23638";
-export let sockentPort = 30002;
+export let port = Number(process.env.PORT) || Number(process.argv[3]);
+// export let  = "http://10.51.50.140:8080/api/static/PrivateCloudUsageStatics";
+// export let  = "http://10.51.50.140:8080/api/v1/PrivateCloudCurrentUsages";
+// export let  = "http://10.51.48.213/nlink/v2/getAllDevicesInfo?prjid=0255e1f7515348cc87c7bb2cc6341fer&online=3&broken=3&token=09a98bc555474e058ef90b6cc6e23638";
+export let sockentPort;
 
 export let dbConfig;
-export let appConfig;
+export let appConfig = {
+    cloudResource:'',
+    physicalResource:'',
+    mapPort:''
+};
 export let mongoServerConstVal;
 export let mySqlConfig;
 
@@ -22,12 +27,13 @@ export async function initConfig() {
         let configInfo:any = await analysisXml(configStr);
 		if (!configInfo || !configInfo.config) console.log("xml中无配置加载");
 		else {
-			let config = configInfo.config;
-			port = config.port[0] || port;
+			let {port, sockentPort} = configInfo.config;
+
+            if ( !getConf(port)|| !getConf(sockentPort) ) throw new SysError(SYSTEMERRORENUM.初始化配置失败, 'serverConfig.xml中 缺少 port 或 sockentPort');
             //左屏
             let leftView = config.leftView[0];
-            cloudResource = leftView.cloudResource[0] || cloudResource;
-            physicalResource = leftView.physicalResource[0] || physicalResource;
+            appConfig.cloudResource = leftView.cloudResource[0];
+            appConfig.physicalResource = leftView.physicalResource[0];
             //地图
             let mapView = config.mapView[0];
             let online = mapView.online[0];
@@ -35,8 +41,7 @@ export async function initConfig() {
             let token = mapView.token[0];
             mapPort = mapView.mapPort[0] + "&online=" + online + "&broken=" + broken + "&token=" + token || mapPort;
 
-            //sockent端口
-            sockentPort = config.sockentPort[0] || sockentPort;
+           
 		}
         
         console.log("config init success");
@@ -45,3 +50,9 @@ export async function initConfig() {
         throw new BizError("服务器配置解析错误 请检查根目录下 serverConfig.xml 文件是否正确");
     }
 }
+
+
+function getConf(conf, index = 0) {
+    if (!conf || !conf[index]) return false;
+    return true;
+}
\ No newline at end of file

src/data/interface/interfaceService.ts

@@ -346,9 +346,9 @@ async function historyData() {
     for (let i = 1; i <= 21; i++) {
         let st = moment().subtract(i, 'months').format('YYMM') + '01';
         let key = moment().subtract(i, 'months').format('YYYY.MM');
-        let et = moment().subtract(i-1, 'months').format('YYMM')+'01';
+        let et = moment().subtract(i, 'months').endOf('month').format('YYMMDD');
 
-        if (i == 21) lastEt = st;
+        if (i == 21) lastEt = moment().subtract(i+1, 'months').endOf('month').format('YYMMDD');
 
         let list = await getInterfaceData(st, et, 1);
 
@@ -374,7 +374,7 @@ async function historyData() {
 
         });
         月里程数据.push( {count, autoCount:testCount, key} );
-        console.log(`完成 ${st} 数据的初始化`);
+        console.log(`初始化 ${key} 数据`);
     }
 
     //查找21个月以外的数据
@@ -393,14 +393,12 @@ async function historyData() {
         if (!企业日里程数据[enterprise]) 企业日里程数据[enterprise] = {count:0, autoCount:0};
         企业日里程数据[enterprise].autoCount += parseInt(auto_mileage);
     });
+
+    console.log(`初始化 数据完成`);
     
     lastMonths = moment().format("YYYY.MM")+'.01';
 }
 
-
-
-
-
 //获取数据
 const interfaceUrl = 'http://10.51.50.136:8090/sql/execute';
 
@@ -410,7 +408,6 @@ async function getInterfaceData(st, et, index) {
         return result.result[0].result;
     } else {
         //报错
-        console.log();
         return [];
     }
 }

src/data/interface/wsData.ts

@@ -91,8 +91,6 @@ async function createSocket() {
     ws.onopen = () => {
         heart.start(ws);
     }
-
-   
 }
 
 export async function initWSData() {

src/main.ts

 
 import { initSocketServer } from "./biz/jgfwnl/wsData";
 import { initConfig, port, sockentPort } from "./config/serverConfig";
-import { getHardware } from "./data/interface/hardwareData";
-import { getTestLicense, getCsgkDayData, initData, getTestAnalysis } from "./data/interface/interfaceService";
-import { getMap } from "./data/interface/mapInterfaceData";
-import { initWSData } from "./data/interface/wsData";
+import { initData } from "./data/interface/interfaceService";
 import { httpServer } from "./net/http_server";
-import { BizError } from "./util/bizError";
 
 async function lanuch() {
-    // await initConfig();
-    // await initData();
+    await initConfig();//初始化配置解析
     httpServer.createServer(port);
-    initSocketServer(sockentPort);
+    await initSocketServer(sockentPort);
+    await initData();
     console.log('This indicates that the server is started successfully.');
-    console.log("初始化成功");
 }
 
 lanuch();
\ No newline at end of file

src/net/socket_server.ts

@@ -8,12 +8,7 @@ export class Socket {
             threshold:1024, // 大小（以字节为单位），低于此大小的消息不压缩
             maxPayload:9999,
         });
-
-        // fallback(wss);
         callback(wss);
-
-       
-    
         console.log("configCenter socketServer listen on port:"+port);
     }
 }

src/util/bizError.ts

-import { getMsg } from "../config/errorEnum";
+import { getBizMsg, getSysMsg } from "../config/errorEnum";
 import { logError } from "./log";
 
 export class BizError extends Error {
@@ -7,9 +7,28 @@ export class BizError extends Error {
         let logErrorMsg = '';
         for (let i = 0; i <msgs.length; i++) {
             if (!i) {
-                let {logMsg, errMsg} = getMsg(msgs[i]);
-                reqErrorMsg = errMsg;
-                logErrorMsg = logMsg;
+                let msg = getBizMsg(msgs[i]);
+                reqErrorMsg = msg;
+                logErrorMsg = msg;
+            } else {
+                logErrorMsg += ` | ${msgs[i]} `;
+            }
+        }
+
+        logError(logErrorMsg);
+        super(reqErrorMsg);
+    }
+}
+
+export class SysError extends Error {
+    constructor(...msgs) {
+        let reqErrorMsg = '';
+        let logErrorMsg = '';
+        for (let i = 0; i <msgs.length; i++) {
+            if (!i) {
+                let msg= getSysMsg(msgs[i]);
+                reqErrorMsg = msg;
+                logErrorMsg = msg;
             } else {
                 logErrorMsg += ` | ${msgs[i]} `;
             }