提交 409b7cb0 作者: obcy

【事件专题在管理页面新建需要手动开启,在事件列表新建不用手动开启】

上级 9767f340
...@@ -162,8 +162,8 @@ public class EventManageController { ...@@ -162,8 +162,8 @@ public class EventManageController {
log.info("新增事件,通知采集,事件id:{}", event.getId()); log.info("新增事件,通知采集,事件id:{}", event.getId());
configurationMessageService.bindKeyWordsEventSend(event.getId()); configurationMessageService.bindKeyWordsEventSend(event.getId());
//事件分析 //事件分析
log.info("新增事件,事件分析,事件id:{}", event.getId()); // log.info("新增事件,事件分析,事件id:{}", event.getId());
kafkaTemplate.send(EVENT_MODEL_KAFKA_CHANNEL, event.getEventCode()); // kafkaTemplate.send(EVENT_MODEL_KAFKA_CHANNEL, event.getEventCode());
}); });
return Result.OK(); return Result.OK();
} else { } else {
......
...@@ -263,6 +263,7 @@ public class EventDataController { ...@@ -263,6 +263,7 @@ public class EventDataController {
AddEventParam eventParam = new AddEventParam(); AddEventParam eventParam = new AddEventParam();
BeanUtils.copyProperties(addEventVO, eventParam); BeanUtils.copyProperties(addEventVO, eventParam);
eventParam.setCreateBy(currentUser.getUsername()); eventParam.setCreateBy(currentUser.getUsername());
eventParam.setOpen(true);
Event event = eventService.saveMain(eventParam); Event event = eventService.saveMain(eventParam);
//新增关键词 //新增关键词
keyWordsService.saveBaseAndMap(event, keywordsVO.getKeyword(), keywordsVO.getExclusionWord()); keyWordsService.saveBaseAndMap(event, keywordsVO.getKeyword(), keywordsVO.getExclusionWord());
......
...@@ -344,8 +344,11 @@ public class EventServiceImpl extends ServiceImpl<EventMapper, Event> implements ...@@ -344,8 +344,11 @@ public class EventServiceImpl extends ServiceImpl<EventMapper, Event> implements
public Event saveMain(AddEventParam addEventParam) { public Event saveMain(AddEventParam addEventParam) {
Event event = new Event(); Event event = new Event();
BeanUtils.copyProperties(addEventParam, event); BeanUtils.copyProperties(addEventParam, event);
event.setStatus(1); if (ObjectUtil.isNotEmpty(addEventParam.isOpen()) && addEventParam.isOpen()) {
event.setFirstOpenTime(new Date()); //立即开启
event.setStatus(1);
event.setFirstOpenTime(new Date());
}
Date endTime = event.getEndTime(); Date endTime = event.getEndTime();
if (endTime == null) { if (endTime == null) {
endTime = DateUtil.addDate(new Date(), 15); endTime = DateUtil.addDate(new Date(), 15);
......
...@@ -18,4 +18,6 @@ public class AddEventParam extends Event { ...@@ -18,4 +18,6 @@ public class AddEventParam extends Event {
/**伪事件id*/ /**伪事件id*/
private String fakeEventId; private String fakeEventId;
/**是否立即开启*/
private boolean isOpen;
} }
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论