From 4e99ffb827540ac02568930968ca0925f185aad7 Mon Sep 17 00:00:00 2001
From: huanghai <10402852@qq.com>
Date: Mon, 7 Sep 2020 08:43:04 +0800
Subject: [PATCH] 'commit'

---
 dsSupport/Test/CreatePgTable/CreatePgTable.go      |  4 ++--
 .../ElasticsearchToGreenPlum.go                    | 14 +++++++-------
 .../Test/ReadEsExistMapping/ReadEsExistMapping.go  |  7 +++++--
 dsSupport/models/t_dw_table_field.go               |  1 -
 4 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/dsSupport/Test/CreatePgTable/CreatePgTable.go b/dsSupport/Test/CreatePgTable/CreatePgTable.go
index 3fca7c3c..f6618538 100644
--- a/dsSupport/Test/CreatePgTable/CreatePgTable.go
+++ b/dsSupport/Test/CreatePgTable/CreatePgTable.go
@@ -54,8 +54,8 @@ func main() {
 		createTableSql = createTableSql[0 : len(createTableSql)-3]
 		createTableSql += `);` + "\r\n"
 		_, err := pgDb.SQL(createTableSql).Execute()
+		fmt.Println(createTableSql)
 		if err != nil {
-			fmt.Println(createTableSql)
 			panic(err.Error())
 		}
 		//主键
@@ -66,7 +66,7 @@ func main() {
 		if err != nil {
 			panic(err.Error())
 		}
-
+		//bzlbm
 		fmt.Println("恭喜，数据仓库中相应表格创建完毕！")
 	}
 }
diff --git a/dsSupport/Test/ElasticsearchToGreenPlum/ElasticsearchToGreenPlum.go b/dsSupport/Test/ElasticsearchToGreenPlum/ElasticsearchToGreenPlum.go
index e6200541..8cd89d38 100644
--- a/dsSupport/Test/ElasticsearchToGreenPlum/ElasticsearchToGreenPlum.go
+++ b/dsSupport/Test/ElasticsearchToGreenPlum/ElasticsearchToGreenPlum.go
@@ -54,16 +54,16 @@ func main() {
 		panic(err)
 	}
 	//从配置表中获取此索引对应的表中主键是哪个，目前只支持一个主键，无主键和多主键不支持
-	sql := "select * from t_dw_table"
-	list, _ := mysqlDb.SQL(sql).Query().List()
-	for i := range list {
-		tableId := list[i]["table_id"].(int64)
-		indexName := list[i]["table_name"].(string)
+	sql := "select * from t_dw_table where b_use=1"
+	tableList, _ := mysqlDb.SQL(sql).Query().List()
+	for i := range tableList {
+		tableId := tableList[i]["table_id"].(int64)
+		indexName := tableList[i]["table_name"].(string)
 		//预热数据表的列名
 		getFields(int(tableId))
 		// 当前表的主键是什么，目前只支持单业务主键，复合主键的不支持
 		sql = `select field_name from t_dw_table_field where table_id=? and is_pk=1`
-		list, _ = mysqlDb.SQL(sql, tableId).Query().List()
+		list, _ := mysqlDb.SQL(sql, tableId).Query().List()
 		pk := list[0]["field_name"].(string)
 		//取所有
 		CTX := context.Background()
@@ -204,7 +204,7 @@ func batchSave(tableName string, pkName string) {
 	_, err := pgDb.SQL(sql).Execute()
 	if err != nil {
 		fmt.Println(sql)
-		//panic(err)
+		panic(err)
 	}
 	fmt.Println("批量执行" + CommonUtil.ConvertIntToString(len(insertStrArray)) + "条.")
 }
diff --git a/dsSupport/Test/ReadEsExistMapping/ReadEsExistMapping.go b/dsSupport/Test/ReadEsExistMapping/ReadEsExistMapping.go
index 7d6d9054..f28fb737 100644
--- a/dsSupport/Test/ReadEsExistMapping/ReadEsExistMapping.go
+++ b/dsSupport/Test/ReadEsExistMapping/ReadEsExistMapping.go
@@ -35,7 +35,7 @@ func main() {
 	}
 
 	//要同步的索引名称，也就是表名称
-	indexName := "org_school"
+	indexName := "user_teacher_org"
 	//取所有
 	CTX := context.Background()
 	result, err := esClient.Scroll().Index(indexName).Size(10).Do(CTX)
@@ -83,7 +83,10 @@ func addFieldData(tableName string, m map[string]interface{}) {
 			model.FieldLength = 128
 			model.DecimalPointLength = 0
 		}
-		db.Insert(model)
+		_,err:=db.Insert(model)
+		if err!=nil{
+			panic(err)
+		}
 	}
 	fmt.Println("完成现有Es Mapping的结构反向初始化工作，将手工修改表t_dw_table_field中数据！尤其是主键，一定要设置啊！")
 }
diff --git a/dsSupport/models/t_dw_table_field.go b/dsSupport/models/t_dw_table_field.go
index 7d73919c..a6b485a3 100644
--- a/dsSupport/models/t_dw_table_field.go
+++ b/dsSupport/models/t_dw_table_field.go
@@ -9,5 +9,4 @@ type TDwTableField struct {
 	DecimalPointLength int32  `xorm:"not null default 0 comment('小数点后长度') INT(11)"`
 	Comment            string `xorm:"default 'NULL' comment('描述') VARCHAR(255)"`
 	IsPk               int32  `xorm:"not null default 0 comment('是否为主键') INT(255)"`
-	IsNull             int32  `xorm:"not null comment('是否可为空') INT(255)"`
 }