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 8663fdf334b064a6c4b47b056e622a50ca197ac7..f9f3302afec3fe5324f3650ad0af9a7f142524fb 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 @@ -29,7 +29,7 @@ public class AppUserApiController extends BaseController { * 获取联系人列表 */ @GetMapping("/list") - public AjaxResult list(@RequestBody Contacts contacts) + public AjaxResult list(Contacts contacts) { if(com.ruoyi.common.utils.StringUtils.isNotNull(contacts.getClassesId())) { List list = userService.selectContactsList(contacts); diff --git a/mobile-app/src/main/java/com/ruoyi/eduinfo/model/Classes.java b/mobile-app/src/main/java/com/ruoyi/eduinfo/model/Classes.java index 8c1d78775f20d0a128d0de8a7e627716666e55ee..e98d9bc7f6d3f373ba725e304f6a647f1fb58cf8 100644 --- a/mobile-app/src/main/java/com/ruoyi/eduinfo/model/Classes.java +++ b/mobile-app/src/main/java/com/ruoyi/eduinfo/model/Classes.java @@ -1,13 +1,7 @@ package com.ruoyi.eduinfo.model; -import com.ruoyi.common.core.domain.BaseEntity; import lombok.Data; -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; -import javax.validation.constraints.Email; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.Size; import java.util.ArrayList; import java.util.List; diff --git a/mobile-app/src/main/java/com/ruoyi/eduinfo/model/Contacts.java b/mobile-app/src/main/java/com/ruoyi/eduinfo/model/Contacts.java index 018f99df436660d6e335efa544310dd5c92bd76e..f6d298c50dcf1334daf7a09c28e674c95eb1c0a7 100644 --- a/mobile-app/src/main/java/com/ruoyi/eduinfo/model/Contacts.java +++ b/mobile-app/src/main/java/com/ruoyi/eduinfo/model/Contacts.java @@ -19,10 +19,10 @@ public class Contacts extends BaseEntity /** 班级ID */ private Long classesId; - /** 用户账号 */ + /** 学号 */ private String userName; - /** 用户昵称 */ + /** 姓名 */ private String nickName; /** 用户邮箱 */ 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 f6aab95d7fc842f4c18ff426da6e7d014be1af46..caac2d9ed7ea49807e48f39fa131e808cef389f9 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 @@ -13,6 +13,7 @@ import com.ruoyi.file.domain.UserFileRole; import com.ruoyi.file.domain.vo.GetFileVo; import com.ruoyi.file.service.IClassesFileRoleService; import com.ruoyi.file.service.IUserFileInfoApiService; +import com.ruoyi.file.service.IUserFileInfoService; import com.ruoyi.file.service.IUserFileRoleService; import com.ruoyi.file.util.FileUtil; @@ -44,6 +45,8 @@ public class FileApiController extends BaseController { @Autowired private IUserFileInfoApiService userFileInfoApiService; @Autowired + private IUserFileInfoService userFileInfoService; + @Autowired private IUserFileRoleService userFileRoleService; @Autowired private IClassesFileRoleService classesFileRoleService; @@ -60,7 +63,7 @@ public class FileApiController extends BaseController { */ @PostMapping("/upload") - public AjaxResult upload(MultipartFile[] files , String username ) throws IOException { + public AjaxResult upload(MultipartFile[] files , String username ,String range) throws IOException { for (MultipartFile file:files) { UserFileInfo userFileInfo = new UserFileInfo(); @@ -73,7 +76,10 @@ public class FileApiController extends BaseController { userFileInfo.setFilePath(path); userFileInfo.setFileMime(file.getContentType()); userFileInfo.setFileSize(file.getSize()); - userFileInfo.setFileRange(0); + if(com.ruoyi.common.utils.StringUtils.isNotNull(range)) + userFileInfo.setFileRange(Integer.parseInt(range)); + else + userFileInfo.setFileRange(0); userFileInfo.setCreateBy(username); FileUtil.transferTo(file, userFileInfo); userFileInfoApiService.insertUserFileInfo(userFileInfo); @@ -91,7 +97,7 @@ public class FileApiController extends BaseController { * @return 文件实体列表 */ @GetMapping("/list") - public AjaxResult getList(@RequestBody GetFileVo getFileVo){ + public AjaxResult getList(GetFileVo getFileVo){ if (getFileVo.getUserId() != null ) { List userFileInfos = userFileInfoApiService.selectUserFileInfoList(getFileVo); return AjaxResult.success(userFileInfos); @@ -153,6 +159,8 @@ public class FileApiController extends BaseController { } catch (Exception ex) { ex.printStackTrace(); } + file.setFileDownload(file.getFileDownload()+1); + userFileInfoService.updateUserFileInfo(file); } /** @@ -161,7 +169,7 @@ public class FileApiController extends BaseController { * @return 用户文件权限集合 */ @GetMapping("/getUserRole") - public AjaxResult getUserFileRole(@RequestBody UserFileRole userFileRole){ + public AjaxResult getUserFileRole(UserFileRole userFileRole){ return AjaxResult.success(userFileRoleService.selectUserFileRoleList(userFileRole)); } @@ -171,7 +179,7 @@ public class FileApiController extends BaseController { * @return 班级文件权限集合 */ @GetMapping("/getClassesRole") - public AjaxResult getClassesFileRole(@RequestBody ClassesFileRole classesFileRole){ + public AjaxResult getClassesFileRole(ClassesFileRole classesFileRole){ return AjaxResult.success(classesFileRoleService.selectClassesFileRoleList(classesFileRole)); } diff --git a/mobile-app/src/main/java/com/ruoyi/file/domain/ClassesFileRole.java b/mobile-app/src/main/java/com/ruoyi/file/domain/ClassesFileRole.java index d43cd14429fe00c87ec99f5679c894cdc1f55fb3..c48e79013ae5514283bf4f00fb9786dbd53f4a11 100644 --- a/mobile-app/src/main/java/com/ruoyi/file/domain/ClassesFileRole.java +++ b/mobile-app/src/main/java/com/ruoyi/file/domain/ClassesFileRole.java @@ -1,5 +1,6 @@ package com.ruoyi.file.domain; +import com.ruoyi.eduinfo.model.Classes; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; import com.ruoyi.common.annotation.Excel; @@ -26,6 +27,9 @@ public class ClassesFileRole extends BaseEntity @Excel(name = "班级id") private Long classesId; + /** 班级对象 */ + private Classes classes; + public void setRoleId(Long roleId) { this.roleId = roleId; @@ -54,12 +58,23 @@ public class ClassesFileRole extends BaseEntity return classesId; } + public Classes getClasses() { + return classes; + } + + public void setClasses(Classes classes) { + this.classes = classes; + } + @Override public String toString() { - return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) - .append("roleId", getRoleId()) - .append("fileId", getFileId()) - .append("classesId", getClassesId()) - .toString(); + return "ClassesFileRole{" + + "roleId=" + roleId + + ", fileId=" + fileId + + ", classesId=" + classesId + + ", classes=" + classes + + '}'; } + + } diff --git a/mobile-app/src/main/java/com/ruoyi/file/domain/UserFileRole.java b/mobile-app/src/main/java/com/ruoyi/file/domain/UserFileRole.java index 67ea6ee30ec7ca0d2f396aa29c490f14fbc81972..f112f3f001ee3701a187d91256c002e40c9dde78 100644 --- a/mobile-app/src/main/java/com/ruoyi/file/domain/UserFileRole.java +++ b/mobile-app/src/main/java/com/ruoyi/file/domain/UserFileRole.java @@ -1,5 +1,6 @@ package com.ruoyi.file.domain; +import com.ruoyi.eduinfo.model.Contacts; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; import com.ruoyi.common.annotation.Excel; @@ -26,6 +27,12 @@ public class UserFileRole extends BaseEntity @Excel(name = "用户id") private Long userId; + /** 学号 */ + private String userName; + + /** 联系人实体 */ + private Contacts contacts; + public void setRoleId(Long roleId) { this.roleId = roleId; @@ -54,12 +61,30 @@ public class UserFileRole extends BaseEntity return userId; } + public String getUserName() { + return userName; + } + + public void setUserName(String userName) { + this.userName = userName; + } + + public Contacts getContacts() { + return contacts; + } + + public void setContacts(Contacts contacts) { + this.contacts = contacts; + } + @Override public String toString() { - return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) - .append("roleId", getRoleId()) - .append("fileId", getFileId()) - .append("userId", getUserId()) - .toString(); + return "UserFileRole{" + + "roleId=" + roleId + + ", fileId=" + fileId + + ", userId=" + userId + + ", userName='" + userName + '\'' + + ", contacts=" + contacts + + '}'; } } diff --git a/mobile-app/src/main/java/com/ruoyi/file/service/impl/UserFileInfoApiServiceImpl.java b/mobile-app/src/main/java/com/ruoyi/file/service/impl/UserFileInfoApiServiceImpl.java index 5139bea854560a871b80ec7cc010ee59a86930a6..d02c491d4a806b23fea718458c2554077c04e29f 100644 --- a/mobile-app/src/main/java/com/ruoyi/file/service/impl/UserFileInfoApiServiceImpl.java +++ b/mobile-app/src/main/java/com/ruoyi/file/service/impl/UserFileInfoApiServiceImpl.java @@ -76,7 +76,6 @@ public class UserFileInfoApiServiceImpl implements IUserFileInfoApiService @Override public int deleteUserFileInfoByFileIds(Long[] fileIds) { - userFileInfoApiMapper.deleteUserFileInfoByFileIds(fileIds); return userFileInfoApiMapper.deleteUserFileInfoByFileIds(fileIds); } @@ -89,7 +88,6 @@ public class UserFileInfoApiServiceImpl implements IUserFileInfoApiService @Override public int deleteUserFileInfoByFileId(Long fileId) { - userFileInfoApiMapper.deleteUserFileInfoByFileId(fileId); return userFileInfoApiMapper.deleteUserFileInfoByFileId(fileId); } diff --git a/mobile-app/src/main/resources/mapper/file/ClassesFileRoleMapper.xml b/mobile-app/src/main/resources/mapper/file/ClassesFileRoleMapper.xml index 65196b0ffb14841a3b53a89d01dfead99f17604c..3258f50ea38e3620a149681c08d37a435246a6a2 100644 --- a/mobile-app/src/main/resources/mapper/file/ClassesFileRoleMapper.xml +++ b/mobile-app/src/main/resources/mapper/file/ClassesFileRoleMapper.xml @@ -8,10 +8,22 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + + + + + + + + - select role_id, file_id, classes_id from classes_file_role + select r.role_id, r.file_id, r.classes_id, + d.classes_id, d.parent_id, d.classes_name, d.order_num, d.leader + from classes_file_role r + left join sys_classes d on r.classes_id = d.classes_id diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml index 22332b857363fb9b640864739f06ef199fb26103..83b3768b7c3fc374f44b2921a4ef3c0f891d72f2 100644 --- a/ruoyi-admin/src/main/resources/application.yml +++ b/ruoyi-admin/src/main/resources/application.yml @@ -105,7 +105,7 @@ accessToken: accessExcludes: /login,/register,/captchaImage # 匹配连接 # accessUrlPatterns: - accessUrlPatterns: /system/*,/monitor/*,/tool/*,/chat/*,/app/*,/file/*,/log/* + accessUrlPatterns: /chat/*,/app/*,/file/*,/log/* # MyBatis配置 diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java index fe2feb650ae1fa4303cdc100089745b52d7798d4..7f0101eca58586a69497f254b9d31d57c2af78eb 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java +++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java @@ -1,5 +1,6 @@ package com.ruoyi.framework.config; +import com.ruoyi.data.filter.first.AccessTokenConfig; import com.ruoyi.data.filter.second.AccessFilter; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Bean; diff --git a/ruoyi-framework/src/main/resource/mapper/DataappMapper.xml b/ruoyi-framework/src/main/resource/mapper/DataappMapper.xml index 6b606fb51b85b033c4e45ba8e44ed1a058f71032..d36ef534374213776c3ebb907cce5eec4f8eb602 100755 --- a/ruoyi-framework/src/main/resource/mapper/DataappMapper.xml +++ b/ruoyi-framework/src/main/resource/mapper/DataappMapper.xml @@ -5,7 +5,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select app_key from data_app where app_id = #{appId} diff --git a/ruoyi-ui/src/views/data/app/index.vue b/ruoyi-ui/src/views/data/app/index.vue index f0aa71782033fc8f9c784fda5636d4f9ce17f732..7c30e32ff2215278f58d1b21d81afaf5a481850f 100644 --- a/ruoyi-ui/src/views/data/app/index.vue +++ b/ruoyi-ui/src/views/data/app/index.vue @@ -250,13 +250,9 @@ }, /** 新增按钮操作 */ handleAdd() { - if(this.appList.length >= 1){ - this.$modal.msgSuccess("只能申请一次"); - }else { this.reset(); this.open = true; this.title = "申请应用"; - } }, /** 修改按钮操作 */ handleUpdate(row) {