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

fix:bug修复

Browse Source
This commit is contained in:
zhuxinru
2026-02-25 16:59:59 +08:00
parent a30ec2507e
commit d3b8fdce87
5 changed files with 23 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -5,10 +5,10 @@ package com.sdm.common.entity.enums;
*/
public enum MessageTemplateEnum {
TASK_ISSUE("任务通知", "接收到下发的仿真任务：%s，请前往仿真数据管理平台查看"),
DATA_ALERT("数据通知", "您的数据存储空间已达阈值，请前往仿真数据管理平台查看"),
DATA_ALERT_MANAGER("数据通知", "%s的数据存储空间已达阈值，请前往仿真数据管理平台查看"),
APPROVE_ALERT("审批通知", "收到一条%s消息，请前往仿真数据管理平台查看"),
TASK_ISSUE("任务通知", "接收到任务：%s"),
DATA_ALERT("数据通知", "您的数据存储空间已达阈值"),
DATA_ALERT_MANAGER("数据通知", "%s的数据存储空间已达阈值"),
APPROVE_ALERT("审批通知", "收到一条%s消息"),
HPC_START("作业通知", "HPC任务作业：%s，已发起%s"),
HPC_END("作业通知", "HPC任务作业：%s，已结束，执行结果：%s")
;

1
project/src/main/java/com/sdm/project/service/impl/SimulationRunServiceImpl.java
View File

@@ -1234,6 +1234,7 @@ public class SimulationRunServiceImpl extends ServiceImpl<SimulationRunMapper, S
.eq(ObjectUtils.isNotEmpty(req.getRunId()),SimulationRunKeyResult::getRunId, req.getRunId())
.eq(ObjectUtils.isNotEmpty(req.getKeyResultType()),SimulationRunKeyResult::getKeyResultType, req.getKeyResultType())
.eq(ObjectUtils.isNotEmpty(req.getFileId()),SimulationRunKeyResult::getFileId, req.getFileId())
.orderByAsc(SimulationRunKeyResult::getFileId)
.list();
PageInfo<SimulationRunKeyResult> page = new PageInfo<>(runKeyResults);
return PageUtils.getJsonObjectSdmResponse(runKeyResults, page);

2
system/src/main/java/com/sdm/system/service/handle/LyricMessageSender.java
View File

@@ -77,7 +77,7 @@ public class LyricMessageSender implements IMessageSender {
freeLinkMsg.setId(sendUserId);
}
freeLinkMsg.setType("text");
freeLinkMsg.setMsg(req.getContent());
freeLinkMsg.setMsg(req.getContent() + "，请前往仿真数据管理平台查看");
freeLinkMsg.setUser("66666");
freeLinkMsg.setPawd("lyric@123");
freeLinkMsg.setFreelinkAppId("d7eb3ef7c8e8c93e7c6e978fee848646");

1
system/src/main/java/com/sdm/system/service/impl/SimulationAppCenterServiceImpl.java
View File

@@ -137,6 +137,7 @@ public class SimulationAppCenterServiceImpl extends BaseService implements ISimu
{
userIds.add(appBean.creator);
}
req.setUserIds(userIds);
SdmResponse<List<CIDUserResp>> userResp = sysUserFeignClient.listUserByIds(req);
if(userResp.isSuccess())
{

17
task/src/main/java/com/sdm/task/service/impl/SimulationPerformanceServiceImpl.java
View File

@@ -104,6 +104,11 @@ public class SimulationPerformanceServiceImpl extends ServiceImpl<SimulationPerf
if (StringUtils.isNotBlank(batchAddTaskPerformanceReq.getRunId())) {
simulationPerformance.setRunId(batchAddTaskPerformanceReq.getRunId());
}
// 设置达成状态
SdmResponse response = setCompleteStatus(simulationPerformance);
if (!response.isSuccess()) {
return response;
}
simulationPerformanceList.add(simulationPerformance);
}
@@ -135,6 +140,15 @@ public class SimulationPerformanceServiceImpl extends ServiceImpl<SimulationPerf
public SdmResponse editPerformance(TaskPerformanceDto performanceDto) {
SimulationPerformance simulationPerformance = new SimulationPerformance();
BeanUtils.copyProperties(performanceDto, simulationPerformance);
SdmResponse response = setCompleteStatus(simulationPerformance);
if (response.isSuccess()) {
return SdmResponse.success(this.updateById(simulationPerformance));
} else {
return response;
}
}
private SdmResponse setCompleteStatus(SimulationPerformance simulationPerformance) {
// 目标值
String targetValueStr = simulationPerformance.getTargetValue();
// 分析值
@@ -160,12 +174,13 @@ public class SimulationPerformanceServiceImpl extends ServiceImpl<SimulationPerf
default -> throw new IllegalArgumentException("无效运算符: " + method);
};
simulationPerformance.setCompleteStatus(isPassed ? PerformanceStatusEnum.STARTED.getCode() : PerformanceStatusEnum.NOT_STARTED.getCode());
return SdmResponse.success();
} catch (Exception e) {
log.error("数字格式异常：", e);
return SdmResponse.failed("请输入有效的目标值和分析值");
}
}
return SdmResponse.success(this.updateById(simulationPerformance));
return SdmResponse.failed("请输入有效的目标值和分析值");
}
private boolean validateNumber(String input) {