2022-9-14 18:35:00 分析系统调整

PAS/src/main/java/cn/cslg/pas/common/utils/StringUtils.java

@@ -13,7 +13,9 @@ public class StringUtils {
     private final static int NUM_32 = 32;
     //集群号
     private static int machineId = 1;
-    /** 下划线 */
+    /**
+     * 下划线
+     */
     private static final char SEPARATOR = '_';
 
     /**
@@ -241,8 +243,8 @@ public class StringUtils {
         String[] split = split(str, code);
         List<String> lnums = new ArrayList<>();
         for (String s : split) {
-            //long lnum = getLong(s, 0l);
-            lnums.add(s);
+            String trim = s.trim();
+            lnums.add(trim);
         }
         return lnums;
     }
@@ -495,6 +497,7 @@ public class StringUtils {
     public static <T> String join(List<T> list, String separator) {
         return org.apache.commons.lang3.StringUtils.join(list, separator);
     }
+
     public static <T> String join(String[] list, String separator) {
         return org.apache.commons.lang3.StringUtils.join(list, separator);
     }

PAS/src/main/java/cn/cslg/pas/controller/DataAnalysisController.java

@@ -3,26 +3,20 @@ package cn.cslg.pas.controller;
 import cn.cslg.pas.common.core.annotation.Permission;
 import cn.cslg.pas.common.core.base.Constants;
 import cn.cslg.pas.common.model.vo.AnalysisItemCountVO;
-import cn.cslg.pas.common.model.vo.SearchSourceDataVO;
+import cn.cslg.pas.common.utils.CacheUtils;
+import cn.cslg.pas.common.utils.Response;
 import cn.cslg.pas.common.utils.ResponseEnum;
 import cn.cslg.pas.common.utils.StringUtils;
-import cn.cslg.pas.common.model.vo.PatentVO;
-import cn.cslg.pas.common.utils.auth.checkAuth;
 import cn.cslg.pas.service.DataAnalysisService;
-import cn.cslg.pas.service.PatentService;
-import cn.cslg.pas.common.utils.CacheUtils;
-import cn.cslg.pas.common.utils.Response;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.RequiredArgsConstructor;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.web.bind.annotation.*;
 
-import java.util.List;
-
 /**
  * <p>
- *  数据分析 前端控制器
+ * 数据分析 前端控制器
  * </p>
  *
  * @author 王岩
@@ -36,7 +30,6 @@ public class DataAnalysisController {
 
     private final CacheUtils cacheUtils;
     private final DataAnalysisService dataAnalysisService;
-    private final PatentService patentService;
 
     @GetMapping("patentNum")
     @Operation(summary = "说选专利数量")
@@ -48,8 +41,7 @@ public class DataAnalysisController {
         return Response.success(count);
     }
 
-    @Permission(roles = {1,2,4})
-    @checkAuth(FunId = "/workspace/folder/analyticSystem/chartAnalysis/count")
+    @Permission(roles = {1, 2, 4})
     @PostMapping("count")
     @Operation(summary = "统计结果")
     public String getCount(@RequestBody AnalysisItemCountVO countVO) {