fengkaiDJ
/
health-base-system
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

upd remoteservice

master
冯凯 2023-10-20 10:57:04 +08:00
parent 61f3f35363
commit 60f2eb41cc
7 changed files with 24 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
base-system-remote/src/main/java/com/health/system/remote/RemoteUserService.java
View File

@ -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<Boolean> registerUser(@RequestBody SysUser sysUser);
public Result<Boolean> registerUser(@RequestBody CommonBody commonBody);
@PostMapping("/getEmailCode")
public Result getEmailCode(@RequestParam("email") String email);

8
base-system-remote/src/main/java/com/health/system/remote/factory/RemoteUserFallbackFactory.java
View File

@ -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<RemoteUserServ
public Result<Boolean> registerUserInfo(SysUser sysUser, String source) {
return Result.error("注册用户失败:" + throwable.getMessage());
}
// ---------------------------------
//--------------------------------------------------------------------------
@Override
public Result<Boolean> registerUser(SysUser sysUser) {
return Result.error("注册新用户失败:" + throwable.getMessage());
public Result<Boolean> registerUser(CommonBody commonBody) {
return Result.error("薪注册用户失败:" + throwable.getMessage());
}
//----------------------------------------
@Override
public Result getEmailCode(String email) {

6
base-system-server/src/main/java/com/health/system/server/controller/SysUserController.java
View File

@ -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<Boolean> registerUser(@RequestBody SysUser sysUser){
public Result<Boolean> 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));
}

11
base-system-server/src/main/java/com/health/system/server/mapper/SysUserMapper.java
View File

@ -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);
}

3
base-system-server/src/main/java/com/health/system/server/service/ISysUserService.java
View File

@ -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);
}

5
base-system-server/src/main/java/com/health/system/server/service/impl/SysUserServiceImpl.java
View File

@ -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;
}

4
base-system-server/src/main/resources/mapper/system/SysUserMapper.xml
View File

@ -173,8 +173,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
sysdate()
)
</insert>
<!--新增用户-->
<insert id="insertNewUser"></insert>
<update id="updateUser" parameterType="SysUser">
<update id="updateUser" parameterType="SysUser">
update sys_user
<set>
<if test="deptId != null and deptId != 0">dept_id = #{deptId},</if>