可靠性仿真评估时后端增加可修设备可修阶段可靠度固定为1的控制

xyc

2024-10-23 1cbc5439e1a250427587b4b31473a0b4448b68ff

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

@@ -24,6 +24,7 @@
import com.zt.life.modules.mainPart.taskReliability.dto.TaskPhaseConstraintDto;
import com.zt.life.modules.mainPart.taskReliability.model.*;
import com.zt.life.modules.mainPart.utils.GetStringSpace;
import io.swagger.models.auth.In;
import org.apache.commons.io.IOUtils;
import org.dom4j.Document;
import org.dom4j.DocumentHelper;
@@ -43,7 +44,10 @@
import org.springframework.transaction.annotation.Transactional;

import java.io.*;
import java.nio.file.FileAlreadyExistsException;
import java.util.*;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import java.util.stream.Collectors;


@@ -107,6 +111,7 @@
    String templetStr = "{\"cells\":[]}";
    Map<String, JSONObject> templetsMap = new HashMap<>();
    Map<String, String> templetsStrMap = new HashMap<>();
    Map<Integer, String> templetsStrMap2 = new HashMap<>();

    private JSONObject xmlJSONObj;

@@ -150,7 +155,10 @@
        return baseDao.getChildren(productId, taskId);
    }

    public String getTimeDiagram(Long productId, Long taskId, Long fzId) {
    public TimeDiagramDto getTimeDiagram(Long productId, Long taskId, Long fzId, double smallWidth, double minPointNum) {
        TimeDiagramDto timeDiagramDto = new TimeDiagramDto();
        timeDiagramDto.setSmallWidth(smallWidth);
        timeDiagramDto.setMinPointNum(minPointNum);
        String filePath = path + "/" + fzId + "/" + "status.json";
        ObjectMapper mapper = new ObjectMapper();
        String jsonStr = null;
@@ -178,7 +186,10 @@
        JSONObject jsonObject = new JSONObject(templetStr);
        JSONArray jsonArray = jsonObject.getJSONArray("cells");

        this.getPetsInfo();
        JSONObject jsonObject3 = new JSONObject(templetStr);
        JSONArray jsonArray3 = jsonObject3.getJSONArray("cells");

        String modelStr2 = this.getPetsInfo();
        double x1 = 0;
        double x2 = 0;
        int y = -10;
@@ -187,32 +198,52 @@
        int groupHeight = 20;

        double pointNumPerHour = 60.0 / simulatAssess.getSamplPeriod();

        //时序图线
        List<TimeDiagramStatusDto> statusDtoList = new ArrayList<>();
        List<TimeDiagramStatusDto> statusDtoListOld = new ArrayList<>();
        for (int i = 0; i < list.size(); i++) {
            x1 = 0;
            groupY = groupHeight * i;
            ProductStatusDto dto = list.get(i);
            double startTime = 0.0;
            int status2 = 5;
            for (StatusDto status : dto.getStatusList()) {
                switch (status.getStatus()) {
                    case "O":
                        y = groupY;
                        status2 = 5;
                        break;
                    case "F":
                        y = groupY;// + spaceHeight;
                        status2 = 1;
                        break;
                    case "I":
                        y = groupY;// + spaceHeight;
                        status2 = 3;
                        break;
                    case "S":
                        y = groupY;// + spaceHeight;
                        status2 = 2;
                        break;
                    case "M":
                        y = groupY;// + 2 * spaceHeight;
                        status2 = 4;
                        break;
                }
                x2 = x1 + status.getTimes() * pointNumPerHour + 5;
                if (i == 0) {
                    statusDtoList.add(new TimeDiagramStatusDto(x1, x2, status2));
                } else {
                    statusDtoListOld.add(new TimeDiagramStatusDto(x1, x2, status2));
                }
                JSONObject lineJson = new JSONObject(templetsStrMap.get(status.getStatus()));
                setlineXy(lineJson, x1, y, x2, y, "");
                JsonUtils2.setJsonValueByPath(lineJson, "data/status".split("/"), status.getStatus());
                JsonUtils2.setJsonValueByPath(lineJson, "data/startTimes".split("/"), String.format("%.4f", x1));
                JsonUtils2.setJsonValueByPath(lineJson, "data/endTimes".split("/"), String.format("%.4f", x1 + status.getTimes()));
                JsonUtils2.setJsonValueByPath(lineJson, "data/startTimes".split("/"), String.format("%.1f", startTime));
                JsonUtils2.setJsonValueByPath(lineJson, "data/endTimes".split("/"), String.format("%.1f", startTime + status.getTimes()));
                JsonUtils2.setJsonValueByPath(lineJson, "id".split("/"), UUIDUtil.generateId().toString());
                startTime = startTime + status.getTimes();
                x1 = x2 - 5;
                jsonArray.add(lineJson);
            }
@@ -221,29 +252,15 @@
            JsonUtils2.setJsonValueByPath(textJson, "attrs/label/textWrap/text".split("/"), dto.getName());
            JsonUtils2.setJsonValueByPath(textJson, "position/x".split("/"), 20);
            JsonUtils2.setJsonValueByPath(textJson, "position/y".split("/"), y - 15);
            jsonArray.add(textJson);
        }

        //图例
        int spaceWitdth = 80;
        x1 = -spaceWitdth;
        x2 = -11;
        y = -110;
        String[] tlArr = "O,F,I,S,M".split(",");
        for (String s : tlArr) {
            JSONObject f = templetsMap.get(s);
            x1 = x1 + spaceWitdth;
            x2 = x2 + spaceWitdth;
            setlineXy(f, x1, y, x2, y, null);
            jsonArray.add(f);
            jsonArray3.add(textJson);
        }

        //阶段模型及刻度
        x1 = 0;
        x2 = 0;
        double y1 = -80;
        y = -60;
        double y2 = -50;
        double y1 = -60;
        y = -40;
        double y2 = -30;

        JSONObject modelJson = new JSONObject(templetsStrMap.get("model"));
        setlineXy(modelJson, 1, y1, 1, y2, null);
@@ -274,17 +291,18 @@
            JSONObject textJson = new JSONObject(templetsStrMap.get("text"));
            JsonUtils2.setJsonValueByPath(textJson, "data/dataId".split("/"), modelId);
            JsonUtils2.setJsonValueByPath(textJson, "id".split("/"), UUIDUtil.generateId().toString());
            JsonUtils2.setJsonValueByPath(textJson, "attrs/label/textWrap/text".split("/"), "模型"+(i+1));
            JsonUtils2.setJsonValueByPath(textJson, "attrs/label/textWrap/text".split("/"), "模型" + (i + 1));
            JsonUtils2.setJsonValueByPath(textJson, "attrs/label/textWrap/modelName".split("/"), modelName);

            JsonUtils2.setJsonValueByPath(textJson, "size/width".split("/"), mapSpace.get("width")+10);
            JsonUtils2.setJsonValueByPath(textJson, "size/width".split("/"), mapSpace.get("width") + 10);

            double x11 = x1 + ((gkPoint - mapSpace.get("width")+12) / 2);
            double x11 = x1 + ((gkPoint - mapSpace.get("width") + 12) / 2);
            JsonUtils2.setJsonValueByPath(textJson, "position/x".split("/"), x11);
            JsonUtils2.setJsonValueByPath(textJson, "position/y".split("/"), y1-10);
            JsonUtils2.setJsonValueByPath(textJson, "position/y".split("/"), y1 - 10);
            jsonArray.add(textJson);
            x1 = x2;
        }

        JSONObject modelJson3 = new JSONObject(templetsStrMap.get("model"));
        setlineXy(modelJson3, 0, y, x2, y, null);
        jsonArray.add(modelJson3);
@@ -306,15 +324,134 @@

            double x11 = x - mapSpace.get("width") / 2 - 5;
            JsonUtils2.setJsonValueByPath(textJson, "position/x".split("/"), x11);
            JsonUtils2.setJsonValueByPath(textJson, "position/y".split("/"), y2-10);
            JsonUtils2.setJsonValueByPath(textJson, "position/y".split("/"), y2 - 10);
            jsonArray.add(textJson);

            curPointHour += periodHour;
        }

        List<TimeDiagramStatusDto> statusDtoListNew = new ArrayList<>();
        while (statusDtoListOld.size() > 0) {
            statusDtoListOld.stream().sorted(Comparator.comparing(TimeDiagramStatusDto::getX1)).collect(Collectors.toList());
            TimeDiagramStatusDto nextStatusDto = statusDtoListOld.get(0);
            if (statusDtoListNew.size() == 0) {
                statusDtoListNew.add(nextStatusDto);
            } else {
                TimeDiagramStatusDto currentStatusDto = statusDtoListNew.get(statusDtoListNew.size() - 1);
                if (nextStatusDto.getStatus() < currentStatusDto.getStatus()) {
                    if (nextStatusDto.getX1() == currentStatusDto.getX1() && nextStatusDto.getX2() == currentStatusDto.getX2()) {
                        currentStatusDto.setStatus(nextStatusDto.getStatus());
                    } else if (nextStatusDto.getX1() == currentStatusDto.getX1() && nextStatusDto.getX2() < currentStatusDto.getX2()) {
                        statusDtoListOld.add(new TimeDiagramStatusDto(nextStatusDto.getX2(), currentStatusDto.getX2(), currentStatusDto.getStatus()));
                        currentStatusDto.setStatus(nextStatusDto.getStatus());
                        currentStatusDto.setX2(nextStatusDto.getX2());
                    } else if (nextStatusDto.getX1() == currentStatusDto.getX1() && nextStatusDto.getX2() > currentStatusDto.getX2()) {
                        currentStatusDto.setStatus(nextStatusDto.getStatus());
                        currentStatusDto.setX2(nextStatusDto.getX2());
                    } else if (nextStatusDto.getX1() > currentStatusDto.getX1() && nextStatusDto.getX2() >= currentStatusDto.getX2()) {
                        currentStatusDto.setX2(nextStatusDto.getX1());
                        statusDtoListNew.add(new TimeDiagramStatusDto(nextStatusDto.getX1(), nextStatusDto.getX2(), nextStatusDto.getStatus()));
                    } else if (nextStatusDto.getX1() > currentStatusDto.getX1() && nextStatusDto.getX2() < currentStatusDto.getX2()) {
                        currentStatusDto.setX2(nextStatusDto.getX1());
                        statusDtoListNew.add(new TimeDiagramStatusDto(nextStatusDto.getX1(), nextStatusDto.getX2(), nextStatusDto.getStatus()));
                        statusDtoListOld.add(new TimeDiagramStatusDto(nextStatusDto.getX2(), currentStatusDto.getX2(), currentStatusDto.getStatus()));
                    }
                } else {
                    if (nextStatusDto.getX2() > currentStatusDto.getX2()) {
                        statusDtoListOld.add(new TimeDiagramStatusDto(currentStatusDto.getX2(), nextStatusDto.getX2(), nextStatusDto.getStatus()));
                    }
                }
            }
            statusDtoListOld.remove(0);
        }
        timeDiagramDto.setTotalWidth(x2);
        double pointRate = timeDiagramDto.getTotalWidth() / timeDiagramDto.getSmallWidth();

        return jsonObject.toString();
        List<List<TimeDiagramStatusDto>> lineArray = new ArrayList();
        lineArray.add(statusDtoList);
        lineArray.add(statusDtoListNew);

        List<List<TimeDiagramStatusDto>> smallStatusDtoList = new ArrayList<>();
        for (int j = 0; j < lineArray.size(); j++) {
            List<TimeDiagramStatusDto> tmpStatusDtoList = new ArrayList<>();
            int lastStatus = 5;
            Boolean isFirst = true;
            x1 = 0;
            for (double i = 0; i < timeDiagramDto.getSmallWidth(); i = i + timeDiagramDto.getMinPointNum()) {
                int netStatus = getPointStatus(lineArray.get(j), i * pointRate, (i + timeDiagramDto.getMinPointNum()) * pointRate - 1);
                if (!isFirst) {
                    if (lastStatus != netStatus) {
                        tmpStatusDtoList.add(new TimeDiagramStatusDto(x1, x2, lastStatus));
                        lastStatus = netStatus;
                        x1 = i;
                    }
                } else {
                    lastStatus = netStatus;
                    isFirst = false;
                }
                x2 = i + timeDiagramDto.getMinPointNum() - 1;
            }
            tmpStatusDtoList.add(new TimeDiagramStatusDto(x1, x2, lastStatus));
            smallStatusDtoList.add(tmpStatusDtoList);
        }

        JSONObject jsonObject2 = new JSONObject(modelStr2);
        JSONArray jsonArray2 = jsonObject2.getJSONArray("cells");
        y = 10;
        for (int i = 0; i < smallStatusDtoList.size(); i++) {
            for (TimeDiagramStatusDto status : smallStatusDtoList.get(i)) {
                JSONObject lineJson = new JSONObject(templetsStrMap2.get(status.getStatus()));
                setlineXy(lineJson, status.getX1(), y, status.getX2() + 5, y, "");
                JsonUtils2.setJsonValueByPath(lineJson, "data/status".split("/"), status.getStatus());
                JsonUtils2.setJsonValueByPath(lineJson, "id".split("/"), UUIDUtil.generateId().toString());
                jsonArray2.add(lineJson);
            }
            y = y + 25;
        }

        //图例
        int spaceWitdth = 80;
        x1 = 0;
        x2 = spaceWitdth - 11;
        y = 60;
        String[] tlArr = "O,F,I,S,M".split(",");
        for (String s : tlArr) {
            JSONObject f = templetsMap.get(s);
            x1 = x1 + spaceWitdth;
            x2 = x2 + spaceWitdth;
            setlineXy(f, x1, y, x2, y, null);
            jsonArray2.add(f);
        }
        timeDiagramDto.setDiagramJson(jsonObject.toString());
        timeDiagramDto.setSmallDiagramJson(jsonObject2.toString());
        timeDiagramDto.setTextDiagramJson(jsonObject3.toString());

        return timeDiagramDto;
    }

    private int getPointStatus(List<TimeDiagramStatusDto> dtoList, double x1, double x2) {
        int status = 5;
        boolean findStart = false;
        for (int i = 0; i < dtoList.size(); i++) {
            if (x2 <= dtoList.get(i).getX1()) {
                break;
            }

            if (!findStart) {
                if (dtoList.get(i).getX1() >= x1 && x1 <= dtoList.get(i).getX2()) {
                    status = dtoList.get(i).getStatus();
                    findStart = true;
                }
            }

            if (dtoList.get(i).getX2() >= x2) {
                if (dtoList.get(i).getStatus() < status)
                    status = dtoList.get(i).getStatus();
            }
        }
        return status;
    }


    public void setlineXy(JSONObject lineJson, double x1, double y1, double x2, double y2, String text) {
        JsonUtils2.setJsonValueByPath(lineJson, "source/x".split("/"), x1);
@@ -327,12 +464,14 @@
        }
    }

    public void getPetsInfo() {
    public String getPetsInfo() {
        Map<String, Object> params = new HashMap<String, Object>();
        params.put("projectId", 10000);
        params.put("diagramId", 10000);
        String modelStr2 = "";
        List<TimeDiagram> list_style = baseDao.getTimeDiagram(params);
        if (list_style.size() > 0) {
            modelStr2 = list_style.get(0).getContent2();
            String modelStr = list_style.get(0).getContent();
            JSONObject modelJson = new JSONObject(modelStr);
            JSONArray modelJsonArray = modelJson.getJSONArray("cells");
@@ -346,22 +485,27 @@
                    if ("运行".equals(nodeMarker)) {
                        templetsMap.put("O", jsonObject);
                        templetsStrMap.put("O", jsonObject.toString());
                        templetsStrMap2.put(5, jsonObject.toString());
                    }
                    if ("故障".equals(nodeMarker)) {
                        templetsMap.put("F", jsonObject);
                        templetsStrMap.put("F", jsonObject.toString());
                        templetsStrMap2.put(1, jsonObject.toString());
                    }
                    if ("空闲".equals(nodeMarker)) {
                        templetsMap.put("I", jsonObject);
                        templetsStrMap.put("I", jsonObject.toString());
                        templetsStrMap2.put(3, jsonObject.toString());
                    }
                    if ("备份".equals(nodeMarker)) {
                        templetsMap.put("S", jsonObject);
                        templetsStrMap.put("S", jsonObject.toString());
                        templetsStrMap2.put(2, jsonObject.toString());
                    }
                    if ("未用".equals(nodeMarker)) {
                        templetsMap.put("M", jsonObject);
                        templetsStrMap.put("M", jsonObject.toString());
                        templetsStrMap2.put(4, jsonObject.toString());
                    }
                    if ("模型".equals(nodeMarker)) {
                        JsonUtils2.setJsonValueByPath(tmpJSONObject, "attrs/text/text".split("/"), "");
@@ -400,6 +544,7 @@
                }
            }
        }
        return modelStr2;
    }

    public List<ProductStatusDto> getStatusData(Long productId, Long taskId) {
@@ -473,16 +618,20 @@
    }

    @Transactional(rollbackFor = Exception.class)
    public Result simulate(SimulatAssess simulatAssess) {
        Result result = null;
    public List<TaskModelCheckResultDto> simulateChecK(SimulatAssess simulatAssess) {
        List<TaskModelCheckResultDto> result = null;
        // 1. 检查模型完整性
        List<TaskModelCheckResultDto> chkResult = taskService.checkTaskModel(simulatAssess.getProductId(),
                simulatAssess.getTaskModelId());
        if (chkResult.size() > 0) {
            result = Result.error("模型不完整，请检查模型定义及参数配置。");
            return result;
            return chkResult;
        }
        return result;
    }

    @Transactional(rollbackFor = Exception.class)
    public Boolean simulate(SimulatAssess simulatAssess) {
        Boolean result = false;
        // 2. 组装供算法库仿真的模型xml
        assembleModelXml(simulatAssess);

@@ -492,12 +641,16 @@
        return result;
    }

    private Result callReliaSimLib(SimulatAssess simulatAssess) {
        Result result = null;
    private Boolean callReliaSimLib(SimulatAssess simulatAssess) {
        Boolean result = false;
        InputStream is = null;
        BufferedReader br = null;
        try {
            setParamToRedis(simulatAssess);
            try {
                setParamToRedis(simulatAssess);
            } catch (Exception e) {
                throw new RenException("访问Redis失败。请检查Redis是否已启动。");
            }

            Process process = null;
            String command = "python " + reliaSimMain;
@@ -509,7 +662,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();
            // 以命令行方式调用算法库时，接口约定返回的结果是utf-8编码
@@ -520,17 +673,17 @@
            if (line != null) {
                ReliaSimLibResult rtn = com.alibaba.fastjson.JSONObject.parseObject(line, ReliaSimLibResult.class);
                if ("0".equals(rtn.getCode())) {
                    logger.info("启动算法库成功。");
                    result = Result.ok();
                    logger.info("启动可靠性仿真评估算法库成功。");
                    result = true;
                } else {
                    String errorMsg = rtn.getErrorMsg();
                    throw new RuntimeException("启动算法库失败: errorMsg=" + errorMsg);
                    throw new RenException("启动可靠性仿真评估算法库失败: errorMsg=" + errorMsg);
                }
            }
        } catch (Exception e) {
            logger.error("启动算法库仿真时发生Exception：", e);
        } catch (IOException e) {
            logger.error("启动可靠性仿真评估算法库仿真时发生Exception：", e);
            e.printStackTrace();
            result = Result.error(e.getMessage());
            throw new RenException("启动可靠性仿真评估算法库失败: errorMsg=" + e.getMessage());
        } finally {
            if (is != null) {
                try {
@@ -583,6 +736,9 @@
        List<ParamData> paramDataList = paramDataDao.getDeviceParams(productId);
        Long taskId = simulatAssess.getTaskModelId();
        Task task = taskService.get(taskId);
        if (simulatAssess.getTaskDuration() != null) {
            task.setTaskDuration(simulatAssess.getTaskDuration());
        }
        List<TaskBinoParam> binoParams = taskBinoParamDao.getBinoParams(taskId);

        // 1. 计算各任务阶段的运行时长
@@ -602,7 +758,8 @@
            Element root = document.addElement("des");
            root.addAttribute("name", "General system");
            addTasksTag(taskPhaseModelAll, root);
            addModelsTag(taskId,
            addModelsTag(simulatAssess,
                    taskId,
                    productId,
                    product.getName(),
                    product.getNamePath(),
@@ -635,7 +792,7 @@
            insert(simulatAssess);
        } catch (Exception e) {
            e.printStackTrace();
            throw new RuntimeException("组装算法库仿真计算用模型XML失败: " + e.getMessage());
            throw new RenException("组装算法库仿真计算用模型XML失败: " + e.getMessage());
        }
    }

@@ -669,7 +826,7 @@
    }

    public void addTasksTag(List<TaskPhaseModel> taskPhaseModelAll,
                             Element root) {
                            Element root) {
        Element tasksTag = root.addElement("tasks");
        for (TaskPhaseModel taskPhaseModel : taskPhaseModelAll) {
            Element taskTag = tasksTag.addElement("task");
@@ -739,6 +896,10 @@
                    ele = repairModelTag.addElement("shape");
                    ele.addAttribute("value", String.valueOf(repairModel.getParam3()));
                    break;
                case RepairModel.TYPE_DIRAC:
                    ele = repairModelTag.addElement("repair-time");
                    ele.addAttribute("value", String.valueOf(repairModel.getParam1()));
                    break;
                default:
                    break;
            }
@@ -746,7 +907,7 @@
    }

    public void calcTaskPhaseModelDuration(TaskPhase taskPhase,
                                            List<TaskPhaseModel> taskPhaseModelAll) {
                                           List<TaskPhaseModel> taskPhaseModelAll) {
        List<TaskPhaseModel> taskPhaseModels = taskPhaseModelDao.getListByPhaseId(taskPhase.getId());
        double totalRate = taskPhaseModels.stream().mapToDouble(TaskPhaseModel::getOperatConditDurationRate).sum();
        double sum = 0.0;
@@ -781,7 +942,8 @@
        return taskPhases;
    }

    private void addModelsTag(Long taskId,
    private void addModelsTag(SimulatAssess simulatAssess,
                              Long taskId,
                              Long productId,
                              String productName,
                              String productNamePath,
@@ -807,7 +969,8 @@
                    "end".equals(item.getAlgorithmType())).collect(Collectors.toList()).get(0);
            ModelNode computerNode = modelNodeAndVnodeList.stream().filter(item ->
                    endAlgo.getComputerList().equals(item.getId().toString())).collect(Collectors.toList()).get(0);
            node2DOM(taskId,
            node2DOM(simulatAssess,
                    taskId,
                    taskPhaseModel,
                    gkModelTop.getModelId(),
                    productId,
@@ -825,7 +988,8 @@
    }

    // 递归函数
    private void node2DOM(Long taskId,
    private void node2DOM(SimulatAssess simulatAssess,
                          Long taskId,
                          TaskPhaseModel taskPhaseModel,
                          Long modelId,
                          Long productId,
@@ -855,7 +1019,8 @@
                        "end".equals(item.getAlgorithmType())).collect(Collectors.toList()).get(0);
                ModelNode computerNode = modelNodeAndVnodeListSub.stream().filter(item ->
                        endAlgo.getComputerList().equals(item.getId().toString())).collect(Collectors.toList()).get(0);
                node2DOM(taskId,
                node2DOM(simulatAssess,
                        taskId,
                        taskPhaseModel,
                        gkModel.getModelId(),
                        product.getId(),
@@ -871,9 +1036,10 @@
                        failureModels, repairModels);
            } else if ("5".equals(product.getProductType())) {
                // 设备
                Integer deviceNo = node.getDeviceNo();
                Element nodeTag = parent.addElement("node");
                nodeTag.addAttribute("name", dataId.toString());
                nodeTag.addAttribute("real_name", product.getName());
                nodeTag.addAttribute("name", deviceNo == 0 ? dataId.toString() : dataId.toString()+"-"+deviceNo);
                nodeTag.addAttribute("real_name", deviceNo == 0 ? product.getName() : product.getName()+"-"+deviceNo);
                nodeTag.addAttribute("name_path", product.getNamePath());
                nodeTag.addAttribute("type", "node");

@@ -905,7 +1071,12 @@

                if (1 == paramData.getRepairable()) {
                    // 可维修
                    RepairModel repairModel = createRepairModel(paramData);
                    RepairModel repairModel = null;
                    if (isRepairDirac(simulatAssess.getRepairDiracFlag(), taskPhaseModel, product.getId())) {
                        repairModel = createRepairModelDirac(0);
                    } else {
                        repairModel = createRepairModel(paramData);
                    }
                    repairModels.add(repairModel);
                    Element repairTag = nodeTag.addElement("repair_model");
                    repairTag.addAttribute("name", repairModel.getId().toString());
@@ -932,6 +1103,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");
            }
@@ -939,7 +1111,8 @@
            for (String nodeStr : computerNodeListStr) {
                ModelNode mn = modelNodeAndVnodeList.stream().filter(item ->
                        nodeStr.equals(item.getId().toString())).collect(Collectors.toList()).get(0);
                node2DOM(taskId,
                node2DOM(simulatAssess,
                        taskId,
                        taskPhaseModel,
                        modelId,
                        null,
@@ -974,7 +1147,8 @@
                break;
            case 3:
                // 二项分布
                if (taskBinoParam.getSimulatTimes().intValue() == taskBinoParam.getSuccessTimes().intValue()) {
                if ((taskBinoParam.getSimulatTimes() == null && taskBinoParam.getSuccessTimes() == null) ||
                        (taskBinoParam.getSimulatTimes().intValue() == taskBinoParam.getSuccessTimes().intValue())) {
                    // 相等则为成败型
                    failureModel.setType(FailureModel.TYPE_FIX);
                    failureModel.setParam1(taskBinoParam.getSuccessRate());
@@ -993,23 +1167,43 @@
        return failureModel;
    }

    private boolean isRepairDirac(boolean repairDiracFlag, TaskPhaseModel taskPhaseModel, Long productId) {
        boolean result = false;

        if (repairDiracFlag) {
            if (taskPhaseModel.getPhaseConstraints() != null) {
                List<TaskPhaseConstraintDto> list = taskPhaseModel.getPhaseConstraints().stream().filter(item ->
                        productId.equals(item.getProductId())).collect(Collectors.toList());
                if (list.size() == 0) {
                    result = true;
                }
            }
        }

        return result;
    }

    private RepairModel createRepairModelDirac(double time) {
        RepairModel repairModel = new RepairModel();
        repairModel.setId(UUIDUtil.generateId());
        repairModel.setParam1(0);
        return repairModel;
    }

    private RepairModel createRepairModel(ParamData paramData) {
        RepairModel repairModel = new RepairModel();
        repairModel.setId(UUIDUtil.generateId());
        switch (paramData.getRepairDistribType()) {
            case 1:
                // 指数分布
                repairModel.setType(FailureModel.TYPE_EXP);
                repairModel.setType(RepairModel.TYPE_EXP);
                repairModel.setParam1(1.0 / paramData.getRepairMttcr());
                break;
            case 2:
                // 威布尔分布
                repairModel.setType(FailureModel.TYPE_WBL);
                repairModel.setType(RepairModel.TYPE_WBL);
                repairModel.setParam2(paramData.getRepairMttcrOtherParams2());
                repairModel.setParam3(paramData.getRepairMttcrOtherParams3());
                break;
            case 3:
                // 二项分布（维修没有）
                break;
            default:
                break;
@@ -1038,6 +1232,7 @@
            } catch (IOException e) {
                e.printStackTrace();
            }

        }

        List<WeakDto> productList = baseDao.getProductList(taskId, productId);
@@ -1052,35 +1247,41 @@
            Object nameValue = jsonArray.getJSONObject(i).get("name");
            if (nameValue instanceof Long) {
                productId1 = (Long) nameValue;
                WeakDto weakDto = map.get(productId1);
                Double mtbfTime = null;
                if (map.get(productId1) != null) {
                    WeakDto weakDto = map.get(productId1);
                    Double mtbfTime = null;

                Double mtbf = (Double) jsonArray.getJSONObject(i).get("mttf");
                Double mttr = (Double) jsonArray.getJSONObject(i).get("mttr");
                Double msr = (Double) jsonArray.getJSONObject(i).get("msr");
                    Double mtbf = (Double) jsonArray.getJSONObject(i).get("mttf");
                    Double mttr = (Double) jsonArray.getJSONObject(i).get("mttr");
                    Double msr = (Double) jsonArray.getJSONObject(i).get("msr");

                data.setMtbf(mtbf);
                data.setMttr(mttr);
                data.setMsr(msr);
                    data.setMtbf(mtbf);
                    data.setMttr(mttr);
                    data.setMsr(msr);

                if (weakDto != null) {
                    data.setId(weakDto.getId());
                    data.setSort(weakDto.getSort());
                    data.setPid(weakDto.getPid());
                    data.setName(weakDto.getName());
                    data.setProductType(weakDto.getProductType());
                    data.setTimeRate(weakDto.getTimeRate());
                    mtbfTime = mtbf / weakDto.getTimeRate();
                    if (weakDto != null) {
                        data.setId(weakDto.getId());
                        data.setSort(weakDto.getSort());
                        data.setPid(weakDto.getPid());
                        data.setName(weakDto.getName());
                        data.setProductType(weakDto.getProductType());
                        data.setTimeRate(weakDto.getTimeRate());
                        mtbfTime = mtbf / weakDto.getTimeRate();
                    }

                    data.setMtbfTime(mtbfTime);
                    data.setIsWeak(0);

                    list.add(data);
                }

                data.setMtbfTime(mtbfTime);
                data.setIsWeak(0);

                list.add(data);
            }
        }
        List<WeakDto> treeList = TreeUtils.build(list);
        this.getIsweak(treeList.get(0).getChildren());
        List<WeakDto> treeList = new ArrayList<>();
        if (list.size() > 0) {
            treeList = TreeUtils.build(list);
            this.getIsweak(treeList.get(0).getChildren());
        }

        return treeList;
    }

@@ -1102,43 +1303,55 @@
        }
    }

    public SchemeComparDto SchemeCompar(String[] taskList, Long showProductId) {
        SchemeComparDto dto = new SchemeComparDto();
    public SimulatResult SchemeCompar(String[] taskList, Long showProductId, Integer samplPeriod, Integer simulatFrequency) {
        SimulatResult simulatResult = new SimulatResult();
        List<Long> idList = new ArrayList<>();
        List<TaskModelCheckResultDto> result = null;
/*        SchemeComparDto dto = new SchemeComparDto();
        List<SimulaDataDto> dataDtoList = new ArrayList<>();
        List<SchemeComparCurve> curveList = new ArrayList<>();
        List<Double> xData = new ArrayList<>();
        SimulatAssess simulatAssess;
        SimulaDataDto data;

        SimulaDataDto data;*/

        List<SimulatAssess> simulatAssessList = new ArrayList<>();

        Task task;
        double maxTaskDuration = 0.0;
        for (String taskId : taskList) {
            Long taskModelId = Long.parseLong(taskId);
            task = taskService.get(taskModelId);
            simulatAssess = this.getByTaskId(taskModelId);
            SimulaDataDto resultData;
            if (showProductId!=null){
                simulatAssess.setProductId(showProductId);
                resultData =this.getResultXML(simulatAssess);
            }else{
                resultData = this.getResultXML(simulatAssess);
            task = taskService.get(Long.parseLong(taskId));
            if (task.getTaskDuration() > maxTaskDuration) {
                maxTaskDuration = task.getTaskDuration();
            }

            data = resultData;
            data.setName(task.getTaskName());
            dataDtoList.add(data);
            xData = resultData.getCurveParam().getXData();
            SimulatAssess simulatAssess = new SimulatAssess();
            Long id = UUIDUtil.generateId();
            simulatAssess.setId(id);
            simulatAssess.setName("");
            simulatAssess.setProductId(showProductId);
            simulatAssess.setSamplPeriod(samplPeriod);
            simulatAssess.setSimulatFrequency(simulatFrequency);
            simulatAssess.setTaskDuration(maxTaskDuration);
            simulatAssess.setTaskModelId(Long.parseLong(taskId));

            SchemeComparCurve curve = new SchemeComparCurve();
            curve.setName(task.getTaskName());
            curve.setSmooth(true);
            curve.setType("line");
            curve.setData(resultData.getCurveParam().getYData());
            curveList.add(curve);
            simulatAssessList.add(simulatAssess);
            result = simulateChecK(simulatAssess);
            if (result!=null){
                simulatResult.setType("errorList");
                simulatResult.setErrList(result);
                return simulatResult;
            }
            idList.add(id);
        }
        dto.setXDataList(xData);
        dto.setDataList(dataDtoList);
        dto.setCurveList(curveList);
        return dto;

        for (SimulatAssess simulatAssess : simulatAssessList) {
            simulatAssess.setTaskDuration(maxTaskDuration);
            this.simulate(simulatAssess);
        }

        simulatResult.setType("idList");
        simulatResult.setIdList(idList);
        return simulatResult;
    }

    public SimulaDataDto getResultXML(SimulatAssess simulatAssess) {
@@ -1225,4 +1438,134 @@
        }
        return data;
    }

    public String verify(Long taskId) {
        StringBuilder result = new StringBuilder();
        Task task = taskService.get(taskId);
        double taskTime = task.getTaskDuration();
        List<OperatConditModel> list = baseDao.getModel(taskId);
        List<Double> reliabiyList = new ArrayList<>();
        String modelStr2 = "";
        for (OperatConditModel model : list) {
            if (model.getProductId().equals(task.getProductId())) {
                modelStr2 = model.getContent();
                continue;
            }
            List<verifyDto> listNodes = baseDao.getNode(model.getModelId());
            for (verifyDto node : listNodes) {
                //lmd,reliabiy,failRate
                double lmd = 1 / node.getMtbf();
                double reliabiy = Math.exp(-1 * lmd * taskTime);
                double failRate = 1 - reliabiy;
                node.setLmd(lmd);
                node.setReliabiy(reliabiy);
                node.setFailRate(failRate);
            }
            int total = listNodes.size();
            String modelStr = model.getContent();
            //找到表决数量

            if (modelStr.contains("switch")) {
                double a = 0;
                double lmd = listNodes.get(0).getLmd();
                result.append("\n").append(total).append("个相同设备旁联,3选1,MTTBCF是").append(listNodes.get(0).getMtbf()).append("\n");
                for (int i = 0; i <= total - 1; i++) {
                    double ijc = getjc(i);
                    double b = Math.pow(taskTime * lmd, i) * Math.exp(-1 * lmd * taskTime) / ijc;
                    a = a + b;
                    result.append("有").append(i + 1).append("个设备好的的概率为").append(b).append("\n");
                }
                result.append("整个旁联系统的可靠度为").append(new Formatter().format("%.4f", a)).append("\n");
                reliabiyList.add(a);
            } else if (modelStr.contains("parallel")) {
                double a = 1;
                result.append("\n并联设备有").append(total).append("个\n");
                for (int i = 0; i < listNodes.size(); i++) {
                    a = a * listNodes.get(i).getFailRate();
                    result.append("第").append(i + 1).append("个设备的MTBCF为").append(listNodes.get(i).getMtbf()).append(",").append(i + 1).append("个设备并联的失效率为").append(a).append("\n");
                }
                double reliabiy = 1 - a;
                result.append("整个并联系统的失效率为").append(a).append("整个并联系统的可靠度为").append(new Formatter().format("%.4f", reliabiy)).append("\n");
                reliabiyList.add(reliabiy);
            } else if (modelStr.contains("vote")) {
                Integer voteNum = baseDao.getVoteNum(model.getModelId());
                if (voteNum != null) {
                    result.append("\n").append(total).append("个相同设备表决,MTBCF为").append(listNodes.get(0).getMtbf()).append("表决数量为").append(voteNum).append("个\n");
                    double a = 0;
                    double zjc = getjc(total);
                    double reliabiy = listNodes.get(0).getReliabiy();
                    for (int i = voteNum; i <= total; i++) {
                        double ijc = getjc(i);
                        double nijc = getjc(total - i);
                        double b = (zjc / (ijc * nijc)) * Math.pow(reliabiy, i) * Math.pow(1 - reliabiy, total - i);
                        a = a + b;
                        result.append("有").append(i).append("个设备是好的概率为").append(b).append("\n");
                    }
                    result.append("整个表决系统的可靠度为").append(new Formatter().format("%.4f", a)).append("\n");
                    reliabiyList.add(a);
                }

            }
        }
        double totalReliabiy = 1;
        if (modelStr2.contains("parallel")) {
            for (Double reliabiy : reliabiyList) {
                totalReliabiy = totalReliabiy * (1 - reliabiy);
            }
            totalReliabiy = 1 - totalReliabiy;
        } else {
            for (Double reliabiy : reliabiyList) {
                totalReliabiy = totalReliabiy * reliabiy;
            }
        }
        result.append("\n整个总体系统的可靠度为").append(totalReliabiy).append("\n");
        return String.valueOf(result);
    }

    Double getjc(int a) {
        double result = 1.0;
        for (int i = a; i > 0; i--)
            result = result * i;
        return result;
    }

    public SchemeComparDto getEcharts(String[] taskList, Long showProductId) {
        SchemeComparDto dto = new SchemeComparDto();
        List<SimulaDataDto> dataDtoList = new ArrayList<>();
        List<SchemeComparCurve> curveList = new ArrayList<>();
        List<Double> xData = new ArrayList<>();
        SimulatAssess simulatAssess;
        SimulaDataDto data;

        Task task;
        for (String taskId : taskList) {
            Long taskModelId = Long.parseLong(taskId);
            task = taskService.get(taskModelId);
            simulatAssess = this.getByTaskId(taskModelId);
            simulatAssess.setDataType("fz");
            SimulaDataDto resultData;
            if (showProductId != null) {
                simulatAssess.setProductId(showProductId);
                resultData = this.getResultXML(simulatAssess);
            } else {
                resultData = this.getResultXML(simulatAssess);
            }

            data = resultData;
            data.setName(task.getTaskName());
            dataDtoList.add(data);
            xData = resultData.getCurveParam().getXData();

            SchemeComparCurve curve = new SchemeComparCurve();
            curve.setName(task.getTaskName());
            curve.setSmooth(true);
            curve.setType("line");
            curve.setData(resultData.getCurveParam().getYData());
            curveList.add(curve);
        }
        dto.setXDataList(xData);
        dto.setDataList(dataDtoList);
        dto.setCurveList(curveList);
        return dto;
    }
}