From f1e6f33ee329712ba242867ba77519d81c97fc82 Mon Sep 17 00:00:00 2001
From: sunyuchao <syc_ls@163.com>
Date: Mon, 14 Dec 2020 10:07:19 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=86=E7=B1=BB=E8=A1=A8=E8=81=94=E5=90=88?=
 =?UTF-8?q?=E4=B8=BB=E9=94=AE=E5=BC=95=E8=B5=B7=E7=9A=84=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/epmet/feign/GovIssueOpenFeignClient.java     |  2 +-
 .../fallback/GovIssueOpenFeignClientFallBack.java    |  4 ++--
 .../epmet/controller/IssueCategoryController.java    |  7 ++++---
 .../main/java/com/epmet/dao/IssueCategoryDao.java    |  6 +++---
 .../java/com/epmet/service/IssueCategoryService.java |  5 +++--
 .../epmet/service/impl/IssueCategoryServiceImpl.java |  7 ++++---
 .../src/main/resources/mapper/IssueCategoryDao.xml   |  3 ++-
 .../dto/form/ProjectCategoryTagListFormDTO.java      | 12 +++++++++++-
 .../epmet/controller/ProjectCategoryController.java  |  5 ++++-
 .../service/impl/ProjectCategoryServiceImpl.java     |  3 ++-
 10 files changed, 36 insertions(+), 18 deletions(-)

