Merge branch 'feature' into 'dev'

非人工项目-方案设置关键词计数调整

See merge request !431

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

@@ -1738,8 +1738,8 @@ public class MarkDataServiceImpl implements MarkDataService {
     public ResponseResult deleteNonManualProjectPlan(String id) {
         String iStarShineSubjectTaskId = nonManualProjectPlanDao.findOneById(id).getIStarShineSubjectTaskId();
         JSONObject body = restTemplate.getForEntity(deleteIStarShineSubjectTaskUrl, JSONObject.class, iStarShineSubjectTaskId, UserThreadLocal.getNickname()).getBody();
-        if (Objects.nonNull(body) && !body.isEmpty() && !body.getBoolean("status")){
-            log.info(id + "-删除快搜订阅任务失败,接口返回信息-" + body.toJSONString());
+        if (Objects.isNull(body) || body.isEmpty() || !body.getBoolean("status")){
+            log.info(id + "-删除快搜订阅任务失败,接口返回信息-" + body);
             return ResponseResult.failure("删除失败");
         }
         nonManualProjectPlanDao.deleteOneById(id);
@@ -1880,14 +1880,10 @@ public class MarkDataServiceImpl implements MarkDataService {
      * @return
      */
     private int getWordCount(String word){
-        if (Objects.isNull(word)){
+        if (StringUtils.isBlank(word)){
             return 0;
         }
-        int count = 0;
-        for (String s : word.split("\\|")) {
-            count += s.split(" ").length;
-        }
-        return count;
+        return word.split("\\|").length;
     }
 
     @Override

src/main/java/com/zhiwei/brandkbs2/util/Tools.java

@@ -1325,7 +1325,7 @@ public class Tools {
     }
 
     /**
-     * 丨处理
+     * 丨处理， 丨｜| 三者有所区别
      *
      * @param str
      * @return
@@ -1335,6 +1335,10 @@ public class Tools {
         if (str.split("[\\u4e28]+").length > 1) {
             str = str.replaceAll("[\\u4e28]+", "|");
         }
+        // ｜替换
+        if (str.split("[\\uff5c]+").length > 1){
+            str = str.replaceAll("[\\uff5c]+", "|");
+        }
         return Arrays.stream(str.split("[\\u007c]+")).filter(StringUtils::isNotBlank).collect(Collectors.joining("|"));
     }
 }
\ No newline at end of file