From edacde3b8be28eda7455a5612dea1ba1dd87d581 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期五, 21 十月 2022 14:06:32 +0800
Subject: [PATCH] 1
---
src/main/java/com/lf/server/controller/show/ComprehensiveController.java | 9 +++++----
src/main/java/com/lf/server/helper/GdalHelper.java | 4 ++++
src/main/java/com/lf/server/service/data/UploaderService.java | 4 +++-
说明.txt | 6 ++++--
4 files changed, 16 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/lf/server/controller/show/ComprehensiveController.java b/src/main/java/com/lf/server/controller/show/ComprehensiveController.java
index 013f869..115aa27 100644
--- a/src/main/java/com/lf/server/controller/show/ComprehensiveController.java
+++ b/src/main/java/com/lf/server/controller/show/ComprehensiveController.java
@@ -40,6 +40,8 @@
@Autowired
ComprehensiveService comprehensiveService;
+ private final static int FOUR = 4;
+
@SysLog()
@ApiOperation(value = "鍒嗛〉鏌ヨ骞惰繑鍥炶褰曟暟-鍦板悕鍦板潃")
@ApiImplicitParams({
@@ -89,10 +91,9 @@
return fail("鐢ㄦ埛鏈櫥褰�", null);
}
- MetaEntity me = new MetaEntity();
- List<MetaFileEntity> list = uploaderService.uploadData(me, ue, req, res);
- if (list.size() == 0) {
- return fail("娌℃湁鎵惧埌涓婁紶鏁版嵁", null);
+ List<MetaFileEntity> list = uploaderService.uploadData(null, ue, req, res);
+ if (list.size() < FOUR) {
+ return fail("娌℃湁鎵惧埌宸蹭笂浼犵殑鏁版嵁鎴栦笉瀹屾暣", null);
}
ShpRecord sr = comprehensiveService.readShpFirstRecord(list);
diff --git a/src/main/java/com/lf/server/helper/GdalHelper.java b/src/main/java/com/lf/server/helper/GdalHelper.java
index 9f95e08..e9053a8 100644
--- a/src/main/java/com/lf/server/helper/GdalHelper.java
+++ b/src/main/java/com/lf/server/helper/GdalHelper.java
@@ -66,6 +66,10 @@
Feature feature = layer.GetFeature(0);
String wkt = feature.GetGeometryRef().ExportToWkt();
+ layer.delete();
+ dataSource.delete();
+ driver.delete();
+
return new ShpRecord(wkt, csid);
} catch (Exception ex) {
ex.printStackTrace();
diff --git a/src/main/java/com/lf/server/service/data/UploaderService.java b/src/main/java/com/lf/server/service/data/UploaderService.java
index a29729b..bb83855 100644
--- a/src/main/java/com/lf/server/service/data/UploaderService.java
+++ b/src/main/java/com/lf/server/service/data/UploaderService.java
@@ -38,7 +38,9 @@
req.setCharacterEncoding("utf-8");
res.setContentType("application/json;charset=utf-8");
- setEntity(t, req);
+ if (t != null) {
+ setEntity(t, req);
+ }
List<MetaFileEntity> list = getFiles(ue, req);
return list;
diff --git "a/\350\257\264\346\230\216.txt" "b/\350\257\264\346\230\216.txt"
index 69469f9..a034020 100644
--- "a/\350\257\264\346\230\216.txt"
+++ "b/\350\257\264\346\230\216.txt"
@@ -11,9 +11,11 @@
a.娣诲姞Mybatis Plus缁勪欢
b.瑙ｅ喅琛ㄦ槧灏勫嚭閿欍�佹牴鎹甀D鏌ヨ澶辫触銆佸垎椤垫棤鏁堢瓑闂
c.寮�鍙戝湴鍚嶅湴鍧�鍒嗛〉鏌ヨ鎺ュ彛
+d.寮�鍙戜笂浼爏hp鏂囦欢璇诲彇绗竴鏉¤褰曠殑WKT鍔熻兘
+e.瑙ｅ喅涓婁紶鏂囦欢鏃跺疄浣撶被鏄犲皠寮傚父
+f.鍚庡彴鏈嶅姟璁块棶娣诲姞鐧诲綍楠岃瘉鎷︽埅鍣�
-----------------------------------------------
-.鍚庡彴鏈嶅姟璁块棶娣诲姞鐧诲綍楠岃瘉鎷︽埅鍣�
.寮�鍙戝垏闈㈡棩蹇楀姛鑳�
.娣诲姞鏁版嵁搴撶洃鎺у姛鑳�(Druid Monitor)
.涓嬭浇鏂囦欢骞惰缃甅IME绫诲瀷
@@ -22,7 +24,7 @@
.娣诲姞鎵归噺淇敼鐢ㄦ埛瀵嗙爜鎺ュ彛
.淇敼鎵�鏈夌殑鎵归噺鏂板銆佸垹闄ゃ�佷慨鏀规帴鍙�
.寮�鍙戝ぇ鏂囦欢涓婁紶鎺ュ彛
-.瑙ｅ喅涓婁紶鏂囦欢鏃跺疄浣撶被鏄犲皠寮傚父
+.GDAL璇诲彇shp鍚庡垹闄や笂浼犳枃浠�
-----------------------------------------------
1.涓婁紶鏂囦欢锛坈ommons-fileupload锛� *
--
Gitblit v1.9.3