添加字段
This commit is contained in:
parent
22242610fe
commit
9f6db5430c
|
|
@ -16,6 +16,9 @@ import org.springframework.amqp.rabbit.annotation.RabbitListener;
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
import org.springframework.stereotype.Component;
|
import org.springframework.stereotype.Component;
|
||||||
|
|
||||||
|
import java.util.HashMap;
|
||||||
|
import java.util.Map;
|
||||||
|
|
||||||
@Slf4j
|
@Slf4j
|
||||||
@Component
|
@Component
|
||||||
public class WorkOrderMQListener {
|
public class WorkOrderMQListener {
|
||||||
|
|
@ -50,8 +53,24 @@ public class WorkOrderMQListener {
|
||||||
data.setWorkOrderId(workOrderMQDto.getId());
|
data.setWorkOrderId(workOrderMQDto.getId());
|
||||||
data.setOrgCode(workOrderMQDto.getOrgCode());
|
data.setOrgCode(workOrderMQDto.getOrgCode());
|
||||||
data.setStatus("1");
|
data.setStatus("1");
|
||||||
|
data.setNetUrl(workOrderMQDto.getNetUrl());
|
||||||
|
data.setAccountNo(workOrderMQDto.getAccountNo());
|
||||||
|
data.setPasswordText(workOrderMQDto.getPasswordText());
|
||||||
sysBaseAPI.updateById(data);
|
sysBaseAPI.updateById(data);
|
||||||
|
|
||||||
|
// var userInfo = { userName: record.tel, realname: record.name, orgCode: record.id, orgId: record.pkId }
|
||||||
|
Map<String,String> 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);
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -53,4 +53,7 @@ public class WorkOrderMQDto implements Serializable {
|
||||||
private String email;
|
private String email;
|
||||||
/**状态 1平台构建*/
|
/**状态 1平台构建*/
|
||||||
private String workType;
|
private String workType;
|
||||||
|
private java.lang.String netUrl;
|
||||||
|
private java.lang.String accountNo;
|
||||||
|
private java.lang.String passwordText;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -646,4 +646,6 @@ public interface ISysBaseAPI extends CommonAPI {
|
||||||
List<SysDepartEntity> queryAllAuditPassOrg(SysDepartEntity queryParams);
|
List<SysDepartEntity> queryAllAuditPassOrg(SysDepartEntity queryParams);
|
||||||
|
|
||||||
void updateById(SysDepartEntity sysDepartEntity);
|
void updateById(SysDepartEntity sysDepartEntity);
|
||||||
|
|
||||||
|
void initialization(Map<String, String> map);
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -297,4 +297,7 @@ public class SysDepartEntity implements Serializable {
|
||||||
private String oldDirectorUserIds;
|
private String oldDirectorUserIds;
|
||||||
//update-end---author:wangshuai ---date:20200308 for:[JTC-119]新增字段负责人ids和旧的负责人ids
|
//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;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -491,6 +491,13 @@ public class SysDepart implements Serializable {
|
||||||
private java.lang.String orgDistrict;
|
private java.lang.String orgDistrict;
|
||||||
|
|
||||||
//update-begin---author:wangshuai ---date:20200308 for:[JTC-119]在部门管理菜单下设置部门负责人,新增字段负责人ids和旧的负责人ids
|
//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
|
* 部门负责人的ids
|
||||||
*/
|
*/
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,7 @@
|
||||||
package org.jeecg.modules.system.service.impl;
|
package org.jeecg.modules.system.service.impl;
|
||||||
|
|
||||||
import cn.hutool.core.bean.BeanUtil;
|
import cn.hutool.core.bean.BeanUtil;
|
||||||
|
import cn.hutool.core.util.RandomUtil;
|
||||||
import com.alibaba.fastjson.JSON;
|
import com.alibaba.fastjson.JSON;
|
||||||
import com.alibaba.fastjson.JSONArray;
|
import com.alibaba.fastjson.JSONArray;
|
||||||
import com.alibaba.fastjson.JSONObject;
|
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.base.Joiner;
|
||||||
import com.google.common.collect.Maps;
|
import com.google.common.collect.Maps;
|
||||||
import org.apache.commons.compress.utils.Lists;
|
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.api.ISysBaseAPI;
|
||||||
import org.jeecg.common.system.entity.SysDepartEntity;
|
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.entity.SysMessageTemplate;
|
||||||
import org.jeecg.modules.message.handle.impl.DdSendMsgHandle;
|
import org.jeecg.modules.message.handle.impl.DdSendMsgHandle;
|
||||||
import org.jeecg.modules.message.handle.impl.EmailSendMsgHandle;
|
import org.jeecg.modules.message.handle.impl.EmailSendMsgHandle;
|
||||||
|
|
@ -1984,4 +1987,51 @@ public class SysBaseApiImpl implements ISysBaseAPI {
|
||||||
BeanUtils.copyProperties(sysDepartEntity,sysDepart);
|
BeanUtils.copyProperties(sysDepartEntity,sysDepart);
|
||||||
sysDepartService.updateById(sysDepart);
|
sysDepartService.updateById(sysDepart);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void initialization(Map<String, String> map) {
|
||||||
|
Map<String,String> 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);
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue