diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/StartPatrolFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/StartPatrolFormDTO.java index 2c723e6177..e0c6ac7b9a 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/StartPatrolFormDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/StartPatrolFormDTO.java @@ -1,8 +1,10 @@ package com.epmet.dto.form; +import com.epmet.commons.tools.validator.group.CustomerClientShowGroup; import lombok.Data; import lombok.NoArgsConstructor; +import javax.validation.constraints.NotBlank; import java.io.Serializable; /** @@ -15,17 +17,22 @@ import java.io.Serializable; public class StartPatrolFormDTO implements Serializable { private static final long serialVersionUID = -2765639550834711582L; + public interface StartPatrol extends CustomerClientShowGroup {} + /** * 网格id */ + @NotBlank(message = "网格Id不能为空",groups = StartPatrol.class) private String gridId; /** * 纬度 */ + @NotBlank(message = "位置维度不能为空",groups = StartPatrol.class) private String latitude; /** * 经度 */ + @NotBlank(message = "位置经度不能为空",groups = StartPatrol.class) private String longitude; /** * 速度,如果拿不到默认0 diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/StaffPatrolController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/StaffPatrolController.java index e8f37f0a2e..c9bcc9d905 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/StaffPatrolController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/StaffPatrolController.java @@ -82,6 +82,7 @@ public class StaffPatrolController { @PostMapping("startpatrol") @RequirePermission(requirePermission = RequirePermissionEnum.WORK_GRASSROOT_GOVERN_PATROL) public Result startPatrol(@LoginUser TokenDto tokenDto, @RequestBody StartPatrolFormDTO formDTO) { + ValidatorUtils.validateEntity(formDTO, StartPatrolFormDTO.StartPatrol.class); StartPatrolResultDTO result = staffPatrolRecordService.startPatrol(tokenDto, formDTO); return new Result().ok(result); diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcUserChangeRecordServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcUserChangeRecordServiceImpl.java index d9662fdc8b..caca478526 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcUserChangeRecordServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcUserChangeRecordServiceImpl.java @@ -134,6 +134,14 @@ public class IcUserChangeRecordServiceImpl extends BaseServiceImpl(list, pageInfo.getTotal()); @@ -265,4 +273,4 @@ public class IcUserChangeRecordServiceImpl extends BaseServiceImpl