From 06edfaddb8539848a2e58fbae717ebe4c7538606 Mon Sep 17 00:00:00 2001 From: RuoYi Date: Tue, 6 Jul 2021 17:54:39 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E7=A4=BA=E4=BE=8B=EF=BC=88?= =?UTF-8?q?=E5=A4=9A=E5=9B=BE=E4=B8=8A=E4=BC=A0=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/common/CommonController.java | 32 +++++++++- .../controller/system/SysRoleController.java | 3 + .../resources/templates/demo/form/upload.html | 51 ++++++++++------ .../ruoyi/common/core/domain/FileInfo.java | 61 +++++++++++++++++++ .../service/impl/SysUserServiceImpl.java | 1 + 5 files changed, 127 insertions(+), 21 deletions(-) create mode 100644 ruoyi-common/src/main/java/com/ruoyi/common/core/domain/FileInfo.java diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CommonController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CommonController.java index a84897de..4cef79e2 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CommonController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CommonController.java @@ -1,5 +1,7 @@ package com.ruoyi.web.controller.common; +import java.util.LinkedList; +import java.util.List; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import org.slf4j.Logger; @@ -15,6 +17,7 @@ import com.ruoyi.common.config.RuoYiConfig; import com.ruoyi.common.config.ServerConfig; import com.ruoyi.common.constant.Constants; import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.core.domain.FileInfo; import com.ruoyi.common.utils.StringUtils; import com.ruoyi.common.utils.file.FileUploadUtils; import com.ruoyi.common.utils.file.FileUtils; @@ -65,7 +68,7 @@ public class CommonController } /** - * 通用上传请求 + * 通用上传请求（单个） */ @PostMapping("/common/upload") @ResponseBody @@ -89,6 +92,33 @@ public class CommonController } } + /** + * 通用上传请求（多个） + */ + @PostMapping("/common/uploads") + @ResponseBody + public AjaxResult uploadFiles(List files) throws Exception + { + try + { + // 上传文件路径 + String filePath = RuoYiConfig.getUploadPath(); + List fileInfos = new LinkedList(); + for (MultipartFile file : files) + { + // 上传并返回新文件名称 + String fileName = FileUploadUtils.upload(filePath, file); + String url = serverConfig.getUrl() + fileName; + fileInfos.add(new FileInfo(fileName, url)); + } + return AjaxResult.success(fileInfos); + } + catch (Exception e) + { + return AjaxResult.error(e.getMessage()); + } + } + /** * 本地资源通用下载 */ diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRoleController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRoleController.java index a48cca24..a21995f5 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRoleController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRoleController.java @@ -243,6 +243,7 @@ public class SysRoleController extends BaseController /** * 取消授权 */ + @RequiresPermissions("system:role:edit") @Log(title = "角色管理", businessType = BusinessType.GRANT) @PostMapping("/authUser/cancel") @ResponseBody @@ -254,6 +255,7 @@ public class SysRoleController extends BaseController /** * 批量取消授权 */ + @RequiresPermissions("system:role:edit") @Log(title = "角色管理", businessType = BusinessType.GRANT) @PostMapping("/authUser/cancelAll") @ResponseBody @@ -288,6 +290,7 @@ public class SysRoleController extends BaseController /** * 批量选择用户授权 */ + @RequiresPermissions("system:role:edit") @Log(title = "角色管理", businessType = BusinessType.GRANT) @PostMapping("/authUser/selectAll") @ResponseBody diff --git a/ruoyi-admin/src/main/resources/templates/demo/form/upload.html b/ruoyi-admin/src/main/resources/templates/demo/form/upload.html index 4292d232..b851a9e5 100644 --- a/ruoyi-admin/src/main/resources/templates/demo/form/upload.html +++ b/ruoyi-admin/src/main/resources/templates/demo/form/upload.html @@ -14,16 +14,16 @@
- +
- +
- +
@@ -38,25 +38,36 @@
- diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/FileInfo.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/FileInfo.java new file mode 100644 index 00000000..d197a5ab --- /dev/null +++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/FileInfo.java @@ -0,0 +1,61 @@ +package com.ruoyi.common.core.domain; + +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; + +/** + * 文件信息 + * + * @author ruoyi + */ +public class FileInfo +{ + /** + * 文件名称 + */ + private String name; + + /** + * 文件地址 + */ + private String url; + + public FileInfo() + { + + } + + public FileInfo(String name, String url) + { + this.name = name; + this.url = url; + } + + public String getName() + { + return name; + } + + public void setName(String name) + { + this.name = name; + } + + public String getUrl() + { + return url; + } + + public void setUrl(String url) + { + this.url = url; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("name", getName()) + .append("url", getUrl()) + .toString(); + } + } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java index d4cae9f5..884b7d0f 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java @@ -265,6 +265,7 @@ public class SysUserServiceImpl implements ISysUserService * @param roleIds 角色组 */ @Override + @Transactional public void insertUserAuth(Long userId, Long[] roleIds) { userRoleMapper.deleteUserRoleByUserId(userId);