From 64d3e9657fb45b6415b19e23f483d46a82efe939 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期一, 06 三月 2023 13:56:42 +0800
Subject: [PATCH] 1

---
 src/main/java/com/lf/server/controller/sys/ResController.java |  101 +++++++++++++++++++++++++++++++++++++++++---------
 1 files changed, 82 insertions(+), 19 deletions(-)

diff --git a/src/main/java/com/lf/server/controller/sys/ResController.java b/src/main/java/com/lf/server/controller/sys/ResController.java
index acafac1..47b4970 100644
--- a/src/main/java/com/lf/server/controller/sys/ResController.java
+++ b/src/main/java/com/lf/server/controller/sys/ResController.java
@@ -1,12 +1,14 @@
 package com.lf.server.controller.sys;
 
-import com.lf.server.aspect.SysLog;
+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.sys.ResEntity;
 import com.lf.server.entity.sys.UserEntity;
+import com.lf.server.helper.StringHelper;
 import com.lf.server.service.all.PermsService;
-import com.lf.server.service.all.UploadService;
+import com.lf.server.service.all.UploadAttachService;
+import com.lf.server.service.data.DownloadService;
 import com.lf.server.service.sys.ResService;
 import com.lf.server.service.sys.TokenService;
 import io.swagger.annotations.Api;
@@ -37,12 +39,15 @@
     TokenService tokenService;
 
     @Autowired
-    UploadService uploadService;
-
-    @Autowired
     PermsService permsService;
 
-    private final static String TAB_NAME = "sys_res";
+    @Autowired
+    DownloadService downloadService;
+
+    @Autowired
+    UploadAttachService uploadAttachService;
+
+    private final static String TAB_NAME = "lf.sys_res";
 
     @SysLog()
     @ApiOperation(value = "鏌ヨ璁板綍鏁�")
@@ -56,7 +61,7 @@
 
             return success(count);
         } catch (Exception ex) {
-            return fail(ex.getMessage(), -1);
+            return fail(ex, -1);
         }
     }
 
@@ -78,7 +83,7 @@
 
             return success(rs);
         } catch (Exception ex) {
-            return fail(ex.getMessage(), null);
+            return fail(ex, null);
         }
     }
 
@@ -103,7 +108,7 @@
             List<ResEntity> rs = resService.selectByPage(name, pageSize, pageSize * (pageIndex - 1));
             return success(count, rs);
         } catch (Exception ex) {
-            return fail(ex.getMessage(), null);
+            return fail(ex, null);
         }
     }
 
@@ -130,7 +135,7 @@
 
             return success(count, rs);
         } catch (Exception ex) {
-            return fail(ex.getMessage(), null);
+            return fail(ex, null);
         }
     }
 
@@ -154,7 +159,7 @@
 
             return success(count);
         } catch (Exception ex) {
-            return fail(ex.getMessage(), -1);
+            return fail(ex, -1);
         }
     }
 
@@ -180,7 +185,7 @@
 
             return success(count);
         } catch (Exception ex) {
-            return fail(ex.getMessage(), -1);
+            return fail(ex, -1);
         }
     }
 
@@ -199,7 +204,7 @@
 
             return success(count);
         } catch (Exception ex) {
-            return fail(ex.getMessage(), -1);
+            return fail(ex, -1);
         }
     }
 
@@ -222,7 +227,7 @@
 
             return success(count);
         } catch (Exception ex) {
-            return fail(ex.getMessage(), -1);
+            return fail(ex, -1);
         }
     }
 
@@ -247,7 +252,7 @@
 
             return success(count);
         } catch (Exception ex) {
-            return fail(ex.getMessage(), -1);
+            return fail(ex, -1);
         }
     }
 
@@ -263,7 +268,7 @@
 
             return success(resEntity);
         } catch (Exception ex) {
-            return fail(ex.getMessage(), null);
+            return fail(ex, null);
         }
     }
 
@@ -276,7 +281,7 @@
 
             return success(list);
         } catch (Exception ex) {
-            return fail(ex.getMessage(), null);
+            return fail(ex, null);
         }
     }
 
@@ -287,7 +292,7 @@
     public ResponseMsg<String> upload(@RequestParam("file") MultipartFile file, HttpServletRequest req) {
         UserEntity ue = tokenService.getCurrentUser(req);
 
-        return uploadService.upload(ue, TAB_NAME, file, this);
+        return uploadAttachService.upload(ue, TAB_NAME, file, this);
     }
 
     @SysLog()
@@ -297,6 +302,64 @@
     })
     @GetMapping(value = "/download")
     public void download(String guid, HttpServletResponse res) {
-        uploadService.download(guid, res);
+        uploadAttachService.download(guid, false, res);
+    }
+
+    @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 = "/downloadReq")
+    public ResponseMsg<Object> downloadReqForGuids(String[] guids, HttpServletRequest req, HttpServletResponse res) {
+        try {
+            if (null == guids || guids.length == 0) {
+                return fail("Guid鏁扮粍涓虹┖");
+            }
+
+            UserEntity ue = tokenService.getCurrentUser(req);
+            String guid = uploadAttachService.downloadReqForGuids(ue, guids);
+
+            return success("");
+        } 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 = "/downloadReq")
+    public ResponseMsg<Object> downloadReqForTabGuids(String tab, String[] guids, HttpServletRequest req, HttpServletResponse res) {
+        try {
+            if (StringHelper.isEmpty(tab)) {
+                return fail("琛ㄥ悕涓虹┖");
+            }
+            if (null != guids && guids.length == 0) {
+                guids = null;
+            }
+
+            UserEntity ue = tokenService.getCurrentUser(req);
+            String guid = uploadAttachService.downloadReqForTabGuids(ue, tab, guids);
+
+            return success(guid);
+        } catch (Exception ex) {
+            return fail(ex, null);
+        }
     }
 }

--
Gitblit v1.9.3