diff --git a/project/src/main/java/com/sdm/project/controller/SimulationLyricNodeController.java b/project/src/main/java/com/sdm/project/controller/SimulationLyricNodeController.java index 27d47150..35edcc53 100644 --- a/project/src/main/java/com/sdm/project/controller/SimulationLyricNodeController.java +++ b/project/src/main/java/com/sdm/project/controller/SimulationLyricNodeController.java @@ -2,6 +2,7 @@ package com.sdm.project.controller; import com.sdm.common.common.SdmResponse; import com.sdm.common.entity.req.project.SpdmNodeListReq; +import com.sdm.common.entity.resp.PageDataResp; import com.sdm.outbridge.entity.LyricVProjectStationExcepTionToDM; import com.sdm.outbridge.mode.GetProcessDataReq; import com.sdm.outbridge.service.lyric.LyricIntegrateService; @@ -209,8 +210,8 @@ public class SimulationLyricNodeController { */ @GetMapping("/queryEncExceptionByTaskId") @Operation(summary = "根据taskId查询enc异常信息", description = "根据taskId查询enc异常信息") - public SdmResponse> queryEncExceptionByTaskId(@RequestParam String taskId) { - return lyricInternalService.queryEncExceptionByTaskId(taskId); + public SdmResponse>> queryEncExceptionByTaskId(@RequestParam String taskId, @RequestParam Integer current, @RequestParam Integer size) { + return lyricInternalService.queryEncExceptionByTaskId(taskId,current,size); } diff --git a/project/src/main/java/com/sdm/project/service/ILyricInternalService.java b/project/src/main/java/com/sdm/project/service/ILyricInternalService.java index 7501276f..072ace17 100644 --- a/project/src/main/java/com/sdm/project/service/ILyricInternalService.java +++ b/project/src/main/java/com/sdm/project/service/ILyricInternalService.java @@ -2,6 +2,7 @@ package com.sdm.project.service; import com.sdm.common.common.SdmResponse; import com.sdm.common.entity.req.project.SpdmNodeListReq; +import com.sdm.common.entity.resp.PageDataResp; import com.sdm.outbridge.entity.LyricVProjectStationExcepTionToDM; import com.sdm.outbridge.mode.GetProcessDataReq; import com.sdm.project.model.req.PushReportReq; @@ -57,6 +58,6 @@ public interface ILyricInternalService { SdmResponse optimisedGetTodoList(String http); - SdmResponse> queryEncExceptionByTaskId(String taskId); + SdmResponse>> queryEncExceptionByTaskId(String taskId, Integer current, Integer size); } diff --git a/project/src/main/java/com/sdm/project/service/impl/LyricInternalServiceImpl.java b/project/src/main/java/com/sdm/project/service/impl/LyricInternalServiceImpl.java index 944024f0..5b1fde62 100644 --- a/project/src/main/java/com/sdm/project/service/impl/LyricInternalServiceImpl.java +++ b/project/src/main/java/com/sdm/project/service/impl/LyricInternalServiceImpl.java @@ -2285,7 +2285,7 @@ public class LyricInternalServiceImpl implements ILyricInternalService { } @Override - public SdmResponse> queryEncExceptionByTaskId(String taskId) { + public SdmResponse>> queryEncExceptionByTaskId(String taskId,Integer current, Integer size) { // taskId --> project code & station code List encNodeSpdmList = nodeMapper.getEncNodeListByTaskId(taskId); log.info("queryEncExceptionByTaskId spdm db back:{}",JSONObject.toJSONString(encNodeSpdmList)); @@ -2312,9 +2312,12 @@ public class LyricInternalServiceImpl implements ILyricInternalService { } // enc 视图查询 log.info("queryEncExceptionByTaskId send lyric db projectNodeCode:{},workspaceNodeCode:{}",projectNodeCode,workspaceNodeCode); + PageHelper.startPage(current,size); List lyricEncInfos = lyricVProjectStationExcepTionToDMMapper.queryExceptionByProjectAndStation(projectNodeCode, workspaceNodeCode); log.info("queryEncExceptionByTaskId lyric db back:{}",lyricEncInfos.size()); - return SdmResponse.success(lyricEncInfos); + PageInfo pageList = new PageInfo<>(lyricEncInfos); + SdmResponse>> response = PageUtils.getJsonObjectSdmResponse(pageList.getList(), pageList); + return response; }