From 427bee04bfacf44abe5d595e2dad976747d83dba Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期日, 08 一月 2023 15:48:48 +0800
Subject: [PATCH] 1.8.5
---
src/main/java/com/lf/server/controller/data/upload/CheckController.java | 24 ++++++++++++++++++++----
1 files changed, 20 insertions(+), 4 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..298321d 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,8 +2,6 @@
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.ctrl.FmeReqEntity;
import com.lf.server.helper.StringHelper;
import com.lf.server.service.data.FmeService;
import io.swagger.annotations.ApiImplicitParam;
@@ -13,6 +11,7 @@
import org.springframework.web.bind.annotation.GetMapping;
import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
/**
* 妫�鏌ユ帶鍒跺櫒
@@ -28,7 +27,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 +42,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) {
@@ -315,5 +331,5 @@
} catch (Exception ex) {
return fail(ex.getMessage(), null);
}
- }
+ }*/
}
--
Gitblit v1.9.3