From 6c4d7a90f8eb2718e1bbf755e8fa6475f968489c Mon Sep 17 00:00:00 2001 From: wucongxing8150 <815046773@qq.com> Date: Tue, 10 Jun 2025 09:59:11 +0800 Subject: [PATCH] 111 --- .../CaseClinicalArticleController.java | 4 ++++ .../CaseClinicalVideoController.java | 4 ++++ .../controller/CaseExchangeController.java | 3 +++ .../UserCommentClinicalArticleDto.java | 6 ++++++ .../UserCommentClinicalVideoDto.java | 6 ++++++ .../service/CaseClinicalArticleService.java | 2 +- .../service/CaseClinicalVideoService.java | 2 +- .../caseData/service/CaseExchangeService.java | 2 +- .../com/example/caseData/utils/Replace.java | 18 ++++++++++++++++++ .../mapper/StatsCaseClinicalHospitalMapper.xml | 2 +- 10 files changed, 45 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/example/caseData/controller/CaseClinicalArticleController.java b/src/main/java/com/example/caseData/controller/CaseClinicalArticleController.java index 10a022d..6eb4f2b 100644 --- a/src/main/java/com/example/caseData/controller/CaseClinicalArticleController.java +++ b/src/main/java/com/example/caseData/controller/CaseClinicalArticleController.java @@ -21,6 +21,7 @@ import com.example.caseData.request.caseExchangeRequest.getUserCaseExchangeComme import com.example.caseData.request.clinicalRequest.getClinicalArticleSearchPage; import com.example.caseData.service.CaseClinicalArticleService; import com.example.caseData.utils.IntToString; +import com.example.caseData.utils.Replace; import jakarta.annotation.Resource; import jakarta.servlet.http.HttpServletRequest; import org.springframework.validation.annotation.Validated; @@ -317,6 +318,9 @@ public class CaseClinicalArticleController { // 去除用户唯一标识 dto.setUserIden(null); + // 图片 + dto.setCommentImage(Replace.addOssDomain(dto.getCommentImage())); + // 获取次级评论 if (request.getIsHaveSubComment() == 1){ if (dto.getRootId() == null){ diff --git a/src/main/java/com/example/caseData/controller/CaseClinicalVideoController.java b/src/main/java/com/example/caseData/controller/CaseClinicalVideoController.java index 9cb14a5..282cec6 100644 --- a/src/main/java/com/example/caseData/controller/CaseClinicalVideoController.java +++ b/src/main/java/com/example/caseData/controller/CaseClinicalVideoController.java @@ -18,6 +18,7 @@ import com.example.caseData.request.CaseClinicalVideoRequest.addClinicalVideoCom import com.example.caseData.request.CaseClinicalVideoRequest.getClinicalVideoCommentPage; import com.example.caseData.service.CaseClinicalVideoService; import com.example.caseData.service.CaseClinicalVideoService; +import com.example.caseData.utils.Replace; import jakarta.annotation.Resource; import jakarta.servlet.http.HttpServletRequest; import org.springframework.validation.annotation.Validated; @@ -313,6 +314,9 @@ public class CaseClinicalVideoController { // 去除用户唯一标识 dto.setUserIden(null); + // 图片 + dto.setCommentImage(Replace.addOssDomain(dto.getCommentImage())); + // 获取次级评论 if (request.getIsHaveSubComment() == 1){ if (dto.getRootId() == null){ diff --git a/src/main/java/com/example/caseData/controller/CaseExchangeController.java b/src/main/java/com/example/caseData/controller/CaseExchangeController.java index 2398291..d43a21f 100644 --- a/src/main/java/com/example/caseData/controller/CaseExchangeController.java +++ b/src/main/java/com/example/caseData/controller/CaseExchangeController.java @@ -582,6 +582,9 @@ public class CaseExchangeController { // 去除用户唯一标识 dto.setUserIden(null); + // 图片 + dto.setCommentImage(Replace.addOssDomain(dto.getCommentImage())); + // 获取次级评论 if (request.getIsHaveSubComment() == 1){ if (dto.getRootId() == null){ diff --git a/src/main/java/com/example/caseData/dto/userCommentClinicalArticle/UserCommentClinicalArticleDto.java b/src/main/java/com/example/caseData/dto/userCommentClinicalArticle/UserCommentClinicalArticleDto.java index 1c7755c..353c0c3 100644 --- a/src/main/java/com/example/caseData/dto/userCommentClinicalArticle/UserCommentClinicalArticleDto.java +++ b/src/main/java/com/example/caseData/dto/userCommentClinicalArticle/UserCommentClinicalArticleDto.java @@ -75,6 +75,12 @@ public class UserCommentClinicalArticleDto { @JsonProperty("content_word") private String contentWord; + /** + * 评论图片 + */ + @JsonProperty("comment_image") + private String commentImage; + /** * 创建时间 */ diff --git a/src/main/java/com/example/caseData/dto/userCommentClinicalVideo/UserCommentClinicalVideoDto.java b/src/main/java/com/example/caseData/dto/userCommentClinicalVideo/UserCommentClinicalVideoDto.java index b2fc9d4..66e631c 100644 --- a/src/main/java/com/example/caseData/dto/userCommentClinicalVideo/UserCommentClinicalVideoDto.java +++ b/src/main/java/com/example/caseData/dto/userCommentClinicalVideo/UserCommentClinicalVideoDto.java @@ -76,6 +76,12 @@ public class UserCommentClinicalVideoDto { @JsonProperty("content_word") private String contentWord; + /** + * 评论图片 + */ + @JsonProperty("comment_image") + private String commentImage; + /** * 创建时间 */ diff --git a/src/main/java/com/example/caseData/service/CaseClinicalArticleService.java b/src/main/java/com/example/caseData/service/CaseClinicalArticleService.java index 3d16a25..8fc96ca 100644 --- a/src/main/java/com/example/caseData/service/CaseClinicalArticleService.java +++ b/src/main/java/com/example/caseData/service/CaseClinicalArticleService.java @@ -179,7 +179,7 @@ public class CaseClinicalArticleService { userCommentClinicalArticleData.setStatus(1); userCommentClinicalArticleData.setIsSensitive(0); userCommentClinicalArticleData.setContent(request.getContent()); - userCommentClinicalArticleData.setCommentImage(Replace.addOssDomain(request.getCommentImage())); + userCommentClinicalArticleData.setCommentImage(Replace.removeOssDomain(request.getCommentImage())); // 评论根id if (request.getRootId() != null) { diff --git a/src/main/java/com/example/caseData/service/CaseClinicalVideoService.java b/src/main/java/com/example/caseData/service/CaseClinicalVideoService.java index 4de1245..a73de66 100644 --- a/src/main/java/com/example/caseData/service/CaseClinicalVideoService.java +++ b/src/main/java/com/example/caseData/service/CaseClinicalVideoService.java @@ -173,7 +173,7 @@ public class CaseClinicalVideoService { userCommentClinicalVideoData.setStatus(1); userCommentClinicalVideoData.setIsSensitive(0); userCommentClinicalVideoData.setContent(request.getContent()); - userCommentClinicalVideoData.setCommentImage(Replace.addOssDomain(request.getCommentImage())); + userCommentClinicalVideoData.setCommentImage(Replace.removeOssDomain(request.getCommentImage())); // 评论根id if (request.getRootId() != null) { diff --git a/src/main/java/com/example/caseData/service/CaseExchangeService.java b/src/main/java/com/example/caseData/service/CaseExchangeService.java index a6ccfa9..80bb768 100644 --- a/src/main/java/com/example/caseData/service/CaseExchangeService.java +++ b/src/main/java/com/example/caseData/service/CaseExchangeService.java @@ -279,7 +279,7 @@ public class CaseExchangeService { userCommentExchangeData.setStatus(1); userCommentExchangeData.setIsSensitive(0); userCommentExchangeData.setContent(request.getContent()); - userCommentExchangeData.setCommentImage(Replace.addOssDomain(request.getCommentImage())); + userCommentExchangeData.setCommentImage(Replace.removeOssDomain(request.getCommentImage())); // 评论根id if (request.getRootId() != null) { diff --git a/src/main/java/com/example/caseData/utils/Replace.java b/src/main/java/com/example/caseData/utils/Replace.java index cd89750..a76e3a7 100644 --- a/src/main/java/com/example/caseData/utils/Replace.java +++ b/src/main/java/com/example/caseData/utils/Replace.java @@ -27,4 +27,22 @@ public class Replace { } return ossConfig.getCustomDomainName() + url; } + + /** + * 去除OSS地址中的域名前缀 + * @param url 可能包含域名的完整URL + * @return 去除了域名后的相对路径，如果未匹配则返回原字符串 + */ + public static String removeOssDomain(String url) { + if (url == null || url.isEmpty()) { + return ""; + } + + String customDomain = ossConfig.getCustomDomainName(); + if (customDomain != null && url.startsWith(customDomain)) { + return url.substring(customDomain.length()); + } + + return url; + } } diff --git a/src/main/resources/mapper/StatsCaseClinicalHospitalMapper.xml b/src/main/resources/mapper/StatsCaseClinicalHospitalMapper.xml index d41b79a..d7febac 100644 --- a/src/main/resources/mapper/StatsCaseClinicalHospitalMapper.xml +++ b/src/main/resources/mapper/StatsCaseClinicalHospitalMapper.xml @@ -31,7 +31,7 @@ LEFT JOIN basic_hospital b ON a.hospital_id = b.hospital_id WHERE b.source = 2 - AND b.hospital_name LIKE CONCAT('%', #{hospitalName}, '%') + AND b.hospital_name LIKE CONCAT('%', #{hospital_name}, '%') ORDER BY