Browse Source

Merge remote-tracking branch 'origin/dev_mess_party' into dev_temp

dev_shibei_match
yinzuomei 5 years ago
parent
commit
8f5a64c3af
  1. 2
      epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-prod.yml
  2. 2
      epmet-module/data-statistical/data-statistical-server/pom.xml
  3. 2
      epmet-module/epmet-message/epmet-message-server/deploy/docker-compose-prod.yml
  4. 2
      epmet-module/epmet-message/epmet-message-server/pom.xml
  5. 52
      epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/form/ResiAroundPartyPointRankFormDTO.java
  6. 39
      epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/result/ResiAroundPartyPointRankResultDTO.java
  7. 28
      epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/common/enu/AroundPartyConstant.java
  8. 1
      epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/controller/AdjustmentController.java
  9. 23
      epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/controller/ResiPointController.java
  10. 22
      epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/dao/UserPointStatisticalDailyDao.java
  11. 13
      epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/UserPointStatisticalDailyService.java
  12. 111
      epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/UserPointStatisticalDailyServiceImpl.java
  13. 43
      epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/UserPointStatisticalDailyDao.xml
  14. 2
      epmet-module/gov-grid/gov-grid-server/deploy/docker-compose-prod.yml
  15. 2
      epmet-module/gov-grid/gov-grid-server/pom.xml
  16. 2
      epmet-module/gov-issue/gov-issue-server/deploy/docker-compose-prod.yml
  17. 2
      epmet-module/gov-issue/gov-issue-server/pom.xml
  18. 2
      epmet-module/gov-mine/gov-mine-server/deploy/docker-compose-prod.yml
  19. 2
      epmet-module/gov-mine/gov-mine-server/pom.xml
  20. 32
      epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/GridInCommunityDTO.java
  21. 10
      epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/GovOrgOpenFeignClient.java
  22. 4
      epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/fallback/GovOrgOpenFeignClientFallback.java
  23. 12
      epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerGridController.java
  24. 11
      epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerGridDao.java
  25. 13
      epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerGridService.java
  26. 4
      epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java
  27. 16
      epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml
  28. 2
      epmet-module/resi-group/resi-group-server/deploy/docker-compose-prod.yml
  29. 2
      epmet-module/resi-group/resi-group-server/pom.xml
  30. 10
      epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/feign/ResiPartyMemberOpenFeignClient.java
  31. 5
      epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/feign/fallback/ResiPartyMemberOpenFeignClientFallback.java
  32. 2
      epmet-module/resi-partymember/resi-partymember-server/deploy/docker-compose-prod.yml
  33. 2
      epmet-module/resi-partymember/resi-partymember-server/pom.xml
  34. 19
      epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/PartymemberInfoController.java
  35. 11
      epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/dao/PartymemberInfoDao.java
  36. 13
      epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/PartymemberInfoService.java
  37. 8
      epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartymemberInfoServiceImpl.java
  38. 36
      epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partymember/PartymemberInfoDao.xml

2
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 # 使用现有网络

2
epmet-module/data-statistical/data-statistical-server/pom.xml

@ -2,7 +2,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0"
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">
<version>0.3.79</version>
<version>0.3.80</version>
<parent>
<artifactId>data-statistical</artifactId>
<groupId>com.epmet</groupId>

2
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 # 使用现有网络

2
epmet-module/epmet-message/epmet-message-server/pom.xml

@ -2,7 +2,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" 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">
<modelVersion>4.0.0</modelVersion>
<version>0.3.32</version>
<version>0.3.33</version>
<parent>
<groupId>com.epmet</groupId>
<artifactId>epmet-message</artifactId>

52
epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/form/ResiAroundPartyPointRankFormDTO.java

