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 | 8 +++++++-
1 files changed, 7 insertions(+), 1 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 64c4e78..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
@@ -613,6 +613,7 @@
simulatAssess.getTaskModelId());
if (chkResult.size() > 0) {
result = Result.error("妯″瀷涓嶅畬鏁达紝璇锋鏌ユā鍨嬪畾涔夊強鍙傛暟閰嶇疆銆�");
+// result = Result.ok(chkResult);
return result;
}
@@ -630,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;
@@ -1065,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