事件列表页分页列表查询逻辑修改

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

@@ -59,7 +59,7 @@ public class EventDataController {
     @GetMapping(value = "/pageList")
     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 = "eventType", required = false) String eventType,
                               @RequestParam(name = "labelField", required = false) String labelField,
                               @RequestParam(name = "labelName", required = false) String labelName,
                               @RequestParam(name = "order", required = false) String order,

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

@@ -2,8 +2,11 @@ package com.zzsn.event.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.zzsn.event.entity.EventCategory;
+import com.zzsn.event.util.tree.Node;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.List;
+
 /**
  * @Description: 事件分类
  * @Author: jeecg-boot
@@ -13,4 +16,11 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface EventCategoryMapper extends BaseMapper<EventCategory> {
 
+    /**
+     * 事件分类信息集合
+     *
+     * @author lkg
+     * @date 2024/6/21
+     */
+    List<Node> categoryList();
 }

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

@@ -67,7 +67,7 @@ public interface EventMapper extends BaseMapper<Event> {
      *
      * @param eventId    事件id
      * @param eventName  事件名称
-     * @param eventType  事件分类id
+     * @param eventTypes  事件分类id集合
      * @param labelField 搜索字段
      * @param labelName  搜索词
      * @param type       类别(1-自定义标签;2-抽取标签)
@@ -79,7 +79,7 @@ public interface EventMapper extends BaseMapper<Event> {
      * @date 2024/4/8
      */
     List<EventFrontVO> frontPageList(@Param("eventId") String eventId, @Param("eventName") String eventName,
-                                     @Param("eventType") Integer eventType, @Param("labelField") String labelField,
+                                     @Param("eventTypes") List<String> eventTypes, @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);
@@ -89,7 +89,7 @@ public interface EventMapper extends BaseMapper<Event> {
      *
      * @param eventId    事件id
      * @param eventName  事件名称
-     * @param eventType  事件分类id
+     * @param eventTypes  事件分类id集合
      * @param labelField 搜索字段
      * @param labelName  搜索词
      * @param type       类别(1-自定义标签;2-抽取标签)
@@ -97,7 +97,7 @@ public interface EventMapper extends BaseMapper<Event> {
      * @date 2024/4/8
      */
     Integer frontTotalCount(@Param("eventId") String eventId, @Param("eventName") String eventName,
-                            @Param("eventType") Integer eventType, @Param("labelField") String labelField,
+                            @Param("eventTypes") List<String> eventTypes, @Param("labelField") String labelField,
                             @Param("labelName") String labelName, @Param("type") Integer type);
 
     /**

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

@@ -2,4 +2,7 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.zzsn.event.mapper.EventCategoryMapper">
 
+    <select id="categoryList" resultType="com.zzsn.event.util.tree.Node">
+        select id,type_name as name,pid from event_category
+    </select>
 </mapper>
\ No newline at end of file

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

@@ -88,8 +88,11 @@
         <if test="eventName!=null and eventName != ''">
             and t1.event_name like CONCAT('%',#{eventName},'%')
         </if>
-        <if test="eventType!=null  and eventType != ''">
-            and t1.event_type = #{eventType}
+        <if test="eventTypes != null  and eventTypes.size() > 0">
+          and t1.event_type in
+          <foreach collection="eventTypes" item="item" open="(" separator="," close=")">
+              #{item}
+          </foreach>
         </if>
         <if test="labelName != null and labelName !=''">
             <if test="labelField != null  and labelField != ''">
@@ -127,8 +130,11 @@
         <if test="eventName!=null and eventName != ''">
             and t1.event_name like CONCAT('%',#{eventName},'%')
         </if>
-        <if test="eventType!=null  and eventType != ''">
-            and t1.event_type = #{eventType}
+        <if test="eventTypes != null  and eventTypes.size() > 0">
+            and t1.event_type in
+            <foreach collection="eventTypes" item="item" open="(" separator="," close=")">
+                #{item}
+            </foreach>
         </if>
         <if test="labelName != null and labelName !=''">
             <if test="labelField != null  and labelField != ''">

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

@@ -2,6 +2,9 @@ package com.zzsn.event.service;
 
 import com.zzsn.event.entity.EventCategory;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.zzsn.event.util.tree.Node;
+
+import java.util.List;
 
 /**
  * @Description: 事件分类
@@ -11,4 +14,11 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface IEventCategoryService extends IService<EventCategory> {
 
+    /**
+     * 事件分类信息集合
+     *
+     * @author lkg
+     * @date 2024/6/21
+     */
+    List<Node> categoryList();
 }

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

@@ -62,7 +62,7 @@ public interface IEventService extends IService<Event> {
      * @author lkg
      * @date 2024/4/8
      */
-    IPage<EventFrontVO> frontPageList(String eventId, String eventName, Integer eventType, String labelField, String labelName, String order, String orderType, Integer pageNo, Integer pageSize);
+    IPage<EventFrontVO> frontPageList(String eventId, String eventName, String eventType, String labelField, String labelName, String order, String orderType, Integer pageNo, Integer pageSize);
 
     /**
      * 分页列表(专题类别)-新平台管理

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

@@ -3,10 +3,13 @@ package com.zzsn.event.service.impl;
 import com.zzsn.event.entity.EventCategory;
 import com.zzsn.event.mapper.EventCategoryMapper;
 import com.zzsn.event.service.IEventCategoryService;
+import com.zzsn.event.util.tree.Node;
 import org.springframework.stereotype.Service;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 
+import java.util.List;
+
 /**
  * @Description: 事件分类
  * @Author: jeecg-boot
@@ -16,4 +19,8 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 @Service
 public class EventCategoryServiceImpl extends ServiceImpl<EventCategoryMapper, EventCategory> implements IEventCategoryService {
 
+    @Override
+    public List<Node> categoryList() {
+        return baseMapper.categoryList();
+    }
 }

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

@@ -19,6 +19,7 @@ import com.zzsn.event.util.CronUtil;
 import com.zzsn.event.util.DateUtil;
 import com.zzsn.event.util.HanlpUtil;
 import com.zzsn.event.util.tree.Node;
+import com.zzsn.event.util.tree.TreeUtil;
 import com.zzsn.event.vo.*;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
@@ -75,6 +76,8 @@ public class EventServiceImpl extends ServiceImpl<EventMapper, Event> implements
     private IProjectSubjectMapService iProjectSubjectMapService;
     @Autowired
     private ISubjectTypeService iSubjectTypeService;
+    @Autowired
+    private IEventCategoryService eventCategoryService;
 
     @Resource
     private RestHighLevelClient client;
@@ -109,13 +112,18 @@ public class EventServiceImpl extends ServiceImpl<EventMapper, Event> implements
     }
 
     @Override
-    public IPage<EventFrontVO> frontPageList(String eventId,String eventName, Integer eventType, String labelField, String labelName, String order, String orderType, Integer pageNo, Integer pageSize) {
+    public IPage<EventFrontVO> frontPageList(String eventId,String eventName, String 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(eventId,eventName, eventType, labelField, labelName, type, order, orderType, offset, pageSize);
+        List<String> eventTypes = new ArrayList<>();
+        if (StringUtils.isNotEmpty(eventType)) {
+            List<Node> nodes = eventCategoryService.categoryList();
+            eventTypes = TreeUtil.belowList(nodes, eventType, true);
+        }
+        List<EventFrontVO> pageList = baseMapper.frontPageList(eventId,eventName, eventTypes, labelField, labelName, type, order, orderType, offset, pageSize);
         if (CollectionUtils.isNotEmpty(pageList)) {
             //获取专题资讯的首发来源
             Map<String, String> map = getFirstMap(pageList);
@@ -127,7 +135,7 @@ public class EventServiceImpl extends ServiceImpl<EventMapper, Event> implements
             }
         }
         //获取总条数
-        Integer count = baseMapper.frontTotalCount(eventId,eventName, eventType, labelField, labelName, type);
+        Integer count = baseMapper.frontTotalCount(eventId,eventName, eventTypes, labelField, labelName, type);
         IPage<EventFrontVO> pageData = new Page<>(pageNo, pageSize, count);
         pageData.setRecords(pageList);
         return pageData;

src/main/resources/application-pro.yml

@@ -112,7 +112,6 @@ spring:
 mybatis-plus:
   mapper-locations: classpath*:com/zzsn/event/**/xml/*.xml
   configuration:
-    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
     map-underscore-to-camel-case: true
 obs:
   ak: VEHN7D0TJ9316H8AHCAV