事件新增时候同时处理关键词id和code为平台的

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

@@ -13,6 +13,7 @@ import com.zzsn.event.entity.CustomerDataPermissionMap;
 import com.zzsn.event.entity.Event;
 import com.zzsn.event.entity.KeyWords;
 import com.zzsn.event.entity.SysUserDataPermission;
+import com.zzsn.event.enums.CodePrefixEnum;
 import com.zzsn.event.es.EsService;
 import com.zzsn.event.service.EventExtractService;
 import com.zzsn.event.service.EventSimpleService;
@@ -36,10 +37,7 @@ import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import java.io.IOException;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.concurrent.CompletableFuture;
 
 /**
@@ -148,11 +146,24 @@ public class EventDataController {
                     JSONObject resultMap = jsonObject.getJSONObject("result");
                     String id = resultMap.getString("id");
                     String eventCode = resultMap.getString("eventCode");
+                    JSONObject clbKeyWords = resultMap.getJSONObject("keyWords");
+
                     // 事件id和code使用clb中生成的
                     addEventVO.setId(id);
                     addEventVO.setEventCode(eventCode);
                     Event event = eventSimpleService.simpleSave(addEventVO);
-                    KeyWords keyWords = keyWordsService.saveKeyword(event, keywordsVO.getKeyword(), keywordsVO.getExclusionWord());
+                    // 关键词使用clb中返回
+                    KeyWords keyWords = new KeyWords();
+                    keyWords.setId(clbKeyWords.getString("id"));
+                    keyWords.setWordsCode(clbKeyWords.getString("wordsCode"));
+                    keyWords.setWordsName(clbKeyWords.getString("wordsName"));
+                    keyWords.setKeyWord(keywordsVO.getKeyword());
+                    keyWords.setExclusionWord(keywordsVO.getExclusionWord());
+                    keyWords.setStatus("1");
+                    keyWords.setCreateTime(new Date());
+                    keyWordsService.saveKeyword(event.getId(), keyWords);
+
+//                    KeyWords keyWords = keyWordsService.saveKeyword(event, keywordsVO.getKeyword(), keywordsVO.getExclusionWord());
 //                    CompletableFuture.runAsync(()->{
 //                        iXxlJobInfoService.subjectInsert(event);
 //                        //关键词
@@ -237,13 +248,18 @@ public class EventDataController {
     /**
      * 通过id删除
      *
-     * @param id 事件id
+     * @param param 事件id
      * @return
      */
     @ApiOperation(value = "事件-通过id删除", notes = "事件-通过id删除")
-    @GetMapping(value = "/simpleDeleteEvent")
-    public Result<?> delete(@RequestParam(name = "id") String id) {
+    @RequestMapping(value = "/simpleDeleteEvent")
+    //public Result<?> delete(@RequestParam(name = "id") String id) {
+    public Result<?> delete(@RequestBody Map<String, String> param) {
         try {
+            String id = param.get("id");
+            if (StringUtils.isBlank(id)) {
+                return Result.FAIL(500, "删除事件信息失败，入参不完整!");
+            }
             // 调用克虏宝删除接口
             Map<String, String> params = new HashMap<>();
             params.put("id", id);

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

@@ -30,7 +30,7 @@ public class KeyWords implements Serializable {
     private static final long serialVersionUID = 1L;
 
 	/**主键*/
-	@TableId(type = IdType.ASSIGN_ID)
+	//@TableId(type = IdType.ASSIGN_ID)
     @ApiModelProperty(value = "主键")
     private String id;
 	/**词组编码*/

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

@@ -136,6 +136,8 @@ public class EventSimpleService {
 
     private void addRegionMap(String eventId, List<RegionVO> regionList) {
         if (CollectionUtils.isNotEmpty(regionList)) {
+            // 先清除再新增
+            eventRegionMapService.remove(Wrappers.lambdaQuery(EventRegionMap.class).eq(EventRegionMap::getEventId, eventId));
             List<EventRegionMap> dataList = new ArrayList<>();
             for (RegionVO regionVO : regionList) {
                 EventRegionMap eventRegionMap = new EventRegionMap();

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

@@ -18,7 +18,7 @@ public interface IKeyWordsService extends IService<KeyWords> {
 
     KeyWords saveKeyword(Event event, String keyword, String exclusionWord);
 
-
+    KeyWords saveKeyword(String subjectId, KeyWords keyWords);
     /**
      * 获取专题绑定的信息源列表
      */

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

@@ -26,7 +26,6 @@ import java.util.List;
  */
 @Service
 public class KeyWordsServiceImpl extends ServiceImpl<KeyWordsMapper, KeyWords> implements IKeyWordsService {
-
     @Autowired
     private ISubjectKeywordsMapService subjectKeywordsMapService;
     @Autowired
@@ -63,6 +62,21 @@ public class KeyWordsServiceImpl extends ServiceImpl<KeyWordsMapper, KeyWords> i
     }
 
     @Override
+    public KeyWords saveKeyword(String subjectId, KeyWords keyWords) {
+        if (keyWords != null){
+            save(keyWords);
+            String keyWordsId = keyWords.getId();
+            //专题和关键词关系
+            SubjectKeywordsMap subjectKeywordsMap = new SubjectKeywordsMap();
+            subjectKeywordsMap.setKeywordsId(keyWordsId);
+            subjectKeywordsMap.setSubjectId(subjectId);
+            subjectKeywordsMapService.save(subjectKeywordsMap);
+        }
+        return keyWords;
+    }
+
+
+    @Override
     public List<KeyWordsPage> bindKeyWordsList(String subjectId) {
         return baseMapper.selectKeyWordsListById(subjectId);
     }