From 3ecb68c427a627ad8e90d8c555655e7724be2d96 Mon Sep 17 00:00:00 2001
From: jinlin <jinlin>
Date: 星期五, 06 九月 2024 11:06:12 +0800
Subject: [PATCH] 修改
---
modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/service/TaskService.java | 38 ++++++++++++++++----------------------
1 files changed, 16 insertions(+), 22 deletions(-)
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/service/TaskService.java b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/service/TaskService.java
index af3f35b..c0d7577 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/service/TaskService.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/service/TaskService.java
@@ -6,7 +6,7 @@
import com.zt.life.modules.mainPart.basicInfo.model.ParamData;
import com.zt.life.modules.mainPart.basicInfo.model.XhProductModel;
import com.zt.life.modules.mainPart.taskReliability.dao.*;
-import com.zt.life.modules.mainPart.taskReliability.dto.TaskModelCheckResult;
+import com.zt.life.modules.mainPart.taskReliability.dto.TaskModelCheckResultDto;
import com.zt.life.modules.mainPart.taskReliability.model.*;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -76,14 +76,8 @@
* @param productId 浜у搧鑺傜偣ID锛堜竴鑸负鎬讳綋锛�
* @return 妫�鏌ュ嚭鐨勯敊璇殑List锛岄暱搴︿负0琛ㄧず娌℃湁閿欒锛屼笉浼氳繑鍥瀗ull
*/
- public List<TaskModelCheckResult> checkTaskModel(Long productId) {
- List<TaskModelCheckResult> result = new ArrayList<>();
- result = doCheckTaskModel(productId, null);
- return result;
- }
-
- private List<TaskModelCheckResult> doCheckTaskModel(Long productId, Long taskModelId) {
- List<TaskModelCheckResult> checkResult = new ArrayList<>();
+ public List<TaskModelCheckResultDto> checkTaskModel(Long productId, Long taskModelId) {
+ List<TaskModelCheckResultDto> checkResult = new ArrayList<>();
List<XhProductModel> deviceUsedList = new ArrayList<>(); // 妫�鏌ュ璞℃ā鍨嬩腑浣跨敤鍒扮殑鎵�鏈夎澶�
// 1. 鑾峰彇鏁版嵁
@@ -114,7 +108,7 @@
setTaskModelCheckResult(taskModel,
null,
null, null, null,
- TaskModelCheckResult.CATEGORY_TASK_TIME, checkResult);
+ TaskModelCheckResultDto.CATEGORY_TASK_TIME, checkResult);
}
List<TaskPhase> phases = taskModelPhaseList.stream().filter(item ->
taskModel.getId().equals(item.getTaskId())).collect(Collectors.toList());
@@ -124,7 +118,7 @@
setTaskModelCheckResult(taskModel,
phase,
null, null, null,
- TaskModelCheckResult.CATEGORY_PHASE_TIME, checkResult);
+ TaskModelCheckResultDto.CATEGORY_PHASE_TIME, checkResult);
}
List<TaskPhaseModel> phaseModels = taskModelPhaseModelList.stream().filter(item ->
phase.getId().equals(item.getPhaseId())).collect(Collectors.toList());
@@ -134,7 +128,7 @@
setTaskModelCheckResult(taskModel,
phase,
null, null, null,
- TaskModelCheckResult.CATEGORY_GK_TIME, checkResult);
+ TaskModelCheckResultDto.CATEGORY_GK_TIME, checkResult);
} else {
// 鏈夊伐鍐垫ā鍨嬫暟鎹�
List<TaskPhaseModel> phaseModelWithDurations = taskModelPhaseModelList.stream().filter(item ->
@@ -147,7 +141,7 @@
phase,
taskPhaseModel,
null, null,
- TaskModelCheckResult.CATEGORY_GK_TIME, checkResult);
+ TaskModelCheckResultDto.CATEGORY_GK_TIME, checkResult);
}
} else {
// 鏈夊伐鍐垫ā鍨嬭閫夌敤锛屾鏌ラ�夌敤鐨勫伐鍐垫ā鍨�
@@ -165,7 +159,7 @@
taskPhaseModel,
null,
node,
- TaskModelCheckResult.CATEGORY_GK_MODEL, checkResult);
+ TaskModelCheckResultDto.CATEGORY_GK_MODEL, checkResult);
} else {
// 鏈夊伐鍐垫ā鍨嬫爲锛屾鏌ュ叾瀹屾暣鎬�
// checkGkModel(taskModel, phase, taskPhaseModel, gkModelTops.get(0),
@@ -191,7 +185,7 @@
List<ModelNodeAlgorithm> rbdNodeList,
List<XhProductModel> productTreeList,
List<XhProductModel> deviceUsedList,
- List<TaskModelCheckResult> checkResult) {
+ List<TaskModelCheckResultDto> checkResult) {
// 棣栧厛鎵惧埌椤跺眰妯″瀷
List<OperatConditModel> gkModelTops = gkModelList.stream().filter(item ->
taskPhaseModel.getOperatConditId().equals(item.getOperatConditId())
@@ -205,7 +199,7 @@
taskPhaseModel,
null,
node,
- TaskModelCheckResult.CATEGORY_GK_MODEL, checkResult);
+ TaskModelCheckResultDto.CATEGORY_GK_MODEL, checkResult);
}
}
@@ -215,20 +209,20 @@
OperatConditModel gkModel,
XhProductModel node,
String category,
- List<TaskModelCheckResult> checkResult) {
- TaskModelCheckResult result = new TaskModelCheckResult();
+ List<TaskModelCheckResultDto> checkResult) {
+ TaskModelCheckResultDto result = new TaskModelCheckResultDto();
result.setCategory(category);
result.setProductId(taskModel.getProductId());
result.setTaskModelId(taskModel.getId());
result.setTaskModelName(taskModel.getTaskName());
switch(category) {
- case TaskModelCheckResult.CATEGORY_TASK_TIME:
+ case TaskModelCheckResultDto.CATEGORY_TASK_TIME:
break;
- case TaskModelCheckResult.CATEGORY_PHASE_TIME:
+ case TaskModelCheckResultDto.CATEGORY_PHASE_TIME:
result.setTaskModelPhaseId(taskModelPhase.getId());
result.setTaskModelPhaseName(taskModelPhase.getPhaseName());
break;
- case TaskModelCheckResult.CATEGORY_GK_TIME:
+ case TaskModelCheckResultDto.CATEGORY_GK_TIME:
result.setTaskModelPhaseId(taskModelPhase.getId());
result.setTaskModelPhaseName(taskModelPhase.getPhaseName());
if (null != taskModelPhaseModel) {
@@ -236,7 +230,7 @@
result.setGkName(taskModelPhaseModel.getOperatConditName());
}
break;
- case TaskModelCheckResult.CATEGORY_GK_MODEL:
+ case TaskModelCheckResultDto.CATEGORY_GK_MODEL:
result.setTaskModelPhaseId(taskModelPhase.getId());
result.setTaskModelPhaseName(taskModelPhase.getPhaseName());
result.setGkId(taskModelPhaseModel.getOperatConditId());
--
Gitblit v1.9.1