hongze 3 жил өмнө
parent
commit
e26f5eb241

+ 2 - 2
services/data_manage/data_pb.go

@@ -29,12 +29,12 @@ func SyncEdbDataByPb(edbInfoId int64, edbCode, startDate, endDate string) (err e
 	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)
+	utils.FileLog.Info("pbUrl:"+pbUrl)
 	body, err := http.Get(pbUrl)
 	fmt.Println(pbUrl)
 	fmt.Println("SyncEdbDataByPb body:")
 	fmt.Println(string(body))
-	utils.FileLog.Info("pb %s", string(body))
+	utils.FileLog.Info("pb"+string(body))
 
 	if err != nil {
 		return

+ 9 - 9
services/data_manage/data_ths.go

@@ -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

+ 2 - 2
services/data_manage/data_wind.go

@@ -24,12 +24,12 @@ func SyncEdbDataByWind(edbInfoId int64, edbCode, startDate, endDate string) (err
 
 	windUrl := utils.Hz_Data_Url + `edbInfo/wind?EdbCode=%s&StartDate=%s&EndDate=%s`
 	windUrl = fmt.Sprintf(windUrl, edbCode, startDate, endDate)
-	utils.FileLog.Info("thsUrl:%s", windUrl)
+	utils.FileLog.Info("windUrl:", windUrl)
 	body, err := http.Get(windUrl)
 	fmt.Println(windUrl)
 	fmt.Println("SyncEdbDataByWind body:")
 	fmt.Println(string(body))
-	utils.FileLog.Info("wind %s", string(body))
+	utils.FileLog.Info("wind result:", string(body))
 
 	if err != nil {
 		return

+ 1 - 1
services/task.go

@@ -89,7 +89,7 @@ func releaseTask() {
 	task.AddTask("refreshData", refreshData)
 
 	//刷新计算指标数据
-	refreshCalculateData := task.NewTask("refreshCalculateData", "0 10 0,19 * * *", RefreshCalculateData)
+	refreshCalculateData := task.NewTask("refreshCalculateData", "0 15 0,19 * * *", RefreshCalculateData)
 	task.AddTask("refreshCalculateData", refreshCalculateData)
 
 	checkDataInterface := task.NewTask("checkDataInterface", "0 */2 * * * * ", data_manage.CheckDataInterface)