Merge remote-tracking branch 'origin/dev0.2' into dev0.2

epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java

@@ -18,9 +18,7 @@ public enum EpmetErrorCode {
 	MOBILE_GET_CODE_ERROR(8104,"获取验证码失败"),
 	MESSAGE_SMS_SEND_ERROR(8105, "短信发送失败"),
 
-    CANNOT_AUDIT_WARM(8201, "未注册居民不能申请热心居民，请先完善居民注册。"),
+    CANNOT_AUDIT_WARM(8201, "未注册居民不能申请热心居民，请先完善居民注册。");
-    RESI_WARM_INIT(8202, "您的信息已提交成功，请等待后台审核。"),
-    RESI_WARM_SUBMIT(8203, "热心居民信息已提交成功，请等待后台审核。");
 
 
 	private int code;

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

@@ -16,6 +16,9 @@ public class InitApplyCreatedGroupFormDTO implements Serializable {
 	@NotBlank(message = "客户id不能为空")
 	private String customerId;
 
+	@NotBlank(message = "当前网格id为空")
+	private String gridId;
+
 	/**
 	 * 用户id TokenDto赋值
 	 */

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

@@ -29,7 +29,7 @@ public class ApplyJoinGroupFormDTO implements Serializable {
 	/**
 	 * 入群理由
 	 */
-	@NotBlank(message="入群理由不能为空")
+	@NotBlank(message="入组理由不能为空")
 	private String operateDes;
 
 	private String app;

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

@@ -17,7 +17,7 @@ public class RemoveMemberFormDTO implements Serializable {
 	 * 群组成员关系表
 	 */
 	@NotBlank(message = "成员Id不能为空")
-	private String memerId;
+	private String memberId;
 
 	/**
 	 * 显示是否要屏蔽该成员的全部话题,1是0否

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

@@ -0,0 +1,32 @@
+package com.epmet.resi.group.dto.member.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+/**
+ * @Description 楼院小组--禁言组成员
+ * @Author sun
+ */
+@Data
+public class SlientMemberFormDTO implements Serializable {
+	private static final long serialVersionUID = 1626650057895049665L;
+
+	/**
+	 * 群组成员关系表
+	 */
+	@NotBlank(message = "成员Id不能为空")
+	private String memberId;
+
+	/**
+	 * 当前登录用户id(token)
+	 */
+	private String userId;
+
+	/**
+	 * 所属app
+	 */
+	private String app;
+
+}

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/constant/GroupMemberConstant.java

@@ -0,0 +1,19 @@
+package com.epmet.modules.constant;
+
+/**
+ * 常量
+ *
+ * @author Mark sunlightcs@gmail.com
+ * @since 1.1.0
+ */
+public interface GroupMemberConstant {
+
+	String DELETE_SUCCESS = "组成员删除成功";
+
+	/**
+	 * 删除组成员时对应话题操作日志表设置默认的屏蔽理由
+	 */
+	String DELETE_MEMBER_REASON = "删除组成员，屏蔽该成员话题";
+
+	String SLIENT_SUCCESS = "禁言成功";
+}

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/constant/UserMessageConstant.java

@@ -26,5 +26,10 @@ public interface UserMessageConstant {
      */
     String INVITED_JOIN_GROUP = "您的好友-【%s】通过邀请连接，加入了【%s】";
 
+    /**
+     * 组成员被禁言时会收到消息：您已被禁言，禁言时间2020.03.20 12:20-2020.03.27  12:20
+     */
+    String SLIENT_IN_GROUP = "您已被禁言，禁言时间%s";
+
 
 }

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/exception/ModuleErrorCode.java

@@ -24,13 +24,8 @@ public interface ModuleErrorCode extends ErrorCode {
 
     String DATA_ACQUISITION_FAILED = "数据库数据获取失败";
 
-    String DELETE_SUCCESS = "组成员删除成功";
-
     String DELETE_FAILED = "组成员删除失败";
 
-    /**
+    String SLIENT_FAILED = "组成员禁言失败";
-     * 删除组成员时对应话题操作日志表设置默认的屏蔽理由
-     */
-    String DELETE_MEMBER_REASON = "删除组成员，屏蔽该成员话题";
 
 }

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

@@ -198,9 +198,10 @@ public interface ResiGroupService extends BaseService<ResiGroupEntity> {
 	 * @param app
 	 * @param userId
 	 * @param customerId
+	 * @param gridId
 	 * @Author yinzuomei
 	 * @Description 判断用户当前角色
 	 * @Date 2020/4/1 0:00
 	 **/
-	UserRoleDTO checkPartyMemberOrWarmHeated(String app, String userId, String customerId);
+	UserRoleDTO checkPartyMemberOrWarmHeated(String app, String userId, String customerId, String gridId);
 }

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

@@ -327,7 +327,8 @@ public class ResiGroupServiceImpl extends BaseServiceImpl<ResiGroupDao, ResiGrou
 		//6、群初始统计记录
 		UserRoleDTO userRoleDTO = this.checkPartyMemberOrWarmHeated(applyCreateGroupFormDTO.getApp(),
 									applyCreateGroupFormDTO.getUserId(),
-									applyCreateGroupFormDTO.getCustomerId());
+									applyCreateGroupFormDTO.getCustomerId(),
+									applyCreateGroupFormDTO.getGridId());
 		ResiGroupStatisticalDTO resiGroupStatisticalDTO=new ResiGroupStatisticalDTO();
 		resiGroupStatisticalDTO.setResiGroupId(resiGroupEntity.getId());
 		resiGroupStatisticalDTO.setTotalMembers(NumConstant.ONE);
@@ -415,7 +416,8 @@ public class ResiGroupServiceImpl extends BaseServiceImpl<ResiGroupDao, ResiGrou
 		}
 		UserRoleDTO userRoleDTO = this.checkPartyMemberOrWarmHeated(initApplyCreatedGroupFormDTO.getApp(),
 				initApplyCreatedGroupFormDTO.getUserId(),
-				initApplyCreatedGroupFormDTO.getCustomerId());
+				initApplyCreatedGroupFormDTO.getCustomerId(),
+				initApplyCreatedGroupFormDTO.getGridId());
 		if (!NumConstant.ONE_STR.equals(userRoleDTO.getPartymemberFlag()) && !NumConstant.ONE_STR.equals(userRoleDTO.getWarmHeartedFlag())) {
 			return new Result().error(EpmetErrorCode.CANNOT_CREATE_GROUP.getCode(),EpmetErrorCode.CANNOT_CREATE_GROUP.getMsg());
 		}
@@ -507,18 +509,20 @@ public class ResiGroupServiceImpl extends BaseServiceImpl<ResiGroupDao, ResiGrou
 	 * @param app
 	 * @param userId
 	 * @param customerId
+	 * @param gridId
 	 * @return boolean
 	 * @Author yinzuomei
 	 * @Description 用户拥有党员或者热心居民标签返回true, 没有权限返回false
 	 * @Date 2020/3/30 16:33
 	 **/
 	@Override
-	public UserRoleDTO checkPartyMemberOrWarmHeated(String app, String userId, String customerId) {
+	public UserRoleDTO checkPartyMemberOrWarmHeated(String app, String userId, String customerId, String gridId) {
 		UserRoleDTO userRoleDTO = new UserRoleDTO();
 		UserRoleFormDTO userRoleFormDTO = new UserRoleFormDTO();
 		userRoleFormDTO.setApp(app);
 		userRoleFormDTO.setCustomerId(customerId);
 		userRoleFormDTO.setUserId(userId);
+		userRoleFormDTO.setGridId(gridId);
 		Result<List<UserRoleResultDTO>> userRoleListResult = epmetUserFeignClient.getUserRoleInfo(userRoleFormDTO);
 		if (!userRoleListResult.success()) {
 			logger.info("获取用户角色feign调用失败" + userRoleListResult.getMsg());

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

@@ -309,10 +309,13 @@ public class GroupInvitationServiceImpl extends BaseServiceImpl<GroupInvitationD
 		GroupInvitationDTO groupInvitationDTO=validResult.getData();
 		//2、校验是否已经注册居民
 		ResiGroupDTO resiGroupDTO = resiGroupService.get(groupInvitationDTO.getResiGroupId());
+		UserRoleDTO userRoleDTO=new UserRoleDTO();
 		if (null != resiGroupDTO) {
-			UserRoleDTO userRoleDTO = resiGroupService.checkPartyMemberOrWarmHeated(formDTO.getApp(),
+			//获取当前用户所有角色
+			 userRoleDTO = resiGroupService.checkPartyMemberOrWarmHeated(formDTO.getApp(),
 					formDTO.getUserId(),
-					resiGroupDTO.getCustomerId());
+					resiGroupDTO.getCustomerId(),
+					resiGroupDTO.getGridId());
 			if (NumConstant.ZERO_STR.equals(userRoleDTO.getRegisteredResiFlag())) {
 				return new Result().error(EpmetErrorCode.CANNOT_JOIN_GROUP.getCode(), EpmetErrorCode.CANNOT_JOIN_GROUP.getMsg());
 			}
@@ -324,7 +327,7 @@ public class GroupInvitationServiceImpl extends BaseServiceImpl<GroupInvitationD
 		groupMemeberOperation.setOperateStatus(MemberStateConstant.APPROVED);
 		groupMemeberOperation.setEnterGroupType(EnterGroupTypeConstant.INVITED);
 		groupMemeberOperation.setOperateUserId(formDTO.getUserId());
-		groupMemeberOperationService.save(groupMemeberOperation);
+		groupMemeberOperationService.accetInvitation(groupMemeberOperation);
 		//4、直接加入群成员关系表
 		//如果是之前被移除的，则修改resi_group_member记录
 		ResiGroupMemberDTO resiGroupMemberDTO = new ResiGroupMemberDTO();
@@ -340,9 +343,6 @@ public class GroupInvitationServiceImpl extends BaseServiceImpl<GroupInvitationD
 		resiGroupMemberDTO.setCreatedBy(groupMemeberOperation.getCustomerUserId());
 		resiGroupMemberService.saveOrUpdate(resiGroupMemberDTO);
 		//5、修改群统计值
-		UserRoleDTO userRoleDTO = resiGroupService.checkPartyMemberOrWarmHeated(formDTO.getApp(),
-				formDTO.getUserId(),
-				resiGroupDTO.getCustomerId());
 		resiGroupMemberDao.updateResiGroupStatistical(groupMemeberOperation.getGroupId(), userRoleDTO);
 		//6、发送消息
 		this.sendMessageToLeader(formDTO, resiGroupDTO,groupInvitationDTO);

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

@@ -135,4 +135,19 @@ public class ResiGroupMemberController {
         return resiGroupMemberService.removeMember(removeMemberFormDTO);
     }
 
+    /**
+	 * 2020.4.13  组成员禁言功能暂不上线
+	 * 1.0版本可能不会使用到此功能 此接口先提交后边在使用
+	 *
+     * @Author sun
+     * @Description 楼院小组--禁言组员
+     **/
+    @PostMapping("slientmember")
+    public Result slientMember(@LoginUser TokenDto tokenDto, @RequestBody SlientMemberFormDTO slientMemberFormDTO) {
+		slientMemberFormDTO.setUserId(tokenDto.getUserId());
+		slientMemberFormDTO.setApp(tokenDto.getApp());
+        ValidatorUtils.validateEntity(slientMemberFormDTO);
+        return resiGroupMemberService.slientMember(slientMemberFormDTO);
+    }
+
 }

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

@@ -105,7 +105,7 @@ public interface GroupMemeberOperationService extends BaseService<GroupMemeberOp
      * @author sun
      * @date 2020-03-29
      */
-    Result saveMemberOperation(RemoveMemberFormDTO removeMemberFormDTO, ResiGroupMemberEntity resiGroupMemberEntity);
+    Result saveMemberOperation(String tokenUserId, String status, ResiGroupMemberEntity resiGroupMemberEntity);
 
     /**
      * @param groupId 小组id
@@ -116,4 +116,10 @@ public interface GroupMemeberOperationService extends BaseService<GroupMemeberOp
      * @Date 2020/4/11 10:41
      **/
     GroupMemeberOperationDTO selectLatestRecord(String groupId, String userId);
+
+    /**
+     * 用户通过邀请入群时，如果存在有效的申请，直接置为已通过
+     * @param groupMemeberOperation
+     */
+    void accetInvitation(GroupMemeberOperationDTO groupMemeberOperation);
 }

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

@@ -168,4 +168,12 @@ public interface ResiGroupMemberService extends BaseService<ResiGroupMemberEntit
      * @Description 楼院小组--删除组成员
      **/
     Result removeMember(RemoveMemberFormDTO removeMemberFormDTO);
+
+    /**
+     * @param slientMemberFormDTO
+     * @return com.epmet.commons.tools.utils.Result
+     * @Author sun
+     * @Description 楼院小组--禁言组成员
+     **/
+    Result slientMember(SlientMemberFormDTO slientMemberFormDTO);
 }

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

@@ -106,15 +106,15 @@ public class GroupMemeberOperationServiceImpl extends BaseServiceImpl<GroupMemeb
     }
 
     @Override
-    public Result saveMemberOperation(RemoveMemberFormDTO removeMemberFormDTO, ResiGroupMemberEntity resiGroupMemberEntity) {
+    public Result saveMemberOperation(String tokenUserId, String status, ResiGroupMemberEntity resiGroupMemberEntity) {
         GroupMemeberOperationEntity entity = new GroupMemeberOperationEntity();
         entity.setCustomerUserId(resiGroupMemberEntity.getCustomerUserId());
         entity.setGroupId(resiGroupMemberEntity.getResiGroupId());
-        entity.setOperateStatus(MemberStateConstant.REMOVED);
+        entity.setOperateStatus(status);
         entity.setEnterGroupType(resiGroupMemberEntity.getEnterGroupType());
         entity.setGroupInvitationId(resiGroupMemberEntity.getGroupInvitationId());
         //entity.setOperateDes("");
-        entity.setOperateUserId(removeMemberFormDTO.getUserId());
+        entity.setOperateUserId(tokenUserId);
         baseDao.insert(entity);
         return new Result();
     }
@@ -132,4 +132,15 @@ public class GroupMemeberOperationServiceImpl extends BaseServiceImpl<GroupMemeb
         return baseDao.selectLatestRecord(groupId,userId);
     }
 
+    @Override
+    public void accetInvitation(GroupMemeberOperationDTO groupMemeberOperation) {
+        //如果用户存在待审核的入群申请，将申请置为已通过
+        GroupMemeberOperationDTO groupMemeberOperationDTO = this.selectLatestRecord(groupMemeberOperation.getGroupId(), groupMemeberOperation.getCustomerUserId());
+        if (null != groupMemeberOperationDTO && MemberStateConstant.UNDER_AUDITTING.equals(groupMemeberOperationDTO.getOperateStatus())) {
+            groupMemeberOperationDTO.setOperateStatus(MemberStateConstant.APPROVED);
+            this.update(groupMemeberOperationDTO);
+        }
+        this.save(groupMemeberOperation);
+    }
+
 }

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

