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

package/lib/core/viewer/components/plugins/ResourceDetail/components/ResourceOverview/ResourceOverviewMetric.js

@@ -78,7 +78,8 @@ function ResourceOverviewMetric(props) {
   var topo = props.topo,
       type = props.type,
       data = props.data,
-      loading = props.loading;
+      loading = props.loading,
+      formatMetricLatestValue = props.formatMetricLatestValue;
 
   function formatValue(itemData) {
     var _list;
@@ -87,7 +88,8 @@ function ResourceOverviewMetric(props) {
         metricItem = itemData.metricItem,
         list = itemData.list;
     var format = (0, _utils.metricValueFormat)({
-      value: (_list = list[list.length - 1]) === null || _list === void 0 ? void 0 : _list.metricValue,
+      // 支持业务拓扑历史时间点指标值处理
+      value: formatMetricLatestValue ? formatMetricLatestValue(list) : (_list = list[list.length - 1]) === null || _list === void 0 ? void 0 : _list.metricValue,
       dataType: metricItem.dataType,
       dict: topo.dictCache.getDictObject(),
       unit: metricItem.unit,

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

@@ -37,7 +37,7 @@ function useMetricPolling(_ref) {
 
 
   var queryLinkMetricsRequest = (0, _ahooks.useRequest)(_services.queryLinkLatestMetrics, {
-    pollingInterval: 1000 * 15,
+    pollingInterval: 60 * 1000,
     pollingWhenHidden: false,
     debounceInterval: 200,
     manual: true,
@@ -48,7 +48,7 @@ function useMetricPolling(_ref) {
     }
   });
   var queryInterfaceMetricsRequest = (0, _ahooks.useRequest)(_services.queryLinkInterfacesLatestMetrics, {
-    pollingInterval: 1000 * 15,
+    pollingInterval: 60 * 1000,
     pollingWhenHidden: false,
     debounceInterval: 200,
     manual: true,

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

@@ -0,0 +1,184 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
+exports.__esModule = true;
+exports["default"] = void 0;
+
+var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
+
+var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
+
+var _ahooks = require("ahooks");
+
+var _react = require("react");
+
+var _alarm = _interopRequireDefault(require("../../../../../../../services/alarm"));
+
+var _overview = _interopRequireDefault(require("../../../../../../../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 = (0, _react.useState)([]),
+      alarmRiskList = _useState[0],
+      setAlarmRiskList = _useState[1]; // 获取告警/风险信息
+
+
+  function getAlarmRiskData(_x) {
+    return _getAlarmRiskData.apply(this, arguments);
+  } // 轮询hooks
+
+
+  function _getAlarmRiskData() {
+    _getAlarmRiskData = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee(id) {
+      var _alarmList, _yield$resourceOvervi, alarmList, _yield$alarmService$g, _alarmList2, AllComponentsByCiId, _yield$service$getRis, riskList;
+
+      return _regenerator["default"].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 _alarm["default"].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 _overview["default"].queryAllComponentsByCiId(id);
+
+            case 17:
+              AllComponentsByCiId = _context.sent;
+              _context.next = 20;
+              return _overview["default"].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 = (0, _ahooks.useRequest)(getAlarmRiskData, {
+    pollingInterval: 1000 * 15,
+    pollingWhenHidden: false,
+    // debounceInterval: 200,
+    manual: true,
+    onSuccess: function onSuccess() {}
+  });
+  (0, _react.useEffect)(function () {
+    setAlarmRiskList([]);
+    request.run(id);
+    return function () {
+      request.cancel();
+    };
+  }, [id]);
+  return {
+    alarmRiskList: alarmRiskList,
+    refreshAlarmData: function refreshAlarmData() {
+      request.run();
+    }
+  };
+};
+
+var _default = useAlarmAndRiskData;
+exports["default"] = _default;

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

@@ -103,9 +103,9 @@ var useMetricModels = function useMetricModels(props) {
   }
 
   var request = (0, _ahooks.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/lib/networkTopo/services/link.js

@@ -165,7 +165,7 @@ var _default = {
    */
   queryAssociatedlinks: function queryAssociatedlinks(ids, type) {
     return (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee5() {
-      var stag, ttag, condition, parm, jsonParm, result;
+      var stag, ttag, condition, parm, result;
       return _regenerator["default"].wrap(function _callee5$(_context5) {
         while (1) {
           switch (_context5.prev = _context5.next) {
@@ -184,29 +184,28 @@ var _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 _componentTopologyUtils.request.post("/mdc/v1/api/cmdb/commonQueryCiData", jsonParm);
+              _context5.prev = 5;
+              _context5.next = 8;
+              return _componentTopologyUtils.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["default"].error("查询可关联链路", _context5.t0);
 
-            case 16:
+            case 15:
             case "end":
               return _context5.stop();
           }
         }
-      }, _callee5, null, [[6, 13]]);
+      }, _callee5, null, [[5, 12]]);
     }))();
   }
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@riil-frontend/component-topology",
-  "version": "8.0.0-a.8",
+  "version": "8.0.1",
   "description": "拓扑",
   "scripts": {
     "start": "build-scripts start",
@@ -116,6 +116,6 @@
     "access": "public"
   },
   "license": "MIT",
-  "homepage": "https://unpkg.com/@riil-frontend/component-topology@8.0.0-a.8/build/index.html",
+  "homepage": "https://unpkg.com/@riil-frontend/component-topology@8.0.1/build/index.html",
   "gitHead": "2da19ffccbb7ca60a8acf396e39f542c68bb33f5"
 }