diff --git a/.gitignore b/.gitignore index 09bdfea..493e215 100644 --- a/.gitignore +++ b/.gitignore @@ -5,6 +5,7 @@ /build/ !gradle/wrapper/gradle-wrapper.jar +logs/ target/ !.mvn/wrapper/maven-wrapper.jar @@ -43,4 +44,4 @@ nbdist/ !*/build/*.java !*/build/*.html -!*/build/*.xml \ No newline at end of file +!*/build/*.xml diff --git a/base-system-common/pom.xml b/base-system-common/pom.xml index c916e55..ec1a269 100644 --- a/base-system-common/pom.xml +++ b/base-system-common/pom.xml @@ -8,7 +8,8 @@ base-system 3.6.3 - 3.6.6 + + 3.6.7 base-system-common 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 new file mode 100644 index 0000000..8e0bdc4 --- /dev/null +++ b/base-system-common/src/main/java/com/health/system/common/domain/Doctor.java @@ -0,0 +1,38 @@ +package com.health.system.common.domain; + +import lombok.Data; + +/** + * @author 冯凯 + * @version 1.0 + * @description: 医生实体类 + * @date 2023/10/26 10:57 + */ +@Data +public class Doctor extends User{ + + /* + 就职医院名称 + */ + private String inauguralHospital; + + /* + 科室id + */ + private Integer departmentId; + + /* + 职位id + */ + private Integer titleId; + + /* + 个人简介 + */ + private String personalFile; + + /* + 擅长领域 + */ + private String goodFiled; +} 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 new file mode 100644 index 0000000..b61267d --- /dev/null +++ b/base-system-common/src/main/java/com/health/system/common/domain/Patient.java @@ -0,0 +1,42 @@ +package com.health.system.common.domain; + +import lombok.Data; + +/** + * @author 冯凯 + * @version 1.0 + * @description: 患者实体类 + * @date 2023/10/26 10:57 + */ +@Data +public class Patient extends User{ + /* + 体重 + */ + private Integer weight; + + /* + 身高 + */ + private Integer height; + + /* + 性别 + */ + private Integer gender; + + /* + 年龄 + */ + private Integer age; + + /* + 绑定微信号 + */ + private String weChat; + + /* + 邀请码 + */ + private String inviteCode; +} diff --git a/base-system-common/src/main/java/com/health/system/common/domain/User.java b/base-system-common/src/main/java/com/health/system/common/domain/User.java index 776cf7a..6053999 100644 --- a/base-system-common/src/main/java/com/health/system/common/domain/User.java +++ b/base-system-common/src/main/java/com/health/system/common/domain/User.java @@ -11,77 +11,41 @@ import lombok.Data; @Data public class User { - /* - 邮箱验证码 - */ - private String code; /* 用户id */ private Integer userId; + /* 用户名称 */ - private String userName; - /* - 用户密码 - */ - private String password; + private String name; + /* 用户邮箱 */ private String email; + /* - 用户邀请码 + 第一次输入密码 */ - private String inviteCode; + private String pwd1; + /* - 用户头像 + 第二次密码 + */ + private String pwd2; + + /* + 用户形象照 */ private String avatar; + /* - 用户性别 1代表男性 2代表女性 - */ - private Integer gender; - /* - 用户身高 - */ - private Integer height; - /* - 用户体重 - */ - private Integer weight; - /* - 用户年龄 - */ - private Integer age; - /* - 患者微信号 - */ - private String wechatNumber; - /* - 医生所属医院 - */ - private String hospital; - /* - 医生所属科室id - */ - private Integer deptId; - /* - 医生职位id - */ - private Integer titleId; - /* - 医生简介 - */ - private String introduce; - /* - 医生擅长领域 - */ - private String skilled; - /* - 用户状态 + 用户注册状态 */ private Integer status; + private String code; + } diff --git a/base-system-remote/pom.xml b/base-system-remote/pom.xml index 168d13e..f1136bc 100644 --- a/base-system-remote/pom.xml +++ b/base-system-remote/pom.xml @@ -8,7 +8,8 @@ base-system 3.6.3 - 3.6.11 + + 3.6.12 base-system-remote @@ -33,7 +34,7 @@ com.health base-system-common - 3.6.6 + 3.6.7 diff --git a/base-system-remote/src/main/java/com/health/system/remote/RemoteUserService.java b/base-system-remote/src/main/java/com/health/system/remote/RemoteUserService.java index da6a344..6545590 100644 --- a/base-system-remote/src/main/java/com/health/system/remote/RemoteUserService.java +++ b/base-system-remote/src/main/java/com/health/system/remote/RemoteUserService.java @@ -4,6 +4,7 @@ import com.health.common.core.constant.SecurityConstants; import com.health.common.core.constant.ServiceNameConstants; import com.health.common.core.domain.Result; import com.health.common.core.user.CommonBody; +import com.health.system.common.domain.Doctor; import com.health.system.common.domain.EmailLoginUser; import com.health.system.common.domain.SysUser; import com.health.system.common.domain.User; @@ -20,6 +21,16 @@ import org.springframework.web.bind.annotation.*; */ @FeignClient(contextId = "remoteUserService", value = ServiceNameConstants.SYSTEM_SERVICE, fallbackFactory = RemoteUserFallbackFactory.class) public interface RemoteUserService { + + /** + * @description: 医生注册 + * @param: * @param doctor + * @return: Result + * @author 冯凯 + * @date: 2023/10/26 12:01 + */ + @PostMapping("/user/register/doctor") + public Result registerDoctor(@RequestBody Doctor doctor,@RequestHeader(SecurityConstants.FROM_SOURCE) String source); /** * 通过用户名查询用户信息 * diff --git a/base-system-remote/src/main/java/com/health/system/remote/factory/RemoteUserFallbackFactory.java b/base-system-remote/src/main/java/com/health/system/remote/factory/RemoteUserFallbackFactory.java index 276d5f3..b72e755 100644 --- a/base-system-remote/src/main/java/com/health/system/remote/factory/RemoteUserFallbackFactory.java +++ b/base-system-remote/src/main/java/com/health/system/remote/factory/RemoteUserFallbackFactory.java @@ -3,6 +3,7 @@ package com.health.system.remote.factory; import com.health.common.core.domain.Result; import com.health.common.core.user.CommonBody; +import com.health.system.common.domain.Doctor; import com.health.system.common.domain.EmailLoginUser; import com.health.system.common.domain.SysUser; import com.health.system.common.domain.User; @@ -27,6 +28,11 @@ public class RemoteUserFallbackFactory implements FallbackFactory registerDoctor(Doctor doctor, String source) { + return Result.error("医生注册失败:" + throwable.getMessage()); + } + @Override public Result getUserInfo(String username, String source) { return Result.error("获取用户失败:" + throwable.getMessage()); diff --git a/base-system-server/pom.xml b/base-system-server/pom.xml index 9733463..6cf2309 100644 --- a/base-system-server/pom.xml +++ b/base-system-server/pom.xml @@ -48,7 +48,7 @@ com.health base-system-common - 3.6.6 + 3.6.7 diff --git a/base-system-server/src/main/java/com/health/system/server/controller/SysConfigController.java b/base-system-server/src/main/java/com/health/system/server/controller/SysConfigController.java index 4820d0d..eefed1f 100644 --- a/base-system-server/src/main/java/com/health/system/server/controller/SysConfigController.java +++ b/base-system-server/src/main/java/com/health/system/server/controller/SysConfigController.java @@ -9,6 +9,7 @@ import com.health.common.log.annotation.Log; import com.health.common.log.enums.BusinessType; import com.health.common.security.annotation.RequiresPermissions; import com.health.common.security.utils.SecurityUtils; + import com.health.system.common.domain.SysConfig; import com.health.system.server.service.ISysConfigService; import org.springframework.beans.factory.annotation.Autowired; 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 56148bd..a055c6c 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 @@ -161,6 +161,12 @@ public class SysUserController extends BaseController //------------------------------------------------------------------- + //--------------邮箱注册医生-------------------------------------- + @PostMapping("/register/doctor") + public Result registerDoctor(@RequestBody Doctor doctor){ + return Result.success(userService.registerDoctor(doctor)); + } + //------------------------------------------------------------------------------- //------------------------邮箱注册---------------- //注册 @PostMapping("/register/user") 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 b88eba1..e840a9a 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 @@ -1,6 +1,7 @@ package com.health.system.server.mapper; import com.health.common.core.user.CommonBody; +import com.health.system.common.domain.Doctor; import com.health.system.common.domain.EmailLoginUser; import com.health.system.common.domain.SysUser; import com.health.system.common.domain.User; @@ -156,4 +157,13 @@ public interface SysUserMapper { int updPasswordByEmail(User user); + + //添加用户表 + int registerDoctor(Doctor doctor); + + //添加医生表 + void insertDoctor(Doctor doctor1); + + //添加用户角色 + int insertUseRole(@Param("userId") Integer userId, @Param("roleId") Integer roleId); } diff --git a/base-system-server/src/main/java/com/health/system/server/service/ISysUserService.java b/base-system-server/src/main/java/com/health/system/server/service/ISysUserService.java index 7674fb9..c688998 100644 --- a/base-system-server/src/main/java/com/health/system/server/service/ISysUserService.java +++ b/base-system-server/src/main/java/com/health/system/server/service/ISysUserService.java @@ -4,6 +4,7 @@ import java.util.List; import com.health.common.core.domain.Result; import com.health.common.core.user.CommonBody; +import com.health.system.common.domain.Doctor; import com.health.system.common.domain.EmailLoginUser; import com.health.system.common.domain.SysUser; import com.health.system.common.domain.User; @@ -220,4 +221,7 @@ public interface ISysUserService User selectUserByUserId(Long userId); int updPasswordByEmail(User user); + + //---------------注册医生--------------------------- + Boolean registerDoctor(Doctor doctor); } 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 009f1af..55f20d7 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 @@ -27,6 +27,7 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.util.CollectionUtils; +import javax.print.Doc; import javax.validation.Validator; import java.util.ArrayList; import java.util.List; @@ -561,24 +562,24 @@ public class SysUserServiceImpl implements ISysUserService @Override @Transactional public int registerNewUser(User user) { - //默认是患者角色 - System.out.println("对象是:"+user); - System.out.println(user.getGender()+","); - System.out.println(user.getAge()+","); - System.out.println(user.getHeight()+","); - System.out.println(user.getWeight()); - int role=101; - //添加用户不管是患者还是医生 - int userId=userMapper.insertNewUser(user); - Integer userId1 = user.getUserId(); - System.out.println("获取的自增userId是"+userId1); - //如果角色标识roleId==2的时候再赋值为102 - if (user.getDeptId()!=null){ - role=100; - } +// //默认是患者角色 +// System.out.println("对象是:"+user); +// System.out.println(user.getGender()+","); +// System.out.println(user.getAge()+","); +// System.out.println(user.getHeight()+","); +// System.out.println(user.getWeight()); +// int role=101; +// //添加用户不管是患者还是医生 +// int userId=userMapper.insertNewUser(user); +// Integer userId1 = user.getUserId(); +// System.out.println("获取的自增userId是"+userId1); +// //如果角色标识roleId==2的时候再赋值为102 +// if (user.getDeptId()!=null){ +// role=100; +// } //为用户添加角色 - userMapper.addUserRole(userId1,role); - return userId; +// userMapper.addUserRole(userId1,role); + return 0; } @@ -602,4 +603,25 @@ public class SysUserServiceImpl implements ISysUserService } + //---------------注册医生--------------------------- + @Override + public Boolean registerDoctor(Doctor doctor) { + Integer roleId=100; + //添加用户表 + int count=userMapper.registerDoctor(doctor); + Integer userId = doctor.getUserId(); + Doctor doctor1 = new Doctor(); + doctor1.setUserId(userId); + doctor1.setDepartmentId(doctor.getDepartmentId()); + doctor1.setTitleId(doctor.getTitleId()); + doctor1.setPersonalFile(doctor.getPersonalFile()); + doctor1.setInauguralHospital(doctor.getInauguralHospital()); + userMapper.insertDoctor(doctor1); + + int i=userMapper.insertUseRole(userId,roleId); + return i>0; + //成功之后添加医生表 + //添加用户角色中间表 + } + } 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 eae691e..69f70d0 100644 --- a/base-system-server/src/main/resources/mapper/system/SysUserMapper.xml +++ b/base-system-server/src/main/resources/mapper/system/SysUserMapper.xml @@ -234,6 +234,47 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + insert into tb_user + + name, + pwd1, + email, + avatar, + status, + + values + + #{name}, + #{pwd1}, + #{email}, + #{avatar}, + #{status}, + + + + insert into tb_doctor + + doctor_id, + inaugural_hospital, + department_id, + title_id, + profession_profile, + good_field, + + values + + #{userId}, + #{inauguralHospital}, + #{departmentId}, + #{titleId}, + #{personalFile}, + #{goodFiled}, + + + + insert into tb_user_role values(#{userId},#{roleId}) + update sys_user