From d6516cafa9921d25f86c3181c3e664f3fa64ccb4 Mon Sep 17 00:00:00 2001
From: jiangdingxuan <jiangdingxuan@rzdata.net>
Date: Mon, 8 Jan 2024 15:38:41 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AF=B7=E6=B1=82=E5=8F=82=E6=95=B0=E6=A0=A1?=
 =?UTF-8?q?=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/net/rzdata/demo/dict/DictController.java   | 9 +++------
 .../java/net/rzdata/demo/dict/domain/AddDictReq.java     | 9 +++++++++
 .../java/net/rzdata/demo/dict/domain/UpdateDictReq.java  | 8 ++++++++
 3 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/service/system/src/main/java/net/rzdata/demo/dict/DictController.java b/service/system/src/main/java/net/rzdata/demo/dict/DictController.java
index 71a9ed8..337721c 100644
--- a/service/system/src/main/java/net/rzdata/demo/dict/DictController.java
+++ b/service/system/src/main/java/net/rzdata/demo/dict/DictController.java
@@ -4,10 +4,7 @@ import net.rzdata.demo.dict.domain.AddDictReq;
 import net.rzdata.demo.dict.domain.Dict;
 import net.rzdata.demo.dict.domain.UpdateDictReq;
 import net.rzdata.domain.Id;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 @RestController
 @RequestMapping("/dict")
@@ -20,7 +17,7 @@ public class DictController {
     }
 
     @PostMapping()
-    public Id addDict(AddDictReq req) {
+    public Id addDict(@RequestBody AddDictReq req) {
         Dict dict = req.into();
         if (dict.getParentId() == null) {
             dict.setParentId(Dict.ROOT.getId());
@@ -31,7 +28,7 @@ public class DictController {
     }
 
     @PutMapping()
-    public Id updateDict(UpdateDictReq req) {
+    public Id updateDict(@RequestBody UpdateDictReq req) {
         Dict dict = req.into();
         dictService.updateDict(dict);
         return Id.of(dict.getId());
diff --git a/service/system/src/main/java/net/rzdata/demo/dict/domain/AddDictReq.java b/service/system/src/main/java/net/rzdata/demo/dict/domain/AddDictReq.java
index 594bc5e..c33338e 100644
--- a/service/system/src/main/java/net/rzdata/demo/dict/domain/AddDictReq.java
+++ b/service/system/src/main/java/net/rzdata/demo/dict/domain/AddDictReq.java
@@ -1,5 +1,8 @@
 package net.rzdata.demo.dict.domain;
 
+import jakarta.validation.constraints.Max;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.Pattern;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.ToString;
@@ -17,14 +20,19 @@ public class AddDictReq implements IQuery<Dict> {
     /**
      * 字典标签
      */
+    @Max(255)
     private String label;
     /**
      * 字典值
      */
+    @Max(255)
+    @NotNull(message = "字典值不能为空")
+    @Pattern(regexp = "[\\w-]+", message = "字典值只允许英文字母、下划线、短横线")
     private String value;
     /**
      * 字典类型
      */
+    @NotNull(message = "字典类型不能为空")
     private String type;
     /**
      * 父级ID
@@ -34,6 +42,7 @@ public class AddDictReq implements IQuery<Dict> {
     /**
      * 排序
      */
+    @NotNull(message = "排序值不能为空")
     private Integer sort;
     /**
      * 是否禁用
diff --git a/service/system/src/main/java/net/rzdata/demo/dict/domain/UpdateDictReq.java b/service/system/src/main/java/net/rzdata/demo/dict/domain/UpdateDictReq.java
index 46f79a7..9dc1b1f 100644
--- a/service/system/src/main/java/net/rzdata/demo/dict/domain/UpdateDictReq.java
+++ b/service/system/src/main/java/net/rzdata/demo/dict/domain/UpdateDictReq.java
@@ -1,5 +1,8 @@
 package net.rzdata.demo.dict.domain;
 
+import jakarta.validation.constraints.Max;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.Pattern;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.ToString;
@@ -21,14 +24,19 @@ public class UpdateDictReq implements IQuery<Dict> {
     /**
      * 字典标签
      */
+    @Max(255)
     private String label;
     /**
      * 字典值
      */
+    @Max(255)
+    @NotNull(message = "字典值不能为空")
+    @Pattern(regexp = "[\\w-]+", message = "字典值只允许英文字母、下划线、短横线")
     private String value;
     /**
      * 排序
      */
+    @NotNull(message = "排序值不能为空")
     private Integer sort;
     /**
      * 父级ID