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 c2b9922..c38f74e 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 @@ -3,6 +3,7 @@ package com.health.system.remote; 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.SysUser; import com.health.system.common.domain.User; import com.health.system.common.domain.model.LoginUser; @@ -40,7 +41,7 @@ public interface RemoteUserService { @PostMapping("/register/user") - public Result registerUser(@RequestBody SysUser sysUser); + public Result registerUser(@RequestBody CommonBody commonBody); @PostMapping("/getEmailCode") public Result getEmailCode(@RequestParam("email") String email); 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 06a84ac..9c56360 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 @@ -1,6 +1,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.SysUser; import com.health.system.common.domain.User; import com.health.system.common.domain.model.LoginUser; @@ -33,11 +34,12 @@ public class RemoteUserFallbackFactory implements FallbackFactory registerUserInfo(SysUser sysUser, String source) { return Result.error("注册用户失败:" + throwable.getMessage()); } - // --------------------------------- +//-------------------------------------------------------------------------- @Override - public Result registerUser(SysUser sysUser) { - return Result.error("注册新用户失败:" + throwable.getMessage()); + public Result registerUser(CommonBody commonBody) { + return Result.error("薪注册用户失败:" + throwable.getMessage()); } + //---------------------------------------- @Override public Result getEmailCode(String email) { 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 a9d1253..374e3c2 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 @@ -1,6 +1,7 @@ package com.health.system.server.controller; import com.health.common.core.domain.Result; +import com.health.common.core.user.CommonBody; import com.health.common.core.utils.StringUtils; import com.health.common.core.utils.poi.ExcelUtil; import com.health.common.core.web.controller.BaseController; @@ -149,14 +150,15 @@ public class SysUserController extends BaseController return userService.getEmailCode(email); } + //---------------------------------------- //注册 @PostMapping("/register/user") - public Result registerUser(@RequestBody SysUser sysUser){ + public Result registerUser(@RequestBody CommonBody commonBody){ if (!("true".equals(configService.selectConfigByKey("sys.account.registerUser")))) { return Result.error("当前系统没有开启注册功能!"); } - return Result.success(userService.registerNewUser(sysUser)); + return Result.success(userService.registerNewUser(commonBody)); } 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 dbcbffe..8a8449b 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,5 +1,6 @@ package com.health.system.server.mapper; +import com.health.common.core.user.CommonBody; import com.health.system.common.domain.SysUser; import com.health.system.common.domain.User; import org.apache.ibatis.annotations.Mapper; @@ -128,13 +129,9 @@ public interface SysUserMapper { */ public SysUser checkEmailUnique(String email); - void insertUserRole(SysUser sysUser); +// void insertUserRole(SysUser sysUser); - int registerNewUser(User user); - //注册医生 - int registerNewDoctor(User user); - - //注册患者 - int registerNewPatient(User user); +//----------------------------------------------- + int insertNewUser(CommonBody commonBody); } 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 492f2ff..6f41464 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 @@ -3,6 +3,7 @@ package com.health.system.server.service; import java.util.List; import com.health.common.core.domain.Result; +import com.health.common.core.user.CommonBody; import com.health.system.common.domain.SysUser; import com.health.system.common.domain.User; @@ -209,5 +210,5 @@ public interface ISysUserService Result getEmailCode(String email); - Boolean registerNewUser(SysUser sysUser); + Boolean registerNewUser(CommonBody commonBody); } 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 60c0273..e3f6f6e 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 @@ -4,6 +4,7 @@ import cn.hutool.core.util.RandomUtil; import com.health.common.core.constant.UserConstants; import com.health.common.core.domain.Result; import com.health.common.core.exception.ServiceException; +import com.health.common.core.user.CommonBody; import com.health.common.core.utils.SpringUtils; import com.health.common.core.utils.StringUtils; import com.health.common.core.utils.bean.BeanValidators; @@ -575,8 +576,10 @@ public class SysUserServiceImpl implements ISysUserService return Result.success(emailCode,"邮箱验证码发送成功"); } + //----------------------------- @Override - public Boolean registerNewUser(SysUser sysUser) { + public Boolean registerNewUser(CommonBody commonBody) { + int i= userMapper.insertNewUser(commonBody); return null; } 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 3e07574..a3cda15 100644 --- a/base-system-server/src/main/resources/mapper/system/SysUserMapper.xml +++ b/base-system-server/src/main/resources/mapper/system/SysUserMapper.xml @@ -173,8 +173,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" sysdate() ) + + - + update sys_user dept_id = #{deptId},