Merge remote-tracking branch 'origin/event_fusion' into event_fusion

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

@@ -162,8 +162,8 @@ public class EventManageController {
                 log.info("新增事件，通知采集，事件id：{}", event.getId());
                 configurationMessageService.bindKeyWordsEventSend(event.getId());
                 //事件分析
-                log.info("新增事件，事件分析，事件id：{}", event.getId());
-                kafkaTemplate.send(EVENT_MODEL_KAFKA_CHANNEL, event.getEventCode());
+//                log.info("新增事件，事件分析，事件id：{}", event.getId());
+//                kafkaTemplate.send(EVENT_MODEL_KAFKA_CHANNEL, event.getEventCode());
             });
             return Result.OK();
         } else {

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

@@ -263,6 +263,7 @@ public class EventDataController {
             AddEventParam eventParam = new AddEventParam();
             BeanUtils.copyProperties(addEventVO, eventParam);
             eventParam.setCreateBy(currentUser.getUsername());
+            eventParam.setOpen(true);
             Event event = eventService.saveMain(eventParam);
             //新增关键词
             keyWordsService.saveBaseAndMap(event, keywordsVO.getKeyword(), keywordsVO.getExclusionWord());

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

@@ -344,8 +344,11 @@ public class EventServiceImpl extends ServiceImpl<EventMapper, Event> implements
     public Event saveMain(AddEventParam addEventParam) {
         Event event = new Event();
         BeanUtils.copyProperties(addEventParam, event);
-        event.setStatus(1);
-        event.setFirstOpenTime(new Date());
+        if (ObjectUtil.isNotEmpty(addEventParam.isOpen()) && addEventParam.isOpen()) {
+            //立即开启
+            event.setStatus(1);
+            event.setFirstOpenTime(new Date());
+        }
         Date endTime = event.getEndTime();
         if (endTime == null) {
             endTime = DateUtil.addDate(new Date(), 15);

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

@@ -351,7 +351,8 @@ public class KeyWordsServiceImpl extends ServiceImpl<KeyWordsMapper, KeyWords> i
         //排除词
         LambdaQueryWrapper<SubjectKeywordsMap> query = Wrappers.lambdaQuery();
         query.eq(SubjectKeywordsMap::getSubjectId, event.getId()).eq(SubjectKeywordsMap::getBindingType, 3);
-        SubjectKeywordsMap excludeOne = subjectKeywordsMapService.getOne(queryWrapper);
+        SubjectKeywordsMap excludeOne = subjectKeywordsMapService.getOne(query);
+
         if (StringUtils.isNotEmpty(exclusionWord)) {
             if (excludeOne == null) {
                 addMapMain(event, exclusionWord,2);

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

@@ -18,4 +18,6 @@ public class AddEventParam extends Event {
 
     /**伪事件id*/
     private String fakeEventId;
+    /**是否立即开启*/
+    private boolean isOpen;
 }