@@ -28,13 +28,16 @@ import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.constant.ReadFlagConstant;
+import com.epmet.dto.UserMessageDTO;
 import com.epmet.dto.form.UserMessageFormDTO;
 import com.epmet.dto.form.UserResiInfoListFormDTO;
 import com.epmet.dto.result.UserResiInfoResultDTO;
 import com.epmet.feign.MessageFeignClient;
+import com.epmet.modules.constant.GroupMemberConstant;
 import com.epmet.modules.constant.UserMessageConstant;
 import com.epmet.modules.exception.ModuleErrorCode;
 import com.epmet.modules.feign.EpmetUserFeignClient;
+import com.epmet.modules.group.entity.ResiGroupEntity;
 import com.epmet.modules.group.service.ResiGroupService;
 import com.epmet.modules.group.service.ResiGroupStatisticalService;
 import com.epmet.modules.member.dao.ResiGroupMemberDao;
@@ -60,10 +63,9 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.ArrayList;
+import java.text.DateFormat;
-import java.util.Arrays;
+import java.text.SimpleDateFormat;
-import java.util.List;
+import java.util.*;
-import java.util.Map;
 
 /**
  * 群组成员关系表
@@ -182,7 +184,8 @@ public class ResiGroupMemberServiceImpl extends BaseServiceImpl<ResiGroupMemberD
 		if (null != resiGroupDTO) {
 			UserRoleDTO userRoleDTO = resiGroupService.checkPartyMemberOrWarmHeated(applyJoinGroupFormDTO.getApp(),
 					applyJoinGroupFormDTO.getUserId(),
-					resiGroupDTO.getCustomerId());
+					resiGroupDTO.getCustomerId(),
+					resiGroupDTO.getGridId());
 			if (NumConstant.ZERO_STR.equals(userRoleDTO.getRegisteredResiFlag())) {
 				return new Result().error(EpmetErrorCode.CANNOT_JOIN_GROUP.getCode(),EpmetErrorCode.CANNOT_JOIN_GROUP.getMsg());
 			}
@@ -265,8 +268,8 @@ public class ResiGroupMemberServiceImpl extends BaseServiceImpl<ResiGroupMemberD
 			formDTO.setUserIdList(userIdList);
 			Result<List<UserResiInfoResultDTO>> userResiInfoDTOListResult=epmetUserFeignClient.getUserResiInfoList(formDTO);
 			if(userResiInfoDTOListResult.success()){
-				for(UserResiInfoResultDTO userResiInfo:userResiInfoDTOListResult.getData()){
+				for (ApplyingMemberResultDTO memberInfo : list) {
-					for (ApplyingMemberResultDTO memberInfo : list) {
+					for(UserResiInfoResultDTO userResiInfo:userResiInfoDTOListResult.getData()){
 						if(memberInfo.getApplyUserId().equals(userResiInfo.getUserId())){
 							memberInfo.setApplyUserName(userResiInfo.getShowName());
 							memberInfo.setApplyUserHeadPhoto(userResiInfo.getHeadPhoto());
@@ -319,9 +322,11 @@ public class ResiGroupMemberServiceImpl extends BaseServiceImpl<ResiGroupMemberD
 		resiGroupMemberDTO.setCreatedBy(groupMemeberOperationDTO.getCustomerUserId());
 		resiGroupMemberService.saveOrUpdate(resiGroupMemberDTO);
 		//5、修改群统计值
+		ResiGroupDTO resiGroupDTO=resiGroupService.get(groupMemeberOperationDTO.getGroupId());
 		UserRoleDTO userRoleDTO = resiGroupService.checkPartyMemberOrWarmHeated(agreeApplyFormDTO.getApp(),
                 groupMemeberOperationDTO.getCustomerUserId(),
-				agreeApplyFormDTO.getCustomerId());
+				agreeApplyFormDTO.getCustomerId(),
+				resiGroupDTO.getGridId());
 		baseDao.updateResiGroupStatistical(groupMemeberOperationDTO.getGroupId(), userRoleDTO);
 		//6、给用户发送消息
 		this.sendUserApprovedMessage(resiGroupMemberDTO);
@@ -425,19 +430,19 @@ public class ResiGroupMemberServiceImpl extends BaseServiceImpl<ResiGroupMemberD
     @Transactional(rollbackFor = Exception.class)
     public Result removeMember(RemoveMemberFormDTO removeMemberFormDTO) {
         Result result = new Result();
-        //1、resi_group_member表中的status置为removed,删除标记置为1
+        //1、resi_group_member表中的status置为removed
         ResiGroupMemberEntity entity = new ResiGroupMemberEntity();
-        entity.setId(removeMemberFormDTO.getMemerId());
+        entity.setId(removeMemberFormDTO.getMemberId());
         entity.setStatus(MemberStateConstant.REMOVED);
         baseDao.updateById(entity);
         //2、group_member_operation新增一条记录
-        ResiGroupMemberEntity resiGroupMemberEntity = baseDao.selectById(removeMemberFormDTO.getMemerId());
+        ResiGroupMemberEntity resiGroupMemberEntity = baseDao.selectById(removeMemberFormDTO.getMemberId());
         if (null == resiGroupMemberEntity) {
             logger.error(ModuleErrorCode.DATA_ACQUISITION_FAILED);
             result.error(ModuleErrorCode.DELETE_FAILED);
             return result;
         }
-        groupMemeberOperationService.saveMemberOperation(removeMemberFormDTO, resiGroupMemberEntity);
+        groupMemeberOperationService.saveMemberOperation(removeMemberFormDTO.getUserId(), MemberStateConstant.REMOVED, resiGroupMemberEntity);
         //3、修改resi_group_statistical表数据:成员总数-1,普通居民总数-1，热心居民或者党员数根据被删除的用户身份来判断
         result = resiGroupStatisticalService.upGroupStatistical(removeMemberFormDTO, resiGroupMemberEntity);
         if (!result.success()) {
@@ -450,7 +455,58 @@ public class ResiGroupMemberServiceImpl extends BaseServiceImpl<ResiGroupMemberD
             resiTopicService.upResiTopic(removeMemberFormDTO, resiGroupMemberEntity);
         }
         //5、评论和产品沟通后，说可以留着。
-		logger.info(ModuleErrorCode.DELETE_SUCCESS);
+		logger.info(GroupMemberConstant.DELETE_SUCCESS);
         return result;
     }
+
+    /**
+     * @param slientMemberFormDTO
+     * @return com.epmet.commons.tools.utils.Result
+     * @Author sun
+     * @Description 楼院小组--禁言组成员
+     **/
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Result slientMember(SlientMemberFormDTO slientMemberFormDTO) {
+        Result result = new Result();
+        //1:修改组成员关系(resi_group_member)表数据状态为禁言
+		ResiGroupMemberEntity entity = new ResiGroupMemberEntity();
+		entity.setId(slientMemberFormDTO.getMemberId());
+		entity.setStatus(MemberStateConstant.SILENT);
+		baseDao.updateById(entity);
+		//2:组成员出入群记录(group_memeber_operation)表新增记录
+		ResiGroupMemberEntity resiGroupMemberEntity = baseDao.selectById(slientMemberFormDTO.getMemberId());
+		if (null == resiGroupMemberEntity) {
+			logger.error(ModuleErrorCode.DATA_ACQUISITION_FAILED);
+			result.error(ModuleErrorCode.SLIENT_FAILED);
+			return result;
+		}
+		groupMemeberOperationService.saveMemberOperation(slientMemberFormDTO.getUserId(), MemberStateConstant.SILENT, resiGroupMemberEntity);
+		//3:用户消息(user_message)表新增消息数据
+		ResiGroupEntity resiGroupEntity = resiGroupService.selectById(resiGroupMemberEntity.getResiGroupId());
+		if (null == resiGroupEntity) {
+			logger.error(ModuleErrorCode.DATA_ACQUISITION_FAILED);
+			result.error(ModuleErrorCode.SLIENT_FAILED);
+			return result;
+		}
+		UserMessageFormDTO userMessageFormDTO = new UserMessageFormDTO();
+		userMessageFormDTO.setCustomerId(resiGroupEntity.getCustomerId());
+		userMessageFormDTO.setGridId(resiGroupEntity.getGridId());
+		//被禁言用户Id
+		userMessageFormDTO.setUserId(resiGroupMemberEntity.getCustomerUserId());
+		userMessageFormDTO.setApp(slientMemberFormDTO.getApp());
+		userMessageFormDTO.setTitle(UserMessageConstant.GROUP_TITLE);
+		DateFormat df = new SimpleDateFormat("yyyy.MM.dd hh:mm");
+		Calendar c = Calendar.getInstance();
+		//当前时间加7天
+		c.add(Calendar.DAY_OF_WEEK, Calendar.DAY_OF_WEEK);
+		StringBuffer dateStr = new StringBuffer(df.format(new Date())).append("-").append(df.format(c.getTime()));
+		String messageContent=String.format(UserMessageConstant.SLIENT_IN_GROUP, dateStr);
+		userMessageFormDTO.setMessageContent(messageContent);
+		userMessageFormDTO.setReadFlag(ReadFlagConstant.UN_READ);
+		messageFeignClient.saveUserMessage(userMessageFormDTO);
+		result.setMsg(GroupMemberConstant.SLIENT_SUCCESS);
+        return result;
+    }
+
 }

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

