[new] 研究中心-事件列表页增加关注栏目

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

@@ -9,7 +9,6 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.zzsn.event.constant.Constants;
 import com.zzsn.event.constant.Result;
-import com.zzsn.event.entity.Event;
 import com.zzsn.event.entity.EventAnalysisReport;
 import com.zzsn.event.entity.LabelEntity;
 import com.zzsn.event.es.EsService;

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

@@ -139,7 +139,7 @@ public class EventDataController {
     /**
      * 事件分页列表-门户
      *
-     * @param category   栏目类型(1-全部;2-自动追踪;3-我的)
+     * @param category   栏目类型(1-全部;2-自动追踪;3-我创建的;4-我关注的)
      * @param eventName  事件名称
      * @param eventType  事件分类id
      * @param labelField 搜索字段(标签)
@@ -167,6 +167,8 @@ public class EventDataController {
         IPage<EventFrontVO> pageList = new Page<>();
         if (category == 1){
             pageList = eventService.frontAllPageList(projectId, eventId,eventName, eventType, labelField, labelName, order, orderType, pageNo, pageSize);
+        } else if (category == 2) {
+            pageList = eventService.frontCollectPageList(projectId,eventName, eventType, labelField, labelName, order, orderType, pageNo, pageSize);
         } else if (category == 3) {
             pageList = eventService.frontOwnerPageList(projectId, eventName, eventType, labelField, labelName, order, orderType, pageNo, pageSize);
         }

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

 package com.zzsn.event.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.zzsn.event.entity.Event;
 import com.zzsn.event.util.tree.Node;
 import com.zzsn.event.vo.*;
@@ -87,7 +88,7 @@ public interface EventMapper extends BaseMapper<Event> {
                                         @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, @Param("tenant")String tenant);
+                                        @Param("offset") Integer offset, @Param("pageSize") Integer pageSize, @Param("tenant") String tenant);
 
     /**
      * 总数量-门户(全部)
@@ -106,7 +107,7 @@ public interface EventMapper extends BaseMapper<Event> {
     Integer frontAllCount(@Param("projectId") String projectId, @Param("createBy") String createBy,
                           @Param("eventId") String eventId, @Param("eventName") String eventName,
                           @Param("eventTypes") List<String> eventTypes, @Param("labelField") String labelField,
-                          @Param("labelName") String labelName, @Param("type") Integer type, @Param("tenant")String tenant);
+                          @Param("labelName") String labelName, @Param("type") Integer type, @Param("tenant") String tenant);
 
 
     /**
@@ -130,7 +131,7 @@ public interface EventMapper extends BaseMapper<Event> {
                                           @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, @Param("tenant")String tenant);
+                                          @Param("offset") Integer offset, @Param("pageSize") Integer pageSize, @Param("tenant") String tenant);
 
     /**
      * 总数量-门户(我的)
@@ -147,7 +148,27 @@ public interface EventMapper extends BaseMapper<Event> {
      */
     Integer frontOwnerCount(@Param("projectId") String projectId, @Param("createBy") String createBy, @Param("eventName") String eventName,
                             @Param("eventTypes") List<String> eventTypes, @Param("labelField") String labelField,
-                            @Param("labelName") String labelName, @Param("type") Integer type, @Param("tenant")String tenant);
+                            @Param("labelName") String labelName, @Param("type") Integer type, @Param("tenant") String tenant);
+
+    /**
+     * @param projectId  项目id
+     * @param userId     用户di
+     * @param eventName  事件名称
+     * @param eventTypes 事件分类id集合
+     * @param labelField 搜索字段
+     * @param labelName  搜索词
+     * @param type       类别(1-自定义标签;2-抽取标签)
+     * @param order      排序字段
+     * @param orderType  排序方式
+     * @param page       分页参数
+     * @author lkg
+     * @date 2025/7/12
+     */
+    Page<EventFrontVO> frontCollectPageList(@Param("projectId") String projectId, @Param("userId") String userId, @Param("eventName") String eventName,
+                                            @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("tenant") String tenant, Page<EventFrontVO> page);
 
 
     /**
@@ -206,7 +227,7 @@ public interface EventMapper extends BaseMapper<Event> {
     List<EventTopVO> topEventList(@Param("projectId") String projectId, @Param("createBy") String createBy,
                                   @Param("startTime") String startTime, @Param("endTime") String endTime,
                                   @Param("type") Integer type,
-                                  @Param("offset") Integer offset, @Param("pageSize") Integer pageSize, @Param("tenant")String tenant);
+                                  @Param("offset") Integer offset, @Param("pageSize") Integer pageSize, @Param("tenant") String tenant);
 
     List<SubjectKafkaVo> processList(@Param("disableDate") Date disableDate);
 
@@ -217,7 +238,7 @@ public interface EventMapper extends BaseMapper<Event> {
      * @author lkg
      * @date 2024/4/10
      */
