Browse Source

成员加组之后,党员数,热心居民数更新

dev_shibei_match
wangchao 5 years ago
parent
commit
6b80bbaffb
  1. 37
      epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/form/ResiRolesOfGroupMemberFormDTO.java
  2. 45
      epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/member/form/ResiIdentityFormDTO.java
  3. 17
      epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/controller/ResiGroupController.java
  4. 12
      epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/dao/ResiGroupStatisticalDao.java
  5. 33
      epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/redis/ResiGroupRedis.java
  6. 10
      epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/ResiGroupStatisticalService.java
  7. 57
      epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupStatisticalServiceImpl.java
  8. 11
      epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/dao/ResiGroupMemberDao.java
  9. 4
      epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/utils/ModuleConstant.java
  10. 37
      epmet-module/resi-group/resi-group-server/src/main/resources/mapper/group/ResiGroupStatisticalDao.xml
  11. 19
      epmet-module/resi-group/resi-group-server/src/main/resources/mapper/member/ResiGroupMemberDao.xml
  12. 47
      epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/ResiIdentityFormDTO.java
  13. 29
      epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/feign/ResiGroupFeignClient.java
  14. 30
      epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/feign/fallback/ResiGroupFeignClientFallBack.java
  15. 14
      epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartyMemberConfirmServiceImpl.java
  16. 11
      epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/warmhearted/service/impl/ResiWarmheartedApplyServiceImpl.java

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

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

17
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<List<RecommendedListResultDTO>> recommendedList(@RequestBody RecommendedListFormDTO formDTO) {
return new Result<List<RecommendedListResultDTO>>().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();
}
}

12
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<ResiGroupStatisticalEnt
* @date 2020.05.24 00:03
**/
void incryTotalIssues(@Param("groupId") String groupId);
/**
* @Description 批量更新组里的党员数热心居民数
* @param list
* @return
* @author wangc
* @date 2020.05.26 14:36
**/
void incryResiRoleMembersBatch(List<ResiRolesOfGroupMemberFormDTO> list);
}

33
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<ResiRolesOfGroupMemberFormDTO>
* @return
* @author wangc
* @date 2020.05.26 15:53
**/
public void increaseRolesCount(List<ResiRolesOfGroupMemberFormDTO> 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()));
}
});
}
}

10
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<ResiGroupStatis
* @author sun
*/
Result upGroupStatistical(RemoveMemberFormDTO removeMemberFormDTO, ResiGroupMemberEntity resiGroupMemberEntity);
/**
* @Description partymember服务审核通过热心居民党员申请之后需要遍历这个人所在的组进行组的缓存与数据库的更新
* @param resiIdentityFormDTO
* @return
* @author wangc
* @date 2020.05.26 14:12
**/
void updateWhenAuditedResiRole(ResiIdentityFormDTO resiIdentityFormDTO);
}

57
epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupStatisticalServiceImpl.java

@ -19,10 +19,12 @@ package com.epmet.modules.group.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.api.R;
import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
import com.epmet.commons.tools.constant.EpmetRoleKeyConstant;
import com.epmet.commons.tools.constant.FieldConstant;
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.utils.ConvertUtils;
@ -35,11 +37,15 @@ import com.epmet.modules.feign.EpmetUserFeignClient;
import com.epmet.modules.group.dao.ResiGroupStatisticalDao;
import com.epmet.modules.group.entity.ResiGroupEntity;
import com.epmet.modules.group.entity.ResiGroupStatisticalEntity;
import com.epmet.modules.group.redis.ResiGroupRedis;
import com.epmet.modules.group.service.ResiGroupStatisticalService;
import com.epmet.modules.member.dao.ResiGroupMemberDao;
import com.epmet.modules.member.entity.ResiGroupMemberEntity;
import com.epmet.modules.utils.ModuleConstant;
import com.epmet.resi.group.dto.group.ResiGroupStatisticalDTO;
import com.epmet.resi.group.dto.group.form.ResiRolesOfGroupMemberFormDTO;
import com.epmet.resi.group.dto.member.form.RemoveMemberFormDTO;
import com.epmet.resi.group.dto.member.form.ResiIdentityFormDTO;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@ -50,6 +56,7 @@ import org.springframework.transaction.annotation.Transactional;
import java.util.Arrays;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
/**
* 群组统计信息表
@ -64,6 +71,10 @@ public class ResiGroupStatisticalServiceImpl extends BaseServiceImpl<ResiGroupSt
private ResiGroupServiceImpl resiGroupServiceImpl;
@Autowired
private EpmetUserFeignClient epmetUserFeignClient;
@Autowired
private ResiGroupMemberDao resiGroupMemberDao;
@Autowired
private ResiGroupRedis resiGroupRedis;
@Override
public PageData<ResiGroupStatisticalDTO> page(Map<String, Object> params) {
@ -168,4 +179,50 @@ public class ResiGroupStatisticalServiceImpl extends BaseServiceImpl<ResiGroupSt
return result;
}
/**
* @Description partymember服务审核通过热心居民党员申请之后需要遍历这个人所在的组进行组的缓存与数据库的更新
* @param resiIdentityFormDTO
* @return
* @author wangc
* @date 2020.05.26 14:12
**/
@Override
@Transactional(rollbackFor = Exception.class)
public void updateWhenAuditedResiRole(ResiIdentityFormDTO resiIdentityFormDTO) {
//用户Id不能为空
//warmFlag为"1"时,网格Id不能为空
//warmFlag与partyFlag不能同时不为0
if(StringUtils.isBlank(resiIdentityFormDTO.getUserId())
|| (StringUtils.isBlank(resiIdentityFormDTO.getGridId()) && StringUtils.equals(NumConstant.ONE_STR,resiIdentityFormDTO.getWarmFlag()))
|| (StringUtils.equals(NumConstant.ONE_STR,resiIdentityFormDTO.getPartyFlag()) && StringUtils.equals(NumConstant.ONE_STR,resiIdentityFormDTO.getWarmFlag()))){
throw new RenException(EpmetErrorCode.SERVER_ERROR.getCode());
}
//查出这个人所在这个网格下的所有的组Id
List<String> 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<ResiRolesOfGroupMemberFormDTO> 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;
}
}

