kubeedge
/
mapper-framework
mirror of https://github.com/kubeedge/mapper-framework.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #13 from wbc6080/sync-6.15 

Synchronize changes from the kubeedge/staging directory on 2024.6.15
This commit is contained in:
wbc6080 2024-06-15 11:25:03 +08:00 committed by GitHub
parent e52ebca353 186b50d113
commit 0533327f84
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
_template/mapper/cmd/main.go
View File

@ -2,7 +2,6 @@ package main
import (
"errors"
"os"
"k8s.io/klog/v2"
@ -23,7 +22,6 @@ func main() {
if c, err = config.Parse(); err != nil {
klog.Fatal(err)
os.Exit(1)
}
klog.Infof("config: %+v", c)

5
_template/mapper/data/dbmethod/redis/client.go
View File

@ -51,9 +51,8 @@ func (d *DataBaseConfig) InitDbClient() error {
if err != nil {
klog.Errorf("init redis database failed, err = %v", err)
return err
} else {
klog.V(1).Infof("init redis database successfully, with return cmd %s", pong)
}
klog.V(1).Infof("init redis database successfully, with return cmd %s", pong)
return nil
}
@ -71,7 +70,7 @@ func (d *DataBaseConfig) AddData(data *common.DataModel) error {
// Check if the current ordered set exists
deviceData := "TimeStamp: " + strconv.FormatInt(data.TimeStamp, 10) + " PropertyName: " + data.PropertyName + " data: " + data.Value
// Add data to ordered set. If the ordered set does not exist, it will be created.
_, err = RedisCli.ZAdd(ctx, data.DeviceName, &redis.Z{
_, err := RedisCli.ZAdd(ctx, data.DeviceName, &redis.Z{
Score: float64(data.TimeStamp),
Member: deviceData,
}).Result()

6
_template/mapper/data/dbmethod/tdengine/client.go
View File

@ -3,6 +3,7 @@
import (
"database/sql"
"encoding/json"
"errors"
"fmt"
"os"
"strings"
@ -44,9 +45,8 @@ func (d *DataBaseConfig) InitDbClient() error {
DB, err = sql.Open("taosRestful", dsn)
if err != nil {
klog.Errorf("init TDEngine db fail, err= %v:", err)
} else {
klog.V(1).Infof("init TDEngine database successfully")
}
klog.V(1).Infof("init TDEngine database successfully")
return nil
}
@ -152,5 +152,5 @@ func (d *DataBaseConfig) GetDataByTimeRange(deviceName string, start int64, end
}
func (d *DataBaseConfig) DeleteDataByTimeRange(start int64, end int64) ([]*common.DataModel, error) {
//TODO implement me
panic("implement me")
return nil, errors.New("implement me")
}