Merge branch 'master' of http://120.78.198.155:10080/zhangjunqiang/fire

# Conflicts:
#	modules/admin/src/main/resources/bootstrap.yml

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

@@ -0,0 +1,181 @@
+package com.fire.es;
+
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.springframework.data.annotation.Id;
+import org.springframework.data.elasticsearch.annotations.*;
+
+import java.util.Date;
+
+@Data
+@Document(indexName = "mobile_flow_dispatch_rec", shards = 3)
+public class DistributionDto {
+    /**
+     * 分发ID号
+     */
+    @Id
+    @ApiModelProperty("分发ID号")
+    private String recId;
+
+    /**
+     * 订单ID号
+     */
+    @ApiModelProperty("订单ID号")
+    @Field(type = FieldType.Keyword)
+    private String orderId;
+
+    /**
+     * 充值手机号
+     */
+    @ApiModelProperty("充值手机号")
+    @Field(type = FieldType.Keyword)
+    private String phoneNo;
+
+    /**
+     * 产品ID号
+     */
+    @ApiModelProperty("产品ID号")
+    @Field(type = FieldType.Keyword)
+    private String packageId;
+
+    /**
+     * 面额
+     */
+    @ApiModelProperty("面额")
+    @Field(type = FieldType.Integer)
+    private Integer flowAmount;
+
+    /**
+     * 总发送次数
+     */
+    @ApiModelProperty("总发送次数")
+    @Field(type = FieldType.Integer)
+    private Integer sendCount;
+
+    /**
+     * 创建时间
+     */
+    @ApiModelProperty("创建时间")
+    @Field(type = FieldType.Date)
+    private Date createDate;
+
+    /**
+     * 回调时间
+     */
+    @ApiModelProperty("回调时间")
+    @Field(type = FieldType.Date)
+    private Date callbackTime;
+
+    /**
+     * 发送状态： 2-已发  4-失败 6-成功
+     */
+    @ApiModelProperty("发送状态： 2-已发  4-失败 6-成功")
+    @Field(type = FieldType.Integer)
+    private Integer sendStatus;
+
+
+    /**
+     * 通道订单号
+     */
+    @ApiModelProperty("通道订单号")
+    @Field(type = FieldType.Keyword)
+    private String gwSeqNo;
+
+    /**
+     * 供应商状态
+     */
+    @ApiModelProperty("供应商状态")
+    @Field(type = FieldType.Keyword)
+    private String gwStatus;
+
+    /**
+     * 通道错误代码
+     */
+    @ApiModelProperty("通道错误代码")
+    @Field(type = FieldType.Keyword)
+    private String gwErrorCode;
+
+    /**
+     * 通道错误信息
+     */
+    @ApiModelProperty("通道错误信息")
+    @Field(type = FieldType.Keyword)
+    private String gwErrorMsg;
+
+    /**
+     * 归属地名称
+     */
+    @ApiModelProperty("归属地名称")
+    @MultiField(
+            mainField = @Field(type=FieldType.Text, analyzer = "ik_max_word"),
+            otherFields = @InnerField(suffix = "keyword", type=FieldType.Keyword))
+    private String phoneHome;
+
+    /**
+     * app接入名称
+     */
+    @ApiModelProperty("app接入名称")
+    @Field(type = FieldType.Keyword)
+    private String appId;
+
+
+    /**
+     * 最后回调信息
+     */
+    @ApiModelProperty("最后回调信息")
+    @Field(type = FieldType.Keyword)
+    private String lastCallbackMsg;
+
+
+    /**
+     * 运营商结算价格
+     */
+    @ApiModelProperty("运营商结算价格")
+    @Field(type = FieldType.Keyword)
+    private String operatorBalancePrice;
+
+    /**
+     * 通道组发送次数
+     */
+    @ApiModelProperty("通道组发送次数")
+    @Field(type = FieldType.Integer)
+    private Integer batchCount;
+
+    /**
+     * 客户产品id
+     */
+    @ApiModelProperty("客户产品id")
+    @Field(type = FieldType.Keyword)
+    private String customerProductsId;
+
+    /**
+     * 客户名称
+     */
+    @ApiModelProperty("客户名称")
+    @MultiField(
+            mainField = @Field(type=FieldType.Text, analyzer = "ik_max_word"),
+            otherFields = @InnerField(suffix = "keyword", type=FieldType.Keyword))
+    private String customerName;
+
+    /**
+     * 通道产品id
+     */
+    @ApiModelProperty("通道产品id")
+    @Field(type = FieldType.Keyword)
+    private String channelProductsId;
+
+    /**
+     * 运营商订单号
+     */
+    @ApiModelProperty("运营商订单号")
+    @Field(type = FieldType.Keyword)
+    private String operatorId;
+
+    /**
+     * 分发记录
+     */
+    @ApiModelProperty("分发记录")
+    @Field(type = FieldType.Keyword)
+    private String recordLog;
+}

modules/admin/src/main/java/com/fire/admin/mapper/DistributionRepository.java

@@ -0,0 +1,11 @@
+package com.fire.admin.mapper;
+
+import com.fire.es.DistributionDto;
+import org.springframework.data.elasticsearch.repository.ElasticsearchRepository;
+import org.springframework.stereotype.Service;
+
+@Service
+public interface DistributionRepository extends ElasticsearchRepository<DistributionDto, String> {
+
+
+}

modules/admin/src/main/resources/bootstrap.yml

@@ -31,14 +31,13 @@ spring:
       pool-name: DatebookHikariCP
   redis:
     cluster:
-      nodes: 192.168.2.110:7001,192.168.2.110:7002,192.168.2.110:7003,192.168.2.110:7004,192.168.2.110:7005,192.168.2.110:7006
+      nodes: 192.168.2.110:7001,192.168.2.110:7002,192.168.2.110:7003
 #    host: 192.168.101.100
 #    port: 11670
 jwt:
   header: Authorization
   tokenHead: Bearer
 
-
 mybatis-plus:
   configuration:
     log-impl: org.apache.ibatis.logging.stdout.StdOutImpl