修改：运行比不为1时，才给算法包传递cycon/cycdown参数。

xyc

2024-12-04 090f7a6976398b5d82a2133f32ad9c9b502a26df

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

@@ -567,17 +567,15 @@
                    ProductStatusDto newRow = null;
                    if (sameNum > 1) {
                        newRow = item.clone();
                    }
                    else
                    } else
                        newRow = item;
                    if ("5".equals(newRow.getProductType())){
                    if ("5".equals(newRow.getProductType())) {
                        newRow.setDeviceNo(i);
                        newRow.setDataId(item.getId().toString() + "-" + i);
                        if (i>1){
                        if (i > 1) {
                            newRow.setName(item.getName() + "-" + i);
                        }
                    }
                    else{
                    } else {
                        newRow.setDeviceNo(0);
                        newRow.setDataId(item.getId().toString());
                    }
@@ -887,7 +885,8 @@
        for (TaskPhaseModel taskPhaseModel : taskPhaseModelAll) {
            Element taskTag = tasksTag.addElement("task");
            taskTag.addAttribute("duration", String.valueOf(taskPhaseModel.getOperatConditDuration()));
            taskTag.addAttribute("model", taskPhaseModel.getOperatConditId().toString());
//            taskTag.addAttribute("model", taskPhaseModel.getOperatConditId().toString());
            taskTag.addAttribute("model", taskPhaseModel.getId().toString());
            if (null != taskPhaseModel.getPhaseConstraints() && taskPhaseModel.getPhaseConstraints().size() > 0) {
                taskTag.addAttribute("NAM",
                        taskPhaseModel.getPhaseConstraints().stream().map(item ->
@@ -1013,7 +1012,8 @@
        Element modelsTag = root.addElement("models");
        for (TaskPhaseModel taskPhaseModel : taskPhaseModelAll) {
            Element modelTag = modelsTag.addElement("model");
            modelTag.addAttribute("name", taskPhaseModel.getOperatConditId().toString());
//            modelTag.addAttribute("name", taskPhaseModel.getOperatConditId().toString());
            modelTag.addAttribute("name", taskPhaseModel.getId().toString());
            List<OperatConditModel> gkModelsAssembled = operatConditModelDao.getGKModelAssembled(
                    taskPhaseModel.getOperatConditId());
            OperatConditModel gkModelTop = gkModelsAssembled.stream().filter(item ->
@@ -1102,7 +1102,8 @@
                ParamData paramData = paramDataList.stream().filter(item ->
                        dataId.equals(item.getProductId())).collect(Collectors.toList()).get(0);
                Double ratio = paramData.getTaskMtbcfOperatingRatio();
                if (null != ratio && ratio > 0) {
//                if (null != ratio && ratio > 0) {
                if (null != ratio && ratio != 1.0) {
                    // 间断型设备的处理
                    double cycon = taskPhaseModel.getOperatConditDuration() * ratio;
                    double cycdown = taskPhaseModel.getOperatConditDuration() - cycon;
@@ -1410,8 +1411,7 @@

    public SimulaDataDto getResultXML(SimulatAssess simulatAssess) {
        if (simulatAssess.getDataType() != null && simulatAssess.getDataType().equals("fz")) {
            Integer num = this.getNumById(simulatAssess.getProductId(), simulatAssess.getTaskModelId());
            simulatAssess.setName("仿真记录" + (num + 1));
            simulatAssess.setName(simulatAssess.getName());
            this.update(simulatAssess);
        }
        String filePath = path + "/" + simulatAssess.getId() + "/" + "result.xml";
@@ -1469,7 +1469,11 @@
                String[] arr = availability.split(" ");
                // 遍历子字符串数组，将每个元素转换为double并存储到double数组中
                Double j = 0.0;
                for (int a = 0; a < arr.length; a++) {
                Double b = 100.0;
                for (int a = 0; a < arr.length - 1; a++) {
                    if (Convert.toDouble(arr[a]) < Convert.toDouble(arr[a+1])) {
                        System.out.println(arr[a]);
                    }
                    j = samplPeriod + j;
                    doubleArray.add(Double.parseDouble(arr[a]));
                    xList.add(j);
@@ -1609,6 +1613,7 @@

            SchemeComparCurve curve = new SchemeComparCurve();
            curve.setName(task.getTaskName());
            curve.setSymbol("none");
            curve.setSmooth(true);
            curve.setType("line");
            curve.setData(resultData.getCurveParam().getYData());