From 2f4053acadaea4eb13d74e516af5c4ed914879c1 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期四, 07 三月 2024 11:54:10 +0800
Subject: [PATCH] 修改录入验证
---
mdc-parent/mdc-show/src/main/java/com/qianwen/mdc/controller/devicetype/DeviceTypeController.java | 7 +++++--
mdc-parent/mdc-show/src/main/java/com/qianwen/mdc/dto/usedepartment/UseDepartmentDTO.java | 9 ++++++++-
mdc-parent/mdc-show/src/main/java/com/qianwen/mdc/dto/devicetype/DeviceTypeDTO.java | 8 +++++++-
mdc-parent/mdc-show/src/main/java/com/qianwen/mdc/dto/manufacturer/ManufacturerDTO.java | 9 +++++++--
mdc-parent/mdc-show/src/main/java/com/qianwen/mdc/controller/UseDepartmentController.java | 13 ++++++++-----
5 files changed, 35 insertions(+), 11 deletions(-)
diff --git a/mdc-parent/mdc-show/src/main/java/com/qianwen/mdc/controller/UseDepartmentController.java b/mdc-parent/mdc-show/src/main/java/com/qianwen/mdc/controller/UseDepartmentController.java
index 709d6ec..fbd081a 100644
--- a/mdc-parent/mdc-show/src/main/java/com/qianwen/mdc/controller/UseDepartmentController.java
+++ b/mdc-parent/mdc-show/src/main/java/com/qianwen/mdc/controller/UseDepartmentController.java
@@ -8,6 +8,7 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.CrossOrigin;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
@@ -24,6 +25,8 @@
import com.qianwen.mdc.dto.usedepartment.UseDepartmentDTO;
import com.qianwen.mdc.dto.usedepartment.UseDepartmentQueryDTO;
import com.qianwen.mdc.service.usedepartment.UseDepartmentService;
+import com.qianwen.mdc.vallidate.AddGroup;
+import com.qianwen.mdc.vallidate.UpdateGroup;
/**
* 浣跨敤閮ㄩ棬绠＄悊鎺у埗鍣�
@@ -40,13 +43,13 @@
@PostMapping(value = "/create")
public OpResult<Void> create(@RequestHeader(value = "mdc-token", defaultValue = "") String token,
- @RequestBody UseDepartmentDTO dto, HttpServletRequest request) {
+ @Validated(value = {AddGroup.class}) @RequestBody UseDepartmentDTO dto, HttpServletRequest request) {
try {
//accountTokenService.checkToken(token);
useDeptService.save(dto);
}catch(Exception ex) {
- logger.error("鏂板鐢熶骇鍘傚晢閿欒",ex);
+ logger.error("鏂板浣跨敤閮ㄩ棬閿欒",ex);
return OpResult.fail(ex.getMessage());
}
return OpResult.success();
@@ -54,13 +57,13 @@
@PostMapping(value = "/update")
public OpResult<Void> update(@RequestHeader(value = "mdc-token", defaultValue = "") String token,
- @RequestBody UseDepartmentDTO dto, HttpServletRequest request) {
+ @Validated(value = {UpdateGroup.class}) @RequestBody UseDepartmentDTO dto, HttpServletRequest request) {
try {
//accountTokenService.checkToken(token);
useDeptService.modify(dto);
}catch(Exception ex) {
- logger.error("淇敼鐢熶骇鍘傚晢閿欒",ex);
+ logger.error("淇敼浣跨敤閮ㄩ棬閿欒",ex);
return OpResult.fail(ex.getMessage());
}
return OpResult.success();
@@ -74,7 +77,7 @@
try {
return OpResult.success(useDeptService.pageQuery(dto));
}catch(Exception e) {
- logger.error("鐢熶骇鍘傚晢鍒嗛〉鏌ヨ寮傚父",e);
+ logger.error("浣跨敤閮ㄩ棬鍒嗛〉鏌ヨ寮傚父",e);
return OpResult.fail(e.getMessage());
}
diff --git a/mdc-parent/mdc-show/src/main/java/com/qianwen/mdc/controller/devicetype/DeviceTypeController.java b/mdc-parent/mdc-show/src/main/java/com/qianwen/mdc/controller/devicetype/DeviceTypeController.java
index d530289..746bd09 100644
--- a/mdc-parent/mdc-show/src/main/java/com/qianwen/mdc/controller/devicetype/DeviceTypeController.java
+++ b/mdc-parent/mdc-show/src/main/java/com/qianwen/mdc/controller/devicetype/DeviceTypeController.java
@@ -8,6 +8,7 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.CrossOrigin;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
@@ -24,6 +25,8 @@
import com.qianwen.mdc.dto.IdsDTO;
import com.qianwen.mdc.dto.devicetype.DeviceTypeDTO;
import com.qianwen.mdc.service.devicetype.DeviceTypeService;
+import com.qianwen.mdc.vallidate.AddGroup;
+import com.qianwen.mdc.vallidate.UpdateGroup;
/**
* 璁惧绫诲瀷绠＄悊鎺у埗鍣�
@@ -40,7 +43,7 @@
@PostMapping(value = "/create")
public OpResult<Void> create(@RequestHeader(value = "mdc-token", defaultValue = "") String token,
- @RequestBody DeviceTypeDTO dto, HttpServletRequest request) {
+ @Validated(value = {AddGroup.class}) @RequestBody DeviceTypeDTO dto, HttpServletRequest request) {
try {
//accountTokenService.checkToken(token);
@@ -54,7 +57,7 @@
@PostMapping(value = "/update")
public OpResult<Void> update(@RequestHeader(value = "mdc-token", defaultValue = "") String token,
- @RequestBody DeviceTypeDTO dto, HttpServletRequest request) {
+ @Validated(value = {UpdateGroup.class}) @RequestBody DeviceTypeDTO dto, HttpServletRequest request) {
try {
//accountTokenService.checkToken(token);
diff --git a/mdc-parent/mdc-show/src/main/java/com/qianwen/mdc/dto/devicetype/DeviceTypeDTO.java b/mdc-parent/mdc-show/src/main/java/com/qianwen/mdc/dto/devicetype/DeviceTypeDTO.java
index 1f82316..55126c6 100644
--- a/mdc-parent/mdc-show/src/main/java/com/qianwen/mdc/dto/devicetype/DeviceTypeDTO.java
+++ b/mdc-parent/mdc-show/src/main/java/com/qianwen/mdc/dto/devicetype/DeviceTypeDTO.java
@@ -1,18 +1,24 @@
package com.qianwen.mdc.dto.devicetype;
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+
import com.qianwen.mdc.dto.BasePageDTO;
+import com.qianwen.mdc.vallidate.AddGroup;
+import com.qianwen.mdc.vallidate.UpdateGroup;
/**
* 璁惧绫诲瀷"鏁版嵁
*/
public class DeviceTypeDTO extends BasePageDTO{
-
+ @NotNull(message = "id涓嶈兘涓虹┖", groups = {UpdateGroup.class})
private Long id;
/*
* 绫诲瀷鍚嶇О
*/
+ @NotBlank(message = "鍚嶇О涓嶈兘涓虹┖", groups = {AddGroup.class, UpdateGroup.class})
private String name;
/*
diff --git a/mdc-parent/mdc-show/src/main/java/com/qianwen/mdc/dto/manufacturer/ManufacturerDTO.java b/mdc-parent/mdc-show/src/main/java/com/qianwen/mdc/dto/manufacturer/ManufacturerDTO.java
index a2107ec..8a3ea36 100644
--- a/mdc-parent/mdc-show/src/main/java/com/qianwen/mdc/dto/manufacturer/ManufacturerDTO.java
+++ b/mdc-parent/mdc-show/src/main/java/com/qianwen/mdc/dto/manufacturer/ManufacturerDTO.java
@@ -1,18 +1,23 @@
package com.qianwen.mdc.dto.manufacturer;
-import com.qianwen.mdc.dto.BasePageDTO;
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+
+import com.qianwen.mdc.vallidate.AddGroup;
+import com.qianwen.mdc.vallidate.UpdateGroup;
/**
* 璁惧绫诲瀷"鏁版嵁
*/
public class ManufacturerDTO{
-
+ @NotNull(message = "id涓嶈兘涓虹┖", groups = {UpdateGroup.class})
private Long id;
/*
* 绫诲瀷鍚嶇О
*/
+ @NotBlank(message = "鍚嶇О涓嶈兘涓虹┖", groups = {AddGroup.class, UpdateGroup.class})
private String name;
diff --git a/mdc-parent/mdc-show/src/main/java/com/qianwen/mdc/dto/usedepartment/UseDepartmentDTO.java b/mdc-parent/mdc-show/src/main/java/com/qianwen/mdc/dto/usedepartment/UseDepartmentDTO.java
index cae82d2..c993f8f 100644
--- a/mdc-parent/mdc-show/src/main/java/com/qianwen/mdc/dto/usedepartment/UseDepartmentDTO.java
+++ b/mdc-parent/mdc-show/src/main/java/com/qianwen/mdc/dto/usedepartment/UseDepartmentDTO.java
@@ -1,16 +1,23 @@
package com.qianwen.mdc.dto.usedepartment;
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+
+import com.qianwen.mdc.vallidate.AddGroup;
+import com.qianwen.mdc.vallidate.UpdateGroup;
+
/**
* "浣跨敤閮ㄩ棬"鏁版嵁
*/
public class UseDepartmentDTO{
-
+ @NotNull(message = "id涓嶈兘涓虹┖", groups = {UpdateGroup.class})
private Long id;
/*
* 閮ㄩ棬鍚嶇О
*/
+ @NotBlank(message = "鍚嶇О涓嶈兘涓虹┖", groups = {AddGroup.class, UpdateGroup.class})
private String name;
public Long getId() {
--
Gitblit v1.9.3