From 2e3b5c97180501cb5fa873da948298e7ee9ccbd1 Mon Sep 17 00:00:00 2001 From: ShiSiWei <12764015+ssw_1_0@user.noreply.gitee.com> Date: Fri, 27 Oct 2023 22:24:23 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8C=BB=E7=94=9F=E5=85=A5?= =?UTF-8?q?=E9=A9=BB=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .idea/inspectionProfiles/Project_Default.xml | 9 +++++++++ .../four/system/api/RemoteUserService.java | 9 +++++---- .../com/four/system/api/domain/SysUser.java | 15 +++++++++++++++ .../factory/RemoteUserFallbackFactory.java | 4 ++-- .../factory/RemoteUserFallbackFactory$1.class | Bin 2291 -> 2279 bytes .../factory/RemoteUserFallbackFactory.class | Bin 1519 -> 1519 bytes .../target/four-api-system-3.6.3.jar | Bin 30274 -> 31803 bytes .../target/maven-archiver/pom.properties | 2 +- .../compile/default-compile/createdFiles.lst | 1 + .../compile/default-compile/inputFiles.lst | 1 + 10 files changed, 34 insertions(+), 7 deletions(-) diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml index 8d66637..ee2c34b 100644 --- a/.idea/inspectionProfiles/Project_Default.xml +++ b/.idea/inspectionProfiles/Project_Default.xml @@ -1,5 +1,14 @@ \ No newline at end of file diff --git a/four-api-system/src/main/java/com/four/system/api/RemoteUserService.java b/four-api-system/src/main/java/com/four/system/api/RemoteUserService.java index 36e64fb..314f9c0 100644 --- a/four-api-system/src/main/java/com/four/system/api/RemoteUserService.java +++ b/four-api-system/src/main/java/com/four/system/api/RemoteUserService.java @@ -1,6 +1,6 @@ package com.four.system.api; -import org.apache.ibatis.annotations.Param; +import com.four.common.duck.request.RequestRegistrationInformation; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; @@ -14,6 +14,7 @@ import com.four.system.api.domain.SysUser; import com.four.system.api.factory.RemoteUserFallbackFactory; import com.four.system.api.model.LoginUser; + /** * 用户服务 * @@ -60,12 +61,12 @@ public interface RemoteUserService /** - * 注册用户信息 + * 注册医生的用户信息用户信息 * - * @param sysUser 用户信息 * @param source 请求来源 * @return 结果 */ @PostMapping("/user/healthRegister") - public R healthRegister(@RequestBody SysUser sysUser,@RequestHeader(SecurityConstants.FROM_SOURCE) String source); + + public R healthRegister(@RequestBody SysUser sysUser, @RequestHeader(SecurityConstants.FROM_SOURCE) String source); } diff --git a/four-api-system/src/main/java/com/four/system/api/domain/SysUser.java b/four-api-system/src/main/java/com/four/system/api/domain/SysUser.java index 22a47a0..45ba2e2 100644 --- a/four-api-system/src/main/java/com/four/system/api/domain/SysUser.java +++ b/four-api-system/src/main/java/com/four/system/api/domain/SysUser.java @@ -13,6 +13,7 @@ import com.four.common.core.annotation.Excel.Type; import com.four.common.core.annotation.Excels; import com.four.common.core.web.domain.BaseEntity; import com.four.common.core.xss.Xss; +import org.apache.poi.hpsf.Decimal; /** * 用户对象 sys_user @@ -123,6 +124,20 @@ public class SysUser extends BaseEntity /** 状态1：患者 2：医生 **/ private Integer differentialState; + + + private Long medicalDepartmentId; + private Long professionalTitleDoctorId; + private Integer numberPatientsServed; + private Decimal consultingPrice; + private Integer praise; + private Integer registrationInformationExamineStatus; + private Integer registrationInformationMedicStatus; + + + + + public SysUser(Long userId, Long deptId, String userName, String nickName, String email, String phonenumber, String personalResume, String affiliatedHospital, String areaExpertise, String sex, String avatar, String password, String status, String delFlag, String loginIp, Date loginDate, SysDept dept, List roles, Long[] roleIds, Long[] postIds, Long roleId, String userSign, Integer bindWechatStatus, Integer realNameAuthenticationStatus, Integer bindBankCardStatus, BigDecimal userMoney, String invitationCode, Integer differentialState) { this.userId = userId; this.deptId = deptId; diff --git a/four-api-system/src/main/java/com/four/system/api/factory/RemoteUserFallbackFactory.java b/four-api-system/src/main/java/com/four/system/api/factory/RemoteUserFallbackFactory.java index 666d693..0aa8f56 100644 --- a/four-api-system/src/main/java/com/four/system/api/factory/RemoteUserFallbackFactory.java +++ b/four-api-system/src/main/java/com/four/system/api/factory/RemoteUserFallbackFactory.java @@ -1,5 +1,6 @@ package com.four.system.api.factory; +import com.four.common.duck.request.RequestRegistrationInformation; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.cloud.openfeign.FallbackFactory; @@ -44,9 +45,8 @@ public class RemoteUserFallbackFactory implements FallbackFactory healthRegister(SysUser sysUser, String source) { - return R.fail("注册维度健康用户失败:" + throwable.getMessage()); + return R.fail("医生用户失败:" + throwable.getMessage()); } - }; } diff --git a/four-api-system/target/classes/com/four/system/api/factory/RemoteUserFallbackFactory$1.class b/four-api-system/target/classes/com/four/system/api/factory/RemoteUserFallbackFactory$1.class index 3b36643be2b4c23c0e0af9d890f5e18625ba988e..29ff84b404b963fde72a726b6b3c5412710ccb9a 100644 GIT binary patch delta 62 zcmew?_*`&91rxjQ)1KYWr_A5n%@obTC^PvvTNw)H&Uz2)hyWltNIKHar_b3Icu3#0Vp+iYo!@{^s|3m8=< VZw8WDlc#d%PY&jAWYh<;f&e+C8_xg$ diff --git a/four-api-system/target/classes/com/four/system/api/factory/RemoteUserFallbackFactory.class b/four-api-system/target/classes/com/four/system/api/factory/RemoteUserFallbackFactory.class index 45cb28afbd6e7629e771722ab62f916b41f4731b..c28e6703d57e1c7a599283b013d1c2d140b227f0 100644 GIT binary patch delta 35 rcmaFQ{hoWnV-`l?$xm4PS)~~G7^Ej#u(~q}O>SUyU=*EvkW~)=$%hHi delta 37 tcmaFQ{hoWnW0uMFtUQz7v$(KIGVn1-O}1clXB3>=!0Ny#GWj5@9suvp3fuqy diff --git a/four-api-system/target/four-api-system-3.6.3.jar b/four-api-system/target/four-api-system-3.6.3.jar index 5abd3fd4d6ce07221c5415737b676769c5a6c1e4..bc40f2001b8a794b6629b5cea33e8294651efb15 100644 GIT binary patch delta 4344 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