From 49266bf7b1a94f69f4eee7951e747db0da9bb869 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期日, 12 十一月 2023 17:49:53 +0800
Subject: [PATCH] 完善Schema注解
---
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoBa/BaBlock.java | 6 +++---
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoBa/BaUser.java | 19 +++++++++++++++++++
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoBa/BaDistrict.java | 8 ++++----
3 files changed, 26 insertions(+), 7 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoBa/BaBlock.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoBa/BaBlock.java
index aaf9d1f..385b88c 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoBa/BaBlock.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoBa/BaBlock.java
@@ -37,14 +37,14 @@
*/
@Schema(description = "鐗囧尯鍚嶇О", requiredMode = Schema.RequiredMode.REQUIRED)
@NotEmpty(message = "鐗囧尯鍚嶇О涓嶈兘涓虹┖") //涓嶈兘涓虹┖涔熶笉鑳戒负null
- @Length(message = "鐗囧尯鍚嶇О灏忎簬{max}瀛�", min = 1, max = 25)
+ @Length(message = "鐗囧尯鍚嶇О涓嶅ぇ浜巤max}瀛楃锛屼笉灏忎簬{min}瀛楃", min = 1, max = 25)
public String name;
/**
* 璐熻矗浜�
*/
@Schema(description = "鐗囧尯璐熻矗浜�", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
- @Length(message = "鐗囧尯璐熻矗浜哄鍚嶅皬浜巤max}瀛�", min = 1, max = 25)
+ @Length(message = "鐗囧尯璐熻矗浜哄鍚嶄笉澶т簬{max}瀛楃锛屼笉灏忎簬{min}瀛楃", min = 1, max = 25)
public String header;
/**
@@ -72,7 +72,7 @@
/**
* 鏄惁鍒犻櫎: 0琛ㄧず鏈垹闄� 1琛ㄧず鍒犻櫎.
*/
- @Schema(description = "鐗囧尯鍒犻櫎鏍囧織", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+ @Schema(description = "鐗囧尯鍒犻櫎鏍囧織锛岃〃鍗曚笉鐢ㄥ～鍐�", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
public Deleted deleted;
}
\ No newline at end of file
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoBa/BaDistrict.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoBa/BaDistrict.java
index 46d0018..5183651 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoBa/BaDistrict.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoBa/BaDistrict.java
@@ -49,7 +49,7 @@
*/
@Schema(description = "琛屾斂鍖哄悕绉�", requiredMode = Schema.RequiredMode.REQUIRED)
@NotEmpty(message = "琛屾斂鍖哄悕绉颁笉鑳戒负绌�") //涓嶈兘涓虹┖涔熶笉鑳戒负null
- @Length(message = "琛屾斂鍖哄悕绉板皬浜巤max}瀛�", min = 1, max = 25)
+ @Length(message = "琛屾斂鍖哄悕绉颁笉澶т簬{max}瀛楃锛屼笉灏忎簬{min}瀛楃", min = 1, max = 25)
public String name;
/**
@@ -57,14 +57,14 @@
*/
@Schema(description = "琛屾斂鍖虹骇鍒�", requiredMode = Schema.RequiredMode.REQUIRED)
@NotNull(message = "琛屾斂鍖虹骇鍒笉鑳戒负绌�") //涓嶈兘涓虹┖涔熶笉鑳戒负null
- @Max(message = "琛屾斂鍖虹骇鍒笉姝ｇ‘", value = 10)
- @Min(message = "琛屾斂鍖虹骇鍒笉姝ｇ‘",value = 0)
+ @Max(message = "琛屾斂鍖虹骇鍒笉澶т簬10", value = 10)
+ @Min(message = "琛屾斂鍖虹骇鍒笉灏忎簬0",value = 0)
public DistrictLevel level;
/**
* 鏄惁鍒犻櫎: 0琛ㄧず鏈垹闄� 1琛ㄧず鍒犻櫎.
*/
- @Schema(description = "琛屾斂鍖哄垹闄ゆ爣蹇�", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+ @Schema(description = "鍒犻櫎鏍囪瘑锛岃〃鍗曚笉鐢ㄥ～鍐�", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
public Deleted deleted;
/**
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoBa/BaUser.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoBa/BaUser.java
index 073a550..e192923 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoBa/BaUser.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoBa/BaUser.java
@@ -6,7 +6,12 @@
import com.dy.common.mybatis.envm.Deleted;
import com.dy.common.mybatis.envm.Disabled;
import com.dy.common.po.BaseEntity;
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.Max;
+import jakarta.validation.constraints.Min;
+import jakarta.validation.constraints.NotEmpty;
import lombok.*;
+import org.hibernate.validator.constraints.Length;
import java.util.List;
@@ -45,43 +50,57 @@
*/
@JSONField(serializeUsing= ObjectWriterImplToString.class)
@TableId(type = IdType.INPUT)
+ @Schema(description = "瀹炰綋id", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
public Long id;
/**
* 鐢ㄦ埛濮撳悕
*/
+ @Schema(description = "濮撳悕", requiredMode = Schema.RequiredMode.REQUIRED)
+ @NotEmpty(message = "濮撳悕涓嶈兘涓虹┖") //涓嶈兘涓虹┖涔熶笉鑳戒负null
+ @Length(message = "濮撳悕涓嶅ぇ浜巤max}瀛楃锛屼笉灏忎簬{min}瀛楃", min = 2, max = 25)
public String name;
/**
* 鎵嬫満鍙凤紝鎵嬫満鍙风敤浜庣櫥褰曠郴缁�
*/
+ @Schema(description = "鎵嬫満鍙�", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+ @Length(message = "鎵嬫満鍙峰繀椤粄max}浣嶆暟鎹�", min = 11, max = 11)
public String phone;
/**
* 瀵嗙爜锛屽瘑鐮佺殑MD5鍔犲瘑
*/
+ @Schema(description = "瀵嗙爜", requiredMode = Schema.RequiredMode.REQUIRED)
+ @Length(message = "瀵嗙爜蹇呴』{max}浣嶆暟鎹�", min = 6, max = 6)
public String password;
/**
* 渚涙按鏈烘瀯鏍囩
*/
@TableField(value = "orgTag")
+ @JSONField(serialize = false)
public String orgTag;
/**
* 鏄惁瓒呯骇绠＄悊鍛� 1:鏄�,0:鍚�
*/
@TableField(value = "supperAdmin")
+ @JSONField(serialize = false)
public Byte supperAdmin;
/**
* 鏄惁绂佺敤 0:鍚�,1:鏄�
*/
+ @Schema(description = "鏄惁绂佺敤", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+ @Max(message = "鏄惁绂佺敤鍙兘0鎴�1", value = 1)
+ @Min(message = "鏄惁绂佺敤鍙兘0鎴�1",value = 0)
public Disabled disabled;
/**
* 鏄惁鍒犻櫎: 0琛ㄧず鏈垹闄� 1琛ㄧず鍒犻櫎.
*/
+ @Schema(description = "鍒犻櫎鏍囪瘑锛岃〃鍗曚笉鐢ㄥ～鍐�", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
public Deleted deleted;
--
Gitblit v1.8.0