Merge remote-tracking branch 'origin/lingshan_master' into lingshan_master

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/LingShanAgentServiceController.java

@@ -279,9 +279,10 @@ public class LingShanAgentServiceController {
     @GetMapping("screen/serviceList")
     public Result<List<LingShanScreenServiceRstDTO>> screenServiceList(@RequestParam("orgType") String orgType,
                                     @RequestParam("orgId") String orgId,
-                                    @RequestParam("dataType") String dataType) {
+                                    @RequestParam("dataType") String dataType,
+                                    @RequestParam(value = "agentId", required = false) String agentId) {
 
-        List<LingShanScreenServiceRstDTO> rl = lingShanServiceAgentService.screenServiceList(orgType, orgId, dataType);
+        List<LingShanScreenServiceRstDTO> rl = lingShanServiceAgentService.screenServiceList(orgType, orgId, dataType, agentId);
         return new Result<List<LingShanScreenServiceRstDTO>>().ok(rl);
     }
 

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/LingShanAgentServiceService.java

@@ -33,7 +33,7 @@ public interface LingShanAgentServiceService {
 
     List<LingShanScreenAgentRstDTO> screenAgentList(String orgType, String orgId);
 
-    List<LingShanScreenServiceRstDTO> screenServiceList(String orgType, String orgId, String dataType);
+    List<LingShanScreenServiceRstDTO> screenServiceList(String orgType, String orgId, String dataType, String agentId);
 
     List<ScreenAgentServiceCategoryAnalysisRstDTO> serviceCategoryAnalysis(String orgType, String orgId);
 

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/LingShanAgentServiceServiceImpl.java

@@ -474,7 +474,7 @@ public class LingShanAgentServiceServiceImpl implements LingShanAgentServiceServ
     }
 
     @Override
-    public List<LingShanScreenServiceRstDTO> screenServiceList(String orgType, String orgId, String dataType) {
+    public List<LingShanScreenServiceRstDTO> screenServiceList(String orgType, String orgId, String dataType, String agentId) {
         String orgIdPath;
 
         if (StringUtils.isAnyBlank(orgType, orgId)) {
@@ -503,6 +503,7 @@ public class LingShanAgentServiceServiceImpl implements LingShanAgentServiceServ
         LambdaQueryWrapper<LingshanAgentServiceRecordEntity> q = new LambdaQueryWrapper<>();
         q.likeRight(LingshanAgentServiceRecordEntity::getOrgIdPath, orgIdPath);
         q.eq(LingshanAgentServiceRecordEntity::getProcessStatus, processStatus);
+        q.eq(StringUtils.isNotBlank(agentId), LingshanAgentServiceRecordEntity::getAgentId, agentId);
 
         List<LingshanAgentServiceRecordEntity> serviceRecords = agentServiceRecordDao.selectList(q);
         return serviceRecords.stream().map(rec -> {