-    List<EventRegionVO> listByRegion(@Param("projectId") String projectId, @Param("createBy") String createBy, @Param("type") Integer type, @Param("name") String name, @Param("tenant")String tenant);
+    List<EventRegionVO> listByRegion(@Param("projectId") String projectId, @Param("createBy") String createBy, @Param("type") Integer type, @Param("name") String name, @Param("tenant") String tenant);
 
     /**
      * 公开且发布的事件信息集合
@@ -232,7 +253,7 @@ public interface EventMapper extends BaseMapper<Event> {
      */
     List<EventExcelVO> frontAllList(@Param("projectId") String projectId, @Param("createBy") String createBy, @Param("eventIdList") List<String> eventIdList,
                                     @Param("eventName") String eventName, @Param("eventTypes") List<String> eventTypes, @Param("labelField") String labelField,
-                                    @Param("labelName") String labelName, @Param("type") Integer type, @Param("size") Integer size, @Param("tenant")String tenant);
+                                    @Param("labelName") String labelName, @Param("type") Integer type, @Param("size") Integer size, @Param("tenant") String tenant);
 
     /**
      * 默认创建的，公开且发布的事件信息集合
@@ -245,8 +266,8 @@ public interface EventMapper extends BaseMapper<Event> {
      * @date 2024/4/10
      */
     List<EventExcelVO> frontOwnerList(@Param("projectId") String projectId, @Param("createBy") String createBy, @Param("eventIdList") List<String> eventIdList,
-                                      @Param("eventName") String eventName,@Param("eventTypes") List<String> eventTypes, @Param("labelField") String labelField,
-                                      @Param("labelName") String labelName, @Param("type") Integer type,@Param("size") Integer size);
+                                      @Param("eventName") String eventName, @Param("eventTypes") List<String> eventTypes, @Param("labelField") String labelField,
+                                      @Param("labelName") String labelName, @Param("type") Integer type, @Param("size") Integer size);
 
     /**
      * 模型信息列表
@@ -263,7 +284,7 @@ public interface EventMapper extends BaseMapper<Event> {
      * @author lkg
      * @date 2024/4/12
      */
