From c60203f88a3eed9c0233a0e48719a4b9df4e6762 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期六, 07 一月 2023 15:42:04 +0800
Subject: [PATCH] 1.7.7
---
src/main/java/com/lf/server/controller/data/upload/CheckController.java | 22 +++++++++++
src/main/java/com/lf/server/helper/RestHelper.java | 45 +++++++++++++---------
src/main/java/com/lf/server/service/data/FmeService.java | 11 ++++-
3 files changed, 58 insertions(+), 20 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 3b4b703..8e86041 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
@@ -6,6 +6,8 @@
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;
+import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
@@ -21,6 +23,26 @@
protected FmeService fmeService;
@SysLog()
+ @ApiOperation(value = "鏌ヨ浠诲姟鐘舵��")
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "id", value = "浠诲姟ID", dataType = "String", paramType = "query", example = "29db09ee-2aae-4c62-bec0-0b5c5d8084e4")
+ })
+ @GetMapping(value = "/selectTaskStatus")
+ public Object selectTaskStatus(String id,HttpServletRequest req) {
+ try {
+ if (StringHelper.isEmpty(id)) {
+ return fail("id涓嶈兘涓虹┖");
+ }
+
+ Object obj = fmeService.getTaskStatus(id, req);
+
+ return obj;
+ } catch (Exception ex) {
+ return fail(ex.getMessage(), null);
+ }
+ }
+
+ @SysLog()
@ApiOperation(value = "鏌ヨOSGB妫�鏌�")
@GetMapping(value = "/selectCheckOsgb")
public ResponseMsg<Object> selectCheckOsgb(HttpServletRequest req) {
diff --git a/src/main/java/com/lf/server/helper/RestHelper.java b/src/main/java/com/lf/server/helper/RestHelper.java
index 648b7a1..b519371 100644
--- a/src/main/java/com/lf/server/helper/RestHelper.java
+++ b/src/main/java/com/lf/server/helper/RestHelper.java
@@ -185,12 +185,39 @@
}
/**
+ * 鑾峰彇閿欒淇℃伅
+ *
+ * @param uri Uri鍦板潃
+ * @param ex 寮傚父
+ * @return 閿欒淇℃伅
+ */
+ public static String getErrorInfo(String uri, Exception ex) {
+ Map<String, Object> map = new LinkedHashMap<>();
+ map.put("result", null);
+ map.put("message", ex.getMessage());
+ map.put("code", 400);
+ map.put("uri", uri);
+ //map.put("tag", StaticData.CACHE_PREFIX)
+
+ return map.toString();
+ }
+
+ /**
* GET璇锋眰锛圧EST锛�
*/
public static String getForRest(String uri) {
RestTemplate rest = getRestTemplate();
return rest.getForObject(uri, String.class);
+ }
+
+ /**
+ * GET璇锋眰锛圧EST锛�
+ */
+ public static <T> T getForRest(String uri, Class<T> clazz) {
+ RestTemplate rest = getRestTemplate();
+
+ return rest.getForObject(uri, clazz);
}
/**
@@ -209,23 +236,5 @@
RestTemplate rest = getRestTemplate();
return rest.postForObject(uri, list, String.class);
- }
-
- /**
- * 鑾峰彇閿欒淇℃伅
- *
- * @param uri Uri鍦板潃
- * @param ex 寮傚父
- * @return 閿欒淇℃伅
- */
- public static String getErrorInfo(String uri, Exception ex) {
- Map<String, Object> map = new LinkedHashMap<>();
- map.put("result", null);
- map.put("message", ex.getMessage());
- map.put("code", 400);
- map.put("uri", uri);
- //map.put("tag", StaticData.CACHE_PREFIX)
-
- return map.toString();
}
}
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 72bcdf1..0fc96b1 100644
--- a/src/main/java/com/lf/server/service/data/FmeService.java
+++ b/src/main/java/com/lf/server/service/data/FmeService.java
@@ -4,10 +4,8 @@
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.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
-import org.springframework.web.client.RestTemplate;
import javax.servlet.http.HttpServletRequest;
import java.util.ArrayList;
@@ -23,6 +21,15 @@
private String fmeUrl;
/**
+ * 鑾峰彇浠诲姟鐘舵��
+ */
+ public Object getTaskStatus(String id, HttpServletRequest req) {
+ String url = getUrl("datax/task/get", req) + "&id=" + id;
+
+ return RestHelper.getForRest(url, Object.class);
+ }
+
+ /**
* 1.OSGB妫�鏌ワ細.osgb + *鍊炬枩鎽勫奖*.xls/.xlsx
*/
public String checkOsgb(FmeReqEntity fme, HttpServletRequest req) {
--
Gitblit v1.9.3