专题新增增加 subjectType以及事件数据清空时，分析数据也一并清除

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

@@ -656,21 +656,4 @@ public class EventManageController {
             return null;
         }
     }
-
-    /**
-     * 分页列表-新平台管理
-     *
-     * @param subjectCondition 筛选条件
-     * @param pageNo           当前页
-     * @param pageSize         返回条数
-     * @author lkg
-     * @date 2024/4/28
-     */
-    @GetMapping("/newPlatPageList")
-    public Result<?> newPlatPageList(SubjectCondition subjectCondition,
-                                     @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
-                                     @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize) {
-        Page<EventNewPlatVO> pageList = eventService.newPlatPageList(subjectCondition, pageNo, pageSize);
-        return Result.OK(pageList);
-    }
 }

src/main/java/com/zzsn/event/entity/Subject.java

@@ -90,7 +90,7 @@ public class Subject implements Serializable {
     private String customerId;
     /**项目id*/
     private String projectId;
-    /**专题类别（1：通用专题  2：事件专题）*/
+    /**专题类型(1-普通专题;3-嵌套专题)*/
     private Integer subjectType;
     /**专题信息所在es库名称*/
     private String esIndex;

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

@@ -461,6 +461,19 @@ public class EventServiceImpl extends ServiceImpl<EventMapper, Event> implements
                 .set(Event::getFirstOpenTime, null);
         this.update(updateWrapper);
         CompletableFuture.runAsync(() -> {
+            //删除分析数据
+            subjectAnalysisService.remove(Wrappers.<SubjectAnalysis>lambdaQuery().eq(SubjectAnalysis::getSubjectId, eventId));
+            //删除事件标签数据（抽取的标签）
+            eventTagService.update(Wrappers.<EventTag>lambdaUpdate()
+                    .set(EventTag::getExtractIndustryTag,null)
+                    .set(EventTag::getExtractCompanyTag,null)
+                    .set(EventTag::getExtractPersonTag,null)
+                    .set(EventTag::getExtractSentimentTag,null)
+                    .set(EventTag::getExtractKeywordsTag,null)
+                    .set(EventTag::getExtractTimeTag,null)
+                    .set(EventTag::getExtractLocationTag,null)
+                    .eq(EventTag::getEventId, eventId)
+            );
             //调用python接口
             pythonUtil.clearDuplicateHistory(Collections.singletonList(eventId));
             //清空专题数据

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

@@ -195,6 +195,9 @@ public class SubjectServiceImpl extends ServiceImpl<SubjectMapper, Subject> impl
         Subject subject = new Subject();
         //事件专题的默认分析规则参数-必填
         BeanUtils.copyProperties(subjectPage, subject);
+        if (subject.getSubjectType() == null) {
+            subject.setSubjectType(1);
+        }
         String subjectCode = codeGenerateUtil.geneCodeNo(CodePrefixEnum.SUBJECT_DEFAULT.getValue());
         subject.setSubjectCode(subjectCode);
         String cron = CronUtil.generateCron(subject.getUnit(), subject.getSpace());

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

@@ -116,6 +116,8 @@ public class SubjectPage {
     /**所属部门*/
     @ApiModelProperty(value = "所属部门")
     private String sysOrgCode;
+    /**专题类型(1-普通专题;3-嵌套专题)*/
+    private Integer subjectType;
 
     /**信息源数量*/
     private Integer infoSourceNum;