修改拓扑图节点名称

src/main/java/com/yingxin/prms/dto/TcpFlowNodeDto.java

@@ -28,6 +28,49 @@ public class TcpFlowNodeDto {
     private int faultCount;   //错误数
     private String url;  //服务路径
 
+    private Boolean isGroup;
+    private String group;
+
+    public TcpFlowNodeDto() {
+    }
+
+    public TcpFlowNodeDto(String key, String category, String description, String descriptionCss, String pos,
+                          String text, String serverName, String imgsrc, String caption,
+                          int tcpTransactionTotalCount, int errorTcpTransactionTotalCount,
+                          int faultCount, String url, Boolean isGroup, String group) {
+        this.key = key;
+        this.category = category;
+        this.description = description;
+        this.descriptionCss = descriptionCss;
+        this.pos = pos;
+        this.text = text;
+        this.serverName = serverName;
+        this.imgsrc = imgsrc;
+        this.caption = caption;
+        this.tcpTransactionTotalCount = tcpTransactionTotalCount;
+        this.errorTcpTransactionTotalCount = errorTcpTransactionTotalCount;
+        this.faultCount = faultCount;
+        this.url = url;
+        this.isGroup = isGroup;
+        this.group = group;
+    }
+
+    public Boolean getIsGroup() {
+        return isGroup;
+    }
+
+    public void setIsGroup(Boolean isGroup) {
+        this.isGroup = isGroup;
+    }
+
+    public String getGroup() {
+        return group;
+    }
+
+    public void setGroup(String group) {
+        this.group = group;
+    }
+
     public String getUrl() {
         return url;
     }

src/main/java/com/yingxin/prms/service/business/Manager.java

 package com.yingxin.prms.service.business;
 
 import com.yingxin.prms.config.ServiceNameConfig;
+import com.yingxin.prms.config.ServiceRelationConfig;
 import com.yingxin.prms.config.filter.TokenInterceptor;
 import com.yingxin.prms.domain.*;
 import com.yingxin.prms.dto.*;
@@ -33,6 +34,8 @@ public class Manager {
 
     @Autowired
     ServiceNameConfig serviceNameConfig;
+    @Autowired
+    ServiceRelationConfig srConfig;
 
     @Value("${ascynTaskThreadPool.clusterStatusPoolSize}")
     private int THREADPOOLSIZE;
@@ -544,13 +547,99 @@ public class Manager {
 //        }
         List<TcpFlowNodeDto> tcpFlowNodeDtos = initNodeDtos(nodeDtos);
         List<TcpFlowLineDto> tcpFlowLineDtos = initLineDtos(lineDtos);
-
+        initGroup(tcpFlowNodeDtos);
         result.put("nodeDataArray", tcpFlowNodeDtos);
         result.put("linkDataArray", tcpFlowLineDtos);
 
        return result;
     }
 
+    /**
+     * 格式化点返回对象，配置isGroup与group属性，并添加六个分区
+     * @param nodeDtos
+     * @return
+     */
+    private List<TcpFlowNodeDto> initGroup(List<TcpFlowNodeDto> nodeDtos){
+        Boolean b = null;
+        String areaName = "";
+        Boolean jrq = false;
+        Boolean qxgl = false;
+        Boolean jrgl = false;
+        Boolean hxywq = false;
+        Boolean sfq = false;
+        Boolean rzhj = false;
+        for (TcpFlowNodeDto tcpFlowNodeDto:nodeDtos){
+            if (tcpFlowNodeDto.getServerName().equals("接入区")){
+                jrq = true;
+            }else if (tcpFlowNodeDto.getServerName().equals("核心业务区")){
+                hxywq = true;
+            }else if (tcpFlowNodeDto.getServerName().equals("算法区")){
+                sfq = true;
+            }else if (tcpFlowNodeDto.getServerName().equals("日志汇聚")){
+                rzhj = true;
+            }else if (tcpFlowNodeDto.getServerName().equals("权限管理")){
+                qxgl = true;
+            }else if (tcpFlowNodeDto.getServerName().equals("接入管理")){
+                jrgl = true;
+            }
+
+            b = srConfig.getAllArea().containsKey(tcpFlowNodeDto.getServerName()) ? true : false;
+            areaName = srConfig.getAreaName(tcpFlowNodeDto.getServerName());
+            tcpFlowNodeDto.setIsGroup(b);
+            tcpFlowNodeDto.setGroup(areaName);
+        }
+        TcpFlowNodeDto nodeDto = new TcpFlowNodeDto();
+        //没有接入区添加区域配置
+        if (!jrq){
+            nodeDto = new TcpFlowNodeDto("接入区",nodeDtos.get(0).getCategory(),nodeDtos.get(0).getDescription(),nodeDtos.get(0).getDescriptionCss(),
+                    nodeDtos.get(0).getPos(),"接入区","接入区",nodeDtos.get(0).getImgsrc(),nodeDtos.get(0).getCaption(),
+                    nodeDtos.get(0).getTcpTransactionTotalCount(),nodeDtos.get(0).getErrorTcpTransactionTotalCount(),nodeDtos.get(0).getFaultCount(),
+                    nodeDtos.get(0).getUrl(),true,"div-total");
+            nodeDtos.add(nodeDto);
+        }
+        //没有核心业务区添加区域配置
+        if (!hxywq){
+            nodeDto = new TcpFlowNodeDto("核心业务区",nodeDtos.get(0).getCategory(),nodeDtos.get(0).getDescription(),nodeDtos.get(0).getDescriptionCss(),
+                    nodeDtos.get(0).getPos(),"核心业务区","核心业务区",nodeDtos.get(0).getImgsrc(),nodeDtos.get(0).getCaption(),
+                    nodeDtos.get(0).getTcpTransactionTotalCount(),nodeDtos.get(0).getErrorTcpTransactionTotalCount(),nodeDtos.get(0).getFaultCount(),
+                    nodeDtos.get(0).getUrl(),true,"div-total");
+            nodeDtos.add(nodeDto);
+        }
+        //没有算法区添加区域配置
+        if (!sfq){
+            nodeDto = new TcpFlowNodeDto("算法区",nodeDtos.get(0).getCategory(),nodeDtos.get(0).getDescription(),nodeDtos.get(0).getDescriptionCss(),
+                    nodeDtos.get(0).getPos(),"算法区","算法区",nodeDtos.get(0).getImgsrc(),nodeDtos.get(0).getCaption(),
+                    nodeDtos.get(0).getTcpTransactionTotalCount(),nodeDtos.get(0).getErrorTcpTransactionTotalCount(),nodeDtos.get(0).getFaultCount(),
+                    nodeDtos.get(0).getUrl(),true,"div-total");
+            nodeDtos.add(nodeDto);
+        }
+        //没有日志汇聚添加区域配置
+        if (!rzhj){
+            nodeDto = new TcpFlowNodeDto("日志汇聚",nodeDtos.get(0).getCategory(),nodeDtos.get(0).getDescription(),nodeDtos.get(0).getDescriptionCss(),
+                    nodeDtos.get(0).getPos(),"日志汇聚","日志汇聚",nodeDtos.get(0).getImgsrc(),nodeDtos.get(0).getCaption(),
+                    nodeDtos.get(0).getTcpTransactionTotalCount(),nodeDtos.get(0).getErrorTcpTransactionTotalCount(),nodeDtos.get(0).getFaultCount(),
+                    nodeDtos.get(0).getUrl(),true,"div-total");
+            nodeDtos.add(nodeDto);
+        }
+        //没有权限管理添加区域配置
+        if (!qxgl){
+            nodeDto = new TcpFlowNodeDto("权限管理",nodeDtos.get(0).getCategory(),nodeDtos.get(0).getDescription(),nodeDtos.get(0).getDescriptionCss(),
+                    nodeDtos.get(0).getPos(),"权限管理","权限管理",nodeDtos.get(0).getImgsrc(),nodeDtos.get(0).getCaption(),
+                    nodeDtos.get(0).getTcpTransactionTotalCount(),nodeDtos.get(0).getErrorTcpTransactionTotalCount(),nodeDtos.get(0).getFaultCount(),
+                    nodeDtos.get(0).getUrl(),true,"接入区");
+            nodeDtos.add(nodeDto);
+        }
+        //没有接入管理添加区域配置
+        if (!jrgl){
+            nodeDto = new TcpFlowNodeDto("接入管理",nodeDtos.get(0).getCategory(),nodeDtos.get(0).getDescription(),nodeDtos.get(0).getDescriptionCss(),
+                    nodeDtos.get(0).getPos(),"接入管理","接入管理",nodeDtos.get(0).getImgsrc(),nodeDtos.get(0).getCaption(),
+                    nodeDtos.get(0).getTcpTransactionTotalCount(),nodeDtos.get(0).getErrorTcpTransactionTotalCount(),nodeDtos.get(0).getFaultCount(),
+                    nodeDtos.get(0).getUrl(),true,"接入区");
+            nodeDtos.add(nodeDto);
+        }
+        return nodeDtos;
+    }
+
     /**
      * //去掉点集合中：照片比对（1对1）、身份核查（人证）、OCR识别引擎、虹膜识别引擎数据
      * @param nodeDtos

src/main/resources/static/index.html

-<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><title>可靠性监控</title><link href=/css/app.3ffe9405db7dd47eeefe18c6235b5ecd.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=/js/manifest.1766e3c7586055624ca0.js></script><script type=text/javascript src=/js/vendor.26cf44d5f3ca6bde9d6b.js></script><script type=text/javascript src=/js/app.c55ae098c3bbf2fd7622.js></script></body></html>
\ No newline at end of file
+<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><title>可靠性监控</title><link href=/css/app.f2cfedaa3ccf92a80104283309eabbfb.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=/js/manifest.1766e3c7586055624ca0.js></script><script type=text/javascript src=/js/vendor.26cf44d5f3ca6bde9d6b.js></script><script type=text/javascript src=/js/app.a80db923b264d7bef464.js></script></body></html>
\ No newline at end of file

src/main/resources/static/js/manifest.1766e3c7586055624ca0.js.map

-{"version":3,"sources":["webpack:///webpack/bootstrap 6f4b7a14831af4d80d92"],"names":["parentJsonpFunction","window","chunkIds","moreModules","executeModules","moduleId","chunkId","result","i","resolves","length","installedChunks","push","Object","prototype","hasOwnProperty","call","modules","shift","__webpack_require__","s","installedModules","2","exports","module","l","m","c","d","name","getter","o","defineProperty","configurable","enumerable","get","n","__esModule","object","property","p","oe","err","console","error"],"mappings":"aACA,IAAAA,EAAAC,OAAA,aACAA,OAAA,sBAAAC,EAAAC,EAAAC,GAIA,IADA,IAAAC,EAAAC,EAAAC,EAAAC,EAAA,EAAAC,KACQD,EAAAN,EAAAQ,OAAoBF,IAC5BF,EAAAJ,EAAAM,GACAG,EAAAL,IACAG,EAAAG,KAAAD,EAAAL,GAAA,IAEAK,EAAAL,GAAA,EAEA,IAAAD,KAAAF,EACAU,OAAAC,UAAAC,eAAAC,KAAAb,EAAAE,KACAY,EAAAZ,GAAAF,EAAAE,IAIA,IADAL,KAAAE,EAAAC,EAAAC,GACAK,EAAAC,QACAD,EAAAS,OAAAT,GAEA,GAAAL,EACA,IAAAI,EAAA,EAAYA,EAAAJ,EAAAM,OAA2BF,IACvCD,EAAAY,IAAAC,EAAAhB,EAAAI,IAGA,OAAAD,GAIA,IAAAc,KAGAV,GACAW,EAAA,GAIA,SAAAH,EAAAd,GAGA,GAAAgB,EAAAhB,GACA,OAAAgB,EAAAhB,GAAAkB,QAGA,IAAAC,EAAAH,EAAAhB,IACAG,EAAAH,EACAoB,GAAA,EACAF,YAUA,OANAN,EAAAZ,GAAAW,KAAAQ,EAAAD,QAAAC,IAAAD,QAAAJ,GAGAK,EAAAC,GAAA,EAGAD,EAAAD,QAKAJ,EAAAO,EAAAT,EAGAE,EAAAQ,EAAAN,EAGAF,EAAAS,EAAA,SAAAL,EAAAM,EAAAC,GACAX,EAAAY,EAAAR,EAAAM,IACAhB,OAAAmB,eAAAT,EAAAM,GACAI,cAAA,EACAC,YAAA,EACAC,IAAAL,KAMAX,EAAAiB,EAAA,SAAAZ,GACA,IAAAM,EAAAN,KAAAa,WACA,WAA2B,OAAAb,EAAA,SAC3B,WAAiC,OAAAA,GAEjC,OADAL,EAAAS,EAAAE,EAAA,IAAAA,GACAA,GAIAX,EAAAY,EAAA,SAAAO,EAAAC,GAAsD,OAAA1B,OAAAC,UAAAC,eAAAC,KAAAsB,EAAAC,IAGtDpB,EAAAqB,EAAA,IAGArB,EAAAsB,GAAA,SAAAC,GAA8D,MAApBC,QAAAC,MAAAF,GAAoBA","file":"js/manifest.1766e3c7586055624ca0.js","sourcesContent":[" \t// install a JSONP callback for chunk loading\n \tvar parentJsonpFunction = window[\"webpackJsonp\"];\n \twindow[\"webpackJsonp\"] = function webpackJsonpCallback(chunkIds, moreModules, executeModules) {\n \t\t// add \"moreModules\" to the modules object,\n \t\t// then flag all \"chunkIds\" as loaded and fire callback\n \t\tvar moduleId, chunkId, i = 0, resolves = [], result;\n \t\tfor(;i < chunkIds.length; i++) {\n \t\t\tchunkId = chunkIds[i];\n \t\t\tif(installedChunks[chunkId]) {\n \t\t\t\tresolves.push(installedChunks[chunkId][0]);\n \t\t\t}\n \t\t\tinstalledChunks[chunkId] = 0;\n \t\t}\n \t\tfor(moduleId in moreModules) {\n \t\t\tif(Object.prototype.hasOwnProperty.call(moreModules, moduleId)) {\n \t\t\t\tmodules[moduleId] = moreModules[moduleId];\n \t\t\t}\n \t\t}\n \t\tif(parentJsonpFunction) parentJsonpFunction(chunkIds, moreModules, executeModules);\n \t\twhile(resolves.length) {\n \t\t\tresolves.shift()();\n \t\t}\n \t\tif(executeModules) {\n \t\t\tfor(i=0; i < executeModules.length; i++) {\n \t\t\t\tresult = __webpack_require__(__webpack_require__.s = executeModules[i]);\n \t\t\t}\n \t\t}\n \t\treturn result;\n \t};\n\n \t// The module cache\n \tvar installedModules = {};\n\n \t// objects to store loaded and loading chunks\n \tvar installedChunks = {\n \t\t2: 0\n \t};\n\n \t// The require function\n \tfunction __webpack_require__(moduleId) {\n\n \t\t// Check if module is in cache\n \t\tif(installedModules[moduleId]) {\n \t\t\treturn installedModules[moduleId].exports;\n \t\t}\n \t\t// Create a new module (and put it into the cache)\n \t\tvar module = installedModules[moduleId] = {\n \t\t\ti: moduleId,\n \t\t\tl: false,\n \t\t\texports: {}\n \t\t};\n\n \t\t// Execute the module function\n \t\tmodules[moduleId].call(module.exports, module, module.exports, __webpack_require__);\n\n \t\t// Flag the module as loaded\n \t\tmodule.l = true;\n\n \t\t// Return the exports of the module\n \t\treturn module.exports;\n \t}\n\n\n \t// expose the modules object (__webpack_modules__)\n \t__webpack_require__.m = modules;\n\n \t// expose the module cache\n \t__webpack_require__.c = installedModules;\n\n \t// define getter function for harmony exports\n \t__webpack_require__.d = function(exports, name, getter) {\n \t\tif(!__webpack_require__.o(exports, name)) {\n \t\t\tObject.defineProperty(exports, name, {\n \t\t\t\tconfigurable: false,\n \t\t\t\tenumerable: true,\n \t\t\t\tget: getter\n \t\t\t});\n \t\t}\n \t};\n\n \t// getDefaultExport function for compatibility with non-harmony modules\n \t__webpack_require__.n = function(module) {\n \t\tvar getter = module && module.__esModule ?\n \t\t\tfunction getDefault() { return module['default']; } :\n \t\t\tfunction getModuleExports() { return module; };\n \t\t__webpack_require__.d(getter, 'a', getter);\n \t\treturn getter;\n \t};\n\n \t// Object.prototype.hasOwnProperty.call\n \t__webpack_require__.o = function(object, property) { return Object.prototype.hasOwnProperty.call(object, property); };\n\n \t// __webpack_public_path__\n \t__webpack_require__.p = \"/\";\n\n \t// on error function for async loading\n \t__webpack_require__.oe = function(err) { console.error(err); throw err; };\n\n\n\n// WEBPACK FOOTER //\n// webpack/bootstrap 6f4b7a14831af4d80d92"],"sourceRoot":""}
\ No newline at end of file
+{"version":3,"sources":["webpack:///webpack/bootstrap 6a42b11593a984adc558"],"names":["parentJsonpFunction","window","chunkIds","moreModules","executeModules","moduleId","chunkId","result","i","resolves","length","installedChunks","push","Object","prototype","hasOwnProperty","call","modules","shift","__webpack_require__","s","installedModules","2","exports","module","l","m","c","d","name","getter","o","defineProperty","configurable","enumerable","get","n","__esModule","object","property","p","oe","err","console","error"],"mappings":"aACA,IAAAA,EAAAC,OAAA,aACAA,OAAA,sBAAAC,EAAAC,EAAAC,GAIA,IADA,IAAAC,EAAAC,EAAAC,EAAAC,EAAA,EAAAC,KACQD,EAAAN,EAAAQ,OAAoBF,IAC5BF,EAAAJ,EAAAM,GACAG,EAAAL,IACAG,EAAAG,KAAAD,EAAAL,GAAA,IAEAK,EAAAL,GAAA,EAEA,IAAAD,KAAAF,EACAU,OAAAC,UAAAC,eAAAC,KAAAb,EAAAE,KACAY,EAAAZ,GAAAF,EAAAE,IAIA,IADAL,KAAAE,EAAAC,EAAAC,GACAK,EAAAC,QACAD,EAAAS,OAAAT,GAEA,GAAAL,EACA,IAAAI,EAAA,EAAYA,EAAAJ,EAAAM,OAA2BF,IACvCD,EAAAY,IAAAC,EAAAhB,EAAAI,IAGA,OAAAD,GAIA,IAAAc,KAGAV,GACAW,EAAA,GAIA,SAAAH,EAAAd,GAGA,GAAAgB,EAAAhB,GACA,OAAAgB,EAAAhB,GAAAkB,QAGA,IAAAC,EAAAH,EAAAhB,IACAG,EAAAH,EACAoB,GAAA,EACAF,YAUA,OANAN,EAAAZ,GAAAW,KAAAQ,EAAAD,QAAAC,IAAAD,QAAAJ,GAGAK,EAAAC,GAAA,EAGAD,EAAAD,QAKAJ,EAAAO,EAAAT,EAGAE,EAAAQ,EAAAN,EAGAF,EAAAS,EAAA,SAAAL,EAAAM,EAAAC,GACAX,EAAAY,EAAAR,EAAAM,IACAhB,OAAAmB,eAAAT,EAAAM,GACAI,cAAA,EACAC,YAAA,EACAC,IAAAL,KAMAX,EAAAiB,EAAA,SAAAZ,GACA,IAAAM,EAAAN,KAAAa,WACA,WAA2B,OAAAb,EAAA,SAC3B,WAAiC,OAAAA,GAEjC,OADAL,EAAAS,EAAAE,EAAA,IAAAA,GACAA,GAIAX,EAAAY,EAAA,SAAAO,EAAAC,GAAsD,OAAA1B,OAAAC,UAAAC,eAAAC,KAAAsB,EAAAC,IAGtDpB,EAAAqB,EAAA,IAGArB,EAAAsB,GAAA,SAAAC,GAA8D,MAApBC,QAAAC,MAAAF,GAAoBA","file":"js/manifest.1766e3c7586055624ca0.js","sourcesContent":[" \t// install a JSONP callback for chunk loading\n \tvar parentJsonpFunction = window[\"webpackJsonp\"];\n \twindow[\"webpackJsonp\"] = function webpackJsonpCallback(chunkIds, moreModules, executeModules) {\n \t\t// add \"moreModules\" to the modules object,\n \t\t// then flag all \"chunkIds\" as loaded and fire callback\n \t\tvar moduleId, chunkId, i = 0, resolves = [], result;\n \t\tfor(;i < chunkIds.length; i++) {\n \t\t\tchunkId = chunkIds[i];\n \t\t\tif(installedChunks[chunkId]) {\n \t\t\t\tresolves.push(installedChunks[chunkId][0]);\n \t\t\t}\n \t\t\tinstalledChunks[chunkId] = 0;\n \t\t}\n \t\tfor(moduleId in moreModules) {\n \t\t\tif(Object.prototype.hasOwnProperty.call(moreModules, moduleId)) {\n \t\t\t\tmodules[moduleId] = moreModules[moduleId];\n \t\t\t}\n \t\t}\n \t\tif(parentJsonpFunction) parentJsonpFunction(chunkIds, moreModules, executeModules);\n \t\twhile(resolves.length) {\n \t\t\tresolves.shift()();\n \t\t}\n \t\tif(executeModules) {\n \t\t\tfor(i=0; i < executeModules.length; i++) {\n \t\t\t\tresult = __webpack_require__(__webpack_require__.s = executeModules[i]);\n \t\t\t}\n \t\t}\n \t\treturn result;\n \t};\n\n \t// The module cache\n \tvar installedModules = {};\n\n \t// objects to store loaded and loading chunks\n \tvar installedChunks = {\n \t\t2: 0\n \t};\n\n \t// The require function\n \tfunction __webpack_require__(moduleId) {\n\n \t\t// Check if module is in cache\n \t\tif(installedModules[moduleId]) {\n \t\t\treturn installedModules[moduleId].exports;\n \t\t}\n \t\t// Create a new module (and put it into the cache)\n \t\tvar module = installedModules[moduleId] = {\n \t\t\ti: moduleId,\n \t\t\tl: false,\n \t\t\texports: {}\n \t\t};\n\n \t\t// Execute the module function\n \t\tmodules[moduleId].call(module.exports, module, module.exports, __webpack_require__);\n\n \t\t// Flag the module as loaded\n \t\tmodule.l = true;\n\n \t\t// Return the exports of the module\n \t\treturn module.exports;\n \t}\n\n\n \t// expose the modules object (__webpack_modules__)\n \t__webpack_require__.m = modules;\n\n \t// expose the module cache\n \t__webpack_require__.c = installedModules;\n\n \t// define getter function for harmony exports\n \t__webpack_require__.d = function(exports, name, getter) {\n \t\tif(!__webpack_require__.o(exports, name)) {\n \t\t\tObject.defineProperty(exports, name, {\n \t\t\t\tconfigurable: false,\n \t\t\t\tenumerable: true,\n \t\t\t\tget: getter\n \t\t\t});\n \t\t}\n \t};\n\n \t// getDefaultExport function for compatibility with non-harmony modules\n \t__webpack_require__.n = function(module) {\n \t\tvar getter = module && module.__esModule ?\n \t\t\tfunction getDefault() { return module['default']; } :\n \t\t\tfunction getModuleExports() { return module; };\n \t\t__webpack_require__.d(getter, 'a', getter);\n \t\treturn getter;\n \t};\n\n \t// Object.prototype.hasOwnProperty.call\n \t__webpack_require__.o = function(object, property) { return Object.prototype.hasOwnProperty.call(object, property); };\n\n \t// __webpack_public_path__\n \t__webpack_require__.p = \"/\";\n\n \t// on error function for async loading\n \t__webpack_require__.oe = function(err) { console.error(err); throw err; };\n\n\n\n// WEBPACK FOOTER //\n// webpack/bootstrap 6a42b11593a984adc558"],"sourceRoot":""}
\ No newline at end of file