议题项目数量类目分析 接口修改

esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/issue/form/IssueStatisticsInfoFormDTO.java

@@ -4,6 +4,7 @@ import lombok.Data;
 
 import javax.validation.constraints.Min;
 import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
 import java.util.List;
 
 /**
@@ -12,7 +13,7 @@ import java.util.List;
  * @Date 2020/2/11 11:58
  */
 @Data
-public class IssueStatisticsInfoFormDTO {
+public class IssueStatisticsInfoFormDTO implements Serializable {
     private static final long serialVersionUID = 6544783947414092507L;
     /**
      * 主键

esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/issue/result/IssueStatisticsInfoResultDTO.java

@@ -1,11 +1,16 @@
 package com.elink.esua.epdc.dto.issue.result;
 
+import lombok.Data;
+
+import java.io.Serializable;
+
 /**
  * @Description 议题项目数量类目分析DTO
  * @Author zy
  * @Date 2020/2/11 11:58
  */
-public class IssueStatisticsInfoResultDTO {
+@Data
+public class IssueStatisticsInfoResultDTO implements Serializable {
 
     /**
      * 分类名称

esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/issue/controller/IssueAnalysisController.java

@@ -72,7 +72,7 @@ public class IssueAnalysisController {
 	 */
 	@GetMapping("getStatisticsByCategory")
 	public Result<List<IssueStatisticsInfoResultDTO>> getStatisticsByCategory(@RequestBody IssueStatisticsInfoFormDTO formDTO) {
-		List<IssueStatisticsInfoResultDTO> list = issueAnalysisService.getStatisticsByCategoryList(formDTO);
+		List<IssueStatisticsInfoResultDTO> list = issueAnalysisService.listStatisticsByCategoryList(formDTO);
 		return new Result<List<IssueStatisticsInfoResultDTO>>().ok(list);
 	}
 }

esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/issue/dao/IssueAnalysisDao.java

@@ -87,7 +87,7 @@ public interface IssueAnalysisDao extends BaseDao<IssueResultDTO> {
 	 * @Author: zy
 	 * @Date: 2020-02-11
 	 */
-	List<IssueStatisticsInfoResultDTO> getStatisticsByFirstCategory(IssueStatisticsInfoFormDTO formDto);
+	List<IssueStatisticsInfoResultDTO> selectListStatisticsByFirstCategory(IssueStatisticsInfoFormDTO formDto);
 
 	/**
 	 * @Description: 二级类目议题项目数量类目分析
@@ -96,7 +96,7 @@ public interface IssueAnalysisDao extends BaseDao<IssueResultDTO> {
 	 * @Author: zy
 	 * @Date: 2020-02-11
 	 */
-	List<IssueStatisticsInfoResultDTO> getStatisticsByTwoCategory(IssueStatisticsInfoFormDTO formDto);
+	List<IssueStatisticsInfoResultDTO> selectListStatisticsByTwoCategory(IssueStatisticsInfoFormDTO formDto);
 
 	/**
 	 * @Description: 三级类目议题项目数量类目分析
@@ -105,5 +105,5 @@ public interface IssueAnalysisDao extends BaseDao<IssueResultDTO> {
 	 * @Author: zy
 	 * @Date: 2020-02-11
 	 */
-	List<IssueStatisticsInfoResultDTO> getStatisticsByThreeCategory(IssueStatisticsInfoFormDTO formDto);
+	List<IssueStatisticsInfoResultDTO> selectListStatisticsByThreeCategory(IssueStatisticsInfoFormDTO formDto);
 }

esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/issue/service/IssueAnalysisService.java

@@ -49,5 +49,5 @@ public interface IssueAnalysisService {
 	 * @Author: zy
 	 * @Date: 2020-02-11
 	 */
-	List<IssueStatisticsInfoResultDTO> getStatisticsByCategoryList(IssueStatisticsInfoFormDTO formDto);
+	List<IssueStatisticsInfoResultDTO> listStatisticsByCategoryList(IssueStatisticsInfoFormDTO formDto);
 }

esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/issue/service/impl/IssueAnalysisServiceImpl.java

@@ -99,22 +99,15 @@ public class IssueAnalysisServiceImpl extends BaseServiceImpl<IssueAnalysisDao,
 		return new PageData<>(list, page.getTotal());
 	}
 
-	/**
-	 * @Description: 议题项目数量类目分析
-	 * @Param: [formDto]
-	 * @return: java.util.List<com.elink.esua.epdc.dto.issue.result.IssueStatisticsInfoResultDTO>
-	 * @Author: zy
-	 * @Date: 2020-02-11
-	 */
 	@Override
-	public List<IssueStatisticsInfoResultDTO> getStatisticsByCategoryList(IssueStatisticsInfoFormDTO formDto) {
+	public List<IssueStatisticsInfoResultDTO> listStatisticsByCategoryList(IssueStatisticsInfoFormDTO formDto) {
 		List<IssueStatisticsInfoResultDTO> list = new ArrayList<>();
-		if ("1".equals(formDto.getCotegoryType())){
-			list = baseDao.getStatisticsByFirstCategory(formDto);
-		} else if ("2".equals(formDto.getCotegoryType())) {
-			list = baseDao.getStatisticsByFirstCategory(formDto);
-		} else if ("3".equals(formDto.getCotegoryType())) {
-			list = baseDao.getStatisticsByFirstCategory(formDto);
+		if (NumConstant.ONE_STR.equals(formDto.getCotegoryType())){
+			list = baseDao.selectListStatisticsByFirstCategory(formDto);
+		} else if (NumConstant.TWO_STR.equals(formDto.getCotegoryType())) {
+			list = baseDao.selectListStatisticsByTwoCategory(formDto);
+		} else if (NumConstant.THREE_STR.equals(formDto.getCotegoryType())) {
+			list = baseDao.selectListStatisticsByThreeCategory(formDto);
 		}
 		return list;
 	}

esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/issue/IssueAnalysisDao.xml

@@ -187,53 +187,68 @@
         <include refid="common_order-if"/>
     </select>
 
-    <select id="getStatisticsByFirstCategory" resultType="com.elink.esua.epdc.dto.issue.form.IssueStatisticsInfoFormDTO">
+    <select id="selectListStatisticsByFirstCategory" resultType="com.elink.esua.epdc.dto.issue.result.IssueStatisticsInfoResultDTO">
         SELECT
-            SUBSTRING_INDEX( ei.CATEGORY_FULL_NAME, '-', 1 ) AS categoryName,
-            COUNT( ei.ID ) AS categoryNum
+            SUBSTRING_INDEX( ei.CATEGORY_FULL_NAME, '-', 1 ) AS cotegoryName,
+            COUNT( ei.ID ) AS count
         FROM
             esua_epdc_events.epdc_issue ei
         WHERE
             ei.DEL_FLAG = '0'
-            AND ei.GRID_ID IN (#{gridIds})
+            <if test="gridIds!=null and gridIds.size()>0">
+                and ei.GRID_ID in
+                <foreach collection="gridIds" index="index" item="deptId" open="(" separator="," close=")">
+                    #{deptId}
+                </foreach>
+            </if>
         GROUP BY
             SUBSTRING_INDEX( ei.CATEGORY_FULL_NAME, '-', 1 )
         ORDER BY
-            categoryNum DESC
+            cotegoryName DESC
             LIMIT 5;
     </select>
 
-    <select id="getStatisticsByTwoCategory" resultType="com.elink.esua.epdc.dto.issue.form.IssueStatisticsInfoFormDTO">
+    <select id="selectListStatisticsByTwoCategory" resultType="com.elink.esua.epdc.dto.issue.result.IssueStatisticsInfoResultDTO">
         SELECT
-            SUBSTRING_INDEX( ei.CATEGORY_FULL_NAME, '-', 2 ) AS categoryName,
-            COUNT( ei.ID ) AS categoryNum
+            SUBSTRING_INDEX( ei.CATEGORY_FULL_NAME, '-', 2 ) AS cotegoryName,
+            COUNT( ei.ID ) AS counut
         FROM
             esua_epdc_events.epdc_issue ei
         WHERE
             ei.DEL_FLAG = '0'
             AND ( LENGTH( ei.CATEGORY_FULL_NAME ) - LENGTH( REPLACE ( ei.CATEGORY_FULL_NAME, '-', '' ) ) ) > 0
-            AND ei.GRID_ID IN (#{gridIds})
+            <if test="gridIds!=null and gridIds.size()>0">
+                and ei.GRID_ID in
+                <foreach collection="gridIds" index="index" item="deptId" open="(" separator="," close=")">
+                    #{deptId}
+                </foreach>
+            </if>
         GROUP BY
             SUBSTRING_INDEX( SUBSTRING_INDEX( ei.CATEGORY_FULL_NAME, '-', 2 ), '-', - 1 )
         ORDER BY
-            categoryNum DESC
+            cotegoryName DESC
             LIMIT 5;
     </select>
 
-    <select id="getStatisticsByThreeCategory" resultType="com.elink.esua.epdc.dto.issue.form.IssueStatisticsInfoFormDTO">
+    <select id="selectListStatisticsByThreeCategory" resultType="com.elink.esua.epdc.dto.issue.result.IssueStatisticsInfoResultDTO">
         SELECT
-            SUBSTRING_INDEX( ei.CATEGORY_FULL_NAME, '-', 3 ) AS categoryName,
-            COUNT( ei.ID ) AS categoryNum
+            SUBSTRING_INDEX( ei.CATEGORY_FULL_NAME, '-', 3 ) AS cotegoryName,
+            COUNT( ei.ID ) AS count
         FROM
             esua_epdc_events.epdc_issue ei
         WHERE
             ei.DEL_FLAG = '0'
             AND ( LENGTH( ei.CATEGORY_FULL_NAME ) - LENGTH( REPLACE ( ei.CATEGORY_FULL_NAME, '-', '' ) ) ) > 1
-            AND ei.GRID_ID IN (#{gridIds})
+            <if test="gridIds!=null and gridIds.size()>0">
+                and ei.GRID_ID in
+                <foreach collection="gridIds" index="index" item="deptId" open="(" separator="," close=")">
+                    #{deptId}
+                </foreach>
+            </if>
         GROUP BY
             SUBSTRING_INDEX( SUBSTRING_INDEX( ei.CATEGORY_FULL_NAME, '-', 3 ), '-', - 1 )
         ORDER BY
-            categoryNum DESC
+            cotegoryName DESC
             LIMIT 5;
     </select>
 </mapper>

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiAnalysisIssueController.java

@@ -10,9 +10,11 @@ import com.elink.esua.epdc.dto.issue.result.IssueStatisticsInfoResultDTO;
 import com.elink.esua.epdc.service.AnalysisIssueService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -42,16 +44,16 @@ public class ApiAnalysisIssueController {
 
     /**
      * @Description: 议题项目数量类目分析
-     * @Param: [tokenDto, formDto]
+     * @Param: [formDto]
      * @return: com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.dto.issue.result.IssueStatisticsInfoResultDTO>>
      * @Author: zy
      * @Date: 2020-02-11
      */
     @GetMapping("getStatisticsByCategory")
-    public Result<List<IssueStatisticsInfoResultDTO>> getStatisticsByCategory(@LoginUser TokenDto tokenDto, IssueStatisticsInfoFormDTO formDto) {
+    public Result<List<IssueStatisticsInfoResultDTO>> getStatisticsByCategory(@RequestBody IssueStatisticsInfoFormDTO formDto) {
         //效验数据
         ValidatorUtils.validateEntity(formDto);
         formDto.setGridIds(SecurityUser.getUser().getDeptIdList());
-        return analysisIssueService.getStatisticsByCategory(formDto);
+        return analysisIssueService.listStatisticsByCategory(formDto);
     }
 }

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/AnalysisIssueFeignClient.java

@@ -38,6 +38,6 @@ public interface AnalysisIssueFeignClient {
      * @Author: zy 
      * @Date: 2020-02-11 
      */ 
-    @GetMapping(value = "analysis/issue/getStatisticsByCategory", consumes = MediaType.APPLICATION_JSON_VALUE)
+    @GetMapping(value = "analysis/issue/getStatisticsByCategory")
     Result<List<IssueStatisticsInfoResultDTO>> getStatisticsByCategory(IssueStatisticsInfoFormDTO formDto);
 }

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/AnalysisIssueService.java

@@ -29,5 +29,5 @@ public interface AnalysisIssueService {
      * @Author: zy
      * @Date: 2020-02-11
      */
-    Result<List<IssueStatisticsInfoResultDTO>> getStatisticsByCategory(IssueStatisticsInfoFormDTO formDto);
+    Result<List<IssueStatisticsInfoResultDTO>> listStatisticsByCategory(IssueStatisticsInfoFormDTO formDto);
 }

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AnalysisIssueServiceImpl.java

@@ -31,7 +31,7 @@ public class AnalysisIssueServiceImpl implements AnalysisIssueService {
     }
 
     @Override
-    public Result<List<IssueStatisticsInfoResultDTO>> getStatisticsByCategory(IssueStatisticsInfoFormDTO formDto) {
+    public Result<List<IssueStatisticsInfoResultDTO>> listStatisticsByCategory(IssueStatisticsInfoFormDTO formDto) {
         return analysisIssueFeignClient.getStatisticsByCategory(formDto);
     }
 }