|
@@ -1,6 +1,7 @@
|
|
package data_manage
|
|
package data_manage
|
|
|
|
|
|
import (
|
|
import (
|
|
|
|
+ "errors"
|
|
"fmt"
|
|
"fmt"
|
|
"hongze/hongze_task/models/data_manage"
|
|
"hongze/hongze_task/models/data_manage"
|
|
"hongze/hongze_task/utils"
|
|
"hongze/hongze_task/utils"
|
|
@@ -21,7 +22,7 @@ func RefreshDataFromThs() (err error) {
|
|
pars = append(pars, utils.DATA_SOURCE_THS)
|
|
pars = append(pars, utils.DATA_SOURCE_THS)
|
|
items, err := data_manage.GetEdbInfoByCondition(condition, pars)
|
|
items, err := data_manage.GetEdbInfoByCondition(condition, pars)
|
|
if err != nil {
|
|
if err != nil {
|
|
- return err
|
|
|
|
|
|
+ return errors.New("GetEdbInfoByCondition:"+err.Error())
|
|
}
|
|
}
|
|
|
|
|
|
for _, v := range items {
|
|
for _, v := range items {
|
|
@@ -29,19 +30,18 @@ func RefreshDataFromThs() (err error) {
|
|
endDate := time.Now().Format(utils.FormatDate)
|
|
endDate := time.Now().Format(utils.FormatDate)
|
|
err = SyncEdbDataByThs(int64(v.EdbInfoId), v.EdbCode, startDate, endDate)
|
|
err = SyncEdbDataByThs(int64(v.EdbInfoId), v.EdbCode, startDate, endDate)
|
|
if err != nil {
|
|
if err != nil {
|
|
- return err
|
|
|
|
|
|
+ return errors.New("SyncEdbDataByThs:"+err.Error())
|
|
}
|
|
}
|
|
minDate, maxDate, err := data_manage.GetEdbDataThsMaxOrMinDate(v.EdbInfoId)
|
|
minDate, maxDate, err := data_manage.GetEdbDataThsMaxOrMinDate(v.EdbInfoId)
|
|
if err != nil {
|
|
if err != nil {
|
|
- return err
|
|
|
|
|
|
+ return errors.New("GetEdbDataThsMaxOrMinDate:"+err.Error())
|
|
}
|
|
}
|
|
fmt.Println("minDate:" + minDate + ";maxDate:" + maxDate)
|
|
fmt.Println("minDate:" + minDate + ";maxDate:" + maxDate)
|
|
err = data_manage.ModifyEdbDataInfoDate(v.EdbInfoId, maxDate)
|
|
err = data_manage.ModifyEdbDataInfoDate(v.EdbInfoId, maxDate)
|
|
if err != nil {
|
|
if err != nil {
|
|
- return err
|
|
|
|
|
|
+ return errors.New("ModifyEdbDataInfoDate:"+err.Error())
|
|
}
|
|
}
|
|
}
|
|
}
|
|
-
|
|
|
|
return err
|
|
return err
|
|
}
|
|
}
|
|
|
|
|