@ -0,0 +1,52 @@
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;
import java.util.List;
/**
* @Description 身边党员 积分排行接口 入参
* @Auth zy
*/
@Data
public class ResiAroundPartyPointRankFormDTO implements Serializable {
private static final long serialVersionUID = 1534061512200591149L;
/**
* 页码
* */
@Min(value = 1)
private Integer pageNo = 1;
/**
* 每页数据条数
* */
private Integer pageSize = 10;
/**
* 身边党员 grid 社区党员community
* */
@NotBlank(message = "查询的部门维度scope不能为空")
private String scope;
/**
* 本月 monthly 总排行 all;
* */
@NotBlank(message = "查询的时间维度type不能为空")
private String type;
/**
* 当前网格id
* */
@NotBlank(message = "网格id不能为空")
private String gridId;
/**
* 通过网格id获取到的 网格下的 认证成功的党员 的用户id
* */
private List<String> userIds;
}

39
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;
}

28
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";
}

1
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();
}
}

23
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,21 @@ public class ResiPointController {
public Result<PointExchangeResponseResultDTO> exchangeCallback(@LoginUser TokenDto tokenDto){
return new Result<PointExchangeResponseResultDTO>().ok(pointVerificationLogService.resiExchangeCallback(tokenDto.getUserId()));
}
/**
* 身边党员-积分排行
* 查询规则 scope grid && type monthly 表示按网格统计对本月党员增加的积分 进行排序
* scope grid && type all 表示按网格统计对党员累计可用积分 排序
* scope community && type monthly 表示按社区统计对本月党员增加的积分 进行排序
* scope community && type all 表示按社区统计对党员累计可用积分 排序
* @param formDTO
* @return com.epmet.commons.tools.utils.Result<java.util.List<com.epmet.dto.result.ResiAroundPartyPointRankResultDTO>>
* @Author zhangyong
* @Date 16:17 2020-12-28
**/
@PostMapping("aroundparty")
public Result<List<ResiAroundPartyPointRankResultDTO>> aroundPartyPointRank( @RequestBody ResiAroundPartyPointRankFormDTO formDTO){
List<ResiAroundPartyPointRankResultDTO> resultDTOS = userPointStatisticalDailyService.listAroundPartyPointRank(formDTO);
return new Result<List<ResiAroundPartyPointRankResultDTO>>().ok(resultDTOS);
}
}

22
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,22 @@ public interface UserPointStatisticalDailyDao extends BaseDao<UserPointStatistic
* @date 2020.08.11 17:40
**/
void insertOrUpdate(UserPointStatisticalDailyEntity entity);
}
/**
* 身边党员-积分排行 按网格统计获取党员累计可用积分 排序
* @param formDTO
* @return java.util.List<com.epmet.dto.result.ResiAroundPartyPointRankResultDTO>
* @Author zhangyong
* @Date 09:24 2020-12-29
**/
List<ResiAroundPartyPointRankResultDTO> selectListGridPartyRankByUsablePoint(ResiAroundPartyPointRankFormDTO formDTO);
/**
* 身边党员-积分排行 按网格统计对本月党员增加的积分 进行排序
* @param formDTO
* @return java.util.List<com.epmet.dto.result.ResiAroundPartyPointRankResultDTO>
* @Author zhangyong
* @Date 09:24 2020-12-29
**/
List<ResiAroundPartyPointRankResultDTO> selectListGridPartyRankByMonth(ResiAroundPartyPointRankFormDTO formDTO);
}

13
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<UserPointS
void insertOrUpdate(UserPointStatisticalDailyEntity entity);
void test(UserPointStatisticalDailyEntity entity);
}
/**
* 身边党员-积分排行
* @param formDTO
* @return com.epmet.commons.tools.utils.Result<java.util.List<com.epmet.dto.result.ResiAroundPartyPointRankResultDTO>>
* @Author zhangyong
* @Date 16:17 2020-12-28
**/
List<ResiAroundPartyPointRankResultDTO> listAroundPartyPointRank(ResiAroundPartyPointRankFormDTO formDTO);
}

111
epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/UserPointStatisticalDailyServiceImpl.java

