From d539637587e961712451ea8c42e043a2a0ad5971 Mon Sep 17 00:00:00 2001 From: 13693261870 <252740454@qq.com> Date: 星期六, 07 一月 2023 13:17:54 +0800 Subject: [PATCH] 1.7 --- src/main/java/com/lf/server/controller/data/upload/CheckController.java | 40 +++++++++++++++++++++++++++++++--------- 1 files changed, 31 insertions(+), 9 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..fc3b367 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 @@ -21,6 +21,28 @@ protected FmeService fmeService; @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 +50,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 +78,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 +100,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 +122,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 +146,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 +168,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 +190,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"; -- Gitblit v1.9.3