添加用户名密码登录

four-api-system/pom.xml

@@ -8,7 +8,7 @@
         <version>3.6.3</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
-    
+
     <artifactId>four-api-system</artifactId>
 
     <description>
@@ -16,13 +16,18 @@
     </description>
 
     <dependencies>
-		
+
         <!-- RuoYi Common Core-->
         <dependency>
             <groupId>com.four</groupId>
             <artifactId>four-common-core</artifactId>
         </dependency>
-        
+
+        <dependency>
+            <groupId>com.four</groupId>
+            <artifactId>four-common-duck</artifactId>
+        </dependency>
+
     </dependencies>
 
-</project>
+</project>

four-api-system/src/main/java/com/four/system/api/RemoteUserService.java

@@ -57,4 +57,15 @@ public interface RemoteUserService
      */
     @PostMapping("/user/register")
     public R<Boolean> registerUserInfo(@RequestBody SysUser sysUser, @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
+
+
+    /**
+     * 注册用户信息
+     *
+     * @param sysUser 用户信息
+     * @param source 请求来源
+     * @return 结果
+     */
+    @PostMapping("/user/healthRegister")
+    public R<Boolean> healthRegister(@RequestBody SysUser sysUser,@RequestHeader(SecurityConstants.FROM_SOURCE) String source);
 }

four-api-system/src/main/java/com/four/system/api/domain/SysUser.java

@@ -16,7 +16,7 @@ import com.four.common.core.xss.Xss;
 
 /**
  * 用户对象 sys_user
- * 
+ *
  * @author ruoyi
  */
 public class SysUser extends BaseEntity
@@ -47,6 +47,23 @@ public class SysUser extends BaseEntity
     @Excel(name = "手机号码")
     private String phonenumber;
 
+    /**
+     * 个人简历
+     * */
+    @Excel(name = "个人简历")
+    private String personalResume;
+    /**
+     * 所属医院
+     * */
+    @Excel(name = "所属医院")
+    private String affiliatedHospital;
+
+    /**
+     * 擅长领域
+     * */
+    @Excel(name = "擅长领域")
+    private String areaExpertise;
+
     /** 用户性别 */
     @Excel(name = "用户性别", readConverterExp = "0=男,1=女,2=未知")
     private String sex;
@@ -106,35 +123,35 @@ public class SysUser extends BaseEntity
     /** 状态1：患者 2：医生 **/
     private Integer differentialState;
 
