修改仿真

xyc

2024-08-02 d9b3b4b0ad0f4022cbb406a9fb3ad56a5e7f7ff3

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

@@ -279,12 +279,13 @@
        setlineXy(modelJson3, 0, y, x2, y, null);
        jsonArray.add(modelJson3);

        double curPointHour = 50, periodHour = 50;
        double curPointHour = 10, periodHour = 50;
        while (curPointHour < totalHours) {
            JSONObject modelJson4 = new JSONObject(templetsStrMap.get("model"));
            double x = curPointHour * pointNumPerHour;
            setlineXy(modelJson4, x, y, x, y, null);
            jsonArray.add(modelJson4);
            curPointHour += 10.0;
        }

        return jsonObject.toString();
@@ -956,7 +957,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(productList,
            node2DOM(productId,
                    productList,
                    paramDataList,
                    gkModelsAssembled,
                    algorithmList,
@@ -969,7 +971,8 @@
    }

    // 递归函数
    private void node2DOM(List<XhProductModel> productList,
    private void node2DOM(Long productId,
                          List<XhProductModel> productList,
                          List<ParamData> paramDataList,
                          List<OperatConditModel> gkModelsAssembled,
                          List<Algorithm> algorithmList,
@@ -994,7 +997,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(productList,
                node2DOM(product.getId(),
                        productList,
                        paramDataList,
                        gkModelsAssembled,
                        algorithmListSub,
@@ -1034,7 +1038,11 @@
            Algorithm algo = algorithmList.stream().filter(item ->
                    node.getId().equals(item.getId())).collect(Collectors.toList()).get(0);
            Element element = parent.addElement("logic");
            if (null == productId) {
            element.addAttribute("name", algo.getId().toString());
            } else {
                element.addAttribute("name", productId.toString());
            }
            if ("series".equals(algo.getAlgorithmType())) {
                element.addAttribute("type", "series");
            } else if ("parallel".equals(algo.getAlgorithmType())) {
@@ -1051,7 +1059,8 @@
            for (String nodeStr : computerNodeListStr) {
                ModelNode mn = modelNodeAndVnodeList.stream().filter(item ->
                        nodeStr.equals(item.getId().toString())).collect(Collectors.toList()).get(0);
                node2DOM(productList,
                node2DOM(null,
                        productList,
                        paramDataList,
                        gkModelsAssembled,
                        algorithmList,