no message

src/biz/ztyxts.ts

@@ -6,7 +6,7 @@ import { getKeyValueListData, getReflectionData } from "./out";
 export async function getData(req, res) {
     let ret:any = {};
 
-    let {dqjxzhd, dqhdrs, bndhds, cyhdrs, ztyxtszjdt, zcyh, dqhds} = await getZtyxtsData();
+    let {dqjxzhd, dqhdrs, bndhds, cyhdrs, ztyxtszjdt, zcyh, dqhds, xxaqfx, zybs, zysylqsData } = await getZtyxtsData();
 
     ret["zcyh"] = getKeyValueListData("注册用户", zcyh);
     ret["dqjxzhd"] = getReflectionData("当前进行中活动", dqjxzhd, { hdmc:"key", num:"value"});
@@ -19,7 +19,6 @@ export async function getData(req, res) {
     ret["ndhds"] = {title:"年度活动数", data: parseInt(dqhds["num_ndhds"] || 0) };
     ret["cyhdrc"] = {title:"参与活动人次", data: parseInt(dqhds["num_cyhdrc"] || 0) };
 
-
     ret["yyjk"] = {
         title:"应用监控",
         data:statsQueue["应用监控"]
@@ -29,6 +28,20 @@ export async function getData(req, res) {
         data:statsQueue["应用系统数"]
     }
 
+    ret["xxaqfx"] = getKeyValueListData("信息安全风险", xxaqfx );
+    ret["zybs"] = {title:"资源部署", dataList:zybs};
+
+    let zykyxInfo = [];
+    for (let name in zysylqsData) {
+        let {sylqs, zykyx} = zysylqsData[name];
+        let addInfo:any = {zysyqk:getKeyValueListData(name, zykyx)};
+        addInfo["cpu"] = {name:"cpu", data:sylqs["cpu"]};
+        addInfo["nc"] = {name:"内存", data:sylqs["nc"]};
+        addInfo["cc"] = {name:"存储", data:sylqs["cc"]};
+        zykyxInfo.push(addInfo);
+    }
+    ret["zykyx"] = {title:"资源可用性", data:zykyxInfo};
+
     
     res.send(ret);
 }
\ No newline at end of file

src/biz/zyhdbz.ts

@@ -7,7 +7,7 @@ import { getKeyValueListData, getReflectionData } from "./out";
 export async function getData(req, res) {
     let ret:any = {};
 
-    let {zcyh, yjbzya, bzry, hdcyd, yhtsl, zyhdbzzjdt, yhtslzs} = await getZyhdbzData();
+    let {zcyh, yjbzya, bzry, hdcyd, yhtsl, zyhdbzzjdt, yhtslzs, rlzb, rlzbsylqs} = await getZyhdbzData();
 
     ret["zcyh"] = getKeyValueListData("注册用户", zcyh);
     ret["yjbzya"] = getKeyValueListData("应急保障预案", yjbzya);
@@ -34,5 +34,15 @@ export async function getData(req, res) {
         title:"页面成功率趋势",
         data:statsQueue["应用系统监控趋势"]
     }
+
+    ret["rlzb"] = getKeyValueListData("容量指标", rlzb);
+
+    ret["sylqs"] = {title:"使用率趋势", data:[
+        {title:"cpu", list:rlzbsylqs['cpu']},
+        {title:"内存", list:rlzbsylqs['nc']},
+        {title:"存储", list:rlzbsylqs['cc']}
+    ]};
+
+    //重要活动
     res.send(ret);
 }
\ No newline at end of file

src/data/interface/data.ts

@@ -89,8 +89,34 @@ export async function getZtyxtsData() {
 
     let dqhds = await post(getUrl(urlEnum.整体运行态势当前活动数), body, {} );
 
+
+    let xxaqfx = await post(getUrl(urlEnum.信息安全风险), body, {} );
+    let zybs:any = await post(getUrl(urlEnum.资源部署), body, {} );
+    let zysylqsData = {};
+    let zymcMap = {"zwy":"政务云", "jyy":"教育云", "yfy":"有孚云"};
+    for (let engName in zymcMap) {
+        let thisBody:any = JSON.parse(JSON.stringify(body));
+        thisBody.zymc = engName;
+        let thisZymcZykyx:any = await post(getUrl(urlEnum.资源可用性), thisBody, {} );
+        
+        let nameList = ["cpu", "nc", "cc"];
+        let thisZymcSylqs = {};
+        for (let j = 0; j < nameList.length; j++) {
+            let name = nameList[j];
+            thisBody.name = name;
+            let onceList = await post(getUrl(urlEnum.资源使用率趋势), thisBody, {} );
+            thisZymcSylqs[name] = onceList;
+
+        }
+        let chName = zymcMap[engName];
+        zysylqsData[chName] = {zykyx:listMappingObject(thisZymcZykyx, {cc:"存储", nc:"内存", cpu:"cpu"}), sylqs:thisZymcSylqs }
+    }
+
     return { dqjxzhd,dqhdrs,bndhds,cyhdrs, ztyxtszjdt, zcyh:listMappingObject(zcyh, {zcyh:"注册用户"}), 
-        dqhds:listMappingObject(dqhds, {num_dqhds:"num_dqhds", num_ndhds:"num_ndhds", num_cyhdrc:"num_cyhdrc" }) };
+        dqhds:listMappingObject(dqhds, {num_dqhds:"num_dqhds", num_ndhds:"num_ndhds", num_cyhdrc:"num_cyhdrc" }),
+        xxaqfx:listMappingObject(xxaqfx, {fxld:"发现漏洞", yxf:"已修复", wxf:"未修复"}),
+        zybs,zysylqsData
+    };
 }
 
 //重要活动保障
@@ -108,14 +134,29 @@ export async function getZyhdbzData() {
     let hdcyd = await post(getUrl(urlEnum.活动参与度), body, {} );
     let yhtsl = await post(getUrl(urlEnum.用户投诉量), body, {} );
 
-    let zyhdbzzjdt:any = await post(getUrl(urlEnum.重要活动地图数据), body, {} );
+    let zyhdbzzjdt = await post(getUrl(urlEnum.重要活动地图数据), body, {} );
+
+    let rlzb = await post(getUrl(urlEnum.容量指标), body, {});
+
 
+    let nameList = ["cpu", "nc", "cc"];
+    let rlzbsylqs = {};
+    for (let j = 0; j < nameList.length; j++) {
+        let name = nameList[j];
+        let thisBody:any = JSON.parse(JSON.stringify(body));
+        thisBody.name = name;
+        let onceRlzbsylqs = await post(getUrl(urlEnum.容量指标使用率趋势), thisBody, {} );
+        rlzbsylqs[name] = onceRlzbsylqs;
+
+    }
+  
     return { 
         zcyh: listMappingObject(zcyh, {zcyh:"注册用户"}), 
         yjbzya: listMappingObject(yjbzya, {hdmc:"活动名称", bzdx:"保障对象", bzsj:"保障时间", bzyq:"保障要求"}), 
         bzry, hdcyd, zyhdbzzjdt,
         yhtsl: listMappingObject(yhtsl, { zcdl:"注册登录", wzdbk:"网站打不开", sfzcw:"身份证填写错误", qt:"其他"}),
         yhtslzs: listMappingObject(yhtsl, {yhts:"用户投诉总数"}),
+        rlzb:listMappingObject(rlzb, {cc:"存储", nc:"内存", cpu:"cpu"}) , rlzbsylqs
     };
 }
 function listMappingObject(dataList, mappingInfo) {

src/data/interface/url.ts

@@ -17,6 +17,14 @@ export enum urlEnum {
     重要活动地图数据="/service/api/kyzx/zyhdbzzjdt",
     整体运行地图数据="/service/api/kyzx/ztyxtszjdt",
     整体运行态势当前活动数="/service/api/kyzx/dqhds",
+    容量指标="/service/api/kyzx/rlzb",
+    容量指标使用率趋势="/service/api/kyzx/rlzbsylqs",
+    信息安全风险="/service/api/kyzx/xxaqfx",
+    资源部署="/service/api/kyzx/zybs",
+    资源可用性="/service/api/kyzx/zykyx",
+    资源使用率趋势="/service/api/kyzx/zysylqs"
+
+
 };
 
 export function getUrl(urlName) {