diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/security/config/WebMvcConfig.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/security/config/WebMvcConfig.java index d1af449333..549530747b 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/security/config/WebMvcConfig.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/security/config/WebMvcConfig.java @@ -66,7 +66,7 @@ public class WebMvcConfig implements WebMvcConfigurer { //日期格式转换 mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false); - mapper.setDateFormat(new SimpleDateFormat(DateUtils.DATE_TIME_PATTERN)); + mapper.setDateFormat(new SimpleDateFormat(DateUtils.DATE_TIME_PATTERN_END_WITH_MINUTE)); mapper.setTimeZone(TimeZone.getTimeZone("GMT+8")); //Long类型转String类型 diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/DateUtils.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/DateUtils.java index 097da00d3e..e4fcc31010 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/DateUtils.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/DateUtils.java @@ -31,6 +31,8 @@ public class DateUtils { public final static String DATE_TIME_PATTERN = "yyyy-MM-dd HH:mm:ss"; /** 时间格式(yyyyMMddHHmmss) */ public final static String DATE_TIME_NO_SPLIT = "yyyyMMddHHmmss"; + /** 时间格式(yyyy-MM-dd HH:mm) */ + public final static String DATE_TIME_PATTERN_END_WITH_MINUTE = "yyyy-MM-dd HH:mm"; /** * 日期格式化 日期格式为：yyyy-MM-dd diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/result/ResiTopicInfoResultDTO.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/result/ResiTopicInfoResultDTO.java index a28028c52d..da3912ce18 100644 --- a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/result/ResiTopicInfoResultDTO.java +++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/result/ResiTopicInfoResultDTO.java @@ -1,6 +1,7 @@ package com.epmet.resi.group.dto.topic.result; import com.alibaba.fastjson.annotation.JSONField; +import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; import java.io.Serializable; @@ -40,6 +41,7 @@ public class ResiTopicInfoResultDTO implements Serializable{ * 发布时间 yyyy-MM-dd HH:mm * */ @JSONField(format="yyyy-MM-dd HH:mm") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm") private String releaseTime; /** diff --git a/epmet-module/resi-group/resi-group-server/pom.xml b/epmet-module/resi-group/resi-group-server/pom.xml index bb20374132..a9a39329a3 100644 --- a/epmet-module/resi-group/resi-group-server/pom.xml +++ b/epmet-module/resi-group/resi-group-server/pom.xml @@ -142,7 +142,7 @@ epmet elink@833066 - 0 + 1 10.10.10.77 6379 123456 diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicCommentServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicCommentServiceImpl.java index 513fd46fca..7e3ab00d7b 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicCommentServiceImpl.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicCommentServiceImpl.java @@ -27,7 +27,10 @@ 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.UserResiInfoListFormDTO; +import com.epmet.dto.result.UserResiInfoResultDTO; import com.epmet.modules.comment.entity.ResiTopicCommentEntity; +import com.epmet.modules.feign.EpmetUserFeignClient; import com.epmet.modules.member.service.ResiGroupMemberService; import com.epmet.modules.topic.dao.ResiTopicCommentDao; import com.epmet.modules.topic.service.ResiTopicCommentService; @@ -41,11 +44,13 @@ import com.epmet.resi.group.dto.member.ResiGroupMemberDTO; import com.epmet.resi.group.dto.topic.ResiTopicCommentDTO; import com.epmet.resi.group.dto.topic.ResiTopicDTO; import com.epmet.resi.group.dto.topic.form.ResiPublishCommentFormDTO; +import com.epmet.resi.group.dto.topic.result.ResiTopicInfoResultDTO; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import java.util.ArrayList; import java.util.Arrays; import java.util.List; import java.util.Map; @@ -65,6 +70,9 @@ public class ResiTopicCommentServiceImpl extends BaseServiceImpl page(Map params) { IPage page = baseDao.selectPage( @@ -174,7 +182,31 @@ public class ResiTopicCommentServiceImpl extends BaseServiceImpl> getCommentList(TokenDto tokenDto, ResiQueryCommentFormDTO commentFormDTO) { commentFormDTO.setPageNo((commentFormDTO.getPageNo() - NumConstant.ONE) * commentFormDTO.getPageSize()); - return new Result>().ok(baseDao.getCommentList(commentFormDTO)); + List comments = baseDao.getCommentList(commentFormDTO); + if (null != comments && comments.size() > 0) { + + List userIdList = new ArrayList<>(); + for (ResiCommentResultDTO comment : comments) { + userIdList.add(comment.getUserId()); + } + UserResiInfoListFormDTO formDTO = new UserResiInfoListFormDTO(); + formDTO.setUserIdList(userIdList); + Result> userResiInfoDTOListResult = epmetUserFeignClient.getUserResiInfoList(formDTO); + if (userResiInfoDTOListResult.success() && null != userResiInfoDTOListResult.getData()) { + if (userResiInfoDTOListResult.getData().size() > 0) { + for (UserResiInfoResultDTO resiUser : userResiInfoDTOListResult.getData()) { + for (ResiCommentResultDTO comment : comments) { + if (StringUtils.equals(comment.getUserId(), resiUser.getUserId())) { + comment.setCommentUserHeadPhoto(resiUser.getHeadPhoto()); + comment.setCommentUserName(resiUser.getShowName()); + break; + } + } + } + } + } + } + return new Result>().ok(comments); } 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 5a0e43bd73..bc34ff07a9 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 @@ -28,6 +28,7 @@ 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.feign.EpmetUserFeignClient; import com.epmet.modules.group.dao.ResiGroupDao; @@ -253,21 +254,26 @@ public class ResiTopicServiceImpl extends BaseServiceImpl>().error(); } //1.查询话题列表 List lastestTenTopics = - baseDao.getLatestTenTopics(groupId,tokenDto.getUserId()); + baseDao.getLatestTenTopics(groupId, tokenDto.getUserId()); - //2.遍历存储用户信息 - ResiGroupEntity group = resiGroupDao.selectById(groupId); - if(null != group && ModuleConstant.DEL_FLAG.equals(group.getDelFlag())){ + if(null != lastestTenTopics && lastestTenTopics.size() > 0) { + //2.遍历存储用户信息 + List userIdList = new ArrayList<>(); + for (ResiTopicInfoResultDTO topic : lastestTenTopics) { + userIdList.add(topic.getUserId()); } - - + UserResiInfoListFormDTO formDTO = new UserResiInfoListFormDTO(); + formDTO.setUserIdList(userIdList); + Result> userResiInfoDTOListResult = epmetUserFeignClient.getUserResiInfoList(formDTO); + setUserInfo(userResiInfoDTOListResult, lastestTenTopics); + } return new Result>().ok(lastestTenTopics); } @@ -294,9 +300,19 @@ public class ResiTopicServiceImpl extends BaseServiceImpl pastTopics = baseDao.getPastTopics(topicPageFormDTO); - //2.遍历用户信息 + if (null != pastTopics && pastTopics.size() > 0) { + //2.遍历用户信息 + List userIdList = new ArrayList<>(); + for (ResiTopicInfoResultDTO topic : pastTopics) { + userIdList.add(topic.getUserId()); + } + UserResiInfoListFormDTO formDTO = new UserResiInfoListFormDTO(); + formDTO.setUserIdList(userIdList); + Result> userResiInfoDTOListResult = epmetUserFeignClient.getUserResiInfoList(formDTO); + setUserInfo(userResiInfoDTOListResult, pastTopics); + } return new Result>().ok(pastTopics); } @@ -445,7 +461,6 @@ public class ResiTopicServiceImpl extends BaseServiceImpl wrapper = new QueryWrapper<>(); wrapper.eq(TopicConstant.TOPIC_ID,topicId); - //wrapper.eq(TopicConstant.DEL_FLAG,NumConstant.ZERO_STR); wrapper.orderByAsc(TopicConstant.SORT); List attachments = resiTopicAttachmentDao.selectList(wrapper); List attachmentUrls = new ArrayList<>(); @@ -553,4 +568,19 @@ public class ResiTopicServiceImpl extends BaseServiceImpl> userResiInfoDTOListResult,List topics){ + if(userResiInfoDTOListResult.success() && null != userResiInfoDTOListResult.getData()){ + if(userResiInfoDTOListResult.getData().size() > 0){ + for(UserResiInfoResultDTO resiUser : userResiInfoDTOListResult.getData()){ + for(ResiTopicInfoResultDTO topic : topics){ + if(StringUtils.equals(topic.getUserId(),resiUser.getUserId())){ + topic.setReleaseUserHeadPhoto(resiUser.getHeadPhoto()); + topic.setReleaseUserName(resiUser.getShowName()); + break; + } + } + } + } + } + } } 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 95d28cff53..ce0a524dc1 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 @@ -69,9 +69,9 @@ public interface ModuleConstant extends Constant { String CUSTOMERID_NOT_NULL="客户id不能为空"; /** - * 当前用户并非改组组员 + * 当前用户并非该组组员 * */ - String NOT_BELONG_TO_CURRENT_GROUP="当前用户并非改组组员"; + String NOT_BELONG_TO_CURRENT_GROUP="当前用户并非该组组员"; /** * 逻辑删除标识 未删除 diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/RegisterRelationServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/RegisterRelationServiceImpl.java index 986ba1a93c..790793dd10 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/RegisterRelationServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/RegisterRelationServiceImpl.java @@ -234,7 +234,7 @@ public class RegisterRelationServiceImpl extends BaseServiceImpl