Merge branches 'dev' and 'dev_bugfix' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_bugfix

epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/constant/NumConstant.java

@@ -39,6 +39,7 @@ public interface NumConstant {
     long TWO_L = 2L;
     long THREE_L = 3L;
     long FOUR_L = 4L;
+    long MINUS_ONE_L = -1L;
 
     String ZERO_STR = "0";
     String ONE_STR = "1";

epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/result/ResiTopicClosingMsgResultDTO.java

@@ -0,0 +1,32 @@
+package com.epmet.resi.group.dto.topic.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Description 关闭话题详情相关信息
+ * @ClassName ResiTopicClosingMsgResultDTO
+ * @Auth wangc
+ * @Date 2020-06-01 17:44
+ */
+@Data
+public class ResiTopicClosingMsgResultDTO implements Serializable {
+    private static final long serialVersionUID = 3959914139163088792L;
+
+    /**
+     * 关闭人（目前只有组长可以关闭话题）
+     * */
+    private String closeUserName;
+
+    /**
+     * 关闭时间
+     * */
+    private Long closeDateTime;
+
+    /**
+     * 关闭理由
+     * */
+    private String closeReason;
+
+}

epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/result/ResiTopicIncludeIssueDetailResultDTO.java

@@ -65,4 +65,9 @@ public class ResiTopicIncludeIssueDetailResultDTO implements Serializable {
      * 议题Id，当shiftIssueFlag为false时返回""
      * */
     private String issueId;
+
+    /**
+     * 关闭详情  如果没有关闭 对象里的字符串属性为String
+   * */
+    private ResiTopicClosingMsgResultDTO closeDetail;
 }

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

@@ -18,6 +18,7 @@
 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;
@@ -29,7 +30,6 @@ import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.commons.tools.utils.DateUtils;
 import com.epmet.commons.tools.utils.Result;
-import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.dto.CustomerGridDTO;
 import com.epmet.dto.form.*;
 import com.epmet.dto.result.CommonDataFilterResultDTO;
@@ -79,7 +79,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import javax.management.monitor.MonitorSettingException;
+
 import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.stream.Collectors;
@@ -523,15 +523,39 @@ public class ResiTopicServiceImpl extends BaseServiceImpl<ResiTopicDao, ResiTopi
         resultDTO.setTopicImgs(attachmentUrls);
 
         //3.拿取用户信息
-        ResiTopicDTO topic = get(topicId);
-        ResiGroupEntity group = resiGroupDao.selectById(topic.getGroupId());
+        //ResiTopicDTO topic = get(topicId);
+        ResiGroupEntity group = resiGroupDao.selectById(topicDetail.getGroupId());
         ResiGroupMemberInfoRedisDTO memberRedis =
-        resiGroupMemberRedis.get(group.getId(),topic.getCreatedBy());
+        resiGroupMemberRedis.get(group.getId(),topicDetail.getCreatedBy());
         if(null != memberRedis && StringUtils.isNotBlank(memberRedis.getUserId())){
             resultDTO.setReleaseUserName(StringUtils.isBlank(memberRedis.getUserShowName()) ? "" : memberRedis.getUserShowName());
             resultDTO.setReleaseUserHeadPhoto(StringUtils.isBlank(memberRedis.getUserHeadPhoto()) ? "" : memberRedis.getUserHeadPhoto());
         }
 
+        //4.话题关闭详情
+        ResiTopicClosingMsgResultDTO closeDetail = new ResiTopicClosingMsgResultDTO();
+        closeDetail.setCloseReason(ModuleConstant.EMPTY_STR);
+        closeDetail.setCloseUserName(ModuleConstant.EMPTY_STR);
+        closeDetail.setCloseDateTime(NumConstant.MINUS_ONE_L);
+        if(StringUtils.equals(ModuleConstant.TOPIC_STATUS_CLOSED,topicDetail.getStatus())){
+            QueryWrapper<ResiTopicOperationEntity> queryWrapper = new QueryWrapper<>();
+            queryWrapper.eq(FieldConstant.DEL_FLAG,NumConstant.ZERO_STR);
+            queryWrapper.eq(ModuleConstant.FILED_TOPIC_ID,topicDetail.getId());
+            queryWrapper.eq(ModuleConstant.FIELD_OPERATION_TYPE,ModuleConstant.TOPIC_STATUS_CLOSED);
+            queryWrapper.orderByDesc(FieldConstant.CREATED_TIME);
+            List<ResiTopicOperationEntity> records =
+            resiTopicOperationDao.selectList(queryWrapper);
+            if(null != records && records.size() > NumConstant.ZERO){
+                closeDetail.setCloseReason(records.get(0).getOperationReason());
+                closeDetail.setCloseDateTime(records.get(0).getCreatedTime().getTime()/NumConstant.ONE_THOUSAND);
+                ResiGroupMemberInfoRedisDTO closedBy =
+                        resiGroupMemberRedis.get(group.getId(),records.get(0).getCreatedBy());
+                if(null != closedBy){
+                    closeDetail.setCloseUserName(closedBy.getUserShowName());
+                }
+            }
+        }
+        resultDTO.setCloseDetail(closeDetail);
         return new Result<ResiTopicIncludeIssueDetailResultDTO>().ok(resultDTO);
     }
 

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/utils/ModuleConstant.java

@@ -267,6 +267,11 @@ public interface ModuleConstant extends Constant {
 	 * */
 	String TOPIC_OPERATION_TYPE_SHIFT_ISSUE = "shift_issue";
 
+	/**
+	 * 话题状态： 已关闭
+	 * */
+	String TOPIC_STATUS_CLOSED = "closed";
+
 	/**
 	 * 空字符串
 	 * */
@@ -317,4 +322,8 @@ public interface ModuleConstant extends Constant {
 	String NO_GROUP_CACHE_LOG_TEMPLATE = "没有相应的组缓存信息，组Id:【%s】";
 
 	String UPDATE_GROUP_CACHE_SUCCESSFULLY_LOG_TEMPLATE = "更新组缓存信息成功，组Id:【%s】";
+
+	String FILED_TOPIC_ID = "TOPIC_ID";
+
+	String FIELD_OPERATION_TYPE = "OPERATION_TYPE";
 }