From 9fcdc929c49252a0280138f70a1836f95ae8bb4c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=9C=E9=9D=99?= <jing.du@baifendian.com>
Date: Fri, 29 Oct 2021 15:09:32 +0800
Subject: [PATCH] =?UTF-8?q?release-3.1.5(2021-10-29,=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E4=BA=86=E4=B8=80=E4=B8=AA=E5=AF=BC=E5=87=BA=E5=AD=97=E6=AE=B5?=
 =?UTF-8?q?=EF=BC=9ApromotionInfo)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/bfd/clickhouse/TestClickhouse.java    | 76 ++++++++++++++++++++++
 .../web/vo/view/monitor/ESMonitorBaseEntity.java   |  9 +++
 .../java/com/bfd/mf/service/SearchDataService.java |  5 ++
 logs/sdkclient_error.log                           |  0
 4 files changed, 90 insertions(+)
 create mode 100644 cl_query_data_job/src/test/java/com/bfd/clickhouse/TestClickhouse.java
 create mode 100644 logs/sdkclient_error.log

diff --git a/cl_query_data_job/src/test/java/com/bfd/clickhouse/TestClickhouse.java b/cl_query_data_job/src/test/java/com/bfd/clickhouse/TestClickhouse.java
new file mode 100644
index 0000000..6627a14
--- /dev/null
+++ b/cl_query_data_job/src/test/java/com/bfd/clickhouse/TestClickhouse.java
@@ -0,0 +1,76 @@
+package com.bfd.clickhouse;
+
+import java.sql.*;
+
+public class TestClickhouse {
+
+    public static void main(String[] args) {
+        try {
+            // 获取链接
+            Connection connection = getConnection();
+            // 创建表
+            createTable(connection);
+//            // 插入数据
+//            insertData(connection);
+            // 查询数据
+          //  queryData(connection);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+    private static void queryData(Connection connection) {
+        try{
+            Statement statement = connection.createStatement();
+
+            String sql = "select age,count(*) from test.jdbc_example GROUP BY age";
+            ResultSet rs = statement.executeQuery(sql);
+
+            while (rs.next()) {
+                // ResultSet 的下标值从 1 开始，不可使用 0，否则越界，报 ArrayIndexOutOfBoundsException 异常
+                System.out.println(rs.getObject(1)+" : "+rs.getObject(2));
+//                System.out.println(rs.getDate(1) + ", " + rs.getString(2) + ", " + rs.getInt(3));
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+        }
+    }
+
+
+    // 插入数据
+    private static void insertData(Connection connection) {
+        try{
+            PreparedStatement pstmt = connection.prepareStatement("insert into test.jdbc_example values(?, ?, ?)");
+            // insert 10 records
+            for (int i = 0; i < 10; i++) {
+                pstmt.setDate(1, new Date(System.currentTimeMillis()));
+                pstmt.setString(2, "panda_" + (i + 1));
+                pstmt.setInt(3, 18);
+                pstmt.addBatch();
+            }
+            pstmt.executeBatch();
+        }catch (Exception e){
+            e.printStackTrace();
+        }
+    }
+    // 创建表
+    private static void createTable(Connection connection ) {
+        try {
+            Statement statement = connection.createStatement();
+            statement.executeQuery("create table test1.jdbc_example(day Date, name String, age UInt8) Engine=Log");
+        }catch (Exception e){
+            e.printStackTrace();
+        }
+    }
+    // 获取链接
+    private static Connection getConnection() {
+        try {
+            Class.forName("com.github.housepower.jdbc.ClickHouseDriver");
+            Connection connection = DriverManager.getConnection("jdbc:clickhouse://172.26.11.111:8123");
+            return connection;
+        }catch (Exception e){
+            e.printStackTrace();
+            return null;
+        }
+    }
+}
diff --git a/cl_search_api/src/main/java/com/bfd/mf/common/web/vo/view/monitor/ESMonitorBaseEntity.java b/cl_search_api/src/main/java/com/bfd/mf/common/web/vo/view/monitor/ESMonitorBaseEntity.java
index 76b8aa7..218bcf8 100644
--- a/cl_search_api/src/main/java/com/bfd/mf/common/web/vo/view/monitor/ESMonitorBaseEntity.java
+++ b/cl_search_api/src/main/java/com/bfd/mf/common/web/vo/view/monitor/ESMonitorBaseEntity.java
@@ -120,6 +120,15 @@ public class ESMonitorBaseEntity implements Comparable<ESMonitorBaseEntity>, Ser
 
     private String otherSourceJson;
 
+    private String promotionInfo;
+
+    public String getPromotionInfo() {
+        return promotionInfo;
+    }
+
+    public void setPromotionInfo(String promotionInfo) {
+        this.promotionInfo = promotionInfo;
+    }
 
     public String getCollectCount() {
         return collectCount;
diff --git a/cl_search_api/src/main/java/com/bfd/mf/service/SearchDataService.java b/cl_search_api/src/main/java/com/bfd/mf/service/SearchDataService.java
index 4b72dff..5ffb0da 100644
--- a/cl_search_api/src/main/java/com/bfd/mf/service/SearchDataService.java
+++ b/cl_search_api/src/main/java/com/bfd/mf/service/SearchDataService.java
@@ -409,6 +409,10 @@ public class SearchDataService extends CrudService<SentimentModify, SentimentRep
             if(sourceAsMap.containsKey(ESConstant.OTHERSOURCEJSON)){
                 otherSourceJson = sourceAsMap.get(ESConstant.OTHERSOURCEJSON).toString();
             }
+            String promotionInfo = "";
+            if(sourceAsMap.containsKey(ESConstant.PROMOTIONINFO)){
+                promotionInfo = sourceAsMap.get(ESConstant.PROMOTIONINFO).toString();
+            }
 
             try {
                 esMonitorEntity.setDataId(dataId);
@@ -472,6 +476,7 @@ public class SearchDataService extends CrudService<SentimentModify, SentimentRep
                 esMonitorEntity.setTag(tag);
                 // 二次评论的字段
                 esMonitorEntity.setOtherSourceJson(otherSourceJson);
+                esMonitorEntity.setPromotionInfo(promotionInfo);
 
             } catch (Exception e) {
                 e.printStackTrace();
diff --git a/logs/sdkclient_error.log b/logs/sdkclient_error.log
new file mode 100644
index 0000000..e69de29