diff --git a/base-system-common/src/main/java/com/health/system/common/domain/Doctor.java b/base-system-common/src/main/java/com/health/system/common/domain/Doctor.java
index 949788f..2a88fae 100644
--- a/base-system-common/src/main/java/com/health/system/common/domain/Doctor.java
+++ b/base-system-common/src/main/java/com/health/system/common/domain/Doctor.java
@@ -9,12 +9,12 @@ import lombok.Data;
* @date 2023/10/26 10:57
*/
@Data
-public class Doctor extends User{
+public class Doctor extends SysUser{
/*
医生id
*/
- private Integer doctorId;
+ private Long doctorId;
/*
就职医院名称
*/
diff --git a/base-system-common/src/main/java/com/health/system/common/domain/Patient.java b/base-system-common/src/main/java/com/health/system/common/domain/Patient.java
index beedc15..c7f5c12 100644
--- a/base-system-common/src/main/java/com/health/system/common/domain/Patient.java
+++ b/base-system-common/src/main/java/com/health/system/common/domain/Patient.java
@@ -9,12 +9,12 @@ import lombok.Data;
* @date 2023/10/26 10:57
*/
@Data
-public class Patient extends User{
+public class Patient extends SysUser{
/*
患者id
*/
- private Integer patientId;
+ private Long patientId;
/*
体重
*/
diff --git a/base-system-common/src/main/java/com/health/system/common/domain/SysUser.java b/base-system-common/src/main/java/com/health/system/common/domain/SysUser.java
index 42ac6f6..886f0f2 100644
--- a/base-system-common/src/main/java/com/health/system/common/domain/SysUser.java
+++ b/base-system-common/src/main/java/com/health/system/common/domain/SysUser.java
@@ -75,6 +75,11 @@ public class SysUser extends BaseEntity {
*/
private String password;
+ /*
+ 邮箱验证码
+ */
+ private String code;
+
/**
* 帐号状态（0正常 1停用）
*/
@@ -295,6 +300,14 @@ public class SysUser extends BaseEntity {
this.roleId = roleId;
}
+ public String getCode() {
+ return code;
+ }
+
+ public void setCode(String code) {
+ this.code = code;
+ }
+
@Override
public String toString() {
return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
@@ -317,6 +330,7 @@ public class SysUser extends BaseEntity {
.append("updateTime", getUpdateTime())
.append("remark", getRemark())
.append("dept", getDept())
+ .append("code",getCode())
.toString();
}
}
diff --git a/base-system-server/src/main/java/com/health/system/server/controller/SysUserController.java b/base-system-server/src/main/java/com/health/system/server/controller/SysUserController.java
index 0db1d3e..38e7673 100644
--- a/base-system-server/src/main/java/com/health/system/server/controller/SysUserController.java
+++ b/base-system-server/src/main/java/com/health/system/server/controller/SysUserController.java
@@ -348,6 +348,18 @@ public class SysUserController extends BaseController
return toAjax(userService.resetPwd(user));
}
+ /**
+ * @description: 个人设置重置密码
+ * @param: * @param user
+ * @return: Result
+ * @author 冯凯
+ * @date: 2023/10/27 14:02
+ */
+// public Result resentPwd(@RequestBody User user){
+// userService.checkUserIfAllowed(user);
+// user.setPwd1();
+// }
+
/**
* 状态修改
*/
diff --git a/base-system-server/src/main/java/com/health/system/server/mapper/SysUserMapper.java b/base-system-server/src/main/java/com/health/system/server/mapper/SysUserMapper.java
index acae0c8..6d56982 100644
--- a/base-system-server/src/main/java/com/health/system/server/mapper/SysUserMapper.java
+++ b/base-system-server/src/main/java/com/health/system/server/mapper/SysUserMapper.java
@@ -162,7 +162,7 @@ public interface SysUserMapper {
void insertDoctor(Doctor doctor1);
//添加用户角色
- int insertUseRole(@Param("userId") Integer userId, @Param("roleId") Integer roleId);
+ int insertUseRole(@Param("userId") Long userId, @Param("roleId") Integer roleId);
int registerPatient(Patient patient);
@@ -179,5 +179,4 @@ public interface SysUserMapper {
* @author 冯凯
* @date: 2023/10/27 10:01
*/
- User checkEmail(@Param("email") String email);
}
diff --git a/base-system-server/src/main/java/com/health/system/server/service/impl/SysUserServiceImpl.java b/base-system-server/src/main/java/com/health/system/server/service/impl/SysUserServiceImpl.java
index 5556a38..b2cc31c 100644
--- a/base-system-server/src/main/java/com/health/system/server/service/impl/SysUserServiceImpl.java
+++ b/base-system-server/src/main/java/com/health/system/server/service/impl/SysUserServiceImpl.java
@@ -611,8 +611,8 @@ public class SysUserServiceImpl implements ISysUserService
Integer roleId=100;
//添加用户表
- int count=userMapper.registerDoctor(doctor);
- Integer userId = doctor.getUserId();
+ int count=userMapper.insertUser(doctor);
+ Long userId = doctor.getUserId();
Doctor doctor1 = new Doctor();
doctor1.setUserId(userId);
doctor1.setDepartmentId(doctor.getDepartmentId());
@@ -637,9 +637,9 @@ public class SysUserServiceImpl implements ISysUserService
* @date: 2023/10/27 10:01
*/
public void checkEmail(String email) {
- User user=userMapper.checkEmail(email);
- System.out.println(user);
- Assert.isNull(user,
+ SysUser sysUser = userMapper.checkEmailUnique(email);
+ System.out.println(sysUser);
+ Assert.isNull(sysUser,
StringUtils.format("邮箱{}存在",email));
}
@@ -656,9 +656,9 @@ public class SysUserServiceImpl implements ISysUserService
public Boolean registerPatient(Patient patient) {
Integer roleId=101;
//
- patient.setStatus(1);
+ patient.setStatus("1");
int count=userMapper.registerPatient(patient);
- Integer userId = patient.getUserId();
+ Long userId = patient.getUserId();
Patient patient1 = new Patient();
patient1.setUserId(userId);
String inviteCode = RandomUtil.randomString("ABCDEFGHIJKLMNOPQRSTUVWXYZ", 10);
diff --git a/base-system-server/src/main/resources/mapper/system/SysUserMapper.xml b/base-system-server/src/main/resources/mapper/system/SysUserMapper.xml
index 9e4b0bc..e03292a 100644
--- a/base-system-server/src/main/resources/mapper/system/SysUserMapper.xml
+++ b/base-system-server/src/main/resources/mapper/system/SysUserMapper.xml
@@ -157,9 +157,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-
+