修改

jinlin

2024-12-02 18f682f736914e427070b9bb769df538ad9f6d1c

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

@@ -561,22 +561,28 @@
        List<ProductStatusDto> dbList = this.getProduct(productId, taskId);
        List<ProductStatusDto> childList = new ArrayList<>();
        for (ProductStatusDto item : dbList) {
            if (item.getSameSbNum() > 1) {
                for (int i = 1; i <= item.getSameSbNum(); i++) {
                    try {
                        ProductStatusDto newRow = item.clone();
            int sameNum = item.getSameSbNum() == null ? 1 : item.getSameSbNum();
            for (int i = 1; i <= sameNum; i++) {
                try {
                    ProductStatusDto newRow = null;
                    if (sameNum > 1) {
                        newRow = item.clone();
                    } else
                        newRow = item;
                    if ("5".equals(newRow.getProductType())) {
                        newRow.setDeviceNo(i);
                        newRow.setName(item.getName() + "-" + i);
                        newRow.setDataId(item.getId().toString() + "-" + i);
                        childList.add(newRow);
                    } catch (CloneNotSupportedException e) {
                        e.printStackTrace();
                        if (i > 1) {
                            newRow.setName(item.getName() + "-" + i);
                        }
                    } else {
                        newRow.setDeviceNo(0);
                        newRow.setDataId(item.getId().toString());
                    }
                    childList.add(newRow);
                } catch (CloneNotSupportedException e) {
                    e.printStackTrace();
                }
            } else {
                item.setDeviceNo(0);
                item.setDataId(item.getId().toString());
                childList.add(item);
            }
        }
        childList.sort(Comparator.comparing(ProductStatusDto::getDeviceNo, Comparator.naturalOrder()));
@@ -1108,7 +1114,7 @@
                            .filter(item -> taskId.equals(item.getTaskId()))
                            .filter(item -> taskPhaseModel.getPhaseId().equals(item.getPhaseId()))
                            .filter(item -> taskPhaseModel.getOperatConditId().equals(item.getOperatConditId()))
                            .filter(item -> modelId.equals(item.getModelId()))
//                            .filter(item -> modelId.equals(item.getModelId()))
                            .filter(item -> dataId.equals(item.getProductId()))
                            .collect(Collectors.toList()).get(0);
                }
@@ -1402,8 +1408,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";
@@ -1461,7 +1466,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);
@@ -1601,6 +1610,7 @@

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