From 85f243c2c91fa7f24501aa4a96f925728f05d18b Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Wed, 23 Dec 2020 15:44:52 +0800 Subject: [PATCH 01/10] =?UTF-8?q?=E5=A4=96=E6=8C=82=E6=8E=A5=E5=8F=A3-?= =?UTF-8?q?=E6=8E=A8=E9=80=81=E7=AB=99=E5=86=85=E4=BF=A1=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet-message-server/deploy/docker-compose-prod.yml | 2 +- epmet-module/epmet-message/epmet-message-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-module/epmet-message/epmet-message-server/deploy/docker-compose-prod.yml b/epmet-module/epmet-message/epmet-message-server/deploy/docker-compose-prod.yml index 6e122b14b9..23750b4168 100644 --- a/epmet-module/epmet-message/epmet-message-server/deploy/docker-compose-prod.yml +++ b/epmet-module/epmet-message/epmet-message-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-message-server: container_name: epmet-message-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-message-server:0.3.32 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-message-server:0.3.33 ports: - "8085:8085" network_mode: host # 使用现有网络 diff --git a/epmet-module/epmet-message/epmet-message-server/pom.xml b/epmet-module/epmet-message/epmet-message-server/pom.xml index 1e0b1a01c5..6a10b4724d 100644 --- a/epmet-module/epmet-message/epmet-message-server/pom.xml +++ b/epmet-module/epmet-message/epmet-message-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.32 + 0.3.33 com.epmet epmet-message From 251e1e0e43cc431458b13fdb3fc8d4fb9b48235f Mon Sep 17 00:00:00 2001 From: wangchao Date: Fri, 25 Dec 2020 13:39:31 +0800 Subject: [PATCH 02/10] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E7=8E=AF=E5=A2=83=20?= =?UTF-8?q?=20=E6=95=B0=E6=8D=AE=E6=A8=A1=E5=9D=97=20=20data-stats=20=20?= =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=8D=87=E7=BA=A7=20=20=20=2079=20->=20=2080?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../data-statistical-server/deploy/docker-compose-prod.yml | 2 +- epmet-module/data-statistical/data-statistical-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-prod.yml b/epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-prod.yml index 075794d502..ccb7cfd518 100644 --- a/epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-prod.yml +++ b/epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: data-statistical-server: container_name: data-statistical-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-statistical-server:0.3.79 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-statistical-server:0.3.80 ports: - "8108:8108" network_mode: host # 使用现有网络 diff --git a/epmet-module/data-statistical/data-statistical-server/pom.xml b/epmet-module/data-statistical/data-statistical-server/pom.xml index 473882d35a..d0da071622 100644 --- a/epmet-module/data-statistical/data-statistical-server/pom.xml +++ b/epmet-module/data-statistical/data-statistical-server/pom.xml @@ -2,7 +2,7 @@ - 0.3.79 + 0.3.80 data-statistical com.epmet From 28041e928553c05fe275256d15e9dbf797b7090b Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Mon, 28 Dec 2020 14:18:29 +0800 Subject: [PATCH 03/10] =?UTF-8?q?=E7=BA=A2=E7=82=B9bug=E4=BF=AE=E5=A4=8Dgo?= =?UTF-8?q?v-grid,gov-issue,gov-mine,resi-group,resi-partymember?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../gov-grid/gov-grid-server/deploy/docker-compose-prod.yml | 2 +- epmet-module/gov-grid/gov-grid-server/pom.xml | 2 +- .../gov-issue/gov-issue-server/deploy/docker-compose-prod.yml | 2 +- epmet-module/gov-issue/gov-issue-server/pom.xml | 2 +- .../gov-mine/gov-mine-server/deploy/docker-compose-prod.yml | 2 +- epmet-module/gov-mine/gov-mine-server/pom.xml | 2 +- .../resi-group/resi-group-server/deploy/docker-compose-prod.yml | 2 +- epmet-module/resi-group/resi-group-server/pom.xml | 2 +- .../resi-partymember-server/deploy/docker-compose-prod.yml | 2 +- epmet-module/resi-partymember/resi-partymember-server/pom.xml | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/epmet-module/gov-grid/gov-grid-server/deploy/docker-compose-prod.yml b/epmet-module/gov-grid/gov-grid-server/deploy/docker-compose-prod.yml index 1447f142c2..bade332658 100644 --- a/epmet-module/gov-grid/gov-grid-server/deploy/docker-compose-prod.yml +++ b/epmet-module/gov-grid/gov-grid-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: gov-grid-server: container_name: gov-grid-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-grid-server:0.3.39 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-grid-server:0.3.40 ports: - "8097:8097" network_mode: host # 使用现有网络 diff --git a/epmet-module/gov-grid/gov-grid-server/pom.xml b/epmet-module/gov-grid/gov-grid-server/pom.xml index 6e0f257174..57bbc5fb73 100644 --- a/epmet-module/gov-grid/gov-grid-server/pom.xml +++ b/epmet-module/gov-grid/gov-grid-server/pom.xml @@ -3,7 +3,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - 0.3.39 + 0.3.40 com.epmet gov-grid diff --git a/epmet-module/gov-issue/gov-issue-server/deploy/docker-compose-prod.yml b/epmet-module/gov-issue/gov-issue-server/deploy/docker-compose-prod.yml index 18bc535f46..5250add85f 100644 --- a/epmet-module/gov-issue/gov-issue-server/deploy/docker-compose-prod.yml +++ b/epmet-module/gov-issue/gov-issue-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: gov-issue-server: container_name: gov-issue-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-issue-server:0.3.58 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-issue-server:0.3.59 ports: - "8101:8101" network_mode: host # 使用现有网络 diff --git a/epmet-module/gov-issue/gov-issue-server/pom.xml b/epmet-module/gov-issue/gov-issue-server/pom.xml index 56cb2ab666..c42a7b1a60 100644 --- a/epmet-module/gov-issue/gov-issue-server/pom.xml +++ b/epmet-module/gov-issue/gov-issue-server/pom.xml @@ -2,7 +2,7 @@ - 0.3.58 + 0.3.59 gov-issue com.epmet diff --git a/epmet-module/gov-mine/gov-mine-server/deploy/docker-compose-prod.yml b/epmet-module/gov-mine/gov-mine-server/deploy/docker-compose-prod.yml index d728d97e7e..2bb561026b 100644 --- a/epmet-module/gov-mine/gov-mine-server/deploy/docker-compose-prod.yml +++ b/epmet-module/gov-mine/gov-mine-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: gov-mine-server: container_name: gov-mine-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-mine-server:0.3.35 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-mine-server:0.3.36 ports: - "8098:8098" network_mode: host # 使用现有网络 diff --git a/epmet-module/gov-mine/gov-mine-server/pom.xml b/epmet-module/gov-mine/gov-mine-server/pom.xml index 70e7ecfc1c..26a057cce8 100644 --- a/epmet-module/gov-mine/gov-mine-server/pom.xml +++ b/epmet-module/gov-mine/gov-mine-server/pom.xml @@ -2,7 +2,7 @@ - 0.3.35 + 0.3.36 com.epmet gov-mine diff --git a/epmet-module/resi-group/resi-group-server/deploy/docker-compose-prod.yml b/epmet-module/resi-group/resi-group-server/deploy/docker-compose-prod.yml index 053f95b4b8..8b618d43e3 100644 --- a/epmet-module/resi-group/resi-group-server/deploy/docker-compose-prod.yml +++ b/epmet-module/resi-group/resi-group-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: resi-group-server: container_name: resi-group-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/resi-group-server:0.3.81 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/resi-group-server:0.3.82 ports: - "8095:8095" network_mode: host # 使用现有网络 diff --git a/epmet-module/resi-group/resi-group-server/pom.xml b/epmet-module/resi-group/resi-group-server/pom.xml index 84a771af59..47606382d3 100644 --- a/epmet-module/resi-group/resi-group-server/pom.xml +++ b/epmet-module/resi-group/resi-group-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.81 + 0.3.82 com.epmet resi-group diff --git a/epmet-module/resi-partymember/resi-partymember-server/deploy/docker-compose-prod.yml b/epmet-module/resi-partymember/resi-partymember-server/deploy/docker-compose-prod.yml index bad8fd163c..ce9ba1ebaa 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/deploy/docker-compose-prod.yml +++ b/epmet-module/resi-partymember/resi-partymember-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: resi-partymember-server: container_name: resi-partymember-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/resi-partymember-server:0.3.61 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/resi-partymember-server:0.3.62 ports: - "8096:8096" network_mode: host # 使用现有网络 diff --git a/epmet-module/resi-partymember/resi-partymember-server/pom.xml b/epmet-module/resi-partymember/resi-partymember-server/pom.xml index c239476922..9e7c958a90 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/pom.xml +++ b/epmet-module/resi-partymember/resi-partymember-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.61 + 0.3.62 com.epmet resi-partymember From cd3acc1ca4d63e18a3b8c7a8fb747c7b12e3a6b8 Mon Sep 17 00:00:00 2001 From: zhangyongzhangyong <2012005003@qq.coom> Date: Tue, 29 Dec 2020 10:36:38 +0800 Subject: [PATCH 04/10] =?UTF-8?q?=E8=BA=AB=E8=BE=B9=E5=85=9A=E5=91=98-?= =?UTF-8?q?=E7=A7=AF=E5=88=86=E6=8E=92=E8=A1=8C=20=20=E6=8E=A5=E5=8F=A3(?= =?UTF-8?q?=E6=9C=AA=E6=B5=8B)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../form/ResiAroundPartyPointRankFormDTO.java | 53 ++++++ .../ResiAroundPartyPointRankResultDTO.java | 39 +++++ .../epmet/controller/ResiPointController.java | 26 ++- .../dao/UserPointStatisticalDailyDao.java | 43 ++++- .../UserPointStatisticalDailyService.java | 13 +- .../UserPointStatisticalDailyServiceImpl.java | 81 ++++++++- .../mapper/UserPointStatisticalDailyDao.xml | 155 +++++++++++++++++- .../epmet/dto/result/GridInCommunityDTO.java | 32 ++++ .../epmet/feign/GovOrgOpenFeignClient.java | 10 ++ .../GovOrgOpenFeignClientFallback.java | 4 + .../controller/CustomerGridController.java | 12 ++ .../java/com/epmet/dao/CustomerGridDao.java | 11 +- .../epmet/service/CustomerGridService.java | 13 +- .../service/impl/CustomerGridServiceImpl.java | 4 + .../main/resources/mapper/CustomerGridDao.xml | 16 ++ 15 files changed, 497 insertions(+), 15 deletions(-) create mode 100644 epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/form/ResiAroundPartyPointRankFormDTO.java create mode 100644 epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/result/ResiAroundPartyPointRankResultDTO.java create mode 100644 epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/GridInCommunityDTO.java diff --git a/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/form/ResiAroundPartyPointRankFormDTO.java b/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/form/ResiAroundPartyPointRankFormDTO.java new file mode 100644 index 0000000000..8387992756 --- /dev/null +++ b/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/form/ResiAroundPartyPointRankFormDTO.java @@ -0,0 +1,53 @@ +package com.epmet.dto.form; + +import com.epmet.commons.tools.validator.group.CustomerClientShowGroup; +import lombok.Data; + +import javax.validation.constraints.Min; +import javax.validation.constraints.NotBlank; +import java.io.Serializable; + +/** + * @Description 身边党员 积分排行接口 入参 + * @Auth zy + */ +@Data +public class ResiAroundPartyPointRankFormDTO implements Serializable { + private static final long serialVersionUID = 1534061512200591149L; + + public interface ResiAroundPartyPointRankGroup extends CustomerClientShowGroup{} + + /** + * 页码 + * */ + @Min(value = 1,groups = ResiAroundPartyPointRankGroup.class) + private Integer pageNo = 1; + + /** + * 每页数据条数 + * */ + private Integer pageSize = 10; + + /** + * 身边党员 grid 社区党员community + * */ + @NotBlank(message = "查询的部门维度scope不能为空",groups = ResiAroundPartyPointRankFormDTO.ResiAroundPartyPointRankGroup.class) + private String scope; + + /** + * 本月 monthly 总排行 all; + * */ + @NotBlank(message = "查询的时间维度type不能为空",groups = ResiAroundPartyPointRankFormDTO.ResiAroundPartyPointRankGroup.class) + private String type; + + /** + * 当前网格id + * */ + @NotBlank(message = "网格id不能为空",groups = ResiAroundPartyPointRankFormDTO.ResiAroundPartyPointRankGroup.class) + private String gridId; + + /** + * 客户Id，不做校验，如果前端不传则使用userId查询相应的客户Id + * */ + private String customerId; +} diff --git a/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/result/ResiAroundPartyPointRankResultDTO.java b/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/result/ResiAroundPartyPointRankResultDTO.java new file mode 100644 index 0000000000..33c9ba5ffb --- /dev/null +++ b/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/result/ResiAroundPartyPointRankResultDTO.java @@ -0,0 +1,39 @@ +package com.epmet.dto.result; + +import lombok.Data; + +import java.io.Serializable; + +/** + * @Description 身边党员 积分排行接口返参DTO + * @Auth zy + */ +@Data +public class ResiAroundPartyPointRankResultDTO implements Serializable { + private static final long serialVersionUID = 685408245193506541L; + + /** + * 排序 + * */ + private Integer ranking; + + /** + * 积分 + * */ + private Integer point; + + /** + * 头像 + * */ + private String userHeadPhoto; + + /** + * 名称 + * */ + private String realName; + + /** + * 用户id + * */ + private String userId; +} diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/controller/ResiPointController.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/controller/ResiPointController.java index f4e5ce6bb4..6e7336d188 100644 --- a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/controller/ResiPointController.java +++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/controller/ResiPointController.java @@ -6,11 +6,9 @@ import com.epmet.commons.tools.utils.Result; import com.epmet.commons.tools.validator.ValidatorUtils; import com.epmet.dto.form.CommonPageUserFormDTO; import com.epmet.dto.form.CommonUserFormDTO; +import com.epmet.dto.form.ResiAroundPartyPointRankFormDTO; import com.epmet.dto.form.ResiPointRankFormDTO; -import com.epmet.dto.result.PointExchangeResponseResultDTO; -import com.epmet.dto.result.ResiPointDetailResultDTO; -import com.epmet.dto.result.ResiPointLogListResultDTO; -import com.epmet.dto.result.ResiPointRankListResultDTO; +import com.epmet.dto.result.*; import com.epmet.service.PointVerificationLogService; import com.epmet.service.UserPointActionLogService; import com.epmet.service.UserPointStatisticalDailyService; @@ -141,4 +139,24 @@ public class ResiPointController { public Result exchangeCallback(@LoginUser TokenDto tokenDto){ return new Result().ok(pointVerificationLogService.resiExchangeCallback(tokenDto.getUserId())); } + + /** + * 身边党员-积分排行 + * 查询规则： scope ： grid && type ：monthly 表示：按网格统计，对本月党员增加的积分 进行排序 + * scope ： grid && type ：all 表示：按网格统计，对党员累计可用积分 排序 + * scope ： community && type ：monthly 表示：按社区统计，对本月党员增加的积分 进行排序 + * scope ： community && type ：all 表示：按社区统计，对党员累计可用积分 排序 + * @param tokenDto + * @param formDTO + * @return com.epmet.commons.tools.utils.Result> + * @Author zhangyong + * @Date 16:17 2020-12-28 + **/ + @PostMapping("aroundparty") + public Result> aroundPartyPointRank(@LoginUser TokenDto tokenDto, @RequestBody ResiAroundPartyPointRankFormDTO formDTO){ + formDTO.setCustomerId(tokenDto.getCustomerId()); + ValidatorUtils.validateEntity(formDTO,ResiAroundPartyPointRankFormDTO.ResiAroundPartyPointRankGroup.class); + List resultDTOS = userPointStatisticalDailyService.listAroundPartyPointRank(formDTO); + return new Result>().ok(resultDTOS); + } } diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/dao/UserPointStatisticalDailyDao.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/dao/UserPointStatisticalDailyDao.java index 9f9783797d..b536a8b5e9 100644 --- a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/dao/UserPointStatisticalDailyDao.java +++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/dao/UserPointStatisticalDailyDao.java @@ -18,6 +18,8 @@ package com.epmet.dao; import com.epmet.commons.mybatis.dao.BaseDao; +import com.epmet.dto.form.ResiAroundPartyPointRankFormDTO; +import com.epmet.dto.result.ResiAroundPartyPointRankResultDTO; import com.epmet.dto.result.ResiPointRankResultDTO; import com.epmet.entity.UserPointStatisticalDailyEntity; import org.apache.ibatis.annotations.Mapper; @@ -62,4 +64,43 @@ public interface UserPointStatisticalDailyDao extends BaseDao + * @Author zhangyong + * @Date 09:24 2020-12-29 + **/ + List selectListGridPartyRankByUsablePoint(ResiAroundPartyPointRankFormDTO formDTO); + + /** + * 身边党员-积分排行 ：按网格统计，对本月党员增加的积分 进行排序 + * @param formDTO + * @return java.util.List + * @Author zhangyong + * @Date 09:24 2020-12-29 + **/ + List selectListGridPartyRankPointByMonth(ResiAroundPartyPointRankFormDTO formDTO); + + /** + * 身边党员-积分排行 ：按社区(社区下的所有网格)统计，对党员累计可用积分 排序 + * @param formDTO + * @param grids 社区下的所有网格id + * @return java.util.List + * @Author zhangyong + * @Date 09:24 2020-12-29 + **/ + List selectListCommunityPartyRankByUsablePoint(ResiAroundPartyPointRankFormDTO formDTO, + @Param("grids")List grids); + + /** + * 身边党员-积分排行 ：按社区(社区下的所有网格)统计，对本月党员增加的积分 进行排序 + * @param formDTO + * @return java.util.List + * @Author zhangyong + * @Date 09:24 2020-12-29 + **/ + List selectListCommunityPartyRankPointByMonth(ResiAroundPartyPointRankFormDTO formDTO, + @Param("grids")List grids); +} diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/UserPointStatisticalDailyService.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/UserPointStatisticalDailyService.java index 9d3f2d3ecf..6630a87891 100644 --- a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/UserPointStatisticalDailyService.java +++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/UserPointStatisticalDailyService.java @@ -20,7 +20,9 @@ package com.epmet.service; import com.epmet.commons.mybatis.service.BaseService; import com.epmet.commons.tools.page.PageData; import com.epmet.dto.UserPointStatisticalDailyDTO; +import com.epmet.dto.form.ResiAroundPartyPointRankFormDTO; import com.epmet.dto.form.ResiPointRankFormDTO; +import com.epmet.dto.result.ResiAroundPartyPointRankResultDTO; import com.epmet.dto.result.ResiPointRankListResultDTO; import com.epmet.entity.UserPointStatisticalDailyEntity; @@ -114,4 +116,13 @@ public interface UserPointStatisticalDailyService extends BaseService> + * @Author zhangyong + * @Date 16:17 2020-12-28 + **/ + List listAroundPartyPointRank(ResiAroundPartyPointRankFormDTO formDTO); +} diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/UserPointStatisticalDailyServiceImpl.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/UserPointStatisticalDailyServiceImpl.java index a36a0c39d9..0242064ae9 100644 --- a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/UserPointStatisticalDailyServiceImpl.java +++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/UserPointStatisticalDailyServiceImpl.java @@ -27,13 +27,12 @@ import com.epmet.commons.tools.constant.FieldConstant; import com.epmet.commons.tools.utils.Result; import com.epmet.dao.UserPointStatisticalDailyDao; import com.epmet.dto.UserPointStatisticalDailyDTO; +import com.epmet.dto.form.ResiAroundPartyPointRankFormDTO; import com.epmet.dto.form.ResiPointRankFormDTO; -import com.epmet.dto.result.ResiPointRankListResultDTO; -import com.epmet.dto.result.ResiPointRankResultDTO; -import com.epmet.dto.result.ResiPointRankingResultDTO; -import com.epmet.dto.result.UserBaseInfoResultDTO; +import com.epmet.dto.result.*; import com.epmet.entity.UserPointStatisticalDailyEntity; import com.epmet.feign.EpmetUserOpenFeignClient; +import com.epmet.feign.GovOrgOpenFeignClient; import com.epmet.service.UserPointStatisticalDailyService; import com.epmet.utils.DimIdGenerator; import com.epmet.utils.ModuleConstant; @@ -59,6 +58,8 @@ public class UserPointStatisticalDailyServiceImpl extends BaseServiceImpl page(Map params) { @@ -230,5 +231,75 @@ public class UserPointStatisticalDailyServiceImpl extends BaseServiceImpl listAroundPartyPointRank(ResiAroundPartyPointRankFormDTO formDTO) { + //查询条件 + int pageIndex = (formDTO.getPageNo() - NumConstant.ONE) * formDTO.getPageSize(); + formDTO.setPageNo(pageIndex); + List resultDTOS = new ArrayList<>(); + + // 获取党员信息 + + // 按网格统计 + if ("grid".equals(formDTO.getScope())){ + if ("monthly".equals(formDTO.getType())){ + // scope ： grid && type ：monthly 表示：按网格统计，对本月党员增加的积分 进行排序 + resultDTOS = baseDao.selectListGridPartyRankPointByMonth(formDTO); + } else if ("all".equals(formDTO.getType())){ + // scope ： grid && type ：all 表示：按网格统计，对党员累计可用积分 排序 + resultDTOS = baseDao.selectListGridPartyRankByUsablePoint(formDTO); + } + } -} \ No newline at end of file + // 按社区统计 + if ("community".equals(formDTO.getScope())){ + // 根据网格id，获取社区下的所有网格id + Result> gridInCommunity = govOrgOpenFeignClient.getGridInCommunity(formDTO.getGridId()); + if (gridInCommunity.getData().size() <= NumConstant.ZERO){ + log.error("根据" + formDTO.getGridId() + "网格id, 查询不到同属于一个社区下的所有网格id"); + return resultDTOS; + } + if ("monthly".equals(formDTO.getType())){ + // scope ： community && type ：monthly 表示：按社区统计，对本月党员增加的积分 进行排序 + resultDTOS = baseDao.selectListCommunityPartyRankPointByMonth(formDTO, gridInCommunity.getData()); + } else if ("all".equals(formDTO.getType())){ + // scope ： community && type ：all 表示：按社区统计，对党员累计可用积分 排序 + resultDTOS = baseDao.selectListCommunityPartyRankByUsablePoint(formDTO, gridInCommunity.getData()); + } + } + + // 给排好序的 身边党员-积分排行， 赋值 【头像】 + resultDTOS = getPartyBaseInfo(resultDTOS); + return resultDTOS; + } + + /* + * 给排好序的 身边党员-积分排行， 赋值 【头像】 + * @param rankResultDTOS + * @return java.util.List + * @Author zhangyong + * @Date 10:14 2020-12-29 + **/ + private List getPartyBaseInfo(List rankResultDTOS){ + // 1.获取当前党员Id + List userIdParam = new LinkedList<>(); + for (ResiAroundPartyPointRankResultDTO formDTO : rankResultDTOS){ + userIdParam.add(formDTO.getUserId()); + } + if (userIdParam.size() == NumConstant.ZERO){ + return rankResultDTOS; + } + // 2.获取用户基本信息 + Result> myResiInfoResult = epmetUserOpenFeignClient.queryUserBaseInfo(userIdParam); + if(myResiInfoResult.success() && null != myResiInfoResult.getData() && !myResiInfoResult.getData().isEmpty()){ + for (UserBaseInfoResultDTO resiInfo : myResiInfoResult.getData()){ + for (ResiAroundPartyPointRankResultDTO formDTO : rankResultDTOS){ + if (formDTO.getUserId().equals(resiInfo.getUserId())){ + formDTO.setUserHeadPhoto(resiInfo.getHeadImgUrl()); + } + } + } + } + return rankResultDTOS; + } +} diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/UserPointStatisticalDailyDao.xml b/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/UserPointStatisticalDailyDao.xml index 9bb759ed72..37325951aa 100644 --- a/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/UserPointStatisticalDailyDao.xml +++ b/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/UserPointStatisticalDailyDao.xml @@ -130,4 +130,157 @@ - \ No newline at end of file + + + + + + + + + + + + diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/GridInCommunityDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/GridInCommunityDTO.java new file mode 100644 index 0000000000..52cfa389da --- /dev/null +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/GridInCommunityDTO.java @@ -0,0 +1,32 @@ +package com.epmet.dto.result; + +import lombok.Data; + +import java.io.Serializable; + +/** + * @Description 根据网格id查询，它的父级 社区id + 最后返回 社区id 下的所有网格信息 + * @Author zy + * @Date 2020/12/28 23:16 + */ +@Data +public class GridInCommunityDTO implements Serializable { + private static final long serialVersionUID = 4360690752084258055L; + + /** + * 网格ID + */ + private String gridId; + + /** + * 网格名称 + */ + private String gridName; + + /** + * 客户ID + */ + private String customerId; +} + diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/GovOrgOpenFeignClient.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/GovOrgOpenFeignClient.java index 2dab8452b3..50bb5e6205 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/GovOrgOpenFeignClient.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/GovOrgOpenFeignClient.java @@ -314,4 +314,14 @@ public interface GovOrgOpenFeignClient { **/ @PostMapping("/gov/org/customergrid/griddatafilter") Result gridDataFilter(CommonGridIdFormDTO gridForm); + + /** + * 根据 网格id，查询同属于一个社区下的所有网格id + * @param gridId + * @return com.epmet.commons.tools.utils.Result> + * @Author zhangyong + * @Date 17:44 2020-12-28 + **/ + @GetMapping("/gov/org/customergrid/getGridInCommunity/{gridId}") + Result> getGridInCommunity(@PathVariable("gridId") String gridId); } diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/fallback/GovOrgOpenFeignClientFallback.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/fallback/GovOrgOpenFeignClientFallback.java index 4776dec9b6..ad3eeeb81c 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/fallback/GovOrgOpenFeignClientFallback.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/fallback/GovOrgOpenFeignClientFallback.java @@ -181,6 +181,10 @@ public class GovOrgOpenFeignClientFallback implements GovOrgOpenFeignClient { @Override public Result gridDataFilter(CommonGridIdFormDTO gridForm) { return ModuleUtils.feignConError(ServiceConstant.GOV_ORG_SERVER, "gridDataFilter", gridForm); + } + @Override + public Result> getGridInCommunity(String gridId) { + return ModuleUtils.feignConError(ServiceConstant.GOV_ORG_SERVER, "getGridInCommunity", gridId); } } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerGridController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerGridController.java index b86bb7df20..26ccea082b 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerGridController.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerGridController.java @@ -228,4 +228,16 @@ public class CustomerGridController { return new Result().ok(customerGridService.selectGridCount(customerIdFormDTO)); } + /** + * @param gridId + * @return com.epmet.commons.tools.utils.Result> + * @Author zy + * @Description 根据 网格id，查询同属于一个社区下的所有网格id、网格name + * @Date 2020/12/28 23:16 + **/ + @GetMapping("getGridInCommunity/{gridId}") + public Result> getGridInCommunity(@PathVariable("gridId") String gridId) { + List resultDTOS = customerGridService.listGridInCommunity(gridId); + return new Result>().ok(resultDTOS); + } } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerGridDao.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerGridDao.java index 64274d1b69..45afaf2874 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerGridDao.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerGridDao.java @@ -246,4 +246,13 @@ public interface CustomerGridDao extends BaseDao { List selectOrgInfoByAgency(@Param("orgIds")List orgIds); List selectOrgInfoByGrid(@Param("orgIds")List orgIds); List selectOrgInfoByDept(@Param("orgIds")List orgIds); -} \ No newline at end of file + + /** + * @param gridId + * @return com.epmet.commons.tools.utils.Result> + * @Author zy + * @Description 根据 网格id，查询同属于一个社区下的所有网格id、网格name + * @Date 2020/12/28 23:16 + **/ + List selectListGridInCommunity(@Param("gridId") String gridId); +} diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerGridService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerGridService.java index f9e8610778..df10430dbf 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerGridService.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerGridService.java @@ -39,7 +39,7 @@ import java.util.List; import java.util.Map; /** - * 客户网格表 + * 客户网格表 * * @author generator generator@elink-cn.com * @since v1.0.0 2020-03-16 @@ -277,4 +277,13 @@ public interface CustomerGridService extends BaseService { * @date 2020/11/10 2:55 下午 */ List selectOrgInfo(OrgInfoFormDTO orgInfoFormDTO); -} \ No newline at end of file + + /** + * @param gridId + * @return com.epmet.commons.tools.utils.Result> + * @Author zy + * @Description 根据 网格id，查询同属于一个社区下的所有网格id、网格name + * @Date 2020/12/28 23:16 + **/ + List listGridInCommunity(String gridId); +} diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java index df895b4f11..da31fd338a 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java @@ -692,4 +692,8 @@ public class CustomerGridServiceImpl extends BaseServiceImpl listGridInCommunity(String gridId) { + return baseDao.selectListGridInCommunity(gridId); + } } diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml index b3e93a2fc3..ecb4a27199 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml @@ -545,4 +545,20 @@ ID = #{orgId} + + + From a754efe0eb357a035978dd8271ae12f6fca59e38 Mon Sep 17 00:00:00 2001 From: zhangyongzhangyong <2012005003@qq.coom> Date: Tue, 29 Dec 2020 11:04:37 +0800 Subject: [PATCH 05/10] =?UTF-8?q?feign=E6=8E=A5=E5=8F=A3=EF=BC=8C=E6=9B=B4?= =?UTF-8?q?=E6=8D=A2=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/UserPointStatisticalDailyServiceImpl.java | 2 +- .../src/main/java/com/epmet/feign/GovOrgOpenFeignClient.java | 2 +- .../epmet/feign/fallback/GovOrgOpenFeignClientFallback.java | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/UserPointStatisticalDailyServiceImpl.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/UserPointStatisticalDailyServiceImpl.java index 0242064ae9..ac5849d385 100644 --- a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/UserPointStatisticalDailyServiceImpl.java +++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/UserPointStatisticalDailyServiceImpl.java @@ -254,7 +254,7 @@ public class UserPointStatisticalDailyServiceImpl extends BaseServiceImpl> gridInCommunity = govOrgOpenFeignClient.getGridInCommunity(formDTO.getGridId()); + Result> gridInCommunity = govOrgOpenFeignClient.getGridIdsInCommunity(formDTO.getGridId()); if (gridInCommunity.getData().size() <= NumConstant.ZERO){ log.error("根据" + formDTO.getGridId() + "网格id, 查询不到同属于一个社区下的所有网格id"); return resultDTOS; diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/GovOrgOpenFeignClient.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/GovOrgOpenFeignClient.java index 50bb5e6205..2c2c8144b0 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/GovOrgOpenFeignClient.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/GovOrgOpenFeignClient.java @@ -323,5 +323,5 @@ public interface GovOrgOpenFeignClient { * @Date 17:44 2020-12-28 **/ @GetMapping("/gov/org/customergrid/getGridInCommunity/{gridId}") - Result> getGridInCommunity(@PathVariable("gridId") String gridId); + Result> getGridIdsInCommunity(@PathVariable("gridId") String gridId); } diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/fallback/GovOrgOpenFeignClientFallback.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/fallback/GovOrgOpenFeignClientFallback.java index ad3eeeb81c..d9d5be0a84 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/fallback/GovOrgOpenFeignClientFallback.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/fallback/GovOrgOpenFeignClientFallback.java @@ -184,7 +184,7 @@ public class GovOrgOpenFeignClientFallback implements GovOrgOpenFeignClient { } @Override - public Result> getGridInCommunity(String gridId) { - return ModuleUtils.feignConError(ServiceConstant.GOV_ORG_SERVER, "getGridInCommunity", gridId); + public Result> getGridIdsInCommunity(String gridId) { + return ModuleUtils.feignConError(ServiceConstant.GOV_ORG_SERVER, "getGridIdsInCommunity", gridId); } } From 9bb0e8d831ae0e4f18b3c68ffcb8326d607095da Mon Sep 17 00:00:00 2001 From: zhangyongzhangyong <2012005003@qq.coom> Date: Tue, 29 Dec 2020 15:31:51 +0800 Subject: [PATCH 06/10] =?UTF-8?q?=E8=BA=AB=E8=BE=B9=E5=85=9A=E5=91=98-?= =?UTF-8?q?=E7=A7=AF=E5=88=86=E6=8E=92=E5=90=8D(=E5=B7=B2=E6=B5=8B)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../form/ResiAroundPartyPointRankFormDTO.java | 5 +- .../epmet/common/enu/AroundPartyConstant.java | 28 +++ .../controller/AdjustmentController.java | 1 - .../epmet/controller/ResiPointController.java | 4 +- .../dao/UserPointStatisticalDailyDao.java | 23 +-- .../UserPointStatisticalDailyServiceImpl.java | 83 ++++++--- .../mapper/UserPointStatisticalDailyDao.xml | 168 +++--------------- .../epmet/feign/GovOrgOpenFeignClient.java | 2 +- .../controller/CustomerGridController.java | 6 +- .../java/com/epmet/dao/CustomerGridDao.java | 2 +- .../epmet/service/CustomerGridService.java | 2 +- .../service/impl/CustomerGridServiceImpl.java | 4 +- .../main/resources/mapper/CustomerGridDao.xml | 2 +- .../feign/ResiPartyMemberOpenFeignClient.java | 10 ++ ...esiPartyMemberOpenFeignClientFallback.java | 5 +- .../controller/PartymemberInfoController.java | 19 +- .../partymember/dao/PartymemberInfoDao.java | 11 +- .../service/PartymemberInfoService.java | 13 +- .../impl/PartymemberInfoServiceImpl.java | 8 +- .../mapper/partymember/PartymemberInfoDao.xml | 36 +++- 20 files changed, 218 insertions(+), 214 deletions(-) create mode 100644 epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/common/enu/AroundPartyConstant.java diff --git a/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/form/ResiAroundPartyPointRankFormDTO.java b/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/form/ResiAroundPartyPointRankFormDTO.java index 8387992756..4fb40ab5c5 100644 --- a/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/form/ResiAroundPartyPointRankFormDTO.java +++ b/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/form/ResiAroundPartyPointRankFormDTO.java @@ -6,6 +6,7 @@ import lombok.Data; import javax.validation.constraints.Min; import javax.validation.constraints.NotBlank; import java.io.Serializable; +import java.util.List; /** * @Description 身边党员 积分排行接口 入参 @@ -47,7 +48,7 @@ public class ResiAroundPartyPointRankFormDTO implements Serializable { private String gridId; /** - * 客户Id，不做校验，如果前端不传则使用userId查询相应的客户Id + * 通过网格id，获取到的 网格下的 认证成功的党员 的用户id * */ - private String customerId; + private List userIds; } diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/common/enu/AroundPartyConstant.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/common/enu/AroundPartyConstant.java new file mode 100644 index 0000000000..43a1a8498a --- /dev/null +++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/common/enu/AroundPartyConstant.java @@ -0,0 +1,28 @@ +/** + * Copyright (c) 2018 人人开源 All rights reserved. + * + * https://www.renren.io + * + * 版权所有，侵权必究！ + */ + +package com.epmet.common.enu; + +import com.epmet.commons.tools.constant.Constant; + +/** + * 身边党员-积分排行 入参常量 + * + * @author Mark sunlightcs@gmail.com + * @since 1.1.0 + */ +public interface AroundPartyConstant extends Constant { + + String ALL = "all"; + + String MONTHLY = "monthly"; + + String GRID = "grid"; + + String COMMUNITY = "community"; +} diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/controller/AdjustmentController.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/controller/AdjustmentController.java index 535b717e0c..f610a25df6 100644 --- a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/controller/AdjustmentController.java +++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/controller/AdjustmentController.java @@ -97,4 +97,3 @@ public class AdjustmentController { return new Result(); } } - diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/controller/ResiPointController.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/controller/ResiPointController.java index 6e7336d188..31906aa411 100644 --- a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/controller/ResiPointController.java +++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/controller/ResiPointController.java @@ -146,15 +146,13 @@ public class ResiPointController { * scope ： grid && type ：all 表示：按网格统计，对党员累计可用积分 排序 * scope ： community && type ：monthly 表示：按社区统计，对本月党员增加的积分 进行排序 * scope ： community && type ：all 表示：按社区统计，对党员累计可用积分 排序 - * @param tokenDto * @param formDTO * @return com.epmet.commons.tools.utils.Result> * @Author zhangyong * @Date 16:17 2020-12-28 **/ @PostMapping("aroundparty") - public Result> aroundPartyPointRank(@LoginUser TokenDto tokenDto, @RequestBody ResiAroundPartyPointRankFormDTO formDTO){ - formDTO.setCustomerId(tokenDto.getCustomerId()); + public Result> aroundPartyPointRank( @RequestBody ResiAroundPartyPointRankFormDTO formDTO){ ValidatorUtils.validateEntity(formDTO,ResiAroundPartyPointRankFormDTO.ResiAroundPartyPointRankGroup.class); List resultDTOS = userPointStatisticalDailyService.listAroundPartyPointRank(formDTO); return new Result>().ok(resultDTOS); diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/dao/UserPointStatisticalDailyDao.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/dao/UserPointStatisticalDailyDao.java index b536a8b5e9..0ef7deae28 100644 --- a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/dao/UserPointStatisticalDailyDao.java +++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/dao/UserPointStatisticalDailyDao.java @@ -66,7 +66,7 @@ public interface UserPointStatisticalDailyDao extends BaseDao * @Author zhangyong @@ -82,25 +82,4 @@ public interface UserPointStatisticalDailyDao extends BaseDao selectListGridPartyRankPointByMonth(ResiAroundPartyPointRankFormDTO formDTO); - - /** - * 身边党员-积分排行 ：按社区(社区下的所有网格)统计，对党员累计可用积分 排序 - * @param formDTO - * @param grids 社区下的所有网格id - * @return java.util.List - * @Author zhangyong - * @Date 09:24 2020-12-29 - **/ - List selectListCommunityPartyRankByUsablePoint(ResiAroundPartyPointRankFormDTO formDTO, - @Param("grids")List grids); - - /** - * 身边党员-积分排行 ：按社区(社区下的所有网格)统计，对本月党员增加的积分 进行排序 - * @param formDTO - * @return java.util.List - * @Author zhangyong - * @Date 09:24 2020-12-29 - **/ - List selectListCommunityPartyRankPointByMonth(ResiAroundPartyPointRankFormDTO formDTO, - @Param("grids")List grids); } diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/UserPointStatisticalDailyServiceImpl.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/UserPointStatisticalDailyServiceImpl.java index ac5849d385..63ad8f5b6d 100644 --- a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/UserPointStatisticalDailyServiceImpl.java +++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/UserPointStatisticalDailyServiceImpl.java @@ -19,6 +19,7 @@ package com.epmet.service.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.epmet.common.enu.AroundPartyConstant; import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; import com.epmet.commons.tools.constant.NumConstant; import com.epmet.commons.tools.page.PageData; @@ -33,6 +34,8 @@ import com.epmet.dto.result.*; import com.epmet.entity.UserPointStatisticalDailyEntity; import com.epmet.feign.EpmetUserOpenFeignClient; import com.epmet.feign.GovOrgOpenFeignClient; +import com.epmet.resi.partymember.dto.partymember.PartymemberInfoDTO; +import com.epmet.resi.partymember.feign.ResiPartyMemberOpenFeignClient; import com.epmet.service.UserPointStatisticalDailyService; import com.epmet.utils.DimIdGenerator; import com.epmet.utils.ModuleConstant; @@ -60,6 +63,8 @@ public class UserPointStatisticalDailyServiceImpl extends BaseServiceImpl page(Map params) { @@ -234,47 +239,70 @@ public class UserPointStatisticalDailyServiceImpl extends BaseServiceImpl listAroundPartyPointRank(ResiAroundPartyPointRankFormDTO formDTO) { //查询条件 - int pageIndex = (formDTO.getPageNo() - NumConstant.ONE) * formDTO.getPageSize(); - formDTO.setPageNo(pageIndex); + formDTO.setPageNo((formDTO.getPageNo() - NumConstant.ONE) * formDTO.getPageSize()); List resultDTOS = new ArrayList<>(); - // 获取党员信息 - - // 按网格统计 - if ("grid".equals(formDTO.getScope())){ - if ("monthly".equals(formDTO.getType())){ - // scope ： grid && type ：monthly 表示：按网格统计，对本月党员增加的积分 进行排序 - resultDTOS = baseDao.selectListGridPartyRankPointByMonth(formDTO); - } else if ("all".equals(formDTO.getType())){ - // scope ： grid && type ：all 表示：按网格统计，对党员累计可用积分 排序 - resultDTOS = baseDao.selectListGridPartyRankByUsablePoint(formDTO); - } + List gridList = new ArrayList<>(); + // 1-1、获取网格id + if (AroundPartyConstant.GRID.equals(formDTO.getScope())){ + gridList.add(formDTO.getGridId()); } - // 按社区统计 - if ("community".equals(formDTO.getScope())){ - // 根据网格id，获取社区下的所有网格id + // 1-2、获取社区(下的所有的网格) id + if (AroundPartyConstant.COMMUNITY.equals(formDTO.getScope())){ + // 1、根据网格id，获取社区下的所有网格id Result> gridInCommunity = govOrgOpenFeignClient.getGridIdsInCommunity(formDTO.getGridId()); - if (gridInCommunity.getData().size() <= NumConstant.ZERO){ - log.error("根据" + formDTO.getGridId() + "网格id, 查询不到同属于一个社区下的所有网格id"); + if (gridInCommunity.success() && gridInCommunity.getData().isEmpty()){ + log.warn("根据" + formDTO.getGridId() + "网格id, 查询不到同属于一个社区下的所有网格id"); return resultDTOS; } - if ("monthly".equals(formDTO.getType())){ - // scope ： community && type ：monthly 表示：按社区统计，对本月党员增加的积分 进行排序 - resultDTOS = baseDao.selectListCommunityPartyRankPointByMonth(formDTO, gridInCommunity.getData()); - } else if ("all".equals(formDTO.getType())){ - // scope ： community && type ：all 表示：按社区统计，对党员累计可用积分 排序 - resultDTOS = baseDao.selectListCommunityPartyRankByUsablePoint(formDTO, gridInCommunity.getData()); - } + gridList = gridInCommunity.getData(); + } + + // 2.获取网格下的所有党员 + Result> partymemberInfo = resiPartyMemberOpenFeignClient.getPartymemberInfoByGridId(gridList); + if (partymemberInfo.success() && partymemberInfo.getData().isEmpty()){ + log.warn("根据" + formDTO.getGridId() + "网格id, 查询不到党员信息"); + return resultDTOS; + } + + // 2.1.获取认证通过的党员的 用户id + List userIds = getUserIds(partymemberInfo.getData()); + formDTO.setUserIds(userIds); + + // 3.根据用户id(所有)，查询积分信息，进行排名 + if (AroundPartyConstant.ALL.equals(formDTO.getType())){ + // scope ： community && type ：all 表示：按网格(一个网格 或 社区下的所有网格)统计，对党员累计可用积分 排序 + resultDTOS = baseDao.selectListGridPartyRankByUsablePoint(formDTO); + + } else if (AroundPartyConstant.MONTHLY.equals(formDTO.getType())){ + // scope ： community && type ：monthly 表示：按网格(一个网格 或 社区下的所有网格)统计，对本月党员增加的积分 进行排序 + resultDTOS = baseDao.selectListGridPartyRankPointByMonth(formDTO); } - // 给排好序的 身边党员-积分排行， 赋值 【头像】 + // 给排好序的 身边党员-积分排行， 赋值 【头像、真实姓名】 resultDTOS = getPartyBaseInfo(resultDTOS); return resultDTOS; } + /** + * 获取认证通过的党员的 用户id + * + * @param partymemberInfo + * @return java.util.List + * @Author zhangyong + * @Date 14:11 2020-12-29 + **/ + private List getUserIds(List partymemberInfo){ + List userIds = new ArrayList<>(); + for (PartymemberInfoDTO dto : partymemberInfo){ + userIds.add(dto.getUserId()); + } + return userIds; + } + /* - * 给排好序的 身边党员-积分排行， 赋值 【头像】 + * 给排好序的 身边党员-积分排行， 赋值 【头像、真实姓名】 * @param rankResultDTOS * @return java.util.List * @Author zhangyong @@ -296,6 +324,7 @@ public class UserPointStatisticalDailyServiceImpl extends BaseServiceImpl - - - - - - diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/GovOrgOpenFeignClient.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/GovOrgOpenFeignClient.java index 2c2c8144b0..fe67bef009 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/GovOrgOpenFeignClient.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/GovOrgOpenFeignClient.java @@ -322,6 +322,6 @@ public interface GovOrgOpenFeignClient { * @Author zhangyong * @Date 17:44 2020-12-28 **/ - @GetMapping("/gov/org/customergrid/getGridInCommunity/{gridId}") + @GetMapping("/gov/org/customergrid/getGridIdsInCommunity/{gridId}") Result> getGridIdsInCommunity(@PathVariable("gridId") String gridId); } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerGridController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerGridController.java index 26ccea082b..8aacd68bec 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerGridController.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerGridController.java @@ -235,9 +235,9 @@ public class CustomerGridController { * @Description 根据 网格id，查询同属于一个社区下的所有网格id、网格name * @Date 2020/12/28 23:16 **/ - @GetMapping("getGridInCommunity/{gridId}") - public Result> getGridInCommunity(@PathVariable("gridId") String gridId) { - List resultDTOS = customerGridService.listGridInCommunity(gridId); + @GetMapping("getGridIdsInCommunity/{gridId}") + public Result> getGridIdsInCommunity(@PathVariable("gridId") String gridId) { + List resultDTOS = customerGridService.listGridIdsInCommunity(gridId); return new Result>().ok(resultDTOS); } } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerGridDao.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerGridDao.java index 45afaf2874..2594d13182 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerGridDao.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerGridDao.java @@ -254,5 +254,5 @@ public interface CustomerGridDao extends BaseDao { * @Description 根据 网格id，查询同属于一个社区下的所有网格id、网格name * @Date 2020/12/28 23:16 **/ - List selectListGridInCommunity(@Param("gridId") String gridId); + List selectListGridIdsInCommunity(@Param("gridId") String gridId); } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerGridService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerGridService.java index df10430dbf..95f0d63061 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerGridService.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerGridService.java @@ -285,5 +285,5 @@ public interface CustomerGridService extends BaseService { * @Description 根据 网格id，查询同属于一个社区下的所有网格id、网格name * @Date 2020/12/28 23:16 **/ - List listGridInCommunity(String gridId); + List listGridIdsInCommunity(String gridId); } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java index da31fd338a..8302b1252f 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java @@ -693,7 +693,7 @@ public class CustomerGridServiceImpl extends BaseServiceImpl listGridInCommunity(String gridId) { - return baseDao.selectListGridInCommunity(gridId); + public List listGridIdsInCommunity(String gridId) { + return baseDao.selectListGridIdsInCommunity(gridId); } } diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml index ecb4a27199..a503573b9f 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml @@ -547,7 +547,7 @@ - SELECT ID FROM customer_grid diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/feign/ResiPartyMemberOpenFeignClient.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/feign/ResiPartyMemberOpenFeignClient.java index bd54ec1604..f823096f15 100644 --- a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/feign/ResiPartyMemberOpenFeignClient.java +++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/feign/ResiPartyMemberOpenFeignClient.java @@ -84,4 +84,14 @@ public interface ResiPartyMemberOpenFeignClient { **/ @PostMapping(value = "/resi/partymember/partymemberinfo/queryPartymemberInfoByUserId", consumes = MediaType.APPLICATION_JSON_UTF8_VALUE) Result> queryPartymemberInfoByUserId(@RequestBody List userIdList); + + /** + * @return com.epmet.commons.tools.utils.Result> + * @param gridIdList + * @author zy + * @description 根据网格id查询认证通过的党员信息 + * @Date 2020/7/22 12:14 + **/ + @PostMapping(value = "/resi/partymember/partymemberinfo/getPartymemberInfoByGridId", consumes = MediaType.APPLICATION_JSON_UTF8_VALUE) + Result> getPartymemberInfoByGridId(@RequestBody List gridIdList); } diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/feign/fallback/ResiPartyMemberOpenFeignClientFallback.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/feign/fallback/ResiPartyMemberOpenFeignClientFallback.java index df60a30abc..3f3ebb8c97 100644 --- a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/feign/fallback/ResiPartyMemberOpenFeignClientFallback.java +++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/feign/fallback/ResiPartyMemberOpenFeignClientFallback.java @@ -60,5 +60,8 @@ public class ResiPartyMemberOpenFeignClientFallback implements ResiPartyMemberOp return ModuleUtils.feignConError(ServiceConstant.RESI_PARTYMEMBER_SERVER, "queryPartymemberInfoByUserId", userIdList); } - + @Override + public Result> getPartymemberInfoByGridId(List gridIdList) { + return ModuleUtils.feignConError(ServiceConstant.RESI_PARTYMEMBER_SERVER, "getPartymemberInfoByGridId", gridIdList); + } } diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/PartymemberInfoController.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/PartymemberInfoController.java index 89b9d7c135..5d7d081e13 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/PartymemberInfoController.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/PartymemberInfoController.java @@ -42,7 +42,7 @@ import java.util.Map; /** - * 党员认证信息表 + * 党员认证信息表 * * @author generator generator@elink-cn.com * @since v1.0.0 2020-03-30 @@ -50,7 +50,7 @@ import java.util.Map; @RestController @RequestMapping("partymemberinfo") public class PartymemberInfoController { - + @Autowired private PartymemberInfoService partymemberInfoService; @@ -144,4 +144,17 @@ public class PartymemberInfoController { List list = partymemberInfoService.queryPartymemberInfoByUserId(userIdList); return new Result>().ok(list); } -} \ No newline at end of file + + /** + * @return com.epmet.commons.tools.utils.Result> + * @param gridIdList + * @author zy + * @description 根据网格id查询认证通过的党员信息 + * @Date 2020/7/22 12:14 + **/ + @PostMapping(value = "getPartymemberInfoByGridId") + Result> getPartymemberInfoByGridId(@RequestBody List gridIdList) { + List list = partymemberInfoService.listPartymemberInfoByGridId(gridIdList); + return new Result>().ok(list); + } +} diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/dao/PartymemberInfoDao.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/dao/PartymemberInfoDao.java index 660cbfa957..f395beac8b 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/dao/PartymemberInfoDao.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/dao/PartymemberInfoDao.java @@ -86,4 +86,13 @@ public interface PartymemberInfoDao extends BaseDao { * @Date 2020/12/25 14:02 **/ List selectCountAuditting(@Param("gridIdList") List gridIdList); -} \ No newline at end of file + + /** + * @return com.epmet.commons.tools.utils.Result> + * @param gridIdList + * @author zy + * @description 根据网格id查询认证通过的党员信息 + * @Date 2020/7/22 12:14 + **/ + List selectListPartymemberInfoByGridId(@Param("gridIdList") List gridIdList); +} diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/PartymemberInfoService.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/PartymemberInfoService.java index b8b0b39694..3290cb084f 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/PartymemberInfoService.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/PartymemberInfoService.java @@ -31,7 +31,7 @@ import java.util.List; import java.util.Map; /** - * 党员认证信息表 + * 党员认证信息表 * * @author generator generator@elink-cn.com * @since v1.0.0 2020-03-30 @@ -153,4 +153,13 @@ public interface PartymemberInfoService extends BaseService queryPartymemberInfoByUserId(List userIdList); -} \ No newline at end of file + + /** + * @return com.epmet.commons.tools.utils.Result> + * @param gridIdList + * @author zy + * @description 根据网格id查询认证通过的党员信息 + * @Date 2020/7/22 12:14 + **/ + List listPartymemberInfoByGridId(List gridIdList); +} diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartymemberInfoServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartymemberInfoServiceImpl.java index ddc22a04b1..c6ce32113b 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartymemberInfoServiceImpl.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartymemberInfoServiceImpl.java @@ -230,5 +230,9 @@ public class PartymemberInfoServiceImpl extends BaseServiceImpl listPartymemberInfoByGridId(List gridIdList) { + List list = baseDao.selectListPartymemberInfoByGridId(gridIdList); + return list; + } +} diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partymember/PartymemberInfoDao.xml b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partymember/PartymemberInfoDao.xml index e47b1a142d..876e1102f0 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partymember/PartymemberInfoDao.xml +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partymember/PartymemberInfoDao.xml @@ -135,4 +135,38 @@ group by pi.GRID_ID - \ No newline at end of file + + + + From e8a0bb5d95ee12695d95c19cd12789ad3fdf4f52 Mon Sep 17 00:00:00 2001 From: zhangyongzhangyong <2012005003@qq.coom> Date: Tue, 29 Dec 2020 15:34:51 +0800 Subject: [PATCH 07/10] =?UTF-8?q?=E6=B3=A8=E9=87=8A=E7=BB=B4=E6=8A=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/UserPointStatisticalDailyServiceImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/UserPointStatisticalDailyServiceImpl.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/UserPointStatisticalDailyServiceImpl.java index 63ad8f5b6d..4e95ca62da 100644 --- a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/UserPointStatisticalDailyServiceImpl.java +++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/UserPointStatisticalDailyServiceImpl.java @@ -280,7 +280,7 @@ public class UserPointStatisticalDailyServiceImpl extends BaseServiceImpl From 828dcfc17f659949e7a6b4f3ca11d6c1b970056e Mon Sep 17 00:00:00 2001 From: zhangyongzhangyong <2012005003@qq.coom> Date: Tue, 29 Dec 2020 16:29:02 +0800 Subject: [PATCH 08/10] =?UTF-8?q?=E6=B3=A8=E9=87=8A=E7=BB=B4=E6=8A=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dao/UserPointStatisticalDailyDao.java | 2 +- .../UserPointStatisticalDailyServiceImpl.java | 23 +++++++++---------- .../mapper/UserPointStatisticalDailyDao.xml | 2 +- 3 files changed, 13 insertions(+), 14 deletions(-) diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/dao/UserPointStatisticalDailyDao.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/dao/UserPointStatisticalDailyDao.java index 0ef7deae28..63a3e68c1c 100644 --- a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/dao/UserPointStatisticalDailyDao.java +++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/dao/UserPointStatisticalDailyDao.java @@ -81,5 +81,5 @@ public interface UserPointStatisticalDailyDao extends BaseDao selectListGridPartyRankPointByMonth(ResiAroundPartyPointRankFormDTO formDTO); + List selectListGridPartyRankByMonth(ResiAroundPartyPointRankFormDTO formDTO); } diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/UserPointStatisticalDailyServiceImpl.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/UserPointStatisticalDailyServiceImpl.java index 4e95ca62da..9d1d387649 100644 --- a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/UserPointStatisticalDailyServiceImpl.java +++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/UserPointStatisticalDailyServiceImpl.java @@ -21,10 +21,10 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.epmet.common.enu.AroundPartyConstant; import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; +import com.epmet.commons.tools.constant.FieldConstant; import com.epmet.commons.tools.constant.NumConstant; import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.utils.ConvertUtils; -import com.epmet.commons.tools.constant.FieldConstant; import com.epmet.commons.tools.utils.Result; import com.epmet.dao.UserPointStatisticalDailyDao; import com.epmet.dto.UserPointStatisticalDailyDTO; @@ -238,46 +238,45 @@ public class UserPointStatisticalDailyServiceImpl extends BaseServiceImpl listAroundPartyPointRank(ResiAroundPartyPointRankFormDTO formDTO) { - //查询条件 + // 0、查询条件 formDTO.setPageNo((formDTO.getPageNo() - NumConstant.ONE) * formDTO.getPageSize()); List resultDTOS = new ArrayList<>(); List gridList = new ArrayList<>(); - // 1-1、获取网格id + // 1-1、获取参数中的网格id if (AroundPartyConstant.GRID.equals(formDTO.getScope())){ gridList.add(formDTO.getGridId()); } - // 1-2、获取社区(下的所有的网格) id + // 1-2、获取社区(下的所有网格) 的网格id if (AroundPartyConstant.COMMUNITY.equals(formDTO.getScope())){ - // 1、根据网格id，获取社区下的所有网格id Result> gridInCommunity = govOrgOpenFeignClient.getGridIdsInCommunity(formDTO.getGridId()); - if (gridInCommunity.success() && gridInCommunity.getData().isEmpty()){ + if (gridInCommunity.success() && null != gridInCommunity.getData() && gridInCommunity.getData().isEmpty()){ log.warn("根据" + formDTO.getGridId() + "网格id, 查询不到同属于一个社区下的所有网格id"); return resultDTOS; } gridList = gridInCommunity.getData(); } - // 2.获取网格下的所有党员 + // 2.根据网格id，获取网格下的所有党员(认证通过) Result> partymemberInfo = resiPartyMemberOpenFeignClient.getPartymemberInfoByGridId(gridList); - if (partymemberInfo.success() && partymemberInfo.getData().isEmpty()){ + if (partymemberInfo.success() && null != partymemberInfo.getData() && partymemberInfo.getData().isEmpty()){ log.warn("根据" + formDTO.getGridId() + "网格id, 查询不到党员信息"); return resultDTOS; } - // 2.1.获取认证通过的党员的 用户id + // 2.1.获取认证通过党员的 用户id List userIds = getUserIds(partymemberInfo.getData()); formDTO.setUserIds(userIds); // 3.根据用户id(所有)，查询积分信息，进行排名 if (AroundPartyConstant.ALL.equals(formDTO.getType())){ - // scope ： community && type ：all 表示：按网格(一个网格 或 社区下的所有网格)统计，对党员累计可用积分 排序 + // type ：all 表示：按网格(一个网格 或 社区下的所有网格)统计，对党员累计可用积分 排序 resultDTOS = baseDao.selectListGridPartyRankByUsablePoint(formDTO); } else if (AroundPartyConstant.MONTHLY.equals(formDTO.getType())){ - // scope ： community && type ：monthly 表示：按网格(一个网格 或 社区下的所有网格)统计，对本月党员增加的积分 进行排序 - resultDTOS = baseDao.selectListGridPartyRankPointByMonth(formDTO); + // type ：monthly 表示：按网格(一个网格 或 社区下的所有网格)统计，对本月党员增加的积分 进行排序 + resultDTOS = baseDao.selectListGridPartyRankByMonth(formDTO); } // 4.给排好序的 身边党员-积分排行， 赋值 【头像、真实姓名】 diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/UserPointStatisticalDailyDao.xml b/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/UserPointStatisticalDailyDao.xml index 296c1fff1f..4267a9c74f 100644 --- a/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/UserPointStatisticalDailyDao.xml +++ b/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/UserPointStatisticalDailyDao.xml @@ -149,7 +149,7 @@ - SELECT @curRank := @curRank + 1 AS ranking, P.userId, From 8f117580b2c263c61dd8dda3c62ac8515052aecb Mon Sep 17 00:00:00 2001 From: zhangyongzhangyong <2012005003@qq.coom> Date: Thu, 31 Dec 2020 13:55:45 +0800 Subject: [PATCH 09/10] =?UTF-8?q?=E5=8E=BB=E6=8E=89=EF=BC=8C=E7=94=A8?= =?UTF-8?q?=E6=88=B7=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/form/ResiAroundPartyPointRankFormDTO.java | 10 ++++------ .../java/com/epmet/controller/ResiPointController.java | 1 - 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/form/ResiAroundPartyPointRankFormDTO.java b/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/form/ResiAroundPartyPointRankFormDTO.java index 4fb40ab5c5..28391a9488 100644 --- a/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/form/ResiAroundPartyPointRankFormDTO.java +++ b/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/form/ResiAroundPartyPointRankFormDTO.java @@ -16,12 +16,10 @@ import java.util.List; public class ResiAroundPartyPointRankFormDTO implements Serializable { private static final long serialVersionUID = 1534061512200591149L; - public interface ResiAroundPartyPointRankGroup extends CustomerClientShowGroup{} - /** * 页码 * */ - @Min(value = 1,groups = ResiAroundPartyPointRankGroup.class) + @Min(value = 1) private Integer pageNo = 1; /** @@ -32,19 +30,19 @@ public class ResiAroundPartyPointRankFormDTO implements Serializable { /** * 身边党员 grid 社区党员community * */ - @NotBlank(message = "查询的部门维度scope不能为空",groups = ResiAroundPartyPointRankFormDTO.ResiAroundPartyPointRankGroup.class) + @NotBlank(message = "查询的部门维度scope不能为空") private String scope; /** * 本月 monthly 总排行 all; * */ - @NotBlank(message = "查询的时间维度type不能为空",groups = ResiAroundPartyPointRankFormDTO.ResiAroundPartyPointRankGroup.class) + @NotBlank(message = "查询的时间维度type不能为空") private String type; /** * 当前网格id * */ - @NotBlank(message = "网格id不能为空",groups = ResiAroundPartyPointRankFormDTO.ResiAroundPartyPointRankGroup.class) + @NotBlank(message = "网格id不能为空") private String gridId; /** diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/controller/ResiPointController.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/controller/ResiPointController.java index 31906aa411..5c3b666fa1 100644 --- a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/controller/ResiPointController.java +++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/controller/ResiPointController.java @@ -153,7 +153,6 @@ public class ResiPointController { **/ @PostMapping("aroundparty") public Result> aroundPartyPointRank( @RequestBody ResiAroundPartyPointRankFormDTO formDTO){ - ValidatorUtils.validateEntity(formDTO,ResiAroundPartyPointRankFormDTO.ResiAroundPartyPointRankGroup.class); List resultDTOS = userPointStatisticalDailyService.listAroundPartyPointRank(formDTO); return new Result>().ok(resultDTOS); } From 3e2027285451fcd9aeb37282bc443e4dd084ed2b Mon Sep 17 00:00:00 2001 From: zhangyongzhangyong <2012005003@qq.coom> Date: Thu, 31 Dec 2020 13:58:07 +0800 Subject: [PATCH 10/10] =?UTF-8?q?=E5=A2=9E=E5=8A=A0sql=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/CustomerGridDao.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml index a503573b9f..df3a9fc938 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml @@ -559,6 +559,6 @@ AND ID = #{gridId} - ) + ) AND DEL_FLAG = 0