From 61cfa0d30461a8020f4e54330ea049ac6efb07c9 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期三, 17 七月 2024 16:21:41 +0800
Subject: [PATCH] 1、完善代码； 2、修改上行命令结果匹配命令的bug;
---
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/util/Org.java | 28 ++++++++++++++++++++--------
1 files changed, 20 insertions(+), 8 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 4ee99ec..fa3fdc0 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
@@ -5,13 +5,17 @@
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", "鐗囪闀�"),
+ Sp("sp", "娌欑洏"),
+ Jyg("ym", "鍢夊唱鍏�");
@EnumValue
public String tag ;
@@ -22,11 +26,14 @@
this.name = name ;
}
//鐢ㄦ潵杞琷son
- public static Map<String, Org> ObjMap = new HashMap<String, Org>();
+ public static List<Map> OrgList = new ArrayList<>();
static {
Org[] all = Org.values();
for (Org one : all) {
- ObjMap.put(one.tag, one);
+ Map<String, String> objMap = new HashMap<>();
+ objMap.put("tag", one.tag);
+ objMap.put("name", one.name);
+ OrgList.add(objMap) ;
}
}
@@ -39,10 +46,15 @@
}
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 ;
+ }else if(tag.equals(Sp.tag)) {
+ return Sp;
}
return null ;
}
--
Gitblit v1.8.0