传播路径增加时间;事件脉络支持编辑

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

 package com.zzsn.event.controller;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.zzsn.event.constant.Result;
 import com.zzsn.event.entity.SubjectAnalysis;
 import com.zzsn.event.service.SubjectAnalysisService;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
 
 /**
  * 事件相关分析维护
@@ -23,6 +24,22 @@ public class EventMaintenanceController {
     private SubjectAnalysisService subjectAnalysisService;
 
     /**
+     * 专题事件脉络列表
+     *
+     * @param subjectId 专题id
+     * @author lkg
+     * @date 2024/5/27
+     */
+    @GetMapping("/eventContextList")
+    public Result<?> eventContextList(@RequestParam String subjectId){
+        LambdaQueryWrapper<SubjectAnalysis> queryWrapper = Wrappers.lambdaQuery();
+        queryWrapper.eq(SubjectAnalysis::getSubjectId, subjectId).eq(SubjectAnalysis::getCategory, 2)
+                .orderByAsc(SubjectAnalysis::getPublishDate);
+        List<SubjectAnalysis> list = subjectAnalysisService.list(queryWrapper);
+        return Result.OK(list);
+    }
+
+    /**
      * 事件脉络编辑
      *
      * @param subjectAnalysis 事件脉络信息
@@ -34,4 +51,17 @@ public class EventMaintenanceController {
         subjectAnalysisService.eventContextModify(subjectAnalysis);
         return Result.OK();
     }
+
+    /**
+     * 删除事件脉络
+     *
+     * @param id 主键id
+     * @author lkg
+     * @date 2024/5/27
+     */
+    @GetMapping("/eventContextRemove")
+    public Result<?> eventContextRemove(String id){
+        subjectAnalysisService.removeById(id);
+        return Result.OK();
+    }
 }

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

@@ -17,7 +17,6 @@ import io.swagger.annotations.Api;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
-import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -330,7 +329,7 @@ public class PlatEventManageController {
     }
 
     /**
-     * 件对应专题库的资讯分页列表
+     * 事件对应专题库的资讯分页列表
      *
      * @param subjectInfoVo 筛选条件
      * @param userId        用户id

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

@@ -146,7 +146,7 @@
 
 
     <select id="newPlatPageList" resultType="com.zzsn.event.vo.EventNewPlatVO">
-        SELECT distinct d.id,d.event_name,d.start_time,d.end_time, 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 != ''">

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

@@ -102,15 +102,18 @@ public class AnalysisServiceImpl implements AnalysisService {
             List<String> allOriginList = new ArrayList<>();
             top = new PropagationPathVo();
             top.setName(subjectName);
+            top.setTime(DateUtil.dateToString(event.getStartTime()));
             //获取发布时间最早的前10的资讯(来源不重复)
             List<PropagationPathVo> secondList = new ArrayList<>();
             List<SubjectDataVo> earlyList = topN(specialDataList,Constants.FAKE_NUM);
             earlyList.forEach(e->allOriginList.add(e.getOrigin()));
             for (SubjectDataVo subjectDataVo : earlyList) {
                 String origin = subjectDataVo.getOrigin();
+                String time = subjectDataVo.getPublishDate();
                 if (StringUtils.isNotEmpty(origin)) {
                     PropagationPathVo second = new PropagationPathVo();
                     second.setName(origin);
+                    second.setTime(time);
                     secondList.add(second);
                     List<String> thirdList = esService.groupByOrigin(subjectDataVo.getTitle(), subjectDataVo.getPublishDate());
                     thirdList.removeAll(allOriginList);

src/main/java/com/zzsn/event/vo/EventNewPlatVO.java

@@ -14,6 +14,7 @@ public class EventNewPlatVO {
     private String eventName;
     private String startTime;
     private String endTime;
+    private Integer status;
     private Integer subjectInfoNum;
     private Integer unCheckNum;
     private Integer infoSourceNum;

src/main/java/com/zzsn/event/vo/PropagationPathVo.java

@@ -14,5 +14,6 @@ import java.util.List;
 public class PropagationPathVo implements Serializable {
 
     private String name;
+    private String time;
     private List<PropagationPathVo> children;
 }