11
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<ResiGroupMemberEntity> {
Integer getMembersCountInGrid(@Param("gridId")String gridId);
List<VotableCountResultDTO> getMembersCountInGrids(@Param("gridIds")List<String> gridIds);
/**
* @Description 根据用户Id和网格Id查询这个人所在的指定网格下所有的组Id
* @param gridId
* @param userId
* @param roleFlag 1:热心居民 其他党员
* @return List<String> 组Id
* @author wangc
* @date 2020.05.26 14:22
**/
List<String> getGroupIdByUserIdAndGridId(@Param("gridId")String gridId,@Param("userId")String userId,@Param("roleFlag")String roleFlag);
}

4
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】";
}

37
epmet-module/resi-group/resi-group-server/src/main/resources/mapper/group/ResiGroupStatisticalDao.xml

@ -37,4 +37,41 @@
AND DEL_FLAG = '0'
</update>
<!-- 批量更新组里的党员数、热心居民数 -->
<update id="incryResiRoleMembersBatch" parameterType="list">
update resi_group_statistical
<trim prefix="set" suffixOverrides=",">
<trim prefix="TOTAL_PARTY_MEMBERS= (case" suffix="end),">
<foreach collection="list" item="i" index="index">
<if test='i.partyFlag == "1"'>
when RESI_GROUP_ID=#{i.groupId} then TOTAL_PARTY_MEMBERS +1
</if>
</foreach>
</trim>
<trim prefix=" TOTAL_EARNEST_MEMEBERS =(case" suffix="end),">
<foreach collection="list" item="i" index="index">
<if test='i.warmFlag == "1"'>
when RESI_GROUP_ID=#{i.groupId} then TOTAL_EARNEST_MEMEBERS + 1
</if>
</foreach>
</trim>
<trim prefix="updated_by =(case" suffix="end)," >
<foreach collection="list" item="i" index="index">
<if test="i.updatedBy!=null">
when RESI_GROUP_ID=#{i.groupId} then #{i.updatedBy}
</if>
</foreach>
</trim>
updated_time = now()
</trim>
where
DEL_FLAG = '0'
<trim prefix="AND ( " suffix=" )">
<foreach collection="list" separator="or" item="i" index="index" >
RESI_GROUP_ID=#{i.groupId}
</foreach>
</trim>
</update>
</mapper>

19
epmet-module/resi-group/resi-group-server/src/main/resources/mapper/member/ResiGroupMemberDao.xml

@ -134,4 +134,23 @@
GROUP BY
groupp.GRID_ID
</select>
<!-- 根据用户Id和网格Id查询这个人所在的指定网格下所有的组Id -->
<select id="getGroupIdByUserIdAndGridId" resultType="string">
SELECT
DISTINCT
member.RESI_GROUP_ID
FROM
RESI_GROUP_MEMBER member
LEFT JOIN RESI_GROUP groupp ON member.RESI_GROUP_ID = groupp.ID AND groupp.DEL_FLAG = '0'
<where>
member.DEL_FLAG = '0'
AND
member.CUSTOMER_USER_ID = #{userId}
<if test='roleFlag == "1"'>
AND groupp.GRID_ID = #{gridId}
</if>
</where>
</select>
</mapper>

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

29
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);
}

30
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);
}
}

14
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<PartyMemberInitResultDTO> 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);
}

11
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<ResiWarmhea
private GovOrgFeignClient govOrgFeignClient;
@Autowired
private ResiPartyMemberRedis resiPartyMemberRedis;
@Autowired
private ResiGroupFeignClient resiGroupFeignClient;
@Override
public PageData<ResiWarmheartedApplyDTO> page(Map<String, Object> params) {
@ -401,6 +406,12 @@ public class ResiWarmheartedApplyServiceImpl extends BaseServiceImpl<ResiWarmhea
result = auditMessage(entity, ResiWarmUserMessageConstant.AUDIT_APPROVE_MSG);
//4:更新政府端:工作-基层治理-居民管理reddot
resiPartyMemberRedis.subtractWorkGrassrootsResiRedDotValue(entity.getGridId());
//5:更新这个人注册热心居民的网格下的所在的组的热心居民数信息
ResiIdentityFormDTO identityParam = new ResiIdentityFormDTO();
identityParam.setUserId(formDTO.getUserId());
identityParam.setGridId(entity.getGridId());
identityParam.setWarmFlag(NumConstant.ONE_STR);
resiGroupFeignClient.updateWhenAuditedResiRole(identityParam);
return result;
}
/**

Loading…
Cancel
Save