From 12d84be70c42c5669ffc5db470ff54b71d093728 Mon Sep 17 00:00:00 2001
From: xyc <jc_xiong@hotmail.com>
Date: 星期四, 26 九月 2024 10:28:15 +0800
Subject: [PATCH] 1）新增可靠性评定XML生成功能； 2）可靠性仿真评估与可靠性评定的算法包分开成2个包，启动脚本也相应地分开。
---
modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/service/SimulatAssessService.java | 15 +++++++++------
1 files changed, 9 insertions(+), 6 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 ea18bfb..59c2801 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
@@ -14,7 +14,6 @@
import com.zt.life.modules.mainPart.basicInfo.dao.XhProductModelDao;
import com.zt.life.modules.mainPart.basicInfo.model.ParamData;
import com.zt.life.modules.mainPart.basicInfo.model.XhProductModel;
-import com.zt.life.modules.mainPart.basicInfo.service.XhProductModelService;
import com.zt.life.modules.mainPart.taskReliability.dao.*;
import com.zt.common.utils.JsonUtils2;
import com.zt.life.modules.mainPart.taskReliability.dao.SimulatAssessDao;
@@ -669,7 +668,7 @@
}
}
- private void addTasksTag(List<TaskPhaseModel> taskPhaseModelAll,
+ public void addTasksTag(List<TaskPhaseModel> taskPhaseModelAll,
Element root) {
Element tasksTag = root.addElement("tasks");
for (TaskPhaseModel taskPhaseModel : taskPhaseModelAll) {
@@ -746,7 +745,7 @@
}
}
- private void calcTaskPhaseModelDuration(TaskPhase taskPhase,
+ public void calcTaskPhaseModelDuration(TaskPhase taskPhase,
List<TaskPhaseModel> taskPhaseModelAll) {
List<TaskPhaseModel> taskPhaseModels = taskPhaseModelDao.getListByPhaseId(taskPhase.getId());
double totalRate = taskPhaseModels.stream().mapToDouble(TaskPhaseModel::getOperatConditDurationRate).sum();
@@ -766,7 +765,7 @@
taskPhaseModels.get(taskPhaseModels.size() - 1).setOperatConditDuration(duration + taskPhase.getPhaseDuration() - sum);
}
- private List<TaskPhase> calcTaskPhaseDuration(Task task) {
+ public List<TaskPhase> calcTaskPhaseDuration(Task task) {
List<TaskPhase> taskPhases = taskPhaseDao.getListByTaskId(task.getId());
double totalRate = taskPhases.stream().mapToDouble(TaskPhase::getPhaseDurationRate).sum();
double sum = 0.0;
@@ -1033,7 +1032,9 @@
throw new RenException("鏂囦欢涓嶅瓨鍦ㄦ垨鑰呮枃浠舵墦涓嶅紑");
} finally {
try {
- in.close();
+ if (in != null) {
+ in.close();
+ }
} catch (IOException e) {
e.printStackTrace();
}
@@ -1158,7 +1159,9 @@
throw new RenException("鏂囦欢涓嶅瓨鍦ㄦ垨鑰呮枃浠舵墦涓嶅紑");
} finally {
try {
- in.close();
+ if (in != null) {
+ in.close();
+ }
} catch (IOException e) {
e.printStackTrace();
}
--
Gitblit v1.9.1