From 92b014a3cd94a0928c31ff8fde662f653bdcb879 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=86=AF=E5=87=AF?= <371894675@qq.com>
Date: Fri, 20 Oct 2023 15:20:35 +0800
Subject: [PATCH] add register code

---
 .../server/controller/SysUserController.java  | 14 ++++++-----
 .../system/server/mapper/SysUserMapper.java   | 10 +++++++-
 .../server/service/ISysUserService.java       |  2 +-
 .../service/impl/SysUserServiceImpl.java      | 24 ++++++++++++++++---
 .../resources/mapper/system/SysUserMapper.xml | 13 +++++++---
 5 files changed, 49 insertions(+), 14 deletions(-)

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 374e3c2..74849e8 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
@@ -153,12 +153,14 @@ public class SysUserController extends BaseController
     //----------------------------------------
     //注册
     @PostMapping("/register/user")
-    public Result<Boolean> registerUser(@RequestBody CommonBody commonBody){
-        if (!("true".equals(configService.selectConfigByKey("sys.account.registerUser"))))
-        {
-            return Result.error("当前系统没有开启注册功能！");
-        }
-        return Result.success(userService.registerNewUser(commonBody));
+    public Result<?> registerUser(@RequestBody CommonBody commonBody){
+//        if (!("true".equals(configService.selectConfigByKey("sys.account.registerUser"))))
+//        {
+//            return Result.error("当前系统没有开启注册功能！");
+//        }
+
+        int i = userService.registerNewUser(commonBody);
+        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 8a8449b..fe8eea9 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
@@ -133,5 +133,13 @@ public interface SysUserMapper {
 
 
 //-----------------------------------------------
-    int insertNewUser(CommonBody commonBody);
+
+    //添新的患者
+    int insertPatient(CommonBody commonBody);
+
+    //为新增用户添加角色
+    void addUserRole(int patientId, Integer roleId, int i);
+
+    //添加新的医生
+    int insertDoctor(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 6f41464..5ac7788 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
@@ -210,5 +210,5 @@ public interface ISysUserService
 
     Result getEmailCode(String email);
 
-    Boolean registerNewUser(CommonBody commonBody);
+    int 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 e3f6f6e..5f7e9b6 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
@@ -578,10 +578,28 @@ public class SysUserServiceImpl implements ISysUserService
 
     //-----------------------------
     @Override
-    public Boolean registerNewUser(CommonBody commonBody) {
-        int i= userMapper.insertNewUser(commonBody);
+    @Transactional
+    public int registerNewUser(CommonBody commonBody) {
 
-        return null;
+
+        //1证明是患者 不用审核直接注册成功
+        if (commonBody.getRoleId()==1){
+            //先添加患者表
+            int patientId= userMapper.insertPatient(commonBody);
+            //添加用户角色
+            userMapper.addUserRole(patientId,commonBody.getRoleId(),101);
+
+            return patientId;
+        }
+        //2证明是医生则需要审核
+        if (commonBody.getRoleId()==2){
+
+            int doctorId= userMapper.insertDoctor(commonBody);
+            //添加用户角色
+            userMapper.addUserRole(doctorId,commonBody.getRoleId(),100);
+            return doctorId;
+        }
+        return 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 a3cda15..c71c5b5 100644
--- a/base-system-server/src/main/resources/mapper/system/SysUserMapper.xml
+++ b/base-system-server/src/main/resources/mapper/system/SysUserMapper.xml
@@ -173,10 +173,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
  			sysdate()
  		)
 	</insert>
-	<!--新增用户-->
-    <insert id="insertNewUser"></insert>
+	<!--添加新患者-->
+    <insert id="insertPatient">
+		insert into tb_patient values (#{name},#{password},#{email},#{6666},#{avatar},#{gender},#{height},#{weight},#{age},#{wechatNumber})
+	<!--为用户添加角色-->
+	</insert>
+	<insert id="addUserRole"></insert>
 
-    <update id="updateUser" parameterType="SysUser">
+	<!--添加新的医生-->
+	<insert id="insertDoctor"></insert>
+
+	<update id="updateUser" parameterType="SysUser">
  		update sys_user
  		<set>
  			<if test="deptId != null and deptId != 0">dept_id = #{deptId},</if>