From 000d00c01cccb865023ad68685f2953fbd28eee4 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期六, 07 一月 2023 11:30:34 +0800
Subject: [PATCH] 1
---
src/main/java/com/lf/server/controller/data/upload/CheckController.java | 43 +++++++++++++++++++++
src/main/java/com/lf/server/service/data/FmeService.java | 18 ++++++++-
src/main/java/com/lf/server/entity/ctrl/FmeReqEntity.java | 5 ++
3 files changed, 64 insertions(+), 2 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 78063c0..988f8e1 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,49 @@
protected FmeService fmeService;
@SysLog()
+ @ApiOperation(value = "鏌ヨ鍥鹃潰鏁撮グ妫�鏌�")
+ @GetMapping(value = "/selectCheckDecorate")
+ 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\\20230106135746\\鍥鹃潰鏁撮グ妫�鏌�.zip";
+ fme.xlsList = "D:\\Project\\Data\\LF\\temp\\20230106135746\\鏂囦欢娓呭崟.xlsx";
+
+ String rs = fmeService.checkDecorate(fme, req);
+ if (StringHelper.isEmpty(rs)) {
+ return fail("妫�鏌ュけ璐�");
+ }
+
+ return success(rs);
+ } catch (Exception ex) {
+ return fail(ex.getMessage(), null);
+ }
+ }
+
+ @SysLog()
+ @ApiOperation(value = "鏌ヨ鍘熺偣妫�鏌�")
+ @GetMapping(value = "/selectCheckOrigin")
+ 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\\20230106135746\\鍘熺偣妫�鏌�.zip";
+
+ String rs = fmeService.checkOrigin(fme, req);
+ if (StringHelper.isEmpty(rs)) {
+ return fail("妫�鏌ュけ璐�");
+ }
+
+ return success(rs);
+ } catch (Exception ex) {
+ return fail(ex.getMessage(), null);
+ }
+ }
+
+ @SysLog()
@ApiOperation(value = "鏌ヨ鏍呮牸妫�鏌�")
@GetMapping(value = "/selectCheckDom")
public ResponseMsg<Object> selectCheckDom(HttpServletRequest req) {
diff --git a/src/main/java/com/lf/server/entity/ctrl/FmeReqEntity.java b/src/main/java/com/lf/server/entity/ctrl/FmeReqEntity.java
index 80def8a..fbafdcc 100644
--- a/src/main/java/com/lf/server/entity/ctrl/FmeReqEntity.java
+++ b/src/main/java/com/lf/server/entity/ctrl/FmeReqEntity.java
@@ -52,4 +52,9 @@
* 褰卞儚鍒嗚鲸鐜囷紙榛樿0.2m锛�
*/
public double imgResolution = 0.2;
+
+ /**
+ * 鏂囦欢娓呭崟
+ */
+ public String xlsList;
}
diff --git a/src/main/java/com/lf/server/service/data/FmeService.java b/src/main/java/com/lf/server/service/data/FmeService.java
index 1562e88..81205fe 100644
--- a/src/main/java/com/lf/server/service/data/FmeService.java
+++ b/src/main/java/com/lf/server/service/data/FmeService.java
@@ -65,15 +65,29 @@
/**
* 7.鍥鹃潰鏁撮グ妫�鏌ワ細.dwg
*/
- public void checkDecorate(FmeReqEntity fme, HttpServletRequest req) {
+ public String checkDecorate(FmeReqEntity fme, HttpServletRequest req) {
+ String url = getUrl("datax/task/run/A10鎴愭灉璐ㄦ_鍥鹃潰鏁撮グ妫�鏌�", req);
+ List<NameValueEntity> list = getKeyValues(fme.name);
+ list.add(new NameValueEntity("XMMC", fme.xmmc));
+ list.add(new NameValueEntity("GCXMYSB", fme.zipPath));
+ list.add(new NameValueEntity("S_XLS2", fme.xlsList));
+ list.add(new NameValueEntity("S_XLS", "$(OrgUserStorage)\\璐ㄦ閰嶇疆鏂囦欢\\璐ㄦ閰嶇疆琛ㄦ��.xlsx"));
+
+ return RestHelper.postForRest(url, list);
}
/**
* 8.鍘熺偣妫�鏌ワ細*鍓栭潰鍥�*.dwg
*/
- public void checkOrigin(FmeReqEntity fme, HttpServletRequest req) {
+ public String checkOrigin(FmeReqEntity fme, HttpServletRequest req) {
+ String url = getUrl("datax/task/run/A11鎴愭灉璐ㄦ_鍘熺偣妫�鏌�", req);
+ List<NameValueEntity> list = getKeyValues(fme.name);
+ list.add(new NameValueEntity("XMMC", fme.xmmc));
+ list.add(new NameValueEntity("GCXMYSB", fme.zipPath));
+
+ return RestHelper.postForRest(url, list);
}
/**
--
Gitblit v1.9.3