组织机构及人员调用平台顺序调整，现在调用顺序为业务-平台-业务

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

@@ -34,7 +34,7 @@ import java.util.stream.Collectors;
  * @date 2023-04-20
  */
 @Service
-public class PersonBasicServiceImpl extends BaseService<PersonBasicDto,PersonBasic,PersonBasicMapper> implements IPersonBasicService {
+public class PersonBasicServiceImpl extends BaseService<PersonBasicDto, PersonBasic, PersonBasicMapper> implements IPersonBasicService {
 
     @Autowired
     PersonBasicMapper personBasicMapper;
@@ -56,45 +56,62 @@ public class PersonBasicServiceImpl extends BaseService<PersonBasicDto,PersonBas
     /**
      * 分页查询
      */
-    public Page<PersonBasicDto> queryForPersonBasicPage(Page<PersonBasicDto> page)   {
+    public Page<PersonBasicDto> queryForPersonBasicPage(Page<PersonBasicDto> page) {
         return this.queryForPage(page, null, false);
     }
 
     /**
      * 列表查询 示例
      */
-    public List<PersonBasicDto> queryForPersonBasicList()   {
-        return this.queryForList("" , false);
+    public List<PersonBasicDto> queryForPersonBasicList() {
+        return this.queryForList("", false);
     }
 
     /**
      * 新增
-     * */
+     */
     @Transactional
-    public void addPerson(PersonDto model, HttpServletRequest httpServletRequest){
+    public void addPerson(PersonDto model, HttpServletRequest httpServletRequest) {
+
 
         //获取人员基本信息数据
-        PersonUser personUser =model.getPersonUser();
+        PersonUser personUser = model.getPersonUser();
         //获取人员资质信息
-        PersonCertificate personCertificate =model.getPersonCertificate();
+        PersonCertificate personCertificate = model.getPersonCertificate();
         //获取人员账号信息
-        PersonAccount personAccount =model.getPersonAccount();
+        PersonAccount personAccount = model.getPersonAccount();
+        //人员基础信息
+        PersonBasic personBasic = new PersonBasic();
+        BeanUtils.copyProperties(personUser, personBasic);
+        this.baseMapper.insert(personBasic);
+        //人员技能学历信息
+        PersonSkillEducation personSkillEducation = new PersonSkillEducation();
+        BeanUtils.copyProperties(personUser, personSkillEducation);
+        personSkillEducation.setPersonId(personBasic.getSequenceNbr());
+        personSkillEducationService.save(personSkillEducation);
+        //人员资质信息
+        personCertificate.setPersonId(personBasic.getSequenceNbr());
+
+        personCertificateService.save(personCertificate);
+        //人员账号信息
+        personAccount.setPersonId(personBasic.getSequenceNbr());
 
+        personAccountService.save(personAccount);
         //新增平台账号
         //组装数据
-        AgencyUserModel usd=new AgencyUserModel();
+        AgencyUserModel usd = new AgencyUserModel();
         //应用
         usd.setAppCodes(personAccount.getApplication());
         //手机号
         usd.setMobile(personUser.getPhone());
         //角色
-        Map<Long,List<Long>> map=new HashMap<>();
+        Map<Long, List<Long>> map = new HashMap<>();
         List<Long> cdids = personAccount.getRoles().stream().map(s -> Long.parseLong(s.trim())).collect(Collectors.toList()); //测点数组
-        if(personAccount.getDepartmentId()!=null){
+        if (personAccount.getDepartmentId() != null) {
 
-            map.put(personAccount.getDepartmentId(),cdids);
-        }else{
-            map.put(personAccount.getProjectId(),cdids);
+            map.put(personAccount.getDepartmentId(), cdids);
+        } else {
+            map.put(personAccount.getProjectId(), cdids);
         }
         usd.setOrgRoleSeqs(map);
         //密码
@@ -107,50 +124,34 @@ public class PersonBasicServiceImpl extends BaseService<PersonBasicDto,PersonBas
         usd.setUserName(personAccount.getAccountName());
         usd.setLockStatus("UNLOCK");
         //新增平台用户
-        AgencyUserModel agencyUserModel=this.setcreateUser(usd);
+        AgencyUserModel agencyUserModel = this.setcreateUser(usd);
         //查询部门
-        DepartmentModel departmentModel=null;
-        if(personAccount.getDepartmentId()!=null){
-            departmentModel= this.getdepartmentModel(personAccount.getDepartmentId());
+        DepartmentModel departmentModel = null;
+        if (personAccount.getDepartmentId() != null) {
+            departmentModel = this.getdepartmentModel(personAccount.getDepartmentId());
         }
-        CompanyModel companyModel=new CompanyModel();
+        CompanyModel companyModel = new CompanyModel();
         //单位
-        companyModel=this.getCompanyModel(personAccount.getProjectId());
-        //人员基础信息
-        PersonBasic personBasic = new PersonBasic();
-        BeanUtils.copyProperties(personUser,personBasic);
-        if(departmentModel!=null){
+        companyModel = this.getCompanyModel(personAccount.getProjectId());
+        if (departmentModel != null) {
             personBasic.setProjectOrgCode(departmentModel.getOrgCode());
             personAccount.setProjectDepartmentName(departmentModel.getDepartmentName());
-        }else{
+        } else {
             personBasic.setProjectOrgCode(companyModel.getOrgCode());
         }
 
-        if(!personUser.getNativePlace().isEmpty()){
+        if (!personUser.getNativePlace().isEmpty()) {
             personBasic.setNativePlace(JSON.toJSONString(personUser.getNativePlace()));
         }
-
-
-        this.baseMapper.insert(personBasic);
-        //人员技能学历信息
-        PersonSkillEducation personSkillEducation = new PersonSkillEducation();
-        BeanUtils.copyProperties(personUser,personSkillEducation);
-        personSkillEducation.setPersonId(personBasic.getSequenceNbr());
-        personSkillEducationService.save(personSkillEducation);
-        //人员资质信息
-        personCertificate.setPersonId(personBasic.getSequenceNbr());
-
-        personCertificateService.save(personCertificate);
-        //人员账号信息
-        personAccount.setPersonId(personBasic.getSequenceNbr());
         personAccount.setPuserId(agencyUserModel.getUserId());
         personAccount.setProjectName(companyModel.getCompanyName());
-        personAccountService.save(personAccount);
+        this.personBasicMapper.updateById(personBasic);
+        this.personAccountService.updateById(personAccount);
     }
 
 
     @Transactional
-    public PersonDto updatePerson(PersonDto model, HttpServletRequest httpServletRequest,Long sequenceNbr) {
+    public PersonDto updatePerson(PersonDto model, HttpServletRequest httpServletRequest, Long sequenceNbr) {
 
 
         //获取人员基本信息数据
@@ -159,22 +160,37 @@ public class PersonBasicServiceImpl extends BaseService<PersonBasicDto,PersonBas
         PersonCertificate personCertificate = model.getPersonCertificate();
         //获取人员账号信息
         PersonAccount personAccount = model.getPersonAccount();
-
+        //人员基础信息
+        PersonBasic personBasic = new PersonBasic();
+        personBasic.setSequenceNbr(sequenceNbr);
+        this.personBasicMapper.updateById(personBasic);
+        //人员归属信息
+        PersonSkillEducation personSkillEducation = new PersonSkillEducation();
+        BeanUtils.copyProperties(personUser, personSkillEducation);
+        personSkillEducation.setPersonId(personBasic.getSequenceNbr());
+        PersonSkillEducation personSkillEducationd = personSkillEducationService.getOne(new QueryWrapper<PersonSkillEducation>().eq("person_id", personBasic.getSequenceNbr()));
+        personSkillEducation.setSequenceNbr(personSkillEducationd.getSequenceNbr());
+        personSkillEducationService.updateById(personSkillEducation);
+        //人员资质信息
+        personCertificateService.updateById(personCertificate);
+        //人员账号信息
+        personAccount.setPersonId(sequenceNbr);
+        personAccountService.updateById(personAccount);
         //新增平台账号
         //组装数据
-        AgencyUserModel usd=new AgencyUserModel();
+        AgencyUserModel usd = new AgencyUserModel();
         //应用
         usd.setAppCodes(personAccount.getApplication());
         //手机号
         usd.setMobile(personUser.getPhone());
         //角色
-        Map<Long,List<Long>> map=new HashMap<>();
+        Map<Long, List<Long>> map = new HashMap<>();
         List<Long> cdids = personAccount.getRoles().stream().map(s -> Long.parseLong(s.trim())).collect(Collectors.toList()); //测点数组
-        if(personAccount.getDepartmentId()!=null){
+        if (personAccount.getDepartmentId() != null) {
 
-            map.put(personAccount.getDepartmentId(),cdids);
-        }else{
-            map.put(personAccount.getProjectId(),cdids);
+            map.put(personAccount.getDepartmentId(), cdids);
+        } else {
+            map.put(personAccount.getProjectId(), cdids);
         }
         usd.setOrgRoleSeqs(map);
         //密码
@@ -188,41 +204,28 @@ public class PersonBasicServiceImpl extends BaseService<PersonBasicDto,PersonBas
         usd.setLockStatus("UNLOCK");
         usd.setUserId(personAccount.getPuserId());
         //新增平台用户
-        AgencyUserModel agencyUserModel=this.updateuser(personAccount.getPuserId(),usd);
+        AgencyUserModel agencyUserModel = this.updateuser(personAccount.getPuserId(), usd);
         //查询部门
-        DepartmentModel departmentModel=null;
-        if(personAccount.getDepartmentId()!=null){
-            departmentModel= this.getdepartmentModel(personAccount.getDepartmentId());
+        DepartmentModel departmentModel = null;
+        if (personAccount.getDepartmentId() != null) {
+            departmentModel = this.getdepartmentModel(personAccount.getDepartmentId());
         }
-        CompanyModel companyModel=new CompanyModel();
+        CompanyModel companyModel = new CompanyModel();
         //单位
-        companyModel=this.getCompanyModel(personAccount.getProjectId());
-        //人员基础信息
-        PersonBasic personBasic = new PersonBasic();
-        personBasic.setSequenceNbr(sequenceNbr);
+        companyModel = this.getCompanyModel(personAccount.getProjectId());
+
         BeanUtils.copyProperties(personUser, personBasic);
-        if(departmentModel!=null){
+        if (departmentModel != null) {
             personBasic.setProjectOrgCode(departmentModel.getOrgCode());
             personAccount.setProjectDepartmentName(departmentModel.getDepartmentName());
-        }else{
+        } else {
             personBasic.setProjectOrgCode(companyModel.getOrgCode());
         }
-        if(personUser.getNativePlace()!=null){
+        if (personUser.getNativePlace() != null) {
             personBasic.setNativePlace(JSON.toJSONString(personUser.getNativePlace()));
         }
-        this.personBasicMapper.updateById(personBasic);
-        //人员归属信息
-        PersonSkillEducation personSkillEducation = new PersonSkillEducation();
-        BeanUtils.copyProperties(personUser, personSkillEducation);
-        personSkillEducation.setPersonId(personBasic.getSequenceNbr());
-        PersonSkillEducation personSkillEducationd= personSkillEducationService.getOne(new QueryWrapper<PersonSkillEducation>().eq("person_id", personBasic.getSequenceNbr()));
-        personSkillEducation.setSequenceNbr(personSkillEducationd.getSequenceNbr());
-        personSkillEducationService.updateById(personSkillEducation);
-        //人员资质信息
-        personCertificateService.updateById(personCertificate);
-        //人员账号信息
-        personAccount.setPersonId(sequenceNbr);
         personAccount.setProjectName(companyModel.getCompanyName());
+        this.personBasicMapper.updateById(personBasic);
         personAccountService.updateById(personAccount);
         return model;
     }
@@ -236,12 +239,12 @@ public class PersonBasicServiceImpl extends BaseService<PersonBasicDto,PersonBas
         wrapper1.eq("is_delete", 0);
         //人员基础信息
         PersonBasic personBasic = this.getOne(wrapper1);
-        BeanUtils.copyProperties(personBasic,personUser);
+        BeanUtils.copyProperties(personBasic, personUser);
         //人员技能学历信息
         QueryWrapper<PersonSkillEducation> wrapper2 = new QueryWrapper();
         wrapper2.eq("person_id", sequenceNbr);
-        PersonSkillEducation personSkillEducation =personSkillEducationService.getOne(wrapper2);
-        BeanUtils.copyProperties(personSkillEducation,personUser);
+        PersonSkillEducation personSkillEducation = personSkillEducationService.getOne(wrapper2);
+        BeanUtils.copyProperties(personSkillEducation, personUser);
 
 
         QueryWrapper<PersonCertificate> wrapper3 = new QueryWrapper();
@@ -253,10 +256,10 @@ public class PersonBasicServiceImpl extends BaseService<PersonBasicDto,PersonBas
         QueryWrapper<PersonAccount> wrapper4 = new QueryWrapper();
         wrapper4.eq("person_id", sequenceNbr);
         //人员账号信息
-        PersonAccount personAccount= personAccountService.getOne(wrapper4);
+        PersonAccount personAccount = personAccountService.getOne(wrapper4);
 
-        if(personBasic.getNativePlace()!=null){
-            personUser.setNativePlace(JSON.parseArray(personBasic.getNativePlace(),Integer.class));
+        if (personBasic.getNativePlace() != null) {
+            personUser.setNativePlace(JSON.parseArray(personBasic.getNativePlace(), Integer.class));
         }
         personDto.setPersonUser(personUser);
         personDto.setPersonCertificate(personCertificate);
@@ -265,31 +268,32 @@ public class PersonBasicServiceImpl extends BaseService<PersonBasicDto,PersonBas
     }
 
     @Transactional
-    public int deletePerson(String [] ids) {
+    public int deletePerson(String[] ids) {
 
         //查询所有平台用户
         QueryWrapper<PersonAccount> wrapper = new QueryWrapper();
-        wrapper.in("person_id",ids);
-        List<PersonAccount>  list=personAccountService.list(wrapper);
-        List<String> userid=new ArrayList<>();
+        wrapper.in("person_id", ids);
+        List<PersonAccount> list = personAccountService.list(wrapper);
+        List<String> userid = new ArrayList<>();
         for (PersonAccount personAccount : list) {
             userid.add(personAccount.getPuserId());
         }
-         //删除平台
-         this.deleuser(String.join(",",userid));
-        return personBasicMapper.deleteList(ids);
+        //删除平台
+        int deleteResult = personBasicMapper.deleteList(ids);
+        this.deleuser(String.join(",", userid));
+        return deleteResult;
     }
 
     //新增平台用户
-    private    AgencyUserModel setcreateUser(AgencyUserModel userDto) {
-        FeignClientResult<AgencyUserModel>  amosUser=Privilege.agencyUserClient.create(userDto);
+    private AgencyUserModel setcreateUser(AgencyUserModel userDto) {
+        FeignClientResult<AgencyUserModel> amosUser = Privilege.agencyUserClient.create(userDto);
 
-        AgencyUserModel user=new AgencyUserModel();
+        AgencyUserModel user = new AgencyUserModel();
 
         if (!ObjectUtils.isEmpty(amosUser)) {
-            if(amosUser.getStatus()==200){
-                user =  amosUser.getResult();
-            }else{
+            if (amosUser.getStatus() == 200) {
+                user = amosUser.getResult();
+            } else {
                 throw new RuntimeException(amosUser.getMessage());
             }
         }
@@ -298,13 +302,13 @@ public class PersonBasicServiceImpl extends BaseService<PersonBasicDto,PersonBas
 
     //修改平台用户
     private AgencyUserModel updateuser(String userId, AgencyUserModel userDto) {
-        FeignClientResult<AgencyUserModel>  amosUser=Privilege.agencyUserClient.update(userDto,userId);
-        AgencyUserModel user=new AgencyUserModel();
+        FeignClientResult<AgencyUserModel> amosUser = Privilege.agencyUserClient.update(userDto, userId);
+        AgencyUserModel user = new AgencyUserModel();
 
         if (!ObjectUtils.isEmpty(amosUser)) {
-            if(amosUser.getStatus()==200){
+            if (amosUser.getStatus() == 200) {
                 user = amosUser.getResult();
-            }else{
+            } else {
                 throw new RuntimeException(amosUser.getMessage());
             }
         }
@@ -312,37 +316,39 @@ public class PersonBasicServiceImpl extends BaseService<PersonBasicDto,PersonBas
     }
 
     private DepartmentModel getdepartmentModel(Long departmentId) {
-        FeignClientResult<DepartmentModel>   de=Privilege.departmentClient.seleteOne(departmentId);
+        FeignClientResult<DepartmentModel> de = Privilege.departmentClient.seleteOne(departmentId);
 
-        DepartmentModel departmentModel=new DepartmentModel();
+        DepartmentModel departmentModel = new DepartmentModel();
 
         if (!ObjectUtils.isEmpty(de)) {
-            if(de.getStatus()==200){
+            if (de.getStatus() == 200) {
                 departmentModel = de.getResult();
-            }else{
+            } else {
                 throw new RuntimeException(de.getMessage());
             }
         }
         return departmentModel;
     }
+
     public CompanyModel getCompanyModel(Long projectId) {
         FeignClientResult<CompanyModel> cResult = Privilege.companyClient.seleteOne(projectId);
-        CompanyModel companyModel=new CompanyModel();
+        CompanyModel companyModel = new CompanyModel();
 
         if (!ObjectUtils.isEmpty(cResult)) {
-            if(cResult.getStatus()==200){
+            if (cResult.getStatus() == 200) {
                 companyModel = cResult.getResult();
-            }else{
+            } else {
                 throw new RuntimeException(cResult.getMessage());
             }
         }
         return companyModel;
     }
+
     private void deleuser(String userid) {
         FeignClientResult<List<String>> cResult = Privilege.agencyUserClient.multDeleteUser(userid);
 
         if (!ObjectUtils.isEmpty(cResult)) {
-            if(cResult.getStatus()!=200){
+            if (cResult.getStatus() != 200) {
                 throw new RuntimeException(cResult.getMessage());
             }
         }
@@ -352,25 +358,20 @@ public class PersonBasicServiceImpl extends BaseService<PersonBasicDto,PersonBas
      * 分页查询
      */
     public Page<UserMapperDto> queryPage(Page<UserMapperDto> page,
-                                           String name,
-                                           String accountName,
-                                           String projectName,String orgCode)   {
+                                         String name,
+                                         String accountName,
+                                         String projectName, String orgCode) {
 
-        List<UserMapperDto> list=personBasicMapper.queryPage((page.getCurrent()-1) * page.getSize(),page.getSize(),  name,
+        List<UserMapperDto> list = personBasicMapper.queryPage((page.getCurrent() - 1) * page.getSize(), page.getSize(), name,
                 accountName,
-                projectName,orgCode);
-        List<UserMapperDto> listcount=personBasicMapper.queryPagecount( name,
+                projectName, orgCode);
+        List<UserMapperDto> listcount = personBasicMapper.queryPagecount(name,
                 accountName,
-                projectName,orgCode);
+                projectName, orgCode);
         page.setTotal(listcount.size());
         page.setRecords(list);
         return page;
     }
 
 
-
-
-
-
-
 }
\ No newline at end of file

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

@@ -95,15 +95,6 @@ public class StationBasicServiceImpl extends BaseService<StationBasicDto,Station
     @Transactional
     public void add(StationBasic  stationBasic)   {
 
-        //平台增加场站
-        CompanyModel companyModeldata=new CompanyModel();
-        companyModeldata.setCompanyName(stationBasic.getStationName());
-        companyModeldata.setCompanyType("company");
-        companyModeldata.setLevel("station");
-        companyModeldata.setParentId(Long.valueOf(stationBasic.getArea()));
-        companyModeldata.setCompanyCode(stationBasic.getStationCode());
-        companyModeldata= this.addCompanyModel(companyModeldata);
-
         //场站坐标信息
         List<StationCoordinate>  list=  stationBasic.getStationCoordinate();
         List<StationCoordinate>  listdate=new ArrayList<>();
@@ -115,8 +106,6 @@ public class StationBasicServiceImpl extends BaseService<StationBasicDto,Station
         companyModel=personBasicServiceImpl.getCompanyModel(Long.parseLong(stationBasic.getArea()));
         stationBasic.setAreaName(companyModel.getCompanyName());
         stationBasic.setAreaCode(companyModel.getCompanyCode());
-        stationBasic.setProjectOrgCode(companyModeldata.getOrgCode());
-        stationBasic.setPlatformStationId(companyModeldata.getSequenceNbr().toString());
         //获取类型名称
         String typeName=this.queryByCode(CZLX,stationBasic.getStationType());
         stationBasic.setStationTypeName(typeName);
@@ -133,6 +122,17 @@ public class StationBasicServiceImpl extends BaseService<StationBasicDto,Station
             }
         }
         stationCoordinateServiceImpl.saveBatch(listdate);
+        //平台增加场站
+        CompanyModel companyModeldata=new CompanyModel();
+        companyModeldata.setCompanyName(stationBasic.getStationName());
+        companyModeldata.setCompanyType("company");
+        companyModeldata.setLevel("station");
+        companyModeldata.setParentId(Long.valueOf(stationBasic.getArea()));
+        companyModeldata.setCompanyCode(stationBasic.getStationCode());
+        companyModeldata= this.addCompanyModel(companyModeldata);
+        stationBasic.setProjectOrgCode(companyModeldata.getOrgCode());
+        stationBasic.setPlatformStationId(companyModeldata.getSequenceNbr().toString());
+        this.update(stationBasic);
     }
 
 
@@ -200,17 +200,6 @@ public class StationBasicServiceImpl extends BaseService<StationBasicDto,Station
 
     public void update(StationBasic  stationBasic)   {
 
-
-        //平台增加场站
-        CompanyModel companyModeldata=new CompanyModel();
-        companyModeldata.setCompanyName(stationBasic.getStationName());
-        companyModeldata.setCompanyType("company");
-        companyModeldata.setLevel("station");
-        companyModeldata.setParentId(Long.valueOf(stationBasic.getArea()));
-        companyModeldata.setCompanyCode(stationBasic.getStationCode());
-        companyModeldata= this.updateCompanyModel(companyModeldata,Long.valueOf(stationBasic.getPlatformStationId()));
-
-
         //场站坐标信息
         List<StationCoordinate>  list=  stationBasic.getStationCoordinate();
         List<StationCoordinate>  listdate=new ArrayList<>();
@@ -222,8 +211,6 @@ public class StationBasicServiceImpl extends BaseService<StationBasicDto,Station
         companyModel=personBasicServiceImpl.getCompanyModel(Long.parseLong(stationBasic.getArea()));
         stationBasic.setAreaName(companyModel.getCompanyName());
         stationBasic.setAreaCode(companyModel.getCompanyCode());
-        stationBasic.setProjectOrgCode(companyModeldata.getOrgCode());
-        stationBasic.setPlatformStationId(companyModeldata.getSequenceNbr().toString());
 
         //获取类型名称
         String typeName=this.queryByCode(CZLX,stationBasic.getStationType());
@@ -237,6 +224,18 @@ public class StationBasicServiceImpl extends BaseService<StationBasicDto,Station
             listdate.add(stationCoordinate);
         }
         stationCoordinateServiceImpl.saveOrUpdateBatch(listdate);
+
+        //平台增加场站
+        CompanyModel companyModeldata=new CompanyModel();
+        companyModeldata.setCompanyName(stationBasic.getStationName());
+        companyModeldata.setCompanyType("company");
+        companyModeldata.setLevel("station");
+        companyModeldata.setParentId(Long.valueOf(stationBasic.getArea()));
+        companyModeldata.setCompanyCode(stationBasic.getStationCode());
+        companyModeldata= this.updateCompanyModel(companyModeldata,Long.valueOf(stationBasic.getPlatformStationId()));
+        stationBasic.setProjectOrgCode(companyModeldata.getOrgCode());
+        stationBasic.setPlatformStationId(companyModeldata.getSequenceNbr().toString());
+        stationBasicMapper.updateById(stationBasic);
     }
 
 
@@ -249,8 +248,9 @@ public class StationBasicServiceImpl extends BaseService<StationBasicDto,Station
             idscom.add(personAccount.getPlatformStationId());
         }
         //删除平台
+        int deleteResult = stationBasicMapper.deleteList(ids);
         this.deleteCompany(String.join(",",idscom));
-        return stationBasicMapper.deleteList(ids);
+        return deleteResult;
     }