@@ -21,18 +21,17 @@ package com.epmet.modules.topic.service.impl;
 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.FieldConstant;
 import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.redis.RedisUtils;
 import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.ConvertUtils;
-import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.dto.form.UserResiInfoFormDTO;
 import com.epmet.dto.form.UserResiInfoListFormDTO;
 import com.epmet.dto.result.UserResiInfoResultDTO;
-import com.epmet.modules.constant.UserMessageConstant;
+import com.epmet.modules.constant.GroupMemberConstant;
-import com.epmet.modules.exception.ModuleErrorCode;
 import com.epmet.modules.feign.EpmetUserFeignClient;
 import com.epmet.modules.group.dao.ResiGroupDao;
 import com.epmet.modules.group.dao.ResiGroupStatisticalDao;
@@ -64,7 +63,6 @@ import com.epmet.resi.group.dto.topic.result.ResiTopicInfoResultDTO;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.bouncycastle.math.raw.Mod;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -674,7 +672,7 @@ public class ResiTopicServiceImpl extends BaseServiceImpl<ResiTopicDao, ResiTopi
             resiTopicOperationEntity = new ResiTopicOperationEntity();
             resiTopicOperationEntity.setTopicId(dto.getId());
             resiTopicOperationEntity.setOperationType(TopicConstant.HIDDEN);
