修正删除
This commit is contained in:
@@ -43,21 +43,13 @@ public interface ResourceRecommendService {
|
|||||||
ResultDomain<TbResourceRecommend> updateRecommend(TbResourceRecommend recommend);
|
ResultDomain<TbResourceRecommend> updateRecommend(TbResourceRecommend recommend);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @description 删除推荐资源
|
* @description 删除推荐记录
|
||||||
* @param resourceID 资源ID
|
* @param recommendID 推荐记录ID
|
||||||
* @return ResultDomain<Boolean> 删除结果
|
* @return ResultDomain<Boolean> 删除结果
|
||||||
* @author yslg
|
* @author yslg
|
||||||
* @since 2025-10-15
|
* @since 2025-10-15
|
||||||
*/
|
*/
|
||||||
ResultDomain<Boolean> deleteRecommend(String resourceID);
|
ResultDomain<Boolean> deleteRecommend(String recommendID);
|
||||||
/**
|
|
||||||
* @description 移除推荐资源
|
|
||||||
* @param resourceID 资源ID
|
|
||||||
* @return ResultDomain<Boolean> 移除结果
|
|
||||||
* @author yslg
|
|
||||||
* @since 2025-10-15
|
|
||||||
*/
|
|
||||||
ResultDomain<Boolean> removeRecommend(String resourceID);
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @description 更新推荐排序
|
* @description 更新推荐排序
|
||||||
|
|||||||
@@ -162,31 +162,34 @@ public class NCResourceRecommendServiceImpl implements ResourceRecommendService
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
@Transactional(rollbackFor = Exception.class)
|
@Transactional(rollbackFor = Exception.class)
|
||||||
public ResultDomain<Boolean> deleteRecommend(String resourceID) {
|
public ResultDomain<Boolean> deleteRecommend(String recommendID) {
|
||||||
ResultDomain<Boolean> resultDomain = new ResultDomain<>();
|
ResultDomain<Boolean> resultDomain = new ResultDomain<>();
|
||||||
try {
|
try {
|
||||||
// 参数验证
|
if (!StringUtils.hasText(recommendID)) {
|
||||||
if (!StringUtils.hasText(resourceID)) {
|
resultDomain.fail("推荐ID不能为空");
|
||||||
resultDomain.fail("资源ID不能为空");
|
|
||||||
return resultDomain;
|
return resultDomain;
|
||||||
}
|
}
|
||||||
|
|
||||||
// 查询推荐
|
TbResourceRecommend recommend = resourceRecommendMapper.selectByRecommendId(recommendID);
|
||||||
List<TbResourceRecommend> recommendList = resourceRecommendMapper.selectByResourceId(resourceID);
|
if (recommend == null) {
|
||||||
if (recommendList == null || recommendList.isEmpty()) {
|
|
||||||
resultDomain.fail("推荐不存在");
|
resultDomain.fail("推荐不存在");
|
||||||
return resultDomain;
|
return resultDomain;
|
||||||
}
|
}
|
||||||
|
|
||||||
// 物理删除
|
String resourceID = recommend.getResourceID();
|
||||||
TbResourceRecommend recommend = recommendList.get(0);
|
|
||||||
int result = resourceRecommendMapper.deleteResourceRecommend(recommend);
|
int result = resourceRecommendMapper.deleteResourceRecommend(recommend);
|
||||||
if (result > 0) {
|
if (result > 0) {
|
||||||
logger.info("删除推荐成功: {}", resourceID);
|
logger.info("删除推荐成功,推荐ID: {}, 资源ID: {}", recommendID, resourceID);
|
||||||
TbResource resource = new TbResource();
|
|
||||||
resource.setResourceID(recommend.getResourceID());
|
List<TbResourceRecommend> remainingRecommends = resourceRecommendMapper.selectByResourceId(resourceID);
|
||||||
resource.setIsRecommend(false);
|
if (remainingRecommends == null || remainingRecommends.isEmpty()) {
|
||||||
resourceMapper.updateResource(resource);
|
TbResource resource = new TbResource();
|
||||||
|
resource.setResourceID(resourceID);
|
||||||
|
resource.setIsRecommend(false);
|
||||||
|
resourceMapper.updateResource(resource);
|
||||||
|
logger.info("资源无其他推荐,更新isRecommend为false: {}", resourceID);
|
||||||
|
}
|
||||||
|
|
||||||
resultDomain.success("删除推荐成功", true);
|
resultDomain.success("删除推荐成功", true);
|
||||||
return resultDomain;
|
return resultDomain;
|
||||||
} else {
|
} else {
|
||||||
@@ -200,12 +203,6 @@ public class NCResourceRecommendServiceImpl implements ResourceRecommendService
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
|
||||||
@Transactional(rollbackFor = Exception.class)
|
|
||||||
public ResultDomain<Boolean> removeRecommend(String resourceID) {
|
|
||||||
return deleteRecommend(resourceID);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@Transactional(rollbackFor = Exception.class)
|
@Transactional(rollbackFor = Exception.class)
|
||||||
public ResultDomain<TbResourceRecommend> batchAddRecommends(List<String> resourceIDs, Integer recommendType, String reason) {
|
public ResultDomain<TbResourceRecommend> batchAddRecommends(List<String> resourceIDs, Integer recommendType, String reason) {
|
||||||
|
|||||||
@@ -63,9 +63,7 @@ export const bannerApi = {
|
|||||||
* @returns Promise<ResultDomain<boolean>>
|
* @returns Promise<ResultDomain<boolean>>
|
||||||
*/
|
*/
|
||||||
async deleteBanner(banner: Banner): Promise<ResultDomain<boolean>> {
|
async deleteBanner(banner: Banner): Promise<ResultDomain<boolean>> {
|
||||||
const response = await api.delete<boolean>('/news/banners/banner', {
|
const response = await api.delete<boolean>('/news/banners/banner', banner);
|
||||||
data: banner
|
|
||||||
});
|
|
||||||
return response.data;
|
return response.data;
|
||||||
},
|
},
|
||||||
|
|
||||||
@@ -75,7 +73,7 @@ export const bannerApi = {
|
|||||||
* @returns Promise<ResultDomain<boolean>>
|
* @returns Promise<ResultDomain<boolean>>
|
||||||
*/
|
*/
|
||||||
async deleteBannerById(bannerID: string): Promise<ResultDomain<boolean>> {
|
async deleteBannerById(bannerID: string): Promise<ResultDomain<boolean>> {
|
||||||
return this.deleteBanner({ id: bannerID });
|
return this.deleteBanner({ bannerID: bannerID });
|
||||||
},
|
},
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
@@ -449,7 +449,7 @@ async function handleDelete(banner: Banner) {
|
|||||||
}
|
}
|
||||||
);
|
);
|
||||||
|
|
||||||
await bannerApi.deleteBannerById(banner.id!);
|
await bannerApi.deleteBannerById(banner.bannerID!);
|
||||||
ElMessage.success('删除成功');
|
ElMessage.success('删除成功');
|
||||||
await loadBanners();
|
await loadBanners();
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
|
|||||||
@@ -690,7 +690,7 @@ async function deleteRecommend(item: ResourceRecommendVO) {
|
|||||||
}
|
}
|
||||||
);
|
);
|
||||||
|
|
||||||
await resourceRecommendApi.deleteRecommend(item.resourceID!);
|
await resourceRecommendApi.deleteRecommend(item.id!);
|
||||||
ElMessage.success('删除成功');
|
ElMessage.success('删除成功');
|
||||||
await refreshCurrentTab();
|
await refreshCurrentTab();
|
||||||
} catch (error: any) {
|
} catch (error: any) {
|
||||||
|
|||||||
Reference in New Issue
Block a user