添加：更新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

@@ -10,6 +10,7 @@ import com.yeejoin.amos.boot.biz.common.utils.RedisKey;
 import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
 import com.yeejoin.amos.boot.module.jg.api.enums.ConstructionEnum;
 import com.yeejoin.amos.boot.module.jg.biz.dao.ESEquipmentCategory;
+import com.yeejoin.amos.boot.module.jg.biz.service.ICommonService;
 import com.yeejoin.amos.boot.module.jg.biz.service.IIdxBizJgConstructionInfoService;
 import com.yeejoin.amos.boot.module.jg.biz.service.IIdxBizJgDesignInfoService;
 import com.yeejoin.amos.boot.module.jg.biz.service.IIdxBizJgFactoryInfoService;
@@ -24,6 +25,7 @@ import com.yeejoin.amos.boot.module.jg.biz.service.IIdxBizJgTechParamsElevatorSe
 import com.yeejoin.amos.boot.module.jg.biz.service.IIdxBizJgUseInfoService;
 import com.yeejoin.amos.boot.module.ymt.api.dto.ESEquipmentCategoryDto;
 import com.yeejoin.amos.boot.module.ymt.api.dto.IdxBizJgRegisterInfoDto;
+import com.yeejoin.amos.boot.module.ymt.api.entity.EquipmentCategory;
 import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgConstructionInfo;
 import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgDesignInfo;
 import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgFactoryInfo;
@@ -89,6 +91,7 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
     private static final String EQUIPMENT_INFO_FORM_ID = "1734504628768239617";
     private static final String EQUSTATE = "EQU_STATE";
     private static final String CONSTRUCTIONTYPE = "CONSTRUCTION_TYPE";
