From 0d72b7080c09c2fb5a0becc65c14b73f31a436c3 Mon Sep 17 00:00:00 2001 From: jpz <3185133571@qq.com> Date: Mon, 8 Jan 2024 22:06:22 +0800 Subject: [PATCH 1/7] jpz1.0 --- .../doctor/entity/UserAdoptCommentEntity.java | 25 ++++++++++++++++ .../doctor/entity/UserArchivesEntity.java | 22 ++++++++++++++ .../doctor/entity/UserBindingLoginEntity.java | 21 ++++++++++++++ .../entity/UserConsumptionRecordEntity.java | 22 ++++++++++++++ .../doctor/entity/UserDoctorFollowEntity.java | 19 ++++++++++++ .../doctor/entity/UserDrawRecordEntity.java | 23 +++++++++++++++ .../main/java/doctor/entity/UserEntity.java | 29 +++++++++++++++++++ .../java/doctor/entity/UserIdCardEntity.java | 25 ++++++++++++++++ .../entity/UserInfoCollectionEntity.java | 19 ++++++++++++ .../src/main/java/doctor/vo/UserVo.java | 14 +++++++++ 10 files changed, 219 insertions(+) create mode 100644 doctor-modules/doctor-health/src/main/java/doctor/entity/UserAdoptCommentEntity.java create mode 100644 doctor-modules/doctor-health/src/main/java/doctor/entity/UserArchivesEntity.java create mode 100644 doctor-modules/doctor-health/src/main/java/doctor/entity/UserBindingLoginEntity.java create mode 100644 doctor-modules/doctor-health/src/main/java/doctor/entity/UserConsumptionRecordEntity.java create mode 100644 doctor-modules/doctor-health/src/main/java/doctor/entity/UserDoctorFollowEntity.java create mode 100644 doctor-modules/doctor-health/src/main/java/doctor/entity/UserDrawRecordEntity.java create mode 100644 doctor-modules/doctor-health/src/main/java/doctor/entity/UserEntity.java create mode 100644 doctor-modules/doctor-health/src/main/java/doctor/entity/UserIdCardEntity.java create mode 100644 doctor-modules/doctor-health/src/main/java/doctor/entity/UserInfoCollectionEntity.java create mode 100644 doctor-modules/doctor-health/src/main/java/doctor/vo/UserVo.java diff --git a/doctor-modules/doctor-health/src/main/java/doctor/entity/UserAdoptCommentEntity.java b/doctor-modules/doctor-health/src/main/java/doctor/entity/UserAdoptCommentEntity.java new file mode 100644 index 0000000..15cbd8f --- /dev/null +++ b/doctor-modules/doctor-health/src/main/java/doctor/entity/UserAdoptCommentEntity.java @@ -0,0 +1,25 @@ +package doctor.entity; + +import lombok.Data; + +import java.util.Date; + +/** + * @BelongsProject: Medical_Treatment + * @BelongsPackage: doctor.entity + * @Author: jpz + * @CreateTime: 2024/1/8 21:33 + */ +@Data +public class UserAdoptCommentEntity { + private Integer id; + private Integer userId; + private Integer releaseUserId; + private String releaseUserName; + private String releaseUserHeadPic; + private Integer sickCircleId; + private String title; + private String disease; + private String content; + private Date createTime; +} diff --git a/doctor-modules/doctor-health/src/main/java/doctor/entity/UserArchivesEntity.java b/doctor-modules/doctor-health/src/main/java/doctor/entity/UserArchivesEntity.java new file mode 100644 index 0000000..5f11bcd --- /dev/null +++ b/doctor-modules/doctor-health/src/main/java/doctor/entity/UserArchivesEntity.java @@ -0,0 +1,22 @@ +package doctor.entity; + +import lombok.Data; + +import java.util.Date; + +/** + * @BelongsProject: Medical_Treatment + * @BelongsPackage: doctor.entity + * @Author: jpz + * @CreateTime: 2024/1/8 21:37 + */ +@Data +public class UserArchivesEntity { + private Integer id; + private Integer userId; + private String bankCardNumber; + private String bankName; + private Integer bankCardType; + private Date updateTime; + private Date createTime; +} diff --git a/doctor-modules/doctor-health/src/main/java/doctor/entity/UserBindingLoginEntity.java b/doctor-modules/doctor-health/src/main/java/doctor/entity/UserBindingLoginEntity.java new file mode 100644 index 0000000..194cd86 --- /dev/null +++ b/doctor-modules/doctor-health/src/main/java/doctor/entity/UserBindingLoginEntity.java @@ -0,0 +1,21 @@ +package doctor.entity; + +import lombok.Data; + +import java.util.Date; + +/** + * @BelongsProject: Medical_Treatment + * @BelongsPackage: doctor.entity + * @Author: jpz + * @CreateTime: 2024/1/8 21:40 + */ +@Data +public class UserBindingLoginEntity { + private Integer id; + private Integer userId; + private Integer type; + private String openId; + private String unionId; + private Date createTime; +} diff --git a/doctor-modules/doctor-health/src/main/java/doctor/entity/UserConsumptionRecordEntity.java b/doctor-modules/doctor-health/src/main/java/doctor/entity/UserConsumptionRecordEntity.java new file mode 100644 index 0000000..61df2a3 --- /dev/null +++ b/doctor-modules/doctor-health/src/main/java/doctor/entity/UserConsumptionRecordEntity.java @@ -0,0 +1,22 @@ +package doctor.entity; + +import lombok.Data; + +import java.util.Date; + +/** + * @BelongsProject: Medical_Treatment + * @BelongsPackage: doctor.entity + * @Author: jpz + * @CreateTime: 2024/1/8 21:45 + */ +@Data +public class UserConsumptionRecordEntity { + private Integer id; + private Integer userId; + private Integer type; + private Integer balance; + private Integer changeNum; + private String remark; + private Date createTime; +} diff --git a/doctor-modules/doctor-health/src/main/java/doctor/entity/UserDoctorFollowEntity.java b/doctor-modules/doctor-health/src/main/java/doctor/entity/UserDoctorFollowEntity.java new file mode 100644 index 0000000..12eb761 --- /dev/null +++ b/doctor-modules/doctor-health/src/main/java/doctor/entity/UserDoctorFollowEntity.java @@ -0,0 +1,19 @@ +package doctor.entity; + +import lombok.Data; + +import java.util.Date; + +/** + * @BelongsProject: Medical_Treatment + * @BelongsPackage: doctor.entity + * @Author: jpz + * @CreateTime: 2024/1/8 21:49 + */ +@Data +public class UserDoctorFollowEntity { + private Integer id; + private Integer userId; + private Integer doctorId; + private Date createTime; +} diff --git a/doctor-modules/doctor-health/src/main/java/doctor/entity/UserDrawRecordEntity.java b/doctor-modules/doctor-health/src/main/java/doctor/entity/UserDrawRecordEntity.java new file mode 100644 index 0000000..46ef9fe --- /dev/null +++ b/doctor-modules/doctor-health/src/main/java/doctor/entity/UserDrawRecordEntity.java @@ -0,0 +1,23 @@ +package doctor.entity; + +import lombok.Data; + +import java.util.Date; + +/** + * @BelongsProject: Medical_Treatment + * @BelongsPackage: doctor.entity + * @Author: jpz + * @CreateTime: 2024/1/8 21:53 + */ +@Data +public class UserDrawRecordEntity { + private Integer id; + private Integer userId; + private Double money; + private String bankCardNumber; + private String bankName; + private String remark; + private Integer status; + private Date createTime; +} diff --git a/doctor-modules/doctor-health/src/main/java/doctor/entity/UserEntity.java b/doctor-modules/doctor-health/src/main/java/doctor/entity/UserEntity.java new file mode 100644 index 0000000..c8aa9e3 --- /dev/null +++ b/doctor-modules/doctor-health/src/main/java/doctor/entity/UserEntity.java @@ -0,0 +1,29 @@ +package doctor.entity; + +import lombok.Data; + +import java.util.Date; + +/** + * @BelongsProject: Medical_Treatment + * @BelongsPackage: doctor.entity + * @Author: jpz + * @CreateTime: 2024/1/8 20:59 + */ +@Data +public class UserEntity { + private Integer id; + private String phone; + private String pwd; + private String email; + private String nickName; + private String userName; + private String headPic; + private Integer sex; + private Integer age; + private Integer height; + private Integer weight; + private String invitationCode; + private Date updateTime; + private Date createTime; +} diff --git a/doctor-modules/doctor-health/src/main/java/doctor/entity/UserIdCardEntity.java b/doctor-modules/doctor-health/src/main/java/doctor/entity/UserIdCardEntity.java new file mode 100644 index 0000000..24278d6 --- /dev/null +++ b/doctor-modules/doctor-health/src/main/java/doctor/entity/UserIdCardEntity.java @@ -0,0 +1,25 @@ +package doctor.entity; + +import lombok.Data; + +import java.util.Date; + +/** + * @BelongsProject: Medical_Treatment + * @BelongsPackage: doctor.entity + * @Author: jpz + * @CreateTime: 2024/1/8 21:56 + */ +@Data +public class UserIdCardEntity { + private Integer id; + private Integer userId; + private String name; + private String sex; + private String nation; + private String birthday; + private String address; + private String idNumber; + private String issueOffice; + private Date createTime; +} diff --git a/doctor-modules/doctor-health/src/main/java/doctor/entity/UserInfoCollectionEntity.java b/doctor-modules/doctor-health/src/main/java/doctor/entity/UserInfoCollectionEntity.java new file mode 100644 index 0000000..60e0a15 --- /dev/null +++ b/doctor-modules/doctor-health/src/main/java/doctor/entity/UserInfoCollectionEntity.java @@ -0,0 +1,19 @@ +package doctor.entity; + +import lombok.Data; + +import java.util.Date; + +/** + * @BelongsProject: Medical_Treatment + * @BelongsPackage: doctor.entity + * @Author: jpz + * @CreateTime: 2024/1/8 22:02 + */ +@Data +public class UserInfoCollectionEntity { + private Integer id; + private Integer userId; + private String infoId; + private Date createTime; +} diff --git a/doctor-modules/doctor-health/src/main/java/doctor/vo/UserVo.java b/doctor-modules/doctor-health/src/main/java/doctor/vo/UserVo.java new file mode 100644 index 0000000..c691a8a --- /dev/null +++ b/doctor-modules/doctor-health/src/main/java/doctor/vo/UserVo.java @@ -0,0 +1,14 @@ +package doctor.vo; + +import lombok.Data; + +/** + * @BelongsProject: Medical_Treatment + * @BelongsPackage: doctor.vo + * @Author: jpz + * @CreateTime: 2024/1/8 20:41 + */ +@Data +public class UserVo { + +} From d1f85c88180c4ee80b24d8c14cf8ab83cd8fbb0e Mon Sep 17 00:00:00 2001 From: jpz <3185133571@qq.com> Date: Mon, 8 Jan 2024 22:40:56 +0800 Subject: [PATCH 2/7] jpz2.0 --- pom.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/pom.xml b/pom.xml index a9c3654..94655ec 100644 --- a/pom.xml +++ b/pom.xml @@ -216,7 +216,6 @@ doctor-modules doctor-api doctor-common - doctor-modules/doctor-health pom From 744f6950ff3d4a5d14f017b495a0e27f250d9a68 Mon Sep 17 00:00:00 2001 From: jpz <3185133571@qq.com> Date: Tue, 9 Jan 2024 22:35:15 +0800 Subject: [PATCH 3/7] jpz3.0 --- .../doctor-health/src/main/java/doctor/vo/UserVo.java | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/doctor-modules/doctor-health/src/main/java/doctor/vo/UserVo.java b/doctor-modules/doctor-health/src/main/java/doctor/vo/UserVo.java index c691a8a..621c3a0 100644 --- a/doctor-modules/doctor-health/src/main/java/doctor/vo/UserVo.java +++ b/doctor-modules/doctor-health/src/main/java/doctor/vo/UserVo.java @@ -1,6 +1,7 @@ package doctor.vo; import lombok.Data; +import org.apache.catalina.User; /** * @BelongsProject: Medical_Treatment @@ -10,5 +11,15 @@ import lombok.Data; */ @Data public class UserVo { + private String pwd; + //邮箱 + private String email; + //昵称 + private String nickName; + //验证码 + private String code; + public static User toUser(UserVo userVo) { + return null; + } } From 2debd213feb46f0a4a8d035703fc871e41ef694f Mon Sep 17 00:00:00 2001 From: jpz <3185133571@qq.com> Date: Wed, 10 Jan 2024 22:25:14 +0800 Subject: [PATCH 4/7] jpz4.0 --- doctor-auth/src/main/resources/bootstrap.yml | 4 +- .../src/main/resources/bootstrap.yml | 4 +- .../src/main/resources/bootstrap.yml | 4 +- .../src/main/resources/bootstrap.yml | 4 +- .../doctor/controller/BannersController.java | 30 ++++ .../controller/DepartmentController.java | 29 ++++ .../controller/DiseaseCategoryController.java | 32 ++++ .../DiseaseKnowledgeController.java | 53 +++++++ .../java/doctor/domain/entity/Banners.java | 85 ++++++++++ .../java/doctor/domain/entity/Department.java | 57 +++++++ .../doctor/domain/entity/DiseaseCategory.java | 50 ++++++ .../domain/entity/DiseaseKnowledge.java | 86 ++++++++++ .../doctor/domain/entity/DrugsCategory.java | 16 ++ .../doctor/domain/entity/DrugsKnowledge.java | 149 ++++++++++++++++++ .../java/doctor/mapper/BannersMapper.java | 17 ++ .../java/doctor/mapper/DepartmentMapper.java | 18 +++ .../doctor/mapper/DiseaseCategoryMapper.java | 18 +++ .../doctor/mapper/DiseaseKnowledgeMapper.java | 22 +++ .../java/doctor/service/BannersService.java | 18 +++ .../doctor/service/DepartmentService.java | 16 ++ .../service/DiseaseCategoryService.java | 18 +++ .../service/DiseaseKnowledgeService.java | 20 +++ .../service/impl/BannersServiceimpl.java | 25 +++ .../service/impl/DepartmentServiceimpl.java | 25 +++ .../impl/DiseaseCategoryServiceimpl.java | 26 +++ .../impl/DiseaseKnowledgeServiceimpl.java | 36 +++++ .../src/main/resources/bootstrap.yml | 4 +- .../mapper/doctor/BannersServiceMapper.xml | 11 ++ .../mapper/doctor/DepartmentServiceMapper.xml | 11 ++ .../doctor/DiseaseCategoryServiceMapper.xml | 11 ++ .../doctor/DiseaseKnowledgeServiceMapper.xml | 19 +++ .../src/main/resources/bootstrap.yml | 4 +- .../src/main/resources/bootstrap.yml | 4 +- .../src/main/resources/bootstrap.yml | 4 +- 34 files changed, 914 insertions(+), 16 deletions(-) create mode 100644 doctor-modules/doctor-health/src/main/java/doctor/controller/BannersController.java create mode 100644 doctor-modules/doctor-health/src/main/java/doctor/controller/DepartmentController.java create mode 100644 doctor-modules/doctor-health/src/main/java/doctor/controller/DiseaseCategoryController.java create mode 100644 doctor-modules/doctor-health/src/main/java/doctor/controller/DiseaseKnowledgeController.java create mode 100644 doctor-modules/doctor-health/src/main/java/doctor/domain/entity/Banners.java create mode 100644 doctor-modules/doctor-health/src/main/java/doctor/domain/entity/Department.java create mode 100644 doctor-modules/doctor-health/src/main/java/doctor/domain/entity/DiseaseCategory.java create mode 100644 doctor-modules/doctor-health/src/main/java/doctor/domain/entity/DiseaseKnowledge.java create mode 100644 doctor-modules/doctor-health/src/main/java/doctor/domain/entity/DrugsCategory.java create mode 100644 doctor-modules/doctor-health/src/main/java/doctor/domain/entity/DrugsKnowledge.java create mode 100644 doctor-modules/doctor-health/src/main/java/doctor/mapper/BannersMapper.java create mode 100644 doctor-modules/doctor-health/src/main/java/doctor/mapper/DepartmentMapper.java create mode 100644 doctor-modules/doctor-health/src/main/java/doctor/mapper/DiseaseCategoryMapper.java create mode 100644 doctor-modules/doctor-health/src/main/java/doctor/mapper/DiseaseKnowledgeMapper.java create mode 100644 doctor-modules/doctor-health/src/main/java/doctor/service/BannersService.java create mode 100644 doctor-modules/doctor-health/src/main/java/doctor/service/DepartmentService.java create mode 100644 doctor-modules/doctor-health/src/main/java/doctor/service/DiseaseCategoryService.java create mode 100644 doctor-modules/doctor-health/src/main/java/doctor/service/DiseaseKnowledgeService.java create mode 100644 doctor-modules/doctor-health/src/main/java/doctor/service/impl/BannersServiceimpl.java create mode 100644 doctor-modules/doctor-health/src/main/java/doctor/service/impl/DepartmentServiceimpl.java create mode 100644 doctor-modules/doctor-health/src/main/java/doctor/service/impl/DiseaseCategoryServiceimpl.java create mode 100644 doctor-modules/doctor-health/src/main/java/doctor/service/impl/DiseaseKnowledgeServiceimpl.java create mode 100644 doctor-modules/doctor-health/src/main/resources/mapper/doctor/BannersServiceMapper.xml create mode 100644 doctor-modules/doctor-health/src/main/resources/mapper/doctor/DepartmentServiceMapper.xml create mode 100644 doctor-modules/doctor-health/src/main/resources/mapper/doctor/DiseaseCategoryServiceMapper.xml create mode 100644 doctor-modules/doctor-health/src/main/resources/mapper/doctor/DiseaseKnowledgeServiceMapper.xml diff --git a/doctor-auth/src/main/resources/bootstrap.yml b/doctor-auth/src/main/resources/bootstrap.yml index c30cba2..7f241e4 100644 --- a/doctor-auth/src/main/resources/bootstrap.yml +++ b/doctor-auth/src/main/resources/bootstrap.yml @@ -15,11 +15,11 @@ spring: discovery: # 服务注册地址 server-addr: 101.34.77.101:8848 - namespace: 9de208a6-cb30-41ae-a880-78196c99c050 + namespace: 7e1e997d-5fa4-4f84-9f48-3e0adf830a37 config: # 配置中心地址 server-addr: 101.34.77.101:8848 - namespace: 9de208a6-cb30-41ae-a880-78196c99c050 + namespace: 7e1e997d-5fa4-4f84-9f48-3e0adf830a37 # 配置文件格式 file-extension: yml # 共享配置 diff --git a/doctor-gateway/src/main/resources/bootstrap.yml b/doctor-gateway/src/main/resources/bootstrap.yml index cc0e562..e0b9071 100644 --- a/doctor-gateway/src/main/resources/bootstrap.yml +++ b/doctor-gateway/src/main/resources/bootstrap.yml @@ -15,11 +15,11 @@ spring: discovery: # 服务注册地址 server-addr: 101.34.77.101:8848 - namespace: 9de208a6-cb30-41ae-a880-78196c99c050 + namespace: 7e1e997d-5fa4-4f84-9f48-3e0adf830a37 config: # 配置中心地址 server-addr: 101.34.77.101:8848 - namespace: 9de208a6-cb30-41ae-a880-78196c99c050 + namespace: 7e1e997d-5fa4-4f84-9f48-3e0adf830a37 # 配置文件格式 file-extension: yml # 共享配置 diff --git a/doctor-modules/doctor-file/src/main/resources/bootstrap.yml b/doctor-modules/doctor-file/src/main/resources/bootstrap.yml index c992149..400e098 100644 --- a/doctor-modules/doctor-file/src/main/resources/bootstrap.yml +++ b/doctor-modules/doctor-file/src/main/resources/bootstrap.yml @@ -15,11 +15,11 @@ spring: discovery: # 服务注册地址 server-addr: 101.34.77.101:8848 - namespace: 9de208a6-cb30-41ae-a880-78196c99c050 + namespace: 7e1e997d-5fa4-4f84-9f48-3e0adf830a37 config: # 配置中心地址 server-addr: 101.34.77.101:8848 - namespace: 9de208a6-cb30-41ae-a880-78196c99c050 + namespace: 7e1e997d-5fa4-4f84-9f48-3e0adf830a37 # 配置文件格式 file-extension: yml # 共享配置 diff --git a/doctor-modules/doctor-gen/src/main/resources/bootstrap.yml b/doctor-modules/doctor-gen/src/main/resources/bootstrap.yml index 007713f..9b8484d 100644 --- a/doctor-modules/doctor-gen/src/main/resources/bootstrap.yml +++ b/doctor-modules/doctor-gen/src/main/resources/bootstrap.yml @@ -15,11 +15,11 @@ spring: discovery: # 服务注册地址 server-addr: 101.34.77.101:8848 - namespace: 9de208a6-cb30-41ae-a880-78196c99c050 + namespace: 7e1e997d-5fa4-4f84-9f48-3e0adf830a37 config: # 配置中心地址 server-addr: 101.34.77.101:8848 - namespace: 9de208a6-cb30-41ae-a880-78196c99c050 + namespace: 7e1e997d-5fa4-4f84-9f48-3e0adf830a37 # 配置文件格式 file-extension: yml # 共享配置 diff --git a/doctor-modules/doctor-health/src/main/java/doctor/controller/BannersController.java b/doctor-modules/doctor-health/src/main/java/doctor/controller/BannersController.java new file mode 100644 index 0000000..a77598a --- /dev/null +++ b/doctor-modules/doctor-health/src/main/java/doctor/controller/BannersController.java @@ -0,0 +1,30 @@ +package doctor.controller; + +import doctor.common.core.domain.R; +import doctor.domain.entity.Banners; +import doctor.service.BannersService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; + +/** + * @BelongsProject: Medical_Treatment + * @BelongsPackage: doctor.controller + * @Author: jpz + * @CreateTime: 2024/1/10 15:54 + */ +@RestController +@RequestMapping("/share/v1") + +public class BannersController { + @Autowired + private BannersService bannersService; + @GetMapping("/bannersShow") + public R> bannersShow(){ + List banners = bannersService.bannersShow(); + return R.ok(banners); + } +} diff --git a/doctor-modules/doctor-health/src/main/java/doctor/controller/DepartmentController.java b/doctor-modules/doctor-health/src/main/java/doctor/controller/DepartmentController.java new file mode 100644 index 0000000..f10f3d0 --- /dev/null +++ b/doctor-modules/doctor-health/src/main/java/doctor/controller/DepartmentController.java @@ -0,0 +1,29 @@ +package doctor.controller; + +import doctor.common.core.domain.R; +import doctor.domain.entity.Department; +import doctor.service.DepartmentService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; + +/** + * @BelongsProject: Medical_Treatment + * @BelongsPackage: doctor.controller + * @Author: jpz + * @CreateTime: 2024/1/10 16:49 + */ +@RestController +@RequestMapping("/share/knowledgeBase/v1") +public class DepartmentController { + @Autowired + private DepartmentService departmentService; + @GetMapping("/findDepartment") + public R> findDepartment(){ + List list=departmentService.findDepartment(); + return R.ok(list); + } +} diff --git a/doctor-modules/doctor-health/src/main/java/doctor/controller/DiseaseCategoryController.java b/doctor-modules/doctor-health/src/main/java/doctor/controller/DiseaseCategoryController.java new file mode 100644 index 0000000..b8a4c8f --- /dev/null +++ b/doctor-modules/doctor-health/src/main/java/doctor/controller/DiseaseCategoryController.java @@ -0,0 +1,32 @@ +package doctor.controller; + +import doctor.common.core.domain.R; +import doctor.domain.entity.DiseaseCategory; +import doctor.service.DiseaseCategoryService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; + +import javax.xml.transform.Result; +import java.util.List; + +/** + * @BelongsProject: Medical_Treatment + * @BelongsPackage: doctor.controller + * @Author: jpz + * @CreateTime: 2024/1/10 17:16 + */ +@RestController +@RequestMapping("/share/knowledgeBase/v1") +public class DiseaseCategoryController { + @Autowired + private DiseaseCategoryService diseaseCategoryService; + + @GetMapping("/findDiseaseCategory") + public R> findDiseaseCategory(@RequestParam Integer departmentId){ + List list=diseaseCategoryService.findDiseaseCategory(departmentId); + return R.ok(list); + } +} diff --git a/doctor-modules/doctor-health/src/main/java/doctor/controller/DiseaseKnowledgeController.java b/doctor-modules/doctor-health/src/main/java/doctor/controller/DiseaseKnowledgeController.java new file mode 100644 index 0000000..6d8c440 --- /dev/null +++ b/doctor-modules/doctor-health/src/main/java/doctor/controller/DiseaseKnowledgeController.java @@ -0,0 +1,53 @@ +package doctor.controller; + + +import doctor.common.core.domain.R; +import doctor.domain.entity.DiseaseKnowledge; +import doctor.domain.entity.DrugsCategory; +import doctor.domain.entity.DrugsKnowledge; +import doctor.service.DiseaseKnowledgeService; +import org.bouncycastle.cert.ocsp.Req; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.actuate.health.Health; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; + +import static doctor.common.core.utils.PageUtils.startPage; + +/** + * @BelongsProject: Medical_Treatment + * @BelongsPackage: doctor.controller + * @Author: jpz + * @CreateTime: 2024/1/10 20:56 + */ +@RestController +@RequestMapping("/share/knowledgeBase/v1") +public class DiseaseKnowledgeController { + @Autowired + private DiseaseKnowledgeService diseaseKnowledgeService; + //罕见病症详情 + @GetMapping("/findDiseaseKnowledge") + public R> findDiseaseKnowledge(@RequestParam Integer diseaseCategoryId){ + return R.ok(diseaseKnowledgeService.findDiseaseKnowledge(diseaseCategoryId)); + } + + @GetMapping("/findDrugsCategoryList") + public R> findDrugsCategoryList(){ + return R.ok(diseaseKnowledgeService.findDrugsCategoryList()); + } + @GetMapping("/findDrugsKnowledgeList") + public R> findDrugsKnowledgeList(@RequestParam Integer drugsCategoryId, + @RequestParam(value = "page",defaultValue = "1") Integer page, + @RequestParam(value = "count",defaultValue = "5") Integer count){ + + startPage(page,count); + List list=diseaseKnowledgeService.findDrugsKnowledgeList(drugsCategoryId); + return R.ok(list); + } + + +} diff --git a/doctor-modules/doctor-health/src/main/java/doctor/domain/entity/Banners.java b/doctor-modules/doctor-health/src/main/java/doctor/domain/entity/Banners.java new file mode 100644 index 0000000..91dfd82 --- /dev/null +++ b/doctor-modules/doctor-health/src/main/java/doctor/domain/entity/Banners.java @@ -0,0 +1,85 @@ +package doctor.domain.entity; + +import java.util.Date; + +/** + * @BelongsProject: Medical_Treatment + * @BelongsPackage: doctor.domain.entity + * @Author: jpz + * @CreateTime: 2024/1/10 15:12 + */ + +public class Banners { + private Integer id; + private String imageUrl; + private String title; + private String jumpUrl; + private String rank; + private Date startTime; + private Date endTime; + private Date createTime; + + public Integer getId() { + return id; + } + + public void setId(Integer id) { + this.id = id; + } + + public String getImageUrl() { + return imageUrl; + } + + public void setImageUrl(String imageUrl) { + this.imageUrl = imageUrl; + } + + public String getTitle() { + return title; + } + + public void setTitle(String title) { + this.title = title; + } + + public String getJumpUrl() { + return jumpUrl; + } + + public void setJumpUrl(String jumpUrl) { + this.jumpUrl = jumpUrl; + } + + public String getRank() { + return rank; + } + + public void setRank(String rank) { + this.rank = rank; + } + + public Date getStartTime() { + return startTime; + } + + public void setStartTime(Date startTime) { + this.startTime = startTime; + } + + public Date getEndTime() { + return endTime; + } + + public void setEndTime(Date endTime) { + this.endTime = endTime; + } + + public Date getCreateTime() { + return createTime; + } + + public void setCreateTime(Date createTime) { + this.createTime = createTime; + } +} diff --git a/doctor-modules/doctor-health/src/main/java/doctor/domain/entity/Department.java b/doctor-modules/doctor-health/src/main/java/doctor/domain/entity/Department.java new file mode 100644 index 0000000..1aba4cf --- /dev/null +++ b/doctor-modules/doctor-health/src/main/java/doctor/domain/entity/Department.java @@ -0,0 +1,57 @@ +package doctor.domain.entity; + +import java.util.Date; + +/** + * @BelongsProject: Medical_Treatment + * @BelongsPackage: doctor.domain.entity + * @Author: jpz + * @CreateTime: 2024/1/10 16:48 + */ +public class Department { + private Integer id; + private String departmentName; + private String pic; + private Integer rank; + private Date createTime; + + public Integer getId() { + return id; + } + + public void setId(Integer id) { + this.id = id; + } + + public String getDepartmentName() { + return departmentName; + } + + public void setDepartmentName(String departmentName) { + this.departmentName = departmentName; + } + + public String getPic() { + return pic; + } + + public void setPic(String pic) { + this.pic = pic; + } + + public Integer getRank() { + return rank; + } + + public void setRank(Integer rank) { + this.rank = rank; + } + + public Date getCreateTime() { + return createTime; + } + + public void setCreateTime(Date createTime) { + this.createTime = createTime; + } +} diff --git a/doctor-modules/doctor-health/src/main/java/doctor/domain/entity/DiseaseCategory.java b/doctor-modules/doctor-health/src/main/java/doctor/domain/entity/DiseaseCategory.java new file mode 100644 index 0000000..0393b8f --- /dev/null +++ b/doctor-modules/doctor-health/src/main/java/doctor/domain/entity/DiseaseCategory.java @@ -0,0 +1,50 @@ +package doctor.domain.entity; + +import java.util.Date; + +/** + * @BelongsProject: Medical_Treatment + * @BelongsPackage: doctor.domain.entity + * @Author: jpz + * @CreateTime: 2024/1/10 17:12 + */ +public class DiseaseCategory { + private Integer id; + private Integer departmentId; + private String name; + private Date createTime; + + public Integer getId() { + return id; + } + + public void setId(Integer id) { + this.id = id; + } + + public Integer getDepartmentId() { + return departmentId; + } + + public void setDepartmentId(Integer departmentId) { + this.departmentId = departmentId; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public Date getCreateTime() { + return createTime; + } + + public void setCreateTime(Date createTime) { + this.createTime = createTime; + + + } +} diff --git a/doctor-modules/doctor-health/src/main/java/doctor/domain/entity/DiseaseKnowledge.java b/doctor-modules/doctor-health/src/main/java/doctor/domain/entity/DiseaseKnowledge.java new file mode 100644 index 0000000..0366549 --- /dev/null +++ b/doctor-modules/doctor-health/src/main/java/doctor/domain/entity/DiseaseKnowledge.java @@ -0,0 +1,86 @@ +package doctor.domain.entity; + +import org.w3c.dom.Text; + +import java.util.Date; + +/** + * @BelongsProject: Medical_Treatment + * @BelongsPackage: doctor.domain.entity + * @Author: jpz + * @CreateTime: 2024/1/10 21:36 + */ +public class DiseaseKnowledge { + private Integer id; + private Integer diseaseCategoryId; + private Text pathology; + private Text symptom; + private Text benefitTaboo; + private Text chineseMedicineTreatment; + private Text westernMedicineTreatment; + private Date createTime; + + public Integer getId() { + return id; + } + + public void setId(Integer id) { + this.id = id; + } + + public Integer getDiseaseCategoryId() { + return diseaseCategoryId; + } + + public void setDiseaseCategoryId(Integer diseaseCategoryId) { + this.diseaseCategoryId = diseaseCategoryId; + } + + public Text getPathology() { + return pathology; + } + + public void setPathology(Text pathology) { + this.pathology = pathology; + } + + public Text getSymptom() { + return symptom; + } + + public void setSymptom(Text symptom) { + this.symptom = symptom; + } + + public Text getBenefitTaboo() { + return benefitTaboo; + } + + public void setBenefitTaboo(Text benefitTaboo) { + this.benefitTaboo = benefitTaboo; + } + + public Text getChineseMedicineTreatment() { + return chineseMedicineTreatment; + } + + public void setChineseMedicineTreatment(Text chineseMedicineTreatment) { + this.chineseMedicineTreatment = chineseMedicineTreatment; + } + + public Text getWesternMedicineTreatment() { + return westernMedicineTreatment; + } + + public void setWesternMedicineTreatment(Text westernMedicineTreatment) { + this.westernMedicineTreatment = westernMedicineTreatment; + } + + public Date getCreateTime() { + return createTime; + } + + public void setCreateTime(Date createTime) { + this.createTime = createTime; + } +} diff --git a/doctor-modules/doctor-health/src/main/java/doctor/domain/entity/DrugsCategory.java b/doctor-modules/doctor-health/src/main/java/doctor/domain/entity/DrugsCategory.java new file mode 100644 index 0000000..2958b68 --- /dev/null +++ b/doctor-modules/doctor-health/src/main/java/doctor/domain/entity/DrugsCategory.java @@ -0,0 +1,16 @@ +package doctor.domain.entity; + +import java.util.Date; + +/** + * @BelongsProject: Medical_Treatment + * @BelongsPackage: doctor.domain.entity + * @Author: jpz + * @CreateTime: 2024/1/10 21:52 + */ +public class DrugsCategory { + private Integer id; + private String name; + private Integer rank; + private Date createTime; +} diff --git a/doctor-modules/doctor-health/src/main/java/doctor/domain/entity/DrugsKnowledge.java b/doctor-modules/doctor-health/src/main/java/doctor/domain/entity/DrugsKnowledge.java new file mode 100644 index 0000000..e816115 --- /dev/null +++ b/doctor-modules/doctor-health/src/main/java/doctor/domain/entity/DrugsKnowledge.java @@ -0,0 +1,149 @@ +package doctor.domain.entity; + +import org.w3c.dom.Text; + +import java.util.Date; + +/** + * @BelongsProject: Medical_Treatment + * @BelongsPackage: doctor.domain.entity + * @Author: jpz + * @CreateTime: 2024/1/10 22:00 + */ +public class DrugsKnowledge { + private Integer id; + private Integer drugsCategoryId; + private String name; + private Text picture; + private String effect; + private Text taboo; + private String shape; + private String packing; + private Text component; + private Text usage; + private Text sideEffects; + private String storage; + private Text mindMatter; + private String approvalNumber; + private Date createTime; + + public Integer getId() { + return id; + } + + public void setId(Integer id) { + this.id = id; + } + + public Integer getDrugsCategoryId() { + return drugsCategoryId; + } + + public void setDrugsCategoryId(Integer drugsCategoryId) { + this.drugsCategoryId = drugsCategoryId; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public Text getPicture() { + return picture; + } + + public void setPicture(Text picture) { + this.picture = picture; + } + + public String getEffect() { + return effect; + } + + public void setEffect(String effect) { + this.effect = effect; + } + + public Text getTaboo() { + return taboo; + } + + public void setTaboo(Text taboo) { + this.taboo = taboo; + } + + public String getShape() { + return shape; + } + + public void setShape(String shape) { + this.shape = shape; + } + + public String getPacking() { + return packing; + } + + public void setPacking(String packing) { + this.packing = packing; + } + + public Text getComponent() { + return component; + } + + public void setComponent(Text component) { + this.component = component; + } + + public Text getUsage() { + return usage; + } + + public void setUsage(Text usage) { + this.usage = usage; + } + + public Text getSideEffects() { + return sideEffects; + } + + public void setSideEffects(Text sideEffects) { + this.sideEffects = sideEffects; + } + + public String getStorage() { + return storage; + } + + public void setStorage(String storage) { + this.storage = storage; + } + + public Text getMindMatter() { + return mindMatter; + } + + public void setMindMatter(Text mindMatter) { + this.mindMatter = mindMatter; + } + + public String getApprovalNumber() { + return approvalNumber; + } + + public void setApprovalNumber(String approvalNumber) { + this.approvalNumber = approvalNumber; + } + + public Date getCreateTime() { + return createTime; + } + + public void setCreateTime(Date createTime) { + this.createTime = createTime; + } +} diff --git a/doctor-modules/doctor-health/src/main/java/doctor/mapper/BannersMapper.java b/doctor-modules/doctor-health/src/main/java/doctor/mapper/BannersMapper.java new file mode 100644 index 0000000..bc44a60 --- /dev/null +++ b/doctor-modules/doctor-health/src/main/java/doctor/mapper/BannersMapper.java @@ -0,0 +1,17 @@ +package doctor.mapper; + +import doctor.domain.entity.Banners; +import org.mybatis.spring.annotation.MapperScan; + +import java.util.List; + +/** + * @BelongsProject: Medical_Treatment + * @BelongsPackage: doctor.mapper + * @Author: jpz + * @CreateTime: 2024/1/10 16:12 + */ +@MapperScan +public interface BannersMapper { + List bannersShow(); +} diff --git a/doctor-modules/doctor-health/src/main/java/doctor/mapper/DepartmentMapper.java b/doctor-modules/doctor-health/src/main/java/doctor/mapper/DepartmentMapper.java new file mode 100644 index 0000000..8de4085 --- /dev/null +++ b/doctor-modules/doctor-health/src/main/java/doctor/mapper/DepartmentMapper.java @@ -0,0 +1,18 @@ +package doctor.mapper; + +import doctor.domain.entity.Department; +import org.mybatis.spring.annotation.MapperScan; + +import java.util.List; + +/** + * @BelongsProject: Medical_Treatment + * @BelongsPackage: doctor.mapper + * @Author: jpz + * @CreateTime: 2024/1/10 16:54 + */ +@MapperScan +public interface DepartmentMapper { + List list(); + +} diff --git a/doctor-modules/doctor-health/src/main/java/doctor/mapper/DiseaseCategoryMapper.java b/doctor-modules/doctor-health/src/main/java/doctor/mapper/DiseaseCategoryMapper.java new file mode 100644 index 0000000..3fcb2a5 --- /dev/null +++ b/doctor-modules/doctor-health/src/main/java/doctor/mapper/DiseaseCategoryMapper.java @@ -0,0 +1,18 @@ +package doctor.mapper; + +import doctor.domain.entity.DiseaseCategory; +import org.mybatis.spring.annotation.MapperScan; + +import java.util.List; + +/** + * @BelongsProject: Medical_Treatment + * @BelongsPackage: doctor.mapper + * @Author: jpz + * @CreateTime: 2024/1/10 20:23 + */ +@MapperScan +public interface DiseaseCategoryMapper { + + List list(Integer departmentId); +} diff --git a/doctor-modules/doctor-health/src/main/java/doctor/mapper/DiseaseKnowledgeMapper.java b/doctor-modules/doctor-health/src/main/java/doctor/mapper/DiseaseKnowledgeMapper.java new file mode 100644 index 0000000..ebabbd9 --- /dev/null +++ b/doctor-modules/doctor-health/src/main/java/doctor/mapper/DiseaseKnowledgeMapper.java @@ -0,0 +1,22 @@ +package doctor.mapper; + +import doctor.domain.entity.DiseaseKnowledge; +import doctor.domain.entity.DrugsCategory; +import org.mybatis.spring.annotation.MapperScan; + +import java.util.List; + +/** + * @BelongsProject: Medical_Treatment + * @BelongsPackage: doctor.mapper + * @Author: jpz + * @CreateTime: 2024/1/10 21:42 + */ +@MapperScan +public interface DiseaseKnowledgeMapper { + List findDiseaseKnowledge(Integer diseaseCategoryId); + + List findDrugsCategoryList(); + + List findDrugsKnowledgeList(Integer drugsCategoryId); +} diff --git a/doctor-modules/doctor-health/src/main/java/doctor/service/BannersService.java b/doctor-modules/doctor-health/src/main/java/doctor/service/BannersService.java new file mode 100644 index 0000000..42a1b41 --- /dev/null +++ b/doctor-modules/doctor-health/src/main/java/doctor/service/BannersService.java @@ -0,0 +1,18 @@ +package doctor.service; + +import doctor.domain.entity.Banners; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * @BelongsProject: Medical_Treatment + * @BelongsPackage: doctor.service + * @Author: jpz + * @CreateTime: 2024/1/10 16:10 + */ + +public interface BannersService { + List bannersShow(); + +} diff --git a/doctor-modules/doctor-health/src/main/java/doctor/service/DepartmentService.java b/doctor-modules/doctor-health/src/main/java/doctor/service/DepartmentService.java new file mode 100644 index 0000000..80ae633 --- /dev/null +++ b/doctor-modules/doctor-health/src/main/java/doctor/service/DepartmentService.java @@ -0,0 +1,16 @@ +package doctor.service; + +import doctor.domain.entity.Department; + +import java.util.List; + +/** + * @BelongsProject: Medical_Treatment + * @BelongsPackage: doctor.service + * @Author: jpz + * @CreateTime: 2024/1/10 16:52 + */ +public interface DepartmentService { + List findDepartment(); + +} diff --git a/doctor-modules/doctor-health/src/main/java/doctor/service/DiseaseCategoryService.java b/doctor-modules/doctor-health/src/main/java/doctor/service/DiseaseCategoryService.java new file mode 100644 index 0000000..81ba569 --- /dev/null +++ b/doctor-modules/doctor-health/src/main/java/doctor/service/DiseaseCategoryService.java @@ -0,0 +1,18 @@ +package doctor.service; + +import doctor.domain.entity.DiseaseCategory; + +import java.util.List; + +/** + * @BelongsProject: Medical_Treatment + * @BelongsPackage: doctor.service + * @Author: jpz + * @CreateTime: 2024/1/10 19:35 + */ + +public interface DiseaseCategoryService { + + + List findDiseaseCategory(Integer departmentId); +} diff --git a/doctor-modules/doctor-health/src/main/java/doctor/service/DiseaseKnowledgeService.java b/doctor-modules/doctor-health/src/main/java/doctor/service/DiseaseKnowledgeService.java new file mode 100644 index 0000000..f1ae174 --- /dev/null +++ b/doctor-modules/doctor-health/src/main/java/doctor/service/DiseaseKnowledgeService.java @@ -0,0 +1,20 @@ +package doctor.service; + +import doctor.domain.entity.DiseaseKnowledge; +import doctor.domain.entity.DrugsCategory; + +import java.util.List; + +/** + * @BelongsProject: Medical_Treatment + * @BelongsPackage: doctor.service + * @Author: jpz + * @CreateTime: 2024/1/10 21:40 + */ +public interface DiseaseKnowledgeService { + List findDiseaseKnowledge(Integer diseaseCategoryId); + + List findDrugsCategoryList(); + + List findDrugsKnowledgeList(Integer drugsCategoryId); +} diff --git a/doctor-modules/doctor-health/src/main/java/doctor/service/impl/BannersServiceimpl.java b/doctor-modules/doctor-health/src/main/java/doctor/service/impl/BannersServiceimpl.java new file mode 100644 index 0000000..a6aaa36 --- /dev/null +++ b/doctor-modules/doctor-health/src/main/java/doctor/service/impl/BannersServiceimpl.java @@ -0,0 +1,25 @@ +package doctor.service.impl; + +import doctor.domain.entity.Banners; +import doctor.mapper.BannersMapper; +import doctor.service.BannersService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * @BelongsProject: Medical_Treatment + * @BelongsPackage: doctor.service.impl + * @Author: jpz + * @CreateTime: 2024/1/10 16:10 + */ +@Service +public class BannersServiceimpl implements BannersService { + @Autowired + private BannersMapper bannersMapper; + @Override + public List bannersShow() { + return bannersMapper.bannersShow(); + } +} diff --git a/doctor-modules/doctor-health/src/main/java/doctor/service/impl/DepartmentServiceimpl.java b/doctor-modules/doctor-health/src/main/java/doctor/service/impl/DepartmentServiceimpl.java new file mode 100644 index 0000000..bac2a53 --- /dev/null +++ b/doctor-modules/doctor-health/src/main/java/doctor/service/impl/DepartmentServiceimpl.java @@ -0,0 +1,25 @@ +package doctor.service.impl; + +import doctor.domain.entity.Department; +import doctor.mapper.DepartmentMapper; +import doctor.service.DepartmentService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * @BelongsProject: Medical_Treatment + * @BelongsPackage: doctor.service.impl + * @Author: jpz + * @CreateTime: 2024/1/10 16:53 + */ +@Service +public class DepartmentServiceimpl implements DepartmentService { + @Autowired + private DepartmentMapper departmentMapper; + @Override + public List findDepartment() { + return departmentMapper.list(); + } +} diff --git a/doctor-modules/doctor-health/src/main/java/doctor/service/impl/DiseaseCategoryServiceimpl.java b/doctor-modules/doctor-health/src/main/java/doctor/service/impl/DiseaseCategoryServiceimpl.java new file mode 100644 index 0000000..da0babb --- /dev/null +++ b/doctor-modules/doctor-health/src/main/java/doctor/service/impl/DiseaseCategoryServiceimpl.java @@ -0,0 +1,26 @@ +package doctor.service.impl; + +import doctor.domain.entity.DiseaseCategory; +import doctor.mapper.DiseaseCategoryMapper; +import doctor.service.DiseaseCategoryService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * @BelongsProject: Medical_Treatment + * @BelongsPackage: doctor.service.impl + * @Author: jpz + * @CreateTime: 2024/1/10 20:21 + */ +@Service +public class DiseaseCategoryServiceimpl implements DiseaseCategoryService { + @Autowired + private DiseaseCategoryMapper diseaseCategoryMapper; + + @Override + public List findDiseaseCategory(Integer departmentId) { + return diseaseCategoryMapper.list(departmentId); + } +} diff --git a/doctor-modules/doctor-health/src/main/java/doctor/service/impl/DiseaseKnowledgeServiceimpl.java b/doctor-modules/doctor-health/src/main/java/doctor/service/impl/DiseaseKnowledgeServiceimpl.java new file mode 100644 index 0000000..83db7b3 --- /dev/null +++ b/doctor-modules/doctor-health/src/main/java/doctor/service/impl/DiseaseKnowledgeServiceimpl.java @@ -0,0 +1,36 @@ +package doctor.service.impl; + +import doctor.domain.entity.DiseaseKnowledge; +import doctor.domain.entity.DrugsCategory; +import doctor.mapper.DiseaseKnowledgeMapper; +import doctor.service.DiseaseKnowledgeService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * @BelongsProject: Medical_Treatment + * @BelongsPackage: doctor.service.impl + * @Author: jpz + * @CreateTime: 2024/1/10 21:40 + */ +@Service +public class DiseaseKnowledgeServiceimpl implements DiseaseKnowledgeService { + @Autowired + private DiseaseKnowledgeMapper diseaseKnowledgeMapper; + @Override + public List findDiseaseKnowledge(Integer diseaseCategoryId) { + return diseaseKnowledgeMapper.findDiseaseKnowledge(diseaseCategoryId); + } + + @Override + public List findDrugsCategoryList() { + return diseaseKnowledgeMapper.findDrugsCategoryList(); + } + + @Override + public List findDrugsKnowledgeList(Integer drugsCategoryId) { + return diseaseKnowledgeMapper.findDrugsKnowledgeList(drugsCategoryId); + } +} diff --git a/doctor-modules/doctor-health/src/main/resources/bootstrap.yml b/doctor-modules/doctor-health/src/main/resources/bootstrap.yml index 31e3ecc..691386c 100644 --- a/doctor-modules/doctor-health/src/main/resources/bootstrap.yml +++ b/doctor-modules/doctor-health/src/main/resources/bootstrap.yml @@ -15,11 +15,11 @@ spring: discovery: # 服务注册地址 server-addr: 101.34.77.101:8848 - namespace: 9de208a6-cb30-41ae-a880-78196c99c050 + namespace: 7e1e997d-5fa4-4f84-9f48-3e0adf830a37 config: # 配置中心地址 server-addr: 101.34.77.101:8848 - namespace: 9de208a6-cb30-41ae-a880-78196c99c050 + namespace: 7e1e997d-5fa4-4f84-9f48-3e0adf830a37 # 配置文件格式 file-extension: yml # 共享配置 diff --git a/doctor-modules/doctor-health/src/main/resources/mapper/doctor/BannersServiceMapper.xml b/doctor-modules/doctor-health/src/main/resources/mapper/doctor/BannersServiceMapper.xml new file mode 100644 index 0000000..905f59a --- /dev/null +++ b/doctor-modules/doctor-health/src/main/resources/mapper/doctor/BannersServiceMapper.xml @@ -0,0 +1,11 @@ + + + + + + + diff --git a/doctor-modules/doctor-health/src/main/resources/mapper/doctor/DepartmentServiceMapper.xml b/doctor-modules/doctor-health/src/main/resources/mapper/doctor/DepartmentServiceMapper.xml new file mode 100644 index 0000000..9cb0cbe --- /dev/null +++ b/doctor-modules/doctor-health/src/main/resources/mapper/doctor/DepartmentServiceMapper.xml @@ -0,0 +1,11 @@ + + + + + + + diff --git a/doctor-modules/doctor-health/src/main/resources/mapper/doctor/DiseaseCategoryServiceMapper.xml b/doctor-modules/doctor-health/src/main/resources/mapper/doctor/DiseaseCategoryServiceMapper.xml new file mode 100644 index 0000000..d883b5a --- /dev/null +++ b/doctor-modules/doctor-health/src/main/resources/mapper/doctor/DiseaseCategoryServiceMapper.xml @@ -0,0 +1,11 @@ + + + + + + + diff --git a/doctor-modules/doctor-health/src/main/resources/mapper/doctor/DiseaseKnowledgeServiceMapper.xml b/doctor-modules/doctor-health/src/main/resources/mapper/doctor/DiseaseKnowledgeServiceMapper.xml new file mode 100644 index 0000000..86fa2e6 --- /dev/null +++ b/doctor-modules/doctor-health/src/main/resources/mapper/doctor/DiseaseKnowledgeServiceMapper.xml @@ -0,0 +1,19 @@ + + + + + + + + + diff --git a/doctor-modules/doctor-job/src/main/resources/bootstrap.yml b/doctor-modules/doctor-job/src/main/resources/bootstrap.yml index 537c5d6..687623f 100644 --- a/doctor-modules/doctor-job/src/main/resources/bootstrap.yml +++ b/doctor-modules/doctor-job/src/main/resources/bootstrap.yml @@ -15,11 +15,11 @@ spring: discovery: # 服务注册地址 server-addr: 101.34.77.101:8848 - namespace: 9de208a6-cb30-41ae-a880-78196c99c050 + namespace: 7e1e997d-5fa4-4f84-9f48-3e0adf830a37 config: # 配置中心地址 server-addr: 101.34.77.101:8848 - namespace: 9de208a6-cb30-41ae-a880-78196c99c050 + namespace: 7e1e997d-5fa4-4f84-9f48-3e0adf830a37 # 配置文件格式 file-extension: yml # 共享配置 diff --git a/doctor-modules/doctor-system/src/main/resources/bootstrap.yml b/doctor-modules/doctor-system/src/main/resources/bootstrap.yml index 8def34f..632b0bd 100644 --- a/doctor-modules/doctor-system/src/main/resources/bootstrap.yml +++ b/doctor-modules/doctor-system/src/main/resources/bootstrap.yml @@ -15,11 +15,11 @@ spring: discovery: # 服务注册地址 server-addr: 101.34.77.101:8848 - namespace: 9de208a6-cb30-41ae-a880-78196c99c050 + namespace: 7e1e997d-5fa4-4f84-9f48-3e0adf830a37 config: # 配置中心地址 server-addr: 101.34.77.101:8848 - namespace: 9de208a6-cb30-41ae-a880-78196c99c050 + namespace: 7e1e997d-5fa4-4f84-9f48-3e0adf830a37 # 配置文件格式 file-extension: yml # 共享配置 diff --git a/doctor-visual/doctor-monitor/src/main/resources/bootstrap.yml b/doctor-visual/doctor-monitor/src/main/resources/bootstrap.yml index 979155f..f378a98 100644 --- a/doctor-visual/doctor-monitor/src/main/resources/bootstrap.yml +++ b/doctor-visual/doctor-monitor/src/main/resources/bootstrap.yml @@ -15,11 +15,11 @@ spring: discovery: # 服务注册地址 server-addr: 101.34.77.101:8848 - namespace: 9de208a6-cb30-41ae-a880-78196c99c050 + namespace: 7e1e997d-5fa4-4f84-9f48-3e0adf830a37 config: # 配置中心地址 server-addr: 101.34.77.101:8848 - namespace: 9de208a6-cb30-41ae-a880-78196c99c050 + namespace: 7e1e997d-5fa4-4f84-9f48-3e0adf830a37 # 配置文件格式 file-extension: yml # 共享配置 From 046dbafaa243e61ed2a820526f078bc09ef1bfc6 Mon Sep 17 00:00:00 2001 From: jpz <3185133571@qq.com> Date: Thu, 11 Jan 2024 22:24:55 +0800 Subject: [PATCH 5/7] jpz5.0 --- .../common/core/constant/Constants.java | 7 +- .../doctor/common/core/domain/HealthR.java | 116 ++++++++++++++++++ doctor-modules/doctor-health/pom.xml | 4 + .../doctor/controller/BannersController.java | 5 +- .../controller/DepartmentController.java | 5 +- .../controller/DiseaseCategoryController.java | 5 +- .../DiseaseKnowledgeController.java | 20 ++- .../controller/InformationController.java | 41 +++++++ .../main/java/doctor/entity/Information.java | 85 +++++++++++++ .../java/doctor/entity/InformationPlate.java | 16 +++ .../doctor/entity/UserAdoptCommentEntity.java | 83 ++++++++++++- .../doctor/entity/UserArchivesEntity.java | 58 ++++++++- .../doctor/entity/UserBindingLoginEntity.java | 50 +++++++- .../entity/UserConsumptionRecordEntity.java | 58 ++++++++- .../doctor/entity/UserDoctorFollowEntity.java | 34 ++++- .../doctor/entity/UserDrawRecordEntity.java | 66 +++++++++- .../main/java/doctor/entity/UserEntity.java | 114 ++++++++++++++++- .../java/doctor/entity/UserIdCardEntity.java | 82 ++++++++++++- .../entity/UserInfoCollectionEntity.java | 34 ++++- .../doctor/mapper/DiseaseKnowledgeMapper.java | 6 + .../java/doctor/mapper/InformationMapper.java | 21 ++++ .../service/DiseaseKnowledgeService.java | 4 + .../doctor/service/InformationService.java | 19 +++ .../impl/DiseaseKnowledgeServiceimpl.java | 4 + .../service/impl/InformationServiceimpl.java | 32 +++++ .../doctor/DiseaseKnowledgeServiceMapper.xml | 1 + .../doctor/InformationMapperServiceMapper.xml | 17 +++ 27 files changed, 964 insertions(+), 23 deletions(-) create mode 100644 doctor-common/doctor-common-core/src/main/java/doctor/common/core/domain/HealthR.java create mode 100644 doctor-modules/doctor-health/src/main/java/doctor/controller/InformationController.java create mode 100644 doctor-modules/doctor-health/src/main/java/doctor/entity/Information.java create mode 100644 doctor-modules/doctor-health/src/main/java/doctor/entity/InformationPlate.java create mode 100644 doctor-modules/doctor-health/src/main/java/doctor/mapper/InformationMapper.java create mode 100644 doctor-modules/doctor-health/src/main/java/doctor/service/InformationService.java create mode 100644 doctor-modules/doctor-health/src/main/java/doctor/service/impl/InformationServiceimpl.java create mode 100644 doctor-modules/doctor-health/src/main/resources/mapper/doctor/InformationMapperServiceMapper.xml diff --git a/doctor-common/doctor-common-core/src/main/java/doctor/common/core/constant/Constants.java b/doctor-common/doctor-common-core/src/main/java/doctor/common/core/constant/Constants.java index 9554ee4..7944d40 100644 --- a/doctor-common/doctor-common-core/src/main/java/doctor/common/core/constant/Constants.java +++ b/doctor-common/doctor-common-core/src/main/java/doctor/common/core/constant/Constants.java @@ -2,7 +2,7 @@ package doctor.common.core.constant; /** * 通用常量信息 - * + * * @author ruoyi */ public class Constants @@ -51,6 +51,11 @@ public class Constants * 成功标记 */ public static final Integer SUCCESS = 200; + /** + * 维度健康成功标识 + */ + public static final String SUCCESS_HEALTH = "0000"; + public static final String FAIL_HEALTH = "9001"; /** * 失败标记 diff --git a/doctor-common/doctor-common-core/src/main/java/doctor/common/core/domain/HealthR.java b/doctor-common/doctor-common-core/src/main/java/doctor/common/core/domain/HealthR.java new file mode 100644 index 0000000..1138ac6 --- /dev/null +++ b/doctor-common/doctor-common-core/src/main/java/doctor/common/core/domain/HealthR.java @@ -0,0 +1,116 @@ +package doctor.common.core.domain; + + +import com.fasterxml.jackson.annotation.JsonPropertyOrder; +import doctor.common.core.constant.Constants; + +import java.io.Serializable; + +/** + * 响应信息主体 + * + * @author ruoyi + */ +@JsonPropertyOrder({ "result", "message", "status" }) +public class HealthR implements Serializable +{ + private static final long serialVersionUID = 1L; + + /** 成功 */ + public static final String SUCCESS = Constants.SUCCESS_HEALTH; + + /** 失败 */ + public static final String FAIL = Constants.FAIL_HEALTH; + + private T result; + private String status; + + private String message; + + + + public static HealthR ok() + { + return restResult(null, SUCCESS, null); + } + + public static HealthR ok(T result) + { + return restResult(result, SUCCESS, null); + } + + public static HealthR ok(T result, String message) + { + return restResult(result, SUCCESS, message); + } + + public static HealthR fail() + { + return restResult(null, FAIL, null); + } + + public static HealthR fail(String message) + { + return restResult(null, FAIL, message); + } + + public static HealthR fail(T result) + { + return restResult(result, FAIL, null); + } + + public static HealthR fail(T result, String message) + { + return restResult(result, FAIL, message); + } + + public static HealthR fail(String status, String message) + { + return restResult(null, status, message); + } + + private static HealthR restResult(T result, String status, String message) + { + HealthR apiResult = new HealthR<>(); + apiResult.setResult(result); + apiResult.setMessage(message); + apiResult.setStatus(status); + return apiResult; + } + + public String getStatus() { + return status; + } + + public void setStatus(String status) { + this.status = status; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public T getResult() { + return result; + } + + public void setResult(T result) { + this.result = result; + } + + public static Boolean isError(HealthR ret) + { + return !isSuccess(ret); + } + + public static Boolean isSuccess(HealthR ret) + { + return HealthR.SUCCESS == ret.getStatus(); + } + + +} diff --git a/doctor-modules/doctor-health/pom.xml b/doctor-modules/doctor-health/pom.xml index d9360ce..08360fd 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 + diff --git a/doctor-modules/doctor-health/src/main/java/doctor/controller/BannersController.java b/doctor-modules/doctor-health/src/main/java/doctor/controller/BannersController.java index a77598a..59cd42c 100644 --- a/doctor-modules/doctor-health/src/main/java/doctor/controller/BannersController.java +++ b/doctor-modules/doctor-health/src/main/java/doctor/controller/BannersController.java @@ -1,5 +1,6 @@ package doctor.controller; +import doctor.common.core.domain.HealthR; import doctor.common.core.domain.R; import doctor.domain.entity.Banners; import doctor.service.BannersService; @@ -23,8 +24,8 @@ public class BannersController { @Autowired private BannersService bannersService; @GetMapping("/bannersShow") - public R> bannersShow(){ + public HealthR> bannersShow(){ List banners = bannersService.bannersShow(); - return R.ok(banners); + return HealthR.ok(banners); } } diff --git a/doctor-modules/doctor-health/src/main/java/doctor/controller/DepartmentController.java b/doctor-modules/doctor-health/src/main/java/doctor/controller/DepartmentController.java index f10f3d0..68efab3 100644 --- a/doctor-modules/doctor-health/src/main/java/doctor/controller/DepartmentController.java +++ b/doctor-modules/doctor-health/src/main/java/doctor/controller/DepartmentController.java @@ -1,5 +1,6 @@ package doctor.controller; +import doctor.common.core.domain.HealthR; import doctor.common.core.domain.R; import doctor.domain.entity.Department; import doctor.service.DepartmentService; @@ -22,8 +23,8 @@ public class DepartmentController { @Autowired private DepartmentService departmentService; @GetMapping("/findDepartment") - public R> findDepartment(){ + public HealthR> findDepartment(){ List list=departmentService.findDepartment(); - return R.ok(list); + return HealthR.ok(list); } } diff --git a/doctor-modules/doctor-health/src/main/java/doctor/controller/DiseaseCategoryController.java b/doctor-modules/doctor-health/src/main/java/doctor/controller/DiseaseCategoryController.java index b8a4c8f..8b16640 100644 --- a/doctor-modules/doctor-health/src/main/java/doctor/controller/DiseaseCategoryController.java +++ b/doctor-modules/doctor-health/src/main/java/doctor/controller/DiseaseCategoryController.java @@ -1,5 +1,6 @@ package doctor.controller; +import doctor.common.core.domain.HealthR; import doctor.common.core.domain.R; import doctor.domain.entity.DiseaseCategory; import doctor.service.DiseaseCategoryService; @@ -25,8 +26,8 @@ public class DiseaseCategoryController { private DiseaseCategoryService diseaseCategoryService; @GetMapping("/findDiseaseCategory") - public R> findDiseaseCategory(@RequestParam Integer departmentId){ + public HealthR> findDiseaseCategory(@RequestParam Integer departmentId){ List list=diseaseCategoryService.findDiseaseCategory(departmentId); - return R.ok(list); + return HealthR.ok(list); } } diff --git a/doctor-modules/doctor-health/src/main/java/doctor/controller/DiseaseKnowledgeController.java b/doctor-modules/doctor-health/src/main/java/doctor/controller/DiseaseKnowledgeController.java index 6d8c440..85f2987 100644 --- a/doctor-modules/doctor-health/src/main/java/doctor/controller/DiseaseKnowledgeController.java +++ b/doctor-modules/doctor-health/src/main/java/doctor/controller/DiseaseKnowledgeController.java @@ -1,10 +1,13 @@ package doctor.controller; +import doctor.common.core.domain.HealthR; import doctor.common.core.domain.R; import doctor.domain.entity.DiseaseKnowledge; import doctor.domain.entity.DrugsCategory; import doctor.domain.entity.DrugsKnowledge; +import doctor.entity.Information; +import doctor.entity.InformationPlate; import doctor.service.DiseaseKnowledgeService; import org.bouncycastle.cert.ocsp.Req; import org.springframework.beans.factory.annotation.Autowired; @@ -31,23 +34,28 @@ public class DiseaseKnowledgeController { private DiseaseKnowledgeService diseaseKnowledgeService; //罕见病症详情 @GetMapping("/findDiseaseKnowledge") - public R> findDiseaseKnowledge(@RequestParam Integer diseaseCategoryId){ - return R.ok(diseaseKnowledgeService.findDiseaseKnowledge(diseaseCategoryId)); + public HealthR> findDiseaseKnowledge(@RequestParam Integer diseaseCategoryId){ + return HealthR.ok(diseaseKnowledgeService.findDiseaseKnowledge(diseaseCategoryId)); } @GetMapping("/findDrugsCategoryList") - public R> findDrugsCategoryList(){ - return R.ok(diseaseKnowledgeService.findDrugsCategoryList()); + public HealthR> findDrugsCategoryList(){ + return HealthR.ok(diseaseKnowledgeService.findDrugsCategoryList()); } @GetMapping("/findDrugsKnowledgeList") - public R> findDrugsKnowledgeList(@RequestParam Integer drugsCategoryId, + public HealthR> findDrugsKnowledgeList(@RequestParam Integer drugsCategoryId, @RequestParam(value = "page",defaultValue = "1") Integer page, @RequestParam(value = "count",defaultValue = "5") Integer count){ startPage(page,count); List list=diseaseKnowledgeService.findDrugsKnowledgeList(drugsCategoryId); - return R.ok(list); + return HealthR.ok(list); } + + + + + } diff --git a/doctor-modules/doctor-health/src/main/java/doctor/controller/InformationController.java b/doctor-modules/doctor-health/src/main/java/doctor/controller/InformationController.java new file mode 100644 index 0000000..7304f18 --- /dev/null +++ b/doctor-modules/doctor-health/src/main/java/doctor/controller/InformationController.java @@ -0,0 +1,41 @@ +package doctor.controller; + +import doctor.common.core.domain.HealthR; +import doctor.entity.Information; +import doctor.entity.InformationPlate; +import doctor.service.InformationService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; + +import static com.github.pagehelper.page.PageMethod.startPage; + +/** + * @BelongsProject: Medical_Treatment + * @BelongsPackage: doctor.controller + * @Author: jpz + * @CreateTime: 2024/1/11 16:19 + */ +@RestController +@RequestMapping("/share/information/v1") +public class InformationController { + @Autowired + private InformationService informationService; + @GetMapping("/findInformationList") + public HealthR> findInformationList(@RequestParam Integer plateId, + @RequestParam(value = "page",defaultValue = "1") Integer page, + @RequestParam(value = "count",defaultValue = "5") Integer count){ + startPage(page,count); + List list=informationService.findInformationList(plateId); + return HealthR.ok(list); + } + @GetMapping("/findInformationPlateList") + public HealthR> findInformationPlateList(){ + List list=informationService.findInformationPlateList(); + return HealthR.ok(list); + } +} diff --git a/doctor-modules/doctor-health/src/main/java/doctor/entity/Information.java b/doctor-modules/doctor-health/src/main/java/doctor/entity/Information.java new file mode 100644 index 0000000..d62d679 --- /dev/null +++ b/doctor-modules/doctor-health/src/main/java/doctor/entity/Information.java @@ -0,0 +1,85 @@ +package doctor.entity; + +import java.util.Date; + +/** + * @BelongsProject: Medical_Treatment + * @BelongsPackage: doctor.entity + * @Author: jpz + * @CreateTime: 2024/1/11 16:03 + */ + +public class Information { + private Integer id; + private Integer plateId; + private String title; + private String thumbnail; + private String content; + private String source; + private Date createTime; + private Date releaseTime; + + public Integer getId() { + return id; + } + + public void setId(Integer id) { + this.id = id; + } + + public Integer getPlateId() { + return plateId; + } + + public void setPlateId(Integer plateId) { + this.plateId = plateId; + } + + public String getTitle() { + return title; + } + + public void setTitle(String title) { + this.title = title; + } + + public String getThumbnail() { + return thumbnail; + } + + public void setThumbnail(String thumbnail) { + this.thumbnail = thumbnail; + } + + public String getContent() { + return content; + } + + public void setContent(String content) { + this.content = content; + } + + public String getSource() { + return source; + } + + public void setSource(String source) { + this.source = source; + } + + public Date getCreateTime() { + return createTime; + } + + public void setCreateTime(Date createTime) { + this.createTime = createTime; + } + + public Date getReleaseTime() { + return releaseTime; + } + + public void setReleaseTime(Date releaseTime) { + this.releaseTime = releaseTime; + } +} diff --git a/doctor-modules/doctor-health/src/main/java/doctor/entity/InformationPlate.java b/doctor-modules/doctor-health/src/main/java/doctor/entity/InformationPlate.java new file mode 100644 index 0000000..c6f1630 --- /dev/null +++ b/doctor-modules/doctor-health/src/main/java/doctor/entity/InformationPlate.java @@ -0,0 +1,16 @@ +package doctor.entity; + +import java.util.Date; + +/** + * @BelongsProject: Medical_Treatment + * @BelongsPackage: doctor.entity + * @Author: jpz + * @CreateTime: 2024/1/11 16:12 + */ +public class InformationPlate { + private Integer id; + private String name; + private String sort; + private Date createTime; +} diff --git a/doctor-modules/doctor-health/src/main/java/doctor/entity/UserAdoptCommentEntity.java b/doctor-modules/doctor-health/src/main/java/doctor/entity/UserAdoptCommentEntity.java index 15cbd8f..a0e205a 100644 --- a/doctor-modules/doctor-health/src/main/java/doctor/entity/UserAdoptCommentEntity.java +++ b/doctor-modules/doctor-health/src/main/java/doctor/entity/UserAdoptCommentEntity.java @@ -1,6 +1,5 @@ package doctor.entity; -import lombok.Data; import java.util.Date; @@ -10,7 +9,7 @@ import java.util.Date; * @Author: jpz * @CreateTime: 2024/1/8 21:33 */ -@Data + public class UserAdoptCommentEntity { private Integer id; private Integer userId; @@ -22,4 +21,84 @@ public class UserAdoptCommentEntity { private String disease; private String content; private Date createTime; + + public Integer getId() { + return id; + } + + public void setId(Integer id) { + this.id = id; + } + + public Integer getUserId() { + return userId; + } + + public void setUserId(Integer userId) { + this.userId = userId; + } + + public Integer getReleaseUserId() { + return releaseUserId; + } + + public void setReleaseUserId(Integer releaseUserId) { + this.releaseUserId = releaseUserId; + } + + public String getReleaseUserName() { + return releaseUserName; + } + + public void setReleaseUserName(String releaseUserName) { + this.releaseUserName = releaseUserName; + } + + public String getReleaseUserHeadPic() { + return releaseUserHeadPic; + } + + public void setReleaseUserHeadPic(String releaseUserHeadPic) { + this.releaseUserHeadPic = releaseUserHeadPic; + } + + public Integer getSickCircleId() { + return sickCircleId; + } + + public void setSickCircleId(Integer sickCircleId) { + this.sickCircleId = sickCircleId; + } + + public String getTitle() { + return title; + } + + public void setTitle(String title) { + this.title = title; + } + + public String getDisease() { + return disease; + } + + public void setDisease(String disease) { + this.disease = disease; + } + + public String getContent() { + return content; + } + + public void setContent(String content) { + this.content = content; + } + + public Date getCreateTime() { + return createTime; + } + + public void setCreateTime(Date createTime) { + this.createTime = createTime; + } } diff --git a/doctor-modules/doctor-health/src/main/java/doctor/entity/UserArchivesEntity.java b/doctor-modules/doctor-health/src/main/java/doctor/entity/UserArchivesEntity.java index 5f11bcd..6b8b164 100644 --- a/doctor-modules/doctor-health/src/main/java/doctor/entity/UserArchivesEntity.java +++ b/doctor-modules/doctor-health/src/main/java/doctor/entity/UserArchivesEntity.java @@ -10,7 +10,7 @@ import java.util.Date; * @Author: jpz * @CreateTime: 2024/1/8 21:37 */ -@Data + public class UserArchivesEntity { private Integer id; private Integer userId; @@ -19,4 +19,60 @@ public class UserArchivesEntity { private Integer bankCardType; private Date updateTime; private Date createTime; + + public Integer getId() { + return id; + } + + public void setId(Integer id) { + this.id = id; + } + + public Integer getUserId() { + return userId; + } + + public void setUserId(Integer userId) { + this.userId = userId; + } + + public String getBankCardNumber() { + return bankCardNumber; + } + + public void setBankCardNumber(String bankCardNumber) { + this.bankCardNumber = bankCardNumber; + } + + public String getBankName() { + return bankName; + } + + public void setBankName(String bankName) { + this.bankName = bankName; + } + + public Integer getBankCardType() { + return bankCardType; + } + + public void setBankCardType(Integer bankCardType) { + this.bankCardType = bankCardType; + } + + public Date getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(Date updateTime) { + this.updateTime = updateTime; + } + + public Date getCreateTime() { + return createTime; + } + + public void setCreateTime(Date createTime) { + this.createTime = createTime; + } } diff --git a/doctor-modules/doctor-health/src/main/java/doctor/entity/UserBindingLoginEntity.java b/doctor-modules/doctor-health/src/main/java/doctor/entity/UserBindingLoginEntity.java index 194cd86..6d21a92 100644 --- a/doctor-modules/doctor-health/src/main/java/doctor/entity/UserBindingLoginEntity.java +++ b/doctor-modules/doctor-health/src/main/java/doctor/entity/UserBindingLoginEntity.java @@ -10,7 +10,7 @@ import java.util.Date; * @Author: jpz * @CreateTime: 2024/1/8 21:40 */ -@Data + public class UserBindingLoginEntity { private Integer id; private Integer userId; @@ -18,4 +18,52 @@ public class UserBindingLoginEntity { private String openId; private String unionId; private Date createTime; + + public Integer getId() { + return id; + } + + public void setId(Integer id) { + this.id = id; + } + + public Integer getUserId() { + return userId; + } + + public void setUserId(Integer userId) { + this.userId = userId; + } + + public Integer getType() { + return type; + } + + public void setType(Integer type) { + this.type = type; + } + + public String getOpenId() { + return openId; + } + + public void setOpenId(String openId) { + this.openId = openId; + } + + public String getUnionId() { + return unionId; + } + + public void setUnionId(String unionId) { + this.unionId = unionId; + } + + public Date getCreateTime() { + return createTime; + } + + public void setCreateTime(Date createTime) { + this.createTime = createTime; + } } diff --git a/doctor-modules/doctor-health/src/main/java/doctor/entity/UserConsumptionRecordEntity.java b/doctor-modules/doctor-health/src/main/java/doctor/entity/UserConsumptionRecordEntity.java index 61df2a3..81cd5e5 100644 --- a/doctor-modules/doctor-health/src/main/java/doctor/entity/UserConsumptionRecordEntity.java +++ b/doctor-modules/doctor-health/src/main/java/doctor/entity/UserConsumptionRecordEntity.java @@ -10,7 +10,7 @@ import java.util.Date; * @Author: jpz * @CreateTime: 2024/1/8 21:45 */ -@Data + public class UserConsumptionRecordEntity { private Integer id; private Integer userId; @@ -19,4 +19,60 @@ public class UserConsumptionRecordEntity { private Integer changeNum; private String remark; private Date createTime; + + public Integer getId() { + return id; + } + + public void setId(Integer id) { + this.id = id; + } + + public Integer getUserId() { + return userId; + } + + public void setUserId(Integer userId) { + this.userId = userId; + } + + public Integer getType() { + return type; + } + + public void setType(Integer type) { + this.type = type; + } + + public Integer getBalance() { + return balance; + } + + public void setBalance(Integer balance) { + this.balance = balance; + } + + public Integer getChangeNum() { + return changeNum; + } + + public void setChangeNum(Integer changeNum) { + this.changeNum = changeNum; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public Date getCreateTime() { + return createTime; + } + + public void setCreateTime(Date createTime) { + this.createTime = createTime; + } } diff --git a/doctor-modules/doctor-health/src/main/java/doctor/entity/UserDoctorFollowEntity.java b/doctor-modules/doctor-health/src/main/java/doctor/entity/UserDoctorFollowEntity.java index 12eb761..8c8329b 100644 --- a/doctor-modules/doctor-health/src/main/java/doctor/entity/UserDoctorFollowEntity.java +++ b/doctor-modules/doctor-health/src/main/java/doctor/entity/UserDoctorFollowEntity.java @@ -10,10 +10,42 @@ import java.util.Date; * @Author: jpz * @CreateTime: 2024/1/8 21:49 */ -@Data + public class UserDoctorFollowEntity { private Integer id; private Integer userId; private Integer doctorId; private Date createTime; + + public Integer getId() { + return id; + } + + public void setId(Integer id) { + this.id = id; + } + + public Integer getUserId() { + return userId; + } + + public void setUserId(Integer userId) { + this.userId = userId; + } + + public Integer getDoctorId() { + return doctorId; + } + + public void setDoctorId(Integer doctorId) { + this.doctorId = doctorId; + } + + public Date getCreateTime() { + return createTime; + } + + public void setCreateTime(Date createTime) { + this.createTime = createTime; + } } diff --git a/doctor-modules/doctor-health/src/main/java/doctor/entity/UserDrawRecordEntity.java b/doctor-modules/doctor-health/src/main/java/doctor/entity/UserDrawRecordEntity.java index 46ef9fe..b428624 100644 --- a/doctor-modules/doctor-health/src/main/java/doctor/entity/UserDrawRecordEntity.java +++ b/doctor-modules/doctor-health/src/main/java/doctor/entity/UserDrawRecordEntity.java @@ -10,7 +10,7 @@ import java.util.Date; * @Author: jpz * @CreateTime: 2024/1/8 21:53 */ -@Data + public class UserDrawRecordEntity { private Integer id; private Integer userId; @@ -20,4 +20,68 @@ public class UserDrawRecordEntity { private String remark; private Integer status; private Date createTime; + + public Integer getId() { + return id; + } + + public void setId(Integer id) { + this.id = id; + } + + public Integer getUserId() { + return userId; + } + + public void setUserId(Integer userId) { + this.userId = userId; + } + + public Double getMoney() { + return money; + } + + public void setMoney(Double money) { + this.money = money; + } + + public String getBankCardNumber() { + return bankCardNumber; + } + + public void setBankCardNumber(String bankCardNumber) { + this.bankCardNumber = bankCardNumber; + } + + public String getBankName() { + return bankName; + } + + public void setBankName(String bankName) { + this.bankName = bankName; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public Integer getStatus() { + return status; + } + + public void setStatus(Integer status) { + this.status = status; + } + + public Date getCreateTime() { + return createTime; + } + + public void setCreateTime(Date createTime) { + this.createTime = createTime; + } } diff --git a/doctor-modules/doctor-health/src/main/java/doctor/entity/UserEntity.java b/doctor-modules/doctor-health/src/main/java/doctor/entity/UserEntity.java index c8aa9e3..a9298e5 100644 --- a/doctor-modules/doctor-health/src/main/java/doctor/entity/UserEntity.java +++ b/doctor-modules/doctor-health/src/main/java/doctor/entity/UserEntity.java @@ -10,7 +10,7 @@ import java.util.Date; * @Author: jpz * @CreateTime: 2024/1/8 20:59 */ -@Data + public class UserEntity { private Integer id; private String phone; @@ -26,4 +26,116 @@ public class UserEntity { private String invitationCode; private Date updateTime; private Date createTime; + + public Integer getId() { + return id; + } + + public void setId(Integer id) { + this.id = id; + } + + public String getPhone() { + return phone; + } + + public void setPhone(String phone) { + this.phone = phone; + } + + public String getPwd() { + return pwd; + } + + public void setPwd(String pwd) { + this.pwd = pwd; + } + + public String getEmail() { + return email; + } + + public void setEmail(String email) { + this.email = email; + } + + public String getNickName() { + return nickName; + } + + public void setNickName(String nickName) { + this.nickName = nickName; + } + + public String getUserName() { + return userName; + } + + public void setUserName(String userName) { + this.userName = userName; + } + + public String getHeadPic() { + return headPic; + } + + public void setHeadPic(String headPic) { + this.headPic = headPic; + } + + public Integer getSex() { + return sex; + } + + public void setSex(Integer sex) { + this.sex = sex; + } + + public Integer getAge() { + return age; + } + + public void setAge(Integer age) { + this.age = age; + } + + public Integer getHeight() { + return height; + } + + public void setHeight(Integer height) { + this.height = height; + } + + public Integer getWeight() { + return weight; + } + + public void setWeight(Integer weight) { + this.weight = weight; + } + + public String getInvitationCode() { + return invitationCode; + } + + public void setInvitationCode(String invitationCode) { + this.invitationCode = invitationCode; + } + + public Date getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(Date updateTime) { + this.updateTime = updateTime; + } + + public Date getCreateTime() { + return createTime; + } + + public void setCreateTime(Date createTime) { + this.createTime = createTime; + } } diff --git a/doctor-modules/doctor-health/src/main/java/doctor/entity/UserIdCardEntity.java b/doctor-modules/doctor-health/src/main/java/doctor/entity/UserIdCardEntity.java index 24278d6..529c2b5 100644 --- a/doctor-modules/doctor-health/src/main/java/doctor/entity/UserIdCardEntity.java +++ b/doctor-modules/doctor-health/src/main/java/doctor/entity/UserIdCardEntity.java @@ -10,7 +10,7 @@ import java.util.Date; * @Author: jpz * @CreateTime: 2024/1/8 21:56 */ -@Data + public class UserIdCardEntity { private Integer id; private Integer userId; @@ -22,4 +22,84 @@ public class UserIdCardEntity { private String idNumber; private String issueOffice; private Date createTime; + + public Integer getId() { + return id; + } + + public void setId(Integer id) { + this.id = id; + } + + public Integer getUserId() { + return userId; + } + + public void setUserId(Integer userId) { + this.userId = userId; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getSex() { + return sex; + } + + public void setSex(String sex) { + this.sex = sex; + } + + public String getNation() { + return nation; + } + + public void setNation(String nation) { + this.nation = nation; + } + + public String getBirthday() { + return birthday; + } + + public void setBirthday(String birthday) { + this.birthday = birthday; + } + + public String getAddress() { + return address; + } + + public void setAddress(String address) { + this.address = address; + } + + public String getIdNumber() { + return idNumber; + } + + public void setIdNumber(String idNumber) { + this.idNumber = idNumber; + } + + public String getIssueOffice() { + return issueOffice; + } + + public void setIssueOffice(String issueOffice) { + this.issueOffice = issueOffice; + } + + public Date getCreateTime() { + return createTime; + } + + public void setCreateTime(Date createTime) { + this.createTime = createTime; + } } diff --git a/doctor-modules/doctor-health/src/main/java/doctor/entity/UserInfoCollectionEntity.java b/doctor-modules/doctor-health/src/main/java/doctor/entity/UserInfoCollectionEntity.java index 60e0a15..6cd422a 100644 --- a/doctor-modules/doctor-health/src/main/java/doctor/entity/UserInfoCollectionEntity.java +++ b/doctor-modules/doctor-health/src/main/java/doctor/entity/UserInfoCollectionEntity.java @@ -10,10 +10,42 @@ import java.util.Date; * @Author: jpz * @CreateTime: 2024/1/8 22:02 */ -@Data + public class UserInfoCollectionEntity { private Integer id; private Integer userId; private String infoId; private Date createTime; + + public Integer getId() { + return id; + } + + public void setId(Integer id) { + this.id = id; + } + + public Integer getUserId() { + return userId; + } + + public void setUserId(Integer userId) { + this.userId = userId; + } + + public String getInfoId() { + return infoId; + } + + public void setInfoId(String infoId) { + this.infoId = infoId; + } + + public Date getCreateTime() { + return createTime; + } + + public void setCreateTime(Date createTime) { + this.createTime = createTime; + } } diff --git a/doctor-modules/doctor-health/src/main/java/doctor/mapper/DiseaseKnowledgeMapper.java b/doctor-modules/doctor-health/src/main/java/doctor/mapper/DiseaseKnowledgeMapper.java index ebabbd9..91cda87 100644 --- a/doctor-modules/doctor-health/src/main/java/doctor/mapper/DiseaseKnowledgeMapper.java +++ b/doctor-modules/doctor-health/src/main/java/doctor/mapper/DiseaseKnowledgeMapper.java @@ -2,6 +2,8 @@ package doctor.mapper; import doctor.domain.entity.DiseaseKnowledge; import doctor.domain.entity.DrugsCategory; +import doctor.entity.Information; +import doctor.entity.InformationPlate; import org.mybatis.spring.annotation.MapperScan; import java.util.List; @@ -19,4 +21,8 @@ public interface DiseaseKnowledgeMapper { List findDrugsCategoryList(); List findDrugsKnowledgeList(Integer drugsCategoryId); + + List findInformationList(Integer plateId); + + List findInformationPlateList(); } diff --git a/doctor-modules/doctor-health/src/main/java/doctor/mapper/InformationMapper.java b/doctor-modules/doctor-health/src/main/java/doctor/mapper/InformationMapper.java new file mode 100644 index 0000000..b28f358 --- /dev/null +++ b/doctor-modules/doctor-health/src/main/java/doctor/mapper/InformationMapper.java @@ -0,0 +1,21 @@ +package doctor.mapper; + +import doctor.entity.Information; +import doctor.entity.InformationPlate; +import org.mybatis.spring.annotation.MapperScan; + +import java.util.List; + +/** + * @BelongsProject: Medical_Treatment + * @BelongsPackage: doctor.mapper + * @Author: jpz + * @CreateTime: 2024/1/11 16:22 + */ +@MapperScan +public interface InformationMapper { + List findInformationList(Integer plateId); + + List findInformationPlateList(); + +} diff --git a/doctor-modules/doctor-health/src/main/java/doctor/service/DiseaseKnowledgeService.java b/doctor-modules/doctor-health/src/main/java/doctor/service/DiseaseKnowledgeService.java index f1ae174..4f227b2 100644 --- a/doctor-modules/doctor-health/src/main/java/doctor/service/DiseaseKnowledgeService.java +++ b/doctor-modules/doctor-health/src/main/java/doctor/service/DiseaseKnowledgeService.java @@ -2,6 +2,8 @@ package doctor.service; import doctor.domain.entity.DiseaseKnowledge; import doctor.domain.entity.DrugsCategory; +import doctor.entity.Information; +import doctor.entity.InformationPlate; import java.util.List; @@ -17,4 +19,6 @@ public interface DiseaseKnowledgeService { List findDrugsCategoryList(); List findDrugsKnowledgeList(Integer drugsCategoryId); + + } diff --git a/doctor-modules/doctor-health/src/main/java/doctor/service/InformationService.java b/doctor-modules/doctor-health/src/main/java/doctor/service/InformationService.java new file mode 100644 index 0000000..1749b0c --- /dev/null +++ b/doctor-modules/doctor-health/src/main/java/doctor/service/InformationService.java @@ -0,0 +1,19 @@ +package doctor.service; + +import doctor.entity.Information; +import doctor.entity.InformationPlate; + +import java.util.List; + +/** + * @BelongsProject: Medical_Treatment + * @BelongsPackage: doctor.service + * @Author: jpz + * @CreateTime: 2024/1/11 16:21 + */ + +public interface InformationService { + List findInformationList(Integer plateId); + + List findInformationPlateList(); +} diff --git a/doctor-modules/doctor-health/src/main/java/doctor/service/impl/DiseaseKnowledgeServiceimpl.java b/doctor-modules/doctor-health/src/main/java/doctor/service/impl/DiseaseKnowledgeServiceimpl.java index 83db7b3..4c060d5 100644 --- a/doctor-modules/doctor-health/src/main/java/doctor/service/impl/DiseaseKnowledgeServiceimpl.java +++ b/doctor-modules/doctor-health/src/main/java/doctor/service/impl/DiseaseKnowledgeServiceimpl.java @@ -2,6 +2,8 @@ package doctor.service.impl; import doctor.domain.entity.DiseaseKnowledge; import doctor.domain.entity.DrugsCategory; +import doctor.entity.Information; +import doctor.entity.InformationPlate; import doctor.mapper.DiseaseKnowledgeMapper; import doctor.service.DiseaseKnowledgeService; import org.springframework.beans.factory.annotation.Autowired; @@ -33,4 +35,6 @@ public class DiseaseKnowledgeServiceimpl implements DiseaseKnowledgeService { public List findDrugsKnowledgeList(Integer drugsCategoryId) { return diseaseKnowledgeMapper.findDrugsKnowledgeList(drugsCategoryId); } + + } diff --git a/doctor-modules/doctor-health/src/main/java/doctor/service/impl/InformationServiceimpl.java b/doctor-modules/doctor-health/src/main/java/doctor/service/impl/InformationServiceimpl.java new file mode 100644 index 0000000..24fb8df --- /dev/null +++ b/doctor-modules/doctor-health/src/main/java/doctor/service/impl/InformationServiceimpl.java @@ -0,0 +1,32 @@ +package doctor.service.impl; + +import doctor.entity.Information; +import doctor.entity.InformationPlate; +import doctor.mapper.InformationMapper; +import doctor.service.InformationService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * @BelongsProject: Medical_Treatment + * @BelongsPackage: doctor.service.impl + * @Author: jpz + * @CreateTime: 2024/1/11 16:21 + */ +@Service +public class InformationServiceimpl implements InformationService { + @Autowired + private InformationMapper informationMapper; + + @Override + public List findInformationList(Integer plateId) { + return informationMapper.findInformationList(plateId); + } + + @Override + public List findInformationPlateList() { + return informationMapper.findInformationPlateList(); + } +} diff --git a/doctor-modules/doctor-health/src/main/resources/mapper/doctor/DiseaseKnowledgeServiceMapper.xml b/doctor-modules/doctor-health/src/main/resources/mapper/doctor/DiseaseKnowledgeServiceMapper.xml index 86fa2e6..66eba71 100644 --- a/doctor-modules/doctor-health/src/main/resources/mapper/doctor/DiseaseKnowledgeServiceMapper.xml +++ b/doctor-modules/doctor-health/src/main/resources/mapper/doctor/DiseaseKnowledgeServiceMapper.xml @@ -16,4 +16,5 @@ select * from drugs_knowledge where drugs_category_id = #{drugsCategoryId} + diff --git a/doctor-modules/doctor-health/src/main/resources/mapper/doctor/InformationMapperServiceMapper.xml b/doctor-modules/doctor-health/src/main/resources/mapper/doctor/InformationMapperServiceMapper.xml new file mode 100644 index 0000000..45409ef --- /dev/null +++ b/doctor-modules/doctor-health/src/main/resources/mapper/doctor/InformationMapperServiceMapper.xml @@ -0,0 +1,17 @@ + + + + + + + + From 3bce4628b2c5767935010dbf0b00eef70ec43e9f Mon Sep 17 00:00:00 2001 From: jpz <3185133571@qq.com> Date: Fri, 12 Jan 2024 16:29:02 +0800 Subject: [PATCH 6/7] jpz6.0 --- .../DiseaseKnowledgeController.java | 6 --- .../controller/InformationController.java | 4 +- .../doctor/domain/entity/DrugsCategory.java | 7 +++ .../{ => domain}/entity/Information.java | 2 +- .../{ => domain}/entity/InformationPlate.java | 9 +++- .../entity/UserAdoptCommentEntity.java | 2 +- .../entity/UserArchivesEntity.java | 2 +- .../entity/UserBindingLoginEntity.java | 2 +- .../entity/UserConsumptionRecordEntity.java | 2 +- .../entity/UserDoctorFollowEntity.java | 2 +- .../entity/UserDrawRecordEntity.java | 2 +- .../{ => domain}/entity/UserEntity.java | 2 +- .../{ => domain}/entity/UserIdCardEntity.java | 2 +- .../entity/UserInfoCollectionEntity.java | 2 +- .../main/java/doctor/domain/vo/BannersVo.java | 50 +++++++++++++++++++ .../java/doctor/domain/vo/DepartmentVo.java | 23 +++++++++ .../doctor/domain/vo/DiseaseCategoryVo.java | 22 ++++++++ .../doctor/domain/vo/DiseaseKnowledgeVo.java | 24 +++++++++ .../doctor/domain/vo/DrugsCategoryVo.java | 21 ++++++++ .../doctor/domain/vo/DrugsKnowledgeVo.java | 22 ++++++++ .../doctor/domain/vo/InformationPlateVo.java | 21 ++++++++ .../java/doctor/domain/vo/InformationVo.java | 23 +++++++++ .../java/doctor/{ => domain}/vo/UserVo.java | 2 +- .../doctor/mapper/DiseaseKnowledgeMapper.java | 6 +-- .../java/doctor/mapper/InformationMapper.java | 4 +- .../service/DiseaseKnowledgeService.java | 2 - .../doctor/service/InformationService.java | 4 +- .../impl/DiseaseKnowledgeServiceimpl.java | 2 - .../service/impl/InformationServiceimpl.java | 4 +- .../doctor/InformationMapperServiceMapper.xml | 4 +- 30 files changed, 244 insertions(+), 36 deletions(-) rename doctor-modules/doctor-health/src/main/java/doctor/{ => domain}/entity/Information.java (98%) rename doctor-modules/doctor-health/src/main/java/doctor/{ => domain}/entity/InformationPlate.java (64%) rename doctor-modules/doctor-health/src/main/java/doctor/{ => domain}/entity/UserAdoptCommentEntity.java (98%) rename doctor-modules/doctor-health/src/main/java/doctor/{ => domain}/entity/UserArchivesEntity.java (98%) rename doctor-modules/doctor-health/src/main/java/doctor/{ => domain}/entity/UserBindingLoginEntity.java (97%) rename doctor-modules/doctor-health/src/main/java/doctor/{ => domain}/entity/UserConsumptionRecordEntity.java (97%) rename doctor-modules/doctor-health/src/main/java/doctor/{ => domain}/entity/UserDoctorFollowEntity.java (96%) rename doctor-modules/doctor-health/src/main/java/doctor/{ => domain}/entity/UserDrawRecordEntity.java (98%) rename doctor-modules/doctor-health/src/main/java/doctor/{ => domain}/entity/UserEntity.java (98%) rename doctor-modules/doctor-health/src/main/java/doctor/{ => domain}/entity/UserIdCardEntity.java (98%) rename doctor-modules/doctor-health/src/main/java/doctor/{ => domain}/entity/UserInfoCollectionEntity.java (96%) create mode 100644 doctor-modules/doctor-health/src/main/java/doctor/domain/vo/BannersVo.java create mode 100644 doctor-modules/doctor-health/src/main/java/doctor/domain/vo/DepartmentVo.java create mode 100644 doctor-modules/doctor-health/src/main/java/doctor/domain/vo/DiseaseCategoryVo.java create mode 100644 doctor-modules/doctor-health/src/main/java/doctor/domain/vo/DiseaseKnowledgeVo.java create mode 100644 doctor-modules/doctor-health/src/main/java/doctor/domain/vo/DrugsCategoryVo.java create mode 100644 doctor-modules/doctor-health/src/main/java/doctor/domain/vo/DrugsKnowledgeVo.java create mode 100644 doctor-modules/doctor-health/src/main/java/doctor/domain/vo/InformationPlateVo.java create mode 100644 doctor-modules/doctor-health/src/main/java/doctor/domain/vo/InformationVo.java rename doctor-modules/doctor-health/src/main/java/doctor/{ => domain}/vo/UserVo.java (94%) diff --git a/doctor-modules/doctor-health/src/main/java/doctor/controller/DiseaseKnowledgeController.java b/doctor-modules/doctor-health/src/main/java/doctor/controller/DiseaseKnowledgeController.java index 85f2987..1b249ac 100644 --- a/doctor-modules/doctor-health/src/main/java/doctor/controller/DiseaseKnowledgeController.java +++ b/doctor-modules/doctor-health/src/main/java/doctor/controller/DiseaseKnowledgeController.java @@ -2,16 +2,10 @@ package doctor.controller; import doctor.common.core.domain.HealthR; -import doctor.common.core.domain.R; import doctor.domain.entity.DiseaseKnowledge; import doctor.domain.entity.DrugsCategory; -import doctor.domain.entity.DrugsKnowledge; -import doctor.entity.Information; -import doctor.entity.InformationPlate; import doctor.service.DiseaseKnowledgeService; -import org.bouncycastle.cert.ocsp.Req; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.actuate.health.Health; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; diff --git a/doctor-modules/doctor-health/src/main/java/doctor/controller/InformationController.java b/doctor-modules/doctor-health/src/main/java/doctor/controller/InformationController.java index 7304f18..83f772f 100644 --- a/doctor-modules/doctor-health/src/main/java/doctor/controller/InformationController.java +++ b/doctor-modules/doctor-health/src/main/java/doctor/controller/InformationController.java @@ -1,8 +1,8 @@ package doctor.controller; import doctor.common.core.domain.HealthR; -import doctor.entity.Information; -import doctor.entity.InformationPlate; +import doctor.domain.entity.Information; +import doctor.domain.entity.InformationPlate; import doctor.service.InformationService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; diff --git a/doctor-modules/doctor-health/src/main/java/doctor/domain/entity/DrugsCategory.java b/doctor-modules/doctor-health/src/main/java/doctor/domain/entity/DrugsCategory.java index 2958b68..26d3f28 100644 --- a/doctor-modules/doctor-health/src/main/java/doctor/domain/entity/DrugsCategory.java +++ b/doctor-modules/doctor-health/src/main/java/doctor/domain/entity/DrugsCategory.java @@ -1,5 +1,9 @@ package doctor.domain.entity; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + import java.util.Date; /** @@ -8,6 +12,9 @@ import java.util.Date; * @Author: jpz * @CreateTime: 2024/1/10 21:52 */ +@Data +@AllArgsConstructor +@NoArgsConstructor public class DrugsCategory { private Integer id; private String name; diff --git a/doctor-modules/doctor-health/src/main/java/doctor/entity/Information.java b/doctor-modules/doctor-health/src/main/java/doctor/domain/entity/Information.java similarity index 98% rename from doctor-modules/doctor-health/src/main/java/doctor/entity/Information.java rename to doctor-modules/doctor-health/src/main/java/doctor/domain/entity/Information.java index d62d679..0343139 100644 --- a/doctor-modules/doctor-health/src/main/java/doctor/entity/Information.java +++ b/doctor-modules/doctor-health/src/main/java/doctor/domain/entity/Information.java @@ -1,4 +1,4 @@ -package doctor.entity; +package doctor.domain.entity; import java.util.Date; diff --git a/doctor-modules/doctor-health/src/main/java/doctor/entity/InformationPlate.java b/doctor-modules/doctor-health/src/main/java/doctor/domain/entity/InformationPlate.java similarity index 64% rename from doctor-modules/doctor-health/src/main/java/doctor/entity/InformationPlate.java rename to doctor-modules/doctor-health/src/main/java/doctor/domain/entity/InformationPlate.java index c6f1630..6b88f9b 100644 --- a/doctor-modules/doctor-health/src/main/java/doctor/entity/InformationPlate.java +++ b/doctor-modules/doctor-health/src/main/java/doctor/domain/entity/InformationPlate.java @@ -1,4 +1,8 @@ -package doctor.entity; +package doctor.domain.entity; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; import java.util.Date; @@ -8,6 +12,9 @@ import java.util.Date; * @Author: jpz * @CreateTime: 2024/1/11 16:12 */ +@Data +@AllArgsConstructor +@NoArgsConstructor public class InformationPlate { private Integer id; private String name; diff --git a/doctor-modules/doctor-health/src/main/java/doctor/entity/UserAdoptCommentEntity.java b/doctor-modules/doctor-health/src/main/java/doctor/domain/entity/UserAdoptCommentEntity.java similarity index 98% rename from doctor-modules/doctor-health/src/main/java/doctor/entity/UserAdoptCommentEntity.java rename to doctor-modules/doctor-health/src/main/java/doctor/domain/entity/UserAdoptCommentEntity.java index a0e205a..f1eefda 100644 --- a/doctor-modules/doctor-health/src/main/java/doctor/entity/UserAdoptCommentEntity.java +++ b/doctor-modules/doctor-health/src/main/java/doctor/domain/entity/UserAdoptCommentEntity.java @@ -1,4 +1,4 @@ -package doctor.entity; +package doctor.domain.entity; import java.util.Date; diff --git a/doctor-modules/doctor-health/src/main/java/doctor/entity/UserArchivesEntity.java b/doctor-modules/doctor-health/src/main/java/doctor/domain/entity/UserArchivesEntity.java similarity index 98% rename from doctor-modules/doctor-health/src/main/java/doctor/entity/UserArchivesEntity.java rename to doctor-modules/doctor-health/src/main/java/doctor/domain/entity/UserArchivesEntity.java index 6b8b164..d5deb6e 100644 --- a/doctor-modules/doctor-health/src/main/java/doctor/entity/UserArchivesEntity.java +++ b/doctor-modules/doctor-health/src/main/java/doctor/domain/entity/UserArchivesEntity.java @@ -1,4 +1,4 @@ -package doctor.entity; +package doctor.domain.entity; import lombok.Data; diff --git a/doctor-modules/doctor-health/src/main/java/doctor/entity/UserBindingLoginEntity.java b/doctor-modules/doctor-health/src/main/java/doctor/domain/entity/UserBindingLoginEntity.java similarity index 97% rename from doctor-modules/doctor-health/src/main/java/doctor/entity/UserBindingLoginEntity.java rename to doctor-modules/doctor-health/src/main/java/doctor/domain/entity/UserBindingLoginEntity.java index 6d21a92..04caf0a 100644 --- a/doctor-modules/doctor-health/src/main/java/doctor/entity/UserBindingLoginEntity.java +++ b/doctor-modules/doctor-health/src/main/java/doctor/domain/entity/UserBindingLoginEntity.java @@ -1,4 +1,4 @@ -package doctor.entity; +package doctor.domain.entity; import lombok.Data; diff --git a/doctor-modules/doctor-health/src/main/java/doctor/entity/UserConsumptionRecordEntity.java b/doctor-modules/doctor-health/src/main/java/doctor/domain/entity/UserConsumptionRecordEntity.java similarity index 97% rename from doctor-modules/doctor-health/src/main/java/doctor/entity/UserConsumptionRecordEntity.java rename to doctor-modules/doctor-health/src/main/java/doctor/domain/entity/UserConsumptionRecordEntity.java index 81cd5e5..f7169c0 100644 --- a/doctor-modules/doctor-health/src/main/java/doctor/entity/UserConsumptionRecordEntity.java +++ b/doctor-modules/doctor-health/src/main/java/doctor/domain/entity/UserConsumptionRecordEntity.java @@ -1,4 +1,4 @@ -package doctor.entity; +package doctor.domain.entity; import lombok.Data; diff --git a/doctor-modules/doctor-health/src/main/java/doctor/entity/UserDoctorFollowEntity.java b/doctor-modules/doctor-health/src/main/java/doctor/domain/entity/UserDoctorFollowEntity.java similarity index 96% rename from doctor-modules/doctor-health/src/main/java/doctor/entity/UserDoctorFollowEntity.java rename to doctor-modules/doctor-health/src/main/java/doctor/domain/entity/UserDoctorFollowEntity.java index 8c8329b..23ccfa5 100644 --- a/doctor-modules/doctor-health/src/main/java/doctor/entity/UserDoctorFollowEntity.java +++ b/doctor-modules/doctor-health/src/main/java/doctor/domain/entity/UserDoctorFollowEntity.java @@ -1,4 +1,4 @@ -package doctor.entity; +package doctor.domain.entity; import lombok.Data; diff --git a/doctor-modules/doctor-health/src/main/java/doctor/entity/UserDrawRecordEntity.java b/doctor-modules/doctor-health/src/main/java/doctor/domain/entity/UserDrawRecordEntity.java similarity index 98% rename from doctor-modules/doctor-health/src/main/java/doctor/entity/UserDrawRecordEntity.java rename to doctor-modules/doctor-health/src/main/java/doctor/domain/entity/UserDrawRecordEntity.java index b428624..8464113 100644 --- a/doctor-modules/doctor-health/src/main/java/doctor/entity/UserDrawRecordEntity.java +++ b/doctor-modules/doctor-health/src/main/java/doctor/domain/entity/UserDrawRecordEntity.java @@ -1,4 +1,4 @@ -package doctor.entity; +package doctor.domain.entity; import lombok.Data; diff --git a/doctor-modules/doctor-health/src/main/java/doctor/entity/UserEntity.java b/doctor-modules/doctor-health/src/main/java/doctor/domain/entity/UserEntity.java similarity index 98% rename from doctor-modules/doctor-health/src/main/java/doctor/entity/UserEntity.java rename to doctor-modules/doctor-health/src/main/java/doctor/domain/entity/UserEntity.java index a9298e5..8cc5894 100644 --- a/doctor-modules/doctor-health/src/main/java/doctor/entity/UserEntity.java +++ b/doctor-modules/doctor-health/src/main/java/doctor/domain/entity/UserEntity.java @@ -1,4 +1,4 @@ -package doctor.entity; +package doctor.domain.entity; import lombok.Data; diff --git a/doctor-modules/doctor-health/src/main/java/doctor/entity/UserIdCardEntity.java b/doctor-modules/doctor-health/src/main/java/doctor/domain/entity/UserIdCardEntity.java similarity index 98% rename from doctor-modules/doctor-health/src/main/java/doctor/entity/UserIdCardEntity.java rename to doctor-modules/doctor-health/src/main/java/doctor/domain/entity/UserIdCardEntity.java index 529c2b5..af7f6e7 100644 --- a/doctor-modules/doctor-health/src/main/java/doctor/entity/UserIdCardEntity.java +++ b/doctor-modules/doctor-health/src/main/java/doctor/domain/entity/UserIdCardEntity.java @@ -1,4 +1,4 @@ -package doctor.entity; +package doctor.domain.entity; import lombok.Data; diff --git a/doctor-modules/doctor-health/src/main/java/doctor/entity/UserInfoCollectionEntity.java b/doctor-modules/doctor-health/src/main/java/doctor/domain/entity/UserInfoCollectionEntity.java similarity index 96% rename from doctor-modules/doctor-health/src/main/java/doctor/entity/UserInfoCollectionEntity.java rename to doctor-modules/doctor-health/src/main/java/doctor/domain/entity/UserInfoCollectionEntity.java index 6cd422a..a6874a5 100644 --- a/doctor-modules/doctor-health/src/main/java/doctor/entity/UserInfoCollectionEntity.java +++ b/doctor-modules/doctor-health/src/main/java/doctor/domain/entity/UserInfoCollectionEntity.java @@ -1,4 +1,4 @@ -package doctor.entity; +package doctor.domain.entity; import lombok.Data; diff --git a/doctor-modules/doctor-health/src/main/java/doctor/domain/vo/BannersVo.java b/doctor-modules/doctor-health/src/main/java/doctor/domain/vo/BannersVo.java new file mode 100644 index 0000000..39cffb1 --- /dev/null +++ b/doctor-modules/doctor-health/src/main/java/doctor/domain/vo/BannersVo.java @@ -0,0 +1,50 @@ +package doctor.domain.vo; + +import lombok.Data; + +/** + * @BelongsProject: Medical_Treatment + * @BelongsPackage: doctor.domain.vo + * @Author: jpz + * @CreateTime: 2024/1/12 15:33 + */ +@Data +public class BannersVo { + + private String imageUrl; + private String jumpUrl; + private Integer rank; + private String title; + + public String getImageUrl() { + return imageUrl; + } + + public void setImageUrl(String imageUrl) { + this.imageUrl = imageUrl; + } + + public String getJumpUrl() { + return jumpUrl; + } + + public void setJumpUrl(String jumpUrl) { + this.jumpUrl = jumpUrl; + } + + public Integer getRank() { + return rank; + } + + public void setRank(Integer rank) { + this.rank = rank; + } + + public String getTitle() { + return title; + } + + public void setTitle(String title) { + this.title = title; + } +} diff --git a/doctor-modules/doctor-health/src/main/java/doctor/domain/vo/DepartmentVo.java b/doctor-modules/doctor-health/src/main/java/doctor/domain/vo/DepartmentVo.java new file mode 100644 index 0000000..dd5cbbe --- /dev/null +++ b/doctor-modules/doctor-health/src/main/java/doctor/domain/vo/DepartmentVo.java @@ -0,0 +1,23 @@ +package doctor.domain.vo; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +/** + * @BelongsProject: Medical_Treatment + * @BelongsPackage: doctor.domain.vo + * @Author: jpz + * @CreateTime: 2024/1/12 15:37 + */ +@Data +@AllArgsConstructor +@NoArgsConstructor +public class DepartmentVo { + + private Integer id; + private String departmentName; + private String pic; + private Integer rank; + +} diff --git a/doctor-modules/doctor-health/src/main/java/doctor/domain/vo/DiseaseCategoryVo.java b/doctor-modules/doctor-health/src/main/java/doctor/domain/vo/DiseaseCategoryVo.java new file mode 100644 index 0000000..11b532c --- /dev/null +++ b/doctor-modules/doctor-health/src/main/java/doctor/domain/vo/DiseaseCategoryVo.java @@ -0,0 +1,22 @@ +package doctor.domain.vo; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +/** + * @BelongsProject: Medical_Treatment + * @BelongsPackage: doctor.domain.vo + * @Author: jpz + * @CreateTime: 2024/1/12 15:39 + */ +@Data +@AllArgsConstructor +@NoArgsConstructor + +public class DiseaseCategoryVo { + private Integer id; + private Integer departmentId; + private String name; + +} diff --git a/doctor-modules/doctor-health/src/main/java/doctor/domain/vo/DiseaseKnowledgeVo.java b/doctor-modules/doctor-health/src/main/java/doctor/domain/vo/DiseaseKnowledgeVo.java new file mode 100644 index 0000000..815506e --- /dev/null +++ b/doctor-modules/doctor-health/src/main/java/doctor/domain/vo/DiseaseKnowledgeVo.java @@ -0,0 +1,24 @@ +package doctor.domain.vo; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +/** + * @BelongsProject: Medical_Treatment + * @BelongsPackage: doctor.domain.vo + * @Author: jpz + * @CreateTime: 2024/1/12 15:40 + */ +@Data +@AllArgsConstructor +@NoArgsConstructor +public class DiseaseKnowledgeVo { + private Integer id; + private String pathology; + private String symptom; + private String benefitTaboo; + private String chineseMedicineTreatment; + private String westernMedicineTreatment; + +} diff --git a/doctor-modules/doctor-health/src/main/java/doctor/domain/vo/DrugsCategoryVo.java b/doctor-modules/doctor-health/src/main/java/doctor/domain/vo/DrugsCategoryVo.java new file mode 100644 index 0000000..97e21fc --- /dev/null +++ b/doctor-modules/doctor-health/src/main/java/doctor/domain/vo/DrugsCategoryVo.java @@ -0,0 +1,21 @@ +package doctor.domain.vo; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +/** + * @BelongsProject: Medical_Treatment + * @BelongsPackage: doctor.domain.vo + * @Author: jpz + * @CreateTime: 2024/1/12 15:49 + */ +@Data +@AllArgsConstructor +@NoArgsConstructor +public class DrugsCategoryVo { + private Integer id; + private String name; + private Integer rank; + +} diff --git a/doctor-modules/doctor-health/src/main/java/doctor/domain/vo/DrugsKnowledgeVo.java b/doctor-modules/doctor-health/src/main/java/doctor/domain/vo/DrugsKnowledgeVo.java new file mode 100644 index 0000000..0550c40 --- /dev/null +++ b/doctor-modules/doctor-health/src/main/java/doctor/domain/vo/DrugsKnowledgeVo.java @@ -0,0 +1,22 @@ +package doctor.domain.vo; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +/** + * @BelongsProject: Medical_Treatment + * @BelongsPackage: doctor.domain.vo + * @Author: jpz + * @CreateTime: 2024/1/12 15:51 + */ +@Data +@AllArgsConstructor +@NoArgsConstructor +public class DrugsKnowledgeVo { + private Integer id; + private Integer drugsCategoryId; + private String name; + private String picture; + +} diff --git a/doctor-modules/doctor-health/src/main/java/doctor/domain/vo/InformationPlateVo.java b/doctor-modules/doctor-health/src/main/java/doctor/domain/vo/InformationPlateVo.java new file mode 100644 index 0000000..ab551d5 --- /dev/null +++ b/doctor-modules/doctor-health/src/main/java/doctor/domain/vo/InformationPlateVo.java @@ -0,0 +1,21 @@ +package doctor.domain.vo; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +/** + * @BelongsProject: Medical_Treatment + * @BelongsPackage: doctor.domain.vo + * @Author: jpz + * @CreateTime: 2024/1/12 15:59 + */ +@Data +@AllArgsConstructor +@NoArgsConstructor +public class InformationPlateVo { + private Integer id; + private String name; + private Integer sort; + +} diff --git a/doctor-modules/doctor-health/src/main/java/doctor/domain/vo/InformationVo.java b/doctor-modules/doctor-health/src/main/java/doctor/domain/vo/InformationVo.java new file mode 100644 index 0000000..d000170 --- /dev/null +++ b/doctor-modules/doctor-health/src/main/java/doctor/domain/vo/InformationVo.java @@ -0,0 +1,23 @@ +package doctor.domain.vo; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +/** + * @BelongsProject: Medical_Treatment + * @BelongsPackage: doctor.domain.vo + * @Author: jpz + * @CreateTime: 2024/1/12 15:57 + */ +@Data +@AllArgsConstructor +@NoArgsConstructor +public class InformationVo { + private Integer id; + private String title; + private String thumbnail; + private String source; + private long releaseTime; + +} diff --git a/doctor-modules/doctor-health/src/main/java/doctor/vo/UserVo.java b/doctor-modules/doctor-health/src/main/java/doctor/domain/vo/UserVo.java similarity index 94% rename from doctor-modules/doctor-health/src/main/java/doctor/vo/UserVo.java rename to doctor-modules/doctor-health/src/main/java/doctor/domain/vo/UserVo.java index 621c3a0..1986bd4 100644 --- a/doctor-modules/doctor-health/src/main/java/doctor/vo/UserVo.java +++ b/doctor-modules/doctor-health/src/main/java/doctor/domain/vo/UserVo.java @@ -1,4 +1,4 @@ -package doctor.vo; +package doctor.domain.vo; import lombok.Data; import org.apache.catalina.User; diff --git a/doctor-modules/doctor-health/src/main/java/doctor/mapper/DiseaseKnowledgeMapper.java b/doctor-modules/doctor-health/src/main/java/doctor/mapper/DiseaseKnowledgeMapper.java index 91cda87..d615876 100644 --- a/doctor-modules/doctor-health/src/main/java/doctor/mapper/DiseaseKnowledgeMapper.java +++ b/doctor-modules/doctor-health/src/main/java/doctor/mapper/DiseaseKnowledgeMapper.java @@ -2,8 +2,8 @@ package doctor.mapper; import doctor.domain.entity.DiseaseKnowledge; import doctor.domain.entity.DrugsCategory; -import doctor.entity.Information; -import doctor.entity.InformationPlate; +import doctor.domain.entity.Information; +import doctor.domain.entity.InformationPlate; import org.mybatis.spring.annotation.MapperScan; import java.util.List; @@ -22,7 +22,5 @@ public interface DiseaseKnowledgeMapper { List findDrugsKnowledgeList(Integer drugsCategoryId); - List findInformationList(Integer plateId); - List findInformationPlateList(); } diff --git a/doctor-modules/doctor-health/src/main/java/doctor/mapper/InformationMapper.java b/doctor-modules/doctor-health/src/main/java/doctor/mapper/InformationMapper.java index b28f358..3f6219b 100644 --- a/doctor-modules/doctor-health/src/main/java/doctor/mapper/InformationMapper.java +++ b/doctor-modules/doctor-health/src/main/java/doctor/mapper/InformationMapper.java @@ -1,7 +1,7 @@ package doctor.mapper; -import doctor.entity.Information; -import doctor.entity.InformationPlate; +import doctor.domain.entity.Information; +import doctor.domain.entity.InformationPlate; import org.mybatis.spring.annotation.MapperScan; import java.util.List; diff --git a/doctor-modules/doctor-health/src/main/java/doctor/service/DiseaseKnowledgeService.java b/doctor-modules/doctor-health/src/main/java/doctor/service/DiseaseKnowledgeService.java index 4f227b2..c6a9d34 100644 --- a/doctor-modules/doctor-health/src/main/java/doctor/service/DiseaseKnowledgeService.java +++ b/doctor-modules/doctor-health/src/main/java/doctor/service/DiseaseKnowledgeService.java @@ -2,8 +2,6 @@ package doctor.service; import doctor.domain.entity.DiseaseKnowledge; import doctor.domain.entity.DrugsCategory; -import doctor.entity.Information; -import doctor.entity.InformationPlate; import java.util.List; diff --git a/doctor-modules/doctor-health/src/main/java/doctor/service/InformationService.java b/doctor-modules/doctor-health/src/main/java/doctor/service/InformationService.java index 1749b0c..de7cd30 100644 --- a/doctor-modules/doctor-health/src/main/java/doctor/service/InformationService.java +++ b/doctor-modules/doctor-health/src/main/java/doctor/service/InformationService.java @@ -1,7 +1,7 @@ package doctor.service; -import doctor.entity.Information; -import doctor.entity.InformationPlate; +import doctor.domain.entity.Information; +import doctor.domain.entity.InformationPlate; import java.util.List; diff --git a/doctor-modules/doctor-health/src/main/java/doctor/service/impl/DiseaseKnowledgeServiceimpl.java b/doctor-modules/doctor-health/src/main/java/doctor/service/impl/DiseaseKnowledgeServiceimpl.java index 4c060d5..09f8d5d 100644 --- a/doctor-modules/doctor-health/src/main/java/doctor/service/impl/DiseaseKnowledgeServiceimpl.java +++ b/doctor-modules/doctor-health/src/main/java/doctor/service/impl/DiseaseKnowledgeServiceimpl.java @@ -2,8 +2,6 @@ package doctor.service.impl; import doctor.domain.entity.DiseaseKnowledge; import doctor.domain.entity.DrugsCategory; -import doctor.entity.Information; -import doctor.entity.InformationPlate; import doctor.mapper.DiseaseKnowledgeMapper; import doctor.service.DiseaseKnowledgeService; import org.springframework.beans.factory.annotation.Autowired; diff --git a/doctor-modules/doctor-health/src/main/java/doctor/service/impl/InformationServiceimpl.java b/doctor-modules/doctor-health/src/main/java/doctor/service/impl/InformationServiceimpl.java index 24fb8df..b2bfb40 100644 --- a/doctor-modules/doctor-health/src/main/java/doctor/service/impl/InformationServiceimpl.java +++ b/doctor-modules/doctor-health/src/main/java/doctor/service/impl/InformationServiceimpl.java @@ -1,7 +1,7 @@ package doctor.service.impl; -import doctor.entity.Information; -import doctor.entity.InformationPlate; +import doctor.domain.entity.Information; +import doctor.domain.entity.InformationPlate; import doctor.mapper.InformationMapper; import doctor.service.InformationService; import org.springframework.beans.factory.annotation.Autowired; diff --git a/doctor-modules/doctor-health/src/main/resources/mapper/doctor/InformationMapperServiceMapper.xml b/doctor-modules/doctor-health/src/main/resources/mapper/doctor/InformationMapperServiceMapper.xml index 45409ef..35fac33 100644 --- a/doctor-modules/doctor-health/src/main/resources/mapper/doctor/InformationMapperServiceMapper.xml +++ b/doctor-modules/doctor-health/src/main/resources/mapper/doctor/InformationMapperServiceMapper.xml @@ -5,11 +5,11 @@ - select * from information_plate - select * from information where plate_id = #{plateId} From bc77718110bfddb792bd677c0c010c5c50afb0af Mon Sep 17 00:00:00 2001 From: zmyYYDS <864398951@qq.com> Date: Fri, 12 Jan 2024 21:40:26 +0800 Subject: [PATCH 7/7] zmy05 --- .../doctor/controller/HealthUserVideoController.java | 11 +++-------- .../java/doctor/mapper/HealthUserVideoMapper.java | 2 +- .../java/doctor/service/HealthUserVideoService.java | 2 +- .../service/impl/HealthUserVideoServiceImpl.java | 4 ++-- .../main/resources/mapper/HealthUserVideoMapper.xml | 1 + 5 files changed, 8 insertions(+), 12 deletions(-) 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 f3311e7..490eb78 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 @@ -2,15 +2,10 @@ package doctor.controller; import doctor.common.core.domain.HealthR; -import doctor.common.core.web.controller.BaseController; -import doctor.common.core.web.page.TableDataInfo; import doctor.domain.dto.VideoDto; -import doctor.domain.entity.VideoCategoryEntity; -import doctor.domain.entity.VideoEntity; import doctor.domain.vo.VideoCategoryVo; import doctor.domain.vo.VideoVo; import doctor.service.HealthUserVideoService; -import doctor.util.ConvertUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -31,9 +26,9 @@ public class HealthUserVideoController{ } @GetMapping("/findVideoVoList") - public HealthR> findVideoVoList(@RequestBody VideoDto videoDto){ - startPage(videoDto.getPage(), videoDto.getCount()); - List List = healthUserVideoService.findVideoVoList(videoDto); + public HealthR> findVideoVoList(@RequestParam Integer categoryId,@RequestParam Integer page,@RequestParam Integer count){ + startPage(page,count); + List List = healthUserVideoService.findVideoVoList(categoryId); return HealthR.ok(List); } 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 bba93fb..7120dfb 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 @@ -12,5 +12,5 @@ import java.util.List; public interface HealthUserVideoMapper { List findVideoCategoryList(); - List findVideoVoList(VideoDto videoDto); + 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 5540cce..56e0b1e 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 @@ -13,5 +13,5 @@ import java.util.List; public interface HealthUserVideoService { List findVideoCategoryList(); - List findVideoVoList(VideoDto videoDto); + 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 49236b6..b5e36d9 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 @@ -29,8 +29,8 @@ public class HealthUserVideoServiceImpl implements HealthUserVideoService { } @Override - public List findVideoVoList(VideoDto videoDto) { - List videoVoList = healthUserVideoMapper.findVideoVoList(videoDto); + public List findVideoVoList(Integer categoryId) { + List videoVoList = healthUserVideoMapper.findVideoVoList(categoryId); List videoVos = ConvertUtil.entityToVoList(videoVoList, VideoVo.class); return videoVos; } 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 25c0127..8e1c34c 100644 --- a/doctor-modules/doctor-health/src/main/resources/mapper/HealthUserVideoMapper.xml +++ b/doctor-modules/doctor-health/src/main/resources/mapper/HealthUserVideoMapper.xml @@ -11,4 +11,5 @@ +