修改

jinlin

2025-02-18 6250f74b2a02770a37f2f0144c762f7952a12bd6

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

@@ -121,16 +121,7 @@
    Map<Integer, String> templetsStrMap2 = new HashMap<>();

    private JSONObject xmlJSONObj;

    /**
     * 分页查询
     *
     * @param queryFilter
     * @return
     */
   /* public List<SimulatAssess> page(QueryFilter queryFilter) {
        return baseDao.getList(queryFilter.getQueryParams());
    }*/
    

    /**
     * 删除
@@ -257,7 +248,7 @@
            JsonUtils2.setJsonValueByPath(textJson, "id".split("/"), UUIDUtil.generateId().toString());
            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);
            JsonUtils2.setJsonValueByPath(textJson, "position/y".split("/"), y + 10);
            jsonArray3.add(textJson);
        }

@@ -561,22 +552,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()));
@@ -601,7 +598,7 @@
            if (jsonArray3.size() == 0) {
                StatusDto statusDto = new StatusDto();
                statusDto.setTimes(phaseModelList.get(j).getGkDuration());
                statusDto.setStatus("");
                statusDto.setStatus("M");
                productStatusDto.getStatusList().add(statusDto);
            } else {
                for (int a = 0; a < jsonArray3.size(); a++) {
@@ -615,6 +612,9 @@
                        }
                    }
                    if (status != null || times != null) {
                        if (StringUtils.isBlank(status)) {
                            status = "M";
                        }
                        StatusDto statusDto = new StatusDto();
                        statusDto.setTimes(times);
                        statusDto.setStatus(status);
@@ -879,7 +879,8 @@
        for (TaskPhaseModel taskPhaseModel : taskPhaseModelAll) {
            Element taskTag = tasksTag.addElement("task");
            taskTag.addAttribute("duration", String.valueOf(taskPhaseModel.getOperatConditDuration()));
            taskTag.addAttribute("model", taskPhaseModel.getOperatConditId().toString());
//            taskTag.addAttribute("model", taskPhaseModel.getOperatConditId().toString());
            taskTag.addAttribute("model", taskPhaseModel.getId().toString());
            if (null != taskPhaseModel.getPhaseConstraints() && taskPhaseModel.getPhaseConstraints().size() > 0) {
                taskTag.addAttribute("NAM",
                        taskPhaseModel.getPhaseConstraints().stream().map(item ->
@@ -902,11 +903,11 @@
                    ele.addAttribute("value", String.valueOf(failureModel.getParam1()));
                    break;
                case FailureModel.TYPE_BIN:
                    ele = failureModelTag.addElement("reliability");
                    ele = failureModelTag.addElement("p");
                    ele.addAttribute("value", String.valueOf(failureModel.getParam1()));
                    ele = failureModelTag.addElement("n");
                    ele.addAttribute("value", String.valueOf(failureModel.getParam2()));
                    ele = failureModelTag.addElement("k");
                    ele = failureModelTag.addElement("m");
                    ele.addAttribute("value", String.valueOf(failureModel.getParam3()));
                    break;
                case FailureModel.TYPE_WBL:
@@ -1005,7 +1006,8 @@
        Element modelsTag = root.addElement("models");
        for (TaskPhaseModel taskPhaseModel : taskPhaseModelAll) {
            Element modelTag = modelsTag.addElement("model");
            modelTag.addAttribute("name", taskPhaseModel.getOperatConditId().toString());
//            modelTag.addAttribute("name", taskPhaseModel.getOperatConditId().toString());
            modelTag.addAttribute("name", taskPhaseModel.getId().toString());
            List<OperatConditModel> gkModelsAssembled = operatConditModelDao.getGKModelAssembled(
                    taskPhaseModel.getOperatConditId());
            OperatConditModel gkModelTop = gkModelsAssembled.stream().filter(item ->
@@ -1086,15 +1088,16 @@
                // 设备
                Integer deviceNo = node.getDeviceNo();
                Element nodeTag = parent.addElement("node");
                nodeTag.addAttribute("name", deviceNo == 0 ? dataId.toString() : dataId.toString() + "-" + deviceNo);
                nodeTag.addAttribute("real_name", deviceNo == 0 ? product.getName() : product.getName() + "-" + deviceNo);
                nodeTag.addAttribute("name", dataId.toString() + "-" + deviceNo);
                nodeTag.addAttribute("real_name", product.getName() + "-" + deviceNo);
                nodeTag.addAttribute("name_path", product.getNamePath());
                nodeTag.addAttribute("type", "node");

                ParamData paramData = paramDataList.stream().filter(item ->
                        dataId.equals(item.getProductId())).collect(Collectors.toList()).get(0);
                Double ratio = paramData.getTaskMtbcfOperatingRatio();
                if (null != ratio && ratio > 0) {
//                if (null != ratio && ratio > 0) {
                if (null != ratio && ratio != 1.0) {
                    // 间断型设备的处理
                    double cycon = taskPhaseModel.getOperatConditDuration() * ratio;
                    double cycdown = taskPhaseModel.getOperatConditDuration() - cycon;
@@ -1108,11 +1111,17 @@
                            .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);
                }
                FailureModel failureModel = createFailureModel(paramData, taskBinoParam);
                FailureModel failureModel = null;
                if (1 == paramData.getRepairable() &&
                        isRepairDirac(simulatAssess.getRepairDiracFlag(), taskPhaseModel, product.getId())) {
                    failureModel = createFailureModelDirac();
                } else {
                    failureModel = createFailureModel(paramData, taskBinoParam);
                }
                failureModels.add(failureModel);
                Element failureTag = nodeTag.addElement("failure_model");
                failureTag.addAttribute("name", failureModel.getId().toString());
@@ -1215,6 +1224,15 @@
        return failureModel;
    }

    private FailureModel createFailureModelDirac() {
        FailureModel failureModel = new FailureModel();
        failureModel.setId(UUIDUtil.generateId());
        failureModel.setType(FailureModel.TYPE_FIX);
        failureModel.setParam1(1);

        return failureModel;
    }

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

@@ -1289,15 +1307,30 @@
        JSONObject xmlJSONObj = XML.toJSONObject(xml);
        JSONArray jsonArray = xmlJSONObj.getJSONObject("ResultNodes").getJSONArray("ResultNode");
        for (int i = 0; i < jsonArray.size(); i++) {
            WeakDto data = new WeakDto();
            Long productId1;
            String nameValue = jsonArray.getJSONObject(i).get("name").toString();
            if (StringUtils.isNotBlank(nameValue)) {
                productId1 = Convert.toLong(nameValue.split("-")[0]);

                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 = null;
                Double mttr = null;
                Double msr = null;
                if (!jsonArray.getJSONObject(i).get("mttf").equals("inf")){
                    mtbf = (Double)jsonArray.getJSONObject(i).get("mttf");
                }else{
                    mtbf = 0.0;
                }
                if (!jsonArray.getJSONObject(i).get("mttr").equals("inf")){
                    mttr = (Double)jsonArray.getJSONObject(i).get("mttr");
                }else{
                    mttr = 0.0;
                }
                if (!jsonArray.getJSONObject(i).get("msr").equals("inf")){
                    msr = (Double)jsonArray.getJSONObject(i).get("msr");
                }else{
                    msr = 0.0;
                }

                WeakDto weakDto = new WeakDto();
                weakDto.setId(productId1);
                weakDto.setMtbf(mtbf);
@@ -1314,12 +1347,14 @@
        }
        List<WeakDto> productList = baseDao.getProductList(taskId, productId);
        for (WeakDto item : productList) {
            WeakDto dto = map.get(item.getId());
            item.setMtbf(dto.getMtbf());
            item.setMttr(dto.getMttr());
            item.setMsr(dto.getMsr());
            item.setMtbfTime(dto.getMtbf() / item.getTimeRate());
            item.setIsWeak(0);
            if (map.get(item.getId()) != null) {
                WeakDto dto = map.get(item.getId());
                item.setMtbf(dto.getMtbf());
                item.setMttr(dto.getMttr());
                item.setMsr(dto.getMsr());
                item.setMtbfTime(dto.getMtbf() / item.getTimeRate());
                item.setIsWeak(0);
            }
        }

        List<WeakDto> treeList = new ArrayList<>();
@@ -1334,13 +1369,15 @@
    private void getIsweak(List<WeakDto> treeList) {
        WeakDto minDto = null;
        for (WeakDto dto : treeList) {
            if (dto.getProductType() == 10)
                continue;
            if (minDto == null) {
                minDto = dto;
            }
            if (dto.getMtbfTime() < minDto.getMtbfTime()) {
                minDto = dto;
            if (dto.getMtbfTime() != null) {
                if (dto.getProductType() == 10)
                    continue;
                if (minDto == null) {
                    minDto = dto;
                }
                if (dto.getMtbfTime() < minDto.getMtbfTime()) {
                    minDto = dto;
                }
            }
        }
        minDto.setIsWeak(1);
@@ -1402,8 +1439,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,20 +1497,53 @@
                String[] arr = availability.split(" ");
                // 遍历子字符串数组，将每个元素转换为double并存储到double数组中
                Double j = 0.0;
                for (int a = 0; a < arr.length; a++) {
                for (int a = 0; a < arr.length - 1; a++) {
                    j = samplPeriod + j;
                    doubleArray.add(Double.parseDouble(arr[a]));
                    if (!StringUtils.isEmpty(arr[a])) {
                        doubleArray.add(Double.parseDouble(arr[a]));
                    }
                    xList.add(j);
                }

                param.setXData(xList);
                param.setYData(doubleArray);
                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 mttfMle = null;
                Double mttrMle = null;
                Double mtbf = null;
                Double mttr = null;
                Double msr = null;
                if (!jsonArray.getJSONObject(i).get("mttf").equals("inf")){
                    mtbf = (Double)jsonArray.getJSONObject(i).get("mttf");
                }else{
                    mtbf = 0.0;
                }
                if (!jsonArray.getJSONObject(i).get("mttr").equals("inf")){
                    mttr = (Double)jsonArray.getJSONObject(i).get("mttr");
                }else{
                    mttr = 0.0;
                }
                if (!jsonArray.getJSONObject(i).get("msr").equals("inf")){
                    msr = (Double)jsonArray.getJSONObject(i).get("msr");
                }else{
                    msr = 0.0;
                }

                if (!jsonArray.getJSONObject(i).get("mttr_MLE").equals("inf")){
                     mttrMle = (Double)jsonArray.getJSONObject(i).get("mttr_MLE");
                }else{
                    mttrMle = 0.0;
                }
                if(!jsonArray.getJSONObject(i).get("mttf_MLE").equals("inf")){
                    mttfMle = (Double) jsonArray.getJSONObject(i).get("mttf_MLE");
                }else{
                    mttfMle = 0.0;
                }
                data.setMtbf(mtbf);
                data.setMttr(mttr);
                data.setMsr(msr);
                data.setMttfMle(mttfMle);
                data.setMttrMle(mttrMle);
            }
            data.setCurveParam(param);
        }
@@ -1601,6 +1670,7 @@

            SchemeComparCurve curve = new SchemeComparCurve();
            curve.setName(task.getTaskName());
            curve.setSymbol("none");
            curve.setSmooth(true);
            curve.setType("line");
            curve.setData(resultData.getCurveParam().getYData());
@@ -1646,12 +1716,8 @@
                ObjectMapper mapper = new ObjectMapper();
                String jsonStr = null;
                try {
                    // 使用 ObjectMapper 的 readValue 方法，将文件中的 JSON 数据转换为一个 Java 对象
                    // 这里使用 Object 类作为泛型参数，表示任意类型的对象
                    Object obj = mapper.readValue(new File(filePath), Object.class);
                    // 使用 ObjectMapper 的 writeValueAsString 方法，将 Java 对象转换为 JSON 字符串
                    jsonStr = mapper.writeValueAsString(obj);

                } catch (IOException e) {
                    // 处理异常
                    e.printStackTrace();