elink-star
/
ShibeiWorkPlatform
12
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

志愿者变更mq

dev
zhaoqifeng 3 years ago
parent
12035263dc
commit
1fa3a53b44
2 changed files with 72 additions and 63 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java
  2. 133
      epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java

2
epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java
View File

@ -231,7 +231,7 @@ public class IcResiUserController implements ResultDataResolver {
*/
private void sendVolunteerMsg(String customerId, String resiUserId) {
//发送志愿者人员消息变动
boolean flag = SendMqMsgUtil.build().sendRocketMqMsg(SystemMessageType.VOLUNTEER_CHANGED, new MqBaseFormDTO(customerId, resiUserId));
boolean flag = SendMqMsgUtil.build().openFeignClient(epmetMessageOpenFeignClient).sendRocketMqMsg(SystemMessageType.VOLUNTEER_CHANGED, new MqBaseFormDTO(customerId, resiUserId));
if (!flag){
throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(),"发送志愿者变动消息失败","发送志愿者变动消息失败");
}

133
epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java
View File

@ -253,22 +253,24 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
//2022.04.19 end
//2022.05.18 start zhaoqf 党员信息同步
partyMemberDTO.setCustomerId(tokenDto.getCustomerId());
partyMemberDTO.setAgencyId(agencyId);
partyMemberDTO.setAgencyPids(result.getData().getPids());
partyMemberDTO.setIcResiUser(resiUserId);
partyMemberDTO.setName(map.get("NAME"));
partyMemberDTO.setIdCard(map.get("ID_CARD"));
partyMemberDTO.setMobile(map.get("MOBILE"));
//查询网格信息
GridInfoCache gridInfo = CustomerOrgRedis.getGridInfo(map.get("GRID_ID"));
//查询房屋信息
HouseInfoCache houseInfo = CustomerIcHouseRedis.getHouseInfo(tokenDto.getCustomerId(), map.get("HOME_ID"));
if (null != gridInfo && null != houseInfo) {
String address = gridInfo.getAllParentName().concat(StrConstant.HYPHEN).concat(gridInfo.getGridNamePath())
.concat(StrConstant.HYPHEN).concat(houseInfo.getNeighborHoodName())
.concat(StrConstant.HYPHEN).concat(houseInfo.getHouseName());
partyMemberDTO.setAddress(address);
if (map.containsKey("IS_PARTY") && NumConstant.ONE_STR.equals(map.get("IS_PARTY"))) {
partyMemberDTO.setCustomerId(tokenDto.getCustomerId());
partyMemberDTO.setAgencyId(agencyId);
partyMemberDTO.setAgencyPids(result.getData().getPids());
partyMemberDTO.setIcResiUser(resiUserId);
partyMemberDTO.setName(map.get("NAME"));
partyMemberDTO.setIdCard(map.get("ID_CARD"));
partyMemberDTO.setMobile(map.get("MOBILE"));
//查询网格信息
GridInfoCache gridInfo = CustomerOrgRedis.getGridInfo(map.get("GRID_ID"));
//查询房屋信息
HouseInfoCache houseInfo = CustomerIcHouseRedis.getHouseInfo(tokenDto.getCustomerId(), map.get("HOME_ID"));
if (null != gridInfo && null != houseInfo) {
String address = gridInfo.getAllParentName().concat(StrConstant.HYPHEN).concat(gridInfo.getGridNamePath())
.concat(StrConstant.HYPHEN).concat(houseInfo.getNeighborHoodName())
.concat(StrConstant.HYPHEN).concat(houseInfo.getHouseName());
partyMemberDTO.setAddress(address);
}
}
//2022.05.18 end zhaoqf
}
@ -305,9 +307,11 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
}
//2022.05.18 end zhaoqf
});
Result syncResult = resiPartyMemberOpenFeignClient.icPartyMemberSync(partyMemberDTO);
if (!syncResult.success()) {
log.error("同步党员信息失败");
if (StringUtils.isNotBlank(partyMemberDTO.getIcResiUser())) {
Result syncResult = resiPartyMemberOpenFeignClient.icPartyMemberSync(partyMemberDTO);
if (!syncResult.success()) {
log.error("同步党员信息失败");
}
}
//3.变更记录表和变更记录明细表新增数据
saveUserChangeRecord(tokenDto,map,resiUserId,name);
@ -434,46 +438,49 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
resiUserId = map.get("ID");
//2022.05.18 start zhaoqf 党员信息同步
IcResiUserEntity icResiUser = baseDao.selectById(resiUserId);
partyMemberDTO.setCustomerId(tokenDto.getCustomerId());
partyMemberDTO.setAgencyId(icResiUser.getAgencyId());
partyMemberDTO.setAgencyPids(icResiUser.getPids());
partyMemberDTO.setIcResiUser(resiUserId);
if (map.containsKey("NAME")) {
partyMemberDTO.setName(map.get("NAME"));
} else {
partyMemberDTO.setName(icResiUser.getName());
}
if (map.containsKey("ID_CARD")) {
partyMemberDTO.setIdCard(map.get("ID_CARD"));
} else {
partyMemberDTO.setIdCard(icResiUser.getIdCard());
}
if (map.containsKey("MOBILE")) {
partyMemberDTO.setMobile(map.get("MOBILE"));
} else {
partyMemberDTO.setMobile(icResiUser.getMobile());
}
//查询网格信息
String gridId = null;
if (map.containsKey("GRID_ID")) {
gridId = map.get("GRID_ID");
} else {
gridId = icResiUser.getGridId();
}
GridInfoCache gridInfo = CustomerOrgRedis.getGridInfo(gridId);
//查询房屋信息
String houseId = null;
if (map.containsKey("HOME_ID")) {
houseId = map.get("HOME_ID");
} else {
houseId = icResiUser.getHomeId();
}
HouseInfoCache houseInfo = CustomerIcHouseRedis.getHouseInfo(tokenDto.getCustomerId(), houseId);
if (null != gridInfo && null != houseInfo) {
String address = gridInfo.getAllParentName().concat(StrConstant.HYPHEN).concat(gridInfo.getGridNamePath())
.concat(StrConstant.HYPHEN).concat(houseInfo.getNeighborHoodName())
.concat(StrConstant.HYPHEN).concat(houseInfo.getHouseName());
partyMemberDTO.setAddress(address);
if ((map.containsKey("IS_PARTY") && NumConstant.ONE_STR.equals(map.get("IS_PARTY")))
|| (!map.containsKey("IS_PARTY") && NumConstant.ONE_STR.equals(icResiUser.getIsParty()))) {
partyMemberDTO.setCustomerId(tokenDto.getCustomerId());
partyMemberDTO.setAgencyId(icResiUser.getAgencyId());
partyMemberDTO.setAgencyPids(icResiUser.getPids());
partyMemberDTO.setIcResiUser(resiUserId);
if (map.containsKey("NAME")) {
partyMemberDTO.setName(map.get("NAME"));
} else {
partyMemberDTO.setName(icResiUser.getName());
}
if (map.containsKey("ID_CARD")) {
partyMemberDTO.setIdCard(map.get("ID_CARD"));
} else {
partyMemberDTO.setIdCard(icResiUser.getIdCard());
}
if (map.containsKey("MOBILE")) {
partyMemberDTO.setMobile(map.get("MOBILE"));
} else {
partyMemberDTO.setMobile(icResiUser.getMobile());
}
//查询网格信息
String gridId = null;
if (map.containsKey("GRID_ID")) {
gridId = map.get("GRID_ID");
} else {
gridId = icResiUser.getGridId();
}
GridInfoCache gridInfo = CustomerOrgRedis.getGridInfo(gridId);
//查询房屋信息
String houseId = null;
if (map.containsKey("HOME_ID")) {
houseId = map.get("HOME_ID");
} else {
houseId = icResiUser.getHomeId();
}
HouseInfoCache houseInfo = CustomerIcHouseRedis.getHouseInfo(tokenDto.getCustomerId(), houseId);
if (null != gridInfo && null != houseInfo) {
String address = gridInfo.getAllParentName().concat(StrConstant.HYPHEN).concat(gridInfo.getGridNamePath())
.concat(StrConstant.HYPHEN).concat(houseInfo.getNeighborHoodName())
.concat(StrConstant.HYPHEN).concat(houseInfo.getHouseName());
partyMemberDTO.setAddress(address);
}
}
//2022.05.18 end zhaoqf
}
@ -532,9 +539,11 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
}
//2022.05.18 end zhaoqf
});
Result syncResult = resiPartyMemberOpenFeignClient.icPartyMemberSync(partyMemberDTO);
if (!syncResult.success()) {
log.error("同步党员信息失败");
if (StringUtils.isNotBlank(partyMemberDTO.getIcResiUser())) {
Result syncResult = resiPartyMemberOpenFeignClient.icPartyMemberSync(partyMemberDTO);
if (!syncResult.success()) {
log.error("同步党员信息失败");
}
}
return resiUserId;
}

Write Preview
Loading…
Cancel
Save