From 2898554b20755028065dd329aee5509d18174e83 Mon Sep 17 00:00:00 2001 From: ls Date: Fri, 15 Nov 2024 10:35:23 +0800 Subject: [PATCH] update --- .../controller/DocumentFavoritesController.java | 16 ++++++++++++---- .../service/IDocumentFavoritesService.java | 1 + .../impl/DocumentFavoritesServiceImpl.java | 8 ++++++++ .../impl/DocumentVisitHistoryServiceImpl.java | 2 +- .../impl/ExperimentAnnealProcessServiceImpl.java | 2 +- .../ExperimentRadiationProcessServiceImpl.java | 2 +- .../impl/ExperimentReportServiceImpl.java | 2 +- .../impl/ExperimentReviewServiceImpl.java | 2 +- .../impl/ExperimentTestProcessServiceImpl.java | 2 +- 9 files changed, 27 insertions(+), 10 deletions(-) diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/DocumentFavoritesController.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/DocumentFavoritesController.java index c874592..c1405f4 100755 --- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/DocumentFavoritesController.java +++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/DocumentFavoritesController.java @@ -25,6 +25,7 @@ import org.springframework.web.bind.annotation.*; import org.springframework.web.servlet.ModelAndView; import java.util.Arrays; +import java.util.Objects; /** * @Description: 我的收藏文档 @@ -84,14 +85,21 @@ public class DocumentFavoritesController extends JeecgController add(@RequestBody DocumentFavorites documentFavorites, HttpServletRequest request) { String documentId = documentFavorites.getDocumentId(); DocumentLibrary documentLibrary = documentLibraryService.getById(documentId); - documentFavorites.setDocumentTitle(documentLibrary.getTitle()); String username = JwtUtil.getUserNameByToken(request); SysUser userByName = userService.getUserByName(username); - documentFavorites.setUserId(userByName.getId()); - documentFavoritesService.save(documentFavorites); - return Result.OK("添加成功！"); + DocumentFavorites old = documentFavoritesService.getByDocIdAndUserId(documentId, userByName.getId()); + if (Objects.isNull(old)) { + documentFavorites.setId(null); + }else{ + documentFavorites.setId(old.getId()); + } + documentFavorites.setUserId(userByName.getId()); + documentFavorites.setDocumentTitle(documentLibrary.getTitle()); + + documentFavoritesService.saveOrUpdate(documentFavorites); + return Result.OK("收藏成功！"); } /** diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/IDocumentFavoritesService.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/IDocumentFavoritesService.java index bb4ab15..b1f4a0c 100755 --- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/IDocumentFavoritesService.java +++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/IDocumentFavoritesService.java @@ -13,4 +13,5 @@ import java.util.List; */ public interface IDocumentFavoritesService extends IService { List getTopFavoritesByUserId(String userId); + DocumentFavorites getByDocIdAndUserId(String userId,String documentId); } diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/DocumentFavoritesServiceImpl.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/DocumentFavoritesServiceImpl.java index d8f25bb..ef4cf88 100755 --- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/DocumentFavoritesServiceImpl.java +++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/DocumentFavoritesServiceImpl.java @@ -27,4 +27,12 @@ public class DocumentFavoritesServiceImpl extends ServiceImpl page = new Page<>(1, 5); return list(page, queryWrapper); } + + @Override + public DocumentFavorites getByDocIdAndUserId(String userId, String documentId) { + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(DocumentFavorites::getUserId, userId); + queryWrapper.eq(DocumentFavorites::getDocumentId, userId); + return getOne(queryWrapper,false); + } } diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/DocumentVisitHistoryServiceImpl.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/DocumentVisitHistoryServiceImpl.java index 8dcafa7..d052c77 100644 --- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/DocumentVisitHistoryServiceImpl.java +++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/DocumentVisitHistoryServiceImpl.java @@ -30,7 +30,7 @@ public class DocumentVisitHistoryServiceImpl extends ServiceImpl().eq(DocumentVisitHistory::getUserId, userId) - .eq(DocumentVisitHistory::getDocumentId, documentId)); + .eq(DocumentVisitHistory::getDocumentId, documentId), false); if (Objects.isNull(one)) { DocumentVisitHistory documentVisitHistory = new DocumentVisitHistory(); documentVisitHistory.setUserId(userId); diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/ExperimentAnnealProcessServiceImpl.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/ExperimentAnnealProcessServiceImpl.java index 3b7c160..fdde4b9 100644 --- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/ExperimentAnnealProcessServiceImpl.java +++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/ExperimentAnnealProcessServiceImpl.java @@ -19,6 +19,6 @@ public class ExperimentAnnealProcessServiceImpl extends ServiceImpl().eq(ExperimentAnnealProcess::getExperimentId, experimentId)); + return getOne(new LambdaQueryWrapper().eq(ExperimentAnnealProcess::getExperimentId, experimentId),false); } } diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/ExperimentRadiationProcessServiceImpl.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/ExperimentRadiationProcessServiceImpl.java index 36a0b0a..dbe9e79 100644 --- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/ExperimentRadiationProcessServiceImpl.java +++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/ExperimentRadiationProcessServiceImpl.java @@ -19,6 +19,6 @@ public class ExperimentRadiationProcessServiceImpl extends ServiceImpl().eq(ExperimentRadiationProcess::getExperimentId, experimentId)); + return getOne(new LambdaQueryWrapper().eq(ExperimentRadiationProcess::getExperimentId, experimentId),false); } } diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/ExperimentReportServiceImpl.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/ExperimentReportServiceImpl.java index 45843d4..205d1cd 100644 --- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/ExperimentReportServiceImpl.java +++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/ExperimentReportServiceImpl.java @@ -19,6 +19,6 @@ public class ExperimentReportServiceImpl extends ServiceImpl().eq(ExperimentReport::getExperimentId, experimentId)); + return getOne(new LambdaQueryWrapper().eq(ExperimentReport::getExperimentId, experimentId),false); } } diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/ExperimentReviewServiceImpl.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/ExperimentReviewServiceImpl.java index 2202434..8f14878 100644 --- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/ExperimentReviewServiceImpl.java +++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/ExperimentReviewServiceImpl.java @@ -19,6 +19,6 @@ public class ExperimentReviewServiceImpl extends ServiceImpl().eq(ExperimentReview::getExperimentId, experimentId)); + return getOne(new LambdaQueryWrapper().eq(ExperimentReview::getExperimentId, experimentId),false); } } diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/ExperimentTestProcessServiceImpl.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/ExperimentTestProcessServiceImpl.java index a3d0243..c8818ae 100644 --- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/ExperimentTestProcessServiceImpl.java +++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/ExperimentTestProcessServiceImpl.java @@ -19,6 +19,6 @@ public class ExperimentTestProcessServiceImpl extends ServiceImpl().eq(ExperimentTestProcess::getExperimentId, experimentId)); + return getOne(new LambdaQueryWrapper().eq(ExperimentTestProcess::getExperimentId, experimentId),false); } }