Commit 41b20d37 authored by shaochangbin's avatar shaochangbin

拓扑图没有保存按键版本

parent 23f8330d
......@@ -36,16 +36,16 @@ public class ServiceNameConfig {
snus.add(new ServiceNameUpdate("核心业务区","核心业务区"));
snus.add(new ServiceNameUpdate("身份核查(两张图片)","照片比对(1对1)"));
snus.add(new ServiceNameUpdate("身份核查(身份证号+人脸)","身份核查(人证)"));
snus.add(new ServiceNameUpdate("以图查人(基础库)","实时人员身份识别"));
snus.add(new ServiceNameUpdate("以图查人(基础库)","实时身份识别"));
snus.add(new ServiceNameUpdate("M:N","聚档人员实名化"));
snus.add(new ServiceNameUpdate("以图查人(特殊人员库)","以图查人-专题库"));
snus.add(new ServiceNameUpdate("以图查人(特殊人员库)","其他业务"));
snus.add(new ServiceNameUpdate("算法区","算法区"));
snus.add(new ServiceNameUpdate("算法融合调度","算法融合调度"));
snus.add(new ServiceNameUpdate("1比1比对(特征+特征)","人脸识别引擎1"));
snus.add(new ServiceNameUpdate("1比1比对(图片+图片)","人脸识别引擎2"));
snus.add(new ServiceNameUpdate("1比N比对(图片)","人脸识别引擎3"));
snus.add(new ServiceNameUpdate("图片生成特征值","图像质量评估引擎"));
snus.add(new ServiceNameUpdate("1比1比对(图片+特征)","指纹识别引擎"));
snus.add(new ServiceNameUpdate("1比1比对(图片+特征)","其他引擎"));
snus.add(new ServiceNameUpdate("M比N","虹膜识别引擎"));
snus.add(new ServiceNameUpdate("1比N比对(特征)","OCR识别引擎"));
snus.add(new ServiceNameUpdate("消息队列","算法融合调度"));
......@@ -74,16 +74,16 @@ public class ServiceNameConfig {
serviceName.put("核心业务区","核心业务区");
serviceName.put("身份核查(两张图片)","照片比对(1对1)");
serviceName.put("身份核查(身份证号+人脸)","身份核查(人证)");
serviceName.put("以图查人(基础库)","实时人员身份识别");
serviceName.put("以图查人(基础库)","实时身份识别");
serviceName.put("M:N","聚档人员实名化");
serviceName.put("以图查人(特殊人员库)","以图查人-专题库");
serviceName.put("以图查人(特殊人员库)","其他业务");
serviceName.put("算法区","算法区");
serviceName.put("算法融合调度","算法融合调度");
serviceName.put("1比1比对(特征+特征)","人脸识别引擎1");
serviceName.put("1比1比对(图片+图片)","人脸识别引擎2");
serviceName.put("1比N比对(图片)","人脸识别引擎3");
serviceName.put("图片生成特征值","图像质量评估引擎");
serviceName.put("1比1比对(图片+特征)","指纹识别引擎");
serviceName.put("1比1比对(图片+特征)","其他引擎");
serviceName.put("M比N","虹膜识别引擎");
serviceName.put("1比N比对(特征)","OCR识别引擎");
serviceName.put("消息队列","算法融合调度");
......@@ -107,9 +107,9 @@ public class ServiceNameConfig {
// serviceName.put("核心业务区","核心业务区");
// serviceName.put("身份核查(两张图片)","照片比对(1对1)");
// serviceName.put("身份核查(身份证号+人脸)","身份核查(人证)");
// serviceName.put("以图查人(基础库)","实时人员身份识别");
// serviceName.put("以图查人(基础库)","实时身份识别");
// serviceName.put("M:N","聚档人员实名化");
// serviceName.put("以图查人(特殊人员库)","以图查人-专题库");
// serviceName.put("以图查人(特殊人员库)","其他业务");
// serviceName.put("算法区","算法区");
// serviceName.put("算法融合调度","算法融合调度");
// serviceName.put("1比1比对(特征+特征)","人脸识别引擎1");
......
......@@ -542,13 +542,55 @@ public class Manager {
// lineDtos.get(j).setTo(serviceNameConfig.getServiceName().get(lineDtos.get(j).getTo()));
// }
// }
List<TcpFlowNodeDto> tcpFlowNodeDtos = initNodeDtos(nodeDtos);
List<TcpFlowLineDto> tcpFlowLineDtos = initLineDtos(lineDtos);
result.put("nodeDataArray", nodeDtos);
result.put("linkDataArray", lineDtos);
result.put("nodeDataArray", tcpFlowNodeDtos);
result.put("linkDataArray", tcpFlowLineDtos);
return result;
}
/**
* //去掉点集合中:照片比对(1对1)、身份核查(人证)、OCR识别引擎、虹膜识别引擎数据
* @param nodeDtos
* @return
*/
private List<TcpFlowNodeDto> initNodeDtos(List<TcpFlowNodeDto> nodeDtos) {
TcpFlowNodeDto next = null;
Iterator<TcpFlowNodeDto> iteratorNode = nodeDtos.iterator();
while (iteratorNode.hasNext()) {
next = iteratorNode.next();
if (next.getServerName().equals("虹膜识别引擎") || next.getServerName().equals("OCR识别引擎")
|| next.getServerName().equals("身份核查(人证)") || next.getServerName().equals("照片比对(1对1)")){
iteratorNode.remove();
}
}
return nodeDtos;
}
/**
* //去掉线集合中:照片比对(1对1)、身份核查(人证)、OCR识别引擎、虹膜识别引擎数据
* @param lineDtos
* @return
*/
private List<TcpFlowLineDto> initLineDtos(List<TcpFlowLineDto> lineDtos) {
TcpFlowLineDto next = null;
Iterator<TcpFlowLineDto> iteratorLine = lineDtos.iterator();
while(iteratorLine.hasNext()) {
next = iteratorLine.next();
if (next.getFrom().equals("虹膜识别引擎") || next.getFrom().equals("OCR识别引擎")
|| next.getFrom().equals("身份核查(人证)") || next.getFrom().equals("照片比对(1对1)")
|| next.getTo().equals("虹膜识别引擎") || next.getTo().equals("OCR识别引擎")
|| next.getTo().equals("身份核查(人证)") || next.getTo().equals("照片比对(1对1)")){
iteratorLine.remove();
}
}
return lineDtos;
}
private long getFaultCount(String servicePath) throws IOException, DataFormatException {
Aggregator aggregatorDay = AggregatorFactory.createSumAggregator(1, org.kairosdb.client.builder.TimeUnit.DAYS).withStartTimeAlignment(0);
QueryBuilder queryBuilder = QueryBuilder.getInstance();
......@@ -804,38 +846,46 @@ public class Manager {
public static void main(String[] args) {
//测试修改map的key值
Map<String,String> total = new HashMap<>();
Map<String,String> error = new HashMap<>();
total.put("a","1");
total.put("b","2");
total.put("c","3");
error.put("a"+"msg","1");
error.put("b"+"msg","2");
error.put("c"+"msg","3");
System.out.println("############################");
for (String key : total.keySet()) {
System.out.println("Key = " + key);
}
System.out.println("############################");
System.out.println(total.toString());
System.out.println(error.toString());
total.put("d",total.remove("a"));
error.put("d"+"msg",error.remove("a"+"msg"));
System.out.println(total.toString());
System.out.println(error.toString());
// Map<String,String> total = new HashMap<>();
// Map<String,String> error = new HashMap<>();
// total.put("a","1");
// total.put("b","2");
// total.put("c","3");
// error.put("a"+"msg","1");
// error.put("b"+"msg","2");
// error.put("c"+"msg","3");
// System.out.println("############################");
//
// for (String key : total.keySet()) {
//
// System.out.println("Key = " + key);
//
// }
// System.out.println("############################");
// System.out.println(total.toString());
// System.out.println(error.toString());
// total.put("d",total.remove("a"));
// error.put("d"+"msg",error.remove("a"+"msg"));
// System.out.println(total.toString());
// System.out.println(error.toString());
//之前的测试内容
// List<String> m = new ArrayList<>();
// m.add("a");
// m.add("b");
// m.add("c");
// m.add("d");
// m.add("e");
// m.add("f");
// m = m.subList(1,4);
// System.out.println(m);
List<String> m = new ArrayList<>();
m.add("a");
m.add("b");
m.add("c");
m.add("d");
m.add("e");
m.add("f");
String next = "";
System.out.println(m.toString());
Iterator<String> iterator = m.iterator();
while (iterator.hasNext()) {
next = iterator.next();
if (next.equals("a") || next.equals("f")){
iterator.remove();
}
}
System.out.println(m);
//之前的测试内容
// cassandraDaoStatic.insertServerHostInfo();
// System.out.println("@@@@@@@@@@@@@@@@@@@@");
......
<!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.2ac41b26cc785b732842.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.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
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
{"version":3,"sources":["webpack:///webpack/bootstrap bf435c2949ed64949674"],"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 bf435c2949ed64949674"],"sourceRoot":""}
\ No newline at end of file
{"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
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment