Merge branch 'feature' into 'release'

案例上新预警log调整

See merge request !576

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

@@ -4107,13 +4107,15 @@ public class MarkDataServiceImpl implements MarkDataService {
                 continue;
             }
             if (i == 0 || isOnline){
+                if (StringUtils.isNotBlank(splits[i])) {
                     answer.put("answer", splits[i].trim());
                     answers.add(answer);
+                }
                 continue;
             }
             if (StringUtils.isNotBlank(sonSplit[0])) {
                 answer.put("answer", sonSplit[0]);
-                List<String> sonSplitList = new ArrayList<>(Arrays.asList(sonSplit)).stream().skip(1).collect(Collectors.toList());
+                List<String> sonSplitList = new ArrayList<>(Arrays.asList(sonSplit)).stream().filter(str -> 1 == str.length() && StringUtils.isNotBlank(str)).collect(Collectors.toList());
                 answer.put("referenceArticles", sonSplitList);
                 answers.add(answer);
             }

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

@@ -464,7 +464,10 @@ public class ProjectWarnServiceImpl implements ProjectWarnService {
     private List<JSONObject> getRankListByType(String type) {
         String search = TYPE_SEARCH.get(type);
         if (null == search) {
+            // 2024/8/19 微博话题榜采集下线，防止微博话题配置历史数据影响
+            if (!Objects.equals(type, "微博话题")) {
                 log.error("getRankListByType,search-null,type:{}", type);
+            }
             return Collections.emptyList();
         }
         try {