From ca1c7154cd69ac95135a5bc401119cd448fdfb6d Mon Sep 17 00:00:00 2001
From: fjj <–1066869486@qq.com>
Date: Fri, 19 Jan 2024 20:24:13 +0800
Subject: [PATCH 1/5] =?UTF-8?q?=E5=AE=8C=E5=96=84=E7=94=A8=E6=88=B7?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/UserVideoController.java       | 33 ++++++++++++++--
 .../java/doctor/mapper/UserVideoMapper.java   | 11 ++++++
 .../java/doctor/service/UserVideoService.java | 10 +++++
 .../service/impl/UserVideoServiceImpl.java    | 27 +++++++++++++
 .../mapper/doctor/UserVideoMapper.xml         | 38 +++++++++++++++++++
 5 files changed, 116 insertions(+), 3 deletions(-)

diff --git a/doctor-modules/doctor-health/src/main/java/doctor/controller/UserVideoController.java b/doctor-modules/doctor-health/src/main/java/doctor/controller/UserVideoController.java
index 9a467e4..d2d1343 100644
--- a/doctor-modules/doctor-health/src/main/java/doctor/controller/UserVideoController.java
+++ b/doctor-modules/doctor-health/src/main/java/doctor/controller/UserVideoController.java
@@ -124,7 +124,34 @@ public class UserVideoController {
         List<SignEntity> signEntities = userVideoService.findUserSign(userId);
         return HealthR.ok(signEntities);
     }
-//    //根据用户ID查询用户信息
-//    @GetMapping("/getUserInfoById")
-//    public HealthR<>
+    //根据用户ID查询用户信息
+    @GetMapping("/getUserInfoById")
+    public HealthR<List<UserVo>> getUserInfoById(@RequestHeader Integer userId){
+        List<UserVo> userVos = userVideoService.getUserInfoById(userId);
+        return HealthR.ok(userVos);
+    }
+    //用户签到
+    @PostMapping("/addSign")
+    public HealthR addSign(){
+        userVideoService.addSign();
+        return HealthR.ok("签到成功");
+    }
+    //完善用户信息
+    @PutMapping("/perfectUserInfo")
+    public HealthR perfectUserInfo(@RequestParam Integer age,@RequestParam Integer height,@RequestParam  Integer weight,@RequestHeader Integer userId ){
+        userVideoService.perfectUserInfo(age,height,weight,userId);
+        return HealthR.ok("完善成功");
+    }
+    //修改用户性别
+    @PutMapping("/updateUserSex")
+    public HealthR updateUserSex(@RequestParam Integer sex,@RequestHeader Integer userId){
+        userVideoService.updateUserSex(sex,userId);
+        return HealthR.ok("修改成功");
+    }
+    //修改用户昵称
+    @PutMapping("/modifyNickName")
+    public HealthR modifyNickName(@RequestParam String nickName,@RequestHeader Integer userId){
+        userVideoService.modifyNickName(nickName,userId);
+        return HealthR.ok("修改成功");
+    }
 }
diff --git a/doctor-modules/doctor-health/src/main/java/doctor/mapper/UserVideoMapper.java b/doctor-modules/doctor-health/src/main/java/doctor/mapper/UserVideoMapper.java
index 1664b98..419d357 100644
--- a/doctor-modules/doctor-health/src/main/java/doctor/mapper/UserVideoMapper.java
+++ b/doctor-modules/doctor-health/src/main/java/doctor/mapper/UserVideoMapper.java
@@ -46,4 +46,15 @@ public interface UserVideoMapper {
     List<UserTaskRecordDto> findUserTaskList();
 
     List<SignEntity> findUserSign(@Param("userId") Integer userId);
+
+    List<UserEntity> getUserInfoById(@Param("userId") Integer userId);
+
+    void perfectUserInfo(@Param("age") Integer age, @Param("height") Integer height, @Param("weight") Integer weight, @Param("userId") Integer userId);
+
+    void updateUserSex(@Param("sex") Integer sex, @Param("userId") Integer userId);
+
+    void modifyNickName(@Param("nickName") String nickName, @Param("userId") Integer userId);
+
+
+//    void addSign(SignEntity signEntity);
 }
