Merge branch 'master' of http://123.207.147.179:8888/changsanjiao/server

# Conflicts:
#	res/其他数据模板.xlsx

src/data/analysisExcelData.ts

@@ -3,7 +3,7 @@
     import * as fs from "fs";
     import { BizError } from "../util/bizError";
     import { limitEnteNameString, changeDataName } from "../util/tools";
-    import { getExcelDataBySheetName, analysisExcelDataOfObject, analysisExcelDataOfMoreObject, analysisExcelDataOfList, analysisExcelDataOfStringList } from "../util/analysisExcel";
+    import { getExcelDataBySheetName, analysisExcelDataOfObject, analysisExcelDataOfMoreObject, analysisExcelDataOfList, analysisExcelDataOfStringList, analysisExcelDataTime } from "../util/analysisExcel";
     export function get智慧电眼首页() {
         let bolckDataList = getExcelDataBySheetName('智慧电眼数据模板.xlsx', '智慧电眼首页');
         let result = {};
@@ -230,8 +230,9 @@
         let bolckDataList = getExcelDataBySheetName('其他数据模板.xlsx', '智慧数据赋能');
         let result = {};
         let ofMoreObjList = [];
-        let ofObjList = ["虚拟机资源管理","IT资源管理","CPU使用情况"];
+        let ofObjList = ["虚拟机资源管理","IT资源管理"];
         let ofStringList = ["数据服务能力", "数据采集", "数据业务能力图片"];
+        let ofTimeObj=["CPU使用情况"];
         let listDataAnalysisInfo = {};
         for (let i = 0; i < bolckDataList.length; i++) {
             let {blockData, blockTitle} = bolckDataList[i];
@@ -241,6 +242,8 @@
             if (ofObjList.indexOf(changeName) > -1) result[changeName] = analysisExcelDataOfObject(blockData, true, false);
             if (listDataAnalysisInfo[changeName]) result[changeName] = analysisExcelDataOfList(blockData, listDataAnalysisInfo[blockTitle].keyValueObj, false);
             if (ofStringList.indexOf(changeName) > -1) result[changeName] = analysisExcelDataOfStringList(blockData);
+            if (ofTimeObj.indexOf(changeName) > -1) result[changeName] = analysisExcelDataTime(blockData, true, false);
+
         }
 
         return result;

src/util/analysisExcel.ts

@@ -56,6 +56,32 @@ export function analysisExcelDataOfObject(dataList, isJumpTitle?, keyInX?) {
     return result;
 }
 
+export function analysisExcelDataTime(dataList, isJumpTitle?, keyInX?) {
+    const moment = require('moment');
+    var time=moment(Date.now()).format('HH');//获取当前时间
+    let result = {};
+    if (keyInX) {
+        let keyList = dataList[0];
+        let valueList = dataList[1];
+        let i = isJumpTitle ? 1:0;
+        for (; i < keyList.length; i++) {
+            let key = keyList[i];
+            let value = valueList[i] || null;
+            result[key] = value;
+        }
+    } else {
+        let y = isJumpTitle ? 1: 0;
+        let timeNum=parseInt(time)+1;
+        for (; y < timeNum; y++) {
+            let childList = dataList[y];
+            let key = childList[0];
+            let value = childList[1] || null;
+            result[key] = value;
+        }
+    }
+    return result;
+}
+
 /**
  * analysisExcelDataOfMoreObject  将excel解出来的数据块按需求解析成可用数据
  * @param dataList excel解出来的数据