From ada810aa38609da55b0f348b86cc8a8d8ace0efb Mon Sep 17 00:00:00 2001
From: xyc <jc_xiong@hotmail.com>
Date: 星期二, 15 十月 2024 15:08:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/service/SimulatAssessService.java |   31 +++++++++++++++++++++++--------
 1 files changed, 23 insertions(+), 8 deletions(-)

diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/service/SimulatAssessService.java b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/service/SimulatAssessService.java
index f065467..c95075e 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/service/SimulatAssessService.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/service/SimulatAssessService.java
@@ -182,7 +182,10 @@
         JSONObject jsonObject = new JSONObject(templetStr);
         JSONArray jsonArray = jsonObject.getJSONArray("cells");
 
-        this.getPetsInfo();
+        JSONObject jsonObject3 = new JSONObject(templetStr);
+        JSONArray jsonArray3 = jsonObject3.getJSONArray("cells");
+
+        String modelStr2 = this.getPetsInfo();
         double x1 = 0;
         double x2 = 0;
         int y = -10;
@@ -237,12 +240,13 @@
                 jsonArray.add(lineJson);
             }
             lineArray.add(statusDtoList);
+
             JSONObject textJson = new JSONObject(templetsStrMap.get("text"));
             JsonUtils2.setJsonValueByPath(textJson, "id".split("/"), UUIDUtil.generateId().toString());
             JsonUtils2.setJsonValueByPath(textJson, "attrs/label/textWrap/text".split("/"), dto.getName());
             JsonUtils2.setJsonValueByPath(textJson, "position/x".split("/"), 20);
             JsonUtils2.setJsonValueByPath(textJson, "position/y".split("/"), y - 15);
-            jsonArray.add(textJson);
+            jsonArray3.add(textJson);
         }
 
         //闃舵妯″瀷鍙婂埢搴�
@@ -375,7 +379,7 @@
         }
         parentStatusDtoList.add(new TimeDiagramStatusDto(x1, x2, lastStatus));
 
-        JSONObject jsonObject2 = new JSONObject(templetStr);
+        JSONObject jsonObject2 = new JSONObject(modelStr2);
         JSONArray jsonArray2 = jsonObject2.getJSONArray("cells");
         List<List<TimeDiagramStatusDto>> smallStatusDtoList = new ArrayList<>();
         smallStatusDtoList.add(parentStatusDtoList);
@@ -385,28 +389,30 @@
         for (int i = 0; i < smallStatusDtoList.size(); i++) {
             for (TimeDiagramStatusDto status : smallStatusDtoList.get(i)) {
                 JSONObject lineJson = new JSONObject(templetsStrMap2.get(status.getStatus()));
-                setlineXy(lineJson, status.getX1(), y, status.getX2()+5, y, "");
+                setlineXy(lineJson, status.getX1(), y, status.getX2() + 5, y, "");
                 JsonUtils2.setJsonValueByPath(lineJson, "data/status".split("/"), status.getStatus());
                 JsonUtils2.setJsonValueByPath(lineJson, "id".split("/"), UUIDUtil.generateId().toString());
                 jsonArray2.add(lineJson);
             }
-            y = y + 10;
+            y = y + 25;
         }
 
         //鍥句緥
         int spaceWitdth = 80;
         x1 = 0;
         x2 = spaceWitdth - 11;
+        y = 60;
         String[] tlArr = "O,F,I,S,M".split(",");
         for (String s : tlArr) {
             JSONObject f = templetsMap.get(s);
             x1 = x1 + spaceWitdth;
             x2 = x2 + spaceWitdth;
-            setlineXy(f, x1, y+10, x2, y+10, null);
+            setlineXy(f, x1, y, x2, y, null);
             jsonArray2.add(f);
         }
         timeDiagramDto.setDiagramJson(jsonObject.toString());
         timeDiagramDto.setSmallDiagramJson(jsonObject2.toString());
+        timeDiagramDto.setTextDiagramJson(jsonObject3.toString());
 
         return timeDiagramDto;
     }
@@ -446,12 +452,14 @@
         }
     }
 
-    public void getPetsInfo() {
+    public String getPetsInfo() {
         Map<String, Object> params = new HashMap<String, Object>();
         params.put("projectId", 10000);
         params.put("diagramId", 10000);
+        String modelStr2 = "";
         List<TimeDiagram> list_style = baseDao.getTimeDiagram(params);
         if (list_style.size() > 0) {
+            modelStr2 = list_style.get(0).getContent2();
             String modelStr = list_style.get(0).getContent();
             JSONObject modelJson = new JSONObject(modelStr);
             JSONArray modelJsonArray = modelJson.getJSONArray("cells");
@@ -524,6 +532,7 @@
                 }
             }
         }
+        return modelStr2;
     }
 
     public List<ProductStatusDto> getStatusData(Long productId, Long taskId) {
@@ -604,6 +613,7 @@
                 simulatAssess.getTaskModelId());
         if (chkResult.size() > 0) {
             result = Result.error("妯″瀷涓嶅畬鏁达紝璇锋鏌ユā鍨嬪畾涔夊強鍙傛暟閰嶇疆銆�");
+//            result = Result.ok(chkResult);
             return result;
         }
 
@@ -621,7 +631,11 @@
         InputStream is = null;
         BufferedReader br = null;
         try {
-            setParamToRedis(simulatAssess);
+            try {
+                setParamToRedis(simulatAssess);
+            } catch (Exception e) {
+                throw new RuntimeException("璁块棶Redis澶辫触銆傝妫�鏌edis鏄惁宸插惎鍔ㄣ��");
+            }
 
             Process process = null;
             String command = "python " + reliaSimMain;
@@ -1056,6 +1070,7 @@
                 element.addAttribute("k", algo.getVoteNum().toString());
             } else if ("switch".equals(algo.getAlgorithmType())) {
                 element.addAttribute("type", "standby");
+                element.addAttribute("k", algo.getVoteNum().toString());
             } else if ("bridge".equals(algo.getAlgorithmType())) {
                 element.addAttribute("type", "bridge");
             }

--
Gitblit v1.9.1