diff --git a/doctor-modules/doctor-health/src/main/java/doctor/controller/VideoController.java b/doctor-modules/doctor-health/src/main/java/doctor/controller/VideoController.java index fd029d0..da6a8d4 100644 --- a/doctor-modules/doctor-health/src/main/java/doctor/controller/VideoController.java +++ b/doctor-modules/doctor-health/src/main/java/doctor/controller/VideoController.java @@ -3,6 +3,7 @@ package doctor.controller; import doctor.common.core.domain.HealthR; import doctor.common.core.domain.R; import doctor.domain.entity.*; +import doctor.domain.vo.VideoCommentVo; import doctor.service.VideoService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -32,11 +33,11 @@ public class VideoController { videoService.videoBuy(videoId,price); return HealthR.ok(); } -// //视频评论列表 -// @GetMapping("/v1/findVideoCommentList") -// public R> findVideoCommentList(){ -// List videoCommentList = videoService.findVideoCommentList(); -// return R.ok(videoCommentList); -// } + + @GetMapping("/v1/findVideoCommentList") + public HealthR> findVideoCommentList(@RequestParam Integer videoId) { + List videoCommentVoList = videoService.findVideoCommentList(videoId); + return HealthR.ok(videoCommentVoList); + } } diff --git a/doctor-modules/doctor-health/src/main/java/doctor/domain/vo/VideoCommentVo.java b/doctor-modules/doctor-health/src/main/java/doctor/domain/vo/VideoCommentVo.java new file mode 100644 index 0000000..b73a45f --- /dev/null +++ b/doctor-modules/doctor-health/src/main/java/doctor/domain/vo/VideoCommentVo.java @@ -0,0 +1,13 @@ +package doctor.domain.vo; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +@Data +@AllArgsConstructor +@NoArgsConstructor +public class VideoCommentVo { + private Integer id; + private String content; +} diff --git a/doctor-modules/doctor-health/src/main/java/doctor/mapper/HealthUserVideoMapper.java b/doctor-modules/doctor-health/src/main/java/doctor/mapper/HealthUserVideoMapper.java index 3ada04b..ed4ed72 100644 --- a/doctor-modules/doctor-health/src/main/java/doctor/mapper/HealthUserVideoMapper.java +++ b/doctor-modules/doctor-health/src/main/java/doctor/mapper/HealthUserVideoMapper.java @@ -16,7 +16,7 @@ public interface HealthUserVideoMapper { List findVideoVoList(@Param("categoryId") Integer categoryId); - UserVideoCollectionEntity selectWhetherCollectionByUserIdAndVideoId(@Param("userId") Integer userId, @Param("id") Integer id); + UserVideoCollectionEntity selectWhetherCollectionByUserIdAndVideoId(@Param("userId") Long userId, @Param("id") Integer id); - UserVideoBuyEntity selectWhetherBuyByUserIdAndVideoId(@Param("userId") Integer userId, @Param("id") Integer id); + UserVideoBuyEntity selectWhetherBuyByUserIdAndVideoId(@Param("userId") Long userId, @Param("id") Integer id); } diff --git a/doctor-modules/doctor-health/src/main/java/doctor/mapper/VideoMapper.java b/doctor-modules/doctor-health/src/main/java/doctor/mapper/VideoMapper.java index 3d235d7..1336a6a 100644 --- a/doctor-modules/doctor-health/src/main/java/doctor/mapper/VideoMapper.java +++ b/doctor-modules/doctor-health/src/main/java/doctor/mapper/VideoMapper.java @@ -31,7 +31,7 @@ public interface VideoMapper { void updateUserWallet(@Param("newblance") int newblance, @Param("id") Integer id); - + List findVideoCommentList(@Param("videoId") Integer videoId); // UserWalletEntity FindById(@Param("userId") Integer userId); diff --git a/doctor-modules/doctor-health/src/main/java/doctor/service/VideoService.java b/doctor-modules/doctor-health/src/main/java/doctor/service/VideoService.java index 1892009..2a49f44 100644 --- a/doctor-modules/doctor-health/src/main/java/doctor/service/VideoService.java +++ b/doctor-modules/doctor-health/src/main/java/doctor/service/VideoService.java @@ -1,6 +1,7 @@ package doctor.service; import doctor.domain.entity.*; +import doctor.domain.vo.VideoCommentVo; import java.util.List; @@ -18,4 +19,5 @@ public interface VideoService { void videoBuy(Integer videoId,Integer price); + List findVideoCommentList(Integer videoId); } diff --git a/doctor-modules/doctor-health/src/main/java/doctor/service/impl/HealthUserVideoServiceImpl.java b/doctor-modules/doctor-health/src/main/java/doctor/service/impl/HealthUserVideoServiceImpl.java index a8db3e4..bc727ab 100644 --- a/doctor-modules/doctor-health/src/main/java/doctor/service/impl/HealthUserVideoServiceImpl.java +++ b/doctor-modules/doctor-health/src/main/java/doctor/service/impl/HealthUserVideoServiceImpl.java @@ -45,8 +45,7 @@ public class HealthUserVideoServiceImpl implements HealthUserVideoService { public List findVideoVoList(Integer categoryId) { List videoVoList = healthUserVideoMapper.findVideoVoList(categoryId); List videoVos = ConvertUtil.entityToVoList(videoVoList, VideoVo.class); - String header = request.getHeader("token"); - Integer userId = Integer.valueOf(JwtUtils.getUserId(header)); + Long userId = SecurityUtils.getUserId(); videoVos.forEach(video -> { UserVideoCollectionEntity userVideoCollection = healthUserVideoMapper.selectWhetherCollectionByUserIdAndVideoId(userId,video.getId()); if(userVideoCollection!=null){ diff --git a/doctor-modules/doctor-health/src/main/java/doctor/service/impl/VideoServiceImpl.java b/doctor-modules/doctor-health/src/main/java/doctor/service/impl/VideoServiceImpl.java index c559e88..1cc550f 100644 --- a/doctor-modules/doctor-health/src/main/java/doctor/service/impl/VideoServiceImpl.java +++ b/doctor-modules/doctor-health/src/main/java/doctor/service/impl/VideoServiceImpl.java @@ -2,8 +2,10 @@ package doctor.service.impl; import doctor.common.core.utils.JwtUtils; import doctor.domain.entity.*; +import doctor.domain.vo.VideoCommentVo; import doctor.mapper.VideoMapper; import doctor.service.VideoService; +import doctor.util.ConvertUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -53,5 +55,12 @@ public class VideoServiceImpl implements VideoService { } } + @Override + public List findVideoCommentList(Integer videoId) { + List videoCommentEntityList = videoMapper.findVideoCommentList(videoId); + List videoCommentVoList = ConvertUtil.entityToVoList(videoCommentEntityList, VideoCommentVo.class); + return videoCommentVoList; + } + } diff --git a/doctor-modules/doctor-health/src/main/resources/bootstrap.yml b/doctor-modules/doctor-health/src/main/resources/bootstrap.yml deleted file mode 100644 index 205fb38..0000000 --- a/doctor-modules/doctor-health/src/main/resources/bootstrap.yml +++ /dev/null @@ -1,27 +0,0 @@ -# Tomcat -server: - port: 9204 - -# Spring -spring: - application: - # 应用名称 - name: doctor-health - profiles: - # 环境配置 - active: dev - cloud: - nacos: - discovery: - # 服务注册地址 - server-addr: 101.34.77.101:8848 - namespace: 7e34f104-f333-4828-b36a-02146e521c9a - config: - # 配置中心地址 - server-addr: 101.34.77.101:8848 - namespace: 7e34f104-f333-4828-b36a-02146e521c9a - # 配置文件格式 - file-extension: yml - # 共享配置 - shared-configs: - - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} diff --git a/doctor-modules/doctor-health/src/main/resources/mapper/doctor/VideoMapper.xml b/doctor-modules/doctor-health/src/main/resources/mapper/doctor/VideoMapper.xml index 21fd79e..9efad74 100644 --- a/doctor-modules/doctor-health/src/main/resources/mapper/doctor/VideoMapper.xml +++ b/doctor-modules/doctor-health/src/main/resources/mapper/doctor/VideoMapper.xml @@ -47,6 +47,9 @@ LEFT JOIN user ON user.id = user_wallet.user_id WHERE user_wallet.user_id==#{id} +