From fb4d9f5196471a7b202b3df69aaf9c8cf50b3377 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期三, 13 三月 2024 16:58:24 +0800
Subject: [PATCH] 修改数据计算面积接口
---
src/main/java/com/lf/server/service/show/OneMapService.java | 6 +++---
src/main/resources/mapper/show/OneMapMapper.xml | 12 ++++++------
src/main/resources/application.yml | 2 +-
3 files changed, 10 insertions(+), 10 deletions(-)
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 98db1ac..e086c0f 100644
--- a/src/main/java/com/lf/server/service/show/OneMapService.java
+++ b/src/main/java/com/lf/server/service/show/OneMapService.java
@@ -435,15 +435,15 @@
}
String guid = fmeService.calcArea(sjfl, id, wjlj);
- if (StringUtils.isEmpty(guid)) {
- ids.add(guid);
+ if (!StringUtils.isEmpty(guid)) {
+ ids.add(map.get("id").toString());
rows++;
}
} catch (Exception ex) {
log.error(ex.getMessage(), ex);
}
}
- System.out.println(StringHelper.join(ids, ","));
+ log.info(StringHelper.join(ids, ","));
}
return String.format("鍏卞鐞嗕簡 %d 鏉¤褰�", rows);
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 006c072..9d903ea 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -150,7 +150,7 @@
# 涓嬭浇鐩綍
download: D:\LF\download
# 涓婁紶鐩綍
- upload: E:\TaiRui\LF\upload
+ upload: D:\LF\upload
# 涓存椂鐩綍
temp: D:\LF\temp
# 涓婁紶闄勪欢琛�
diff --git a/src/main/resources/mapper/show/OneMapMapper.xml b/src/main/resources/mapper/show/OneMapMapper.xml
index 1c57857..6459d8b 100644
--- a/src/main/resources/mapper/show/OneMapMapper.xml
+++ b/src/main/resources/mapper/show/OneMapMapper.xml
@@ -319,18 +319,18 @@
<select id="selectMetaByType" resultType="java.util.Map">
(select a.id, a.path, 'DOM' type 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 = '鏁板瓧姝ｅ皠褰卞儚鍥�' limit 1)
+ where a.area is null and a.type in ('img', 'tif', 'tiff') and b.name = '鏁板瓧姝ｅ皠褰卞儚鍥�')
union all
(select a.id, a.path, 'DEM' type 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 = '鏁板瓧楂樼▼妯″瀷' limit 1)
+ where a.area is null and a.type in ('dem', 'tif', 'tiff') and b.name = '鏁板瓧楂樼▼妯″瀷')
union all
- (select id, path, 'OSGB' type from lf.sys_meta where area is null and type = 'osgb' limit 1)
+ (select id, path, 'OSGB' type from lf.sys_meta where area is null and type = 'osgb')
union all
- (select id, path, 'LAS' type from lf.sys_meta where area is null and type = 'las' or type = 'laz' limit 1)
+ (select id, path, 'LAS' type from lf.sys_meta where area is null and (type = 'las' or type = 'laz'))
union all
- (select id, path, 'IFC' type from lf.sys_meta where area is null and type = 'ifc' limit 1)
+ (select id, path, 'IFC' type from lf.sys_meta where area is null and type = 'ifc')
union all
- (select id, path, 'FBX' type from lf.sys_meta where area is null and type = 'fbx' limit 1)
+ (select id, path, 'FBX' type from lf.sys_meta where area is null and type = 'fbx')
</select>
</mapper>
\ No newline at end of file
--
Gitblit v1.9.3