Merge remote-tracking branch 'origin/master'

xyc

2024-10-15 ada810aa38609da55b0f348b86cc8a8d8ace0efb

 modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/service/SimulatAssessService.java

@@ -612,8 +612,8 @@
        List<TaskModelCheckResultDto> chkResult = taskService.checkTaskModel(simulatAssess.getProductId(),
                simulatAssess.getTaskModelId());
        if (chkResult.size() > 0) {
//            result = Result.error("模型不完整，请检查模型定义及参数配置。");
            result = Result.ok(chkResult);
            result = Result.error("模型不完整，请检查模型定义及参数配置。");
//            result = Result.ok(chkResult);
            return result;
        }

@@ -631,7 +631,11 @@
        InputStream is = null;
        BufferedReader br = null;
        try {
            setParamToRedis(simulatAssess);
            try {
                setParamToRedis(simulatAssess);
            } catch (Exception e) {
                throw new RuntimeException("访问Redis失败。请检查Redis是否已启动。");
            }

            Process process = null;
            String command = "python " + reliaSimMain;
@@ -1066,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");
            }