From 6643337d004acddc66877c195467b9e145737034 Mon Sep 17 00:00:00 2001 From: zhxlight Date: Sat, 13 Nov 2021 18:38:44 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BC=A0=E5=96=9C=E4=BA=AE20211113--=E5=AE=8C?= =?UTF-8?q?=E5=96=84=E6=96=87=E4=BB=B6=E6=A8=A1=E5=9D=97=20=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E4=BA=86=E7=94=A8=E6=88=B7=E5=8F=8A=E7=8F=AD=E7=BA=A7?= =?UTF-8?q?=E7=9A=84=E6=96=87=E4=BB=B6=E6=9D=83=E9=99=90=E7=AE=A1=E7=90=86?= =?UTF-8?q?=EF=BC=8C=E5=8C=85=E6=8B=AC=E5=A2=9E=E5=8A=A0=E6=9D=83=E9=99=90?= =?UTF-8?q?=E5=92=8C=E5=88=A0=E9=99=A4=E6=9D=83=E9=99=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/api/AppUserApiController.java | 2 +- .../controller/api/ClassesController.java | 2 +- .../service/impl/AppUserServiceImpl.java | 6 +- .../file/controller/FileApiController.java | 58 +++++++++++++++---- .../file/mapper/ClassesFileRoleMapper.java | 9 +++ .../ruoyi/file/mapper/UserFileRoleMapper.java | 9 +++ .../file/service/IClassesFileRoleService.java | 10 +++- .../file/service/IUserFileRoleService.java | 9 +++ .../impl/ClassesFileRoleServiceImpl.java | 12 ++++ .../service/impl/UserFileRoleServiceImpl.java | 12 ++++ .../mapper/file/ClassesFileRoleMapper.xml | 8 +++ .../mapper/file/UserFileRoleMapper.xml | 8 +++ 12 files changed, 131 insertions(+), 14 deletions(-) diff --git a/mobile-app/src/main/java/com/ruoyi/eduinfo/controller/api/AppUserApiController.java b/mobile-app/src/main/java/com/ruoyi/eduinfo/controller/api/AppUserApiController.java index d410dbd..8663fdf 100644 --- a/mobile-app/src/main/java/com/ruoyi/eduinfo/controller/api/AppUserApiController.java +++ b/mobile-app/src/main/java/com/ruoyi/eduinfo/controller/api/AppUserApiController.java @@ -89,7 +89,7 @@ public class AppUserApiController extends BaseController { if (u != null) { ajax.put("userId", u.getUserId()); ajax.put("userName", u.getUserName()); - ajax.put("NickName",u.getNickName()); + ajax.put("nickName",u.getNickName()); ajax.put("classesId", u.getClassesId()); return ajax; diff --git a/mobile-app/src/main/java/com/ruoyi/eduinfo/controller/api/ClassesController.java b/mobile-app/src/main/java/com/ruoyi/eduinfo/controller/api/ClassesController.java index d3a8d77..ce8f43c 100644 --- a/mobile-app/src/main/java/com/ruoyi/eduinfo/controller/api/ClassesController.java +++ b/mobile-app/src/main/java/com/ruoyi/eduinfo/controller/api/ClassesController.java @@ -24,7 +24,7 @@ public class ClassesController { * 获取班级列表 */ @GetMapping("/list") - public AjaxResult list(@RequestBody SysClasses classes ) + public AjaxResult list(SysClasses classes ) { List classess = classesService.selectClassesList(classes); diff --git a/mobile-app/src/main/java/com/ruoyi/eduinfo/service/impl/AppUserServiceImpl.java b/mobile-app/src/main/java/com/ruoyi/eduinfo/service/impl/AppUserServiceImpl.java index 4db6101..bf07c4a 100644 --- a/mobile-app/src/main/java/com/ruoyi/eduinfo/service/impl/AppUserServiceImpl.java +++ b/mobile-app/src/main/java/com/ruoyi/eduinfo/service/impl/AppUserServiceImpl.java @@ -223,7 +223,7 @@ public class AppUserServiceImpl implements IAppUserService @Override public SysUser login(SysUser user) { SysUser user1 = userMapper.selectUserByUserName(user.getUserName()); - if (SecurityUtils.matchesPassword(user.getPassword(),user1.getPassword())) { + if (user1 !=null && SecurityUtils.matchesPassword(user.getPassword(),user1.getPassword())) { recordLoginInfo(user1.getUserId()); return user1; } @@ -252,6 +252,10 @@ public class AppUserServiceImpl implements IAppUserService { msg = "用户密码不能为空"; } + else if (user.getClassesId() == null) + { + msg = "用户班级不能为空"; + } else if (username.length() < UserConstants.USERNAME_MIN_LENGTH || username.length() > UserConstants.USERNAME_MAX_LENGTH) { diff --git a/mobile-app/src/main/java/com/ruoyi/file/controller/FileApiController.java b/mobile-app/src/main/java/com/ruoyi/file/controller/FileApiController.java index b4361ee..f6aab95 100644 --- a/mobile-app/src/main/java/com/ruoyi/file/controller/FileApiController.java +++ b/mobile-app/src/main/java/com/ruoyi/file/controller/FileApiController.java @@ -2,8 +2,11 @@ package com.ruoyi.file.controller; import com.ruoyi.chat.LongConnection.model.msg.FileMsg; import com.ruoyi.chat.service.IMinioService; +import com.ruoyi.common.annotation.Log; +import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.enums.BusinessType; import com.ruoyi.file.domain.ClassesFileRole; import com.ruoyi.file.domain.UserFileInfo; import com.ruoyi.file.domain.UserFileRole; @@ -19,6 +22,7 @@ import io.minio.StatObjectArgs; import io.minio.StatObjectResponse; import org.apache.commons.io.IOUtils; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; @@ -36,7 +40,7 @@ import java.util.List; */ @RestController @RequestMapping("/file/api") -public class FileApiController { +public class FileApiController extends BaseController { @Autowired private IUserFileInfoApiService userFileInfoApiService; @Autowired @@ -113,7 +117,7 @@ public class FileApiController { */ @GetMapping("/deleteByList") public AjaxResult deletFileInfoByFileIds(Long[] fileIds){ - return AjaxResult.success("删除成功"); + return toAjax(userFileInfoApiService.deleteUserFileInfoByFileIds(fileIds)); } /** @@ -123,8 +127,7 @@ public class FileApiController { */ @GetMapping("/delete") public AjaxResult deleteFileInfoByFileId(Long fileId){ - userFileInfoApiService.deleteUserFileInfoByFileId(fileId); - return AjaxResult.success("删除成功"); + return toAjax(userFileInfoApiService.deleteUserFileInfoByFileId(fileId)); } /** @@ -174,18 +177,53 @@ public class FileApiController { /** * 添加用户文件权限 - * @param userFileRole + * @param fileId + * @param userIds * @return */ - @PostMapping("addUserRole") - public AjaxResult addUserFileRole(@RequestBody UserFileRole userFileRole){ - if(userFileRole.getFileId() == null) + @PostMapping("/addUserRole") + public AjaxResult addUserFileRole(Long fileId ,Long[] userIds){ + if(fileId == null) return AjaxResult.error("fileID不能为空"); - else if (userFileRole.getUserId() == null ) + else if (userIds.length ==0 ) return AjaxResult.error("userId不能为空"); else - userFileRoleService.insertUserFileRole(userFileRole); + userFileRoleService.insertUserFileRoles(fileId,userIds); + return AjaxResult.success("添加成功"); + } + + /** + * 添加班级文件权限 + * @param fileId + * @param classesIds + * @return + */ + @PostMapping("/addClassesRole") + public AjaxResult addClassesFileRole(Long fileId ,Long[] classesIds){ + if(fileId == null) + return AjaxResult.error("fileID不能为空"); + else if (classesIds.length ==0 ) + return AjaxResult.error("classesIds不能为空"); + else + classesFileRoleService.insertClassesFileRoles(fileId,classesIds); return AjaxResult.success("添加成功"); } + /** + * 删除班级文档权限 + */ + @GetMapping("/deleteClassesRole") + public AjaxResult deleteClassesRole(Long[] roleIds) + { + return toAjax(classesFileRoleService.deleteClassesFileRoleByRoleIds(roleIds)); + } + + /** + * 删除用户文档权限 + */ + @GetMapping("/deleteUserRole") + public AjaxResult deleteUserRole(Long[] roleIds) + { + return toAjax(userFileRoleService.deleteUserFileRoleByRoleIds(roleIds)); + } } diff --git a/mobile-app/src/main/java/com/ruoyi/file/mapper/ClassesFileRoleMapper.java b/mobile-app/src/main/java/com/ruoyi/file/mapper/ClassesFileRoleMapper.java index baa2c08..eb72bcb 100644 --- a/mobile-app/src/main/java/com/ruoyi/file/mapper/ClassesFileRoleMapper.java +++ b/mobile-app/src/main/java/com/ruoyi/file/mapper/ClassesFileRoleMapper.java @@ -2,6 +2,7 @@ package com.ruoyi.file.mapper; import java.util.List; import com.ruoyi.file.domain.ClassesFileRole; +import org.apache.ibatis.annotations.Param; /** * 班级文档权限Mapper接口 @@ -35,6 +36,14 @@ public interface ClassesFileRoleMapper */ public int insertClassesFileRole(ClassesFileRole classesFileRole); + /** + * 批量添加班级文档权限 + * @param fileId + * @param classesIds + * @return 结果 + */ + public int insertClassesFileRoles(@Param("fileId") Long fileId , @Param("classesIds") Long[] classesIds); + /** * 修改班级文档权限 * diff --git a/mobile-app/src/main/java/com/ruoyi/file/mapper/UserFileRoleMapper.java b/mobile-app/src/main/java/com/ruoyi/file/mapper/UserFileRoleMapper.java index bb0f982..38d648c 100644 --- a/mobile-app/src/main/java/com/ruoyi/file/mapper/UserFileRoleMapper.java +++ b/mobile-app/src/main/java/com/ruoyi/file/mapper/UserFileRoleMapper.java @@ -2,6 +2,7 @@ package com.ruoyi.file.mapper; import java.util.List; import com.ruoyi.file.domain.UserFileRole; +import org.apache.ibatis.annotations.Param; /** * 用户文档权限Mapper接口 @@ -35,6 +36,14 @@ public interface UserFileRoleMapper */ public int insertUserFileRole(UserFileRole userFileRole); + /** + * 批量添加用户文档权限 + * @param fileId + * @param userIds + * @return 结果 + */ + public int insertUserFileRoles(@Param("fileId") Long fileId, @Param("userIds") Long[] userIds); + /** * 修改用户文档权限 * diff --git a/mobile-app/src/main/java/com/ruoyi/file/service/IClassesFileRoleService.java b/mobile-app/src/main/java/com/ruoyi/file/service/IClassesFileRoleService.java index 3102d28..d56152d 100644 --- a/mobile-app/src/main/java/com/ruoyi/file/service/IClassesFileRoleService.java +++ b/mobile-app/src/main/java/com/ruoyi/file/service/IClassesFileRoleService.java @@ -27,9 +27,17 @@ public interface IClassesFileRoleService */ public List selectClassesFileRoleList(ClassesFileRole classesFileRole); + /** + * 批量添加班级文档权限 + * @param fileId + * @param classesIds + * @return 结果 + */ + public int insertClassesFileRoles(Long fileId ,Long[] classesIds); + /** * 新增班级文档权限 - * + * * @param classesFileRole 班级文档权限 * @return 结果 */ diff --git a/mobile-app/src/main/java/com/ruoyi/file/service/IUserFileRoleService.java b/mobile-app/src/main/java/com/ruoyi/file/service/IUserFileRoleService.java index 5d1ab93..ab8cfc6 100644 --- a/mobile-app/src/main/java/com/ruoyi/file/service/IUserFileRoleService.java +++ b/mobile-app/src/main/java/com/ruoyi/file/service/IUserFileRoleService.java @@ -2,6 +2,7 @@ package com.ruoyi.file.service; import java.util.List; import com.ruoyi.file.domain.UserFileRole; +import org.springframework.web.bind.annotation.RequestBody; /** * 用户文档权限Service接口 @@ -35,6 +36,14 @@ public interface IUserFileRoleService */ public int insertUserFileRole(UserFileRole userFileRole); + /** + * 批量添加用户文档权限 + * @param fileId + * @param userIds + * @return 结果 + */ + public int insertUserFileRoles(Long fileId , Long[] userIds); + /** * 修改用户文档权限 * diff --git a/mobile-app/src/main/java/com/ruoyi/file/service/impl/ClassesFileRoleServiceImpl.java b/mobile-app/src/main/java/com/ruoyi/file/service/impl/ClassesFileRoleServiceImpl.java index d46e02e..b846f1d 100644 --- a/mobile-app/src/main/java/com/ruoyi/file/service/impl/ClassesFileRoleServiceImpl.java +++ b/mobile-app/src/main/java/com/ruoyi/file/service/impl/ClassesFileRoleServiceImpl.java @@ -55,6 +55,18 @@ public class ClassesFileRoleServiceImpl implements IClassesFileRoleService return classesFileRoleMapper.insertClassesFileRole(classesFileRole); } + /** + * 批量添加班级文档权限 + * @param fileId + * @param classesIds + * @return 结果 + */ + @Override + public int insertClassesFileRoles(Long fileId ,Long[] classesIds) + { + return classesFileRoleMapper.insertClassesFileRoles(fileId,classesIds); + } + /** * 修改班级文档权限 * diff --git a/mobile-app/src/main/java/com/ruoyi/file/service/impl/UserFileRoleServiceImpl.java b/mobile-app/src/main/java/com/ruoyi/file/service/impl/UserFileRoleServiceImpl.java index bd87109..6811254 100644 --- a/mobile-app/src/main/java/com/ruoyi/file/service/impl/UserFileRoleServiceImpl.java +++ b/mobile-app/src/main/java/com/ruoyi/file/service/impl/UserFileRoleServiceImpl.java @@ -55,6 +55,18 @@ public class UserFileRoleServiceImpl implements IUserFileRoleService return userFileRoleMapper.insertUserFileRole(userFileRole); } + /** + * 批量添加用户文档权限 + * @param fileId + * @param userIds + * @return 结果 + */ + @Override + public int insertUserFileRoles(Long fileId, Long[] userIds) { + + return userFileRoleMapper.insertUserFileRoles(fileId,userIds); + } + /** * 修改用户文档权限 * diff --git a/mobile-app/src/main/resources/mapper/file/ClassesFileRoleMapper.xml b/mobile-app/src/main/resources/mapper/file/ClassesFileRoleMapper.xml index dcea24b..65196b0 100644 --- a/mobile-app/src/main/resources/mapper/file/ClassesFileRoleMapper.xml +++ b/mobile-app/src/main/resources/mapper/file/ClassesFileRoleMapper.xml @@ -37,6 +37,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{fileId}, #{classesId}, + + + + insert into classes_file_role + (file_id,classes_id) values + + ( #{fileId},#{classesId}) + diff --git a/mobile-app/src/main/resources/mapper/file/UserFileRoleMapper.xml b/mobile-app/src/main/resources/mapper/file/UserFileRoleMapper.xml index 7792b10..4336ad8 100644 --- a/mobile-app/src/main/resources/mapper/file/UserFileRoleMapper.xml +++ b/mobile-app/src/main/resources/mapper/file/UserFileRoleMapper.xml @@ -39,6 +39,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + insert into user_file_role + ( file_id,user_id) values + + (#{fileId},#{userId}) + + + update user_file_role -- Gitee