机构加盟搭建完平台在业务中增加员工信息、用户表中机构负责人数据增加employees_id的值
This commit is contained in:
parent
65acd6e306
commit
77d5094d35
|
|
@ -2,6 +2,7 @@ package com.nu.modules.employeesInfo.mapper;
|
||||||
|
|
||||||
import com.nu.modules.employeesInfo.entity.BizEmployeesInfo;
|
import com.nu.modules.employeesInfo.entity.BizEmployeesInfo;
|
||||||
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
||||||
|
import org.apache.ibatis.annotations.Param;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @Description: 员工信息
|
* @Description: 员工信息
|
||||||
|
|
@ -11,4 +12,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
||||||
*/
|
*/
|
||||||
public interface BizEmployeesInfoMapper extends BaseMapper<BizEmployeesInfo> {
|
public interface BizEmployeesInfoMapper extends BaseMapper<BizEmployeesInfo> {
|
||||||
BizEmployeesInfo findById(BizEmployeesInfo bizEmployeesInfo);
|
BizEmployeesInfo findById(BizEmployeesInfo bizEmployeesInfo);
|
||||||
|
|
||||||
|
void UpUserEmployeesId(@Param("userId") String userId);
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,9 @@
|
||||||
<?xml version="1.0" encoding="UTF-8"?>
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
||||||
<mapper namespace="com.nu.modules.employeesInfo.mapper.BizEmployeesInfoMapper">
|
<mapper namespace="com.nu.modules.employeesInfo.mapper.BizEmployeesInfoMapper">
|
||||||
|
<update id="UpUserEmployeesId">
|
||||||
|
update sys_user set employees_id = id where id = #{userId}
|
||||||
|
</update>
|
||||||
|
|
||||||
<select id="findById" resultType="com.nu.modules.employeesInfo.entity.BizEmployeesInfo">
|
<select id="findById" resultType="com.nu.modules.employeesInfo.entity.BizEmployeesInfo">
|
||||||
select
|
select
|
||||||
|
|
|
||||||
|
|
@ -11,4 +11,6 @@ import com.baomidou.mybatisplus.extension.service.IService;
|
||||||
*/
|
*/
|
||||||
public interface IBizEmployeesInfoService extends IService<BizEmployeesInfo> {
|
public interface IBizEmployeesInfoService extends IService<BizEmployeesInfo> {
|
||||||
BizEmployeesInfo findById(BizEmployeesInfo bizEmployeesInfo);
|
BizEmployeesInfo findById(BizEmployeesInfo bizEmployeesInfo);
|
||||||
|
|
||||||
|
void UpUserEmployeesId(String userId);
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -38,6 +38,11 @@ public class BizEmployeesInfoServiceImpl extends ServiceImpl<BizEmployeesInfoMap
|
||||||
return baseMapper.findById(bizEmployeesInfo);
|
return baseMapper.findById(bizEmployeesInfo);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void UpUserEmployeesId(String userId) {
|
||||||
|
baseMapper.UpUserEmployeesId(userId);
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public List<Map<String, Object>> getPermissionList(String employeesId) {
|
public List<Map<String, Object>> getPermissionList(String employeesId) {
|
||||||
List<NuAppEmployeesPermission> permissionList = nuAppEmployeesPermissionService.listByEmployeesId(employeesId);
|
List<NuAppEmployeesPermission> permissionList = nuAppEmployeesPermissionService.listByEmployeesId(employeesId);
|
||||||
|
|
|
||||||
|
|
@ -125,5 +125,18 @@ public class DynamicQueueNameProvider {
|
||||||
return getSysUserInfoQueueName();
|
return getSysUserInfoQueueName();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public String getUpUserEmployeesIdQueueName() {
|
||||||
|
JSONObject deptInfo = sysBaseAPI.getDeptInfo();
|
||||||
|
String orgCode = deptInfo.getString("code");
|
||||||
|
if (StringUtils.isNotBlank(orgCode)) {
|
||||||
|
return orgCode + ".orgapply.upuseremployeesid";
|
||||||
|
} else {
|
||||||
|
return "";
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public String getUpUserEmployeesIdKeyName() {
|
||||||
|
return getUpUserEmployeesIdQueueName();
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1385,13 +1385,13 @@ public class EmployeesMQListener {
|
||||||
String employeeId = dto.getEmployeeId();
|
String employeeId = dto.getEmployeeId();
|
||||||
|
|
||||||
//需要初始化
|
//需要初始化
|
||||||
if(izInit.equals("Y")){
|
if (izInit.equals("Y")) {
|
||||||
|
|
||||||
QueryWrapper<BizEmployeesInfo> qw = new QueryWrapper<>();
|
QueryWrapper<BizEmployeesInfo> qw = new QueryWrapper<>();
|
||||||
qw.eq("id", employeeId);
|
qw.eq("id", employeeId);
|
||||||
BizEmployeesInfo employeesInfo = employeesInfoService.getOne(qw);
|
BizEmployeesInfo employeesInfo = employeesInfoService.getOne(qw);
|
||||||
SysUserEntity user = sysUserAPI.getOne(employeeId);
|
SysUserEntity user = sysUserAPI.getOne(employeeId);
|
||||||
if(user==null) {
|
if (user == null) {
|
||||||
// user = new SysUserEntity();
|
// user = new SysUserEntity();
|
||||||
// user.setUsername(employeesInfo.getTel());
|
// user.setUsername(employeesInfo.getTel());
|
||||||
// user.setRealname(employeesInfo.getName());
|
// user.setRealname(employeesInfo.getName());
|
||||||
|
|
@ -1422,14 +1422,14 @@ public class EmployeesMQListener {
|
||||||
//审核通过 - 给员工添加账号
|
//审核通过 - 给员工添加账号
|
||||||
JSONObject deptInfo = sysBaseAPI.getDeptInfo();
|
JSONObject deptInfo = sysBaseAPI.getDeptInfo();
|
||||||
JSONObject j = new JSONObject();
|
JSONObject j = new JSONObject();
|
||||||
j.put("userName",employeesInfo.getTel());
|
j.put("userName", employeesInfo.getTel());
|
||||||
j.put("realname",employeesInfo.getName());
|
j.put("realname", employeesInfo.getName());
|
||||||
j.put("orgCode",deptInfo.getString("id"));//这个参数要的是机构的id
|
j.put("orgCode", deptInfo.getString("id"));//这个参数要的是机构的id
|
||||||
j.put("opeType","employee");
|
j.put("opeType", "employee");
|
||||||
j.put("o_c_",deptInfo.getString("code"));
|
j.put("o_c_", deptInfo.getString("code"));
|
||||||
j.put("employees_id",employeeId);
|
j.put("employees_id", employeeId);
|
||||||
employeesApplyService.initialization(j);
|
employeesApplyService.initialization(j);
|
||||||
}else{
|
} else {
|
||||||
user.setUsername(employeesInfo.getTel());
|
user.setUsername(employeesInfo.getTel());
|
||||||
user.setRealname(employeesInfo.getName());
|
user.setRealname(employeesInfo.getName());
|
||||||
String salt = oConvertUtils.randomGen(8);
|
String salt = oConvertUtils.randomGen(8);
|
||||||
|
|
@ -1441,11 +1441,11 @@ public class EmployeesMQListener {
|
||||||
Date birthday = employeesInfo.getDateOfBirth();
|
Date birthday = employeesInfo.getDateOfBirth();
|
||||||
user.setBirthday(birthday);
|
user.setBirthday(birthday);
|
||||||
String sex = employeesInfo.getSex();
|
String sex = employeesInfo.getSex();
|
||||||
if(sex.equals("男")){
|
if (sex.equals("男")) {
|
||||||
user.setSex(1);
|
user.setSex(1);
|
||||||
}else if(sex.equals("女")){
|
} else if (sex.equals("女")) {
|
||||||
user.setSex(2);
|
user.setSex(2);
|
||||||
}else{
|
} else {
|
||||||
user.setSex(0);
|
user.setSex(0);
|
||||||
}
|
}
|
||||||
user.setPhone(employeesInfo.getTel());
|
user.setPhone(employeesInfo.getTel());
|
||||||
|
|
@ -1455,10 +1455,10 @@ public class EmployeesMQListener {
|
||||||
user.setUpdateTime(new Date());//设置创建时间
|
user.setUpdateTime(new Date());//设置创建时间
|
||||||
sysUserAPI.updateById(user);
|
sysUserAPI.updateById(user);
|
||||||
}
|
}
|
||||||
}else{
|
} else {
|
||||||
//不需要初始化,从其他业务结构复制过来
|
//不需要初始化,从其他业务结构复制过来
|
||||||
SysUserEntity user = sysUserAPI.getOne(employeeId);
|
SysUserEntity user = sysUserAPI.getOne(employeeId);
|
||||||
if(user==null) {
|
if (user == null) {
|
||||||
user = new SysUserEntity();
|
user = new SysUserEntity();
|
||||||
user.setUsername(dto.getUsername());
|
user.setUsername(dto.getUsername());
|
||||||
user.setRealname(dto.getRealname());
|
user.setRealname(dto.getRealname());
|
||||||
|
|
@ -1474,7 +1474,7 @@ public class EmployeesMQListener {
|
||||||
user.setCreateTime(new Date());//设置创建时间
|
user.setCreateTime(new Date());//设置创建时间
|
||||||
user.setEmployeesId(employeeId);
|
user.setEmployeesId(employeeId);
|
||||||
sysUserAPI.save(user);
|
sysUserAPI.save(user);
|
||||||
}else{
|
} else {
|
||||||
user.setUsername(dto.getUsername());
|
user.setUsername(dto.getUsername());
|
||||||
user.setRealname(dto.getRealname());
|
user.setRealname(dto.getRealname());
|
||||||
user.setPassword(dto.getPassword());
|
user.setPassword(dto.getPassword());
|
||||||
|
|
@ -1491,16 +1491,16 @@ public class EmployeesMQListener {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if(izInitPassword.equals("1")){
|
if (izInitPassword.equals("1")) {
|
||||||
//需要更新其他业务平台密码
|
//需要更新其他业务平台密码
|
||||||
SysUserEntity user = sysUserAPI.getOne(employeeId);
|
SysUserEntity user = sysUserAPI.getOne(employeeId);
|
||||||
if(user!=null){
|
if (user != null) {
|
||||||
SysUserMQDto sysUserMQDto = new SysUserMQDto();
|
SysUserMQDto sysUserMQDto = new SysUserMQDto();
|
||||||
BeanUtils.copyProperties(user, sysUserMQDto);
|
BeanUtils.copyProperties(user, sysUserMQDto);
|
||||||
sysUserMQDto.setEmployeeId(user.getEmployeesId());
|
sysUserMQDto.setEmployeeId(user.getEmployeesId());
|
||||||
rabbitMQUtil.sendToExchange("hldy.employees", "hldy.employeesorg.sysuser.sync", sysUserMQDto);
|
rabbitMQUtil.sendToExchange("hldy.employees", "hldy.employeesorg.sysuser.sync", sysUserMQDto);
|
||||||
}
|
}
|
||||||
}else{
|
} else {
|
||||||
JSONObject deptInfo = sysBaseAPI.getDeptInfo();
|
JSONObject deptInfo = sysBaseAPI.getDeptInfo();
|
||||||
String orgCode = deptInfo.getString("code");
|
String orgCode = deptInfo.getString("code");
|
||||||
SysUserMQDto sysUserMQDto = new SysUserMQDto();
|
SysUserMQDto sysUserMQDto = new SysUserMQDto();
|
||||||
|
|
@ -1525,7 +1525,7 @@ public class EmployeesMQListener {
|
||||||
)
|
)
|
||||||
public void handleSyncSysUserPwd(SysUserMQDto dto) {
|
public void handleSyncSysUserPwd(SysUserMQDto dto) {
|
||||||
SysUserEntity user = sysUserAPI.getOne(dto.getEmployeeId());
|
SysUserEntity user = sysUserAPI.getOne(dto.getEmployeeId());
|
||||||
if(user!=null) {
|
if (user != null) {
|
||||||
user.setPassword(dto.getPassword());
|
user.setPassword(dto.getPassword());
|
||||||
user.setSalt(dto.getSalt());
|
user.setSalt(dto.getSalt());
|
||||||
sysUserAPI.updateById(user);
|
sysUserAPI.updateById(user);
|
||||||
|
|
@ -1550,7 +1550,7 @@ public class EmployeesMQListener {
|
||||||
// QueryWrapper<SysUserEntity> queryWrapper = new QueryWrapper<>();
|
// QueryWrapper<SysUserEntity> queryWrapper = new QueryWrapper<>();
|
||||||
// queryWrapper.eq("employees_id", employeeId);
|
// queryWrapper.eq("employees_id", employeeId);
|
||||||
SysUserEntity user = sysUserAPI.getOne(dto.getEmployeeId());
|
SysUserEntity user = sysUserAPI.getOne(dto.getEmployeeId());
|
||||||
if(user!=null) {
|
if (user != null) {
|
||||||
SysUserMQDto sysUserMQDto = new SysUserMQDto();
|
SysUserMQDto sysUserMQDto = new SysUserMQDto();
|
||||||
BeanUtils.copyProperties(user, sysUserMQDto);
|
BeanUtils.copyProperties(user, sysUserMQDto);
|
||||||
sysUserMQDto.setTargetOrgCode(dto.getTargetOrgCode());
|
sysUserMQDto.setTargetOrgCode(dto.getTargetOrgCode());
|
||||||
|
|
@ -1562,6 +1562,7 @@ public class EmployeesMQListener {
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 同步更新密码
|
* 同步更新密码
|
||||||
|
*
|
||||||
* @param dto
|
* @param dto
|
||||||
*/
|
*/
|
||||||
@RabbitListener(
|
@RabbitListener(
|
||||||
|
|
@ -1582,4 +1583,36 @@ public class EmployeesMQListener {
|
||||||
en.setPassword(dto.getPassword());
|
en.setPassword(dto.getPassword());
|
||||||
sysUserAPI.updateById(en);
|
sysUserAPI.updateById(en);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 更新机构负责人用户表employees_id
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
@RabbitListener(
|
||||||
|
bindings = @QueueBinding(
|
||||||
|
value = @Queue(name = "#{employeesAsyncDQNP.getUpUserEmployeesIdQueueName()}"),
|
||||||
|
exchange = @Exchange(name = "hldy.org", type = ExchangeTypes.DIRECT),
|
||||||
|
key = "#{employeesAsyncDQNP.getUpUserEmployeesIdKeyName()}"
|
||||||
|
),
|
||||||
|
errorHandler = "employeesMQErrorHandler"
|
||||||
|
)
|
||||||
|
public void handleResetPW(EmployeesApplyMQDto dto) {
|
||||||
|
//入职时间 entryTime用当前时间
|
||||||
|
BizEmployeesInfo bizEmployeesInfo = new BizEmployeesInfo();
|
||||||
|
bizEmployeesInfo.setId(dto.getId());//机构负责人的数据id跟sys_user表id一致
|
||||||
|
bizEmployeesInfo.setName(dto.getName());//姓名
|
||||||
|
bizEmployeesInfo.setSex(dto.getSex());//性别
|
||||||
|
bizEmployeesInfo.setNational(dto.getNational());//民族
|
||||||
|
bizEmployeesInfo.setIdCard(dto.getIdCard());//身份证号
|
||||||
|
bizEmployeesInfo.setDateOfBirth(dto.getDateOfBirth());//出生日期
|
||||||
|
bizEmployeesInfo.setHouseAddress(dto.getHouseAddress());//地址
|
||||||
|
bizEmployeesInfo.setIdCardPositive(dto.getIdCardPositive());//身份证正面
|
||||||
|
bizEmployeesInfo.setIdCardNegative(dto.getIdCardNegative());//身份证反面
|
||||||
|
bizEmployeesInfo.setTel(dto.getTel());
|
||||||
|
bizEmployeesInfo.setOpenId(dto.getOpenId());
|
||||||
|
employeesInfoService.save(bizEmployeesInfo);
|
||||||
|
|
||||||
|
|
||||||
|
employeesInfoService.UpUserEmployeesId(dto.getId());
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue