rdluck 3 years ago
parent
commit
c41426a137

+ 1 - 1
models/data_manage/edb_info.go

@@ -26,7 +26,7 @@ func GetEdbInfoByCondition(condition string, pars []interface{}) (item []*EdbInf
 	if condition != "" {
 		sql += condition
 	}
-	err = o.Raw(sql, pars).QueryRow(&item)
+	_,err = o.Raw(sql, pars).QueryRows(&item)
 	return
 }
 

+ 5 - 5
services/data_manage/data_ths.go

@@ -31,12 +31,12 @@ func SyncEdbDataByThs(edbInfoId int64, edbCode, startDate, endDate string) (err
 	fmt.Println(string(body))
 
 	if err != nil {
-		return
+		return errors.New("SyncEdbDataByThs:"+err.Error()+"; result:"+string(body))
 	}
 	item := new(EdbDataFromThs)
 	err = json.Unmarshal(body, &item)
 	if err != nil {
-		return
+		return errors.New("EdbDataFromThs Unmarshal:"+err.Error())
 	}
 	if item.Errorcode != 0 {
 		err = errors.New(string(body))
@@ -52,12 +52,12 @@ func SyncEdbDataByThs(edbInfoId int64, edbCode, startDate, endDate string) (err
 			sValue := table.Value[i]
 			count, err := data_manage.GetEdbDataThsCount(edbInfoId, eDate)
 			if err != nil {
-				return err
+				return errors.New("GetEdbDataThsCount Err:"+err.Error())
 			}
 			if count > 0 {
 				err = data_manage.ModifyEdbDataThs(edbInfoId, eDate, sValue)
 				if err != nil {
-					return err
+					return errors.New("ModifyEdbDataThs Err:"+err.Error())
 				}
 			} else {
 				dataItem := new(data_manage.EdbDataThs)
@@ -75,7 +75,7 @@ func SyncEdbDataByThs(edbInfoId int64, edbCode, startDate, endDate string) (err
 	if len(dataList) > 0 {
 		err = data_manage.AddEdbDataThs(dataList)
 		if err != nil {
-			return
+			return errors.New("AddEdbDataThs Err:"+err.Error())
 		}
 	}
 	return

+ 5 - 5
services/data_manage/edb_info.go

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