From 11a649a1c1c48546be1394c0437d0cf284010db7 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期二, 07 三月 2023 10:53:29 +0800
Subject: [PATCH] 1
---
src/main/java/com/lf/server/controller/sys/ResController.java | 121 ++++++++++++++++++++++++++++++++++------
1 files changed, 103 insertions(+), 18 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 34777db..c9c0ae9 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,15 @@
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.ctrl.DownloadReqEntity;
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.helper.StringHelper;
+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 +40,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 +62,7 @@
return success(count);
} catch (Exception ex) {
- return fail(ex.getMessage(), -1);
+ return fail(ex, -1);
}
}
@@ -74,7 +84,7 @@
return success(rs);
} catch (Exception ex) {
- return fail(ex.getMessage(), null);
+ return fail(ex, null);
}
}
@@ -99,7 +109,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);
}
}
@@ -126,7 +136,7 @@
return success(count, rs);
} catch (Exception ex) {
- return fail(ex.getMessage(), null);
+ return fail(ex, null);
}
}
@@ -144,10 +154,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);
}
}
@@ -167,10 +180,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);
}
}
@@ -183,10 +199,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);
}
}
@@ -201,10 +220,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);
}
}
@@ -223,10 +247,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);
}
}
@@ -242,7 +269,7 @@
return success(resEntity);
} catch (Exception ex) {
- return fail(ex.getMessage(), null);
+ return fail(ex, null);
}
}
@@ -255,7 +282,7 @@
return success(list);
} catch (Exception ex) {
- return fail(ex.getMessage(), null);
+ return fail(ex, null);
}
}
@@ -266,7 +293,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()
@@ -275,7 +302,65 @@
@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);
+ }
+
+ @SysLog()
+ @ApiOperation(value = "璇锋眰涓嬭浇")
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "guids", value = "闄勪欢Guid鏁扮粍", dataType = "String", paramType = "body", allowMultiple = true, example = "e5b6ae0889b88111f13a4b6e048348db,fa4f299e901a0c46e634f8fcc8185c0c")
+ })
+ @ResponseBody
+ @PostMapping(value = "/downloadReqForGuids")
+ public ResponseMsg<Object> downloadReqForGuids(@RequestBody DownloadReqEntity dre, HttpServletRequest req, HttpServletResponse res) {
+ try {
+ if (null == dre || null == dre.getGuids() || dre.getGuids().isEmpty()) {
+ return fail("Guid鏁扮粍涓虹┖");
+ }
+
+ UserEntity ue = tokenService.getCurrentUser(req);
+ String guid = uploadAttachService.downloadReqForGuids(ue, dre.getGuids());
+
+ return success(guid);
+ } catch (Exception ex) {
+ return fail(ex, null);
+ }
+ }
+
+ @SysLog()
+ @ApiOperation(value = "璇锋眰涓嬭浇")
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "tab", value = "琛ㄥ悕", dataType = "String", paramType = "body", example = "bd.b_borehole"),
+ @ApiImplicitParam(name = "guids", value = "闄勪欢Guid鏁扮粍", dataType = "String", paramType = "body", allowMultiple = true, example = "08e5b4ad-93b8-46f6-adaa-46a6274af4ce,6f94f4f8-6e8d-44e7-8803-3d068d34983f")
+ })
+ @ResponseBody
+ @PostMapping(value = "/downloadReqForTabGuids")
+ public ResponseMsg<Object> downloadReqForTabGuids(@RequestBody DownloadReqEntity dre, HttpServletRequest req, HttpServletResponse res) {
+ try {
+ if (null == dre || StringHelper.isEmpty(dre.getTab())) {
+ return fail("琛ㄥ悕涓虹┖");
+ }
+ if (null != dre.getGuids() && dre.getGuids().size() == 0) {
+ dre.setIds(null);
+ }
+
+ UserEntity ue = tokenService.getCurrentUser(req);
+ String guid = uploadAttachService.downloadReqForTabGuids(ue, dre.getTab(), dre.getGuids());
+
+ return success(guid);
+ } catch (Exception ex) {
+ return fail(ex, null);
+ }
}
}
--
Gitblit v1.9.3