From c106bce7e225891bac9a008ded32c1ab249d98f8 Mon Sep 17 00:00:00 2001 From: wucongxing8150 <815046773@qq.com> Date: Wed, 21 May 2025 16:06:00 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=86=E6=90=9C=E7=B4=A2?= =?UTF-8?q?=EF=BC=8C=E5=A2=9E=E5=8A=A0=E4=BA=86=E9=83=A8=E5=88=86=E8=AF=84?= =?UTF-8?q?=E8=AE=BA=E6=A8=A1=E5=9D=97=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CaseClinicalArticleCommentController.java | 127 ++++++++++++++ .../CaseClinicalArticleController.java | 35 ---- .../model/BasicSensitiveWordModel.java | 6 - .../UserCommentClinicalArticleModel.java | 12 +- .../model/UserCommentClinicalVideoModel.java | 12 +- .../addClinicalArticleComment.java | 25 +++ .../addClinicalArticleComment.java | 11 -- .../getClinicalArticleSearchPage.java | 5 + .../getClinicalVideoSearchPage.java | 5 + .../service/BasicSensitiveWordService.java | 133 +++++++++++++++ .../CaseClinicalArticleCommentService.java | 160 ++++++++++++++++++ .../service/CaseClinicalArticleService.java | 34 ++-- 12 files changed, 489 insertions(+), 76 deletions(-) create mode 100644 src/main/java/com/example/caseData/controller/CaseClinicalArticleCommentController.java create mode 100644 src/main/java/com/example/caseData/request/CaseClinicalArticleCommentRequest/addClinicalArticleComment.java delete mode 100644 src/main/java/com/example/caseData/request/clinicalRequest/addClinicalArticleComment.java create mode 100644 src/main/java/com/example/caseData/service/BasicSensitiveWordService.java create mode 100644 src/main/java/com/example/caseData/service/CaseClinicalArticleCommentService.java diff --git a/src/main/java/com/example/caseData/controller/CaseClinicalArticleCommentController.java b/src/main/java/com/example/caseData/controller/CaseClinicalArticleCommentController.java new file mode 100644 index 0000000..2da4da6 --- /dev/null +++ b/src/main/java/com/example/caseData/controller/CaseClinicalArticleCommentController.java @@ -0,0 +1,127 @@ +package com.example.caseData.controller; + +import com.example.caseData.common.Response; +import com.example.caseData.dao.*; +import com.example.caseData.dto.T; +import com.example.caseData.exception.BusinessException; +import com.example.caseData.request.CaseClinicalArticleCommentRequest.addClinicalArticleComment; +import com.example.caseData.service.CaseClinicalArticleCommentService; +import jakarta.annotation.Resource; +import jakarta.servlet.http.HttpServletRequest; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +@RestController +@RequestMapping("/api") +public class CaseClinicalArticleCommentController { + @Resource + private CaseClinicalArticleDao caseClinicalArticleDao; + + @Resource + private CaseClinicalArticleAuthorDao caseClinicalArticleAuthorDao; + + @Resource + private StatsCaseClinicalDoctorDao statsCaseClinicalDoctorDao; + + @Resource + private CaseClinicalDoctorDao caseClinicalDoctorDao; + + @Resource + private BasicHospitalDao basicHospitalDao; + + @Resource + private HttpServletRequest httpServletRequest; + + @Resource + private CaseClinicalArticleCommentService caseClinicalArticleCommentService; + + /** + * 临床病例库-文章-评论 + */ + @PostMapping("/clinical/article/comment/{article_id}") + public Response AddClinicalArticleComment( + @PathVariable("article_id") String articleId, + @Validated() + @RequestBody addClinicalArticleComment request + ) { + + String userId = (String) httpServletRequest.getAttribute("userId"); + + if (userId == null) { + return Response.error("操作失败"); + } + + try { + boolean res = caseClinicalArticleCommentService.AddClinicalArticleComment(articleId,userId,request); + if (!res){ + return Response.error("操作失败"); + } + } catch (BusinessException e) { + return Response.error(e.getMessage()); + } + + return Response.success(); + } + + /** + * 临床病例库-文章-评论-删除 + */ + @DeleteMapping("/clinical/article/comment/{comment_id}") + public Response DeleteClinicalArticleComment( + @PathVariable("comment_id") String commentId + ) { + + String userId = (String) httpServletRequest.getAttribute("userId"); + + if (userId == null) { + return Response.error("操作失败"); + } + + try { + boolean res = caseClinicalArticleCommentService.DeleteClinicalArticleComment(commentId,userId); + if (!res){ + return Response.error("操作失败"); + } + } catch (BusinessException e) { + return Response.error(e.getMessage()); + } + + return Response.success(); + } + + /** + * 临床病例库-文章-评论-置顶 + */ + @PutMapping("/clinical/article/comment/top/{article_id}") + public Response AddTopClinicalArticleComment( + @PathVariable("article_id") String articleId + ) { + + String userId = (String) httpServletRequest.getAttribute("userId"); + + if (userId == null) { + return Response.error("操作失败"); + } + + return Response.success(); + } + + /** + * 临床病例库-文章-评论-取消置顶 + */ + @DeleteMapping("/clinical/article/comment/top/{article_id}") + public Response deleteTopClinicalArticleComment( + @PathVariable("article_id") String articleId + ) { + + String userId = (String) httpServletRequest.getAttribute("userId"); + + if (userId == null) { + return Response.error("操作失败"); + } + + return Response.success(); + } + + // 临床病例库-文章-评论-列表 +} diff --git a/src/main/java/com/example/caseData/controller/CaseClinicalArticleController.java b/src/main/java/com/example/caseData/controller/CaseClinicalArticleController.java index 540663d..3335fc0 100644 --- a/src/main/java/com/example/caseData/controller/CaseClinicalArticleController.java +++ b/src/main/java/com/example/caseData/controller/CaseClinicalArticleController.java @@ -1,29 +1,17 @@ package com.example.caseData.controller; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.example.caseData.common.Response; import com.example.caseData.dao.*; import com.example.caseData.dto.T; -import com.example.caseData.dto.basicHospital.BasicHospitalDto; import com.example.caseData.dto.caseClinicalArticle.CaseClinicalArticleDto; -import com.example.caseData.dto.statsCaseClinicalHospital.StatsCaseClinicalHospitalDto; -import com.example.caseData.exception.BusinessException; import com.example.caseData.model.*; -import com.example.caseData.request.UserRequest; -import com.example.caseData.request.clinicalRequest.addClinicalArticleComment; -import com.example.caseData.request.clinicalRequest.getClinicalHospitalSearchPage; import com.example.caseData.service.CaseClinicalArticleService; -import com.example.caseData.service.UserService; import jakarta.annotation.Resource; import jakarta.servlet.http.HttpServletRequest; -import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; -import java.util.HashMap; import java.util.List; -import java.util.Map; @RestController @RequestMapping("/api") @@ -141,27 +129,4 @@ public class CaseClinicalArticleController { return Response.success(); } - - /** - * 临床病例库-文章-评论 - */ - @PostMapping("/clinical/article/comment/{article_id}") - public Response AddClinicalArticleComment( - @PathVariable("article_id") String articleId, - @Validated() addClinicalArticleComment request - ) { - - String userId = (String) httpServletRequest.getAttribute("userId"); - - if (userId == null) { - return Response.error("操作失败"); - } - - boolean res = caseClinicalArticleService.AddClinicalArticleComment(articleId,userId,request.getComment()); - if (!res){ - return Response.error("操作失败"); - } - - return Response.success(); - } } diff --git a/src/main/java/com/example/caseData/model/BasicSensitiveWordModel.java b/src/main/java/com/example/caseData/model/BasicSensitiveWordModel.java index 053289a..d9c1618 100644 --- a/src/main/java/com/example/caseData/model/BasicSensitiveWordModel.java +++ b/src/main/java/com/example/caseData/model/BasicSensitiveWordModel.java @@ -20,12 +20,6 @@ public class BasicSensitiveWordModel { @TableField("word") private String word; - /** - * 状态（0:禁用 1:正常） - */ - @TableField("status") - private Integer status; - /** * 创建时间 */ diff --git a/src/main/java/com/example/caseData/model/UserCommentClinicalArticleModel.java b/src/main/java/com/example/caseData/model/UserCommentClinicalArticleModel.java index 781f134..54c662a 100644 --- a/src/main/java/com/example/caseData/model/UserCommentClinicalArticleModel.java +++ b/src/main/java/com/example/caseData/model/UserCommentClinicalArticleModel.java @@ -51,10 +51,10 @@ public class UserCommentClinicalArticleModel { private Integer isSensitive; /** - * 是否优质留言（0:否 1:是） + * 是否置顶（0:否 1:是） */ - @TableField("is_high_quality") - private Integer isHighQuality; + @TableField("is_top") + private Integer isTop; /** * 点赞数量 @@ -74,6 +74,12 @@ public class UserCommentClinicalArticleModel { @TableField("content_word") private String contentWord; + /** + * 评论图片 + */ + @TableField("comment_image") + private String commentImage; + /** * 创建时间 */ diff --git a/src/main/java/com/example/caseData/model/UserCommentClinicalVideoModel.java b/src/main/java/com/example/caseData/model/UserCommentClinicalVideoModel.java index 64bd3fa..48f9585 100644 --- a/src/main/java/com/example/caseData/model/UserCommentClinicalVideoModel.java +++ b/src/main/java/com/example/caseData/model/UserCommentClinicalVideoModel.java @@ -51,10 +51,10 @@ public class UserCommentClinicalVideoModel { private Integer isSensitive; /** - * 是否优质留言（0:否 1:是） + * 是否置顶（0:否 1:是） */ - @TableField("is_high_quality") - private Integer isHighQuality; + @TableField("is_top") + private Integer isTop; /** * 点赞数量 @@ -74,6 +74,12 @@ public class UserCommentClinicalVideoModel { @TableField("content_word") private String contentWord; + /** + * 评论图片 + */ + @TableField("comment_image") + private String commentImage; + /** * 创建时间 */ diff --git a/src/main/java/com/example/caseData/request/CaseClinicalArticleCommentRequest/addClinicalArticleComment.java b/src/main/java/com/example/caseData/request/CaseClinicalArticleCommentRequest/addClinicalArticleComment.java new file mode 100644 index 0000000..1d4a952 --- /dev/null +++ b/src/main/java/com/example/caseData/request/CaseClinicalArticleCommentRequest/addClinicalArticleComment.java @@ -0,0 +1,25 @@ +package com.example.caseData.request.CaseClinicalArticleCommentRequest; + +import com.fasterxml.jackson.annotation.JsonProperty; +import jakarta.validation.constraints.NotEmpty; +import lombok.Data; + +@Data +public class addClinicalArticleComment { + // 父级 次级评论此字段必须存在 + @JsonProperty("parent_id") + private String parentId; + + // 根评论标识 次级评论此字段必须存在 + @JsonProperty("root_id") + private String rootId; + + // 评论内容 + @JsonProperty("content") + @NotEmpty(message = "请输入评论内容") + private String content; + + // 评论图片 + @JsonProperty("comment_image") + private String commentImage; +} diff --git a/src/main/java/com/example/caseData/request/clinicalRequest/addClinicalArticleComment.java b/src/main/java/com/example/caseData/request/clinicalRequest/addClinicalArticleComment.java deleted file mode 100644 index d170f52..0000000 --- a/src/main/java/com/example/caseData/request/clinicalRequest/addClinicalArticleComment.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.example.caseData.request.clinicalRequest; - -import com.fasterxml.jackson.annotation.JsonProperty; -import lombok.Data; - -@Data -public class addClinicalArticleComment { - // 评论内容 - @JsonProperty("comment") - private String comment; -} diff --git a/src/main/java/com/example/caseData/request/clinicalRequest/getClinicalArticleSearchPage.java b/src/main/java/com/example/caseData/request/clinicalRequest/getClinicalArticleSearchPage.java index a4f67ee..f202df4 100644 --- a/src/main/java/com/example/caseData/request/clinicalRequest/getClinicalArticleSearchPage.java +++ b/src/main/java/com/example/caseData/request/clinicalRequest/getClinicalArticleSearchPage.java @@ -41,8 +41,13 @@ public class getClinicalArticleSearchPage { */ @Data public static class OrderRequest { + @JsonProperty("created_at") private String createdAt; // 创建时间 + + @JsonProperty("read_num") private String readNum; // 阅读量 + + @JsonProperty("push_date") private String pushDate; // 发表时间 public Map toMap() { diff --git a/src/main/java/com/example/caseData/request/clinicalRequest/getClinicalVideoSearchPage.java b/src/main/java/com/example/caseData/request/clinicalRequest/getClinicalVideoSearchPage.java index e2a3a75..3c5dc51 100644 --- a/src/main/java/com/example/caseData/request/clinicalRequest/getClinicalVideoSearchPage.java +++ b/src/main/java/com/example/caseData/request/clinicalRequest/getClinicalVideoSearchPage.java @@ -41,8 +41,13 @@ public class getClinicalVideoSearchPage { */ @Data public static class OrderRequest { + @JsonProperty("created_at") private String createdAt; // 创建时间 + + @JsonProperty("read_num") private String readNum; // 阅读量 + + @JsonProperty("push_date") private String pushDate; // 发表时间 public Map toMap() { diff --git a/src/main/java/com/example/caseData/service/BasicSensitiveWordService.java b/src/main/java/com/example/caseData/service/BasicSensitiveWordService.java new file mode 100644 index 0000000..40d7421 --- /dev/null +++ b/src/main/java/com/example/caseData/service/BasicSensitiveWordService.java @@ -0,0 +1,133 @@ +package com.example.caseData.service; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.example.caseData.dao.BasicSensitiveWordDao; +import com.example.caseData.model.BasicSensitiveWordModel; +import com.example.caseData.model.CaseClinicalArticleModel; +import com.fasterxml.jackson.databind.ObjectMapper; +import jakarta.annotation.Resource; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.data.redis.core.RedisTemplate; +import org.springframework.data.redis.core.StringRedisTemplate; +import org.springframework.stereotype.Service; +import com.fasterxml.jackson.core.type.TypeReference; + +import java.time.Duration; +import java.util.*; +import java.util.concurrent.TimeUnit; +import java.util.stream.Collectors; + +@Service +public class BasicSensitiveWordService { + private static final String REDIS_SENSITIVE_WORD_KEY = "sensitive:word:list"; + private static final long REDIS_EXPIRE_MINUTES = 30; + + @Resource + private RedisTemplate redisTemplate; + + @Resource + private BasicSensitiveWordDao basicSensitiveWordDao; // 假设你有这个 DAO + + private final ObjectMapper objectMapper = new ObjectMapper(); + + // 主过滤方法 + public FilterResult filter(String comment) { + List wordList = loadSensitiveWords(); + if (wordList == null || wordList.isEmpty()) { + return new FilterResult(comment, 0); + } + + TrieNode root = buildTrie(wordList); + return doFilter(comment, root); + } + + // 加载敏感词（可替换为数据库查询） + private List loadSensitiveWords() { + List wordList = new ArrayList<>(); + + // 尝试从 Redis 获取 + String wordJson = redisTemplate.opsForValue().get(REDIS_SENSITIVE_WORD_KEY); + if (wordJson != null && !wordJson.isEmpty()) { + try { + // 反序列化 JSON 字符串为 List + wordList = objectMapper.readValue(wordJson, new TypeReference>() {}); + } catch (Exception e) { + return wordList; + } + }else{ + // Redis 无数据，则查询 DB + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + List basicSensitiveWords = basicSensitiveWordDao.selectList(queryWrapper); // 你自己的 DAO 方法 + if (basicSensitiveWords != null && !basicSensitiveWords.isEmpty()) { + wordList = basicSensitiveWords.stream() + .map(BasicSensitiveWordModel::getWord) + .filter(Objects::nonNull) + .collect(Collectors.toList()); + + try { + String wordListJson = objectMapper.writeValueAsString(wordList); + redisTemplate.opsForValue().set(REDIS_SENSITIVE_WORD_KEY, wordListJson, Duration.ofMinutes(REDIS_EXPIRE_MINUTES)); + } catch (Exception e) { + return wordList; + } + } + } + + return wordList; + } + + // 构建字典树 + private TrieNode buildTrie(List words) { + TrieNode root = new TrieNode(); + for (String word : words) { + TrieNode node = root; + for (char ch : word.toCharArray()) { + node.children.putIfAbsent(ch, new TrieNode()); + node = node.children.get(ch); + } + node.isEnd = true; + } + return root; + } + + // 实际过滤逻辑 + private FilterResult doFilter(String comment, TrieNode root) { + char[] chars = comment.toCharArray(); + int isSensitive = 0; + + for (int i = 0; i < chars.length; i++) { + TrieNode node = root; + int j = i; + while (j < chars.length && node.children.containsKey(chars[j])) { + node = node.children.get(chars[j]); + if (node.isEnd) { + for (int k = i; k <= j; k++) { + chars[k] = '*'; + } + isSensitive = 1; + break; + } + j++; + } + } + + return new FilterResult(new String(chars), isSensitive); + } + + // Trie 节点内部类 + private static class TrieNode { + boolean isEnd = false; + Map children = new HashMap<>(); + } + + // 返回结果封装 + public static class FilterResult { + public final String comment; + public final int hasSensitive; + + public FilterResult(String comment, int hasSensitive) { + this.comment = comment; + this.hasSensitive = hasSensitive; + } + } +} diff --git a/src/main/java/com/example/caseData/service/CaseClinicalArticleCommentService.java b/src/main/java/com/example/caseData/service/CaseClinicalArticleCommentService.java new file mode 100644 index 0000000..c7986f0 --- /dev/null +++ b/src/main/java/com/example/caseData/service/CaseClinicalArticleCommentService.java @@ -0,0 +1,160 @@ +package com.example.caseData.service; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.example.caseData.dao.*; +import com.example.caseData.exception.BusinessException; +import com.example.caseData.model.*; +import com.example.caseData.request.CaseClinicalArticleCommentRequest.addClinicalArticleComment; +import com.example.caseData.utils.Replace; +import jakarta.annotation.Resource; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; +import org.springframework.transaction.interceptor.TransactionAspectSupport; + +import java.util.List; +import java.util.Objects; + + +@Service +public class CaseClinicalArticleCommentService { + @Resource + private UserCollectClinicalArticleDao userCollectClinicalArticleDao; + + @Resource + private CaseClinicalArticleDao caseClinicalArticleDao; + + @Resource + private StatsCaseClinicalDao statsCaseClinicalDao; + + @Resource + private StatsCaseClinicalHospitalDao statsCaseClinicalHospitalDao; + + @Resource + private StatsCaseClinicalDoctorDao statsCaseClinicalDoctorDao; + + @Resource + private CaseClinicalArticleAuthorDao caseClinicalArticleAuthorDao; + + @Resource + private CaseClinicalDoctorDao caseClinicalDoctorDao; + + @Resource + private BasicSensitiveWordService basicSensitiveWordService; + + @Resource + private UserCommentClinicalArticleDao userCommentClinicalArticleDao; + + @Resource + private UserDao userDao; + + /** + * 新增评论-临床病例库-文章 + * @param articleId 文章id + * @param userId 用户id + * @return bool + */ + @Transactional + public boolean AddClinicalArticleComment(String articleId, String userId, addClinicalArticleComment request){ + // 获取文章数据 + CaseClinicalArticleModel article = caseClinicalArticleDao.selectById(articleId); + if (article == null) { + throw new BusinessException("非法文章"); + } + + if (article.getArticleStatus() != 1){ + throw new BusinessException("非法文章"); + } + + // 处理评论内容 + BasicSensitiveWordService.FilterResult result = basicSensitiveWordService.filter(request.getContent()); + + // 新增评论 + UserCommentClinicalArticleModel userCommentClinicalArticleData = new UserCommentClinicalArticleModel(); + userCommentClinicalArticleData.setUserId(Long.valueOf(userId)); + userCommentClinicalArticleData.setArticleId(Long.valueOf(articleId)); + userCommentClinicalArticleData.setStatus(1); + userCommentClinicalArticleData.setIsSensitive(result.hasSensitive); + userCommentClinicalArticleData.setContent(result.comment); + userCommentClinicalArticleData.setCommentImage(Replace.addOssDomain(request.getCommentImage())); + if (result.hasSensitive == 1){ + userCommentClinicalArticleData.setContentWord(request.getContent()); + } + + // 评论根id + if (request.getRootId() != null) { + userCommentClinicalArticleData.setRootId(Long.valueOf(request.getRootId())); + } + + // 评论父级id + if (request.getParentId() != null) { + userCommentClinicalArticleData.setParentId(Long.valueOf(request.getParentId())); + } + + int res = userCommentClinicalArticleDao.insert(userCommentClinicalArticleData); + return res > 0; + } + + /** + * 删除评论-临床病例库-文章 + * @param commentId 评论id + * @param userId 用户id + * @return bool + */ + @Transactional + public boolean DeleteClinicalArticleComment(String commentId, String userId){ + // 获取评论数据 + UserCommentClinicalArticleModel comment = userCommentClinicalArticleDao.selectById(commentId); + if (comment == null) { + return true; + } + + // 获取当前登录用户数据 + UserModel user = userDao.selectById(Long.valueOf(userId)); + if (user == null) { + throw new BusinessException("错误"); + } + + + // 获取文章数据 + CaseClinicalArticleModel article = caseClinicalArticleDao.selectById(comment.getArticleId()); + if (article == null) { + throw new BusinessException("删除失败"); + } + + if (article.getArticleStatus() != 1){ + throw new BusinessException("删除失败"); + } + + // 当前用户是否是作者之一 + boolean isAuthor = false; + + // 获取文章作者数据 + LambdaQueryWrapper authorQueryWrapper = new LambdaQueryWrapper<>(); + authorQueryWrapper.eq(CaseClinicalArticleAuthorModel::getArticleId, article.getArticleId()); + List caseClinicalArticleAuthors = caseClinicalArticleAuthorDao.selectList(authorQueryWrapper); + for (CaseClinicalArticleAuthorModel author : caseClinicalArticleAuthors) { + // 查询医生 + CaseClinicalDoctorModel caseClinicalDoctor = caseClinicalDoctorDao.selectById(author.getDoctorId()); + if (caseClinicalDoctor == null) { + throw new BusinessException("错误"); + } + + if (Objects.equals(caseClinicalDoctor.getDoctorIden(), user.getUserIden())){ + isAuthor = true; + } + } + + if (!isAuthor) { + throw new BusinessException("不可删除"); + } + + // 删除评论 + int res = userCommentClinicalArticleDao.deleteById(comment.getCommentId()); + if (res <= 0){ + TransactionAspectSupport.currentTransactionStatus().setRollbackOnly(); + return false; + } + + return true; + } +} diff --git a/src/main/java/com/example/caseData/service/CaseClinicalArticleService.java b/src/main/java/com/example/caseData/service/CaseClinicalArticleService.java index 5d1bff2..2268afd 100644 --- a/src/main/java/com/example/caseData/service/CaseClinicalArticleService.java +++ b/src/main/java/com/example/caseData/service/CaseClinicalArticleService.java @@ -2,10 +2,10 @@ package com.example.caseData.service; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.example.caseData.dao.*; -import com.example.caseData.model.CaseClinicalArticleAuthorModel; -import com.example.caseData.model.CaseClinicalDoctorModel; -import com.example.caseData.model.UserCollectClinicalArticleModel; -import com.example.caseData.model.UserModel; +import com.example.caseData.exception.BusinessException; +import com.example.caseData.model.*; +import com.example.caseData.request.CaseClinicalArticleCommentRequest.addClinicalArticleComment; +import com.example.caseData.utils.Replace; import jakarta.annotation.Resource; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -28,9 +28,6 @@ public class CaseClinicalArticleService { @Resource private StatsCaseClinicalDao statsCaseClinicalDao; - @Resource - private UserDao userDao; - @Resource private StatsCaseClinicalHospitalDao statsCaseClinicalHospitalDao; @@ -43,6 +40,12 @@ public class CaseClinicalArticleService { @Resource private CaseClinicalDoctorDao caseClinicalDoctorDao; + @Resource + private BasicSensitiveWordService basicSensitiveWordService; + + @Resource + private UserCommentClinicalArticleDao userCommentClinicalArticleDao; + /** * 新增收藏-临床病例库-文章 @@ -52,6 +55,12 @@ public class CaseClinicalArticleService { */ @Transactional public boolean AddClinicalArticleCollect(String articleId,String userId){ + // 获取文章数据 + CaseClinicalArticleModel article = caseClinicalArticleDao.selectById(articleId); + if (article == null) { + return false; + } + // 检测用户是否已收藏过 UserCollectClinicalArticleModel userCollectClinicalArticle = getUserCollectClinicalArticleStatus(articleId,userId); if (userCollectClinicalArticle != null) { @@ -136,17 +145,6 @@ public class CaseClinicalArticleService { return true; } - /** - * 新增评论-临床病例库-文章 - * @param articleId 文章id - * @param userId 用户id - * @return bool - */ - @Transactional - public boolean AddClinicalArticleComment(String articleId,String userId,String comment){ - return true; - } - /** * 获取用户收藏数据 * @param articleId 文章id