新增网格长审核群申请接口-用来测试

epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/constant/EnterGroupTypeConstant.java

@@ -13,12 +13,12 @@ public interface EnterGroupTypeConstant {
 	String INVITED = "invited";
 
 	/**
-	 * 入群方式：（受邀请入群 - invited 、 主动加入 - joincreated群主创建群自动进入群）
+	 * 入群方式：（受邀请入群 - invited 、 主动加入 - join、created群主创建群自动进入群）
 	 */
 	String JOIN = "join";
 
 	/**
-	 * 入群方式：（受邀请入群 - invited 、 主动加入 - joincreated群主创建群自动进入群）
+	 * 入群方式：（受邀请入群 - invited 、 主动加入 - join、created群主创建群自动进入群）
 	 */
 	String CREATED = "created";
 }

epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/form/AuditApplyGroupFormDTO.java

@@ -0,0 +1,27 @@
+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 12:45
+ */
+@Data
+public class AuditApplyGroupFormDTO implements Serializable{
+	private static final long serialVersionUID = 1L;
+	/**
+	 * 要审核的组id
+	 */
+	@NotBlank(message="groupId不能为空")
+	private String groupId;
+
+	/**
+	 * 当前登录用户id由TokenDto赋值
+	 */
+	@NotBlank(message="当前用户id不能为空")
+	private String userId;
+}

epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/member/GroupMemeberOperationDTO.java

