fix(jg):es查询设备添加工程装置名称的过滤条件

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/IdxBizJgRegisterInfoServiceImpl.java

@@ -158,6 +158,8 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
     public static final String DATA_SOURCE_NAME = "DATA_SOURCE_NAME";
     private static final String ATTACHMENT_UPLOAD = "attachmentUpload";
     public static final String USE_PLACE_CODE = "USE_PLACE_CODE";
+    public static final String EQU_CATEGORY_CODE = "EQU_CATEGORY_CODE";
+    public static final String PROJECT_CONTRAPTION = "PROJECT_CONTRAPTION";// 工程装置名称
 
     private final List<String> resultError = new ArrayList<>();
     List<String> useInnerCodeList = new ArrayList<>();// 单位内部编号集合
@@ -1397,28 +1399,35 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
                 syBuilder.must(QueryBuilders.existsQuery("EQU_STATE"));
                 syBuilder.must(QueryBuilders.wildcardQuery("USE_ORG_CODE", "*"));
                 boolMust.must(syBuilder);
+                // 设备类别为工业管道（8300）时，用工程装置名称过滤
+                if (!ValidationUtil.isEmpty(EQU_CATEGORY_CODE) && ValidationUtil.equals(EQU_CATEGORY_CODE, "8300")) {
+                    if (ValidationUtil.isEmpty(map.get("projectContraption"))) {
+                        throw new BadRequest("请先选择工程装置信息！");
+                    }
+                    map.put(PROJECT_CONTRAPTION, String.valueOf(map.get("projectContraption")));
+                }
                 if (ValidationUtil.equals(queryType, "GZ_GZ")) {// 改造告知设备选择 - 业务限制
                     // 设备类别（EQU_CATEGORY）、安装单位（USC_UNIT_CREDIT_CODE）、选择的使用单位（USE_UNIT_CREDIT_CODE）、选择的区县（USE_PLACE_CODE）过滤数据
                     if (ValidationUtil.isEmpty(map.get("useUnitCreditCode")) || ValidationUtil.isEmpty(map.get("county"))) {
-                        throw new BadRequest("请先选择使用单位，施工区县等信息");
+                        throw new BadRequest("请先选择使用单位，施工区县等信息！");
                     }
                     map.put("USE_UNIT_CREDIT_CODE", String.valueOf(map.get("useUnitCreditCode")).split("_")[0]);
                     map.put(USE_PLACE_CODE, String.valueOf(map.get("county")).split("_")[0]);
                 } else if (ValidationUtil.equals(queryType, "GZ_WX")) {// 维修告知设备选择 - 业务限制
                     // 设备类别（EQU_CATEGORY）、安装单位（USC_UNIT_CREDIT_CODE）、选择的使用单位（USE_UNIT_CREDIT_CODE）、选择的区县（USE_PLACE_CODE）过滤数据
                     if (ValidationUtil.isEmpty(map.get("useUnitCreditCode")) || ValidationUtil.isEmpty(map.get("county"))) {
-                        throw new BadRequest("请先选择使用单位，施工区县等信息");
+                        throw new BadRequest("请先选择使用单位，施工区县等信息！");
                     }
                     map.put("USE_UNIT_CREDIT_CODE", map.get("useUnitCreditCode"));
                     map.put(USE_PLACE_CODE, String.valueOf(map.get("county")).split("_")[0]);
                 } else if (ValidationUtil.equals(queryType, "GZ_YZ")) {// 移装告知设备选择 - 业务限制
                     // 设备类别（EQU_CATEGORY）、安装单位（USC_UNIT_CREDIT_CODE）、选择的使用单位（USE_UNIT_CREDIT_CODE）、（区内移装（transferType=区内移装）根据区县(USE_PLACE_CODE)）过滤数据
                     if (ValidationUtil.isEmpty(map.get("useUnitCreditCode"))) {
-                        throw new BadRequest("请先选择使用单位等信息");
+                        throw new BadRequest("请先选择使用单位等信息！");
                     }
                     if (!ValidationUtil.isEmpty(map.get("transferType")) && ValidationUtil.equals(map.get("transferType"), "区内移装")
                             && ValidationUtil.isEmpty(map.get("county"))) {
-                        throw new BadRequest("请先选择施工区域等信息");
+                        throw new BadRequest("请先选择施工区域等信息！");
                     }
                     map.put("USE_UNIT_CREDIT_CODE", map.get("useUnitCreditCode"));
                     map.put(USE_PLACE_CODE, ValidationUtil.equals(map.get("transferType"), "区内移装") ? String.valueOf(map.get("county")).split("_")[0] : null);
@@ -1521,10 +1530,10 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
         }
 
         // 设备类别
