From 6d921fe2fe9a74e33fbb8c344ff4aa74cb0d62b7 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期四, 02 三月 2023 16:28:28 +0800
Subject: [PATCH] 1

---
 src/main/java/com/lf/server/controller/sys/ResController.java |  101 ++++++++++++++++++++++++++++++++++++++++++--------
 1 files changed, 85 insertions(+), 16 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..1c476e1 100644
--- a/src/main/java/com/lf/server/controller/sys/ResController.java
+++ b/src/main/java/com/lf/server/controller/sys/ResController.java
@@ -1,11 +1,12 @@
 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.service.all.FileService;
+import com.lf.server.service.all.PermsService;
+import com.lf.server.service.all.UploadAttachService;
 import com.lf.server.service.sys.ResService;
 import com.lf.server.service.sys.TokenService;
 import io.swagger.annotations.Api;
@@ -17,6 +18,7 @@
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
 import java.util.List;
 
 /**
@@ -35,9 +37,12 @@
     TokenService tokenService;
 
     @Autowired
-    FileService fileService;
+    UploadAttachService uploadAttachService;
 
-    private final static String TAB_NAME = "sys_res";
+    @Autowired
+    PermsService permsService;
+
+    private final static String TAB_NAME = "lf.sys_res";
 
     @SysLog()
     @ApiOperation(value = "鏌ヨ璁板綍鏁�")
@@ -51,7 +56,7 @@
 
             return success(count);
         } catch (Exception ex) {
-            return fail(ex.getMessage(), -1);
+            return fail(ex, -1);
         }
     }
 
@@ -73,7 +78,7 @@
 
             return success(rs);
         } catch (Exception ex) {
-            return fail(ex.getMessage(), null);
+            return fail(ex, null);
         }
     }
 
@@ -98,7 +103,34 @@
             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);
+        }
+    }
+
+    @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, null);
         }
     }
 
@@ -116,10 +148,13 @@
             }
 
             int count = resService.insertRes(entity);
+            if (count > 0) {
+                permsService.clearResCache();
+            }
 
             return success(count);
         } catch (Exception ex) {
-            return fail(ex.getMessage(), -1);
+            return fail(ex, -1);
         }
     }
 
@@ -139,10 +174,13 @@
             }
 
             int count = resService.insertRess(list);
+            if (count > 0) {
+                permsService.clearResCache();
+            }
 
             return success(count);
         } catch (Exception ex) {
-            return fail(ex.getMessage(), -1);
+            return fail(ex, -1);
         }
     }
 
@@ -155,10 +193,13 @@
     public ResponseMsg<Integer> deleteRes(int id) {
         try {
             int count = resService.deleteRes(id);
+            if (count > 0) {
+                permsService.clearResCache();
+            }
 
             return success(count);
         } catch (Exception ex) {
-            return fail(ex.getMessage(), -1);
+            return fail(ex, -1);
         }
     }
 
@@ -173,10 +214,15 @@
             if (ids == null || ids.isEmpty()) {
                 return fail("id鏁扮粍涓嶈兘涓虹┖", -1);
             }
+
             int count = resService.deleteRess(ids);
+            if (count > 0) {
+                permsService.clearResCache();
+            }
+
             return success(count);
         } catch (Exception ex) {
-            return fail(ex.getMessage(), -1);
+            return fail(ex, -1);
         }
     }
 
@@ -195,10 +241,13 @@
             }
 
             int count = resService.updateRes(entity);
+            if (count > 0) {
+                permsService.clearResCache();
+            }
 
             return success(count);
         } catch (Exception ex) {
-            return fail(ex.getMessage(), -1);
+            return fail(ex, -1);
         }
     }
 
@@ -214,7 +263,7 @@
 
             return success(resEntity);
         } catch (Exception ex) {
-            return fail(ex.getMessage(), null);
+            return fail(ex, null);
         }
     }
 
@@ -227,7 +276,7 @@
 
             return success(list);
         } catch (Exception ex) {
-            return fail(ex.getMessage(), null);
+            return fail(ex, null);
         }
     }
 
@@ -235,9 +284,29 @@
     @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 uploadAttachService.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) {
+        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);
     }
 }

--
Gitblit v1.9.3