事件列表也查询逻辑重构

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

 package com.zzsn.event.controller;
 
-import com.zzsn.event.entity.EventCategory;
-import com.zzsn.event.service.IEventCategoryService;
 import com.zzsn.event.constant.Result;
+import com.zzsn.event.service.IEventCategoryService;
+import com.zzsn.event.util.tree.Node;
+import com.zzsn.event.util.tree.TreeUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
@@ -12,8 +13,6 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
 
 /**
  * 事件分类
@@ -37,20 +36,9 @@ public class EventCategoryController {
 	@ApiOperation(value="获取树状数据", notes="获取树状数据")
 	@GetMapping(value = "/treeData")
 	public Result<?> treeData() {
-		Map<String, List<EventCategory>> collect = eventCategoryService.list().stream().collect(Collectors.groupingBy(EventCategory::getPid));
-		EventCategory parent = EventCategory.builder().id("0").typeName("所有").hasChild(1).build();
-		buildData(parent,collect);
-		return Result.OK(parent);
-	}
-
-	private void buildData(EventCategory parent, Map<String, List<EventCategory>> collect) {
-		if(parent.getHasChild()==1){
-			parent.setChildren(collect.get(parent.getId()));
-			collect.remove(parent.getId());
-			for (EventCategory child : parent.getChildren()) {
-				buildData(child,collect);
-			}
-		}
+		List<Node> nodes = eventCategoryService.categoryList();
+		List<Node> tree = TreeUtil.tree(nodes, "0");
+		return Result.OK(tree);
 	}
 
 }

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

@@ -7,6 +7,8 @@ import com.zzsn.event.entity.Event;
 import com.zzsn.event.es.EsService;
 import com.zzsn.event.service.EventSimpleService;
 import com.zzsn.event.service.IEventService;
+import com.zzsn.event.util.user.UserUtil;
+import com.zzsn.event.util.user.UserVo;
 import com.zzsn.event.vo.*;
 import com.zzsn.event.xxljob.service.IXxlJobInfoService;
 import io.swagger.annotations.Api;
@@ -44,6 +46,7 @@ public class EventDataController {
     /**
      * 事件分页列表-门户
      *
+     * @param category   栏目类型(1-全部;2-自动追踪;3-人工创建;4-我创建的)
      * @param eventId    事件id
      * @param eventName  事件名称
      * @param eventType  事件分类id
@@ -58,7 +61,8 @@ public class EventDataController {
      */
     @ApiOperation(value = "事件-分页列表查询", notes = "事件-分页列表查询")
     @GetMapping(value = "/pageList")
