Merge branch 'feature' into 'dev'

去除tags里附带情感倾向值

See merge request !83

src/main/java/com/zhiwei/brandkbs2/pojo/external/BaseMapCompound.java

@@ -31,7 +31,7 @@ public class BaseMapCompound {
     public static BaseMapCompound createFromBaseMap(BaseMap baseMap, String projectId) {
         List<String> tagList = new ArrayList<>();
         // 情感倾向
-        tagList.add(baseMap.getEmotion());
+//        tagList.add(baseMap.getEmotion());
         // 媒体类型
         String mediaType = GlobalPojo.getMediaType(projectId, baseMap.getPlatform(), baseMap.getSource());
         if (null != mediaType) {

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

@@ -225,7 +225,7 @@ public class ProjectWarnServiceImpl implements ProjectWarnService {
         // 如果有竞品
         if (CollectionUtils.isNotEmpty(config.getContends())) {
             dataType.append(",");
-            config.getContends().forEach(contend -> dataType.append(contend).append(" "));
+            config.getContends().forEach(contend -> dataType.append(projectService.getProjectByContendId(project.getId(), contend).getBrandName()).append(" "));
             dataType.append("(竞品)");
         }
         String key2 = key2Header + dataType;
@@ -528,7 +528,7 @@ public class ProjectWarnServiceImpl implements ProjectWarnService {
     private List<BaseMap> duplicateBaseMapList(List<BaseMap> datas) {
         Map<String, BaseMap> duplicateMap = new LinkedHashMap<>();
         for (BaseMap data : datas) {
-            String key = data.getTitleNullOptionalContent();
+            String key = Tools.filterSpecialCharacter(data.getTitleNullOptionalContent());
             BaseMap newValue;
             if (duplicateMap.containsKey(key)) {
                 BaseMap oldValue = duplicateMap.get(key);