From 7c476c6685c41aa59d5b5f8a09e8e2d45ece95d9 Mon Sep 17 00:00:00 2001 From: chenbingxuan <3581044601@qq.com> Date: Wed, 17 Jan 2024 19:46:55 +0800 Subject: [PATCH] 1.17 --- 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 ++-- .../controller/HealthSickController.java | 14 +++++++++++ .../domain/entity/SickCircleEntity.java | 2 +- .../doctor/domain/vo/SearchSickCircleVo.java | 12 ++++++++++ .../java/doctor/domain/vo/SickInfoVo.java | 23 +++++++++++++++++++ .../mapper/InquiryVerifyServiceMapper.java | 8 +++++++ .../java/doctor/mapper/SickCircleMapper.java | 4 ++++ .../doctor/service/SickCircleService.java | 5 ++++ .../impl/InquiryVerifyServiceImpl.java | 3 +-- .../service/impl/SickCircleServiceImpl.java | 20 +++++++++++++++- .../doctor/InquiryVerifyServiceMapper.xml | 3 +++ .../mapper/doctor/SickCircleMapper.xml | 6 +++++ .../src/main/resources/bootstrap.yml | 4 ++-- .../src/main/resources/bootstrap.yml | 4 ++-- .../src/main/resources/bootstrap.yml | 4 ++-- 18 files changed, 110 insertions(+), 18 deletions(-) create mode 100644 doctor-modules/doctor-health/src/main/java/doctor/domain/vo/SearchSickCircleVo.java create mode 100644 doctor-modules/doctor-health/src/main/java/doctor/domain/vo/SickInfoVo.java diff --git a/doctor-auth/src/main/resources/bootstrap.yml b/doctor-auth/src/main/resources/bootstrap.yml index 80f11fd..c30cba2 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: 9de208a6-cb30-41ae-a880-78196c99c050 config: # 配置中心地址 server-addr: 101.34.77.101:8848 - namespace: 09dff3e2-9790-4d4f-beb6-9baeb01ae040 + namespace: 9de208a6-cb30-41ae-a880-78196c99c050 # 配置文件格式 file-extension: yml # 共享配置 diff --git a/doctor-gateway/src/main/resources/bootstrap.yml b/doctor-gateway/src/main/resources/bootstrap.yml index d3e056c..cc0e562 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: 9de208a6-cb30-41ae-a880-78196c99c050 config: # 配置中心地址 server-addr: 101.34.77.101:8848 - namespace: 09dff3e2-9790-4d4f-beb6-9baeb01ae040 + namespace: 9de208a6-cb30-41ae-a880-78196c99c050 # 配置文件格式 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..c992149 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: 9de208a6-cb30-41ae-a880-78196c99c050 config: # 配置中心地址 server-addr: 101.34.77.101:8848 - namespace: 09dff3e2-9790-4d4f-beb6-9baeb01ae040 + namespace: 9de208a6-cb30-41ae-a880-78196c99c050 # 配置文件格式 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..007713f 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: 9de208a6-cb30-41ae-a880-78196c99c050 config: # 配置中心地址 server-addr: 101.34.77.101:8848 - namespace: 09dff3e2-9790-4d4f-beb6-9baeb01ae040 + namespace: 9de208a6-cb30-41ae-a880-78196c99c050 # 配置文件格式 file-extension: yml # 共享配置 diff --git a/doctor-modules/doctor-health/src/main/java/doctor/controller/HealthSickController.java b/doctor-modules/doctor-health/src/main/java/doctor/controller/HealthSickController.java index ba5e4f8..f954134 100644 --- a/doctor-modules/doctor-health/src/main/java/doctor/controller/HealthSickController.java +++ b/doctor-modules/doctor-health/src/main/java/doctor/controller/HealthSickController.java @@ -1,7 +1,9 @@ package doctor.controller; import doctor.common.core.domain.HealthR; +import doctor.domain.vo.SearchSickCircleVo; import doctor.domain.vo.SickCircleVo; +import doctor.domain.vo.SickInfoVo; import doctor.service.SickCircleService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; @@ -18,6 +20,12 @@ public class HealthSickController { @Autowired private SickCircleService sickCircleService; + @GetMapping("/findSickCircleInfo") + public HealthR findSickCircleInfo(@RequestParam Integer sickCircleId) { + SickInfoVo sickInfoVo = sickCircleService.findSickCircleInfo(sickCircleId); + return HealthR.ok(sickInfoVo); + } + @GetMapping("/findSickCircleList") public HealthR> sickCircleList(@RequestParam Integer page, @RequestParam Integer count, @@ -25,4 +33,10 @@ public class HealthSickController { List sickCircleList = sickCircleService.findSickCircleList(page, count, departmentId); return HealthR.ok(sickCircleList); } + + @GetMapping("/searchSickCircle") + public HealthR searchSickCircle(@RequestParam String keyWord) { + SearchSickCircleVo searchSickCircleVo = sickCircleService.searchSickCircle(keyWord); + return HealthR.ok(searchSickCircleVo); + } } diff --git a/doctor-modules/doctor-health/src/main/java/doctor/domain/entity/SickCircleEntity.java b/doctor-modules/doctor-health/src/main/java/doctor/domain/entity/SickCircleEntity.java index 99468ef..fb7326e 100644 --- a/doctor-modules/doctor-health/src/main/java/doctor/domain/entity/SickCircleEntity.java +++ b/doctor-modules/doctor-health/src/main/java/doctor/domain/entity/SickCircleEntity.java @@ -9,7 +9,7 @@ import java.util.Date; @Data public class SickCircleEntity { - private Integer id; + private Integer sickCircleId; private Integer userId; diff --git a/doctor-modules/doctor-health/src/main/java/doctor/domain/vo/SearchSickCircleVo.java b/doctor-modules/doctor-health/src/main/java/doctor/domain/vo/SearchSickCircleVo.java new file mode 100644 index 0000000..91a099e --- /dev/null +++ b/doctor-modules/doctor-health/src/main/java/doctor/domain/vo/SearchSickCircleVo.java @@ -0,0 +1,12 @@ +package doctor.domain.vo; + +import lombok.Data; + +@Data +public class SearchSickCircleVo { + private Integer sickCircleId; + private String title; + private String detail; + private Integer amount; + private long releaseTime; +} diff --git a/doctor-modules/doctor-health/src/main/java/doctor/domain/vo/SickInfoVo.java b/doctor-modules/doctor-health/src/main/java/doctor/domain/vo/SickInfoVo.java new file mode 100644 index 0000000..ccc11ef --- /dev/null +++ b/doctor-modules/doctor-health/src/main/java/doctor/domain/vo/SickInfoVo.java @@ -0,0 +1,23 @@ +package doctor.domain.vo; + +import lombok.Data; + +@Data +public class SickInfoVo { + private Integer id; + private Integer userId; + private String authorName; + private String title; + private Integer departmentId; + private String departmentName; + private String disease; + private String detail; + private String treatmentHospital; + private long treatmentStartTime; + private long treatmentEndTime; + private String treatmentProcess; + private String picture; + private Integer amount; + private String content; + private Integer whetherContent; +} diff --git a/doctor-modules/doctor-health/src/main/java/doctor/mapper/InquiryVerifyServiceMapper.java b/doctor-modules/doctor-health/src/main/java/doctor/mapper/InquiryVerifyServiceMapper.java index 3779261..3059118 100644 --- a/doctor-modules/doctor-health/src/main/java/doctor/mapper/InquiryVerifyServiceMapper.java +++ b/doctor-modules/doctor-health/src/main/java/doctor/mapper/InquiryVerifyServiceMapper.java @@ -1,4 +1,12 @@ package doctor.mapper; +import doctor.domain.vo.InquiryRecordVo; +import org.apache.ibatis.annotations.Mapper; + +import java.util.List; +@Mapper public interface InquiryVerifyServiceMapper { + List findInquiryRecordList(); + + } diff --git a/doctor-modules/doctor-health/src/main/java/doctor/mapper/SickCircleMapper.java b/doctor-modules/doctor-health/src/main/java/doctor/mapper/SickCircleMapper.java index ae8f55a..286d121 100644 --- a/doctor-modules/doctor-health/src/main/java/doctor/mapper/SickCircleMapper.java +++ b/doctor-modules/doctor-health/src/main/java/doctor/mapper/SickCircleMapper.java @@ -1,6 +1,7 @@ package doctor.mapper; import doctor.domain.entity.SickCircleEntity; +import doctor.domain.vo.SickInfoVo; import org.apache.ibatis.annotations.Mapper; import java.util.List; @@ -9,4 +10,7 @@ import java.util.List; public interface SickCircleMapper { List findSickCircleList(Integer departmentId); + SickCircleEntity findSickCircleInfo(Integer sickCircleId); + + SickCircleEntity findSickCircleInfoByKeyWord(String keyWord); } diff --git a/doctor-modules/doctor-health/src/main/java/doctor/service/SickCircleService.java b/doctor-modules/doctor-health/src/main/java/doctor/service/SickCircleService.java index 81a47ef..2851f12 100644 --- a/doctor-modules/doctor-health/src/main/java/doctor/service/SickCircleService.java +++ b/doctor-modules/doctor-health/src/main/java/doctor/service/SickCircleService.java @@ -1,11 +1,16 @@ package doctor.service; import doctor.common.core.domain.HealthR; +import doctor.domain.vo.SearchSickCircleVo; import doctor.domain.vo.SickCircleVo; +import doctor.domain.vo.SickInfoVo; import java.util.List; public interface SickCircleService { List findSickCircleList(Integer page, Integer size, Integer departmentId); + SickInfoVo findSickCircleInfo(Integer sickCircleId); + + SearchSickCircleVo searchSickCircle(String keyWord); } diff --git a/doctor-modules/doctor-health/src/main/java/doctor/service/impl/InquiryVerifyServiceImpl.java b/doctor-modules/doctor-health/src/main/java/doctor/service/impl/InquiryVerifyServiceImpl.java index 10bd216..3ae6164 100644 --- a/doctor-modules/doctor-health/src/main/java/doctor/service/impl/InquiryVerifyServiceImpl.java +++ b/doctor-modules/doctor-health/src/main/java/doctor/service/impl/InquiryVerifyServiceImpl.java @@ -16,7 +16,6 @@ public class InquiryVerifyServiceImpl extends BaseController implements InquiryV @Override public List findInquiryRecordList() { - - return null; + return inquiryVerifyServiceMapper.findInquiryRecordList(); } } diff --git a/doctor-modules/doctor-health/src/main/java/doctor/service/impl/SickCircleServiceImpl.java b/doctor-modules/doctor-health/src/main/java/doctor/service/impl/SickCircleServiceImpl.java index 169dd76..6354ca8 100644 --- a/doctor-modules/doctor-health/src/main/java/doctor/service/impl/SickCircleServiceImpl.java +++ b/doctor-modules/doctor-health/src/main/java/doctor/service/impl/SickCircleServiceImpl.java @@ -3,7 +3,9 @@ package doctor.service.impl; import doctor.common.core.domain.HealthR; import doctor.common.core.web.controller.BaseController; import doctor.domain.entity.SickCircleEntity; +import doctor.domain.vo.SearchSickCircleVo; import doctor.domain.vo.SickCircleVo; +import doctor.domain.vo.SickInfoVo; import doctor.mapper.SickCircleMapper; import doctor.service.SickCircleService; import org.springframework.beans.BeanUtils; @@ -24,10 +26,26 @@ public class SickCircleServiceImpl extends BaseController implements SickCircleS ArrayList sickCircleVos = new ArrayList<>(); for (SickCircleEntity sickCircleEntity : list) { SickCircleVo sickCircleVo = new SickCircleVo(); - sickCircleVo.setSickCircleId(sickCircleEntity.getId()); + sickCircleVo.setSickCircleId(sickCircleEntity.getSickCircleId()); BeanUtils.copyProperties(sickCircleEntity,sickCircleVo); sickCircleVos.add(sickCircleVo); } return sickCircleVos; } + + @Override + public SickInfoVo findSickCircleInfo(Integer sickCircleId) { + SickCircleEntity sickCircleInfo = sickCircleMapper.findSickCircleInfo(sickCircleId); + SickInfoVo sickInfoVo = new SickInfoVo(); + BeanUtils.copyProperties(sickCircleInfo,sickInfoVo); + return sickInfoVo; + } + + @Override + public SearchSickCircleVo searchSickCircle(String keyWord) { + SearchSickCircleVo searchSickCircleVo = new SearchSickCircleVo(); + SickCircleEntity sickCircleInfo = sickCircleMapper.findSickCircleInfoByKeyWord(keyWord); + BeanUtils.copyProperties(sickCircleInfo,searchSickCircleVo); + return searchSickCircleVo; + } } diff --git a/doctor-modules/doctor-health/src/main/resources/mapper/doctor/InquiryVerifyServiceMapper.xml b/doctor-modules/doctor-health/src/main/resources/mapper/doctor/InquiryVerifyServiceMapper.xml index 92a7923..4b4c13b 100644 --- a/doctor-modules/doctor-health/src/main/resources/mapper/doctor/InquiryVerifyServiceMapper.xml +++ b/doctor-modules/doctor-health/src/main/resources/mapper/doctor/InquiryVerifyServiceMapper.xml @@ -5,4 +5,7 @@ + diff --git a/doctor-modules/doctor-health/src/main/resources/mapper/doctor/SickCircleMapper.xml b/doctor-modules/doctor-health/src/main/resources/mapper/doctor/SickCircleMapper.xml index 1e82943..4059f24 100644 --- a/doctor-modules/doctor-health/src/main/resources/mapper/doctor/SickCircleMapper.xml +++ b/doctor-modules/doctor-health/src/main/resources/mapper/doctor/SickCircleMapper.xml @@ -8,4 +8,10 @@ + + diff --git a/doctor-modules/doctor-job/src/main/resources/bootstrap.yml b/doctor-modules/doctor-job/src/main/resources/bootstrap.yml index ab123c4..537c5d6 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: 9de208a6-cb30-41ae-a880-78196c99c050 config: # 配置中心地址 server-addr: 101.34.77.101:8848 - namespace: 09dff3e2-9790-4d4f-beb6-9baeb01ae040 + namespace: 9de208a6-cb30-41ae-a880-78196c99c050 # 配置文件格式 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..8def34f 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: 9de208a6-cb30-41ae-a880-78196c99c050 config: # 配置中心地址 server-addr: 101.34.77.101:8848 - namespace: 09dff3e2-9790-4d4f-beb6-9baeb01ae040 + namespace: 9de208a6-cb30-41ae-a880-78196c99c050 # 配置文件格式 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..979155f 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: 9de208a6-cb30-41ae-a880-78196c99c050 config: # 配置中心地址 server-addr: 101.34.77.101:8848 - namespace: 09dff3e2-9790-4d4f-beb6-9baeb01ae040 + namespace: 9de208a6-cb30-41ae-a880-78196c99c050 # 配置文件格式 file-extension: yml # 共享配置