From d23b2ce1ae45c192aed067041da8de748b97d405 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期五, 22 十一月 2024 14:19:31 +0800
Subject: [PATCH] 1
---
src/main/java/com/lf/server/service/data/FmeService.java | 28 +++++++++++++++++++++++-----
1 files changed, 23 insertions(+), 5 deletions(-)
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 7fb782d..6cefe9f 100644
--- a/src/main/java/com/lf/server/service/data/FmeService.java
+++ b/src/main/java/com/lf/server/service/data/FmeService.java
@@ -7,6 +7,8 @@
import com.lf.server.helper.RestHelper;
import com.lf.server.helper.StringHelper;
import com.lf.server.helper.WebHelper;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
@@ -23,6 +25,11 @@
public class FmeService {
@Value("${sys.fmeUrl}")
private String fmeUrl;
+
+ @Value("${sys.fmeToken}")
+ private String fmeToken;
+
+ private final static Log log = LogFactory.getLog(FmeService.class);
/**
* 鑾峰彇浠诲姟鐘舵��
@@ -300,11 +307,15 @@
* d.鏈嶅姟鐢宠
*/
public void serverApply(String id, Integer pubid, HttpServletRequest req) {
- String url = getUrl("resource/res/request", req) + "&resourceid=" + id;
+ try {
+ String url = getUrl("resource/res/request", req) + "&resourceid=" + id;
- RegisterEntity entity = new RegisterEntity(pubid);
+ RegisterEntity entity = new RegisterEntity(pubid);
- RestHelper.postForRest(url, entity);
+ RestHelper.postForRest(url, entity);
+ } catch (Exception ex) {
+ log.error(ex.getMessage(), ex);
+ }
}
/**
@@ -319,8 +330,8 @@
/**
* f.璁＄畻闈㈢Н
*/
- public String calcArea(String sjfl, String id, String wjlj, HttpServletRequest req) {
- String url = getUrl("datax/task/run/鏁版嵁鍗犲湴闈㈢Н璁＄畻", req);
+ public String calcArea(String sjfl, String id, String wjlj) {
+ String url = getUrl("datax/task/run/鏁版嵁鍗犲湴闈㈢Н璁＄畻");
List<NameValueEntity> list = new ArrayList<>();
list.add(new NameValueEntity("_name", String.format("%s_%s", "鏁版嵁鍗犲湴闈㈢Н璁＄畻", StringHelper.YMDHMS2_FORMAT.format(new Date()))));
@@ -343,6 +354,13 @@
}
/**
+ * 鑾峰彇Url
+ */
+ public String getUrl(String subUrl) {
+ return fmeUrl + subUrl + "?token=" + fmeToken;
+ }
+
+ /**
* 鑾峰彇鍚嶇О鍊煎闆嗗悎
*/
public List<NameValueEntity> getKeyValues(String name) {
--
Gitblit v1.9.3