Merge remote-tracking branch 'origin/dev_issue_category' into dev_temp

epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/project/ProjectController.java

@@ -24,10 +24,7 @@ import com.epmet.project.dto.form.DifficultyRankFormDTO;
 import com.epmet.project.dto.form.ProjectIncrTrendFormDTO;
 import com.epmet.project.dto.result.*;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
 
@@ -142,13 +139,13 @@ public class ProjectController {
      * 002、项目分类字典查询
      *      查询当前客户的父客户下，项目分类字典
      *
-     * @param tokenDto
+     * @param customerId
      * @return com.epmet.commons.tools.utils.Result<java.util.List<com.epmet.project.dto.result.ProjectCategoryDictResultDTO>>
      * @Author zhangyong
      * @Date 10:41 2021-03-22
      **/
     @PostMapping("categorydict")
-    public Result<List<ProjectCategoryDictResultDTO>> categoryDict(@LoginUser TokenDto tokenDto) {
-        return new Result<List<ProjectCategoryDictResultDTO>>().ok(projectService.getCategoryDict(tokenDto));
+    public Result<List<ProjectCategoryDictResultDTO>> categoryDict(@RequestHeader("CustomerId") String customerId) {
+        return new Result<List<ProjectCategoryDictResultDTO>>().ok(projectService.getCategoryDict(customerId));
     }
 }

epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/project/ProjectService.java

@@ -74,10 +74,10 @@ public interface ProjectService {
     /**
      * 002、项目分类字典查询
      *
-     * @param tokenDto
+     * @param customerId
      * @return java.util.List<com.epmet.project.dto.result.ProjectCategoryDictResultDTO>
      * @Author zhangyong
      * @Date 14:26 2021-03-22
      **/
-    List<ProjectCategoryDictResultDTO> getCategoryDict(TokenDto tokenDto);
+    List<ProjectCategoryDictResultDTO> getCategoryDict(String customerId);
 }

epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/project/impl/ProjectServiceImpl.java

@@ -358,12 +358,12 @@ public class ProjectServiceImpl implements ProjectService {
     }
 
     @Override
-    public List<ProjectCategoryDictResultDTO> getCategoryDict(TokenDto tokenDto) {
+    public List<ProjectCategoryDictResultDTO> getCategoryDict(String customerId) {
         List<ProjectCategoryDictResultDTO> result = new ArrayList<>();
-        Result<String> parentCustomerId = operCrmOpenFeignClient.getExternalAndParentCustomerId(tokenDto.getCustomerId());
+        Result<String> parentCustomerId = operCrmOpenFeignClient.getExternalAndParentCustomerId(customerId);
         if (!parentCustomerId.success() && null == parentCustomerId.getData()) {
             logger.warn(String.format("调用%s服务查询外部客户的 父级客户ID 失败,入参%s", ServiceConstant.OPER_CRM_SERVER,
-                    JSON.toJSONString(tokenDto.getCustomerId())));
+                    JSON.toJSONString(customerId)));
             return result;
         }
         CustomerCategoryDTO argDto = new CustomerCategoryDTO();
@@ -373,7 +373,7 @@ public class ProjectServiceImpl implements ProjectService {
         Result<List<ProjectCategoryDictResultDTO>> parentCategoryDict = govIssueOpenFeignClient.getCustomerCategoryDict(argDto);
         if (!parentCategoryDict.success()) {
             logger.warn(String.format("调用%s服务查询当前客户的父客户下，项目分类字典失败,入参%s", ServiceConstant.GOV_ISSUE_SERVER,
-                    JSON.toJSONString(tokenDto.getCustomerId())));
+                    JSON.toJSONString(customerId)));
         } else {
             result = parentCategoryDict.getData();
             // 获取客户二级分类