From 5c3482e853299bcc786a244ca22a05a3a8d380fe Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期五, 06 一月 2023 17:18:43 +0800
Subject: [PATCH] 1
---
src/main/java/com/lf/server/helper/RestHelper.java | 17 +++++------------
src/main/java/com/lf/server/controller/all/BaseUploadController.java | 27 +++++++++++++++++++++++++++
src/main/java/com/lf/server/service/data/FmeService.java | 12 +++++++-----
src/main/resources/application.yml | 4 ++--
4 files changed, 41 insertions(+), 19 deletions(-)
diff --git a/src/main/java/com/lf/server/controller/all/BaseUploadController.java b/src/main/java/com/lf/server/controller/all/BaseUploadController.java
index 60f23a4..2703a21 100644
--- a/src/main/java/com/lf/server/controller/all/BaseUploadController.java
+++ b/src/main/java/com/lf/server/controller/all/BaseUploadController.java
@@ -7,8 +7,10 @@
import com.lf.server.entity.data.VerEntity;
import com.lf.server.entity.sys.DepEntity;
import com.lf.server.entity.sys.UserEntity;
+import com.lf.server.helper.StringHelper;
import com.lf.server.service.all.BaseUploadService;
import com.lf.server.service.data.DirService;
+import com.lf.server.service.data.FmeService;
import com.lf.server.service.data.MetaService;
import com.lf.server.service.data.VerService;
import com.lf.server.service.sys.DepService;
@@ -39,6 +41,9 @@
@Autowired
MetaService metaService;
+
+ @Autowired
+ FmeService fmeService;
@Autowired
protected TokenService tokenService;
@@ -177,4 +182,26 @@
return fail(ex.getMessage(), -1);
}
}
+
+ @SysLog()
+ @ApiOperation(value = "鏌ヨ鏁版嵁鏈夋晥鎬�")
+ @GetMapping(value = "/selectDataValid")
+ public ResponseMsg<Object> selectDataValid(HttpServletRequest req) {
+ try {
+ String taskGuid = StringHelper.getGuid();
+ String xmmc = "瑗挎皵涓滆緭鍥涚嚎澶╃劧姘旂閬撳伐绋嬶紙鍚愰瞾鐣�-涓崼锛夛紙00116BT02锛�";
+ // 娴嬮噺涓撲笟|鍕樺療涓撲笟|鍦扮伨涓撲笟|娲炲簱涓撲笟
+ String sjzy = "娴嬮噺涓撲笟";
+ String filePath = "D:\\Project\\Data\\LF\\temp\\20230106135746\\鏁板鍩虹妫�鏌�.zip";
+
+ String rs = fmeService.checkMath(taskGuid, xmmc, sjzy, filePath, req);
+ if (StringHelper.isEmpty(rs)) {
+ return fail("妫�鏌ュけ璐�");
+ }
+
+ return success(rs);
+ } catch (Exception ex) {
+ return fail(ex.getMessage(), null);
+ }
+ }
}
diff --git a/src/main/java/com/lf/server/helper/RestHelper.java b/src/main/java/com/lf/server/helper/RestHelper.java
index dfd48d8..b27d1c1 100644
--- a/src/main/java/com/lf/server/helper/RestHelper.java
+++ b/src/main/java/com/lf/server/helper/RestHelper.java
@@ -1,6 +1,7 @@
package com.lf.server.helper;
import com.lf.server.entity.all.StaticData;
+import com.lf.server.entity.ctrl.NameValueEntity;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.http.HttpEntity;
@@ -202,19 +203,11 @@
}
}
- /**
- * Post璇锋眰-RestTemplate
- *
- * @param uri Uri鍦板潃
- * @param postData 寰呭彂閫佹暟鎹�
- * @return 鍝嶅簲瀛楃涓�
- */
- public static String postForRest(String uri, List<NameValuePair> postData) {
+ public static String postForRest(String uri, Map<String, Object> map) {
try {
RestTemplate rest = getRestTemplate();
- UrlEncodedFormEntity entity = new UrlEncodedFormEntity(postData, StaticData.TEXT_ENCODER);
- return rest.postForObject(uri, entity, String.class);
+ return rest.postForObject(uri, map, String.class);
} catch (Exception ex) {
log.error(ex.getMessage(), ex);
@@ -222,11 +215,11 @@
}
}
- public static String postForRest(String uri, Map<String, Object> map) {
+ public static <T> String postForRest(String uri, List<T> list) {
try {
RestTemplate rest = getRestTemplate();
- return rest.postForObject(uri, map, String.class);
+ return rest.postForObject(uri, list, String.class);
} catch (Exception ex) {
log.error(ex.getMessage(), ex);
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 e5c6e00..fe1e16a 100644
--- a/src/main/java/com/lf/server/service/data/FmeService.java
+++ b/src/main/java/com/lf/server/service/data/FmeService.java
@@ -1,10 +1,12 @@
package com.lf.server.service.data;
import com.lf.server.entity.ctrl.NameValueEntity;
+import com.lf.server.helper.RestHelper;
import com.lf.server.helper.WebHelper;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
+import javax.servlet.http.HttpServletRequest;
import java.util.ArrayList;
import java.util.List;
@@ -83,8 +85,8 @@
/**
* 鏁板鍩虹妫�鏌ワ細.shp, .gdb, *鍏冩暟鎹�*.xls/.xlsx
*/
- public void checkMath(String taskGuid, String xmmc, String sjzy, String filePath) {
- String url = getUrl("datax/task/run/B1鍏ュ簱璐ㄦ_鏁板鍩虹妫�鏌�");
+ public String checkMath(String taskGuid, String xmmc, String sjzy, String filePath, HttpServletRequest req) {
+ String url = getUrl("datax/task/run/B1鍏ュ簱璐ㄦ_鏁板鍩虹妫�鏌�", req);
List<NameValueEntity> list = getKeyVals();
list.add(new NameValueEntity("_name", taskGuid));
@@ -92,7 +94,7 @@
list.add(new NameValueEntity("SJZY", sjzy));
list.add(new NameValueEntity("GCXMYSB", filePath));
- //String rs =
+ return RestHelper.postForRest(url, list);
}
/**
@@ -105,8 +107,8 @@
/**
* 鑾峰彇Url
*/
- public String getUrl(String subUrl) {
- String token = WebHelper.getToken(WebHelper.getRequest());
+ public String getUrl(String subUrl, HttpServletRequest req) {
+ String token = WebHelper.getToken(req);
return fmeUrl + subUrl + "?token=" + token;
}
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 9f0a321..012d117 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -12,8 +12,8 @@
# redis
redis:
database: 0
- host: pipe.cppe.com
- port: 6369
+ host: 127.0.0.1
+ port: 6379
password: rediS_5L#F4_Server
timeout: 6000 # 杩炴帴瓒呮椂鏃堕暱锛堟绉掞級
pool:
--
Gitblit v1.9.3