-            resiTopicOperationEntity.setOperationReason(ModuleErrorCode.DELETE_MEMBER_REASON);
+            resiTopicOperationEntity.setOperationReason(GroupMemberConstant.DELETE_MEMBER_REASON);
             resiTopicOperationEntity.setDelFlag(NumConstant.ZERO_STR);
             resiTopicOperationEntity.setRevision(NumConstant.ZERO);
             resiTopicOperationEntity.setCreatedBy(removeMemberFormDTO.getUserId());

epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/constant/PartyMemberConstant.java

@@ -69,7 +69,7 @@ public interface PartyMemberConstant {
 	/**
 	 * 手机号比对结果小部分相同最低值
 	 */
-	Double MOBILE_SMALL = 5.0;
+	Double MOBILE_SMALL = 4.0;
 
 	/**
 	 * 姓名比对结果大部分相同最低值

epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartyMemberConfirmServiceImpl.java

@@ -189,6 +189,7 @@ public class PartyMemberConfirmServiceImpl implements PartyMemberConfirmService
 			//添加用户党员角色关系
 			UserRoleDTO userRole = new UserRoleDTO();
 			userRole.setCustomerId(partyMemberInfoDTO.getCustomerId());
+			userRole.setGridId("all");
 			userRole.setUserId(partyMemberInfoDTO.getUserId());
 			userRole.setRoleKey(EpmetRoleKeyConstant.PARTYMEMBER);
 			userRole.setApp(partyMemberInfoDTO.getApp());

epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/warmhearted/constant/ResiWarmheartedVisitConstant.java

@@ -46,8 +46,17 @@ public interface ResiWarmheartedVisitConstant {
      */
     String REJECTED = "rejected";
 
+    String RESI_WARM_INIT = "您的信息已提交成功，请等待后台审核。";
+
+    String RESI_WARM_SUBMIT = "热心居民信息已提交成功，请等待后台审核。";
+
     /**
      * 数据库操作异常
      */
     String OPERATION_EXCEPTION = "数据库操作异常";
+
+    /**
+     * 数据库操作异常
+     */
+    String REPEAT_EXCEPTION = "已存在待审核的申请，不能重复申请";
 }

epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/warmhearted/service/impl/ResiWarmheartedApplyServiceImpl.java

@@ -157,8 +157,8 @@ public class ResiWarmheartedApplyServiceImpl extends BaseServiceImpl<ResiWarmhea
             resiWarmheartedResultDTO.setIsApplied(NumConstant.ZERO_STR);
         } else {
             resiWarmheartedResultDTO.setIsApplied(NumConstant.ONE_STR);
-            result.setCode(EpmetErrorCode.RESI_WARM_INIT.getCode());
+            result.setCode(NumConstant.ZERO);
-            result.setMsg(EpmetErrorCode.RESI_WARM_INIT.getMsg());
+            result.setMsg(ResiWarmheartedVisitConstant.RESI_WARM_INIT);
         }
         return result.ok(resiWarmheartedResultDTO);
     }
@@ -167,12 +167,21 @@ public class ResiWarmheartedApplyServiceImpl extends BaseServiceImpl<ResiWarmhea
     @Transactional(rollbackFor = Exception.class)
     public Result submit(ResiWarmheartedSubmitFormDTO formDTO) {
         Result result = new Result();
-        //1:将申请记录存入热心居民申请表中
+        //0:为防止前台点击多次提交 先查询一下是否有已提交数据
-        saveResiWarmApply(formDTO);
+        ResiWarmheartedFormDTO ResiWarmheartedFormDTO = ConvertUtils.sourceToTarget(formDTO, ResiWarmheartedFormDTO.class);
-        //2:将最后一次操作行为更新到热心居民申请行为记录表中
+        ResiWarmheartedFormDTO.setAuditStatus(ResiWarmheartedVisitConstant.REJECTED);
-        resiWarmheartedVisitService.updateResiWarmVisit(formDTO);
+        ResiWarmheartedApplyDTO resiWarmheartedApplyDTO = resiWarmheartedApplyDao.selectResiWarmheartedApply(ResiWarmheartedFormDTO);
-        result.setCode(EpmetErrorCode.RESI_WARM_SUBMIT.getCode());
+        if (null != resiWarmheartedApplyDTO) {
-        result.setMsg(EpmetErrorCode.RESI_WARM_SUBMIT.getMsg());
+            result.error(ResiWarmheartedVisitConstant.REPEAT_EXCEPTION);
+            return result;
+        }else{
+            //1:将申请记录存入热心居民申请表中
+            saveResiWarmApply(formDTO);
+            //2:将最后一次操作行为更新到热心居民申请行为记录表中
+            resiWarmheartedVisitService.updateResiWarmVisit(formDTO);
+            result.setCode(NumConstant.ZERO);
+            result.setMsg(ResiWarmheartedVisitConstant.RESI_WARM_SUBMIT);
+        }
         return result;
     }
 
