BUG提交 ES字段修正 中文查询

common/fire-dto/src/main/java/com/fire/es/OrderEsDto.java

@@ -11,265 +11,225 @@ import org.springframework.data.elasticsearch.annotations.FieldType;
 import java.util.Date;
 
 @Data
-@Document(indexName = "flow_order_info", shards = 6)
+@Document(indexName = "flow_order_info", shards = 3)
 public class OrderEsDto {
     /**
      * 订单ID
      */
     @Id
-    @ApiModelProperty(value = "订单ID")
     private String orderId;
 
     /**
      * 接入ID号
      */
-    @ApiModelProperty(value = "接入ID号")
     @Field(type = FieldType.Keyword)
     private String flowAppId;
 
     /**
      * 流量包ID号
      */
-    @ApiModelProperty(value = "流量包ID号")
     @Field(type = FieldType.Keyword)
     private String packageId;
 
     /**
      * 客户ID号
      */
-    @ApiModelProperty(value = "客户ID号")
     @Field(type = FieldType.Integer)
     private Integer enterpriseId;
 
     /**
      * 订单类型 2:流量 3:话费
      */
-    @ApiModelProperty(value = "订单类型 2:流量 3:话费")
     @Field(type = FieldType.Integer)
     private Integer orderType;
 
     /**
      * 用户手机号
      */
-    @ApiModelProperty(value = "用户手机号")
     @Field(type = FieldType.Keyword)
     private String usedMobile;
 
     /**
      * 客户订单号
      */
-    @ApiModelProperty(value = "客户订单号")
     @Field(type = FieldType.Keyword)
     private String extorderId;
 
     /**
      * 分发记录号
      */
-    @ApiModelProperty(value = "分发记录号")
     @Field(type = FieldType.Keyword)
     private String recId;
 
     /**
      * 下单时间
      */
-    @ApiModelProperty(value = "下单时间")
     @Field(type = FieldType.Date)
     private Date applyDate;
     /**
      * 激活日期
      */
-    @ApiModelProperty(value = "激活日期")
     @Field(type = FieldType.Date)
     private Date activeDate;
     /**
      * 订单超时
      */
-    @ApiModelProperty(value = "订单超时")
     @Field(type = FieldType.Date)
     private Date limitedDate;
     /**
      * 订单状态 1-待发 2-已发 3-成功
      *   4-失败 5-风控
      */
-    @ApiModelProperty(value = "订单状态 1-待发 2-已发 3-成功 4-失败 5-风控")
     @Field(type = FieldType.Integer)
     private Integer status;
     /**
      * 订单备注
      */
-    @ApiModelProperty(value = "订单备注")
     @Field(type = FieldType.Keyword)
     private String note;
     /**
      * 归属运营商
      */
-    @ApiModelProperty(value = "归属运营商")
     @Field(type = FieldType.Keyword)
     private String mobileOperator;
     /**
      * 归属地市
      */
-    @ApiModelProperty(value = "运营商归属地")
     @Field(type = FieldType.Text, analyzer = "ik_max_word")
     private String mobileHome;
     /**
      * 供应商返回订单号
      */
-    @ApiModelProperty(value = "供应商返回订单号")
     @Field(type = FieldType.Keyword)
     private String gwSeqNo;
     /**
      * 供应商返回状态
      */
-    @ApiModelProperty(value = "供应商返回状态")
     @Field(type = FieldType.Keyword)
     private String gwStatus;
     /**
      * 最后修改日期
      */
-    @ApiModelProperty(value = "最后修改日期")
     @Field(type = FieldType.Date)
     private Date lastModifyDate;
     /**
      * 供应商网关错误代码
      */
-    @ApiModelProperty(value = "供应商网关错误代码")
     @Field(type = FieldType.Keyword)
     private String gwErrorCode;
     /**
      * 面额
      */
-    @ApiModelProperty(value = "面额")
     @Field(type = FieldType.Integer)
     private Integer flowAmount;
 
     /**
      * 回调状态
      */
-    @ApiModelProperty(value = "回调状态")
     @Field(type = FieldType.Keyword)
     private String dealFlag;
 
     /**
      * 未知
      */
-    @ApiModelProperty(value = "未知")
     @Field(type = FieldType.Keyword)
     private String oprCode;
 
     /**
      * 成本
      */
-    @ApiModelProperty(value = "成本")
     @Field(type = FieldType.Integer)
     private Integer usageLimit;
 
     /**
      * 分发组发送次数
      */
-    @ApiModelProperty(value = "分发组发送次数")
     @Field(type = FieldType.Integer)
     private Integer batchCount;
 
     /**
      * 总发送次数
      */
-    @ApiModelProperty(value = "总发送次数")
     @Field(type = FieldType.Integer)
     private Integer sendCount;
     /**
      * 省级行政编码
      */
-    @ApiModelProperty(value = "总发送次数")
     @Field(type = FieldType.Keyword)
     private String areaCode;
     /**
      * 客户结算价格
      */
-    @ApiModelProperty(value = "客户结算价格")
     @Field(type = FieldType.Integer)
     private Integer price;
     /**
      * 代理商结算价格
      */
-    @ApiModelProperty(value = "代理商结算价格")
     @Field(type = FieldType.Integer)
     private Integer partnerBalancePrice;
     /**
      * 运行商成本价格
      */
-    @ApiModelProperty(value = "运行商成本价格")
     @Field(type = FieldType.Integer)
     private Integer operatorBalancePrice;
 
     /**
      * 客户产品
      */
-    @ApiModelProperty(value = "客户产品")
     @Field(type = FieldType.Integer)
     private Integer orderDetailId;
 
     /**
      * 通道ID
      */
-    @ApiModelProperty(value = "通道ID")
     @Field(type = FieldType.Integer)
     private Integer channelId;
 
     /**
      * 回调时间
      */
-    @ApiModelProperty(value = "回调时间")
     @Field(type = FieldType.Date)
     private Date checkTime;
 
     /**
      * 产品ID
      */
-    @ApiModelProperty(value = "产品ID")
     @Field(type = FieldType.Keyword)
     private String productId;
 
     /**
      * 官方凭证
      */
-    @ApiModelProperty(value = "官方凭证")
     @Field(type = FieldType.Keyword)
     private String attr1;
 
     /**
      * 备用2
      */
-    @ApiModelProperty(value = "备用2")
     @Field(type = FieldType.Keyword)
     private String attr2;
 
     /**
      * 备用3
      */
-    @ApiModelProperty(value = "备用3")
     @Field(type = FieldType.Keyword)
     private String attr3;
 
     /**
      * 客户名称
      */
-    @ApiModelProperty(value = "客户名称")
     @Field(type = FieldType.Text, analyzer = "ik_max_word")
     private String user;
 
     /**
      * 通道名称
      */
-    @ApiModelProperty(value = "通道名称")
     @Field(type = FieldType.Text, analyzer = "ik_max_word")
     private String channelName;
 
     /**
      * app接入名称
      */
-    @ApiModelProperty(value = "app接入名称")
-    @Field(type = FieldType.Text, analyzer = "ik_max_word")
+    @Field(type = FieldType.Keyword)
     private String appId;
-
 }

