From 427bee04bfacf44abe5d595e2dad976747d83dba Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期日, 08 一月 2023 15:48:48 +0800
Subject: [PATCH] 1.8.5
---
src/main/java/com/lf/server/controller/data/upload/CheckController.java | 173 +++++++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 161 insertions(+), 12 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 f65d435..298321d 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
@@ -2,15 +2,16 @@
import com.lf.server.annotation.SysLog;
import com.lf.server.controller.all.BaseController;
-import com.lf.server.entity.all.ResponseMsg;
-import com.lf.server.entity.ctrl.FmeReqEntity;
import com.lf.server.helper.StringHelper;
import com.lf.server.service.data.FmeService;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
/**
* 妫�鏌ユ帶鍒跺櫒
@@ -21,6 +22,154 @@
protected FmeService fmeService;
@SysLog()
+ @ApiOperation(value = "鏌ヨ浠诲姟鐘舵��")
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "id", value = "浠诲姟ID", dataType = "String", paramType = "query", example = "29db09ee-2aae-4c62-bec0-0b5c5d8084e4")
+ })
+ @GetMapping(value = "/selectTaskStatus")
+ public Object selectTaskStatus(String id, HttpServletRequest req) {
+ try {
+ if (StringHelper.isEmpty(id)) {
+ return fail("id涓嶈兘涓虹┖");
+ }
+
+ Object obj = fmeService.getTaskStatus(id, req);
+
+ return obj;
+ } catch (Exception ex) {
+ return fail(ex.getMessage(), null);
+ }
+ }
+
+ @SysLog()
+ @ApiOperation(value = "涓嬭浇璐ㄦ閿欒缁撴灉")
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "id", value = "浠诲姟ID", dataType = "String", paramType = "query", example = "29db09ee-2aae-4c62-bec0-0b5c5d8084e4")
+ })
+ @GetMapping(value = "/downloadResult")
+ public void downloadResult(String id, HttpServletRequest req, HttpServletResponse res) {
+ try {
+ if (!StringHelper.isEmpty(id)) {
+ String url = fmeService.getDownloadUrl(id, req);
+ res.sendRedirect(url);
+ }
+ } catch (Exception ex) {
+ log.error(ex.getMessage(), ex);
+ }
+ }
+
+ /*@SysLog()
+ @ApiOperation(value = "鏌ヨOSGB妫�鏌�")
+ @GetMapping(value = "/selectCheckOsgb")
+ 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;
+
+ String rs = fmeService.checkOsgb(fme, req);
+ if (StringHelper.isEmpty(rs)) {
+ return fail("妫�鏌ュけ璐�");
+ }
+
+ return success(rs);
+ } catch (Exception ex) {
+ return fail(ex.getMessage(), null);
+ }
+ }
+
+ @SysLog()
+ @ApiOperation(value = "鏌ヨ琛ㄦ牸鏁版嵁妫�鏌�")
+ @GetMapping(value = "/selectCheckXls")
+ 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";
+
+ String rs = fmeService.checkXls(fme, req);
+ if (StringHelper.isEmpty(rs)) {
+ return fail("妫�鏌ュけ璐�");
+ }
+
+ return success(rs);
+ } catch (Exception ex) {
+ return fail(ex.getMessage(), null);
+ }
+ }
+
+ @SysLog()
+ @ApiOperation(value = "鏌ヨ鐐逛簯妫�鏌�")
+ @GetMapping(value = "/selectCheckLaz")
+ 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;
+
+ String rs = fmeService.checkLaz(fme, req);
+ if (StringHelper.isEmpty(rs)) {
+ return fail("妫�鏌ュけ璐�");
+ }
+
+ return success(rs);
+ } catch (Exception ex) {
+ return fail(ex.getMessage(), null);
+ }
+ }
+
+ @SysLog()
+ @ApiOperation(value = "鏌ヨ楂樼▼妫�鏌�")
+ @GetMapping(value = "/selectCheckDem")
+ 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;
+ fme.demChangeRate = 200;
+
+ String rs = fmeService.checkDem(fme, req);
+ if (StringHelper.isEmpty(rs)) {
+ return fail("妫�鏌ュけ璐�");
+ }
+
+ return success(rs);
+ } catch (Exception ex) {
+ return fail(ex.getMessage(), null);
+ }
+ }
+
+ @SysLog()
+ @ApiOperation(value = "鏌ヨ灞炴�ф鏌�")
+ @GetMapping(value = "/selectCheckAttrs")
+ 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";
+
+ String rs = fmeService.checkAttrs(fme, req);
+ if (StringHelper.isEmpty(rs)) {
+ return fail("妫�鏌ュけ璐�");
+ }
+
+ return success(rs);
+ } catch (Exception ex) {
+ return fail(ex.getMessage(), null);
+ }
+ }
+
+ @SysLog()
@ApiOperation(value = "鏌ヨ鎷撴墤妫�鏌�")
@GetMapping(value = "/selectCheckTopology")
public ResponseMsg<Object> selectCheckTopology(HttpServletRequest req) {
@@ -28,7 +177,7 @@
FmeReqEntity fme = new FmeReqEntity();
fme.name = StringHelper.getGuid();
fme.xmmc = "瑗挎皵涓滆緭鍥涚嚎澶╃劧姘旂閬撳伐绋嬶紙鍚愰瞾鐣�-涓崼锛夛紙00116BT02锛�";
- fme.zipPath = "D:\\Project\\Data\\LF\\temp\\20230106135746\\鎷撴墤妫�鏌�.zip";
+ fme.zipPath = "D:\\Project\\Data\\LF\\temp\\20230107010101\\鎷撴墤妫�鏌�.zip";
fme.polyTolerance = 0.001;
fme.lineTolerance = 0.001;
fme.pointTolerance = 0.001;
@@ -56,8 +205,8 @@
FmeReqEntity fme = new FmeReqEntity();
fme.name = StringHelper.getGuid();
fme.xmmc = "瑗挎皵涓滆緭鍥涚嚎澶╃劧姘旂閬撳伐绋嬶紙鍚愰瞾鐣�-涓崼锛夛紙00116BT02锛�";
- fme.zipPath = "D:\\Project\\Data\\LF\\temp\\20230106135746\\鍥鹃潰鏁撮グ妫�鏌�.zip";
- fme.xlsList = "D:\\Project\\Data\\LF\\temp\\20230106135746\\鏂囦欢娓呭崟.xlsx";
+ fme.zipPath = "D:\\Project\\Data\\LF\\temp\\20230107010101\\鍥鹃潰鏁撮グ妫�鏌�.zip";
+ fme.xlsList = "D:\\Project\\Data\\LF\\temp\\20230107010101\\鏂囦欢娓呭崟.xlsx";
String rs = fmeService.checkDecorate(fme, req);
if (StringHelper.isEmpty(rs)) {
@@ -78,7 +227,7 @@
FmeReqEntity fme = new FmeReqEntity();
fme.name = StringHelper.getGuid();
fme.xmmc = "瑗挎皵涓滆緭鍥涚嚎澶╃劧姘旂閬撳伐绋嬶紙鍚愰瞾鐣�-涓崼锛夛紙00116BT02锛�";
- fme.zipPath = "D:\\Project\\Data\\LF\\temp\\20230106135746\\鍘熺偣妫�鏌�.zip";
+ fme.zipPath = "D:\\Project\\Data\\LF\\temp\\20230107010101\\鍘熺偣妫�鏌�.zip";
String rs = fmeService.checkOrigin(fme, req);
if (StringHelper.isEmpty(rs)) {
@@ -100,7 +249,7 @@
fme.name = StringHelper.getGuid();
fme.xmmc = "瑗挎皵涓滆緭鍥涚嚎澶╃劧姘旂閬撳伐绋嬶紙鍚愰瞾鐣�-涓崼锛夛紙00116BT02锛�";
fme.sjzy = "娴嬮噺涓撲笟";
- fme.zipPath = "D:\\Project\\Data\\LF\\temp\\20230106135746\\鏍呮牸妫�鏌�.zip";
+ fme.zipPath = "D:\\Project\\Data\\LF\\temp\\20230107010101\\鏍呮牸妫�鏌�.zip";
fme.coordinateSystem = "CGCS2000/GK3d-93E_FME";
fme.imgResolution = 0.2;
@@ -124,7 +273,7 @@
fme.name = StringHelper.getGuid();
fme.xmmc = "瑗挎皵涓滆緭鍥涚嚎澶╃劧姘旂閬撳伐绋嬶紙鍚愰瞾鐣�-涓崼锛夛紙00116BT02锛�";
fme.sjzy = "娴嬮噺涓撲笟";
- fme.zipPath = "D:\\Project\\Data\\LF\\temp\\20230106135746\\鏁板鍩虹妫�鏌�.zip";
+ fme.zipPath = "D:\\Project\\Data\\LF\\temp\\20230107010101\\鏁板鍩虹妫�鏌�.zip";
String rs = fmeService.checkMath(fme, req);
if (StringHelper.isEmpty(rs)) {
@@ -146,7 +295,7 @@
fme.name = StringHelper.getGuid();
fme.xmmc = "瑗挎皵涓滆緭鍥涚嚎澶╃劧姘旂閬撳伐绋嬶紙鍚愰瞾鐣�-涓崼锛夛紙00116BT02锛�";
fme.sjzy = "娴嬮噺涓撲笟";
- fme.zipPath = "D:\\Project\\Data\\LF\\temp\\20230106135746\\鍏冩暟鎹鏌�.zip";
+ fme.zipPath = "D:\\Project\\Data\\LF\\temp\\20230107010101\\鍏冩暟鎹鏌�.zip";
String rs = fmeService.checkMeta(fme, req);
if (StringHelper.isEmpty(rs)) {
@@ -168,8 +317,8 @@
fme.name = StringHelper.getGuid();
fme.xmmc = "瑗挎皵涓滆緭鍥涚嚎澶╃劧姘旂閬撳伐绋嬶紙鍚愰瞾鐣�-涓崼锛夛紙00116BT02锛�";
fme.sjzy = "娴嬮噺涓撲笟";
- fme.zipPath = "D:\\Project\\Data\\LF\\temp\\20230106135746\\瑗挎皵涓滆緭鍥涚嚎澶╃劧姘旂閬撳伐绋嬶紙鍚愰瞾鐣�-涓崼锛夛紙00116BT02锛�.7z";
- fme.wbsPath = "D:\\Project\\Data\\LF\\temp\\20230106135746\\椤圭洰WBS瀵煎嚭.xlsx";
+ fme.zipPath = "D:\\Project\\Data\\LF\\temp\\20230107010101\\瑗挎皵涓滆緭鍥涚嚎澶╃劧姘旂閬撳伐绋嬶紙鍚愰瞾鐣�-涓崼锛夛紙00116BT02锛�.7z";
+ fme.wbsPath = "D:\\Project\\Data\\LF\\temp\\20230107010101\\椤圭洰WBS瀵煎嚭.xlsx";
fme.isDiZai = "NO";
fme.diZaiType = "NO";
@@ -182,5 +331,5 @@
} catch (Exception ex) {
return fail(ex.getMessage(), null);
}
- }
+ }*/
}
--
Gitblit v1.9.3