From a86c2eb2db34d2d350e5c2eb72bf6416ec89c0d2 Mon Sep 17 00:00:00 2001
From: xyc <jc_xiong@hotmail.com>
Date: 星期二, 19 十一月 2024 11:43:03 +0800
Subject: [PATCH] 1）可靠性评定时新增模型检查处理； 2）获取任务二项分布参数时，去掉模型的匹配。
---
modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/service/ReliabilityAssessService.java | 445 +++++++++++++++++++++++++++++++++++++-----------------
1 files changed, 303 insertions(+), 142 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 ac513ed..d582d6a 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
@@ -1,5 +1,6 @@
package com.zt.life.modules.mainPart.taskReliability.service;
+import cn.hutool.json.JSONArray;
import cn.hutool.json.JSONObject;
import cn.hutool.json.XML;
import com.zt.common.exception.RenException;
@@ -37,6 +38,8 @@
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.multipart.MultipartFile;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
import java.io.*;
import java.util.*;
import java.util.stream.Collectors;
@@ -100,21 +103,14 @@
Long assessId = UUIDUtil.generateId();
assessResult.setId(assessId);
-/*
- // 1. 妫�鏌ュ弬鏁板畬鏁存��
- List<TaskModelCheckResultDto> chkResult = taskService.checkTaskModel(simulatAssess.getProductId(),
- simulatAssess.getTaskModelId());
- if (chkResult.size() > 0) {
- result = Result.error("妯″瀷涓嶅畬鏁达紝璇锋鏌ユā鍨嬪畾涔夊強鍙傛暟閰嶇疆銆�");
- return result;
- }
-*/
- // 2. 缁勮渚涚畻娉曞簱璇勫畾鐨勬ā鍨媥ml
+ // 1. 缁勮渚涚畻娉曞簱璇勫畾鐨勬ā鍨媥ml
assembleModelXml(assessResult);
- // 3. 璋冪敤绠楁硶搴擄紝杩涜璇勫畾璁＄畻
+ // 2. 璋冪敤绠楁硶搴擄紝杩涜璇勫畾璁＄畻
result = callReliaAssessLib(assessResult);
+ if (result.getCode() != 0) throw new RenException(result.getMsg());
+
assessResultDao.insert(assessResult);
List<ReliabilityAssess> list = this.getAssess(assessResult, assessId);
@@ -146,45 +142,27 @@
}
}
JSONObject xmlJSONObj = XML.toJSONObject(xml);
- JSONObject jsonObject = xmlJSONObj.getJSONObject("Results");
- /*for (ReliabilityAssess assess : list) {
- Double result1 = (Double) jsonObject.get(assess.getName());
+ //JSONObject jsonObject = xmlJSONObj.getJSONObject("Results");
+ JSONArray jsonArray = xmlJSONObj.getJSONObject("Results").getJSONArray("Result");
+ for (ReliabilityAssess assess : list) {
+ Double result1 = null;
+ for (int i = 0; i < jsonArray.size(); i++) {
+ String nameValue = jsonArray.getJSONObject(i).get("name").toString();
+ if (nameValue.contains(assess.getId().toString())) {
+ // 鑾峰彇瀵瑰簲鐨勫��
+ if (jsonArray.getJSONObject(i).get("value") instanceof Double) {
+ result1 = (Double) jsonArray.getJSONObject(i).get("value");
+ } else {
+ String[] values = jsonArray.getJSONObject(i).get("value").toString().split(",");
+ result1 = Double.valueOf(values[1]);
+ }
+ break; // 濡傛灉鎵惧埌灏遍��鍑哄惊鐜�
+ }
+ }
if (result1 != null) {
result1 = Double.valueOf(new Formatter().format("%.2f", result1).toString());
}
- Double result1=null;
assess.setAssessResult(result1);
- }*/
- Random random = new Random();
-
- for (ReliabilityAssess assess : list) {
- double lowerBound, upperBound;
- switch (assess.getType()) {
- case 5:
- lowerBound = 0.95;
- upperBound = 0.99;
- break;
- case 4:
- lowerBound = 0.9;
- upperBound = 0.95;
- break;
- case 3:
- lowerBound = 0.85;
- upperBound = 0.9;
- break;
- case 2:
- lowerBound = 0.8;
- upperBound = 0.85;
- break;
- default:
- throw new IllegalArgumentException("Invalid type: " + assess.getType());
- }
-
- // 鐢熸垚涓�涓粙浜� lowerBound 鍒� upperBound 涔嬮棿鐨勯殢鏈烘暟
- double adjustedRandom = lowerBound + (upperBound - lowerBound) * random.nextDouble();
- adjustedRandom = Double.parseDouble(new Formatter().format("%.2f", adjustedRandom).toString());
- // 璁剧疆璇勪及缁撴灉
- assess.setAssessResult(adjustedRandom);
}
} else {
list = null;
@@ -198,42 +176,70 @@
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();
Long itemId = assessResult.getItemId();
- List<ReliabilityAssess> assessDataList = reliabilityAssessDao.getProductList(productId, itemId);
+ List<ReliabilityAssess> assessDataList = reliabilityAssessDao.getProductList(productId, itemId);
Task task = taskService.get(taskId);
XhProductModel product = xhProductModelDao.getById(productId);
List<XhProductModel> productList = xhProductModelDao.getByShipId(productId);
@@ -291,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");
@@ -324,7 +332,8 @@
null,
list,
null, null, null, null,
- modelTag);
+ modelTag,
+ vCounter);
}
}
@@ -348,60 +357,61 @@
String NoE,
String ToE,
String F,
- Element parent) {
+ Element parent,
+ Map<String, Integer> vCounter) {
if (sameNameGroup) {
// 鐩稿悓璁惧鐨勫垎缁�
+ 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 = "";
+ String ToEStr = "";
+ String FStr = "";
+// for (ModelNode node : nodeList) {
+ List<ReliabilityAssess> assessDatas = assessDataList.stream().filter(item ->
+ dataId.equals(item.getId())).collect(Collectors.toList());
+ NoEStr += ",";
+ ToEStr += ",";
+ FStr += ",";
+ 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";
+ }
+// }
+ NoEStr = NoEStr.substring(1);
+ ToEStr = ToEStr.substring(1);
+ FStr = FStr.substring(1);
+
+ int counter = vCounter.get("v");
+ counter++;
+ vCounter.put("v", counter);
Element sameNameGroupTag = parent.addElement("logic");
sameNameGroupTag.addAttribute("name",
- nodeList.stream().map(item -> item.getId().toString()).collect(Collectors.joining(",")));
+ "v" + counter);
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();
- ParamData paramData = paramDataList.stream().filter(item ->
- dataId.equals(item.getProductId())).collect(Collectors.toList()).get(0);
- String NoEStr = "";
- String ToEStr = "";
- String FStr = "";
- for (ModelNode node : nodeList) {
- List<ReliabilityAssess> assessDatas = assessDataList.stream().filter(item ->
- node.getDataId().equals(item.getId())).collect(Collectors.toList());
- NoEStr += ",";
- ToEStr += ",";
- FStr += ",";
- 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";
- }
+ Element nodeTag = sameNameGroupTag.addElement("node");
+ nodeTag.addAttribute("name",
+ nodeList.stream().map(item -> item.getDataId().toString() + "-" + item.getDeviceNo().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);
}
- 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);
- }
+ nodeTag.addAttribute("F", FStr);
} else {
// 涓嶅悓璁惧锛堝彧鏈�1涓級
ModelNode node = nodeList.get(0);
@@ -437,7 +447,8 @@
null,
list,
null, null, null, null,
- parent);
+ parent,
+ vCounter);
} else if ("5".equals(product.getProductType())) {
// 璁惧
Element nodeTag = parent.addElement("node");
@@ -458,6 +469,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());
@@ -466,41 +481,119 @@
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);
+ }
+ }
+ }
+
+ // 鏍规嵁鍚岀被璁惧鍚嶇О杩涜鍒嗙粍澶勭悊锛堟敼涓烘牴鎹甦ataId杩涜鍒嗙粍锛�
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();
+ sameSbName = mn.getDataId().toString();
+ }
+ 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();
@@ -523,7 +616,8 @@
algo.getAlgorithmType(),
list,
null, null, null, null,
- element);
+ element,
+ vCounter);
} else {
// 涓嶅悓鍚嶇О鑺傜偣锛�1涓妭鐐癸級
Integer distTypeParam = null;
@@ -537,12 +631,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,
@@ -561,15 +655,49 @@
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");
+ break;
+ }
+ }
+ NoEStr = NoEStr.substring(1);
+ ToEStr = ToEStr.substring(1);
+ FStr = FStr.substring(1);
+
+ nodeTag.addAttribute("name",
+ nodes.stream().map(item -> item.getDataId().toString() + "-" + item.getDeviceNo().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,
- Element root) {
+ Element root) {
Element tasksTag = root.addElement("tasks");
for (TaskPhaseModel taskPhaseModel : taskPhaseModelAll) {
Element taskTag = tasksTag.addElement("task");
@@ -583,7 +711,11 @@
InputStream is = null;
BufferedReader br = null;
try {
- setParamToRedis(assessResult);
+ try {
+ setParamToRedis(assessResult);
+ } catch (Exception e) {
+ throw new RenException("璁块棶Redis澶辫触銆傝妫�鏌edis鏄惁宸插惎鍔ㄣ��");
+ }
Process process = null;
String command = "python " + assessMain;
@@ -595,7 +727,7 @@
} else if (System.getProperty("os.name").toLowerCase().indexOf("linux") > -1) {
process = Runtime.getRuntime().exec(new String[]{"/bin/sh", "-c", command});
} else {
- throw new Exception("鏆備笉鏀寔璇ユ搷浣滅郴缁燂紝杩涜鍚姩绠楁硶搴撹绠楋紒");
+ throw new RenException("鏆備笉鏀寔璇ユ搷浣滅郴缁燂紝杩涜鍚姩绠楁硶搴撹绠楋紒");
}
is = process.getInputStream();
// 浠ュ懡浠よ鏂瑰紡璋冪敤绠楁硶搴撴椂锛屾帴鍙ｇ害瀹氳繑鍥炵殑缁撴灉鏄痷tf-8缂栫爜
@@ -606,19 +738,22 @@
if (line != null) {
ReliaSimLibResult rtn = com.alibaba.fastjson.JSONObject.parseObject(line, ReliaSimLibResult.class);
if ("0".equals(rtn.getCode())) {
- logger.info("鍚姩绠楁硶搴撴垚鍔熴��");
- result = Result.ok();
+ logger.info("鍚姩鍙潬鎬ц瘎瀹氱畻娉曞簱鎴愬姛銆�");
+ if (exitCode == 0) {
+ deleteAssessInfoInRedis(assessResult.getId());
+ result = Result.ok();
+ } else {
+ result = Result.error("鍙潬鎬ц瘎瀹氱畻娉曞簱璁＄畻澶辫触: exitCode=" + exitCode);
+ }
} else {
String errorMsg = rtn.getErrorMsg();
- throw new RuntimeException("鍚姩绠楁硶搴撳け璐�: errorMsg=" + errorMsg);
+ throw new RenException("鍚姩鍙潬鎬ц瘎瀹氱畻娉曞簱澶辫触: errorMsg=" + errorMsg);
}
}
-
- deleteAssessInfoInRedis(assessResult.getId()); //TODO锛堝彂甯冩椂鏀惧紑锛�
} catch (Exception e) {
logger.error("鍚姩鍙潬鎬ц瘎瀹氱畻娉曞簱鏃跺彂鐢烢xception锛�", e);
e.printStackTrace();
- result = Result.error(e.getMessage());
+ throw new RenException("鍚姩鍙潬鎬ц瘎瀹氱畻娉曞簱澶辫触: errorMsg=" + e.getMessage());
} finally {
if (is != null) {
try {
@@ -794,4 +929,30 @@
return baseDao.getAssessDataList(productId);
}
+ public void downloadXml(HttpServletRequest request, HttpServletResponse response, Long productId, Long taskId, Long itemId, Integer xml) {
+ Long assessId = baseDao.getAssessId(itemId, productId, taskId);
+ String json="";
+ if (xml == 1) {
+ json = baseDao.getxml(assessId);
+ } else {
+ String filePath = path + "/" + assessId + "/" + "result.xml";
+ InputStream in = null;
+ File file = new File(filePath);
+ if (file.exists()) {
+ try {
+ in = new FileInputStream(filePath);
+ json = IOUtils.toString(in);
+ } catch (IOException e) {
+ throw new RenException("鏂囦欢涓嶅瓨鍦ㄦ垨鑰呮枃浠舵墦涓嶅紑");
+ } finally {
+ try {
+ in.close();
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
+ }
+ }
+ }
+ simulatAssessService.writeToTxt(request, response, json, "璇勫畾");
+ }
}
--
Gitblit v1.9.1