舆情动态舆情-配置新增屏蔽关键词及屏蔽渠道3

src/main/java/com/zhiwei/brandkbs2/controller/InterfaceController.java

@@ -54,8 +54,8 @@ public class InterfaceController {
     }
 
     @ApiOperation("获取舆情动态-预警结果")
-    @PostMapping("/warn/yuqingNew")
-    public ResponseResult getYuqingWaringNew(@RequestBody JSONObject json) {
+    @PostMapping("/warn/yuqing")
+    public ResponseResult getYuqingWaring(@RequestBody JSONObject json) {
         String projectId = json.getString("projectId");
         BrandkbsYuQingConfigNew config = json.getObject("config", BrandkbsYuQingConfigNew.class);
         return projectWarnService.getYuqingWaringNew(projectId, config);

src/main/java/com/zhiwei/brandkbs2/service/impl/ProjectWarnServiceImpl.java

@@ -657,11 +657,11 @@ public class ProjectWarnServiceImpl implements ProjectWarnService {
                 Map<String, Object> sourceMap = hit.getSourceAsMap();
                 BaseMap baseMap = Tools.getBaseFromEsMap(sourceMap);
                 // 关键词命中
-                if (!Tools.isContains(config.getKeyword(), baseMap.getTitle() + baseMap.getContent())) {
+                if (!Tools.isEmpty(config.getKeyword()) && !Tools.isContains(config.getKeyword(), baseMap.getTitle() + baseMap.getContent())) {
                     return null;
                 }
                 // 屏蔽关键词命中
-                if (Tools.isContains(config.getNoiseKeyword(), baseMap.getTitle() + baseMap.getContent())) {
+                if (!Tools.isEmpty(config.getNoiseKeyword()) && Tools.isContains(config.getNoiseKeyword(), baseMap.getTitle() + baseMap.getContent())) {
                     return null;
                 }
                 baseMap.setTitle(baseMap.getTitleNullOptionalContent());