-    public Result<?> pageList(@RequestParam(name = "eventId", required = false) String eventId,
+    public Result<?> pageList(@RequestParam(name = "category") Integer category,
+                              @RequestParam(name = "eventId", required = false) String eventId,
                               @RequestParam(name = "eventName", required = false) String eventName,
                               @RequestParam(name = "eventType", required = false) String eventType,
                               @RequestParam(name = "labelField", required = false) String labelField,
@@ -67,7 +71,12 @@ 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(eventId, eventName, eventType, labelField, labelName, order, orderType, pageNo, pageSize);
+        String username = null;
+        if (category == 4) {
+            UserVo currentUser = UserUtil.getLoginUser();
+            username = currentUser.getUsername();
+        }
+        IPage<EventFrontVO> pageList = eventService.frontPageList(category, username, eventId, eventName, eventType, labelField, labelName, order, orderType, pageNo, pageSize);
         return Result.OK(pageList);
     }
 
@@ -79,7 +88,7 @@ public class EventDataController {
      * @date 2024/7/22
      */
     @PostMapping("/simpleSaveEvent")
-    public Result<?> addEvent(@RequestBody AddEventVO addEventVO){
+    public Result<?> addEvent(@RequestBody AddEventVO addEventVO) {
         Event event = eventSimpleService.simpleSave(addEventVO);
         iXxlJobInfoService.subjectInsert(event);
         return Result.OK();

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

@@ -173,7 +173,7 @@ public class EventExportController {
             }
             contents.add(content);
             contentSortMap.put(docTitle, contents);//文档结构图中，文章标题
-            Map<String, Object> catalog = new HashMap();
+            Map<String, Object> catalog = new HashMap<>();
             catalog.put("index", num);
             catalog.put("title", title);
             catalog.put("id", rid + "-" + (num - 1));

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

@@ -114,6 +114,7 @@ public class EventManageController {
         UserVo currentUser = UserUtil.getLoginUser();
         eventParam.setCreateTime(new Date());
         eventParam.setUpdateTime(new Date());
+        eventParam.setCreateBy(currentUser.getUsername());
         Event event = eventService.saveMain(eventParam);
         //新建的专题授权给自己和客户
         if (currentUser.getCategory().equals(Constants.ADMIN_USER)) {
@@ -137,7 +138,9 @@ public class EventManageController {
     @ApiOperation(value = "事件-编辑", notes = "事件-编辑")
     @PostMapping(value = "/edit")
     public Result<?> edit(@RequestBody AddEventParam addEventParam) {
+        UserVo currentUser = UserUtil.getLoginUser();
         addEventParam.setUpdateTime(new Date());
+        addEventParam.setUpdateBy(currentUser.getUsername());
         eventService.updateMain(addEventParam);
         //更新xxljob
         List<String> subjectCodes = new ArrayList<>();

src/main/java/com/zzsn/event/controller/plat/PlatEventManageController.java

 package com.zzsn.event.controller.plat;
 
-import cn.hutool.core.bean.BeanUtil;
 import com.alibaba.fastjson2.JSON;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.zzsn.event.constant.Constants;
@@ -290,7 +289,7 @@ public class PlatEventManageController {
 
 
     /**
-     * 事件对应专题库的资讯分页列表
+     * 事件对应采集库的资讯分页列表
      *
      * @param eventDataCondition 筛选条件
      * @param sourceId           信息源id

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

@@ -65,6 +65,9 @@ public interface EventMapper extends BaseMapper<Event> {
     /**
      * 分页列表-后台管理
      *
+     * @param createBy   创建人
+     * @param facePublic 是否公开(0-未公开;1-已公开)
+     * @param category   事件创建方式(1-用户创建;2-事件挖掘)
      * @param eventId    事件id
      * @param eventName  事件名称
      * @param eventTypes 事件分类id集合
@@ -78,7 +81,9 @@ public interface EventMapper extends BaseMapper<Event> {
      * @author lkg
      * @date 2024/4/8
      */
-    List<EventFrontVO> frontPageList(@Param("eventId") String eventId, @Param("eventName") String eventName,
+    List<EventFrontVO> frontPageList(@Param("createBy") String createBy, @Param("facePublic") Integer facePublic,
+                                     @Param("category") Integer category,
+                                     @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("order") String order, @Param("orderType") String orderType,
@@ -87,6 +92,9 @@ public interface EventMapper extends BaseMapper<Event> {
     /**
      * 总数量-后台管理
      *
+     * @param createBy   创建人
+     * @param facePublic 是否公开(0-未公开;1-已公开)
+     * @param category 事件创建方式(1-用户创建;2-事件挖掘)
      * @param eventId    事件id
      * @param eventName  事件名称
      * @param eventTypes 事件分类id集合
@@ -96,7 +104,9 @@ public interface EventMapper extends BaseMapper<Event> {
      * @author lkg
      * @date 2024/4/8
      */
-    Integer frontTotalCount(@Param("eventId") String eventId, @Param("eventName") String eventName,
+    Integer frontTotalCount(@Param("createBy") String createBy, @Param("facePublic") Integer facePublic,
+                            @Param("category") Integer category,
+                            @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);
 

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

@@ -3,6 +3,6 @@
 <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 id,type_name as name,pid,has_child from event_category
     </select>
 </mapper>
\ No newline at end of file

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

@@ -16,11 +16,27 @@
     </select>
 
     <select id="queryInfo" resultType="com.zzsn.event.vo.EventVO">
-        select t.id,t.event_name,t.event_icon,t.start_time,t.end_time,t.publish_date,t.event_describe,t.event_label,
-               t.library,t.unit,t.space,t.cron,t.yn_extract_hot_words,
-               t.face_public,t.relation_events,t.event_type,t.sort_order,
-               stm.type_id as subjectTypeId,psm.project_id,
-               c.type_name,IFNULL(r.id,false) as hasReport
+        select t.id,
+               t.event_name,
+               t.event_icon,
+               t.start_time,
+               t.end_time,
+               t.publish_date,
+               t.event_describe,
+               t.event_label,
+               t.library,
+               t.unit,
+               t.space,
+               t.cron,
+               t.yn_extract_hot_words,
+               t.face_public,
+               t.relation_events,
+               t.event_type,
+               t.sort_order,
+               stm.type_id         as subjectTypeId,
+               psm.project_id,
+               c.type_name,
+               IFNULL(r.id, false) as hasReport
         from event t
                  inner join event_category c on t.event_type = c.id
                  inner join subject_type_map stm on t.id = stm.subject_id
@@ -81,7 +97,16 @@
         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
         left join event_tag t3 on t1.id=t3.event_id
-        where t1.publish_status = 1 and t1.face_public = 1
+        where t1.publish_status = 1
+        <if test="createBy!=null and createBy != ''">
+            and t1.create_by = #{createBy}
+        </if>
+        <if test="facePublic != null">
+            and t1.face_public = #{facePublic}
+        </if>
+        <if test="category != null">
+            and t1.category = #{category}
+        </if>
         <if test="eventId!=null and eventId != ''">
             and t1.id = #{eventId}
         </if>
@@ -123,7 +148,16 @@
         select count(1) 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
+        where t1.publish_status = 1
+        <if test="createBy!=null and createBy != ''">
+            and t1.create_by = #{createBy}
+        </if>
+        <if test="facePublic != null">
+            and t1.face_public = #{facePublic}
+        </if>
+        <if test="category != null">
+            and t1.category = #{category}
+        </if>
         <if test="eventId!=null and eventId != ''">
             and t1.id = #{eventId}
         </if>
@@ -152,7 +186,8 @@
 
 
     <select id="newPlatPageList" resultType="com.zzsn.event.vo.EventNewPlatVO">
-        SELECT distinct d.id,d.event_name,d.start_time,d.end_time,d.status, m.type_name as subjectTypeName, n.project_name
+        SELECT distinct d.id,d.event_name,d.start_time,d.end_time,d.status, m.type_name as subjectTypeName,
+        n.project_name
         from
         <choose>
             <when test="subjectCondition.userId !=null and subjectCondition.userId != ''">
@@ -425,7 +460,10 @@
     </select>
 
     <select id="modelList" resultType="com.zzsn.event.vo.ModelVO">
-        select id,model_name,type from model where pid = '0' and type is not null
+        select id, model_name, type
+        from model
+        where pid = '0'
+          and type is not null
     </select>
 
     <select id="eventList" resultType="com.zzsn.event.vo.EventVO">
@@ -505,7 +543,8 @@
     <select id="selectSubjectByTypeIds" resultType="String">
         select distinct a.id from event a
         <if test="userId!=null and userId != ''">
-            inner join sys_user_data_permission b on b.permission_id = a.id and b.category = 'subject' and b.user_id = #{userId}
+            inner join sys_user_data_permission b on b.permission_id = a.id and b.category = 'subject' and b.user_id =
+            #{userId}
         </if>
         inner join subject_type_map c on c.subject_id = a.id
         where 1=1
@@ -557,7 +596,8 @@
     </select>
 
     <select id="selectLabelModelBySubjectId" resultType="com.zzsn.event.vo.LabelModelVo">
-        SELECT distinct a.subject_id,b.id as modelId,b.service_name as modelServiceName,b.label_id as labelId,c.label_mark,c.label_name,c.label_type
+        SELECT distinct a.subject_id,b.id as modelId,b.service_name as modelServiceName,b.label_id as
+        labelId,c.label_mark,c.label_name,c.label_type
         FROM subject_model_map a
         inner JOIN clb_algorithm_model b ON a.model_id = b.id and a.sign = 1
         LEFT JOIN sys_base_label_type c on c.id = b.label_id
@@ -584,15 +624,21 @@
     </select>
 
     <select id="ynBelowBindGroup" resultType="Integer">
-        select count(1) from subject_info_source_map n
+        select count(1)
+        from subject_info_source_map n
                  left join info_source_group_map m on n.source_id = m.group_id
-        where n.type in (2,5) and n.subject_id = #{subjectId} and m.source_id = #{sourceId}
+        where n.type in (2, 5)
+          and n.subject_id = #{subjectId}
+          and m.source_id = #{sourceId}
     </select>
 
     <select id="ynBelowExcludeGroup" resultType="Integer">
-        select count(1) from subject_info_source_map n
+        select count(1)
+        from subject_info_source_map n
                  left join info_source_group_map m on n.source_id = m.group_id
-        where n.type = 4 and n.subject_id = #{subjectId} and m.source_id = #{sourceId}
+        where n.type = 4
+          and n.subject_id = #{subjectId}
+          and m.source_id = #{sourceId}
     </select>
 
     <select id="bindKeyWordsList" resultType="com.zzsn.event.vo.KeyWordsPage">

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

@@ -6,6 +6,8 @@ import com.zzsn.event.enums.CodePrefixEnum;
 import com.zzsn.event.util.CodeGenerateUtil;
 import com.zzsn.event.util.CronUtil;
 import com.zzsn.event.util.DateUtil;
+import com.zzsn.event.util.user.UserUtil;
+import com.zzsn.event.util.user.UserVo;
 import com.zzsn.event.vo.AddEventVO;
 import com.zzsn.event.vo.RegionVO;
 import com.zzsn.event.vo.SubjectKeywordsMap;
@@ -77,6 +79,8 @@ public class EventSimpleService {
         event.setSpace(2);
         event.setCron(CronUtil.generateCron("2",2));
         event.setCreateTime(new Date());
+        UserVo currentUser = UserUtil.getLoginUser();
+        event.setCreateBy(currentUser.getUsername());
         eventService.save(event);
         String eventId = event.getId();
         saveMapMain(eventId);

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

@@ -50,6 +50,8 @@ public interface IEventService extends IService<Event> {
     /**
      * 分页列表-后台管理
      *
+     * @param columnType 栏目类型(1-全部;2-自动追踪;3-人工创建;4-我创建的)
+     * @param username   登录用户的账号
      * @param eventId    事件id
      * @param eventName  事件名称
      * @param eventType  事件分类id
@@ -62,7 +64,7 @@ public interface IEventService extends IService<Event> {
      * @author lkg
      * @date 2024/4/8
      */
-    IPage<EventFrontVO> frontPageList(String eventId, String eventName, String eventType, String labelField, String labelName, String order, String orderType, Integer pageNo, Integer pageSize);
+    IPage<EventFrontVO> frontPageList(Integer columnType, String username, 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/EventServiceImpl.java

@@ -112,7 +112,7 @@ public class EventServiceImpl extends ServiceImpl<EventMapper, Event> implements
     }
 
     @Override
-    public IPage<EventFrontVO> frontPageList(String eventId,String eventName, String eventType, String labelField, String labelName, String order, String orderType, Integer pageNo, Integer pageSize) {
+    public IPage<EventFrontVO> frontPageList(Integer columnType,String username,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")) {
@@ -123,7 +123,20 @@ public class EventServiceImpl extends ServiceImpl<EventMapper, Event> implements
             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);
+        Integer facePublic = null;
+        Integer category = null;
+        if (columnType == 1) {
+            facePublic = 1;
+        } else if (columnType == 2) {
+            facePublic = 1;
+            category = 2;
+        } else if (columnType == 3) {
+            facePublic = 1;
+            category = 1;
+        } else {
+            category = 1;
+        }
+        List<EventFrontVO> pageList = baseMapper.frontPageList(username,facePublic,category,eventId,eventName, eventTypes, labelField, labelName, type, order, orderType, offset, pageSize);
         if (CollectionUtils.isNotEmpty(pageList)) {
             //获取专题资讯的首发来源
             Map<String, String> map = getFirstMap(pageList);
@@ -135,7 +148,7 @@ public class EventServiceImpl extends ServiceImpl<EventMapper, Event> implements
             }
         }
         //获取总条数
-        Integer count = baseMapper.frontTotalCount(eventId,eventName, eventTypes, labelField, labelName, type);
+        Integer count = baseMapper.frontTotalCount(username,facePublic,category,eventId,eventName, eventTypes, labelField, labelName, type);
         IPage<EventFrontVO> pageData = new Page<>(pageNo, pageSize, count);
         pageData.setRecords(pageList);
         return pageData;

src/main/java/com/zzsn/event/task/EventHotTask.java

@@ -3,7 +3,9 @@ package com.zzsn.event.task;
 import cn.hutool.core.date.DateField;
 import cn.hutool.core.date.DateTime;
 import cn.hutool.core.date.DateUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.zzsn.event.entity.Event;
 import com.zzsn.event.service.EsStatisticsService;
 import com.zzsn.event.service.IEventService;
@@ -53,7 +55,9 @@ public class EventHotTask {
      */
     @Scheduled(cron = "0 0 0/3 * * ?")
     public void hot() {
-        List<Event> list = eventService.list();
+        LambdaQueryWrapper<Event> queryWrapper = Wrappers.lambdaQuery();
+        queryWrapper.eq(Event::getFacePublic,1).eq(Event::getPublishStatus,1);
+        List<Event> list = eventService.list(queryWrapper);
         List<HotVO> countList = new ArrayList<>();
         for (Event event : list) {
             CompletableFuture<HotVO> async = CompletableFuture.supplyAsync(() -> {