From 0c39f5388d95dbc41c47285a8c2dfda57a019d5b Mon Sep 17 00:00:00 2001
From: xyc <jc_xiong@hotmail.com>
Date: 星期三, 08 一月 2025 08:47:49 +0800
Subject: [PATCH] 修改:“可修设备可靠度为1”通过给算法包传递参数固定为1、type为fixed的failure_model来实现。

---
 modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/service/SimulatAssessService.java |   20 ++++++++++++++++++--
 1 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/service/SimulatAssessService.java b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/service/SimulatAssessService.java
index 05d095f..a69a11e 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/service/SimulatAssessService.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/service/SimulatAssessService.java
@@ -1105,7 +1105,8 @@
                 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;
@@ -1123,7 +1124,13 @@
                             .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());
@@ -1226,6 +1233,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;
 

--
Gitblit v1.9.1