diff --git a/base-system-common/pom.xml b/base-system-common/pom.xml
index 6f06352..c916e55 100644
--- a/base-system-common/pom.xml
+++ b/base-system-common/pom.xml
@@ -8,7 +8,7 @@
base-system
3.6.3
- 3.6.5
+ 3.6.6
base-system-common
diff --git a/base-system-remote/pom.xml b/base-system-remote/pom.xml
index a261956..c2ff93b 100644
--- a/base-system-remote/pom.xml
+++ b/base-system-remote/pom.xml
@@ -8,7 +8,7 @@
base-system
3.6.3
- 3.6.8
+ 3.6.9
base-system-remote
@@ -33,7 +33,7 @@
com.health
base-system-common
- 3.6.4
+ 3.6.6
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 e086be7..5c1b729 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
@@ -45,7 +45,7 @@ public interface RemoteUserService {
@PostMapping("/user/register/user")
- public Result registerUser(@RequestBody CommonBody commonBody,@RequestHeader(SecurityConstants.FROM_SOURCE) String source);
+ public Result registerUser(@RequestBody User user,@RequestHeader(SecurityConstants.FROM_SOURCE) String source);
@PostMapping("/user/getEmailCode")
public Result getEmailCode(@RequestParam("email") String email,@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 9b00c9b..782605f 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
@@ -5,6 +5,7 @@ import com.health.common.core.user.CommonBody;
import com.health.system.common.domain.EmailLoginUser;
import com.health.system.common.domain.SysUser;
+import com.health.system.common.domain.User;
import com.health.system.common.domain.model.LoginUser;
import com.health.system.remote.RemoteUserService;
import org.slf4j.Logger;
@@ -43,7 +44,7 @@ public class RemoteUserFallbackFactory implements FallbackFactory registerUser(CommonBody commonBody,String source) {
+ public Result registerUser(User user, String source) {
return Result.error("薪注册用户失败:" + throwable.getMessage());
}
diff --git a/base-system-server/pom.xml b/base-system-server/pom.xml
index d95dc46..9733463 100644
--- a/base-system-server/pom.xml
+++ b/base-system-server/pom.xml
@@ -48,7 +48,7 @@
com.health
base-system-common
- 3.6.5
+ 3.6.6
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 3efd630..3012009 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
@@ -164,9 +164,9 @@ public class SysUserController extends BaseController
//----------------------------------------
//注册
@PostMapping("/register/user")
- public Result registerUser(@RequestBody CommonBody commonBody){
+ public Result registerUser(@RequestBody User user){
- int i = userService.registerNewUser(commonBody);
+ int i = userService.registerNewUser(user);
return i>0?Result.success("","注册成功"):Result.error("注册失败");
}
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 27d865f..9c61877 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
@@ -141,12 +141,12 @@ public interface SysUserMapper {
//为新增用户添加角色
- void addUserRole(@Param("patientId") int patientId, @Param("roleId") Integer roleId, @Param("i") int i);
+ void addUserRole(@Param("patientId") int patientId, @Param("roleId") Integer roleId);
//添加新的医生
//添加患者或者医生公用这个动态sql
- int insertNewUser(CommonBody commonBody);
+ int insertNewUser(User user);
//------------------------------------------
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 184b998..1a76ee2 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
@@ -213,7 +213,7 @@ public interface ISysUserService
public String importUser(List userList, Boolean isUpdateSupport, String operName);
- int registerNewUser(CommonBody commonBody);
+ int registerNewUser(User user);
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 95353ce..9dc015d 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
@@ -560,24 +560,24 @@ public class SysUserServiceImpl implements ISysUserService
//-----------------------------
@Override
@Transactional
- public int registerNewUser(CommonBody commonBody) {
+ public int registerNewUser(User user) {
//默认是患者角色
- System.out.println("对象是:"+commonBody);
- System.out.println(commonBody.getGender()+",");
- System.out.println(commonBody.getAge()+",");
- System.out.println(commonBody.getHeight()+",");
- System.out.println(commonBody.getWeight());
+ 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(commonBody);
- Integer userId1 = commonBody.getUserId();
+ int userId=userMapper.insertNewUser(user);
+ Integer userId1 = user.getUserId();
System.out.println("获取的自增userId是"+userId1);
//如果角色标识roleId==2的时候再赋值为102
- if (commonBody.getRoleId()==2){
+ if (user.getDeptId()!=null){
role=100;
}
//为用户添加角色
- userMapper.addUserRole(userId1,role,commonBody.getRoleId());
+ userMapper.addUserRole(userId1,role);
return userId;
}
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 e25c1c8..f5e7f8b 100644
--- a/base-system-server/src/main/resources/mapper/system/SysUserMapper.xml
+++ b/base-system-server/src/main/resources/mapper/system/SysUserMapper.xml
@@ -184,18 +184,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
- insert into tb_user_role values (#{patientId},#{roleId},#{i})
+ insert into tb_user_role values (#{patientId},#{roleId})
-
-
- insert into tb_patient
+
+ insert into tb_user
user_id,
- patient_name,
+ user_name,
password,
email,
invite_code,
@@ -205,52 +204,35 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
weight,
age,
wechat_number
+ hospital,
+ dept_id,
+ title_id,
+ introduce,
+ skilled,
+ status,
values
#{userId},
- #{name},
+ #{userName},
#{password},
#{email},
#{inviteCode},
#{avatar},
#{gender},
#{height},
- #{weight},
+ 3{weight},
#{age},
- #{wechatNumber}
+ #{wechaNumber}
+ #{hospital},
+ #{deptId},
+ #{titleId},
+ #{introduce},
+ #{skilled},
+ #{status},
-
-
- insert into tb_doctor
-
- user_id,
- doctor_name,
- password,
- email,
- hospital,
- dept_id,
- title_id,
- introduce,
- skilled,
- avatar,
-
- values
-
- #{userId},
- #{name},
- #{password},
- #{email},
- #{hospital},
- #{deptId},
- #{titleId},
- #{introduce},
- #{skilled},
- #{avatar},
-
-
-
+