From e86f1c58fc3075a10c49d8ced123c891c40094ce Mon Sep 17 00:00:00 2001 From: lidongyang <506508008@qq.com> Date: Thu, 5 Mar 2026 10:10:29 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E4=BF=AE=E6=94=B9=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E5=BB=B6=E6=9C=9F=E6=97=B6=E7=BB=99=E6=8F=90=E5=87=BA=E4=BA=BA?= =?UTF-8?q?=E5=8F=91=E6=B6=88=E6=81=AF=E7=9A=84=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/service/TaskProgressService.java | 4 +-- ...mitmentDeadlineStatusScheduleExecutor.java | 27 ++++--------------- .../impl/LyricInternalServiceImpl.java | 1 + 3 files changed, 8 insertions(+), 24 deletions(-) diff --git a/common/src/main/java/com/sdm/common/service/TaskProgressService.java b/common/src/main/java/com/sdm/common/service/TaskProgressService.java index 1765a23f..6dd02a6e 100644 --- a/common/src/main/java/com/sdm/common/service/TaskProgressService.java +++ b/common/src/main/java/com/sdm/common/service/TaskProgressService.java @@ -22,10 +22,10 @@ public class TaskProgressService { @Autowired private SysConfigFeignClientImpl sysConfigFeignClient; - private static final String TASK_PROGRESS_STATUS = "TASK_PROGRESS_STATUS"; + private static final String SUBMITTER_TASK_PROGRESS_STATUS = "SUBMITTER_TASK_PROGRESS_STATUS"; public Map getMapName() { - SdmResponse> taskProgressStatusList = sysConfigFeignClient.getDictionaryData(TASK_PROGRESS_STATUS); + SdmResponse> taskProgressStatusList = sysConfigFeignClient.getDictionaryData(SUBMITTER_TASK_PROGRESS_STATUS); if (!taskProgressStatusList.isSuccess() || ObjectUtils.isEmpty(taskProgressStatusList.getData())) { log.error("字典信息查询失败"); return emptyMap(); diff --git a/project/src/main/java/com/sdm/project/schedule/lyric/CommitmentDeadlineStatusScheduleExecutor.java b/project/src/main/java/com/sdm/project/schedule/lyric/CommitmentDeadlineStatusScheduleExecutor.java index 0c2ef0ef..32ee79ab 100644 --- a/project/src/main/java/com/sdm/project/schedule/lyric/CommitmentDeadlineStatusScheduleExecutor.java +++ b/project/src/main/java/com/sdm/project/schedule/lyric/CommitmentDeadlineStatusScheduleExecutor.java @@ -26,6 +26,7 @@ import com.sdm.project.service.ISimulationTaskService; import com.xxl.job.core.handler.annotation.XxlJob; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.CollectionUtils; +import org.apache.commons.collections4.MapUtils; import org.apache.commons.lang3.ObjectUtils; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -129,21 +130,9 @@ public class CommitmentDeadlineStatusScheduleExecutor{ log.info("无节点延期"); } - // 查询任务进度状态的字典 + // 查询需要给提出人发消息的任务进度状态的字典 Map taskProgressMap = taskProgressService.getMapName(); - // 若实际达成进度超过 3D设计，则不发消息给提出人 - int taskProgressValue = 0; - if (isConvertibleToInt(taskProgressMap.get(THREE_D_DESIGN))) { - taskProgressValue = Integer.parseInt(taskProgressMap.get(THREE_D_DESIGN)); - }else { - log.error("未查询到3D设计的字典值，或字典值不为数字。{}",taskProgressMap.get(THREE_D_DESIGN)); - taskProgressValue = -1; - } - log.info("taskProgressValue为：{}",taskProgressValue); - if (CollectionUtils.isNotEmpty(taskList)) { - - for (SimulationTask simulationTask : taskList) { // 取工位的军令状时间 String workspaceNodeId = simulationTask.getTag5(); @@ -184,15 +173,9 @@ public class CommitmentDeadlineStatusScheduleExecutor{ // 若实际达成进度不超过 3D设计，则发消息给提出人 String actualProgress = actualProgressMap.get(simulationTask.getUuid()); log.info("actualProgress为：{}",actualProgress); - if (StringUtils.isNotBlank(actualProgress)) { - String actualProgressValueStr = taskProgressMap.get(actualProgress); - log.info("actualProgressValueStr为：{}",actualProgressValueStr); - if (StringUtils.isNotBlank(actualProgressValueStr) && isConvertibleToInt(actualProgressValueStr)) { - int actualProgressValue = Integer.parseInt(actualProgressValueStr); - if ((taskProgressValue == -1 || actualProgressValue <= taskProgressValue) - && ObjectUtils.isNotEmpty(simulationTask.getCreator())) { - sendMessage(MessageTemplateEnum.TASK_OVERDUE, simulationTask.getTaskName(), String.valueOf(simulationTask.getCreator()), simulationTask.getUuid()); - } + if (StringUtils.isNotBlank(actualProgress) && MapUtils.isNotEmpty(taskProgressMap)) { + if (taskProgressMap.containsKey(actualProgress)) { + sendMessage(MessageTemplateEnum.TASK_OVERDUE, simulationTask.getTaskName(), String.valueOf(simulationTask.getCreator()), simulationTask.getUuid()); } } // 发消息给执行人 diff --git a/project/src/main/java/com/sdm/project/service/impl/LyricInternalServiceImpl.java b/project/src/main/java/com/sdm/project/service/impl/LyricInternalServiceImpl.java index fb486e26..8a7cf4c4 100644 --- a/project/src/main/java/com/sdm/project/service/impl/LyricInternalServiceImpl.java +++ b/project/src/main/java/com/sdm/project/service/impl/LyricInternalServiceImpl.java @@ -532,6 +532,7 @@ public class LyricInternalServiceImpl implements ILyricInternalService { List allNodeList = nodeService.lambdaQuery().eq(SimulationNode::getTag1, projectNode.getUuid()).list(); // 填充需求的阶段ID + // 如果阶段不存在，就去同步阶段机台工位 allNodeList.stream() .filter(node -> NodeTypeEnum.PHASE.getValue().equals(node.getNodeType()) && node.getNodeCode().equals(todo.getProjectStage()))