From ed8c7a5effd0d423ce1118b680ecdca6fe732609 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期三, 02 七月 2025 16:43:13 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.11.205:9000/r/P2022036_Service

---
 src/main/java/com/lf/server/controller/sys/ResController.java |   66 +++++++++++++++++---------------
 1 files changed, 35 insertions(+), 31 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 f7a6058..fe7ae85 100644
--- a/src/main/java/com/lf/server/controller/sys/ResController.java
+++ b/src/main/java/com/lf/server/controller/sys/ResController.java
@@ -7,6 +7,7 @@
 import com.lf.server.entity.sys.UserEntity;
 import com.lf.server.service.all.PermsService;
 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 +38,15 @@
     TokenService tokenService;
 
     @Autowired
-    UploadAttachService uploadAttachService;
-
-    @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 +60,7 @@
 
             return success(count);
         } catch (Exception ex) {
-            return fail(ex.getMessage(), -1);
+            return fail(ex, -1);
         }
     }
 
@@ -78,7 +82,7 @@
 
             return success(rs);
         } catch (Exception ex) {
-            return fail(ex.getMessage(), null);
+            return fail(ex, null);
         }
     }
 
@@ -103,7 +107,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 +134,7 @@
 
             return success(count, rs);
         } catch (Exception ex) {
-            return fail(ex.getMessage(), null);
+            return fail(ex, null);
         }
     }
 
@@ -147,14 +151,12 @@
                 entity.setCreateUser(ue.getId());
             }
 
+            permsService.clearPermsCache();
             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);
         }
     }
 
@@ -173,14 +175,12 @@
                 }
             }
 
+            permsService.clearPermsCache();
             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);
         }
     }
 
@@ -192,14 +192,12 @@
     @GetMapping(value = "/deleteRes")
     public ResponseMsg<Integer> deleteRes(int id) {
         try {
+            permsService.clearPermsCache();
             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);
         }
     }
 
@@ -215,14 +213,12 @@
                 return fail("id鏁扮粍涓嶈兘涓虹┖", -1);
             }
 
+            permsService.clearPermsCache();
             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);
         }
     }
 
@@ -240,14 +236,12 @@
                 entity.setUpdateUser(ue.getId());
             }
 
+            permsService.clearPermsCache();
             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);
         }
     }
 
@@ -263,7 +257,7 @@
 
             return success(resEntity);
         } catch (Exception ex) {
-            return fail(ex.getMessage(), null);
+            return fail(ex, null);
         }
     }
 
@@ -276,7 +270,7 @@
 
             return success(list);
         } catch (Exception ex) {
-            return fail(ex.getMessage(), null);
+            return fail(ex, null);
         }
     }
 
@@ -297,6 +291,16 @@
     })
     @GetMapping(value = "/download")
     public void download(String guid, HttpServletResponse res) {
-        uploadAttachService.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);
     }
 }

--
Gitblit v1.9.3