four
/
modules-system
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改入驻信息

master
ShiSiWei 2023-10-27 22:25:55 +08:00
parent 87204c512e
commit 9a2bdc2686
7 changed files with 206 additions and 89 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/com/four/system/controller/SysProfileController.java
View File

@ -28,7 +28,7 @@ import com.four.system.service.ISysUserService;
/**
* 个人信息 业务处理
*
*
* @author ruoyi
*/
@RestController
@ -37,10 +37,10 @@ public class SysProfileController extends BaseController
{
@Autowired
private ISysUserService userService;
@Autowired
private TokenService tokenService;
@Autowired
private RemoteFileService remoteFileService;
@ -116,7 +116,7 @@ public class SysProfileController extends BaseController
}
return error("修改密码异常，请联系管理员");
}
/**
* 头像上传
*/

15
src/main/java/com/four/system/controller/SysUserController.java
View File

@ -5,6 +5,9 @@ import java.util.List;
import java.util.Set;
import java.util.stream.Collectors;
import javax.servlet.http.HttpServletResponse;
import com.four.system.api.domain.RequestRegistrationInformation;
import com.four.system.service.*;
import org.apache.commons.lang3.ArrayUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
@ -32,12 +35,6 @@ import com.four.system.api.domain.SysDept;
import com.four.system.api.domain.SysRole;
import com.four.system.api.domain.SysUser;
import com.four.system.api.model.LoginUser;
import com.four.system.service.ISysConfigService;
import com.four.system.service.ISysDeptService;
import com.four.system.service.ISysPermissionService;
import com.four.system.service.ISysPostService;
import com.four.system.service.ISysRoleService;
import com.four.system.service.ISysUserService;
/**
* 用户信息
@ -171,9 +168,11 @@ public class SysUserController extends BaseController
}
/**
* 注册
*
*
*
* 医生注册
*/
@InnerAuth
@PostMapping("/healthRegister")
public R<Boolean> healthRegister(@RequestBody SysUser sysUser){

8
src/main/java/com/four/system/mapper/SysUserMapper.java
View File

@ -150,4 +150,12 @@ public interface SysUserMapper
public int insertHealthUser(SysUser sysUser);
SysUser selectHealthUserById(Long userId);
int insertSysUser(SysUser sysUser);
/**
* 注册医生添加用户信息表
* @param sysUser
* @return
*/
}

12
src/main/java/com/four/system/service/ISysUserService.java
View File

@ -1,6 +1,9 @@
package com.four.system.service;
import java.util.List;
import com.four.common.core.domain.R;
import com.four.system.api.domain.RequestRegistrationInformation;
import com.four.system.api.domain.SysUser;
/**
@ -85,10 +88,10 @@ public interface ISysUserService
/**
* 校验email是否唯一
*
* @param user 用户信息
* @param requestRegistrationInformation 用户信息
* @return 结果
*/
public boolean checkEmailUnique(SysUser user);
public boolean checkEmailUnique(SysUser sysUser);
/**
* 校验用户是否允许操作
@ -209,7 +212,10 @@ public interface ISysUserService
SysUser selectByEmail(String email);
public boolean healthRegister(SysUser sysUser);
public SysUser selectHealthUserById(Long userId);
Boolean healthRegister(SysUser sysUser);
}

21
src/main/java/com/four/system/service/impl/SysConfigServiceImpl.java
View File

@ -3,6 +3,8 @@ package com.four.system.service.impl;
import java.util.Collection;
import java.util.List;
import javax.annotation.PostConstruct;
import com.four.system.service.ISysConfigService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.four.common.core.constant.CacheConstants;
@ -13,11 +15,10 @@ import com.four.common.core.utils.StringUtils;
import com.four.common.redis.service.RedisService;
import com.four.system.domain.SysConfig;
import com.four.system.mapper.SysConfigMapper;
import com.four.system.service.ISysConfigService;
/**
* 参数配置 服务层实现
*
*
* @author ruoyi
*/
@Service
@ -40,7 +41,7 @@ public class SysConfigServiceImpl implements ISysConfigService
/**
* 查询参数配置信息
*
*
* @param configId 参数配置ID
* @return 参数配置信息
*/
@ -54,7 +55,7 @@ public class SysConfigServiceImpl implements ISysConfigService
/**
* 根据键名查询参数配置信息
*
*
* @param configKey 参数key
* @return 参数键值
*/
@ -79,7 +80,7 @@ public class SysConfigServiceImpl implements ISysConfigService
/**
* 查询参数配置列表
*
*
* @param config 参数配置信息
* @return 参数配置集合
*/
@ -91,7 +92,7 @@ public class SysConfigServiceImpl implements ISysConfigService
/**
* 新增参数配置
*
*
* @param config 参数配置信息
* @return 结果
*/
@ -108,7 +109,7 @@ public class SysConfigServiceImpl implements ISysConfigService
/**
* 修改参数配置
*
*
* @param config 参数配置信息
* @return 结果
*/
@ -131,7 +132,7 @@ public class SysConfigServiceImpl implements ISysConfigService
/**
* 批量删除参数信息
*
*
* @param configIds 需要删除的参数ID
*/
@Override
@ -184,7 +185,7 @@ public class SysConfigServiceImpl implements ISysConfigService
/**
* 校验参数键名是否唯一
*
*
* @param config 参数配置信息
* @return 结果
*/
@ -202,7 +203,7 @@ public class SysConfigServiceImpl implements ISysConfigService
/**
* 设置cache key
*
*
* @param configKey 参数键
* @return 缓存键key
*/