-    List<EventVO> eventList(@Param("eventIdList") List<String> eventIdList, @Param("tenant")String tenant);
+    List<EventVO> eventList(@Param("eventIdList") List<String> eventIdList, @Param("tenant") String tenant);
 
     /**
      * 专题绑定关键词数量

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

@@ -304,6 +304,55 @@
             </if>
         </if>
     </select>
+    <select id="frontCollectPageList" resultType="com.zzsn.event.vo.EventFrontVO">
+        select
+        t1.id,t1.event_name,t1.event_icon,t1.start_time,t1.end_time,t1.publish_date,t1.event_describe,t1.event_label,
+        t1.total_hot,t1.create_by,t1.category,
+        t2.type_name,
+        t3.extract_industry_tag,t3.extract_company_tag,t3.extract_person_tag,t3.extract_sentiment_tag,
+        t3.extract_keywords_tag,t3.extract_time_tag,t3.extract_location_tag
+        from event t1 inner join event_category t2 on t1.event_type =t2.id
+        inner join event_collect_map ecm on t1.id = ecm.event_id
+        inner join project_subject_map m on t1.id = m.subject_id
+        left join event_tag t3 on t1.id=t3.event_id
+        where t1.publish_status = 1 and ecm.user_id = #{userId} and m.project_id = #{projectId}
+        <if test="tenant != null and tenant != ''">
+            and t1.tenant = #{tenant}
+        </if>
+        <if test="eventName!=null and eventName != ''">
+            and t1.event_name like CONCAT('%',#{eventName},'%')
+        </if>
+        <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 != ''">
+                <choose>
+                    <when test="type == 1">
+                        and t1.event_label like concat('%',#{labelName},'%')
+                    </when>
+                    <otherwise>
+                        and t3.${labelField} like concat('%',#{labelName},'%')
+                    </otherwise>
+                </choose>
+            </if>
+        </if>
+        <choose>
+            <when test="order != null  and order != ''">
+                order by t1.${order}
+                <if test="orderType != null  and orderType != ''">
+                    ${orderType}
+                </if>
+            </when>
+            <otherwise>
+                order by t1.publish_date desc
+            </otherwise>
+        </choose>
+        limit #{offset}, #{pageSize}
+    </select>
 
 
     <select id="newPlatPageList" resultType="com.zzsn.event.vo.EventNewPlatVO">

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

@@ -82,6 +82,22 @@ public interface IEventService extends IService<Event> {
      */
     IPage<EventFrontVO> frontOwnerPageList(String projectId, String eventName, String eventType, String labelField, String labelName, String order, String orderType, Integer pageNo, Integer pageSize);
 
+    /**
+     * 分页列表-门户(我关注的)
+     *
+     * @param projectId  项目id
+     * @param eventName  事件名称
+     * @param eventType  事件分类id
+     * @param labelField 搜索字段
+     * @param labelName  搜索词
+     * @param order      排序字段
+     * @param orderType  排序方式
+     * @param pageNo     偏移量
+     * @param pageSize   返回条数
+     * @author lkg
+     * @date 2024/4/8
+     */
+    IPage<EventFrontVO> frontCollectPageList(String projectId, String eventName, String eventType, String labelField, String labelName, String order, String orderType, Integer pageNo, Integer pageSize);
 
     /**
      * 分页列表(专题类别)-新平台管理

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

@@ -225,6 +225,35 @@ public class EventServiceImpl extends ServiceImpl<EventMapper, Event> implements
     }
 
     @Override
+    public IPage<EventFrontVO> frontCollectPageList(String projectId, String eventName, String eventType, String labelField, String labelName, String order, String orderType, Integer pageNo, Integer pageSize) {
+        //获取当前登录人信息
+        UserVo currentUser = UserUtil.getLoginUser();
+        Page<EventFrontVO> page = new Page<>(pageNo, pageSize);
+        Integer type = null;
+        if (StringUtils.isNotEmpty(labelField) && labelField.equals("event_label")) {
+            type = 1;
+        }
+        List<String> eventTypes = new ArrayList<>();
+        if (StringUtils.isNotEmpty(eventType)) {
+            List<Node> nodes = eventCategoryService.categoryList();
+            eventTypes = TreeUtil.belowList(nodes, eventType, true);
+        }
+        Page<EventFrontVO> pageList = baseMapper.frontCollectPageList(projectId,currentUser.getId(), eventName, eventTypes, labelField, labelName, type, order, orderType, currentUser.getTenant(),page);
+        List<EventFrontVO> records = pageList.getRecords();
+        if (CollectionUtils.isNotEmpty(records)) {
+            Map<String, String> map = getFirstMap(records);
+            if (MapUtil.isNotEmpty(map)) {
+                for (EventFrontVO eventFrontVO : records) {
+                    //获取专题资讯的首发来源
+                    String firstOrigin = map.get(eventFrontVO.getId());
+                    eventFrontVO.setFirstOrigin(firstOrigin);
+                }
+            }
+        }
+        return pageList;
+    }
+
+    @Override
     public Page<EventNewPlatVO> newPlatPageList(SubjectCondition subjectCondition, Integer pageNo, Integer pageSize) {
         int offset = (pageNo - 1) * pageSize;
         //查询类别id的所有明细id