@ -19,21 +19,23 @@ 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.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;
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.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;
@ -59,6 +61,10 @@ public class UserPointStatisticalDailyServiceImpl extends BaseServiceImpl<UserPo
@Autowired
private EpmetUserOpenFeignClient epmetUserOpenFeignClient;
@Autowired
private GovOrgOpenFeignClient govOrgOpenFeignClient;
@Autowired
private ResiPartyMemberOpenFeignClient resiPartyMemberOpenFeignClient;
@Override
public PageData<UserPointStatisticalDailyDTO> page(Map<String, Object> params) {
@ -230,5 +236,98 @@ public class UserPointStatisticalDailyServiceImpl extends BaseServiceImpl<UserPo
baseDao.insertOrUpdate(entity);
}
@Override
public List<ResiAroundPartyPointRankResultDTO> listAroundPartyPointRank(ResiAroundPartyPointRankFormDTO formDTO) {
// 0、查询条件
formDTO.setPageNo((formDTO.getPageNo() - NumConstant.ONE) * formDTO.getPageSize());
List<ResiAroundPartyPointRankResultDTO> resultDTOS = new ArrayList<>();
}
List<String> gridList = new ArrayList<>();
// 1-1、获取参数中的网格id
if (AroundPartyConstant.GRID.equals(formDTO.getScope())){
gridList.add(formDTO.getGridId());
}
// 1-2、获取社区(下的所有网格) 的网格id
if (AroundPartyConstant.COMMUNITY.equals(formDTO.getScope())){
Result<List<String>> gridInCommunity = govOrgOpenFeignClient.getGridIdsInCommunity(formDTO.getGridId());
if (gridInCommunity.success() && null != gridInCommunity.getData() && gridInCommunity.getData().isEmpty()){
log.warn("根据" + formDTO.getGridId() + "网格id, 查询不到同属于一个社区下的所有网格id");
return resultDTOS;
}
gridList = gridInCommunity.getData();
}
// 2.根据网格id,获取网格下的所有党员(认证通过)
Result<List<PartymemberInfoDTO>> partymemberInfo = resiPartyMemberOpenFeignClient.getPartymemberInfoByGridId(gridList);
if (partymemberInfo.success() && null != partymemberInfo.getData() && partymemberInfo.getData().isEmpty()){
log.warn("根据" + formDTO.getGridId() + "网格id, 查询不到党员信息");
return resultDTOS;
}
// 2.1.获取认证通过党员的 用户id
List<String> userIds = getUserIds(partymemberInfo.getData());
formDTO.setUserIds(userIds);
// 3.根据用户id(所有),查询积分信息,进行排名
if (AroundPartyConstant.ALL.equals(formDTO.getType())){
// type :all 表示:按网格(一个网格 或 社区下的所有网格)统计,对党员累计可用积分 排序
resultDTOS = baseDao.selectListGridPartyRankByUsablePoint(formDTO);
} else if (AroundPartyConstant.MONTHLY.equals(formDTO.getType())){
// type :monthly 表示:按网格(一个网格 或 社区下的所有网格)统计,对本月党员增加的积分 进行排序
resultDTOS = baseDao.selectListGridPartyRankByMonth(formDTO);
}
// 4.给排好序的 身边党员-积分排行, 赋值 【头像、真实姓名】
resultDTOS = getPartyBaseInfo(resultDTOS);
return resultDTOS;
}
/**
* 获取认证通过的党员的 用户id
*
* @param partymemberInfo
* @return java.util.List<java.lang.String>
* @Author zhangyong
* @Date 14:11 2020-12-29
**/
private List<String> getUserIds(List<PartymemberInfoDTO> partymemberInfo){
List<String> userIds = new ArrayList<>();
for (PartymemberInfoDTO dto : partymemberInfo){
userIds.add(dto.getUserId());
}
return userIds;
}
/**
* 给排好序的 身边党员-积分排行 赋值 头像真实姓名
* @param rankResultDTOS
* @return java.util.List<com.epmet.dto.result.ResiAroundPartyPointRankResultDTO>
* @Author zhangyong
* @Date 10:14 2020-12-29
**/
private List<ResiAroundPartyPointRankResultDTO> getPartyBaseInfo(List<ResiAroundPartyPointRankResultDTO> rankResultDTOS){
// 1.获取当前党员Id
List<String> userIdParam = new LinkedList<>();
for (ResiAroundPartyPointRankResultDTO formDTO : rankResultDTOS){
userIdParam.add(formDTO.getUserId());
}
if (userIdParam.size() == NumConstant.ZERO){
return rankResultDTOS;
}
// 2.获取用户基本信息
Result<List<UserBaseInfoResultDTO>> 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());
formDTO.setRealName(resiInfo.getRealName());
}
}
}
}
return rankResultDTOS;
}
}

