elink-star
/
ShibeiWorkPlatform
8
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

日期格式修改，用户信息修改

dev_shibei_match
wangchao 6 years ago
parent
3e1d7b1626
commit
b6bea7692d
8 changed files with 81 additions and 15 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/security/config/WebMvcConfig.java
  2. 2
      epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/DateUtils.java
  3. 2
      epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/result/ResiTopicInfoResultDTO.java
  4. 2
      epmet-module/resi-group/resi-group-server/pom.xml
  5. 34
      epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicCommentServiceImpl.java
  6. 48
      epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java
  7. 4
      epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/utils/ModuleConstant.java
  8. 2
      epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/RegisterRelationServiceImpl.java

2
epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/security/config/WebMvcConfig.java
View File

@ -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类型

2
epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/DateUtils.java
View File

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

2
epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/result/ResiTopicInfoResultDTO.java
View File

@ -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;
/**

2
epmet-module/resi-group/resi-group-server/pom.xml
View File

@ -142,7 +142,7 @@
<spring.datasource.druid.username>epmet</spring.datasource.druid.username>
<spring.datasource.druid.password>elink@833066</spring.datasource.druid.password>
<!-- redis配置 -->
<spring.redis.index>0</spring.redis.index>
<spring.redis.index>1</spring.redis.index>
<spring.redis.host>10.10.10.77</spring.redis.host>
<spring.redis.port>6379</spring.redis.port>
<spring.redis.password>123456</spring.redis.password>

34
epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicCommentServiceImpl.java
View File

@ -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<ResiTopicCommen
@Autowired
ResiGroupMemberService resiGroupMemberService;
@Autowired
EpmetUserFeignClient epmetUserFeignClient;
@Override
public PageData<ResiTopicCommentDTO> page(Map<String, Object> params) {
IPage<ResiTopicCommentEntity> page = baseDao.selectPage(
@ -174,7 +182,31 @@ public class ResiTopicCommentServiceImpl extends BaseServiceImpl<ResiTopicCommen
@Override
public Result<List<ResiCommentResultDTO>> getCommentList(TokenDto tokenDto, ResiQueryCommentFormDTO commentFormDTO) {
commentFormDTO.setPageNo((commentFormDTO.getPageNo() - NumConstant.ONE) * commentFormDTO.getPageSize());
return new Result<List<ResiCommentResultDTO>>().ok(baseDao.getCommentList(commentFormDTO));
List<ResiCommentResultDTO> comments = baseDao.getCommentList(commentFormDTO);
if (null != comments && comments.size() > 0) {
List<String> userIdList = new ArrayList<>();
for (ResiCommentResultDTO comment : comments) {
userIdList.add(comment.getUserId());
}
UserResiInfoListFormDTO formDTO = new UserResiInfoListFormDTO();
formDTO.setUserIdList(userIdList);
Result<List<UserResiInfoResultDTO>> 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<List<ResiCommentResultDTO>>().ok(comments);
}

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

@ -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<ResiTopicDao, ResiTopi
if (null == tokenDto) {
return new Result().error(ModuleConstant.USER_NOT_NULL);
}
if(StringUtils.isBlank(groupId)){
if (StringUtils.isBlank(groupId)) {
return new Result<List<ResiTopicInfoResultDTO>>().error();
}
//1.查询话题列表
List<ResiTopicInfoResultDTO> 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<String> userIdList = new ArrayList<>();
for (ResiTopicInfoResultDTO topic : lastestTenTopics) {
userIdList.add(topic.getUserId());
}
UserResiInfoListFormDTO formDTO = new UserResiInfoListFormDTO();
formDTO.setUserIdList(userIdList);
Result<List<UserResiInfoResultDTO>> userResiInfoDTOListResult = epmetUserFeignClient.getUserResiInfoList(formDTO);
setUserInfo(userResiInfoDTOListResult, lastestTenTopics);
}
return new Result<List<ResiTopicInfoResultDTO>>().ok(lastestTenTopics);
}
@ -294,9 +300,19 @@ public class ResiTopicServiceImpl extends BaseServiceImpl<ResiTopicDao, ResiTopi
List<ResiTopicInfoResultDTO> pastTopics =
baseDao.getPastTopics(topicPageFormDTO);
//2.遍历用户信息
if (null != pastTopics && pastTopics.size() > 0) {
//2.遍历用户信息
List<String> userIdList = new ArrayList<>();
for (ResiTopicInfoResultDTO topic : pastTopics) {
userIdList.add(topic.getUserId());
}
UserResiInfoListFormDTO formDTO = new UserResiInfoListFormDTO();
formDTO.setUserIdList(userIdList);
Result<List<UserResiInfoResultDTO>> userResiInfoDTOListResult = epmetUserFeignClient.getUserResiInfoList(formDTO);
setUserInfo(userResiInfoDTOListResult, pastTopics);
}
return new Result<List<ResiTopicInfoResultDTO>>().ok(pastTopics);
}
@ -445,7 +461,6 @@ public class ResiTopicServiceImpl extends BaseServiceImpl<ResiTopicDao, ResiTopi
//2.查询话题附件
QueryWrapper<ResiTopicAttachmentEntity> wrapper = new QueryWrapper<>();
wrapper.eq(TopicConstant.TOPIC_ID,topicId);
//wrapper.eq(TopicConstant.DEL_FLAG,NumConstant.ZERO_STR);
wrapper.orderByAsc(TopicConstant.SORT);
List<ResiTopicAttachmentEntity> attachments = resiTopicAttachmentDao.selectList(wrapper);
List<String> attachmentUrls = new ArrayList<>();
@ -553,4 +568,19 @@ public class ResiTopicServiceImpl extends BaseServiceImpl<ResiTopicDao, ResiTopi
}
}
public void setUserInfo(Result<List<UserResiInfoResultDTO>> userResiInfoDTOListResult,List<ResiTopicInfoResultDTO> 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;
}
}
}
}
}
}
}

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

@ -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="当前用户并非该组组员";
/**
* 逻辑删除标识 未删除

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

@ -234,7 +234,7 @@ public class RegisterRelationServiceImpl extends BaseServiceImpl<RegisterRelatio
userResiInfoFormDTO.setUserId(enterGridFormDTO.getUserId());
userResiInfoFormDTO.setCustomerId(enterGridFormDTO.getCustomerId());
UserResiInfoResultDTO userResiInfo = userResiInfoDao.selectUserResiInfoDTO(userResiInfoFormDTO);
resultObj.setNickname(userResiInfo.getSurname() + userResiInfo.getName());
resultObj.setNickname(userResiInfo.getShowName());
}

Write Preview
Loading…
Cancel
Save