From 8ba1de209b520c91354383179f91f6602ea6672b Mon Sep 17 00:00:00 2001 From: chenxudong Date: Fri, 28 Feb 2025 15:08:21 +0800 Subject: [PATCH] =?UTF-8?q?=E9=87=8D=E6=9E=84=E6=96=87=E4=BB=B6=E6=94=B6?= =?UTF-8?q?=E8=97=8F=E7=9B=B8=E5=85=B3=E5=8A=9F=E8=83=BD=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/EdFileFavoriteController.java | 55 ------------------- .../controller/EdFileInfoController.java | 39 +++++++++++++ .../controller/UserEdFileInfoController.java | 42 ++++++++++++++ .../serviceimpl/FileRecycleServiceImpl.java | 1 + 4 files changed, 82 insertions(+), 55 deletions(-) delete mode 100644 electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/controller/EdFileFavoriteController.java diff --git a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/controller/EdFileFavoriteController.java b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/controller/EdFileFavoriteController.java deleted file mode 100644 index 86df04b..0000000 --- a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/controller/EdFileFavoriteController.java +++ /dev/null @@ -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)); - } -} diff --git a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/controller/EdFileInfoController.java b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/controller/EdFileInfoController.java index 1673099..d4115b5 100644 --- a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/controller/EdFileInfoController.java +++ b/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)); + } } diff --git a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/controller/UserEdFileInfoController.java b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/controller/UserEdFileInfoController.java index 3947bb2..5c4cc59 100644 --- a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/controller/UserEdFileInfoController.java +++ b/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 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)); + } + + } diff --git a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/FileRecycleServiceImpl.java b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/FileRecycleServiceImpl.java index 0c52dee..ab9b63e 100644 --- a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/FileRecycleServiceImpl.java +++ b/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 edFileInfos = this.edFileInfoMapper.selectList(Wrappers.lambdaQuery(EdFileInfo.class)