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/util/Org.java | 27 +++++++++++++++++++++++++++
1 files changed, 27 insertions(+), 0 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/util/Org.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/util/Org.java
index 4b344a6..0507bd1 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/util/Org.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/util/Org.java
@@ -1,17 +1,38 @@
package com.dy.pipIrrGlobal.util;
+import com.alibaba.fastjson2.JSONObject;
+import com.alibaba.fastjson2.annotation.JSONField;
+import com.baomidou.mybatisplus.annotation.EnumValue;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
public enum Org {
Ym("ym", "鍏冭皨"),
Pj("pj", "鐗囪闀�") ;
+ @EnumValue
public String tag ;
public String name ;
Org(String tag, String name){
this.tag = tag ;
this.name = name ;
+ }
+ //鐢ㄦ潵杞琷son
+ public static List<Map> OrgList = new ArrayList<>();
+ static {
+ Org[] all = Org.values();
+ for (Org one : all) {
+ Map<String, String> objMap = new HashMap<>();
+ objMap.put("tag", one.tag);
+ objMap.put("name", one.name);
+ OrgList.add(objMap) ;
+ }
}
public String getTag() {
@@ -30,4 +51,10 @@
}
return null ;
}
+
+
+ @JSONField
+ public JSONObject toJson() {
+ return JSONObject.of("tag", getTag(), "name", getName());
+ }
}
\ No newline at end of file
--
Gitblit v1.8.0