From 05a4c18628bba5010c0ce423408cc5f40f864ee0 Mon Sep 17 00:00:00 2001
From: xyc <jc_xiong@hotmail.com>
Date: 星期六, 28 九月 2024 18:54:10 +0800
Subject: [PATCH] 修改可靠性评定后台
---
modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/service/ReliabilityAssessService.java | 296 ++++++++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 221 insertions(+), 75 deletions(-)
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/service/ReliabilityAssessService.java b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/service/ReliabilityAssessService.java
index b38efe2..ca7b3c9 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/service/ReliabilityAssessService.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/service/ReliabilityAssessService.java
@@ -152,7 +152,7 @@
for (ReliabilityAssess assess : list) {
Double result1 = null;
for (int i = 0; i < jsonArray.size(); i++) {
- String nameValue = (String) jsonArray.getJSONObject(i).get("name");
+ String nameValue = jsonArray.getJSONObject(i).get("name").toString();
if (nameValue.contains(assess.getId().toString())) {
// 鑾峰彇瀵瑰簲鐨勫��
result1 = (Double) jsonArray.getJSONObject(i).get("value");
@@ -176,37 +176,65 @@
private void assembleModelXml(AssessResult assessResult) {
/*
// 娴嬭瘯绠楁硶搴撶敤
- String xml = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" +
- "\n" +
- "<des name=\"General system\" gama=\"0.7\">\n" +
+ String xml = "<des name=\"General system\" gama=\"0.7\">\n" +
" <tasks>\n" +
" <task duration=\"1\" model=\"1819282257303678978\"/>\n" +
" </tasks>\n" +
" <models>\n" +
" <model name=\"1819282257303678978\">\n" +
- " <logic name=\"绯荤粺1\" type=\"series\" distType=\"ber\" NoE=\"10\" F=\"1\">\n" +
- " <logic name=\"鍒嗙郴缁�1\" type=\"series\" distType=\"exp\" ToE=\"68.0\" F=\"1\">\n" +
+ " <logic name=\"绯荤粺\" type=\"series\" >\n" +
+ " <logic name=\"鍒嗙郴缁�1\" type=\"series\" >\n" +
" <logic name=\"v1\" type=\"parallel\" nums=\"2\">\n" +
- " <node name=\"璁惧1\" distType=\"ber\" NoE=\"20\" F=\"1\"/>\n" +
+ " <node name=\"璁惧1\" distType=\"exp\" ToE=\"20\" F=\"1\"/>\n" +
" </logic>\n" +
- " <node name=\"璁惧2\" distType=\"exp\" ToE=\"62.0\" F=\"1\"/>\n" +
+ " <node name=\"璁惧2\" distType=\"exp\" ToE=\"0.3\" F=\"1\"/>\n" +
" </logic>\n" +
- " <logic name=\"鍒嗙郴缁�2\" type=\"series\" distType=\"ber\" NoE=\"14\" F=\"0\">\n" +
- " <node name=\"璁惧3\" distType=\"ber\" NoE=\"58\" F=\"0\"/>\n" +
+ " <logic name=\"鍒嗙郴缁�2\" type=\"series\" >\n" +
+ " <node name=\"璁惧3\" distType=\"exp\" ToE=\"0.2\" F=\"0\"/>\n" +
" <node name=\"璁惧4\" distType=\"ber\" NoE=\"18\" F=\"0\"/>\n" +
" <logic name=\"v2\" type=\"series\" nums=\"2\">\n" +
- " <node name=\"璁惧5\" distType=\"exp\" ToE=\"88.0\" F=\"1\"/>\n" +
+ " <node name=\"璁惧5\" distType=\"exp\" ToE=\"0.5,0,6\" F=\"1,2\"/>\n" +
" </logic> \n" +
- " <node name=\"璁惧6\" distType=\"ber\" NoE=\"71.52\" F=\"1\"/>\n" +
+ " <node name=\"璁惧6\" distType=\"exp\" ToE=\"0.3\" F=\"1\"/>\n" +
" </logic>\n" +
- " <logic name=\"鍒嗙郴缁�3\" type=\"vote\" distType=\"exp\" nums=\"3\" k=\"2\" ToE=\"68.0\" F=\"2\">\n" +
- " <node name=\"璁惧7\" distType=\"exp\" ToE=\"86\" F=\"1\"/>\n" +
+ " <logic name=\"鍒嗙郴缁�3\" type=\"vote\" nums=\"3\" k=\"2\" >\n" +
+ " <node name=\"璁惧7\" distType=\"exp\" ToE=\"87\" F=\"1\"/>\n" +
" </logic>\n" +
" </logic>\n" +
" </model>\n" +
" </models>\n" +
"</des>";
- assessResult.setXml(xml);
+ String xml1 = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" +
+ "\n" +
+ "<des name=\"General system\" gama=\"0.6\">\n" +
+ " <tasks>\n" +
+ " <task duration=\"1.0\" model=\"1839217232446533633\"/>\n" +
+ " </tasks>\n" +
+ " <models>\n" +
+ " <model name=\"1839217232446533633\">\n" +
+ " <logic name=\"1727338143768926498\" real_name=\"璇勫鐢ㄨ埞A\" type=\"series\">\n" +
+ " <logic name=\"1727338125295232953\" real_name=\"閫氫俊绯荤粺\" name_path=\"閫氫俊绯荤粺\" type=\"series\">\n" +
+ " <logic name=\"v1\" type=\"parallel\" nums=\"2\">\n" +
+ " <node name=\"1727338347041863487,1727338104458428136\" real_name=\"瀵硅鏈篭" name_path=\"閫氫俊绯荤粺,瀵硅鏈篵\" distType=\"ber\" NoE=\"0,10\" F=\"0,1\"/>\n" +
+ " </logic>\n" +
+ " <node name=\"1727338109884317860\" real_name=\"浜ゆ崲鏈篭" name_path=\"閫氫俊绯荤粺,浜ゆ崲鏈篭" distType=\"exp\" ToE=\"10\" F=\"1\"/>\n" +
+ " </logic>\n" +
+ " <logic name=\"1727338132480394459\" real_name=\"绌鸿皟绯荤粺\" name_path=\"绌鸿皟绯荤粺\" type=\"vote\" k=\"2\" nums=\"3\">\n" +
+ " <node name=\"1727338148414415252,1727338894880570868,1727338666019181419\" real_name=\"绌鸿皟\" name_path=\"绌鸿皟绯荤粺,绌鸿皟c\" distType=\"exp\" ToE=\"88,87,86\" F=\"8,7,6\"/>\n" +
+ " </logic>\n" +
+ " <logic name=\"1727338199831104683\" real_name=\"鐢靛姏绯荤粺\" name_path=\"鐢靛姏绯荤粺\" type=\"series\">\n" +
+ " <node name=\"1727338129701280729\" real_name=\"鍙戠數鏈�2\" name_path=\"鐢靛姏绯荤粺,鍙戠數鏈�2\" distType=\"ber\" NoE=\"20\" F=\"2\"/>\n" +
+ " <node name=\"1727338865212183133\" real_name=\"鍙戠數鏈�1\" name_path=\"鐢靛姏绯荤粺,鍙戠數鏈�1\" distType=\"exp\" ToE=\"20\" F=\"2\"/>\n" +
+ " <node name=\"1727338589328410328\" real_name=\"閰嶇數鏉縗" name_path=\"鐢靛姏绯荤粺,閰嶇數鏉縗" distType=\"exp\" ToE=\"50\" F=\"5\"/>\n" +
+ " <logic name=\"v3\" type=\"series\" nums=\"2\">\n" +
+ " <node name=\"1727338101737644187,1727338554151292452\" real_name=\"钃勭數姹燶" name_path=\"鐢靛姏绯荤粺,钃勭數姹燼\" distType=\"exp\" ToE=\"30,40\" F=\"3,4\"/>\n" +
+ " </logic>\n" +
+ " </logic>\n" +
+ " </logic>\n" +
+ " </model>\n" +
+ " </models>\n" +
+ "</des>";
+ assessResult.setXml(xml1);
*/
Long productId = assessResult.getProductId();
Long taskId = assessResult.getTaskId();
@@ -269,6 +297,8 @@
List<TaskPhaseModel> taskPhaseModelAll,
List<ReliabilityAssess> assessDataList,
Element root) {
+ Map<String, Integer> vCounter = new HashMap<>();
+ vCounter.put("v", 0);
Element modelsTag = root.addElement("models");
for (TaskPhaseModel taskPhaseModel : taskPhaseModelAll) {
Element modelTag = modelsTag.addElement("model");
@@ -302,7 +332,8 @@
null,
list,
null, null, null, null,
- modelTag);
+ modelTag,
+ vCounter);
}
}
@@ -326,19 +357,13 @@
String NoE,
String ToE,
String F,
- Element parent) {
+ Element parent,
+ Map<String, Integer> vCounter) {
if (sameNameGroup) {
// 鐩稿悓璁惧鐨勫垎缁�
- Element sameNameGroupTag = parent.addElement("logic");
- sameNameGroupTag.addAttribute("name",
- nodeList.stream().map(item -> item.getId().toString()).collect(Collectors.joining(",")));
- if ("parallel".equals(sameNameGroupAlgorithmType)) {
- sameNameGroupTag.addAttribute("type", "parallel");
- } else {
- sameNameGroupTag.addAttribute("type", "series");
- }
- sameNameGroupTag.addAttribute("nums", String.valueOf(nodeList.size()));
Long dataId = nodeList.get(0).getDataId();
+ XhProductModel product = productList.stream().filter(item ->
+ dataId.equals(item.getId())).collect(Collectors.toList()).get(0);
ParamData paramData = paramDataList.stream().filter(item ->
dataId.equals(item.getProductId())).collect(Collectors.toList()).get(0);
String NoEStr = "";
@@ -359,27 +384,33 @@
NoEStr = NoEStr.substring(1);
ToEStr = ToEStr.substring(1);
FStr = FStr.substring(1);
- for (ModelNode node : nodeList) {
- List<ModelNode> list = new ArrayList<>();
- list.add(node);
- node2DOM(taskId,
- taskPhaseModel,
- modelId,
- null,
- null,
- null,
- productList,
- paramDataList,
- gkModelsAssembled,
- algorithmList,
- modelNodeAndVnodeList,
- assessDataList,
- false,
- null,
- list,
- paramData.getReliabDistribType(), NoEStr, ToEStr, FStr,
- sameNameGroupTag);
+
+ int counter = vCounter.get("v");
+ counter++;
+ vCounter.put("v", counter);
+ Element sameNameGroupTag = parent.addElement("logic");
+ sameNameGroupTag.addAttribute("name",
+ "v"+counter);
+ if ("parallel".equals(sameNameGroupAlgorithmType)) {
+ sameNameGroupTag.addAttribute("type", "parallel");
+ } else {
+ sameNameGroupTag.addAttribute("type", "series");
}
+ sameNameGroupTag.addAttribute("nums", String.valueOf(nodeList.size()));
+ Element nodeTag = sameNameGroupTag.addElement("node");
+ nodeTag.addAttribute("name",
+ nodeList.stream().map(item -> item.getDataId().toString()).collect(Collectors.joining(",")));
+ nodeTag.addAttribute("real_name", product.getSameSbName());
+ nodeTag.addAttribute("name_path", product.getNamePath());
+ if (paramData.getReliabDistribType() == 3) {
+ // 浜岄」鍒嗗竷
+ nodeTag.addAttribute("distType", "ber");
+ nodeTag.addAttribute("NoE", NoEStr);
+ } else {
+ nodeTag.addAttribute("distType", "exp");
+ nodeTag.addAttribute("ToE", ToEStr);
+ }
+ nodeTag.addAttribute("F", FStr);
} else {
// 涓嶅悓璁惧锛堝彧鏈�1涓級
ModelNode node = nodeList.get(0);
@@ -415,7 +446,8 @@
null,
list,
null, null, null, null,
- parent);
+ parent,
+ vCounter);
} else if ("5".equals(product.getProductType())) {
// 璁惧
Element nodeTag = parent.addElement("node");
@@ -436,6 +468,10 @@
// vnode锛堣繍绠楄妭鐐癸級
Algorithm algo = algorithmList.stream().filter(item ->
node.getId().equals(item.getId())).collect(Collectors.toList()).get(0);
+ if (!"series,parallel,vote".contains(algo.getAlgorithmType())) {
+ throw new RenException("鍙潬鎬ц瘎瀹氬姛鑳界洰鍓嶅彧鏀寔涓茶仈銆佸苟鑱斿拰琛ㄥ喅銆�");
+ }
+
Element element = parent.addElement("logic");
if (null == productId) {
element.addAttribute("name", algo.getId().toString());
@@ -444,41 +480,118 @@
element.addAttribute("real_name", productName);
element.addAttribute("name_path", productNamePath);
}
- if ("series".equals(algo.getAlgorithmType())) {
- element.addAttribute("type", "series");
- } else if ("parallel".equals(algo.getAlgorithmType())) {
- element.addAttribute("type", "parallel");
- } else if ("vote".equals(algo.getAlgorithmType())) {
- element.addAttribute("type", "vote");
- element.addAttribute("k", algo.getVoteNum().toString());
- } else if ("switch".equals(algo.getAlgorithmType())) {
- element.addAttribute("type", "standby");
- } else if ("bridge".equals(algo.getAlgorithmType())) {
- element.addAttribute("type", "bridge");
- }
- // 鏍规嵁鍚嶅瓧杩涜鍒嗙粍澶勭悊
+ element.addAttribute("type", algo.getAlgorithmType());
+
String[] computerNodeListStr = algo.getComputerList().split(",");
+
+ List<Integer> distTypes = new ArrayList<>();
+ List<ModelNode> nodes = new ArrayList<>();
+ List<ReliabilityAssess> assessDatas = new ArrayList<>();
+ for (String nodeStr : computerNodeListStr) {
+ ModelNode mn = modelNodeAndVnodeList.stream().filter(item ->
+ nodeStr.equals(item.getId().toString())).collect(Collectors.toList()).get(0);
+ nodes.add(mn);
+ if (mn.getDataId() == null) {
+ distTypes.add(null);
+ assessDatas.add(null);
+ } else {
+ List<ParamData> paramDatas1 = paramDataList.stream().filter(item ->
+ mn.getDataId().equals(item.getProductId())).collect(Collectors.toList());
+ if (paramDatas1.size() > 0) {
+ distTypes.add(paramDatas1.get(0).getReliabDistribType());
+ } else {
+ distTypes.add(null);
+ }
+ List<ReliabilityAssess> assessDatas1 = assessDataList.stream().filter(item ->
+ mn.getDataId().equals(item.getId())).collect(Collectors.toList());
+ if (assessDatas1.size() > 0) {
+ assessDatas.add(assessDatas1.get(0));
+ } else {
+ assessDatas.add(null);
+ }
+ }
+ }
+
+ // 鏍规嵁鍚岀被璁惧鍚嶇О杩涜鍒嗙粍澶勭悊
Map<String, List<ModelNode>> groupByNameMap = new HashMap<>();
for (String nodeStr : computerNodeListStr) {
ModelNode mn = modelNodeAndVnodeList.stream().filter(item ->
nodeStr.equals(item.getId().toString())).collect(Collectors.toList()).get(0);
- if (mn.getDataId() == null) {
+ String sameSbName = null;
+ if (mn.getDataId() != null) {
+ XhProductModel product = productList.stream().filter(item ->
+ mn.getDataId().equals(item.getId())).collect(Collectors.toList()).get(0);
+ if ("5".equals(product.getProductType())) sameSbName = product.getSameSbName();
+ }
+ if (sameSbName == null) {
List<ModelNode> list = new ArrayList<>();
list.add(mn);
groupByNameMap.put(mn.getId().toString(), list);
} else {
- XhProductModel product = productList.stream().filter(item ->
- mn.getDataId().equals(item.getId())).collect(Collectors.toList()).get(0);
- String name = product.getName();
- if (groupByNameMap.containsKey(name)) {
- groupByNameMap.get(name).add(mn);
+ if (groupByNameMap.containsKey(sameSbName)) {
+ groupByNameMap.get(sameSbName).add(mn);
} else {
List<ModelNode> list = new ArrayList<>();
list.add(mn);
- groupByNameMap.put(name, list);
+ groupByNameMap.put(sameSbName, list);
}
}
}
+
+ // 琛ㄥ喅
+ if ("vote".equals(algo.getAlgorithmType())) {
+ element.addAttribute("k", algo.getVoteNum().toString());
+ if (groupByNameMap.size() == 1) {
+ // 鍙湁1涓垎缁勶紝璇存槑璁惧閮界浉鍚�
+ element.addAttribute("nums", String.valueOf(computerNodeListStr.length));
+ Element nodeTag = element.addElement("node");
+ createNodeTagSameDevice(nodes, distTypes, assessDatas, nodeTag);
+ } else {
+ // 涓嶅叏鏄浉鍚岃澶囷紝鎸変笉鍚岃澶囧鐞�
+ for (int i = 0; i < computerNodeListStr.length; i++) {
+ List<ModelNode> list = new ArrayList<>();
+ list.add(nodes.get(i));
+ String NoEStr = "0";
+ String ToEStr = "0";
+ String FStr = "0";
+ if (assessDatas.get(i) != null) {
+ NoEStr = assessDatas.get(i).getRunNum() != null ? assessDatas.get(i).getRunNum().toString() : "0";
+ ToEStr = assessDatas.get(i).getRunTimes() != null ? assessDatas.get(i).getRunTimes().toString() : "0";
+ FStr = assessDatas.get(i).getFailNum() != null ? assessDatas.get(i).getFailNum().toString() : "0";
+ }
+ node2DOM(taskId,
+ taskPhaseModel,
+ modelId,
+ null,
+ null,
+ null,
+ productList,
+ paramDataList,
+ gkModelsAssembled,
+ algorithmList,
+ modelNodeAndVnodeList,
+ assessDataList,
+ false,
+ null,
+ list,
+ distTypes.get(i), NoEStr, ToEStr, FStr,
+ element,
+ vCounter);
+ }
+ }
+ return;
+ }
+
+ if ("parallel".equals(algo.getAlgorithmType())) {
+ if (groupByNameMap.size() == 1) {
+ // 鍙湁1涓垎缁勶紝璇存槑璁惧閮界浉鍚�
+ element.addAttribute("nums", String.valueOf(computerNodeListStr.length));
+ Element nodeTag = element.addElement("node");
+ createNodeTagSameDevice(nodes, distTypes, assessDatas, nodeTag);
+ return;
+ }
+ }
+
Iterator<String> iterator = groupByNameMap.keySet().iterator();
while (iterator.hasNext()) {
String name = iterator.next();
@@ -501,7 +614,8 @@
algo.getAlgorithmType(),
list,
null, null, null, null,
- element);
+ element,
+ vCounter);
} else {
// 涓嶅悓鍚嶇О鑺傜偣锛�1涓妭鐐癸級
Integer distTypeParam = null;
@@ -515,12 +629,12 @@
if (paramDatas.size() > 0) {
distTypeParam = paramDatas.get(0).getReliabDistribType();
}
- List<ReliabilityAssess> assessDatas = assessDataList.stream().filter(item ->
+ List<ReliabilityAssess> assessDatas1 = assessDataList.stream().filter(item ->
oneNode.getDataId().equals(item.getId())).collect(Collectors.toList());
- if (assessDatas.size() > 0) {
- NoEStr = assessDatas.get(0).getRunNum() != null ? assessDatas.get(0).getRunNum().toString() : "0";
- ToEStr = assessDatas.get(0).getRunTimes() != null ? assessDatas.get(0).getRunTimes().toString() : "0";
- FStr = assessDatas.get(0).getFailNum() != null ? assessDatas.get(0).getFailNum().toString() : "0";
+ if (assessDatas1.size() > 0) {
+ NoEStr = assessDatas1.get(0).getRunNum() != null ? assessDatas1.get(0).getRunNum().toString() : "0";
+ ToEStr = assessDatas1.get(0).getRunTimes() != null ? assessDatas1.get(0).getRunTimes().toString() : "0";
+ FStr = assessDatas1.get(0).getFailNum() != null ? assessDatas1.get(0).getFailNum().toString() : "0";
}
}
node2DOM(taskId,
@@ -539,11 +653,43 @@
null,
list,
distTypeParam, NoEStr, ToEStr, FStr,
- element);
+ element,
+ vCounter);
}
}
}
}
+ }
+
+ private void createNodeTagSameDevice(List<ModelNode> nodes,
+ List<Integer> distTypes,
+ List<ReliabilityAssess> assessDatas,
+ Element nodeTag) {
+ String NoEStr = "";
+ String ToEStr = "";
+ String FStr = "";
+ for (ReliabilityAssess assessData : assessDatas) {
+ if (assessData != null) {
+ NoEStr += "," + (assessData.getRunNum() != null ? assessData.getRunNum().toString() : "0");
+ ToEStr += "," + (assessData.getRunTimes() != null ? assessData.getRunTimes().toString() : "0");
+ FStr += "," + (assessData.getFailNum() != null ? assessData.getFailNum().toString() : "0");
+ }
+ }
+ NoEStr = NoEStr.substring(1);
+ ToEStr = ToEStr.substring(1);
+ FStr = FStr.substring(1);
+
+ nodeTag.addAttribute("name",
+ nodes.stream().map(item -> item.getDataId().toString()).collect(Collectors.joining(",")));
+ if (distTypes.get(0) == 3) {
+ // 浜岄」鍒嗗竷
+ nodeTag.addAttribute("distType", "ber");
+ nodeTag.addAttribute("NoE", NoEStr);
+ } else {
+ nodeTag.addAttribute("distType", "exp");
+ nodeTag.addAttribute("ToE", ToEStr);
+ }
+ nodeTag.addAttribute("F", FStr);
}
private void addTasksTag(List<TaskPhaseModel> taskPhaseModelAll,
@@ -592,7 +738,7 @@
}
}
- deleteAssessInfoInRedis(assessResult.getId()); //TODO锛堝彂甯冩椂鏀惧紑锛�
+// deleteAssessInfoInRedis(assessResult.getId()); //TODO锛堝彂甯冩椂鏀惧紑锛�
} catch (Exception e) {
logger.error("鍚姩鍙潬鎬ц瘎瀹氱畻娉曞簱鏃跺彂鐢烢xception锛�", e);
e.printStackTrace();
--
Gitblit v1.9.1