From 32eb478322d76aaab5562fb24b9fd06e4b4bfe4c Mon Sep 17 00:00:00 2001 From: zmyYYDS <864398951@qq.com> Date: Wed, 17 Jan 2024 20:04:02 +0800 Subject: [PATCH] zmy09 --- doctor-auth/src/main/resources/bootstrap.yml | 4 +- .../src/main/resources/bootstrap.yml | 4 +- .../src/main/resources/bootstrap.yml | 4 +- .../src/main/resources/bootstrap.yml | 4 +- .../doctor/controller/InquiryController.java | 37 +++++++++++++++++++ .../java/doctor/mapper/InquiryMapper.java | 5 +++ .../java/doctor/service/InquiryService.java | 8 ++++ .../service/impl/InquiryServiceImpl.java | 29 +++++++++++++++ .../resources/mapper/doctor/DoctorMapper.xml | 2 +- .../resources/mapper/doctor/InquiryMapper.xml | 20 ++++++++++ .../src/main/resources/bootstrap.yml | 4 +- .../src/main/resources/bootstrap.yml | 4 +- .../src/main/resources/bootstrap.yml | 4 +- 13 files changed, 114 insertions(+), 15 deletions(-) diff --git a/doctor-auth/src/main/resources/bootstrap.yml b/doctor-auth/src/main/resources/bootstrap.yml index 80f11fd..343a2f2 100644 --- a/doctor-auth/src/main/resources/bootstrap.yml +++ b/doctor-auth/src/main/resources/bootstrap.yml @@ -15,11 +15,11 @@ spring: discovery: # 服务注册地址 server-addr: 101.34.77.101:8848 - namespace: 09dff3e2-9790-4d4f-beb6-9baeb01ae040 + namespace: 7e34f104-f333-4828-b36a-02146e521c9a config: # 配置中心地址 server-addr: 101.34.77.101:8848 - namespace: 09dff3e2-9790-4d4f-beb6-9baeb01ae040 + namespace: 7e34f104-f333-4828-b36a-02146e521c9a # 配置文件格式 file-extension: yml # 共享配置 diff --git a/doctor-gateway/src/main/resources/bootstrap.yml b/doctor-gateway/src/main/resources/bootstrap.yml index d3e056c..2eaa492 100644 --- a/doctor-gateway/src/main/resources/bootstrap.yml +++ b/doctor-gateway/src/main/resources/bootstrap.yml @@ -15,11 +15,11 @@ spring: discovery: # 服务注册地址 server-addr: 101.34.77.101:8848 - namespace: 09dff3e2-9790-4d4f-beb6-9baeb01ae040 + namespace: 7e34f104-f333-4828-b36a-02146e521c9a config: # 配置中心地址 server-addr: 101.34.77.101:8848 - namespace: 09dff3e2-9790-4d4f-beb6-9baeb01ae040 + namespace: 7e34f104-f333-4828-b36a-02146e521c9a # 配置文件格式 file-extension: yml # 共享配置 diff --git a/doctor-modules/doctor-file/src/main/resources/bootstrap.yml b/doctor-modules/doctor-file/src/main/resources/bootstrap.yml index 66f9597..0ecdb89 100644 --- a/doctor-modules/doctor-file/src/main/resources/bootstrap.yml +++ b/doctor-modules/doctor-file/src/main/resources/bootstrap.yml @@ -15,11 +15,11 @@ spring: discovery: # 服务注册地址 server-addr: 101.34.77.101:8848 - namespace: 09dff3e2-9790-4d4f-beb6-9baeb01ae040 + namespace: 7e34f104-f333-4828-b36a-02146e521c9a config: # 配置中心地址 server-addr: 101.34.77.101:8848 - namespace: 09dff3e2-9790-4d4f-beb6-9baeb01ae040 + namespace: 7e34f104-f333-4828-b36a-02146e521c9a # 配置文件格式 file-extension: yml # 共享配置 diff --git a/doctor-modules/doctor-gen/src/main/resources/bootstrap.yml b/doctor-modules/doctor-gen/src/main/resources/bootstrap.yml index 81bc32c..823a6a8 100644 --- a/doctor-modules/doctor-gen/src/main/resources/bootstrap.yml +++ b/doctor-modules/doctor-gen/src/main/resources/bootstrap.yml @@ -15,11 +15,11 @@ spring: discovery: # 服务注册地址 server-addr: 101.34.77.101:8848 - namespace: 09dff3e2-9790-4d4f-beb6-9baeb01ae040 + namespace: 7e34f104-f333-4828-b36a-02146e521c9a config: # 配置中心地址 server-addr: 101.34.77.101:8848 - namespace: 09dff3e2-9790-4d4f-beb6-9baeb01ae040 + namespace: 7e34f104-f333-4828-b36a-02146e521c9a # 配置文件格式 file-extension: yml # 共享配置 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 6f161dc..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 @@ -5,6 +5,7 @@ import doctor.domain.vo.DoctorVo; import doctor.domain.vo.InquiryDetailsRecordVo; import doctor.service.InquiryService; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.actuate.health.Health; import org.springframework.web.bind.annotation.*; import java.util.List; @@ -37,4 +38,40 @@ public class InquiryController { 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/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 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/service/InquiryService.java b/doctor-modules/doctor-health/src/main/java/doctor/service/InquiryService.java index 111988f..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 @@ -15,4 +15,12 @@ public interface InquiryService { List 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/impl/InquiryServiceImpl.java b/doctor-modules/doctor-health/src/main/java/doctor/service/impl/InquiryServiceImpl.java index 2e849c8..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 @@ -6,6 +6,8 @@ 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; @@ -33,4 +35,31 @@ public class InquiryServiceImpl implements InquiryService { 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/resources/mapper/doctor/DoctorMapper.xml b/doctor-modules/doctor-health/src/main/resources/mapper/doctor/DoctorMapper.xml index e9d1433..36e1400 100644 --- a/doctor-modules/doctor-health/src/main/resources/mapper/doctor/DoctorMapper.xml +++ b/doctor-modules/doctor-health/src/main/resources/mapper/doctor/DoctorMapper.xml @@ -10,4 +10,4 @@ from doctor where department_id = #{deptId} -2 + 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"> + + insert into inquiry_record( + user_id, + doctor_id, + status, + show_status, + inquiry_time, + create_time + )values ( + #{userId}, + #{doctorId}, + 1, + 1, + now(), + now() + ) + + diff --git a/doctor-modules/doctor-job/src/main/resources/bootstrap.yml b/doctor-modules/doctor-job/src/main/resources/bootstrap.yml index ab123c4..0bffaa1 100644 --- a/doctor-modules/doctor-job/src/main/resources/bootstrap.yml +++ b/doctor-modules/doctor-job/src/main/resources/bootstrap.yml @@ -15,11 +15,11 @@ spring: discovery: # 服务注册地址 server-addr: 101.34.77.101:8848 - namespace: 09dff3e2-9790-4d4f-beb6-9baeb01ae040 + namespace: 7e34f104-f333-4828-b36a-02146e521c9a config: # 配置中心地址 server-addr: 101.34.77.101:8848 - namespace: 09dff3e2-9790-4d4f-beb6-9baeb01ae040 + namespace: 7e34f104-f333-4828-b36a-02146e521c9a # 配置文件格式 file-extension: yml # 共享配置 diff --git a/doctor-modules/doctor-system/src/main/resources/bootstrap.yml b/doctor-modules/doctor-system/src/main/resources/bootstrap.yml index 14e7505..d48b98a 100644 --- a/doctor-modules/doctor-system/src/main/resources/bootstrap.yml +++ b/doctor-modules/doctor-system/src/main/resources/bootstrap.yml @@ -15,11 +15,11 @@ spring: discovery: # 服务注册地址 server-addr: 101.34.77.101:8848 - namespace: 09dff3e2-9790-4d4f-beb6-9baeb01ae040 + namespace: 7e34f104-f333-4828-b36a-02146e521c9a config: # 配置中心地址 server-addr: 101.34.77.101:8848 - namespace: 09dff3e2-9790-4d4f-beb6-9baeb01ae040 + namespace: 7e34f104-f333-4828-b36a-02146e521c9a # 配置文件格式 file-extension: yml # 共享配置 diff --git a/doctor-visual/doctor-monitor/src/main/resources/bootstrap.yml b/doctor-visual/doctor-monitor/src/main/resources/bootstrap.yml index d94bf20..ed199de 100644 --- a/doctor-visual/doctor-monitor/src/main/resources/bootstrap.yml +++ b/doctor-visual/doctor-monitor/src/main/resources/bootstrap.yml @@ -15,11 +15,11 @@ spring: discovery: # 服务注册地址 server-addr: 101.34.77.101:8848 - namespace: 09dff3e2-9790-4d4f-beb6-9baeb01ae040 + namespace: 7e34f104-f333-4828-b36a-02146e521c9a config: # 配置中心地址 server-addr: 101.34.77.101:8848 - namespace: 09dff3e2-9790-4d4f-beb6-9baeb01ae040 + namespace: 7e34f104-f333-4828-b36a-02146e521c9a # 配置文件格式 file-extension: yml # 共享配置