From ea369047ce54ad74cdfeff78fcbc3548a624a345 Mon Sep 17 00:00:00 2001 From: zhangyongzhangyong <2012005003@qq.coom> Date: Tue, 11 Feb 2020 14:42:01 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=AE=E9=A2=98=E9=A1=B9=E7=9B=AE=E6=95=B0?= =?UTF-8?q?=E9=87=8F=E7=B1=BB=E7=9B=AE=E5=88=86=E6=9E=90=20=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../form/IssueStatisticsInfoFormDTO.java | 3 +- .../result/IssueStatisticsInfoResultDTO.java | 7 ++- .../controller/IssueAnalysisController.java | 2 +- .../modules/issue/dao/IssueAnalysisDao.java | 6 +-- .../issue/service/IssueAnalysisService.java | 2 +- .../impl/IssueAnalysisServiceImpl.java | 21 +++------ .../mapper/issue/IssueAnalysisDao.xml | 45 ++++++++++++------- .../ApiAnalysisIssueController.java | 8 ++-- .../epdc/feign/AnalysisIssueFeignClient.java | 2 +- .../epdc/service/AnalysisIssueService.java | 2 +- .../impl/AnalysisIssueServiceImpl.java | 2 +- 11 files changed, 58 insertions(+), 42 deletions(-) diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/issue/form/IssueStatisticsInfoFormDTO.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/issue/form/IssueStatisticsInfoFormDTO.java index ce629a24f..91c63d415 100644 --- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/issue/form/IssueStatisticsInfoFormDTO.java +++ b/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; /** * 主键 diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/issue/result/IssueStatisticsInfoResultDTO.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/issue/result/IssueStatisticsInfoResultDTO.java index 28b8a2c69..edb29ade3 100644 --- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/issue/result/IssueStatisticsInfoResultDTO.java +++ b/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 { /** * 分类名称 diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/issue/controller/IssueAnalysisController.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/issue/controller/IssueAnalysisController.java index ac5e56b4b..c5db2b5cd 100644 --- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/issue/controller/IssueAnalysisController.java +++ b/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> getStatisticsByCategory(@RequestBody IssueStatisticsInfoFormDTO formDTO) { - List list = issueAnalysisService.getStatisticsByCategoryList(formDTO); + List list = issueAnalysisService.listStatisticsByCategoryList(formDTO); return new Result>().ok(list); } } diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/issue/dao/IssueAnalysisDao.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/issue/dao/IssueAnalysisDao.java index 34df10a9d..34c32f373 100644 --- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/issue/dao/IssueAnalysisDao.java +++ b/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 { * @Author: zy * @Date: 2020-02-11 */ - List getStatisticsByFirstCategory(IssueStatisticsInfoFormDTO formDto); + List selectListStatisticsByFirstCategory(IssueStatisticsInfoFormDTO formDto); /** * @Description: 二级类目议题项目数量类目分析 @@ -96,7 +96,7 @@ public interface IssueAnalysisDao extends BaseDao { * @Author: zy * @Date: 2020-02-11 */ - List getStatisticsByTwoCategory(IssueStatisticsInfoFormDTO formDto); + List selectListStatisticsByTwoCategory(IssueStatisticsInfoFormDTO formDto); /** * @Description: 三级类目议题项目数量类目分析 @@ -105,5 +105,5 @@ public interface IssueAnalysisDao extends BaseDao { * @Author: zy * @Date: 2020-02-11 */ - List getStatisticsByThreeCategory(IssueStatisticsInfoFormDTO formDto); + List selectListStatisticsByThreeCategory(IssueStatisticsInfoFormDTO formDto); } diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/issue/service/IssueAnalysisService.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/issue/service/IssueAnalysisService.java index 32fc131c5..270b98d09 100644 --- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/issue/service/IssueAnalysisService.java +++ b/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 getStatisticsByCategoryList(IssueStatisticsInfoFormDTO formDto); + List listStatisticsByCategoryList(IssueStatisticsInfoFormDTO formDto); } diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/issue/service/impl/IssueAnalysisServiceImpl.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/issue/service/impl/IssueAnalysisServiceImpl.java index 4b4e2fada..fe16ebbac 100644 --- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/issue/service/impl/IssueAnalysisServiceImpl.java +++ b/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(list, page.getTotal()); } - /** - * @Description: 议题项目数量类目分析 - * @Param: [formDto] - * @return: java.util.List - * @Author: zy - * @Date: 2020-02-11 - */ @Override - public List getStatisticsByCategoryList(IssueStatisticsInfoFormDTO formDto) { + public List listStatisticsByCategoryList(IssueStatisticsInfoFormDTO formDto) { List 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; } diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/issue/IssueAnalysisDao.xml b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/issue/IssueAnalysisDao.xml index c19254811..420af45b1 100644 --- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/issue/IssueAnalysisDao.xml +++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/issue/IssueAnalysisDao.xml @@ -187,53 +187,68 @@ - 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}) + + and ei.GRID_ID in + + #{deptId} + + GROUP BY SUBSTRING_INDEX( ei.CATEGORY_FULL_NAME, '-', 1 ) ORDER BY - categoryNum DESC + cotegoryName DESC LIMIT 5; - 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}) + + and ei.GRID_ID in + + #{deptId} + + GROUP BY SUBSTRING_INDEX( SUBSTRING_INDEX( ei.CATEGORY_FULL_NAME, '-', 2 ), '-', - 1 ) ORDER BY - categoryNum DESC + cotegoryName DESC LIMIT 5; - 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}) + + and ei.GRID_ID in + + #{deptId} + + GROUP BY SUBSTRING_INDEX( SUBSTRING_INDEX( ei.CATEGORY_FULL_NAME, '-', 3 ), '-', - 1 ) ORDER BY - categoryNum DESC + cotegoryName DESC LIMIT 5; diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiAnalysisIssueController.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiAnalysisIssueController.java index 66564590e..d06e1ea2f 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiAnalysisIssueController.java +++ b/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> * @Author: zy * @Date: 2020-02-11 */ @GetMapping("getStatisticsByCategory") - public Result> getStatisticsByCategory(@LoginUser TokenDto tokenDto, IssueStatisticsInfoFormDTO formDto) { + public Result> getStatisticsByCategory(@RequestBody IssueStatisticsInfoFormDTO formDto) { //效验数据 ValidatorUtils.validateEntity(formDto); formDto.setGridIds(SecurityUser.getUser().getDeptIdList()); - return analysisIssueService.getStatisticsByCategory(formDto); + return analysisIssueService.listStatisticsByCategory(formDto); } } diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/AnalysisIssueFeignClient.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/AnalysisIssueFeignClient.java index 1fa325750..e357137f8 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/AnalysisIssueFeignClient.java +++ b/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> getStatisticsByCategory(IssueStatisticsInfoFormDTO formDto); } diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/AnalysisIssueService.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/AnalysisIssueService.java index 9859e8ebc..dcdb6171c 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/AnalysisIssueService.java +++ b/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> getStatisticsByCategory(IssueStatisticsInfoFormDTO formDto); + Result> listStatisticsByCategory(IssueStatisticsInfoFormDTO formDto); } diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AnalysisIssueServiceImpl.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AnalysisIssueServiceImpl.java index 895bcabd1..7fa108002 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AnalysisIssueServiceImpl.java +++ b/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> getStatisticsByCategory(IssueStatisticsInfoFormDTO formDto) { + public Result> listStatisticsByCategory(IssueStatisticsInfoFormDTO formDto) { return analysisIssueFeignClient.getStatisticsByCategory(formDto); } }