Commit 3aab2ad9 authored by suhuiguang's avatar suhuiguang

feat(综合搜索):设备索引增加车牌号

1.增加车牌号字段
parent d15300d2
...@@ -341,6 +341,12 @@ public class ESEquipmentInfo { ...@@ -341,6 +341,12 @@ public class ESEquipmentInfo {
/** /**
* 车牌号
*/
@Field(type = FieldType.Keyword)
private String carNumber;
/**
* 下次检验日期-冗余字段 * 下次检验日期-冗余字段
*/ */
@Field(type = FieldType.Date, format = DateFormat.date) @Field(type = FieldType.Date, format = DateFormat.date)
......
...@@ -74,7 +74,8 @@ public class EquipmentRefreshHandler implements IDataRefreshHandler { ...@@ -74,7 +74,8 @@ public class EquipmentRefreshHandler implements IDataRefreshHandler {
.select(IdxBizJgFactoryInfo::getRecord, IdxBizJgFactoryInfo::getProduceUnitCreditCode)); .select(IdxBizJgFactoryInfo::getRecord, IdxBizJgFactoryInfo::getProduceUnitCreditCode));
IdxBizJgRegisterInfo registerInfo = registerInfoService.getOne(new LambdaQueryWrapper<IdxBizJgRegisterInfo>() IdxBizJgRegisterInfo registerInfo = registerInfoService.getOne(new LambdaQueryWrapper<IdxBizJgRegisterInfo>()
.eq(IdxBizJgRegisterInfo::getRecord, record) .eq(IdxBizJgRegisterInfo::getRecord, record)
.select(IdxBizJgRegisterInfo::getRecord, IdxBizJgRegisterInfo::getWhetherSphericalTank, IdxBizJgRegisterInfo::getUseOrgCode)); .select(IdxBizJgRegisterInfo::getRecord, IdxBizJgRegisterInfo::getWhetherSphericalTank,
IdxBizJgRegisterInfo::getUseOrgCode, IdxBizJgRegisterInfo::getCarNumber));
List<IdxBizJgInspectionDetectionInfo> inspectionDetectionInfos = iIdxBizJgInspectionDetectionInfoService.queryLastedGroupByInspectType(record); List<IdxBizJgInspectionDetectionInfo> inspectionDetectionInfos = iIdxBizJgInspectionDetectionInfoService.queryLastedGroupByInspectType(record);
IdxBizJgInspectionDetectionInfo inspectionDetectionInfo = iIdxBizJgInspectionDetectionInfoService.queryNewestDetailByRecord(record); IdxBizJgInspectionDetectionInfo inspectionDetectionInfo = iIdxBizJgInspectionDetectionInfoService.queryNewestDetailByRecord(record);
IdxBizJgMaintenanceRecordInfo lastMaintenanceRecordInfo = maintenanceRecordInfoService.queryNewestDetailByRecord(record); IdxBizJgMaintenanceRecordInfo lastMaintenanceRecordInfo = maintenanceRecordInfoService.queryNewestDetailByRecord(record);
...@@ -86,6 +87,7 @@ public class EquipmentRefreshHandler implements IDataRefreshHandler { ...@@ -86,6 +87,7 @@ public class EquipmentRefreshHandler implements IDataRefreshHandler {
} catch (Exception e) { } catch (Exception e) {
log.error("时区转换失败:{}", record, e); log.error("时区转换失败:{}", record, e);
} }
esEquipmentInfo.setCarNumber(registerInfo.getCarNumber());
esEquipmentInfo.setUSE_ORG_CODE(registerInfo.getUseOrgCode()); esEquipmentInfo.setUSE_ORG_CODE(registerInfo.getUseOrgCode());
esEquipmentInfo.setIssueDate(getIssueDate(registerInfo.getUseOrgCode())); esEquipmentInfo.setIssueDate(getIssueDate(registerInfo.getUseOrgCode()));
esEquipmentInfo.setWhetherSphericalTank(registerInfo.getWhetherSphericalTank()); esEquipmentInfo.setWhetherSphericalTank(registerInfo.getWhetherSphericalTank());
......
...@@ -1528,7 +1528,8 @@ public class DataHandlerServiceImpl { ...@@ -1528,7 +1528,8 @@ public class DataHandlerServiceImpl {
.select(IdxBizJgFactoryInfo::getRecord, IdxBizJgFactoryInfo::getProduceUnitCreditCode)); .select(IdxBizJgFactoryInfo::getRecord, IdxBizJgFactoryInfo::getProduceUnitCreditCode));
IdxBizJgRegisterInfo registerInfo = registerInfoService.getOne(new LambdaQueryWrapper<IdxBizJgRegisterInfo>() IdxBizJgRegisterInfo registerInfo = registerInfoService.getOne(new LambdaQueryWrapper<IdxBizJgRegisterInfo>()
.eq(IdxBizJgRegisterInfo::getRecord, record) .eq(IdxBizJgRegisterInfo::getRecord, record)
.select(IdxBizJgRegisterInfo::getRecord, IdxBizJgRegisterInfo::getWhetherSphericalTank, IdxBizJgRegisterInfo::getUseOrgCode)); .select(IdxBizJgRegisterInfo::getRecord, IdxBizJgRegisterInfo::getWhetherSphericalTank,
IdxBizJgRegisterInfo::getUseOrgCode, IdxBizJgRegisterInfo::getCarNumber));
// 检验信息按照不同检验类型,存最新的一条 // 检验信息按照不同检验类型,存最新的一条
List<IdxBizJgInspectionDetectionInfo> inspectionDetectionInfos = iIdxBizJgInspectionDetectionInfoService.queryLastedGroupByInspectType(record); List<IdxBizJgInspectionDetectionInfo> inspectionDetectionInfos = iIdxBizJgInspectionDetectionInfoService.queryLastedGroupByInspectType(record);
IdxBizJgInspectionDetectionInfo inspectionDetectionInfo = iIdxBizJgInspectionDetectionInfoService.queryNewestDetailByRecord(record); IdxBizJgInspectionDetectionInfo inspectionDetectionInfo = iIdxBizJgInspectionDetectionInfoService.queryNewestDetailByRecord(record);
...@@ -1541,6 +1542,7 @@ public class DataHandlerServiceImpl { ...@@ -1541,6 +1542,7 @@ public class DataHandlerServiceImpl {
} catch (Exception e) { } catch (Exception e) {
log.error("时区转换失败:{}", record, e); log.error("时区转换失败:{}", record, e);
} }
esEquipmentInfo.setCarNumber(registerInfo.getCarNumber());
esEquipmentInfo.setUSE_ORG_CODE(registerInfo.getUseOrgCode()); esEquipmentInfo.setUSE_ORG_CODE(registerInfo.getUseOrgCode());
esEquipmentInfo.setIssueDate(getIssueDate(registerInfo.getUseOrgCode())); esEquipmentInfo.setIssueDate(getIssueDate(registerInfo.getUseOrgCode()));
esEquipmentInfo.setWhetherSphericalTank(registerInfo.getWhetherSphericalTank()); esEquipmentInfo.setWhetherSphericalTank(registerInfo.getWhetherSphericalTank());
......
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