From b878041fe51918beb9cf77d5862900d1cb0a4677 Mon Sep 17 00:00:00 2001 From: lidongyang <506508008@qq.com> Date: Wed, 1 Apr 2026 13:38:36 +0800 Subject: [PATCH] =?UTF-8?q?fix[project]:=20=E6=96=B0=E5=A2=9E=E6=B5=8B?= =?UTF-8?q?=E8=AF=95=E9=A1=B9=E7=9B=AE=E9=80=9A=E7=9F=A5=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entity/enums/MessageTemplateEnum.java | 2 +- .../SimulationProjectController.java | 14 ++++++ .../project/model/entity/SimulationTask.java | 47 +++++++++++++++++++ .../sdm/project/service/IProjectService.java | 2 + .../service/impl/ProjectServiceImpl.java | 14 ++++++ .../project/service/impl/TaskServiceImpl.java | 22 +++++++++ 6 files changed, 100 insertions(+), 1 deletion(-) diff --git a/common/src/main/java/com/sdm/common/entity/enums/MessageTemplateEnum.java b/common/src/main/java/com/sdm/common/entity/enums/MessageTemplateEnum.java index 8a461a01..4b8239b4 100644 --- a/common/src/main/java/com/sdm/common/entity/enums/MessageTemplateEnum.java +++ b/common/src/main/java/com/sdm/common/entity/enums/MessageTemplateEnum.java @@ -12,7 +12,7 @@ public enum MessageTemplateEnum { HPC_START("作业通知", "HPC任务作业：%s，已发起%s"), HPC_END("作业通知", "HPC任务作业：%s，已结束，执行结果：%s"), TASK_OVERDUE("任务逾期通知", "任务：%s，已逾期"), - PROJECT_MANAGER_EMPTY("项目专项代表为空通知", "从EP拉取%s项目时，专项代表为空，需要前往仿真平台项目列表界面维护专项代表") + PROJECT_MANAGER_EMPTY("项目通知", "从EP拉取%s项目时，专项代表为空，需要前往仿真平台项目列表界面维护专项代表") ; private final String title; diff --git a/project/src/main/java/com/sdm/project/controller/SimulationProjectController.java b/project/src/main/java/com/sdm/project/controller/SimulationProjectController.java index a796113b..47e0408f 100644 --- a/project/src/main/java/com/sdm/project/controller/SimulationProjectController.java +++ b/project/src/main/java/com/sdm/project/controller/SimulationProjectController.java @@ -130,4 +130,18 @@ public class SimulationProjectController implements ISimulationProjectFeignClien return taskService.importSimulationExternalForm(file,columns); } + /** + * 测试项目通知 + * @return + */ + @GetMapping(value = "/testProjectMessage") + @ResponseBody + void testProjectMessage() { + projectService.testProjectMessage(); + } + + + + + } diff --git a/project/src/main/java/com/sdm/project/model/entity/SimulationTask.java b/project/src/main/java/com/sdm/project/model/entity/SimulationTask.java index 690d66cb..70ce77bf 100644 --- a/project/src/main/java/com/sdm/project/model/entity/SimulationTask.java +++ b/project/src/main/java/com/sdm/project/model/entity/SimulationTask.java @@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.annotation.TableId; import java.io.Serializable; import java.util.List; +import com.sdm.common.entity.req.data.TagReq; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import io.swagger.v3.oas.annotations.media.Schema; @@ -226,4 +227,50 @@ public class SimulationTask implements Serializable { private List reportFileUrlList; + @Schema(description= "标签筛选参数") + @TableField(exist = false) + private TagReq tagReq; + + @TableField(exist = false) + private String tag1Code; + @TableField(exist = false) + private String tag2Code; + @TableField(exist = false) + private String tag3Code; + @TableField(exist = false) + private String tag4Code; + @TableField(exist = false) + private String tag5Code; + @TableField(exist = false) + private String tag6Code; + @TableField(exist = false) + private String tag7Code; + @TableField(exist = false) + private String tag8Code; + @TableField(exist = false) + private String tag9Code; + @TableField(exist = false) + private String tag10Code; + @TableField(exist = false) + private String tag1Name; + @TableField(exist = false) + private String tag2Name; + @TableField(exist = false) + private String tag3Name; + @TableField(exist = false) + private String tag4Name; + @TableField(exist = false) + private String tag5Name; + @TableField(exist = false) + private String tag6Name; + @TableField(exist = false) + private String tag7Name; + @TableField(exist = false) + private String tag8Name; + @TableField(exist = false) + private String tag9Name; + @TableField(exist = false) + private String tag10Name; + + } diff --git a/project/src/main/java/com/sdm/project/service/IProjectService.java b/project/src/main/java/com/sdm/project/service/IProjectService.java index 230e671e..658107ee 100644 --- a/project/src/main/java/com/sdm/project/service/IProjectService.java +++ b/project/src/main/java/com/sdm/project/service/IProjectService.java @@ -45,4 +45,6 @@ public interface IProjectService { SdmResponse>> getWorkspaceReportList(WorkspaceReportListReq req); + void testProjectMessage(); + } diff --git a/project/src/main/java/com/sdm/project/service/impl/ProjectServiceImpl.java b/project/src/main/java/com/sdm/project/service/impl/ProjectServiceImpl.java index e6f3d1ea..5239209a 100644 --- a/project/src/main/java/com/sdm/project/service/impl/ProjectServiceImpl.java +++ b/project/src/main/java/com/sdm/project/service/impl/ProjectServiceImpl.java @@ -4115,6 +4115,20 @@ public class ProjectServiceImpl extends BaseService implements IProjectService { return PageUtils.getJsonObjectSdmResponse(pagedList, pageInfo); } + private void testProjectMessage(MessageTemplateEnum templateEnum, String projectName, String userId) { + SendMsgReq req = new SendMsgReq(); + req.setTitle(templateEnum.getTitle()); + req.setContent(templateEnum.getContent(projectName)); + req.setTenantId(ThreadLocalContext.getTenantId().toString()); + req.setUserId(userId); + messageFeignClient.sendMessage(req); + } + + @Override + public void testProjectMessage() { + testProjectMessage(MessageTemplateEnum.PROJECT_MANAGER_EMPTY, "WBL测试项目3", "1980235559149838337"); + } + public static void setTagProperty(Object obj, String propertyName, Object value) throws Exception { Class clazz = obj.getClass(); Field field = clazz.getDeclaredField(propertyName); diff --git a/project/src/main/java/com/sdm/project/service/impl/TaskServiceImpl.java b/project/src/main/java/com/sdm/project/service/impl/TaskServiceImpl.java index c6391007..12517f3e 100644 --- a/project/src/main/java/com/sdm/project/service/impl/TaskServiceImpl.java +++ b/project/src/main/java/com/sdm/project/service/impl/TaskServiceImpl.java @@ -4590,6 +4590,28 @@ public class TaskServiceImpl implements ITaskService { .le(StringUtils.isNotBlank(endTime), SimulationTask::getEndTime, endTime) .list(); + + if (CollectionUtils.isNotEmpty(taskList)) { + for (SimulationTask simulationTask : taskList) { + TagReq tagReq = new TagReq(); + setTagField(tagReq, simulationTask.getTag1(), simulationTask.getTag1Name(),simulationTask.getTag1Code(), TagReq::setTag1, TagReq::setTag1Name, TagReq::setTag1Code); + setTagField(tagReq, simulationTask.getTag2(), simulationTask.getTag2Name(), simulationTask.getTag2Code(),TagReq::setTag2, TagReq::setTag2Name, TagReq::setTag2Code); + setTagField(tagReq, simulationTask.getTag3(), simulationTask.getTag3Name(), simulationTask.getTag3Code(),TagReq::setTag3, TagReq::setTag3Name, TagReq::setTag3Code); + setTagField(tagReq, simulationTask.getTag4(), simulationTask.getTag4Name(), simulationTask.getTag4Code(),TagReq::setTag4, TagReq::setTag4Name, TagReq::setTag4Code); + setTagField(tagReq, simulationTask.getTag5(), simulationTask.getTag5Name(), simulationTask.getTag5Code(),TagReq::setTag5, TagReq::setTag5Name, TagReq::setTag5Code); + setTagField(tagReq, simulationTask.getTag6(), simulationTask.getTag6Name(), simulationTask.getTag6Code(),TagReq::setTag6, TagReq::setTag6Name, TagReq::setTag6Code); + setTagField(tagReq, simulationTask.getTag7(), simulationTask.getTag7Name(), simulationTask.getTag7Code(),TagReq::setTag7, TagReq::setTag7Name, TagReq::setTag7Code); + setTagField(tagReq, simulationTask.getTag8(), simulationTask.getTag8Name(), simulationTask.getTag8Code(),TagReq::setTag8, TagReq::setTag8Name,TagReq::setTag8Code); + setTagField(tagReq, simulationTask.getTag9(), simulationTask.getTag9Name(), simulationTask.getTag9Code(),TagReq::setTag9, TagReq::setTag9Name, TagReq::setTag9Code); + setTagField(tagReq, simulationTask.getTag10(), simulationTask.getTag10Name(), simulationTask.getTag10Code(),TagReq::setTag10, TagReq::setTag10Name, TagReq::setTag10Code); + tagReq.setTaskId(simulationTask.getUuid()); + tagReq.setTaskName(simulationTask.getTaskName()); + tagReq.setTaskCode(simulationTask.getTaskCode()); + simulationTask.setTagReq(tagReq); + } + } + + // 构建任务映射（项目ID -> 任务列表） Map> projectTaskMap = CollectionUtils.isEmpty(taskList) ? new HashMap<>()