|
@ -251,7 +251,7 @@ public class ResiGroupServiceImpl extends BaseServiceImpl<ResiGroupDao, ResiGrou |
|
|
//校验是否是群主
|
|
|
//校验是否是群主
|
|
|
ResiGroupMemberDTO groupMemberDTO = resiGroupMemberService.getResiGroupMember(modifyGroupFormDTO.getGroupId(), modifyGroupFormDTO.getUserId()); |
|
|
ResiGroupMemberDTO groupMemberDTO = resiGroupMemberService.getResiGroupMember(modifyGroupFormDTO.getGroupId(), modifyGroupFormDTO.getUserId()); |
|
|
if (null == groupMemberDTO || ModuleConstant.GROUP_MEMBER.equals(groupMemberDTO.getGroupLeaderFlag())) { |
|
|
if (null == groupMemberDTO || ModuleConstant.GROUP_MEMBER.equals(groupMemberDTO.getGroupLeaderFlag())) { |
|
|
logger.error(String.format("修改小组信息异常:%s",EpmetErrorCode.GROUP_LEADER_CAN_EDIT_GROUP_INFO.getMsg())); |
|
|
logger.info(String.format("修改小组信息异常:%s",EpmetErrorCode.GROUP_LEADER_CAN_EDIT_GROUP_INFO.getMsg())); |
|
|
throw new RenException(EpmetErrorCode.GROUP_LEADER_CAN_EDIT_GROUP_INFO.getCode()); |
|
|
throw new RenException(EpmetErrorCode.GROUP_LEADER_CAN_EDIT_GROUP_INFO.getCode()); |
|
|
} |
|
|
} |
|
|
if (StringUtils.isBlank(modifyGroupFormDTO.getGroupHeadPhoto()) |
|
|
if (StringUtils.isBlank(modifyGroupFormDTO.getGroupHeadPhoto()) |
|
@ -279,7 +279,7 @@ public class ResiGroupServiceImpl extends BaseServiceImpl<ResiGroupDao, ResiGrou |
|
|
public GroupSummarizeResultDTO getGroupSummarize(GroupSummarizeFormDTO groupSummarizeFormDTO) { |
|
|
public GroupSummarizeResultDTO getGroupSummarize(GroupSummarizeFormDTO groupSummarizeFormDTO) { |
|
|
GroupSummarizeResultDTO groupSummarizeResultDTO = baseDao.selectGroupSummarize(groupSummarizeFormDTO); |
|
|
GroupSummarizeResultDTO groupSummarizeResultDTO = baseDao.selectGroupSummarize(groupSummarizeFormDTO); |
|
|
if (null == groupSummarizeResultDTO) { |
|
|
if (null == groupSummarizeResultDTO) { |
|
|
logger.error(String.format("查看小组管理界面信息异常,userId=%s,groupId=%s",groupSummarizeFormDTO.getUserId(),groupSummarizeFormDTO.getGroupId())); |
|
|
logger.warn(String.format("查看小组管理界面信息异常,userId=%s,groupId=%s",groupSummarizeFormDTO.getUserId(),groupSummarizeFormDTO.getGroupId())); |
|
|
return new GroupSummarizeResultDTO(); |
|
|
return new GroupSummarizeResultDTO(); |
|
|
} |
|
|
} |
|
|
//获取组长信息
|
|
|
//获取组长信息
|
|
@ -287,7 +287,7 @@ public class ResiGroupServiceImpl extends BaseServiceImpl<ResiGroupDao, ResiGrou |
|
|
if (groupLeaderUserInfo.success() && null != groupLeaderUserInfo.getData()) { |
|
|
if (groupLeaderUserInfo.success() && null != groupLeaderUserInfo.getData()) { |
|
|
groupSummarizeResultDTO.setLeaderName(groupLeaderUserInfo.getData().getShowName()); |
|
|
groupSummarizeResultDTO.setLeaderName(groupLeaderUserInfo.getData().getShowName()); |
|
|
} else { |
|
|
} else { |
|
|
logger.error(String.format("查看小组管理界面信息错误,获取组长注册信息失败,接口返参%s",JSON.toJSONString(groupLeaderUserInfo))); |
|
|
logger.warn(String.format("查看小组管理界面信息错误,获取组长注册信息失败,接口返参%s",JSON.toJSONString(groupLeaderUserInfo))); |
|
|
groupSummarizeResultDTO.setLeaderName(""); |
|
|
groupSummarizeResultDTO.setLeaderName(""); |
|
|
} |
|
|
} |
|
|
return groupSummarizeResultDTO; |
|
|
return groupSummarizeResultDTO; |
|
@ -329,7 +329,7 @@ public class ResiGroupServiceImpl extends BaseServiceImpl<ResiGroupDao, ResiGrou |
|
|
//1、校验是否同名
|
|
|
//1、校验是否同名
|
|
|
List<ResiGroupEntity> resiGroupEntityList = this.getResiGroupEntityList(applyCreateGroupFormDTO); |
|
|
List<ResiGroupEntity> resiGroupEntityList = this.getResiGroupEntityList(applyCreateGroupFormDTO); |
|
|
if (null != resiGroupEntityList && resiGroupEntityList.size() > 0) { |
|
|
if (null != resiGroupEntityList && resiGroupEntityList.size() > 0) { |
|
|
logger.error(String.format("创建小组异常:%s",EpmetErrorCode.GROUP_ALREADY_EXISTED.getMsg())); |
|
|
logger.info(String.format("创建小组异常:%s",EpmetErrorCode.GROUP_ALREADY_EXISTED.getMsg())); |
|
|
throw new RenException(EpmetErrorCode.GROUP_ALREADY_EXISTED.getCode()); |
|
|
throw new RenException(EpmetErrorCode.GROUP_ALREADY_EXISTED.getCode()); |
|
|
} |
|
|
} |
|
|
//2.1、查询当前申请人的身份,生成对应格式的消息内容
|
|
|
//2.1、查询当前申请人的身份,生成对应格式的消息内容
|
|
@ -338,7 +338,7 @@ public class ResiGroupServiceImpl extends BaseServiceImpl<ResiGroupDao, ResiGrou |
|
|
applyCreateGroupFormDTO.getCustomerId(), |
|
|
applyCreateGroupFormDTO.getCustomerId(), |
|
|
applyCreateGroupFormDTO.getGridId()); |
|
|
applyCreateGroupFormDTO.getGridId()); |
|
|
if (!NumConstant.ONE_STR.equals(userRoleDTO.getPartymemberFlag()) && !NumConstant.ONE_STR.equals(userRoleDTO.getWarmHeartedFlag())) { |
|
|
if (!NumConstant.ONE_STR.equals(userRoleDTO.getPartymemberFlag()) && !NumConstant.ONE_STR.equals(userRoleDTO.getWarmHeartedFlag())) { |
|
|
logger.error(String.format("创建小组异常:%s",EpmetErrorCode.CANNOT_CREATE_GROUP.getMsg())); |
|
|
logger.info(String.format("创建小组异常:%s",EpmetErrorCode.CANNOT_CREATE_GROUP.getMsg())); |
|
|
throw new RenException(EpmetErrorCode.CANNOT_CREATE_GROUP.getCode()); |
|
|
throw new RenException(EpmetErrorCode.CANNOT_CREATE_GROUP.getCode()); |
|
|
} |
|
|
} |
|
|
String roleName = ""; |
|
|
String roleName = ""; |
|
@ -450,7 +450,7 @@ public class ResiGroupServiceImpl extends BaseServiceImpl<ResiGroupDao, ResiGrou |
|
|
resiUserInfoFormDTO.setCustomerId(initApplyGroupFormDTO.getCustomerId()); |
|
|
resiUserInfoFormDTO.setCustomerId(initApplyGroupFormDTO.getCustomerId()); |
|
|
Result<UserResiInfoResultDTO> result = epmetUserFeignClient.getUserResiInfoDTO(resiUserInfoFormDTO); |
|
|
Result<UserResiInfoResultDTO> result = epmetUserFeignClient.getUserResiInfoDTO(resiUserInfoFormDTO); |
|
|
if (!result.success() || null == result.getData() || StringUtils.isBlank(result.getData().getRegMobile())) { |
|
|
if (!result.success() || null == result.getData() || StringUtils.isBlank(result.getData().getRegMobile())) { |
|
|
logger.error(String.format("加入小组界面初始化查询成功,当前用户非注册居民,epmet-user-server接口入参%s,返回%s",JSON.toJSONString(resiUserInfoFormDTO),JSON.toJSONString(result))); |
|
|
logger.info(String.format("加入小组界面初始化查询成功,当前用户非注册居民,epmet-user-server接口入参%s,返回%s",JSON.toJSONString(resiUserInfoFormDTO),JSON.toJSONString(result))); |
|
|
throw new RenException(EpmetErrorCode.CANNOT_JOIN_GROUP.getCode()); |
|
|
throw new RenException(EpmetErrorCode.CANNOT_JOIN_GROUP.getCode()); |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
@ -481,7 +481,7 @@ public class ResiGroupServiceImpl extends BaseServiceImpl<ResiGroupDao, ResiGrou |
|
|
initApplyCreatedGroupFormDTO.getCustomerId(), |
|
|
initApplyCreatedGroupFormDTO.getCustomerId(), |
|
|
initApplyCreatedGroupFormDTO.getGridId()); |
|
|
initApplyCreatedGroupFormDTO.getGridId()); |
|
|
if (!NumConstant.ONE_STR.equals(userRoleDTO.getPartymemberFlag()) && !NumConstant.ONE_STR.equals(userRoleDTO.getWarmHeartedFlag())) { |
|
|
if (!NumConstant.ONE_STR.equals(userRoleDTO.getPartymemberFlag()) && !NumConstant.ONE_STR.equals(userRoleDTO.getWarmHeartedFlag())) { |
|
|
logger.error(String.format("创建小组界面初始化查询成功,用户角色列表%s",JSON.toJSONString(userRoleDTO))); |
|
|
logger.info(String.format("创建小组界面初始化查询成功,用户角色列表%s",JSON.toJSONString(userRoleDTO))); |
|
|
throw new RenException(EpmetErrorCode.CANNOT_CREATE_GROUP.getCode()); |
|
|
throw new RenException(EpmetErrorCode.CANNOT_CREATE_GROUP.getCode()); |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|