diff --git a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/mq/workorder/listener/WorkOrderMQListener.java b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/mq/workorder/listener/WorkOrderMQListener.java index c67e8b1..b342153 100644 --- a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/mq/workorder/listener/WorkOrderMQListener.java +++ b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/mq/workorder/listener/WorkOrderMQListener.java @@ -16,6 +16,9 @@ import org.springframework.amqp.rabbit.annotation.RabbitListener; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; +import java.util.HashMap; +import java.util.Map; + @Slf4j @Component public class WorkOrderMQListener { @@ -50,8 +53,24 @@ public class WorkOrderMQListener { data.setWorkOrderId(workOrderMQDto.getId()); data.setOrgCode(workOrderMQDto.getOrgCode()); data.setStatus("1"); + data.setNetUrl(workOrderMQDto.getNetUrl()); + data.setAccountNo(workOrderMQDto.getAccountNo()); + data.setPasswordText(workOrderMQDto.getPasswordText()); sysBaseAPI.updateById(data); + +// var userInfo = { userName: record.tel, realname: record.name, orgCode: record.id, orgId: record.pkId } + Map map = new HashMap<>(); + map.put("userName", workOrderMQDto.getAccountNo()); + map.put("realname", "管理员"); + map.put("orgCode", workOrderMQDto.getId()); + map.put("orgId", workOrderMQDto.getOrgId()); + map.put("password", workOrderMQDto.getPasswordText()); + sysBaseAPI.initialization(map); + + } } + + } diff --git a/nursing-unit-common/src/main/java/com/nu/dto/WorkOrderMQDto.java b/nursing-unit-common/src/main/java/com/nu/dto/WorkOrderMQDto.java index 12e0493..c998ff9 100644 --- a/nursing-unit-common/src/main/java/com/nu/dto/WorkOrderMQDto.java +++ b/nursing-unit-common/src/main/java/com/nu/dto/WorkOrderMQDto.java @@ -53,4 +53,7 @@ public class WorkOrderMQDto implements Serializable { private String email; /**状态 1平台构建*/ private String workType; + private java.lang.String netUrl; + private java.lang.String accountNo; + private java.lang.String passwordText; } diff --git a/nursing-unit-system/nu-system-api/nu-system-local-api/src/main/java/org/jeecg/common/system/api/ISysBaseAPI.java b/nursing-unit-system/nu-system-api/nu-system-local-api/src/main/java/org/jeecg/common/system/api/ISysBaseAPI.java index 1c525e1..082bccf 100644 --- a/nursing-unit-system/nu-system-api/nu-system-local-api/src/main/java/org/jeecg/common/system/api/ISysBaseAPI.java +++ b/nursing-unit-system/nu-system-api/nu-system-local-api/src/main/java/org/jeecg/common/system/api/ISysBaseAPI.java @@ -646,4 +646,6 @@ public interface ISysBaseAPI extends CommonAPI { List queryAllAuditPassOrg(SysDepartEntity queryParams); void updateById(SysDepartEntity sysDepartEntity); + + void initialization(Map map); } diff --git a/nursing-unit-system/nu-system-api/nu-system-local-api/src/main/java/org/jeecg/common/system/entity/SysDepartEntity.java b/nursing-unit-system/nu-system-api/nu-system-local-api/src/main/java/org/jeecg/common/system/entity/SysDepartEntity.java index 578c7c3..7ec1a4c 100644 --- a/nursing-unit-system/nu-system-api/nu-system-local-api/src/main/java/org/jeecg/common/system/entity/SysDepartEntity.java +++ b/nursing-unit-system/nu-system-api/nu-system-local-api/src/main/java/org/jeecg/common/system/entity/SysDepartEntity.java @@ -297,4 +297,7 @@ public class SysDepartEntity implements Serializable { private String oldDirectorUserIds; //update-end---author:wangshuai ---date:20200308 for：[JTC-119]新增字段负责人ids和旧的负责人ids + private java.lang.String netUrl; + private java.lang.String accountNo; + private java.lang.String passwordText; } diff --git a/nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/system/entity/SysDepart.java b/nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/system/entity/SysDepart.java index 8c00061..462f731 100644 --- a/nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/system/entity/SysDepart.java +++ b/nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/system/entity/SysDepart.java @@ -491,6 +491,13 @@ public class SysDepart implements Serializable { private java.lang.String orgDistrict; //update-begin---author:wangshuai ---date:20200308 for：[JTC-119]在部门管理菜单下设置部门负责人，新增字段负责人ids和旧的负责人ids + + + private java.lang.String netUrl; + private java.lang.String accountNo; + private java.lang.String passwordText; + + /** * 部门负责人的ids */ diff --git a/nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysBaseApiImpl.java b/nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysBaseApiImpl.java index 81748b9..46cebe5 100644 --- a/nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysBaseApiImpl.java +++ b/nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysBaseApiImpl.java @@ -1,6 +1,7 @@ package org.jeecg.modules.system.service.impl; import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.util.RandomUtil; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; @@ -13,8 +14,10 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.google.common.base.Joiner; import com.google.common.collect.Maps; import org.apache.commons.compress.utils.Lists; +import org.jeecg.common.api.vo.Result; import org.jeecg.common.system.api.ISysBaseAPI; import org.jeecg.common.system.entity.SysDepartEntity; +import org.jeecg.common.util.PasswordUtil; import org.jeecg.modules.message.entity.SysMessageTemplate; import org.jeecg.modules.message.handle.impl.DdSendMsgHandle; import org.jeecg.modules.message.handle.impl.EmailSendMsgHandle; @@ -1984,4 +1987,51 @@ public class SysBaseApiImpl implements ISysBaseAPI { BeanUtils.copyProperties(sysDepartEntity,sysDepart); sysDepartService.updateById(sysDepart); } + + @Override + public void initialization(Map map) { + Map result = new HashMap<>(); + String selectedRoles = "f6817f48af4fb3af11b9e8bf182f618b"; + String selectedDeparts = ""; + try { + SysUser user = new SysUser(); +// JSON.parseObject(jsonObject.toJSONString(), SysUser.class); + String orgId = map.get("orgId"); + if(StringUtils.isNotBlank(orgId)){ + SysDepart depart = sysDepartService.getDepartById(orgId); + //生成六位随机数 + String random = RandomUtil.randomNumbers(6); + String password = map.get("password"); + selectedDeparts = depart.getId(); + user.setOrgCode(depart.getOrgCode()); + user.setWorkNo(depart.getOrgCode()+random); + user.setPassword(password); + user.setCreateTime(new Date());//设置创建时间 + String salt = oConvertUtils.randomGen(8); + user.setSalt(salt); + String passwordEncode = PasswordUtil.encrypt(user.getUsername(), user.getPassword(), salt); + user.setPassword(passwordEncode); + user.setStatus(1); + user.setDelFlag(CommonConstant.DEL_FLAG_0); + //用户表字段org_code不能在这里设置他的值 + user.setOrgCode(null); + // 保存用户走一个service 保证事务 + //获取租户ids + String relTenantIds = map.get("relTenantIds"); + String dataSourceCode = depart.getOrgCode(); + sysUserService.saveUserInitialization(dataSourceCode,user, selectedRoles, selectedDeparts, relTenantIds); + + //修改机构加盟申请信息 + SysDepartEntity sysDepartEntity = new SysDepartEntity(); + sysDepartEntity.setId(depart.getId()); + sysDepartEntity.setOrgStatus("5"); + updateById(sysDepartEntity); + } + + + + } catch (Exception e) { + log.error(e.getMessage(), e); + } + } }