43
epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/UserPointStatisticalDailyDao.xml

@ -130,4 +130,45 @@
</insert>
</mapper>
<!-- 身边党员-积分排行 :按网格统计,对党员累计可用积分 排序 -->
<select id="selectListGridPartyRankByUsablePoint" resultType="com.epmet.dto.result.ResiAroundPartyPointRankResultDTO" >
SELECT
@curRank := @curRank + 1 AS ranking,
IFNULL(p.USABLE_POINT, 0) point,
p.USER_ID userId
FROM
user_point_total p, ( SELECT @curRank := #{pageNo} * #{pageSize} ) r
<if test="null != userIds and userIds.size() > 0">
WHERE p.USER_ID IN
<foreach collection="userIds" item="userId" open="(" separator="," close=" )">
#{userId}
</foreach>
</if>
ORDER BY IFNULL(p.USABLE_POINT, 0) DESC
LIMIT #{pageNo}, #{pageSize}
</select>
<!-- 身边党员-积分排行 :按网格统计,对本月党员增加的积分 进行排序 -->
<select id="selectListGridPartyRankByMonth" resultType="com.epmet.dto.result.ResiAroundPartyPointRankResultDTO" >
SELECT
@curRank := @curRank + 1 AS ranking,
P.userId,
P.point
FROM(
SELECT
pl.USER_ID userId,
SUM(PL.POINT) point
FROM user_point_action_log pl
WHERE pl.DEL_FLAG = '0' AND DATE_FORMAT(pl.CREATED_TIME, '%Y%m')= DATE_FORMAT( CURDATE( ) , '%Y%m' ) AND pl.action_flag = 'plus'
GROUP BY pl.USER_ID
) P, ( SELECT @curRank := #{pageNo} * #{pageSize} ) r
<if test="null != userIds and userIds.size() > 0">
WHERE userId IN
<foreach collection="userIds" item="userId" open="(" separator="," close=" )">
#{userId}
</foreach>
</if>
ORDER BY P.point DESC
LIMIT #{pageNo}, #{pageSize}
</select>
</mapper>

2
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 # 使用现有网络

2
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">
<modelVersion>4.0.0</modelVersion>
<version>0.3.39</version>
<version>0.3.40</version>
<parent>
<groupId>com.epmet</groupId>
<artifactId>gov-grid</artifactId>

2
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 # 使用现有网络

2
epmet-module/gov-issue/gov-issue-server/pom.xml

@ -2,7 +2,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0"
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">
<version>0.3.58</version>
<version>0.3.59</version>
<parent>
<artifactId>gov-issue</artifactId>
<groupId>com.epmet</groupId>

2
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 # 使用现有网络

2
epmet-module/gov-mine/gov-mine-server/pom.xml

@ -2,7 +2,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0"
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">
<version>0.3.35</version>
<version>0.3.36</version>
<parent>
<groupId>com.epmet</groupId>
<artifactId>gov-mine</artifactId>

32
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;
}

10
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<CommonDataFilterResultDTO> gridDataFilter(CommonGridIdFormDTO gridForm);
/**
* 根据 网格id查询同属于一个社区下的所有网格id
* @param gridId
* @return com.epmet.commons.tools.utils.Result<java.util.List<java.lang.String>>
* @Author zhangyong
* @Date 17:44 2020-12-28
**/
@GetMapping("/gov/org/customergrid/getGridIdsInCommunity/{gridId}")
Result<List<String>> getGridIdsInCommunity(@PathVariable("gridId") String gridId);
}

