From d692b45b22f985aff4635a5bb8b8958ae9bcd6dd Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期五, 21 十月 2022 17:50:09 +0800
Subject: [PATCH] 1

---
 src/main/java/com/lf/server/controller/sys/ResController.java |   46 ++++++++++++++++++++++++++++++++++++++++++----
 1 files changed, 42 insertions(+), 4 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 293b586..8fdf779 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.all.UploadService;
 import com.lf.server.service.sys.ResService;
 import com.lf.server.service.sys.TokenService;
 import io.swagger.annotations.Api;
@@ -17,6 +17,7 @@
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
 import java.util.List;
 
 /**
@@ -35,7 +36,7 @@
     TokenService tokenService;
 
     @Autowired
-    FileService fileService;
+    UploadService uploadService;
 
     private final static String TAB_NAME = "sys_res";
 
@@ -96,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);
@@ -235,9 +263,19 @@
     @ApiOperation(value = "涓婁紶鏂囦欢")
     @ResponseBody
     @PostMapping(value = "/upload")
-    public ResponseMsg<String> upload(@RequestBody MultipartFile file, HttpServletRequest req) {
+    public ResponseMsg<String> upload(@RequestParam("file") MultipartFile file, HttpServletRequest req) {
         UserEntity ue = tokenService.getCurrentUser(req);
 
-        return fileService.upload(ue, TAB_NAME, file, this);
+        return uploadService.upload(ue, TAB_NAME, file, this);
+    }
+
+    @SysLog()
+    @ApiOperation(value = "涓嬭浇鏂囦欢")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "guid", value = "闄勪欢Guid", dataType = "String", paramType = "body")
+    })
+    @GetMapping(value = "/download")
+    public void download(String guid, HttpServletResponse res) {
+        uploadService.download(guid, res);
     }
 }

--
Gitblit v1.9.3