fix bug

models/data_manage/edb_data_pb.go

@@ -6,16 +6,17 @@ import (
 )
 
 type EdbDataPb struct {
-	EdbDataId  int `orm:"column(edb_data_id);pk"`
-	EdbInfoId  int
-	EdbCode    string
-	DataTime   string
-	Value      float64
-	Status     int
-	CreateTime time.Time
-	ModifyTime time.Time
-	Ticker     string
-	Field      string
+	EdbDataId     int `orm:"column(edb_data_id);pk"`
+	EdbInfoId     int
+	EdbCode       string
+	DataTime      string
+	Value         float64
+	Status        int
+	CreateTime    time.Time
+	ModifyTime    time.Time
+	Ticker        string
+	Field         string
+	DataTimestamp int64
 }
 
 func AddEdbDataPb(items []*EdbDataPb) (err error) {

models/data_manage/edb_data_ths.go

@@ -14,6 +14,7 @@ type EdbDataThs struct {
 	Status     int
 	CreateTime time.Time
 	ModifyTime time.Time
+	DataTimestamp int64
 }
 
 func AddEdbDataThs(items []*EdbDataThs) (err error) {

models/data_manage/edb_data_wind.go

@@ -14,6 +14,7 @@ type EdbDataWind struct {
 	Status     int
 	CreateTime time.Time
 	ModifyTime time.Time
+	DataTimestamp int64
 }
 
 func AddEdbDataWind(items []*EdbDataWind) (err error) {

services/data_manage/data_pb.go

@@ -24,9 +24,9 @@ func SyncEdbDataByPb(edbInfoId int64, edbCode, startDate, endDate string) (err e
 			fmt.Println("SyncEdbDataByPb Err:" + err.Error())
 		}
 	}()
-	addEdbCode:=edbCode
+	addEdbCode := edbCode
 
-	edbCode=url.QueryEscape(edbCode)
+	edbCode = url.QueryEscape(edbCode)
 	pbUrl := utils.Hz_Data_PB_Url + `edbInfo/pb?EdbCode=%s&StartDate=%s&EndDate=%s`
 	pbUrl = fmt.Sprintf(pbUrl, edbCode, startDate, endDate)
 	utils.FileLog.Info("pbUrl:%s", pbUrl)
@@ -49,6 +49,7 @@ func SyncEdbDataByPb(edbInfoId int64, edbCode, startDate, endDate string) (err e
 	if len(item.Date) > 0 {
 		dateMap := item.Date
 		for k, v := range dateMap {
+			dataTimestamp := v
 			v = v / 1000
 			t := time.Unix(v, 0)
 			dateTime := t.Format(utils.FormatDate)
@@ -62,7 +63,7 @@ func SyncEdbDataByPb(edbInfoId int64, edbCode, startDate, endDate string) (err e
 				return err
 			}
 			if count > 0 {
-				err = data_manage.ModifyEdbDataPb(edbInfoId,edbCode, dateTime, val)
+				err = data_manage.ModifyEdbDataPb(edbInfoId, edbCode, dateTime, val)
 				if err != nil {
 					return err
 				}
@@ -75,8 +76,9 @@ func SyncEdbDataByPb(edbInfoId int64, edbCode, startDate, endDate string) (err e
 				item.DataTime = dateTime
 				item.Value = val
 				item.Status = 1
-				item.Field=field
-				item.Ticker=ticker
+				item.Field = field
+				item.Ticker = ticker
+				item.DataTimestamp = dataTimestamp
 				pbList = append(pbList, item)
 			}
 		}

services/data_manage/data_ths.go

@@ -61,6 +61,12 @@ func SyncEdbDataByThs(edbInfoId int64, edbCode, startDate, endDate string) (err
 					return errors.New("ModifyEdbDataThs Err:"+err.Error())
 				}
 			} else {
+				dataTime, err := time.Parse(utils.FormatDate, eDate)
+				if err != nil {
+
+				}
+				timestamp := dataTime.UnixNano() / 1e6
+
 				dataItem := new(data_manage.EdbDataThs)
 				dataItem.EdbInfoId = int(edbInfoId)
 				dataItem.EdbCode = edbCode
@@ -69,6 +75,7 @@ func SyncEdbDataByThs(edbInfoId int64, edbCode, startDate, endDate string) (err
 				dataItem.Status = 1
 				dataItem.CreateTime = time.Now()
 				dataItem.ModifyTime = time.Now()
+				dataItem.DataTimestamp=timestamp
 				dataList = append(dataList, dataItem)
 			}
 		}

services/data_manage/data_wind.go

@@ -42,6 +42,7 @@ func SyncEdbDataByWind(edbInfoId int64, edbCode, startDate, endDate string) (err
 
 	windList := make([]*data_manage.EdbDataWind, 0)
 	for k, v := range item.Dt {
+		dataTimestamp := v
 		v = v / 1000
 		fmt.Println(k, v)
 		t := time.Unix(v, 0)
@@ -53,7 +54,7 @@ func SyncEdbDataByWind(edbInfoId int64, edbCode, startDate, endDate string) (err
 			return err
 		}
 		if count > 0 {
-			err = data_manage.ModifyEdbDataWind(edbInfoId,edbCode, dateTime, val)
+			err = data_manage.ModifyEdbDataWind(edbInfoId, edbCode, dateTime, val)
 			if err != nil {
 				return err
 			}
@@ -67,6 +68,7 @@ func SyncEdbDataByWind(edbInfoId int64, edbCode, startDate, endDate string) (err
 			item.DataTime = dateTime
 			item.Value = val
 			item.Status = 1
+			item.DataTimestamp = dataTimestamp
 			windList = append(windList, item)
 		}
 	}