From 1c090243771f3aea29e5d5de6d8291cd54a31356 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期三, 15 二月 2023 14:42:05 +0800
Subject: [PATCH] 1
---
src/main/java/com/lf/server/helper/ShpHelper.java | 3 ++-
src/main/java/com/lf/server/entity/all/StaticData.java | 5 +++++
data/update.sql | 11 +++++------
src/main/java/com/lf/server/helper/GdbHelper.java | 9 ++++-----
4 files changed, 16 insertions(+), 12 deletions(-)
diff --git a/data/update.sql b/data/update.sql
index c29911a..1020117 100644
--- a/data/update.sql
+++ b/data/update.sql
@@ -182,20 +182,19 @@
select * from lf.sys_res;
select * from lf.sys_ver;
-
select c.* from lf.sys_role a inner join lf.sys_role_user b on a.id = b.roleid
inner join lf.sys_user c on b.userid = c.id
where a.is_admin = 2 and c.depcode = '000204'
-order by c.id limit 1
+order by c.id limit 1;
select c.* from lf.sys_role a inner join lf.sys_role_user b on a.id = b.roleid
inner join lf.sys_user c on b.userid = c.id
where a.is_admin = 2 and a.depid = 20
-order by c.id limit 1
+order by c.id limit 1;
-select * from lf.sys_user
-select * from lf.sys_role
-select * from lf.sys_download
+select * from lf.sys_user;
+select * from lf.sys_role;
+select * from lf.sys_download where guid = '5f0d5b61ca8cd79a07502f308c2f4dcc';
diff --git a/src/main/java/com/lf/server/entity/all/StaticData.java b/src/main/java/com/lf/server/entity/all/StaticData.java
index 1206898..98557ea 100644
--- a/src/main/java/com/lf/server/entity/all/StaticData.java
+++ b/src/main/java/com/lf/server/entity/all/StaticData.java
@@ -235,6 +235,11 @@
public final static List<String> MDB_EXCLUDE_FIELDS = new ArrayList<>(Arrays.asList("Shape", "SHAPE_LENG", "Shape_Length", "Shape_Area", "OBJECTID_1"));
/**
+ * 鏍囩粯Shp鎺掗櫎瀛楁
+ */
+ public final static List<String> MARK_EXCLUDE_FIELDS = new ArrayList<>(Arrays.asList("wkt", "geom", "objectid", "shape_leng", "shape_area", "serialVersionUID", "dirName", "depName", "verName", "createName", "updateName"));
+
+ /**
* GDB鎺掗櫎瀛楁
*/
public final static List<String> GDB_EXCLUDE_FIELDS = new ArrayList<>(Arrays.asList("geom", "objectid", "shape_leng", "shape_area", "serialVersionUID", "dirName", "depName", "verName", "createName", "updateName"));
diff --git a/src/main/java/com/lf/server/helper/GdbHelper.java b/src/main/java/com/lf/server/helper/GdbHelper.java
index 2f012f4..e813e7d 100644
--- a/src/main/java/com/lf/server/helper/GdbHelper.java
+++ b/src/main/java/com/lf/server/helper/GdbHelper.java
@@ -390,8 +390,7 @@
}
List<Field> fields = new ArrayList<>();
- // fields.add(getGeomField(clazz))
- getFields(clazz, fields);
+ getFields(clazz, fields, StaticData.GDB_EXCLUDE_FIELDS);
addLayerField(layer, fields);
setLayerData(layer, fields, map.get(key));
@@ -465,11 +464,11 @@
/**
* 鑾峰彇瀛楁
*/
- public static void getFields(Class clazz, List<Field> list) {
+ public static void getFields(Class clazz, List<Field> list, List<String> excludeFields) {
try {
Field[] fields = clazz.getDeclaredFields();
for (Field f : fields) {
- if (StaticData.GDB_EXCLUDE_FIELDS.contains(f.getName())) {
+ if (excludeFields.contains(f.getName())) {
continue;
}
@@ -478,7 +477,7 @@
}
if (!StaticData.OBJECT.equals(clazz.getSuperclass().getName())) {
- getFields(clazz.getSuperclass(), list);
+ getFields(clazz.getSuperclass(), list, excludeFields);
}
} catch (Exception ex) {
//
diff --git a/src/main/java/com/lf/server/helper/ShpHelper.java b/src/main/java/com/lf/server/helper/ShpHelper.java
index 692af1d..c953132 100644
--- a/src/main/java/com/lf/server/helper/ShpHelper.java
+++ b/src/main/java/com/lf/server/helper/ShpHelper.java
@@ -1,5 +1,6 @@
package com.lf.server.helper;
+import com.lf.server.entity.all.StaticData;
import com.lf.server.entity.ctrl.MarkJsonEntity;
import com.lf.server.entity.ctrl.ShpRecordEntity;
import org.apache.commons.logging.Log;
@@ -171,7 +172,7 @@
}
List<Field> fields = new ArrayList<>();
- GdbHelper.getFields(MarkJsonEntity.class, fields);
+ GdbHelper.getFields(MarkJsonEntity.class, fields, StaticData.MARK_EXCLUDE_FIELDS);
GdbHelper.addLayerField(layer, fields);
FeatureDefn featureDefn = layer.GetLayerDefn();
--
Gitblit v1.9.3