Skip to content

A
amos-boot-biz
Commit 51ef7f2c authored by 曹盼盼's avatar 曹盼盼
Browse files
Options

修改

parent 2f572f2b
Hide whitespace changes
Inline Side-by-side
Showing with 68 additions and 65 deletions
amos-boot-system-ugp/amos-boot-module-ugp-biz/src/main/java/com/yeejoin/amos/boot/module/ugp/biz/service/impl/CompanyServiceImpl.java
View file @ 51ef7f2c
...@@ -174,81 +174,84 @@ public class CompanyServiceImpl extends BaseService<CompanyDto, Company, Company ...@@ -174,81 +174,84 @@ public class CompanyServiceImpl extends BaseService<CompanyDto, Company, Company
Map<Long,List<RoleModel>> orgRoles = new HashMap<>(); Map<Long,List<RoleModel>> orgRoles = new HashMap<>();
Set<String> appCodeSet = new HashSet<>(); Set<String> appCodeSet = new HashSet<>();
Company company = companyMapper.selectById(sequenceNbr); Company company = companyMapper.selectById(sequenceNbr);
if (!ValidationUtil.isEmpty(company)&& "已审核".equals(company.getApproved())){ company.setApproved(model.getApproved());
company.setApproved(model.getApproved()); if (!ValidationUtil.isEmpty(company)) {
final CompanyModel companyModel = new CompanyModel(); if ("已审核".equals(company.getApproved())){
AgencyUserModel agencyUserModel = new AgencyUserModel(); final CompanyModel companyModel = new CompanyModel();
AgencyUserModel agencyUserModel = new AgencyUserModel();
//创建平台企业 //创建平台企业
companyModel.setCompanyName(company.getName()); companyModel.setCompanyName(company.getName());
companyModel.setCompanyCode(company.getCreditCode()); companyModel.setCompanyCode(company.getCreditCode());
companyModel.setAddress(company.getAddress()); companyModel.setAddress(company.getAddress());
companyModel.setParentId(0L); companyModel.setParentId(0L);
companyModel.setLevel("headquarter"); companyModel.setLevel("headquarter");
companyModel.setAgencyCode("ugp"); companyModel.setAgencyCode("ugp");
CompanyModel companyModelFeignClient = Privilege.companyClient.create(companyModel).getResult(); CompanyModel companyModelFeignClient = Privilege.companyClient.create(companyModel).getResult();
//创建平台用户 //创建平台用户
//设置用户角色 //设置用户角色
List<RoleModel> allRoleList = Privilege.roleClient.queryRoleList(null,null).getResult(); List<RoleModel> allRoleList = Privilege.roleClient.queryRoleList(null,null).getResult();
String[] unitTypeCodes = company.getType().split(","); String[] unitTypeCodes = company.getType().split(",");
for(String code : unitTypeCodes) { for(String code : unitTypeCodes) {
roleNameSet.add(OrgEnum.map.get(code)); roleNameSet.add(OrgEnum.map.get(code));
if(!ValidationUtil.isEmpty(OrgEnum.codeMap.get(code))){ if(!ValidationUtil.isEmpty(OrgEnum.codeMap.get(code))){
String[] codes = OrgEnum.codeMap.get(code).split(","); String[] codes = OrgEnum.codeMap.get(code).split(",");
for(int i = 0;i <codes.length; i++){ for(int i = 0;i <codes.length; i++){
if(!appCodeSet.contains(codes[i])){ if(!appCodeSet.contains(codes[i])){
appCodeSet.add(codes[i]); appCodeSet.add(codes[i]);
}
} }
} }
} }
} Iterator iterator = roleNameSet.iterator();
Iterator iterator = roleNameSet.iterator();
allRoleList.stream().forEach(r -> { allRoleList.stream().forEach(r -> {
if(roleNameSet.contains(r.getRoleName())){ if(roleNameSet.contains(r.getRoleName())){
userRoleList.add(r); userRoleList.add(r);
} }
}); });
userRoleList.stream().forEach(r -> { userRoleList.stream().forEach(r -> {
roleIds.add(r.getSequenceNbr()); roleIds.add(r.getSequenceNbr());
}); });
roleSeqsMap.put(companyModelFeignClient.getSequenceNbr(),roleIds); roleSeqsMap.put(companyModelFeignClient.getSequenceNbr(),roleIds);
orgRoles.put(companyModelFeignClient.getSequenceNbr(),userRoleList); orgRoles.put(companyModelFeignClient.getSequenceNbr(),userRoleList);
agencyUserModel.setOrgRoleSeqs(roleSeqsMap); agencyUserModel.setOrgRoleSeqs(roleSeqsMap);
agencyUserModel.setOrgRoles(orgRoles); agencyUserModel.setOrgRoles(orgRoles);
//设置用户信息 //设置用户信息
String adminName = company.getAdminName(); String adminName = company.getAdminName();
String adminLoginName = company.getAdminLoginName(); String adminLoginName = company.getAdminLoginName();
String adminPhone = company.getAdminTel(); String adminPhone = company.getAdminTel();
String adminPassword = company.getAdminLoginPwd(); String adminPassword = company.getAdminLoginPwd();
agencyUserModel.setRealName(adminName); agencyUserModel.setRealName(adminName);
agencyUserModel.setAgencyCode("ugp"); agencyUserModel.setAgencyCode("ugp");
agencyUserModel.setLockStatus("UNLOCK"); agencyUserModel.setLockStatus("UNLOCK");
agencyUserModel.setMobile(adminPhone); agencyUserModel.setMobile(adminPhone);
agencyUserModel.setCreateTime(new Date()); agencyUserModel.setCreateTime(new Date());
agencyUserModel.setUserName(adminLoginName); agencyUserModel.setUserName(adminLoginName);
agencyUserModel.setPassword(DesUtil.encode(adminPassword, secretKey)); agencyUserModel.setPassword(DesUtil.encode(adminPassword, secretKey));
agencyUserModel.setRePassword(DesUtil.encode(adminPassword, secretKey)); agencyUserModel.setRePassword(DesUtil.encode(adminPassword, secretKey));
List<String> appCodes = new ArrayList<>(appCodeSet); List<String> appCodes = new ArrayList<>(appCodeSet);
agencyUserModel.setAppCodes(appCodes); agencyUserModel.setAppCodes(appCodes);
agencyUserModel = Privilege.agencyUserClient.create(agencyUserModel).getResult(); agencyUserModel = Privilege.agencyUserClient.create(agencyUserModel).getResult();
//企业动态表单存储 //企业动态表单存储
JSONObject jsonObject = JSON.parseObject(JSON.toJSONString(company)); JSONObject jsonObject = JSON.parseObject(JSON.toJSONString(company));
jsonObject.put("amosOrgId",companyModelFeignClient.getSequenceNbr()); jsonObject.put("amosOrgId",companyModelFeignClient.getSequenceNbr());
jsonObject.put("amosOrgCode",companyModelFeignClient.getOrgCode()); jsonObject.put("amosOrgCode",companyModelFeignClient.getOrgCode());
orgServiceImpl.dataHandling(jsonObject,bizOrgType,null); orgServiceImpl.dataHandling(jsonObject,bizOrgType,null);
//企业管理员人员 动态表单存储 //企业管理员人员 动态表单存储
jsonObject = new JSONObject(); jsonObject = new JSONObject();
jsonObject.put("name",adminName); jsonObject.put("name",adminName);
jsonObject.put("phone",adminPhone); jsonObject.put("phone",adminPhone);
jsonObject.put("amosOrgId",agencyUserModel.getSequenceNbr()); jsonObject.put("amosOrgId",agencyUserModel.getSequenceNbr());
jsonObject.put("isCheck",companyModelFeignClient.getSequenceNbr()); jsonObject.put("isCheck",companyModelFeignClient.getSequenceNbr());
orgServiceImpl.dataHandling(jsonObject, OrgEnum.普通人员.getKey(),null); orgServiceImpl.dataHandling(jsonObject, OrgEnum.普通人员.getKey(),null);
}
} }
return this.updateById(company); return this.updateById(company);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment