zmy08

# Conflicts:
#	doctor-api/doctor-api-system/src/main/java/doctor/system/api/domain/User.java
#	doctor-modules/doctor-health/src/main/java/doctor/controller/HealthDepartmentController.java
#	doctor-modules/doctor-health/src/main/java/doctor/controller/InformationController.java
#	doctor-modules/doctor-health/src/main/java/doctor/domain/entity/InquiryDetailsRecordEntity.java
#	doctor-modules/doctor-health/src/main/java/doctor/domain/vo/DoctorVo.java

doctor-api/doctor-api-system/src/main/java/doctor/system/api/domain/User.java

@@ -1,11 +1,20 @@
 package doctor.system.api.domain;
-
+import lombok.AllArgsConstructor;
 import lombok.Data;
+import lombok.NoArgsConstructor;
 import org.springframework.format.annotation.DateTimeFormat;
 
 import java.util.Date;
 
+/**
+ * @ClassName : User
+ * @Description : 用户表
+ * @Author : FJJ
+ * @Date: 2024-01-10 20:46
+ */
 @Data
+@AllArgsConstructor
+@NoArgsConstructor
 public class User {
     private Integer id;
     private String phone;
@@ -20,6 +29,7 @@ public class User {
     private Integer weight;
     private String invitationCode;
     private Date updateTime;
-    private Date createTime;
+    private Long createTime;
+
 
 }

doctor-auth/src/main/resources/bootstrap.yml

@@ -15,11 +15,11 @@ spring:
       discovery:
         # 服务注册地址
         server-addr: 101.34.77.101:8848
-        namespace: 7e34f104-f333-4828-b36a-02146e521c9a
+        namespace: 09dff3e2-9790-4d4f-beb6-9baeb01ae040
       config:
         # 配置中心地址
         server-addr: 101.34.77.101:8848
-        namespace: 7e34f104-f333-4828-b36a-02146e521c9a
+        namespace: 09dff3e2-9790-4d4f-beb6-9baeb01ae040
         # 配置文件格式
         file-extension: yml
         # 共享配置

doctor-gateway/src/main/resources/bootstrap.yml

@@ -15,11 +15,11 @@ spring:
       discovery:
         # 服务注册地址
         server-addr: 101.34.77.101:8848
-        namespace: 7e34f104-f333-4828-b36a-02146e521c9a
+        namespace: 09dff3e2-9790-4d4f-beb6-9baeb01ae040
       config:
         # 配置中心地址
         server-addr: 101.34.77.101:8848
-        namespace: 7e34f104-f333-4828-b36a-02146e521c9a
+        namespace: 09dff3e2-9790-4d4f-beb6-9baeb01ae040
         # 配置文件格式
         file-extension: yml
         # 共享配置

doctor-modules/doctor-file/src/main/resources/bootstrap.yml

@@ -15,11 +15,11 @@ spring:
       discovery:
         # 服务注册地址
         server-addr: 101.34.77.101:8848
-        namespace: 7e34f104-f333-4828-b36a-02146e521c9a
+        namespace: 09dff3e2-9790-4d4f-beb6-9baeb01ae040
       config:
         # 配置中心地址
         server-addr: 101.34.77.101:8848
-        namespace: 7e34f104-f333-4828-b36a-02146e521c9a
+        namespace: 09dff3e2-9790-4d4f-beb6-9baeb01ae040
         # 配置文件格式
         file-extension: yml
         # 共享配置

doctor-modules/doctor-gen/src/main/resources/bootstrap.yml

@@ -15,11 +15,11 @@ spring:
       discovery:
         # 服务注册地址
         server-addr: 101.34.77.101:8848
-        namespace: 7e34f104-f333-4828-b36a-02146e521c9a
+        namespace: 09dff3e2-9790-4d4f-beb6-9baeb01ae040
       config:
         # 配置中心地址
         server-addr: 101.34.77.101:8848
-        namespace: 7e34f104-f333-4828-b36a-02146e521c9a
+        namespace: 09dff3e2-9790-4d4f-beb6-9baeb01ae040
         # 配置文件格式
         file-extension: yml
         # 共享配置

doctor-modules/doctor-health/pom.xml

@@ -12,6 +12,11 @@
 
     <artifactId>doctor-health</artifactId>
 
+    <properties>
+        <lombok.version>1.18.12</lombok.version>
+        <mapstruct.version>1.4.2.Final</mapstruct.version>
+    </properties>
+
     <dependencies>
 
         <!-- Oss上传  -->
@@ -96,9 +101,26 @@
             <artifactId>spring-boot-starter-mail</artifactId>
         </dependency>
 
-
+        <dependency>
+            <groupId>org.mapstruct</groupId>
+            <artifactId>mapstruct</artifactId>
+            <version>${mapstruct.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.mapstruct</groupId>
+            <artifactId>mapstruct-jdk8</artifactId>
+            <version>${mapstruct.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.mapstruct</groupId>
+            <artifactId>mapstruct-processor</artifactId>
+            <version>${mapstruct.version}</version>
+        </dependency>
     </dependencies>
 
+
+
+
     <build>
         <finalName>${project.artifactId}</finalName>
         <plugins>
@@ -116,4 +138,5 @@
         </plugins>
     </build>
 
+
 </project>

doctor-modules/doctor-health/src/main/java/doctor/controller/DiseaseKnowledgeController.java

@@ -1,11 +1,10 @@
 package doctor.controller;
 
+
 import doctor.common.core.domain.HealthR;
+import doctor.common.core.domain.R;
 import doctor.domain.entity.*;
-import doctor.service.DepartmentService;
-import doctor.service.DiseaseCategoryService;
 import doctor.service.DiseaseKnowledgeService;
-import doctor.service.HealthDepartmentService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -14,17 +13,17 @@ import org.springframework.web.bind.annotation.RestController;
 
 import java.util.List;
 
-import static com.github.pagehelper.page.PageMethod.startPage;
+import static doctor.common.core.utils.PageUtils.startPage;
 
+/**
+ * @BelongsProject: Medical_Treatment
+ * @BelongsPackage: doctor.controller
+ * @Author: jpz
+ * @CreateTime: 2024/1/10 20:56
+ */
 @RestController
-@RequestMapping("/knowledgeBase/v1")
-public class HealthDepartmentController {
-
-    @Autowired
-    private HealthDepartmentService healthV1Service;
-    @Autowired
-    private DiseaseCategoryService diseaseCategoryService;
-
+@RequestMapping("/share/knowledgeBase/v1")
+public class DiseaseKnowledgeController {
     @Autowired
     private DiseaseKnowledgeService diseaseKnowledgeService;
     //罕见病症详情
@@ -39,24 +38,30 @@ public class HealthDepartmentController {
     }
     @GetMapping("/findDrugsKnowledgeList")
     public HealthR<List<DrugsCategory>> findDrugsKnowledgeList(@RequestParam Integer drugsCategoryId,
-                                                               @RequestParam(value = "page",defaultValue = "1") Integer page,
-                                                               @RequestParam(value = "count",defaultValue = "5") Integer count){
+                                                         @RequestParam(value = "page",defaultValue = "1") Integer page,
+                                                         @RequestParam(value = "count",defaultValue = "5") Integer count){
 
         startPage(page,count);
         List<DrugsCategory> list=diseaseKnowledgeService.findDrugsKnowledgeList(drugsCategoryId);
         return HealthR.ok(list);
     }
-
-
-    @GetMapping("/findDiseaseCategory")
-    public HealthR<List<DiseaseCategory>> findDiseaseCategory(@RequestParam Integer departmentId){
-        List<DiseaseCategory> list=diseaseCategoryService.findDiseaseCategory(departmentId);
+    @GetMapping("/findDrugsKnowledge")
+    public HealthR <DrugsKnowledge> findDrugsKnowledge(@RequestParam Integer id){
+        DrugsKnowledge list=diseaseKnowledgeService.findDrugsKnowledge(id);
+        return HealthR.ok(list);
+    }
+    @GetMapping("/popularSearch")
+    public HealthR<List<PopularSearchEntity>> popularSeach(){
+        List<PopularSearchEntity> list=diseaseKnowledgeService.popularSeach();
         return HealthR.ok(list);
     }
 
-    @GetMapping("/findDepartment")
-    public HealthR<List<DepartmentEntity>> findDepartment(){
-        List<DepartmentEntity> departmentEntities=healthV1Service.findDepartment();
-        return HealthR.ok(departmentEntities);
-    }
+
+
+
+
+
+
+
+
 }

doctor-modules/doctor-health/src/main/java/doctor/controller/DoctorController.java

@@ -0,0 +1,36 @@
+package doctor.controller;
+
+import doctor.common.core.domain.HealthR;
+import doctor.domain.entity.DoctorEntity;
+import doctor.service.DoctorService;
+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.print.Doc;
+import java.util.List;
+
+/**
+ * @BelongsProject: Medical_Treatment
+ * @BelongsPackage: doctor.controller
+ * @Author: jpz
+ * @CreateTime: 2024/1/15 11:30
+ */
+@RestController
+@RequestMapping("/user/inquiry/v1")
+public class DoctorController {
+    @Autowired
+    private DoctorService doctorService;
+    @GetMapping("/findDoctorList")
+    public HealthR<List<DoctorEntity>> findDoctorList(@RequestParam Integer deptId,
+                                                      @RequestParam Integer condition,
+                                                      @RequestParam Integer sortBy,
+                                                      @RequestParam(value = "page",defaultValue = "1") Integer page,
+                                                      @RequestParam(value = "count",defaultValue = "5") Integer count
+    ){
+        List<DoctorEntity> list=doctorService.findDoctorList(deptId);
+        return HealthR.ok(list);
+    }
+}

doctor-modules/doctor-health/src/main/java/doctor/controller/InformationController.java

@@ -5,10 +5,7 @@ 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;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
 
@@ -21,7 +18,8 @@ import static com.github.pagehelper.page.PageMethod.startPage;
  * @CreateTime: 2024/1/11 16:19
  */
 @RestController
-@RequestMapping("/information/v1")
+@RequestMapping("/share/information/v1")
+
 public class InformationController {
     @Autowired
     private InformationService informationService;
@@ -38,4 +36,11 @@ public class InformationController {
         List<InformationPlate> list=informationService.findInformationPlateList();
         return HealthR.ok(list);
     }
+    @GetMapping("/findInformation")
+    public HealthR<Information> findInformation(@RequestParam Long infoId,
+                                                      @RequestHeader(name="userId",required = false)Long userId,
+                                                      @RequestHeader(name = "sessionId",required = false)String sessionId){
+        Information list=informationService.findInformation(infoId);
+        return HealthR.ok(list,"查询成功");
+    }
 }

doctor-modules/doctor-health/src/main/java/doctor/controller/InquiryController.java

@@ -1,13 +1,11 @@
 package doctor.controller;
 
 import doctor.common.core.domain.HealthR;
+import doctor.domain.vo.DoctorVo;
 import doctor.domain.vo.InquiryDetailsRecordVo;
 import doctor.service.InquiryService;
 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 org.springframework.web.bind.annotation.*;
 
 import java.util.List;
 
@@ -20,16 +18,23 @@ import static com.github.pagehelper.page.PageMethod.startPage;
  * @Date: 2024-01-12 19:09
  */
 @RestController
-@RequestMapping("/user/inquiry/verify/v1")
+@RequestMapping("/user/inquiry")
 public class InquiryController {
     @Autowired
     private InquiryService inquiryService;
     //历史问诊记录列表
-    @GetMapping("/findHistoryInquiryRecord")
+    @GetMapping("/verify/v1/findHistoryInquiryRecord")
     public HealthR<List<InquiryDetailsRecordVo>> findHistoryInquiryRecord(@RequestParam Integer page,@RequestParam Integer count){
         startPage(page,count);
         List<InquiryDetailsRecordVo> inquiryDetailsRecordVoList = inquiryService.findHistoryInquiryRecord();
         return HealthR.ok(inquiryDetailsRecordVoList);
     }
 
+    @GetMapping("/v1/findDoctorInfo")
+    public HealthR<DoctorVo> findDoctorInfo(@RequestHeader Integer userId,
+                                            @RequestHeader String sessionId,
+                                            @RequestParam Integer doctorId) {
+        DoctorVo doctorVo = inquiryService.findDoctorInfo(doctorId);
+        return HealthR.ok(doctorVo);
+    }
 }

doctor-modules/doctor-health/src/main/java/doctor/controller/UserVideoController.java

@@ -1,10 +1,12 @@
 package doctor.controller;
 
 import doctor.common.core.domain.HealthR;
+import doctor.domain.dto.UserArchivesDto;
+import doctor.domain.entity.UserAdoptCommentEntity;
+import doctor.domain.entity.UserEntity;
+import doctor.domain.entity.UserInfoCollectionEntity;
 import doctor.domain.entity.UserWalletEntity;
-import doctor.domain.vo.UserConsumptionRecordVo;
-import doctor.domain.vo.UserVideoBuyVo;
-import doctor.domain.vo.UserVideoCollectionVo;
+import doctor.domain.vo.*;
 import doctor.service.UserVideoService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -28,9 +30,9 @@ public class UserVideoController {
 
     //用户视频收藏列表
     @GetMapping("/findVideoCollectionList")
-    public HealthR<List<UserVideoCollectionVo>> findVideoCollectionList(@RequestParam Integer page, @RequestParam Integer count){
+    public HealthR<List<UserVideoCollectionVo>> findVideoCollectionList(@RequestParam Integer page, @RequestParam Integer count,@RequestHeader Integer userId){
         startPage(page,count);
-      List<UserVideoCollectionVo>  userVideoCollectionVos=userVideoService.findVideoCollectionList();
+      List<UserVideoCollectionVo>  userVideoCollectionVos=userVideoService.findVideoCollectionList(userId);
         return HealthR.ok(userVideoCollectionVos);
     }
     //用户取消视频收藏
@@ -47,8 +49,8 @@ public class UserVideoController {
         return HealthR.ok(userVideoCollectionVos);
     }
     //用户删除购买的视频
-    @DeleteMapping("/deleteVideoBuy/{videoId}")
-    public HealthR deleteVideoBuy(@PathVariable Integer videoId){
+    @DeleteMapping("/deleteVideoBuy}")
+    public HealthR deleteVideoBuy(@RequestParam Integer videoId){
         userVideoService.deleteVideoBuy(videoId);
         return HealthR.ok();
     }
@@ -67,5 +69,36 @@ public class UserVideoController {
         return HealthR.ok(userConsumptionRecordVos);
     }
 
+    //用户详情页面
+    @GetMapping("/whetherSignToday")
+    public HealthR<List<UserEntity>> whetherSignToday(@RequestHeader Integer userId){
+        List<UserEntity> userEntities = userVideoService.whetherSignToday(userId);
+        return HealthR.ok(userEntities);
+    }
+   // 用户资讯收藏列表
+    @GetMapping("/findUserInfoCollectionList")
+    public HealthR<List<UserInfoCollectionVo>> findUserInfoCollectionList(){
+        List<UserInfoCollectionVo> userInfoCollections = userVideoService.findUserInfoCollectionList();
+        return HealthR.ok(userInfoCollections);
+    }
+    //用户被采纳意见列表
+    @GetMapping("/findMyAdoptedCommentList")
+    public HealthR<List<UserAdoptCommentVo>> findMyAdoptedCommentList(@RequestParam Integer page,@RequestParam Integer count){
+        startPage(page,count);
+        List<UserAdoptCommentVo> userAdoptCommentEntities = userVideoService.findMyAdoptedCommentList();
+        return HealthR.ok(userAdoptCommentEntities);
+    }
+    //用户查看自己的档案
+    @GetMapping("/findUserArchives")
+    public HealthR<List<UserArchivesVo>> findUserArchives(@RequestHeader Integer userId){
+        List<UserArchivesVo> userArchivesVos = userVideoService.findUserArchives(userId);
+        return HealthR.ok(userArchivesVos);
+    }
+    //添加用户档案
+    @PostMapping("/addUserArchives")
+    public HealthR addUserArchives(@RequestBody UserArchivesDto userArchivesDto){
+        userVideoService.addUserArchives(userArchivesDto);
+        return HealthR.ok();
+    }
 
 }

doctor-modules/doctor-health/src/main/java/doctor/controller/VideoController.java

@@ -22,9 +22,9 @@ public class VideoController {
     @Autowired
     private VideoService videoService;
     //收藏健康讲堂视频列表
-    @PostMapping("/verify/v1/addUserVideoCollection/{videoId}")
-    public HealthR addUserVideoCollection(@PathVariable Integer videoId){
-        videoService.addUserVideoCollection(videoId);
+    @PostMapping("/verify/v1/addUserVideoCollection")
+    public HealthR addUserVideoCollection(@RequestParam  Integer videoId,@RequestHeader Integer userId){
+        videoService.addUserVideoCollection(videoId,userId);
         return HealthR.ok();
     }
     //购买健康讲堂视频

doctor-modules/doctor-health/src/main/java/doctor/convert/VideoConvert.java

@@ -0,0 +1,22 @@
+package doctor.convert;
+
+import doctor.domain.entity.VideoEntity;
+import doctor.domain.vo.VideoVo;
+import org.mapstruct.Mapper;
+import org.mapstruct.factory.Mappers;
+import org.w3c.dom.stylesheets.LinkStyle;
+
+import java.util.List;
+
+@Mapper
+public interface VideoConvert {
+    VideoConvert INSTANCE = Mappers.getMapper(VideoConvert.class);
+
+    VideoVo videoEntityToVideoVo(VideoEntity videoEntity);
+
+    VideoEntity videoVoToVideoEntity(VideoVo videoVo);
+
+    List<VideoEntity> videoVoListToVideoEntityList(List<VideoVo> videoVoList);
+
+    List<VideoVo> videoEntityListToVideoVoList(List<VideoEntity> videoEntityList);
+}

doctor-modules/doctor-health/src/main/java/doctor/domain/dto/UserArchivesDto.java

@@ -0,0 +1,82 @@
+package doctor.domain.dto;
+
+/**
+ * @ClassName : UserArchivesDto
+ * @Description : 添加用户档案
+ * @Author : FJJ
+ * @Date: 2024-01-15 21:51
+ */
+public class UserArchivesDto {
+    private Integer userId;
+    private String diseaseMain;
+    private String diseaseNow;
+    private String diseaseBefore;
+    private String treatmentHospitalRecent;
+    private String treatmentProcess;
+    private String treatmentStartTime;
+    private String treatmentEndTime;
+
+    public Integer getUserId() {
+        return userId;
+    }
+
+    public void setUserId(Integer userId) {
+        this.userId = userId;
+    }
+
+    public String getDiseaseMain() {
+        return diseaseMain;
+    }
+
+    public void setDiseaseMain(String diseaseMain) {
+        this.diseaseMain = diseaseMain;
+    }
+
+    public String getDiseaseNow() {
+        return diseaseNow;
+    }
+
+    public void setDiseaseNow(String diseaseNow) {
+        this.diseaseNow = diseaseNow;
+    }
+
+    public String getDiseaseBefore() {
+        return diseaseBefore;
+    }
+
+    public void setDiseaseBefore(String diseaseBefore) {
+        this.diseaseBefore = diseaseBefore;
+    }
+
+    public String getTreatmentHospitalRecent() {
+        return treatmentHospitalRecent;
+    }
+
+    public void setTreatmentHospitalRecent(String treatmentHospitalRecent) {
+        this.treatmentHospitalRecent = treatmentHospitalRecent;
+    }
+
+    public String getTreatmentProcess() {
+        return treatmentProcess;
+    }
+
+    public void setTreatmentProcess(String treatmentProcess) {
+        this.treatmentProcess = treatmentProcess;
+    }
+
+    public String getTreatmentStartTime() {
+        return treatmentStartTime;
+    }
+
+    public void setTreatmentStartTime(String treatmentStartTime) {
+        this.treatmentStartTime = treatmentStartTime;
+    }
+
+    public String getTreatmentEndTime() {
+        return treatmentEndTime;
+    }
+
+    public void setTreatmentEndTime(String treatmentEndTime) {
+        this.treatmentEndTime = treatmentEndTime;
+    }
+}

doctor-modules/doctor-health/src/main/java/doctor/domain/entity/DoctorEntity.java

@@ -0,0 +1,32 @@
+package doctor.domain.entity;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.Date;
+
+/**
+ * @BelongsProject: Medical_Treatment
+ * @BelongsPackage: doctor.domain.entity
+ * @Author: jpz
+ * @CreateTime: 2024/1/15 11:32
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class DoctorEntity {
+    private Integer id;
+    private Integer departmentId;
+    private String email;
+    private String userName;
+    private Integer reviewStatus;
+    private String phone;
+    private String pwd;
+    private String name;
+    private String imagePic;
+    private String inauguralHospital;
+    private String personalProfile;
+    private String goodFieId;
+    private Date createTime;
+}

doctor-modules/doctor-health/src/main/java/doctor/domain/entity/DrugsKnowledge.java

@@ -1,5 +1,8 @@
 package doctor.domain.entity;
 
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
 import org.w3c.dom.Text;
 
 import java.util.Date;
@@ -10,6 +13,9 @@ import java.util.Date;
  * @Author: jpz
  * @CreateTime: 2024/1/10 22:00
  */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
 public class DrugsKnowledge {
     private Integer id;
     private Integer drugsCategoryId;
@@ -27,123 +33,5 @@ public class DrugsKnowledge {
     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;
-    }
 }

doctor-modules/doctor-health/src/main/java/doctor/domain/entity/InquiryDetailsRecordEntity.java

@@ -1,106 +1,54 @@
 package doctor.domain.entity;
 
-import org.springframework.format.annotation.DateTimeFormat;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
 
 import java.util.Date;
 
 /**
- * @ClassName : InquiryDetailsRecordEntity
- * @Description : 查询详情记录表
- * @Author : FJJ
- * @Date: 2024-01-12 17:26
+ * @BelongsProject: Medical_Treatment
+ * @BelongsPackage: doctor.domain.entity
+ * @Author: jpz
+ * @CreateTime: 2024/1/12 21:46
  */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
 public class InquiryDetailsRecordEntity {
+    //主键id
     private Integer id;
+    //问诊记录
     private Integer inquiryId;
+    //用户id
     private Integer userId;
+    //好友id
     private Integer friendId;
+    //问诊内容
     private String askContent;
+    //问诊图片
     private String askImage;
+    //语音聊天
     private String voiceChat;
+    //方向1=发送 2=接收
     private Integer direction;
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    //问诊时间
     private Date askTime;
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    //创建时间
     private Date createTime;
 
-    public Integer getId() {
-        return id;
-    }
 
-    public void setId(Integer id) {
-        this.id = id;
-    }
 
-    public Integer getInquiryId() {
-        return inquiryId;
-    }
 
-    public void setInquiryId(Integer inquiryId) {
-        this.inquiryId = inquiryId;
-    }
 
-    public Integer getUserId() {
-        return userId;
-    }
 
-    public void setUserId(Integer userId) {
-        this.userId = userId;
-    }
 
-    public Integer getFriendId() {
-        return friendId;
-    }
 
-    public void setFriendId(Integer friendId) {
-        this.friendId = friendId;
-    }
 
-    public String getAskContent() {
-        return askContent;
-    }
 
-    public void setAskContent(String askContent) {
-        this.askContent = askContent;
-    }
 
-    public String getAskImage() {
-        return askImage;
-    }
 
-    public void setAskImage(String askImage) {
-        this.askImage = askImage;
-    }
 
-    public String getVoiceChat() {
-        return voiceChat;
-    }
 
-    public void setVoiceChat(String voiceChat) {
-        this.voiceChat = voiceChat;
-    }
 
-    public Integer getDirection() {
-        return direction;
-    }
-
-    public void setDirection(Integer direction) {
-        this.direction = direction;
-    }
-
-    public Date getAskTime() {
-        return askTime;
-    }
-
-    public void setAskTime(Date askTime) {
-        this.askTime = askTime;
-    }
-
-    public Date getCreateTime() {
-        return createTime;
-    }
-
-    public void setCreateTime(Date createTime) {
-        this.createTime = createTime;
-    }
 }

doctor-modules/doctor-health/src/main/java/doctor/domain/entity/InquiryRecordEntity.java

@@ -0,0 +1,26 @@
+package doctor.domain.entity;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.Date;
+
+/**
+ * @BelongsProject: Medical_Treatment
+ * @BelongsPackage: doctor.domain.entity
+ * @Author: jpz
+ * @CreateTime: 2024/1/12 21:52
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class InquiryRecordEntity {
+    private Integer id;
+    private Integer userId;
+    private Integer doctorId;
+    private Integer status;
+    private Integer showStatus;
+    private Date inquiryTime;
+    private Date createTime;
+}

doctor-modules/doctor-health/src/main/java/doctor/domain/entity/PopularSearchEntity.java

@@ -0,0 +1,22 @@
+package doctor.domain.entity;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.Date;
+
+/**
+ * @BelongsProject: Medical_Treatment
+ * @BelongsPackage: doctor.domain.entity
+ * @Author: jpz
+ * @CreateTime: 2024/1/14 16:00
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class PopularSearchEntity {
+    private Integer id;
+    private String name;
+    private Date createTime;
+}

doctor-modules/doctor-health/src/main/java/doctor/domain/entity/UserArchivesEntity.java

@@ -14,9 +14,14 @@ import java.util.Date;
 public class UserArchivesEntity {
     private Integer id;
     private Integer userId;
-    private String bankCardNumber;
-    private String bankName;
-    private Integer bankCardType;
+    private String diseaseMain;
+    private String diseaseNow;
+    private String diseaseBefore;
+    private String treatmentHospitalRecent;
+    private String treatmentProcess;
+    private Date treatmentStartTime;
+    private Date treatmentEndTime;
+    private String picture;
     private Date updateTime;
     private Date createTime;
 
@@ -36,28 +41,68 @@ public class UserArchivesEntity {
         this.userId = userId;
     }
 
-    public String getBankCardNumber() {
-        return bankCardNumber;
+    public String getDiseaseMain() {
+        return diseaseMain;
     }
 
-    public void setBankCardNumber(String bankCardNumber) {
-        this.bankCardNumber = bankCardNumber;
+    public void setDiseaseMain(String diseaseMain) {
+        this.diseaseMain = diseaseMain;
     }
 
-    public String getBankName() {
-        return bankName;
+    public String getDiseaseNow() {
+        return diseaseNow;
     }
 
-    public void setBankName(String bankName) {
-        this.bankName = bankName;
+    public void setDiseaseNow(String diseaseNow) {
+        this.diseaseNow = diseaseNow;
     }
 
-    public Integer getBankCardType() {
-        return bankCardType;
+    public String getDiseaseBefore() {
+        return diseaseBefore;
     }
 
-    public void setBankCardType(Integer bankCardType) {
-        this.bankCardType = bankCardType;
+    public void setDiseaseBefore(String diseaseBefore) {
+        this.diseaseBefore = diseaseBefore;
+    }
+
+    public String getTreatmentHospitalRecent() {
+        return treatmentHospitalRecent;
+    }
+
+    public void setTreatmentHospitalRecent(String treatmentHospitalRecent) {
+        this.treatmentHospitalRecent = treatmentHospitalRecent;
+    }
+
+    public String getTreatmentProcess() {
+        return treatmentProcess;
+    }
+
+    public void setTreatmentProcess(String treatmentProcess) {
+        this.treatmentProcess = treatmentProcess;
+    }
+
+    public Date getTreatmentStartTime() {
+        return treatmentStartTime;
+    }
+
+    public void setTreatmentStartTime(Date treatmentStartTime) {
+        this.treatmentStartTime = treatmentStartTime;
+    }
+
+    public Date getTreatmentEndTime() {
+        return treatmentEndTime;
+    }
+
+    public void setTreatmentEndTime(Date treatmentEndTime) {
+        this.treatmentEndTime = treatmentEndTime;
+    }
+
+    public String getPicture() {
+        return picture;
+    }
+
+    public void setPicture(String picture) {
+        this.picture = picture;
     }
 
     public Date getUpdateTime() {

doctor-modules/doctor-health/src/main/java/doctor/domain/entity/UserVideoCollectionEntity.java

@@ -16,6 +16,8 @@ public class UserVideoCollectionEntity {
     private Integer id;
     private Integer userId;
     private Integer videoId;
+
+    private  String original;
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
     private Date createTime;
@@ -52,5 +54,11 @@ public class UserVideoCollectionEntity {
         this.createTime = createTime;
     }
 
+    public String getOriginal() {
+        return original;
+    }
 
+    public void setOriginal(String original) {
+        this.original = original;
+    }
 }

doctor-modules/doctor-health/src/main/java/doctor/domain/vo/Comment.java

@@ -0,0 +1,15 @@
+package doctor.domain.vo;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class Comment {
+    private String nickName;
+    private String headPic;
+    private String content;
+    private Long commentTime;
+}

doctor-modules/doctor-health/src/main/java/doctor/domain/vo/DoctorReceiveGift.java

@@ -0,0 +1,16 @@
+package doctor.domain.vo;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class DoctorReceiveGift {
+    private Integer worth;
+    private Integer receiveNum;
+    private String giftPic;
+    private String giftName;
+    private String meaning;
+}

doctor-modules/doctor-health/src/main/java/doctor/domain/vo/DoctorVo.java

@@ -1,16 +1,35 @@
 package doctor.domain.vo;
 
+import lombok.AllArgsConstructor;
 import lombok.Data;
+import lombok.NoArgsConstructor;
 
+import java.util.List;
+
+/**
+ * @BelongsProject: Medical_Treatment
+ * @BelongsPackage: doctor.domain.vo
+ * @Author: jpz
+ * @CreateTime: 2024/1/15 11:38
+ */
 @Data
+@AllArgsConstructor
+@NoArgsConstructor
 public class DoctorVo {
-    private Integer departmentId;
-    private String departmentName;
-    private String goodField;
-    private Integer id;
+    private Integer doctorId;
+    private String doctorName;
     private String imagePic;
-    private String inauguralHospital;
     private String jobTitle;
-    private String name;
+    private String inauguralHospital;
+    private double praise;
+    private Integer serverNum;
+    private Integer servicePrice;
+    private Integer followFlag;
     private String personalProfile;
+    private String goodField;
+    private Integer commentNum;
+    private Integer praiseNum;
+    private Integer badNum;
+    private List<DoctorReceiveGift> doctorReceiveGiftList;
+    private List<Comment> commentVoList;
 }

doctor-modules/doctor-health/src/main/java/doctor/domain/vo/DrugsKnowledgeVo.java

@@ -18,5 +18,16 @@ public class DrugsKnowledgeVo {
     private Integer drugsCategoryId;
     private String name;
     private String picture;
+    private String effect;
+    private String taboo;
+    private String shape;
+    private String packing;
+    private String component;
+    private String usage;
+    private String sideEffects;
+    private String storage;
+    private String mindMatter;
+    private String approvalNumber;
+
 
 }

doctor-modules/doctor-health/src/main/java/doctor/domain/vo/InformationVo.java

@@ -19,5 +19,6 @@ public class InformationVo {
     private String thumbnail;
     private String source;
     private long releaseTime;
+    private Integer whetherCollection;
 
 }

doctor-modules/doctor-health/src/main/java/doctor/domain/vo/UserAdoptCommentVo.java

@@ -0,0 +1,73 @@
+package doctor.domain.vo;
+
+/**
+ * @ClassName : UserAdoptCommentVo
+ * @Description : 用户被采纳的建议
+ * @Author : FJJ
+ * @Date: 2024-01-15 19:46
+ */
+public class UserAdoptCommentVo {
+    private Integer releaseUserId;
+    private String releaseUserNickName;
+    private String releaseUserHeadPic;
+    private String title;
+    private String disease;
+    private long  adoptTime;
+    private String   content;
+
+    public Integer getReleaseUserId() {
+        return releaseUserId;
+    }
+
+    public void setReleaseUserId(Integer releaseUserId) {
+        this.releaseUserId = releaseUserId;
+    }
+
+    public String getReleaseUserNickName() {
+        return releaseUserNickName;
+    }
+
+    public void setReleaseUserNickName(String releaseUserNickName) {
+        this.releaseUserNickName = releaseUserNickName;
+    }
+
+    public String getReleaseUserHeadPic() {
+        return releaseUserHeadPic;
+    }
+
+    public void setReleaseUserHeadPic(String releaseUserHeadPic) {
+        this.releaseUserHeadPic = releaseUserHeadPic;
+    }
+
+    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 long getAdoptTime() {
+        return adoptTime;
+    }
+
+    public void setAdoptTime(long adoptTime) {
+        this.adoptTime = adoptTime;
+    }
+
+    public String getContent() {
+        return content;
+    }
+
+    public void setContent(String content) {
+        this.content = content;
+    }
+}

doctor-modules/doctor-health/src/main/java/doctor/domain/vo/UserArchivesVo.java

@@ -7,5 +7,14 @@ package doctor.domain.vo;
  * @Date: 2024-01-12 18:52
  */
 public class UserArchivesVo {
-    private Integer recordId;
+    private Integer userId;
+    private Integer archivesId;
+    private String diseaseMain;
+    private String diseaseNow;
+    private String diseaseBefore;
+    private String treatmentHospitalRecent;
+    private String treatmentProcess;
+    private long treatmentStartTime;
+    private long treatmentEndTime;
+    private String picture;
 }

doctor-modules/doctor-health/src/main/java/doctor/domain/vo/UserInfoCollectionVo.java

@@ -0,0 +1,57 @@
+package doctor.domain.vo;
+
+import java.util.Date;
+
+/**
+ * @ClassName : UserInfoCollectionVo
+ * @Description : 用户资讯列表
+ * @Author : FJJ
+ * @Date: 2024-01-15 11:52
+ */
+public class UserInfoCollectionVo {
+    private Integer id;
+    private Integer infoId;
+    private String title;
+    private String thumbnail;
+    private Date createTime;
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public Integer getInfoId() {
+        return infoId;
+    }
+
+    public void setInfoId(Integer infoId) {
+        this.infoId = infoId;
+    }
+
+    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 Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+}

doctor-modules/doctor-health/src/main/java/doctor/domain/vo/UserVideoCollectionVo.java

@@ -1,13 +1,21 @@
 package doctor.domain.vo;
 
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
 /**
  * @ClassName : UserVideoCollectionVo
  * @Description : 用户视频收藏表
  * @Author : FJJ
  * @Date: 2024-01-12 16:11
  */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
 public class UserVideoCollectionVo {
     private Integer id;
+    private Integer videoId;
     private String title;
     private String shearUrl;
     private String original;
@@ -16,76 +24,4 @@ public class UserVideoCollectionVo {
     private Integer whetherBuy;
     private Integer buyNum;
     private Long createTime;
-
-    public Integer getId() {
-        return id;
-    }
-
-    public void setId(Integer id) {
-        this.id = id;
-    }
-
-    public String getTitle() {
-        return title;
-    }
-
-    public void setTitle(String title) {
-        this.title = title;
-    }
-
-    public String getShearUrl() {
-        return shearUrl;
-    }
-
-    public void setShearUrl(String shearUrl) {
-        this.shearUrl = shearUrl;
-    }
-
-    public String getOriginal() {
-        return original;
-    }
-
-    public void setOriginal(String original) {
-        this.original = original;
-    }
-
-    public Integer getPrice() {
-        return price;
-    }
-
-    public void setPrice(Integer price) {
-        this.price = price;
-    }
-
-    public Integer getDuration() {
-        return duration;
-    }
-
-    public void setDuration(Integer duration) {
-        this.duration = duration;
-    }
-
-    public Integer getWhetherBuy() {
-        return whetherBuy;
-    }
-
-    public void setWhetherBuy(Integer whetherBuy) {
-        this.whetherBuy = whetherBuy;
-    }
-
-    public Integer getBuyNum() {
-        return buyNum;
-    }
-
-    public void setBuyNum(Integer buyNum) {
-        this.buyNum = buyNum;
-    }
-
-    public Long getCreateTime() {
-        return createTime;
-    }
-
-    public void setCreateTime(Long createTime) {
-        this.createTime = createTime;
-    }
 }

doctor-modules/doctor-health/src/main/java/doctor/mapper/DiseaseKnowledgeMapper.java

@@ -1,9 +1,6 @@
 package doctor.mapper;
 
-import doctor.domain.entity.DiseaseKnowledge;
-import doctor.domain.entity.DrugsCategory;
-import doctor.domain.entity.Information;
-import doctor.domain.entity.InformationPlate;
+import doctor.domain.entity.*;
 import org.mybatis.spring.annotation.MapperScan;
 
 import java.util.List;
@@ -23,4 +20,8 @@ public interface DiseaseKnowledgeMapper {
     List<DrugsCategory> findDrugsKnowledgeList(Integer drugsCategoryId);
 
 
+    DrugsKnowledge findDrugsKnowledge(Integer id);
+
+    List<PopularSearchEntity> popularSeach();
+
 }

doctor-modules/doctor-health/src/main/java/doctor/mapper/DoctorMapper.java

@@ -0,0 +1,17 @@
+package doctor.mapper;
+
+import doctor.domain.entity.DoctorEntity;
+import org.mybatis.spring.annotation.MapperScan;
+
+import java.util.List;
+
+/**
+ * @BelongsProject: Medical_Treatment
+ * @BelongsPackage: doctor.mapper
+ * @Author: jpz
+ * @CreateTime: 2024/1/15 11:54
+ */
+@MapperScan
+public interface DoctorMapper {
+    List<DoctorEntity> findDoctorList(Integer deptId);
+}

doctor-modules/doctor-health/src/main/java/doctor/mapper/InformationMapper.java

@@ -18,4 +18,6 @@ public interface InformationMapper {
 
     List<InformationPlate> findInformationPlateList();
 
+
+    Information findInformation(Long infoId);
 }

doctor-modules/doctor-health/src/main/java/doctor/mapper/UserVideoMapper.java

@@ -1,9 +1,7 @@
 package doctor.mapper;
 
-import doctor.domain.entity.UserConsumptionRecordEntity;
-import doctor.domain.entity.UserVideoBuyEntity;
-import doctor.domain.entity.UserVideoCollectionEntity;
-import doctor.domain.entity.UserWalletEntity;
+import doctor.domain.dto.UserArchivesDto;
+import doctor.domain.entity.*;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
@@ -17,7 +15,7 @@ import java.util.List;
  */
 @Mapper
 public interface UserVideoMapper {
-    List<UserVideoCollectionEntity> findVideoCollectionList();
+    List<UserVideoCollectionEntity> findVideoCollectionList(@Param("userId") Integer userId);
 
     void cancelVideoCollection(@Param("videoId") Integer videoId);
 
@@ -28,4 +26,14 @@ public interface UserVideoMapper {
     List<UserWalletEntity> findUserWallet();
 
     List<UserConsumptionRecordEntity> findUserConsumptionRecordList();
+
+    List<UserEntity> findUserEntityList(@Param("userId") Integer userId);
+
+    List<UserInfoCollectionEntity> findUserInfoCollectionList();
+
+    List<UserAdoptCommentEntity> findMyAdoptedCommentList();
+
+    List<UserArchivesEntity> findUserArchives(@Param("userId") Integer userId);
+
+    void addUserArchives(UserArchivesDto userArchivesDto);
 }

doctor-modules/doctor-health/src/main/java/doctor/service/DiseaseKnowledgeService.java

@@ -1,7 +1,6 @@
 package doctor.service;
 
-import doctor.domain.entity.DiseaseKnowledge;
-import doctor.domain.entity.DrugsCategory;
+import doctor.domain.entity.*;
 
 import java.util.List;
 
@@ -19,4 +18,8 @@ public interface DiseaseKnowledgeService {
     List<DrugsCategory> findDrugsKnowledgeList(Integer drugsCategoryId);
 
 
+    DrugsKnowledge  findDrugsKnowledge(Integer id);
+
+    List<PopularSearchEntity> popularSeach();
+
 }

doctor-modules/doctor-health/src/main/java/doctor/service/DoctorService.java

@@ -0,0 +1,15 @@
+package doctor.service;
+
+import doctor.domain.entity.DoctorEntity;
+
+import java.util.List;
+
+/**
+ * @BelongsProject: Medical_Treatment
+ * @BelongsPackage: doctor.service
+ * @Author: jpz
+ * @CreateTime: 2024/1/15 11:32
+ */
+public interface DoctorService {
+    List<DoctorEntity> findDoctorList(Integer deptId);
+}

doctor-modules/doctor-health/src/main/java/doctor/service/InformationService.java

@@ -16,4 +16,7 @@ public interface InformationService {
     List<Information> findInformationList(Integer plateId);
 
     List<InformationPlate> findInformationPlateList();
+
+
+    Information findInformation(Long infoId);
 }

doctor-modules/doctor-health/src/main/java/doctor/service/InquiryService.java

@@ -1,5 +1,6 @@
 package doctor.service;
 
+import doctor.domain.vo.DoctorVo;
 import doctor.domain.vo.InquiryDetailsRecordVo;
 
 import java.util.List;
@@ -12,4 +13,6 @@ import java.util.List;
  */
 public interface InquiryService {
     List<InquiryDetailsRecordVo> findHistoryInquiryRecord();
+
+    DoctorVo findDoctorInfo(Integer doctorId);
 }

doctor-modules/doctor-health/src/main/java/doctor/service/UserVideoService.java

@@ -1,11 +1,10 @@
 package doctor.service;
 
-import doctor.domain.entity.UserVideoBuyEntity;
-import doctor.domain.entity.UserVideoCollectionEntity;
+import doctor.domain.dto.UserArchivesDto;
+import doctor.domain.entity.UserAdoptCommentEntity;
+import doctor.domain.entity.UserEntity;
 import doctor.domain.entity.UserWalletEntity;
-import doctor.domain.vo.UserConsumptionRecordVo;
-import doctor.domain.vo.UserVideoBuyVo;
-import doctor.domain.vo.UserVideoCollectionVo;
+import doctor.domain.vo.*;
 
 import java.util.List;
 
@@ -26,9 +25,19 @@ public interface UserVideoService {
 
     List<UserWalletEntity> findUserWallet();
 
-    List<UserVideoCollectionVo> findVideoCollectionList();
+    List<UserVideoCollectionVo> findVideoCollectionList(Integer userId);
 
     void cancelVideoCollection(Integer userId, String sessionId, Integer videoId);
 
     List<UserConsumptionRecordVo> findUserConsumptionRecordList();
+
+    List<UserEntity> whetherSignToday(Integer userId);
+
+    List<UserInfoCollectionVo> findUserInfoCollectionList();
+
+    List<UserAdoptCommentVo> findMyAdoptedCommentList();
+
+    List<UserArchivesVo> findUserArchives(Integer userId);
+
+    void addUserArchives(UserArchivesDto userArchivesDto);
 }

doctor-modules/doctor-health/src/main/java/doctor/service/VideoService.java

@@ -13,7 +13,7 @@ import java.util.List;
  */
 public interface VideoService {
 
-    void addUserVideoCollection(Integer videoId);
+    void addUserVideoCollection(Integer videoId,Integer userId);
 
 
     void videoBuy(Integer videoId,Integer price);

doctor-modules/doctor-health/src/main/java/doctor/service/impl/DiseaseKnowledgeServiceimpl.java

@@ -1,7 +1,6 @@
 package doctor.service.impl;
 
-import doctor.domain.entity.DiseaseKnowledge;
-import doctor.domain.entity.DrugsCategory;
+import doctor.domain.entity.*;
 import doctor.mapper.DiseaseKnowledgeMapper;
 import doctor.service.DiseaseKnowledgeService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -34,5 +33,17 @@ public class DiseaseKnowledgeServiceimpl implements DiseaseKnowledgeService {
         return diseaseKnowledgeMapper.findDrugsKnowledgeList(drugsCategoryId);
     }
 
+    @Override
+    public DrugsKnowledge findDrugsKnowledge(Integer id) {
+        return diseaseKnowledgeMapper.findDrugsKnowledge(id);
+    }
+
+    @Override
+    public List<PopularSearchEntity> popularSeach() {
+        return diseaseKnowledgeMapper.popularSeach();
+    }
+
+
+
 
 }

doctor-modules/doctor-health/src/main/java/doctor/service/impl/DoctorServiceimpl.java

@@ -0,0 +1,26 @@
+package doctor.service.impl;
+
+import doctor.domain.entity.DoctorEntity;
+import doctor.mapper.DoctorMapper;
+import doctor.service.DoctorService;
+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/15 11:45
+ */
+@Service
+public class DoctorServiceimpl implements DoctorService {
+    @Autowired
+    private DoctorMapper doctorMapper;
+
+    @Override
+    public List<DoctorEntity> findDoctorList(Integer deptId) {
+        return doctorMapper.findDoctorList(deptId);
+    }
+}

doctor-modules/doctor-health/src/main/java/doctor/service/impl/HealthUserVideoServiceImpl.java

@@ -3,6 +3,7 @@ package doctor.service.impl;
 
 import doctor.common.security.service.TokenService;
 import doctor.common.security.utils.SecurityUtils;
+import doctor.convert.VideoConvert;
 import doctor.domain.entity.UserVideoBuyEntity;
 import doctor.domain.entity.UserVideoCollectionEntity;
 import doctor.domain.entity.VideoCategoryEntity;
@@ -37,7 +38,7 @@ public class HealthUserVideoServiceImpl implements HealthUserVideoService {
     @Override
     public List<VideoVo> findVideoVoList(Integer categoryId, Integer userId) {
         List<VideoEntity> videoVoList = healthUserVideoMapper.findVideoVoList(categoryId);
-        List<VideoVo> videoVos = ConvertUtil.entityToVoList(videoVoList, VideoVo.class);
+        List<VideoVo> videoVos = VideoConvert.INSTANCE.videoEntityListToVideoVoList(videoVoList);
         videoVos.forEach(video -> {
             UserVideoCollectionEntity userVideoCollection = healthUserVideoMapper.selectWhetherCollectionByUserIdAndVideoId(userId,video.getId());
             if(userVideoCollection!=null){

doctor-modules/doctor-health/src/main/java/doctor/service/impl/InformationServiceimpl.java

@@ -29,4 +29,11 @@ public class InformationServiceimpl implements InformationService {
     public List<InformationPlate> findInformationPlateList() {
         return informationMapper.findInformationPlateList();
     }
+
+    @Override
+    public Information findInformation(Long infoId) {
+        return informationMapper.findInformation(infoId);
+    }
+
+
 }

doctor-modules/doctor-health/src/main/java/doctor/service/impl/InquiryServiceImpl.java

@@ -1,6 +1,7 @@
 package doctor.service.impl;
 
 import doctor.domain.entity.InquiryDetailsRecordEntity;
+import doctor.domain.vo.DoctorVo;
 import doctor.domain.vo.InquiryDetailsRecordVo;
 import doctor.mapper.InquiryMapper;
 import doctor.service.InquiryService;
@@ -26,4 +27,10 @@ public class InquiryServiceImpl implements InquiryService {
         List<InquiryDetailsRecordVo> inquiryDetailsRecordVos = ConvertUtil.entityToVoList(inquiryDetailsRecordEntity, InquiryDetailsRecordVo.class);
         return inquiryDetailsRecordVos;
     }
+
+    @Override
+    public DoctorVo findDoctorInfo(Integer doctorId) {
+
+        return null;
+    }
 }

doctor-modules/doctor-health/src/main/java/doctor/service/impl/UserVideoServiceImpl.java

@@ -1,12 +1,8 @@
 package doctor.service.impl;
 
-import doctor.domain.entity.UserConsumptionRecordEntity;
-import doctor.domain.entity.UserVideoBuyEntity;
-import doctor.domain.entity.UserVideoCollectionEntity;
-import doctor.domain.entity.UserWalletEntity;
-import doctor.domain.vo.UserConsumptionRecordVo;
-import doctor.domain.vo.UserVideoBuyVo;
-import doctor.domain.vo.UserVideoCollectionVo;
+import doctor.domain.dto.UserArchivesDto;
+import doctor.domain.entity.*;
+import doctor.domain.vo.*;
 import doctor.mapper.UserVideoMapper;
 import doctor.service.UserVideoService;
 import doctor.util.ConvertUtil;
@@ -28,8 +24,8 @@ public class UserVideoServiceImpl implements UserVideoService {
 
 
     @Override
-    public List<UserVideoCollectionVo> findVideoCollectionList() {
-        List<UserVideoCollectionEntity> userVideoCollectionEntityList=userVideoMapper.findVideoCollectionList();
+    public List<UserVideoCollectionVo> findVideoCollectionList(Integer userId) {
+        List<UserVideoCollectionEntity> userVideoCollectionEntityList=userVideoMapper.findVideoCollectionList(userId);
         List<UserVideoCollectionVo> userVideoCollectionVoList = ConvertUtil.entityToVoList(userVideoCollectionEntityList, UserVideoCollectionVo.class);
         return userVideoCollectionVoList;
     }
@@ -46,6 +42,38 @@ public class UserVideoServiceImpl implements UserVideoService {
         return userConsumptionRecordVoList;
     }
 
+    @Override
+    public List<UserEntity> whetherSignToday(Integer userId) {
+        List<UserEntity> userEntityList=userVideoMapper.findUserEntityList(userId);
+        return userEntityList;
+    }
+
+    @Override
+    public List<UserInfoCollectionVo> findUserInfoCollectionList() {
+        List<UserInfoCollectionEntity> userVideoCollectionEntityList=userVideoMapper.findUserInfoCollectionList();
+        List<UserInfoCollectionVo> userVideoCollectionVoList = ConvertUtil.entityToVoList(userVideoCollectionEntityList, UserInfoCollectionVo.class);
+        return userVideoCollectionVoList;
+    }
+
+    @Override
+    public List<UserAdoptCommentVo> findMyAdoptedCommentList() {
+        List<UserAdoptCommentEntity> userAdoptCommentEntityList=userVideoMapper.findMyAdoptedCommentList();
+        List<UserAdoptCommentVo> userAdoptCommentVoList = ConvertUtil.entityToVoList(userAdoptCommentEntityList, UserAdoptCommentVo.class);
+        return userAdoptCommentVoList;
+    }
+
+    @Override
+    public List<UserArchivesVo> findUserArchives(Integer userId) {
+        List<UserArchivesEntity> userArchivesEntityList=userVideoMapper.findUserArchives(userId);
+        List<UserArchivesVo> userArchivesVoList = ConvertUtil.entityToVoList(userArchivesEntityList, UserArchivesVo.class);
+        return userArchivesVoList;
+    }
+
+    @Override
+    public void addUserArchives(UserArchivesDto userArchivesDto) {
+        userVideoMapper.addUserArchives(userArchivesDto);
+    }
+
 
     @Override
     public List<UserVideoBuyVo> findUserVideoBuyList() {

doctor-modules/doctor-health/src/main/java/doctor/service/impl/VideoServiceImpl.java

@@ -25,10 +25,7 @@ public class VideoServiceImpl implements VideoService {
     @Autowired
     private HttpServletRequest request;
     @Override
-    public void addUserVideoCollection(Integer videoId) {
-        //获取用户id
-        String token = request.getHeader("token");
-        Integer userId = Integer.valueOf(JwtUtils.getUserId(token));
+    public void addUserVideoCollection(Integer videoId,Integer userId) {
         // 添加收藏
         videoMapper.addUserVideoCollection(userId,videoId);
         // 更新视频收藏数

doctor-modules/doctor-health/src/main/resources/bootstrap.yml

@@ -0,0 +1,38 @@
+# Tomcat
+server:
+  port: 9204
+
+# Spring
+spring:
+  application:
+    # 应用名称
+    name: doctor-health
+  profiles:
+    # 环境配置
+    active: dev
+  cloud:
+    nacos:
+      discovery:
+        # 服务注册地址
+        server-addr: 101.34.77.101:8848
+        namespace: 7e34f104-f333-4828-b36a-02146e521c9a
+      config:
+        # 配置中心地址
+        server-addr: 101.34.77.101:8848
+        namespace: 7e34f104-f333-4828-b36a-02146e521c9a
+        # 配置文件格式
+        file-extension: yml
+        # 共享配置
+        shared-configs:
+          - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
+  mail:
+    host: smtp.qq.com
+    port: 587
+    username: 3581044601@qq.com
+    password: bwscqgqpkagjciih
+    default-encoding: UTF8
+    properties:
+      mail:
+        smtp:
+          socketFactoryClass: javax.net.ssl.SSLSocketFactory
+    debug: true

doctor-modules/doctor-health/src/main/resources/mapper/doctor/DiseaseKnowledgeServiceMapper.xml

@@ -16,5 +16,12 @@
         select *
         from drugs_knowledge where drugs_category_id = #{drugsCategoryId}
     </select>
+    <select id="findDrugsKnowledge" resultType="doctor.domain.entity.DrugsKnowledge">
+        select *from drugs_knowledge where id=#{id}
+    </select>
+    <select id="popularSeach" resultType="doctor.domain.entity.PopularSearchEntity">
+        select *from popular_search
+    </select>
+
 
 </mapper>

doctor-modules/doctor-health/src/main/resources/mapper/doctor/DoctorMapper.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="doctor.mapper.DoctorMapper">
+
+
+    <select id="findDoctorList" resultType="doctor.domain.entity.DoctorEntity">
+        select *
+        from doctor where department_id = #{deptId}
+    </select>
+</mapper>
+2

doctor-modules/doctor-health/src/main/resources/mapper/doctor/InformationMapperServiceMapper.xml

@@ -14,4 +14,9 @@
         select *
         from information where plate_id = #{plateId}
     </select>
+    <select id="findInformation" resultType="doctor.domain.entity.Information">
+        select *
+        from information where plate_id=#{infoId}
+    </select>
+
 </mapper>

doctor-modules/doctor-health/src/main/resources/mapper/doctor/UserVideoMapper.xml

@@ -3,6 +3,33 @@
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="doctor.mapper.UserVideoMapper">
+    <insert id="addUserArchives">
+        insert into user_archives (
+                user_id,
+disease_main,
+disease_now,
+disease_before,
+treatment_hospital_recent,
+treatment_process,
+treatment_start_time,
+treatment_end_time,
+picture,
+create_time
+
+        )
+        values (
+                #{userId},
+                #{diseaseMain},
+                #{diseaseNow},
+                #{diseaseBefore},
+                #{treatmentHospitalRecent},
+                #{treatmentProcess},
+                #{treatmentStartTime},
+                #{treatmentEndTime},
+                #{picture},
+                now()
+               );
+    </insert>
     <delete id="cancelVideoCollection">
         delete
         from user_video_collection
@@ -14,8 +41,7 @@
         where video_id = #{videoId}
     </delete>
     <select id="findVideoCollectionList" resultType="doctor.domain.entity.UserVideoCollectionEntity">
-        select *
-        from user_video_collection
+        SELECT user_video_collection.*,video.original_url original FROM user_video_collection LEFT JOIN video ON video.id=user_video_collection.video_id where user_id=#{userId}
     </select>
     <select id="findUserVideoBuyList" resultType="doctor.domain.entity.UserVideoBuyEntity">
         select *
@@ -29,4 +55,19 @@
         select *
         from user_consumption_record
     </select>
+    <select id="findUserEntityList" resultType="doctor.domain.entity.UserEntity">
+        select *
+        from user where id=#{userId}
+    </select>
+    <select id="findUserInfoCollectionList" resultType="doctor.domain.entity.UserInfoCollectionEntity">
+        SELECT user_info_collection.*,information.title,information.content,information.source FROM user_info_collection LEFT JOIN information ON user_info_collection.info_id =information.id
+    </select>
+    <select id="findMyAdoptedCommentList" resultType="doctor.domain.entity.UserAdoptCommentEntity">
+        select *
+        from user_adopt_comment
+    </select>
+    <select id="findUserArchives" resultType="doctor.domain.entity.UserArchivesEntity">
+        select *
+        from user_archives where user_id=#{userId}
+    </select>
 </mapper>

doctor-modules/doctor-job/src/main/resources/bootstrap.yml

@@ -15,11 +15,11 @@ spring:
       discovery:
         # 服务注册地址
         server-addr: 101.34.77.101:8848
-        namespace: 7e34f104-f333-4828-b36a-02146e521c9a
+        namespace: 09dff3e2-9790-4d4f-beb6-9baeb01ae040
       config:
         # 配置中心地址
         server-addr: 101.34.77.101:8848
-        namespace: 7e34f104-f333-4828-b36a-02146e521c9a
+        namespace: 09dff3e2-9790-4d4f-beb6-9baeb01ae040
         # 配置文件格式
         file-extension: yml
         # 共享配置

doctor-modules/doctor-system/src/main/resources/bootstrap.yml

@@ -15,11 +15,11 @@ spring:
       discovery:
         # 服务注册地址
         server-addr: 101.34.77.101:8848
-        namespace: 7e34f104-f333-4828-b36a-02146e521c9a
+        namespace: 09dff3e2-9790-4d4f-beb6-9baeb01ae040
       config:
         # 配置中心地址
         server-addr: 101.34.77.101:8848
-        namespace: 7e34f104-f333-4828-b36a-02146e521c9a
+        namespace: 09dff3e2-9790-4d4f-beb6-9baeb01ae040
         # 配置文件格式
         file-extension: yml
         # 共享配置

doctor-visual/doctor-monitor/src/main/resources/bootstrap.yml

@@ -15,11 +15,11 @@ spring:
       discovery:
         # 服务注册地址
         server-addr: 101.34.77.101:8848
-        namespace: 7e34f104-f333-4828-b36a-02146e521c9a
+        namespace: 09dff3e2-9790-4d4f-beb6-9baeb01ae040
       config:
         # 配置中心地址
         server-addr: 101.34.77.101:8848
-        namespace: 7e34f104-f333-4828-b36a-02146e521c9a
+        namespace: 09dff3e2-9790-4d4f-beb6-9baeb01ae040
         # 配置文件格式
         file-extension: yml
         # 共享配置

pom.xml

@@ -35,6 +35,7 @@
         <minio.version>8.2.2</minio.version>
         <poi.version>4.1.2</poi.version>
         <transmittable-thread-local.version>2.14.4</transmittable-thread-local.version>
+        <mapstruct.version>1.4.2.Final</mapstruct.version>
     </properties>
 
     <!-- 依赖声明 -->
@@ -206,6 +207,22 @@
                 <version>${doctor.version}</version>
             </dependency>
 
+            <dependency>
+                <groupId>org.mapstruct</groupId>
+                <artifactId>mapstruct</artifactId>
+                <version>${mapstruct.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.mapstruct</groupId>
+                <artifactId>mapstruct-jdk8</artifactId>
+                <version>${mapstruct.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.mapstruct</groupId>
+                <artifactId>mapstruct-processor</artifactId>
+                <version>${mapstruct.version}</version>
+            </dependency>
+
         </dependencies>
     </dependencyManagement>