[IMP] 调整查询pod事件逻辑

open-hand · Apr 17, 2024 · 10788b8 · 10788b8
1 parent 4bfa4d5
commit 10788b8
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 5 deletions.
diff --git a/src/main/java/io/choerodon/devops/app/service/DevopsCommandEventService.java b/src/main/java/io/choerodon/devops/app/service/DevopsCommandEventService.java
@@ -18,13 +18,13 @@ public interface DevopsCommandEventService {
     void baseDeleteByCommandId(Long commandId);
 
     /**
-     * 根据commandIds 批量查询
+     * 根据commandIds 批量查询(最多查询最近200条)
      *
      * @param commandIds
      * @param type
      * @return
      */
-    List<DevopsCommandEventDTO> listByCommandIdsAndType(Set<Long> commandIds, String type);
+    List<DevopsCommandEventDTO> listLastByCommandIdsAndType(Set<Long> commandIds, String type);
 
     /**
      * 根据commandIds 批量查询

diff --git a/src/main/java/io/choerodon/devops/app/service/impl/DevopsCommandEventServiceImpl.java b/src/main/java/io/choerodon/devops/app/service/impl/DevopsCommandEventServiceImpl.java
@@ -53,7 +53,7 @@ public void baseDeleteByCommandId(Long commandId) {
     }
 
     @Override
-    public List<DevopsCommandEventDTO> listByCommandIdsAndType(Set<Long> commandIds, String type) {
+    public List<DevopsCommandEventDTO> listLastByCommandIdsAndType(Set<Long> commandIds, String type) {
         return commandIds.isEmpty() ? new ArrayList<>() : devopsCommandEventMapper.listByCommandIdsAndType(commandIds, type);
     }
 

diff --git a/src/main/java/io/choerodon/devops/app/service/impl/DevopsEnvResourceServiceImpl.java b/src/main/java/io/choerodon/devops/app/service/impl/DevopsEnvResourceServiceImpl.java
@@ -208,8 +208,8 @@ private List<InstanceEventVO> listEventByObjectId(Long objectId, ObjectType obje
 
         // 查出所有的 DevopsCommandEventDTO 并根据commandId分组
         Set<Long> commandIds = devopsEnvCommandDTOS.stream().map(DevopsEnvCommandDTO::getId).collect(Collectors.toSet());
-        List<DevopsCommandEventDTO> commandEventTypeJob = devopsCommandEventService.listByCommandIdsAndType(commandIds, ResourceType.JOB.getType());
-        List<DevopsCommandEventDTO> commandEventTypePod = devopsCommandEventService.listByCommandIdsAndType(commandIds, ResourceType.POD.getType());
+        List<DevopsCommandEventDTO> commandEventTypeJob = devopsCommandEventService.listLastByCommandIdsAndType(commandIds, ResourceType.JOB.getType());
+        List<DevopsCommandEventDTO> commandEventTypePod = devopsCommandEventService.listLastByCommandIdsAndType(commandIds, ResourceType.POD.getType());
         Map<Long, List<DevopsCommandEventDTO>> commandEventTypeJobMap = commandEventTypeJob.stream().collect(Collectors.groupingBy(DevopsCommandEventDTO::getCommandId));
         Map<Long, List<DevopsCommandEventDTO>> commandEventTypePodJobMap = commandEventTypePod.stream().collect(Collectors.groupingBy(DevopsCommandEventDTO::getCommandId));
 

diff --git a/src/main/resources/mapper/DevopsCommandEventMapper.xml b/src/main/resources/mapper/DevopsCommandEventMapper.xml
@@ -27,5 +27,7 @@
        <foreach collection="commandIds" item="commandId"  open="(" separator=" , " close=")">
            #{commandId}
        </foreach>
+        order by id desc
+        limit 200
     </select>
 </mapper>