fix bug

models/data_manage/edb_data_pb.go

@@ -25,11 +25,11 @@ func AddEdbDataPb(items []*EdbDataPb) (err error) {
 	return
 }
 
-func ModifyEdbDataPb(edbInfoId int64, dataTime string, value float64) (err error) {
+func ModifyEdbDataPb(edbInfoId int64, edbCode, dataTime string, value float64) (err error) {
 	o := orm.NewOrm()
 	o.Using("data")
-	sql := ` UPDATE edb_data_pb SET value=?,modify_time=NOW() WHERE edb_info_id=? AND data_time=? `
-	_, err = o.Raw(sql, value, edbInfoId, dataTime).Exec()
+	sql := ` UPDATE edb_data_pb SET edb_info_id=?,value=?,status=1,modify_time=NOW() WHERE edb_code=? AND data_time=? `
+	_, err = o.Raw(sql, edbInfoId, value, edbCode, dataTime).Exec()
 	return
 }
 
@@ -41,11 +41,11 @@ func ModifyEdbDataPbStatus(edbInfoId int64, edbCode string) (err error) {
 	return
 }
 
-func GetEdbDataPbCount(edbInfoId int64, dataTime string) (count int, err error) {
+func GetEdbDataPbCount(edbCode, dataTime string) (count int, err error) {
 	o := orm.NewOrm()
 	o.Using("data")
-	sql := ` SELECT COUNT(1) AS count FROM edb_data_pb WHERE edb_info_id=? AND data_time=? `
-	err = o.Raw(sql, edbInfoId, dataTime).QueryRow(&count)
+	sql := ` SELECT COUNT(1) AS count FROM edb_data_pb WHERE edb_code=? AND data_time=? `
+	err = o.Raw(sql, edbCode, dataTime).QueryRow(&count)
 	return
 }
 

models/data_manage/edb_data_ths.go

@@ -23,19 +23,19 @@ func AddEdbDataThs(items []*EdbDataThs) (err error) {
 	return
 }
 
-func ModifyEdbDataThs(edbInfoId int64, dataTime string, value float64) (err error) {
+func ModifyEdbDataThs(edbInfoId int64, edbCode, dataTime string, value float64) (err error) {
 	o := orm.NewOrm()
 	o.Using("data")
-	sql := ` UPDATE edb_data_ths SET value=?,modify_time=NOW() WHERE edb_info_id=? AND data_time=? `
-	_, err = o.Raw(sql, value, edbInfoId, dataTime).Exec()
+	sql := ` UPDATE edb_data_ths SET edb_info_id=?,value=?,status=1,modify_time=NOW() WHERE edb_code=? AND data_time=? `
+	_, err = o.Raw(sql, edbInfoId, value, edbCode, dataTime).Exec()
 	return
 }
 
-func GetEdbDataThsCount(edbInfoId int64, dataTime string) (count int, err error) {
+func GetEdbDataThsCount(ebdCode, dataTime string) (count int, err error) {
 	o := orm.NewOrm()
 	o.Using("data")
-	sql := ` SELECT COUNT(1) AS count FROM edb_data_ths WHERE edb_info_id=? AND data_time=? `
-	err = o.Raw(sql, edbInfoId, dataTime).QueryRow(&count)
+	sql := ` SELECT COUNT(1) AS count FROM edb_data_ths WHERE edb_code=? AND data_time=? `
+	err = o.Raw(sql, ebdCode, dataTime).QueryRow(&count)
 	return
 }
 
@@ -45,4 +45,4 @@ func GetEdbDataThsMaxOrMinDate(edbInfoId int) (min_date, max_date string, err er
 	sql := ` SELECT MIN(data_time) AS min_date,MAX(data_time) AS max_date FROM edb_data_ths WHERE edb_info_id=? `
 	err = o.Raw(sql, edbInfoId).QueryRow(&min_date, &max_date)
 	return
-}
+}

models/data_manage/edb_data_wind.go

@@ -23,11 +23,11 @@ func AddEdbDataWind(items []*EdbDataWind) (err error) {
 	return
 }
 
-func ModifyEdbDataWind(edbInfoId int64, dataTime string, value float64) (err error) {
+func ModifyEdbDataWind(edbInfoId int64, edbCode, dataTime string, value float64) (err error) {
 	o := orm.NewOrm()
 	o.Using("data")
-	sql := ` UPDATE edb_data_wind SET value=?,modify_time=NOW() WHERE edb_info_id=? AND data_time=? `
-	_, err = o.Raw(sql, value, edbInfoId, dataTime).Exec()
+	sql := ` UPDATE edb_data_wind SET edb_info_id=?,value=?,status=1,modify_time=NOW() WHERE edb_code=? AND data_time=? `
+	_, err = o.Raw(sql, edbInfoId, value, edbCode, dataTime).Exec()
 	return
 }
 
@@ -39,11 +39,11 @@ func ModifyEdbDataWindStatus(edbInfoId int64, edbCode string) (err error) {
 	return
 }
 
-func GetEdbDataWindCount(edbInfoId int64, dataTime string) (count int, err error) {
+func GetEdbDataWindCount(edbCode, dataTime string) (count int, err error) {
 	o := orm.NewOrm()
 	o.Using("data")
-	sql := ` SELECT COUNT(1) AS count FROM edb_data_wind WHERE edb_info_id=? AND data_time=? `
-	err = o.Raw(sql, edbInfoId, dataTime).QueryRow(&count)
+	sql := ` SELECT COUNT(1) AS count FROM edb_data_wind WHERE edb_code=? AND data_time=? `
+	err = o.Raw(sql, edbCode, dataTime).QueryRow(&count)
 	return
 }
 
@@ -53,4 +53,4 @@ func GetEdbDataWindMaxOrMinDate(edbInfoId int) (min_date, max_date string, err e
 	sql := ` SELECT MIN(data_time) AS min_date,MAX(data_time) AS max_date FROM edb_data_wind WHERE edb_info_id=? `
 	err = o.Raw(sql, edbInfoId).QueryRow(&min_date, &max_date)
 	return
-}
+}

services/data_manage/data_pb.go

@@ -55,12 +55,12 @@ func SyncEdbDataByPb(edbInfoId int64, edbCode, startDate, endDate string) (err e
 			field := item.Field[k]
 			ticker := item.Ticker[k]
 
-			count, err := data_manage.GetEdbDataPbCount(edbInfoId, dateTime)
+			count, err := data_manage.GetEdbDataPbCount(edbCode, dateTime)
 			if err != nil {
 				return err
 			}
 			if count > 0 {
-				err = data_manage.ModifyEdbDataPb(edbInfoId, dateTime, val)
+				err = data_manage.ModifyEdbDataPb(edbInfoId,edbCode, dateTime, val)
 				if err != nil {
 					return err
 				}

services/data_manage/data_ths.go

@@ -51,12 +51,12 @@ func SyncEdbDataByThs(edbInfoId int64, edbCode, startDate, endDate string) (err
 		for i := 0; i < dataLen; i++ {
 			eDate := table.Time[i]
 			sValue := table.Value[i]
-			count, err := data_manage.GetEdbDataThsCount(edbInfoId, eDate)
+			count, err := data_manage.GetEdbDataThsCount(edbCode, eDate)
 			if err != nil {
 				return errors.New("GetEdbDataThsCount Err:"+err.Error())
 			}
 			if count > 0 {
-				err = data_manage.ModifyEdbDataThs(edbInfoId, eDate, sValue)
+				err = data_manage.ModifyEdbDataThs(edbInfoId,edbCode, eDate, sValue)
 				if err != nil {
 					return errors.New("ModifyEdbDataThs Err:"+err.Error())
 				}

services/data_manage/data_wind.go

@@ -48,12 +48,12 @@ func SyncEdbDataByWind(edbInfoId int64, edbCode, startDate, endDate string) (err
 		dateTime := t.Format(utils.FormatDate)
 		fmt.Println(dateTime)
 		val := item.Close[k]
-		count, err := data_manage.GetEdbDataWindCount(edbInfoId, dateTime)
+		count, err := data_manage.GetEdbDataWindCount(edbCode, dateTime)
 		if err != nil {
 			return err
 		}
 		if count > 0 {
-			err = data_manage.ModifyEdbDataWind(edbInfoId, dateTime, val)
+			err = data_manage.ModifyEdbDataWind(edbInfoId,edbCode, dateTime, val)
 			if err != nil {
 				return err
 			}

services/data_manage/edb_info.go

@@ -63,7 +63,8 @@ func RefreshDataFromWind() (err error) {
 		return err
 	}
 
-	for _, v := range items {
+	for k, v := range items {
+		fmt.Println("line 67:", k, v.EdbCode)
 		startDate := v.EndDate.AddDate(0, 0, -3).Format(utils.FormatDate)
 		endDate := time.Now().Format(utils.FormatDate)
 		err = SyncEdbDataByWind(int64(v.EdbInfoId), v.EdbCode, startDate, endDate)
@@ -123,14 +124,16 @@ func RefreshDataFromPb() (err error) {
 }
 
 func CheckDataInterface() (err error) {
-	checkUrl := utils.Hz_Data_Url + `hz_server`
-	body, err := http.Get(checkUrl)
-	if err != nil {
-		go utils.SendEmail(utils.APPNAME+"【"+utils.RunMode+"】"+"检测数据接口：失败提醒", "CheckDataInterface ErrMsg:"+err.Error(), utils.EmailSendToUsers)
-	}
-	result := string(body)
-	if result != "1" {
-		go utils.SendEmail(utils.APPNAME+"【"+utils.RunMode+"】"+"检测数据接口：失败提醒", "CheckDataInterface ErrMsg:"+string(body), utils.EmailSendToUsers)
-	}
+	go func() {
+		checkUrl := utils.Hz_Data_Url + `hz_server`
+		body, err := http.Get(checkUrl)
+		if err != nil {
+			go utils.SendEmail(utils.APPNAME+"【"+utils.RunMode+"】"+"检测数据接口：失败提醒", "CheckDataInterface ErrMsg:"+err.Error(), utils.EmailSendToUsers)
+		}
+		result := string(body)
+		if result != "1" {
+			go utils.SendEmail(utils.APPNAME+"【"+utils.RunMode+"】"+"检测数据接口：失败提醒", "CheckDataInterface ErrMsg:"+string(body), utils.EmailSendToUsers)
+		}
+	}()
 	return
 }

services/task.go

@@ -88,7 +88,7 @@ func releaseTask(){
 	refreshData := toolbox.NewTask("refreshData", "0 0 18 * * *", RefreshData)
 	toolbox.AddTask("refreshData", refreshData)
 
-	checkDataInterface := toolbox.NewTask("checkDataInterface", "0 */4 * * * * ", data_manage.CheckDataInterface)
+	checkDataInterface := toolbox.NewTask("checkDataInterface", "0 */3 * * * * ", data_manage.CheckDataInterface)
 	toolbox.AddTask("checkDataInterface", checkDataInterface)
 }