新增/删除bug修改

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

@@ -191,9 +191,9 @@ public class EventDataController {
     @ApiOperation(value = "事件-通过id删除", notes = "事件-通过id删除")
     @GetMapping(value = "/simpleDeleteEvent")
     public Result<?> delete(@RequestParam(name = "id") String id) {
+        EventVO eventVO = eventService.queryInfo(id);
         eventService.deleteMain(id);
         CompletableFuture.runAsync(() -> {
-            EventVO eventVO = eventService.queryInfo(id);
             iXxlJobInfoService.deleteByInfosourceCode(eventVO.getEventCode());
             KeywordsVO keywordsVO = eventVO.getKeywordsVO();
             if (keywordsVO != null) {

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

@@ -258,9 +258,9 @@ public class EventManageController {
     @ApiOperation(value = "事件-通过id删除", notes = "事件-通过id删除")
     @GetMapping(value = "/delete")
     public Result<?> delete(@RequestParam(name = "id") String id) {
+        EventVO eventVO = eventService.queryInfo(id);
         eventService.deleteMain(id);
         CompletableFuture.runAsync(() -> {
-            EventVO eventVO = eventService.queryInfo(id);
             iXxlJobInfoService.deleteByInfosourceCode(eventVO.getEventCode());
             //删除数据权限关系
             customerDataPermissionMapService.remove(Wrappers.<CustomerDataPermissionMap>lambdaQuery().eq(CustomerDataPermissionMap::getPermissionId, id));
@@ -289,8 +289,8 @@ public class EventManageController {
         List<CompletableFuture<Void>> asyncList = new ArrayList<>();
         for (String id : ids.split(",")) {
             asyncList.add(CompletableFuture.runAsync(() -> {
-                eventService.deleteMain(id);
                 EventVO eventVO = eventService.queryInfo(id);
+                eventService.deleteMain(id);
                 iXxlJobInfoService.deleteByInfosourceCode(eventVO.getEventCode());
                 //删除数据权限关系
                 customerDataPermissionMapService.remove(Wrappers.<CustomerDataPermissionMap>lambdaQuery().eq(CustomerDataPermissionMap::getPermissionId, id));

src/main/java/com/zzsn/event/service/EventSimpleService.java

@@ -84,7 +84,7 @@ public class EventSimpleService {
         CompletableFuture.runAsync(()->{
             //删除伪事件
             Integer category = addEventVO.getCategory();
-            if (category == 2) {
+            if (category != null && category == 2) {
                 eventExtractService.update(Wrappers.<EventExtract>lambdaUpdate().set(EventExtract::getDeleteStatus, 1)
                         .eq(EventExtract::getId, addEventVO.getFakeEventId()));
             }

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

@@ -295,7 +295,6 @@ public class EventServiceImpl extends ServiceImpl<EventMapper, Event> implements
     @Transactional
     public Event saveMain(AddEventParam addEventParam) {
         Event event = new Event();
-        //事件专题的默认分析规则参数-必填
         BeanUtils.copyProperties(addEventParam, event);
         event.setStatus(1);
         Date endTime = event.getEndTime();
@@ -303,6 +302,7 @@ public class EventServiceImpl extends ServiceImpl<EventMapper, Event> implements
             endTime = DateUtil.addDate(new Date(), 15);
         }
         event.setEndTime(endTime);
+        //事件专题的默认分析规则参数-必填
         event.setIncreAnaRule(20);
         event.setTotalAnaRule(50);
         event.setTimeAnaRule(5);
@@ -320,7 +320,7 @@ public class EventServiceImpl extends ServiceImpl<EventMapper, Event> implements
         CompletableFuture.runAsync(() -> {
             //删除伪事件
             Integer category = addEventParam.getCategory();
-            if (category == 2) {
+            if (category != null && category == 2) {
                 eventExtractService.update(Wrappers.<EventExtract>lambdaUpdate().set(EventExtract::getDeleteStatus, 1)
                         .eq(EventExtract::getId, addEventParam.getFakeEventId()));
             }

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

@@ -39,7 +39,7 @@ public class KeyWordsServiceImpl extends ServiceImpl<KeyWordsMapper, KeyWords> i
             //关键词
             String wordsCode = codeGenerateUtil.geneCodeNo(CodePrefixEnum.KEY_WORDS_DEFAULT.getValue());
             keyWords.setWordsCode(wordsCode);
-            keyWords.setWordsName(event.getEventName());
+            keyWords.setWordsName(event.getEventName() + "_" + System.currentTimeMillis());
             keyWords.setKeyWord(keyword);
             keyWords.setExclusionWord(exclusionWord);
             keyWords.setStatus("1");

src/main/resources/application-pro.yml

@@ -92,7 +92,7 @@ spring:
       key-serializer: org.apache.kafka.common.serialization.StringSerializer
       value-serializer: org.apache.kafka.common.serialization.StringSerializer
       properties:
-        max.request.size: 5242880 #5M
+        max.request.size: 10485760 #10M
     consumer:
       #用于标识此使用者所属的使用者组的唯一字符串
       group-id: event-analysis-group