From 66f7328fdf20deea1fa800e0123502afb7ea78e6 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Sun, 25 Apr 2021 09:35:43 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E7=AD=BE=E5=88=B0=E5=85=A5=E5=8F=82?= =?UTF-8?q?=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/resi/group/dto/act/form/SignInFormDTO.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/act/form/SignInFormDTO.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/act/form/SignInFormDTO.java index af00808a0f..f8ad90e67d 100644 --- a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/act/form/SignInFormDTO.java +++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/act/form/SignInFormDTO.java @@ -3,6 +3,7 @@ package com.epmet.resi.group.dto.act.form; import lombok.Data; import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; import java.io.Serializable; import java.math.BigDecimal; @@ -30,11 +31,13 @@ public class SignInFormDTO implements Serializable { /** * 签到地点-经度 */ + @NotNull(message ="经度不能为空",groups = AddUserInternalGroup.class) private BigDecimal longitude; /** * 签到地点-纬度 */ + @NotNull(message ="纬度不能为空",groups = AddUserInternalGroup.class) private BigDecimal latitude; @NotBlank(message = "tokenDto获取userId为空", groups = AddUserInternalGroup.class) From b750e2c933699a507359e3267755c3291aae644b Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Sun, 25 Apr 2021 09:42:43 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=94=99=E8=AF=AF?= =?UTF-8?q?=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/commons/tools/exception/EpmetErrorCode.java | 4 +++- .../epmet/modules/notice/controller/NoticeController.java | 3 ++- .../modules/notice/service/impl/NoticeServiceImpl.java | 6 ++++-- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java index fab6d1d2b0..7e37bb458e 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java @@ -177,7 +177,9 @@ public enum EpmetErrorCode { GROUP_ACT_CAN_NOT_COMMENT(8910,"当前活动,不能评论"), SIGN_IN_TIME_NOT_START(8911,"未到签到时间,不允许签到"), SIGN_IN_TIME_PASSED(8912,"当前时间已超过签到时间"), - INVITATION_NOT_EXIST(8913,"链接不存在"); + INVITATION_NOT_EXIST(8913,"链接不存在"), + NOTICE_EXPIRATION_TIME(8914,"通知过期时间不能早于当前时间"), + NOTICE_BE_OVERDUE(8915,"通知已过期不允许再次变更"); private int code; diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/notice/controller/NoticeController.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/notice/controller/NoticeController.java index fd4328ddaa..1f4d37d1df 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/notice/controller/NoticeController.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/notice/controller/NoticeController.java @@ -18,6 +18,7 @@ package com.epmet.modules.notice.controller; import com.epmet.commons.tools.annotation.LoginUser; +import com.epmet.commons.tools.exception.EpmetErrorCode; import com.epmet.commons.tools.exception.RenException; import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.utils.Result; @@ -63,7 +64,7 @@ public class NoticeController { public Result add(@LoginUser TokenDto tokenDto, @RequestBody AddNoticeFormDTO formDTO){ ValidatorUtils.validateEntity(formDTO, AddNoticeFormDTO.Add.class, AddNoticeFormDTO.AddUserShow.class); if(formDTO.getExpirationTime().before(new Date())){ - throw new RenException("通知过期时间不能早于当前时间"); + throw new RenException(EpmetErrorCode.NOTICE_EXPIRATION_TIME.getCode()); } formDTO.setUserId(tokenDto.getUserId()); noticeService.add(formDTO); 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 da7ffb59c2..9f91a71585 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 @@ -295,10 +295,12 @@ public class NoticeServiceImpl extends BaseServiceImpl } //通知已过期时不允许再次变更 if(entity.getChangeTime().before(new Date())){ - throw new RenException("通知已过期不允许再次变更"); + throw new RenException(EpmetErrorCode.NOTICE_BE_OVERDUE.getCode()); + } + //通知过期时间不能早于当前时间 if(formDTO.getExpirationTime().before(new Date())){ - throw new RenException("通知过期时间不能早于当前时间"); + throw new RenException(EpmetErrorCode.NOTICE_EXPIRATION_TIME.getCode()); } //2.文字、图片安全校验 From ca82d570733edbcc60ea6dbba6955dcac9eef840 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Sun, 25 Apr 2021 09:49:53 +0800 Subject: [PATCH 3/3] bugfix --- .../modules/act/service/impl/GroupActInfoServiceImpl.java | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/service/impl/GroupActInfoServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/service/impl/GroupActInfoServiceImpl.java index aecf370b48..3e1d9af54e 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/service/impl/GroupActInfoServiceImpl.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/service/impl/GroupActInfoServiceImpl.java @@ -75,10 +75,7 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.util.CollectionUtils; -import java.util.ArrayList; -import java.util.Date; -import java.util.List; -import java.util.UUID; +import java.util.*; import java.util.stream.Collectors; /** @@ -808,6 +805,8 @@ public class GroupActInfoServiceImpl extends BaseServiceImpl()); + actSummaryFormDTO.setTextList(new ArrayList<>()); actSummaryService.submitActSummary(actSummaryFormDTO); } //4、插入操作日志