85
src/main/java/com/four/system/service/impl/SysUserServiceImpl.java
View File

@ -1,9 +1,14 @@
package com.four.system.service.impl;
import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.List;
import java.util.stream.Collectors;
import javax.validation.Validator;
import com.four.common.core.domain.R;
import com.four.system.api.domain.RequestRegistrationInformation;
import com.four.system.service.ISysConfigService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@ -12,7 +17,6 @@ import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils;
import com.four.common.core.constant.UserConstants;
import com.four.common.core.exception.ServiceException;
import com.four.common.core.utils.SpringUtils;
import com.four.common.core.utils.StringUtils;
import com.four.common.core.utils.bean.BeanValidators;
import com.four.common.datascope.annotation.DataScope;
@ -27,9 +31,10 @@ import com.four.system.mapper.SysRoleMapper;
import com.four.system.mapper.SysUserMapper;
import com.four.system.mapper.SysUserPostMapper;
import com.four.system.mapper.SysUserRoleMapper;
import com.four.system.service.ISysConfigService;
import com.four.system.service.ISysUserService;
import static com.four.common.core.utils.SpringUtils.getAopProxy;
/**
* 用户 业务层处理
*
@ -191,17 +196,10 @@ public class SysUserServiceImpl implements ISysUserService
return UserConstants.UNIQUE;
}
/**
* 校验email是否唯一
*
* @param user 用户信息
* @return
*/
@Override
public boolean checkEmailUnique(SysUser user)
{
Long userId = StringUtils.isNull(user.getUserId()) ? -1L : user.getUserId();
SysUser info = userMapper.checkEmailUnique(user.getEmail());
public boolean checkEmailUnique(SysUser sysUser) {
Long userId = StringUtils.isNull(sysUser.getUserId()) ? -1L : sysUser.getUserId();
SysUser info = userMapper.checkEmailUnique(sysUser.getEmail());
if (StringUtils.isNotNull(info) && info.getUserId().longValue() != userId.longValue())
{
return UserConstants.NOT_UNIQUE;
@ -209,6 +207,25 @@ public class SysUserServiceImpl implements ISysUserService
return UserConstants.UNIQUE;
}
// @Override
// public boolean checkEmailUnique() {
// Long userId = StringUtils.isNull(user.getUserId()) ? -1L : user.getUserId();
// SysUser info = userMapper.checkPhoneUnique(user.getPhonenumber());
// if (StringUtils.isNotNull(info) && info.getUserId().longValue() != userId.longValue())
// {
// return UserConstants.NOT_UNIQUE;
// }
// return UserConstants.UNIQUE;
// }
/**
* 校验email是否唯一
*
* @param user 用户信息
* @return
*/
/**
* 校验用户是否允许操作
*
@ -235,7 +252,7 @@ public class SysUserServiceImpl implements ISysUserService
{
SysUser user = new SysUser();
user.setUserId(userId);
List<SysUser> users = SpringUtils.getAopProxy(this).selectUserList(user);
List<SysUser> users = getAopProxy(this).selectUserList(user);
if (StringUtils.isEmpty(users))
{
throw new ServiceException("没有权限访问用户数据！");
@ -548,25 +565,37 @@ public class SysUserServiceImpl implements ISysUserService
public SysUser selectByEmail(String email) {
return userMapper.selectByEmail(email);
}
@Override
@Transactional(rollbackFor = Exception.class)
public boolean healthRegister(SysUser sysUser) {
System.out.println(sysUser);
int i = userMapper.insertHealthUser(sysUser);
Long userId = sysUser.getUserId();
Long[] logs =new Long[]{sysUser.getUserId()};
insertUserRole(userId,logs);
if(i>0 && sysUser.getRoleId() == 101 && StringUtils.isNotNull(sysUser.getInvitationCode())){
System.out.println("等待接口开放");
}
return i>0;
}
// @Transactional(rollbackFor = Exception.class)
// public boolean healthRegister(SysUser sysUser) {
// System.out.println(sysUser);
// int i = userMapper.insertHealthUser(sysUser);
// Long userId = sysUser.getUserId();
// Long[] logs =new Long[]{sysUser.getUserId()};
// insertUserRole(userId,logs);
//
// if(i>0 && sysUser.getRoleId() == 1 && StringUtils.isNotNull(sysUser.getInvitationCode())){
// System.out.println("等待接口开放");
// }
// return i>0;
// }
@Override
public SysUser selectHealthUserById(Long userId) {
return userMapper.selectHealthUserById(userId);
}
/**
* 医生注册
* @param requestRegistrationInformation
* @return
*/
@Override
public Boolean healthRegister(SysUser sysUser) {
return userMapper.insertSysUser(sysUser)>0;
}
}

146
src/main/resources/mapper/system/SysUserMapper.xml
View File

@ -169,62 +169,136 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<insert id="insertUser" parameterType="SysUser" useGeneratedKeys="true" keyProperty="userId">
insert into sys_user(
<if test="user_id != null and userId != 0">user_id,</if>
<if test="dept_id != null and deptId != 0">dept_id,</if>
<if test="user_name != null and userName != ''">user_name,</if>
<if test="nick_name != null and nickName != ''">nick_name,</if>
<if test="user_type != null and userType != ''">user_type,</if>
<if test="userId != null and userId != 0">user_id,</if>
<if test="deptId != null and deptId != 0">dept_id,</if>
<if test="userName != null and userName != ''">user_name,</if>
<if test="nickName != null and nickName != ''">nick_name,</if>
<if test="userType != null and userType != ''">user_type,</if>
<if test="email != null and email != ''">email,</if>
<if test="phonenumber != null and phonenumber != ''">phonenumber,</if>
<if test="sex != null and sex != ''">sex,</if>
<if test="avatar != null and avatar != ''">avatar,</if>
<if test="password != null and password != ''">password,</if>
<if test="status != null and status != ''">status,</if>
<if test="del_flag != null and delFlag != ''">del_flag,</if>
<if test="login_ip != null and loginIp != ''">login_ip,</if>
<if test="login_date != null and loginDate != ''">login_date,</if>
<if test="create_by != null and createBy != ''">create_by,</if>
<if test="create_time != null and createTime != ''">create_time,</if>
<if test="update_by != null and updateBy != ''">update_by,</if>
<if test="update_time != null and updateTime != ''">update_time,</if>
<if test="delFlag != null and delFlag != ''">del_flag,</if>
<if test="loginIp != null and loginIp != ''">login_ip,</if>
<if test="loginDate != null and loginDate != ''">login_date,</if>
<if test="createBy != null and createBy != ''">create_by,</if>
<if test="createTime != null and createTime != ''">create_time,</if>
<if test="updateTime != null and updateTime != ''">update_time,</if>
<if test="remark != null and remark != ''">remark,</if>
<if test="user_sign != null and userSign != ''">user_sign,</if>
<if test="bind_wechat_status != null and bindWechatStatus != ''">bind_wechat_status,</if>
<if test="real_name_authentication_status != null and realNameAuthenticationStatus != ''">real_name_authentication_status,</if>
<if test="bind_bank_card_status != null and bindBankCardStatus != ''">bind_bank_card_status,</if>
<if test="user_money != null and userMoney != ''">user_money,</if>
<if test="invitation_code != null and invitationCode != ''">invitation_code,</if>
<if test="userSign != null and userSign != ''">user_sign,</if>
<if test="bindWechatStatus != null and bindWechatStatus != ''">bind_wechat_status,</if>
<if test="realNameAuthenticationStatus != null and realNameAuthenticationStatus != ''">real_name_authentication_status,</if>
<if test="bindBankCardStatus != null and bindBankCardStatus != ''">bind_bank_card_status,</if>
<if test="userMoney != null and userMoney != ''">user_money,</if>
<if test="invitationCode != null and invitationCode != ''">invitation_code,</if>
create_time
)values(
<if test="user_id != null and user_id != 0">#{userId},</if>
<if test="dept_id != null and dept_id != 0">#{deptId},</if>
<if test="user_name != null and user_name != ''">#{userName},</if>
<if test="nick_name != null and nick_name != ''">#{nickName},</if>
<if test="user_type != null and user_type != ''">#{userType},</if>
<if test="userId != null and userId != 0">#{userId},</if>
<if test="deptId != null and deptId != 0">#{deptId},</if>
<if test="userName != null and userName != ''">#{userName},</if>
<if test="nickName != null and nickName != ''">#{nickName},</if>
<if test="userType != null and userType != ''">#{userType},</if>
<if test="email != null and email != ''">#{email},</if>
<if test="phonenumber != null and phonenumber != ''">#{phonenumber},</if>
<if test="sex != null and sex != ''">#{sex},</if>
<if test="avatar != null and avatar != ''">#{avatar},</if>
<if test="password != null and password != ''">#{password},</if>
<if test="status != null and status != ''">#{status},</if>
<if test="del_flag != null and del_flag != ''">#{delFlag},</if>
<if test="login_ip != null and login_ip != ''">#{loginIp},</if>
<if test="login_date != null and login_date != ''">#{loginDate},</if>
<if test="create_by != null and create_by != ''">#{createBy},</if>
<if test="create_time != null and create_time != ''">#{createTime},</if>
<if test="update_by != null and update_by != ''">#{updateBy},</if>
<if test="update_time != null and update_time != ''">#{updateTime},</if>
<if test="delFlag != null and delFlag != ''">#{delFlag},</if>
<if test="loginIp != null and loginIp != ''">#{loginIp},</if>
<if test="loginDate != null and loginDate != ''">#{loginDate},</if>
<if test="createBy != null and createBy != ''">#{createBy},</if>
<if test="createTime != null and createTime != ''">#{createTime},</if>
<if test="updateBy != null and updateBy != ''">#{updateBy},</if>
<if test="updateTime != null and updateTime != ''">#{updateTime},</if>
<if test="remark != null and remark != ''">#{remark},</if>
<if test="user_sign != null and user_sign != ''">#{userSign},</if>
<if test="bind_wechat_status != null and bind_wechat_status != ''">#{bindWechatStatus},</if>
<if test="real_name_authentication_status != null and real_name_authentication_status != ''">#{realNameAuthenticationStatus},</if>
<if test="bind_bank_card_status != null and bind_bank_card_status != ''">#{bindBankCardStatus},</if>
<if test="user_money != null and user_money != ''">#{userMoney},</if>
<if test="invitation_code != null and invitation_code != ''">#{invitationCode},</if>
<if test="userSign != null and userSign != ''">#{userSign},</if>
<if test="bindWechatStatus != null and bindWechatStatus != ''">#{bindWechatStatus},</if>
<if test="realNameAuthenticationStatus != null and realNameAuthenticationStatus != ''">#{realNameAuthenticationStatus},</if>
<if test="bindBankCardStatus != null and bindBankCardStatus != ''">#{bindBankCardStatus},</if>
<if test="userMoney != null and userMoney != ''">#{userMoney},</if>
<if test="invitationCode != null and invitationCode != ''">#{invitationCode},</if>
sysdate()
)
</insert>
<insert id="insertHealthUser" parameterType="com.four.system.api.domain.registrationInformation" useGeneratedKeys="true" keyProperty="registrationInformationId">
insert into registration_information(
<if test="registrationInformationId != null and registrationInformationId != 0">registration_information_id,</if>
<if test="userId != null and userId != 0">user_id,</if>
<if test="realName != null and realName != 0">real_name,</if>
<if test="affiliatedHospital != null and affiliatedHospital != 0">affiliated_hospital,</if>
<if test="medicalDepartmentId != null and medicalDepartmentId != 0">medical_department_id,</if>
<if test="professionalTitleDoctorId != null and professionalTitleDoctorId != 0">professional_title_doctor_id,</if>
<if test="personalResume != null and personalResume != 0">personal_resume,</if>
<if test="areaExpertise != null and areaExpertise != 0">area_expertise,</if>
<if test="numberPatientsServed != null and numberPatientsServed != 0">number_patients_served,</if>
<if test="consultingPrice != null and consultingPrice != 0">consulting_price,</if>
<if test="praise != null and praise != 0">praise,</if>
<if test="registrationInformationExamineStatus != null and registrationInformationExamineStatus != 0">registration_information_examine_status,</if>
<if test="registrationInformationMedicStatus != null and registrationInformationMedicStatus != 0">registration_information_medic_status</if>
)values(
<if test="registrationInformationId != null and registrationInformationId != 0">#{registrationInformationId},</if>
<if test="userId != null and userId != 0">#{userId},</if>
<if test="realName != null and realName != 0">#{realName},</if>
<if test="affiliatedHospital != null and affiliatedHospital != 0">#{affiliatedHospital},</if>
<if test="medicalDepartmentId != null and medicalDepartmentId != 0">#{medicalDepartmentId},</if>
<if test="professionalTitleDoctorId != null and professionalTitleDoctorId != 0">#{professionalTitleDoctorId},</if>
<if test="personalResume != null and personalResume != 0">#{personalResume},</if>
<if test="areaExpertise != null and areaExpertise != 0">#{areaExpertise},</if>
<if test="numberPatientsServed != null and numberPatientsServed != 0">#{numberPatientsServed},</if>
<if test="consultingPrice != null and consultingPrice != 0">#{consultingPrice},</if>
<if test="praise != null and praise != 0">#{praise},</if>
<if test="registrationInformationExamineStatus != null and registrationInformationExamineStatus != 0">#{registrationInformationExamineStatus},</if>
<if test="registrationInformationMedicStatus != null and registrationInformationMedicStatus != 0">#{registrationInformationMedicStatus}</if>
)
</insert>
<insert id="insertSysUser" parameterType="com.four.system.api.domain.SysUser" useGeneratedKeys="true" keyProperty="userId">
insert into sys_user(
<if test="userId != null and userId != 0">user_id,</if>
<if test="deptId != null and deptId != 0">dept_id,</if>
<if test="userName != null and userName != ''">user_name,</if>
<if test="nickName != null and nickName != ''">nick_name,</if>
<if test="email != null and email != ''">email,</if>
<if test="password != null and password != ''">password,</if>
<if test="status != null and status != ''">status,</if>
<if test="delFlag != null and delFlag != ''">del_flag,</if>
<if test="loginDate != null and loginDate != ''">login_date,</if>
<if test="createBy != null and createBy != ''">create_by,</if>
<if test="createTime != null and createTime != ''">create_time,</if>
<if test="updateTime != null and updateTime != ''">update_time,</if>
<if test="bindWechatStatus != null and bindWechatStatus != ''">bind_wechat_status,</if>
<if test="realNameAuthenticationStatus != null and realNameAuthenticationStatus != ''">real_name_authentication_status,</if>
<if test="bindBankCardStatus != null and bindBankCardStatus != ''">bind_bank_card_status,</if>
<if test="userMoney != null and userMoney != ''">user_money,</if>
<if test="differentialState != null and differentialState != ''">differential_state,</if>
create_time
)values(
<if test="userId != null and userId != 0">#{userId},</if>
<if test="deptId != null and deptId != 0">#{deptId},</if>
<if test="userName != null and userName != ''">#{userName},</if>
<if test="nickName != null and nickName != ''">#{nickName},</if>
<if test="email != null and email != ''">#{email},</if>
<if test="password != null and password != ''">#{password},</if>
<if test="status != null and status != ''">#{status},</if>
<if test="delFlag != null and delFlag != ''">#{delFlag},</if>
<if test="loginDate != null and loginDate != ''">#{loginDate},</if>
<if test="createBy != null and createBy != ''">#{createBy},</if>
<if test="createTime != null and createTime != ''">#{createTime},</if>
<if test="updateTime != null and updateTime != ''">#{updateTime},</if>
<if test="bindWechatStatus != null and bindWechatStatus != ''">#{bindWechatStatus},</if>
<if test="realNameAuthenticationStatus != null and realNameAuthenticationStatus != ''">#{realNameAuthenticationStatus},</if>
<if test="bindBankCardStatus != null and bindBankCardStatus != ''">#{bindBankCardStatus},</if>
<if test="userMoney != null and userMoney != ''">#{userMoney},</if>
<if test="differentialState != null and differentialState != ''">#{differentialState},</if>
sysdate()
)
</insert>
<update id="updateUser" parameterType="SysUser">
update sys_user
<set>