修改数据同步日志

services/data/data_ths.go

@@ -28,9 +28,9 @@ func SyncEdbDataByThs(edbInfoId int64, edbCode, startDate, endDate string) (err
 	thsUrl = fmt.Sprintf(thsUrl, edbCode, startDate, endDate)
 	utils.FileLog.Info("thsUrl:" + thsUrl)
 	body, err := http.Get(thsUrl)
-
 	if strings.Contains(string(body), "html") {
-		return nil
+		err = errors.New("SyncEdbDataByThs Err:" + string(body))
+		return err
 	}
 	utils.FileLog.Info("ths result:" + string(body))
 	if err != nil {

services/data/edb_info.go

@@ -27,7 +27,8 @@ func RefreshDataFromThs(wg *sync.WaitGroup) (err error) {
 	pars = append(pars, utils.DATA_SOURCE_THS)
 	items, err := data_manage.GetEdbInfoByCondition(condition, pars, 0)
 	if err != nil {
-		return errors.New("GetEdbInfoByCondition:" + err.Error())
+		err = errors.New("GetEdbInfoByCondition:" + err.Error())
+		return
 	}
 
 	var endDate string
@@ -49,27 +50,21 @@ func RefreshDataFromThs(wg *sync.WaitGroup) (err error) {
 		}
 		err = SyncEdbDataByThs(int64(v.EdbInfoId), v.EdbCode, startDate, endDate)
 		if err != nil {
-			return errors.New("SyncEdbDataByThs:" + err.Error())
+			err=errors.New("SyncEdbDataByThs Err:" + err.Error())
+			return err
 		}
 		item, err := data_manage.GetEdbInfoMaxAndMinInfo(v.Source, v.EdbCode)
 		if err != nil {
+			err=errors.New("GetEdbInfoMaxAndMinInfo Err:" + err.Error())
 			return err
 		}
 		if item != nil {
 			err = data_manage.ModifyEdbInfoMaxAndMinInfo(v.EdbInfoId, item)
 			if err != nil {
+				err=errors.New("ModifyEdbInfoMaxAndMinInfo Err:" + err.Error())
 				return err
 			}
 		}
-		//minDate, maxDate, err := data.GetEdbDataThsMaxOrMinDate(v.EdbInfoId)
-		//if err != nil {
-		//	return errors.New("GetEdbDataThsMaxOrMinDate:" + err.Error())
-		//}
-		//fmt.Println("minDate:" + minDate + ";maxDate:" + maxDate)
-		//err = data.ModifyEdbDataInfoDate(v.EdbInfoId, maxDate)
-		//if err != nil {
-		//	return errors.New("ModifyEdbDataInfoDate:" + err.Error())
-		//}
 	}
 	return err
 }
@@ -302,7 +297,7 @@ func RefreshDataFromCalculateAll() (err error) {
 			}
 			year := time.Now().Year() - 1
 			startDate := strconv.Itoa(year) + "-01" + "-01"
-			endDate := ""//time.Now().Format(utils.FormatDate)
+			endDate := "" //time.Now().Format(utils.FormatDate)
 			err = data_manage.RefreshCalculateLjzzy(edbInfoId, fromEdbInfo, edbCode, startDate, endDate)
 			if err != nil {
 				return errors.New("RefreshCalculateLjzzy Err:" + err.Error())
@@ -317,7 +312,7 @@ func RefreshDataFromCalculateAll() (err error) {
 				return errors.New("GetEdbInfoById Err:" + err.Error())
 			}
 			startDate := time.Now().AddDate(-2, -2, 0).Format(utils.FormatDate)
-			endDate := ""//time.Now().Format(utils.FormatDate)
+			endDate := "" //time.Now().Format(utils.FormatDate)
 			err = data_manage.RefreshCalculateTbz(edbInfoId, fromEdbInfo, calculateTbz.EdbCode, startDate, endDate)
 			if err != nil {
 				return errors.New("RefreshCalculateTbz Err:" + err.Error())
@@ -332,7 +327,7 @@ func RefreshDataFromCalculateAll() (err error) {
 				return errors.New("GetEdbInfoById Err:" + err.Error())
 			}
 			startDate := time.Now().AddDate(-2, -2, 0).Format(utils.FormatDate)
-			endDate := ""//time.Now().Format(utils.FormatDate)
+			endDate := "" //time.Now().Format(utils.FormatDate)
 			err = data_manage.RefreshCalculateTcz(edbInfoId, fromEdbInfo, calculateTcz.EdbCode, startDate, endDate)
 			if err != nil {
 				return errors.New("RefreshCalculateTcz Err:" + err.Error())
@@ -361,7 +356,7 @@ func RefreshDataFromCalculateAll() (err error) {
 				return errors.New("GetEdbInfoById Err:" + err.Error())
 			}
 			startDate := time.Now().AddDate(-2, -2, 0).Format(utils.FormatDate)
-			endDate := ""//time.Now().Format(utils.FormatDate)
+			endDate := "" //time.Now().Format(utils.FormatDate)
 			err = data_manage.RefreshCalculateHbz(edbInfoId, source, fromEdbInfo, calculateHbz.EdbCode, startDate, endDate)
 			if err != nil {
 				return errors.New("RefreshCalculateTbz Err:" + err.Error())
@@ -376,7 +371,7 @@ func RefreshDataFromCalculateAll() (err error) {
 				return errors.New("GetEdbInfoById Err:" + err.Error())
 			}
 			startDate := time.Now().AddDate(-2, -2, 0).Format(utils.FormatDate)
-			endDate := ""//time.Now().Format(utils.FormatDate)
+			endDate := "" //time.Now().Format(utils.FormatDate)
 			err = data_manage.RefreshCalculateHcz(edbInfoId, source, fromEdbInfo, calculateHcz.EdbCode, startDate, endDate)
 			if err != nil {
 				return errors.New("RefreshCalculateTbz Err:" + err.Error())
@@ -392,7 +387,7 @@ func RefreshDataFromCalculateAll() (err error) {
 					return errors.New("GetEdbInfoById Err:" + err.Error())
 				}
 				startDate := time.Now().AddDate(-2, -2, 0).Format(utils.FormatDate)
-				endDate := ""//time.Now().Format(utils.FormatDate)
+				endDate := "" //time.Now().Format(utils.FormatDate)
 				err = data_manage.RefreshCalculateBp(edbInfoId, fromEdbInfo, calculateBp.EdbCode, startDate, endDate)
 				if err != nil {
 					return errors.New("RefreshCalculateTbz Err:" + err.Error())