diff --git a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/feign/GovIssueOpenFeignClient.java b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/feign/GovIssueOpenFeignClient.java
index 1bc5ac3e14..283207c1b5 100644
--- a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/feign/GovIssueOpenFeignClient.java
+++ b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/feign/GovIssueOpenFeignClient.java
@@ -215,7 +215,7 @@ public interface GovIssueOpenFeignClient {
 	 * @author sun
 	 **/
 	@PostMapping(value = "/gov/issue/issuecategory/projectcategorylist")
-	Result<List<ProjectCategoryTagResultDTO>> projectCategoryList(@RequestBody List<String> categoryIdList);
+	Result<List<ProjectCategoryTagResultDTO>> projectCategoryList(@RequestBody ProjectCategoryTagListFormDTO formDTO);
 
 	/**
 	 * @description 查询项目所属客户和所属网格信息以及分类对应的分类信息
diff --git a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/feign/fallback/GovIssueOpenFeignClientFallBack.java b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/feign/fallback/GovIssueOpenFeignClientFallBack.java
index 537b7d3265..3eacd247d8 100644
--- a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/feign/fallback/GovIssueOpenFeignClientFallBack.java
+++ b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/feign/fallback/GovIssueOpenFeignClientFallBack.java
@@ -199,8 +199,8 @@ public class GovIssueOpenFeignClientFallBack implements GovIssueOpenFeignClient
 	 * @author sun
 	 **/
 	@Override
-	public Result<List<ProjectCategoryTagResultDTO>> projectCategoryList(List<String> categoryIdList) {
-		return ModuleUtils.feignConError(ServiceConstant.GOV_ISSUE_SERVER, "projectCategoryList", categoryIdList);
+	public Result<List<ProjectCategoryTagResultDTO>> projectCategoryList(ProjectCategoryTagListFormDTO formDTO) {
+		return ModuleUtils.feignConError(ServiceConstant.GOV_ISSUE_SERVER, "projectCategoryList", formDTO);
 	}
 
 	/**
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueCategoryController.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueCategoryController.java
index bfd770a5ff..f8755d1037 100644
--- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueCategoryController.java
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueCategoryController.java
@@ -30,6 +30,7 @@ import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.dto.IssueCategoryDTO;
 import com.epmet.dto.form.IssueCategoryTagListFormDTO;
 import com.epmet.dto.form.IssueSaveCategoryFormDTO;
+import com.epmet.dto.form.ProjectCategoryTagListFormDTO;
 import com.epmet.dto.result.IssueCategoryTagListResultDTO;
 import com.epmet.dto.result.ProjectCategoryTagResultDTO;
 import com.epmet.excel.IssueCategoryExcel;
@@ -110,14 +111,14 @@ public class IssueCategoryController {
     }
 
     /**
-     * @param categoryIdList
+     * @param formDTO
      * @return
      * @Description 查询分类Id集合对应的分类名称，按分类升序排列
      * @Author sun
      **/
     @PostMapping("projectcategorylist")
-    public Result<List<ProjectCategoryTagResultDTO>> projectCategoryList(@RequestBody List<String> categoryIdList) {
-        return new Result<List<ProjectCategoryTagResultDTO>>().ok(issueCategoryService.projectCategoryList(categoryIdList));
+    public Result<List<ProjectCategoryTagResultDTO>> projectCategoryList(@RequestBody ProjectCategoryTagListFormDTO formDTO) {
+        return new Result<List<ProjectCategoryTagResultDTO>>().ok(issueCategoryService.projectCategoryList(formDTO));
     }
 
     /**
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueCategoryDao.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueCategoryDao.java
index 0d88504d4c..c263ec1ddb 100644
--- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueCategoryDao.java
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueCategoryDao.java
@@ -19,6 +19,7 @@ package com.epmet.dao;
 
 import com.epmet.commons.mybatis.dao.BaseDao;
 import com.epmet.dto.IssueCategoryDTO;
+import com.epmet.dto.form.ProjectCategoryTagListFormDTO;
 import com.epmet.dto.result.IssueCategoryTagResultDTO;
 import com.epmet.dto.result.ProjectCategoryTagResultDTO;
 import com.epmet.entity.IssueCategoryEntity;
@@ -43,13 +44,12 @@ public interface IssueCategoryDao extends BaseDao<IssueCategoryEntity> {
     List<IssueCategoryTagResultDTO> selectIssueCategoryList(@Param("issueId") String issueId);
 
     /**
-     * @param categoryIdList
+     * @param formDTO
      * @return
      * @Description 查询分类Id对应的分类名称，按分类升序排列
      * @Author sun
      **/
-    List<ProjectCategoryTagResultDTO> selectProjectCategoryList(@Param("categoryIdList") List<String> categoryIdList);
-//    List<ProjectCategoryTagResultDTO> selectProjectCategoryList(List<String> categoryIdList);
+    List<ProjectCategoryTagResultDTO> selectProjectCategoryList(ProjectCategoryTagListFormDTO formDTO);
 
     /**
      * 获取议题分类
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueCategoryService.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueCategoryService.java
index 3f051a29ff..5717b27db0 100644
--- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueCategoryService.java
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueCategoryService.java
@@ -22,6 +22,7 @@ import com.epmet.commons.tools.page.PageData;
 import com.epmet.dto.IssueCategoryDTO;
 import com.epmet.dto.form.IssueCategoryTagListFormDTO;
 import com.epmet.dto.form.IssueSaveCategoryFormDTO;
+import com.epmet.dto.form.ProjectCategoryTagListFormDTO;
 import com.epmet.dto.result.IssueCategoryTagListResultDTO;
 import com.epmet.dto.result.ProjectCategoryTagResultDTO;
 import com.epmet.entity.IssueCategoryEntity;
@@ -106,12 +107,12 @@ public interface IssueCategoryService extends BaseService<IssueCategoryEntity> {
     IssueCategoryTagListResultDTO categoryTagList(IssueCategoryTagListFormDTO formDTO);
 
     /**
-     * @param categoryIdList
+     * @param formDTO
      * @return
      * @Description 查询分类Id集合对应的分类名称，按分类升序排列
      * @Author sun
      **/
-    List<ProjectCategoryTagResultDTO> projectCategoryList(List<String> categoryIdList);
+    List<ProjectCategoryTagResultDTO> projectCategoryList(ProjectCategoryTagListFormDTO formDTO);
 
     /**
      * 获取议题分类
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueCategoryServiceImpl.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueCategoryServiceImpl.java
index f806f28032..85d52737da 100644
--- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueCategoryServiceImpl.java
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueCategoryServiceImpl.java
@@ -31,6 +31,7 @@ import com.epmet.dto.IssueCategoryDTO;
 import com.epmet.dto.IssueProjectCategoryDictDTO;
 import com.epmet.dto.form.IssueCategoryTagListFormDTO;
 import com.epmet.dto.form.IssueSaveCategoryFormDTO;
+import com.epmet.dto.form.ProjectCategoryTagListFormDTO;
 import com.epmet.dto.form.SaveIssueCategoryFormDTO;
 import com.epmet.dto.result.IssueCategoryTagListResultDTO;
 import com.epmet.dto.result.IssueCategoryTagResultDTO;
@@ -145,14 +146,14 @@ public class IssueCategoryServiceImpl extends BaseServiceImpl<IssueCategoryDao,
     }
 
     /**
-     * @param categoryIdList
+     * @param formDTO
      * @return
      * @Description 查询分类Id集合对应的分类名称，按分类升序排列
      * @Author sun
      **/
     @Override
-    public List<ProjectCategoryTagResultDTO> projectCategoryList(List<String> categoryIdList) {
-        return baseDao.selectProjectCategoryList(categoryIdList);
+    public List<ProjectCategoryTagResultDTO> projectCategoryList(ProjectCategoryTagListFormDTO formDTO) {
+        return baseDao.selectProjectCategoryList(formDTO);
     }
 
     /**
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueCategoryDao.xml b/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueCategoryDao.xml
index e3713438a4..93c51604f7 100644
--- a/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueCategoryDao.xml
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueCategoryDao.xml
@@ -20,13 +20,14 @@
     </select>
 
     <select id="selectProjectCategoryList" resultType="com.epmet.dto.result.ProjectCategoryTagResultDTO">
-         SELECT
+        SELECT
             id AS "id",
             category_name AS "name"
         FROM
             issue_project_category_dict
         WHERE
             del_flag = '0'
+        AND customer_id = #{customerId}
         <if test="categoryIdList != null and categoryIdList.size() > 0">
             <foreach collection="categoryIdList" item="id" open="AND(  " separator=" OR " index="index" close=")">
                 id = #{id}
diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ProjectCategoryTagListFormDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ProjectCategoryTagListFormDTO.java
index 9c179732ac..34b2543486 100644
--- a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ProjectCategoryTagListFormDTO.java
+++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ProjectCategoryTagListFormDTO.java
@@ -4,6 +4,7 @@ import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
 import java.io.Serializable;
+import java.util.List;
 
 /**
  * 获取议题的分类、标签列表-接口入参
@@ -13,10 +14,19 @@ import java.io.Serializable;
 public class ProjectCategoryTagListFormDTO implements Serializable {
 
     private static final long serialVersionUID = 2599592072265715951L;
+    /**
+     * 客户ID
+     */
+    private String customerId;
+
     @NotBlank(message = "议题ID不能为空",groups = {ProjectCategoryTagListFormDTO.CategoryTag.class})
     private String projectId;
-
+    /**
+     * 分类Id
+     */
+    private List<String> categoryIdList;
     public interface CategoryTag{}
 
 
+
 }
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ProjectCategoryController.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ProjectCategoryController.java
index f9c6b2acda..c47fb0ea4c 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ProjectCategoryController.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ProjectCategoryController.java
@@ -17,9 +17,11 @@
 
 package com.epmet.controller;
 
+import com.epmet.commons.tools.annotation.LoginUser;
 import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.exception.RenException;
 import com.epmet.commons.tools.page.PageData;
+import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.ExcelUtils;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.AssertUtils;
@@ -103,8 +105,9 @@ public class ProjectCategoryController {
      * @Author sun
      **/
     @PostMapping("categorytaglist")
-    public Result<ProjectCategoryTagListResultDTO> categoryTagList(@RequestBody ProjectCategoryTagListFormDTO formDTO) {
+    public Result<ProjectCategoryTagListResultDTO> categoryTagList(@LoginUser TokenDto tokenDto, @RequestBody ProjectCategoryTagListFormDTO formDTO) {
         ValidatorUtils.validateEntity(formDTO, ProjectCategoryTagListFormDTO.CategoryTag.class);
+        formDTO.setCustomerId(tokenDto.getCustomerId());
         return new Result<ProjectCategoryTagListResultDTO>().ok(projectCategoryService.categoryTagList(formDTO));
     }
 
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectCategoryServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectCategoryServiceImpl.java
index 8cb2ec5a0b..2db7977d67 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectCategoryServiceImpl.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectCategoryServiceImpl.java
@@ -127,7 +127,8 @@ public class ProjectCategoryServiceImpl extends BaseServiceImpl<ProjectCategoryD
         List<String> categoryIdList = baseDao.selectProjectCategoryIdList(formDTO.getProjectId());
         if (categoryIdList.size() > NumConstant.ZERO) {
             //1-1.调用issue库，查询分类Id对应的分类名称，按分类升序排列
-            Result<List<ProjectCategoryTagResultDTO>> result = govIssueOpenFeignClient.projectCategoryList(categoryIdList);
+            formDTO.setCategoryIdList(categoryIdList);
+            Result<List<ProjectCategoryTagResultDTO>> result = govIssueOpenFeignClient.projectCategoryList(formDTO);
             if (!result.success()) {
                 throw new RenException(result.getInternalMsg());
             }