From 573f35bfa891d01f939c3a6341c434862e1654d8 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Wed, 8 Apr 2020 15:05:53 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E6=B7=BB=E5=8A=A0=E5=85=A5?= =?UTF-8?q?=E5=8F=82=E5=BF=85=E8=A6=81=E5=8F=82=E6=95=B0=E9=9D=9E=E7=A9=BA?= =?UTF-8?q?=E5=88=A4=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/controller/CustomerStaffGridController.java | 1 + .../resiregister/controller/ResiRegisterController.java | 4 ++++ .../warmhearted/controller/ResiWarmheartedController.java | 3 +++ .../dto/warmhearted/form/ResiWarmheartedAuditFormDTO.java | 2 -- .../dto/warmhearted/form/ResiWarmheartedFormDTO.java | 1 - .../dto/warmhearted/form/ResiWarmheartedSubmitFormDTO.java | 1 - .../src/main/java/com/epmet/dto/form/ResiRegisterFormDTO.java | 1 - .../main/java/com/epmet/dto/form/VerificationCodeFormDTO.java | 1 - 8 files changed, 8 insertions(+), 6 deletions(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerStaffGridController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerStaffGridController.java index 29058e3247..752fb2b9fc 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerStaffGridController.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerStaffGridController.java @@ -101,6 +101,7 @@ public class CustomerStaffGridController { **/ @PostMapping("manageaudit") public Result manageAudit(@LoginUser TokenDto tokenDTO, @RequestBody ResiWarmheartedAuditFormDTO formDTO) { + ValidatorUtils.validateEntity(formDTO); return customerStaffGridService.manageAudit(tokenDTO, formDTO); } diff --git a/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/resiregister/controller/ResiRegisterController.java b/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/resiregister/controller/ResiRegisterController.java index 1574ded95c..e9d591581e 100644 --- a/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/resiregister/controller/ResiRegisterController.java +++ b/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/resiregister/controller/ResiRegisterController.java @@ -3,6 +3,7 @@ package com.epmet.modules.resiregister.controller; import com.epmet.commons.tools.annotation.LoginUser; import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.utils.Result; +import com.epmet.commons.tools.validator.ValidatorUtils; import com.epmet.dto.form.ResiInfoSubmitFormDTO; import com.epmet.dto.form.ResiRegisterFormDTO; import com.epmet.dto.form.VerificationCodeFormDTO; @@ -34,6 +35,7 @@ public class ResiRegisterController { **/ @PostMapping("init") public Result init(@LoginUser TokenDto tokenDTO, @RequestBody ResiRegisterFormDTO resiRegisterFormDTO) { + ValidatorUtils.validateEntity(resiRegisterFormDTO); return resiRegisterService.init(tokenDTO, resiRegisterFormDTO); } @@ -44,6 +46,7 @@ public class ResiRegisterController { **/ @PostMapping("submit") public Result submit(@LoginUser TokenDto tokenDTO, @RequestBody ResiInfoSubmitFormDTO resiInfoSubmitFormDTO) { + ValidatorUtils.validateEntity(resiInfoSubmitFormDTO); return resiRegisterService.submit(tokenDTO, resiInfoSubmitFormDTO); } @@ -54,6 +57,7 @@ public class ResiRegisterController { **/ @PostMapping("getverificationcode") public Result getVerificationCode(@LoginUser TokenDto tokenDTO, @RequestBody VerificationCodeFormDTO formDTO) { + ValidatorUtils.validateEntity(formDTO); return resiRegisterService.getVerificationCode(tokenDTO, formDTO); } diff --git a/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/warmhearted/controller/ResiWarmheartedController.java b/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/warmhearted/controller/ResiWarmheartedController.java index c3150d0879..03283c179a 100644 --- a/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/warmhearted/controller/ResiWarmheartedController.java +++ b/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/warmhearted/controller/ResiWarmheartedController.java @@ -3,6 +3,7 @@ package com.epmet.modules.warmhearted.controller; import com.epmet.commons.tools.annotation.LoginUser; import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.utils.Result; +import com.epmet.commons.tools.validator.ValidatorUtils; import com.epmet.modules.warmhearted.service.ResiWarmheartedService; import com.epmet.resi.partymember.dto.warmhearted.form.ResiWarmheartedFormDTO; import com.epmet.resi.partymember.dto.warmhearted.form.ResiWarmheartedSubmitFormDTO; @@ -31,6 +32,7 @@ public class ResiWarmheartedController { **/ @PostMapping("init") public Result init(@LoginUser TokenDto tokenDTO, @RequestBody ResiWarmheartedFormDTO resiWarmheartedFormDTO) { + ValidatorUtils.validateEntity(resiWarmheartedFormDTO); return resiWarmheartedService.init(tokenDTO, resiWarmheartedFormDTO); } @@ -41,6 +43,7 @@ public class ResiWarmheartedController { **/ @PostMapping("submit") public Result submit(@LoginUser TokenDto tokenDTO, @RequestBody ResiWarmheartedSubmitFormDTO formDTO) { + ValidatorUtils.validateEntity(formDTO); return resiWarmheartedService.submit(tokenDTO, formDTO); } diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/warmhearted/form/ResiWarmheartedAuditFormDTO.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/warmhearted/form/ResiWarmheartedAuditFormDTO.java index 6c35e40152..707e41f30f 100644 --- a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/warmhearted/form/ResiWarmheartedAuditFormDTO.java +++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/warmhearted/form/ResiWarmheartedAuditFormDTO.java @@ -47,7 +47,6 @@ public class ResiWarmheartedAuditFormDTO implements Serializable { /** * 驳回理由 */ - @NotBlank(message = "驳回理由不能为空") private String refuseReason; /** @@ -59,7 +58,6 @@ public class ResiWarmheartedAuditFormDTO implements Serializable { /** * 用户Id */ - @NotBlank(message = "用户ID不能为空") private String userId; } \ No newline at end of file diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/warmhearted/form/ResiWarmheartedFormDTO.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/warmhearted/form/ResiWarmheartedFormDTO.java index 4c05ab5391..0b474c8bdd 100644 --- a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/warmhearted/form/ResiWarmheartedFormDTO.java +++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/warmhearted/form/ResiWarmheartedFormDTO.java @@ -53,7 +53,6 @@ public class ResiWarmheartedFormDTO implements Serializable { /** * 用户Id */ - @NotBlank(message = "用户ID不能为空") private String userId; } \ No newline at end of file diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/warmhearted/form/ResiWarmheartedSubmitFormDTO.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/warmhearted/form/ResiWarmheartedSubmitFormDTO.java index f631a278b9..38adf78eae 100644 --- a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/warmhearted/form/ResiWarmheartedSubmitFormDTO.java +++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/warmhearted/form/ResiWarmheartedSubmitFormDTO.java @@ -59,7 +59,6 @@ public class ResiWarmheartedSubmitFormDTO implements Serializable { /** * 用户Id */ - @NotBlank(message = "用户ID不能为空") private String userId; } \ No newline at end of file diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/ResiRegisterFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/ResiRegisterFormDTO.java index 15faa061e4..0cc3bcfef2 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/ResiRegisterFormDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/ResiRegisterFormDTO.java @@ -53,7 +53,6 @@ public class ResiRegisterFormDTO implements Serializable { /** * 用户Id */ - @NotBlank(message = "用户ID不能为空") private String userId; } \ No newline at end of file diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/VerificationCodeFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/VerificationCodeFormDTO.java index 7fcc758bc9..4d28c3b0ed 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/VerificationCodeFormDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/VerificationCodeFormDTO.java @@ -30,7 +30,6 @@ public class VerificationCodeFormDTO implements Serializable { /** * 用户ID */ - @NotBlank(message = "用户ID不能为空") private String userId; }