修复bug：1）一键排版时不要自动保存； 2）无论设备数量多少，deviceNo统一改成从1开始。

xyc

2024-11-18 f770e36d5ec735f53df298445a6940daa20d0bfa

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

@@ -38,6 +38,8 @@
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.multipart.MultipartFile;

import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.io.*;
import java.util.*;
import java.util.stream.Collectors;
@@ -157,9 +159,9 @@
                    String nameValue = jsonArray.getJSONObject(i).get("name").toString();
                    if (nameValue.contains(assess.getId().toString())) {
                        // 获取对应的值
                        if (jsonArray.getJSONObject(i).get("value") instanceof Double){
                            result1 = (Double)  jsonArray.getJSONObject(i).get("value");
                        }else{
                        if (jsonArray.getJSONObject(i).get("value") instanceof Double) {
                            result1 = (Double) jsonArray.getJSONObject(i).get("value");
                        } else {
                            String[] values = jsonArray.getJSONObject(i).get("value").toString().split(",");
                            result1 = Double.valueOf(values[1]);
                        }
@@ -376,18 +378,18 @@
            String NoEStr = "";
            String ToEStr = "";
            String FStr = "";
            for (ModelNode node : nodeList) {
                List<ReliabilityAssess> assessDatas = assessDataList.stream().filter(item ->
                        node.getDataId().equals(item.getId())).collect(Collectors.toList());
                NoEStr += ",";
                ToEStr += ",";
                FStr += ",";
                if (assessDatas.size() > 0) {
                    NoEStr += assessDatas.get(0).getRunNum() != null ? assessDatas.get(0).getRunNum().toString() : "0";
                    ToEStr += assessDatas.get(0).getRunTimes() != null ? assessDatas.get(0).getRunTimes().toString() : "0";
                    FStr += assessDatas.get(0).getFailNum() != null ? assessDatas.get(0).getFailNum().toString() : "0";
                }
//            for (ModelNode node : nodeList) {
            List<ReliabilityAssess> assessDatas = assessDataList.stream().filter(item ->
                    dataId.equals(item.getId())).collect(Collectors.toList());
            NoEStr += ",";
            ToEStr += ",";
            FStr += ",";
            if (assessDatas.size() > 0) {
                NoEStr += assessDatas.get(0).getRunNum() != null ? assessDatas.get(0).getRunNum().toString() : "0";
                ToEStr += assessDatas.get(0).getRunTimes() != null ? assessDatas.get(0).getRunTimes().toString() : "0";
                FStr += assessDatas.get(0).getFailNum() != null ? assessDatas.get(0).getFailNum().toString() : "0";
            }
//            }
            NoEStr = NoEStr.substring(1);
            ToEStr = ToEStr.substring(1);
            FStr = FStr.substring(1);
@@ -397,7 +399,7 @@
            vCounter.put("v", counter);
            Element sameNameGroupTag = parent.addElement("logic");
            sameNameGroupTag.addAttribute("name",
                    "v"+counter);
                    "v" + counter);
            if ("parallel".equals(sameNameGroupAlgorithmType)) {
                sameNameGroupTag.addAttribute("type", "parallel");
            } else {
@@ -406,7 +408,8 @@
            sameNameGroupTag.addAttribute("nums", String.valueOf(nodeList.size()));
            Element nodeTag = sameNameGroupTag.addElement("node");
            nodeTag.addAttribute("name",
                    nodeList.stream().map(item -> item.getDataId().toString()).collect(Collectors.joining(",")));
                    nodeList.stream().map(item -> item.getDataId().toString() + "-" + item.getDeviceNo().toString()).
                            collect(Collectors.joining(",")));
            nodeTag.addAttribute("real_name", product.getSameSbName());
            nodeTag.addAttribute("name_path", product.getNamePath());
            if (paramData.getReliabDistribType() == 3) {
@@ -519,16 +522,17 @@
                    }
                }

                // 根据同类设备名称进行分组处理
                // 根据同类设备名称进行分组处理（改为根据dataId进行分组）
                Map<String, List<ModelNode>> groupByNameMap = new HashMap<>();
                for (String nodeStr : computerNodeListStr) {
                    ModelNode mn = modelNodeAndVnodeList.stream().filter(item ->
                            nodeStr.equals(item.getId().toString())).collect(Collectors.toList()).get(0);
                    String sameSbName = null;
                    if (mn.getDataId() != null) {
                        XhProductModel product = productList.stream().filter(item ->
                                mn.getDataId().equals(item.getId())).collect(Collectors.toList()).get(0);
                        if ("5".equals(product.getProductType())) sameSbName = product.getSameSbName();
//                        XhProductModel product = productList.stream().filter(item ->
//                                mn.getDataId().equals(item.getId())).collect(Collectors.toList()).get(0);
//                        if ("5".equals(product.getProductType())) sameSbName = product.getSameSbName();
                        sameSbName = mn.getDataId().toString();
                    }
                    if (sameSbName == null) {
                        List<ModelNode> list = new ArrayList<>();
@@ -680,6 +684,7 @@
                NoEStr += "," + (assessData.getRunNum() != null ? assessData.getRunNum().toString() : "0");
                ToEStr += "," + (assessData.getRunTimes() != null ? assessData.getRunTimes().toString() : "0");
                FStr += "," + (assessData.getFailNum() != null ? assessData.getFailNum().toString() : "0");
                break;
            }
        }
        NoEStr = NoEStr.substring(1);
@@ -687,7 +692,8 @@
        FStr = FStr.substring(1);

        nodeTag.addAttribute("name",
                nodes.stream().map(item -> item.getDataId().toString()).collect(Collectors.joining(",")));
                nodes.stream().map(item -> item.getDataId().toString() + "-" + item.getDeviceNo().toString()).
                        collect(Collectors.joining(",")));
        if (distTypes.get(0) == 3) {
            // 二项分布
            nodeTag.addAttribute("distType", "ber");
@@ -742,14 +748,17 @@
                ReliaSimLibResult rtn = com.alibaba.fastjson.JSONObject.parseObject(line, ReliaSimLibResult.class);
                if ("0".equals(rtn.getCode())) {
                    logger.info("启动可靠性评定算法库成功。");
                    result = Result.ok();
                    if (exitCode == 0) {
                        deleteAssessInfoInRedis(assessResult.getId());
                        result = Result.ok();
                    } else {
                        result = Result.error("可靠性评定算法库计算失败: exitCode=" + exitCode);
                    }
                } else {
                    String errorMsg = rtn.getErrorMsg();
                    throw new RenException("启动可靠性评定算法库失败: errorMsg=" + errorMsg);
                }
            }

            deleteAssessInfoInRedis(assessResult.getId());
        } catch (Exception e) {
            logger.error("启动可靠性评定算法库时发生Exception：", e);
            e.printStackTrace();
@@ -929,4 +938,30 @@
        return baseDao.getAssessDataList(productId);
    }

    public void downloadXml(HttpServletRequest request, HttpServletResponse response, Long productId, Long taskId, Long itemId, Integer xml) {
        Long assessId = baseDao.getAssessId(itemId, productId, taskId);
        String json="";
        if (xml == 1) {
            json = baseDao.getxml(assessId);
        } else {
            String filePath = path + "/" + assessId + "/" + "result.xml";
            InputStream in = null;
            File file = new File(filePath);
            if (file.exists()) {
                try {
                    in = new FileInputStream(filePath);
                    json = IOUtils.toString(in);
                } catch (IOException e) {
                    throw new RenException("文件不存在或者文件打不开");
                } finally {
                    try {
                        in.close();
                    } catch (IOException e) {
                        e.printStackTrace();
                    }
                }
            }
        }
        simulatAssessService.writeToTxt(request, response, json, "评定");
    }
}