From 62e6365d46347eb494ffc1be8b61f171c9b0a601 Mon Sep 17 00:00:00 2001 From: wangys <3401275564@qq.com> Date: Tue, 16 Dec 2025 17:30:42 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E5=88=A0=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../recommend/ResourceRecommendService.java | 14 ++----- .../impl/NCResourceRecommendServiceImpl.java | 37 +++++++++---------- schoolNewsWeb/src/apis/resource/banner.ts | 6 +-- .../manage/content/BannerManagementView.vue | 2 +- .../manage/content/ColumnManagementView.vue | 2 +- 5 files changed, 24 insertions(+), 37 deletions(-) diff --git a/schoolNewsServ/api/api-news/src/main/java/org/xyzh/api/news/recommend/ResourceRecommendService.java b/schoolNewsServ/api/api-news/src/main/java/org/xyzh/api/news/recommend/ResourceRecommendService.java index 9e8b3d5..38290f6 100644 --- a/schoolNewsServ/api/api-news/src/main/java/org/xyzh/api/news/recommend/ResourceRecommendService.java +++ b/schoolNewsServ/api/api-news/src/main/java/org/xyzh/api/news/recommend/ResourceRecommendService.java @@ -43,21 +43,13 @@ public interface ResourceRecommendService { ResultDomain updateRecommend(TbResourceRecommend recommend); /** - * @description 删除推荐资源 - * @param resourceID 资源ID + * @description 删除推荐记录 + * @param recommendID 推荐记录ID * @return ResultDomain 删除结果 * @author yslg * @since 2025-10-15 */ - ResultDomain deleteRecommend(String resourceID); - /** - * @description 移除推荐资源 - * @param resourceID 资源ID - * @return ResultDomain 移除结果 - * @author yslg - * @since 2025-10-15 - */ - ResultDomain removeRecommend(String resourceID); + ResultDomain deleteRecommend(String recommendID); /** * @description 更新推荐排序 diff --git a/schoolNewsServ/news/src/main/java/org/xyzh/news/service/impl/NCResourceRecommendServiceImpl.java b/schoolNewsServ/news/src/main/java/org/xyzh/news/service/impl/NCResourceRecommendServiceImpl.java index 4a6a19b..c0c5115 100644 --- a/schoolNewsServ/news/src/main/java/org/xyzh/news/service/impl/NCResourceRecommendServiceImpl.java +++ b/schoolNewsServ/news/src/main/java/org/xyzh/news/service/impl/NCResourceRecommendServiceImpl.java @@ -162,31 +162,34 @@ public class NCResourceRecommendServiceImpl implements ResourceRecommendService @Override @Transactional(rollbackFor = Exception.class) - public ResultDomain deleteRecommend(String resourceID) { + public ResultDomain deleteRecommend(String recommendID) { ResultDomain resultDomain = new ResultDomain<>(); try { - // 参数验证 - if (!StringUtils.hasText(resourceID)) { - resultDomain.fail("资源ID不能为空"); + if (!StringUtils.hasText(recommendID)) { + resultDomain.fail("推荐ID不能为空"); return resultDomain; } - // 查询推荐 - List recommendList = resourceRecommendMapper.selectByResourceId(resourceID); - if (recommendList == null || recommendList.isEmpty()) { + TbResourceRecommend recommend = resourceRecommendMapper.selectByRecommendId(recommendID); + if (recommend == null) { resultDomain.fail("推荐不存在"); return resultDomain; } - // 物理删除 - TbResourceRecommend recommend = recommendList.get(0); + String resourceID = recommend.getResourceID(); int result = resourceRecommendMapper.deleteResourceRecommend(recommend); if (result > 0) { - logger.info("删除推荐成功: {}", resourceID); - TbResource resource = new TbResource(); - resource.setResourceID(recommend.getResourceID()); - resource.setIsRecommend(false); - resourceMapper.updateResource(resource); + logger.info("删除推荐成功，推荐ID: {}, 资源ID: {}", recommendID, resourceID); + + List remainingRecommends = resourceRecommendMapper.selectByResourceId(resourceID); + if (remainingRecommends == null || remainingRecommends.isEmpty()) { + TbResource resource = new TbResource(); + resource.setResourceID(resourceID); + resource.setIsRecommend(false); + resourceMapper.updateResource(resource); + logger.info("资源无其他推荐，更新isRecommend为false: {}", resourceID); + } + resultDomain.success("删除推荐成功", true); return resultDomain; } else { @@ -200,12 +203,6 @@ public class NCResourceRecommendServiceImpl implements ResourceRecommendService } } - @Override - @Transactional(rollbackFor = Exception.class) - public ResultDomain removeRecommend(String resourceID) { - return deleteRecommend(resourceID); - } - @Override @Transactional(rollbackFor = Exception.class) public ResultDomain batchAddRecommends(List resourceIDs, Integer recommendType, String reason) { diff --git a/schoolNewsWeb/src/apis/resource/banner.ts b/schoolNewsWeb/src/apis/resource/banner.ts index f2d3c49..462b94f 100644 --- a/schoolNewsWeb/src/apis/resource/banner.ts +++ b/schoolNewsWeb/src/apis/resource/banner.ts @@ -63,9 +63,7 @@ export const bannerApi = { * @returns Promise> */ async deleteBanner(banner: Banner): Promise> { - const response = await api.delete('/news/banners/banner', { - data: banner - }); + const response = await api.delete('/news/banners/banner', banner); return response.data; }, @@ -75,7 +73,7 @@ export const bannerApi = { * @returns Promise> */ async deleteBannerById(bannerID: string): Promise> { - return this.deleteBanner({ id: bannerID }); + return this.deleteBanner({ bannerID: bannerID }); }, /** diff --git a/schoolNewsWeb/src/views/admin/manage/content/BannerManagementView.vue b/schoolNewsWeb/src/views/admin/manage/content/BannerManagementView.vue index 6945d4c..cba0c19 100644 --- a/schoolNewsWeb/src/views/admin/manage/content/BannerManagementView.vue +++ b/schoolNewsWeb/src/views/admin/manage/content/BannerManagementView.vue @@ -449,7 +449,7 @@ async function handleDelete(banner: Banner) { } ); - await bannerApi.deleteBannerById(banner.id!); + await bannerApi.deleteBannerById(banner.bannerID!); ElMessage.success('删除成功'); await loadBanners(); } catch (error) { diff --git a/schoolNewsWeb/src/views/admin/manage/content/ColumnManagementView.vue b/schoolNewsWeb/src/views/admin/manage/content/ColumnManagementView.vue index cd8e2a5..9594762 100644 --- a/schoolNewsWeb/src/views/admin/manage/content/ColumnManagementView.vue +++ b/schoolNewsWeb/src/views/admin/manage/content/ColumnManagementView.vue @@ -690,7 +690,7 @@ async function deleteRecommend(item: ResourceRecommendVO) { } ); - await resourceRecommendApi.deleteRecommend(item.resourceID!); + await resourceRecommendApi.deleteRecommend(item.id!); ElMessage.success('删除成功'); await refreshCurrentTab(); } catch (error: any) {