From 19beea5d5dc165efb0feca7c4c0a296819010178 Mon Sep 17 00:00:00 2001
From: xyc <jc_xiong@hotmail.com>
Date: 星期三, 04 十二月 2024 11:16:17 +0800
Subject: [PATCH] 修改bug：传给仿真算法包的modelId重复。（将工况ID改为阶段模型ID）
---
modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/service/ReliabilityAssessService.java | 165 +++++++++++++++++++++----------------------------------
1 files changed, 63 insertions(+), 102 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 ccf5062..1dfdc6c 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
@@ -38,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;
@@ -101,20 +103,11 @@
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());
@@ -157,9 +150,9 @@
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{
+ 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]);
}
@@ -181,68 +174,6 @@
// 寤虹珛浜у搧缁撴瀯鏍戞椂锛岀浉鍚岀殑璁惧澶氫釜浣跨敤鏃讹紝澶氫釜璁惧浣跨敤鐩稿悓鐨勫悕绉般�傝繖鏍凤紝鍦ㄦ澶勯�氳繃鍚嶇О鏉ュ垽鏂槸鍚︽槸鐩稿悓鐨勮澶囷紝鐩稿悓鐨勮澶囷紝闇�瑕佹嬁鍑烘潵浣滀负瀛愭爣绛惧祵濂楄繘xml銆�
private void assembleModelXml(AssessResult assessResult) {
-/*
- // 娴嬭瘯绠楁硶搴撶敤
- 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=\"绯荤粺\" type=\"series\" >\n" +
- " <logic name=\"鍒嗙郴缁�1\" type=\"series\" >\n" +
- " <logic name=\"v1\" type=\"parallel\" nums=\"2\">\n" +
- " <node name=\"璁惧1\" distType=\"exp\" ToE=\"20\" F=\"1\"/>\n" +
- " </logic>\n" +
- " <node name=\"璁惧2\" distType=\"exp\" ToE=\"0.3\" F=\"1\"/>\n" +
- " </logic>\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=\"0.5,0,6\" F=\"1,2\"/>\n" +
- " </logic> \n" +
- " <node name=\"璁惧6\" distType=\"exp\" ToE=\"0.3\" F=\"1\"/>\n" +
- " </logic>\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>";
- 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();
@@ -376,18 +307,18 @@
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";
- }
+// 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);
@@ -397,7 +328,7 @@
vCounter.put("v", counter);
Element sameNameGroupTag = parent.addElement("logic");
sameNameGroupTag.addAttribute("name",
- "v"+counter);
+ "v" + counter);
if ("parallel".equals(sameNameGroupAlgorithmType)) {
sameNameGroupTag.addAttribute("type", "parallel");
} else {
@@ -406,7 +337,8 @@
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(",")));
+ 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) {
@@ -519,16 +451,17 @@
}
}
- // 鏍规嵁鍚岀被璁惧鍚嶇О杩涜鍒嗙粍澶勭悊
+ // 鏍规嵁鍚岀被璁惧鍚嶇О杩涜鍒嗙粍澶勭悊锛堟敼涓烘牴鎹甦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);
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();
+// 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<>();
@@ -680,6 +613,7 @@
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);
@@ -687,7 +621,8 @@
FStr = FStr.substring(1);
nodeTag.addAttribute("name",
- nodes.stream().map(item -> item.getDataId().toString()).collect(Collectors.joining(",")));
+ nodes.stream().map(item -> item.getDataId().toString() + "-" + item.getDeviceNo().toString()).
+ collect(Collectors.joining(",")));
if (distTypes.get(0) == 3) {
// 浜岄」鍒嗗竷
nodeTag.addAttribute("distType", "ber");
@@ -742,14 +677,17 @@
ReliaSimLibResult rtn = com.alibaba.fastjson.JSONObject.parseObject(line, ReliaSimLibResult.class);
if ("0".equals(rtn.getCode())) {
logger.info("鍚姩鍙潬鎬ц瘎瀹氱畻娉曞簱鎴愬姛銆�");
- result = Result.ok();
+ if (exitCode == 0) {
+ deleteAssessInfoInRedis(assessResult.getId());
+ result = Result.ok();
+ } else {
+ result = Result.error("鍙潬鎬ц瘎瀹氱畻娉曞簱璁＄畻澶辫触: exitCode=" + exitCode);
+ }
} else {
String errorMsg = rtn.getErrorMsg();
throw new RenException("鍚姩鍙潬鎬ц瘎瀹氱畻娉曞簱澶辫触: errorMsg=" + errorMsg);
}
}
-
- deleteAssessInfoInRedis(assessResult.getId());
} catch (Exception e) {
logger.error("鍚姩鍙潬鎬ц瘎瀹氱畻娉曞簱鏃跺彂鐢烢xception锛�", e);
e.printStackTrace();
@@ -864,14 +802,12 @@
path = shipPath = name;
xtPath = "";
fxtPath = "";
- sbPath = "";
productId = shipId;
} else {
if (type.equals("绯荤粺")) {
if (StringUtils.isNotBlank(shipPath)) {
path = xtPath = name;
fxtPath = "";
- sbPath = "";
} else {
continue;
}
@@ -879,14 +815,13 @@
if (type.equals("鍒嗙郴缁�")) {
if (StringUtils.isNotBlank(xtPath)) {
path = fxtPath = xtPath + "," + name;
- sbPath = "";
} else {
continue;
}
}
if (type.equals("璁惧")) {
if ((StringUtils.isNotBlank(xtPath) || StringUtils.isNotBlank(fxtPath))) {
- path = sbPath = StringUtils.isNotBlank(fxtPath) ? fxtPath + "," + name : xtPath + "," + name;
+ path = StringUtils.isNotBlank(fxtPath) ? fxtPath + "," + name : xtPath + "," + name;
} else {
continue;
}
@@ -896,6 +831,7 @@
}
}
+ baseDao.deleteByItemId(itemId);
ReliabilityAssess assess = new ReliabilityAssess();
assess.setFailNum(failNum);
assess.setRunNum(runNum);
@@ -909,7 +845,6 @@
} catch (Exception e) {
e.printStackTrace();
ImportUtil.updateErrMap(errMap, "瀵煎叆寮傚父" + e.getMessage(), "", row1);
- //err++;
}
Date nowDate = new Date();
@@ -929,4 +864,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