diff --git a/.idea/compiler.xml b/.idea/compiler.xml index 1aec85a..01f3e42 100644 --- a/.idea/compiler.xml +++ b/.idea/compiler.xml @@ -2,6 +2,7 @@ + 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 314f9c0..7961952 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 @@ -48,13 +48,11 @@ public interface RemoteUserService public R getUserInfo(@PathVariable("userName") String userName, @RequestHeader(SecurityConstants.FROM_SOURCE) String source); - - /** + /*** * 注册用户信息 - * - * @param sysUser 用户信息 - * @param source 请求来源 - * @return 结果 + * @param sysUser + * @param source + * @return */ @PostMapping("/user/register") public R registerUserInfo(@RequestBody SysUser sysUser, @RequestHeader(SecurityConstants.FROM_SOURCE) String source); @@ -69,4 +67,12 @@ public interface RemoteUserService @PostMapping("/user/healthRegister") public R healthRegister(@RequestBody SysUser sysUser, @RequestHeader(SecurityConstants.FROM_SOURCE) String source); + + + /*** + * 注册患者到用户信息 + */ + @PostMapping("/user/PatientRegisterBody") + public R PatientRegisterBody(@RequestBody SysUser sysUser,@RequestHeader(SecurityConstants.FROM_SOURCE) String source); + } diff --git a/four-api-system/src/main/java/com/four/system/api/domain/registrationInformation.java b/four-api-system/src/main/java/com/four/system/api/domain/registrationInformation.java index 6e1b86b..6d55fe4 100644 --- a/four-api-system/src/main/java/com/four/system/api/domain/registrationInformation.java +++ b/four-api-system/src/main/java/com/four/system/api/domain/registrationInformation.java @@ -1,6 +1,7 @@ package com.four.system.api.domain; import com.four.system.api.model.LoginUser; +import org.apache.poi.hpsf.Decimal; import java.util.Date; @@ -8,40 +9,176 @@ import java.util.Date; * 医生信息表 * */ public class registrationInformation { - private Long registrationInformationId; - private Long userId; - private String realName; - private String affiliatedHospital; - private Long medicalDepartmentId; - private Long professionalTitleDoctorId; - private String personalResume; - private String areaExpertise; - private Date registrationTime; - private Long numberPatientsServed; - private Double consultingPrice; - private Integer praise; - private Integer registrationInformationExamineStatus; - private Integer registrationInformationMedicStatus; + /** + * 医生注册信息id + */ + private Long registrationInformationId; + /** + * 用户id + */ + private Long userId; + /** + * 所属医院 + */ + private String affiliatedHospital; + /** + * 医生科室id + */ + private Long medicalDepartmentId; + /** + * 医生职称id + */ + private Long professionalTitleDoctorId; + /** + * 个人简历 + */ + private String personalResume; + /** + * 擅长领域 + */ + private String areaExpertise; + /** + * 服务患者次数 + */ + private Integer numberPatientsServed; + /** + * 咨询价格 + */ + private Decimal consultingPrice; + /** + * 好评人数 + */ + private Integer praise; + /** + * 审核状态：1：待审核2：审核通过3：已驳回 + */ + private Integer registrationInformationExamineStatus; - public registrationInformation(Long registrationInformationId, Long userId, String realName, String affiliatedHospital, Long medicalDepartmentId, Long professionalTitleDoctorId, String personalResume, String areaExpertise, Date registrationTime, Long numberPatientsServed, Double consultingPrice, Integer praise, Integer registrationInformationExamineStatus, Integer registrationInformationMedicStatus) { + /** + * 部门ID + */ + private Long deptId; + /** + * 用户账号 + */ + private String userName; + /** + * 用户昵称 + */ + private String nickName; + /** + * 用户类型（00系统用户） + */ + private String userType; + /** + * 用户邮箱 + */ + private String email; + /** + * 手机号码 + */ + private String phonenumber; + /** + * 用户性别（0男 1女 2未知） + */ + private String sex; + /** + * 头像地址 + */ + private String avatar; + /** + * 密码 + */ + private String password; + /** + * 帐号状态（0正常 1停用） + */ + private String status; + /** + * 删除标志（0代表存在 2代表删除） + */ + private String delFlag; + /** + * 最后登录IP + */ + private String loginIp; + /** + * 创建者 + */ + private String createBy; + /** + * 备注 + */ + private String remark; + /** + * 更新者 + */ + private String updateBy; + /** + * 体征 + */ + private String userSign; + /** + * 绑定微信状态 1：未绑定 2：已绑定 + */ + private Integer bindWechatStatus; + /** + * 实名认证状态 1：未绑定 2：已绑定 + */ + private Integer realNameAuthenticationStatus; + /** + * 绑定银行卡状态 1：未绑定 2：已绑定 + */ + private Integer bindBankCardStatus; + /** + * 余额 + */ + private Decimal userMoney; + /** + * 邀请码 + */ + private String invitationCode; + /** + * 状态1：患者 2：医生 + */ + private Integer differentialState; + + + public registrationInformation(Long registrationInformationId, Long userId, String affiliatedHospital, Long medicalDepartmentId, Long professionalTitleDoctorId, String personalResume, String areaExpertise, Integer numberPatientsServed, Decimal consultingPrice, Integer praise, Integer registrationInformationExamineStatus, Long deptId, String userName, String nickName, String userType, String email, String phonenumber, String sex, String avatar, String password, String status, String delFlag, String loginIp, String createBy, String remark, String updateBy, String userSign, Integer bindWechatStatus, Integer realNameAuthenticationStatus, Integer bindBankCardStatus, Decimal userMoney, String invitationCode, Integer differentialState) { this.registrationInformationId = registrationInformationId; this.userId = userId; - this.realName = realName; this.affiliatedHospital = affiliatedHospital; this.medicalDepartmentId = medicalDepartmentId; this.professionalTitleDoctorId = professionalTitleDoctorId; this.personalResume = personalResume; this.areaExpertise = areaExpertise; - this.registrationTime = registrationTime; this.numberPatientsServed = numberPatientsServed; this.consultingPrice = consultingPrice; this.praise = praise; this.registrationInformationExamineStatus = registrationInformationExamineStatus; - this.registrationInformationMedicStatus = registrationInformationMedicStatus; - } - - public registrationInformation() { + this.deptId = deptId; + this.userName = userName; + this.nickName = nickName; + this.userType = userType; + this.email = email; + this.phonenumber = phonenumber; + this.sex = sex; + this.avatar = avatar; + this.password = password; + this.status = status; + this.delFlag = delFlag; + this.loginIp = loginIp; + this.createBy = createBy; + this.remark = remark; + this.updateBy = updateBy; + this.userSign = userSign; + this.bindWechatStatus = bindWechatStatus; + this.realNameAuthenticationStatus = realNameAuthenticationStatus; + this.bindBankCardStatus = bindBankCardStatus; + this.userMoney = userMoney; + this.invitationCode = invitationCode; + this.differentialState = differentialState; } public Long getRegistrationInformationId() { @@ -60,14 +197,6 @@ public class registrationInformation { this.userId = userId; } - public String getRealName() { - return realName; - } - - public void setRealName(String realName) { - this.realName = realName; - } - public String getAffiliatedHospital() { return affiliatedHospital; } @@ -108,27 +237,19 @@ public class registrationInformation { this.areaExpertise = areaExpertise; } - public Date getRegistrationTime() { - return registrationTime; - } - - public void setRegistrationTime(Date registrationTime) { - this.registrationTime = registrationTime; - } - - public Long getNumberPatientsServed() { + public Integer getNumberPatientsServed() { return numberPatientsServed; } - public void setNumberPatientsServed(Long numberPatientsServed) { + public void setNumberPatientsServed(Integer numberPatientsServed) { this.numberPatientsServed = numberPatientsServed; } - public Double getConsultingPrice() { + public Decimal getConsultingPrice() { return consultingPrice; } - public void setConsultingPrice(Double consultingPrice) { + public void setConsultingPrice(Decimal consultingPrice) { this.consultingPrice = consultingPrice; } @@ -148,12 +269,183 @@ public class registrationInformation { this.registrationInformationExamineStatus = registrationInformationExamineStatus; } - public Integer getRegistrationInformationMedicStatus() { - return registrationInformationMedicStatus; + public Long getDeptId() { + return deptId; } - public void setRegistrationInformationMedicStatus(Integer registrationInformationMedicStatus) { - this.registrationInformationMedicStatus = registrationInformationMedicStatus; + public void setDeptId(Long deptId) { + this.deptId = deptId; + } + + public String getUserName() { + return userName; + } + + public void setUserName(String userName) { + this.userName = userName; + } + + public String getNickName() { + return nickName; + } + + public void setNickName(String nickName) { + this.nickName = nickName; + } + + public String getUserType() { + return userType; + } + + public void setUserType(String userType) { + this.userType = userType; + } + + public String getEmail() { + return email; + } + + public void setEmail(String email) { + this.email = email; + } + + public String getPhonenumber() { + return phonenumber; + } + + public void setPhonenumber(String phonenumber) { + this.phonenumber = phonenumber; + } + + public String getSex() { + return sex; + } + + public void setSex(String sex) { + this.sex = sex; + } + + public String getAvatar() { + return avatar; + } + + public void setAvatar(String avatar) { + this.avatar = avatar; + } + + public String getPassword() { + return password; + } + + public void setPassword(String password) { + this.password = password; + } + + public String getStatus() { + return status; + } + + public void setStatus(String status) { + this.status = status; + } + + public String getDelFlag() { + return delFlag; + } + + public void setDelFlag(String delFlag) { + this.delFlag = delFlag; + } + + public String getLoginIp() { + return loginIp; + } + + public void setLoginIp(String loginIp) { + this.loginIp = loginIp; + } + + public String getCreateBy() { + return createBy; + } + + public void setCreateBy(String createBy) { + this.createBy = createBy; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getUpdateBy() { + return updateBy; + } + + public void setUpdateBy(String updateBy) { + this.updateBy = updateBy; + } + + public String getUserSign() { + return userSign; + } + + public void setUserSign(String userSign) { + this.userSign = userSign; + } + + public Integer getBindWechatStatus() { + return bindWechatStatus; + } + + public void setBindWechatStatus(Integer bindWechatStatus) { + this.bindWechatStatus = bindWechatStatus; + } + + public Integer getRealNameAuthenticationStatus() { + return realNameAuthenticationStatus; + } + + public void setRealNameAuthenticationStatus(Integer realNameAuthenticationStatus) { + this.realNameAuthenticationStatus = realNameAuthenticationStatus; + } + + public Integer getBindBankCardStatus() { + return bindBankCardStatus; + } + + public void setBindBankCardStatus(Integer bindBankCardStatus) { + this.bindBankCardStatus = bindBankCardStatus; + } + + public Decimal getUserMoney() { + return userMoney; + } + + public void setUserMoney(Decimal userMoney) { + this.userMoney = userMoney; + } + + public String getInvitationCode() { + return invitationCode; + } + + public void setInvitationCode(String invitationCode) { + this.invitationCode = invitationCode; + } + + public Integer getDifferentialState() { + return differentialState; + } + + public void setDifferentialState(Integer differentialState) { + this.differentialState = differentialState; + } + + public registrationInformation() { } @Override @@ -161,18 +453,37 @@ public class registrationInformation { return "registrationInformation{" + "registrationInformationId=" + registrationInformationId + ", userId=" + userId + - ", realName='" + realName + '\'' + ", affiliatedHospital='" + affiliatedHospital + '\'' + ", medicalDepartmentId=" + medicalDepartmentId + ", professionalTitleDoctorId=" + professionalTitleDoctorId + ", personalResume='" + personalResume + '\'' + ", areaExpertise='" + areaExpertise + '\'' + - ", registrationTime=" + registrationTime + ", numberPatientsServed=" + numberPatientsServed + ", consultingPrice=" + consultingPrice + ", praise=" + praise + ", registrationInformationExamineStatus=" + registrationInformationExamineStatus + - ", registrationInformationMedicStatus=" + registrationInformationMedicStatus + + ", deptId=" + deptId + + ", userName='" + userName + '\'' + + ", nickName='" + nickName + '\'' + + ", userType='" + userType + '\'' + + ", email='" + email + '\'' + + ", phonenumber='" + phonenumber + '\'' + + ", sex='" + sex + '\'' + + ", avatar='" + avatar + '\'' + + ", password='" + password + '\'' + + ", status='" + status + '\'' + + ", delFlag='" + delFlag + '\'' + + ", loginIp='" + loginIp + '\'' + + ", createBy='" + createBy + '\'' + + ", remark='" + remark + '\'' + + ", updateBy='" + updateBy + '\'' + + ", userSign='" + userSign + '\'' + + ", bindWechatStatus=" + bindWechatStatus + + ", realNameAuthenticationStatus=" + realNameAuthenticationStatus + + ", bindBankCardStatus=" + bindBankCardStatus + + ", userMoney=" + userMoney + + ", invitationCode='" + invitationCode + '\'' + + ", differentialState=" + differentialState + '}'; } } 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 0aa8f56..78dc176 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 @@ -27,26 +27,63 @@ public class RemoteUserFallbackFactory implements FallbackFactory getUserInfoByEmail(String email, String source) { return R.fail("获取用户信息失败："+ throwable.getMessage()); } + /*** + * 查询用户信息 + * @param userName 用户名 + * @param source 请求来源 + * @return + */ @Override public R getUserInfo(String userName,String source){ return R.fail("获取用户失败:"+throwable.getMessage()); } + /*** + * 欧通用户注册 + * @param sysUser + * @param source + * @return + */ @Override public R registerUserInfo(SysUser sysUser, String source) { return R.fail("注册用户失败:" + throwable.getMessage()); } + /*** + * 医生注册 + * @param sysUser + * @param source 请求来源 + * @return + */ @Override public R healthRegister(SysUser sysUser, String source) { return R.fail("医生用户失败:" + throwable.getMessage()); } + + /*** + * 用户注册 + * @param sysUser + * @param source + * @return + */ + @Override + public R PatientRegisterBody(SysUser sysUser, String source) { + return R.fail("患者用户失败：" + throwable.getMessage()); + } + }; } diff --git a/four-api-system/target/classes/com/four/system/api/RemoteUserService.class b/four-api-system/target/classes/com/four/system/api/RemoteUserService.class index 8152eec..4fe3a7d 100644 Binary files a/four-api-system/target/classes/com/four/system/api/RemoteUserService.class and b/four-api-system/target/classes/com/four/system/api/RemoteUserService.class differ diff --git a/four-api-system/target/classes/com/four/system/api/domain/RequestRegistrationInformation.class b/four-api-system/target/classes/com/four/system/api/domain/RequestRegistrationInformation.class deleted file mode 100644 index d0d670e..0000000 Binary files a/four-api-system/target/classes/com/four/system/api/domain/RequestRegistrationInformation.class and /dev/null differ diff --git a/four-api-system/target/classes/com/four/system/api/domain/SysUser.class b/four-api-system/target/classes/com/four/system/api/domain/SysUser.class index 4771ec1..a2de29d 100644 Binary files a/four-api-system/target/classes/com/four/system/api/domain/SysUser.class and b/four-api-system/target/classes/com/four/system/api/domain/SysUser.class differ diff --git a/four-api-system/target/classes/com/four/system/api/domain/registrationInformation.class b/four-api-system/target/classes/com/four/system/api/domain/registrationInformation.class index 95a912c..6ecffe1 100644 Binary files a/four-api-system/target/classes/com/four/system/api/domain/registrationInformation.class and b/four-api-system/target/classes/com/four/system/api/domain/registrationInformation.class differ 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 29ff84b..65291b8 100644 Binary files a/four-api-system/target/classes/com/four/system/api/factory/RemoteUserFallbackFactory$1.class and b/four-api-system/target/classes/com/four/system/api/factory/RemoteUserFallbackFactory$1.class differ 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 bc40f20..44d0d84 100644 Binary files a/four-api-system/target/four-api-system-3.6.3.jar and b/four-api-system/target/four-api-system-3.6.3.jar differ diff --git a/four-api-system/target/maven-archiver/pom.properties b/four-api-system/target/maven-archiver/pom.properties index af8518e..ea95b85 100644 --- a/four-api-system/target/maven-archiver/pom.properties +++ b/four-api-system/target/maven-archiver/pom.properties @@ -1,5 +1,5 @@ #Generated by Maven -#Fri Oct 27 19:38:37 CST 2023 +#Tue Oct 31 20:35:17 CST 2023 groupId=com.four artifactId=four-api-system version=3.6.3 diff --git a/four-api-system/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst b/four-api-system/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst index 9073f46..2ace286 100644 --- a/four-api-system/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst +++ b/four-api-system/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst @@ -3,7 +3,6 @@ com\four\system\api\factory\RemoteLogFallbackFactory$1.class com\four\system\api\domain\SysDictData.class com\four\system\api\domain\SysFile.class com\four\system\api\factory\RemoteFileFallbackFactory$1.class -com\four\system\api\domain\RequestRegistrationInformation.class com\four\system\api\domain\registrationInformation.class com\four\system\api\factory\RemoteFileFallbackFactory.class com\four\system\api\RemoteLogService.class diff --git a/four-api-system/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst b/four-api-system/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst index 5516f7e..7857a8e 100644 --- a/four-api-system/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst +++ b/four-api-system/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst @@ -13,5 +13,4 @@ D:\hospital\api-system\four-api-system\src\main\java\com\four\system\api\domain\ D:\hospital\api-system\four-api-system\src\main\java\com\four\system\api\domain\SysDept.java D:\hospital\api-system\four-api-system\src\main\java\com\four\system\api\domain\SysUser.java D:\hospital\api-system\four-api-system\src\main\java\com\four\system\api\RemoteLogService.java -D:\hospital\api-system\four-api-system\src\main\java\com\four\system\api\domain\RequestRegistrationInformation.java D:\hospital\api-system\four-api-system\src\main\java\com\four\system\api\domain\SysFile.java