修改平台用户

amos-boot-system-jxiop/amos-boot-module-jxiop-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/service/impl/PersonBasicServiceImpl.java

@@ -167,13 +167,57 @@ public class PersonBasicServiceImpl extends BaseService<PersonBasicDto,PersonBas
         //获取人员账号信息
         PersonAccount personAccount = model.getPersonAccount();
 
+        //新增平台账号
+        //组装数据
+        AgencyUserModel usd=new AgencyUserModel();
+        //应用
+        usd.setAppCodes(personAccount.getApplication());
+        //手机号
+        usd.setMobile(personUser.getPhone());
+        //角色
+        Map<Long,List<Long>> map=new HashMap<>();
+        List<Long> cdids = personAccount.getRoles().stream().map(s -> Long.parseLong(s.trim())).collect(Collectors.toList()); //测点数组
+        if(personUser.getDepartmentId()!=null){
+
+            map.put(personUser.getDepartmentId(),cdids);
+        }else{
+            map.put(personUser.getProjectId(),cdids);
+        }
+        usd.setOrgRoleSeqs(map);
+        //密码
+        usd.setPassword(DesUtil.encode(personAccount.getPassword(), "qaz"));
+        //二次密码
+        usd.setRePassword(DesUtil.encode(personAccount.getSecondaryPassword(), "qaz"));
+        //用户名
+        usd.setRealName(personUser.getName());
+        //账号
+        usd.setUserName(personAccount.getAccountName());
+        usd.setLockStatus("UNLOCK");
+        //新增平台用户
+        AgencyUserModel agencyUserModel=this.updateuser(personAccount.getUserId(),usd);
+        //查询部门
+        DepartmentModel departmentModel=null;
+        if(personUser.getDepartmentId()!=null){
+            departmentModel= this.getdepartmentModel(personUser.getDepartmentId());
+        }
+        CompanyModel companyModel=new CompanyModel();
+        //单位
+        companyModel=this.getCompanyModel(personUser.getProjectId());
+
         //人员基础信息
         PersonBasic personBasic = new PersonBasic();
         BeanUtils.copyProperties(personUser, personBasic);
+        if(departmentModel!=null){
+            personBasic.setOrgCode(departmentModel.getOrgCode());
+        }else{
+            personBasic.setOrgCode(companyModel.getOrgCode());
+        }
         this.personBasicMapper.updateById(personBasic);
         //人员归属信息
         PersonAscription personAscription = new PersonAscription();
         BeanUtils.copyProperties(personUser, personAscription);
+        personAscription.setDepartmentName(departmentModel.getDepartmentName());
+        personAscription.setProjectName(companyModel.getCompanyName());
         personAscriptionService.saveOrUpdate(personAscription);
         //人员归属信息
         PersonSkillEducation personSkillEducation = new PersonSkillEducation();
@@ -248,7 +292,7 @@ public class PersonBasicServiceImpl extends BaseService<PersonBasicDto,PersonBas
     }
 
     //修改平台用户
-    private AgencyUserModel update(String userId, AgencyUserModel userDto) {
+    private AgencyUserModel updateuser(String userId, AgencyUserModel userDto) {
         FeignClientResult<AgencyUserModel>  amosUser=Privilege.agencyUserClient.update(userDto,userId);
         AgencyUserModel user=new AgencyUserModel();