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

fix[project]: 新增测试项目通知接口

Browse Source
This commit is contained in:
lidongyang
2026-04-01 13:38:36 +08:00
parent 4723666fe8
commit b878041fe5
6 changed files with 100 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
common/src/main/java/com/sdm/common/entity/enums/MessageTemplateEnum.java
View File

@@ -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;

14
project/src/main/java/com/sdm/project/controller/SimulationProjectController.java
View File

@@ -130,4 +130,18 @@ public class SimulationProjectController implements ISimulationProjectFeignClien
return taskService.importSimulationExternalForm(file,columns);
}
/**
* 测试项目通知
* @return
*/
@GetMapping(value = "/testProjectMessage")
@ResponseBody
void testProjectMessage() {
projectService.testProjectMessage();
}
}

47
project/src/main/java/com/sdm/project/model/entity/SimulationTask.java
View File

@@ -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<String> 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;
}

2
project/src/main/java/com/sdm/project/service/IProjectService.java
View File

@@ -45,4 +45,6 @@ public interface IProjectService {
SdmResponse<PageDataResp<List<WorkspaceReportListResp>>> getWorkspaceReportList(WorkspaceReportListReq req);
void testProjectMessage();
}

14
project/src/main/java/com/sdm/project/service/impl/ProjectServiceImpl.java
View File

@@ -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);

22
project/src/main/java/com/sdm/project/service/impl/TaskServiceImpl.java
View File

@@ -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<String, List<SimulationTask>> projectTaskMap = CollectionUtils.isEmpty(taskList)
? new HashMap<>()