toolchaintechnologycenter/spdm-backend
1
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main'

Browse Source
This commit is contained in:
zhuxinru
2026-03-05 13:47:38 +08:00
parent 897d652c94 95cc8e4503
commit 4af8d69d55
4 changed files with 22 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
project/src/main/java/com/sdm/project/schedule/lyric/CommitmentDeadlineStatusScheduleExecutor.java
View File

@@ -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<String, String> 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());
}
}
// 发消息给执行人

9
project/src/main/java/com/sdm/project/service/impl/LyricInternalServiceImpl.java
View File

@@ -532,6 +532,7 @@ public class LyricInternalServiceImpl implements ILyricInternalService {
List<SimulationNode> 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()))
@@ -2640,7 +2641,13 @@ public class LyricInternalServiceImpl implements ILyricInternalService {
}
private SpdmProjectNodeEditReq buildProjectForTodoInfo(LyricVProjectToDM lyricVProjectToDM, Long tenantId, Long jobNumber) {
String curDateStr = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date());
String curDateStr;
Date createTime = lyricVProjectToDM.getCreateTime();
if (ObjectUtils.isNotEmpty(createTime)) {
curDateStr = new SimpleDateFormat("yyyy-MM-ddTHH:mm:ss").format(createTime).replace("T"," ");
}else {
curDateStr = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date());
}
List<SpdmProjectNodeEditReq> currentNodeList;
List<SpdmProjectNodeEditReq> addNodeList = new ArrayList<>();
// 构建项目——阶段——机台——工位节点树