From 18f682f736914e427070b9bb769df538ad9f6d1c Mon Sep 17 00:00:00 2001
From: jinlin <jinlin>
Date: 星期一, 02 十二月 2024 08:42:38 +0800
Subject: [PATCH] 修改
---
modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/service/ReliabilityAssessService.java | 69 +---------------------------------
1 files changed, 2 insertions(+), 67 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 d582d6a..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
@@ -174,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();
@@ -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();
--
Gitblit v1.9.1