From 99f67e978ed5d73ef50172bafa8ed4d9e08c4099 Mon Sep 17 00:00:00 2001 From: 侯瑞军 <411269194@kidgrow.com> Date: Fri, 05 Jun 2020 10:37:07 +0800 Subject: [PATCH] 1.新增和修改接口: (1)用户登录后返回信息接口 (2)用户注册 (3)诊断模版 (4)重置密码 修改密码 (5)设为超管 2.增加生成指定长度随机数common --- kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/impl/SysDoctorServiceImpl.java | 92 +++++++++++++++++++++++++++++++++++++--------- 1 files changed, 74 insertions(+), 18 deletions(-) diff --git a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/impl/SysDoctorServiceImpl.java b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/impl/SysDoctorServiceImpl.java index 6ee3454..ec7fa0d 100644 --- a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/impl/SysDoctorServiceImpl.java +++ b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/impl/SysDoctorServiceImpl.java @@ -1,39 +1,32 @@ package com.kidgrow.usercenter.service.impl; -import com.alibaba.fastjson.JSON; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.kidgrow.common.constant.CommonConstant; import com.kidgrow.common.constant.SecurityConstants; import com.kidgrow.common.model.*; +import com.kidgrow.common.service.impl.SuperServiceImpl; import com.kidgrow.redis.util.RedisConstant; import com.kidgrow.redis.util.RedisUtils; +import com.kidgrow.usercenter.mapper.SysDoctorMapper; import com.kidgrow.usercenter.mapper.SysRoleMapper; -import com.kidgrow.usercenter.mapper.SysRoleOrganizationMapper; import com.kidgrow.usercenter.mapper.SysUserRoleMapper; -import com.kidgrow.usercenter.model.SysRoleOrganization; +import com.kidgrow.usercenter.model.SysDoctor; import com.kidgrow.usercenter.model.SysRoleUser; -import com.kidgrow.usercenter.service.ISysRoleOrganizationService; +import com.kidgrow.usercenter.service.ISysDoctorService; import com.kidgrow.usercenter.service.ISysUserOrgService; import com.kidgrow.usercenter.service.ISysUserService; import com.kidgrow.usercenter.vo.SysDoctorDto; import com.kidgrow.usercenter.vo.SysDoctorVo; +import lombok.extern.slf4j.Slf4j; +import org.apache.commons.collections4.MapUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.cglib.beans.BeanCopier; import org.springframework.security.crypto.password.PasswordEncoder; import org.springframework.stereotype.Service; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.kidgrow.common.service.impl.SuperServiceImpl; - -import java.util.*; - -import org.apache.commons.collections4.MapUtils; -import lombok.extern.slf4j.Slf4j; - -import com.kidgrow.usercenter.model.SysDoctor; -import com.kidgrow.usercenter.mapper.SysDoctorMapper; -import com.kidgrow.usercenter.service.ISysDoctorService; import org.springframework.transaction.annotation.Transactional; import javax.servlet.http.HttpServletRequest; +import java.util.*; /** * 石家庄喜高科技有限责任公司 版权所有 © Copyright 2020<br> @@ -153,8 +146,8 @@ sysUser.setNickname(sysDoctor.getHospitalName()); sysUser.setHeadImgUrl(sysDoctor.getDoctorLogo()); sysUser.setMobile(sysDoctor.getDoctorTel()); - sysUser.setType("doctor"); - sysUser.setTenantId("hospital"); + sysUser.setType(CommonConstant.H_DOCTOR); + sysUser.setTenantId(CommonConstant.H_TENANT); sysUser.setCreateTime(new Date()); SysUser byId = iSysUserService.getById(id); if(byId!=null){ @@ -232,4 +225,67 @@ map.put("is_del",0); return baseMapper.selectByMap(map); } + + @Override + @Transactional + public ResultBody setAdminDoctor(Map<String, Object> params) { + Long id = MapUtils.getLong(params, "id"); + Long adminId = MapUtils.getLong(params, "adminId"); + if (id>0&&adminId>0) { + Map<String,Object> map= new HashMap<>(); + map.put("id",adminId); + SysDoctor sysDoctor=baseMapper.selectById(adminId); + //先检查操作用户是否管理员 + if(sysDoctor!=null){ + if (sysDoctor.getIsAdminUser()) { + //现将操作人员设为非管理 + sysDoctor=new SysDoctor(); + sysDoctor.setIsAdminUser(false); + if(baseMapper.updateById(sysDoctor)>0) + { + //再将新用户设为管理 + sysDoctor=baseMapper.selectById(id); + if (sysDoctor != null) { + if (!sysDoctor.getIsAdminUser()) { + sysDoctor=new SysDoctor(); + sysDoctor.setIsAdminUser(true); + if (baseMapper.updateById(sysDoctor)>0) { + return ResultBody.ok().data(true).msg("管理员设置成功!"); + } + else + { + return ResultBody.failed("设为管理失败!").data(false); + } + } + else + { + return ResultBody.failed("设为管理失败,改用户就是管理员!").data(false); + } + } + else + { + return ResultBody.failed("用户信息有误!").data(false); + } + } + else + { + return ResultBody.failed("设为管理失败!").data(false); + } + } + else + { + return ResultBody.failed("当前操作用户不是管理员!").data(false); + } + } + else + { + return ResultBody.failed("用户信息有误!").data(false); + } + + } + else + { + return ResultBody.failed("业务参数有误!").data(false); + } + } } -- Gitblit v1.8.0