重构文件收藏相关功能。

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

@@ -1,55 +0,0 @@
-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;
-import com.electromagnetic.industry.software.manage.pojo.req.FileInfoQueryDTO;
-import com.electromagnetic.industry.software.manage.service.EdFileFavoriteService;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-
-@RestController
-@RequestMapping("/data/ed/favorite")
-public class EdFileFavoriteController {
-
-    @Resource
-    EdFileFavoriteService edFileFavoriteService;
-
-    /**
-     * 添加进收藏夹
-     * @param id 文件id
-     * @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));
-    }
-
-    /**
-     * 从收藏夹移除
-     * @param id 文件id
-     * @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));
-    }
-
-    /**
-     * 展示当前用户收藏夹文件
-     * @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/EdFileInfoController.java

@@ -6,10 +6,13 @@ import com.electromagnetic.industry.software.common.enums.DataOwnEnum;
 import com.electromagnetic.industry.software.common.enums.FilePermission;
 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;
 import com.electromagnetic.industry.software.manage.pojo.req.CreateFolderDTO;
 import com.electromagnetic.industry.software.manage.pojo.req.FileChunkDTO;
 import com.electromagnetic.industry.software.manage.pojo.req.FileInfoQueryDTO;
 import com.electromagnetic.industry.software.manage.pojo.req.UpdateFileInfoDTO;
+import com.electromagnetic.industry.software.manage.service.EdFileFavoriteService;
 import com.electromagnetic.industry.software.manage.service.EdFileInfoService;
 import org.springframework.core.io.InputStreamResource;
 import org.springframework.http.ResponseEntity;
@@ -26,6 +29,8 @@ public class EdFileInfoController {
 
     @Resource
     private EdFileInfoService edFileInfoService;
+    @Resource
+    private EdFileFavoriteService edFileFavoriteService;
 
     @UserOperation(value = "查看工程树", modelName = UserOperationModuleEnum.DATABASE)
     @RequestMapping("tree")
@@ -161,4 +166,38 @@ public class EdFileInfoController {
         return edFileInfoService.preview(id, response, DataOwnEnum.COMMON.code);
     }
 
+    /**
+     * 添加进收藏夹
+     * @param id 文件id
+     * @return
+     */
+    @GetMapping("/collection")
+    @UserOperation(value="收藏了文件", modelName = UserOperationModuleEnum.DATABASE)
+    public ElectromagneticResult<?> addFavorite(@RequestParam String id) {
+        String userId = UserThreadLocal.getUserId();
+        return ElectromagneticResultUtil.success(edFileFavoriteService.addFavorite(userId, id));
+    }
+
+    /**
+     * 从收藏夹移除
+     * @param id 文件id
+     * @return
+     */
+    @GetMapping("/removeCollection")
+    @UserOperation(value="从收藏夹移除了文件", modelName = UserOperationModuleEnum.DATABASE)
+    public ElectromagneticResult<?> removeFavorite(@RequestParam String id) {
+        String userId = UserThreadLocal.getUserId();
+        return ElectromagneticResultUtil.success(edFileFavoriteService.removeFavorite(userId, id));
+    }
+
+    /**
+     * 展示当前用户收藏夹文件
+     * @return
+     */
+    @PostMapping("/listCollection")
+    @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/UserEdFileInfoController.java

@@ -4,9 +4,12 @@ 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.resp.ElectromagneticResult;
+import com.electromagnetic.industry.software.common.util.ElectromagneticResultUtil;
+import com.electromagnetic.industry.software.common.util.UserThreadLocal;
 import com.electromagnetic.industry.software.manage.pojo.req.CreateFolderDTO;
 import com.electromagnetic.industry.software.manage.pojo.req.FileInfoQueryDTO;
 import com.electromagnetic.industry.software.manage.pojo.req.UpdateFileInfoDTO;
+import com.electromagnetic.industry.software.manage.service.EdFileFavoriteService;
 import com.electromagnetic.industry.software.manage.service.EdFileInfoService;
 import org.springframework.core.io.InputStreamResource;
 import org.springframework.http.ResponseEntity;
@@ -22,6 +25,8 @@ public class UserEdFileInfoController {
 
     @Resource
     private EdFileInfoService edFileInfoService;
+    @Resource
+    private EdFileFavoriteService edFileFavoriteService;
 
     @UserOperation(value = "查看工程树", modelName =UserOperationModuleEnum.USER_PRJ)
     @RequestMapping("tree")
@@ -118,4 +123,41 @@ public class UserEdFileInfoController {
     public ResponseEntity<InputStreamResource> preview(@RequestParam String id, HttpServletResponse response) {
         return edFileInfoService.preview(id, response, DataOwnEnum.USER_PRJ.code);
     }
+
+    /**
+     * 添加进收藏夹
+     * @param id 文件id
+     * @return
+     */
+    @GetMapping("/collection")
+    @UserOperation(value="收藏了文件", modelName = UserOperationModuleEnum.DATABASE)
+    public ElectromagneticResult<?> addFavorite(@RequestParam String id) {
+        String userId = UserThreadLocal.getUserId();
+        return ElectromagneticResultUtil.success(edFileFavoriteService.addFavorite(userId, id));
+    }
+
+    /**
+     * 从收藏夹移除
+     * @param id 文件id
+     * @return
+     */
+    @GetMapping("/removeCollection")
+    @UserOperation(value="从收藏夹移除了文件", modelName = UserOperationModuleEnum.DATABASE)
+    public ElectromagneticResult<?> removeFavorite(@RequestParam String id) {
+        String userId = UserThreadLocal.getUserId();
+        return ElectromagneticResultUtil.success(edFileFavoriteService.removeFavorite(userId, id));
+    }
+
+    /**
+     * 展示当前用户收藏夹文件
+     * @return
+     */
+    @PostMapping("/listCollection")
+    @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/service/serviceimpl/FileRecycleServiceImpl.java

@@ -201,6 +201,7 @@ public class FileRecycleServiceImpl implements FileRecycleService {
     }
 
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public ElectromagneticResult<?> recover(String fileId) {
 
         List<EdFileInfo> edFileInfos = this.edFileInfoMapper.selectList(Wrappers.lambdaQuery(EdFileInfo.class)