diff --git a/src/main/java/com/example/caseData/dto/caseClinicalArticle/CaseClinicalArticleDto.java b/src/main/java/com/example/caseData/dto/caseClinicalArticle/CaseClinicalArticleDto.java index 53a858d..52b59bc 100644 --- a/src/main/java/com/example/caseData/dto/caseClinicalArticle/CaseClinicalArticleDto.java +++ b/src/main/java/com/example/caseData/dto/caseClinicalArticle/CaseClinicalArticleDto.java @@ -2,6 +2,8 @@ package com.example.caseData.dto.caseClinicalArticle; import cn.hutool.core.bean.BeanUtil; import com.example.caseData.dto.caseClinicalArticleAuthor.CaseClinicalArticleAuthorDto; +import com.example.caseData.dto.caseClinicalArticleLabel.CaseClinicalArticleLabelDto; +import com.example.caseData.model.CaseClinicalArticleLabelModel; import com.example.caseData.model.CaseClinicalArticleModel; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.Data; @@ -43,6 +45,12 @@ public class CaseClinicalArticleDto { @JsonProperty("collect_num") private Integer collectNum; + /** + * 评论量 + */ + @JsonProperty("comment_num") + private Integer commentNum; + /** * 发表时间 */ @@ -73,6 +81,12 @@ public class CaseClinicalArticleDto { @JsonProperty("author") private List author; + /** + * 标签 + */ + @JsonProperty("label") + private List label; + /** * 收藏状态 */ @@ -102,6 +116,12 @@ public class CaseClinicalArticleDto { dto.setAuthor(caseClinicalArticleAuthorListDto); } + // 标签 + if (model.getLabel() != null && !model.getLabel().isEmpty()) { + List caseClinicalArticleLabelListDto = CaseClinicalArticleLabelDto.GetListDto(model.getLabel()); + dto.setLabel(caseClinicalArticleLabelListDto); + } + dto.setArticleContent(""); return dto; }) @@ -129,6 +149,12 @@ public class CaseClinicalArticleDto { dto.setAuthor(caseClinicalArticleAuthorListDto); } + // 标签 + if (model.getLabel() != null && !model.getLabel().isEmpty()) { + List caseClinicalArticleLabelListDto = CaseClinicalArticleLabelDto.GetListDto(model.getLabel()); + dto.setLabel(caseClinicalArticleLabelListDto); + } + return dto; } } diff --git a/src/main/java/com/example/caseData/dto/caseClinicalArticleLabel/CaseClinicalArticleLabelDto.java b/src/main/java/com/example/caseData/dto/caseClinicalArticleLabel/CaseClinicalArticleLabelDto.java index a0fafca..66cc3e3 100644 --- a/src/main/java/com/example/caseData/dto/caseClinicalArticleLabel/CaseClinicalArticleLabelDto.java +++ b/src/main/java/com/example/caseData/dto/caseClinicalArticleLabel/CaseClinicalArticleLabelDto.java @@ -1,8 +1,14 @@ package com.example.caseData.dto.caseClinicalArticleLabel; +import cn.hutool.core.bean.BeanUtil; +import com.example.caseData.dto.caseClinicalDoctor.CaseClinicalDoctorDto; +import com.example.caseData.model.CaseClinicalArticleLabelModel; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.Data; import java.time.LocalDateTime; +import java.util.Collections; +import java.util.List; +import java.util.stream.Collectors; @Data public class CaseClinicalArticleLabelDto { @@ -10,13 +16,13 @@ public class CaseClinicalArticleLabelDto { * 主键id */ @JsonProperty("article_label_id") - private Long articleLabelId; + private String articleLabelId; /** * 临床文章id */ @JsonProperty("article_id") - private Long articleId; + private String articleId; /** * app唯一标识 @@ -41,4 +47,26 @@ public class CaseClinicalArticleLabelDto { */ @JsonProperty("updated_at") private LocalDateTime updatedAt; + + /** + * 列表 + */ + public static List GetListDto(List models) { + if (models == null || models.isEmpty()) { + return Collections.emptyList(); + } + + return models.stream() + .map(model -> { + CaseClinicalArticleLabelDto dto = BeanUtil.copyProperties(model, CaseClinicalArticleLabelDto.class); + + // 示例:手动处理字段类型不一致 + if (model.getArticleLabelId() != null) { + dto.setArticleLabelId(String.valueOf(model.getArticleLabelId())); // Long -> String + } + + return dto; + }) + .collect(Collectors.toList()); + } } \ No newline at end of file diff --git a/src/main/java/com/example/caseData/model/CaseClinicalArticleModel.java b/src/main/java/com/example/caseData/model/CaseClinicalArticleModel.java index 4130cfd..0584b41 100644 --- a/src/main/java/com/example/caseData/model/CaseClinicalArticleModel.java +++ b/src/main/java/com/example/caseData/model/CaseClinicalArticleModel.java @@ -37,6 +37,12 @@ public class CaseClinicalArticleModel { @TableField("collect_num") private Integer collectNum; + /** + * 评论量 + */ + @TableField("comment_num") + private Integer commentNum; + /** * 发表时间 */ @@ -66,4 +72,8 @@ public class CaseClinicalArticleModel { // 作者 @TableField(exist = false) private List author; + + // 标签 + @TableField(exist = false) + private List label; } diff --git a/src/main/java/com/example/caseData/model/CaseClinicalVideoModel.java b/src/main/java/com/example/caseData/model/CaseClinicalVideoModel.java index e6084b9..b8c3ee4 100644 --- a/src/main/java/com/example/caseData/model/CaseClinicalVideoModel.java +++ b/src/main/java/com/example/caseData/model/CaseClinicalVideoModel.java @@ -40,6 +40,12 @@ public class CaseClinicalVideoModel { @TableField("collect_num") private Integer collectNum; + /** + * 评论量 + */ + @TableField("comment_num") + private Integer commentNum; + /** * 视频编号(保利) */ diff --git a/src/main/java/com/example/caseData/model/CaseExchangeModel.java b/src/main/java/com/example/caseData/model/CaseExchangeModel.java index 7436e65..6c145ca 100644 --- a/src/main/java/com/example/caseData/model/CaseExchangeModel.java +++ b/src/main/java/com/example/caseData/model/CaseExchangeModel.java @@ -49,6 +49,12 @@ public class CaseExchangeModel { @TableField("collect_num") private Integer collectNum; + /** + * 评论量 + */ + @TableField("comment_num") + private Integer commentNum; + /** * 发表时间 */ diff --git a/src/main/java/com/example/caseData/model/StatsCaseClinicalDoctorModel.java b/src/main/java/com/example/caseData/model/StatsCaseClinicalDoctorModel.java index 71918f1..54baa9a 100644 --- a/src/main/java/com/example/caseData/model/StatsCaseClinicalDoctorModel.java +++ b/src/main/java/com/example/caseData/model/StatsCaseClinicalDoctorModel.java @@ -42,6 +42,12 @@ public class StatsCaseClinicalDoctorModel { @TableField("article_collect_num") private Integer articleCollectNum; + /** + * 总评论量-文章 + */ + @TableField("article_comment_num") + private Integer articleCommentNum; + /** * 数量-视频 */ @@ -60,6 +66,12 @@ public class StatsCaseClinicalDoctorModel { @TableField("video_collect_num") private Integer videoCollectNum; + /** + * 总评论量-视频 + */ + @TableField("video_comment_num") + private Integer VideoCommentNum; + /** * 创建时间 */ diff --git a/src/main/java/com/example/caseData/model/StatsCaseClinicalHospitalModel.java b/src/main/java/com/example/caseData/model/StatsCaseClinicalHospitalModel.java index a5f4d5f..4a615ea 100644 --- a/src/main/java/com/example/caseData/model/StatsCaseClinicalHospitalModel.java +++ b/src/main/java/com/example/caseData/model/StatsCaseClinicalHospitalModel.java @@ -39,6 +39,12 @@ public class StatsCaseClinicalHospitalModel { @TableField("article_collect_num") private Integer articleCollectNum; + /** + * 总评论量-文章 + */ + @TableField("article_comment_num") + private Integer articleCommentNum; + /** * 最后一篇文章发表时间 */ @@ -63,6 +69,12 @@ public class StatsCaseClinicalHospitalModel { @TableField("video_collect_num") private Integer videoCollectNum; + /** + * 总评论量-视频 + */ + @TableField("video_comment_num") + private Integer VideoCommentNum; + /** * 创建时间 */ diff --git a/src/main/java/com/example/caseData/model/StatsCaseClinicalModel.java b/src/main/java/com/example/caseData/model/StatsCaseClinicalModel.java index c7d4865..6a97f89 100644 --- a/src/main/java/com/example/caseData/model/StatsCaseClinicalModel.java +++ b/src/main/java/com/example/caseData/model/StatsCaseClinicalModel.java @@ -33,6 +33,12 @@ public class StatsCaseClinicalModel { @TableField("article_collect_num") private Integer articleCollectNum; + /** + * 总评论量-文章 + */ + @TableField("article_comment_num") + private Integer articleCommentNum; + /** * 数量-视频 */ @@ -51,6 +57,12 @@ public class StatsCaseClinicalModel { @TableField("video_collect_num") private Integer videoCollectNum; + /** + * 总评论量-视频 + */ + @TableField("video_comment_num") + private Integer VideoCommentNum; + /** * 创建时间 */ diff --git a/src/main/java/com/example/caseData/model/StatsCaseExchangeModel.java b/src/main/java/com/example/caseData/model/StatsCaseExchangeModel.java index 4dca610..d1a1548 100644 --- a/src/main/java/com/example/caseData/model/StatsCaseExchangeModel.java +++ b/src/main/java/com/example/caseData/model/StatsCaseExchangeModel.java @@ -36,6 +36,12 @@ public class StatsCaseExchangeModel { @TableField("exchange_collect_num") private Integer exchangeCollectNum; + /** + * 总评论量-病例交流 + */ + @TableField("exchange_comment_num") + private Integer exchangeCommentNum; + /** * 创建时间 */ diff --git a/src/main/java/com/example/caseData/model/StatsCaseExchangeUserModel.java b/src/main/java/com/example/caseData/model/StatsCaseExchangeUserModel.java index fdb48bf..0e852a5 100644 --- a/src/main/java/com/example/caseData/model/StatsCaseExchangeUserModel.java +++ b/src/main/java/com/example/caseData/model/StatsCaseExchangeUserModel.java @@ -42,6 +42,12 @@ public class StatsCaseExchangeUserModel { @TableField("exchange_collect_num") private Integer exchangeCollectNum; + /** + * 总评论量-病例交流 + */ + @TableField("exchange_comment_num") + private Integer exchangeCommentNum; + /** * 创建时间 */ diff --git a/src/main/java/com/example/caseData/service/IndexService.java b/src/main/java/com/example/caseData/service/IndexService.java index f8019c4..a4bfde6 100644 --- a/src/main/java/com/example/caseData/service/IndexService.java +++ b/src/main/java/com/example/caseData/service/IndexService.java @@ -38,6 +38,9 @@ public class IndexService { @Resource private BasicHospitalDao basicHospitalDao; + @Resource + private CaseClinicalArticleLabelDao caseClinicalArticleLabelDao; + /** * 获取首页数据-临床病例库 */ @@ -65,6 +68,12 @@ public class IndexService { } article.setAuthor(caseClinicalArticleAuthors); + + // 查找标签 + LambdaQueryWrapper labelQueryWrapper = new LambdaQueryWrapper<>(); + labelQueryWrapper.eq(CaseClinicalArticleLabelModel::getArticleId, article.getArticleId()); + List caseClinicalArticleLabels = caseClinicalArticleLabelDao.selectList(labelQueryWrapper); + article.setLabel(caseClinicalArticleLabels); } @@ -92,6 +101,12 @@ public class IndexService { article.setAuthor(caseClinicalArticleAuthors); + // 查找标签 + LambdaQueryWrapper labelQueryWrapper = new LambdaQueryWrapper<>(); + labelQueryWrapper.eq(CaseClinicalArticleLabelModel::getArticleId, article.getArticleId()); + List caseClinicalArticleLabels = caseClinicalArticleLabelDao.selectList(labelQueryWrapper); + article.setLabel(caseClinicalArticleLabels); + // 删除内容字段 article.setArticleContent(""); }