From ed8c7a5effd0d423ce1118b680ecdca6fe732609 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期三, 02 七月 2025 16:43:13 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.11.205:9000/r/P2022036_Service
---
src/main/java/com/lf/server/controller/data/upload/CheckController.java | 139 ++++++++++++++++++++++++++++++++++++---------
1 files changed, 110 insertions(+), 29 deletions(-)
diff --git a/src/main/java/com/lf/server/controller/data/upload/CheckController.java b/src/main/java/com/lf/server/controller/data/upload/CheckController.java
index f0837a5..ae92877 100644
--- a/src/main/java/com/lf/server/controller/data/upload/CheckController.java
+++ b/src/main/java/com/lf/server/controller/data/upload/CheckController.java
@@ -5,6 +5,7 @@
import com.lf.server.entity.all.ResponseMsg;
import com.lf.server.entity.all.StaticData;
import com.lf.server.entity.ctrl.FmeReqEntity;
+import com.lf.server.entity.ctrl.RegisterEntity;
import com.lf.server.helper.HttpHelper;
import com.lf.server.helper.PathHelper;
import com.lf.server.helper.StringHelper;
@@ -50,12 +51,12 @@
return fmeService.getTaskStatus(id, req);
} catch (Exception ex) {
- return fail(ex.getMessage(), null);
+ return fail(ex, null);
}
}
@SysLog()
- @ApiOperation(value = "涓嬭浇璐ㄦ閿欒缁撴灉")
+ @ApiOperation(value = "涓嬭浇璐ㄦ缁撴灉")
@ApiImplicitParams({
@ApiImplicitParam(name = "id", value = "浠诲姟ID", dataType = "String", paramType = "query", example = "29db09ee-2aae-4c62-bec0-0b5c5d8084e4")
})
@@ -109,7 +110,7 @@
return success(list);
} catch (Exception ex) {
- return fail(ex.getMessage(), null);
+ return fail(ex, null);
}
}
@@ -171,7 +172,6 @@
public ResponseMsg<Object> selectCheckOsgb(HttpServletRequest req) {
try {
FmeReqEntity fme = new FmeReqEntity();
- fme.name = StringHelper.getGuid();
fme.xmmc = "瑗挎皵涓滆緭鍥涚嚎澶╃劧姘旂閬撳伐绋嬶紙鍚愰瞾鐣�-涓崼锛夛紙00116BT02锛�";
fme.zipPath = "D:\\Project\\Data\\LF\\temp\\20230107010101\\OSGB妫�鏌�.zip";
fme.imgResolution = 0.2;
@@ -183,7 +183,7 @@
return success(rs);
} catch (Exception ex) {
- return fail(ex.getMessage(), null);
+ return fail(ex, null);
}
}
@@ -193,7 +193,6 @@
public ResponseMsg<Object> selectCheckXls(HttpServletRequest req) {
try {
FmeReqEntity fme = new FmeReqEntity();
- fme.name = StringHelper.getGuid();
fme.xmmc = "瑗挎皵涓滆緭鍥涚嚎澶╃劧姘旂閬撳伐绋嬶紙鍚愰瞾鐣�-涓崼锛夛紙00116BT02锛�";
fme.sjzy = "娴嬮噺涓撲笟";
fme.zipPath = "D:\\Project\\Data\\LF\\temp\\20230107010101\\琛ㄦ牸鏁版嵁妫�鏌�.zip";
@@ -205,7 +204,7 @@
return success(rs);
} catch (Exception ex) {
- return fail(ex.getMessage(), null);
+ return fail(ex, null);
}
}
@@ -215,7 +214,6 @@
public ResponseMsg<Object> selectCheckLaz(HttpServletRequest req) {
try {
FmeReqEntity fme = new FmeReqEntity();
- fme.name = StringHelper.getGuid();
fme.xmmc = "瑗挎皵涓滆緭鍥涚嚎澶╃劧姘旂閬撳伐绋嬶紙鍚愰瞾鐣�-涓崼锛夛紙00116BT02锛�";
fme.zipPath = "D:\\Project\\Data\\LF\\temp\\20230107010101\\鐐逛簯妫�鏌�.zip";
fme.lazDensity = 1;
@@ -227,7 +225,7 @@
return success(rs);
} catch (Exception ex) {
- return fail(ex.getMessage(), null);
+ return fail(ex, null);
}
}
@@ -237,7 +235,6 @@
public ResponseMsg<Object> selectCheckDem(HttpServletRequest req) {
try {
FmeReqEntity fme = new FmeReqEntity();
- fme.name = StringHelper.getGuid();
fme.xmmc = "瑗挎皵涓滆緭鍥涚嚎澶╃劧姘旂閬撳伐绋嬶紙鍚愰瞾鐣�-涓崼锛夛紙00116BT02锛�";
fme.zipPath = "D:\\Project\\Data\\LF\\temp\\20230107010101\\楂樼▼妫�鏌�.zip";
fme.demTolerance = 5;
@@ -250,7 +247,7 @@
return success(rs);
} catch (Exception ex) {
- return fail(ex.getMessage(), null);
+ return fail(ex, null);
}
}
@@ -260,7 +257,6 @@
public ResponseMsg<Object> selectCheckAttrs(HttpServletRequest req) {
try {
FmeReqEntity fme = new FmeReqEntity();
- fme.name = StringHelper.getGuid();
fme.xmmc = "瑗挎皵涓滆緭鍥涚嚎澶╃劧姘旂閬撳伐绋嬶紙鍚愰瞾鐣�-涓崼锛夛紙00116BT02锛�";
fme.sjzy = "娴嬮噺涓撲笟";
fme.zipPath = "D:\\Project\\Data\\LF\\temp\\20230107010101\\灞炴�ф鏌�.zip";
@@ -272,7 +268,7 @@
return success(rs);
} catch (Exception ex) {
- return fail(ex.getMessage(), null);
+ return fail(ex, null);
}
}
@@ -282,7 +278,6 @@
public ResponseMsg<Object> selectCheckTopology(HttpServletRequest req) {
try {
FmeReqEntity fme = new FmeReqEntity();
- fme.name = StringHelper.getGuid();
fme.xmmc = "瑗挎皵涓滆緭鍥涚嚎澶╃劧姘旂閬撳伐绋嬶紙鍚愰瞾鐣�-涓崼锛夛紙00116BT02锛�";
fme.zipPath = "D:\\Project\\Data\\LF\\temp\\20230107010101\\鎷撴墤妫�鏌�.zip";
fme.polyTolerance = 0.001;
@@ -300,7 +295,7 @@
return success(rs);
} catch (Exception ex) {
- return fail(ex.getMessage(), null);
+ return fail(ex, null);
}
}
@@ -310,7 +305,6 @@
public ResponseMsg<Object> selectCheckDecorate(HttpServletRequest req) {
try {
FmeReqEntity fme = new FmeReqEntity();
- fme.name = StringHelper.getGuid();
fme.xmmc = "瑗挎皵涓滆緭鍥涚嚎澶╃劧姘旂閬撳伐绋嬶紙鍚愰瞾鐣�-涓崼锛夛紙00116BT02锛�";
fme.zipPath = "D:\\Project\\Data\\LF\\temp\\20230107010101\\鍥鹃潰鏁撮グ妫�鏌�.zip";
fme.xlsList = "D:\\Project\\Data\\LF\\temp\\20230107010101\\鏂囦欢娓呭崟.xlsx";
@@ -322,7 +316,7 @@
return success(rs);
} catch (Exception ex) {
- return fail(ex.getMessage(), null);
+ return fail(ex, null);
}
}
@@ -332,7 +326,6 @@
public ResponseMsg<Object> selectCheckOrigin(HttpServletRequest req) {
try {
FmeReqEntity fme = new FmeReqEntity();
- fme.name = StringHelper.getGuid();
fme.xmmc = "瑗挎皵涓滆緭鍥涚嚎澶╃劧姘旂閬撳伐绋嬶紙鍚愰瞾鐣�-涓崼锛夛紙00116BT02锛�";
fme.zipPath = "D:\\Project\\Data\\LF\\temp\\20230107010101\\鍘熺偣妫�鏌�.zip";
@@ -343,7 +336,7 @@
return success(rs);
} catch (Exception ex) {
- return fail(ex.getMessage(), null);
+ return fail(ex, null);
}
}
@@ -353,7 +346,6 @@
public ResponseMsg<Object> selectCheckDom(HttpServletRequest req) {
try {
FmeReqEntity fme = new FmeReqEntity();
- fme.name = StringHelper.getGuid();
fme.xmmc = "瑗挎皵涓滆緭鍥涚嚎澶╃劧姘旂閬撳伐绋嬶紙鍚愰瞾鐣�-涓崼锛夛紙00116BT02锛�";
fme.sjzy = "娴嬮噺涓撲笟";
fme.zipPath = "D:\\Project\\Data\\LF\\temp\\20230107010101\\鏍呮牸妫�鏌�.zip";
@@ -367,7 +359,7 @@
return success(rs);
} catch (Exception ex) {
- return fail(ex.getMessage(), null);
+ return fail(ex, null);
}
}
@@ -377,7 +369,6 @@
public ResponseMsg<Object> selectCheckMath(HttpServletRequest req) {
try {
FmeReqEntity fme = new FmeReqEntity();
- fme.name = StringHelper.getGuid();
fme.xmmc = "瑗挎皵涓滆緭鍥涚嚎澶╃劧姘旂閬撳伐绋嬶紙鍚愰瞾鐣�-涓崼锛夛紙00116BT02锛�";
fme.sjzy = "娴嬮噺涓撲笟";
fme.zipPath = "D:\\Project\\Data\\LF\\temp\\20230107010101\\鏁板鍩虹妫�鏌�.zip";
@@ -389,20 +380,19 @@
return success(rs);
} catch (Exception ex) {
- return fail(ex.getMessage(), null);
+ return fail(ex, null);
}
}
@SysLog()
- @ApiOperation(value = "鏌ヨ婧愭暟鎹鏌�")
+ @ApiOperation(value = "鏌ヨ鍏冩暟鎹鏌�")
@GetMapping(value = "/selectCheckMeta")
public ResponseMsg<Object> selectCheckMeta(HttpServletRequest req) {
try {
FmeReqEntity fme = new FmeReqEntity();
- fme.name = StringHelper.getGuid();
fme.xmmc = "瑗挎皵涓滆緭鍥涚嚎澶╃劧姘旂閬撳伐绋嬶紙鍚愰瞾鐣�-涓崼锛夛紙00116BT02锛�";
fme.sjzy = "娴嬮噺涓撲笟";
- fme.zipPath = "D:\\Project\\Data\\LF\\temp\\20230107010101\\婧愭暟鎹鏌�.zip";
+ fme.zipPath = "D:\\Project\\Data\\LF\\temp\\20230107010101\\鍏冩暟鎹鏌�.zip";
String rs = fmeService.checkMeta(fme, req);
if (StringHelper.isEmpty(rs)) {
@@ -411,7 +401,7 @@
return success(rs);
} catch (Exception ex) {
- return fail(ex.getMessage(), null);
+ return fail(ex, null);
}
}
@@ -421,7 +411,6 @@
public ResponseMsg<Object> selectCheckMain(HttpServletRequest req) {
try {
FmeReqEntity fme = new FmeReqEntity();
- fme.name = StringHelper.getGuid();
fme.xmmc = "瑗挎皵涓滆緭鍥涚嚎澶╃劧姘旂閬撳伐绋嬶紙鍚愰瞾鐣�-涓崼锛夛紙00116BT02锛�";
fme.sjzy = "娴嬮噺涓撲笟";
fme.zipPath = "D:\\Project\\Data\\LF\\temp\\20230107010101\\瑗挎皵涓滆緭鍥涚嚎澶╃劧姘旂閬撳伐绋嬶紙鍚愰瞾鐣�-涓崼锛夛紙00116BT02锛�.7z";
@@ -436,7 +425,99 @@
return success(rs);
} catch (Exception ex) {
- return fail(ex.getMessage(), null);
+ return fail(ex, null);
+ }
+ }
+
+ @SysLog()
+ @ApiOperation(value = "閫昏緫涓�鑷存�ф鏌�")
+ @GetMapping(value = "/checkLogical")
+ public ResponseMsg<Object> checkLogical(HttpServletRequest req) {
+ try {
+ FmeReqEntity fme = new FmeReqEntity();
+ fme.xmmc = "瑗挎皵涓滆緭鍥涚嚎澶╃劧姘旂閬撳伐绋嬶紙鍚愰瞾鐣�-涓崼锛夛紙00116BT02锛�";
+ fme.sjzy = "娴嬮噺涓撲笟";
+ fme.zipPath = "D:\\LF\\temp\\20230411\\鏁板瓧鍖栨垚鏋�.zip";
+
+ String rs = fmeService.checkLogical(fme, req);
+ if (StringHelper.isEmpty(rs)) {
+ return fail("妫�鏌ュけ璐�");
+ }
+
+ return success(rs);
+ } catch (Exception ex) {
+ return fail(ex, null);
+ }
+ }
+
+ @SysLog()
+ @ApiOperation(value = "鍗曢」鎴愭灉瀹屾暣鎬ф鏌�")
+ @GetMapping(value = "/checkSingleIntegrity")
+ public ResponseMsg<Object> checkSingleIntegrity(HttpServletRequest req) {
+ try {
+ FmeReqEntity fme = new FmeReqEntity();
+ fme.xmmc = "瑗挎皵涓滆緭鍥涚嚎澶╃劧姘旂閬撳伐绋嬶紙鍚愰瞾鐣�-涓崼锛夛紙00116BT02锛�";
+ fme.sjzy = "娴嬮噺涓撲笟";
+ fme.sjfl = "鏁板瓧鍖栨垚鏋�";
+ fme.zipPath = "D:\\LF\\temp\\20230411\\鏁板瓧鍖栨垚鏋�.zip";
+
+ String rs = fmeService.checkSingleIntegrity(fme, req);
+ if (StringHelper.isEmpty(rs)) {
+ return fail("妫�鏌ュけ璐�");
+ }
+
+ return success(rs);
+ } catch (Exception ex) {
+ return fail(ex, null);
}
}*/
+
+ @SysLog()
+ @ApiOperation(value = "鏈嶅姟娉ㄥ唽")
+ @GetMapping(value = "/selectServerRegister")
+ public ResponseMsg<Object> selectServerRegister(HttpServletRequest req) {
+ try {
+ RegisterEntity rs = fmeService.serverRegister("瑗挎皵涓滆緭鍥涚嚎澶╃劧姘旂閬撳伐绋嬶紙鍚愰瞾鐣�-涓崼锛夛紙00116DT02锛�", "http://127.0.0.1/LFData/2d/tiles/01/{z}/{x}/{y}.png", "DOM", req);
+ if (null == rs || StringHelper.isEmpty(rs.getSerialnum())) {
+ return fail("澶辫触");
+ }
+
+ return success(rs);
+ } catch (Exception ex) {
+ return fail(ex, null);
+ }
+ }
+
+ @SysLog()
+ @ApiOperation(value = "鏈嶅姟鐢宠")
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "id", value = "鏈嶅姟ID", dataType = "String", paramType = "query", example = "195f77eb-19dd-4e34-afc1-fcff8f758f7b"),
+ @ApiImplicitParam(name = "pubid", value = "鍙戝竷ID", dataType = "Integer", paramType = "query", example = "1"),
+ })
+ @GetMapping(value = "/selectServerApply")
+ public ResponseMsg<Object> selectServerApply(String id, Integer pubid, HttpServletRequest req) {
+ try {
+ fmeService.serverApply(id, pubid, req);
+
+ return success("OK");
+ } catch (Exception ex) {
+ return fail(ex, null);
+ }
+ }
+
+ @SysLog()
+ @ApiOperation(value = "鍒犻櫎璧勬簮")
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "id", value = "鏈嶅姟ID", dataType = "String", paramType = "query", example = "6f4b6783-4b98-4d46-a0d9-43cdb5f339dc")
+ })
+ @GetMapping(value = "/selectDeleteRes")
+ public ResponseMsg<Object> selectDeleteRes(String id, HttpServletRequest req) {
+ try {
+ fmeService.deleteRes(id, req);
+
+ return success("OK");
+ } catch (Exception ex) {
+ return fail(ex, null);
+ }
+ }
}
--
Gitblit v1.9.3