|
|
|
@ -7,11 +7,14 @@ import com.epmet.commons.tools.utils.ConvertUtils; |
|
|
|
import com.epmet.commons.tools.utils.Result; |
|
|
|
import com.epmet.dto.CustomerPartyBranchDTO; |
|
|
|
import com.epmet.dto.form.*; |
|
|
|
import com.epmet.dto.result.ListPartyBranchResultDTO; |
|
|
|
import com.epmet.dto.result.PartyBranchAddResultDTO; |
|
|
|
import com.epmet.dto.result.PartyBranchListResultDTO; |
|
|
|
import com.epmet.dto.result.*; |
|
|
|
import com.epmet.feign.GovOrgOpenFeignClient; |
|
|
|
import com.epmet.resi.partymember.dto.partymember.PartymemberBaseInfoDTO; |
|
|
|
import com.epmet.resi.partymember.dto.partymember.form.PartyMemberBaseInfoAddFormDTO; |
|
|
|
import com.epmet.resi.partymember.dto.partymember.result.PartymemberBaseInfoResultDTO; |
|
|
|
import com.epmet.resi.partymember.feign.ResiPartyMemberOpenFeignClient; |
|
|
|
import com.epmet.service.PartyBranchManageService; |
|
|
|
import org.apache.commons.lang3.StringUtils; |
|
|
|
import org.apache.logging.log4j.LogManager; |
|
|
|
import org.apache.logging.log4j.Logger; |
|
|
|
import org.springframework.beans.factory.annotation.Autowired; |
|
|
|
@ -31,6 +34,8 @@ public class PartyBranchManageServiceImpl implements PartyBranchManageService { |
|
|
|
private Logger logger = LogManager.getLogger(PartyBranchManageServiceImpl.class); |
|
|
|
@Autowired |
|
|
|
private GovOrgOpenFeignClient govOrgOpenFeignClient; |
|
|
|
@Autowired |
|
|
|
private ResiPartyMemberOpenFeignClient resiPartyMemberOpenFeignClient; |
|
|
|
|
|
|
|
@Override |
|
|
|
public PartyBranchAddResultDTO addPartyBranch(PartyBranchAddFormDTO formDTO) { |
|
|
|
@ -71,19 +76,108 @@ public class PartyBranchManageServiceImpl implements PartyBranchManageService { |
|
|
|
} |
|
|
|
|
|
|
|
@Override |
|
|
|
public void deleteBranch(DeleteBranchFormDTO formDTO) { |
|
|
|
Result<CustomerPartyBranchDTO> customerPartyBranchDTOResult = govOrgOpenFeignClient.getPartyBranchById(formDTO.getPartyBranchId()); |
|
|
|
public void deleteBranch(String partyBranchId) { |
|
|
|
Result<CustomerPartyBranchDTO> customerPartyBranchDTOResult = govOrgOpenFeignClient.getPartyBranchById(partyBranchId); |
|
|
|
if (!customerPartyBranchDTOResult.success()||null==customerPartyBranchDTOResult.getData()) { |
|
|
|
logger.error(String.format("查询党支部信息失败入参:%s",JSON.toJSONString(formDTO))); |
|
|
|
logger.error(String.format("查询党支部信息失败入参:partyBranchId=%s",partyBranchId)); |
|
|
|
return; |
|
|
|
}else{ |
|
|
|
if (null != customerPartyBranchDTOResult.getData() && customerPartyBranchDTOResult.getData().getTotalPartyMember() > 0) { |
|
|
|
throw new RenException(EpmetErrorCode.CANNOT_DELETE_PARTYB_RANCH.getCode()); |
|
|
|
throw new RenException(EpmetErrorCode.CANNOT_DELETE_PARTY_BRANCH.getCode()); |
|
|
|
} |
|
|
|
} |
|
|
|
Result delteResult=govOrgOpenFeignClient.deletePartyBranchById(formDTO.getPartyBranchId()); |
|
|
|
Result delteResult=govOrgOpenFeignClient.deletePartyBranchById(partyBranchId); |
|
|
|
if(!delteResult.success()){ |
|
|
|
logger.error(String.format("删除党支部失败入参:%s",JSON.toJSONString(formDTO))); |
|
|
|
logger.error(String.format("删除党支部失败入参:partyBranchId=%s",partyBranchId)); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
@Override |
|
|
|
public PartyBranchInfoResultDTO queryPartyBranchInfo(String partyBranchId) { |
|
|
|
PartyBranchInfoResultDTO partyBranchInfo = new PartyBranchInfoResultDTO(); |
|
|
|
Result<CustomerPartyBranchDTO> customerPartyBranchDTOResult = govOrgOpenFeignClient.getPartyBranchById(partyBranchId); |
|
|
|
if (!customerPartyBranchDTOResult.success() || null == customerPartyBranchDTOResult.getData()) { |
|
|
|
logger.error(String.format("党支部详情信息查询异常,partyBranchId=%s", partyBranchId)); |
|
|
|
return partyBranchInfo; |
|
|
|
} |
|
|
|
partyBranchInfo.setPartyBranchId(partyBranchId); |
|
|
|
partyBranchInfo.setPartyBranchName(customerPartyBranchDTOResult.getData().getPartyBranchName()); |
|
|
|
partyBranchInfo.setProfile(customerPartyBranchDTOResult.getData().getProfile()); |
|
|
|
partyBranchInfo.setGridId(customerPartyBranchDTOResult.getData().getGridId()); |
|
|
|
Result<GridInfoResultDTO> gridInfoResult = govOrgOpenFeignClient.queryGridInfo(customerPartyBranchDTOResult.getData().getGridId()); |
|
|
|
if (gridInfoResult.success() && null != gridInfoResult.getData() && StringUtils.isNotBlank(gridInfoResult.getData().getParentAgencyName())) { |
|
|
|
partyBranchInfo.setGridName(String.format("%s-%s", gridInfoResult.getData().getParentAgencyName(), gridInfoResult.getData().getGridName())); |
|
|
|
} else { |
|
|
|
logger.error(String.format("查询网格基本信息失败,gridId=%s", customerPartyBranchDTOResult.getData().getGridId())); |
|
|
|
} |
|
|
|
return partyBranchInfo; |
|
|
|
} |
|
|
|
|
|
|
|
@Override |
|
|
|
public List<PartyMemberInfoResultDTO> listPartyMember(String partyBranchId) { |
|
|
|
Result<List<PartymemberBaseInfoResultDTO>> result = resiPartyMemberOpenFeignClient.listPartyMemberBaseInfo(partyBranchId); |
|
|
|
if (result.success()) { |
|
|
|
List<PartyMemberInfoResultDTO> list = ConvertUtils.sourceToTarget(result.getData(), PartyMemberInfoResultDTO.class); |
|
|
|
return list; |
|
|
|
} |
|
|
|
logger.error("党员列表查询失败"); |
|
|
|
return new ArrayList<>(); |
|
|
|
} |
|
|
|
|
|
|
|
@Override |
|
|
|
public String addPartyMember(SaveOrUpdateParyMemberFormDTO formDTO) { |
|
|
|
//1、查询党支部信息
|
|
|
|
Result<CustomerPartyBranchDTO> customerPartyBranchResult = govOrgOpenFeignClient.getPartyBranchById(formDTO.getPartyBranchId()); |
|
|
|
if (!customerPartyBranchResult.success() || null == customerPartyBranchResult.getData()) { |
|
|
|
throw new RenException("党支部信息获取失败"); |
|
|
|
} |
|
|
|
//2、构造党员入参
|
|
|
|
CustomerPartyBranchDTO customerPartyBranch = customerPartyBranchResult.getData(); |
|
|
|
PartyMemberBaseInfoAddFormDTO partyMemberBaseInfoAddFormDTO = this.getPartyMemberBaseInfoAddFormDTO(formDTO, customerPartyBranch); |
|
|
|
Result<String> result = resiPartyMemberOpenFeignClient.addPartyMemberBaseInfo(partyMemberBaseInfoAddFormDTO); |
|
|
|
//3、党支部总人数+1
|
|
|
|
if (result.success() && StringUtils.isNotBlank(result.getData())) { |
|
|
|
//党支部总人数+1
|
|
|
|
customerPartyBranch.setTotalPartyMember(customerPartyBranch.getTotalPartyMember() + 1); |
|
|
|
Result<String> updatePartyBranchResult = govOrgOpenFeignClient.updatePartyBranch(customerPartyBranch); |
|
|
|
if (updatePartyBranchResult.success()) { |
|
|
|
logger.info(String.format("党支部(%s)总人数+1", formDTO.getPartyBranchId())); |
|
|
|
} |
|
|
|
} else { |
|
|
|
logger.error("添加党员异常"); |
|
|
|
throw new RenException(result.getCode()); |
|
|
|
} |
|
|
|
return result.getData(); |
|
|
|
} |
|
|
|
|
|
|
|
@Override |
|
|
|
public String editPartyMember(SaveOrUpdateParyMemberFormDTO formDTO) { |
|
|
|
PartymemberBaseInfoDTO partymemberBaseInfoDTO = new PartymemberBaseInfoDTO(); |
|
|
|
partymemberBaseInfoDTO.setIdCard(formDTO.getIdCard().trim()); |
|
|
|
partymemberBaseInfoDTO.setName(formDTO.getName().trim()); |
|
|
|
partymemberBaseInfoDTO.setMobile(formDTO.getMobile().trim()); |
|
|
|
partymemberBaseInfoDTO.setId(formDTO.getPartyMemberId()); |
|
|
|
Result<String> updateResult = resiPartyMemberOpenFeignClient.update(partymemberBaseInfoDTO); |
|
|
|
if (updateResult.success() && StringUtils.isNotBlank(updateResult.getData())) { |
|
|
|
logger.info("修改党员信息成功"); |
|
|
|
return updateResult.getData(); |
|
|
|
}else{ |
|
|
|
logger.error("修改党员信息失败"); |
|
|
|
throw new RenException(updateResult.getCode()); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
private PartyMemberBaseInfoAddFormDTO getPartyMemberBaseInfoAddFormDTO(SaveOrUpdateParyMemberFormDTO formDTO, |
|
|
|
CustomerPartyBranchDTO customerPartyBranchDTO) { |
|
|
|
PartyMemberBaseInfoAddFormDTO partyMemberBaseInfoAddFormDTO=new PartyMemberBaseInfoAddFormDTO(); |
|
|
|
partyMemberBaseInfoAddFormDTO.setBranchId(formDTO.getPartyBranchId()); |
|
|
|
partyMemberBaseInfoAddFormDTO.setIdCard(formDTO.getIdCard().trim()); |
|
|
|
partyMemberBaseInfoAddFormDTO.setMobile(formDTO.getMobile().trim()); |
|
|
|
partyMemberBaseInfoAddFormDTO.setName(formDTO.getName().trim()); |
|
|
|
|
|
|
|
partyMemberBaseInfoAddFormDTO.setBranch(customerPartyBranchDTO.getPartyBranchName()); |
|
|
|
partyMemberBaseInfoAddFormDTO.setOrganization(customerPartyBranchDTO.getAgencyName()); |
|
|
|
partyMemberBaseInfoAddFormDTO.setCustomerId(customerPartyBranchDTO.getCustomerId()); |
|
|
|
return partyMemberBaseInfoAddFormDTO; |
|
|
|
} |
|
|
|
} |
|
|
|
|
yinzuomei
5 years ago