modules/admin/src/main/java/com/fire/admin/service/OrderManagementService.java

@@ -1,5 +1,6 @@
 package com.fire.admin.service;
 
+import cn.hutool.core.util.StrUtil;
 import com.fire.admin.request.OrderSearchPram;
 import com.fire.es.OrderEsDto;
 import lombok.extern.slf4j.Slf4j;
@@ -59,7 +60,7 @@ public class OrderManagementService {
                     .gte(orderSearchPram.getCheckTimeStart().getTime())
                     .lte(orderSearchPram.getCheckTimeEnd().getTime());
             boolQuery.must(rangeQueryBuilder);
-            }
+        }
         rangeQueryBuilder = QueryBuilders.rangeQuery("applyDate")
                 .gte(applyDateStart.getTime())
                 .lte(applyDateEnd.getTime());
@@ -88,15 +89,11 @@ public class OrderManagementService {
         }
         //客户名称
         if (Strings.isNotBlank(orderSearchPram.getEnterpriseIdDesc())) {
-            BoolQueryBuilder tempQueryBuilder = QueryBuilders.boolQuery();
-            tempQueryBuilder.should(QueryBuilders.wildcardQuery("user.keyword", "*" + orderSearchPram.getEnterpriseIdDesc() + "*"));
-            boolQuery.must(tempQueryBuilder);
+            boolQuery.must(QueryBuilders.wildcardQuery("user.keyword", "*" + orderSearchPram.getEnterpriseIdDesc() + "*"));
         }
         //通道名称
         if (Strings.isNotBlank(orderSearchPram.getChannelIdDesc())) {
-            BoolQueryBuilder tempQueryBuilder = QueryBuilders.boolQuery();
-            tempQueryBuilder.should(QueryBuilders.wildcardQuery("channelName.keyword", "*" + orderSearchPram.getChannelIdDesc() + "*"));
-            boolQuery.must(tempQueryBuilder);
+            boolQuery.must(QueryBuilders.wildcardQuery("channelName.keyword", "*" + orderSearchPram.getChannelIdDesc() + "*" ));
         }
         //订单状态
         if (Strings.isNotBlank(orderSearchPram.getStatus())) {
@@ -112,9 +109,7 @@ public class OrderManagementService {
         }
         //归属地
         if (Strings.isNotBlank(orderSearchPram.getMobileHome())) {
-            BoolQueryBuilder tempQueryBuilder = QueryBuilders.boolQuery();
-            tempQueryBuilder.should(QueryBuilders.wildcardQuery("mobileHome.keyword", "*" + orderSearchPram.getMobileHome() + "*"));
-            boolQuery.must(tempQueryBuilder);
+            boolQuery.must(QueryBuilders.wildcardQuery("mobileHome.keyword", "*" + orderSearchPram.getMobileHome() + "*"));
         }
 
         NativeSearchQuery query = new NativeSearchQueryBuilder()
@@ -200,15 +195,11 @@ public class OrderManagementService {
         }
         //客户名称
         if (Strings.isNotBlank(orderSearchPram.getEnterpriseIdDesc())) {
-            BoolQueryBuilder tempQueryBuilder = QueryBuilders.boolQuery();
-            tempQueryBuilder.should(QueryBuilders.wildcardQuery("user.keyword", "*" + orderSearchPram.getEnterpriseIdDesc() + "*"));
-            boolQuery.must(tempQueryBuilder);
+            boolQuery.must(QueryBuilders.wildcardQuery("user.keyword", "*" + orderSearchPram.getEnterpriseIdDesc() + "*"));
         }
         //通道名称
         if (Strings.isNotBlank(orderSearchPram.getChannelIdDesc())) {
-            BoolQueryBuilder tempQueryBuilder = QueryBuilders.boolQuery();
-            tempQueryBuilder.should(QueryBuilders.wildcardQuery("channelName.keyword", "*" + orderSearchPram.getChannelIdDesc() + "*"));
-            boolQuery.must(tempQueryBuilder);
+            boolQuery.must(QueryBuilders.wildcardQuery("channelName.keyword", "*" + orderSearchPram.getChannelIdDesc() + "*" ));
         }
         //订单状态
         if (Strings.isNotBlank(orderSearchPram.getStatus())) {
@@ -224,9 +215,7 @@ public class OrderManagementService {
         }
         //归属地
         if (Strings.isNotBlank(orderSearchPram.getMobileHome())) {
-            BoolQueryBuilder tempQueryBuilder = QueryBuilders.boolQuery();
-            tempQueryBuilder.should(QueryBuilders.wildcardQuery("mobileHome.keyword", "*" + orderSearchPram.getMobileHome() + "*"));
-            boolQuery.must(tempQueryBuilder);
+            boolQuery.must(QueryBuilders.wildcardQuery("mobileHome.keyword", "*" + orderSearchPram.getMobileHome() + "*"));
         }
 
         //统计条件