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

移除学科节点，基于学科信息查询优化

Browse Source
This commit is contained in:
gulongcheng
2026-01-20 17:04:01 +08:00
parent 990eb0a47a
commit d2a8b9536b
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
project/src/main/java/com/sdm/project/controller/SimulationNodeController.java
View File

@@ -221,9 +221,9 @@ public class SimulationNodeController implements ISimulationNodeFeignClient {
/**
* 基于节点（工位）查询（任务/指标）完成统计，
* 需要传：
* queryType 查询统计类型 task/
* queryType 查询统计类型 任务/指标:task/performance
* tag1-tag10 标签
* resultTagType 数据返回Tag类型: tag1、tag2,tag3,tag4,tag5,tag6,tag7,tag8,tag9,tag10
* resultTagType X轴(工位对应的tag)数据返回对应的Tag类型: tag1、tag2,tag3,tag4,tag5,tag6,tag7,tag8,tag9,tag10
*/
@SysLog("任务/指标 完成情况统计请求参数(工位)")
@PostMapping("/getCommonCompleteStatistics")

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

@@ -1115,8 +1115,11 @@ public class SimulationRunServiceImpl extends ServiceImpl<SimulationRunMapper, S
@Override
public SdmResponse<PageDataResp<List<SimulationRunKeyResult>>> listSimulationKeyResult(KeyResultReq req) {
PageHelper.startPage(req.getCurrent(), req.getSize());
List<SimulationRunKeyResult> runKeyResults = simulationKeyResultService.lambdaQuery().eq(SimulationRunKeyResult::getRunId, req.getRunId())
.eq(SimulationRunKeyResult::getKeyResultType, req.getKeyResultType()).list();
List<SimulationRunKeyResult> runKeyResults = simulationKeyResultService.lambdaQuery()
.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())
.list();
PageInfo<SimulationRunKeyResult> page = new PageInfo<>(runKeyResults);
return PageUtils.getJsonObjectSdmResponse(runKeyResults, page);
}