From 08c3d5f3d953a4da9ce4bed2394ba122c4560884 Mon Sep 17 00:00:00 2001 From: wangchao Date: Tue, 2 Jun 2020 10:26:29 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B1=85=E6=B0=91=E7=AB=AF=E6=9F=A5=E7=9C=8B?= =?UTF-8?q?=E8=AF=9D=E9=A2=98=E8=AF=A6=E6=83=85=E6=97=B6=EF=BC=8C=E5=A6=82?= =?UTF-8?q?=E6=9E=9C=E8=AF=9D=E9=A2=98=E5=B7=B2=E5=85=B3=E9=97=AD=EF=BC=8C?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E5=85=B3=E9=97=AD=E7=9A=84=E8=AF=A6=E6=83=85?= =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../commons/tools/constant/NumConstant.java | 1 + .../result/ResiTopicClosingMsgResultDTO.java | 32 +++++++++++++++++ .../ResiTopicIncludeIssueDetailResultDTO.java | 5 +++ .../service/impl/ResiTopicServiceImpl.java | 34 ++++++++++++++++--- .../epmet/modules/utils/ModuleConstant.java | 9 +++++ 5 files changed, 76 insertions(+), 5 deletions(-) create mode 100644 epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/result/ResiTopicClosingMsgResultDTO.java diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/constant/NumConstant.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/constant/NumConstant.java index 5f13d2bb81..2e67bb3098 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/constant/NumConstant.java +++ b/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"; diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/result/ResiTopicClosingMsgResultDTO.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/result/ResiTopicClosingMsgResultDTO.java new file mode 100644 index 0000000000..ab8262e70c --- /dev/null +++ b/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; + +} diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/result/ResiTopicIncludeIssueDetailResultDTO.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/result/ResiTopicIncludeIssueDetailResultDTO.java index 4ac316638c..988d319ad8 100644 --- a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/result/ResiTopicIncludeIssueDetailResultDTO.java +++ b/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; } diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java index 718fe179a5..4e3c3578b2 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java +++ b/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 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 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().ok(resultDTO); } diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/utils/ModuleConstant.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/utils/ModuleConstant.java index 8fd8c6954f..2d1bcc545f 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/utils/ModuleConstant.java +++ b/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"; }