From 0c5606be951e50c6e86671ecde51b012f5d55735 Mon Sep 17 00:00:00 2001
From: Administrator <zhubaomin>
Date: 星期二, 18 六月 2024 14:32:26 +0800
Subject: [PATCH] 2024-06-18 朱宝民 开关阀报（未完）
---
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/util/Org.java | 43 +++++++++++++++++++++++++++++++++++++------
1 files changed, 37 insertions(+), 6 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..70a0885 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,39 @@
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", "鐗囪闀�") ;
+// Ym("ym", "鍏冭皨"),
+// Pj("pj", "鐗囪闀�"),
+ Jyg("ym", "鍢夊唱鍏�");
+ @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() {
@@ -23,11 +45,20 @@
}
public static Org get(String tag){
- if(tag.equals(Ym.tag)){
- return Ym ;
- }else if(tag.equals(Pj.tag)){
- return Pj ;
+// if(tag.equals(Ym.tag) || tag.equals(Jyg.tag)){
+// return Ym ;
+// }else if(tag.equals(Pj.tag)){
+// return Pj ;
+// }
+ if( tag.equals(Jyg.tag)){
+ return Jyg ;
}
return null ;
}
+
+
+ @JSONField
+ public JSONObject toJson() {
+ return JSONObject.of("tag", getTag(), "name", getName());
+ }
}
\ No newline at end of file
--
Gitblit v1.8.0