update tdengine client ..

Signed-off-by: cai6489 <caichunbo@beyondcent.com>

2 files changed, 13 insertions, 14 deletions

diff --git a/staging/src/github.com/kubeedge/mapper-framework/_template/mapper/data/dbmethod/tdengine/client.go b/staging/src/github.com/kubeedge/mapper-framework/_template/mapper/data/dbmethod/tdengine/client.go
index 6cfa01fd0..551f435e8 100644
--- a/staging/src/github.com/kubeedge/mapper-framework/_template/mapper/data/dbmethod/tdengine/client.go
+++ b/staging/src/github.com/kubeedge/mapper-framework/_template/mapper/data/dbmethod/tdengine/client.go
@@ -21,7 +21,7 @@ type DataBaseConfig struct {
 }
 type TDEngineClientConfig struct {
 	Addr   string `json:"addr,omitempty"`
-	DBName string `json:"DB,omitempty"`
+	DBName string `json:"dbName,omitempty"`
 }
 
 func NewDataBaseClient(config json.RawMessage) (*DataBaseConfig, error) {
@@ -42,7 +42,6 @@ func (d *DataBaseConfig) InitDbClient() error {
 	DB, err = sql.Open("taosRestful", dsn)
 	if err != nil {
 		klog.Errorf("init TDEngine db fail, err= %v:", err)
-		//fmt.Printf("failed connect to TDengine:%v", err)
 	} else {
 		klog.V(1).Infof("init TDEngine database successfully")
 	}
@@ -52,7 +51,7 @@ func (d *DataBaseConfig) InitDbClient() error {
 func (d *DataBaseConfig) CloseSessio() {
 	err := DB.Close()
 	if err != nil {
-		klog.V(4).Info("close  TDEngine failed")
+		klog.Errorf("close TDEngine failed")
 	}
 }
 
@@ -62,33 +61,33 @@ func (d *DataBaseConfig) AddData(data *common.DataModel) error {
 	legal_tag := strings.Replace(data.PropertyName, "-", "_", -1)
 
 	stable_name := fmt.Sprintf("SHOW STABLES LIKE '%s'", legal_table)
-
 	stabel := fmt.Sprintf("CREATE STABLE %s (ts timestamp, devicename binary(64), propertyname binary(64), data binary(64),type binary(64)) TAGS (localtion binary(64));", legal_table)
 
-	datatime := time.Unix(data.TimeStamp, 0).Format("2006-01-02 15:04:05")
+	datatime := time.Unix(data.TimeStamp/1e3, 0).Format("2006-01-02 15:04:05")
 	insertSQL := fmt.Sprintf("INSERT INTO %s USING %s TAGS ('%s') VALUES('%v','%s', '%s', '%s', '%s');",
 		legal_tag, legal_table, legal_tag, datatime, data.DeviceName, data.PropertyName, data.Value, data.Type)
 
 	rows, _ := DB.Query(stable_name)
+	defer rows.Close()
 
 	if err := rows.Err(); err != nil {
-		fmt.Printf("query stable failed：%v", err)
+		klog.Errorf("query stable failed：%v", err)
 	}
 
 	switch rows.Next() {
 	case false:
 		_, err := DB.Exec(stabel)
 		if err != nil {
-			klog.V(4).Infof("create stable failed %v\n", err)
+			klog.Errorf("create stable failed %v\n", err)
 		}
 		_, err = DB.Exec(insertSQL)
 		if err != nil {
-			klog.Infof("failed add data to TdEngine:%v", err)
+			klog.Errorf("failed add data to TdEngine:%v", err)
 		}
 	case true:
 		_, err := DB.Exec(insertSQL)
 		if err != nil {
-			klog.Infof("failed add data to TdEngine:%v", err)
+			klog.Errorf("failed add data to TdEngine:%v", err)
 		}
 	default:
 		klog.Infoln("failed add data to TdEngine")
@@ -109,7 +108,7 @@ func (d *DataBaseConfig) GetDataByDeviceName(deviceName string) ([]*common.DataM
 		var ts time.Time
 		err := rows.Scan(&ts, &data.DeviceName, &data.PropertyName, &data.Value, &data.Type)
 		if err != nil {
-			klog.V(4).Infof(" data scan error: %v\n", err)
+			klog.Errorf(" data scan error: %v\n", err)
 			//fmt.Printf("scan error:\n", err)
 			return nil, err
 		}
diff --git a/staging/src/github.com/kubeedge/mapper-framework/pkg/util/parse/grpc.go b/staging/src/github.com/kubeedge/mapper-framework/pkg/util/parse/grpc.go
index b3eca0518..20308e532 100644
--- a/staging/src/github.com/kubeedge/mapper-framework/pkg/util/parse/grpc.go
+++ b/staging/src/github.com/kubeedge/mapper-framework/pkg/util/parse/grpc.go
@@ -161,22 +161,22 @@ func buildPropertiesFromGrpc(device *dmiapi.Device) []common.DeviceProperty {
 					Influxdb2DataConfig:   dataconfig,
 				}
 			case "redis":
-				configdata, err := json.Marshal(pptv.PushMethod.DBMethod.Redis.RedisClientConfig)
+				clientConfig, err := json.Marshal(pptv.PushMethod.DBMethod.Redis.RedisClientConfig)
 				if err != nil {
 					klog.Errorf("err: %+v", err)
 					return nil
 				}
 				dbconfig = common.DBConfig{
-					RedisClientConfig: configdata,
+					RedisClientConfig: clientConfig,
 				}
 			case "tdengine":
-				configdata, err := json.Marshal(pptv.PushMethod.DBMethod.Tdengine.TdEngineClientConfig)
+				clientConfig, err := json.Marshal(pptv.PushMethod.DBMethod.Tdengine.TdEngineClientConfig)
 				if err != nil {
 					klog.Errorf("err: %+v", err)
 					return nil
 				}
 				dbconfig = common.DBConfig{
-					TDEngineClientConfig: configdata,
+					TDEngineClientConfig: clientConfig,
 				}
 			}
 		}