diff --git a/doctor-modules/doctor-health/src/main/java/doctor/service/UserVideoService.java b/doctor-modules/doctor-health/src/main/java/doctor/service/UserVideoService.java
index 3da852d..7afe516 100644
--- a/doctor-modules/doctor-health/src/main/java/doctor/service/UserVideoService.java
+++ b/doctor-modules/doctor-health/src/main/java/doctor/service/UserVideoService.java
@@ -46,4 +46,14 @@ public interface UserVideoService {
     List<UserTaskRecordVo> findUserTaskList();
 
     List<SignEntity> findUserSign(Integer userId);
+
+    List<UserVo> getUserInfoById(Integer userId);
+
+    void addSign();
+
+    void perfectUserInfo(Integer age, Integer height, Integer weight, Integer userId);
+
+    void updateUserSex(Integer sex, Integer userId);
+
+    void modifyNickName(String nickName, Integer userId);
 }
diff --git a/doctor-modules/doctor-health/src/main/java/doctor/service/impl/UserVideoServiceImpl.java b/doctor-modules/doctor-health/src/main/java/doctor/service/impl/UserVideoServiceImpl.java
index a8b59a5..e9fb540 100644
--- a/doctor-modules/doctor-health/src/main/java/doctor/service/impl/UserVideoServiceImpl.java
+++ b/doctor-modules/doctor-health/src/main/java/doctor/service/impl/UserVideoServiceImpl.java
@@ -100,6 +100,33 @@ public class UserVideoServiceImpl implements UserVideoService {
         return userEntityList;
     }
 
+    @Override
+    public List<UserVo> getUserInfoById(Integer userId) {
+        List<UserEntity> userEntities=userVideoMapper.getUserInfoById(userId);
+        List<UserVo> userVos = ConvertUtil.entityToVoList(userEntities, UserVo.class);
+        return userVos;
+    }
+
+    @Override
+    public void addSign() {
+//        userVideoMapper.addSign(signEntity);
+    }
+
+    @Override
+    public void perfectUserInfo(Integer age, Integer height, Integer weight, Integer userId) {
+        userVideoMapper.perfectUserInfo(age,height,weight,userId);
+    }
+
+    @Override
+    public void updateUserSex(Integer sex, Integer userId) {
+        userVideoMapper.updateUserSex(sex,userId);
+    }
+
+    @Override
+    public void modifyNickName(String nickName, Integer userId) {
+        userVideoMapper.modifyNickName(nickName,userId);
+    }
+
 
     @Override
     public List<UserVideoBuyVo> findUserVideoBuyList() {
diff --git a/doctor-modules/doctor-health/src/main/resources/mapper/doctor/UserVideoMapper.xml b/doctor-modules/doctor-health/src/main/resources/mapper/doctor/UserVideoMapper.xml
index 0b6832b..de61012 100644
--- a/doctor-modules/doctor-health/src/main/resources/mapper/doctor/UserVideoMapper.xml
+++ b/doctor-modules/doctor-health/src/main/resources/mapper/doctor/UserVideoMapper.xml
@@ -30,11 +30,45 @@ create_time
                 now()
                );
     </insert>
+<!--    <insert id="addSign">-->
+<!--        insert into sign (-->
+<!--                user_id,-->
+<!--sign_time,-->
+<!--sign_num,-->
+<!--sign_reward,-->
+<!--create_time-->
+
+<!--        )-->
+<!--        values (-->
+<!--                #{userId},-->
+<!--                now(),-->
+<!--                sign_num+1,-->
+<!--                #{signReward},-->
+<!--                now()-->
+<!--               );-->
+<!--    </insert>-->
     <update id="uploadUserArchivesImg">
         update user_archives
         set picture = #{picture}
         where id=#{id}
     </update>
+    <update id="perfectUserInfo">
+        update user
+        set age = #{age},
+height = #{height},
+weight = #{weight}
+        where id = #{userId}
+    </update>
+    <update id="updateUserSex">
+        update user
+        set sex = #{sex}
+        where id = #{userId}
+    </update>
+    <update id="modifyNickName">
+        update user
+        set nick_name = #{nickName}
+        where id = #{userId}
+    </update>
     <delete id="cancelVideoCollection">
         delete
         from user_video_collection
@@ -86,5 +120,9 @@ create_time
         select *
         from sign where user_id=#{userId}
     </select>