@@ -62,7 +62,7 @@ public class GroupMemeberOperationDTO implements Serializable {
 	private String operateStatus;
 
     /**
-     * 入群方式：（受邀请入群 - invited 、 主动加入 - join）
+     * 入群方式：（受邀请入群 - invited 、 主动加入 - join、created群主创建群自动进入群）
      */
 	private String enterGroupType;
 

epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/member/ResiGroupMemberDTO.java

@@ -54,7 +54,7 @@ public class ResiGroupMemberDTO implements Serializable {
 	private String groupLeaderFlag;
 
     /**
-     * 入群方式：（受邀请入群 - invited 、 主动加入 - join）
+     * 入群方式：（受邀请入群 - invited 、 主动加入 - join、created群主创建群自动进入群）
      */
 	private String enterGroupType;
 

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/controller/ResiGroupController.java

@@ -175,4 +175,17 @@ public class ResiGroupController {
 		return resiGroupService.initApplyCreatedGroup(tokenDto,customerId);
 	}
 
+	/**
+	 * @param tokenDto
+	 * @return com.epmet.commons.tools.utils.Result
+	 * @Author yinzuomei
+	 * @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);
+	}
 }

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/dao/ResiGroupOperationDao.java

@@ -19,6 +19,7 @@ package com.epmet.modules.group.dao;
 
 import com.epmet.commons.mybatis.dao.BaseDao;
 import com.epmet.modules.group.entity.ResiGroupOperationEntity;
+import com.epmet.resi.group.dto.group.ResiGroupOperationDTO;
 import org.apache.ibatis.annotations.Mapper;
 
 /**
@@ -29,5 +30,12 @@ import org.apache.ibatis.annotations.Mapper;
  */
 @Mapper
 public interface ResiGroupOperationDao extends BaseDao<ResiGroupOperationEntity> {
-
+	/**
+	 * @return com.epmet.resi.group.dto.group.ResiGroupOperationDTO
+	 * @param groupId
+	 * @Author yinzuomei
+	 * @Description 查询组的申请记录
+	 * @Date 2020/3/31 13:04
+	 **/
+	ResiGroupOperationDTO selectGroupApplyRecord(String groupId);
 }

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/ResiGroupService.java

@@ -174,4 +174,13 @@ public interface ResiGroupService extends BaseService<ResiGroupEntity> {
 	 * @Date 2020/3/30 15:50
 	 **/
 	Result initApplyCreatedGroup(TokenDto tokenDto, String customerId);
+
+	/**
+	 * @return com.epmet.commons.tools.utils.Result
+	 * @param auditApplyGroupFormDTO
+	 * @Author yinzuomei
+	 * @Description 审核群申请-测试用后面会放到政府端
+	 * @Date 2020/3/31 12:44
+	 **/
+	Result auditApplyGroup(AuditApplyGroupFormDTO auditApplyGroupFormDTO);
 }

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java

@@ -35,10 +35,13 @@ import com.epmet.dto.form.UserRoleFormDTO;
 import com.epmet.dto.result.UserRoleResultDTO;
 import com.epmet.modules.feign.EpmetUserFeignClient;
 import com.epmet.modules.group.dao.ResiGroupDao;
+import com.epmet.modules.group.dao.ResiGroupOperationDao;
 import com.epmet.modules.group.entity.ResiGroupEntity;
 import com.epmet.modules.group.service.ResiGroupOperationService;
 import com.epmet.modules.group.service.ResiGroupService;
 import com.epmet.modules.group.service.ResiGroupStatisticalService;
+import com.epmet.modules.member.dao.GroupMemeberOperationDao;
+import com.epmet.modules.member.dao.ResiGroupMemberDao;
 import com.epmet.modules.member.service.GroupMemeberOperationService;
 import com.epmet.modules.member.service.ResiGroupMemberService;
 import com.epmet.modules.utils.ModuleConstant;
@@ -58,6 +61,7 @@ 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;
@@ -96,6 +100,15 @@ public class ResiGroupServiceImpl extends BaseServiceImpl<ResiGroupDao, ResiGrou
 	@Autowired
 	private ResiGroupStatisticalService resiGroupStatisticalService;
 
+	@Autowired
+	private ResiGroupOperationDao resiGroupOperationDao;
+
+	@Autowired
+	private ResiGroupMemberDao resiGroupMemberDao;
+
+	@Autowired
+	private GroupMemeberOperationDao groupMemeberOperationDao;
+
 	@Override
 	public PageData<ResiGroupDTO> page(Map<String, Object> params) {
 		IPage<ResiGroupEntity> page = baseDao.selectPage(
@@ -201,6 +214,7 @@ public class ResiGroupServiceImpl extends BaseServiceImpl<ResiGroupDao, ResiGrou
 	 * @Description 修改组信息
 	 * @Date 2020/3/28 22:27
 	 **/
+	@Transactional(rollbackFor = Exception.class)
 	@Override
 	public Result modifyGroup(ModifyGroupFormDTO modifyGroupFormDTO) {
 		//校验是否是群主
@@ -273,6 +287,7 @@ public class ResiGroupServiceImpl extends BaseServiceImpl<ResiGroupDao, ResiGrou
 	 * @Description 创建小组
 	 * @Date 2020/3/29 19:26
 	 **/
+	@Transactional(rollbackFor = Exception.class)
 	@Override
 	public Result applyCreateGroup(ApplyCreateGroupFormDTO applyCreateGroupFormDTO) {
 		//1、校验是否同名
@@ -408,6 +423,37 @@ public class ResiGroupServiceImpl extends BaseServiceImpl<ResiGroupDao, ResiGrou
 		return new Result();
 	}
 
+	/**
+	 * @param auditApplyGroupFormDTO
+	 * @return com.epmet.commons.tools.utils.Result
+	 * @Author yinzuomei
+	 * @Description 审核群申请-测试用后面会放到政府端
+	 * @Date 2020/3/31 12:44
+	 **/
+	@Override
+	public Result auditApplyGroup(AuditApplyGroupFormDTO auditApplyGroupFormDTO) {
+		//1、更新组的状态
+		ResiGroupDTO resiGroupDTO = this.get(auditApplyGroupFormDTO.getGroupId());
+		resiGroupDTO.setState(GroupStateConstant.GROUP_APPROVED);
+		this.update(resiGroupDTO);
+		//2、更新组的申请记录改为已通过
+		ResiGroupOperationDTO resiGroupOperation = resiGroupOperationDao.selectGroupApplyRecord(auditApplyGroupFormDTO.getGroupId());
+		resiGroupOperation.setState(GroupStateConstant.GROUP_APPROVED);
+		resiGroupOperation.setOperateUserId(auditApplyGroupFormDTO.getUserId());
+		resiGroupOperationService.update(resiGroupOperation);
+		//3、将群主在群成员的状态改为已通过
+		ResiGroupMemberDTO resiGroupMemberDTO=resiGroupMemberDao.selectLeaderMember(auditApplyGroupFormDTO.getGroupId());
+		resiGroupMemberDTO.setStatus(MemberStateConstant.APPROVED);
+		resiGroupMemberService.update(resiGroupMemberDTO);
+		//4、更新群主的出入群记录改为已通过
+		GroupMemeberOperationDTO groupMemeberOperationDTO=groupMemeberOperationDao.selectLeaderRecord(auditApplyGroupFormDTO.getGroupId());
+		groupMemeberOperationDTO.setOperateStatus(MemberStateConstant.APPROVED);
+		groupMemeberOperationDTO.setOperateUserId(auditApplyGroupFormDTO.getUserId());
+		groupMemeberOperationService.update(groupMemeberOperationDTO);
+		//5、给用户发送消息？？？待定
+		return new Result();
+	}
+
 	/**
 	 * @param app
 	 * @param userId

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/dao/GroupMemeberOperationDao.java

@@ -19,6 +19,7 @@ package com.epmet.modules.member.dao;
 
 import com.epmet.commons.mybatis.dao.BaseDao;
 import com.epmet.modules.member.entity.GroupMemeberOperationEntity;
+import com.epmet.resi.group.dto.member.GroupMemeberOperationDTO;
 import org.apache.ibatis.annotations.Mapper;
 
 /**
@@ -30,4 +31,12 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface GroupMemeberOperationDao extends BaseDao<GroupMemeberOperationEntity> {
 
+	/**
+	 * @param groupId
+	 * @return com.epmet.resi.group.dto.member.GroupMemeberOperationDTO
+	 * @Author yinzuomei
+	 * @Description 查询组长的入群记录
+	 * @Date 2020/3/31 13:05
+	 **/
+	GroupMemeberOperationDTO selectLeaderRecord(String groupId);
 }

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/dao/ResiGroupMemberDao.java

@@ -20,6 +20,7 @@ package com.epmet.modules.member.dao;
 import com.epmet.commons.mybatis.dao.BaseDao;
 import com.epmet.modules.member.entity.ResiGroupMemberEntity;
 import com.epmet.resi.group.dto.UserRoleDTO;
+import com.epmet.resi.group.dto.member.ResiGroupMemberDTO;
 import com.epmet.resi.group.dto.member.form.ApplyingMemberFormDTO;
 import com.epmet.resi.group.dto.member.form.GroupMemberListFormDTO;
 import com.epmet.resi.group.dto.member.result.ApplyingMemberResultDTO;
@@ -65,4 +66,13 @@ public interface ResiGroupMemberDao extends BaseDao<ResiGroupMemberEntity> {
 	 * @Date 2020/3/30 22:40
 	 **/
 	int updateResiGroupStatistical(@Param("groupId") String groupId, @Param("userRoleDTO") UserRoleDTO userRoleDTO);
+
+	/**
+	 * @return com.epmet.resi.group.dto.member.ResiGroupMemberDTO
+	 * @param groupId
+	 * @Author yinzuomei
+	 * @Description 查询群主的记录
+	 * @Date 2020/3/31 13:04
+	 **/
+	ResiGroupMemberDTO selectLeaderMember(String groupId);
 }

epmet-module/resi-group/resi-group-server/src/main/resources/mapper/group/ResiGroupOperationDao.xml

@@ -3,6 +3,17 @@
 
 <mapper namespace="com.epmet.modules.group.dao.ResiGroupOperationDao">
 
+    <!--   查看组的申请记录 -->
+    <select id="selectGroupApplyRecord" parameterType="java.lang.String" resultType="com.epmet.resi.group.dto.group.ResiGroupOperationDTO">
+        SELECT
+            rgo.*
+        FROM
+            resi_group_operation rgo
+        WHERE
+            rgo.DEL_FLAG = '0'
+            AND rgo.STATE = 'under_auditting'
+            AND rgo.RESI_GROUP_ID = #{groupId}
+    </select>
 
 
 </mapper>

epmet-module/resi-group/resi-group-server/src/main/resources/mapper/member/GroupMemeberOperationDao.xml

@@ -2,7 +2,16 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
 <mapper namespace="com.epmet.modules.member.dao.GroupMemeberOperationDao">
-
-
+    <!--  查询组长的入群记录  -->
+    <select id="selectLeaderRecord" parameterType="java.lang.String" resultType="com.epmet.resi.group.dto.member.GroupMemeberOperationDTO">
+        SELECT
+            *
+        FROM
+            group_memeber_operation gmo
+        WHERE
+            gmo.DEL_FLAG = '0'
+            AND gmo.ENTER_GROUP_TYPE = 'created'
+            AND gmo.GROUP_ID = #{groupId}
+    </select>
 
 </mapper>

epmet-module/resi-group/resi-group-server/src/main/resources/mapper/member/ResiGroupMemberDao.xml

@@ -57,4 +57,17 @@
             rgs.RESI_GROUP_ID = #{groupId}
             AND rgs.DEL_FLAG = '0'
     </update>
+
+    <!--  查询群主的记录  -->
+    <select id="selectLeaderMember" parameterType="java.lang.String" resultType="com.epmet.resi.group.dto.member.ResiGroupMemberDTO">
+        SELECT
+            rgm.*
+        FROM
+            resi_group_member rgm
+        WHERE
+            rgm.DEL_FLAG = '0'
+            AND rgm.ENTER_GROUP_TYPE = 'created'
+            AND rgm.GROUP_LEADER_FLAG = 'leader'
+            AND rgm.RESI_GROUP_ID = #{groupId}
+    </select>
 </mapper>