Merge remote-tracking branch 'origin/master'

xyc

2024-10-15 ada810aa38609da55b0f348b86cc8a8d8ace0efb

 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 RuntimeException("访问Redis失败。请检查Redis是否已启动。");
            }

            Process process = null;
            String command = "python " + assessMain;
@@ -738,7 +749,7 @@
                }
            }

//            deleteAssessInfoInRedis(assessResult.getId()); //TODO（发布时放开）
            deleteAssessInfoInRedis(assessResult.getId());
        } catch (Exception e) {
            logger.error("启动可靠性评定算法库时发生Exception：", e);
            e.printStackTrace();