@@ -222,6 +231,8 @@ public class ResiWarmheartedApplyServiceImpl extends BaseServiceImpl<ResiWarmhea
             dto.setApp(AppClientConstant.APP_RESI);
             //角色-热心居民
             dto.setRoleKey(EpmetRoleKeyConstant.WARMHEARTED);
+            //角色表新增网格Id
+            dto.setGridId(resiWarmheartedApplyEntity.getGridId());
             result = epmetUserFeignClient.saveUserRole(dto);
         }
         return result;

epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partymember/PartymemberInfoDao.xml

@@ -41,7 +41,7 @@
           AND pi.GRID_ID = #{gridId}
           AND pi.USER_ID = #{userId}
           AND pi.DEL_FLAG = 0
-          AND pcm.AUDIT_STATUS = 'under_auditting'
+          AND ( pcm.AUDIT_STATUS = 'under_auditting' OR pi.ORGANIZATION_TYPE IS NULL )
     </select>
     <select id="selectPartyMemberInfoByMobile"
             parameterType="com.epmet.modules.partymember.entity.PartymemberInfoEntity"

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/UserRoleDTO.java

@@ -44,6 +44,11 @@ public class UserRoleDTO implements Serializable {
      */
 	private String customerId;
 
+	/**
+	 * 网格Id (customer_grid.id)
+	 */
+	private String gridId;
+
     /**
      * 用户Id user.id
      */

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/UserRoleFormDTO.java

@@ -6,7 +6,7 @@ import javax.validation.constraints.NotBlank;
 import java.io.Serializable;
 
 /**
- * @Description
+ * @Description 查询用户在当前网格下拥有的角色信息，入参DTO
  * @ClassName UserRoleFormDTO
  * @Author wangc
  * @date 2020.03.30 15:26
@@ -22,6 +22,9 @@ public class UserRoleFormDTO implements Serializable{
     @NotBlank(message = "客户Id不能为空")
     private String customerId;
 
+    @NotBlank(message = "网格id不能为空")
+    private String gridId;
+
     @NotBlank(message = "用户来源app不能为空")
     private String app;
 

epmet-user/epmet-user-server/src/main/java/com/epmet/constant/UserRoleConstant.java

@@ -0,0 +1,14 @@
+package com.epmet.constant;
+
+/**
+ * @Description
+ * @IntefaceName UserRoleConstant
+ * @Author sun
+ */
+public interface UserRoleConstant {
+
+	/**
+	 * 角色表对应的是居民角色时grid_id的默认值
+	 */
+	String DEFAULT_GRID_ID = "all";
+}

epmet-user/epmet-user-server/src/main/java/com/epmet/entity/UserRoleEntity.java

@@ -18,13 +18,10 @@
 package com.epmet.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
-
 /**
  * 用户角色关系表 
  *
@@ -43,6 +40,11 @@ public class UserRoleEntity extends BaseEpmetEntity {
      */
 	private String customerId;
 
+	/**
+	 * 网格Id (customer_grid.id)
+	 */
+	private String gridId;
+
     /**
      * 用户Id user.id
      */

epmet-user/epmet-user-server/src/main/java/com/epmet/excel/UserRoleExcel.java

@@ -37,6 +37,9 @@ public class UserRoleExcel {
     @Excel(name = "客户Id customer.id")
     private String customerId;
 
+    @Excel(name = "网格ID")
+    private String gridId;
+
     @Excel(name = "用户Id user.id")
     private String userId;
 

epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/RegisterRelationServiceImpl.java

@@ -249,6 +249,7 @@ public class RegisterRelationServiceImpl extends BaseServiceImpl<RegisterRelatio
         UserRoleFormDTO userRoleFormDTO = new UserRoleFormDTO();
         userRoleFormDTO.setUserId(enterGridFormDTO.getUserId());
         userRoleFormDTO.setCustomerId(enterGridFormDTO.getCustomerId());
+        userRoleFormDTO.setGridId(enterGridFormDTO.getGridId());
         List<UserRoleResultDTO> roleList =  userRoleDao.getUserRoleInfo(userRoleFormDTO);
         List<String> roleListString = new ArrayList<>();
         for(UserRoleResultDTO role : roleList){

epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserResiInfoServiceImpl.java

@@ -30,6 +30,7 @@ import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.constant.UserConstant;
 import com.epmet.constant.UserResiRegisterConstant;
+import com.epmet.constant.UserRoleConstant;
 import com.epmet.dao.UserResiInfoDao;
 import com.epmet.dto.UserResiInfoDTO;
 import com.epmet.dto.UserRoleDTO;
@@ -191,6 +192,8 @@ public class UserResiInfoServiceImpl extends BaseServiceImpl<UserResiInfoDao, Us
         userRoleDTO.setUserId(userResiInfoDTO.getUserId());
         userRoleDTO.setApp(userResiInfoDTO.getApp());
         userRoleDTO.setRoleKey(EpmetRoleKeyConstant.REGISTERED_RESI);
+        //居民角色对应的网格Id存默认值-all
+		userRoleDTO.setGridId(UserRoleConstant.DEFAULT_GRID_ID);
         userRoleService.saveUserRole(userRoleDTO);
 	}
 

epmet-user/epmet-user-server/src/main/resources/mapper/UserRoleDao.xml

@@ -6,6 +6,7 @@
     <resultMap type="com.epmet.entity.UserRoleEntity" id="userRoleMap">
         <result property="id" column="ID"/>
         <result property="customerId" column="CUSTOMER_ID"/>
+        <result property="gridId" column="GRID_ID"/>
         <result property="userId" column="USER_ID"/>
         <result property="roleId" column="ROLE_ID"/>
         <result property="delFlag" column="DEL_FLAG"/>
@@ -40,6 +41,14 @@
                 AND
                 ur.CUSTOMER_ID = #{customerId}
             </if>
+            <if test='null != gridId and "" != gridId'>
+                AND
+                ( ur.GRID_ID = #{gridId} OR ur.GRID_ID = 'all' )
+            </if>
+            <if test='null == gridId or "" == gridId'>
+                AND
+                ur.GRID_ID = 'all'
+            </if>
         </where>
 
     </select>