@riil-frontend/component-topology 8.0.0-a.8 → 8.0.1

package/es/core/viewer/components/plugins/ResourceDetail/components/ResourceOverview/components/LinkTopo/hooks/useMetricPolling.js

@@ -21,7 +21,7 @@ export default function useMetricPolling(_ref) {
 
 
   var queryLinkMetricsRequest = useRequest(queryLinkLatestMetrics, {
-    pollingInterval: 1000 * 15,
+    pollingInterval: 60 * 1000,
     pollingWhenHidden: false,
     debounceInterval: 200,
     manual: true,
@@ -31,7 +31,7 @@ export default function useMetricPolling(_ref) {
     }
   });
   var queryInterfaceMetricsRequest = useRequest(queryLinkInterfacesLatestMetrics, {
-    pollingInterval: 1000 * 15,
+    pollingInterval: 60 * 1000,
     pollingWhenHidden: false,
     debounceInterval: 200,
     manual: true,

package/es/core/viewer/components/plugins/ResourceDetail/components/ResourceOverview/hooks/useAlarmAndRiskData.js

@@ -0,0 +1,171 @@
+import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
+import _regeneratorRuntime from "@babel/runtime/regenerator";
+import { useRequest } from 'ahooks';
+import { useEffect, useState } from 'react';
+import alarmService from "../../../../../../../services/alarm";
+import service from "../../../../../../../services/overview";
+/**
+ * 概览指标定义
+ * @param {*} props
+ */
+
+var useAlarmAndRiskData = function useAlarmAndRiskData(props) {
+  var id = props.id,
+      isAppTopo = props.isAppTopo,
+      resourceOverviewProps = props.resourceOverviewProps,
+      childrenIds = props.childrenIds,
+      userId = props.userId;
+
+  var _useState = useState([]),
+      alarmRiskList = _useState[0],
+      setAlarmRiskList = _useState[1]; // 获取告警/风险信息
+
+
+  function getAlarmRiskData(_x) {
+    return _getAlarmRiskData.apply(this, arguments);
+  } // 轮询hooks
+
+
+  function _getAlarmRiskData() {
+    _getAlarmRiskData = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(id) {
+      var _alarmList, _yield$resourceOvervi, alarmList, _yield$alarmService$g, _alarmList2, AllComponentsByCiId, _yield$service$getRis, riskList;
+
+      return _regeneratorRuntime.wrap(function _callee$(_context) {
+        while (1) {
+          switch (_context.prev = _context.next) {
+            case 0:
+              if (!isAppTopo) {
+                _context.next = 9;
+                break;
+              }
+
+              _context.next = 3;
+              return resourceOverviewProps === null || resourceOverviewProps === void 0 ? void 0 : resourceOverviewProps.getData({
+                id: id // metrics: topModelMetrics,
+
+              });
+
+            case 3:
+              _yield$resourceOvervi = _context.sent;
+              alarmList = _yield$resourceOvervi.alarms;
+              alarmList = ((_alarmList = alarmList) === null || _alarmList === void 0 ? void 0 : _alarmList.map(function (item) {
+                return {
+                  type: 'alarm',
+                  icon: 'gaojing-3',
+                  className: "alarm-color-icon-lv" + item.alertLevel,
+                  title: "[" + item.alertObject + "] " + item.alertTitle,
+                  link: "/default/pagecenter/alertDetail/view/" + item.alertId + "?alertId=" + item.alertId + "&resId=" + item.ciId + "&title=" + item.alertObject + "&ruleId=" + item.ruleId,
+                  time: item.createTime,
+                  status: item.status,
+                  params: [{
+                    alertId: item.alertId,
+                    status: 'dealing',
+                    userId: userId,
+                    isBaseAlert: false
+                  }]
+                };
+              })) || [];
+              setAlarmRiskList(alarmList);
+              _context.next = 24;
+              break;
+
+            case 9:
+              _context.next = 11;
+              return alarmService.getAlarmByIds([id].concat(childrenIds), {
+                alertStatusList: ['toDeal', 'woDealing', 'dealing'],
+                // toDeal: 待处理, dealing：处理中
+                pageNum: 1,
+                pageSize: 10000,
+                sortField: 'alertLevel',
+                sortOrder: 'asc'
+              });
+
+            case 11:
+              _yield$alarmService$g = _context.sent;
+              _alarmList2 = _yield$alarmService$g.datas;
+              // 2022-07-16 后端不支持多列排序，暂通过前端实现,按创建时间倒序
+              _alarmList2 = _alarmList2.sort(function (a, b) {
+                return b.createTime - a.createTime;
+              });
+              _alarmList2 = _alarmList2.map(function (item) {
+                return {
+                  type: 'alarm',
+                  icon: 'gaojing-3',
+                  className: "alarm-color-icon-lv" + item.alertLevel,
+                  title: "" + item.alertObject + item.alertTitle,
+                  link: "/default/pagecenter/alertDetail/view/" + item.alertId + "?alertId=" + item.alertId + "&resId=" + item.ciId + "&title=" + item.alertObject + "&ruleId=" + item.ruleId,
+                  time: item.createTime,
+                  status: item.status,
+                  params: [{
+                    alertId: item.alertId,
+                    status: 'dealing',
+                    userId: userId,
+                    isBaseAlert: false
+                  }]
+                };
+              }); // fix NEWITOM-33635【南昌大学】网络拓扑上双击设备拉开的抽屉中无法看到风险
+
+              _context.next = 17;
+              return service.queryAllComponentsByCiId(id);
+
+            case 17:
+              AllComponentsByCiId = _context.sent;
+              _context.next = 20;
+              return service.getRiskByIds({
+                ciIdList: [id].concat(childrenIds, AllComponentsByCiId.map(function (item) {
+                  return item.id;
+                })),
+                statusList: ['toDeal', 'dealing'],
+                current: 1,
+                pageSize: 10000
+              });
+
+            case 20:
+              _yield$service$getRis = _context.sent;
+              riskList = _yield$service$getRis.content;
+              riskList = riskList.map(function (item) {
+                return {
+                  type: 'risk',
+                  icon: 'Overall_risk_full',
+                  className: 'risk-icon',
+                  title: "" + item.ciName + item.itemName,
+                  link: "/default/inspectionTaskList/inspectionReport?title=" + item.ciName + "&reportId=" + item.executeId + "&reportTime=" + item.executeTime + "&reportType=" + item.viewType + "&reportName=" + item.reportName,
+                  time: item.firstFoundTime
+                };
+              }); // console.log('告警和风险', alarmList, riskList);
+
+              setAlarmRiskList([].concat(_alarmList2, riskList));
+
+            case 24:
+            case "end":
+              return _context.stop();
+          }
+        }
+      }, _callee);
+    }));
+    return _getAlarmRiskData.apply(this, arguments);
+  }
+
+  var request = useRequest(getAlarmRiskData, {
+    pollingInterval: 1000 * 15,
+    pollingWhenHidden: false,
+    // debounceInterval: 200,
+    manual: true,
+    onSuccess: function onSuccess() {}
+  });
+  useEffect(function () {
+    setAlarmRiskList([]);
+    request.run(id);
+    return function () {
+      request.cancel();
+    };
+  }, [id]);
+  return {
+    alarmRiskList: alarmRiskList,
+    refreshAlarmData: function refreshAlarmData() {
+      request.run();
+    }
+  };
+};
+
+export default useAlarmAndRiskData;

package/es/core/viewer/components/plugins/ResourceDetail/components/ResourceOverview/hooks/useMetricModels.js

@@ -92,9 +92,9 @@ var useMetricModels = function useMetricModels(props) {
   }
 
   var request = useRequest(fetchData, {
-    pollingInterval: 1000 * 5,
-    // pollingWhenHidden: false,
-    // debounceInterval: 1000,
+    pollingInterval: 1000 * 60,
+    pollingWhenHidden: false,
+    // debounceInterval: 200,
     manual: true,
     onSuccess: function onSuccess(newMetricModels) {
       var a = metricModels.map(function (item) {

package/es/networkTopo/services/link.js

@@ -148,7 +148,7 @@ export default {
    */
   queryAssociatedlinks: function queryAssociatedlinks(ids, type) {
     return _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee5() {
-      var stag, ttag, condition, parm, jsonParm, result;
+      var stag, ttag, condition, parm, result;
       return _regeneratorRuntime.wrap(function _callee5$(_context5) {
         while (1) {
           switch (_context5.prev = _context5.next) {
@@ -167,28 +167,27 @@ export default {
                 sort: "name asc",
                 currentPage: 1,
                 pageSize: 99
-              };
-              jsonParm = JSON.stringify(parm); // console.log("queryAssociatedlinks", ids, parm, jsonParm);
+              }; // console.log("queryAssociatedlinks", ids, parm, jsonParm);
 
-              _context5.prev = 6;
-              _context5.next = 9;
-              return request.post("/mdc/v1/api/cmdb/commonQueryCiData", jsonParm);
+              _context5.prev = 5;
+              _context5.next = 8;
+              return request.post("/mdc/v1/api/cmdb/commonQueryCiData", parm);
 
-            case 9:
+            case 8:
               result = _context5.sent;
               return _context5.abrupt("return", result);
 
-            case 13:
-              _context5.prev = 13;
-              _context5.t0 = _context5["catch"](6);
+            case 12:
+              _context5.prev = 12;
+              _context5.t0 = _context5["catch"](5);
               rlog.error("查询可关联链路", _context5.t0);
 
-            case 16:
+            case 15:
             case "end":
               return _context5.stop();
           }
         }
-      }, _callee5, null, [[6, 13]]);
+      }, _callee5, null, [[5, 12]]);
     }))();
   }
 };

package/lib/core/hooks/usePolling.js

@@ -34,9 +34,9 @@ var usePolling = function usePolling(props) {
   var resIdsList = resAndMetrics === null || resAndMetrics === void 0 ? void 0 : resAndMetrics.resIdsList; // 轮询hooks
 
   var _useRequest = (0, _ahooks.useRequest)(refresh, {
-    pollingInterval: 1000 * 15,
-    // pollingWhenHidden: false,
-    // debounceInterval: 1000,
+    pollingInterval: 60 * 1000,
+    pollingWhenHidden: false,
+    // debounceInterval: 200,
     manual: true,
     onSuccess: function onSuccess(result) {
       if (result) {

package/lib/core/models/TopoApp.js

@@ -54,7 +54,7 @@ var _ElementTagTipConfig = _interopRequireDefault(require("./tagstips/ElementTag
 var _SelectionModel = _interopRequireDefault(require("./SelectionModel"));
 
 // eslint-disable-next-line no-undef
-var version = typeof "8.0.0-a.8" === 'string' ? "8.0.0-a.8" : null;
+var version = typeof "8.0.1" === 'string' ? "8.0.1" : null;
 console.info("\u62D3\u6251\u7248\u672C: " + version);
 /**
  * 拓扑显示和编辑

package/lib/core/models/utils/linkUtils.js

@@ -4,7 +4,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 
 exports.__esModule = true;
 exports.buildTopoLinkData = buildTopoLinkData;
-exports.getInterfaceObject = exports.compatibleWith = void 0;
+exports.compatibleWith = void 0;
 exports.getLinksDetail = getLinksDetail;
 exports.isCrucialLink = isCrucialLink;
 exports.isExitLink = isExitLink;
@@ -13,11 +13,9 @@ exports.showLinkByConfig = exports.plurals = void 0;
 
 var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
 
-var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
-
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 
-var _topo = _interopRequireDefault(require("@riil-frontend/component-topology-common/es/services/topo"));
+var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 
 var _keyBy = _interopRequireDefault(require("lodash/keyBy"));
 
@@ -27,6 +25,8 @@ var _services = require("../../services");
 
 var _htElementUtils = require("../../../utils/htElementUtils");
 
+var _CiTypeCache = _interopRequireDefault(require("../cache/CiTypeCache"));
+
 // 查询所有连线
 // const interfaceTypeMap = {
 //   "network.interface": {
@@ -56,43 +56,6 @@ function isExitLink(link) {
   return (link === null || link === void 0 ? void 0 : link.attributes) && !(link !== null && link !== void 0 && link.attributes['destination_id']);
 }
 
-var getInterfaceObject = /*#__PURE__*/function () {
-  var _ref = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee(codes) {
-    var query, promises, result, ifDoc;
-    return _regenerator["default"].wrap(function _callee$(_context) {
-      while (1) {
-        switch (_context.prev = _context.next) {
-          case 0:
-            query = _lodash["default"].compact(_lodash["default"].uniq(codes));
-            promises = query.map(_services.queryModelAsset);
-            _context.next = 4;
-            return Promise.all(promises);
-
-          case 4:
-            result = _context.sent;
-            ifDoc = {};
-            result.map(function (ifItem) {
-              ifDoc[ifItem.code] = {
-                displayName: ifItem.displayName
-              };
-            });
-            return _context.abrupt("return", ifDoc);
-
-          case 8:
-          case "end":
-            return _context.stop();
-        }
-      }
-    }, _callee);
-  }));
-
-  return function getInterfaceObject(_x) {
-    return _ref.apply(this, arguments);
-  };
-}();
-
-exports.getInterfaceObject = getInterfaceObject;
-
 function mergeLinksData(links, linkCis, nodes, interfaceCis, interfaceDoc) {
   var linkCiMap = (0, _keyBy["default"])(links, 'id');
   return links.map(function (link) {
@@ -135,57 +98,59 @@ function mergeLinksData(links, linkCis, nodes, interfaceCis, interfaceDoc) {
   });
 }
 
-function getLinksDetail(_x2, _x3) {
+function getLinksDetail(_x, _x2) {
   return _getLinksDetail.apply(this, arguments);
 }
 
 function _getLinksDetail() {
-  _getLinksDetail = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee2(links, nodes) {
+  _getLinksDetail = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee(links, nodes) {
     var linkCis, interfaceIds, interfaceTypes, interfaceCis, interfaceDoc;
-    return _regenerator["default"].wrap(function _callee2$(_context2) {
+    return _regenerator["default"].wrap(function _callee$(_context) {
       while (1) {
-        switch (_context2.prev = _context2.next) {
+        switch (_context.prev = _context.next) {
           case 0:
             if (!(!links || !links.length)) {
-              _context2.next = 2;
+              _context.next = 2;
               break;
             }
 
-            return _context2.abrupt("return", []);
+            return _context.abrupt("return", []);
 
           case 2:
             // const linkCis = await topoService.relation.batchQueryRelation(
             //   links.map((link) => link.id)
             // );
             linkCis = links;
-            interfaceIds = [];
-            interfaceTypes = [];
-            linkCis.forEach(function (item) {
-              interfaceIds.push(item.attributes.source_id);
-              interfaceIds.push(item.attributes.destination_id);
-              interfaceTypes.push(item.attributes.source_type);
-              interfaceTypes.push(item.attributes.destination_type);
+            interfaceIds = [].concat(linkCis.map(function (item) {
+              return item.attributes.source_id;
+            }), linkCis.map(function (item) {
+              return item.attributes.destination_id;
+            }));
+            interfaceTypes = _lodash["default"].compact(_lodash["default"].uniq([].concat(linkCis.map(function (item) {
+              return item.attributes.source_type;
+            }), linkCis.map(function (item) {
+              return item.attributes.destination_type;
+            })))).filter(function (item) {
+              return item !== 'ip';
             });
-            _context2.next = 8;
+            _context.next = 7;
             return (0, _services.queryCisByIds)(interfaceIds);
 
-          case 8:
-            interfaceCis = _context2.sent;
-            _context2.next = 11;
-            return getInterfaceObject(interfaceTypes.filter(function (item) {
-              return item !== 'ip';
-            }));
+          case 7:
+            interfaceCis = _context.sent;
+            _context.next = 10;
+            return _CiTypeCache["default"].getCiTypeMap(interfaceTypes);
 
-          case 11:
-            interfaceDoc = _context2.sent;
-            return _context2.abrupt("return", mergeLinksData(links, linkCis, nodes, interfaceCis, interfaceDoc));
+          case 10:
+            interfaceDoc = _context.sent;
+            return _context.abrupt("return", mergeLinksData(links, linkCis, nodes, interfaceCis, interfaceDoc));
 
-          case 13:
+          case 12:
           case "end":
-            return _context2.stop();
+            return _context.stop();
         }
       }
-    }, _callee2);
+    }, _callee);
   }));
   return _getLinksDetail.apply(this, arguments);
 }

package/lib/core/services/overview.js

@@ -13,6 +13,10 @@ var _componentTopologyUtils = require("@riil-frontend/component-topology-utils")
 
 var _cmdb = require("./cmdb");
 
+// 机房可上架设备类型缓存数据
+var roomDeviceTypeList = null; // 资源子组件缓存
+
+var ciComponentsMap = {};
 var _default = {
   /**
    * 根据资源id获取风险
@@ -46,19 +50,31 @@ var _default = {
    */
   queryAllComponentsByCiId: function queryAllComponentsByCiId(id) {
     return (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee2() {
+      var components;
       return _regenerator["default"].wrap(function _callee2$(_context2) {
         while (1) {
           switch (_context2.prev = _context2.next) {
             case 0:
-              _context2.next = 2;
+              components = ciComponentsMap[id];
+
+              if (components) {
+                _context2.next = 6;
+                break;
+              }
+
+              _context2.next = 4;
               return _componentTopologyUtils.request.post('/mdc/v1/api/cmdb/queryAllComponentsByCiId', {
                 id: id
               });
 
-            case 2:
-              return _context2.abrupt("return", _context2.sent);
+            case 4:
+              components = _context2.sent;
+              ciComponentsMap[id] = components;
 
-            case 3:
+            case 6:
+              return _context2.abrupt("return", components);
+
+            case 7:
             case "end":
               return _context2.stop();
           }
@@ -197,13 +213,21 @@ var _default = {
         while (1) {
           switch (_context8.prev = _context8.next) {
             case 0:
-              _context8.next = 2;
-              return _componentTopologyUtils.request.post("/room/v1/api/device/type/list", {});
+              if (roomDeviceTypeList) {
+                _context8.next = 4;
+                break;
+              }
 
-            case 2:
-              return _context8.abrupt("return", _context8.sent);
+              _context8.next = 3;
+              return _componentTopologyUtils.request.post("/room/v1/api/device/type/list", {});
 
             case 3:
+              roomDeviceTypeList = _context8.sent;
+
+            case 4:
+              return _context8.abrupt("return", roomDeviceTypeList);
+
+            case 5:
             case "end":
               return _context8.stop();
           }

package/lib/core/store/models/topoAlarm.js

@@ -15,13 +15,19 @@ var _rlog = _interopRequireDefault(require("@riil-frontend/component-topology-ut
 
 var _lodash = _interopRequireDefault(require("lodash"));
 
-var _topoData = require("../../../utils/topoData");
-
 /**
  * 告警
  */
 var showAlarmStatus = ["toDeal", "dealing", "change", "woDealing"];
 
+var sortList = function sortList(a, b) {
+  if (a.level === b.level) {
+    return a.obj.createTime - b.obj.createTime;
+  } else {
+    return a.level - b.level;
+  }
+};
+
 function _default(topo) {
   return {
     // 定义 model 的初始 state
@@ -124,7 +130,7 @@ function _default(topo) {
                               }) < 0) {
                                 var newArr = [].concat(doc[rid]);
                                 newArr.push(item);
-                                doc[rid] = newArr.sort(_topoData.sortList);
+                                doc[rid] = newArr.sort(sortList);
                               }
                             } else {
                               doc[rid] = [item];
@@ -155,7 +161,7 @@ function _default(topo) {
                                   status: old.status
                                 }));
 
-                                doc[rid] = _newArr.sort(_topoData.sortList);
+                                doc[rid] = _newArr.sort(sortList);
 
                                 _rlog["default"].debug("告警级别变更", doc[rid], item);
                               } else {