Skip to content

A
amos-boot-biz
Commit a1adcaef authored by suhuiguang's avatar suhuiguang
Browse files
Options

Merge branch 'develop_tzs_bugfix' into develop_tzs_register

# Conflicts: # amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/DataHandlerServiceImpl.java
parents f7891fc5 ff8b79a4
Show whitespace changes
Inline Side-by-side
Showing with 94 additions and 129 deletions
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/controller/CommonController.java
View file @ a1adcaef
...@@ -13,6 +13,7 @@ import com.yeejoin.amos.boot.module.jg.api.dto.EquipmentClassifyDto; ...@@ -13,6 +13,7 @@ import com.yeejoin.amos.boot.module.jg.api.dto.EquipmentClassifyDto;
import com.yeejoin.amos.boot.module.jg.api.dto.UseFlagParamDto; import com.yeejoin.amos.boot.module.jg.api.dto.UseFlagParamDto;
import com.yeejoin.amos.boot.module.jg.api.entity.JgRegistrationHistory; import com.yeejoin.amos.boot.module.jg.api.entity.JgRegistrationHistory;
import com.yeejoin.amos.boot.module.jg.api.entity.JgUseRegistrationManage; import com.yeejoin.amos.boot.module.jg.api.entity.JgUseRegistrationManage;
import com.yeejoin.amos.boot.module.jg.api.enums.CompanyTypeEnum;
import com.yeejoin.amos.boot.module.jg.api.mapper.JgUseRegistrationMapper; import com.yeejoin.amos.boot.module.jg.api.mapper.JgUseRegistrationMapper;
import com.yeejoin.amos.boot.module.jg.api.service.IJgInstallationNoticeService; import com.yeejoin.amos.boot.module.jg.api.service.IJgInstallationNoticeService;
import com.yeejoin.amos.boot.module.jg.biz.service.ICommonService; import com.yeejoin.amos.boot.module.jg.biz.service.ICommonService;
...@@ -446,6 +447,26 @@ public class CommonController extends BaseController { ...@@ -446,6 +447,26 @@ public class CommonController extends BaseController {
/** /**
* 获取当前登录人单位及以下管辖分局树
*
* @return result
*/
@TycloudOperation(ApiLevel = UserType.AGENCY)
@GetMapping(value = "/getOrgTreeByCompanyLevel")
@ApiOperation(httpMethod = "GET", value = "按照当前登录人单位类型返回管辖机构树", notes = "按照当前登录人单位类型返回管辖机构树，")
public ResponseModel<Object> getOrgTreeByCompanyLevel() {
ReginParams reginParams = getSelectedOrgInfo();
String orgCode = reginParams.getCompany().getOrgCode();
if (reginParams.getCompany().getLevel().equals(BaseController.COMPANY_TYPE_COMPANY)) { // 公司类型人员返回全部树
return getCreatTree();
} else { // 监管机构返回当前登录人机构及一下（只考虑非审批机构使用）
return ResponseHelper.buildResponse(commonService.loginUnitAndBelowGetTree(orgCode));
}
}
/**
* 获取管辖分局树 * 获取管辖分局树
* *
* @return * @return
......
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/DataHandlerServiceImpl.java
View file @ a1adcaef
...@@ -11,6 +11,7 @@ import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; ...@@ -11,6 +11,7 @@ import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.core.type.TypeReference;
import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.ObjectMapper;
import com.yeejoin.amos.boot.biz.common.bo.CompanyBo;
import com.yeejoin.amos.boot.biz.common.dao.mapper.DataDictionaryMapper; import com.yeejoin.amos.boot.biz.common.dao.mapper.DataDictionaryMapper;
import com.yeejoin.amos.boot.biz.common.entity.BaseEntity; import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
import com.yeejoin.amos.boot.biz.common.entity.DataDictionary; import com.yeejoin.amos.boot.biz.common.entity.DataDictionary;
...@@ -20,6 +21,7 @@ import com.yeejoin.amos.boot.module.common.api.dto.ESEquipmentCategoryDto; ...@@ -20,6 +21,7 @@ import com.yeejoin.amos.boot.module.common.api.dto.ESEquipmentCategoryDto;
import com.yeejoin.amos.boot.module.jg.api.dto.JgInstallationNoticeEqDto; import com.yeejoin.amos.boot.module.jg.api.dto.JgInstallationNoticeEqDto;
import com.yeejoin.amos.boot.module.jg.api.dto.PieLineEquipContraptionDto; import com.yeejoin.amos.boot.module.jg.api.dto.PieLineEquipContraptionDto;
import com.yeejoin.amos.boot.module.jg.api.entity.*; import com.yeejoin.amos.boot.module.jg.api.entity.*;
import com.yeejoin.amos.boot.module.jg.api.enums.CompanyTypeEnum;
import com.yeejoin.amos.boot.module.jg.api.enums.PipelineEnum; import com.yeejoin.amos.boot.module.jg.api.enums.PipelineEnum;
import com.yeejoin.amos.boot.module.jg.api.mapper.DataHandlerMapper; import com.yeejoin.amos.boot.module.jg.api.mapper.DataHandlerMapper;
import com.yeejoin.amos.boot.module.jg.api.mapper.JgInstallationNoticeEqMapper; import com.yeejoin.amos.boot.module.jg.api.mapper.JgInstallationNoticeEqMapper;
...@@ -29,6 +31,7 @@ import com.yeejoin.amos.boot.module.ymt.api.entity.*; ...@@ -29,6 +31,7 @@ import com.yeejoin.amos.boot.module.ymt.api.entity.*;
import com.yeejoin.amos.boot.module.ymt.api.enums.EquimentEnum; import com.yeejoin.amos.boot.module.ymt.api.enums.EquimentEnum;
import com.yeejoin.amos.boot.module.ymt.api.enums.FlowStatusEnum; import com.yeejoin.amos.boot.module.ymt.api.enums.FlowStatusEnum;
import com.yeejoin.amos.boot.module.ymt.api.mapper.*; import com.yeejoin.amos.boot.module.ymt.api.mapper.*;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
...@@ -44,6 +47,7 @@ import javax.annotation.Resource; ...@@ -44,6 +47,7 @@ import javax.annotation.Resource;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.math.RoundingMode; import java.math.RoundingMode;
import java.sql.Timestamp; import java.sql.Timestamp;
import java.time.LocalDateTime;
import java.util.*; import java.util.*;
import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.atomic.AtomicReference; import java.util.concurrent.atomic.AtomicReference;
...@@ -58,82 +62,36 @@ import static com.yeejoin.amos.boot.module.jg.biz.service.impl.JgInstallationNot ...@@ -58,82 +62,36 @@ import static com.yeejoin.amos.boot.module.jg.biz.service.impl.JgInstallationNot
*/ */
@Slf4j @Slf4j
@Service @Service
@RequiredArgsConstructor
public class DataHandlerServiceImpl { public class DataHandlerServiceImpl {
@Resource private final ObjectMapper objectMapper;
private ObjectMapper objectMapper; private final JgRegistrationHistoryServiceImpl registrationHistoryService;
private final JgInstallationNoticeServiceImpl installationNoticeService;
@Resource private final JgUseRegistrationServiceImpl useRegistrationService;
private JgRegistrationHistoryServiceImpl registrationHistoryService; private final JgVehicleInformationServiceImpl jgVehicleInformationService;
private final JgUseRegistrationEqServiceImpl useRegistrationEqService;
@Resource private final JgInstallationNoticeEqServiceImpl installationNoticeEqService;
private JgInstallationNoticeServiceImpl installationNoticeService; private final IdxBizJgUseInfoServiceImpl useInfoService;
private final SnowflakeIdUtil sequence;
@Resource private final IdxBizJgProjectContraptionServiceImpl projectContraptionService;
private JgUseRegistrationServiceImpl useRegistrationService; private final IdxBizJgProjectConstructionMapper projectConstructionMapper;
private final IdxBizJgTechParamsPipelineServiceImpl techParamsPipelineService;
@Resource private final EquipmentCategoryMapper equipmentCategoryMapper;
private JgUseRegistrationEqServiceImpl useRegistrationEqService; private final IdxBizJgRegisterInfoServiceImpl registerInfoService;
private final IdxBizJgSupervisionInfoServiceImpl supervisionInfoService;
@Resource private final IdxBizJgFactoryInfoServiceImpl factoryInfoService;
private JgInstallationNoticeEqServiceImpl installationNoticeEqService; private final ESEquipmentCategory esEquipmentCategory;
private final TzBaseEnterpriseInfoMapper tzBaseEnterpriseInfoMapper;
@Resource private final JgInstallationNoticeEqMapper jgInstallationNoticeEqMapper;
private IdxBizJgUseInfoServiceImpl useInfoService; private final DataDictionaryMapper dataDictionaryMapper;
private final IdxBizJgProjectInspectionMapper projectInspectionMapper;
@Resource private final IIdxBizJgInspectionDetectionInfoService iIdxBizJgInspectionDetectionInfoService;
private SnowflakeIdUtil sequence; private final IdxBizJgProjectContraptionMapper idxBizJgProjectContraptionMapper;
private final JgInstallationNoticeMapper jgInstallationNoticeMapper;
@Resource private final DataHandlerMapper dataHandlerMapper;
private IdxBizJgProjectContraptionServiceImpl projectContraptionService; private final CategoryOtherInfoMapper categoryOtherInfoMapper;
;
@Resource
private IdxBizJgProjectConstructionMapper projectConstructionMapper;
@Resource
private IdxBizJgTechParamsPipelineServiceImpl techParamsPipelineService;
@Resource
private EquipmentCategoryMapper equipmentCategoryMapper;
@Resource
private IdxBizJgRegisterInfoServiceImpl registerInfoService;
@Resource
private IdxBizJgSupervisionInfoServiceImpl supervisionInfoService;
@Resource
private IdxBizJgFactoryInfoServiceImpl factoryInfoService;
@Resource
private ESEquipmentCategory esEquipmentCategory;
@Resource
TzBaseEnterpriseInfoMapper tzBaseEnterpriseInfoMapper;
@Resource
private JgInstallationNoticeEqMapper jgInstallationNoticeEqMapper;
@Resource
private DataDictionaryMapper dataDictionaryMapper;
@Resource
IdxBizJgProjectInspectionMapper projectInspectionMapper;
@Resource
IIdxBizJgInspectionDetectionInfoService iIdxBizJgInspectionDetectionInfoService;
@Autowired
private IdxBizJgProjectContraptionMapper idxBizJgProjectContraptionMapper;
@Autowired
private JgInstallationNoticeMapper jgInstallationNoticeMapper;
@Resource
private JgVehicleInformationServiceImpl jgVehicleInformationService;
@Resource
private DataHandlerMapper dataHandlerMapper;
@Resource
private CategoryOtherInfoMapper categoryOtherInfoMapper;
/** /**
...@@ -143,13 +101,13 @@ public class DataHandlerServiceImpl { ...@@ -143,13 +101,13 @@ public class DataHandlerServiceImpl {
*/ */
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
public Boolean deviceListInFormWithInstallNotice() { public Boolean deviceListInFormWithInstallNotice() {
List<JgInstallationNotice> noticeList = installationNoticeService.list(new LambdaQueryWrapper<JgInstallationNotice>() List<JgInstallationNotice> noticeList = installationNoticeService.list(new LambdaQueryWrapper<JgInstallationNotice>().eq(JgInstallationNotice::getEquCategoryCode, "8300"));
.eq(JgInstallationNotice::getEquCategoryCode, "8300"));
List<JgRegistrationHistory> jgRegistrationHistories = noticeList.stream() List<JgRegistrationHistory> jgRegistrationHistories = noticeList.stream()
.map(notice -> { .map(notice -> {
JgRegistrationHistory history = getRegistrationHistory(String.valueOf(notice.getSequenceNbr())); JgRegistrationHistory history = getRegistrationHistory(String.valueOf(notice.getSequenceNbr()));
if (history == null) return null; if (history == null)
return null;
try { try {
Map<String, Object> hisData = objectMapper.readValue( Map<String, Object> hisData = objectMapper.readValue(
history.getChangeData(), history.getChangeData(),
...@@ -429,7 +387,7 @@ public class DataHandlerServiceImpl { ...@@ -429,7 +387,7 @@ public class DataHandlerServiceImpl {
.eq(IdxBizJgUseInfo::getProjectContraption, projectContraption) .eq(IdxBizJgUseInfo::getProjectContraption, projectContraption)
.list(); .list();
//技术参数表 // 技术参数表
List<IdxBizJgTechParamsPipeline> idxBizJgTechParamsPipelines = useInfos.isEmpty() ? new ArrayList<>() : techParamsPipelineService List<IdxBizJgTechParamsPipeline> idxBizJgTechParamsPipelines = useInfos.isEmpty() ? new ArrayList<>() : techParamsPipelineService
.lambdaQuery() .lambdaQuery()
.in(IdxBizJgTechParamsPipeline::getRecord, useInfos.stream() .in(IdxBizJgTechParamsPipeline::getRecord, useInfos.stream()
...@@ -529,36 +487,34 @@ public class DataHandlerServiceImpl { ...@@ -529,36 +487,34 @@ public class DataHandlerServiceImpl {
} }
private void filledHisRegCylinderByUnit() { private void filledHisRegCylinderByUnit() {
List<JgUseRegistration> useRegistrations = useRegistrationService.list(new LambdaQueryWrapper<JgUseRegistration>() List<JgUseRegistration> useRegistrations = useRegistrationService.list(new LambdaQueryWrapper<JgUseRegistration>().isNull(JgUseRegistration::getSupervisionOrgCode).eq(JgUseRegistration::getManageType, "unit").eq(JgUseRegistration::getRegType, "1").select(BaseEntity::getSequenceNbr, JgUseRegistration::getUseUnitCreditCode));
.isNull(JgUseRegistration::getSupervisionOrgCode).eq(JgUseRegistration::getManageType, "unit").eq(JgUseRegistration::getRegType, "1").
select(BaseEntity::getSequenceNbr,JgUseRegistration::getUseUnitCreditCode));
Map<String, String> unitSuperOrgCodeMap = new ConcurrentHashMap<>(); Map<String, String> unitSuperOrgCodeMap = new ConcurrentHashMap<>();
useRegistrations.parallelStream().forEach(u->{ useRegistrations.parallelStream().forEach(u -> {
LambdaUpdateWrapper<JgUseRegistration> updateWrapper = new LambdaUpdateWrapper<>(); LambdaUpdateWrapper<JgUseRegistration> updateWrapper = new LambdaUpdateWrapper<>();
updateWrapper.eq(JgUseRegistration::getSequenceNbr, u.getSequenceNbr()); updateWrapper.eq(JgUseRegistration::getSequenceNbr, u.getSequenceNbr());
if(unitSuperOrgCodeMap.get(u.getUseUnitCreditCode()) != null){ if (unitSuperOrgCodeMap.get(u.getUseUnitCreditCode()) != null) {
updateWrapper.set(JgUseRegistration::getSupervisionOrgCode, unitSuperOrgCodeMap.get(u.getUseUnitCreditCode())); updateWrapper.set(JgUseRegistration::getSupervisionOrgCode, unitSuperOrgCodeMap.get(u.getUseUnitCreditCode()));
} else { } else {
TzBaseEnterpriseInfo baseEnterpriseInfo = tzBaseEnterpriseInfoMapper.selectByUseUnitCode(u.getUseUnitCreditCode()); TzBaseEnterpriseInfo baseEnterpriseInfo = tzBaseEnterpriseInfoMapper.selectByUseUnitCode(u.getUseUnitCreditCode());
if(baseEnterpriseInfo != null){ if (baseEnterpriseInfo != null) {
unitSuperOrgCodeMap.put(u.getUseUnitCreditCode(), baseEnterpriseInfo.getSuperviseOrgCode()); unitSuperOrgCodeMap.put(u.getUseUnitCreditCode(), baseEnterpriseInfo.getSuperviseOrgCode());
updateWrapper.set(JgUseRegistration::getSupervisionOrgCode, baseEnterpriseInfo.getSuperviseOrgCode()); updateWrapper.set(JgUseRegistration::getSupervisionOrgCode, baseEnterpriseInfo.getSuperviseOrgCode());
} else { } else {
updateWrapper.set(JgUseRegistration::getSupervisionOrgCode, null); updateWrapper.set(JgUseRegistration::getSupervisionOrgCode, null);
} }
} }
useRegistrationService.update(null,updateWrapper); useRegistrationService.update(null, updateWrapper);
}); });
} }
private void filledDataFromHistory() { private void filledDataFromHistory() {
List<JgUseRegistration> useRegistrations = useRegistrationService.list(new LambdaQueryWrapper<JgUseRegistration>().isNull(JgUseRegistration::getSupervisionOrgCode).select(BaseEntity::getSequenceNbr)); List<JgUseRegistration> useRegistrations = useRegistrationService.list(new LambdaQueryWrapper<JgUseRegistration>().isNull(JgUseRegistration::getSupervisionOrgCode).select(BaseEntity::getSequenceNbr));
useRegistrations.parallelStream().forEach(u->{ useRegistrations.parallelStream().forEach(u -> {
JgRegistrationHistory history = getRegistrationHistory(u.getSequenceNbr() + ""); JgRegistrationHistory history = getRegistrationHistory(u.getSequenceNbr() + "");
if(history != null) { if (history != null) {
JSONObject jsonObject = JSON.parseObject(history.getChangeData()); JSONObject jsonObject = JSON.parseObject(history.getChangeData());
String orgBranchCodeWithName = jsonObject.getString("orgBranchCode"); String orgBranchCodeWithName = jsonObject.getString("orgBranchCode");
if(orgBranchCodeWithName != null && !orgBranchCodeWithName.isEmpty()) { if (orgBranchCodeWithName != null && !orgBranchCodeWithName.isEmpty()) {
u.setSupervisionOrgCode(orgBranchCodeWithName.split("_")[0]); u.setSupervisionOrgCode(orgBranchCodeWithName.split("_")[0]);
LambdaUpdateWrapper<JgUseRegistration> updateWrapper = new LambdaUpdateWrapper<>(); LambdaUpdateWrapper<JgUseRegistration> updateWrapper = new LambdaUpdateWrapper<>();
updateWrapper.set(JgUseRegistration::getSupervisionOrgCode, u.getSupervisionOrgCode()); updateWrapper.set(JgUseRegistration::getSupervisionOrgCode, u.getSupervisionOrgCode());
...@@ -574,7 +530,7 @@ public class DataHandlerServiceImpl { ...@@ -574,7 +530,7 @@ public class DataHandlerServiceImpl {
// 1.安装告知完成但是设备状态未非已纳管状态：设备的idx_biz_jg_use_info表的IS_INTO_MANAGEMENT刷为已纳管, es的IS_INTO_MANAGEMENT刷为已纳管 // 1.安装告知完成但是设备状态未非已纳管状态：设备的idx_biz_jg_use_info表的IS_INTO_MANAGEMENT刷为已纳管, es的IS_INTO_MANAGEMENT刷为已纳管
List<JgInstallationNoticeEq> eqs = jgInstallationNoticeEqMapper.selectErrorRecordOfInIntoManage(); List<JgInstallationNoticeEq> eqs = jgInstallationNoticeEqMapper.selectErrorRecordOfInIntoManage();
log.info("处理前统计：1.安装告知完成但是设备状态未非已纳管状态的设备数量：{}", eqs.size()); log.info("处理前统计：1.安装告知完成但是设备状态未非已纳管状态的设备数量：{}", eqs.size());
for(JgInstallationNoticeEq eq : eqs){ for (JgInstallationNoticeEq eq : eqs) {
// 使用信息表刷已纳管 // 使用信息表刷已纳管
useInfoService.lambdaUpdate() useInfoService.lambdaUpdate()
.set(IdxBizJgUseInfo::getIsIntoManagement, true) .set(IdxBizJgUseInfo::getIsIntoManagement, true)
...@@ -592,16 +548,14 @@ public class DataHandlerServiceImpl { ...@@ -592,16 +548,14 @@ public class DataHandlerServiceImpl {
log.info("处理前统计：2.安装告知非已作废，但是缺少装置id安装告知单据数量：{}", noticeList.size()); log.info("处理前统计：2.安装告知非已作废，但是缺少装置id安装告知单据数量：{}", noticeList.size());
List<IdxBizJgProjectContraption> projectContraptionList = new ArrayList<>(); List<IdxBizJgProjectContraption> projectContraptionList = new ArrayList<>();
Map<Long, List<String>> projectContraptionIdRecordsMap = new HashMap<>(); Map<Long, List<String>> projectContraptionIdRecordsMap = new HashMap<>();
for(JgInstallationNotice installationNotice : noticeList){ for (JgInstallationNotice installationNotice : noticeList) {
List<JgInstallationNoticeEq> noticeEqs = installationNoticeEqService.list(new LambdaQueryWrapper<JgInstallationNoticeEq>().eq(JgInstallationNoticeEq::getEquipTransferId, installationNotice.getSequenceNbr()).select(JgInstallationNoticeEq::getEquId,JgInstallationNoticeEq::getInformNumber)); List<JgInstallationNoticeEq> noticeEqs = installationNoticeEqService.list(new LambdaQueryWrapper<JgInstallationNoticeEq>().eq(JgInstallationNoticeEq::getEquipTransferId, installationNotice.getSequenceNbr()).select(JgInstallationNoticeEq::getEquId, JgInstallationNoticeEq::getInformNumber));
if(noticeEqs.isEmpty()){ if (noticeEqs.isEmpty()) {
continue; continue;
} }
List<String> records = noticeEqs.stream().map(JgInstallationNoticeEq::getEquId).collect(Collectors.toList()); List<String> records = noticeEqs.stream().map(JgInstallationNoticeEq::getEquId).collect(Collectors.toList());
List<IdxBizJgUseInfo> useInfos = useInfoService.lambdaQuery() List<IdxBizJgUseInfo> useInfos = useInfoService.lambdaQuery().in(IdxBizJgUseInfo::getRecord, records).list();
.in(IdxBizJgUseInfo::getRecord, records) // 技术参数表
.list();
//技术参数表
List<IdxBizJgTechParamsPipeline> idxBizJgTechParamsPipelines = useInfos.isEmpty() ? new ArrayList<>() : techParamsPipelineService List<IdxBizJgTechParamsPipeline> idxBizJgTechParamsPipelines = useInfos.isEmpty() ? new ArrayList<>() : techParamsPipelineService
.lambdaQuery() .lambdaQuery()
.in(IdxBizJgTechParamsPipeline::getRecord, records) .in(IdxBizJgTechParamsPipeline::getRecord, records)
...@@ -675,7 +629,7 @@ public class DataHandlerServiceImpl { ...@@ -675,7 +629,7 @@ public class DataHandlerServiceImpl {
projectContraptionList.add(idxBizJgProjectContraption); projectContraptionList.add(idxBizJgProjectContraption);
} }
// 创建装置 // 创建装置
if(!projectContraptionList.isEmpty()){ if (!projectContraptionList.isEmpty()) {
projectContraptionService.saveBatch(projectContraptionList); projectContraptionService.saveBatch(projectContraptionList);
} }
// 更新设备es的装置id、使用信息的装置id // 更新设备es的装置id、使用信息的装置id
...@@ -707,7 +661,7 @@ public class DataHandlerServiceImpl { ...@@ -707,7 +661,7 @@ public class DataHandlerServiceImpl {
} }
private void saveProjectConstructionAfterFinish(JgInstallationNotice installationNotice, boolean isFinish, List<JgInstallationNoticeEq> eqs, Long sequenceNbr, List<String> records) { private void saveProjectConstructionAfterFinish(JgInstallationNotice installationNotice, boolean isFinish, List<JgInstallationNoticeEq> eqs, Long sequenceNbr, List<String> records) {
if(isFinish){ if (isFinish) {
IdxBizJgProjectConstruction idxBizJgProjectConstruction = new IdxBizJgProjectConstruction(); IdxBizJgProjectConstruction idxBizJgProjectConstruction = new IdxBizJgProjectConstruction();
idxBizJgProjectConstruction.setUscUnitCreditCode(installationNotice.getInstallUnitCreditCode()); idxBizJgProjectConstruction.setUscUnitCreditCode(installationNotice.getInstallUnitCreditCode());
idxBizJgProjectConstruction.setUscUnitName(installationNotice.getInstallUnitName()); idxBizJgProjectConstruction.setUscUnitName(installationNotice.getInstallUnitName());
...@@ -745,29 +699,26 @@ public class DataHandlerServiceImpl { ...@@ -745,29 +699,26 @@ public class DataHandlerServiceImpl {
} }
private List<JgInstallationNotice> getErrorInstallNoticeData() { private List<JgInstallationNotice> getErrorInstallNoticeData() {
return installationNoticeService.list(new LambdaQueryWrapper<JgInstallationNotice>() return installationNoticeService.list(new LambdaQueryWrapper<JgInstallationNotice>().ne(JgInstallationNotice::getNoticeStatus, FlowStatusEnum.TO_BE_DISCARD.getCode()).ne(JgInstallationNotice::getProjectContraption, "").isNull(JgInstallationNotice::getProjectContraptionId));
.ne(JgInstallationNotice::getNoticeStatus, FlowStatusEnum.TO_BE_DISCARD.getCode())
.ne(JgInstallationNotice::getProjectContraption, "")
.isNull(JgInstallationNotice::getProjectContraptionId));
} }
/** /**
* 刷使用登记缺少装置id的管道的登记数据：1.填充装置id；2.已完成状状态清除装置表的安装单位信息字段,补充使用信息字段 * 刷使用登记缺少装置id的管道的登记数据：1.填充装置id；2.已完成状状态清除装置表的安装单位信息字段,补充使用信息字段
*/ */
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
public void projectContraptionUseRegisterDataDeal(){ public void projectContraptionUseRegisterDataDeal() {
// 查询使用登记：非作废状态 有装置名称但是缺少装置id的使用登记单据进行数据处理 // 查询使用登记：非作废状态 有装置名称但是缺少装置id的使用登记单据进行数据处理
List<JgUseRegistration> useRegistrations = getUseRegisterOfError(); List<JgUseRegistration> useRegistrations = getUseRegisterOfError();
log.info("处理前统计：1.使用登记装置id历史数据填充，存在缺少装置id的单据数量：{}", useRegistrations.size()); log.info("处理前统计：1.使用登记装置id历史数据填充，存在缺少装置id的单据数量：{}", useRegistrations.size());
// 循环按照使用登记的eq表关联安装告知eq表，在安装告知主表查询装置id // 循环按照使用登记的eq表关联安装告知eq表，在安装告知主表查询装置id
for(JgUseRegistration useRegistration : useRegistrations){ for (JgUseRegistration useRegistration : useRegistrations) {
// 登记的关联的告知单据【逻辑按照eq进行关联】 // 登记的关联的告知单据【逻辑按照eq进行关联】
JgInstallationNotice installationNotice = installationNoticeService.getBaseMapper().selectNoticeDataByUseRegisterId(useRegistration.getSequenceNbr() + ""); JgInstallationNotice installationNotice = installationNoticeService.getBaseMapper().selectNoticeDataByUseRegisterId(useRegistration.getSequenceNbr() + "");
if(installationNotice != null && StringUtils.isNotEmpty(installationNotice.getProjectContraptionId())){ if (installationNotice != null && StringUtils.isNotEmpty(installationNotice.getProjectContraptionId())) {
// 0.填充装置id // 0.填充装置id
useRegistration.setProjectContraptionId(installationNotice.getProjectContraptionId()); useRegistration.setProjectContraptionId(installationNotice.getProjectContraptionId());
// 1.已完成状状态清除装置表的安装单位信息字段,填充使用信息数据，创建装置检验信息表 // 1.已完成状状态清除装置表的安装单位信息字段,填充使用信息数据，创建装置检验信息表
if(FlowStatusEnum.TO_BE_FINISHED.getName().equals(useRegistration.getStatus())){ if (FlowStatusEnum.TO_BE_FINISHED.getName().equals(useRegistration.getStatus())) {
updateProjectContraptionAfter(useRegistration, installationNotice); updateProjectContraptionAfter(useRegistration, installationNotice);
// 创建装置检验流水信息 // 创建装置检验流水信息
createProjectInspectInfoAfter(useRegistration); createProjectInspectInfoAfter(useRegistration);
...@@ -786,11 +737,11 @@ public class DataHandlerServiceImpl { ...@@ -786,11 +737,11 @@ public class DataHandlerServiceImpl {
private void updateProjectContraptionAfter(JgUseRegistration useRegistration, JgInstallationNotice installationNotice) { private void updateProjectContraptionAfter(JgUseRegistration useRegistration, JgInstallationNotice installationNotice) {
// 特殊处理 将任意一个的 record 放入到remark字段 // 特殊处理 将任意一个的 record 放入到remark字段
IdxBizJgUseInfo useInfo = getIdxBizJgUseInfo(installationNotice.getRemark()); IdxBizJgUseInfo useInfo = getIdxBizJgUseInfo(installationNotice.getRemark());
if(useInfo != null){ if (useInfo != null) {
LambdaUpdateWrapper<IdxBizJgProjectContraption> updateWrapper = new LambdaUpdateWrapper<>(); LambdaUpdateWrapper<IdxBizJgProjectContraption> updateWrapper = new LambdaUpdateWrapper<>();
updateWrapper.eq(BaseEntity::getSequenceNbr, installationNotice.getProjectContraptionId()); updateWrapper.eq(BaseEntity::getSequenceNbr, installationNotice.getProjectContraptionId());
updateWrapper.set(IdxBizJgProjectContraption::getUscUnitCreditCode ,null); updateWrapper.set(IdxBizJgProjectContraption::getUscUnitCreditCode, null);
updateWrapper.set(IdxBizJgProjectContraption::getUscUnitName,null); updateWrapper.set(IdxBizJgProjectContraption::getUscUnitName, null);
updateWrapper.set(IdxBizJgProjectContraption::getUseRegistrationCode, useRegistration.getUseRegistrationCode()); updateWrapper.set(IdxBizJgProjectContraption::getUseRegistrationCode, useRegistration.getUseRegistrationCode());
updateWrapper.set(IdxBizJgProjectContraption::getProvince, useInfo.getProvince()); updateWrapper.set(IdxBizJgProjectContraption::getProvince, useInfo.getProvince());
updateWrapper.set(IdxBizJgProjectContraption::getProvinceName, useInfo.getProvinceName()); updateWrapper.set(IdxBizJgProjectContraption::getProvinceName, useInfo.getProvinceName());
...@@ -808,12 +759,12 @@ public class DataHandlerServiceImpl { ...@@ -808,12 +759,12 @@ public class DataHandlerServiceImpl {
private void createProjectInspectInfoAfter(JgUseRegistration useRegistration) { private void createProjectInspectInfoAfter(JgUseRegistration useRegistration) {
JgRegistrationHistory jgRegistrationHistory = getRegistrationHistory(useRegistration.getSequenceNbr() + ""); JgRegistrationHistory jgRegistrationHistory = getRegistrationHistory(useRegistration.getSequenceNbr() + "");
if(jgRegistrationHistory != null){ if (jgRegistrationHistory != null) {
JSONObject mapData = JSONObject.parseObject(jgRegistrationHistory.getChangeData()); JSONObject mapData = JSONObject.parseObject(jgRegistrationHistory.getChangeData());
IdxBizJgProjectInspection inspectionDetectionInfo = new IdxBizJgProjectInspection(); IdxBizJgProjectInspection inspectionDetectionInfo = new IdxBizJgProjectInspection();
BeanUtil.copyProperties(mapData, inspectionDetectionInfo); BeanUtil.copyProperties(mapData, inspectionDetectionInfo);
// 兼容最早的老数据，管道的检验信息单独维护 // 兼容最早的老数据，管道的检验信息单独维护
if(inspectionDetectionInfo.getInspectConclusion() == null && mapData.containsKey("equipmentLists")){ if (inspectionDetectionInfo.getInspectConclusion() == null && mapData.containsKey("equipmentLists")) {
List<Map<String, Object>> equipmentLists = null; List<Map<String, Object>> equipmentLists = null;
try { try {
equipmentLists = objectMapper.readValue( equipmentLists = objectMapper.readValue(
...@@ -821,7 +772,7 @@ public class DataHandlerServiceImpl { ...@@ -821,7 +772,7 @@ public class DataHandlerServiceImpl {
new TypeReference<ArrayList<Map<String, Object>>>() { new TypeReference<ArrayList<Map<String, Object>>>() {
} }
); );
if(!equipmentLists.isEmpty()){ if (!equipmentLists.isEmpty()) {
Object record = equipmentLists.get(0).get("record"); Object record = equipmentLists.get(0).get("record");
IdxBizJgInspectionDetectionInfo idxBizJgInspectionDetectionInfo = iIdxBizJgInspectionDetectionInfoService.queryNewestDetailByRecord(String.valueOf(record)); IdxBizJgInspectionDetectionInfo idxBizJgInspectionDetectionInfo = iIdxBizJgInspectionDetectionInfoService.queryNewestDetailByRecord(String.valueOf(record));
BeanUtil.copyProperties(idxBizJgInspectionDetectionInfo, inspectionDetectionInfo); BeanUtil.copyProperties(idxBizJgInspectionDetectionInfo, inspectionDetectionInfo);
...@@ -847,14 +798,11 @@ public class DataHandlerServiceImpl { ...@@ -847,14 +798,11 @@ public class DataHandlerServiceImpl {
/** /**
* 查询非作废状态的装置名称不为空，装置id为空或者null的使用登记数据 * 查询非作废状态的装置名称不为空，装置id为空或者null的使用登记数据
*
* @return 符合条件列表 * @return 符合条件列表
*/ */
private List<JgUseRegistration> getUseRegisterOfError() { private List<JgUseRegistration> getUseRegisterOfError() {
return useRegistrationService.getBaseMapper().selectList(new LambdaQueryWrapper<JgUseRegistration>() return useRegistrationService.getBaseMapper().selectList(new LambdaQueryWrapper<JgUseRegistration>().ne(JgUseRegistration::getStatus, FlowStatusEnum.TO_BE_DISCARD.getName()).ne(JgUseRegistration::getProjectContraption, "").isNull(JgUseRegistration::getProjectContraptionId).select(BaseEntity::getSequenceNbr, JgUseRegistration::getProjectContraption, JgUseRegistration::getUseRegistrationCode, JgUseRegistration::getStatus, JgUseRegistration::getAuditPassDate));
.ne(JgUseRegistration::getStatus, FlowStatusEnum.TO_BE_DISCARD.getName())
.ne(JgUseRegistration::getProjectContraption, "")
.isNull(JgUseRegistration::getProjectContraptionId)
.select(BaseEntity::getSequenceNbr, JgUseRegistration::getProjectContraption, JgUseRegistration::getUseRegistrationCode, JgUseRegistration::getStatus, JgUseRegistration::getAuditPassDate));
} }
/** /**
...@@ -864,7 +812,7 @@ public class DataHandlerServiceImpl { ...@@ -864,7 +812,7 @@ public class DataHandlerServiceImpl {
public void projectContraptionInfoUpdateV2() { public void projectContraptionInfoUpdateV2() {
List<IdxBizJgProjectContraption> projectConstructions = idxBizJgProjectContraptionMapper.selectErrorManagementProject(); List<IdxBizJgProjectContraption> projectConstructions = idxBizJgProjectContraptionMapper.selectErrorManagementProject();
log.info("处理前：安装告知审批完成但是装置是否纳管状态不正确的数据量：{}", projectConstructions.size()); log.info("处理前：安装告知审批完成但是装置是否纳管状态不正确的数据量：{}", projectConstructions.size());
projectConstructions.parallelStream().forEach(p->{ projectConstructions.parallelStream().forEach(p -> {
LambdaUpdateWrapper<IdxBizJgProjectContraption> updateWrapper = new LambdaUpdateWrapper<>(); LambdaUpdateWrapper<IdxBizJgProjectContraption> updateWrapper = new LambdaUpdateWrapper<>();
updateWrapper.eq(BaseEntity::getSequenceNbr, p.getSequenceNbr()); updateWrapper.eq(BaseEntity::getSequenceNbr, p.getSequenceNbr());
updateWrapper.set(IdxBizJgProjectContraption::getUscUnitName, p.getUscUnitName()); updateWrapper.set(IdxBizJgProjectContraption::getUscUnitName, p.getUscUnitName());
...@@ -883,7 +831,7 @@ public class DataHandlerServiceImpl { ...@@ -883,7 +831,7 @@ public class DataHandlerServiceImpl {
public void projectUseInfoUpdateV3() { public void projectUseInfoUpdateV3() {
List<JgInstallationNoticeEq> eqs = jgInstallationNoticeEqMapper.selectPCIdNeErrorPieLineInUseInfo(); List<JgInstallationNoticeEq> eqs = jgInstallationNoticeEqMapper.selectPCIdNeErrorPieLineInUseInfo();
log.info("处理前：查询安装告知（非删除、已作废）的装置id和设备的使用信息装置id不一样的设备：{}", eqs.size()); log.info("处理前：查询安装告知（非删除、已作废）的装置id和设备的使用信息装置id不一样的设备：{}", eqs.size());
eqs.forEach(eq->{ eqs.forEach(eq -> {
Optional<ESEquipmentCategoryDto> equInfosWithEs = esEquipmentCategory.findById(eq.getEquId()); Optional<ESEquipmentCategoryDto> equInfosWithEs = esEquipmentCategory.findById(eq.getEquId());
equInfosWithEs.ifPresent(equInfoEs -> { equInfosWithEs.ifPresent(equInfoEs -> {
if(StringUtils.isNotEmpty(equInfoEs.getProjectContraptionId())){ if(StringUtils.isNotEmpty(equInfoEs.getProjectContraptionId())){
...@@ -905,11 +853,9 @@ public class DataHandlerServiceImpl { ...@@ -905,11 +853,9 @@ public class DataHandlerServiceImpl {
// 1220上线时, 已完成安装告知管道未写入装置的施工信息表的告知单据查询 // 1220上线时, 已完成安装告知管道未写入装置的施工信息表的告知单据查询
List<JgInstallationNotice> noticeList = getNotInsertProjectConstructionInstallNotice(); List<JgInstallationNotice> noticeList = getNotInsertProjectConstructionInstallNotice();
log.info("处理前统计：1.管道已完成安装告知，但是未写入装置的施工信息表的告知单据数量：{}", noticeList.size()); log.info("处理前统计：1.管道已完成安装告知，但是未写入装置的施工信息表的告知单据数量：{}", noticeList.size());
for(JgInstallationNotice installationNotice : noticeList){ for (JgInstallationNotice installationNotice : noticeList) {
List<JgInstallationNoticeEq> noticeEqs = installationNoticeEqService.list(new LambdaQueryWrapper<JgInstallationNoticeEq>() List<JgInstallationNoticeEq> noticeEqs = installationNoticeEqService.list(new LambdaQueryWrapper<JgInstallationNoticeEq>().eq(JgInstallationNoticeEq::getEquipTransferId, installationNotice.getSequenceNbr()).select(JgInstallationNoticeEq::getEquId));
.eq(JgInstallationNoticeEq::getEquipTransferId, installationNotice.getSequenceNbr()). if (noticeEqs.isEmpty()) {
select(JgInstallationNoticeEq::getEquId));
if(noticeEqs.isEmpty()){
continue; continue;
} }
List<String> records = noticeEqs.stream().map(JgInstallationNoticeEq::getEquId).collect(Collectors.toList()); List<String> records = noticeEqs.stream().map(JgInstallationNoticeEq::getEquId).collect(Collectors.toList());
...@@ -933,7 +879,7 @@ public class DataHandlerServiceImpl { ...@@ -933,7 +879,7 @@ public class DataHandlerServiceImpl {
public void projectUseInfoUpdateV4() { public void projectUseInfoUpdateV4() {
List<PieLineEquipContraptionDto> eqs = jgInstallationNoticeEqMapper.selectPCIdNeErrorPieLineInUseInfo2(); List<PieLineEquipContraptionDto> eqs = jgInstallationNoticeEqMapper.selectPCIdNeErrorPieLineInUseInfo2();
log.info("处理前：查询管道的装置id与安装告知的装置id的不一样管道设备：{}", eqs.size()); log.info("处理前：查询管道的装置id与安装告知的装置id的不一样管道设备：{}", eqs.size());
eqs.forEach(eq->{ eqs.forEach(eq -> {
// 1.已安装告知单据为准更新es // 1.已安装告知单据为准更新es
Optional<ESEquipmentCategoryDto> equInfosWithEs = esEquipmentCategory.findById(eq.getRecord()); Optional<ESEquipmentCategoryDto> equInfosWithEs = esEquipmentCategory.findById(eq.getRecord());
equInfosWithEs.ifPresent(equInfoEs -> { equInfosWithEs.ifPresent(equInfoEs -> {
...@@ -959,11 +905,9 @@ public class DataHandlerServiceImpl { ...@@ -959,11 +905,9 @@ public class DataHandlerServiceImpl {
public void projectUseInfoUpdateV5() { public void projectUseInfoUpdateV5() {
List<PieLineEquipContraptionDto> eqs = jgInstallationNoticeEqMapper.selectPCIdNeErrorPieLineInUseInfo3(); List<PieLineEquipContraptionDto> eqs = jgInstallationNoticeEqMapper.selectPCIdNeErrorPieLineInUseInfo3();
log.info("处理前：一个管道在多个安装告知里，安装告知的装置id的不一样管道设备：{}", eqs.size()); log.info("处理前：一个管道在多个安装告知里，安装告知的装置id的不一样管道设备：{}", eqs.size());
eqs.forEach(eq->{ eqs.forEach(eq -> {
JgInstallationNoticeEqDto jgInstallationNoticeEqDto = jgInstallationNoticeEqMapper.selectLatestNoticeByRecord(eq.getRecord()); JgInstallationNoticeEqDto jgInstallationNoticeEqDto = jgInstallationNoticeEqMapper.selectLatestNoticeByRecord(eq.getRecord());
JgInstallationNotice jgInstallationNotice = jgInstallationNoticeMapper.selectOne(new LambdaQueryWrapper<JgInstallationNotice>() JgInstallationNotice jgInstallationNotice = jgInstallationNoticeMapper.selectOne(new LambdaQueryWrapper<JgInstallationNotice>().eq(BaseEntity::getSequenceNbr, jgInstallationNoticeEqDto.getEquipTransferId()).select(JgInstallationNotice::getProjectContraptionId, JgInstallationNotice::getProjectContraption));
.eq(BaseEntity::getSequenceNbr, jgInstallationNoticeEqDto.getEquipTransferId())
.select(JgInstallationNotice::getProjectContraptionId, JgInstallationNotice::getProjectContraption));
// 1.已安装告知单据为准更新es // 1.已安装告知单据为准更新es
Optional<ESEquipmentCategoryDto> equInfosWithEs = esEquipmentCategory.findById(eq.getRecord()); Optional<ESEquipmentCategoryDto> equInfosWithEs = esEquipmentCategory.findById(eq.getRecord());
equInfosWithEs.ifPresent(equInfoEs -> { equInfosWithEs.ifPresent(equInfoEs -> {
......
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