增加事件挖掘逻辑;研究中心门户逻辑修改

src/main/java/com/zzsn/event/controller/eventExtract/EventExtractController.java

@@ -71,8 +71,8 @@ public class EventExtractController {
      * @date 2024/9/13
      */
     @GetMapping("/dataInfoList")
-    public Result<?> dataInfoList(@RequestParam String relatedIds) {
-        List<SubjectDataVo> subjectDataVos = esService.listByIds(Arrays.asList(relatedIds.split(",")));
+    public Result<?> dataInfoList(@RequestParam List<String> relatedIds) {
+        List<SubjectDataVo> subjectDataVos = esService.listByIds(relatedIds);
         return Result.OK(subjectDataVos);
     }
 

src/main/java/com/zzsn/event/kafka/KafkaConsumer.java

@@ -193,6 +193,7 @@ public class KafkaConsumer {
         }
         eventExtract.setEventDescribe(eventDesc);
         eventExtract.setRelatedId(relatedIds);
+        eventExtract.setExtractTime(new Date());
         eventExtract.setCreateTime(new Date());
         eventExtract.setCreateBy("event-dig");
         eventExtract.setTaskId(taskId);

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

@@ -111,7 +111,7 @@
         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 and t1.category = 1
+        where t1.publish_status = 1 and t1.face_public = 1
         union
         select
         t1.id,t1.event_name,t1.event_icon,t1.event_type,t1.start_time,t1.end_time,t1.publish_date,t1.event_describe,t1.event_label,
@@ -168,7 +168,7 @@
         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 and t1.category = 1
+        where t1.publish_status = 1 and t1.face_public = 1
         union
         select
         t1.id,t1.event_name,t1.event_icon,t1.event_type,t1.start_time,t1.end_time,t1.publish_date,t1.event_describe,t1.event_label,
@@ -179,7 +179,7 @@
         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.create_by = #{createBy}) a
-        inner join project_subject_map m on a.id = m.subject_id where m.project_id = #{projectId}
+        inner join project_subject_map m on a.id = m.subject_id
         ) b
         where b.project_id = #{projectId}
         <if test="eventName!=null and eventName != ''">

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

@@ -308,6 +308,9 @@ public class EventServiceImpl extends ServiceImpl<EventMapper, Event> implements
         event.setTimeAnaRule(5);
         String subjectCode = codeGenerateUtil.geneCodeNo(CodePrefixEnum.SUBJECT_DEFAULT.getValue());
         event.setEventCode(subjectCode);
+        //默认发布
+        event.setPublishStatus(1);
+        event.setPublishDate(DateUtil.dateToString(new Date()));
         event.setUnit("2");
         event.setSpace(1);
         String cron = CronUtil.generateCron("2", 1);