From 62bb665c448a743a7d91b1d6f014e3d693212763 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Thu, 30 Dec 2021 10:33:51 +0800 Subject: [PATCH 1/4] governcapacityrank-origin --- .../screen/GrassRootsGovernController.java | 13 ++++ .../screen/ScreenGovernRankDataDao.java | 3 + .../screen/GrassRootsGovernService.java | 6 ++ .../impl/GrassRootsGovernServiceImpl.java | 56 +++++++++++++ .../mapper/screen/ScreenGovernRankDataDao.xml | 78 +++++++++++++++++++ 5 files changed, 156 insertions(+) diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/screen/GrassRootsGovernController.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/screen/GrassRootsGovernController.java index f3c2a545c5..42dc88cd77 100644 --- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/screen/GrassRootsGovernController.java +++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/screen/GrassRootsGovernController.java @@ -97,4 +97,17 @@ public class GrassRootsGovernController { return new Result>().ok(grassRootsGovernService.governCapacityRank(param)); } + /** + * @Description 治理能力榜单查询 screen_govern_rank_data + * @NEI https://nei.netease.com/interface/detail/req/?pid=57068&id=321627 + * @param param + * @return + * @author wangc + * @date 2020.08.20 17:46 + **/ + @PostMapping("governcapacityrank-origin") + public Result> governCapacityRankOrigin(@RequestBody AgencyAndNumFormDTO param){ + ValidatorUtils.validateEntity(param,AgencyFormDTO.CommonAgencyIdGroup.class); + return new Result>().ok(grassRootsGovernService.governCapacityRankOrigin(param)); + } } diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/evaluationindex/screen/ScreenGovernRankDataDao.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/evaluationindex/screen/ScreenGovernRankDataDao.java index 405144008a..c95897f2af 100644 --- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/evaluationindex/screen/ScreenGovernRankDataDao.java +++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/evaluationindex/screen/ScreenGovernRankDataDao.java @@ -50,4 +50,7 @@ public interface ScreenGovernRankDataDao{ * @date 2021/2/26 上午9:22 */ List selectGovernCapacityRatioNew(@Param("monthId") String monthId,@Param("orgIds") List orgIds); + + List selectGovernCapacityRatioBak(@Param("monthId") String monthId,@Param("agencyId") String agencyId); + List selectGovernCapacityRatioNewBak(@Param("monthId") String monthId,@Param("orgIds") List orgIds); } \ No newline at end of file diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/GrassRootsGovernService.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/GrassRootsGovernService.java index fecde12a9f..bcfb7e7d51 100644 --- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/GrassRootsGovernService.java +++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/GrassRootsGovernService.java @@ -65,6 +65,12 @@ public interface GrassRootsGovernService { **/ List governCapacityRank(AgencyAndNumFormDTO param); + /** + * 治理能力榜单查询 screen_govern_rank_data + * @param param + * @return + */ + List governCapacityRankOrigin(AgencyAndNumFormDTO param); /** * @Description 6、公众参与-柱状折线图 * @NEI https://nei.netease.com/interface/detail/req/?pid=57068&id=322434 diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/GrassRootsGovernServiceImpl.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/GrassRootsGovernServiceImpl.java index 18978f6e23..385671f129 100644 --- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/GrassRootsGovernServiceImpl.java +++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/GrassRootsGovernServiceImpl.java @@ -293,6 +293,62 @@ public class GrassRootsGovernServiceImpl implements GrassRootsGovernService { return result; } + /** + * 治理能力榜单查询 screen_govern_rank_data + * @param param + * @return + */ + @DataSource(value = DataSourceConstant.EVALUATION_INDEX,datasourceNameFromArg = true) + @Override + public List governCapacityRankOrigin(AgencyAndNumFormDTO param) { + List orderList = new ArrayList<>(); + if (null == param.getTopNum() || NumConstant.ZERO == param.getTopNum()) { + param.setTopNum(NumConstant.TEN); + } + String monthId = dateUtils.getCurrentMonthId(); + + if (StringUtils.isNotEmpty(param.getAreaCode())){ + List nextAgencyIds = screenCustomerAgencyService.getNextAgencyIds(param.getAreaCode(), param.getAgencyId()); + if (CollectionUtils.isEmpty(nextAgencyIds)){ + return new ArrayList<>(); + } + PageHelper.startPage(NumConstant.ONE,param.getTopNum()); + orderList = screenGovernRankDataDao.selectGovernCapacityRatioNewBak(monthId,nextAgencyIds); + int time = NumConstant.TWELVE; + while(CollectionUtils.isEmpty(orderList) && time > NumConstant.ONE){ + time--; + monthId = dateUtils.getPreviousMonthIdByDest(null, monthId); + PageHelper.startPage(NumConstant.ONE,param.getTopNum()); + orderList = screenGovernRankDataDao.selectGovernCapacityRatioNewBak(monthId,nextAgencyIds); + } + }else { + PageHelper.startPage(NumConstant.ONE,param.getTopNum()); + orderList = screenGovernRankDataDao.selectGovernCapacityRatioBak(monthId, param.getAgencyId()); + int time = NumConstant.TWELVE; + while (CollectionUtils.isEmpty(orderList) && time > NumConstant.ONE) { + time++; + monthId = dateUtils.getPreviousMonthIdByDest(null, monthId); + PageHelper.startPage(NumConstant.ONE, param.getTopNum()); + orderList = screenGovernRankDataDao.selectGovernCapacityRatioBak(monthId, param.getAgencyId()); + } + } + if(null == orderList || orderList.isEmpty()) { + return new ArrayList<>(); + } + List result = new LinkedList<>(); + orderList.forEach(o -> { + GovernCapacityRankResultDTO rank = new GovernCapacityRankResultDTO(); + rank.setAgencyName(o.getAgencyName()); + rank.setGovernRatio(convertPercentStr(o.getGovernRatio(),NumConstant.ONE)); + rank.setResolvedRatio(convertPercentStr(o.getResolvedRatio(),NumConstant.ONE)); + rank.setResponseRatio(convertPercentStr(o.getResponseRatio(),NumConstant.ONE)); + rank.setSatisfactionRatio(convertPercentStr(o.getSatisfactionRatio(),NumConstant.ONE)); + rank.setParentAgencyName(o.getParentAgencyName()); + rank.setMonthId(o.getMonthId()); + result.add(rank); + }); + return result; + } /** * @Description 6、公众参与-柱状折线图 * @NEI https://nei.netease.com/interface/detail/req/?pid=57068&id=322434 diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenGovernRankDataDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenGovernRankDataDao.xml index 1568e078b5..6f040d326b 100644 --- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenGovernRankDataDao.xml +++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenGovernRankDataDao.xml @@ -82,4 +82,82 @@ RESPONSE_RATIO DESC + + + + + \ No newline at end of file From 149b9e93bda76a5e62839c0d79e4cb321b075262 Mon Sep 17 00:00:00 2001 From: jianjun Date: Thu, 30 Dec 2021 10:38:52 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E4=B8=B4=E6=97=B6=E8=A7=A3=E5=86=B3?= =?UTF-8?q?=E6=96=B9=E6=A1=88=20=E7=BB=84=E7=BB=87=E6=A0=91=20=E5=85=88?= =?UTF-8?q?=E7=BC=93=E5=AD=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/commons/tools/redis/RedisKeys.java | 8 ++++++++ .../controller/CustomerAgencyController.java | 18 ++++++++++++++++-- 2 files changed, 24 insertions(+), 2 deletions(-) diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/RedisKeys.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/RedisKeys.java index 1558df9b36..57630deaaf 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/RedisKeys.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/RedisKeys.java @@ -628,4 +628,12 @@ public class RedisKeys { return rootPrefix.concat("resi:").concat("export").concat(":template:changed").concat(customerId); } + /** + * desc:临时方案 + * @param userId + * @return + */ + public static String getOrgTreeCacheKey(String userId) { + return rootPrefix.concat("ic:temp:orgtree").concat("userId"); + } } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerAgencyController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerAgencyController.java index 183b6f81f5..43108f3706 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerAgencyController.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerAgencyController.java @@ -20,6 +20,8 @@ package com.epmet.controller; import com.epmet.commons.tools.annotation.LoginUser; import com.epmet.commons.tools.exception.RenException; import com.epmet.commons.tools.page.PageData; +import com.epmet.commons.tools.redis.RedisKeys; +import com.epmet.commons.tools.redis.RedisUtils; import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.utils.ExcelUtils; import com.epmet.commons.tools.utils.Result; @@ -53,6 +55,8 @@ import java.util.Set; @RestController @RequestMapping("customeragency") public class CustomerAgencyController { + @Autowired + private RedisUtils redisUtils; @Autowired private CustomerAgencyService customerAgencyService; @@ -365,8 +369,18 @@ public class CustomerAgencyController { * @Date 2021/9/8 15:20 */ @PostMapping("agencygridtree") - public Result getOrgTreeData(@LoginUser TokenDto tokenDTO) { - return new Result().ok(customerAgencyService.getOrgTreeData(tokenDTO.getUserId())); + public Result getOrgTreeData(/*@LoginUser */TokenDto tokenDTO) { + tokenDTO.setUserId("dffe71e021a61b900f9025f4f07f6955"); + String orgTreeCacheKey = RedisKeys.getOrgTreeCacheKey(tokenDTO.getUserId()); + Object o = redisUtils.get(orgTreeCacheKey); + AgencyTreeResultDTO result = null; + if (o == null){ + result = customerAgencyService.getOrgTreeData(tokenDTO.getUserId()); + redisUtils.set(orgTreeCacheKey,result,RedisUtils.MINUTE_THIRTY_EXPIRE); + }else { + result = (AgencyTreeResultDTO) o; + } + return new Result().ok(result); } } From d69fd2381f5d3a69de46d1c17eefc067db33402e Mon Sep 17 00:00:00 2001 From: jianjun Date: Thu, 30 Dec 2021 10:39:29 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E4=B8=B4=E6=97=B6=E8=A7=A3=E5=86=B3?= =?UTF-8?q?=E6=96=B9=E6=A1=88=20=E7=BB=84=E7=BB=87=E6=A0=91=20=E5=85=88?= =?UTF-8?q?=E7=BC=93=E5=AD=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/controller/CustomerAgencyController.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerAgencyController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerAgencyController.java index 43108f3706..704b9b66b6 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerAgencyController.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerAgencyController.java @@ -369,8 +369,8 @@ public class CustomerAgencyController { * @Date 2021/9/8 15:20 */ @PostMapping("agencygridtree") - public Result getOrgTreeData(/*@LoginUser */TokenDto tokenDTO) { - tokenDTO.setUserId("dffe71e021a61b900f9025f4f07f6955"); + public Result getOrgTreeData(@LoginUser TokenDto tokenDTO) { + //tokenDTO.setUserId("dffe71e021a61b900f9025f4f07f6955"); String orgTreeCacheKey = RedisKeys.getOrgTreeCacheKey(tokenDTO.getUserId()); Object o = redisUtils.get(orgTreeCacheKey); AgencyTreeResultDTO result = null; From a7c4bd9031637d0fcc2c22ebedbc2e42ad32ebf2 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Thu, 30 Dec 2021 12:02:50 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E6=8B=86=E5=88=86sql?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../result/ResiBuzzLeftPieChartResultDTO.java | 5 +- .../src/main/java/com/epmet/dao/IssueDao.java | 3 + .../epmet/service/impl/IssueServiceImpl.java | 26 ++++++- .../src/main/resources/mapper/IssueDao.xml | 69 +++++++++++++------ 4 files changed, 80 insertions(+), 23 deletions(-) diff --git a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/ResiBuzzLeftPieChartResultDTO.java b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/ResiBuzzLeftPieChartResultDTO.java index 8db3918fab..9c12da7c91 100644 --- a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/ResiBuzzLeftPieChartResultDTO.java +++ b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/ResiBuzzLeftPieChartResultDTO.java @@ -37,10 +37,13 @@ public class ResiBuzzLeftPieChartResultDTO implements Serializable { */ private String color; + @JsonIgnore + private String issueId; + public ResiBuzzLeftPieChartResultDTO() { this.count = NumConstant.ZERO; this.categoryCode = ""; this.categoryName = ""; - this.color = "#0091ed"; + this.color = ""; } } diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueDao.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueDao.java index 8ab346293c..5e7e0029d0 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueDao.java +++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueDao.java @@ -262,6 +262,9 @@ public interface IssueDao extends BaseDao { */ List resiBuzzLeftPieChartByIssueIds(@Param("length")Integer length,@Param("issueIds")List issueIds); + List resiBuzzIssueCategoryByIssueIds(@Param("length")Integer length,@Param("issueIds")List issueIds); + List resiBuzzIssueCategoryNameByIssueIds(List categories,@Param("customerId")String customerId); + /** * @Description 查询前50名的议题ID * @param orgId diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java index 09310d3091..9271042bcf 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java +++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java @@ -1656,13 +1656,37 @@ public class IssueServiceImpl extends BaseServiceImpl imp if(CollectionUtils.isEmpty(issueIds)){ return new ArrayList<>(); } - List result = baseDao.resiBuzzLeftPieChartByIssueIds(length, issueIds); + List categories = baseDao.resiBuzzIssueCategoryByIssueIds(length, issueIds); + List pieChat = getPieChat(issueIds); + Iterator list = pieChat.iterator(); + while (list.hasNext()){ + ResiBuzzLeftPieChartResultDTO next = list.next(); + for (ResiBuzzLeftPieChartResultDTO category : categories) { + if (next.getIssueId().equals(category.getIssueId())){ + list.remove(); + continue; + } + } + } + categories.addAll(pieChat); +// List result = baseDao.resiBuzzLeftPieChartByIssueIds(length, issueIds); + List result = baseDao.resiBuzzIssueCategoryNameByIssueIds(categories, tokenDto.getCustomerId()); if (CollectionUtils.isEmpty(result)){ return new ArrayList<>(); } return result; } + public List getPieChat(List issueIds){ + List resultDTOS = new ArrayList<>(); + issueIds.forEach(i -> { + ResiBuzzLeftPieChartResultDTO dto = new ResiBuzzLeftPieChartResultDTO(); + dto.setIssueId(i); + resultDTOS.add(dto); + }); + return resultDTOS; + } + /** * @Description 查询组织下每个网格的项目数 * @param formDTO diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueDao.xml b/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueDao.xml index cf309c8106..659f8c1322 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueDao.xml +++ b/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueDao.xml @@ -621,25 +621,25 @@ @@ -700,11 +700,38 @@ IFNULL(cd.CATEGORY_NAME,'其他') AS categoryName, IFNULL(cd.color,'#0091ed') AS color FROM issue_category ic - INNER JOIN issue_project_category_dict cd ON (cd.CATEGORY_CODE = LEFT(ic.CATEGORY_CODE,#{length}) AND cd.DEL_FLAG = '0' AND cd.CUSTOMER_ID = ic.CUSTOMER_ID) + LEFT JOIN issue_project_category_dict cd ON (cd.CATEGORY_CODE = LEFT(ic.CATEGORY_CODE,#{length}) AND cd.DEL_FLAG = '0' AND cd.CUSTOMER_ID = ic.CUSTOMER_ID) AND ic.ISSUE_ID IN ( #{issueId} - ) GROUP BY categoryName + ) GROUP BY categoryCode + + + \ No newline at end of file