From 41e661c57a6011a25c3aaf6647d20a03df7c17a3 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期四, 20 十月 2022 16:03:10 +0800
Subject: [PATCH] 添加zip包处理工具

---
 src/main/java/com/lf/server/controller/sys/ResController.java |   37 ++++++++++++++++++++++++++++++++-----
 1 files changed, 32 insertions(+), 5 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 4673411..deaa943 100644
--- a/src/main/java/com/lf/server/controller/sys/ResController.java
+++ b/src/main/java/com/lf/server/controller/sys/ResController.java
@@ -5,7 +5,7 @@
 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.service.all.FileService;
+import com.lf.server.service.data.UploaderService;
 import com.lf.server.service.sys.ResService;
 import com.lf.server.service.sys.TokenService;
 import io.swagger.annotations.Api;
@@ -36,7 +36,7 @@
     TokenService tokenService;
 
     @Autowired
-    FileService fileService;
+    UploaderService uploaderService;
 
     private final static String TAB_NAME = "sys_res";
 
@@ -97,6 +97,33 @@
                 return success(0, null);
             }
             List<ResEntity> rs = resService.selectByPage(name, pageSize, pageSize * (pageIndex - 1));
+            return success(count, rs);
+        } catch (Exception ex) {
+            return fail(ex.getMessage(), null);
+        }
+    }
+
+    @SysLog()
+    @ApiOperation(value = "鏍规嵁瑙掕壊鍒嗛〉鏌ヨ骞惰繑鍥炶褰曟暟")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "roleid", value = "瑙掕壊ID", dataType = "Integer", paramType = "query", example = "1"),
+            @ApiImplicitParam(name = "pageSize", value = "姣忛〉鏉℃暟", dataType = "Integer", paramType = "query", example = "10"),
+            @ApiImplicitParam(name = "pageIndex", value = "鍒嗛〉鏁帮紙浠�1寮�濮嬶級", dataType = "Integer", paramType = "query", example = "1")
+    })
+    @GetMapping(value = "/selectByPageForRole")
+    public ResponseMsg<List<ResEntity>> selectByPageForRole(Integer roleid, Integer pageSize, Integer pageIndex) {
+        try {
+            if (pageSize < 1 || pageIndex < 1) {
+                return fail("姣忛〉椤垫暟鎴栧垎椤垫暟灏忎簬1", null);
+            }
+
+            int count = resService.selectCountForRole(roleid);
+            if (count == 0) {
+                return success(0, null);
+            }
+
+            List<ResEntity> rs = resService.selectByPageForRole(roleid, pageSize, pageSize * (pageIndex - 1));
+
             return success(count, rs);
         } catch (Exception ex) {
             return fail(ex.getMessage(), null);
@@ -239,7 +266,7 @@
     public ResponseMsg<String> upload(@RequestParam("file") MultipartFile file, HttpServletRequest req) {
         UserEntity ue = tokenService.getCurrentUser(req);
 
-        return fileService.upload(ue, TAB_NAME, file, this);
+        return uploaderService.upload(ue, TAB_NAME, file, this);
     }
 
     @SysLog()
@@ -248,7 +275,7 @@
             @ApiImplicitParam(name = "guid", value = "闄勪欢Guid", dataType = "String", paramType = "body")
     })
     @GetMapping(value = "/download")
-    public void download(String guid, HttpServletRequest req, HttpServletResponse res) {
-        fileService.download(guid, req, res, this);
+    public void download(String guid, HttpServletResponse res) {
+        uploaderService.download(guid, res);
     }
 }

--
Gitblit v1.9.3