修改收藏数据查询排序字段

electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/controller/EdFileFavoriteController.java

@@ -1,5 +1,7 @@
 package com.electromagnetic.industry.software.manage.controller;
 
+import com.electromagnetic.industry.software.common.annotations.UserOperation;
+import com.electromagnetic.industry.software.common.enums.UserOperationModuleEnum;
 import com.electromagnetic.industry.software.common.resp.ElectromagneticResult;
 import com.electromagnetic.industry.software.common.util.ElectromagneticResultUtil;
 import com.electromagnetic.industry.software.common.util.UserThreadLocal;
@@ -22,6 +24,7 @@ public class EdFileFavoriteController {
      * @return
      */
     @GetMapping("/add")
+    @UserOperation(value="收藏了文件", modelName = UserOperationModuleEnum.DATABASE)
     public ElectromagneticResult<?> addFavorite(@RequestParam String id) {
         String userId = UserThreadLocal.getUserId();
         return ElectromagneticResultUtil.success(edFileFavoriteService.addFavorite(userId, id));
@@ -33,6 +36,7 @@ public class EdFileFavoriteController {
      * @return
      */
     @GetMapping("/remove")
+    @UserOperation(value="从收藏夹移除了文件", modelName = UserOperationModuleEnum.DATABASE)
     public ElectromagneticResult<?> removeFavorite(@RequestParam String id) {
         String userId = UserThreadLocal.getUserId();
         return ElectromagneticResultUtil.success(edFileFavoriteService.removeFavorite(userId, id));
@@ -43,6 +47,7 @@ public class EdFileFavoriteController {
      * @return
      */
     @PostMapping("/list")
+    @UserOperation(value="查看了收藏夹", modelName = UserOperationModuleEnum.DATABASE)
     public ElectromagneticResult<?> listFavorite(@RequestBody FileInfoQueryDTO fileInfoQueryDTO) {
         String userId = UserThreadLocal.getUserId();
         return ElectromagneticResultUtil.success(edFileFavoriteService.findFavorite(userId, fileInfoQueryDTO));

electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/controller/EdFileRelationController.java

@@ -1,7 +1,9 @@
 package com.electromagnetic.industry.software.manage.controller;
 
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.electromagnetic.industry.software.common.annotations.UserOperation;
 import com.electromagnetic.industry.software.common.enums.DataOwnEnum;
+import com.electromagnetic.industry.software.common.enums.UserOperationModuleEnum;
 import com.electromagnetic.industry.software.common.exception.BizException;
 import com.electromagnetic.industry.software.common.resp.ElectromagneticResult;
 import com.electromagnetic.industry.software.common.util.ElectromagneticResultUtil;
@@ -28,6 +30,7 @@ public class EdFileRelationController {
      * @return
      */
     @RequestMapping(value = "/create", method = RequestMethod.POST)
+    @UserOperation(value="创建了文件关系", modelName = UserOperationModuleEnum.DATABASE)
     public ElectromagneticResult<?> createRelation(@RequestBody EdFileRelation relation) {
         try {
             Boolean res = edFileRelationService.createRelation(relation);
@@ -38,12 +41,13 @@ public class EdFileRelationController {
     }
 
     /**
-     * 创建文件关系
+     * 更新文件关系
      *
      * @param updateRelation
      * @return
      */
     @RequestMapping(value = "/update", method = RequestMethod.POST)
+    @UserOperation(value="更新了文件关系", modelName = UserOperationModuleEnum.DATABASE)
     public ElectromagneticResult<?> updateRelation(@RequestBody UpdateRelationDTO updateRelation) {
         LambdaUpdateWrapper<EdFileRelation> wrapper = new LambdaUpdateWrapper<>();
         wrapper.eq(EdFileRelation::getId, updateRelation.getRelationId()).set(EdFileRelation::getRelationship, updateRelation.getRelationship());
@@ -57,6 +61,7 @@ public class EdFileRelationController {
      * @return
      */
     @RequestMapping(value = "/cancel/{relationId}", method = RequestMethod.GET)
+    @UserOperation(value="取消了文件关系", modelName = UserOperationModuleEnum.DATABASE)
     public ElectromagneticResult<?> cancelRelation(@PathVariable("relationId") String relationId) {
         return ElectromagneticResultUtil.success(edFileRelationService.cancelRelation(relationId));
     }
@@ -65,6 +70,7 @@ public class EdFileRelationController {
      * 展示文件关系
      */
     @RequestMapping(value = "listRelations/{id}", method = RequestMethod.GET)
+    @UserOperation(value="查看了文件关系", modelName = UserOperationModuleEnum.DATABASE)
     public ElectromagneticResult<?> listRelations(@PathVariable("id") String id) {
         return ElectromagneticResultUtil.success(edFileRelationService.listRelations(id));
     }
@@ -73,6 +79,7 @@ public class EdFileRelationController {
      * 检验文件名是否唯一
      */
     @RequestMapping(value = "/checkFileNameExist", method = RequestMethod.POST)
+    @UserOperation(value="校验文件名唯一性", modelName = UserOperationModuleEnum.DATABASE)
     public ElectromagneticResult<?> checkFileNameExist(@RequestBody CheckNameUniqueRequest checkNameUniqueRequest) {
         String fileName = checkNameUniqueRequest.getFileName();
         String parentId = checkNameUniqueRequest.getParentId();
@@ -83,6 +90,7 @@ public class EdFileRelationController {
      * 本地上传并建立关系
      */
     @RequestMapping(value = "/upload", method = RequestMethod.POST)
+    @UserOperation(value="上传了文件并创建了文件关系", modelName = UserOperationModuleEnum.DATABASE)
     public ElectromagneticResult<?> uploadRelation(@RequestParam("parentId") String parentId,
                                                    @RequestParam("file") MultipartFile file,
                                                    @RequestParam("description") String description,

electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/controller/EdTagLibraryController.java

@@ -1,6 +1,7 @@
 package com.electromagnetic.industry.software.manage.controller;
 
 import com.electromagnetic.industry.software.common.annotations.UserOperation;
+import com.electromagnetic.industry.software.common.enums.UserOperationModuleEnum;
 import com.electromagnetic.industry.software.common.resp.ElectromagneticResult;
 import com.electromagnetic.industry.software.common.util.ElectromagneticResultUtil;
 import com.electromagnetic.industry.software.common.util.UserThreadLocal;
@@ -18,7 +19,7 @@ public class EdTagLibraryController {
 
     // 新建标签组
     @PostMapping("/createGroup")
-    @UserOperation(value="创建了标签组")
+    @UserOperation(value="创建了标签组", modelName = UserOperationModuleEnum.TAG)
     public ElectromagneticResult<?> createTagGroup(@RequestParam String tagName) {
         String createdBy = UserThreadLocal.getUserId();
         return ElectromagneticResultUtil.success(edTagLibraryService.createTagGroup(tagName, createdBy));
@@ -26,7 +27,7 @@ public class EdTagLibraryController {
 
     // 在标签组下新建标签
     @PostMapping("/createTag")
-    @UserOperation(value="创建了标签")
+    @UserOperation(value="创建了标签", modelName = UserOperationModuleEnum.TAG)
     public ElectromagneticResult<?> createTag(@RequestParam String parentId, @RequestParam String tagName) {
         String createdBy = UserThreadLocal.getUserId();
         return ElectromagneticResultUtil.success(edTagLibraryService.createTag(parentId, tagName, createdBy));
@@ -34,7 +35,7 @@ public class EdTagLibraryController {
 
     // 拖拽修改排序/分组
     @PostMapping("/updateOrder")
-    @UserOperation("修改了标签顺序")
+    @UserOperation(value="修改了标签顺序", modelName = UserOperationModuleEnum.TAG)
     public ElectromagneticResult<?> updateTagOrder(@RequestParam String tagId, @RequestParam String newParentId, @RequestParam Integer newOrderBy) {
         String updatedBy = UserThreadLocal.getUserId();
         return ElectromagneticResultUtil.success(edTagLibraryService.updateTagOrder(tagId, newParentId, newOrderBy,updatedBy));
@@ -42,27 +43,28 @@ public class EdTagLibraryController {
 
     // 发布标签
     @PostMapping("/batchPublish")
-    @UserOperation(value="发布了标签组")
+    @UserOperation(value="发布了标签组", modelName = UserOperationModuleEnum.TAG)
     public ElectromagneticResult<?> publishTag(@RequestParam List<String> tagIds) {
         return ElectromagneticResultUtil.success(edTagLibraryService.batchPublishTagGroups(tagIds));
     }
 
     // 废除标签
     @GetMapping("/delete")
-    @UserOperation(value="废除了标签组/标签")
+    @UserOperation(value="废除了标签组/标签", modelName = UserOperationModuleEnum.TAG)
     public ElectromagneticResult<?> deleteTag(@RequestParam String tagId) {
         return ElectromagneticResultUtil.success(edTagLibraryService.deleteTagOrGroup(tagId));
     }
 
     //获取标签数据
     @GetMapping("/list")
+    @UserOperation(value="查看了标签数据", modelName = UserOperationModuleEnum.TAG)
     public ElectromagneticResult<?> listTags() {
         return ElectromagneticResultUtil.success(edTagLibraryService.listTagsWithGroups());
     }
 
     // 修改标签组/标签
     @PostMapping ("/updateTag")
-    @UserOperation("修改了标签名称")
+    @UserOperation(value="修改了标签组/标签", modelName = UserOperationModuleEnum.TAG)
     public ElectromagneticResult<?> updateTag(@RequestParam String tagId, @RequestParam String tagName) {
         String updatedBy = UserThreadLocal.getUserId();
         return ElectromagneticResultUtil.success(edTagLibraryService.updateTagInfo(tagId, tagName, updatedBy));

electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/controller/PermissionController.java

@@ -1,5 +1,7 @@
 package com.electromagnetic.industry.software.manage.controller;
 
+import com.electromagnetic.industry.software.common.annotations.UserOperation;
+import com.electromagnetic.industry.software.common.enums.UserOperationModuleEnum;
 import com.electromagnetic.industry.software.common.resp.ElectromagneticResult;
 import com.electromagnetic.industry.software.common.util.ElectromagneticResultUtil;
 import com.electromagnetic.industry.software.common.util.UserThreadLocal;
@@ -19,8 +21,8 @@ public class PermissionController {
     @Resource
     private PermissionService permissionService;
 
-    @ApiOperation(value = "查询当前用户在当前目录的功能权限", notes = "")
     @GetMapping(value = "/{id}")
+    @UserOperation(value="查询了在当前目录的功能权限", modelName = UserOperationModuleEnum.PERMISSION)
     public ElectromagneticResult<?> getUserPermission(@PathVariable("id") String id) {
         String userId = UserThreadLocal.getUserId();
         return ElectromagneticResultUtil.success(permissionService.getUserPermission(userId, id, false));

electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/controller/RoleController.java

@@ -1,7 +1,9 @@
 package com.electromagnetic.industry.software.manage.controller;
 
 import com.electromagnetic.industry.software.common.annotations.RequiredRole;
+import com.electromagnetic.industry.software.common.annotations.UserOperation;
 import com.electromagnetic.industry.software.common.enums.AdminTypeEnum;
+import com.electromagnetic.industry.software.common.enums.UserOperationModuleEnum;
 import com.electromagnetic.industry.software.common.exception.BizException;
 import com.electromagnetic.industry.software.common.resp.ElectromagneticResult;
 import com.electromagnetic.industry.software.common.util.ElectromagneticResultUtil;
@@ -20,8 +22,8 @@ public class RoleController {
     @Resource
     private RoleService roleService;
 
-    @ApiOperation(value = "新建角色", notes = "")
     @RequiredRole(AdminTypeEnum.SECURITY)
+    @UserOperation(value="新建了角色", modelName = UserOperationModuleEnum.PERMISSION)
     @RequestMapping(value = "/createRole", method = RequestMethod.POST)
     public ElectromagneticResult<?> createRole(@RequestBody RoleDTO roleDTO) {
         try {
@@ -32,8 +34,8 @@ public class RoleController {
         }
     }
 
-    @ApiOperation(value = "更新角色", notes = "")
     @RequiredRole(AdminTypeEnum.SECURITY)
+    @UserOperation(value="更新了角色", modelName = UserOperationModuleEnum.PERMISSION)
     @RequestMapping(value = "/updateRole", method = RequestMethod.POST)
     public ElectromagneticResult<?> updateRole(@RequestBody RoleDTO roleDTO) {
         try {
@@ -44,43 +46,43 @@ public class RoleController {
         }
     }
 
-    @ApiOperation(value = "删除角色", notes = "")
     @RequiredRole(AdminTypeEnum.SECURITY)
+    @UserOperation(value="删除了角色", modelName = UserOperationModuleEnum.PERMISSION)
     @GetMapping(value = "/deleteRole/{roleId}")
     public ElectromagneticResult<?> deleteRole(@PathVariable("roleId") String roleId) {
         return ElectromagneticResultUtil.success(roleService.deleteRole(roleId));
     }
 
-    @ApiOperation(value = "查看角色", notes = "")
     @RequiredRole(AdminTypeEnum.SECURITY)
+    @UserOperation(value="查看了某一角色", modelName = UserOperationModuleEnum.PERMISSION)
     @GetMapping(value = "/getSingleRole/{roleId}")
     public ElectromagneticResult<?> getRole(@PathVariable("roleId") String roleId) {
         return ElectromagneticResultUtil.success(roleService.getRole(roleId));
     }
 
-    @ApiOperation(value = "获取角色列表", notes = "")
     @RequiredRole(AdminTypeEnum.SECURITY)
+    @UserOperation(value="查看了角色", modelName = UserOperationModuleEnum.PERMISSION)
     @RequestMapping(value = "/list", method = RequestMethod.POST)
     public ElectromagneticResult<?> getRoles(@RequestBody RolePageDTO rolePageDTO) {
         return ElectromagneticResultUtil.success(roleService.getRoles(rolePageDTO));
     }
 
-    @ApiOperation(value = "通过角色名查看角色权限", notes = "")
     @RequiredRole(AdminTypeEnum.SECURITY)
+    @UserOperation(value="查看了某一角色的权限", modelName = UserOperationModuleEnum.PERMISSION)
     @GetMapping(value = "/getRoleByName")
     public ElectromagneticResult<?> getRoleByName(@RequestParam("roleName") String roleName) {
         return ElectromagneticResultUtil.success(roleService.getRoleByName(roleName));
     }
 
-    @ApiOperation(value = "角色名列表", notes = "")
     @RequiredRole(AdminTypeEnum.SECURITY)
+    @UserOperation(value="获取了角色名列表", modelName = UserOperationModuleEnum.PERMISSION)
     @GetMapping(value = "/getRoleNames")
     public ElectromagneticResult<?> getRoleNames() {
         return ElectromagneticResultUtil.success(roleService.getAllRoleNames());
     }
 
-    @ApiOperation(value = "获得角色配置模版", notes = "")
     @RequiredRole(AdminTypeEnum.SECURITY)
+    @UserOperation(value="获取了角色配置模版", modelName = UserOperationModuleEnum.PERMISSION)
     @GetMapping(value = "/getRoleTemplate")
     public ElectromagneticResult<?> getRoleTemplate() {
         return ElectromagneticResultUtil.success(roleService.getRoleTemplate());

electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/controller/UserController.java

@@ -1,8 +1,10 @@
 package com.electromagnetic.industry.software.manage.controller;
 
 import com.electromagnetic.industry.software.common.annotations.RequiredRole;
+import com.electromagnetic.industry.software.common.annotations.UserOperation;
 import com.electromagnetic.industry.software.common.enums.AdminTypeEnum;
 import com.electromagnetic.industry.software.common.enums.PublishEnum;
+import com.electromagnetic.industry.software.common.enums.UserOperationModuleEnum;
 import com.electromagnetic.industry.software.common.resp.ElectromagneticResult;
 import com.electromagnetic.industry.software.common.util.ElectromagneticResultUtil;
 import com.electromagnetic.industry.software.common.util.UserThreadLocal;
@@ -21,77 +23,77 @@ public class UserController {
     @Resource
     private UserService userService;
 
-    @ApiOperation(value = "登录", notes = "")
     @PostMapping("/login")
+    @UserOperation(value="登陆", modelName = UserOperationModuleEnum.USER)
     public ElectromagneticResult<?> login(@RequestBody UserLoginRequest loginRequest) {
         return userService.login(loginRequest);
     }
 
-    @ApiOperation(value = "新增用户信息", notes = "")
     @RequiredRole(AdminTypeEnum.SYSTEM)
     @PostMapping("/createUser")
+    @UserOperation(value="新增了用户信息", modelName = UserOperationModuleEnum.USER)
     public ElectromagneticResult<?> createUser(@RequestBody UserRequest userRequest) {
         return userService.createUser(userRequest);
     }
 
-    @ApiOperation(value = "编辑用户信息", notes = "")
     @RequiredRole(AdminTypeEnum.SYSTEM)
     @PutMapping("/updateUser")
+    @UserOperation(value="编辑了用户信息", modelName = UserOperationModuleEnum.USER)
     public ElectromagneticResult<?> updateUser(@RequestBody UserModiRequest userModiRequest) {
         return userService.modifyUser(userModiRequest);
     }
 
-    @ApiOperation(value = "发布用户信息", notes = "")
     @RequiredRole(AdminTypeEnum.SYSTEM)
     @RequestMapping(value = "/publish", method = RequestMethod.POST)
+    @UserOperation(value="发布了用户信息", modelName = UserOperationModuleEnum.USER)
     public ElectromagneticResult<?> publishUser(@RequestBody UserPublishRequest userPublishRequest) {
         return userService.publishUser(userPublishRequest);
     }
 
-    @ApiOperation(value = "获取单条用户信息", notes = "")
     @RequiredRole(AdminTypeEnum.SYSTEM)
     @RequestMapping(value = "/getInfo", method = RequestMethod.GET)
+    @UserOperation(value="获取了某一用户信息", modelName = UserOperationModuleEnum.USER)
     public ElectromagneticResult<?> getSingleUser(GetSingleUserRequest getSingleUserRequest) {
         return userService.getSingleUser(getSingleUserRequest);
     }
 
-    @ApiOperation(value = "查询用户信息", notes = "")
     @RequiredRole(AdminTypeEnum.SYSTEM)
+    @UserOperation(value="查询了用户信息", modelName = UserOperationModuleEnum.USER)
     @RequestMapping(value = "/list", method = RequestMethod.POST)
     public ElectromagneticResult<?> searchUser(@RequestBody SearchUserRequest searchUserRequest) {
         return userService.searchUser(searchUserRequest);
     }
 
-    @ApiOperation(value = "校验工号唯一性", notes = "")
     @RequestMapping(value = "/validateWorkNumber", method = RequestMethod.POST)
+    @UserOperation(value="校验了工号唯一性", modelName = UserOperationModuleEnum.USER)
     public ElectromagneticResult<?> validateWorkNum(@RequestBody UserWorkNumRequest userWorkNumRequest) {
         return userService.validateWorkNum(userWorkNumRequest);
     }
 
-    @ApiOperation(value = "删除用户信息", notes = "")
     @RequiredRole(AdminTypeEnum.SYSTEM)
     @PostMapping(value = "/deleteUser")
+    @UserOperation(value="删除了用户信息", modelName = UserOperationModuleEnum.USER)
     public ElectromagneticResult<?> deleteUser(@RequestBody UserDeleteRequest userDeleteRequest) {
         return userService.deleteUser(userDeleteRequest);
     }
 
-    @ApiOperation(value = "登出", notes = "")
     @RequestMapping(value = "/logout", method = RequestMethod.POST)
+    @UserOperation(value="登出", modelName = UserOperationModuleEnum.USER)
     public ElectromagneticResult<?> logout(@RequestHeader("Authorization") String token) {
         return userService.logout(token);
     }
 
-    @ApiOperation(value = "人员绑定界面查询用户", notes = "")
     @RequiredRole(AdminTypeEnum.SECURITY)
     @RequestMapping(value = "/bindRole/list", method = RequestMethod.POST)
+    @UserOperation(value="查询了用户信息", modelName = UserOperationModuleEnum.USER)
     public ElectromagneticResult<?> getPublishedUsers(@RequestBody SearchUserRequest searchUserRequest) {
         searchUserRequest.setIsPublished(PublishEnum.PUBLISHED.getCode().toString());
         return userService.searchUser(searchUserRequest);
     }
 
-    @ApiOperation(value = "人员绑定", notes = "")
     @RequiredRole(AdminTypeEnum.SECURITY)
     @RequestMapping(value = "/bindRoles", method = RequestMethod.POST)
+    @UserOperation(value="绑定了人员与角色", modelName = UserOperationModuleEnum.USER)
     public ElectromagneticResult<?> bindRoles(@RequestBody List<UserBindRoleDTO> list) {
         if (userService.bindRoles(list)) {
             return ElectromagneticResultUtil.success(true);
@@ -100,15 +102,15 @@ public class UserController {
         }
     }
 
-    @ApiOperation(value = "密码重置", notes = "")
     @RequiredRole(AdminTypeEnum.SECURITY)
     @GetMapping(value = "/resetPassword/{userId}")
+    @UserOperation(value="重置了密码", modelName = UserOperationModuleEnum.USER)
     public ElectromagneticResult<?> resetPassword(@PathVariable("userId") String userId) {
         return ElectromagneticResultUtil.success(userService.resetPassword(userId));
     }
 
-    @ApiOperation(value = "获取当前用户管理员类型")
     @GetMapping(value = "/getAdminType")
+    @UserOperation(value="获取了当前用户的管理员类型", modelName = UserOperationModuleEnum.USER)
     public ElectromagneticResult<?> getAdminType() {
         String adminType = UserThreadLocal.getAdminType();
         if (adminType == null || adminType.isEmpty()) {

electrmangnetic/src/main/resources/sqlmapper/EdFileInfoMapper.xml

@@ -79,10 +79,10 @@
             <when test="pars.versionSort == 1">
                 ORDER BY file_version DESC
             </when>
-            <when test="pars.fileSize == 0">
+            <when test="pars.fileSizeSort == 0">
                 ORDER BY file_size ASC
             </when>
-            <when test="pars.fileSize == 1">
+            <when test="pars.fileSizeSort == 1">
                 ORDER BY file_size DESC
             </when>
             <otherwise>

electromagnetic-common/src/main/java/com/electromagnetic/industry/software/common/enums/UserOperationModuleEnum.java

@@ -10,6 +10,7 @@ public enum UserOperationModuleEnum {
     DATABASE("database", "数据库管理"),
     USER("user", "人员管理"),
     USER_PRJ("userPrj", "个人数据"),
+    TAG("tag","标签管理"),
     PERMISSION("permission", "权限管理");
 
     public final String key;