From 7bfbdcdab10c58ecf96b45543c0d0df948af4ba5 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期二, 12 三月 2024 16:43:18 +0800
Subject: [PATCH] 修改根据类型查询元数据方法
---
src/main/java/com/lf/server/mapper/show/OneMapMapper.java | 3 ++-
src/main/java/com/lf/server/service/data/FmeService.java | 17 +++++++++++++++++
src/main/java/com/lf/server/service/show/OneMapService.java | 2 +-
src/main/resources/mapper/show/OneMapMapper.xml | 14 +++++++-------
4 files changed, 27 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/lf/server/mapper/show/OneMapMapper.java b/src/main/java/com/lf/server/mapper/show/OneMapMapper.java
index 86f2fe9..3d7d02a 100644
--- a/src/main/java/com/lf/server/mapper/show/OneMapMapper.java
+++ b/src/main/java/com/lf/server/mapper/show/OneMapMapper.java
@@ -251,5 +251,6 @@
*
* @return
*/
- public List<IdNameEntity> selectMetaByType();
+ @MapKey("")
+ public List<Map<String, Object>> selectMetaByType();
}
diff --git a/src/main/java/com/lf/server/service/data/FmeService.java b/src/main/java/com/lf/server/service/data/FmeService.java
index 3d380bc..7fb782d 100644
--- a/src/main/java/com/lf/server/service/data/FmeService.java
+++ b/src/main/java/com/lf/server/service/data/FmeService.java
@@ -317,6 +317,23 @@
}
/**
+ * f.璁＄畻闈㈢Н
+ */
+ public String calcArea(String sjfl, String id, String wjlj, HttpServletRequest req) {
+ String url = getUrl("datax/task/run/鏁版嵁鍗犲湴闈㈢Н璁＄畻", req);
+
+ List<NameValueEntity> list = new ArrayList<>();
+ list.add(new NameValueEntity("_name", String.format("%s_%s", "鏁版嵁鍗犲湴闈㈢Н璁＄畻", StringHelper.YMDHMS2_FORMAT.format(new Date()))));
+ list.add(new NameValueEntity("_terminate_on_error", false));
+ list.add(new NameValueEntity("_priority", 100));
+ list.add(new NameValueEntity("SJFL", sjfl));
+ list.add(new NameValueEntity("ID", id));
+ list.add(new NameValueEntity("WJLJ", wjlj));
+
+ return RestHelper.postForRest(url, list);
+ }
+
+ /**
* 鑾峰彇Url
*/
public String getUrl(String subUrl, HttpServletRequest req) {
diff --git a/src/main/java/com/lf/server/service/show/OneMapService.java b/src/main/java/com/lf/server/service/show/OneMapService.java
index 4316091..1b2e1be 100644
--- a/src/main/java/com/lf/server/service/show/OneMapService.java
+++ b/src/main/java/com/lf/server/service/show/OneMapService.java
@@ -383,7 +383,7 @@
}
@Override
- public List<IdNameEntity> selectMetaByType() {
+ public List<Map<String, Object>> selectMetaByType() {
return oneMapMapper.selectMetaByType();
}
}
diff --git a/src/main/resources/mapper/show/OneMapMapper.xml b/src/main/resources/mapper/show/OneMapMapper.xml
index ff7812a..c19e372 100644
--- a/src/main/resources/mapper/show/OneMapMapper.xml
+++ b/src/main/resources/mapper/show/OneMapMapper.xml
@@ -316,21 +316,21 @@
</select>
<!-- 鏍规嵁绫诲瀷鏌ヨ鍏冩暟鎹紙鐢ㄤ簬璁＄畻闈㈢Н锛� -->
- <select id="selectMetaByType" resultType="com.lf.server.entity.ctrl.IdNameEntity">
- (select a.id, 'DOM' name from lf.sys_meta a
+ <select id="selectMetaByType" resultType="java.util.Map">
+ (select a.id, a.path, 'DOM' name from lf.sys_meta a
inner join lf.sys_dir b on a.dircode = b.code
where a.area is null and a.type in ('img', 'tif', 'tiff') and b.name = '鏁板瓧姝ｅ皠褰卞儚鍥�')
union all
- (select a.id, 'DEM' name from lf.sys_meta a
+ (select a.id, a.path, 'DEM' name from lf.sys_meta a
inner join lf.sys_dir b on a.dircode = b.code
where a.area is null and a.type in ('dem', 'tif', 'tiff') and b.name = '鏁板瓧楂樼▼妯″瀷')
union all
- (select id, 'OSGB' name from lf.sys_meta where area is null and type = 'osgb')
+ (select id, path, 'OSGB' name from lf.sys_meta where area is null and type = 'osgb')
union all
- (select id, 'LAS' name from lf.sys_meta where area is null and type = 'las' or type = 'laz')
+ (select id, path, 'LAS' name from lf.sys_meta where area is null and type = 'las' or type = 'laz')
union all
- (select id, 'IFC' name from lf.sys_meta where area is null and type = 'ifc')
+ (select id, path, 'IFC' name from lf.sys_meta where area is null and type = 'ifc')
union all
- (select id, 'FBX' name from lf.sys_meta where area is null and type = 'fbx')
+ (select id, path, 'FBX' name from lf.sys_meta where area is null and type = 'fbx')
</select>
</mapper>
\ No newline at end of file
--
Gitblit v1.9.3