diff --git a/src/main/java/com/example/caseData/controller/CaseClinicalArticleController.java b/src/main/java/com/example/caseData/controller/CaseClinicalArticleController.java index bb7616d..66087f5 100644 --- a/src/main/java/com/example/caseData/controller/CaseClinicalArticleController.java +++ b/src/main/java/com/example/caseData/controller/CaseClinicalArticleController.java @@ -79,13 +79,9 @@ public class CaseClinicalArticleController { return Response.error("非法文章"); } - // 删除状态 - if (article.getDeleteStatus() == 1){ - return Response.error(201,null,"该作品已被删除"); - } - - // 状态(1:正常 2:禁用) - if (article.getArticleStatus() == 2){ + // 检测作品状态 + boolean result = caseClinicalArticleService.checkClinicalArticleStatus(article); + if (!result){ return Response.error(201,null,"该作品已被删除"); } diff --git a/src/main/java/com/example/caseData/controller/CaseClinicalVideoController.java b/src/main/java/com/example/caseData/controller/CaseClinicalVideoController.java index 8fed4da..4db2336 100644 --- a/src/main/java/com/example/caseData/controller/CaseClinicalVideoController.java +++ b/src/main/java/com/example/caseData/controller/CaseClinicalVideoController.java @@ -69,13 +69,9 @@ public class CaseClinicalVideoController { return Response.error("非法视频"); } - // 删除状态 - if (video.getDeleteStatus() == 1){ - return Response.error(201,null,"该作品已被删除"); - } - - // 状态(1:正常 2:禁用) - if (video.getVideoStatus() == 2){ + // 检测作品状态 + boolean result = caseClinicalVideoService.checkClinicalVideoStatus(video); + if (!result){ return Response.error(201,null,"该作品已被删除"); } diff --git a/src/main/java/com/example/caseData/controller/CaseExchangeController.java b/src/main/java/com/example/caseData/controller/CaseExchangeController.java index f17d854..95132e4 100644 --- a/src/main/java/com/example/caseData/controller/CaseExchangeController.java +++ b/src/main/java/com/example/caseData/controller/CaseExchangeController.java @@ -157,13 +157,9 @@ public class CaseExchangeController { return Response.error(); } - // 删除状态 - if (caseExchange.getDeleteStatus() == 1){ - return Response.error(201,null,"该作品已被删除"); - } - - // 状态(1:正常 2:禁用) - if (caseExchange.getExchangeStatus() == 2){ + // 检测作品状态 + boolean result = caseExchangeService.checkCaseExchangeStatus(caseExchange); + if (!result){ return Response.error(201,null,"该作品已被删除"); } diff --git a/src/main/java/com/example/caseData/service/CaseClinicalArticleService.java b/src/main/java/com/example/caseData/service/CaseClinicalArticleService.java index e379468..95138d8 100644 --- a/src/main/java/com/example/caseData/service/CaseClinicalArticleService.java +++ b/src/main/java/com/example/caseData/service/CaseClinicalArticleService.java @@ -554,4 +554,21 @@ public class CaseClinicalArticleService { return true; } + + /** + * 检测作品状态 + */ + public boolean checkClinicalArticleStatus(CaseClinicalArticleModel caseClinicalArticle){ + // 删除状态 + if (caseClinicalArticle.getDeleteStatus() == 1){ + return false; + } + + // 状态(1:正常 2:禁用) + if (caseClinicalArticle.getArticleStatus() == 2){ + return false; + } + + return true; + } } diff --git a/src/main/java/com/example/caseData/service/CaseClinicalVideoService.java b/src/main/java/com/example/caseData/service/CaseClinicalVideoService.java index eb8ed16..9121b8c 100644 --- a/src/main/java/com/example/caseData/service/CaseClinicalVideoService.java +++ b/src/main/java/com/example/caseData/service/CaseClinicalVideoService.java @@ -497,4 +497,21 @@ public class CaseClinicalVideoService { return false; } } + + /** + * 检测作品状态 + */ + public boolean checkClinicalVideoStatus(CaseClinicalVideoModel caseClinicalVideo){ + // 删除状态 + if (caseClinicalVideo.getDeleteStatus() == 1){ + return false; + } + + // 状态(1:正常 2:禁用) + if (caseClinicalVideo.getVideoStatus() == 2){ + return false; + } + + return true; + } } diff --git a/src/main/java/com/example/caseData/service/CaseExchangeService.java b/src/main/java/com/example/caseData/service/CaseExchangeService.java index d822809..7a3b775 100644 --- a/src/main/java/com/example/caseData/service/CaseExchangeService.java +++ b/src/main/java/com/example/caseData/service/CaseExchangeService.java @@ -219,6 +219,12 @@ public class CaseExchangeService { throw new BusinessException("非法操作"); } + // 检测作品状态 + boolean result = checkCaseExchangeStatus(caseExchange); + if (!result){ + throw new BusinessException("非法操作"); + } + // 标签 if (r.getCaseExchangeLabel() != null && !r.getCaseExchangeLabel().isEmpty()){ for (updateCaseExchange.CaseExchangeLabelRequest caseExchangeLabelRequest : r.getCaseExchangeLabel()){ @@ -311,6 +317,10 @@ public class CaseExchangeService { throw new BusinessException("非法操作"); } + if (caseExchange.getDeleteStatus() == 1){ + return true; + } + // 修改病例交流删除状态 caseExchange.setDeleteStatus(1); caseExchangeDao.updateById(caseExchange); @@ -358,8 +368,6 @@ public class CaseExchangeService { return false; } - - // 检测用户是否已收藏过 UserCollectExchangeModel userCollectExchange = getUserCollectExchangeStatus(exchangeId,userId); if (userCollectExchange != null) {