diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/form/AuditApplyGroupFormDTO.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/form/AgreeApplyGroupFormDTO.java similarity index 76% rename from epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/form/AuditApplyGroupFormDTO.java rename to epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/form/AgreeApplyGroupFormDTO.java index 53f6f4f791..ea40cea345 100644 --- a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/form/AuditApplyGroupFormDTO.java +++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/form/AgreeApplyGroupFormDTO.java @@ -6,12 +6,12 @@ import javax.validation.constraints.NotBlank; import java.io.Serializable; /** - * @Description 网格长审核群入参DTO-测试后面会迁移到政府端 + * @Description 网格长同意群申请入参DTO-测试后面会迁移到政府端 * @Author yinzuomei * @Date 2020/3/31 12:45 */ @Data -public class AuditApplyGroupFormDTO implements Serializable{ +public class AgreeApplyGroupFormDTO implements Serializable{ private static final long serialVersionUID = 1L; /** * 要审核的组id diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/form/DisAgreeApplyGroupFormDTO.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/form/DisAgreeApplyGroupFormDTO.java new file mode 100644 index 0000000000..aba99aa56f --- /dev/null +++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/form/DisAgreeApplyGroupFormDTO.java @@ -0,0 +1,33 @@ +package com.epmet.resi.group.dto.group.form; + +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import java.io.Serializable; + +/** + * @Description 网格长拒绝群申请入参DTO-测试后面会迁移到政府端 + * @Author yinzuomei + * @Date 2020/3/31 13:20 + */ +@Data +public class DisAgreeApplyGroupFormDTO implements Serializable { + private static final long serialVersionUID = -3038681990616751705L; + /** + * 要审核的组id + */ + @NotBlank(message="groupId不能为空") + private String groupId; + + /** + * 拒绝理由 + */ + @NotBlank(message="拒绝理由不能为空") + private String rejectReason; + + /** + * 当前登录用户id由TokenDto赋值 + */ + @NotBlank(message="当前用户id不能为空") + private String userId; +} diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/controller/ResiGroupController.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/controller/ResiGroupController.java index 4246274889..83c7ab6054 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/controller/ResiGroupController.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/controller/ResiGroupController.java @@ -179,13 +179,28 @@ public class ResiGroupController { * @param tokenDto * @return com.epmet.commons.tools.utils.Result * @Author yinzuomei - * @Description 审核群申请-测试用后面会放到政府端 + * @Description 审核(同意)群申请-测试用后面会放到政府端 * @Date 2020/3/31 12:31 **/ - @PostMapping("auditapplygroup") - public Result auditApplyGroup(@LoginUser TokenDto tokenDto, @RequestBody AuditApplyGroupFormDTO auditApplyGroupFormDTO) { - auditApplyGroupFormDTO.setUserId(tokenDto.getUserId()); - ValidatorUtils.validateEntity(auditApplyGroupFormDTO); - return resiGroupService.auditApplyGroup(auditApplyGroupFormDTO); + @PostMapping("agreeapplygroup") + public Result agreeApplyGroup(@LoginUser TokenDto tokenDto, @RequestBody AgreeApplyGroupFormDTO agreeApplyGroupFormDTO) { + agreeApplyGroupFormDTO.setUserId(tokenDto.getUserId()); + ValidatorUtils.validateEntity(agreeApplyGroupFormDTO); + return resiGroupService.agreeApplyGroup(agreeApplyGroupFormDTO); + } + + /** + * @param tokenDto + * @param disAgreeApplyGroupFormDTO + * @return com.epmet.commons.tools.utils.Result + * @Author yinzuomei + * @Description 审核(拒绝)群申请-测试用后面会放到政府端 + * @Date 2020/3/31 13:23 + **/ + @PostMapping("disagreeapplygroup") + public Result disagreeApplyGroup(@LoginUser TokenDto tokenDto, @RequestBody DisAgreeApplyGroupFormDTO disAgreeApplyGroupFormDTO) { + disAgreeApplyGroupFormDTO.setUserId(tokenDto.getUserId()); + ValidatorUtils.validateEntity(disAgreeApplyGroupFormDTO); + return resiGroupService.disagreeApplyGroup(disAgreeApplyGroupFormDTO); } } diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/ResiGroupService.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/ResiGroupService.java index eed9ea4539..73eb3ef5a7 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/ResiGroupService.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/ResiGroupService.java @@ -177,10 +177,19 @@ public interface ResiGroupService extends BaseService { /** * @return com.epmet.commons.tools.utils.Result - * @param auditApplyGroupFormDTO + * @param agreeApplyGroupFormDTO * @Author yinzuomei - * @Description 审核群申请-测试用后面会放到政府端 + * @Description 审核(同意)群申请-测试用后面会放到政府端 * @Date 2020/3/31 12:44 **/ - Result auditApplyGroup(AuditApplyGroupFormDTO auditApplyGroupFormDTO); + Result agreeApplyGroup(AgreeApplyGroupFormDTO agreeApplyGroupFormDTO); + + /** + * @return com.epmet.commons.tools.utils.Result + * @param disAgreeApplyGroupFormDTO + * @Author yinzuomei + * @Description 审核(拒绝)群申请-测试用后面会放到政府端 + * @Date 2020/3/31 13:22 + **/ + Result disagreeApplyGroup(DisAgreeApplyGroupFormDTO disAgreeApplyGroupFormDTO); } diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java index cb7d91ab41..90b0ece47b 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java @@ -24,7 +24,6 @@ import com.epmet.commons.tools.constant.EpmetRoleKeyConstant; import com.epmet.commons.tools.constant.FieldConstant; import com.epmet.commons.tools.constant.NumConstant; import com.epmet.commons.tools.exception.EpmetErrorCode; -import com.epmet.commons.tools.exception.ErrorCode; import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.utils.ConvertUtils; @@ -61,7 +60,6 @@ import com.epmet.resi.group.dto.group.result.MyGroupResultDTO; import com.epmet.resi.group.dto.group.result.RecommendGroupResultDTO; import com.epmet.resi.group.dto.member.GroupMemeberOperationDTO; import com.epmet.resi.group.dto.member.ResiGroupMemberDTO; -import net.bytebuddy.asm.Advice; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -424,31 +422,63 @@ public class ResiGroupServiceImpl extends BaseServiceImpl