4
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<CommonDataFilterResultDTO> gridDataFilter(CommonGridIdFormDTO gridForm) {
return ModuleUtils.feignConError(ServiceConstant.GOV_ORG_SERVER, "gridDataFilter", gridForm);
}
@Override
public Result<List<String>> getGridIdsInCommunity(String gridId) {
return ModuleUtils.feignConError(ServiceConstant.GOV_ORG_SERVER, "getGridIdsInCommunity", gridId);
}
}

12
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<CustomerGridCountResultDTO>().ok(customerGridService.selectGridCount(customerIdFormDTO));
}
/**
* @param gridId
* @return com.epmet.commons.tools.utils.Result<java.util.List<java.lang.String>>
* @Author zy
* @Description 根据 网格id查询同属于一个社区下的所有网格id网格name
* @Date 2020/12/28 23:16
**/
@GetMapping("getGridIdsInCommunity/{gridId}")
public Result<List<String>> getGridIdsInCommunity(@PathVariable("gridId") String gridId) {
List<String> resultDTOS = customerGridService.listGridIdsInCommunity(gridId);
return new Result<List<String>>().ok(resultDTOS);
}
}

11
epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerGridDao.java

@ -246,4 +246,13 @@ public interface CustomerGridDao extends BaseDao<CustomerGridEntity> {
List<OrgInfoResultDTO> selectOrgInfoByAgency(@Param("orgIds")List<String> orgIds);
List<OrgInfoResultDTO> selectOrgInfoByGrid(@Param("orgIds")List<String> orgIds);
List<OrgInfoResultDTO> selectOrgInfoByDept(@Param("orgIds")List<String> orgIds);
}
/**
* @param gridId
* @return com.epmet.commons.tools.utils.Result<java.util.List<java.lang.String>>
* @Author zy
* @Description 根据 网格id查询同属于一个社区下的所有网格id网格name
* @Date 2020/12/28 23:16
**/
List<String> selectListGridIdsInCommunity(@Param("gridId") String gridId);
}

13
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<CustomerGridEntity> {
* @date 2020/11/10 2:55 下午
*/
List<OrgInfoResultDTO> selectOrgInfo(OrgInfoFormDTO orgInfoFormDTO);
}
/**
* @param gridId
* @return com.epmet.commons.tools.utils.Result<java.util.List<java.lang.String>>
* @Author zy
* @Description 根据 网格id查询同属于一个社区下的所有网格id网格name
* @Date 2020/12/28 23:16
**/
List<String> listGridIdsInCommunity(String gridId);
}

4
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<CustomerGridDao, Cu
return result;
}
@Override
public List<String> listGridIdsInCommunity(String gridId) {
return baseDao.selectListGridIdsInCommunity(gridId);
}
}

16
epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml

@ -545,4 +545,20 @@
ID = #{orgId}
</foreach>
</select>
<!--根据 网格id,查询同属于一个社区下的所有网格id-->
<select id="selectListGridIdsInCommunity" resultType="java.lang.String">
SELECT
ID
FROM customer_grid
WHERE PID = (
SELECT
PID
FROM customer_grid
WHERE DEL_FLAG = 0
<if test="gridId != null and gridId != '' ">
AND ID = #{gridId}
</if>
) AND DEL_FLAG = 0
</select>
</mapper>

2
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 # 使用现有网络

2
epmet-module/resi-group/resi-group-server/pom.xml

@ -2,7 +2,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" 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">
<modelVersion>4.0.0</modelVersion>
<version>0.3.81</version>
<version>0.3.82</version>
<parent>
<groupId>com.epmet</groupId>
<artifactId>resi-group</artifactId>