+    <select id="getUserInfoById" resultType="doctor.domain.entity.UserEntity">
+        select *
+        from user where id=#{userId}
+    </select>
 
 </mapper>

From 463d1bf61c2b991040cf621432d3c377fc20d642 Mon Sep 17 00:00:00 2001
From: fjj <–1066869486@qq.com>
Date: Fri, 19 Jan 2024 20:28:34 +0800
Subject: [PATCH 2/5] =?UTF-8?q?=E5=AE=8C=E5=96=84=E7=94=A8=E6=88=B7?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/doctor/controller/UserVideoController.java  | 4 ++--
 .../src/main/java/doctor/mapper/UserVideoMapper.java          | 2 +-
 .../src/main/java/doctor/service/UserVideoService.java        | 2 +-
 .../main/java/doctor/service/impl/UserVideoServiceImpl.java   | 4 ++--
 .../src/main/resources/mapper/doctor/UserVideoMapper.xml      | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/doctor-modules/doctor-health/src/main/java/doctor/controller/UserVideoController.java b/doctor-modules/doctor-health/src/main/java/doctor/controller/UserVideoController.java
index d2d1343..c01ad46 100644
--- a/doctor-modules/doctor-health/src/main/java/doctor/controller/UserVideoController.java
+++ b/doctor-modules/doctor-health/src/main/java/doctor/controller/UserVideoController.java
@@ -55,8 +55,8 @@ public class UserVideoController {
 
     //我的钱包
     @GetMapping("/findUserWallet")
-    public HealthR<List<UserWalletEntity>> findUserWallet(){
-        List<UserWalletEntity> userWallets = userVideoService.findUserWallet();
+    public HealthR<List<UserWalletEntity>> findUserWallet(@RequestHeader Integer userId){
+        List<UserWalletEntity> userWallets = userVideoService.findUserWallet(userId);
         return HealthR.ok(userWallets);
     }
     //用户消费记录
diff --git a/doctor-modules/doctor-health/src/main/java/doctor/mapper/UserVideoMapper.java b/doctor-modules/doctor-health/src/main/java/doctor/mapper/UserVideoMapper.java
index 419d357..fd1e5e0 100644
--- a/doctor-modules/doctor-health/src/main/java/doctor/mapper/UserVideoMapper.java
+++ b/doctor-modules/doctor-health/src/main/java/doctor/mapper/UserVideoMapper.java
@@ -24,7 +24,7 @@ public interface UserVideoMapper {
 
     void deleteVideoBuy(@Param("videoId") Integer videoId);
 
-    List<UserWalletEntity> findUserWallet();
+    List<UserWalletEntity> findUserWallet(@Param("userId") Integer userId);
 
     List<UserConsumptionRecordEntity> findUserConsumptionRecordList();
 
diff --git a/doctor-modules/doctor-health/src/main/java/doctor/service/UserVideoService.java b/doctor-modules/doctor-health/src/main/java/doctor/service/UserVideoService.java
index 7afe516..c0aa8e5 100644
--- a/doctor-modules/doctor-health/src/main/java/doctor/service/UserVideoService.java
+++ b/doctor-modules/doctor-health/src/main/java/doctor/service/UserVideoService.java
@@ -21,7 +21,7 @@ public interface UserVideoService {
 
     void deleteVideoBuy(Integer videoId);
 
-    List<UserWalletEntity> findUserWallet();
+    List<UserWalletEntity> findUserWallet(Integer userId);
 
     List<UserVideoCollectionVo> findVideoCollectionList(Integer userId);
 
diff --git a/doctor-modules/doctor-health/src/main/java/doctor/service/impl/UserVideoServiceImpl.java b/doctor-modules/doctor-health/src/main/java/doctor/service/impl/UserVideoServiceImpl.java
index e9fb540..666a625 100644
--- a/doctor-modules/doctor-health/src/main/java/doctor/service/impl/UserVideoServiceImpl.java
+++ b/doctor-modules/doctor-health/src/main/java/doctor/service/impl/UserVideoServiceImpl.java
@@ -141,8 +141,8 @@ public class UserVideoServiceImpl implements UserVideoService {
     }
 
     @Override
-    public List<UserWalletEntity> findUserWallet() {
-        return userVideoMapper.findUserWallet();
+    public List<UserWalletEntity> findUserWallet(Integer userId) {
+        return userVideoMapper.findUserWallet(userId);
     }
 
 
diff --git a/doctor-modules/doctor-health/src/main/resources/mapper/doctor/UserVideoMapper.xml b/doctor-modules/doctor-health/src/main/resources/mapper/doctor/UserVideoMapper.xml
index de61012..64d8bda 100644
--- a/doctor-modules/doctor-health/src/main/resources/mapper/doctor/UserVideoMapper.xml
+++ b/doctor-modules/doctor-health/src/main/resources/mapper/doctor/UserVideoMapper.xml
@@ -88,7 +88,7 @@ weight = #{weight}
     </select>
     <select id="findUserWallet" resultType="doctor.domain.entity.UserWalletEntity">
         select *
-        from user_wallet
+        from user_wallet where user_id=#{userId}
     </select>
     <select id="findUserConsumptionRecordList" resultType="doctor.domain.entity.UserConsumptionRecordEntity">
         select *

From 2fb6724844a2221ee73556bc647effefb868a69d Mon Sep 17 00:00:00 2001
From: fjj <–1066869486@qq.com>
Date: Fri, 19 Jan 2024 20:47:59 +0800
Subject: [PATCH 3/5] =?UTF-8?q?Revert=20"=E5=AE=8C=E5=96=84=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7=E4=BF=A1=E6=81=AF2"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 463d1bf61c2b991040cf621432d3c377fc20d642.
---
 .../src/main/java/doctor/controller/UserVideoController.java  | 4 ++--
 .../src/main/java/doctor/mapper/UserVideoMapper.java          | 2 +-
 .../src/main/java/doctor/service/UserVideoService.java        | 2 +-
 .../main/java/doctor/service/impl/UserVideoServiceImpl.java   | 4 ++--
 .../src/main/resources/mapper/doctor/UserVideoMapper.xml      | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/doctor-modules/doctor-health/src/main/java/doctor/controller/UserVideoController.java b/doctor-modules/doctor-health/src/main/java/doctor/controller/UserVideoController.java
index c01ad46..d2d1343 100644
--- a/doctor-modules/doctor-health/src/main/java/doctor/controller/UserVideoController.java
+++ b/doctor-modules/doctor-health/src/main/java/doctor/controller/UserVideoController.java
@@ -55,8 +55,8 @@ public class UserVideoController {
 
     //我的钱包
     @GetMapping("/findUserWallet")
-    public HealthR<List<UserWalletEntity>> findUserWallet(@RequestHeader Integer userId){
-        List<UserWalletEntity> userWallets = userVideoService.findUserWallet(userId);
+    public HealthR<List<UserWalletEntity>> findUserWallet(){
+        List<UserWalletEntity> userWallets = userVideoService.findUserWallet();
         return HealthR.ok(userWallets);
     }
     //用户消费记录
diff --git a/doctor-modules/doctor-health/src/main/java/doctor/mapper/UserVideoMapper.java b/doctor-modules/doctor-health/src/main/java/doctor/mapper/UserVideoMapper.java
index fd1e5e0..419d357 100644
--- a/doctor-modules/doctor-health/src/main/java/doctor/mapper/UserVideoMapper.java
+++ b/doctor-modules/doctor-health/src/main/java/doctor/mapper/UserVideoMapper.java
@@ -24,7 +24,7 @@ public interface UserVideoMapper {
 
     void deleteVideoBuy(@Param("videoId") Integer videoId);
 
-    List<UserWalletEntity> findUserWallet(@Param("userId") Integer userId);
+    List<UserWalletEntity> findUserWallet();
 
     List<UserConsumptionRecordEntity> findUserConsumptionRecordList();
 
diff --git a/doctor-modules/doctor-health/src/main/java/doctor/service/UserVideoService.java b/doctor-modules/doctor-health/src/main/java/doctor/service/UserVideoService.java
index c0aa8e5..7afe516 100644
--- a/doctor-modules/doctor-health/src/main/java/doctor/service/UserVideoService.java
+++ b/doctor-modules/doctor-health/src/main/java/doctor/service/UserVideoService.java
@@ -21,7 +21,7 @@ public interface UserVideoService {
 
     void deleteVideoBuy(Integer videoId);
 
-    List<UserWalletEntity> findUserWallet(Integer userId);
+    List<UserWalletEntity> findUserWallet();
 
     List<UserVideoCollectionVo> findVideoCollectionList(Integer userId);
 
diff --git a/doctor-modules/doctor-health/src/main/java/doctor/service/impl/UserVideoServiceImpl.java b/doctor-modules/doctor-health/src/main/java/doctor/service/impl/UserVideoServiceImpl.java
index 666a625..e9fb540 100644
--- a/doctor-modules/doctor-health/src/main/java/doctor/service/impl/UserVideoServiceImpl.java
+++ b/doctor-modules/doctor-health/src/main/java/doctor/service/impl/UserVideoServiceImpl.java
@@ -141,8 +141,8 @@ public class UserVideoServiceImpl implements UserVideoService {
     }
 
     @Override
-    public List<UserWalletEntity> findUserWallet(Integer userId) {
-        return userVideoMapper.findUserWallet(userId);
+    public List<UserWalletEntity> findUserWallet() {
+        return userVideoMapper.findUserWallet();
     }
 
 
diff --git a/doctor-modules/doctor-health/src/main/resources/mapper/doctor/UserVideoMapper.xml b/doctor-modules/doctor-health/src/main/resources/mapper/doctor/UserVideoMapper.xml
index 64d8bda..de61012 100644
--- a/doctor-modules/doctor-health/src/main/resources/mapper/doctor/UserVideoMapper.xml
+++ b/doctor-modules/doctor-health/src/main/resources/mapper/doctor/UserVideoMapper.xml
@@ -88,7 +88,7 @@ weight = #{weight}
     </select>
     <select id="findUserWallet" resultType="doctor.domain.entity.UserWalletEntity">
         select *
-        from user_wallet where user_id=#{userId}
+        from user_wallet
     </select>
     <select id="findUserConsumptionRecordList" resultType="doctor.domain.entity.UserConsumptionRecordEntity">
         select *

From c33fc3ae525dcb7fdf122fe537139d695c80e718 Mon Sep 17 00:00:00 2001
From: fjj <–1066869486@qq.com>
Date: Fri, 19 Jan 2024 21:33:30 +0800
Subject: [PATCH 4/5] =?UTF-8?q?=E5=AE=8C=E5=96=84=E7=94=A8=E6=88=B7?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 doctor-modules/doctor-health/pom.xml          | 21 ++++++++
 .../doctor/controller/InquiryController.java  | 54 ++++++++++++++++---
 .../controller/UserVideoController.java       |  4 +-
 .../java/doctor/convert/VideoConvert.java     | 22 ++++++++
 .../java/doctor/mapper/InquiryMapper.java     |  5 ++
 .../java/doctor/mapper/UserVideoMapper.java   |  3 +-
 .../java/doctor/service/InquiryService.java   | 11 ++++
 .../java/doctor/service/UserVideoService.java |  3 +-
 .../impl/HealthUserVideoServiceImpl.java      |  3 +-
 .../service/impl/InquiryServiceImpl.java      | 36 +++++++++++++
 .../service/impl/UserVideoServiceImpl.java    |  5 +-
 .../resources/mapper/doctor/InquiryMapper.xml | 20 +++++++
 .../mapper/doctor/UserVideoMapper.xml         |  2 +-
 13 files changed, 175 insertions(+), 14 deletions(-)
 create mode 100644 doctor-modules/doctor-health/src/main/java/doctor/convert/VideoConvert.java

diff --git a/doctor-modules/doctor-health/pom.xml b/doctor-modules/doctor-health/pom.xml
index a082a43..526539b 100644
--- a/doctor-modules/doctor-health/pom.xml
+++ b/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>
 
 
@@ -97,6 +102,22 @@
             <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>
 
diff --git a/doctor-modules/doctor-health/src/main/java/doctor/controller/InquiryController.java b/doctor-modules/doctor-health/src/main/java/doctor/controller/InquiryController.java
index 814704b..69dc8d8 100644
--- a/doctor-modules/doctor-health/src/main/java/doctor/controller/InquiryController.java
+++ b/doctor-modules/doctor-health/src/main/java/doctor/controller/InquiryController.java
@@ -1,13 +1,12 @@
 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.boot.actuate.health.Health;
+import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
 
@@ -20,16 +19,59 @@ 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);
+    }
+
+    //咨询医生
+    @PutMapping("/verify/v1/consultDoctor")
+    public HealthR consultDoctor(@RequestHeader Integer userId,
+                                                  @RequestHeader String sessionId,
+                                                  @RequestParam Integer doctorId){
+        String doctorUserName = inquiryService.consultDoctor(userId,doctorId);
+        return HealthR.ok(doctorUserName);
+    }
+
+    //关注医生
+    @PostMapping("/verify/v1/followDoctor")
+    public HealthR followDoctor(@RequestHeader Integer userId,
+                                @RequestHeader String sessionId,
+                                @RequestParam Integer doctorId) {
+        inquiryService.followDoctor(userId,doctorId);
+        return HealthR.ok();
+    }
+
+    //取消关注医生
+   @DeleteMapping("/verify/v1/cancelFollow")
+    public HealthR cancelFollow(@RequestHeader Integer userId,
+                                @RequestHeader String sessionId,
+                                @RequestParam Integer doctorId){
+        inquiryService.cancelFollow(userId,doctorId);
+        return HealthR.ok();
+   }
+
+   //结束问诊
+   @PutMapping("/verify/v1/endInquiry")
+    public HealthR endInquiry(@RequestHeader Integer userId,
+                                        @RequestHeader String sessionId,
+                                        @RequestParam Integer recordId) {
+        inquiryService.endInquiry(userId,recordId);
+        return HealthR.ok();
+   }
 }
diff --git a/doctor-modules/doctor-health/src/main/java/doctor/controller/UserVideoController.java b/doctor-modules/doctor-health/src/main/java/doctor/controller/UserVideoController.java
index d2d1343..c01ad46 100644
--- a/doctor-modules/doctor-health/src/main/java/doctor/controller/UserVideoController.java
+++ b/doctor-modules/doctor-health/src/main/java/doctor/controller/UserVideoController.java
@@ -55,8 +55,8 @@ public class UserVideoController {
 
     //我的钱包
     @GetMapping("/findUserWallet")
-    public HealthR<List<UserWalletEntity>> findUserWallet(){
-        List<UserWalletEntity> userWallets = userVideoService.findUserWallet();
+    public HealthR<List<UserWalletEntity>> findUserWallet(@RequestHeader Integer userId){
+        List<UserWalletEntity> userWallets = userVideoService.findUserWallet(userId);
         return HealthR.ok(userWallets);
     }
     //用户消费记录
diff --git a/doctor-modules/doctor-health/src/main/java/doctor/convert/VideoConvert.java b/doctor-modules/doctor-health/src/main/java/doctor/convert/VideoConvert.java
new file mode 100644
index 0000000..517085e
--- /dev/null
+++ b/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);
+}
diff --git a/doctor-modules/doctor-health/src/main/java/doctor/mapper/InquiryMapper.java b/doctor-modules/doctor-health/src/main/java/doctor/mapper/InquiryMapper.java
index 081f354..05b979d 100644
--- a/doctor-modules/doctor-health/src/main/java/doctor/mapper/InquiryMapper.java
+++ b/doctor-modules/doctor-health/src/main/java/doctor/mapper/InquiryMapper.java
@@ -2,6 +2,7 @@ package doctor.mapper;
 
 import doctor.domain.entity.InquiryDetailsRecordEntity;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -14,4 +15,8 @@ import java.util.List;
 @Mapper
 public interface InquiryMapper {
     List<InquiryDetailsRecordEntity> findHistoryInquiryRecord();
+
+    void consultDoctor(@Param("userId") Integer userId, @Param("doctorId") Integer doctorId);
+
+    String findDoctorUserNameByDoctorId(@Param("doctorId") Integer doctorId);
 }
diff --git a/doctor-modules/doctor-health/src/main/java/doctor/mapper/UserVideoMapper.java b/doctor-modules/doctor-health/src/main/java/doctor/mapper/UserVideoMapper.java
index 419d357..c55aa77 100644
--- a/doctor-modules/doctor-health/src/main/java/doctor/mapper/UserVideoMapper.java
+++ b/doctor-modules/doctor-health/src/main/java/doctor/mapper/UserVideoMapper.java
@@ -5,6 +5,7 @@ import doctor.domain.dto.UserTaskRecordDto;
 import doctor.domain.entity.*;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
+import org.springframework.web.bind.annotation.RequestHeader;
 
 import java.util.List;
 
@@ -24,7 +25,7 @@ public interface UserVideoMapper {
 
     void deleteVideoBuy(@Param("videoId") Integer videoId);
 
-    List<UserWalletEntity> findUserWallet();
+    List<UserWalletEntity> findUserWallet(Integer userId);
 
     List<UserConsumptionRecordEntity> findUserConsumptionRecordList();
 
diff --git a/doctor-modules/doctor-health/src/main/java/doctor/service/InquiryService.java b/doctor-modules/doctor-health/src/main/java/doctor/service/InquiryService.java
index 41e58c6..4c32a84 100644
--- a/doctor-modules/doctor-health/src/main/java/doctor/service/InquiryService.java
+++ b/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,14 @@ import java.util.List;
  */
 public interface InquiryService {
     List<InquiryDetailsRecordVo> findHistoryInquiryRecord();
+
+    DoctorVo findDoctorInfo(Integer doctorId);
+
+    String consultDoctor(Integer userId, Integer doctorId);
+
+    void followDoctor(Integer userId, Integer doctorId);
+
+    void cancelFollow(Integer userId, Integer doctorId);
+
+    void endInquiry(Integer userId, Integer recordId);
 }
diff --git a/doctor-modules/doctor-health/src/main/java/doctor/service/UserVideoService.java b/doctor-modules/doctor-health/src/main/java/doctor/service/UserVideoService.java
index 7afe516..a61b36e 100644
--- a/doctor-modules/doctor-health/src/main/java/doctor/service/UserVideoService.java
+++ b/doctor-modules/doctor-health/src/main/java/doctor/service/UserVideoService.java
@@ -3,6 +3,7 @@ package doctor.service;
 import doctor.domain.dto.UserArchivesDto;
 import doctor.domain.entity.*;
 import doctor.domain.vo.*;
+import org.springframework.web.bind.annotation.RequestHeader;
 
 import java.util.List;
 
@@ -21,7 +22,7 @@ public interface UserVideoService {
 
     void deleteVideoBuy(Integer videoId);
 
-    List<UserWalletEntity> findUserWallet();
+    List<UserWalletEntity> findUserWallet(Integer userId);
 
     List<UserVideoCollectionVo> findVideoCollectionList(Integer userId);
 
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 bd32a87..ab0c1ce 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
@@ -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){
diff --git a/doctor-modules/doctor-health/src/main/java/doctor/service/impl/InquiryServiceImpl.java b/doctor-modules/doctor-health/src/main/java/doctor/service/impl/InquiryServiceImpl.java
index 00d24bc..e206164 100644
--- a/doctor-modules/doctor-health/src/main/java/doctor/service/impl/InquiryServiceImpl.java
+++ b/doctor-modules/doctor-health/src/main/java/doctor/service/impl/InquiryServiceImpl.java
@@ -1,10 +1,13 @@
 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;
 import doctor.util.ConvertUtil;
+import doctor.util.RSAUtils;
+import doctor.util.RsaKey;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -26,4 +29,37 @@ public class InquiryServiceImpl implements InquiryService {
         List<InquiryDetailsRecordVo> inquiryDetailsRecordVos = ConvertUtil.entityToVoList(inquiryDetailsRecordEntity, InquiryDetailsRecordVo.class);
         return inquiryDetailsRecordVos;
     }
+
+    @Override
+    public DoctorVo findDoctorInfo(Integer doctorId) {
+
+        return null;
+    }
+
+    @Override
+    public String consultDoctor(Integer userId, Integer doctorId) {
+        inquiryMapper.consultDoctor(userId,doctorId);
+        String doctorUserName = inquiryMapper.findDoctorUserNameByDoctorId(doctorId);
+        try {
+            String s = RSAUtils.rsaDecrypt(doctorUserName, RsaKey.PUBLIC_KEY);
+            return s;
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    @Override
+    public void followDoctor(Integer userId, Integer doctorId) {
+
+    }
+
+    @Override
+    public void cancelFollow(Integer userId, Integer doctorId) {
+
+    }
+
+    @Override
+    public void endInquiry(Integer userId, Integer recordId) {
+
+    }
 }
diff --git a/doctor-modules/doctor-health/src/main/java/doctor/service/impl/UserVideoServiceImpl.java b/doctor-modules/doctor-health/src/main/java/doctor/service/impl/UserVideoServiceImpl.java
index e9fb540..86b9ee4 100644
--- a/doctor-modules/doctor-health/src/main/java/doctor/service/impl/UserVideoServiceImpl.java
+++ b/doctor-modules/doctor-health/src/main/java/doctor/service/impl/UserVideoServiceImpl.java
@@ -9,6 +9,7 @@ import doctor.service.UserVideoService;
 import doctor.util.ConvertUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.web.bind.annotation.RequestHeader;
 
 import java.util.List;
 
@@ -141,8 +142,8 @@ public class UserVideoServiceImpl implements UserVideoService {
     }
 
     @Override
-    public List<UserWalletEntity> findUserWallet() {
-        return userVideoMapper.findUserWallet();
+    public List<UserWalletEntity> findUserWallet(Integer userId) {
+        return userVideoMapper.findUserWallet(userId);
     }
 
 
diff --git a/doctor-modules/doctor-health/src/main/resources/mapper/doctor/InquiryMapper.xml b/doctor-modules/doctor-health/src/main/resources/mapper/doctor/InquiryMapper.xml
index 0da48d0..c16948d 100644
--- a/doctor-modules/doctor-health/src/main/resources/mapper/doctor/InquiryMapper.xml
+++ b/doctor-modules/doctor-health/src/main/resources/mapper/doctor/InquiryMapper.xml
@@ -3,10 +3,30 @@
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="doctor.mapper.InquiryMapper">
+    <insert id="consultDoctor">
+        insert into inquiry_record(
+        user_id,
+        doctor_id,
+        status,
+        show_status,
+        inquiry_time,
+        create_time
+        )values (
+        #{userId},
+        #{doctorId},
+        1,
+        1,
+        now(),
+        now()
+        )
+    </insert>
 
 
     <select id="findHistoryInquiryRecord" resultType="doctor.domain.entity.InquiryDetailsRecordEntity">
         select *
         from inquiry_details_record
     </select>
+    <select id="findDoctorUserNameByDoctorId" resultType="java.lang.String">
+        select user_name from doctor where doctor_id=#{doctorId}
+    </select>
 </mapper>
diff --git a/doctor-modules/doctor-health/src/main/resources/mapper/doctor/UserVideoMapper.xml b/doctor-modules/doctor-health/src/main/resources/mapper/doctor/UserVideoMapper.xml
index de61012..64d8bda 100644
--- a/doctor-modules/doctor-health/src/main/resources/mapper/doctor/UserVideoMapper.xml
+++ b/doctor-modules/doctor-health/src/main/resources/mapper/doctor/UserVideoMapper.xml
@@ -88,7 +88,7 @@ weight = #{weight}
     </select>
     <select id="findUserWallet" resultType="doctor.domain.entity.UserWalletEntity">
         select *
-        from user_wallet
+        from user_wallet where user_id=#{userId}
     </select>
     <select id="findUserConsumptionRecordList" resultType="doctor.domain.entity.UserConsumptionRecordEntity">
         select *

From a6b136581850b0b28a3bab35e9da2b40b289cd5e Mon Sep 17 00:00:00 2001
From: fjj <–1066869486@qq.com>
Date: Fri, 19 Jan 2024 21:59:37 +0800
Subject: [PATCH 5/5] =?UTF-8?q?=E5=AE=8C=E5=96=84=E7=94=A8=E6=88=B7?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/doctor/controller/VideoController.java         | 1 +
 1 file changed, 1 insertion(+)

diff --git a/doctor-modules/doctor-health/src/main/java/doctor/controller/VideoController.java b/doctor-modules/doctor-health/src/main/java/doctor/controller/VideoController.java
index 2f2d775..fedff4d 100644
--- a/doctor-modules/doctor-health/src/main/java/doctor/controller/VideoController.java
+++ b/doctor-modules/doctor-health/src/main/java/doctor/controller/VideoController.java
@@ -34,6 +34,7 @@ public class VideoController {
         return HealthR.ok();
     }
 
+
     //评论列表
     @GetMapping("/v1/findVideoCommentList")
     public HealthR<List<VideoCommentVo>> findVideoCommentList(@RequestParam Integer videoId) {