From af6c11252f16a07822a9ff7c53deaa7923ce3556 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Mon, 26 Apr 2021 11:00:13 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E8=BF=94=E5=9B=9E=E6=97=B6=E9=97=B4?= =?UTF-8?q?=E6=A0=BC=E5=BC=8F=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/group/result/AllGroupListResultDTO.java | 5 ++--- .../dto/notice/result/NoticeDetailResultDTO.java | 16 +++++++++------- .../notice/service/impl/NoticeServiceImpl.java | 3 ++- 3 files changed, 13 insertions(+), 11 deletions(-) diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/result/AllGroupListResultDTO.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/result/AllGroupListResultDTO.java index 8ec0a07554..d31e01cab8 100644 --- a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/result/AllGroupListResultDTO.java +++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/result/AllGroupListResultDTO.java @@ -5,9 +5,8 @@ import lombok.Data; import java.io.Serializable; /** - * @Description 推荐小组查询返参 - * @Author yinzuomei - * @Date 2020/3/28 17:11 + * @Author sun + * @Description 所有小组查询-接口返参 */ @Data public class AllGroupListResultDTO implements Serializable { diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/notice/result/NoticeDetailResultDTO.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/notice/result/NoticeDetailResultDTO.java index eec820ee53..8709f48263 100644 --- a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/notice/result/NoticeDetailResultDTO.java +++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/notice/result/NoticeDetailResultDTO.java @@ -1,15 +1,11 @@ package com.epmet.resi.group.dto.notice.result; -import com.epmet.resi.group.dto.notice.form.AddNoticeFormDTO; -import com.epmet.resi.group.dto.topic.form.FileDTO; -import com.fasterxml.jackson.annotation.JsonIgnore; +import com.alibaba.fastjson.annotation.JSONField; import lombok.Data; import lombok.NoArgsConstructor; -import org.hibernate.validator.constraints.Length; -import javax.validation.constraints.NotBlank; import java.io.Serializable; -import java.util.ArrayList; +import java.util.Date; import java.util.List; /** @@ -39,7 +35,13 @@ public class NoticeDetailResultDTO implements Serializable { /** * 发布时间yyyy-MM-dd HH:mm */ - private String releaseTime; + @JSONField(format="yyyy-MM-dd HH:mm") + private Date releaseTime; + /** + * 通知过期时间(此时间需大于变更时间) + */ + @JSONField(format="yyyy-MM-dd HH:mm") + private Date expirationTime; /** * 发布人头像 */ diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/notice/service/impl/NoticeServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/notice/service/impl/NoticeServiceImpl.java index 9f91a71585..871f2c23f0 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/notice/service/impl/NoticeServiceImpl.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/notice/service/impl/NoticeServiceImpl.java @@ -469,7 +469,8 @@ public class NoticeServiceImpl extends BaseServiceImpl resultDTO.setTitle(entity.getTitle()); resultDTO.setContent(entity.getContent()); resultDTO.setIsChange(entity.getIsChange()); - resultDTO.setReleaseTime(entity.getChangeTime().toString()); + resultDTO.setReleaseTime(entity.getChangeTime()); + resultDTO.setExpirationTime(entity.getExpirationTime()); StringBuffer name = new StringBuffer(); StringBuffer url = new StringBuffer(); resultDTOList.forEach(user -> { From 34f5546e3e99fc8922cff3d0620f854f65a40064 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Mon, 26 Apr 2021 11:05:23 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20groupActInfo=E7=9A=84?= =?UTF-8?q?=E6=97=B6=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/group/ResiGroupDao.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/group/ResiGroupDao.xml b/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/group/ResiGroupDao.xml index f1b0327b3c..4076d519be 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/group/ResiGroupDao.xml +++ b/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/group/ResiGroupDao.xml @@ -574,7 +574,7 @@ (SELECT ai.ID, ai.CREATED_BY AS userId, - DATE_FORMAT(ai.CREATED_TIME,'%Y-%m-%d %H:%i:%s') AS releaseTime, + DATE_FORMAT(ai.CHANGED_TIME,'%Y-%m-%d %H:%i:%s') AS releaseTime, IFNULL(ac.CONTENT,'') AS content, ai.`STATUS` AS status, '' AS issueId, @@ -586,7 +586,7 @@ LEFT JOIN group_act_content ac2 ON ac2.GROUP_ACT_ID = ai.ID AND ac2.CONTENT_TYPE = 'img' AND ac2.DEL_FLAG = 0 AND ac2.SORT = 1 WHERE ai.DEL_FLAG = '0' AND ai.GROUP_ID = #{groupId} - ORDER BY ai.CREATED_TIME DESC + ORDER BY ai.CHANGED_TIME DESC LIMIT 10) UNION ALL (SELECT @@ -736,7 +736,7 @@ (SELECT ai.ID, ai.CREATED_BY AS userId, - DATE_FORMAT(ai.CREATED_TIME,'%Y-%m-%d %H:%i:%s') AS releaseTime, + DATE_FORMAT(ai.CHANGED_TIME,'%Y-%m-%d %H:%i:%s') AS releaseTime, IFNULL(ac.CONTENT,'') AS content, 'act' AS contentType, IFNULL(ac2.CONTENT,'') AS firstPhoto, @@ -797,7 +797,7 @@ (SELECT ai.ID, ai.CREATED_BY AS userId, - DATE_FORMAT(ai.CREATED_TIME,'%Y-%m-%d %H:%i:%s') AS releaseTime, + DATE_FORMAT(ai.CHANGED_TIME,'%Y-%m-%d %H:%i:%s') AS releaseTime, IFNULL(ac.CONTENT,'') AS content, ai.`STATUS` AS status, '' AS issueId, From 918117d71057e10e4062e0a5a410fff8f13c3294 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Mon, 26 Apr 2021 13:28:53 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E9=80=9A=E7=9F=A5?= =?UTF-8?q?=E8=AF=84=E8=AE=BA=E8=BF=94=E5=8F=82=E5=90=8D=E5=AD=97=E9=87=8D?= =?UTF-8?q?=E5=A4=8D=E4=B8=BA=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/notice/service/impl/NoticeCommentServiceImpl.java | 1 + 1 file changed, 1 insertion(+) diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/notice/service/impl/NoticeCommentServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/notice/service/impl/NoticeCommentServiceImpl.java index b4ee53de76..2ab3994891 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/notice/service/impl/NoticeCommentServiceImpl.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/notice/service/impl/NoticeCommentServiceImpl.java @@ -158,6 +158,7 @@ public class NoticeCommentServiceImpl extends BaseServiceImpl userIdList = resultList.stream().map(NoticeCommentListResultDTO::getUserId).collect(Collectors.toList()); + userIdList = userIdList.stream().distinct().collect(Collectors.toList()); Result> result = epmetUserOpenFeignClient.queryUserBaseInfo(userIdList); if (!result.success()) { throw new RenException("调用user服务，获取用户基础数据失败"); From 349ef81852bbcb8eacd43a3cdf1cf66def27b21e Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Mon, 26 Apr 2021 14:03:33 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E6=89=80=E6=9C=89=E6=97=B6=E9=97=B4?= =?UTF-8?q?=E9=83=BD=E5=88=B0=E7=A7=92=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../group/dto/notice/result/NoticeCommentListResultDTO.java | 2 +- .../resi/group/dto/notice/result/NoticeDetailResultDTO.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/notice/result/NoticeCommentListResultDTO.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/notice/result/NoticeCommentListResultDTO.java index c086df0f94..cb8602d897 100644 --- a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/notice/result/NoticeCommentListResultDTO.java +++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/notice/result/NoticeCommentListResultDTO.java @@ -34,7 +34,7 @@ public class NoticeCommentListResultDTO implements Serializable { /** * 评论时间 yyyy-MM-dd HH:mm * */ - @JSONField(format="yyyy-MM-dd HH:mm") + @JSONField(format="yyyy-MM-dd HH:mm:ss") private Date commentTime; /** * 用户Id 评论者Id diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/notice/result/NoticeDetailResultDTO.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/notice/result/NoticeDetailResultDTO.java index 8709f48263..61ba04c4f5 100644 --- a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/notice/result/NoticeDetailResultDTO.java +++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/notice/result/NoticeDetailResultDTO.java @@ -35,12 +35,12 @@ public class NoticeDetailResultDTO implements Serializable { /** * 发布时间yyyy-MM-dd HH:mm */ - @JSONField(format="yyyy-MM-dd HH:mm") + @JSONField(format="yyyy-MM-dd HH:mm:ss") private Date releaseTime; /** * 通知过期时间(此时间需大于变更时间) */ - @JSONField(format="yyyy-MM-dd HH:mm") + @JSONField(format="yyyy-MM-dd HH:mm:ss") private Date expirationTime; /** * 发布人头像 From e3b8f951038cdbd81f8bcf30479e70160aedad1c Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Mon, 26 Apr 2021 14:23:31 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E6=97=B6=E9=97=B4=E8=BF=94=E5=8F=82?= =?UTF-8?q?=E6=8D=A2=E4=B8=AA=E6=B3=A8=E8=A7=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../group/dto/notice/result/NoticeCommentListResultDTO.java | 3 ++- .../resi/group/dto/notice/result/NoticeDetailResultDTO.java | 5 +++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/notice/result/NoticeCommentListResultDTO.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/notice/result/NoticeCommentListResultDTO.java index cb8602d897..726289e144 100644 --- a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/notice/result/NoticeCommentListResultDTO.java +++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/notice/result/NoticeCommentListResultDTO.java @@ -1,6 +1,7 @@ package com.epmet.resi.group.dto.notice.result; import com.alibaba.fastjson.annotation.JSONField; +import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; import java.io.Serializable; @@ -34,7 +35,7 @@ public class NoticeCommentListResultDTO implements Serializable { /** * 评论时间 yyyy-MM-dd HH:mm * */ - @JSONField(format="yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date commentTime; /** * 用户Id 评论者Id diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/notice/result/NoticeDetailResultDTO.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/notice/result/NoticeDetailResultDTO.java index 61ba04c4f5..551b8eb7d6 100644 --- a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/notice/result/NoticeDetailResultDTO.java +++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/notice/result/NoticeDetailResultDTO.java @@ -1,6 +1,7 @@ package com.epmet.resi.group.dto.notice.result; import com.alibaba.fastjson.annotation.JSONField; +import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; import lombok.NoArgsConstructor; @@ -35,12 +36,12 @@ public class NoticeDetailResultDTO implements Serializable { /** * 发布时间yyyy-MM-dd HH:mm */ - @JSONField(format="yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date releaseTime; /** * 通知过期时间(此时间需大于变更时间) */ - @JSONField(format="yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date expirationTime; /** * 发布人头像 From 3688c0d27493470a071ce2142d2a0c9129dd032f Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Mon, 26 Apr 2021 14:33:11 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/modules/notice/service/impl/NoticeServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/notice/service/impl/NoticeServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/notice/service/impl/NoticeServiceImpl.java index 871f2c23f0..36a20ffde6 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/notice/service/impl/NoticeServiceImpl.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/notice/service/impl/NoticeServiceImpl.java @@ -294,7 +294,7 @@ public class NoticeServiceImpl extends BaseServiceImpl throw new RenException(String.format("小组通知变更，获取通知数据失败，通知Id->", formDTO.getNoticeId())); } //通知已过期时不允许再次变更 - if(entity.getChangeTime().before(new Date())){ + if(entity.getExpirationTime().before(new Date())){ throw new RenException(EpmetErrorCode.NOTICE_BE_OVERDUE.getCode()); }