|
@@ -25,19 +25,19 @@ type EdbDataFromThs struct {
|
|
|
func SyncEdbDataByThs(edbInfoId int64, edbCode, startDate, endDate string) (err error) {
|
|
|
thsUrl := utils.Hz_Data_Url + `edbInfo/ths?EdbCode=%s&StartDate=%s&EndDate=%s`
|
|
|
thsUrl = fmt.Sprintf(thsUrl, edbCode, startDate, endDate)
|
|
|
- utils.FileLog.Info("thsUrl:%s", thsUrl)
|
|
|
+ utils.FileLog.Info("thsUrl:" + thsUrl)
|
|
|
body, err := http.Get(thsUrl)
|
|
|
fmt.Println(thsUrl)
|
|
|
fmt.Println("GetEdbDataByThs body:")
|
|
|
fmt.Println(string(body))
|
|
|
-
|
|
|
+ utils.FileLog.Info("ths result:" + string(body))
|
|
|
if err != nil {
|
|
|
- return errors.New("SyncEdbDataByThs:"+err.Error()+"; result:"+string(body))
|
|
|
+ return errors.New("SyncEdbDataByThs:" + err.Error() + "; result:" + string(body))
|
|
|
}
|
|
|
item := new(EdbDataFromThs)
|
|
|
err = json.Unmarshal(body, &item)
|
|
|
if err != nil {
|
|
|
- return errors.New("EdbDataFromThs Unmarshal:"+err.Error())
|
|
|
+ return errors.New("EdbDataFromThs Unmarshal:" + err.Error())
|
|
|
}
|
|
|
if item.Errorcode != 0 {
|
|
|
err = errors.New(string(body))
|
|
@@ -53,12 +53,12 @@ func SyncEdbDataByThs(edbInfoId int64, edbCode, startDate, endDate string) (err
|
|
|
sValue := table.Value[i]
|
|
|
count, err := data_manage.GetEdbDataThsCount(edbCode, eDate)
|
|
|
if err != nil {
|
|
|
- return errors.New("GetEdbDataThsCount Err:"+err.Error())
|
|
|
+ return errors.New("GetEdbDataThsCount Err:" + err.Error())
|
|
|
}
|
|
|
if count > 0 {
|
|
|
- err = data_manage.ModifyEdbDataThs(edbInfoId,edbCode, eDate, sValue)
|
|
|
+ err = data_manage.ModifyEdbDataThs(edbInfoId, edbCode, eDate, sValue)
|
|
|
if err != nil {
|
|
|
- return errors.New("ModifyEdbDataThs Err:"+err.Error())
|
|
|
+ return errors.New("ModifyEdbDataThs Err:" + err.Error())
|
|
|
}
|
|
|
} else {
|
|
|
dataTime, err := time.Parse(utils.FormatDate, eDate)
|
|
@@ -75,7 +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
|
|
|
+ dataItem.DataTimestamp = timestamp
|
|
|
dataList = append(dataList, dataItem)
|
|
|
}
|
|
|
}
|
|
@@ -83,7 +83,7 @@ func SyncEdbDataByThs(edbInfoId int64, edbCode, startDate, endDate string) (err
|
|
|
if len(dataList) > 0 {
|
|
|
err = data_manage.AddEdbDataThs(dataList)
|
|
|
if err != nil {
|
|
|
- return errors.New("AddEdbDataThs Err:"+err.Error())
|
|
|
+ return errors.New("AddEdbDataThs Err:" + err.Error())
|
|
|
}
|
|
|
}
|
|
|
return
|