From c5e08335a81518a4ec2538d9e6e9e54538df97df Mon Sep 17 00:00:00 2001
From: CZT <czt18638530771@163.com>
Date: 星期一, 04 九月 2023 19:21:03 +0800
Subject: [PATCH] 增加上海嘉定配置信息
---
igds-verb/src/main/java/com/ld/igds/models/MAreationData.java | 32 ++++++++++++++++----------------
igds-web/src/main/resources/gas-conf.properties | 22 +++++++++++++++++++---
igds-core/src/main/java/com/ld/igds/common/impl/CommonDataServiceImpl.java | 2 +-
igds-web/src/main/resources/static/img/gas/5303/003.png | 0
igds-web/src/main/resources/static/img/gas/5303/001.png | 0
igds-web/src/main/resources/static/img/gas/5303/002.png | 0
6 files changed, 36 insertions(+), 20 deletions(-)
diff --git a/igds-core/src/main/java/com/ld/igds/common/impl/CommonDataServiceImpl.java b/igds-core/src/main/java/com/ld/igds/common/impl/CommonDataServiceImpl.java
index 535937f..3cc6230 100644
--- a/igds-core/src/main/java/com/ld/igds/common/impl/CommonDataServiceImpl.java
+++ b/igds-core/src/main/java/com/ld/igds/common/impl/CommonDataServiceImpl.java
@@ -84,7 +84,7 @@
//閲嶆柊鎺掑簭
Collator sortChina = Collator.getInstance(Locale.CHINA);
- Collections.sort(list, (a, b) -> sortChina.compare(a.getName(), b.getName()));
+ Collections.sort(list, (a, b) -> sortChina.compare(a.getId(), b.getId()));
return list;
}
diff --git a/igds-verb/src/main/java/com/ld/igds/models/MAreationData.java b/igds-verb/src/main/java/com/ld/igds/models/MAreationData.java
index 736cca0..b761e2c 100644
--- a/igds-verb/src/main/java/com/ld/igds/models/MAreationData.java
+++ b/igds-verb/src/main/java/com/ld/igds/models/MAreationData.java
@@ -47,7 +47,7 @@
@PropertyDef(label = "绮爢瀛旈殭搴�")
@Column(name = "ldkxd", precision = 10, scale = 3)
- private double ldkxd;
+ private Double ldkxd;
/**
* 1锛氳嚜鐒剁┖姘旈�氶
@@ -79,23 +79,23 @@
@PropertyDef(label = "涓婚閬撴埅闈㈢Н")
@Column(name = "zfdjmj", precision = 10, scale = 3)
- private double zfdjmj;
+ private Double zfdjmj;
@PropertyDef(label = "鏀閬撴埅闈㈢Н")
@Column(name = "zhfdjmj", precision = 10, scale = 3)
- private double zhfdjmj;
+ private Double zhfdjmj;
@PropertyDef(label = "鏀閬撴�婚暱搴�")
@Column(name = "zfdzcd", precision = 20, scale = 3)
- private double zfdzcd;
+ private Double zfdzcd;
@PropertyDef(label = "椋庣綉寮�瀛旂巼")
@Column(name = "fwkkl", precision = 10, scale = 3)
- private double fwkkl;
+ private Double fwkkl;
@PropertyDef(label = "绌烘皵閫斿緞姣�")
@Column(name = "kqtjb", precision = 10, scale = 3)
- private double kqtjb;
+ private Double kqtjb;
@PropertyDef(label = "閫氶鍙ｈ缃釜鏁�")
@Column(name = "tfkszgs")
@@ -111,15 +111,15 @@
@PropertyDef(label = "鍗曞彴椋庢満棰濆畾鍏ㄥ帇")
@Column(name = "dtfjedqy", precision = 10, scale = 3)
- private double dtfjedqy;
+ private Double dtfjedqy;
@PropertyDef(label = "鍗曞彴椋庢満棰濆畾椋庨噺")
@Column(name = "dtfjedfl", precision = 10, scale = 3)
- private double dtfjedfl;
+ private Double dtfjedfl;
@PropertyDef(label = "鍗曞彴椋庢満棰濆畾鍔熺巼")
@Column(name = "dtfjedgl", precision = 10, scale = 3)
- private double dtfjedgl;
+ private Double dtfjedgl;
/**
* 1锛氬帇鍏ュ紡閫氶
@@ -134,23 +134,23 @@
@PropertyDef(label = "鍗曞彴椋庢満瀹炴祴椋庨噺")
@Column(name = "dtfjscfl", precision = 10, scale = 3)
- private double dtfjscfl;
+ private Double dtfjscfl;
@PropertyDef(label = "鍗曞彴椋庢満杞村姛鐜�")
@Column(name = "dtfjzgl", precision = 10, scale = 3)
- private double dtfjzgl;
+ private Double dtfjzgl;
@PropertyDef(label = "鎬婚閲�")
@Column(name = "zfl", precision = 10, scale = 3)
- private double zfl;
+ private Double zfl;
@PropertyDef(label = "鍗曚綅閫氶閲�")
@Column(name = "dwtfl", precision = 10, scale = 3)
- private double dwtfl;
+ private Double dwtfl;
@PropertyDef(label = "瀹炴祴绯荤粺闃诲姏")
@Column(name = "scxtzl", precision = 10, scale = 3)
- private double scxtzl;
+ private Double scxtzl;
/**
* 鎬昏�楃數閲� 鍗冪摝
@@ -217,11 +217,11 @@
@PropertyDef(label = "闄嶆按骞呭害")
@Column(name = "jsfd", precision = 10, scale = 3)
- private double jsfd;
+ private Double jsfd;
@PropertyDef(label = "鍚ㄧ伯闄嶆按鑳借��")
@Column(name = "dljsnh", precision = 10, scale = 3)
- private double dljsnh;
+ private Double dljsnh;
@PropertyDef(label = "閫氶闄嶆按鍧囧寑鎬у垎鏋恄鏁翠粨")
@Column(name = "tfjsjyxfxzc", length = 128)
diff --git a/igds-web/src/main/resources/gas-conf.properties b/igds-web/src/main/resources/gas-conf.properties
index 675bf62..0f75746 100644
--- a/igds-web/src/main/resources/gas-conf.properties
+++ b/igds-web/src/main/resources/gas-conf.properties
@@ -15,9 +15,25 @@
gas.mapImg.5016_3P09.img=5016_001.png
gas.mapImg.5016_3P10.img=5016_001.png
-## 5303-\u4E0A\u6D77\u5609\u5B9A\uFF0C\u53EA\u67092\u4E2A\u4ED3\u6709\u6C14\u4F53
-gas.mapImg.5303_91310114703439394M0010009001.img=009001.png
-gas.mapImg.5303_91310114703439394M0010009002.img=009002.png
+## 5303-上海嘉定主库区
+gas.mapImg.5303_91310114703439394M0010001001.img=001.png
+gas.mapImg.5303_91310114703439394M0010001002.img=003.png
+gas.mapImg.5303_91310114703439394M0010002001.img=001.png
+gas.mapImg.5303_91310114703439394M0010002002.img=003.png
+gas.mapImg.5303_91310114703439394M0010003001.img=001.png
+gas.mapImg.5303_91310114703439394M0010003002.img=003.png
+gas.mapImg.5303_91310114703439394M0010004001.img=001.png
+gas.mapImg.5303_91310114703439394M0010004002.img=003.png
+gas.mapImg.5303_91310114703439394M0010005001.img=001.png
+gas.mapImg.5303_91310114703439394M0010005002.img=003.png
+gas.mapImg.5303_91310114703439394M0010006001.img=001.png
+gas.mapImg.5303_91310114703439394M0010006002.img=003.png
+gas.mapImg.5303_91310114703439394M0010007001.img=001.png
+gas.mapImg.5303_91310114703439394M0010007002.img=003.png
+gas.mapImg.5303_91310114703439394M0010008001.img=001.png
+gas.mapImg.5303_91310114703439394M0010008002.img=003.png
+gas.mapImg.5303_91310114703439394M0010009001.img=001.png
+gas.mapImg.5303_91310114703439394M0010009002.img=002.png
## 5317-\u6F6E\u9633
gas.mapImg.5317_001.img=5317_001.png
diff --git a/igds-web/src/main/resources/static/img/gas/5303/009001.png b/igds-web/src/main/resources/static/img/gas/5303/001.png
similarity index 100%
rename from igds-web/src/main/resources/static/img/gas/5303/009001.png
rename to igds-web/src/main/resources/static/img/gas/5303/001.png
Binary files differ
diff --git a/igds-web/src/main/resources/static/img/gas/5303/009002.png b/igds-web/src/main/resources/static/img/gas/5303/002.png
similarity index 100%
rename from igds-web/src/main/resources/static/img/gas/5303/009002.png
rename to igds-web/src/main/resources/static/img/gas/5303/002.png
Binary files differ
diff --git a/igds-web/src/main/resources/static/img/gas/5303/003.png b/igds-web/src/main/resources/static/img/gas/5303/003.png
new file mode 100644
index 0000000..7db4de1
--- /dev/null
+++ b/igds-web/src/main/resources/static/img/gas/5303/003.png
Binary files differ
--
Gitblit v1.9.3