diff --git a/doctor-auth/src/main/java/doctor/auth/controller/HealthDoctorController.java b/doctor-auth/src/main/java/doctor/auth/controller/HealthDoctorController.java index d0bcf22..f313107 100644 --- a/doctor-auth/src/main/java/doctor/auth/controller/HealthDoctorController.java +++ b/doctor-auth/src/main/java/doctor/auth/controller/HealthDoctorController.java @@ -23,7 +23,7 @@ public class HealthDoctorController { @PostMapping("/login") @ApiOperation("邮箱密码登录") - public HealthR login(@RequestParam @ApiParam("email") String email, @RequestParam @ApiParam("pwd") String pwd) { + public HealthR login(@RequestParam String email, @RequestParam String pwd) { DoctorVo userInfo = healthDoctorService.login(email,pwd); if (userInfo!=null){ return HealthR.ok(userInfo,"登录成功"); diff --git a/doctor-auth/src/main/resources/bootstrap.yml b/doctor-auth/src/main/resources/bootstrap.yml index c30cba2..7f241e4 100644 --- a/doctor-auth/src/main/resources/bootstrap.yml +++ b/doctor-auth/src/main/resources/bootstrap.yml @@ -15,11 +15,11 @@ spring: discovery: # 服务注册地址 server-addr: 101.34.77.101:8848 - namespace: 9de208a6-cb30-41ae-a880-78196c99c050 + namespace: 7e1e997d-5fa4-4f84-9f48-3e0adf830a37 config: # 配置中心地址 server-addr: 101.34.77.101:8848 - namespace: 9de208a6-cb30-41ae-a880-78196c99c050 + namespace: 7e1e997d-5fa4-4f84-9f48-3e0adf830a37 # 配置文件格式 file-extension: yml # 共享配置 diff --git a/doctor-gateway/src/main/resources/bootstrap.yml b/doctor-gateway/src/main/resources/bootstrap.yml index cc0e562..e0b9071 100644 --- a/doctor-gateway/src/main/resources/bootstrap.yml +++ b/doctor-gateway/src/main/resources/bootstrap.yml @@ -15,11 +15,11 @@ spring: discovery: # 服务注册地址 server-addr: 101.34.77.101:8848 - namespace: 9de208a6-cb30-41ae-a880-78196c99c050 + namespace: 7e1e997d-5fa4-4f84-9f48-3e0adf830a37 config: # 配置中心地址 server-addr: 101.34.77.101:8848 - namespace: 9de208a6-cb30-41ae-a880-78196c99c050 + namespace: 7e1e997d-5fa4-4f84-9f48-3e0adf830a37 # 配置文件格式 file-extension: yml # 共享配置 diff --git a/doctor-modules/doctor-file/src/main/resources/bootstrap.yml b/doctor-modules/doctor-file/src/main/resources/bootstrap.yml index c992149..400e098 100644 --- a/doctor-modules/doctor-file/src/main/resources/bootstrap.yml +++ b/doctor-modules/doctor-file/src/main/resources/bootstrap.yml @@ -15,11 +15,11 @@ spring: discovery: # 服务注册地址 server-addr: 101.34.77.101:8848 - namespace: 9de208a6-cb30-41ae-a880-78196c99c050 + namespace: 7e1e997d-5fa4-4f84-9f48-3e0adf830a37 config: # 配置中心地址 server-addr: 101.34.77.101:8848 - namespace: 9de208a6-cb30-41ae-a880-78196c99c050 + namespace: 7e1e997d-5fa4-4f84-9f48-3e0adf830a37 # 配置文件格式 file-extension: yml # 共享配置 diff --git a/doctor-modules/doctor-gen/src/main/resources/bootstrap.yml b/doctor-modules/doctor-gen/src/main/resources/bootstrap.yml index 007713f..9b8484d 100644 --- a/doctor-modules/doctor-gen/src/main/resources/bootstrap.yml +++ b/doctor-modules/doctor-gen/src/main/resources/bootstrap.yml @@ -15,11 +15,11 @@ spring: discovery: # 服务注册地址 server-addr: 101.34.77.101:8848 - namespace: 9de208a6-cb30-41ae-a880-78196c99c050 + namespace: 7e1e997d-5fa4-4f84-9f48-3e0adf830a37 config: # 配置中心地址 server-addr: 101.34.77.101:8848 - namespace: 9de208a6-cb30-41ae-a880-78196c99c050 + namespace: 7e1e997d-5fa4-4f84-9f48-3e0adf830a37 # 配置文件格式 file-extension: yml # 共享配置 diff --git a/doctor-modules/doctor-health/pom.xml b/doctor-modules/doctor-health/pom.xml index 547b6de..a4e24e3 100644 --- a/doctor-modules/doctor-health/pom.xml +++ b/doctor-modules/doctor-health/pom.xml @@ -19,6 +19,25 @@ + + + + + + + + + + com.alipay.sdk + alipay-easysdk + 2.2.3 + + + + com.alipay.sdk + alipay-sdk-java + 4.38.149.ALL + diff --git a/doctor-modules/doctor-health/src/main/java/doctor/AliPayConfig.java b/doctor-modules/doctor-health/src/main/java/doctor/AliPayConfig.java new file mode 100644 index 0000000..7e01ca5 --- /dev/null +++ b/doctor-modules/doctor-health/src/main/java/doctor/AliPayConfig.java @@ -0,0 +1,23 @@ +package doctor; + +import com.alipay.api.AlipayClient; +import com.alipay.api.DefaultAlipayClient; +import org.springframework.context.annotation.Bean; +import org.springframework.stereotype.Component; +@Component +public class AliPayConfig { + + + + @Bean + public AlipayClient initAlipayClient(AlipayConfigProperties alipayConfigProperties) { + return new + DefaultAlipayClient( + alipayConfigProperties.getGatewayUrl(), + alipayConfigProperties.getAppId(), + alipayConfigProperties.getMerchantPrivateKey(), + "json", alipayConfigProperties.getCharset(), + alipayConfigProperties.getAlipayPublicKey(), + alipayConfigProperties.getSignType()); + } +} diff --git a/doctor-modules/doctor-health/src/main/java/doctor/AlipayConfigProperties.java b/doctor-modules/doctor-health/src/main/java/doctor/AlipayConfigProperties.java new file mode 100644 index 0000000..c60e860 --- /dev/null +++ b/doctor-modules/doctor-health/src/main/java/doctor/AlipayConfigProperties.java @@ -0,0 +1,62 @@ +package doctor; + +import lombok.Data; +import org.springframework.boot.context.properties.ConfigurationProperties; +import org.springframework.context.annotation.Configuration; + +@Configuration +@Data +//@ConfigurationProperties(prefix = "pay.alipay") +public class AlipayConfigProperties { + + + /** + * 应用ID,您的APPID，收款账号既是您的APPID对应支付宝账号 + */ + private String appId = "9021000132656203"; + + /** + * 商户私钥，您的PKCS8格式RSA2私钥 + */ + private String merchantPrivateKey = "MIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQC7lh2ErwckK+mODTqBRWi78nlUR5a1OrCP5b+ImFjsB0EIkeOpSKiqGJv9omaRUfKxwoSqBc6c22KLszNdS6rKvcDrRObFRcLaOoMVT7CS0sSsq7ZATVy4WvouyudAOTNL6H4QOyj+YnyM6pU7Ja2jepAJwvDD9h/7c0fvASAtSteC0akuRq/r2SJ7ZRQpLWtrW4KBz+NneYHHP519sWtF2GSToN8brZJrDB9xI75N43+42L8MEuVsRK375wBv4jkwPtrB9mYQsuSMDXOsLbjuCHfxcTlFEUJ3c6SiZeIrDH9auW/lPJ+QZg91DYsZr7+HdijBej/CRT+rTmgzb7VpAgMBAAECggEASuCxB7WV9CpTIBDHubIrDFrNc4bf8ZdrwwTCX5Pwasa6fuE9LuWB7ePE4Ilix78eUTaEHhoTTymDPKBbcHIzypnT2BW4yCYAkXupt2gH45OeTg58wU4gJLasBuGXTVuHzlUPfQsgYeqOLPG2f9WaahcSR9M4qAAm5AgwPocEgQ8eRxC13xBX5r+ZRhKdnI+jLIpYggv52oIiPxz+LBUcTNHyrzOVgmn+jvEvYWQ784vNQxRYidBTO6nz89PcdfXFeH1/GdGTnodutj3C5ccodlEbOsgtZQ9o6+E7x6YDRE2oKhCZOZGE9xaNfQDSnWMv07jb/i0GoF3DsB8xVUbwwQKBgQD7BLtS6dQTCR41fO7RGWKvhGTKS6RKL5djfVlB/IYujscNUnC36Uf2ZYJnQh1wF+ztcSyZQUStxDFy4+U/M39P03Nz1yG1cejonegll8OzZ706lNE/uqXa/ruGvuztg1kuM+qWYYK57EuWJIuFdirr6ZQ6kmPSzyrlnqPaQEoeSwKBgQC/Tx/rBAjbSiceaon0UAO61/TypjvsI7lwypyjIIew3/Nwm8icaaw3GZUCX/9JH89rddioZMncucuuCp8cHBwvNj+BnrqRJc4VAUhJ0U06oNFoxfdrjeU9Pg+RMoZ4i/pHrnkDsLbvu/JYjjcGwJXDlBcDGJvv3yzJtUTsUhtamwKBgCrm3yFHp6BtQYWAycxhG1XGOfe9P+ISCjzN0rCNeV2Bt5GWUn+MVmlNZiFB0ogy/qKCYk37MsLEMnNhcfAAXDUHfccBsNgzFMyVGHU8YA1MoLHfd3f97ZTlTqW0AgiCF37nDqQPHGmscirCKjpwPNu/Oz9bf8Yq9Dj0iSqnLEPLAoGAdiIRDpm2MluO3mxhdbj3JKh4PGJEPGQu/aRPpzfOMn2IIPBBp7xlOL0WU5od1PTMq4ng2NMsB52/VWB/seb1zH2OJ6dxg3G52SSqk9KoAt0Nkso0J3k+plutVzbA7K1bRmpJlerIfC8tzls7RXMkx9mpgCLxH+VLDd9eiSOGeqMCgYB5TqHy94+lVMBf9T+8qsvmBBbOhoerqdUzV3EIqumEpT2xCgCwUzKtUIgiPljbze5hzyOJRI3xvOa5DqAiaxI/iyG1bYqogIBjkQcz+WR/CvpciqO9OL5oHz/YzTtdX/vhLdTkZ88O/CbzMhQyolkLfvE5dLmhKqj8mCDX13PZ7A=="; + + /** + * 支付宝公钥,查看地址：https://openhome.alipay.com/platform/keyManage.htm 对应APPID下的支付宝公钥。 + */ + private String alipayPublicKey = "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAhr8XuZtu7ytmPL907t0FeCppdF2+fHKn4nYBOV1eC6VlZh5TZ88Q8SAacj8FmkcWOyvAUwsF4ouQiuAxIGPLwklVVEwPc4xkdPMeiAStMqlHQreDdk33D4e9V6pkPmyNcA6ZTkUey1oaTB9lJ7S8oSbjiuMRwv8lxeSxjATjQsZoSryhl60oQj0qfEIjyttavWgpBiPRPLmwDOAIRAZC9Cm6gUnJFq3To3HyFnn81RzkowvvRp4rxZk28ZVPrBUM0TV8+Bn2m8MCeUVS1xt/dOrU2cUAru1iGKqJckiX1w+NV07euwDP1ekmze14i3oN0ZY5W/ZiAAcdF+eboPBouQIDAQAB"; + /** + * 服务器异步通知页面路径 需http://格式的完整路径，不能加?id=123这类自定义参数，必须外网可以正常访问 + */ + private String notifyUrl="http://localhost:7000/wallet/recharge/success"; + + /**\ + * 页面跳转同步通知页面路径 需http://格式的完整路径，不能加?id=123这类自定义参数，必须外网可以正常访问 + */ + private String returnUrl ="http://localhost:7000/wallet/recharge/success"; + + /** + * 签名方式 + */ + private String signType = "RSA2"; + + /** + * / 字符编码格式 + */ + private String charset ="utf-8"; + + /** + * / 支付宝网关 + */ + private String gatewayUrl = "https://openapi-sandbox.dl.alipaydev.com/gateway.do"; + + +} +/* * + *类名：AlipayConfig + *功能：基础配置类 + *详细：设置户有关信息及返回路径 + *修改日期：2017-04-05 + *说明： + *以下代码只是为了方便商户测试而提供的样例代码，商户可以根据自己网站的需要，按照技术文档编写,并非一定要使用该代码。 + *该代码仅供学习和研究支付宝接口使用，只是提供一个参考。 + */ diff --git a/doctor-modules/doctor-health/src/main/java/doctor/controller/DiseaseKnowledgeController.java b/doctor-modules/doctor-health/src/main/java/doctor/controller/DiseaseKnowledgeController.java index 508013b..6ffee33 100644 --- a/doctor-modules/doctor-health/src/main/java/doctor/controller/DiseaseKnowledgeController.java +++ b/doctor-modules/doctor-health/src/main/java/doctor/controller/DiseaseKnowledgeController.java @@ -28,6 +28,8 @@ import static doctor.common.core.utils.PageUtils.startPage; public class DiseaseKnowledgeController { @Autowired private DiseaseKnowledgeService diseaseKnowledgeService; + @Autowired + private DiseaseCategoryService diseaseCategoryService; @GetMapping("/findDepartment") public HealthR> findDepartment(){ @@ -74,6 +76,12 @@ public class DiseaseKnowledgeController { List list=diseaseKnowledgeService.popularSeach(); return HealthR.ok(list); } + @GetMapping("/findDiseaseCategory") + public HealthR> findDiseaseCategory(@RequestParam Integer departmentId){ + List list=diseaseCategoryService.findDiseaseCategory(departmentId); + return HealthR.ok(list); + } + diff --git a/doctor-modules/doctor-health/src/main/java/doctor/controller/DoctorController.java b/doctor-modules/doctor-health/src/main/java/doctor/controller/DoctorController.java index a93d06b..a7a0ced 100644 --- a/doctor-modules/doctor-health/src/main/java/doctor/controller/DoctorController.java +++ b/doctor-modules/doctor-health/src/main/java/doctor/controller/DoctorController.java @@ -2,6 +2,7 @@ package doctor.controller; import doctor.common.core.domain.HealthR; import doctor.domain.entity.DoctorEntity; +import doctor.domain.vo.DoctorVo; import doctor.service.DoctorService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; @@ -12,6 +13,8 @@ import org.springframework.web.bind.annotation.RestController; import javax.print.Doc; import java.util.List; +import static com.github.pagehelper.page.PageMethod.startPage; + /** * @BelongsProject: Medical_Treatment * @BelongsPackage: doctor.controller @@ -24,13 +27,14 @@ public class DoctorController { @Autowired private DoctorService doctorService; @GetMapping("/findDoctorList") - public HealthR> findDoctorList(@RequestParam Integer deptId, - @RequestParam Integer condition, - @RequestParam Integer sortBy, - @RequestParam(value = "page",defaultValue = "1") Integer page, - @RequestParam(value = "count",defaultValue = "5") Integer count + public HealthR> 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 list=doctorService.findDoctorList(deptId); + startPage(page,count); + List list=doctorService.findDoctorList(deptId,condition,sortBy); return HealthR.ok(list); } } diff --git a/doctor-modules/doctor-health/src/main/java/doctor/controller/HealthInquiryVerifyController.java b/doctor-modules/doctor-health/src/main/java/doctor/controller/HealthInquiryVerifyController.java index 4e9e189..d8cd699 100644 --- a/doctor-modules/doctor-health/src/main/java/doctor/controller/HealthInquiryVerifyController.java +++ b/doctor-modules/doctor-health/src/main/java/doctor/controller/HealthInquiryVerifyController.java @@ -1,12 +1,11 @@ package doctor.controller; import doctor.common.core.domain.HealthR; +import doctor.domain.vo.HistoryInquiryRecordVo; import doctor.domain.vo.InquiryRecordVo; import doctor.service.InquiryVerifyService; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; import java.util.List; @@ -23,4 +22,12 @@ public class HealthInquiryVerifyController { return HealthR.ok(inquiryRecordList); } + @GetMapping("/findHistoryInquiryRecord") + public HealthR> findHistoryInquiryRecord(@RequestParam Integer page, + @RequestParam Integer count, + @RequestHeader Integer doctorId) { + List inquiryRecordList = inquiryVerifyService.findHistoryInquiryRecord(page,count,doctorId); + return HealthR.ok(inquiryRecordList); + } + } diff --git a/doctor-modules/doctor-health/src/main/java/doctor/controller/HealthJobTitleController.java b/doctor-modules/doctor-health/src/main/java/doctor/controller/HealthJobTitleController.java index dd3ce23..167fe32 100644 --- a/doctor-modules/doctor-health/src/main/java/doctor/controller/HealthJobTitleController.java +++ b/doctor-modules/doctor-health/src/main/java/doctor/controller/HealthJobTitleController.java @@ -28,7 +28,7 @@ public class HealthJobTitleController { return HealthR.ok(doctorJobTitleEntities); } - @PostMapping("/sendEmailCode") + @RequestMapping("/sendEmailCode") public HealthR sendEmailCode(@RequestParam("email") String email) { HealthR healthR= healthJobTitleService.sendEmailCode(email); return HealthR.ok(healthR); @@ -50,4 +50,10 @@ public class HealthJobTitleController { return HealthR.ok(healthJobTitleService.findSystemImagePic()); } + @PutMapping("/checkCode") + public HealthR checkCode(@RequestParam("email") String email, + @RequestParam("code") String code) { + return HealthR.ok(healthJobTitleService.checkCode(email, code)); + } + } diff --git a/doctor-modules/doctor-health/src/main/java/doctor/controller/HealthRVerifyController.java b/doctor-modules/doctor-health/src/main/java/doctor/controller/HealthRVerifyController.java index b6b495f..6d1e52c 100644 --- a/doctor-modules/doctor-health/src/main/java/doctor/controller/HealthRVerifyController.java +++ b/doctor-modules/doctor-health/src/main/java/doctor/controller/HealthRVerifyController.java @@ -1,10 +1,7 @@ package doctor.controller; import doctor.common.core.domain.HealthR; -import doctor.domain.vo.DoctorIncomeRecordVo; -import doctor.domain.vo.DoctorVo; -import doctor.domain.vo.NoticeReadNumVo; -import doctor.domain.vo.WalletVo; +import doctor.domain.vo.*; import doctor.service.HealthJobTitleService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -18,6 +15,34 @@ public class HealthRVerifyController { @Autowired private HealthJobTitleService healthJobTitleService; + @PostMapping("/chooseImagePic") + public HealthR chooseImagePic(@RequestParam String imagePic, + @RequestHeader Integer doctorId) { + healthJobTitleService.upImagePicByDoctorId(imagePic,doctorId); + return HealthR.ok(); + } + + @GetMapping("/findDoctorSystemNoticeList") + public HealthR> findDoctorSystemNoticeList( + @RequestParam Integer page,@RequestParam Integer count) { + List list = healthJobTitleService.findDoctorSystemNoticeList(page,count); + return HealthR.ok(list); + } + @GetMapping("/findDoctorInquiryNoticeList") + public HealthR> findDoctorInquiryNoticeList( + @RequestParam Integer page,@RequestParam Integer count) { + List list = healthJobTitleService.findDoctorSystemNoticeList(page,count); + return HealthR.ok(list); + } + @GetMapping("/findDoctorHealthyCurrencyNoticeList") + public HealthR> findDoctorHealthyCurrencyNoticeList( + @RequestParam Integer page,@RequestParam Integer count) { + List list = healthJobTitleService.findDoctorSystemNoticeList(page,count); + return HealthR.ok(list); + } + + + @GetMapping("/findDoctorWallet") public HealthR findDoctorWallet(@RequestHeader Integer doctorId, @RequestHeader String sessionId) { @@ -55,4 +80,13 @@ public class HealthRVerifyController { return HealthR.ok(healthR); } + @GetMapping("/findMyAdoptedCommentList") + public HealthR> findMyAdoptedCommentList(@RequestHeader Integer doctorId, + @RequestHeader String sessionId, + @RequestParam Integer page, + @RequestParam Integer count) { + List healthR = healthJobTitleService.findMyAdoptedCommentList(doctorId,page,count); + return HealthR.ok(healthR); + } + } diff --git a/doctor-modules/doctor-health/src/main/java/doctor/controller/InformationController.java b/doctor-modules/doctor-health/src/main/java/doctor/controller/InformationController.java index fbc3629..ecb3611 100644 --- a/doctor-modules/doctor-health/src/main/java/doctor/controller/InformationController.java +++ b/doctor-modules/doctor-health/src/main/java/doctor/controller/InformationController.java @@ -19,7 +19,6 @@ import static com.github.pagehelper.page.PageMethod.startPage; */ @RestController @RequestMapping("/share/information/v1") - public class InformationController { @Autowired private InformationService informationService; 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 69dc8d8..876acd6 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 @@ -34,7 +34,7 @@ public class InquiryController { @GetMapping("/v1/findDoctorInfo") public HealthR findDoctorInfo(@RequestHeader Integer userId, @RequestHeader String sessionId, - @RequestParam Integer doctorId) { + @RequestParam(value = "doctorId",defaultValue = "2") Integer doctorId) { DoctorVo doctorVo = inquiryService.findDoctorInfo(doctorId); return HealthR.ok(doctorVo); } diff --git a/doctor-modules/doctor-health/src/main/java/doctor/controller/PatientController.java b/doctor-modules/doctor-health/src/main/java/doctor/controller/PatientController.java index cfdd639..bcf2ddd 100644 --- a/doctor-modules/doctor-health/src/main/java/doctor/controller/PatientController.java +++ b/doctor-modules/doctor-health/src/main/java/doctor/controller/PatientController.java @@ -25,15 +25,47 @@ import java.util.List; * @Author 栗永斌 */ @RestController -@RequestMapping("/user/sickCircle/v1/") +@RequestMapping("/sickCircle/v1/") public class PatientController { @Autowired private PatientService patientService; + @Autowired + private SickCircleService sickCircleService; + + /** + * 发表评论 + */ + @PostMapping("/publishComment") + public Result publishComment( + @RequestParam("sickCircleId") Integer sickCircleId, + @RequestParam("content") String content) { + + return sickCircleService.publishComment(sickCircleId, content); + } + /** + * 点采 + * @param opinion + * @return + */ + @PutMapping("expressOpinion") + public HealthR expressOpinion(@RequestParam("opinion") Integer opinion){ +// return sickCircleServer.expressOpinion(commentId, opinion); + System.out.println(opinion); + return null; + } + /** + * 新增病友圈 + */ + @PostMapping("/publishSickCircle") + public HealthR publishSickCircle(@RequestBody SickCircleEntity sickCircleEntity) { + + return sickCircleService.publishSickCircle(sickCircleEntity); + } /** * 病友圈列表 @@ -43,10 +75,9 @@ public class PatientController { */ @GetMapping("/findSickCircleList") public HealthR> sickCircleList(@RequestParam(value = "departmentId",required = false) Integer departmentId, - @RequestParam(value = "page",defaultValue = "1") Integer page, - @RequestParam(value = "count",defaultValue = "20") Integer count) { - - return patientService.sickCircleList(departmentId); + @RequestParam(value = "page") Integer page, + @RequestParam(value = "count") Integer count) { + return patientService.sickCircleList(departmentId,page,count); } private PageInfo startPage(Integer page, Integer count) { @@ -89,27 +120,9 @@ public class PatientController { * @param keyWord * @return */ - @GetMapping("/searchSickCircle") + @GetMapping("searchSickCircle") public HealthR> searchSickCircle(@RequestParam(value = "keyWord",required = false) String keyWord){ - System.out.println(keyWord); return patientService.searchSickCircle(keyWord); + } - - - /** - * 查询患者创建的病友圈 - * @param patientUserId - * @return - */ - @GetMapping("/findPatientSickCircleList") - public HealthR> findPatientSickCircleList(@RequestParam(value = "patientUserId",required = false) Integer patientUserId, - @RequestParam(value = "page",defaultValue = "1") Integer page, - @RequestParam(value = "count",defaultValue = "20") Integer count) { - startPage(page, count); - return patientService.findPatientSickCircleList(patientUserId); - } - - - - } diff --git a/doctor-modules/doctor-health/src/main/java/doctor/controller/UserSickCircleController.java b/doctor-modules/doctor-health/src/main/java/doctor/controller/UserSickCircleController.java index 82f418f..bf7ef9d 100644 --- a/doctor-modules/doctor-health/src/main/java/doctor/controller/UserSickCircleController.java +++ b/doctor-modules/doctor-health/src/main/java/doctor/controller/UserSickCircleController.java @@ -1,13 +1,11 @@ package doctor.controller; import doctor.common.core.domain.HealthR; +import doctor.domain.vo.SickCircleCommentVo; import doctor.domain.vo.UserSickCircleVo; import doctor.service.UserSickCircleService; 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; @@ -32,4 +30,5 @@ public class UserSickCircleController { return HealthR.ok(userFriendCircles); } + } 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..e7fae89 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 @@ -7,8 +7,13 @@ import doctor.domain.vo.*; import doctor.service.UserVideoService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; +import org.springframework.web.multipart.MultipartFile; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; +import java.io.IOException; +import java.math.BigDecimal; import java.util.List; import static com.github.pagehelper.page.PageMethod.startPage; @@ -47,7 +52,7 @@ public class UserVideoController { return HealthR.ok(userVideoCollectionVos); } //用户删除购买的视频 - @DeleteMapping("/deleteVideoBuy}") + @DeleteMapping("/deleteVideoBuy") public HealthR deleteVideoBuy(@RequestParam Integer videoId){ userVideoService.deleteVideoBuy(videoId); return HealthR.ok(); @@ -55,9 +60,9 @@ public class UserVideoController { //我的钱包 @GetMapping("/findUserWallet") - public HealthR> findUserWallet(@RequestHeader Integer userId){ - List userWallets = userVideoService.findUserWallet(userId); - return HealthR.ok(userWallets); + public HealthR findUserWallet(@RequestHeader Integer userId){ + Integer i= userVideoService.findUserWallet(userId); + return HealthR.ok(i); } //用户消费记录 @GetMapping("/findUserConsumptionRecordList") @@ -100,9 +105,12 @@ public class UserVideoController { } //上传用户档案图片 @PostMapping("/uploadArchivesPicture") - public HealthR uploadUserArchivesImg(@RequestParam Integer id){ - userVideoService.uploadUserArchivesImg(id); - return HealthR.ok(); + public HealthR uploadUserArchivesImg(@RequestParam("imagePic") MultipartFile imagePic, + @RequestHeader String sessionId, + @RequestParam Integer id + ){ + + return HealthR.ok(userVideoService.uploadUserArchivesImg(imagePic,sessionId,id)); } //用户关注医生列表 @@ -154,4 +162,60 @@ public class UserVideoController { userVideoService.modifyNickName(nickName,userId); return HealthR.ok("修改成功"); } + //查询系统通知列表 + @GetMapping("/findSystemNoticeList") + public HealthR> findSystemNoticeList(){ + List systemNoticeEntities = userVideoService.findSystemNoticeList(); + return HealthR.ok(systemNoticeEntities); + } + //查询用户问诊通知列表 + @GetMapping("/findInquiryNoticeList") + public HealthR> findInquiryNoticeList(@RequestHeader Integer userId,@RequestParam Integer page,@RequestParam Integer count){ + startPage(page,count); + List inquiryRecordEntities = userVideoService.findInquiryNoticeList(userId); + return HealthR.ok(inquiryRecordEntities); + } + //查询用户货币通知列表 + @GetMapping("/findHealthyCurrencyNoticeList") + public HealthR> findHealthyCurrencyNoticeList(@RequestHeader Integer userId,@RequestParam Integer page,@RequestParam Integer count) { + startPage(page,count); + List healthyCurrencyNoticeListVos = userVideoService.findHealthyCurrencyNoticeList(userId); + return HealthR.ok(healthyCurrencyNoticeListVos); + } + + //查询用户未读数消息 + @GetMapping("/findUserNoticeReadNum") + public HealthR> findUserNoticeReadNum(@RequestHeader Integer userId){ + List userNoticeReadNumVos = userVideoService.findUserNoticeReadNum(userId); + return HealthR.ok(userNoticeReadNumVos); + } + //修改消息为已读 + @PutMapping("/modifyAllStatus") + public HealthR modifyAllStatus(@RequestHeader Integer userId){ + userVideoService.modifyAllStatus(userId); + return HealthR.ok("全部已读"); + } + //充值 + @PostMapping("/recharge") + public HealthR pay(@RequestParam BigDecimal money,@RequestHeader Integer userId) { + String pay = userVideoService.Pay(money,userId); + System.err.println(pay); + return HealthR.ok(pay); + } + + //提现 + @PostMapping("/drawCash") + public HealthR drawCash(@RequestHeader Integer userId,@RequestParam BigDecimal money){ + userVideoService.drawCash(userId,money); + return HealthR.ok("提现成功"); + } + + //病友圈评论列表查询 + @GetMapping("/findUserSickCollectionList") + public HealthR> findSickCircleCommentList(@RequestHeader Integer userId,@RequestParam Integer page, @RequestParam Integer count){ + startPage(page,count); + List sickCircleComments = userVideoService.findSickCircleCommentList(userId); + return HealthR.ok(sickCircleComments); + } + } diff --git a/doctor-modules/doctor-health/src/main/java/doctor/convert/DoctorConvert.java b/doctor-modules/doctor-health/src/main/java/doctor/convert/DoctorConvert.java new file mode 100644 index 0000000..2d4643d --- /dev/null +++ b/doctor-modules/doctor-health/src/main/java/doctor/convert/DoctorConvert.java @@ -0,0 +1,25 @@ +package doctor.convert; + +import doctor.domain.entity.DoctorEntity; +import doctor.domain.vo.DoctorVo; +import org.mapstruct.Mapper; +import org.mapstruct.Mapping; +import org.mapstruct.Mappings; +import org.mapstruct.factory.Mappers; + +import java.util.List; + +@Mapper +public interface DoctorConvert { + + DoctorConvert INSTANCE = Mappers.getMapper(DoctorConvert.class); + + DoctorEntity doctorVoToDoctorEntity(DoctorVo doctorVo); + @Mappings({ + @Mapping(source = "id", target = "doctorId") + }) + DoctorVo doctorEntityToDoctorVo(DoctorEntity doctorEntity); + List doctorEntityListToDoctorVoList(List doctorEntityList); + + List doctorVoListToDoctorEntityList(List doctorVoList); +} diff --git a/doctor-modules/doctor-health/src/main/java/doctor/domain/entity/DoctorAskCount.java b/doctor-modules/doctor-health/src/main/java/doctor/domain/entity/DoctorAskCount.java new file mode 100644 index 0000000..bf71f5a --- /dev/null +++ b/doctor-modules/doctor-health/src/main/java/doctor/domain/entity/DoctorAskCount.java @@ -0,0 +1,24 @@ +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/19 11:41 + */ +@Data +@AllArgsConstructor +@NoArgsConstructor +public class DoctorAskCount { + private Integer id; + private Integer doctorAskCount; + private Integer number; + private Date updateTime; + private Date createTime; +} diff --git a/doctor-modules/doctor-health/src/main/java/doctor/domain/entity/DoctorCharge.java b/doctor-modules/doctor-health/src/main/java/doctor/domain/entity/DoctorCharge.java new file mode 100644 index 0000000..9f0a0ba --- /dev/null +++ b/doctor-modules/doctor-health/src/main/java/doctor/domain/entity/DoctorCharge.java @@ -0,0 +1,24 @@ +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/18 18:33 + */ +@Data +@AllArgsConstructor +@NoArgsConstructor +public class DoctorCharge { + private Integer id; + private Integer doctorId; + private Integer cost; + private Date updateTime; + private Date createTime; +} diff --git a/doctor-modules/doctor-health/src/main/java/doctor/domain/entity/DoctorCommentCount.java b/doctor-modules/doctor-health/src/main/java/doctor/domain/entity/DoctorCommentCount.java new file mode 100644 index 0000000..83e341f --- /dev/null +++ b/doctor-modules/doctor-health/src/main/java/doctor/domain/entity/DoctorCommentCount.java @@ -0,0 +1,24 @@ +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/18 18:48 + */ +@Data +@AllArgsConstructor +@NoArgsConstructor +public class DoctorCommentCount { + private Integer id; + private Integer doctorId; + private Integer praiseNum; + private Integer badNum; + private Date createTime; +} diff --git a/doctor-modules/doctor-health/src/main/java/doctor/domain/entity/DoctorEntity.java b/doctor-modules/doctor-health/src/main/java/doctor/domain/entity/DoctorEntity.java index 331dd38..816bb14 100644 --- a/doctor-modules/doctor-health/src/main/java/doctor/domain/entity/DoctorEntity.java +++ b/doctor-modules/doctor-health/src/main/java/doctor/domain/entity/DoctorEntity.java @@ -24,6 +24,7 @@ public class DoctorEntity { private String phone; private String pwd; private String name; + private String jobTitle; private String imagePic; private String inauguralHospital; private String personalProfile; diff --git a/doctor-modules/doctor-health/src/main/java/doctor/domain/entity/DoctorSystemReplyEntity.java b/doctor-modules/doctor-health/src/main/java/doctor/domain/entity/DoctorSystemReplyEntity.java new file mode 100644 index 0000000..06b615a --- /dev/null +++ b/doctor-modules/doctor-health/src/main/java/doctor/domain/entity/DoctorSystemReplyEntity.java @@ -0,0 +1,13 @@ +package doctor.domain.entity; + +import lombok.Data; + +import java.util.Date; + +@Data +public class DoctorSystemReplyEntity { + private Integer id; + private String content; + private Date createTime; + +} diff --git a/doctor-modules/doctor-health/src/main/java/doctor/domain/entity/SickCircleCommentEntity.java b/doctor-modules/doctor-health/src/main/java/doctor/domain/entity/SickCircleCommentEntity.java index e7f67e7..5f11b6d 100644 --- a/doctor-modules/doctor-health/src/main/java/doctor/domain/entity/SickCircleCommentEntity.java +++ b/doctor-modules/doctor-health/src/main/java/doctor/domain/entity/SickCircleCommentEntity.java @@ -1,5 +1,7 @@ package doctor.domain.entity; +import lombok.Data; + import java.util.Date; /** @@ -8,6 +10,7 @@ import java.util.Date; * @Author : FJJ * @Date: 2024-01-12 19:57 */ +@Data public class SickCircleCommentEntity { private Integer id; private Integer sickCircleId; @@ -15,61 +18,6 @@ public class SickCircleCommentEntity { private String content; private Date commentTime; private Integer whetherDoctor; - private Long createTime; + private Date createTime; - public Integer getId() { - return id; - } - - public void setId(Integer id) { - this.id = id; - } - - public Integer getSickCircleId() { - return sickCircleId; - } - - public void setSickCircleId(Integer sickCircleId) { - this.sickCircleId = sickCircleId; - } - - public Integer getUserId() { - return userId; - } - - public void setUserId(Integer userId) { - this.userId = userId; - } - - public String getContent() { - return content; - } - - public void setContent(String content) { - this.content = content; - } - - public Date getCommentTime() { - return commentTime; - } - - public void setCommentTime(Date commentTime) { - this.commentTime = commentTime; - } - - public Integer getWhetherDoctor() { - return whetherDoctor; - } - - public void setWhetherDoctor(Integer whetherDoctor) { - this.whetherDoctor = whetherDoctor; - } - - public Long getCreateTime() { - return createTime; - } - - public void setCreateTime(Long createTime) { - this.createTime = createTime; - } } diff --git a/doctor-modules/doctor-health/src/main/java/doctor/domain/entity/SystemNoticeEntity.java b/doctor-modules/doctor-health/src/main/java/doctor/domain/entity/SystemNoticeEntity.java new file mode 100644 index 0000000..a2911f5 --- /dev/null +++ b/doctor-modules/doctor-health/src/main/java/doctor/domain/entity/SystemNoticeEntity.java @@ -0,0 +1,22 @@ +package doctor.domain.entity; + +import lombok.Data; + +import java.util.Date; + +/** + * @ClassName : SystemNoticeEntity + * @Description : 系统通知表 + * @Author : FJJ + * @Date: 2024-01-18 10:57 + */ +@Data +public class SystemNoticeEntity { + private Integer id; + private Integer reciveUserId; + private String content; + private String noticeType; + private String pushType; + private Integer status; + private Date createTime; +} diff --git a/doctor-modules/doctor-health/src/main/java/doctor/domain/entity/UserBankCard.java b/doctor-modules/doctor-health/src/main/java/doctor/domain/entity/UserBankCard.java new file mode 100644 index 0000000..481911b --- /dev/null +++ b/doctor-modules/doctor-health/src/main/java/doctor/domain/entity/UserBankCard.java @@ -0,0 +1,20 @@ +package doctor.domain.entity; + +import lombok.Data; + +/** + * @ClassName : UserBankCard + * @Description : 银行卡表 + * @Author : FJJ + * @Date: 2024-01-19 10:22 + */ +@Data +public class UserBankCard { + private Integer id; + private Integer userId; + private String bankCardNumber; + private String bankName; + private Integer bankCardType; + private Data updateTime; + private Data createTime; +} diff --git a/doctor-modules/doctor-health/src/main/java/doctor/domain/entity/UserDoctorFollowEntity.java b/doctor-modules/doctor-health/src/main/java/doctor/domain/entity/UserDoctorFollowEntity.java index 23ccfa5..89db021 100644 --- a/doctor-modules/doctor-health/src/main/java/doctor/domain/entity/UserDoctorFollowEntity.java +++ b/doctor-modules/doctor-health/src/main/java/doctor/domain/entity/UserDoctorFollowEntity.java @@ -1,6 +1,8 @@ package doctor.domain.entity; +import lombok.AllArgsConstructor; import lombok.Data; +import lombok.NoArgsConstructor; import java.util.Date; @@ -10,42 +12,16 @@ import java.util.Date; * @Author: jpz * @CreateTime: 2024/1/8 21:49 */ - +@Data +@AllArgsConstructor +@NoArgsConstructor public class UserDoctorFollowEntity { private Integer id; - private Integer userId; + private Long userId; private Integer doctorId; private Date createTime; - public Integer getId() { - return id; - } - public void setId(Integer id) { - this.id = id; - } - public Integer getUserId() { - return userId; - } - public void setUserId(Integer userId) { - this.userId = userId; - } - - public Integer getDoctorId() { - return doctorId; - } - - public void setDoctorId(Integer doctorId) { - this.doctorId = doctorId; - } - - public Date getCreateTime() { - return createTime; - } - - public void setCreateTime(Date createTime) { - this.createTime = createTime; - } } diff --git a/doctor-modules/doctor-health/src/main/java/doctor/domain/entity/UserRechargeRecordEntity.java b/doctor-modules/doctor-health/src/main/java/doctor/domain/entity/UserRechargeRecordEntity.java new file mode 100644 index 0000000..1e4fc39 --- /dev/null +++ b/doctor-modules/doctor-health/src/main/java/doctor/domain/entity/UserRechargeRecordEntity.java @@ -0,0 +1,23 @@ +package doctor.domain.entity; + +import lombok.Data; + +import java.util.Date; + +/** + * @ClassName : UserRechargeRecordEntity + * @Description : 用户充值 + * @Author : FJJ + * @Date: 2024-01-18 20:51 + */ +@Data +public class UserRechargeRecordEntity { + private Integer id; + private String orderId; + private Integer userId; + private Integer money; + private Integer payType; + private Integer payStatus; + private Date rechargeTime; + private Date createTime; +} diff --git a/doctor-modules/doctor-health/src/main/java/doctor/domain/vo/DoctorSystemNoticeListVo.java b/doctor-modules/doctor-health/src/main/java/doctor/domain/vo/DoctorSystemNoticeListVo.java new file mode 100644 index 0000000..28f5db8 --- /dev/null +++ b/doctor-modules/doctor-health/src/main/java/doctor/domain/vo/DoctorSystemNoticeListVo.java @@ -0,0 +1,12 @@ +package doctor.domain.vo; + +import lombok.Data; + +import java.util.Date; + +@Data +public class DoctorSystemNoticeListVo { + private Integer id; + private String content; + private Date createTime; +} diff --git a/doctor-modules/doctor-health/src/main/java/doctor/domain/vo/DoctorVo.java b/doctor-modules/doctor-health/src/main/java/doctor/domain/vo/DoctorVo.java index 0f1f4d9..2534241 100644 --- a/doctor-modules/doctor-health/src/main/java/doctor/domain/vo/DoctorVo.java +++ b/doctor-modules/doctor-health/src/main/java/doctor/domain/vo/DoctorVo.java @@ -24,12 +24,7 @@ public class DoctorVo { 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 doctorReceiveGiftList; - private List commentVoList; + private Integer commentNum; } diff --git a/doctor-modules/doctor-health/src/main/java/doctor/domain/vo/HealthyCurrencyNoticeListVo.java b/doctor-modules/doctor-health/src/main/java/doctor/domain/vo/HealthyCurrencyNoticeListVo.java new file mode 100644 index 0000000..0847260 --- /dev/null +++ b/doctor-modules/doctor-health/src/main/java/doctor/domain/vo/HealthyCurrencyNoticeListVo.java @@ -0,0 +1,18 @@ +package doctor.domain.vo; + +import lombok.Data; + +import java.util.Date; + +/** + * @ClassName : HealthyCurrencyNoticeListVo + * @Description : 用户H币通知列表 + * @Author : FJJ + * @Date: 2024-01-18 15:57 + */ +@Data +public class HealthyCurrencyNoticeListVo { + private Integer id; + private String content; + private Date createTime; +} diff --git a/doctor-modules/doctor-health/src/main/java/doctor/domain/vo/HistoryInquiryRecordVo.java b/doctor-modules/doctor-health/src/main/java/doctor/domain/vo/HistoryInquiryRecordVo.java new file mode 100644 index 0000000..49b4d5a --- /dev/null +++ b/doctor-modules/doctor-health/src/main/java/doctor/domain/vo/HistoryInquiryRecordVo.java @@ -0,0 +1,14 @@ +package doctor.domain.vo; + +import lombok.Data; + +@Data +public class HistoryInquiryRecordVo { + private Integer recordId; + private Integer userId; + private String uerHeadPic; + private String doctorHeadPic; + private String nickName; + private long inquiryTime; + private Integer status; +} diff --git a/doctor-modules/doctor-health/src/main/java/doctor/domain/vo/InquiryNoticeVo.java b/doctor-modules/doctor-health/src/main/java/doctor/domain/vo/InquiryNoticeVo.java new file mode 100644 index 0000000..b5e79d7 --- /dev/null +++ b/doctor-modules/doctor-health/src/main/java/doctor/domain/vo/InquiryNoticeVo.java @@ -0,0 +1,18 @@ +package doctor.domain.vo; + +import lombok.Data; + +import java.util.Date; + +/** + * @ClassName : InquiryNotice + * @Description : 用户问诊通知表 + * @Author : FJJ + * @Date: 2024-01-18 11:33 + */ +@Data +public class InquiryNoticeVo { + private Integer id; + private String content; + private Date createTime; +} diff --git a/doctor-modules/doctor-health/src/main/java/doctor/domain/vo/MyAdoptedCommentListVo.java b/doctor-modules/doctor-health/src/main/java/doctor/domain/vo/MyAdoptedCommentListVo.java new file mode 100644 index 0000000..096b9f4 --- /dev/null +++ b/doctor-modules/doctor-health/src/main/java/doctor/domain/vo/MyAdoptedCommentListVo.java @@ -0,0 +1,13 @@ +package doctor.domain.vo; + +import lombok.Data; + +@Data +public class MyAdoptedCommentListVo { + private Integer releaseUserId; + private String releaseUserNickName; + private String title; + private String disease; + private String content; + private String adoptTime; +} diff --git a/doctor-modules/doctor-health/src/main/java/doctor/domain/vo/SickCircleCommentVo.java b/doctor-modules/doctor-health/src/main/java/doctor/domain/vo/SickCircleCommentVo.java new file mode 100644 index 0000000..db7bc20 --- /dev/null +++ b/doctor-modules/doctor-health/src/main/java/doctor/domain/vo/SickCircleCommentVo.java @@ -0,0 +1,25 @@ +package doctor.domain.vo; + +import lombok.Data; + +import java.util.Date; + +/** + * @ClassName : SickCircleComment + * @Description : 病友圈列表 + * @Author : FJJ + * @Date: 2024-01-19 11:03 + */ +@Data +public class SickCircleCommentVo { + private Integer commentId; + private Integer commentUserId; + private String nickNmae; + private String headPic; + private String content; + private Integer supportNum; + private Integer opposeNum; + private Integer opinion; + private Integer whetherDoctor; + private Date commentTime; +} diff --git a/doctor-modules/doctor-health/src/main/java/doctor/domain/vo/UserNoticeReadNumVo.java b/doctor-modules/doctor-health/src/main/java/doctor/domain/vo/UserNoticeReadNumVo.java new file mode 100644 index 0000000..03e1c85 --- /dev/null +++ b/doctor-modules/doctor-health/src/main/java/doctor/domain/vo/UserNoticeReadNumVo.java @@ -0,0 +1,15 @@ +package doctor.domain.vo; + +import lombok.Data; + +/** + * @ClassName : UserNoticeReadNumVo + * @Description : 未读消息 + * @Author : FJJ + * @Date: 2024-01-18 16:14 + */ +@Data +public class UserNoticeReadNumVo { + private Integer notReadNum; + private Integer noticeType; +} diff --git a/doctor-modules/doctor-health/src/main/java/doctor/mapper/DoctorMapper.java b/doctor-modules/doctor-health/src/main/java/doctor/mapper/DoctorMapper.java index 1836f85..baae786 100644 --- a/doctor-modules/doctor-health/src/main/java/doctor/mapper/DoctorMapper.java +++ b/doctor-modules/doctor-health/src/main/java/doctor/mapper/DoctorMapper.java @@ -1,6 +1,7 @@ package doctor.mapper; import doctor.domain.entity.DoctorEntity; +import org.apache.ibatis.annotations.Param; import org.mybatis.spring.annotation.MapperScan; import java.util.List; @@ -13,5 +14,6 @@ import java.util.List; */ @MapperScan public interface DoctorMapper { - List findDoctorList(Integer deptId); +// List findDoctorList(Integer deptId, Integer condition, Integer sortBy); + List findDoctorList(@Param("deptId") Integer deptId); } diff --git a/doctor-modules/doctor-health/src/main/java/doctor/mapper/HealthJobTitleMapper.java b/doctor-modules/doctor-health/src/main/java/doctor/mapper/HealthJobTitleMapper.java index 430954e..e9510ba 100644 --- a/doctor-modules/doctor-health/src/main/java/doctor/mapper/HealthJobTitleMapper.java +++ b/doctor-modules/doctor-health/src/main/java/doctor/mapper/HealthJobTitleMapper.java @@ -1,9 +1,7 @@ package doctor.mapper; -import doctor.domain.entity.DoctorIncomeRecordEntity; -import doctor.domain.entity.DoctorJobTitleEntity; -import doctor.domain.entity.DoctorWalletEntity; -import doctor.domain.entity.doctorSystemNoticeEntity; +import doctor.controller.HealthRVerifyController; +import doctor.domain.entity.*; import doctor.system.api.domain.Department; import doctor.system.api.domain.Doctor; import org.apache.ibatis.annotations.Mapper; @@ -32,4 +30,8 @@ public interface HealthJobTitleMapper { List findDoctorIncomeRecordList(Integer doctorId); List findDoctorNoticeReadNum(Integer doctorId); + + List findDoctorSystemNoticeList(); + + void upImagePicByDoctorId(@Param("doctorId") Integer doctorId, @Param("imagePic") String imagePic); } 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 05b979d..fe85ae8 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 @@ -1,6 +1,10 @@ package doctor.mapper; +import doctor.domain.entity.DoctorAskCount; import doctor.domain.entity.InquiryDetailsRecordEntity; +import doctor.domain.entity.InquiryRecordEntity; +import doctor.domain.entity.UserDoctorFollowEntity; +import doctor.domain.vo.DoctorVo; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -19,4 +23,20 @@ public interface InquiryMapper { void consultDoctor(@Param("userId") Integer userId, @Param("doctorId") Integer doctorId); String findDoctorUserNameByDoctorId(@Param("doctorId") Integer doctorId); + + DoctorVo findDoctorInfo(@Param("doctorId") Integer doctorId); + + void followDoctor(@Param("userDoctorFollowEntity") UserDoctorFollowEntity userDoctorFollowEntity); + + void delCancelFollow(@Param("userid") Long userid, @Param("doctorId") Integer doctorId); + + InquiryRecordEntity findInquiryRecordById(@Param("recordId") Integer recordId, int i); + + void endInquiry(@Param("recordId") Integer recordId); + + DoctorAskCount getDoctorAskCount(@Param("doctorId") Integer doctorId); + + void addDoctorAskCount(DoctorAskCount doctorAskCount); + + void updDoctorAskCount(DoctorAskCount doctorAskCount); } 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 3059118..277e23c 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 @@ -6,7 +6,6 @@ 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/UserSickCircleMapper.java b/doctor-modules/doctor-health/src/main/java/doctor/mapper/UserSickCircleMapper.java index 3e31b23..08f89bb 100644 --- a/doctor-modules/doctor-health/src/main/java/doctor/mapper/UserSickCircleMapper.java +++ b/doctor-modules/doctor-health/src/main/java/doctor/mapper/UserSickCircleMapper.java @@ -1,7 +1,9 @@ package doctor.mapper; +import doctor.domain.entity.SickCircleCommentEntity; import doctor.domain.entity.UserSickCircleEntity; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; import java.util.List; @@ -14,4 +16,5 @@ import java.util.List; @Mapper public interface UserSickCircleMapper { List findUserSickCircleList(); + } 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 c55aa77..9890fb1 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 @@ -7,6 +7,7 @@ import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import org.springframework.web.bind.annotation.RequestHeader; +import java.math.BigDecimal; import java.util.List; /** @@ -25,7 +26,7 @@ public interface UserVideoMapper { void deleteVideoBuy(@Param("videoId") Integer videoId); - List findUserWallet(Integer userId); +// Integer findUserWallet(@Param("userId") Integer userId); List findUserConsumptionRecordList(); @@ -39,7 +40,7 @@ public interface UserVideoMapper { void addUserArchives(UserArchivesEntity userArchivesEntity, @Param("userId") Integer userId); - void uploadUserArchivesImg(@Param("id") Integer id); + List findUserDoctorFollowList(); @@ -56,6 +57,30 @@ public interface UserVideoMapper { void modifyNickName(@Param("nickName") String nickName, @Param("userId") Integer userId); + List findSystemNoticeList(); + + List findInquiryNoticeList(Integer userId); + + List findHealthyCurrencyNoticeList(@Param("userId") Integer userId); + + List findUserNoticeReadNum(@Param("userId") Integer userId); + + + SystemNoticeEntity findModifyAll(@Param("userId") Integer userId); + + void modifyAllStatus(@Param("userId") Integer userId); + + void uploadUserArchivesImg(@Param("id") Integer id, @Param("s") String s); + + void updateUserWallet(@Param("money") BigDecimal money, @Param("userId") Integer userId); + + Integer findUserWallet(@Param("userId") Integer userId); + + void updateUserWallet1(@Param("money") BigDecimal money, @Param("userId") Integer userId); + // void addSign(SignEntity signEntity); + + List findSickCircleCommentList(@Param("userId") Integer userId); + } diff --git a/doctor-modules/doctor-health/src/main/java/doctor/model/TradeCloseModel.java b/doctor-modules/doctor-health/src/main/java/doctor/model/TradeCloseModel.java new file mode 100644 index 0000000..61fa557 --- /dev/null +++ b/doctor-modules/doctor-health/src/main/java/doctor/model/TradeCloseModel.java @@ -0,0 +1,34 @@ +package doctor.model; + +import com.alibaba.fastjson.JSONObject; +import com.alibaba.fastjson.annotation.JSONField; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +/** + * 交易关闭 + */ +@Data +@AllArgsConstructor +@NoArgsConstructor +@Builder +public class TradeCloseModel { + /** + * 商户订单号，商户网站订单系统中唯一订单号 + */ + @JSONField(name = "out_trade_no") + private String outTradeNo; + /** + * 支付宝交易号 + */ + @JSONField(name = "trade_no") + private String tradeNo; + + public String toJsonStr(){ + return JSONObject.toJSONString(this); + } + + +} diff --git a/doctor-modules/doctor-health/src/main/java/doctor/model/TradePayModel.java b/doctor-modules/doctor-health/src/main/java/doctor/model/TradePayModel.java new file mode 100644 index 0000000..e8c6648 --- /dev/null +++ b/doctor-modules/doctor-health/src/main/java/doctor/model/TradePayModel.java @@ -0,0 +1,50 @@ +package doctor.model; + +import com.alibaba.fastjson.JSONObject; +import com.alibaba.fastjson.annotation.JSONField; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.math.BigDecimal; + +/** + * 支付模型 + */ +@Data +@AllArgsConstructor +@NoArgsConstructor +@Builder +public class TradePayModel { + + /** + * 商户订单号，商户网站订单系统中唯一订单号 + */ + @JSONField(name = "out_trade_no") + private String outTradeNo; + /** + * 付款金额，必填 + */ + @JSONField(name = "total_amount") + private BigDecimal totalAmount; + /** + * 订单名称 + */ + private String subject; + + /** + * 商品描述，可空 + */ + private String body; + /** + * 商品编码 + */ + @JSONField(name = "product_code") + private String productCode = "FAST_INSTANT_TRADE_PAY"; + + public String toJsonStr() { + return JSONObject.toJSONString(this); + } + +} diff --git a/doctor-modules/doctor-health/src/main/java/doctor/model/TradeQueryModel.java b/doctor-modules/doctor-health/src/main/java/doctor/model/TradeQueryModel.java new file mode 100644 index 0000000..2f4cfc5 --- /dev/null +++ b/doctor-modules/doctor-health/src/main/java/doctor/model/TradeQueryModel.java @@ -0,0 +1,32 @@ +package doctor.model; + +import com.alibaba.fastjson.JSONObject; +import com.alibaba.fastjson.annotation.JSONField; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +/** + * 交易查询 + */ +@Data +@AllArgsConstructor +@NoArgsConstructor +@Builder +public class TradeQueryModel { + /** + * 商户订单号，商户网站订单系统中唯一订单号 + */ + @JSONField(name = "out_trade_no") + private String outTradeNo; + /** + * 支付宝交易号 + */ + @JSONField(name = "trade_no") + private String tradeNo; + + public String toJsonStr(){ + return JSONObject.toJSONString(this); + } +} diff --git a/doctor-modules/doctor-health/src/main/java/doctor/model/TradeRefundModel.java b/doctor-modules/doctor-health/src/main/java/doctor/model/TradeRefundModel.java new file mode 100644 index 0000000..0f81911 --- /dev/null +++ b/doctor-modules/doctor-health/src/main/java/doctor/model/TradeRefundModel.java @@ -0,0 +1,47 @@ +package doctor.model; + +import com.alibaba.fastjson.JSONObject; +import com.alibaba.fastjson.annotation.JSONField; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +/** + * 退款 + */ +@Data +@AllArgsConstructor +@NoArgsConstructor +@Builder +public class TradeRefundModel { + /** + * 商户订单号 + */ + @JSONField(name = "out_trade_no") + private String outTradeNo; + /** + * 支付宝交易号 + */ + @JSONField(name = "trade_no") + private String tradeNo; + /** + * 退款金额 + */ + @JSONField(name = "refund_amount") + private String refundAmount; + /** + * 退款原因 + */ + @JSONField(name = "refund_reason") + private String refundReason; + /** + * 商户退款请求号 + */ + @JSONField(name = "out_request_no") + private String outRequestNo; + + public String toJsonStr(){ + return JSONObject.toJSONString(this); + } +} diff --git a/doctor-modules/doctor-health/src/main/java/doctor/model/TradeRefundQueryModel.java b/doctor-modules/doctor-health/src/main/java/doctor/model/TradeRefundQueryModel.java new file mode 100644 index 0000000..5152ec4 --- /dev/null +++ b/doctor-modules/doctor-health/src/main/java/doctor/model/TradeRefundQueryModel.java @@ -0,0 +1,40 @@ +package doctor.model; + +import com.alibaba.fastjson.JSONObject; +import com.alibaba.fastjson.annotation.JSONField; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +/** + * 退款查询 + */ +@Data +@AllArgsConstructor +@NoArgsConstructor +@Builder +public class TradeRefundQueryModel { + /** + * 商户订单号，商户网站订单系统中唯一订单号 + */ + @JSONField(name = "out_trade_no") + private String outTradeNo; + /** + //支付宝交易号 + * + */ + @JSONField(name = "trade_no") + private String tradeNo; + //请二选一设置 + /** + * 请求退款接口时，传入的退款请求号，如果在退款请求时未传入，则该值为创建交易时的外部交易号，必填 + */ + @JSONField(name = "out_request_no") + private String outRequestNo; + + public String toJsonStr(){ + return JSONObject.toJSONString(this); + } + +} diff --git a/doctor-modules/doctor-health/src/main/java/doctor/service/DoctorService.java b/doctor-modules/doctor-health/src/main/java/doctor/service/DoctorService.java index 8c65c46..9ff185e 100644 --- a/doctor-modules/doctor-health/src/main/java/doctor/service/DoctorService.java +++ b/doctor-modules/doctor-health/src/main/java/doctor/service/DoctorService.java @@ -1,6 +1,7 @@ package doctor.service; import doctor.domain.entity.DoctorEntity; +import doctor.domain.vo.DoctorVo; import java.util.List; @@ -11,5 +12,5 @@ import java.util.List; * @CreateTime: 2024/1/15 11:32 */ public interface DoctorService { - List findDoctorList(Integer deptId); + List findDoctorList(Integer deptId, Integer condition, Integer sortBy); } diff --git a/doctor-modules/doctor-health/src/main/java/doctor/service/HealthJobTitleService.java b/doctor-modules/doctor-health/src/main/java/doctor/service/HealthJobTitleService.java index e810d5f..c306438 100644 --- a/doctor-modules/doctor-health/src/main/java/doctor/service/HealthJobTitleService.java +++ b/doctor-modules/doctor-health/src/main/java/doctor/service/HealthJobTitleService.java @@ -1,6 +1,7 @@ package doctor.service; import doctor.common.core.domain.HealthR; +import doctor.controller.HealthRVerifyController; import doctor.domain.dto.ApplyJoinDto; import doctor.domain.entity.DoctorJobTitleEntity; import doctor.domain.vo.*; @@ -32,4 +33,10 @@ public interface HealthJobTitleService { HealthR> findHistoryInquiryRecord(Integer page, Integer size); List findDoctorNoticeReadNum(Integer doctorId); + + List findMyAdoptedCommentList(Integer doctorId, Integer page, Integer count); + + List findDoctorSystemNoticeList(Integer page, Integer count); + + void upImagePicByDoctorId(String imagePic, Integer doctorId); } diff --git a/doctor-modules/doctor-health/src/main/java/doctor/service/InquiryVerifyService.java b/doctor-modules/doctor-health/src/main/java/doctor/service/InquiryVerifyService.java index 1f0c886..436b0ba 100644 --- a/doctor-modules/doctor-health/src/main/java/doctor/service/InquiryVerifyService.java +++ b/doctor-modules/doctor-health/src/main/java/doctor/service/InquiryVerifyService.java @@ -1,6 +1,7 @@ package doctor.service; import doctor.common.core.domain.HealthR; +import doctor.domain.vo.HistoryInquiryRecordVo; import doctor.domain.vo.InquiryRecordVo; import java.util.List; @@ -8,4 +9,5 @@ import java.util.List; public interface InquiryVerifyService { List findInquiryRecordList(); + List findHistoryInquiryRecord(Integer page, Integer count, Integer doctorId); } diff --git a/doctor-modules/doctor-health/src/main/java/doctor/service/PatientService.java b/doctor-modules/doctor-health/src/main/java/doctor/service/PatientService.java index 1af179c..3111e75 100644 --- a/doctor-modules/doctor-health/src/main/java/doctor/service/PatientService.java +++ b/doctor-modules/doctor-health/src/main/java/doctor/service/PatientService.java @@ -5,7 +5,6 @@ import doctor.common.core.domain.HealthR; import doctor.domain.entity.SickCircleEntity; import doctor.domain.entity.SickCommentEntity; import doctor.domain.entity.SymptomEntity; -import org.apache.ibatis.annotations.Param; import java.util.List; @@ -30,15 +29,13 @@ public interface PatientService { - HealthR> sickCircleList(@Param("departmentId") Integer departmentId); + HealthR> sickCircleList(Integer departmentId, Integer page, Integer count); - HealthR> findSickCircleCommentList(@Param("sickCircleId") Integer sickCircleId); + HealthR> findSickCircleCommentList(Integer sickCircleId); HealthR> searchSickCircle(String keyWord); - HealthR> findPatientSickCircleList(Integer patientUserId); - } diff --git a/doctor-modules/doctor-health/src/main/java/doctor/service/UserSickCircleService.java b/doctor-modules/doctor-health/src/main/java/doctor/service/UserSickCircleService.java index ea24211..deb7005 100644 --- a/doctor-modules/doctor-health/src/main/java/doctor/service/UserSickCircleService.java +++ b/doctor-modules/doctor-health/src/main/java/doctor/service/UserSickCircleService.java @@ -1,5 +1,6 @@ package doctor.service; +import doctor.domain.vo.SickCircleCommentVo; import doctor.domain.vo.UserSickCircleVo; import java.util.List; @@ -13,4 +14,6 @@ import java.util.List; public interface UserSickCircleService { List findMySickCircleList(); + + } 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 a61b36e..4141e06 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 @@ -1,10 +1,14 @@ package doctor.service; +import com.alipay.api.AlipayApiException; +import doctor.common.core.domain.HealthR; import doctor.domain.dto.UserArchivesDto; import doctor.domain.entity.*; import doctor.domain.vo.*; import org.springframework.web.bind.annotation.RequestHeader; +import org.springframework.web.multipart.MultipartFile; +import java.math.BigDecimal; import java.util.List; /** @@ -22,7 +26,7 @@ public interface UserVideoService { void deleteVideoBuy(Integer videoId); - List findUserWallet(Integer userId); + List findVideoCollectionList(Integer userId); @@ -40,7 +44,7 @@ public interface UserVideoService { void addUserArchives(UserArchivesEntity userArchivesEntity, Integer userId); - void uploadUserArchivesImg(Integer id); + List findUserDoctorFollowList(); @@ -57,4 +61,25 @@ public interface UserVideoService { void updateUserSex(Integer sex, Integer userId); void modifyNickName(String nickName, Integer userId); + + List findSystemNoticeList(); + + List findInquiryNoticeList(Integer userId); + + List findHealthyCurrencyNoticeList(Integer userId); + + List findUserNoticeReadNum(Integer userId); + + void modifyAllStatus(Integer userId); + + + HealthR uploadUserArchivesImg(MultipartFile imagePic, String sessionId, Integer id); + + String Pay(BigDecimal money,Integer userId); + + Integer findUserWallet(Integer userId); + + + void drawCash(Integer userId, BigDecimal money); + List findSickCircleCommentList(Integer userId); } diff --git a/doctor-modules/doctor-health/src/main/java/doctor/service/impl/DoctorServiceimpl.java b/doctor-modules/doctor-health/src/main/java/doctor/service/impl/DoctorServiceimpl.java index cd5181f..c188bd8 100644 --- a/doctor-modules/doctor-health/src/main/java/doctor/service/impl/DoctorServiceimpl.java +++ b/doctor-modules/doctor-health/src/main/java/doctor/service/impl/DoctorServiceimpl.java @@ -1,11 +1,17 @@ package doctor.service.impl; +import doctor.convert.DoctorConvert; +import doctor.domain.entity.DoctorCharge; +import doctor.domain.entity.DoctorCommentCount; import doctor.domain.entity.DoctorEntity; +import doctor.domain.vo.DoctorVo; import doctor.mapper.DoctorMapper; import doctor.service.DoctorService; +import doctor.system.api.domain.Doctor; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.util.ArrayList; import java.util.List; /** @@ -19,8 +25,33 @@ public class DoctorServiceimpl implements DoctorService { @Autowired private DoctorMapper doctorMapper; + @Override - public List findDoctorList(Integer deptId) { - return doctorMapper.findDoctorList(deptId); + public List findDoctorList(Integer deptId, Integer condition, Integer sortBy) { + List doctorEntities=doctorMapper.findDoctorList(deptId);//获取指定部门的医生实体列表 +// List doctorVos=new ArrayList<>(); +// for (DoctorEntity doctorEntity : doctorVoList) { +// DoctorVo doctorVo = new DoctorVo(); +// DoctorCharge doctorCharge = doctorMapper.doctorCharge(doctorEntity.getId()); // 获医生的收费信 +// doctorVo.setServicePrice(doctorCharge.getCost()); // 设置医生的收费价格 +// doctorVo.setDoctorId(doctorEntity.getId()); +// doctorVo.setDoctorName(doctorEntity.getName()); +// doctorVo.setDoctorName(doctorVo.getDoctorName()); +// doctorVo.setImagePic(doctorVo.getImagePic()); +// doctorVo.setJobTitle(doctorEntity.getJobTitle()); +// doctorVo.setInauguralHospital(doctorVo.getInauguralHospital()); +// DoctorCommentCount doctored=doctorMapper.doctorCommentCount(doctorEntity.getId()); +// doctorVo.setPraiseNum(doctored.getPraiseNum()); +// doctorVo.setCommentNum(doctored.getPraiseNum()+doctored.getBadNum()); +// doctorVo.setBadNum(doctored.getBadNum()); +// doctorVo.setPraise(doctorVo.getPraiseNum()/doctorVo.getCommentNum()); +// +// +// +// } + + List doctorVos= DoctorConvert.INSTANCE.doctorEntityListToDoctorVoList(doctorEntities); + + return doctorVos; } } diff --git a/doctor-modules/doctor-health/src/main/java/doctor/service/impl/HealthJobTitleServiceImpl.java b/doctor-modules/doctor-health/src/main/java/doctor/service/impl/HealthJobTitleServiceImpl.java index 4a305c7..cc14fe2 100644 --- a/doctor-modules/doctor-health/src/main/java/doctor/service/impl/HealthJobTitleServiceImpl.java +++ b/doctor-modules/doctor-health/src/main/java/doctor/service/impl/HealthJobTitleServiceImpl.java @@ -3,11 +3,9 @@ package doctor.service.impl; import doctor.common.core.domain.HealthR; import doctor.common.core.web.controller.BaseController; import doctor.common.security.service.TokenService; +import doctor.controller.HealthRVerifyController; import doctor.domain.dto.ApplyJoinDto; -import doctor.domain.entity.DoctorIncomeRecordEntity; -import doctor.domain.entity.DoctorJobTitleEntity; -import doctor.domain.entity.DoctorWalletEntity; -import doctor.domain.entity.doctorSystemNoticeEntity; +import doctor.domain.entity.*; import doctor.domain.vo.*; import doctor.mapper.HealthJobTitleMapper; import doctor.service.HealthJobTitleService; @@ -88,7 +86,7 @@ public class HealthJobTitleServiceImpl extends BaseController implements HealthJ } Integer integer = redisTemplate.opsForValue().get(applyJoinDto.getEmail()); if (!String.valueOf(integer).equals(applyJoinDto.getCode())){ - return HealthR.fail("验车码错误"); + return HealthR.fail("验证码码错误"); } Doctor doctor = new Doctor(); BeanUtils.copyProperties(applyJoinDto,doctor); @@ -199,4 +197,28 @@ public class HealthJobTitleServiceImpl extends BaseController implements HealthJ } return noticeReadNumVos; } + + @Override + public List findMyAdoptedCommentList(Integer doctorId, Integer page, Integer count) { + startPage(page,count); + return null; + } + + @Override + public List findDoctorSystemNoticeList(Integer page, Integer count) { + startPage(page,count); + List doctorSystemNoticeList = healthJobTitleMapper.findDoctorSystemNoticeList(); + ArrayList doctorSystemNoticeListVos = new ArrayList<>(); + for (DoctorSystemReplyEntity doctorSystemReplyEntity : doctorSystemNoticeList) { + DoctorSystemNoticeListVo doctorSystemNoticeListVo = new DoctorSystemNoticeListVo(); + BeanUtils.copyProperties(doctorSystemReplyEntity,doctorSystemNoticeListVo); + doctorSystemNoticeListVos.add(doctorSystemNoticeListVo); + } + return doctorSystemNoticeListVos; + } + + @Override + public void upImagePicByDoctorId(String imagePic, Integer doctorId) { + healthJobTitleMapper.upImagePicByDoctorId(doctorId,imagePic); + } } 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 e206164..960fa70 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,16 +1,21 @@ package doctor.service.impl; -import doctor.domain.entity.InquiryDetailsRecordEntity; +import doctor.common.security.utils.SecurityUtils; +import doctor.domain.entity.*; import doctor.domain.vo.DoctorVo; import doctor.domain.vo.InquiryDetailsRecordVo; import doctor.mapper.InquiryMapper; import doctor.service.InquiryService; +import doctor.system.api.domain.Doctor; +import doctor.system.api.model.LoginUser; import doctor.util.ConvertUtil; import doctor.util.RSAUtils; import doctor.util.RsaKey; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.sql.Timestamp; +import java.util.Date; import java.util.List; /** @@ -32,17 +37,22 @@ public class InquiryServiceImpl implements InquiryService { @Override public DoctorVo findDoctorInfo(Integer doctorId) { +// DoctorCharge doctorCharge=inquiryMapper.doctorCharge(doctorId); +// DoctorCommentCount doctorCommentCount=inquiryMapper.doctorCommentCount(doctorId); + return inquiryMapper.findDoctorInfo(doctorId); + - return null; } @Override public String consultDoctor(Integer userId, Integer doctorId) { inquiryMapper.consultDoctor(userId,doctorId); - String doctorUserName = inquiryMapper.findDoctorUserNameByDoctorId(doctorId); + String doctorUserName1 = inquiryMapper.findDoctorUserNameByDoctorId(doctorId); try { - String s = RSAUtils.rsaDecrypt(doctorUserName, RsaKey.PUBLIC_KEY); - return s; + List strings = RSAUtils.rsaEncrypt(doctorUserName1, RsaKey.PUBLIC_KEY); + String doctorUserName = strings.get(0); + System.out.println("==============="+doctorUserName); + return doctorUserName; } catch (Exception e) { throw new RuntimeException(e); } @@ -50,16 +60,61 @@ public class InquiryServiceImpl implements InquiryService { @Override public void followDoctor(Integer userId, Integer doctorId) { + if (doctorId==0){ + throw new RuntimeException("医生Id不能为空"); + }else { + UserDoctorFollowEntity userDoctorFollowEntity = new UserDoctorFollowEntity(); + LoginUser loginUser= SecurityUtils.getLoginUser(); + Long userid = loginUser.getUserid(); + userDoctorFollowEntity.setUserId(userid); + userDoctorFollowEntity.setDoctorId(doctorId); + userDoctorFollowEntity.setCreateTime(new Date()); + inquiryMapper.followDoctor(userDoctorFollowEntity); + } } + //取消关注 @Override public void cancelFollow(Integer userId, Integer doctorId) { - + LoginUser loginUser= SecurityUtils.getLoginUser(); + Long userid=loginUser.getUserid(); + inquiryMapper.delCancelFollow(userid,doctorId); } + //结束问增 @Override public void endInquiry(Integer userId, Integer recordId) { + //检查问诊记录Id是否为空 + if (recordId == 0) { + throw new RuntimeException("问诊记录Id不能为空"); + } + //结束问诊,获取问诊记录信息 + InquiryRecordEntity inquiryRecordEntity = inquiryMapper.findInquiryRecordById(recordId,1); + //结束问诊,修改问诊记录状态 + inquiryMapper.endInquiry(recordId); + if (inquiryRecordEntity==null){ + throw new RuntimeException("没有找到该问诊记录"); + } + //获取医生问诊次数信息 + DoctorAskCount doctorAskCount=inquiryMapper.getDoctorAskCount(inquiryRecordEntity.getDoctorId()); + // 如果医生问诊次数信息为空，表示医生首次问诊，添加新的记录 + if (doctorAskCount==null){ + doctorAskCount = new DoctorAskCount(); + doctorAskCount.setDoctorAskCount(inquiryRecordEntity.getDoctorId()); + doctorAskCount.setNumber(1); + doctorAskCount.setUpdateTime(new Date()); + doctorAskCount.setCreateTime(new Timestamp(new Date().getTime())); + // 添加医生问诊次数记录到数据库 + inquiryMapper.addDoctorAskCount(doctorAskCount); + } + else { + // 如果医生已有问诊次数记录，增加次数并更新信息 + doctorAskCount.setNumber(doctorAskCount.getNumber() + 1); + doctorAskCount.setUpdateTime(new Date()); + // 更新医生问诊次数记录到数据库 + inquiryMapper.updDoctorAskCount(doctorAskCount); + } } } 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 3ae6164..215d384 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 @@ -1,6 +1,7 @@ package doctor.service.impl; import doctor.common.core.web.controller.BaseController; +import doctor.domain.vo.HistoryInquiryRecordVo; import doctor.domain.vo.InquiryRecordVo; import doctor.mapper.InquiryVerifyServiceMapper; import doctor.service.InquiryVerifyService; @@ -16,6 +17,15 @@ public class InquiryVerifyServiceImpl extends BaseController implements InquiryV @Override public List findInquiryRecordList() { - return inquiryVerifyServiceMapper.findInquiryRecordList(); + //TODO 待做 + //inquiryVerifyServiceMapper.findInquiryRecordList(); + return null; + } + + @Override + public List findHistoryInquiryRecord(Integer page, Integer count, Integer doctorId) { + startPage(page,count); + //TODO 待做 + return null; } } diff --git a/doctor-modules/doctor-health/src/main/java/doctor/service/impl/PatientServiceImpl.java b/doctor-modules/doctor-health/src/main/java/doctor/service/impl/PatientServiceImpl.java index fb645d6..166b5ff 100644 --- a/doctor-modules/doctor-health/src/main/java/doctor/service/impl/PatientServiceImpl.java +++ b/doctor-modules/doctor-health/src/main/java/doctor/service/impl/PatientServiceImpl.java @@ -3,6 +3,7 @@ package doctor.service.impl; import com.alibaba.nacos.api.model.v2.Result; import doctor.common.core.constant.TokenConstants; import doctor.common.core.domain.HealthR; +import doctor.common.core.web.controller.BaseController; import doctor.common.security.service.TokenService; import doctor.common.security.utils.SecurityUtils; import doctor.domain.entity.SickCircleEntity; @@ -25,19 +26,20 @@ import java.util.List; */ @Service @Log4j2 -public class PatientServiceImpl implements PatientService { +public class PatientServiceImpl extends BaseController implements PatientService { @Autowired private PatientMapper patientMapper; @Override - public HealthR> sickCircleList(Integer departmentId) { + public HealthR> sickCircleList(Integer departmentId, Integer page, Integer count) { /** * 根据科室id获取病人圈列表 * @param departmentId 科室id * @return 病人圈列表 */ + startPage(page,count); List sickCircleEntity = patientMapper.sickCircleList(departmentId); - return HealthR.ok(sickCircleEntity); + return HealthR.ok(sickCircleEntity); } diff --git a/doctor-modules/doctor-health/src/main/java/doctor/service/impl/UserSickCircleServiceImpl.java b/doctor-modules/doctor-health/src/main/java/doctor/service/impl/UserSickCircleServiceImpl.java index 8412cd1..7d11724 100644 --- a/doctor-modules/doctor-health/src/main/java/doctor/service/impl/UserSickCircleServiceImpl.java +++ b/doctor-modules/doctor-health/src/main/java/doctor/service/impl/UserSickCircleServiceImpl.java @@ -1,6 +1,8 @@ package doctor.service.impl; +import doctor.domain.entity.SickCircleCommentEntity; import doctor.domain.entity.UserSickCircleEntity; +import doctor.domain.vo.SickCircleCommentVo; import doctor.domain.vo.UserSickCircleVo; import doctor.mapper.UserSickCircleMapper; import doctor.mapper.UserVideoMapper; @@ -27,4 +29,6 @@ public class UserSickCircleServiceImpl implements UserSickCircleService { List userSickCircleVoList = ConvertUtil.entityToVoList(userSickCircleEntityList, UserSickCircleVo.class); return userSickCircleVoList; } + + } 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 86b9ee4..a9d30b1 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 @@ -1,17 +1,39 @@ package doctor.service.impl; +import com.alipay.api.AlipayApiException; +import com.alipay.api.AlipayClient; +import com.alipay.api.CertAlipayRequest; +import com.alipay.api.DefaultAlipayClient; +import com.alipay.api.domain.AlipayFundTransToaccountTransferModel; +import com.alipay.api.request.AlipayFundTransToaccountTransferRequest; +import com.alipay.api.request.AlipayTradePagePayRequest; +import com.alipay.api.response.AlipayFundTransToaccountTransferResponse; +import com.alipay.api.response.AlipayTradePagePayResponse; +import doctor.AlipayConfigProperties; +import doctor.common.core.domain.HealthR; +import doctor.common.security.service.TokenService; import doctor.domain.dto.UserArchivesDto; import doctor.domain.dto.UserTaskRecordDto; import doctor.domain.entity.*; import doctor.domain.vo.*; import doctor.mapper.UserVideoMapper; +import doctor.model.TradePayModel; import doctor.service.UserVideoService; +import doctor.system.api.domain.Doctor; +import doctor.system.api.model.LoginUser; import doctor.util.ConvertUtil; +import doctor.util.OssUtil; +import lombok.extern.log4j.Log4j2; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.web.bind.annotation.RequestHeader; +import org.springframework.web.multipart.MultipartFile; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.math.BigDecimal; import java.util.List; +import java.util.UUID; /** * @ClassName : UserVideoServiceImpl @@ -20,10 +42,20 @@ import java.util.List; * @Date: 2024-01-10 14:34 */ @Service +@Log4j2 public class UserVideoServiceImpl implements UserVideoService { @Autowired private UserVideoMapper userVideoMapper; + @Autowired + private TokenService tokenService; + + @Autowired + private HttpServletResponse response; + @Autowired + private AlipayConfigProperties alipayConfigProperties; + @Autowired + private AlipayClient alipayClient; @Override public List findVideoCollectionList(Integer userId) { @@ -76,10 +108,6 @@ public class UserVideoServiceImpl implements UserVideoService { userVideoMapper.addUserArchives(userArchivesEntity,userId); } - @Override - public void uploadUserArchivesImg(Integer id) { - userVideoMapper.uploadUserArchivesImg(id); - } @Override public List findUserDoctorFollowList() { @@ -128,6 +156,92 @@ public class UserVideoServiceImpl implements UserVideoService { userVideoMapper.modifyNickName(nickName,userId); } + @Override + public List findSystemNoticeList() { + List systemNoticeEntities=userVideoMapper.findSystemNoticeList(); + return systemNoticeEntities; + } + + @Override + public List findInquiryNoticeList(Integer userId) { + List inquiryRecordEntities=userVideoMapper.findInquiryNoticeList(userId); + List inquiryNoticeVos = ConvertUtil.entityToVoList(inquiryRecordEntities, InquiryNoticeVo.class); + return inquiryNoticeVos; + } + + @Override + public List findHealthyCurrencyNoticeList(Integer userId) { + List healthyCurrencyNoticeEntities=userVideoMapper.findHealthyCurrencyNoticeList(userId); + List healthyCurrencyNoticeListVos = ConvertUtil.entityToVoList(healthyCurrencyNoticeEntities, HealthyCurrencyNoticeListVo.class); + return healthyCurrencyNoticeListVos; + } + + @Override + public List findUserNoticeReadNum(Integer userId) { + List userNoticeReadNumEntities=userVideoMapper.findUserNoticeReadNum(userId); + List userNoticeReadNumVos = ConvertUtil.entityToVoList(userNoticeReadNumEntities, UserNoticeReadNumVo.class); + return userNoticeReadNumVos; + } + + @Override + public void modifyAllStatus(Integer userId) { + userVideoMapper.modifyAllStatus(userId); + } + + @Override + public HealthR uploadUserArchivesImg(MultipartFile imagePic, String sessionId, Integer id) { + String s = OssUtil.uploadMultipartFile(imagePic); + userVideoMapper.uploadUserArchivesImg(id,s); + LoginUser loginUser = tokenService.getLoginUser(sessionId); + Doctor doctor = loginUser.getDoctor(); + doctor.setImagePic(s); + tokenService.createToken(loginUser); + return HealthR.ok(s); + } + + @Override + public String Pay(BigDecimal money,Integer userId) { + // 设置支付宝请求参数 + AlipayTradePagePayRequest alipayRequest = new AlipayTradePagePayRequest(); + + // 设置返回页面的URL，用户支付成功后会跳转到这个URL + alipayRequest.setReturnUrl(alipayConfigProperties.getReturnUrl()); + + // 设置异步通知的URL，支付宝会向这个URL发送支付结果通知 + alipayRequest.setNotifyUrl(alipayConfigProperties.getNotifyUrl()); + + // 构建业务参数，使用TradePayModel封装支付信息 + alipayRequest.setBizContent(TradePayModel.builder() + .outTradeNo(UUID.randomUUID().toString().replaceAll("-", "")) // 生成商户订单号 + .totalAmount(money) // 设置订单总金额 + .subject("H币充值") // 设置订单标题 + .body("APP内虚拟货币") // 设置订单描述 + .productCode("FAST_INSTANT_TRADE_PAY") // 设置产品码，FAST_INSTANT_TRADE_PAY表示快速支付 + .build() + .toJsonStr()); // 将TradePayModel转换为JSON字符串并设置到业务参数 + + try { + // 调用支付宝SDK发起支付请求 + AlipayTradePagePayResponse alipayTradeRefundResponse = alipayClient.pageExecute(alipayRequest); + + // 打印请求成功的日志信息 + log.info("请求成功: {}", alipayTradeRefundResponse); + log.info("请求成功: {}", alipayTradeRefundResponse.getBody()); + + // 设置响应的Content-Type为text/html;charset=UTF-8 + response.setContentType("text/html;charset=UTF-8"); + + //修改金额 + userVideoMapper.updateUserWallet(money,userId); + // 返回支付宝支付页面的HTML代码，用户浏览器将自动跳转到支付宝页面进行支付 + return alipayTradeRefundResponse.getBody(); + + } catch (AlipayApiException e) { + // 处理支付宝API异常，抛出运行时异常 + throw new RuntimeException(e); + } + } + @Override public List findUserVideoBuyList() { @@ -142,9 +256,78 @@ public class UserVideoServiceImpl implements UserVideoService { } @Override - public List findUserWallet(Integer userId) { + public Integer findUserWallet(Integer userId) { return userVideoMapper.findUserWallet(userId); } + @Override + public void drawCash(Integer userId, BigDecimal money) { + AlipayConfigProperties alipayConfigProperties1 = new AlipayConfigProperties(); + //构造client + CertAlipayRequest certAlipayRequest = new CertAlipayRequest(); + // 设置网关地址 + certAlipayRequest.setServerUrl(alipayConfigProperties1.getGatewayUrl()); + //设置应用AppId + certAlipayRequest.setAppId(alipayConfigProperties1.getAppId()); + //设置应用私钥 + certAlipayRequest.setPrivateKey(alipayConfigProperties1.getMerchantPrivateKey()); + + // 设置字符集 + certAlipayRequest.setCharset(alipayConfigProperties1.getCharset()); + // 设置签名类型 + certAlipayRequest.setSignType(alipayConfigProperties1.getSignType()); +// // 设置应用公钥证书路径 +// certAlipayRequest.setCertPath(alipayConfigProperties1.); +// // 设置支付宝公钥证书路径 +// certAlipayRequest.setAlipayPublicCertPath(basePath + AliPayConfig.ALIPAY_CERT_PATH); +// // 设置支付宝根证书路径 +// certAlipayRequest.setRootCertPath(basePath + AliPayConfig.ALIPAY_ROOT_CERT_PATH); + // 构造client + AlipayClient alipayClient = null; + try { + alipayClient = new DefaultAlipayClient(certAlipayRequest); + } catch (AlipayApiException e) { + throw new RuntimeException(e); + } + //请求对象 + AlipayFundTransToaccountTransferRequest request = new AlipayFundTransToaccountTransferRequest(); + // 设置请求参数 + AlipayFundTransToaccountTransferModel model = new AlipayFundTransToaccountTransferModel(); + // 金额 + model.setAmount(String.valueOf(money)); +// // 商户单号 订单id +// model.setOutBizNo(wOrderNumber); + // 收款方支付宝账号 +// model.setPayeeAccount(zfbName); +// // 收款方姓名 +// model.setPayeeRealName(name); + // 收款方账户类型 + model.setPayeeType("ALIPAY_LOGONID"); + // 备注 + model.setRemark("用户提现"); + // 设置请求参数 + request.setBizModel(model); + AlipayFundTransToaccountTransferResponse response = null; + try { + response = alipayClient.certificateExecute(request); + if (response.isSuccess()) { + if ("10000".equals(response.getCode())) { + /** + * 转账成功 这里写自己的业务代码 + * */ + userVideoMapper.updateUserWallet1(money,userId); + } + } + } catch (AlipayApiException e) { + System.out.println("转账失败"); + } + } + + @Override + public List findSickCircleCommentList(Integer userId) { + List sickCircleCommentEntities = userVideoMapper.findSickCircleCommentList(userId); + List sickCircleCommentVos = ConvertUtil.entityToVoList(sickCircleCommentEntities, SickCircleCommentVo.class); + return sickCircleCommentVos; + } } diff --git a/doctor-modules/doctor-health/src/main/resources/bootstrap.yml b/doctor-modules/doctor-health/src/main/resources/bootstrap.yml index 5b5ac25..2d01c2c 100644 --- a/doctor-modules/doctor-health/src/main/resources/bootstrap.yml +++ b/doctor-modules/doctor-health/src/main/resources/bootstrap.yml @@ -29,7 +29,7 @@ spring: host: smtp.qq.com port: 587 username: 3581044601@qq.com - password: bwscqgqpkagjciih + password: jwxhwyxfaznhdaae default-encoding: UTF8 properties: mail: 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 6413b10..453b6f1 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 @@ -5,8 +5,14 @@ + + + + + + + diff --git a/doctor-modules/doctor-health/src/main/resources/mapper/doctor/HealthJobTitleMapper.xml b/doctor-modules/doctor-health/src/main/resources/mapper/doctor/HealthJobTitleMapper.xml index 2b0dcf6..2644b7b 100644 --- a/doctor-modules/doctor-health/src/main/resources/mapper/doctor/HealthJobTitleMapper.xml +++ b/doctor-modules/doctor-health/src/main/resources/mapper/doctor/HealthJobTitleMapper.xml @@ -11,6 +11,9 @@ update doctor set image_pic=#{s} where id=#{doctorId} + + update doctor set image_pic=#{imagePic} where id=#{doctorId} + + 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 c16948d..4b57f80 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 @@ -20,6 +20,25 @@ now() ) + + insert into user_doctor_follow (doctor_id, user_id, create_time)values (#{doctorId}, #{userId}, #{createTime}) + + + insert into doctor_ask_count (doctor_id, number, create_time) + values (#{doctorId}, #{number}, #{createTime}) + + + update inquiry_record set status = 2 where id = #{recordId} + + + update doctor_ask_count + set number = #{number}, + update_time = #{updateTime} + where doctor_id = #{doctorId} + + + delete from user_doctor_follow where doctor_id = #{doctorId} and user_id = #{userId} + + + + 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 4b4c13b..92a7923 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,7 +5,4 @@ - diff --git a/doctor-modules/doctor-health/src/main/resources/mapper/doctor/UserSickCircleMapper.xml b/doctor-modules/doctor-health/src/main/resources/mapper/doctor/UserSickCircleMapper.xml index 6f017c2..c0e4e15 100644 --- a/doctor-modules/doctor-health/src/main/resources/mapper/doctor/UserSickCircleMapper.xml +++ b/doctor-modules/doctor-health/src/main/resources/mapper/doctor/UserSickCircleMapper.xml @@ -8,4 +8,5 @@ select * from user_sick_circle + 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..688acb7 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 @@ -49,7 +49,7 @@ create_time update user_archives - set picture = #{picture} + set picture = #{s} where id=#{id} @@ -69,6 +69,21 @@ weight = #{weight} set nick_name = #{nickName} where id = #{userId} + + update system_notice + set status = 1 + where receive_user_id=#{userId} + + + update user_wallet + set balance = balance + #{money} + where user_id = #{userId} + + + update user_wallet + set balance = balance - #{money} + where user_id = #{userId} + delete from user_video_collection @@ -86,10 +101,10 @@ weight = #{weight} select * from user_video_buy - + + + + + + + + + + + diff --git a/doctor-modules/doctor-job/src/main/resources/bootstrap.yml b/doctor-modules/doctor-job/src/main/resources/bootstrap.yml index 537c5d6..687623f 100644 --- a/doctor-modules/doctor-job/src/main/resources/bootstrap.yml +++ b/doctor-modules/doctor-job/src/main/resources/bootstrap.yml @@ -15,11 +15,11 @@ spring: discovery: # 服务注册地址 server-addr: 101.34.77.101:8848 - namespace: 9de208a6-cb30-41ae-a880-78196c99c050 + namespace: 7e1e997d-5fa4-4f84-9f48-3e0adf830a37 config: # 配置中心地址 server-addr: 101.34.77.101:8848 - namespace: 9de208a6-cb30-41ae-a880-78196c99c050 + namespace: 7e1e997d-5fa4-4f84-9f48-3e0adf830a37 # 配置文件格式 file-extension: yml # 共享配置 diff --git a/doctor-modules/doctor-system/src/main/resources/bootstrap.yml b/doctor-modules/doctor-system/src/main/resources/bootstrap.yml index 8def34f..632b0bd 100644 --- a/doctor-modules/doctor-system/src/main/resources/bootstrap.yml +++ b/doctor-modules/doctor-system/src/main/resources/bootstrap.yml @@ -15,11 +15,11 @@ spring: discovery: # 服务注册地址 server-addr: 101.34.77.101:8848 - namespace: 9de208a6-cb30-41ae-a880-78196c99c050 + namespace: 7e1e997d-5fa4-4f84-9f48-3e0adf830a37 config: # 配置中心地址 server-addr: 101.34.77.101:8848 - namespace: 9de208a6-cb30-41ae-a880-78196c99c050 + namespace: 7e1e997d-5fa4-4f84-9f48-3e0adf830a37 # 配置文件格式 file-extension: yml # 共享配置 diff --git a/doctor-visual/doctor-monitor/src/main/resources/bootstrap.yml b/doctor-visual/doctor-monitor/src/main/resources/bootstrap.yml index 979155f..f378a98 100644 --- a/doctor-visual/doctor-monitor/src/main/resources/bootstrap.yml +++ b/doctor-visual/doctor-monitor/src/main/resources/bootstrap.yml @@ -15,11 +15,11 @@ spring: discovery: # 服务注册地址 server-addr: 101.34.77.101:8848 - namespace: 9de208a6-cb30-41ae-a880-78196c99c050 + namespace: 7e1e997d-5fa4-4f84-9f48-3e0adf830a37 config: # 配置中心地址 server-addr: 101.34.77.101:8848 - namespace: 9de208a6-cb30-41ae-a880-78196c99c050 + namespace: 7e1e997d-5fa4-4f84-9f48-3e0adf830a37 # 配置文件格式 file-extension: yml # 共享配置