将新增焊工接口改为新增人员接口并创建平台用户

amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/common/bo/ReginParams.java

@@ -32,14 +32,14 @@ public class ReginParams implements Serializable {
 
     @Data
     public static class BusinessInfo implements Serializable {
-        private Long amosBizCode;
-        private String companyName;
-        private Long companySequenceNbr;
-        private String companyType;
+        private Long amosBizCode; //平台企业code
+        private String companyName; //公司名称
+        private Long companySequenceNbr; //公司SequenceNbr（业务）
+        private String companyType; //公司类型
         private Long amosUserCode;
-        private String userName;
-        private Long userSequenceNbr;
-        private String userType;
+        private String userName; //用户名称
+        private Long userSequenceNbr; //用户sequenceNbr(业务)
+        private String userType; //用户类型
     }
 
     public BusinessInfo getBusinessInfo() {

amos-boot-system-ugp/amos-boot-module-ugp-api/src/main/java/com/yeejoin/amos/boot/module/ugp/api/Enum/OrgEnum.java

@@ -11,7 +11,7 @@ import java.util.HashMap;
 public enum OrgEnum {
     公司("COMPANY", "244", "公司",1),
     部门("DEPARTMENT", "245", "部门",2),
-    人员("PERSON", "246", "人员",3),
+    普通人员("PERSON", "246", "普通人员",3),
     焊工("WELDER","247","焊工",3),
     建设单位负责人("CHARGE","254","建设单位负责人",3),
     企业管理员("ADMIN","248","企业管理员",3),

amos-boot-system-ugp/amos-boot-module-ugp-biz/src/main/java/com/yeejoin/amos/boot/module/ugp/biz/controller/WelderController.java

@@ -64,10 +64,10 @@ public class WelderController extends BaseController {
      */
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @RequestMapping(value = "/saveWelder", method = RequestMethod.POST)
-    @ApiOperation(httpMethod = "POST", value = "新增焊工信息", notes = "新增焊工信息")
+    @ApiOperation(httpMethod = "POST", value = "新增人员信息", notes = "新增人员信息")
     public ResponseModel<OrgUsrDto> saveWelder(@RequestBody JSONObject jsonObject, @RequestParam String bizOrgType ,
                                             @RequestParam(required = false) String sequenceNbr) {
-        return ResponseHelper.buildResponse(orgServiceImpl.dataHandling(jsonObject,bizOrgType,sequenceNbr));
+        return ResponseHelper.buildResponse(welderServiceImpl.savePerson(jsonObject,bizOrgType,sequenceNbr));
     }
 
     /**

amos-boot-system-ugp/amos-boot-module-ugp-biz/src/main/java/com/yeejoin/amos/boot/module/ugp/biz/service/impl/CompanyServiceImpl.java

@@ -80,6 +80,7 @@ public class CompanyServiceImpl extends BaseService<CompanyDto, Company, Company
         List<RoleModel> userRoleList = new ArrayList<>();
         List<Long> roleIds = new ArrayList<>();
         Map<Long, List<Long>> roleSeqsMap = new HashMap<>();
+        Map<Long,List<RoleModel>> orgRoles = new HashMap<>();
 
         Company company = this.getById(sequenceNbr);
         company.setApproved(model.getApproved());
@@ -104,16 +105,14 @@ public class CompanyServiceImpl extends BaseService<CompanyDto, Company, Company
             for(String code : unitTypeCodes) {
                 roleNameSet.add(OrgEnum.map.get(code));
             }
-            allRoleList.stream().forEach(t -> {
-                if(roleNameSet.contains(t.getRoleName())) {
-                    userRoleList.add(t);
-                }
-            });
+            userRoleList = allRoleList.stream().filter(r -> r.getRoleName().equals(roleNameSet)).collect(Collectors.toList());
             userRoleList.stream().forEach(r -> {
                 roleIds.add(r.getSequenceNbr());
             });
             roleSeqsMap.put(companyModelFeignClient.getSequenceNbr(),roleIds);
+            orgRoles.put(companyModelFeignClient.getSequenceNbr(),userRoleList);
             agencyUserModel.setOrgRoleSeqs(roleSeqsMap);
+            agencyUserModel.setOrgRoles(orgRoles);
             //设置用户信息
             String adminName = company.getAdminName();
             String adminLoginName = company.getAdminLoginName();
@@ -140,7 +139,6 @@ public class CompanyServiceImpl extends BaseService<CompanyDto, Company, Company
             jsonObject.put("name",adminName);
             jsonObject.put("phone",adminPhone);
             jsonObject.put("amosOrgId",agencyUserModel.getSequenceNbr());
-            jsonObject.put("amosOrgCode",agencyUserModel.getUserId());
             orgServiceImpl.dataHandling(jsonObject, OrgEnum.企业管理员.getKey(),null);
         }
         return this.updateById(company);

amos-boot-system-ugp/amos-boot-module-ugp-biz/src/main/java/com/yeejoin/amos/boot/module/ugp/biz/service/impl/WelderServiceImpl.java

 package com.yeejoin.amos.boot.module.ugp.biz.service.impl;
 
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
+import com.yeejoin.amos.boot.module.common.api.dto.OrgUsrDto;
+import com.yeejoin.amos.boot.module.ugp.api.Enum.OrgEnum;
 import com.yeejoin.amos.boot.module.ugp.api.Enum.ProjectResourceEnum;
 import com.yeejoin.amos.boot.module.ugp.api.entity.Project;
 import com.yeejoin.amos.boot.module.ugp.api.entity.ProjectResource;
 import com.yeejoin.amos.boot.module.ugp.biz.framework.BusinessIdentify;
+import com.yeejoin.amos.feign.privilege.Privilege;
+import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
+import com.yeejoin.amos.feign.privilege.model.RoleModel;
+import com.yeejoin.amos.feign.privilege.util.DesUtil;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
+import java.util.stream.Collectors;
 
 @Service
 public class WelderServiceImpl {
@@ -27,6 +34,10 @@ public class WelderServiceImpl {
     @Autowired
     ProjectResourceServiceImpl projectResourceService;
 
+    @Value("${amos.secret.key}")
+    String secretKey;
+
+
 
     @BusinessIdentify
     public List<Map> getInfo(){
@@ -66,4 +77,52 @@ public class WelderServiceImpl {
         page.setTotal(getInfo().size());
         return page;
     }
+
+    /**
+     * 存人员信息至业务表及平台表
+     * @param jsonObject
+     * @param bizOrgType
+     * @param sequenceNbr
+     * @return
+     */
+    @BusinessIdentify
+    public OrgUsrDto savePerson(JSONObject jsonObject, String bizOrgType, String sequenceNbr){
+        Long companyId = orgService.getReginParams().getCompany().getSequenceNbr();
+        Set<String> roleNameSet = new HashSet<>();
+        List<RoleModel> userRoleList = new ArrayList<>();
+        List<Long> roleIds = new ArrayList<>();
+        Map<Long, List<Long>> roleSeqsMap = new HashMap<>();
+        AgencyUserModel agencyUserModel = new AgencyUserModel();
+        Map<Long,List<RoleModel>> orgRoles = new HashMap<>();
+        //用户基本信息
+        agencyUserModel.setRealName(jsonObject.getString("name"));
+        agencyUserModel.setAgencyCode("ugp");
+        agencyUserModel.setLockStatus("UNLOCK");
+        agencyUserModel.setMobile(jsonObject.getString("phone"));
+        agencyUserModel.setCreateTime(new Date());
+        agencyUserModel.setUserName(jsonObject.getString("phone"));
+        agencyUserModel.setPassword(DesUtil.encode(jsonObject.getString("phone"), secretKey));
+        agencyUserModel.setRePassword(DesUtil.encode(jsonObject.getString("phone"), secretKey));
+        //用户角色信息
+        List<RoleModel> allRoleList = Privilege.roleClient.queryRoleList(null,null).getResult();
+        if(1==jsonObject.getInteger("isWelder")){
+            roleNameSet.add(OrgEnum.焊工.getName());
+        } else {
+            roleNameSet.add(OrgEnum.普通人员.getName());
+        }
+        userRoleList = allRoleList.stream().filter(r -> r.getRoleName().equals(roleNameSet)).collect(Collectors.toList());
+        userRoleList.stream().forEach(r -> {
+            if (!roleIds.contains(r.getSequenceNbr())) {
+                roleIds.add(r.getSequenceNbr());
+            }
+        });
+        roleSeqsMap.put(companyId,roleIds);
+        orgRoles.put(companyId,userRoleList);
+        agencyUserModel.setOrgRoleSeqs(roleSeqsMap);
+        agencyUserModel.setOrgRoles(orgRoles);
+        //创建用户
+        agencyUserModel = Privilege.agencyUserClient.create(agencyUserModel).getResult();
+        jsonObject.put("amosOrgId",agencyUserModel.getSequenceNbr());
+        return orgService.dataHandling(jsonObject,bizOrgType,sequenceNbr);
+    }
 }