修改设备代码

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

@@ -69,7 +69,7 @@ public class ESEquipmentCategoryDto {
     @Field(type = FieldType.Text)
     private String STATUS;
 
-    @Field(type = FieldType.Date, format = DateFormat.basic_date_time, index = false)
+    @Field(type = FieldType.Date, format = DateFormat.custom,pattern = "yyyy-MM-dd HH:mm:ss||yyyy-MM-dd||epoch_second")
     private Date REC_DATE;
 
 

amos-boot-system-tzs/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/biz/service/impl/EquipmentCategoryServiceImpl.java

@@ -1026,10 +1026,9 @@ public class EquipmentCategoryServiceImpl extends BaseService<EquipmentCategoryD
             query.must(QueryBuilders.matchQuery("ADDRESS", "*" + map.getString("ADDRESS") + "*"));
             boolMust.must(query);
         }
-        if (!ObjectUtils.isEmpty(map.getString("EQU_STATE")) && !("所有设备状态").equals(map.getString("EQU_STATE").toString()) ) {
+        if (!ObjectUtils.isEmpty(map.getString("EQU_STATE"))  ) {
             BoolQueryBuilder meBuilder = QueryBuilders.boolQuery();
-            Integer equState = EquimentEnum.getCode.get(map.getString("EQU_STATE"));
-            meBuilder.must(QueryBuilders.matchQuery("EQU_STATE", equState));
+            meBuilder.must(QueryBuilders.matchQuery("EQU_STATE", map.getLong("EQU_STATE")));
             boolMust.must(meBuilder);
         }
         if (!ObjectUtils.isEmpty(map.getString("STATUS"))) {