新增拒绝群申请，后期会放到政府端，目前测试用

epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/form/AuditApplyGroupFormDTO.java → 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

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;
+}

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);
 	}
 }

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<ResiGroupEntity> {
 
 	/**
 	 * @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);
 }

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<ResiGroupDao, ResiGrou
 	}
 
 	/**
-	 * @param auditApplyGroupFormDTO
+	 * @param agreeApplyGroupFormDTO
 	 * @return com.epmet.commons.tools.utils.Result
 	 * @Author yinzuomei
 	 * @Description 审核群申请-测试用后面会放到政府端
 	 * @Date 2020/3/31 12:44
 	 **/
 	@Override
-	public Result auditApplyGroup(AuditApplyGroupFormDTO auditApplyGroupFormDTO) {
+	public Result agreeApplyGroup(AgreeApplyGroupFormDTO agreeApplyGroupFormDTO) {
 		//1、更新组的状态
-		ResiGroupDTO resiGroupDTO = this.get(auditApplyGroupFormDTO.getGroupId());
+		ResiGroupDTO resiGroupDTO = this.get(agreeApplyGroupFormDTO.getGroupId());
 		resiGroupDTO.setState(GroupStateConstant.GROUP_APPROVED);
 		this.update(resiGroupDTO);
 		//2、更新组的申请记录改为已通过
-		ResiGroupOperationDTO resiGroupOperation = resiGroupOperationDao.selectGroupApplyRecord(auditApplyGroupFormDTO.getGroupId());
+		ResiGroupOperationDTO resiGroupOperation = resiGroupOperationDao.selectGroupApplyRecord(agreeApplyGroupFormDTO.getGroupId());
 		resiGroupOperation.setState(GroupStateConstant.GROUP_APPROVED);
-		resiGroupOperation.setOperateUserId(auditApplyGroupFormDTO.getUserId());
+		resiGroupOperation.setOperateUserId(agreeApplyGroupFormDTO.getUserId());
 		resiGroupOperationService.update(resiGroupOperation);
 		//3、将群主在群成员的状态改为已通过
-		ResiGroupMemberDTO resiGroupMemberDTO=resiGroupMemberDao.selectLeaderMember(auditApplyGroupFormDTO.getGroupId());
+		ResiGroupMemberDTO resiGroupMemberDTO=resiGroupMemberDao.selectLeaderMember(agreeApplyGroupFormDTO.getGroupId());
 		resiGroupMemberDTO.setStatus(MemberStateConstant.APPROVED);
 		resiGroupMemberService.update(resiGroupMemberDTO);
 		//4、更新群主的出入群记录改为已通过
-		GroupMemeberOperationDTO groupMemeberOperationDTO=groupMemeberOperationDao.selectLeaderRecord(auditApplyGroupFormDTO.getGroupId());
+		GroupMemeberOperationDTO groupMemeberOperationDTO=groupMemeberOperationDao.selectLeaderRecord(agreeApplyGroupFormDTO.getGroupId());
 		groupMemeberOperationDTO.setOperateStatus(MemberStateConstant.APPROVED);
-		groupMemeberOperationDTO.setOperateUserId(auditApplyGroupFormDTO.getUserId());
+		groupMemeberOperationDTO.setOperateUserId(agreeApplyGroupFormDTO.getUserId());
+		groupMemeberOperationService.update(groupMemeberOperationDTO);
+		//5、给用户发送消息？？？待定
+		return new Result();
+	}
+
+	/**
+	 * @param disAgreeApplyGroupFormDTO
+	 * @return com.epmet.commons.tools.utils.Result
+	 * @Author yinzuomei
+	 * @Description 审核（拒绝）群申请-测试用后面会放到政府端
+	 * @Date 2020/3/31 13:22
+	 **/
+	@Override
+	public Result disagreeApplyGroup(DisAgreeApplyGroupFormDTO disAgreeApplyGroupFormDTO) {
+		//1、更新组的状态
+		ResiGroupDTO resiGroupDTO = this.get(disAgreeApplyGroupFormDTO.getGroupId());
+		resiGroupDTO.setState(GroupStateConstant.GROUP_REJECTED);
+		this.update(resiGroupDTO);
+		//2、更新组的申请记录改为已通过
+		ResiGroupOperationDTO resiGroupOperation = resiGroupOperationDao.selectGroupApplyRecord(disAgreeApplyGroupFormDTO.getGroupId());
+		resiGroupOperation.setState(GroupStateConstant.GROUP_REJECTED);
+		resiGroupOperation.setOperateUserId(disAgreeApplyGroupFormDTO.getUserId());
+		resiGroupOperation.setOperateReason(disAgreeApplyGroupFormDTO.getRejectReason());
+		resiGroupOperationService.update(resiGroupOperation);
+		//3、将群主在群成员的状态改为已通过
+		ResiGroupMemberDTO resiGroupMemberDTO=resiGroupMemberDao.selectLeaderMember(disAgreeApplyGroupFormDTO.getGroupId());
+		resiGroupMemberDTO.setStatus(MemberStateConstant.REJECTED);
+		resiGroupMemberService.update(resiGroupMemberDTO);
+		//4、更新群主的出入群记录改为已通过
+		GroupMemeberOperationDTO groupMemeberOperationDTO=groupMemeberOperationDao.selectLeaderRecord(disAgreeApplyGroupFormDTO.getGroupId());
+		groupMemeberOperationDTO.setOperateStatus(MemberStateConstant.REJECTED);
+		groupMemeberOperationDTO.setOperateUserId(disAgreeApplyGroupFormDTO.getUserId());
 		groupMemeberOperationService.update(groupMemeberOperationDTO);
 		//5、给用户发送消息？？？待定
 		return new Result();