From a27fab527ce7d4aa8c9c8f0645cb8c2520590407 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期一, 01 七月 2024 14:20:51 +0800
Subject: [PATCH] 1、靳总协议解析与构造修改完善; 2、靳总协议上行数据处理修改完善; 3、增加UserTokenFilter非过滤(放行)URL功能实现。

---
 pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/util/DistrictLevel.java |   15 ++++++++++++---
 1 files changed, 12 insertions(+), 3 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 535171d..8e49596 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
@@ -1,9 +1,12 @@
 package com.dy.pipIrrGlobal.util;
 
+import com.alibaba.fastjson2.JSONObject;
 import com.baomidou.mybatisplus.annotation.EnumValue;
 import com.dy.common.mybatis.envm.IEnum;
 
+import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -12,6 +15,7 @@
  */
 public enum DistrictLevel implements IEnum {
 
+    Province((byte)0, "鐪�"),
     City((byte)1, "甯�"),
     County((byte)2, "鍘�"),
     Town((byte)3,  "闀�"),
@@ -27,11 +31,14 @@
     }
 
     //鐢ㄦ潵杞琷son
-    public static Map<Byte, DistrictLevel> ObjMap = new HashMap<Byte, DistrictLevel>();
+    public static List<Map> LevelList = new ArrayList<>();
     static {
         DistrictLevel[] all = DistrictLevel.values();
         for (DistrictLevel one : all) {
-            ObjMap.put(one.code, one);
+            Map<String, Object> objMap = new HashMap<>();
+            objMap.put("code", one.code);
+            objMap.put("name", one.name);
+            LevelList.add(objMap) ;
         }
     }
 
@@ -46,7 +53,9 @@
     }
 
     public static DistrictLevel get(Byte code){
-        if(code.byteValue() == City.code.byteValue()){
+        if(code.byteValue() == Province.code.byteValue()) {
+            return Province;
+        }else if(code.byteValue() == City.code.byteValue()){
             return City ;
         }else if(code.byteValue() == County.code.byteValue()){
             return County ;

--
Gitblit v1.8.0