From eb06ce39a09aa916ac39b72824f7811a5a53a44d Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Fri, 27 Nov 2020 09:53:51 +0800 Subject: [PATCH] =?UTF-8?q?=E9=82=80=E8=AF=B7=E5=85=A5=E7=BB=84=E7=9A=84?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E6=B7=BB=E5=8A=A0=E8=BF=94=E5=8F=82=EF=BC=8C?= =?UTF-8?q?=E6=A0=87=E8=AF=86=E6=98=AF=E5=90=A6=E5=AD=98=E5=9C=A8=E5=AE=A1?= =?UTF-8?q?=E6=A0=B8=E4=B8=AD=E7=94=B3=E8=AF=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../tools/exception/EpmetErrorCode.java | 3 +-- .../result/AcceptInvitationResultDTO.java | 19 +++++++++++++++++ .../result/LinkGroupInfoResultDTO.java | 4 ++++ .../controller/GroupInvitationController.java | 7 +++---- .../service/GroupInvitationService.java | 3 ++- .../impl/GroupInvitationServiceImpl.java | 21 ++++++++++++++----- 6 files changed, 45 insertions(+), 12 deletions(-) create mode 100644 epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/invitation/result/AcceptInvitationResultDTO.java diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java index 550a78de43..10533e98fd 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java @@ -128,8 +128,7 @@ public enum EpmetErrorCode { GROUP_EDIT_ERROR(9000,"组信息编辑失败"), GROUP_NOT_EXISTS(9001,"该组不存在"), GROUP_IN_AUDITING(9002,"该组已提交编辑，处于待审核状态，完成审核前不可再次提交"), - GROUP_EDIT_NUM_LIMITED(9003,"已达编辑次数上限"), - EXISTING_APPLICATION(9004,"已存在待审核入组申请，不能重复申请"); + GROUP_EDIT_NUM_LIMITED(9003,"已达编辑次数上限"); private int code; diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/invitation/result/AcceptInvitationResultDTO.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/invitation/result/AcceptInvitationResultDTO.java new file mode 100644 index 0000000000..c7dc6cf6f7 --- /dev/null +++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/invitation/result/AcceptInvitationResultDTO.java @@ -0,0 +1,19 @@ +package com.epmet.resi.group.dto.invitation.result; + +import lombok.Data; + +import java.io.Serializable; + +/** + * @Description 同意邀请进组 + * @Author sun + */ +@Data +public class AcceptInvitationResultDTO implements Serializable { + private static final long serialVersionUID = 8860336693592035343L; + + /** + * true 已经入组过需要审核 false没有入组过 + */ + private Boolean awaitAudit = false; +} 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 4e3fd08cd5..441571f202 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,6 +14,10 @@ import java.io.Serializable; public class LinkGroupInfoResultDTO implements Serializable { private static final long serialVersionUID = 8860336693592035343L; + /** + * true 已经入组过需要审核 false没有入组过 + */ + private Boolean awaitAudit; /** * 是否在群内标志，已经在群内yes 不在群内no */ diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/invitation/controller/GroupInvitationController.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/invitation/controller/GroupInvitationController.java index cf50b0b4b3..14044a668f 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/invitation/controller/GroupInvitationController.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/invitation/controller/GroupInvitationController.java @@ -25,6 +25,7 @@ import com.epmet.modules.invitation.service.GroupInvitationService; 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.AcceptInvitationResultDTO; import com.epmet.resi.group.dto.invitation.result.CreateGroupInvitationResultDTO; import com.epmet.resi.group.dto.invitation.result.LinkGroupInfoResultDTO; import org.springframework.beans.factory.annotation.Autowired; @@ -89,12 +90,10 @@ public class GroupInvitationController { * @Date 2020/3/31 23:47 **/ @PostMapping("acceptinvitation") - public Result accetInvitation(@LoginUser TokenDto tokenDto, - @RequestBody AccetInvitationFormDTO formDTO) { + public Result accetInvitation(@LoginUser TokenDto tokenDto, @RequestBody AccetInvitationFormDTO formDTO) { formDTO.setUserId(tokenDto.getUserId()); formDTO.setApp(tokenDto.getApp()); ValidatorUtils.validateEntity(formDTO); - groupInvitationService.accetInvitation(formDTO); - return new Result(); + return new Result().ok(groupInvitationService.accetInvitation(formDTO)); } } diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/invitation/service/GroupInvitationService.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/invitation/service/GroupInvitationService.java index 7f3153f9b7..12611bbbec 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/invitation/service/GroupInvitationService.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/invitation/service/GroupInvitationService.java @@ -25,6 +25,7 @@ import com.epmet.resi.group.dto.invitation.GroupInvitationDTO; 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.AcceptInvitationResultDTO; import com.epmet.resi.group.dto.invitation.result.CreateGroupInvitationResultDTO; import com.epmet.resi.group.dto.invitation.result.LinkGroupInfoResultDTO; @@ -133,5 +134,5 @@ public interface GroupInvitationService extends BaseService userRoleList) {