Browse Source

修改:

修改BlockChainService中getResultOrThrowException()入参列表
dev_shibei_match
wangxianzhang 4 years ago
parent
commit
9f6b32a3a8
  1. 20
      epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/BlockChainProjectServiceImpl.java

20
epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/BlockChainProjectServiceImpl.java

@ -76,17 +76,17 @@ public class BlockChainProjectServiceImpl implements BlockChainProjectService, R
CustomerDTO customerDTO = new CustomerDTO(); CustomerDTO customerDTO = new CustomerDTO();
customerDTO.setId(project.getCustomerId()); customerDTO.setId(project.getCustomerId());
CustomerDTO customerInfo = getResultDataOrThrowsException(operCrmOpenFeignClient.getCustomerInfo(customerDTO), CustomerDTO customerInfo = getResultDataOrThrowsException(operCrmOpenFeignClient.getCustomerInfo(customerDTO),
ServiceConstant.EPMET_THIRD_SERVER, EpmetErrorCode.SERVER_ERROR.getCode(), "【项目信息上链】查询客户信息失败"); ServiceConstant.EPMET_THIRD_SERVER, EpmetErrorCode.SERVER_ERROR.getCode(), "【项目信息上链】查询客户信息失败", null);
// 组织信息 // 组织信息
CustomerAgencyDTO agencyInfo = getResultDataOrThrowsException(govOrgOpenFeignClient.getAgencyById(project.getAgencyId()), CustomerAgencyDTO agencyInfo = getResultDataOrThrowsException(govOrgOpenFeignClient.getAgencyById(project.getAgencyId()),
ServiceConstant.GOV_ORG_SERVER, EpmetErrorCode.SERVER_ERROR.getCode(), "【项目信息上链】查询Agency信息失败"); ServiceConstant.GOV_ORG_SERVER, EpmetErrorCode.SERVER_ERROR.getCode(), "【项目信息上链】查询Agency信息失败", null);
// 用户信息 // 用户信息
CustomerStaffDTO customerStaffDTO = new CustomerStaffDTO(); CustomerStaffDTO customerStaffDTO = new CustomerStaffDTO();
customerStaffDTO.setUserId(project.getCreatedBy()); customerStaffDTO.setUserId(project.getCreatedBy());
CustomerStaffDTO staffInfo = getResultDataOrThrowsException(userOpenFeignClient.getCustomerStaffInfoByUserId(customerStaffDTO), CustomerStaffDTO staffInfo = getResultDataOrThrowsException(userOpenFeignClient.getCustomerStaffInfoByUserId(customerStaffDTO),
ServiceConstant.EPMET_USER_SERVER, EpmetErrorCode.SERVER_ERROR.getCode(), "【项目信息上链】查询用户信息失败"); ServiceConstant.EPMET_USER_SERVER, EpmetErrorCode.SERVER_ERROR.getCode(), "【项目信息上链】查询用户信息失败", null);
project.setCustomerName(customerInfo.getCustomerName()); project.setCustomerName(customerInfo.getCustomerName());
project.setAgencyName(agencyInfo.getOrganizationName()); project.setAgencyName(agencyInfo.getOrganizationName());
@ -100,7 +100,7 @@ public class BlockChainProjectServiceImpl implements BlockChainProjectService, R
if (StringUtils.isNotBlank(process.getAgencyId())) { if (StringUtils.isNotBlank(process.getAgencyId())) {
// 组织信息 // 组织信息
CustomerAgencyDTO processAgencyInfo = getResultDataOrThrowsException(govOrgOpenFeignClient.getAgencyById(process.getAgencyId()), CustomerAgencyDTO processAgencyInfo = getResultDataOrThrowsException(govOrgOpenFeignClient.getAgencyById(process.getAgencyId()),
ServiceConstant.GOV_ORG_SERVER, EpmetErrorCode.SERVER_ERROR.getCode(), "【项目信息上链】查询处理节点Agency信息失败"); ServiceConstant.GOV_ORG_SERVER, EpmetErrorCode.SERVER_ERROR.getCode(), "【项目信息上链】查询处理节点Agency信息失败", null);
process.setAgencyName(processAgencyInfo.getOrganizationName()); process.setAgencyName(processAgencyInfo.getOrganizationName());
} }
@ -110,7 +110,7 @@ public class BlockChainProjectServiceImpl implements BlockChainProjectService, R
CustomerGridFormDTO processGridFormDTO = new CustomerGridFormDTO(); CustomerGridFormDTO processGridFormDTO = new CustomerGridFormDTO();
processGridFormDTO.setGridId(process.getGridId()); processGridFormDTO.setGridId(process.getGridId());
CustomerGridDTO processGridInfo = getResultDataOrThrowsException(govOrgOpenFeignClient.getCustomerGridByGridId(processGridFormDTO), CustomerGridDTO processGridInfo = getResultDataOrThrowsException(govOrgOpenFeignClient.getCustomerGridByGridId(processGridFormDTO),
ServiceConstant.GOV_ORG_SERVER, EpmetErrorCode.SERVER_ERROR.getCode(), "【项目信息上链】查询处理节点网格信息失败"); ServiceConstant.GOV_ORG_SERVER, EpmetErrorCode.SERVER_ERROR.getCode(), "【项目信息上链】查询处理节点网格信息失败", null);
Optional.of(processGridInfo).ifPresent((grid) -> process.setGridName(grid.getGridName())); Optional.of(processGridInfo).ifPresent((grid) -> process.setGridName(grid.getGridName()));
} }
@ -119,7 +119,7 @@ public class BlockChainProjectServiceImpl implements BlockChainProjectService, R
CustomerStaffDTO processCustomerStaffDTO = new CustomerStaffDTO(); CustomerStaffDTO processCustomerStaffDTO = new CustomerStaffDTO();
processCustomerStaffDTO.setUserId(process.getStaffId()); processCustomerStaffDTO.setUserId(process.getStaffId());
CustomerStaffDTO processStaffInfo = getResultDataOrThrowsException(userOpenFeignClient.getCustomerStaffInfoByUserId(processCustomerStaffDTO), CustomerStaffDTO processStaffInfo = getResultDataOrThrowsException(userOpenFeignClient.getCustomerStaffInfoByUserId(processCustomerStaffDTO),
ServiceConstant.EPMET_USER_SERVER, EpmetErrorCode.SERVER_ERROR.getCode(), "【项目信息上链】查询处理节点用户信息失败"); ServiceConstant.EPMET_USER_SERVER, EpmetErrorCode.SERVER_ERROR.getCode(), "【项目信息上链】查询处理节点用户信息失败", null);
process.setStaffName(processStaffInfo.getRealName()); process.setStaffName(processStaffInfo.getRealName());
process.setCreatedBy(processStaffInfo.getRealName()); process.setCreatedBy(processStaffInfo.getRealName());
@ -147,7 +147,7 @@ public class BlockChainProjectServiceImpl implements BlockChainProjectService, R
// 组织信息 // 组织信息
if (StringUtils.isNotBlank(assignedStaff.getOrgId())) { if (StringUtils.isNotBlank(assignedStaff.getOrgId())) {
CustomerAgencyDTO assignedStaffAgencyInfo = getResultDataOrThrowsException(govOrgOpenFeignClient.getAgencyById(assignedStaff.getOrgId()), CustomerAgencyDTO assignedStaffAgencyInfo = getResultDataOrThrowsException(govOrgOpenFeignClient.getAgencyById(assignedStaff.getOrgId()),
ServiceConstant.GOV_ORG_SERVER, EpmetErrorCode.SERVER_ERROR.getCode(), "【项目信息上链】查询指派人员组织信息失败"); ServiceConstant.GOV_ORG_SERVER, EpmetErrorCode.SERVER_ERROR.getCode(), "【项目信息上链】查询指派人员组织信息失败", null);
assignedStaff.setOrgName(assignedStaffAgencyInfo.getOrganizationName()); assignedStaff.setOrgName(assignedStaffAgencyInfo.getOrganizationName());
} }
@ -157,7 +157,7 @@ public class BlockChainProjectServiceImpl implements BlockChainProjectService, R
CustomerGridFormDTO assignedStaffGridFormDTO = new CustomerGridFormDTO(); CustomerGridFormDTO assignedStaffGridFormDTO = new CustomerGridFormDTO();
assignedStaffGridFormDTO.setGridId(assignedStaff.getGridId()); assignedStaffGridFormDTO.setGridId(assignedStaff.getGridId());
CustomerGridDTO assignedStaffProcessGridInfo = getResultDataOrThrowsException(govOrgOpenFeignClient.getCustomerGridByGridId(assignedStaffGridFormDTO), CustomerGridDTO assignedStaffProcessGridInfo = getResultDataOrThrowsException(govOrgOpenFeignClient.getCustomerGridByGridId(assignedStaffGridFormDTO),
ServiceConstant.GOV_ORG_SERVER, EpmetErrorCode.SERVER_ERROR.getCode(), "【项目信息上链】查询指派人员网格信息失败"); ServiceConstant.GOV_ORG_SERVER, EpmetErrorCode.SERVER_ERROR.getCode(), "【项目信息上链】查询指派人员网格信息失败", null);
Optional.of(assignedStaffProcessGridInfo).ifPresent((gridOfStaff) -> assignedStaff.setGridName(gridOfStaff.getGridName())); Optional.of(assignedStaffProcessGridInfo).ifPresent((gridOfStaff) -> assignedStaff.setGridName(gridOfStaff.getGridName()));
} }
@ -166,7 +166,7 @@ public class BlockChainProjectServiceImpl implements BlockChainProjectService, R
CustomerStaffDTO assignedStaffDTO = new CustomerStaffDTO(); CustomerStaffDTO assignedStaffDTO = new CustomerStaffDTO();
assignedStaffDTO.setUserId(assignedStaff.getStaffId()); assignedStaffDTO.setUserId(assignedStaff.getStaffId());
CustomerStaffDTO assignedStaffInfo = getResultDataOrThrowsException(userOpenFeignClient.getCustomerStaffInfoByUserId(assignedStaffDTO), CustomerStaffDTO assignedStaffInfo = getResultDataOrThrowsException(userOpenFeignClient.getCustomerStaffInfoByUserId(assignedStaffDTO),
ServiceConstant.EPMET_USER_SERVER, EpmetErrorCode.SERVER_ERROR.getCode(), "【项目信息上链】查询指派用户信息失败"); ServiceConstant.EPMET_USER_SERVER, EpmetErrorCode.SERVER_ERROR.getCode(), "【项目信息上链】查询指派用户信息失败", null);
assignedStaff.setStaffName(assignedStaffInfo.getRealName()); assignedStaff.setStaffName(assignedStaffInfo.getRealName());
@ -174,7 +174,7 @@ public class BlockChainProjectServiceImpl implements BlockChainProjectService, R
CustomerStaffDTO createStaffDTO = new CustomerStaffDTO(); CustomerStaffDTO createStaffDTO = new CustomerStaffDTO();
createStaffDTO.setUserId(assignedStaff.getCreatedBy()); createStaffDTO.setUserId(assignedStaff.getCreatedBy());
CustomerStaffDTO createStaffInfo = getResultDataOrThrowsException(userOpenFeignClient.getCustomerStaffInfoByUserId(createStaffDTO), CustomerStaffDTO createStaffInfo = getResultDataOrThrowsException(userOpenFeignClient.getCustomerStaffInfoByUserId(createStaffDTO),
ServiceConstant.EPMET_USER_SERVER, EpmetErrorCode.SERVER_ERROR.getCode(), "【项目信息上链】查询指派用户信息失败"); ServiceConstant.EPMET_USER_SERVER, EpmetErrorCode.SERVER_ERROR.getCode(), "【项目信息上链】查询指派用户信息失败", null);
Optional.of(createStaffInfo).ifPresent((createStaff) -> assignedStaff.setCreaterName(createStaffInfo.getRealName())); Optional.of(createStaffInfo).ifPresent((createStaff) -> assignedStaff.setCreaterName(createStaffInfo.getRealName()));
} }

Loading…
Cancel
Save