From ea58523b67ad59002a1191c3c564258c5b81f6f2 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期二, 06 五月 2025 17:35:16 +0800
Subject: [PATCH] Revert "1、实现万用token（0000-0000-1234-9876-5）； 2、web端单独实现命令结果等待器，并修改相关部分； 3、web端实现透传命令； 4、修改一些不当注释； 5、优化一些代码。"
---
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoBa/BaDistrict.java | 25 +++++++++++++++++++++++--
1 files changed, 23 insertions(+), 2 deletions(-)
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 5183651..dcfa310 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
@@ -42,6 +42,7 @@
* 涓婄骇琛屼笅鍖篒D
*/
@Schema(description = "涓婄骇瀹炰綋id", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+ @JSONField(serializeUsing= ObjectWriterImplToString.class)
public Long supperId;
/**
@@ -49,13 +50,22 @@
*/
@Schema(description = "琛屾斂鍖哄悕绉�", requiredMode = Schema.RequiredMode.REQUIRED)
@NotEmpty(message = "琛屾斂鍖哄悕绉颁笉鑳戒负绌�") //涓嶈兘涓虹┖涔熶笉鑳戒负null
- @Length(message = "琛屾斂鍖哄悕绉颁笉澶т簬{max}瀛楃锛屼笉灏忎簬{min}瀛楃", min = 1, max = 25)
+ @Length(message = "琛屾斂鍖哄悕绉颁笉澶т簬{max}瀛楋紝涓嶅皬浜巤min}瀛�", min = 1, max = 25)
public String name;
+
+ /**
+ * 琛屾斂鍖虹紪鍙�
+ */
+ @Schema(description = "琛屾斂鍖虹紪鍙�", requiredMode = Schema.RequiredMode.REQUIRED)
+ @NotEmpty(message = "琛屾斂鍖虹紪鍙蜂笉鑳戒负绌�") //涓嶈兘涓虹┖涔熶笉鑳戒负null
+ @Max(message = "琛屾斂鍖虹紪鍙蜂笉澶т簬99", value = 99)
+ @Min(message = "琛屾斂鍖虹紪鍙蜂笉灏忎簬0",value = 0)
+ public String num;
/**
* 琛屾斂鍖虹骇鍒�
*/
- @Schema(description = "琛屾斂鍖虹骇鍒�", requiredMode = Schema.RequiredMode.REQUIRED)
+ @Schema(description = "琛屾斂鍖虹骇鍒�", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
@NotNull(message = "琛屾斂鍖虹骇鍒笉鑳戒负绌�") //涓嶈兘涓虹┖涔熶笉鑳戒负null
@Max(message = "琛屾斂鍖虹骇鍒笉澶т簬10", value = 10)
@Min(message = "琛屾斂鍖虹骇鍒笉灏忎簬0",value = 0)
@@ -73,4 +83,15 @@
@TableField(exist = false)
public List<BaDistrict> subDistricts ;
+ /**
+ * 涓嬬骇琛屾斂鍖洪泦鍚�
+ */
+ @Schema(description = "鏄惁鍙互娣讳笅绾э紝琛ㄥ崟涓嶇敤濉啓锛屽彧鍦ㄦ煡璇㈠垪琛ㄦ椂鏈夋晥", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+ @TableField(exist = false)
+ public boolean canAdd ;
+
+ @Schema(description = "鏄惁鍙互鍒犻櫎锛岃〃鍗曚笉鐢ㄥ～鍐欙紝鍙湪鏌ヨ鍒楄〃鏃舵湁鏁�", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+ @TableField(exist = false)
+ public boolean canDelete ;
+
}
\ No newline at end of file
--
Gitblit v1.8.0