1）新增可靠性评定XML生成功能； 2）可靠性仿真评估与可靠性评定的算法包分开成2个包，启动脚本也相应地分开。

xyc

2024-09-26 12d84be70c42c5669ffc5db470ff54b71d093728

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

@@ -14,7 +14,6 @@
import com.zt.life.modules.mainPart.basicInfo.dao.XhProductModelDao;
import com.zt.life.modules.mainPart.basicInfo.model.ParamData;
import com.zt.life.modules.mainPart.basicInfo.model.XhProductModel;
import com.zt.life.modules.mainPart.basicInfo.service.XhProductModelService;
import com.zt.life.modules.mainPart.taskReliability.dao.*;
import com.zt.common.utils.JsonUtils2;
import com.zt.life.modules.mainPart.taskReliability.dao.SimulatAssessDao;
@@ -75,8 +74,6 @@
    private RedisTemplate redisTemplate;
    @Autowired
    private TaskService taskService;
    @Autowired
    private XhProductModelService xhProductModelService;
    @Autowired
    private SimulatAssessTaskPhaseModelService simulatAssessTaskPhaseModelService;
    @Autowired
@@ -184,7 +181,7 @@
        this.getPetsInfo();
        double x1 = 0;
        double x2 = 0;
        int y = 0;
        int y = -10;
        int groupY = 0;
        int spaceHeight = 20;
        int groupHeight = 20;
@@ -225,14 +222,13 @@
            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 = -130;
        y = -110;
        String[] tlArr = "O,F,I,S,M".split(",");
        for (String s : tlArr) {
            JSONObject f = templetsMap.get(s);
@@ -245,12 +241,12 @@
        //阶段模型及刻度
        x1 = 0;
        x2 = 0;
        double y1 = -100;
        y = -70;
        double y1 = -80;
        y = -60;
        double y2 = -50;

        JSONObject modelJson = new JSONObject(templetsStrMap.get("model"));
        setlineXy(modelJson, 2, y1, 2, y2, null);
        setlineXy(modelJson, 1, y1, 1, y2, null);
        jsonArray.add(modelJson);
        double totalHours = 0;
        for (int i = 0; i < modelDtoList.size(); i++) {
@@ -274,17 +270,18 @@
                modelName = modelRbd.getModelName();
                modelId = modelRbd.getId().toString();
            }
            Map<String, Integer> mapSpace = GetStringSpace.getStringSpaceSize(modelName, null, 18);
            Map<String, Integer> mapSpace = GetStringSpace.getStringSpaceSize(modelName, null, 12);
            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("/"), modelName);
            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") + 20);
            JsonUtils2.setJsonValueByPath(textJson, "size/width".split("/"), mapSpace.get("width")+10);

            double x11 = x1 + ((gkPoint - mapSpace.get("width") - 20) / 2);
            double x11 = x1 + ((gkPoint - mapSpace.get("width")+12) / 2);
            JsonUtils2.setJsonValueByPath(textJson, "position/x".split("/"), x11);
            JsonUtils2.setJsonValueByPath(textJson, "position/y".split("/"), y1);
            JsonUtils2.setJsonValueByPath(textJson, "position/y".split("/"), y1-10);
            jsonArray.add(textJson);
            x1 = x2;
        }
@@ -292,7 +289,8 @@
        setlineXy(modelJson3, 0, y, x2, y, null);
        jsonArray.add(modelJson3);

        Integer curPointHour = 50, periodHour = 50;
        //刻度
        Integer curPointHour = 100, periodHour = 100;
        while (curPointHour < totalHours) {
            JSONObject modelJson4 = new JSONObject(templetsStrMap.get("model"));
            double x = curPointHour * pointNumPerHour;
@@ -308,7 +306,7 @@

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

            curPointHour += periodHour;
@@ -474,209 +472,6 @@
        timeDiagramDao.updateById(diagram);
    }

