From 73a0b00bd9dbf0cebc410727c6be1863dee551fc Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期六, 07 一月 2023 16:26:47 +0800
Subject: [PATCH] 1
---
src/main/java/com/lf/server/controller/data/upload/CheckController.java | 21 ++++++++++++++++++++-
src/main/java/com/lf/server/service/data/FmeService.java | 7 +++++++
2 files changed, 27 insertions(+), 1 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 8e86041..f4bdd36 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
@@ -12,7 +12,9 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
+import javax.servlet.RequestDispatcher;
import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
/**
* 妫�鏌ユ帶鍒跺櫒
@@ -28,7 +30,7 @@
@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) {
+ public Object selectTaskStatus(String id, HttpServletRequest req) {
try {
if (StringHelper.isEmpty(id)) {
return fail("id涓嶈兘涓虹┖");
@@ -43,6 +45,23 @@
}
@SysLog()
+ @ApiOperation(value = "涓嬭浇璐ㄦ閿欒缁撴灉")
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "id", value = "浠诲姟ID", dataType = "String", paramType = "query", example = "29db09ee-2aae-4c62-bec0-0b5c5d8084e4")
+ })
+ @GetMapping(value = "/downloadResult")
+ public void downloadResult(String id, HttpServletRequest req, HttpServletResponse res) {
+ try {
+ if (!StringHelper.isEmpty(id)) {
+ String url = fmeService.getDownloadUrl(id, req);
+ res.sendRedirect(url);
+ }
+ } catch (Exception ex) {
+ log.error(ex.getMessage(), ex);
+ }
+ }
+
+ @SysLog()
@ApiOperation(value = "鏌ヨOSGB妫�鏌�")
@GetMapping(value = "/selectCheckOsgb")
public ResponseMsg<Object> selectCheckOsgb(HttpServletRequest req) {
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 0fc96b1..46027d5 100644
--- a/src/main/java/com/lf/server/service/data/FmeService.java
+++ b/src/main/java/com/lf/server/service/data/FmeService.java
@@ -30,6 +30,13 @@
}
/**
+ * 涓嬭浇璐ㄦ閿欒缁撴灉
+ */
+ public String getDownloadUrl(String id, HttpServletRequest req) {
+ return getUrl("datax/task/downloadResult", req) + "&id=" + id;
+ }
+
+ /**
* 1.OSGB妫�鏌ワ細.osgb + *鍊炬枩鎽勫奖*.xls/.xlsx
*/
public String checkOsgb(FmeReqEntity fme, HttpServletRequest req) {
--
Gitblit v1.9.3