From 9a2bdc26861d57cdba5e4b75d8c8c38ee9f59612 Mon Sep 17 00:00:00 2001 From: ShiSiWei <12764015+ssw_1_0@user.noreply.gitee.com> Date: Fri, 27 Oct 2023 22:25:55 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=85=A5=E9=A9=BB=E4=BF=A1?= =?UTF-8?q?=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/SysProfileController.java | 8 +- .../system/controller/SysUserController.java | 15 +- .../com/four/system/mapper/SysUserMapper.java | 8 + .../four/system/service/ISysUserService.java | 12 +- .../service/impl/SysConfigServiceImpl.java | 21 +-- .../service/impl/SysUserServiceImpl.java | 85 ++++++---- .../resources/mapper/system/SysUserMapper.xml | 146 +++++++++++++----- 7 files changed, 206 insertions(+), 89 deletions(-) diff --git a/src/main/java/com/four/system/controller/SysProfileController.java b/src/main/java/com/four/system/controller/SysProfileController.java index 19a51bc..2bb8962 100644 --- a/src/main/java/com/four/system/controller/SysProfileController.java +++ b/src/main/java/com/four/system/controller/SysProfileController.java @@ -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("修改密码异常，请联系管理员"); } - + /** * 头像上传 */ diff --git a/src/main/java/com/four/system/controller/SysUserController.java b/src/main/java/com/four/system/controller/SysUserController.java index 27034ef..b288a08 100644 --- a/src/main/java/com/four/system/controller/SysUserController.java +++ b/src/main/java/com/four/system/controller/SysUserController.java @@ -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 healthRegister(@RequestBody SysUser sysUser){ diff --git a/src/main/java/com/four/system/mapper/SysUserMapper.java b/src/main/java/com/four/system/mapper/SysUserMapper.java index 595473e..97ee840 100644 --- a/src/main/java/com/four/system/mapper/SysUserMapper.java +++ b/src/main/java/com/four/system/mapper/SysUserMapper.java @@ -150,4 +150,12 @@ public interface SysUserMapper public int insertHealthUser(SysUser sysUser); SysUser selectHealthUserById(Long userId); + + int insertSysUser(SysUser sysUser); + + /** + * 注册医生添加用户信息表 + * @param sysUser + * @return + */ } diff --git a/src/main/java/com/four/system/service/ISysUserService.java b/src/main/java/com/four/system/service/ISysUserService.java index 385d59a..650ba8d 100644 --- a/src/main/java/com/four/system/service/ISysUserService.java +++ b/src/main/java/com/four/system/service/ISysUserService.java @@ -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); } diff --git a/src/main/java/com/four/system/service/impl/SysConfigServiceImpl.java b/src/main/java/com/four/system/service/impl/SysConfigServiceImpl.java index 1d8c0a5..10c51c2 100644 --- a/src/main/java/com/four/system/service/impl/SysConfigServiceImpl.java +++ b/src/main/java/com/four/system/service/impl/SysConfigServiceImpl.java @@ -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 */ diff --git a/src/main/java/com/four/system/service/impl/SysUserServiceImpl.java b/src/main/java/com/four/system/service/impl/SysUserServiceImpl.java index 0e18e88..bdbe95d 100644 --- a/src/main/java/com/four/system/service/impl/SysUserServiceImpl.java +++ b/src/main/java/com/four/system/service/impl/SysUserServiceImpl.java @@ -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 users = SpringUtils.getAopProxy(this).selectUserList(user); + List 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; + } + + + + } diff --git a/src/main/resources/mapper/system/SysUserMapper.xml b/src/main/resources/mapper/system/SysUserMapper.xml index a55033e..64bc57a 100644 --- a/src/main/resources/mapper/system/SysUserMapper.xml +++ b/src/main/resources/mapper/system/SysUserMapper.xml @@ -169,62 +169,136 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" insert into sys_user( - user_id, - dept_id, - user_name, - nick_name, - user_type, + user_id, + dept_id, + user_name, + nick_name, + user_type, email, phonenumber, sex, avatar, password, status, - del_flag, - login_ip, - login_date, - create_by, - create_time, - update_by, - update_time, + del_flag, + login_ip, + login_date, + create_by, + create_time, + update_time, remark, - user_sign, - bind_wechat_status, - real_name_authentication_status, - bind_bank_card_status, - user_money, - invitation_code, + user_sign, + bind_wechat_status, + real_name_authentication_status, + bind_bank_card_status, + user_money, + invitation_code, create_time )values( - #{userId}, - #{deptId}, - #{userName}, - #{nickName}, - #{userType}, + #{userId}, + #{deptId}, + #{userName}, + #{nickName}, + #{userType}, #{email}, #{phonenumber}, #{sex}, #{avatar}, #{password}, #{status}, - #{delFlag}, - #{loginIp}, - #{loginDate}, - #{createBy}, - #{createTime}, - #{updateBy}, - #{updateTime}, + #{delFlag}, + #{loginIp}, + #{loginDate}, + #{createBy}, + #{createTime}, + #{updateBy}, + #{updateTime}, #{remark}, - #{userSign}, - #{bindWechatStatus}, - #{realNameAuthenticationStatus}, - #{bindBankCardStatus}, - #{userMoney}, - #{invitationCode}, + #{userSign}, + #{bindWechatStatus}, + #{realNameAuthenticationStatus}, + #{bindBankCardStatus}, + #{userMoney}, + #{invitationCode}, sysdate() ) + + + insert into registration_information( + registration_information_id, + user_id, + real_name, + affiliated_hospital, + medical_department_id, + professional_title_doctor_id, + personal_resume, + area_expertise, + number_patients_served, + consulting_price, + praise, + registration_information_examine_status, + registration_information_medic_status + )values( + #{registrationInformationId}, + #{userId}, + #{realName}, + #{affiliatedHospital}, + #{medicalDepartmentId}, + #{professionalTitleDoctorId}, + #{personalResume}, + #{areaExpertise}, + #{numberPatientsServed}, + #{consultingPrice}, + #{praise}, + #{registrationInformationExamineStatus}, + #{registrationInformationMedicStatus} + ) + + + insert into sys_user( + user_id, + dept_id, + user_name, + nick_name, + email, + password, + status, + del_flag, + login_date, + create_by, + create_time, + update_time, + bind_wechat_status, + real_name_authentication_status, + bind_bank_card_status, + user_money, + differential_state, + create_time + )values( + #{userId}, + #{deptId}, + #{userName}, + #{nickName}, + #{email}, + #{password}, + #{status}, + #{delFlag}, + #{loginDate}, + #{createBy}, + #{createTime}, + #{updateTime}, + #{bindWechatStatus}, + #{realNameAuthenticationStatus}, + #{bindBankCardStatus}, + #{userMoney}, + #{differentialState}, + sysdate() + ) + + + update sys_user