diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/form/ResiRolesOfGroupMemberFormDTO.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/form/ResiRolesOfGroupMemberFormDTO.java new file mode 100644 index 0000000000..ee2d684b6b --- /dev/null +++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/form/ResiRolesOfGroupMemberFormDTO.java @@ -0,0 +1,37 @@ +package com.epmet.resi.group.dto.group.form; + +import lombok.Data; + +import java.io.Serializable; + +/** + * @Description + * @ClassName ResiRolesOfGroupMemberFormDTO + * @Auth wangc + * @Date 2020-05-26 14:27 + */ +@Data +public class ResiRolesOfGroupMemberFormDTO implements Serializable { + private static final long serialVersionUID = 881671287108605309L; + + /** + * 组Id + * */ + private String groupId; + + + /** + * 热心居民标识 1:是 0:不是 网格级别 + * */ + private String warmFlag; + + /** + * 党员标识 1: 是 0:不是 + * */ + private String partyFlag; + + /** + * 修改人Id + * */ + private String updatedBy; +} diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/member/form/ResiIdentityFormDTO.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/member/form/ResiIdentityFormDTO.java new file mode 100644 index 0000000000..4be22d07e6 --- /dev/null +++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/member/form/ResiIdentityFormDTO.java @@ -0,0 +1,45 @@ +package com.epmet.resi.group.dto.member.form; + +import lombok.Data; + +import java.io.Serializable; + +/** + * @Description partymember服务调用传参,用户认证[党员、热心居民]成功后,更新组的缓存统计信息及组统计信息 + * @ClassName ResiIdentityFormDTO + * @Auth wangc + * @Date 2020-05-26 13:55 + */ +@Data +public class ResiIdentityFormDTO implements Serializable { + private static final long serialVersionUID = -6822310777491335787L; + /** + * 用户Id + * */ + private String userId; + + /** + * 网格Id + * */ + private String gridId; + + /** + * 客户Id + * */ + private String customerId; + + /** + * 热心居民标识 1:是 0:不是 网格级别 + * */ + private String warmFlag; + + /** + * 党员标识 1: 是 0:不是 + * */ + private String partyFlag; + + /** + * 操作人的Id + * */ + private String operatorId; +} diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/controller/ResiGroupController.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/controller/ResiGroupController.java index 270df47002..afdce31da0 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/controller/ResiGroupController.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/controller/ResiGroupController.java @@ -23,9 +23,11 @@ import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.utils.Result; import com.epmet.commons.tools.validator.ValidatorUtils; import com.epmet.modules.group.service.ResiGroupService; +import com.epmet.modules.group.service.ResiGroupStatisticalService; import com.epmet.resi.group.dto.group.GroupProcessingCountResultDTO; import com.epmet.resi.group.dto.group.form.*; import com.epmet.resi.group.dto.group.result.*; +import com.epmet.resi.group.dto.member.form.ResiIdentityFormDTO; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -43,6 +45,8 @@ import java.util.List; public class ResiGroupController { @Autowired private ResiGroupService resiGroupService; + @Autowired + private ResiGroupStatisticalService resiGroupStatisticalService; /** * @param tokenDto @@ -342,4 +346,17 @@ public class ResiGroupController { public Result> recommendedList(@RequestBody RecommendedListFormDTO formDTO) { return new Result>().ok(resiGroupService.recommendedList(formDTO)); } + + /** + * @Description partymember服务审核通过热心居民、党员申请之后,需要遍历这个人所在的组进行组的缓存与数据库的更新 + * @param resiIdentityFormDTO + * @return + * @author wangc + * @date 2020.05.26 14:12 + **/ + @PostMapping("updatewhenauditedresirole") + public Result updateWhenAuditedResiRole(@RequestBody ResiIdentityFormDTO resiIdentityFormDTO){ + resiGroupStatisticalService.updateWhenAuditedResiRole(resiIdentityFormDTO); + return new Result(); + } } diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/dao/ResiGroupStatisticalDao.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/dao/ResiGroupStatisticalDao.java index 589cfaeb27..dd75c99b96 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/dao/ResiGroupStatisticalDao.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/dao/ResiGroupStatisticalDao.java @@ -19,9 +19,12 @@ package com.epmet.modules.group.dao; import com.epmet.commons.mybatis.dao.BaseDao; import com.epmet.modules.group.entity.ResiGroupStatisticalEntity; +import com.epmet.resi.group.dto.group.form.ResiRolesOfGroupMemberFormDTO; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; +import java.util.List; + /** * 群组统计信息表 * @@ -47,4 +50,13 @@ public interface ResiGroupStatisticalDao extends BaseDao list); } diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/redis/ResiGroupRedis.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/redis/ResiGroupRedis.java index f5d0541ba8..e2d19f2a03 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/redis/ResiGroupRedis.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/redis/ResiGroupRedis.java @@ -24,11 +24,13 @@ import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.modules.constant.ResiGroupRedisKeys; import com.epmet.modules.group.service.ResiGroupService; import com.epmet.modules.group.service.ResiGroupStatisticalService; +import com.epmet.modules.utils.ModuleConstant; import com.epmet.resi.group.constant.TopicConstant; import com.epmet.resi.group.dto.group.ResiGroupDTO; import com.epmet.resi.group.dto.group.ResiGroupInfoRedisDTO; import com.epmet.resi.group.dto.group.ResiGroupStatisticalDTO; import com.epmet.resi.group.dto.group.ResiGroupStatisticalInfoRedisDTO; +import com.epmet.resi.group.dto.group.form.ResiRolesOfGroupMemberFormDTO; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -209,4 +211,35 @@ public class ResiGroupRedis { } return auditingGroupCount; } + + /** + * @Description 增加群缓存信息中的热心居民数和党员数 + * @param list List + * @return + * @author wangc + * @date 2020.05.26 15:53 + **/ + public void increaseRolesCount(List list){ + list.forEach(o -> { + ResiGroupInfoRedisDTO cache = get(o.getGroupId()); + if(null != cache && null != cache.getGroupStatisticalInfo()){ + if(StringUtils.equals(NumConstant.ONE_STR,o.getPartyFlag())){ + cache.getGroupStatisticalInfo().setTotalPartyMembers( + null == cache.getGroupStatisticalInfo().getTotalPartyMembers() ? NumConstant.ONE : + cache.getGroupStatisticalInfo().getTotalPartyMembers() + NumConstant.ONE + ); + }else if(StringUtils.equals(NumConstant.ONE_STR,o.getWarmFlag())){ + cache.getGroupStatisticalInfo().setTotalEarnestMembers( + null == cache.getGroupStatisticalInfo().getTotalEarnestMembers() ? NumConstant.ONE : + cache.getGroupStatisticalInfo().getTotalEarnestMembers() + NumConstant.ONE + ); + } + cache.setGroupId(o.getGroupId()); + set(cache); + logger.debug(String.format(ModuleConstant.UPDATE_GROUP_CACHE_SUCCESSFULLY_LOG_TEMPLATE,o.getGroupId())); + }else { + logger.warn(String.format(ModuleConstant.NO_GROUP_CACHE_LOG_TEMPLATE, o.getGroupId())); + } + }); + } } \ No newline at end of file diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/ResiGroupStatisticalService.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/ResiGroupStatisticalService.java index 160c9eea05..a27e5d9531 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/ResiGroupStatisticalService.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/ResiGroupStatisticalService.java @@ -24,6 +24,7 @@ import com.epmet.modules.group.entity.ResiGroupStatisticalEntity; import com.epmet.modules.member.entity.ResiGroupMemberEntity; import com.epmet.resi.group.dto.group.ResiGroupStatisticalDTO; import com.epmet.resi.group.dto.member.form.RemoveMemberFormDTO; +import com.epmet.resi.group.dto.member.form.ResiIdentityFormDTO; import java.util.List; import java.util.Map; @@ -103,4 +104,13 @@ public interface ResiGroupStatisticalService extends BaseService page(Map params) { @@ -168,4 +179,50 @@ public class ResiGroupStatisticalServiceImpl extends BaseServiceImpl groupIds = + resiGroupMemberDao.getGroupIdByUserIdAndGridId(resiIdentityFormDTO.getGridId(), + resiIdentityFormDTO.getUserId(), + StringUtils.equals(NumConstant.ONE_STR,resiIdentityFormDTO.getWarmFlag()) ? NumConstant.ONE_STR : NumConstant.THREE_STR + ); + if(null != groupIds && groupIds.size() > NumConstant.ZERO){ + List params = groupIds.stream().map(groupId -> { + ResiRolesOfGroupMemberFormDTO param = new ResiRolesOfGroupMemberFormDTO(); + param.setGroupId(groupId); + if(StringUtils.equals(NumConstant.ONE_STR,resiIdentityFormDTO.getWarmFlag())){ + param.setWarmFlag(NumConstant.ONE_STR); + }else{ + param.setPartyFlag(NumConstant.ONE_STR); + } + param.setUpdatedBy(resiIdentityFormDTO.getOperatorId()); + return param; + }).collect(Collectors.toList()); + baseDao.incryResiRoleMembersBatch(params); + resiGroupRedis.increaseRolesCount(params); + } + + return; + } + + + } diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/dao/ResiGroupMemberDao.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/dao/ResiGroupMemberDao.java index 57916ee6de..7e13eba2b4 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/dao/ResiGroupMemberDao.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/dao/ResiGroupMemberDao.java @@ -108,4 +108,15 @@ public interface ResiGroupMemberDao extends BaseDao { Integer getMembersCountInGrid(@Param("gridId")String gridId); List getMembersCountInGrids(@Param("gridIds")List gridIds); + + /** + * @Description 根据用户Id和网格Id查询这个人所在的指定网格下所有的组Id + * @param gridId + * @param userId + * @param roleFlag 1:热心居民 其他:党员 + * @return List 组Id + * @author wangc + * @date 2020.05.26 14:22 + **/ + List getGroupIdByUserIdAndGridId(@Param("gridId")String gridId,@Param("userId")String userId,@Param("roleFlag")String roleFlag); } diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/utils/ModuleConstant.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/utils/ModuleConstant.java index f077980f7f..8fd8c6954f 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/utils/ModuleConstant.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/utils/ModuleConstant.java @@ -313,4 +313,8 @@ public interface ModuleConstant extends Constant { String GROUP_STATUS_UNDER_AUDITTING = "under_auditting"; String ALREADY_SHIFT_ISSUE = "话题已转议题,请勿重复操作"; + + String NO_GROUP_CACHE_LOG_TEMPLATE = "没有相应的组缓存信息,组Id:【%s】"; + + String UPDATE_GROUP_CACHE_SUCCESSFULLY_LOG_TEMPLATE = "更新组缓存信息成功,组Id:【%s】"; } diff --git a/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/group/ResiGroupStatisticalDao.xml b/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/group/ResiGroupStatisticalDao.xml index 995c637bb1..488f5a5bd7 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/group/ResiGroupStatisticalDao.xml +++ b/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/group/ResiGroupStatisticalDao.xml @@ -37,4 +37,41 @@ AND DEL_FLAG = '0' + + + update resi_group_statistical + + + + + when RESI_GROUP_ID=#{i.groupId} then TOTAL_PARTY_MEMBERS +1 + + + + + + + when RESI_GROUP_ID=#{i.groupId} then TOTAL_EARNEST_MEMEBERS + 1 + + + + + + + + when RESI_GROUP_ID=#{i.groupId} then #{i.updatedBy} + + + + updated_time = now() + + where + DEL_FLAG = '0' + + + RESI_GROUP_ID=#{i.groupId} + + + + diff --git a/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/member/ResiGroupMemberDao.xml b/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/member/ResiGroupMemberDao.xml index ae8b7d8f14..407e42879f 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/member/ResiGroupMemberDao.xml +++ b/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/member/ResiGroupMemberDao.xml @@ -134,4 +134,23 @@ GROUP BY groupp.GRID_ID + + + diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/ResiIdentityFormDTO.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/ResiIdentityFormDTO.java new file mode 100644 index 0000000000..6709cc435d --- /dev/null +++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/ResiIdentityFormDTO.java @@ -0,0 +1,47 @@ +package com.epmet.resi.partymember.dto; + +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import java.io.Serializable; + +/** + * @Description 调用resi_group服务,用户认证[党员、热心居民]成功后,更新组的缓存统计信息及组统计信息 + * @ClassName ResiIdentityFormDTO + * @Auth wangc + * @Date 2020-05-26 13:55 + */ +@Data +public class ResiIdentityFormDTO implements Serializable { + private static final long serialVersionUID = -6822310777491335787L; + /** + * 用户Id + * */ + @NotBlank(message = "用户Id不能为空") + private String userId; + + /** + * 网格Id + * */ + private String gridId; + + /** + * 客户Id + * */ + private String customerId; + + /** + * 热心居民标识 1:是 0:不是 网格级别 + * */ + private String warmFlag; + + /** + * 党员标识 1: 是 0:不是 + * */ + private String partyFlag; + + /** + * 操作人的Id + * */ + private String operatorId; +} diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/feign/ResiGroupFeignClient.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/feign/ResiGroupFeignClient.java new file mode 100644 index 0000000000..bbe89c5f91 --- /dev/null +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/feign/ResiGroupFeignClient.java @@ -0,0 +1,29 @@ +package com.epmet.modules.feign; + +import com.epmet.commons.tools.constant.ServiceConstant; +import com.epmet.commons.tools.utils.Result; +import com.epmet.modules.feign.fallback.GovOrgFeignClientFallBack; +import com.epmet.resi.partymember.dto.ResiIdentityFormDTO; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; + +/** + * @Description Feign调用resi-group模块 + * @ClassName ResiGroupFeignClient + * @Author wangc + */ + +@FeignClient(name = ServiceConstant.RESI_GROUP_SERVER, fallback = GovOrgFeignClientFallBack.class) +public interface ResiGroupFeignClient { + + /** + * @Description partymember服务审核通过热心居民、党员申请之后,需要遍历这个人所在的组进行组的缓存与数据库的更新 + * @param resiIdentityFormDTO + * @return + * @author wangc + * @date 2020.05.26 14:12 + **/ + @PostMapping("/resi/group/group/updatewhenauditedresirole") + Result updateWhenAuditedResiRole(@RequestBody ResiIdentityFormDTO resiIdentityFormDTO); +} diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/feign/fallback/ResiGroupFeignClientFallBack.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/feign/fallback/ResiGroupFeignClientFallBack.java new file mode 100644 index 0000000000..d3d098b764 --- /dev/null +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/feign/fallback/ResiGroupFeignClientFallBack.java @@ -0,0 +1,30 @@ +package com.epmet.modules.feign.fallback; + +import com.epmet.commons.tools.constant.ServiceConstant; +import com.epmet.commons.tools.utils.ModuleUtils; +import com.epmet.commons.tools.utils.Result; +import com.epmet.modules.feign.ResiGroupFeignClient; +import com.epmet.resi.partymember.dto.ResiIdentityFormDTO; +import org.springframework.stereotype.Component; + + +/** + * @Description + * @ClassName ResiGroupFeignClientFallBack + * @Auth wangc + * @Date 2020-05-26 16:04 + */ +@Component +public class ResiGroupFeignClientFallBack implements ResiGroupFeignClient { + /** + * @Description partymember服务审核通过热心居民、党员申请之后,需要遍历这个人所在的组进行组的缓存与数据库的更新 + * @param resiIdentityFormDTO + * @return + * @author wangc + * @date 2020.05.26 14:12 + **/ + @Override + public Result updateWhenAuditedResiRole(ResiIdentityFormDTO resiIdentityFormDTO) { + return ModuleUtils.feignConError(ServiceConstant.RESI_GROUP_SERVER, "updateWhenAuditedResiRole",resiIdentityFormDTO); + } +} diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartyMemberConfirmServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartyMemberConfirmServiceImpl.java index 837efc5901..c4c661debf 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartyMemberConfirmServiceImpl.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartyMemberConfirmServiceImpl.java @@ -25,6 +25,7 @@ import com.epmet.dto.result.UserResiInfoResultDTO; import com.epmet.modules.feign.EpmetMessageFeignClient; import com.epmet.modules.feign.EpmetUserFeignClient; import com.epmet.modules.feign.GovOrgFeignClient; +import com.epmet.modules.feign.ResiGroupFeignClient; import com.epmet.modules.partymember.entity.*; import com.epmet.modules.partymember.redis.PartymemberInfoRedis; import com.epmet.modules.partymember.service.*; @@ -35,6 +36,7 @@ import com.epmet.redis.ResiPartyMemberRedis; import com.epmet.resi.mine.dto.from.PartyMemberInitFromDTO; import com.epmet.resi.mine.dto.from.VerificationCodeFromDTO; import com.epmet.resi.mine.dto.result.PartyMemberInitResultDTO; +import com.epmet.resi.partymember.dto.ResiIdentityFormDTO; import com.epmet.resi.partymember.dto.partymember.PartymemberConfirmAutoDTO; import com.epmet.resi.partymember.dto.partymember.PartymemberConfirmManualDTO; import com.epmet.resi.partymember.dto.partymember.PartymemberInfoDTO; @@ -89,6 +91,8 @@ public class PartyMemberConfirmServiceImpl implements PartyMemberConfirmService private GovOrgFeignClient govOrgFeignClient; @Autowired private ResiPartyMemberRedis resiPartyMemberRedis; + @Autowired + private ResiGroupFeignClient resiGroupFeignClient; @Override @Transactional(rollbackFor = Exception.class) public Result init(PartyMemberInitFromDTO fromDto) { @@ -231,6 +235,11 @@ public class PartyMemberConfirmServiceImpl implements PartyMemberConfirmService epmetUserFeignClient.saveUserRole(userRole); //存入党员注册关系表 用于统计客户网格的认证党员数 saveRegisterRelation(partyMemberInfoDTO); + + ResiIdentityFormDTO identityParam = new ResiIdentityFormDTO(); + identityParam.setUserId(partyMemberInfoDTO.getUserId()); + identityParam.setPartyFlag(NumConstant.ONE_STR); + resiGroupFeignClient.updateWhenAuditedResiRole(identityParam); } //将自动认证结果存入党员认证自动审核表 @@ -312,6 +321,11 @@ public class PartyMemberConfirmServiceImpl implements PartyMemberConfirmService saveRegisterRelation(ConvertUtils.sourceToTarget(partyMemberInfoEntity, PartymemberInfoDTO.class)); auditMessageToResi(partyMemberInfoEntity, PartyMemberMessageConstant.AUDIT_APPROVE_MSG); + + ResiIdentityFormDTO identityParam = new ResiIdentityFormDTO(); + identityParam.setUserId(partyMemberInfoEntity.getUserId()); + identityParam.setPartyFlag(NumConstant.ONE_STR); + resiGroupFeignClient.updateWhenAuditedResiRole(identityParam); } else { auditMessageToResi(partyMemberInfoEntity, PartyMemberMessageConstant.AUDIT_REJECT_MSG); } diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/warmhearted/service/impl/ResiWarmheartedApplyServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/warmhearted/service/impl/ResiWarmheartedApplyServiceImpl.java index fe5b9ab1bc..c00077dd1f 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/warmhearted/service/impl/ResiWarmheartedApplyServiceImpl.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/warmhearted/service/impl/ResiWarmheartedApplyServiceImpl.java @@ -27,6 +27,7 @@ import com.epmet.commons.tools.constant.NumConstant; import com.epmet.commons.tools.exception.EpmetErrorCode; import com.epmet.commons.tools.exception.RenException; import com.epmet.commons.tools.page.PageData; +import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.commons.tools.utils.Result; import com.epmet.constant.PartyMemberConstant; @@ -41,6 +42,7 @@ import com.epmet.dto.result.UserResiInfoResultDTO; import com.epmet.modules.feign.EpmetMessageFeignClient; import com.epmet.modules.feign.EpmetUserFeignClient; import com.epmet.modules.feign.GovOrgFeignClient; +import com.epmet.modules.feign.ResiGroupFeignClient; import com.epmet.modules.warmhearted.constant.ResiWarmUserMessageConstant; import com.epmet.modules.warmhearted.constant.ResiWarmheartedConstant; import com.epmet.modules.warmhearted.constant.ResiWarmheartedVisitConstant; @@ -49,6 +51,7 @@ import com.epmet.modules.warmhearted.entity.ResiWarmheartedApplyEntity; import com.epmet.modules.warmhearted.service.ResiWarmheartedApplyService; import com.epmet.modules.warmhearted.service.ResiWarmheartedVisitService; import com.epmet.redis.ResiPartyMemberRedis; +import com.epmet.resi.partymember.dto.ResiIdentityFormDTO; import com.epmet.resi.partymember.dto.warmhearted.ResiWarmheartedApplyDTO; import com.epmet.resi.partymember.dto.warmhearted.form.*; import com.epmet.resi.partymember.dto.warmhearted.result.ResiProcessingCountResultDTO; @@ -90,6 +93,8 @@ public class ResiWarmheartedApplyServiceImpl extends BaseServiceImpl page(Map params) { @@ -401,6 +406,12 @@ public class ResiWarmheartedApplyServiceImpl extends BaseServiceImpl