From 4783fc799e4416c4c90e07afd00e733502f0bba8 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期四, 31 十月 2024 16:09:11 +0800
Subject: [PATCH] 1、更新日漏损最新记录有bug（新生成了记录，应该是更新老记录），修改之 ； 2、CommonV1_0_0中获取开关阀类型名称时，对于null返回空字符串。
---
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/util/DistrictLevel.java | 16 +++++++++++-----
1 files changed, 11 insertions(+), 5 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 a4fd7e4..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;
/**
@@ -28,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) ;
}
}
@@ -47,9 +53,9 @@
}
public static DistrictLevel get(Byte code){
- if(code.byteValue() == Province.code.byteValue()){
- return Province ;
- }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