Browse Source

删除指标数据status字段

longyu 3 years ago
parent
commit
a813e82009

+ 2 - 2
models/base_from_lt.go

@@ -17,7 +17,7 @@ func AddEdbDataFromLt(edbCode string, ltDataList map[int64]interface{}) (err err
 	o := orm.NewOrm()
 	if len(ltDataList) > 0 {
 		var isAdd bool
-		addSql := ` INSERT INTO edb_data_lt(edb_info_id,edb_code,data_time,value,create_time,modify_time,status,data_timestamp) values `
+		addSql := ` INSERT INTO edb_data_lt(edb_info_id,edb_code,data_time,value,create_time,modify_time,data_timestamp) values `
 		for timestampInt, edbValue := range ltDataList {
 			dataTime := time.Unix(timestampInt/1000, 0)
 
@@ -78,7 +78,7 @@ func RefreshEdbDataFromLt(edbInfoId int, edbCode, startDate string, ltDataList m
 
 	edbInfoIdStr := strconv.Itoa(edbInfoId)
 
-	addSql := ` INSERT INTO edb_data_lt(edb_info_id,edb_code,data_time,value,create_time,modify_time,status,data_timestamp) values `
+	addSql := ` INSERT INTO edb_data_lt(edb_info_id,edb_code,data_time,value,create_time,modify_time,data_timestamp) values `
 	var isAdd bool
 
 	for timestampInt, edbValue := range ltDataList {

+ 2 - 2
models/base_from_lz.go

@@ -49,7 +49,7 @@ func AddEdbDataFromLz(edbCode string) (err error) {
 
 	if dataLen > 0 {
 		var isAdd bool
-		addSql := ` INSERT INTO edb_data_lz(edb_info_id,edb_code,data_time,value,create_time,modify_time,status,data_timestamp) values `
+		addSql := ` INSERT INTO edb_data_lz(edb_info_id,edb_code,data_time,value,create_time,modify_time,data_timestamp) values `
 		for i := 0; i < dataLen; i++ {
 			item := lzDataList[i]
 			eDate := item.DataTime
@@ -119,7 +119,7 @@ func RefreshEdbDataFromLz(edbInfoId int, edbCode, startDate string) (err error)
 	for _, v := range existList {
 		existMap[v.DataTime] = v
 	}
-	addSql := ` INSERT INTO edb_data_lz(edb_info_id,edb_code,data_time,value,create_time,modify_time,status,data_timestamp) values `
+	addSql := ` INSERT INTO edb_data_lz(edb_info_id,edb_code,data_time,value,create_time,modify_time,data_timestamp) values `
 	var isAdd bool
 	for _, v := range lzDataList {
 		item := v

+ 2 - 2
models/base_from_manual.go

@@ -49,7 +49,7 @@ func AddEdbDataFromManual(edbCode string) (err error) {
 
 	if dataLen > 0 {
 		var isAdd bool
-		addSql := ` INSERT INTO edb_data_manual(edb_info_id,edb_code,data_time,value,create_time,modify_time,status,data_timestamp) values `
+		addSql := ` INSERT INTO edb_data_manual(edb_info_id,edb_code,data_time,value,create_time,modify_time,data_timestamp) values `
 		for i := 0; i < dataLen; i++ {
 			item := manualDataList[i]
 			eDate := item.Dt
@@ -117,7 +117,7 @@ func RefreshEdbDataFromManual(edbInfoId int, edbCode, startDate string) (err err
 		existMap[v.DataTime] = v
 	}
 
-	addSql := ` INSERT INTO edb_data_manual(edb_info_id,edb_code,data_time,value,create_time,modify_time,status,data_timestamp) values `
+	addSql := ` INSERT INTO edb_data_manual(edb_info_id,edb_code,data_time,value,create_time,modify_time,data_timestamp) values `
 	var isAdd bool
 	manualMap := make(map[string]*ManualEdbdata)
 	fmt.Println("manualDataList:", len(manualDataList))

+ 2 - 2
models/base_from_mysteel.go

@@ -51,7 +51,7 @@ func AddEdbDataFromMysteel(edbCode string) (err error) {
 	existMap := make(map[string]string)
 	if dataLen > 0 {
 		var isAdd bool
-		addSql := ` INSERT INTO edb_data_gl(edb_info_id,edb_code,data_time,value,create_time,modify_time,status,data_timestamp) values `
+		addSql := ` INSERT INTO edb_data_gl(edb_info_id,edb_code,data_time,value,create_time,modify_time,data_timestamp) values `
 		for i := 0; i < dataLen; i++ {
 			item := glDataList[i]
 			eDate := item.DataTime
@@ -125,7 +125,7 @@ func RefreshEdbDataFromMysteel(edbInfoId int, edbCode, startDate string) (err er
 		existMap[v.DataTime] = v
 	}
 
-	addSql := ` INSERT INTO edb_data_gl(edb_info_id,edb_code,data_time,value,create_time,modify_time,status,data_timestamp) values `
+	addSql := ` INSERT INTO edb_data_gl(edb_info_id,edb_code,data_time,value,create_time,modify_time,data_timestamp) values `
 	var isAdd bool
 	addMap := make(map[string]string)
 	for _, v := range glDataList {

+ 4 - 4
models/base_from_pb.go

@@ -22,7 +22,7 @@ func AddEdbDataFromPb(edbCode string, item *services.EdbDataFromPb) (err error)
 	if len(item.Date) > 0 {
 		var isAdd bool
 		dateMap := item.Date
-		addSql := ` INSERT INTO edb_data_pb(edb_info_id,edb_code,data_time,value,create_time,modify_time,status,ticker,field,data_timestamp) values `
+		addSql := ` INSERT INTO edb_data_pb(edb_info_id,edb_code,data_time,value,create_time,modify_time,ticker,field,data_timestamp) values `
 		nowStr := time.Now().Format(utils.FormatDateTime)
 		for k, v := range dateMap {
 			timeStr := fmt.Sprintf("%d", v)
@@ -37,7 +37,7 @@ func AddEdbDataFromPb(edbCode string, item *services.EdbDataFromPb) (err error)
 			if field == "PX_LAST" {
 				addSql += "("
 				addSql += "0," + "'" + edbCode + "'" + "," + "'" + dateTime + "'" + "," + utils.SubFloatToString(val, 20) + "," + "'" + nowStr + "'" +
-					"," + "'" + nowStr + "'" + "," + "0" + "," + "'" + ticker + "'" + "," + "'" + field + "'" + "," + "'" + timeStr + "'"
+					"," + "'" + nowStr + "'" + "," + "'" + ticker + "'" + "," + "'" + field + "'" + "," + "'" + timeStr + "'"
 				addSql += "),"
 				isAdd = true
 			}
@@ -78,7 +78,7 @@ func RefreshEdbDataFromPb(edbInfoId int, edbCode, startDate string, item *servic
 	if len(item.Date) > 0 {
 		dateMap := item.Date
 		var isAdd bool
-		addSql := ` INSERT INTO edb_data_pb(edb_info_id,edb_code,data_time,value,create_time,modify_time,status,ticker,field,data_timestamp) values `
+		addSql := ` INSERT INTO edb_data_pb(edb_info_id,edb_code,data_time,value,create_time,modify_time,ticker,field,data_timestamp) values `
 		nowStr := time.Now().Format(utils.FormatDateTime)
 		for k, v := range dateMap {
 			timeStr := fmt.Sprintf("%d", v)
@@ -94,7 +94,7 @@ func RefreshEdbDataFromPb(edbInfoId int, edbCode, startDate string, item *servic
 					if _, addOk := addMap[dateTime]; !addOk {
 						addSql += "("
 						addSql += edbInfoIdStr + "," + "'" + edbCode + "'" + "," + "'" + dateTime + "'" + "," + saveValue + "," + "'" + nowStr + "'" +
-							"," + "'" + nowStr + "'" + "," + "1" + "," + "'" + ticker + "'" + "," + "'" + field + "'" + "," + "'" + timeStr + "'"
+							"," + "'" + nowStr + "'" + "," + "'" + ticker + "'" + "," + "'" + field + "'" + "," + "'" + timeStr + "'"
 						addSql += "),"
 						isAdd = true
 						addMap[dateTime] = saveValue

+ 2 - 2
models/base_from_smm.go

@@ -46,7 +46,7 @@ func AddEdbDataFromSmm(edbCode string) (err error) {
 		return
 	}
 	var isAdd bool
-	addSql := ` INSERT INTO edb_data_ys(edb_info_id,edb_code,data_time,value,create_time,modify_time,status,data_timestamp) values `
+	addSql := ` INSERT INTO edb_data_ys(edb_info_id,edb_code,data_time,value,create_time,modify_time,data_timestamp) values `
 	existMap := make(map[string]string)
 	for _, sv := range smmBaseDataAll {
 		eDate := sv.DataTime
@@ -116,7 +116,7 @@ func RefreshEdbDataFromSmm(edbInfoId int, edbCode, startDate string) (err error)
 		existMap[v.DataTime] = v
 	}
 
-	addSql := ` INSERT INTO edb_data_ys(edb_info_id,edb_code,data_time,value,create_time,modify_time,status,data_timestamp) values `
+	addSql := ` INSERT INTO edb_data_ys(edb_info_id,edb_code,data_time,value,create_time,modify_time,data_timestamp) values `
 	var isAdd bool
 	for _, v := range smmDataList {
 		item := v

+ 2 - 2
models/base_from_ths.go

@@ -25,7 +25,7 @@ func AddEdbDataFromThs(edbCode string, item *services.EdbDataFromThs) (err error
 		dataLen := len(table.Time)
 
 		var isAdd bool
-		addSql := ` INSERT INTO %s(edb_info_id,edb_code,data_time,value,create_time,modify_time,status,data_timestamp) values `
+		addSql := ` INSERT INTO %s(edb_info_id,edb_code,data_time,value,create_time,modify_time,data_timestamp) values `
 		tableName := GetEdbDataTableName(utils.DATA_SOURCE_THS)
 		addSql = fmt.Sprintf(addSql, tableName)
 
@@ -81,7 +81,7 @@ func RefreshEdbDataFromThs(edbInfoId int, edbCode, startDate string, item *servi
 
 		table := item.Tables[0]
 		dataLen := len(table.Time)
-		addSql := ` INSERT INTO edb_data_ths(edb_info_id,edb_code,data_time,value,create_time,modify_time,status,data_timestamp) values `
+		addSql := ` INSERT INTO edb_data_ths(edb_info_id,edb_code,data_time,value,create_time,modify_time,data_timestamp) values `
 		var isAdd bool
 		addMap := make(map[string]string)
 		edbInfoIdStr := strconv.Itoa(edbInfoId)

+ 2 - 2
models/base_from_wind.go

@@ -20,7 +20,7 @@ func AddEdbDataFromWind(edbCode string, item *services.EdbDataFromWind) (err err
 	}()
 
 	var isAdd bool
-	addSql := ` INSERT INTO edb_data_wind(edb_info_id,edb_code,data_time,value,create_time,modify_time,status,data_timestamp) values `
+	addSql := ` INSERT INTO edb_data_wind(edb_info_id,edb_code,data_time,value,create_time,modify_time,data_timestamp) values `
 	for k, v := range item.Dt {
 		timeStr := fmt.Sprintf("%d", v)
 		v = v / 1000
@@ -65,7 +65,7 @@ func RefreshEdbDataFromWind(edbInfoId int, edbCode, startDate string, item *serv
 	for _, v := range existList {
 		existMap[v.DataTime] = v
 	}
-	addSql := ` INSERT INTO edb_data_wind(edb_info_id,edb_code,data_time,value,create_time,modify_time,status,data_timestamp) values `
+	addSql := ` INSERT INTO edb_data_wind(edb_info_id,edb_code,data_time,value,create_time,modify_time,data_timestamp) values `
 	var isAdd bool
 	addMap := make(map[string]string)
 	edbInfoIdStr := strconv.Itoa(edbInfoId)

+ 1 - 1
models/edb_data_base.go

@@ -34,7 +34,7 @@ func GetAddSql(edbInfoId, edbCode, dataTime, timestampStr string, value string)
 	nowStr := time.Now().Format(utils.FormatDateTime)
 	addSql += "("
 	addSql += edbInfoId + "," + "'" + edbCode + "'" + "," + "'" + dataTime + "'" + "," + value + "," + "'" + nowStr + "'" +
-		"," + "'" + nowStr + "'" + "," + "1"
+		"," + "'" + nowStr + "'"
 	addSql += "," + "'" + timestampStr + "'"
 	addSql += "),"
 	return