|
|
|
@ -185,6 +185,10 @@ public class ResiGroupServiceImpl extends BaseServiceImpl<ResiGroupDao, ResiGrou |
|
|
|
int pageIndex = (myGroupFormDTO.getPageNo() - NumConstant.ONE) * myGroupFormDTO.getPageSize(); |
|
|
|
myGroupFormDTO.setPageNo(pageIndex); |
|
|
|
List<MyGroupResultDTO> myGroupList = baseDao.selectListMyGroup(myGroupFormDTO); |
|
|
|
if (null == myGroupList || myGroupList.size() < 1) { |
|
|
|
logger.info(String.format("我的小组查询为空,selectListMyGroup入参%s", JSON.toJSONString(myGroupFormDTO))); |
|
|
|
return new ArrayList<>(); |
|
|
|
} |
|
|
|
return myGroupList; |
|
|
|
} |
|
|
|
|
|
|
|
@ -201,6 +205,10 @@ public class ResiGroupServiceImpl extends BaseServiceImpl<ResiGroupDao, ResiGrou |
|
|
|
recommendGroupFormDTO.setPageNo(pageIndex); |
|
|
|
//显示当前网格内所有当前用户还未加入的组，以组的人数由高到低排序；如果人数相同，以最新话题的时间有近到远排序
|
|
|
|
List<RecommendGroupResultDTO> recommendGroupList = baseDao.selectListRecommendGroup(recommendGroupFormDTO); |
|
|
|
if (null == recommendGroupList || recommendGroupList.size() == 0) { |
|
|
|
logger.info(String.format("推荐小组查询为空,selectListRecommendGroup入参%s", JSON.toJSONString(recommendGroupFormDTO))); |
|
|
|
return new ArrayList<>(); |
|
|
|
} |
|
|
|
for (RecommendGroupResultDTO recommendGroupResultDTO : recommendGroupList) { |
|
|
|
GroupMemeberOperationDTO groupMemeberOperationDTO = groupMemeberOperationService.selectLatestRecord(recommendGroupResultDTO.getGroupId(), |
|
|
|
recommendGroupFormDTO.getUserId()); |
|
|
|
@ -223,6 +231,10 @@ public class ResiGroupServiceImpl extends BaseServiceImpl<ResiGroupDao, ResiGrou |
|
|
|
int pageIndex = (createdFormDTO.getPageNo() - NumConstant.ONE) * createdFormDTO.getPageSize(); |
|
|
|
createdFormDTO.setPageNo(pageIndex); |
|
|
|
List<CreatedResultDTO> createdResultDTOList = baseDao.selectListMyCreated(createdFormDTO); |
|
|
|
if (null == createdResultDTOList || createdResultDTOList.size() == 0) { |
|
|
|
logger.info(String.format("我创建的小组查询为空,selectListMyCreated入参%s", JSON.toJSONString(createdFormDTO))); |
|
|
|
return new ArrayList<>(); |
|
|
|
} |
|
|
|
return createdResultDTOList; |
|
|
|
} |
|
|
|
|
|
|
|
@ -239,8 +251,8 @@ public class ResiGroupServiceImpl extends BaseServiceImpl<ResiGroupDao, ResiGrou |
|
|
|
//校验是否是群主
|
|
|
|
ResiGroupMemberDTO groupMemberDTO = resiGroupMemberService.getResiGroupMember(modifyGroupFormDTO.getGroupId(), modifyGroupFormDTO.getUserId()); |
|
|
|
if (null == groupMemberDTO || ModuleConstant.GROUP_MEMBER.equals(groupMemberDTO.getGroupLeaderFlag())) { |
|
|
|
logger.error(String.format("修改组信息:%s",ModuleConstant.REJECT_MODIFYGROUPINFO)); |
|
|
|
throw new RenException(EpmetErrorCode.SERVER_ERROR.getCode()); |
|
|
|
logger.error(String.format("修改小组信息异常:%s",EpmetErrorCode.GROUP_LEADER_CAN_EDIT_GROUP_INFO.getMsg())); |
|
|
|
throw new RenException(EpmetErrorCode.GROUP_LEADER_CAN_EDIT_GROUP_INFO.getCode()); |
|
|
|
} |
|
|
|
if (StringUtils.isBlank(modifyGroupFormDTO.getGroupHeadPhoto()) |
|
|
|
&& StringUtils.isBlank(modifyGroupFormDTO.getGroupName()) |
|
|
|
@ -250,9 +262,10 @@ public class ResiGroupServiceImpl extends BaseServiceImpl<ResiGroupDao, ResiGrou |
|
|
|
} |
|
|
|
int updatedRows = baseDao.modifyGroupInfo(modifyGroupFormDTO); |
|
|
|
if (1 == updatedRows) { |
|
|
|
logger.info(ModuleConstant.UPDATE_FAILED); |
|
|
|
logger.info("修改小组信息成功"); |
|
|
|
}else{ |
|
|
|
logger.error(String.format("修改小组信息失败,updatedRows=%s",updatedRows)); |
|
|
|
} |
|
|
|
logger.error(ModuleConstant.UPDATE_FAILED); |
|
|
|
} |
|
|
|
|
|
|
|
/** |
|
|
|
@ -266,7 +279,7 @@ public class ResiGroupServiceImpl extends BaseServiceImpl<ResiGroupDao, ResiGrou |
|
|
|
public GroupSummarizeResultDTO getGroupSummarize(GroupSummarizeFormDTO groupSummarizeFormDTO) { |
|
|
|
GroupSummarizeResultDTO groupSummarizeResultDTO = baseDao.selectGroupSummarize(groupSummarizeFormDTO); |
|
|
|
if (null == groupSummarizeResultDTO) { |
|
|
|
logger.error(String.format("查看小组管理界面信息异常%s",ModuleConstant.GETGROUPSUMMARIZE_FAILED)); |
|
|
|
logger.error(String.format("查看小组管理界面信息异常,userId=%s,groupId=%s",groupSummarizeFormDTO.getUserId(),groupSummarizeFormDTO.getGroupId())); |
|
|
|
return new GroupSummarizeResultDTO(); |
|
|
|
} |
|
|
|
//获取组长信息
|
|
|
|
@ -274,7 +287,8 @@ public class ResiGroupServiceImpl extends BaseServiceImpl<ResiGroupDao, ResiGrou |
|
|
|
if (groupLeaderUserInfo.success() && null != groupLeaderUserInfo.getData()) { |
|
|
|
groupSummarizeResultDTO.setLeaderName(groupLeaderUserInfo.getData().getShowName()); |
|
|
|
} else { |
|
|
|
logger.warn("组长注册信息查询失败" + groupLeaderUserInfo.getMsg()); |
|
|
|
logger.error(String.format("查看小组管理界面信息错误,获取组长注册信息失败,接口返参%s",JSON.toJSONString(groupLeaderUserInfo))); |
|
|
|
groupSummarizeResultDTO.setLeaderName(""); |
|
|
|
} |
|
|
|
return groupSummarizeResultDTO; |
|
|
|
} |
|
|
|
@ -318,10 +332,7 @@ public class ResiGroupServiceImpl extends BaseServiceImpl<ResiGroupDao, ResiGrou |
|
|
|
logger.error(String.format("创建小组异常:%s",EpmetErrorCode.GROUP_ALREADY_EXISTED.getMsg())); |
|
|
|
throw new RenException(EpmetErrorCode.GROUP_ALREADY_EXISTED.getCode()); |
|
|
|
} |
|
|
|
//2、插入一条待审核的组信息
|
|
|
|
ResiGroupEntity resiGroupEntity = this.structureResiGroupEntity(applyCreateGroupFormDTO); |
|
|
|
insert(resiGroupEntity); |
|
|
|
//3.1、查询当前申请人的身份，生成对应格式的消息内容
|
|
|
|
//2.1、查询当前申请人的身份，生成对应格式的消息内容
|
|
|
|
UserRoleDTO userRoleDTO = this.checkPartyMemberOrWarmHeated(applyCreateGroupFormDTO.getApp(), |
|
|
|
applyCreateGroupFormDTO.getUserId(), |
|
|
|
applyCreateGroupFormDTO.getCustomerId(), |
|
|
|
@ -336,6 +347,10 @@ public class ResiGroupServiceImpl extends BaseServiceImpl<ResiGroupDao, ResiGrou |
|
|
|
}else if(NumConstant.ONE_STR.equals(userRoleDTO.getWarmHeartedFlag())){ |
|
|
|
roleName = ModuleConstant.WAREMHEARTED_RESI; |
|
|
|
} |
|
|
|
//2.2、插入一条待审核的组信息
|
|
|
|
ResiGroupEntity resiGroupEntity = this.structureResiGroupEntity(applyCreateGroupFormDTO); |
|
|
|
insert(resiGroupEntity); |
|
|
|
//3.获取居民注册信息
|
|
|
|
UserResiInfoFormDTO resiParam = new UserResiInfoFormDTO(); |
|
|
|
resiParam.setCustomerId(applyCreateGroupFormDTO.getCustomerId()); |
|
|
|
resiParam.setUserId(applyCreateGroupFormDTO.getUserId()); |
|
|
|
@ -435,7 +450,7 @@ public class ResiGroupServiceImpl extends BaseServiceImpl<ResiGroupDao, ResiGrou |
|
|
|
resiUserInfoFormDTO.setCustomerId(initApplyGroupFormDTO.getCustomerId()); |
|
|
|
Result<UserResiInfoResultDTO> result = epmetUserFeignClient.getUserResiInfoDTO(resiUserInfoFormDTO); |
|
|
|
if (!result.success() || null == result.getData() || StringUtils.isBlank(result.getData().getRegMobile())) { |
|
|
|
logger.error("加入小组界面初始化，居民注册信息查询失败"); |
|
|
|
logger.error(String.format("加入小组界面初始化查询成功,当前用户非注册居民,epmet-user-server接口入参%s,返回%s",JSON.toJSONString(resiUserInfoFormDTO),JSON.toJSONString(result))); |
|
|
|
throw new RenException(EpmetErrorCode.CANNOT_JOIN_GROUP.getCode()); |
|
|
|
} |
|
|
|
} |
|
|
|
@ -466,7 +481,7 @@ public class ResiGroupServiceImpl extends BaseServiceImpl<ResiGroupDao, ResiGrou |
|
|
|
initApplyCreatedGroupFormDTO.getCustomerId(), |
|
|
|
initApplyCreatedGroupFormDTO.getGridId()); |
|
|
|
if (!NumConstant.ONE_STR.equals(userRoleDTO.getPartymemberFlag()) && !NumConstant.ONE_STR.equals(userRoleDTO.getWarmHeartedFlag())) { |
|
|
|
logger.error(String.format("创建小组界面初始化,用户非党员、非热心居民，请求参数%S",initApplyCreatedGroupFormDTO.toString())); |
|
|
|
logger.error(String.format("创建小组界面初始化查询成功,用户角色列表%s",JSON.toJSONString(userRoleDTO))); |
|
|
|
throw new RenException(EpmetErrorCode.CANNOT_CREATE_GROUP.getCode()); |
|
|
|
} |
|
|
|
} |
|
|
|
|
yinzuomei
5 years ago