From 7f5d914898c9d05942705ce7d80c0d14a8174df8 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期二, 19 十二月 2023 15:57:14 +0800
Subject: [PATCH] 1、common模块优化代码； 2、通信中间件优化代码，队列遍历由递归调用改为while循环，原因是队列数据量大时递归调易产生栈溢出，HashTable多线程应用时仍有线程安全问题，改为HashMap+同步锁； 3、RTU模拟器和模拟器控制服务增加report命令
---
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoBa/BaDistrict.java | 24 ++++++++++++++++++++++--
1 files changed, 22 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..d88ab02 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,13 +49,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 +82,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