10
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<List<PartymemberInfoDTO>> queryPartymemberInfoByUserId(@RequestBody List<String> userIdList);
/**
* @return com.epmet.commons.tools.utils.Result<java.util.List<com.epmet.resi.partymember.dto.partymember.PartymemberInfoDTO>>
* @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<List<PartymemberInfoDTO>> getPartymemberInfoByGridId(@RequestBody List<String> gridIdList);
}

5
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<List<PartymemberInfoDTO>> getPartymemberInfoByGridId(List<String> gridIdList) {
return ModuleUtils.feignConError(ServiceConstant.RESI_PARTYMEMBER_SERVER, "getPartymemberInfoByGridId", gridIdList);
}
}

2
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 # 使用现有网络

2
epmet-module/resi-partymember/resi-partymember-server/pom.xml

@ -2,7 +2,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" 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">
<modelVersion>4.0.0</modelVersion>
<version>0.3.61</version>
<version>0.3.62</version>
<parent>
<groupId>com.epmet</groupId>
<artifactId>resi-partymember</artifactId>

19
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<PartymemberInfoDTO> list = partymemberInfoService.queryPartymemberInfoByUserId(userIdList);
return new Result<List<PartymemberInfoDTO>>().ok(list);
}
}
/**
* @return com.epmet.commons.tools.utils.Result<java.util.List<com.epmet.resi.partymember.dto.partymember.PartymemberInfoDTO>>
* @param gridIdList
* @author zy
* @description 根据网格id查询认证通过的党员信息
* @Date 2020/7/22 12:14
**/
@PostMapping(value = "getPartymemberInfoByGridId")
Result<List<PartymemberInfoDTO>> getPartymemberInfoByGridId(@RequestBody List<String> gridIdList) {
List<PartymemberInfoDTO> list = partymemberInfoService.listPartymemberInfoByGridId(gridIdList);
return new Result<List<PartymemberInfoDTO>>().ok(list);
}
}

11
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<PartymemberInfoEntity> {
* @Date 2020/12/25 14:02
**/
List<PartyAuthProcessingCountResultDTO> selectCountAuditting(@Param("gridIdList") List<String> gridIdList);
}
/**
* @return com.epmet.commons.tools.utils.Result<java.util.List<com.epmet.resi.partymember.dto.partymember.PartymemberInfoDTO>>
* @param gridIdList
* @author zy
* @description 根据网格id查询认证通过的党员信息
* @Date 2020/7/22 12:14
**/
List<PartymemberInfoDTO> selectListPartymemberInfoByGridId(@Param("gridIdList") List<String> gridIdList);
}

13
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<PartymemberInfoEntit
* @Date 2020/7/22 12:18
**/
List<PartymemberInfoDTO> queryPartymemberInfoByUserId(List<String> userIdList);
}
/**
* @return com.epmet.commons.tools.utils.Result<java.util.List<com.epmet.resi.partymember.dto.partymember.PartymemberInfoDTO>>
* @param gridIdList
* @author zy
* @description 根据网格id查询认证通过的党员信息
* @Date 2020/7/22 12:14
**/
List<PartymemberInfoDTO> listPartymemberInfoByGridId(List<String> gridIdList);
}

8
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<PartymemberInfoD
return list;
}
}
@Override
public List<PartymemberInfoDTO> listPartymemberInfoByGridId(List<String> gridIdList) {
List<PartymemberInfoDTO> list = baseDao.selectListPartymemberInfoByGridId(gridIdList);
return list;
}
}

36
epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partymember/PartymemberInfoDao.xml

@ -135,4 +135,38 @@
</if>
group by pi.GRID_ID
</select>
</mapper>
<!-- 根据网格id查询认证通过的党员信息 -->
<select id="selectListPartymemberInfoByGridId" resultType="com.epmet.resi.partymember.dto.partymember.PartymemberInfoDTO">
SELECT
ID,
CUSTOMER_ID,
USER_ID,
GRID_ID,
PARTYMEMBER_VISIT_ID,
CONFIRM_RESULT,
SURNAME,
NAME,
ID_CARD,
MOBILE,
STREET,
ESTATE,
BUILDING,
ORGANIZATION_TYPE,
EXTRA_ORGANIZATION,
EXTRA_CERTIFIER_NAME,
EXTRA_CERTIFIER_MOBILE,
CREATED_TIME
FROM
partymember_info
WHERE
DEL_FLAG = 0
AND ( CONFIRM_RESULT = 'auto_confirm_success' OR CONFIRM_RESULT = 'approved' )
<if test="gridIdList != null and gridIdList.size() != 0">
AND GRID_ID IN
<foreach collection="gridIdList" item="gridId" open="(" close=")" separator=",">
#{gridId}
</foreach>
</if>
</select>
</mapper>

Loading…
Cancel
Save