diff --git a/doctor-modules/doctor-health/pom.xml b/doctor-modules/doctor-health/pom.xml index ccec9f7..52c8401 100644 --- a/doctor-modules/doctor-health/pom.xml +++ b/doctor-modules/doctor-health/pom.xml @@ -74,6 +74,10 @@ doctor doctor-common-swagger + + org.projectlombok + lombok + doctor diff --git a/doctor-modules/doctor-health/src/main/java/doctor/controller/HealthUserVideoController.java b/doctor-modules/doctor-health/src/main/java/doctor/controller/HealthUserVideoController.java index d43d6c8..2c6c474 100644 --- a/doctor-modules/doctor-health/src/main/java/doctor/controller/HealthUserVideoController.java +++ b/doctor-modules/doctor-health/src/main/java/doctor/controller/HealthUserVideoController.java @@ -3,10 +3,9 @@ package doctor.controller; import doctor.common.core.web.controller.BaseController; import doctor.common.core.web.page.TableDataInfo; -import doctor.entity.VideoCategoryEntity; -import doctor.entity.VideoEntity; +import doctor.domain.entity.VideoCategoryEntity; +import doctor.domain.entity.VideoEntity; import doctor.service.HealthUserVideoService; -import doctor.system.api.domain.SysUser; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; @@ -22,9 +21,9 @@ public class HealthUserVideoController extends BaseController { private HealthUserVideoService healthUserVideoService; @GetMapping("/findVideoCategoryList") - public TableDataInfo findVideoCategoryList(VideoCategoryEntity entity){ + public TableDataInfo findVideoCategoryList(){ startPage(); - List List = healthUserVideoService.findVideoCategoryList(entity); + List List = healthUserVideoService.findVideoCategoryList(); return getDataTable(List); } diff --git a/doctor-modules/doctor-health/src/main/java/doctor/entity/VideoCategoryEntity.java b/doctor-modules/doctor-health/src/main/java/doctor/domain/entity/VideoCategoryEntity.java similarity index 94% rename from doctor-modules/doctor-health/src/main/java/doctor/entity/VideoCategoryEntity.java rename to doctor-modules/doctor-health/src/main/java/doctor/domain/entity/VideoCategoryEntity.java index ba2e6c8..903c042 100644 --- a/doctor-modules/doctor-health/src/main/java/doctor/entity/VideoCategoryEntity.java +++ b/doctor-modules/doctor-health/src/main/java/doctor/domain/entity/VideoCategoryEntity.java @@ -1,4 +1,4 @@ -package doctor.entity; +package doctor.domain.entity; import com.fasterxml.jackson.annotation.JsonFormat; diff --git a/doctor-modules/doctor-health/src/main/java/doctor/entity/VideoCommentEntity.java b/doctor-modules/doctor-health/src/main/java/doctor/domain/entity/VideoCommentEntity.java similarity index 94% rename from doctor-modules/doctor-health/src/main/java/doctor/entity/VideoCommentEntity.java rename to doctor-modules/doctor-health/src/main/java/doctor/domain/entity/VideoCommentEntity.java index 952ce05..cf35c5a 100644 --- a/doctor-modules/doctor-health/src/main/java/doctor/entity/VideoCommentEntity.java +++ b/doctor-modules/doctor-health/src/main/java/doctor/domain/entity/VideoCommentEntity.java @@ -1,4 +1,4 @@ -package doctor.entity; +package doctor.domain.entity; import com.fasterxml.jackson.annotation.JsonFormat; import lombok.AllArgsConstructor; diff --git a/doctor-modules/doctor-health/src/main/java/doctor/entity/VideoCountEntity.java b/doctor-modules/doctor-health/src/main/java/doctor/domain/entity/VideoCountEntity.java similarity index 95% rename from doctor-modules/doctor-health/src/main/java/doctor/entity/VideoCountEntity.java rename to doctor-modules/doctor-health/src/main/java/doctor/domain/entity/VideoCountEntity.java index 9965c9f..6393a84 100644 --- a/doctor-modules/doctor-health/src/main/java/doctor/entity/VideoCountEntity.java +++ b/doctor-modules/doctor-health/src/main/java/doctor/domain/entity/VideoCountEntity.java @@ -1,4 +1,4 @@ -package doctor.entity; +package doctor.domain.entity; import com.fasterxml.jackson.annotation.JsonFormat; import lombok.AllArgsConstructor; diff --git a/doctor-modules/doctor-health/src/main/java/doctor/entity/VideoEntity.java b/doctor-modules/doctor-health/src/main/java/doctor/domain/entity/VideoEntity.java similarity index 84% rename from doctor-modules/doctor-health/src/main/java/doctor/entity/VideoEntity.java rename to doctor-modules/doctor-health/src/main/java/doctor/domain/entity/VideoEntity.java index c7daafd..c6579f7 100644 --- a/doctor-modules/doctor-health/src/main/java/doctor/entity/VideoEntity.java +++ b/doctor-modules/doctor-health/src/main/java/doctor/domain/entity/VideoEntity.java @@ -1,4 +1,4 @@ -package doctor.entity; +package doctor.domain.entity; import com.fasterxml.jackson.annotation.JsonFormat; import lombok.AllArgsConstructor; @@ -19,6 +19,9 @@ public class VideoEntity { private String abstracts; private String originalUrl; private Integer duration; + private Integer whetherCollection; + private Integer whetherBuy; + private Integer buyNum; private Integer price; @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") 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 23b8b24..082c162 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 @@ -1,15 +1,14 @@ package doctor.mapper; -import doctor.entity.VideoCategoryEntity; -import doctor.entity.VideoEntity; -import doctor.system.api.domain.SysUser; +import doctor.domain.entity.VideoCategoryEntity; +import doctor.domain.entity.VideoEntity; import org.apache.ibatis.annotations.Param; import java.util.List; public interface HealthUserVideoMapper { - List findVideoCategoryList(VideoCategoryEntity entity); + List findVideoCategoryList(); List findVideoVoList(@Param("categoryId") Integer categoryId); } diff --git a/doctor-modules/doctor-health/src/main/java/doctor/service/HealthUserVideoService.java b/doctor-modules/doctor-health/src/main/java/doctor/service/HealthUserVideoService.java index f90a472..a1f7375 100644 --- a/doctor-modules/doctor-health/src/main/java/doctor/service/HealthUserVideoService.java +++ b/doctor-modules/doctor-health/src/main/java/doctor/service/HealthUserVideoService.java @@ -2,13 +2,13 @@ package doctor.service; -import doctor.entity.VideoCategoryEntity; -import doctor.entity.VideoEntity; +import doctor.domain.entity.VideoCategoryEntity; +import doctor.domain.entity.VideoEntity; import java.util.List; public interface HealthUserVideoService { - List findVideoCategoryList(VideoCategoryEntity entity); + List findVideoCategoryList(); List findVideoVoList(Integer categoryId); } 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 6ed7e09..f4c1147 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 @@ -1,8 +1,8 @@ package doctor.service.impl; -import doctor.entity.VideoCategoryEntity; -import doctor.entity.VideoEntity; +import doctor.domain.entity.VideoCategoryEntity; +import doctor.domain.entity.VideoEntity; import doctor.mapper.HealthUserVideoMapper; import doctor.service.HealthUserVideoService; import org.springframework.beans.factory.annotation.Autowired; @@ -16,8 +16,8 @@ public class HealthUserVideoServiceImpl implements HealthUserVideoService { private HealthUserVideoMapper healthUserVideoMapper; @Override - public List findVideoCategoryList(VideoCategoryEntity entity) { - return healthUserVideoMapper.findVideoCategoryList(entity); + public List findVideoCategoryList() { + return healthUserVideoMapper.findVideoCategoryList(); } @Override diff --git a/doctor-modules/doctor-health/src/main/resources/mapper/HealthUserVideoMapper.xml b/doctor-modules/doctor-health/src/main/resources/mapper/HealthUserVideoMapper.xml index 3efe450..25c0127 100644 --- a/doctor-modules/doctor-health/src/main/resources/mapper/HealthUserVideoMapper.xml +++ b/doctor-modules/doctor-health/src/main/resources/mapper/HealthUserVideoMapper.xml @@ -5,10 +5,10 @@ - select * from video_category - select * from video where category_id=#{categoryId}