From 8509343e3c5b6f1953902414bb7d4468020d9f9f Mon Sep 17 00:00:00 2001 From: wucongxing8150 <815046773@qq.com> Date: Fri, 13 Jun 2025 16:58:10 +0800 Subject: [PATCH] 1111 --- .../controller/CaseExchangeController.java | 6 +-- .../controller/UserCaseReadController.java | 38 +++++++++++++++++-- .../CaseClinicalArticleDto.java | 12 ++++++ .../CaseClinicalVideoDto.java | 12 ++++++ .../caseExchangeVote/CaseExchangeVoteDto.java | 6 +++ .../model/CaseClinicalArticleModel.java | 12 ++++++ .../model/CaseClinicalVideoModel.java | 12 ++++++ .../request/publicRequest/LoginRequest.java | 6 +++ .../userCaseReadRequest/addUserCaseRead.java | 19 ++++++++++ 9 files changed, 116 insertions(+), 7 deletions(-) create mode 100644 src/main/java/com/example/caseData/request/userCaseReadRequest/addUserCaseRead.java diff --git a/src/main/java/com/example/caseData/controller/CaseExchangeController.java b/src/main/java/com/example/caseData/controller/CaseExchangeController.java index 9dde467..c990ee2 100644 --- a/src/main/java/com/example/caseData/controller/CaseExchangeController.java +++ b/src/main/java/com/example/caseData/controller/CaseExchangeController.java @@ -266,7 +266,7 @@ public class CaseExchangeController { UserVoteExchangeModel userVoteExchange = userVoteExchangeDao.selectOne(queryWrapper); if (userVoteExchange != null) { // 已投过票 - g.getCaseExchangeVote().setIsEnabled(0); + g.getCaseExchangeVote().setIsHaveVoted(1); } } @@ -671,12 +671,12 @@ public class CaseExchangeController { String userId = (String) httpServletRequest.getAttribute("userId"); if (userId == null) { - return Response.error("操作失败1"); + return Response.error("操作失败"); } boolean res = caseExchangeService.AddCaseExchangeVote(exchangeId,userId,r.getOptionId()); if (!res){ - return Response.error("操作失败2"); + return Response.error("操作失败"); } return Response.success(); diff --git a/src/main/java/com/example/caseData/controller/UserCaseReadController.java b/src/main/java/com/example/caseData/controller/UserCaseReadController.java index c8ccdc8..f44dd29 100644 --- a/src/main/java/com/example/caseData/controller/UserCaseReadController.java +++ b/src/main/java/com/example/caseData/controller/UserCaseReadController.java @@ -5,18 +5,19 @@ 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.userCaseRead.UserCaseReadDto; import com.example.caseData.dto.userCollectClinicalVideo.UserCollectClinicalVideoDto; import com.example.caseData.dto.userCollectExchange.UserCollectExchangeDto; +import com.example.caseData.exception.BusinessException; import com.example.caseData.model.*; +import com.example.caseData.request.caseExchangeRequest.addCaseExchangeComment; +import com.example.caseData.request.caseExchangeRequest.getCaseExchangeCommentPage; import com.example.caseData.request.userCaseReadRequest.getUserCaseReadSearchPage; import jakarta.annotation.Resource; import jakarta.servlet.http.HttpServletRequest; import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; import java.util.ArrayList; import java.util.HashMap; @@ -190,4 +191,33 @@ public class UserCaseReadController extends BaseController { return Response.success(resultMap); } + + + /** + * 浏览记录-新增 + */ + @PostMapping("/user/case/read") + public Response AddUserCaseRead( + @Validated() + @RequestBody addCaseExchangeComment request + ) { + + String userId = (String) httpServletRequest.getAttribute("userId"); + + if (userId == null) { + return Response.error("操作失败"); + } + +// try { +// boolean res = caseExchangeService.AddCaseExchangeComment(exchangeId,userId,request); +// if (!res){ +// return Response.error("操作失败"); +// } +// } catch (BusinessException e) { +// return Response.error(e.getMessage()); +// } + + return Response.success(); + } + } 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 a915dbd..91ab47e 100644 --- a/src/main/java/com/example/caseData/dto/caseClinicalArticle/CaseClinicalArticleDto.java +++ b/src/main/java/com/example/caseData/dto/caseClinicalArticle/CaseClinicalArticleDto.java @@ -64,6 +64,18 @@ public class CaseClinicalArticleDto { @JsonProperty("cert_image") private String certImage; + /** + * 是否外部链接（0:否 1:是） + */ + @JsonProperty("is_link") + private Integer isLink; + + /** + * 外部链接地址 + */ + @JsonProperty("is_link_url") + private String isLinkUrl; + /** * 内容 */ diff --git a/src/main/java/com/example/caseData/dto/caseClinicalVideo/CaseClinicalVideoDto.java b/src/main/java/com/example/caseData/dto/caseClinicalVideo/CaseClinicalVideoDto.java index cb83dba..f5e3dec 100644 --- a/src/main/java/com/example/caseData/dto/caseClinicalVideo/CaseClinicalVideoDto.java +++ b/src/main/java/com/example/caseData/dto/caseClinicalVideo/CaseClinicalVideoDto.java @@ -64,6 +64,18 @@ public class CaseClinicalVideoDto { @JsonProperty("cert_image") private String certImage; + /** + * 是否外部链接（0:否 1:是） + */ + @JsonProperty("is_link") + private Integer isLink; + + /** + * 外部链接地址 + */ + @JsonProperty("is_link_url") + private String isLinkUrl; + /** * 创建时间 */ diff --git a/src/main/java/com/example/caseData/dto/caseExchangeVote/CaseExchangeVoteDto.java b/src/main/java/com/example/caseData/dto/caseExchangeVote/CaseExchangeVoteDto.java index cb122b9..88f3e09 100644 --- a/src/main/java/com/example/caseData/dto/caseExchangeVote/CaseExchangeVoteDto.java +++ b/src/main/java/com/example/caseData/dto/caseExchangeVote/CaseExchangeVoteDto.java @@ -46,6 +46,12 @@ public class CaseExchangeVoteDto { @JsonProperty("is_enabled") private Integer isEnabled; + /** + * 是否已投票（0: 否 1:是） + */ + @JsonProperty("is_have_voted") + private Integer isHaveVoted; + /** * 创建时间 */ diff --git a/src/main/java/com/example/caseData/model/CaseClinicalArticleModel.java b/src/main/java/com/example/caseData/model/CaseClinicalArticleModel.java index 22422ef..8468c44 100644 --- a/src/main/java/com/example/caseData/model/CaseClinicalArticleModel.java +++ b/src/main/java/com/example/caseData/model/CaseClinicalArticleModel.java @@ -55,6 +55,18 @@ public class CaseClinicalArticleModel { @TableField("cert_image") private String certImage; + /** + * 是否外部链接（0:否 1:是） + */ + @TableField("is_link") + private Integer isLink; + + /** + * 外部链接地址 + */ + @TableField("is_link_url") + private String isLinkUrl; + /** * 内容 */ diff --git a/src/main/java/com/example/caseData/model/CaseClinicalVideoModel.java b/src/main/java/com/example/caseData/model/CaseClinicalVideoModel.java index 0c20ee7..b37129e 100644 --- a/src/main/java/com/example/caseData/model/CaseClinicalVideoModel.java +++ b/src/main/java/com/example/caseData/model/CaseClinicalVideoModel.java @@ -64,6 +64,18 @@ public class CaseClinicalVideoModel { @TableField("cert_image") private String certImage; + /** + * 是否外部链接（0:否 1:是） + */ + @TableField("is_link") + private Integer isLink; + + /** + * 外部链接地址 + */ + @TableField("is_link_url") + private String isLinkUrl; + /** * 创建时间 */ diff --git a/src/main/java/com/example/caseData/request/publicRequest/LoginRequest.java b/src/main/java/com/example/caseData/request/publicRequest/LoginRequest.java index 4d69acd..07be003 100644 --- a/src/main/java/com/example/caseData/request/publicRequest/LoginRequest.java +++ b/src/main/java/com/example/caseData/request/publicRequest/LoginRequest.java @@ -13,4 +13,10 @@ public class LoginRequest { @NotEmpty(message = "错误请求2", groups = {Login.class}) private String wx_code; + + /** + * 来源（1:小程序 2:h5） + */ + @NotEmpty(message = "错误请求", groups = {Login.class}) + private Integer source; } \ No newline at end of file diff --git a/src/main/java/com/example/caseData/request/userCaseReadRequest/addUserCaseRead.java b/src/main/java/com/example/caseData/request/userCaseReadRequest/addUserCaseRead.java new file mode 100644 index 0000000..b543122 --- /dev/null +++ b/src/main/java/com/example/caseData/request/userCaseReadRequest/addUserCaseRead.java @@ -0,0 +1,19 @@ +package com.example.caseData.request.userCaseReadRequest; + +import com.fasterxml.jackson.annotation.JsonProperty; +import jakarta.validation.constraints.Min; +import jakarta.validation.constraints.NotNull; +import lombok.Data; + +@Data +public class addUserCaseRead { + // 类型（1:文章 2:视频 3:病例交流） + @NotNull(message = "错误") + @JsonProperty("type") + private Integer type; + + @NotNull(message = "错误") + @JsonProperty("id") + private String id; + +}