From 55bb7e09cc5b7eb1de77f128db0e4071a9a8df88 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期四, 07 三月 2024 17:39:02 +0800
Subject: [PATCH] 台账管理增加后端验证
---
mdc-parent/mdc-show/src/main/java/com/qianwen/mdc/service/account/MachineAccountEditService.java | 1 +
mdc-parent/mdc-show/src/main/java/com/qianwen/mdc/dto/account/MachineAccountEditDTO.java | 8 +++++++-
mdc-parent/mdc-show/src/main/java/com/qianwen/mdc/controller/account/MachineAccountEditController.java | 7 +++----
mdc-parent/mdc-show/src/main/java/com/qianwen/mdc/controller/account/MachineAccountAddController.java | 4 +++-
4 files changed, 14 insertions(+), 6 deletions(-)
diff --git a/mdc-parent/mdc-show/src/main/java/com/qianwen/mdc/controller/account/MachineAccountAddController.java b/mdc-parent/mdc-show/src/main/java/com/qianwen/mdc/controller/account/MachineAccountAddController.java
index ebe73c6..f6a7f85 100644
--- a/mdc-parent/mdc-show/src/main/java/com/qianwen/mdc/controller/account/MachineAccountAddController.java
+++ b/mdc-parent/mdc-show/src/main/java/com/qianwen/mdc/controller/account/MachineAccountAddController.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.PostMapping;
@@ -25,6 +26,7 @@
import com.qianwen.mdc.mapper.MachineCountryMapper;
import com.qianwen.mdc.service.account.MachineAccountAddService;
import com.qianwen.mdc.service.usedepartment.UseDepartmentService;
+import com.qianwen.mdc.vallidate.AddGroup;
/**
* 鍙拌处鏂板鎺у埗鍣�
@@ -47,7 +49,7 @@
@PostMapping(value = "/create")
public OpResult<Void> create(@RequestHeader(value = "mdc-token", defaultValue = "") String token,
- @RequestBody MachineAccountEditDTO dto, HttpServletRequest request) {
+ @Validated(value = {AddGroup.class}) @RequestBody MachineAccountEditDTO dto, HttpServletRequest request) {
try {
// accountTokenService.checkToken(token);
diff --git a/mdc-parent/mdc-show/src/main/java/com/qianwen/mdc/controller/account/MachineAccountEditController.java b/mdc-parent/mdc-show/src/main/java/com/qianwen/mdc/controller/account/MachineAccountEditController.java
index c7c3bbc..66c858a 100644
--- a/mdc-parent/mdc-show/src/main/java/com/qianwen/mdc/controller/account/MachineAccountEditController.java
+++ b/mdc-parent/mdc-show/src/main/java/com/qianwen/mdc/controller/account/MachineAccountEditController.java
@@ -1,25 +1,24 @@
package com.qianwen.mdc.controller.account;
-import java.util.List;
-
import javax.servlet.http.HttpServletRequest;
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.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestHeader;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import com.qianwen.mdc.common.OpResult;
import com.qianwen.mdc.dto.IdsDTO;
import com.qianwen.mdc.dto.account.MachineAccountEditDTO;
import com.qianwen.mdc.service.account.MachineAccountEditService;
+import com.qianwen.mdc.vallidate.UpdateGroup;
/**
* 璁惧鍙拌处缂栬緫 鎺у埗鍣�
@@ -34,7 +33,7 @@
@PostMapping(value = "/update")
public OpResult<Void> update(@RequestHeader(value = "mdc-token", defaultValue = "") String token,
- @RequestBody MachineAccountEditDTO dto, HttpServletRequest request) {
+ @Validated(value = {UpdateGroup.class}) @RequestBody MachineAccountEditDTO dto, HttpServletRequest request) {
//TODO checktoken
/*
JSONObject jsonResult = new JSONObject();
diff --git a/mdc-parent/mdc-show/src/main/java/com/qianwen/mdc/dto/account/MachineAccountEditDTO.java b/mdc-parent/mdc-show/src/main/java/com/qianwen/mdc/dto/account/MachineAccountEditDTO.java
index 27a1e17..fbfccce 100644
--- a/mdc-parent/mdc-show/src/main/java/com/qianwen/mdc/dto/account/MachineAccountEditDTO.java
+++ b/mdc-parent/mdc-show/src/main/java/com/qianwen/mdc/dto/account/MachineAccountEditDTO.java
@@ -3,14 +3,19 @@
import java.io.Serializable;
import java.util.Date;
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+
import com.fasterxml.jackson.annotation.JsonFormat;
+import com.qianwen.mdc.vallidate.AddGroup;
+import com.qianwen.mdc.vallidate.UpdateGroup;
/**
* 璁惧鍙拌处鏂板缂栬緫鐨勬暟鎹璞�
*/
public class MachineAccountEditDTO implements Serializable {
-
+ @NotNull(message = "id涓嶈兘涓虹┖", groups = {UpdateGroup.class})
private Long id;
/**
@@ -22,6 +27,7 @@
* machine name
*/
//@Column(name = "machine_name")
+ @NotBlank(message = "鍚嶇О涓嶈兘涓虹┖", groups = {AddGroup.class, UpdateGroup.class})
private String machineName;
/**
diff --git a/mdc-parent/mdc-show/src/main/java/com/qianwen/mdc/service/account/MachineAccountEditService.java b/mdc-parent/mdc-show/src/main/java/com/qianwen/mdc/service/account/MachineAccountEditService.java
index 7242c7a..bbe1081 100644
--- a/mdc-parent/mdc-show/src/main/java/com/qianwen/mdc/service/account/MachineAccountEditService.java
+++ b/mdc-parent/mdc-show/src/main/java/com/qianwen/mdc/service/account/MachineAccountEditService.java
@@ -26,6 +26,7 @@
MachineAccount account = accountMapper.selectById(dto.getId());
+ account.setMachineName(dto.getMachineName());
account.setUuid(dto.getUuid());
account.setSpecification(dto.getSpecification());
account.setType(dto.getType());
--
Gitblit v1.9.3