居民注册

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/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

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

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;
 
 /**
  * 群组成员关系表
@@ -425,19 +427,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 +452,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());