-    @Override
+    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<SysRole> roles, Long[] roleIds, Long[] postIds, Long roleId, String userSign, Integer bindWechatStatus, Integer realNameAuthenticationStatus, Integer bindBankCardStatus, BigDecimal userMoney, String invitationCode, Integer differentialState) {
-    public String toString() {
+        this.userId = userId;
-        return "SysUser{" +
+        this.deptId = deptId;
-                "userId=" + userId +
+        this.userName = userName;
-                ", deptId=" + deptId +
+        this.nickName = nickName;
-                ", userName='" + userName + '\'' +
+        this.email = email;
-                ", nickName='" + nickName + '\'' +
+        this.phonenumber = phonenumber;
-                ", email='" + email + '\'' +
+        this.personalResume = personalResume;
-                ", phonenumber='" + phonenumber + '\'' +
+        this.affiliatedHospital = affiliatedHospital;
-                ", sex='" + sex + '\'' +
+        this.areaExpertise = areaExpertise;
-                ", avatar='" + avatar + '\'' +
+        this.sex = sex;
-                ", password='" + password + '\'' +
+        this.avatar = avatar;
-                ", status='" + status + '\'' +
+        this.password = password;
-                ", delFlag='" + delFlag + '\'' +
+        this.status = status;
-                ", loginIp='" + loginIp + '\'' +
+        this.delFlag = delFlag;
-                ", loginDate=" + loginDate +
+        this.loginIp = loginIp;
-                ", dept=" + dept +
+        this.loginDate = loginDate;
-                ", roles=" + roles +
+        this.dept = dept;
-                ", roleIds=" + Arrays.toString(roleIds) +
+        this.roles = roles;
-                ", postIds=" + Arrays.toString(postIds) +
+        this.roleIds = roleIds;
-                ", roleId=" + roleId +
+        this.postIds = postIds;
-                ", userSign='" + userSign + '\'' +
+        this.roleId = roleId;
-                ", bindWechatStatus=" + bindWechatStatus +
+        this.userSign = userSign;
-                ", realNameAuthenticationStatus=" + realNameAuthenticationStatus +
+        this.bindWechatStatus = bindWechatStatus;
-                ", bindBankCardStatus=" + bindBankCardStatus +
+        this.realNameAuthenticationStatus = realNameAuthenticationStatus;
-                ", userMoney=" + userMoney +
+        this.bindBankCardStatus = bindBankCardStatus;
-                ", invitationCode='" + invitationCode + '\'' +
+        this.userMoney = userMoney;
-                ", differentialState=" + differentialState +
+        this.invitationCode = invitationCode;
-                '}';
+        this.differentialState = differentialState;
     }
 
     public String getUserSign() {
@@ -165,6 +182,31 @@ public class SysUser extends BaseEntity
         return bindBankCardStatus;
     }
 
+
+    public String getPersonalResume() {
+        return personalResume;
+    }
+
+    public void setPersonalResume(String personalResume) {
+        this.personalResume = personalResume;
+    }
+
+    public String getAffiliatedHospital() {
+        return affiliatedHospital;
+    }
+
+    public void setAffiliatedHospital(String affiliatedHospital) {
+        this.affiliatedHospital = affiliatedHospital;
+    }
+
+    public String getAreaExpertise() {
+        return areaExpertise;
+    }
+
+    public void setAreaExpertise(String areaExpertise) {
+        this.areaExpertise = areaExpertise;
+    }
+
     public void setBindBankCardStatus(Integer bindBankCardStatus) {
         this.bindBankCardStatus = bindBankCardStatus;
     }

four-api-system/src/main/java/com/four/system/api/domain/registrationInformation.java

@@ -0,0 +1,178 @@
+package com.four.system.api.domain;
+
+import com.four.system.api.model.LoginUser;
+
+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;
+
+
+    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) {
+        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() {
+    }
+
+    public Long getRegistrationInformationId() {
+        return registrationInformationId;
+    }
+
+    public void setRegistrationInformationId(Long registrationInformationId) {
+        this.registrationInformationId = registrationInformationId;
+    }
+
+    public Long getUserId() {
+        return userId;
+    }
+
+    public void setUserId(Long userId) {
+        this.userId = userId;
+    }
+
+    public String getRealName() {
+        return realName;
+    }
+
+    public void setRealName(String realName) {
+        this.realName = realName;
+    }
+
+    public String getAffiliatedHospital() {
+        return affiliatedHospital;
+    }
+
+    public void setAffiliatedHospital(String affiliatedHospital) {
+        this.affiliatedHospital = affiliatedHospital;
+    }
+
+    public Long getMedicalDepartmentId() {
+        return medicalDepartmentId;
+    }
+
+    public void setMedicalDepartmentId(Long medicalDepartmentId) {
+        this.medicalDepartmentId = medicalDepartmentId;
+    }
+
+    public Long getProfessionalTitleDoctorId() {
+        return professionalTitleDoctorId;
+    }
+
+    public void setProfessionalTitleDoctorId(Long professionalTitleDoctorId) {
+        this.professionalTitleDoctorId = professionalTitleDoctorId;
+    }
+
+    public String getPersonalResume() {
+        return personalResume;
+    }
+
+    public void setPersonalResume(String personalResume) {
+        this.personalResume = personalResume;
+    }
+
+    public String getAreaExpertise() {
+        return areaExpertise;
+    }
+
+    public void setAreaExpertise(String areaExpertise) {
+        this.areaExpertise = areaExpertise;
+    }
+
+    public Date getRegistrationTime() {
+        return registrationTime;
+    }
+
+    public void setRegistrationTime(Date registrationTime) {
+        this.registrationTime = registrationTime;
+    }
+
+    public Long getNumberPatientsServed() {
+        return numberPatientsServed;
+    }
+
+    public void setNumberPatientsServed(Long numberPatientsServed) {
+        this.numberPatientsServed = numberPatientsServed;
+    }
+
+    public Double getConsultingPrice() {
+        return consultingPrice;
+    }
+
+    public void setConsultingPrice(Double consultingPrice) {
+        this.consultingPrice = consultingPrice;
+    }
+
+    public Integer getPraise() {
+        return praise;
+    }
+
+    public void setPraise(Integer praise) {
+        this.praise = praise;
+    }
+
+    public Integer getRegistrationInformationExamineStatus() {
+        return registrationInformationExamineStatus;
+    }
+
+    public void setRegistrationInformationExamineStatus(Integer registrationInformationExamineStatus) {
+        this.registrationInformationExamineStatus = registrationInformationExamineStatus;
+    }
+
+    public Integer getRegistrationInformationMedicStatus() {
+        return registrationInformationMedicStatus;
+    }
+
+    public void setRegistrationInformationMedicStatus(Integer registrationInformationMedicStatus) {
+        this.registrationInformationMedicStatus = registrationInformationMedicStatus;
+    }
+
+    @Override
+    public String toString() {
+        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 +
+                '}';
+    }
+}

four-api-system/src/main/java/com/four/system/api/factory/RemoteUserFallbackFactory.java

@@ -41,6 +41,12 @@ public class RemoteUserFallbackFactory implements FallbackFactory<RemoteUserServ
             {
                 return R.fail("注册用户失败:" + throwable.getMessage());
             }
+
+            @Override
+            public R<Boolean> healthRegister(SysUser sysUser, String source) {
+                return R.fail("注册维度健康用户失败:" + throwable.getMessage());
+            }
+
         };
 
     }

four-api-system/target/maven-archiver/pom.properties

@@ -1,5 +1,5 @@
 #Generated by Maven
-#Thu Oct 26 13:56:24 CST 2023
+#Thu Oct 26 21:31:47 CST 2023
 groupId=com.four
 artifactId=four-api-system
 version=3.6.3

four-api-system/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst

@@ -3,6 +3,7 @@ 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\registrationInformation.class
 com\four\system\api\factory\RemoteFileFallbackFactory.class
 com\four\system\api\RemoteLogService.class
 com\four\system\api\domain\SysDictType.class

four-api-system/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst

@@ -5,6 +5,7 @@ D:\hospital\api-system\four-api-system\src\main\java\com\four\system\api\model\L
 D:\hospital\api-system\four-api-system\src\main\java\com\four\system\api\factory\RemoteUserFallbackFactory.java
 D:\hospital\api-system\four-api-system\src\main\java\com\four\system\api\factory\RemoteLogFallbackFactory.java
 D:\hospital\api-system\four-api-system\src\main\java\com\four\system\api\RemoteFileService.java
+D:\hospital\api-system\four-api-system\src\main\java\com\four\system\api\domain\registrationInformation.java
 D:\hospital\api-system\four-api-system\src\main\java\com\four\system\api\domain\SysOperLog.java
 D:\hospital\api-system\four-api-system\src\main\java\com\four\system\api\RemoteUserService.java
 D:\hospital\api-system\four-api-system\src\main\java\com\four\system\api\domain\SysLogininfor.java