/*    public void combineDiagram(TimeDiagram networkDiagram) {

        if (!networkDiagram.getDiagramId().equals(1L) && !networkDiagram.getDiagramId().equals(2L))
            return null;
        Map<String, Object> params = new HashMap<String, Object>();
        params.put("projectId", networkDiagram.getProjectId());

        ProjectNetworkDiagram combineDiagram = null;
        params.put("diagramId", 100);
        List<ProjectNetworkDiagram> list = baseDao.getList(params);
        if (list.size() > 0) {
            combineDiagram = list.get(0);
        }

        ProjectNetworkDiagram phaseDiagram = null;
        params.put("diagramId", 1);
        List<ProjectNetworkDiagram> list1 = baseDao.getList(params);
        if (list1.size() > 0) {
            phaseDiagram = list1.get(0);
        }

        ProjectNetworkDiagram inspectDiagram = null;
        params.put("diagramId", 2);
        List<ProjectNetworkDiagram> list2 = baseDao.getList(params);
        if (list2.size() > 0) {
            inspectDiagram = list2.get(0);
        }

        String jsonStr = "";
        Map<String, Map<String, String>> leftMap = new Hashtable<>();
        Map<String, Map<String, String>> rightMap = new Hashtable<>();
        if (phaseDiagram != null && inspectDiagram != null) {
            String inspectJsonStr = inspectDiagram.getContent();
            JSONObject inspectJsonObj = new JSONObject(inspectJsonStr);
            JSONArray inspectJsonArray = inspectJsonObj.getJSONArray("cells");

            String phaseJsonStr = phaseDiagram.getContent();
            JSONObject phaseJsonObj = new JSONObject(phaseJsonStr);
            JSONArray phaseJsonArray = phaseJsonObj.getJSONArray("cells");

            JSONArray leftArray = inspectJsonArray.stream().filter(iter -> "edge".equals(((JSONObject) iter).get("shape"))
                    && "left".equals(((JSONObject) iter).get("phaseType"))).collect(Collectors.toCollection(JSONArray::new));
            int leftPhaseMaxX = 0;
            int phaseY = 0;
            String leftPhaseMaxId = "";
            for (int i = 0; i < leftArray.size(); i++) {
                Map<String, String> tmpMap = new Hashtable<>();

                JSONObject lineObject = (JSONObject) leftArray.get(i);
                String phaseId = lineObject.getStr("phaseId");
                JSONArray phaseArray = phaseJsonArray.stream().filter(iter -> "custom-circle".equals(((JSONObject) iter).get("shape"))
                        && phaseId.equals(((JSONObject) iter).get("id"))).collect(Collectors.toCollection(JSONArray::new));

                tmpMap.put("lineId", lineObject.getStr("id"));
                tmpMap.put("phaseId", phaseId);
                String portId = "";
                if (phaseArray.size() > 0) {
                    JSONObject phaseObject = (JSONObject) phaseArray.get(0);
                    Object portIdObject = JsonUtils2.getArrJsonValueByPath(phaseObject, "ports/items/".split("/"), "group", "right", "id");
                    //portId = portIdObject == null ? "" : portIdObject.toString();
                    Object xObject = JsonUtils2.getJsonValueByPath(phaseObject, "position/x".split("/"));
                    int x = xObject == null ? 0 : Convert.toInt(xObject.toString());
                    if (x > leftPhaseMaxX) {
                        leftPhaseMaxX = x;
                        leftPhaseMaxId = phaseObject.getStr("id");
                    }
                    if (phaseY == 0) {
                        Object yObject = JsonUtils2.getJsonValueByPath(phaseObject, "position/y".split("/"));
                        phaseY = yObject == null ? 0 : Convert.toInt(yObject.toString());
                    }
                }
                tmpMap.put("portId", portId);
                leftMap.put(lineObject.getStr("id"), tmpMap);
            }

            JSONArray rightArray = inspectJsonArray.stream().filter(iter -> "edge".equals(((JSONObject) iter).get("shape"))
                    && "right".equals(((JSONObject) iter).get("phaseType"))).collect(Collectors.toCollection(JSONArray::new));
            int rightPhaseMinX = 10000000;
            String rightPhaseMinId = "";
            for (int i = 0; i < rightArray.size(); i++) {
                Map<String, String> tmpMap = new Hashtable<>();

                JSONObject lineObject = (JSONObject) rightArray.get(i);
                String phaseId = lineObject.getStr("phaseId");
                JSONArray phaseArray = phaseJsonArray.stream().filter(iter -> "custom-circle".equals(((JSONObject) iter).get("shape"))
                        && phaseId.equals(((JSONObject) iter).get("id"))).collect(Collectors.toCollection(JSONArray::new));

                tmpMap.put("lineId", lineObject.getStr("id"));
                tmpMap.put("phaseId", phaseId);
                String portId = "";
                if (phaseArray.size() > 0) {
                    JSONObject phaseObject = (JSONObject) phaseArray.get(0);
                    Object portIdObject = JsonUtils2.getArrJsonValueByPath(phaseObject, "ports/items/".split("/"), "group", "left", "id");
                    //portId = portIdObject == null ? "" : portIdObject.toString();
                    Object xObject = JsonUtils2.getJsonValueByPath(phaseObject, "position/x".split("/"));
                    int x = xObject == null ? 100000000 : Convert.toInt(xObject.toString());
                    if (x < rightPhaseMinX) {
                        rightPhaseMinX = x;
                        rightPhaseMinId = phaseObject.getStr("id");
                    }
                }
                tmpMap.put("portId", portId);
                rightMap.put(lineObject.getStr("id"), tmpMap);
            }


            JSONArray startArray = inspectJsonArray.stream().filter(iter -> "custom-circle".equals(((JSONObject) iter).get("shape"))
                    && "10000".equals(((JSONObject) iter).get("id"))).collect(Collectors.toCollection(JSONArray::new));
            int inspectBeginX = 0;
            int inspectY = 0;
            if (startArray.size() > 0) {
                JSONObject inspectObject = (JSONObject) startArray.get(0);
                Object xObject = JsonUtils2.getJsonValueByPath(inspectObject, "position/x".split("/"));
                inspectBeginX = xObject == null ? 0 : Convert.toInt(xObject.toString());
                Object yObject = JsonUtils2.getJsonValueByPath(inspectObject, "position/y".split("/"));
                inspectY = yObject == null ? 0 : Convert.toInt(yObject.toString());
            }

            JSONArray endArray = inspectJsonArray.stream().filter(iter -> "custom-circle".equals(((JSONObject) iter).get("shape"))
                    && "20000".equals(((JSONObject) iter).get("id"))).collect(Collectors.toCollection(JSONArray::new));
            int inspectEndX = 10000000;
            if (endArray.size() > 0) {
                JSONObject inspectObject = (JSONObject) endArray.get(0);
                Object xObject = JsonUtils2.getJsonValueByPath(inspectObject, "position/x".split("/"));
                inspectEndX = xObject == null ? 100000000 : Convert.toInt(xObject.toString());
            }

            JSONObject beginObject = null;
            JSONObject endObject = null;
            for (int i = 0; i < inspectJsonArray.size(); i++) {
                JSONObject inspectObject = (JSONObject) inspectJsonArray.get(i);
                String inspectObjectId = inspectObject.getStr("id");
                if (leftMap.get(inspectObjectId) != null) {
                    JsonUtils2.setJsonValueByPath(inspectObject, "target/cell".split("/"), leftMap.get(inspectObjectId).get("phaseId"));
                    JsonUtils2.setJsonValueByPath(inspectObject, "target/port".split("/"), leftMap.get(inspectObjectId).get("portId"));
                }
                if (rightMap.get(inspectObjectId) != null) {
                    JsonUtils2.setJsonValueByPath(inspectObject, "target/cell".split("/"), rightMap.get(inspectObjectId).get("phaseId"));
                    JsonUtils2.setJsonValueByPath(inspectObject, "target/port".split("/"), rightMap.get(inspectObjectId).get("portId"));
                }
                if ("10000".equals(inspectObjectId)) {
                    //inspectJsonArray.remove(inspectObject);
                    beginObject = inspectObject;
                }
                if ("20000".equals(inspectObjectId)) {
                    //inspectJsonArray.remove(inspectObject);
                    endObject = inspectObject;
                }
            }

            if (endObject != null)
                inspectJsonArray.remove(endObject);
            if (beginObject != null)
                inspectJsonArray.remove(beginObject);

            for (int i = 0; i < phaseJsonArray.size(); i++) {
                JSONObject phaseObject = (JSONObject) phaseJsonArray.get(i);
                if ("custom-circle".equals(phaseObject.getStr("shape"))) {
                    Object xObject = JsonUtils2.getJsonValueByPath(phaseObject, "position/x".split("/"));
                    Object yObject = JsonUtils2.getJsonValueByPath(phaseObject, "position/y".split("/"));
                    int x = Convert.toInt(xObject.toString());
                    int y = Convert.toInt(yObject.toString());
                    if (x <= leftPhaseMaxX)
                        x = x + (inspectBeginX - leftPhaseMaxX);
                    else if (x >= rightPhaseMinX)
                        x = x + (inspectEndX - rightPhaseMinX);
                    y = y + (inspectY - phaseY);
                    JsonUtils2.setJsonValueByPath(phaseObject, "position/x".split("/"), x);
                    JsonUtils2.setJsonValueByPath(phaseObject, "position/y".split("/"), y);
                }
            }

            for (int i = 0; i < phaseJsonArray.size(); i++) {
                JSONObject phaseObject = (JSONObject) phaseJsonArray.get(i);
                if ("edge".equals(phaseObject.getStr("shape"))) {
                    Object sourceId = JsonUtils2.getJsonValueByPath(phaseObject, "source/cell".split("/"));
                    Object targetId = JsonUtils2.getJsonValueByPath(phaseObject, "target/cell".split("/"));
                    if (leftPhaseMaxId.equals(sourceId) && rightPhaseMinId.equals(targetId)) {
                        phaseJsonArray.remove(phaseObject);
                    }
                }
            }
            inspectJsonArray.addAll(phaseJsonArray);
            jsonStr = inspectJsonObj.toString();
        } else if (phaseDiagram != null) {
            jsonStr = phaseDiagram.getContent();
        } else if (inspectDiagram != null) {
            jsonStr = inspectDiagram.getContent();
        }

        if (combineDiagram != null) {
            combineDiagram.setContent(jsonStr);
            baseDao.updateById(combineDiagram);
        } else {
            combineDiagram = new ProjectNetworkDiagram();
            combineDiagram.setProjectId(networkDiagram.getProjectId());
            combineDiagram.setDiagramId(100L);
            combineDiagram.setContent(jsonStr);
            baseDao.insert(combineDiagram);
        }
        return combineDiagram;
    }*/

    @Transactional(rollbackFor = Exception.class)
    public Result simulate(SimulatAssess simulatAssess) {
        Result result = null;
@@ -783,6 +578,7 @@

    private void assembleModelXml(SimulatAssess simulatAssess) {
        Long productId = simulatAssess.getProductId();
        XhProductModel product = xhProductModelDao.getById(productId);
        List<XhProductModel> productList = xhProductModelDao.getByShipId(productId);
        List<ParamData> paramDataList = paramDataDao.getDeviceParams(productId);
        Long taskId = simulatAssess.getTaskModelId();
@@ -808,6 +604,8 @@
            addTasksTag(taskPhaseModelAll, root);
            addModelsTag(taskId,
                    productId,
                    product.getName(),
                    product.getNamePath(),
                    productList,
                    paramDataList,
                    taskPhaseModelAll,
@@ -834,7 +632,7 @@
                if (xmlWriter != null) xmlWriter.close();
            }
            // XML存盘
            update(simulatAssess);
            insert(simulatAssess);
        } catch (Exception e) {
            e.printStackTrace();
            throw new RuntimeException("组装算法库仿真计算用模型XML失败: " + e.getMessage());
@@ -870,7 +668,7 @@
        }
    }

    private void addTasksTag(List<TaskPhaseModel> taskPhaseModelAll,
    public void addTasksTag(List<TaskPhaseModel> taskPhaseModelAll,
                             Element root) {
        Element tasksTag = root.addElement("tasks");
        for (TaskPhaseModel taskPhaseModel : taskPhaseModelAll) {
@@ -947,7 +745,7 @@
        }
    }

    private void calcTaskPhaseModelDuration(TaskPhase taskPhase,
    public void calcTaskPhaseModelDuration(TaskPhase taskPhase,
                                            List<TaskPhaseModel> taskPhaseModelAll) {
        List<TaskPhaseModel> taskPhaseModels = taskPhaseModelDao.getListByPhaseId(taskPhase.getId());
        double totalRate = taskPhaseModels.stream().mapToDouble(TaskPhaseModel::getOperatConditDurationRate).sum();
@@ -967,7 +765,7 @@
        taskPhaseModels.get(taskPhaseModels.size() - 1).setOperatConditDuration(duration + taskPhase.getPhaseDuration() - sum);
    }

    private List<TaskPhase> calcTaskPhaseDuration(Task task) {
    public List<TaskPhase> calcTaskPhaseDuration(Task task) {
        List<TaskPhase> taskPhases = taskPhaseDao.getListByTaskId(task.getId());
        double totalRate = taskPhases.stream().mapToDouble(TaskPhase::getPhaseDurationRate).sum();
        double sum = 0.0;
@@ -985,6 +783,8 @@

    private void addModelsTag(Long taskId,
                              Long productId,
                              String productName,
                              String productNamePath,
                              List<XhProductModel> productList,
                              List<ParamData> paramDataList,
                              List<TaskPhaseModel> taskPhaseModelAll,
@@ -1011,6 +811,8 @@
                    taskPhaseModel,
                    gkModelTop.getModelId(),
                    productId,
                    productName,
                    productNamePath,
                    productList,
                    paramDataList,
                    gkModelsAssembled,
@@ -1027,6 +829,8 @@
                          TaskPhaseModel taskPhaseModel,
                          Long modelId,
                          Long productId,
                          String productName,
                          String productNamePath,
                          List<XhProductModel> productList,
                          List<ParamData> paramDataList,
                          List<OperatConditModel> gkModelsAssembled,
@@ -1055,6 +859,8 @@
                        taskPhaseModel,
                        gkModel.getModelId(),
                        product.getId(),
                        product.getName(),
                        product.getNamePath(),
                        productList,
                        paramDataList,
                        gkModelsAssembled,
@@ -1067,6 +873,8 @@
                // 设备
                Element nodeTag = parent.addElement("node");
                nodeTag.addAttribute("name", dataId.toString());
                nodeTag.addAttribute("real_name", product.getName());
                nodeTag.addAttribute("name_path", product.getNamePath());
                nodeTag.addAttribute("type", "node");

                ParamData paramData = paramDataList.stream().filter(item ->
@@ -1112,6 +920,8 @@
                element.addAttribute("name", algo.getId().toString());
            } else {
                element.addAttribute("name", productId.toString());
                element.addAttribute("real_name", productName);
                element.addAttribute("name_path", productNamePath);
            }
            if ("series".equals(algo.getAlgorithmType())) {
                element.addAttribute("type", "series");
@@ -1132,6 +942,8 @@
                node2DOM(taskId,
                        taskPhaseModel,
                        modelId,
                        null,
                        null,
                        null,
                        productList,
                        paramDataList,
@@ -1210,16 +1022,19 @@
        String filePath = path + "/" + fzId + "/" + "result.xml";
        List<WeakDto> list = new ArrayList<>();
        Map<Long, WeakDto> map = new HashMap<>();
        String xml = null;
        String xml;
        InputStream in = null;
        try {
            in = new FileInputStream(filePath);
            xml = IOUtils.toString(in);
        } catch (IOException e) {
            e.printStackTrace();
            throw new RenException("文件不存在或者文件打不开");
        } finally {
            try {
                in.close();
                if (in != null) {
                    in.close();
                }
            } catch (IOException e) {
                e.printStackTrace();
            }
@@ -1233,7 +1048,7 @@
        JSONArray jsonArray = xmlJSONObj.getJSONObject("ResultNodes").getJSONArray("ResultNode");
        for (int i = 0; i < jsonArray.size(); i++) {
            WeakDto data = new WeakDto();
            Long productId1 = null;
            Long productId1;
            Object nameValue = jsonArray.getJSONObject(i).get("name");
            if (nameValue instanceof Long) {
                productId1 = (Long) nameValue;
@@ -1302,8 +1117,8 @@
            simulatAssess = this.getByTaskId(taskModelId);
            SimulaDataDto resultData;
            if (showProductId!=null){
                simulatAssess.setShowProductId(showProductId);
                resultData =this.getResultData(simulatAssess);
                simulatAssess.setProductId(showProductId);
                resultData =this.getResultXML(simulatAssess);
            }else{
                resultData = this.getResultXML(simulatAssess);
            }
@@ -1330,19 +1145,23 @@
        if (simulatAssess.getDataType() != null && simulatAssess.getDataType().equals("fz")) {
            Integer num = this.getNumById(simulatAssess.getProductId(), simulatAssess.getTaskModelId());
            simulatAssess.setName("仿真记录" + (num + 1));
            this.insert(simulatAssess);
            this.update(simulatAssess);
        }
        String filePath = path + "/" + simulatAssess.getId() + "/" + "result.xml";
        String xml = null;
        String xml;
        InputStream in = null;

        try {
            in = new FileInputStream(filePath);
            xml = IOUtils.toString(in);
        } catch (IOException e) {
            e.printStackTrace();
            throw new RenException("文件不存在或者文件打不开");
        } finally {
            try {
                in.close();
                if (in != null) {
                    in.close();
                }
            } catch (IOException e) {
                e.printStackTrace();
            }