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 | 86 ++++++++++++++++++++++++++++++++++--------
1 files changed, 69 insertions(+), 17 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..fe7ae85 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,13 @@
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.data.DownloadService;
import com.lf.server.service.sys.ResService;
import com.lf.server.service.sys.TokenService;
import io.swagger.annotations.Api;
@@ -36,9 +38,15 @@
TokenService tokenService;
@Autowired
- FileService fileService;
+ 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 = "鏌ヨ璁板綍鏁�")
@@ -52,7 +60,7 @@
return success(count);
} catch (Exception ex) {
- return fail(ex.getMessage(), -1);
+ return fail(ex, -1);
}
}
@@ -74,7 +82,7 @@
return success(rs);
} catch (Exception ex) {
- return fail(ex.getMessage(), null);
+ return fail(ex, null);
}
}
@@ -99,7 +107,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,11 +151,12 @@
entity.setCreateUser(ue.getId());
}
+ permsService.clearPermsCache();
int count = resService.insertRes(entity);
return success(count);
} catch (Exception ex) {
- return fail(ex.getMessage(), -1);
+ return fail(ex, -1);
}
}
@@ -139,11 +175,12 @@
}
}
+ permsService.clearPermsCache();
int count = resService.insertRess(list);
return success(count);
} catch (Exception ex) {
- return fail(ex.getMessage(), -1);
+ return fail(ex, -1);
}
}
@@ -155,11 +192,12 @@
@GetMapping(value = "/deleteRes")
public ResponseMsg<Integer> deleteRes(int id) {
try {
+ permsService.clearPermsCache();
int count = resService.deleteRes(id);
return success(count);
} catch (Exception ex) {
- return fail(ex.getMessage(), -1);
+ return fail(ex, -1);
}
}
@@ -174,10 +212,13 @@
if (ids == null || ids.isEmpty()) {
return fail("id鏁扮粍涓嶈兘涓虹┖", -1);
}
+
+ permsService.clearPermsCache();
int count = resService.deleteRess(ids);
+
return success(count);
} catch (Exception ex) {
- return fail(ex.getMessage(), -1);
+ return fail(ex, -1);
}
}
@@ -195,11 +236,12 @@
entity.setUpdateUser(ue.getId());
}
+ permsService.clearPermsCache();
int count = resService.updateRes(entity);
return success(count);
} catch (Exception ex) {
- return fail(ex.getMessage(), -1);
+ return fail(ex, -1);
}
}
@@ -215,7 +257,7 @@
return success(resEntity);
} catch (Exception ex) {
- return fail(ex.getMessage(), null);
+ return fail(ex, null);
}
}
@@ -228,7 +270,7 @@
return success(list);
} catch (Exception ex) {
- return fail(ex.getMessage(), null);
+ return fail(ex, null);
}
}
@@ -239,7 +281,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 uploadAttachService.upload(ue, TAB_NAME, file, this);
}
@SysLog()
@@ -248,7 +290,17 @@
@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) {
+ 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