联调逻辑修改

src/main/java/com/zzsn/event/controller/EventAnalysisController.java

@@ -89,6 +89,11 @@ public class EventAnalysisController {
         map.put("spread", divide);
         String mainReport = esStatisticsService.mainReport(subjectId);
         map.put("mainReport", mainReport);
+        List<String> subjectIdList = new ArrayList<>();
+        subjectIdList.add(subjectId);
+        DateTime beforeHour = DateUtil.offsetHour(DateUtil.parseDateTime(endTime), -1);
+        long lastHour = esStatisticsService.totalCount(subjectIdList, DateUtil.formatDateTime(beforeHour),endTime);
+        map.put("lastHour",String.valueOf(lastHour));
         return Result.OK(map);
     }
 

src/main/java/com/zzsn/event/controller/EventDataController.java

@@ -43,6 +43,7 @@ public class EventDataController {
     /**
      * 事件分页列表-门户
      *
+     * @param eventId    事件id
      * @param eventName  事件名称
      * @param eventType  事件分类id
      * @param labelField 搜索字段
@@ -56,7 +57,8 @@ public class EventDataController {
      */
     @ApiOperation(value = "事件-分页列表查询", notes = "事件-分页列表查询")
     @GetMapping(value = "/pageList")
-    public Result<?> pageList(@RequestParam(name = "eventName", required = false) String eventName,
+    public Result<?> pageList(@RequestParam(name = "eventId", required = false) String eventId,
+                              @RequestParam(name = "eventName", required = false) String eventName,
                               @RequestParam(name = "eventType", required = false) Integer eventType,
                               @RequestParam(name = "labelField", required = false) String labelField,
                               @RequestParam(name = "labelName", required = false) String labelName,
@@ -64,7 +66,7 @@ public class EventDataController {
                               @RequestParam(name = "orderType", required = false) String orderType,
                               @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
                               @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize) {
-        IPage<EventFrontVO> pageList = eventService.frontPageList(eventName, eventType, labelField, labelName, order, orderType, pageNo, pageSize);
+        IPage<EventFrontVO> pageList = eventService.frontPageList(eventId, eventName, eventType, labelField, labelName, order, orderType, pageNo, pageSize);
         return Result.OK(pageList);
     }
 

src/main/java/com/zzsn/event/mapper/EventMapper.java

@@ -65,6 +65,7 @@ public interface EventMapper extends BaseMapper<Event> {
     /**
      * 分页列表-后台管理
      *
+     * @param eventId    事件id
      * @param eventName  事件名称
      * @param eventType  事件分类id
      * @param labelField 搜索字段
@@ -77,15 +78,16 @@ public interface EventMapper extends BaseMapper<Event> {
      * @author lkg
      * @date 2024/4/8
      */
-    List<EventFrontVO> frontPageList(@Param("eventName") String eventName, @Param("eventType") Integer eventType,
-                                     @Param("labelField") String labelField, @Param("labelName") String labelName,
-                                     @Param("type") Integer type,
+    List<EventFrontVO> frontPageList(@Param("eventId") String eventId, @Param("eventName") String eventName,
+                                     @Param("eventType") Integer eventType, @Param("labelField") String labelField,
+                                     @Param("labelName") String labelName, @Param("type") Integer type,
                                      @Param("order") String order, @Param("orderType") String orderType,
                                      @Param("offset") Integer offset, @Param("pageSize") Integer pageSize);
 
     /**
      * 总数量-后台管理
      *
+     * @param eventId    事件id
      * @param eventName  事件名称
      * @param eventType  事件分类id
      * @param labelField 搜索字段
@@ -94,9 +96,9 @@ public interface EventMapper extends BaseMapper<Event> {
      * @author lkg
      * @date 2024/4/8
      */
-    Integer frontTotalCount(@Param("eventName") String eventName, @Param("eventType") Integer eventType,
-                            @Param("labelField") String labelField, @Param("labelName") String labelName,
-                            @Param("type") Integer type);
+    Integer frontTotalCount(@Param("eventId") String eventId, @Param("eventName") String eventName,
+                            @Param("eventType") Integer eventType, @Param("labelField") String labelField,
+                            @Param("labelName") String labelName, @Param("type") Integer type);
 
     /**
      * 分页列表(专题分类)-新平台管理

src/main/java/com/zzsn/event/mapper/xml/EventMapper.xml

@@ -81,6 +81,9 @@
         from event t1 inner join event_category t2 on t1.event_type =t2.id
         left join event_tag t3 on t1.id=t3.event_id
         where t1.publish_status = 1 and t1.face_public = 1
+        <if test="eventId!=null and eventId != ''">
+            and t1.id = #{eventId}
+        </if>
         <if test="eventName!=null and eventName != ''">
             and t1.event_name like CONCAT('%',#{eventName},'%')
         </if>
@@ -117,6 +120,9 @@
         inner join event_category t2 on t1.event_type =t2.id
         left join event_tag t3 on t1.id=t3.event_id
         where t1.publish_status = 1 and t1.face_public = 1
+        <if test="eventId!=null and eventId != ''">
+            and t1.id = #{eventId}
+        </if>
         <if test="eventName!=null and eventName != ''">
             and t1.event_name like CONCAT('%',#{eventName},'%')
         </if>

src/main/java/com/zzsn/event/service/IEventService.java

@@ -50,6 +50,7 @@ public interface IEventService extends IService<Event> {
     /**
      * 分页列表-后台管理
      *
+     * @param eventId    事件id
      * @param eventName  事件名称
      * @param eventType  事件分类id
      * @param labelField 搜索字段
@@ -61,7 +62,7 @@ public interface IEventService extends IService<Event> {
      * @author lkg
      * @date 2024/4/8
      */
-    IPage<EventFrontVO> frontPageList(String eventName, Integer eventType, String labelField, String labelName, String order, String orderType, Integer pageNo, Integer pageSize);
+    IPage<EventFrontVO> frontPageList(String eventId, String eventName, Integer eventType, String labelField, String labelName, String order, String orderType, Integer pageNo, Integer pageSize);
 
     /**
      * 分页列表(专题类别)-新平台管理
@@ -220,12 +221,12 @@ public interface IEventService extends IService<Event> {
     /**
      * 删除专题下已屏蔽的信息源(即恢复绑定关系)
      *
-     * @param subjectId 专题id
+     * @param subjectId    专题id
      * @param infoSourceId 信息源id
      * @author lkg
      * @date 2024/5/7
      */
-    void removeUnBindInfoSource(String subjectId,String infoSourceId);
+    void removeUnBindInfoSource(String subjectId, String infoSourceId);
 
     /**
      * 专题关联信息源时间段内的采集量统计

src/main/java/com/zzsn/event/service/impl/EventServiceImpl.java

@@ -109,13 +109,13 @@ public class EventServiceImpl extends ServiceImpl<EventMapper, Event> implements
     }
 
     @Override
-    public IPage<EventFrontVO> frontPageList(String eventName, Integer eventType, String labelField, String labelName, String order, String orderType, Integer pageNo, Integer pageSize) {
+    public IPage<EventFrontVO> frontPageList(String eventId,String eventName, Integer eventType, String labelField, String labelName, String order, String orderType, Integer pageNo, Integer pageSize) {
         int offset = (pageNo - 1) * pageSize;
         Integer type = null;
         if (StringUtils.isNotEmpty(labelField) && labelField.equals("event_label")) {
             type = 1;
         }
-        List<EventFrontVO> pageList = baseMapper.frontPageList(eventName, eventType, labelField, labelName, type, order, orderType, offset, pageSize);
+        List<EventFrontVO> pageList = baseMapper.frontPageList(eventId,eventName, eventType, labelField, labelName, type, order, orderType, offset, pageSize);
         if (CollectionUtils.isNotEmpty(pageList)) {
             //获取专题资讯的首发来源
             Map<String, String> map = getFirstMap(pageList);
@@ -127,7 +127,7 @@ public class EventServiceImpl extends ServiceImpl<EventMapper, Event> implements
             }
         }
         //获取总条数
-        Integer count = baseMapper.frontTotalCount(eventName, eventType, labelField, labelName, type);
+        Integer count = baseMapper.frontTotalCount(eventId,eventName, eventType, labelField, labelName, type);
         IPage<EventFrontVO> pageData = new Page<>(pageNo, pageSize, count);
         pageData.setRecords(pageList);
         return pageData;