Commit 5abb32e9 authored by suhuiguang's avatar suhuiguang

feat(jg): es数据同步

1.es新老索引增加字段是否球罐后,数据的同步 2.新增刷设备旧索引球罐接口
parent 3cd28fc4
......@@ -217,6 +217,6 @@ public class ESEquipmentCategoryDto {
/**
* 是否球罐
*/
@Field(type = FieldType.Keyword, name = "WHETHER_SPHERICAL_TANK")
@Field(type = FieldType.Keyword)
private String whetherSphericalTank;
}
......@@ -25,6 +25,7 @@ public class WeatherTankFieldPatcher extends BatchDataPatcher {
private final ESEquipmentCategory equipmentCategory;
protected WeatherTankFieldPatcher(ApplicationContext applicationContext, IdxBizJgRegisterInfoServiceImpl registerInfoService, ESEquipmentCategory equipmentCategory) {
super(applicationContext);
this.registerInfoService = registerInfoService;
......
......@@ -1553,7 +1553,7 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec
}
// 固定式压力容器按照是否球罐过滤
if (!ObjectUtils.isEmpty(map.getString("equipTag1")) && BizCommonConstant.EQU_CATEGORY_CODE_GDYLRQ.equals(map.getString("EQU_CATEGORY_CODE"))) {
boolMust.must(QueryBuilders.termQuery("WHETHER_SPHERICAL_TANK.keyword", QueryParser.escape(map.getString("equipTag1"))));
boolMust.must(QueryBuilders.termQuery("whetherSphericalTank.keyword", QueryParser.escape(map.getString("equipTag1"))));
}
this.setFilterOfInFlowing(boolMust, map.getString("EQU_LIST_CODE"), map.getString("inspectionType"), map.getString("EQU_CATEGORY_CODE"));
builder.query(boolMust);
......
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