From 334628695e7bd20c08554fe574954246e2e2c8aa Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期二, 07 三月 2023 13:53:35 +0800
Subject: [PATCH] 1

---
 src/main/java/com/lf/server/controller/show/ComprehensiveController.java |   66 ++++++++++++++++++++++++++++++++
 1 files changed, 65 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/lf/server/controller/show/ComprehensiveController.java b/src/main/java/com/lf/server/controller/show/ComprehensiveController.java
index 3d3d371..24ceada 100644
--- a/src/main/java/com/lf/server/controller/show/ComprehensiveController.java
+++ b/src/main/java/com/lf/server/controller/show/ComprehensiveController.java
@@ -5,6 +5,7 @@
 import com.lf.server.entity.all.HttpStatus;
 import com.lf.server.entity.all.ResponseMsg;
 import com.lf.server.entity.all.StaticData;
+import com.lf.server.entity.ctrl.DownloadReqEntity;
 import com.lf.server.entity.ctrl.MarkJsonEntity;
 import com.lf.server.entity.data.DownloadEntity;
 import com.lf.server.entity.data.MetaFileEntity;
@@ -16,6 +17,7 @@
 import com.lf.server.mapper.show.MarkMapper;
 import com.lf.server.service.all.BaseQueryService;
 import com.lf.server.service.all.BaseUploadService;
+import com.lf.server.service.all.UploadAttachService;
 import com.lf.server.service.data.DownloadService;
 import com.lf.server.service.show.MarkService;
 import com.lf.server.service.show.PipelineService;
@@ -27,6 +29,7 @@
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
@@ -60,6 +63,9 @@
 
     @Autowired
     PipelineService pipelineService;
+
+    @Autowired
+    UploadAttachService uploadAttachService;
 
     @SysLog()
     @ApiOperation(value = "鏌ヨ绠$嚎")
@@ -168,11 +174,69 @@
 
             downlogService.updateInfos(ue, de, req);
 
-            String filePath = markService.getDownloadFilePath(de);
+            String filePath = downloadService.getDownloadFilePath(de);
             WebHelper.download(filePath, de.getName(), res);
         } catch (Exception ex) {
             WebHelper.writeStr2Page(res, WebHelper.getErrJson(HttpStatus.UNAUTHORIZED, ex.getMessage()));
             log.error(ex.getMessage(), ex);
         }
     }
+
+    @SysLog()
+    @ApiOperation(value = "鏌ョ湅鏂囦欢")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "guid", value = "闄勪欢Guid", dataType = "String", paramType = "body")
+    })
+    @GetMapping(value = "/downloadForView")
+    public void downloadForView(String guid, HttpServletResponse res) {
+        uploadAttachService.download(guid, true, res);
+    }
+
+    @SysLog()
+    @ApiOperation(value = "璇锋眰涓嬭浇")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "guids", value = "闄勪欢Guid鏁扮粍", dataType = "String", paramType = "body", allowMultiple = true, example = "e5b6ae0889b88111f13a4b6e048348db,fa4f299e901a0c46e634f8fcc8185c0c")
+    })
+    @ResponseBody
+    @PostMapping(value = "/downloadReqForGuids")
+    public ResponseMsg<Object> downloadReqForGuids(@RequestBody DownloadReqEntity dre, HttpServletRequest req, HttpServletResponse res) {
+        try {
+            if (null == dre || null == dre.getGuids() || dre.getGuids().isEmpty()) {
+                return fail("Guid鏁扮粍涓虹┖");
+            }
+
+            UserEntity ue = tokenService.getCurrentUser(req);
+            String guid = uploadAttachService.downloadReqForGuids(ue, dre.getGuids());
+
+            return success(guid);
+        } catch (Exception ex) {
+            return fail(ex, null);
+        }
+    }
+
+    @SysLog()
+    @ApiOperation(value = "璇锋眰涓嬭浇")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "tab", value = "琛ㄥ悕", dataType = "String", paramType = "body", example = "bd.b_borehole"),
+            @ApiImplicitParam(name = "guids", value = "闄勪欢Guid鏁扮粍", dataType = "String", paramType = "body", allowMultiple = true, example = "08e5b4ad-93b8-46f6-adaa-46a6274af4ce,6f94f4f8-6e8d-44e7-8803-3d068d34983f")
+    })
+    @ResponseBody
+    @PostMapping(value = "/downloadReqForTabGuids")
+    public ResponseMsg<Object> downloadReqForTabGuids(@RequestBody DownloadReqEntity dre, HttpServletRequest req, HttpServletResponse res) {
+        try {
+            if (null == dre || StringHelper.isEmpty(dre.getTab())) {
+                return fail("琛ㄥ悕涓虹┖");
+            }
+            if (null != dre.getGuids() && dre.getGuids().size() == 0) {
+                dre.setIds(null);
+            }
+
+            UserEntity ue = tokenService.getCurrentUser(req);
+            String guid = uploadAttachService.downloadReqForTabGuids(ue, dre.getTab(), dre.getGuids());
+
+            return success(guid);
+        } catch (Exception ex) {
+            return fail(ex, null);
+        }
+    }
 }

--
Gitblit v1.9.3