From 3d7669b78c751f808d17b92be18b800cdf595844 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期一, 27 十一月 2023 15:38:39 +0800
Subject: [PATCH] 枚举类型转json
---
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/util/Org.java | 13 +++++++++++++
pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/district/DistrictCtrl.java | 4 ++--
pipIrr-platform/pipIrr-web/pipIrr-web-sso/src/main/java/com/dy/sso/busi/SsoCtrl.java | 4 ++--
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/util/DistrictLevel.java | 12 ++++++++++++
4 files changed, 29 insertions(+), 4 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/util/DistrictLevel.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/util/DistrictLevel.java
index 6cd780d..a4fd7e4 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/util/DistrictLevel.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/util/DistrictLevel.java
@@ -3,6 +3,9 @@
import com.baomidou.mybatisplus.annotation.EnumValue;
import com.dy.common.mybatis.envm.IEnum;
+import java.util.HashMap;
+import java.util.Map;
+
/**
* 琛屾斂鍖哄垝绾у埆
* Provinces, cities, counties, towns, and village groups
@@ -24,6 +27,15 @@
this.name = name ;
}
+ //鐢ㄦ潵杞琷son
+ public static Map<Byte, DistrictLevel> ObjMap = new HashMap<Byte, DistrictLevel>();
+ static {
+ DistrictLevel[] all = DistrictLevel.values();
+ for (DistrictLevel one : all) {
+ ObjMap.put(one.code, one);
+ }
+ }
+
@Override
public Byte getCode() {
return this.code ;
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 ca78397..4ee99ec 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,6 +5,9 @@
import com.alibaba.fastjson2.annotation.JSONField;
import com.baomidou.mybatisplus.annotation.EnumValue;
+import java.util.HashMap;
+import java.util.Map;
+
public enum Org {
Ym("ym", "鍏冭皨"),
@@ -17,6 +20,14 @@
Org(String tag, String name){
this.tag = tag ;
this.name = name ;
+ }
+ //鐢ㄦ潵杞琷son
+ public static Map<String, Org> ObjMap = new HashMap<String, Org>();
+ static {
+ Org[] all = Org.values();
+ for (Org one : all) {
+ ObjMap.put(one.tag, one);
+ }
}
public String getTag() {
@@ -35,6 +46,8 @@
}
return null ;
}
+
+
@JSONField
public JSONObject toJson() {
return JSONObject.of("tag", getTag(), "name", getName());
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/district/DistrictCtrl.java b/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/district/DistrictCtrl.java
index 72753da..fd580ed 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/district/DistrictCtrl.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/district/DistrictCtrl.java
@@ -54,8 +54,8 @@
})
@GetMapping(path = "allLevel")
public BaseResponse<List<DistrictLevel>> allDistrictLevels(){
- List<DistrictLevel> list = Arrays.asList(DistrictLevel.City, DistrictLevel.County, DistrictLevel.Town, DistrictLevel.Village) ;
- return BaseResponseUtils.buildSuccess(list);
+ //List<DistrictLevel> list = Arrays.asList(DistrictLevel.City, DistrictLevel.County, DistrictLevel.Town, DistrictLevel.Village) ;
+ return BaseResponseUtils.buildSuccess(DistrictLevel.ObjMap);
}
/**
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-sso/src/main/java/com/dy/sso/busi/SsoCtrl.java b/pipIrr-platform/pipIrr-web/pipIrr-web-sso/src/main/java/com/dy/sso/busi/SsoCtrl.java
index 783d579..e90a82b 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-sso/src/main/java/com/dy/sso/busi/SsoCtrl.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-sso/src/main/java/com/dy/sso/busi/SsoCtrl.java
@@ -72,8 +72,8 @@
})
@GetMapping(path = "allOrg")
public BaseResponse<List<Org>> allOrg(){
- List<Org> list = Arrays.asList(Org.Ym, Org.Pj) ;
- return BaseResponseUtils.buildSuccess(list);
+ //List<Org> list = Arrays.asList(Org.Ym, Org.Pj) ;
+ return BaseResponseUtils.buildSuccess(Org.ObjMap);
}
/**
--
Gitblit v1.8.0