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

1、数据查询 bugfix

Browse Source
This commit is contained in:
lidongyang
2025-11-26 11:20:03 +08:00
parent e9fb463917
commit 2507cfa8eb
3 changed files with 36 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
project/src/main/java/com/sdm/project/dao/SimulationProjectMapper.java
View File

@@ -162,13 +162,13 @@ public interface SimulationProjectMapper {
void deleteTaskMemberList(@Param("taskIdList") List<String> taskIdList);
List<PerformanceNodePo> queryPerformanceNodeByNodeIdList(@Param("taskIdList") List<String> taskIdList);
List<PerformanceNodePo> queryPerformanceNodeByNodeIdList(@Param("taskIdList") List<String> taskIdList,@Param("beginTime") String beginTime,@Param("endTime") String endTime,@Param("name") String name);
List<PerformanceNodeExtraPo> queryPerformanceNodeExtrasByNodeIdList(@Param("taskIdList") List<String> taskIdList);
// List<SpdmTaskVo> getTaskList(@Param("tenantId") String tenantId,@Param("taskName") String taskName, @Param("taskStatus") Integer taskStatus, @Param("achieveStatus") Integer achieveStatus, @Param("nodeIdList") List<String> nodeIdList);
List<TaskRunPo> queryRunListByNodeIdList(@Param("taskIdList") List<String> taskIdList);
List<TaskRunPo> queryRunListByNodeIdList(@Param("taskIdList") List<String> taskIdList,@Param("beginTime") String beginTime,@Param("endTime") String endTime,@Param("name") String name);
List<ProjectNodePo> getNodeListByTag(@Param("req") ProjectTreeReq projectTreeReq);

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

@@ -648,6 +648,9 @@ public class TaskServiceImpl implements ITaskService {
BeanUtils.copyProperties(req, taskReq);
taskReq.setCurrent(1);
taskReq.setSize(10000);
taskReq.setName("");
taskReq.setBeginTime("");
taskReq.setEndTime("");
SdmResponse response = analysisTaskList(taskReq);
if (ObjectUtils.isEmpty(response)) {
log.error("指标查询中，未查询到任务1");
@@ -661,7 +664,7 @@ public class TaskServiceImpl implements ITaskService {
}
List<String> taskIdList = taskVoList.stream().map(SpdmAnalysisTaskVo::getUuid).toList();
List<PerformanceNodePo> performanceNodePoList = projectMapper.queryPerformanceNodeByNodeIdList(taskIdList);
List<PerformanceNodePo> performanceNodePoList = projectMapper.queryPerformanceNodeByNodeIdList(taskIdList,req.getBeginTime(),req.getEndTime(),req.getName());
if (CollectionUtils.isEmpty(performanceNodePoList)) {
log.error("指标查询中，未查询到指标1");
return SdmResponse.success(new ArrayList<>());
@@ -775,6 +778,9 @@ public class TaskServiceImpl implements ITaskService {
BeanUtils.copyProperties(req, taskReq);
taskReq.setCurrent(1);
taskReq.setSize(10000);
taskReq.setName("");
taskReq.setBeginTime("");
taskReq.setEndTime("");
SdmResponse response = analysisTaskList(taskReq);
if (ObjectUtils.isEmpty(response)) {
log.error("指标查询中，未查询到任务1");
@@ -786,16 +792,12 @@ public class TaskServiceImpl implements ITaskService {
log.error("指标查询中，未查询到任务2");
return SdmResponse.success(new ArrayList<>());
}
List<String> taskIdList = taskVoList.stream().map(SpdmAnalysisTaskVo::getUuid).toList();
List<TaskRunPo> runPoList = projectMapper.queryRunListByNodeIdList(taskIdList);
List<TaskRunPo> runPoList = projectMapper.queryRunListByNodeIdList(taskIdList,req.getBeginTime(),req.getEndTime(),req.getName());
if (CollectionUtils.isEmpty(runPoList)) {
log.error("算例查询中，未查询到算例1");
return SdmResponse.success(new ArrayList<>());
}
if (StringUtils.isNotBlank(req.getRunName())) {
runPoList = runPoList.stream().filter(performance -> performance.getRunName().contains(req.getName())).toList();
}
if (CollectionUtils.isEmpty(runPoList)) {
log.error("算例查询中，未查询到算例2");
return SdmResponse.success(new ArrayList<>());

26
project/src/main/resources/mapper/SimulationProjectMapper.xml
View File

@@ -565,6 +565,19 @@
#{taskId}
</foreach>
)
<if test="beginTime != null and beginTime != ''">
<![CDATA[
and STR_TO_DATE(createTime,'%Y-%m-%d %H:%i:%s') >= #{beginTime}
]]>
</if>
<if test="endTime != null and endTime != ''">
<![CDATA[
and STR_TO_DATE(createTime,'%Y-%m-%d %H:%i:%s') <= #{endTime}
]]>
</if>
<if test="name != null and name != ''">
and nodeName like CONCAT('%',#{name},'%')
</if>
</select>
<select id="queryPerformanceNodeExtrasByNodeIdList" resultType="com.sdm.project.model.po.PerformanceNodeExtraPo">
@@ -581,6 +594,19 @@
#{taskId}
</foreach>
)
<if test="beginTime != null and beginTime != ''">
<![CDATA[
and STR_TO_DATE(createTime,'%Y-%m-%d %H:%i:%s') >= #{beginTime}
]]>
</if>
<if test="endTime != null and endTime != ''">
<![CDATA[
and STR_TO_DATE(createTime,'%Y-%m-%d %H:%i:%s') <= #{endTime}
]]>
</if>
<if test="name != null and name != ''">
and runName like CONCAT('%',#{name},'%')
</if>
</select>
<select id="getNodeListByTag" resultType="com.sdm.project.model.po.ProjectNodePo">