事件分析-事件列表：增加biz参数，前端传递业务类型，查询不同的数据

epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ProcessAnalysisEventListFormDTO.java

@@ -44,4 +44,11 @@ public class ProcessAnalysisEventListFormDTO {
     private String categoryCode;
     private Integer pageNo;
     private Integer pageSize;
+
+    /**
+     * 业务：
+     * 1.eventProcessAnalysis 事件处理分析
+     * 2.eventCategoryAnalysis 事件分类分析
+     */
+    private String biz;
 }

epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/IcEventController.java

@@ -126,15 +126,16 @@ public class IcEventController {
     @PostMapping("processAnalysis/eventList")
     public Result<PageData<IcEventResultDTO>> listProcessAnalysisEvents(@RequestBody ProcessAnalysisEventListFormDTO input) {
         ValidatorUtils.validateEntity(input);
-        String orgId = input.getOrgId();
+        PageData<IcEventResultDTO> page = icEventService.listProcessAnalysisEvents(
-        String orgType = input.getOrgType();
+                input.getOrgId(),
-        String categoryCode = input.getCategoryCode();
+                input.getOrgType(),
-        Date queryStartTime = input.getQueryStartTime();
+                input.getCategoryCode(),
-        Date queryEndTime = input.getQueryEndTime();
+                input.getProcessStatus(),
-        Integer pageNo = input.getPageNo();
+                input.getQueryStartTime(),
-        Integer pageSize = input.getPageSize();
+                input.getQueryEndTime(),
-        String processStatus = input.getProcessStatus();
+                input.getPageNo(),
-        PageData<IcEventResultDTO> page = icEventService.listProcessAnalysisEvents(orgId, orgType, categoryCode, processStatus, queryStartTime, queryEndTime, pageNo, pageSize);
+                input.getPageSize(),
+                input.getBiz());
         return new Result<PageData<IcEventResultDTO>>().ok(page);
     }
 

epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/IcEventDao.java

@@ -57,7 +57,8 @@ public interface IcEventDao extends BaseDao<IcEventEntity> {
                                                @Param("categoryCode") String categoryCode,
                                                @Param("processStatus") String processStatus,
                                                @Param("queryStartTime") Date queryStartTime,
-                                               @Param("queryEndTime") Date queryEndTime);
+                                               @Param("queryEndTime") Date queryEndTime,
+                                                @Param("biz") String biz);
 
     /**
      * 月度事件数统计查询

epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/IcEventService.java

@@ -84,7 +84,7 @@ public interface IcEventService extends BaseService<IcEventEntity> {
      * @return
      */
     PageData<IcEventResultDTO> listProcessAnalysisEvents(String orgId, String orgType, String categoryCode, String processStatus, Date queryStartTime,
-                                                     Date queryEndTime, Integer pageNo, Integer pageSize);
+                                                     Date queryEndTime, Integer pageNo, Integer pageSize, String biz);
 
     /**
      * 月度增量查询

epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/IcEventServiceImpl.java

@@ -479,7 +479,7 @@ public class IcEventServiceImpl extends BaseServiceImpl<IcEventDao, IcEventEntit
     @Override
     public PageData<IcEventResultDTO> listProcessAnalysisEvents(String orgId, String orgType, String categoryCode, String processStatus,
                                                                 Date queryStartTime, Date queryEndTime, Integer pageNo,
-                                                                Integer pageSize) {
+                                                                Integer pageSize, String biz) {
 
         // 1.分类字典
         Map<String, String> eventSourceTypeDict = getResultDataOrThrowsException(adminOpenFeignClient.dictMap("ic_event_source_type"),
@@ -497,7 +497,7 @@ public class IcEventServiceImpl extends BaseServiceImpl<IcEventDao, IcEventEntit
         PageHelper.startPage(pageNo, pageSize);
         List<IcEventResultDTO> list = baseDao.listProcessAnalysisEvents(
                 EpmetRequestHolder.getHeader(AppClientConstant.CUSTOMER_ID), orgType, orgId, gridPids, categoryCode, processStatus, queryStartTime
-                , queryEndTime);
+                , queryEndTime, biz);
 
         // 3.补充数据
         for (IcEventResultDTO event : list) {

epmet-module/gov-project/gov-project-server/src/main/resources/mapper/IcEventDao.xml

@@ -45,7 +45,15 @@
                e.MOBILE mobile,
                e.STATUS processStatus
         from ic_event e
-                 inner join ic_event_category c on (e.ID = c.IC_EVENT_ID)
+            <choose>
+            <!-- 如果是事件分类分析，那么用inner join；如果是处理分析，那么leftjoin查询所有事件 -->
+                <when test="biz != null and biz == 'eventCategoryAnalysis'">
+                    inner join ic_event_category c on (e.ID = c.IC_EVENT_ID)
+                </when>
+                <otherwise>
+                    left join ic_event_category c on (e.ID = c.IC_EVENT_ID)
+                </otherwise>
+            </choose>
         <where>
               e.CUSTOMER_ID = #{customerId}
             and e.HAPPEN_TIME >= #{queryStartTime}