From ed10f88f563db45297346d60aca82733bc29b04c Mon Sep 17 00:00:00 2001 From: chenwj <654891551@qq.com> Date: Sun, 2 Jul 2023 18:36:31 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9football=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E5=BA=93=E8=A1=A8model?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- model/football_match.py | 5 +++-- model/football_match_bf_odds.py | 6 ++++-- model/football_match_bqc_odds.py | 6 ++++-- model/football_match_spf_odds.py | 6 +++++- model/football_match_zjq_odds.py | 7 +++++-- 5 files changed, 21 insertions(+), 9 deletions(-) diff --git a/model/football_match.py b/model/football_match.py index 196098b..c60b58b 100644 --- a/model/football_match.py +++ b/model/football_match.py @@ -1,5 +1,5 @@ # coding: utf-8 -from sqlalchemy import Column, Date, DateTime, Integer, String, text +from sqlalchemy import Column, Date, DateTime, Integer, text from sqlalchemy.dialects.mysql import VARCHAR from sqlalchemy.ext.declarative import declarative_base @@ -28,8 +28,9 @@ class FootballMatch(Base): result = Column(Integer, comment='结果：0 负 1 平 3 胜') rq_count = Column(Integer, comment='让球数') rq_result = Column(Integer, comment='让球结果：0 负 1 平 3 胜') - bqc_result = Column(String(10, 'utf8mb4_general_ci'), comment='半全场结果') + bqc_result = Column(VARCHAR(10), comment='半全场结果') spf_odds_ranking = Column(Integer, comment='胜平负赔率排名') + rq_spf_odds_ranking = Column(Integer, comment='让球胜平负赔率排名') bf_odds_ranking = Column(Integer, comment='比分赔率排名') bqc_odds_ranking = Column(Integer, comment='半全场赔率排名') zjq_odds_ranking = Column(Integer, comment='总进球数赔率排名') diff --git a/model/football_match_bf_odds.py b/model/football_match_bf_odds.py index 9cd3ccb..41a554d 100644 --- a/model/football_match_bf_odds.py +++ b/model/football_match_bf_odds.py @@ -1,5 +1,5 @@ # coding: utf-8 -from sqlalchemy import Column, DateTime, Float, Integer, text +from sqlalchemy import Column, DateTime, Float, Integer, JSON, text from sqlalchemy.dialects.mysql import VARCHAR from sqlalchemy.ext.declarative import declarative_base @@ -14,7 +14,8 @@ class FootballMatchBfOdd(Base): id = Column(Integer, primary_key=True) match_id = Column(Integer) issue = Column(VARCHAR(255)) - result = Column(Float) + result = Column(VARCHAR(50)) + odds = Column(Float) _1_0 = Column('1-0', Float) _2_0 = Column('2-0', Float) _2_1 = Column('2-1', Float) @@ -46,4 +47,5 @@ class FootballMatchBfOdd(Base): win_others = Column(Float) draw_others = Column(Float) lost_others = Column(Float) + odds_history = Column(JSON) created_at = Column(DateTime, server_default=text("CURRENT_TIMESTAMP")) diff --git a/model/football_match_bqc_odds.py b/model/football_match_bqc_odds.py index 3a64351..01d4cf4 100644 --- a/model/football_match_bqc_odds.py +++ b/model/football_match_bqc_odds.py @@ -1,5 +1,5 @@ # coding: utf-8 -from sqlalchemy import Column, DateTime, Float, Integer, String, text +from sqlalchemy import Column, DateTime, Float, Integer, JSON, text from sqlalchemy.dialects.mysql import VARCHAR from sqlalchemy.ext.declarative import declarative_base @@ -14,7 +14,8 @@ class FootballMatchBqcOdd(Base): id = Column(Integer, primary_key=True) match_id = Column(Integer) issue = Column(VARCHAR(255)) - result = Column(String(50, 'utf8mb4_general_ci')) + result = Column(VARCHAR(50)) + odds = Column(Float) _3_3 = Column('3_3', Float) _3_1 = Column('3_1', Float) _3_0 = Column('3_0', Float) @@ -24,4 +25,5 @@ class FootballMatchBqcOdd(Base): _0_3 = Column('0_3', Float) _0_1 = Column('0_1', Float) _0_0 = Column('0_0', Float) + odds_history = Column(JSON) created_at = Column(DateTime, server_default=text("CURRENT_TIMESTAMP")) diff --git a/model/football_match_spf_odds.py b/model/football_match_spf_odds.py index 3c58958..5778e23 100644 --- a/model/football_match_spf_odds.py +++ b/model/football_match_spf_odds.py @@ -1,5 +1,5 @@ # coding: utf-8 -from sqlalchemy import Column, DateTime, Float, Integer, text +from sqlalchemy import Column, DateTime, Float, Integer, JSON, text from sqlalchemy.dialects.mysql import VARCHAR from sqlalchemy.ext.declarative import declarative_base @@ -15,12 +15,16 @@ class FootballMatchSpfOdd(Base): match_id = Column(Integer) issue = Column(VARCHAR(255)) result = Column(Integer, comment='结果') + odds = Column(Float) rq_count = Column(Integer, comment='让球数') rq_result = Column(Integer, comment='让球结果') + rq_odds = Column(Float) win = Column(Float, comment='胜') draw = Column(Float, comment='平') lost = Column(Float, comment='负') rq_win = Column(Float, comment='让球-胜') rq_draw = Column(Float, comment='让球-平') rq_lost = Column(Float, comment='让球-负') + odds_history = Column(JSON) + rq_odds_history = Column(JSON) created_at = Column(DateTime, server_default=text("CURRENT_TIMESTAMP")) diff --git a/model/football_match_zjq_odds.py b/model/football_match_zjq_odds.py index 3a8b5c6..4ebc035 100644 --- a/model/football_match_zjq_odds.py +++ b/model/football_match_zjq_odds.py @@ -1,5 +1,5 @@ # coding: utf-8 -from sqlalchemy import Column, Float, Integer, String +from sqlalchemy import Column, DateTime, Float, Integer, JSON, text from sqlalchemy.dialects.mysql import VARCHAR from sqlalchemy.ext.declarative import declarative_base @@ -14,7 +14,8 @@ class FootballMatchZjqOdd(Base): id = Column(Integer, primary_key=True) issue = Column(VARCHAR(255)) match_id = Column(Integer) - result = Column(String(50, 'utf8mb4_general_ci')) + result = Column(VARCHAR(50)) + odds = Column(Float) ball_0 = Column(Float) ball_1 = Column(Float) ball_2 = Column(Float) @@ -23,3 +24,5 @@ class FootballMatchZjqOdd(Base): ball_5 = Column(Float) ball_6 = Column(Float) ball_7_plus = Column(Float) + odds_history = Column(JSON) + created_at = Column(DateTime, server_default=text("CURRENT_TIMESTAMP"))