From 3b5d642459af24fa3cad7536edee230989e01d4c Mon Sep 17 00:00:00 2001 From: liurunyu <lry9898@163.com> Date: 星期三, 24 七月 2024 14:02:23 +0800 Subject: [PATCH] 机构标签与名称去掉枚举实现方式,改为全部从配置文件中得到。 --- pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/util/Org.java | 77 +++++++++----------------------------- 1 files changed, 19 insertions(+), 58 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 fa3fdc0..5e3341f 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,67 +1,28 @@ 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", "鐗囪闀�"), - Sp("sp", "娌欑洏"), - Jyg("ym", "鍢夊唱鍏�"); - - @EnumValue - public String tag ; - public String name ; - - Org(String tag, String name){ - this.tag = tag ; - this.name = name ; - } +/** + * @Author: liurunyu + * @Date: 2024/7/24 11:45 + * @Description + */ +public class Org { //鐢ㄦ潵杞琷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 static List<OrgVo> OrgList = new ArrayList<>(); + + public class OrgVo{ + public String tag ; + public String name ; + + public String getTag() { + return this.tag ; + } + + public String getName() { + return this.name ; } } - - public String getTag() { - return this.tag ; - } - - public String getName() { - return this.name ; - } - - public static Org get(String tag){ -// 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 ; - } - - - @JSONField - public JSONObject toJson() { - return JSONObject.of("tag", getTag(), "name", getName()); - } -} \ No newline at end of file +} -- Gitblit v1.8.0