From 77031c2c9fca6c55f74e636c5ea765cc1dc1fd6e Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Tue, 19 Nov 2024 16:21:42 +0800
Subject: [PATCH] 应急物资查询调整,风险源查询调整

---
 src/main/java/org/springblade/common/utils/ShapeFileUtil.java |   10 +++++++++-
 1 files changed, 9 insertions(+), 1 deletions(-)

diff --git a/src/main/java/org/springblade/common/utils/ShapeFileUtil.java b/src/main/java/org/springblade/common/utils/ShapeFileUtil.java
index c48a131..59c6450 100644
--- a/src/main/java/org/springblade/common/utils/ShapeFileUtil.java
+++ b/src/main/java/org/springblade/common/utils/ShapeFileUtil.java
@@ -74,6 +74,8 @@
 			String geomProperty = "the_geom";
 			String idProperty = "ID";
 			String nameProperty = "name";
+			String firmIdProperty = "firmId";
+			String firmNameProperty = "firmName";
 
 			//设置图形类型
 			if ("Polygon".equals(geomType)) {
@@ -94,6 +96,8 @@
 			//设置对应属性类型
 			tb.add(idProperty, String.class);
 			tb.add(nameProperty, String.class);
+			tb.add(firmIdProperty, String.class);
+			tb.add(firmNameProperty, String.class);
 
 			//设置默认geometry
 			tb.setDefaultGeometry(geomProperty);
@@ -108,9 +112,13 @@
 			for (Map<String, Object> map : dataPropertiesList) {
 				feature = writer.next();
 				//属性赋值  geometry要赋值wkt格式的
-				feature.setAttribute(geomProperty, new WKTReader().read((MapUtil.getStr(map, "geometry"))));
+				if (map.containsKey("geometry")) {
+					feature.setAttribute(geomProperty, new WKTReader().read((MapUtil.getStr(map, "geometry"))));
+				}
 				feature.setAttribute(idProperty, MapUtil.getStr(map, idProperty));
 				feature.setAttribute(nameProperty, MapUtil.getStr(map, nameProperty));
+				feature.setAttribute(firmIdProperty, MapUtil.getStr(map, firmIdProperty));
+				feature.setAttribute(firmNameProperty, MapUtil.getStr(map, firmNameProperty));
 //				String description = MapUtil.getStr(map, "描述");
 //				if (CharSequenceUtil.isNotBlank(description)) {
 //					feature.setAttribute(descriptionProperty, description);

--
Gitblit v1.9.3