From c0e3f24edd2ef47339c676ff3dc6fdc06b3c387e Mon Sep 17 00:00:00 2001
From: xyc <jc_xiong@hotmail.com>
Date: 星期五, 18 十月 2024 10:42:40 +0800
Subject: [PATCH] 1）修改bug：可靠性预计参数配置，可靠性分布类型下拉框缺少威布尔分布； 2）细化可靠性仿真评估报错信息。
---
modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/service/ReliabilityAssessService.java | 25 ++++++++++++++++++-------
1 files changed, 18 insertions(+), 7 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 ca7b3c9..ccf5062 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
@@ -116,6 +116,8 @@
// 3. 璋冪敤绠楁硶搴擄紝杩涜璇勫畾璁＄畻
result = callReliaAssessLib(assessResult);
+ if (result.getCode() != 0) throw new RenException(result.getMsg());
+
assessResultDao.insert(assessResult);
List<ReliabilityAssess> list = this.getAssess(assessResult, assessId);
@@ -155,7 +157,12 @@
String nameValue = jsonArray.getJSONObject(i).get("name").toString();
if (nameValue.contains(assess.getId().toString())) {
// 鑾峰彇瀵瑰簲鐨勫��
- result1 = (Double) jsonArray.getJSONObject(i).get("value");
+ 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; // 濡傛灉鎵惧埌灏遍��鍑哄惊鐜�
}
}
@@ -707,7 +714,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;
@@ -719,7 +730,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缂栫爜
@@ -730,19 +741,19 @@
if (line != null) {
ReliaSimLibResult rtn = com.alibaba.fastjson.JSONObject.parseObject(line, ReliaSimLibResult.class);
if ("0".equals(rtn.getCode())) {
- logger.info("鍚姩绠楁硶搴撴垚鍔熴��");
+ logger.info("鍚姩鍙潬鎬ц瘎瀹氱畻娉曞簱鎴愬姛銆�");
result = Result.ok();
} else {
String errorMsg = rtn.getErrorMsg();
- throw new RuntimeException("鍚姩绠楁硶搴撳け璐�: errorMsg=" + errorMsg);
+ throw new RenException("鍚姩鍙潬鎬ц瘎瀹氱畻娉曞簱澶辫触: errorMsg=" + errorMsg);
}
}
-// deleteAssessInfoInRedis(assessResult.getId()); //TODO锛堝彂甯冩椂鏀惧紑锛�
+ deleteAssessInfoInRedis(assessResult.getId());
} 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 {
--
Gitblit v1.9.1