From 2e5a06f82547f5f20b38d3e6b14b619de922088b Mon Sep 17 00:00:00 2001 From: wucongxing8150 <815046773@qq.com> Date: Wed, 30 Jul 2025 17:00:28 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AF=84=E8=AE=BA=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CaseClinicalVideoController.java | 22 +++++++++++++++ .../controller/CaseExchangeController.java | 27 +++++++++++++++++++ .../UserCommentCaseExchangeDto.java | 12 +++++++++ .../UserCommentClinicalVideoDto.java | 12 +++++++++ .../mapper/UserCommentClinicalVideoMapper.xml | 6 +++-- .../mapper/UserCommentExchangeMapper.xml | 6 +++-- 6 files changed, 81 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/example/caseData/controller/CaseClinicalVideoController.java b/src/main/java/com/example/caseData/controller/CaseClinicalVideoController.java index 446ebf5..36fc018 100644 --- a/src/main/java/com/example/caseData/controller/CaseClinicalVideoController.java +++ b/src/main/java/com/example/caseData/controller/CaseClinicalVideoController.java @@ -318,9 +318,19 @@ public class CaseClinicalVideoController { // 处理返回值 for (UserCommentClinicalVideoDto dto : resultPage.getRecords()) { + // 查询医生 + LambdaQueryWrapper doctorQueryWrapper = new LambdaQueryWrapper<>(); + doctorQueryWrapper.eq(CaseClinicalDoctorModel::getDoctorIden, dto.getUserIden()); + CaseClinicalDoctorModel caseClinicalDoctor = caseClinicalDoctorDao.selectOne(doctorQueryWrapper); + if (caseClinicalDoctor != null) { + dto.setDoctorId(String.valueOf(caseClinicalDoctor.getDoctorId())); + } + // 去除用户唯一标识 dto.setUserIden(null); + dto.setAvatar(Replace.addOssDomain(dto.getAvatar())); + // 图片 dto.setCommentImage(Replace.addOssDomain(dto.getCommentImage())); @@ -333,6 +343,18 @@ public class CaseClinicalVideoController { 5 ); + for (UserCommentClinicalVideoDto subComment : subComments) { + // 查询医生 + doctorQueryWrapper = new LambdaQueryWrapper<>(); + doctorQueryWrapper.eq(CaseClinicalDoctorModel::getDoctorIden, subComment.getUserIden()); + caseClinicalDoctor = caseClinicalDoctorDao.selectOne(doctorQueryWrapper); + if (caseClinicalDoctor != null) { + subComment.setDoctorId(String.valueOf(caseClinicalDoctor.getDoctorId())); + } + + subComment.setAvatar(Replace.addOssDomain(subComment.getAvatar())); + } + dto.setSubComment(subComments); } } diff --git a/src/main/java/com/example/caseData/controller/CaseExchangeController.java b/src/main/java/com/example/caseData/controller/CaseExchangeController.java index 95132e4..b097a2b 100644 --- a/src/main/java/com/example/caseData/controller/CaseExchangeController.java +++ b/src/main/java/com/example/caseData/controller/CaseExchangeController.java @@ -12,6 +12,7 @@ import com.example.caseData.dto.caseExchangeVote.CaseExchangeVoteDto; import com.example.caseData.dto.caseExchangeVoteOption.CaseExchangeVoteOptionDto; import com.example.caseData.dto.userCommentCaseExchange.GetUserCaseExchangeCommentPageDto; import com.example.caseData.dto.userCommentCaseExchange.UserCommentCaseExchangeDto; +import com.example.caseData.dto.userCommentClinicalVideo.UserCommentClinicalVideoDto; import com.example.caseData.exception.BusinessException; import com.example.caseData.model.*; import com.example.caseData.request.caseExchangeRequest.*; @@ -62,6 +63,9 @@ public class CaseExchangeController { @Resource private UserCommentExchangeDao userCommentExchangeDao; + @Resource + private CaseClinicalDoctorDao caseClinicalDoctorDao; + /** * 临床病例库-病例交流-搜索 */ @@ -614,6 +618,17 @@ public class CaseExchangeController { // 处理返回值 for (UserCommentCaseExchangeDto dto : resultPage.getRecords()) { + // 查询医生 + LambdaQueryWrapper doctorQueryWrapper = new LambdaQueryWrapper<>(); + doctorQueryWrapper.eq(CaseClinicalDoctorModel::getDoctorIden, dto.getUserIden()); + CaseClinicalDoctorModel caseClinicalDoctor = caseClinicalDoctorDao.selectOne(doctorQueryWrapper); + if (caseClinicalDoctor != null) { + dto.setDoctorId(String.valueOf(caseClinicalDoctor.getDoctorId())); + } + + + dto.setAvatar(Replace.addOssDomain(dto.getAvatar())); + // 去除用户唯一标识 dto.setUserIden(null); @@ -629,6 +644,18 @@ public class CaseExchangeController { 5 ); + for (UserCommentCaseExchangeDto subComment : subComments) { + // 查询医生 + doctorQueryWrapper = new LambdaQueryWrapper<>(); + doctorQueryWrapper.eq(CaseClinicalDoctorModel::getDoctorIden, subComment.getUserIden()); + caseClinicalDoctor = caseClinicalDoctorDao.selectOne(doctorQueryWrapper); + if (caseClinicalDoctor != null) { + subComment.setDoctorId(String.valueOf(caseClinicalDoctor.getDoctorId())); + } + + subComment.setAvatar(Replace.addOssDomain(subComment.getAvatar())); + } + dto.setSubComment(subComments); } } diff --git a/src/main/java/com/example/caseData/dto/userCommentCaseExchange/UserCommentCaseExchangeDto.java b/src/main/java/com/example/caseData/dto/userCommentCaseExchange/UserCommentCaseExchangeDto.java index 864e9ef..a177d54 100644 --- a/src/main/java/com/example/caseData/dto/userCommentCaseExchange/UserCommentCaseExchangeDto.java +++ b/src/main/java/com/example/caseData/dto/userCommentCaseExchange/UserCommentCaseExchangeDto.java @@ -29,6 +29,12 @@ public class UserCommentCaseExchangeDto { @JsonProperty("exchange_id") private String exchangeId; + /** + * 医生id + */ + @JsonProperty("doctor_id") + private String doctorId; + /** * 父级id，一级评论为null */ @@ -103,6 +109,12 @@ public class UserCommentCaseExchangeDto { @JsonProperty("user_name") private String userName; + /** + * 用户头像 + */ + @JsonProperty("avatar") + private String avatar; + /** * 用户唯一标识 */ 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 66e631c..4e1d002 100644 --- a/src/main/java/com/example/caseData/dto/userCommentClinicalVideo/UserCommentClinicalVideoDto.java +++ b/src/main/java/com/example/caseData/dto/userCommentClinicalVideo/UserCommentClinicalVideoDto.java @@ -22,6 +22,12 @@ public class UserCommentClinicalVideoDto { @JsonProperty("user_id") private String userId; + /** + * 医生id + */ + @JsonProperty("doctor_id") + private String doctorId; + /** * 临床视频id */ @@ -102,6 +108,12 @@ public class UserCommentClinicalVideoDto { @JsonProperty("user_name") private String userName; + /** + * 用户头像 + */ + @JsonProperty("avatar") + private String avatar; + /** * 用户唯一标识 */ diff --git a/src/main/resources/mapper/UserCommentClinicalVideoMapper.xml b/src/main/resources/mapper/UserCommentClinicalVideoMapper.xml index 361b495..aad001f 100644 --- a/src/main/resources/mapper/UserCommentClinicalVideoMapper.xml +++ b/src/main/resources/mapper/UserCommentClinicalVideoMapper.xml @@ -5,7 +5,8 @@ SELECT a.*, b.user_name, - b.user_iden + b.user_iden, + b.avatar FROM user_comment_clinical_video a LEFT JOIN user b ON a.user_id = b.user_id WHERE a.status = 1 @@ -27,7 +28,8 @@ SELECT a.*, b.user_name, - b.user_iden + b.user_iden, + b.avatar FROM user_comment_clinical_video a LEFT JOIN user b ON a.user_id = b.user_id WHERE a.status = 1 diff --git a/src/main/resources/mapper/UserCommentExchangeMapper.xml b/src/main/resources/mapper/UserCommentExchangeMapper.xml index 88fc148..3978bda 100644 --- a/src/main/resources/mapper/UserCommentExchangeMapper.xml +++ b/src/main/resources/mapper/UserCommentExchangeMapper.xml @@ -6,7 +6,8 @@ SELECT a.*, b.user_name, - b.user_iden + b.user_iden, + b.avatar FROM user_comment_exchange a LEFT JOIN user b ON a.user_id = b.user_id WHERE a.status = 1 @@ -28,7 +29,8 @@ SELECT a.*, b.user_name, - b.user_iden + b.user_iden, + b.avatar FROM user_comment_exchange a LEFT JOIN user b ON a.user_id = b.user_id WHERE a.status = 1