-        if (!ObjectUtils.isEmpty(map.getString("EQU_CATEGORY_CODE"))) {
+        if (!ObjectUtils.isEmpty(map.getString(EQU_CATEGORY_CODE))) {
             BoolQueryBuilder pBuilder = QueryBuilders.boolQuery();
-            String test = QueryParser.escape(map.getString("EQU_CATEGORY_CODE"));
-            pBuilder.must(QueryBuilders.termQuery("EQU_CATEGORY_CODE", test));
+            String test = QueryParser.escape(map.getString(EQU_CATEGORY_CODE));
+            pBuilder.must(QueryBuilders.termQuery(EQU_CATEGORY_CODE, test));
             boolMust.must(pBuilder);
         }
         // 是否车用气瓶
@@ -1576,6 +1585,13 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
             pBuilder.must(QueryBuilders.wildcardQuery(USE_PLACE_CODE, "*" + QueryParser.escape(test.toLowerCase()) + "*"));
             boolMust.must(pBuilder);
         }
+        // 工程装置名称模糊查询
+        if (!ObjectUtils.isEmpty(map.getString(PROJECT_CONTRAPTION))) {
+            BoolQueryBuilder pBuilder = QueryBuilders.boolQuery();
+            String test = QueryParser.escape(map.getString(PROJECT_CONTRAPTION));
+            pBuilder.must(QueryBuilders.wildcardQuery(PROJECT_CONTRAPTION, "*" + QueryParser.escape(test.toLowerCase()) + "*"));
+            boolMust.must(pBuilder);
+        }
         builder.query(boolMust);
         builder.sort("REC_DATE", SortOrder.DESC);
         builder.from((pageNumber - 1) * size);
@@ -1909,10 +1925,10 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
         }
 
         // 设备类别
-        if (!ObjectUtils.isEmpty(map.getString("EQU_CATEGORY_CODE"))) {
+        if (!ObjectUtils.isEmpty(map.getString(EQU_CATEGORY_CODE))) {
             BoolQueryBuilder pBuilder = QueryBuilders.boolQuery();
-            String test = QueryParser.escape(map.getString("EQU_CATEGORY_CODE"));
-            pBuilder.must(QueryBuilders.termQuery("EQU_CATEGORY_CODE", test));
+            String test = QueryParser.escape(map.getString(EQU_CATEGORY_CODE));
+            pBuilder.must(QueryBuilders.termQuery(EQU_CATEGORY_CODE, test));
             boolMust.must(pBuilder);
         }
         // 是否车用气瓶
@@ -2490,9 +2506,9 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
         jsonObject.put("useUnitCreditCode", useUnitCreditCode);
         Page<JSONObject> page = new Page<>(jsonObject.getLong("number"), jsonObject.getLong("size"));
         Set<String> records = EquipUsedCheckStrategyContext.getUsedStrategy("useRegistration").getEquipInFlow(useUnitCreditCode);
-        if ("8300".equals(jsonObject.get("EQU_CATEGORY_CODE"))) {// 管道
+        if ("8300".equals(jsonObject.get(EQU_CATEGORY_CODE))) {// 管道
             return jgUseRegistrationMapper.queryForUnitPipelineEquipmentPage(page, jsonObject, records);
-        } else if ("2300".equals(jsonObject.get("EQU_CATEGORY_CODE"))) {// 气瓶
+        } else if ("2300".equals(jsonObject.get(EQU_CATEGORY_CODE))) {// 气瓶
             List<DictionarieValueModel> fillingMedium = Systemctl.dictionarieClient.dictValues("FILLING_MEDIUM").getResult();
             Map<String, Object> fillingMediumMap = fillingMedium.stream().collect(Collectors.toMap(DictionarieValueModel::getDictDataKey, DictionarieValueModel::getDictDataValue));
             Page<JSONObject> result = jgUseRegistrationMapper.queryForUnitVesselEquipmentPage(page, jsonObject, records);