+    private static final String EQUDEFINE = "EQU_DEFINE";
 
     /**
      * levlel=company,是企业,如果不是都是监管单位,
@@ -136,6 +139,8 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
     IIdxBizJgProtectionDevicesService iIdxBizJgProtectionDevicesService;
     @Autowired
     ESEquipmentCategory esEquipmentCategory;
+    @Autowired
+    ICommonService commonService;
 
     @Autowired
     CategoryOtherInfoMapper categoryOtherInfoMapper;
@@ -423,9 +428,9 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
             if (!ValidationUtil.isEmpty(level)) {
                 if (LEVEL.equals(level)) {
                     //企业
-                    if(!ValidationUtil.isEmpty(type) && ValidationUtil.equals(type,"使用单位")){
+                    if (!ValidationUtil.isEmpty(type) && ValidationUtil.equals(type, "使用单位")) {
                         map.put("USE_UNIT_CREDIT_CODE", companyCode);
-                    }else if(!ValidationUtil.isEmpty(type) && ValidationUtil.equals(type,"安装改造维修单位")){
+                    } else if (!ValidationUtil.isEmpty(type) && ValidationUtil.equals(type, "安装改造维修单位")) {
                         map.put("USC_UNIT_CREDIT_CODE", companyCode);
                     }
 
@@ -458,7 +463,7 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
         BoolQueryBuilder meBuilder = QueryBuilders.boolQuery();
         meBuilder.must(QueryBuilders.boolQuery()
                 .should(QueryBuilders.boolQuery().mustNot(QueryBuilders.existsQuery("STATUS")))
-                .should(QueryBuilders.boolQuery().must(QueryBuilders.matchPhraseQuery("STATUS",""))));
+                .should(QueryBuilders.boolQuery().must(QueryBuilders.matchPhraseQuery("STATUS", ""))));
         boolMust.must(meBuilder);
 
         String queryType = map.getString("QUERY_TYPE");
@@ -473,7 +478,7 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
             BoolQueryBuilder wbBuilder = QueryBuilders.boolQuery();
             wbBuilder.mustNot(QueryBuilders.existsQuery("EQU_STATE"));
             wbBuilder.must(QueryBuilders.existsQuery("INSPECT_REPORT"));
-            wbBuilder.mustNot(QueryBuilders.matchPhraseQuery("INSPECT_REPORT",""));
+            wbBuilder.mustNot(QueryBuilders.matchPhraseQuery("INSPECT_REPORT", ""));
             boolMust.must(wbBuilder);
         }
         //查询 使用登记【可选设备列表】【EQU_STATUS=== null && (INSPECT_REPORT！=="" && !null) && (USE_ORG_CODE!=="" && !null)】
@@ -481,9 +486,9 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
             BoolQueryBuilder syBuilder = QueryBuilders.boolQuery();
             syBuilder.mustNot(QueryBuilders.existsQuery("EQU_STATE"));
             syBuilder.must(QueryBuilders.existsQuery("INSPECT_REPORT"));
-            syBuilder.mustNot(QueryBuilders.matchPhraseQuery("INSPECT_REPORT",""));
+            syBuilder.mustNot(QueryBuilders.matchPhraseQuery("INSPECT_REPORT", ""));
             syBuilder.must(QueryBuilders.existsQuery("USE_ORG_CODE"));
-            syBuilder.mustNot(QueryBuilders.matchPhraseQuery("USE_ORG_CODE",""));
+            syBuilder.mustNot(QueryBuilders.matchPhraseQuery("USE_ORG_CODE", ""));
             boolMust.must(syBuilder);
         }
 
@@ -522,7 +527,17 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
             uuccBuilder.must(QueryBuilders.matchPhraseQuery("USC_UNIT_CREDIT_CODE", param));
             boolMust.must(uuccBuilder);
         }
-
+        //监管码
+        if (!ObjectUtils.isEmpty(map.getString("SUPERVISORY_CODE"))) {
+            BoolQueryBuilder scBuilder = QueryBuilders.boolQuery();
+            String param = map.getString("SUPERVISORY_CODE");
+            String[] split = param.split(",");
+            for (String code : split) {
+                scBuilder.should(QueryBuilders.termQuery("SUPERVISORY_CODE", code));
+            }
+            scBuilder.minimumShouldMatch(1);
+            boolMust.must(scBuilder);
+        }
 
         builder.query(boolMust);
         builder.sort("REC_DATE", SortOrder.DESC);
@@ -539,10 +554,22 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
                 JSONObject jsonObject = (JSONObject) JSONObject.toJSON(hit);
                 JSONObject dto2 = jsonObject.getJSONObject("sourceAsMap");
                 if (!ValidationUtil.isEmpty(dto2.get(CONSTRUCTIONTYPE))) {
+                    //转化施工类型
                     Integer integer = Integer.valueOf(dto2.get(CONSTRUCTIONTYPE).toString());
                     String status = ConstructionEnum.getName.get(integer);
                     dto2.put(CONSTRUCTIONTYPE, status);
                 }
+                if (!ValidationUtil.isEmpty(dto2.get(EQUDEFINE))) {
+                    //转化设备品种名称
+                    String code = dto2.get(EQUDEFINE).toString();
+                    List<EquipmentCategory> equipmentCategoryList = commonService.getEquipmentCategoryList(code, null);
+                    if (!ValidationUtil.isEmpty(equipmentCategoryList)) {
+                        String name = equipmentCategoryList.get(0).getName();
+                        dto2.put(EQUDEFINE, name);
+                    } else {
+                        dto2.put(EQUDEFINE, code);
+                    }
+                }
                 list.add(dto2);
             }
             totle = response.getInternalResponse().hits().getTotalHits().value;

amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-api/src/main/java/com/yeejoin/amos/boot/module/ymt/api/dto/ESEquipmentCategoryDto.java

@@ -105,4 +105,19 @@ public class ESEquipmentCategoryDto {
 
     @Field(type = FieldType.Text)
     private String USC_DATE;
+
+    @Field(type = FieldType.Text)
+    private String EQU_DEFINE;
+
+    @Field(type = FieldType.Text)
+    private String PRODUCT_NAME;
+
+    @Field(type = FieldType.Text)
+    private String BRAND_NAME;
+
+    @Field(type = FieldType.Text)
+    private String EQU_TYPE;
+
+    @Field(type = FieldType.Text)
+    private String PRODUCE_DATE;
 }

amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-api/src/main/resources/mapper/CategoryOtherInfoMapper.xml

@@ -94,7 +94,12 @@
                CONSTRUCTION_TYPE,
                USC_UNIT_CREDIT_CODE,
                USC_UNIT_NAME,
-               DATE_FORMAT(USC_DATE, '%Y-%m-%d %H:%i:%s') as USC_DATE
+               DATE_FORMAT(USC_DATE, '%Y-%m-%d %H:%i:%s') as USC_DATE,
+               EQU_DEFINE,
+               PRODUCT_NAME,
+               BRAND_NAME,
+               EQU_TYPE,
+               DATE_FORMAT(PRODUCE_DATE, '%Y-%m-%d %H:%i:%s') as PRODUCE_DATE
         from idx_biz_view_jg_all
         WHERE SEQUENCE_NBR = #{id}
     </select>