From 44e70ea1f80b048c80eec4a2dc7b3679ac3e3ccb Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期日, 08 一月 2023 17:30:44 +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 | 4 ++--
src/main/java/com/lf/server/entity/all/StaticData.java | 5 +++++
src/main/java/com/lf/server/entity/ctrl/FmeReqEntity.java | 7 +------
4 files changed, 51 insertions(+), 8 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 298321d..ac4dd64 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,6 +2,9 @@
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.all.StaticData;
+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;
@@ -12,6 +15,9 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import java.lang.reflect.Method;
+import java.util.ArrayList;
+import java.util.List;
/**
* 妫�鏌ユ帶鍒跺櫒
@@ -58,6 +64,43 @@
}
}
+ @SysLog()
+ @ApiOperation(value = "鎻愪氦鏁版嵁璐ㄦ")
+ @GetMapping(value = "/uploadChecks")
+ public ResponseMsg<Object> uploadChecks(FmeReqEntity entity, HttpServletRequest req) {
+ try {
+ if (StringHelper.isEmpty(entity.names)) {
+ return fail("浠诲姟鍚嶇О涓嶈兘涓虹┖");
+ }
+
+ List<String> list = new ArrayList<>();
+ for (String name : entity.names.split(StaticData.COMMA)) {
+ String guid = invoke(name, entity, req);
+ list.add(guid);
+ }
+
+ return success(list);
+ } catch (Exception ex) {
+ return fail(ex.getMessage(), null);
+ }
+ }
+
+ /**
+ * 鏂规硶璋冪敤
+ */
+ private String invoke(String name, FmeReqEntity entity, HttpServletRequest req) throws Exception {
+ Method method;
+ try {
+ method = FmeService.class.getDeclaredMethod(name, FmeReqEntity.class, HttpServletRequest.class);
+ } catch (Exception ex) {
+ throw new Exception(name + "锛岃妫�鏌ユ柟娉曚笉瀛樺湪");
+ }
+
+ Object obj = method.invoke(fmeService, entity, req);
+
+ return null == obj ? null : obj.toString();
+ }
+
/*@SysLog()
@ApiOperation(value = "鏌ヨOSGB妫�鏌�")
@GetMapping(value = "/selectCheckOsgb")
diff --git a/src/main/java/com/lf/server/entity/all/StaticData.java b/src/main/java/com/lf/server/entity/all/StaticData.java
index 084d1d2..8734fc6 100644
--- a/src/main/java/com/lf/server/entity/all/StaticData.java
+++ b/src/main/java/com/lf/server/entity/all/StaticData.java
@@ -60,6 +60,11 @@
public final static String POINT = ".";
/**
+ * 閫楀彿
+ */
+ public final static String COMMA = ",";
+
+ /**
* 绛夊彿
*/
public final static String EQ = "=";
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 6c70af2..3834d5c 100644
--- a/src/main/java/com/lf/server/entity/ctrl/FmeReqEntity.java
+++ b/src/main/java/com/lf/server/entity/ctrl/FmeReqEntity.java
@@ -11,7 +11,7 @@
/**
* 浠诲姟鍚嶇О
*/
- public String name;
+ public String names;
/**
* 椤圭洰鍚嶇О
@@ -52,11 +52,6 @@
* 褰卞儚鍒嗚鲸鐜囷紙榛樿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 877acc5..795f579 100644
--- a/src/main/java/com/lf/server/service/data/FmeService.java
+++ b/src/main/java/com/lf/server/service/data/FmeService.java
@@ -138,8 +138,8 @@
List<NameValueEntity> list = getKeyValues("鍥鹃潰鏁撮グ妫�鏌�");
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"));
+ list.add(new NameValueEntity("S_XLS", "$(ZJPZWJ)\\璐ㄦ閰嶇疆琛ㄦ��.xlsx"));
+ list.add(new NameValueEntity("S_XLS2", "D:\\Project\\Data\\LF\\temp\\20230107010101\\鏂囦欢娓呭崟.xlsx"));
return RestHelper.postForRest(url, list);
}
--
Gitblit v1.9.3