From 44986e5aac3db9b518880573162e07123a84d426 Mon Sep 17 00:00:00 2001 From: yinzuomei <57602893@qq.com> Date: Wed, 8 Apr 2020 12:42:33 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A0=B9=E6=8D=AE=E9=93=BE=E6=8E=A5=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E7=BE=A4=E7=BB=84=E4=BF=A1=E6=81=AF=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B7=BB=E5=8A=A0inGroup=E8=BF=94=E5=8F=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../commons/tools/constant/Constant.java | 10 +++ .../invitation/result/LinkGroupInfoDTO.java | 50 ++++++++++++++ .../result/LinkGroupInfoResultDTO.java | 33 ++------- .../invitation/dao/GroupInvitationDao.java | 5 +- .../impl/GroupInvitationServiceImpl.java | 67 ++++++++++++------- .../service/ResiGroupMemberService.java | 9 +++ .../impl/ResiGroupMemberServiceImpl.java | 37 +++++++--- .../mapper/invitation/GroupInvitationDao.xml | 2 +- 8 files changed, 144 insertions(+), 69 deletions(-) create mode 100644 epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/invitation/result/LinkGroupInfoDTO.java diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/constant/Constant.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/constant/Constant.java index e62ed4b7ce..256113a848 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/constant/Constant.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/constant/Constant.java @@ -108,4 +108,14 @@ public interface Constant { * 版本控制用 */ String VERSION_CONTROL = "/{version}"; + + /** + * 是 + */ + String YES="yes"; + + /** + * 否 + */ + String NO="no"; } diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/invitation/result/LinkGroupInfoDTO.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/invitation/result/LinkGroupInfoDTO.java new file mode 100644 index 0000000000..240901878d --- /dev/null +++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/invitation/result/LinkGroupInfoDTO.java @@ -0,0 +1,50 @@ +package com.epmet.resi.group.dto.invitation.result; + +import lombok.Data; + +import java.io.Serializable; + +/** + * @Description 点击链接，查看组信息返参DTO + * @Author yinzuomei + * @Date 2020/4/8 11:22 + */ +@Data +public class LinkGroupInfoDTO implements Serializable { + private static final long serialVersionUID = 6136787210623326830L; + /** + * 群组id + */ + private String groupId; + + /** + * 群组头像 + */ + private String groupHeadPhoto; + + /** + * 组长名称！！！！！！！！ + * 暂定街道-姓名 + */ + private String leaderName; + + /** + * 群组名称 + */ + private String groupName; + + /** + * 组介绍 + */ + private String groupIntroduction; + + /** + * 成员总数 + */ + private Integer totalMember; + + /** + * 党员总数 + */ + private Integer totalPartyMember; +} diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/invitation/result/LinkGroupInfoResultDTO.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/invitation/result/LinkGroupInfoResultDTO.java index b856309601..fbbc9214ff 100644 --- a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/invitation/result/LinkGroupInfoResultDTO.java +++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/invitation/result/LinkGroupInfoResultDTO.java @@ -14,38 +14,13 @@ public class LinkGroupInfoResultDTO implements Serializable { private static final long serialVersionUID = 8860336693592035343L; /** - * 群组id + * 是否在群内标志，已经在群内yes 不在群内no */ - private String groupId; + private String inGroup; /** - * 群组头像 + * 小组相关信息 */ - private String groupHeadPhoto; + private LinkGroupInfoDTO groupInfo; - /** - * 组长名称！！！！！！！！ - * 暂定街道-姓名 - */ - private String leaderName; - - /** - * 群组名称 - */ - private String groupName; - - /** - * 组介绍 - */ - private String groupIntroduction; - - /** - * 成员总数 - */ - private Integer totalMember; - - /** - * 党员总数 - */ - private Integer totalPartyMember; } diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/invitation/dao/GroupInvitationDao.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/invitation/dao/GroupInvitationDao.java index c521956b8b..0e3d4ce0f3 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/invitation/dao/GroupInvitationDao.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/invitation/dao/GroupInvitationDao.java @@ -19,8 +19,7 @@ package com.epmet.modules.invitation.dao; import com.epmet.commons.mybatis.dao.BaseDao; import com.epmet.modules.invitation.entity.GroupInvitationEntity; -import com.epmet.resi.group.dto.invitation.form.LinkGroupInfoFormDTO; -import com.epmet.resi.group.dto.invitation.result.LinkGroupInfoResultDTO; +import com.epmet.resi.group.dto.invitation.result.LinkGroupInfoDTO; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -40,5 +39,5 @@ public interface GroupInvitationDao extends BaseDao { * @Description 根据群邀请连接查询群基本信息 * @Date 2020/3/31 23:22 **/ - LinkGroupInfoResultDTO selectLinkGroupInfo(@Param("groupId") String groupId); + LinkGroupInfoDTO selectLinkGroupInfo(@Param("groupId") String groupId); } diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/invitation/service/impl/GroupInvitationServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/invitation/service/impl/GroupInvitationServiceImpl.java index 1746b9b648..3b9d3d1059 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/invitation/service/impl/GroupInvitationServiceImpl.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/invitation/service/impl/GroupInvitationServiceImpl.java @@ -21,6 +21,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; import com.epmet.commons.tools.constant.AppClientConstant; +import com.epmet.commons.tools.constant.Constant; import com.epmet.commons.tools.constant.FieldConstant; import com.epmet.commons.tools.constant.NumConstant; import com.epmet.commons.tools.exception.EpmetErrorCode; @@ -56,6 +57,7 @@ import com.epmet.resi.group.dto.invitation.form.AccetInvitationFormDTO; import com.epmet.resi.group.dto.invitation.form.CreateGroupInvitationFormDTO; import com.epmet.resi.group.dto.invitation.form.LinkGroupInfoFormDTO; import com.epmet.resi.group.dto.invitation.result.CreateGroupInvitationResultDTO; +import com.epmet.resi.group.dto.invitation.result.LinkGroupInfoDTO; import com.epmet.resi.group.dto.invitation.result.LinkGroupInfoResultDTO; import com.epmet.resi.group.dto.member.GroupMemeberOperationDTO; import com.epmet.resi.group.dto.member.ResiGroupMemberDTO; @@ -169,7 +171,7 @@ public class GroupInvitationServiceImpl extends BaseServiceImpl().error(ModuleConstant.CANNOT_SHARED); } //3、插入一条邀请记录 @@ -199,17 +201,28 @@ public class GroupInvitationServiceImpl extends BaseServiceImpl getLinkGroupInfo(LinkGroupInfoFormDTO formDTO) { //校验是否存在该邀请连接 Result validResult = this.checkLinkValid(formDTO.getInvitationId()); - if(!validResult.success()){ - return new Result().error(validResult.getCode(),validResult.getMsg()); + if (!validResult.success()) { + return new Result().error(validResult.getCode(), validResult.getMsg()); } - LinkGroupInfoResultDTO linkGroupInfoResultDTO = baseDao.selectLinkGroupInfo(validResult.getData().getResiGroupId()); - //获取组长信息 - Result groupLeaderUserInfo = this.getGroupLeaderUserInfo(linkGroupInfoResultDTO.getGroupId()); + LinkGroupInfoResultDTO linkGroupInfoResultDTO = new LinkGroupInfoResultDTO(); + //1、查询是否在群内 + ResiGroupMemberDTO resiGroupMemberDTO = resiGroupMemberDao.selectGroupMemberInfo(validResult.getData().getResiGroupId(), formDTO.getUserId()); + if (null != resiGroupMemberDTO && !MemberStateConstant.REMOVED.equals(resiGroupMemberDTO.getStatus())) { + linkGroupInfoResultDTO.setInGroup(Constant.YES); + return new Result().ok(linkGroupInfoResultDTO); + } else { + linkGroupInfoResultDTO.setInGroup(Constant.NO); + } + //2、查询组信息 + LinkGroupInfoDTO groupInfo = baseDao.selectLinkGroupInfo(validResult.getData().getResiGroupId()); + //3、获取组长信息 + Result groupLeaderUserInfo = this.getGroupLeaderUserInfo(groupInfo.getGroupId()); if (groupLeaderUserInfo.success() && null != groupLeaderUserInfo.getData()) { - linkGroupInfoResultDTO.setLeaderName(groupLeaderUserInfo.getData().getShowName()); + groupInfo.setLeaderName(groupLeaderUserInfo.getData().getShowName()); } else { logger.info("组长注册信息查询失败" + groupLeaderUserInfo.getMsg()); } + linkGroupInfoResultDTO.setGroupInfo(groupInfo); return new Result().ok(linkGroupInfoResultDTO); } @@ -236,15 +249,15 @@ public class GroupInvitationServiceImpl extends BaseServiceImpl checkLinkValid(String invitationId){ + private Result checkLinkValid(String invitationId) { //校验是否存在该邀请连接 GroupInvitationDTO groupInvitationDTO = this.get(invitationId); //Date1.after(Date2),当Date1大于Date2时，返回TRUE，当小于等于时，返回false； if (null == groupInvitationDTO) { - return new Result().error(EpmetErrorCode.LOSE_EFFICACY.getValue(),EpmetErrorCode.LOSE_EFFICACY.getName()); + return new Result().error(EpmetErrorCode.LOSE_EFFICACY.getValue(), EpmetErrorCode.LOSE_EFFICACY.getName()); } if (null != groupInvitationDTO && !groupInvitationDTO.getValidEndTime().after(new Date())) { - return new Result().error(EpmetErrorCode.LOSE_EFFICACY.getValue(),EpmetErrorCode.LOSE_EFFICACY.getName()); + return new Result().error(EpmetErrorCode.LOSE_EFFICACY.getValue(), EpmetErrorCode.LOSE_EFFICACY.getName()); } return new Result().ok(groupInvitationDTO); } @@ -260,8 +273,8 @@ public class GroupInvitationServiceImpl extends BaseServiceImpl validResult = this.checkLinkValid(formDTO.getInvitationId()); - if(!validResult.success()){ - return new Result().error(validResult.getCode(),validResult.getMsg()); + if (!validResult.success()) { + return new Result().error(validResult.getCode(), validResult.getMsg()); } //2、校验是否已经注册居民 ResiGroupDTO resiGroupDTO = resiGroupService.get(validResult.getData().getResiGroupId()); @@ -270,65 +283,69 @@ public class GroupInvitationServiceImpl extends BaseServiceImpl userResiInfoDTOResult=epmetUserFeignClient.getUserResiInfoDTO(userResiInfoFormDTO); - if(!userResiInfoDTOResult.success()||null==userResiInfoDTOResult.getData()){ - return ; + Result userResiInfoDTOResult = epmetUserFeignClient.getUserResiInfoDTO(userResiInfoFormDTO); + if (!userResiInfoDTOResult.success() || null == userResiInfoDTOResult.getData()) { + return; } - UserMessageFormDTO userMessage=new UserMessageFormDTO(); + UserMessageFormDTO userMessage = new UserMessageFormDTO(); userMessage.setApp(AppClientConstant.APP_RESI); userMessage.setCustomerId(resiGroupDTO.getCustomerId()); userMessage.setGridId(resiGroupDTO.getGridId()); - String messageContent=String.format(UserMessageConstant.INVITED_JOIN_GROUP,userResiInfoDTOResult.getData().getShowName(),resiGroupDTO.getGroupName()); + String messageContent = String.format(UserMessageConstant.INVITED_JOIN_GROUP, userResiInfoDTOResult.getData().getShowName(), resiGroupDTO.getGroupName()); userMessage.setMessageContent(messageContent); userMessage.setReadFlag(ReadFlagConstant.UN_READ); userMessage.setTitle(UserMessageConstant.GROUP_TITLE); diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/service/ResiGroupMemberService.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/service/ResiGroupMemberService.java index 0744a4c689..0daad30427 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/service/ResiGroupMemberService.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/service/ResiGroupMemberService.java @@ -151,4 +151,13 @@ public interface ResiGroupMemberService extends BaseService - SELECT rg.id AS groupId, rg.GROUP_HEAD_PHOTO AS groupHeadPhoto,