Skip to content

GitLab

E
elp
Commit 7cfb16a4 authored by 崔为之's avatar 崔为之 💪🏽
Browse files
Options

Update project

parent ee420830
Hide whitespace changes
Inline Side-by-side
Showing with 84 additions and 44 deletions
application/extensions/init_sqlalchemy.py
View file @ 7cfb16a4
...@@ -39,43 +39,43 @@ def init_database(app: Flask) -> None: ...@@ -39,43 +39,43 @@ def init_database(app: Flask) -> None:
app.config.setdefault('SQLALCHEMY_DATABASE_URI', uri.create()) app.config.setdefault('SQLALCHEMY_DATABASE_URI', uri.create())
db.app = app db.app = app
db.init_app(app) db.init_app(app)
with app.app_context(): # with app.app_context():
db.session.execute(text(f""" # db.session.execute(text(f"""
CREATE TABLE IF NOT EXISTS {cfg.TableName} ( # CREATE TABLE IF NOT EXISTS {cfg.TableName} (
id SERIAL NOT NULL, # id SERIAL NOT NULL,
date_time TIMESTAMP WITH TIME ZONE NOT NULL, # date_time TIMESTAMP WITH TIME ZONE NOT NULL,
uuid varchar(100) DEFAULT NULL, # uuid varchar(100) DEFAULT NULL,
mid varchar(50) DEFAULT NULL, # mid varchar(50) DEFAULT NULL,
mid_type varchar(50) DEFAULT NULL, # mid_type varchar(50) DEFAULT NULL,
mac_wifi varchar(50) DEFAULT NULL, # mac_wifi varchar(50) DEFAULT NULL,
mac_voice varchar(50) DEFAULT NULL, # mac_voice varchar(50) DEFAULT NULL,
code smallint DEFAULT NULL, # code smallint DEFAULT NULL,
query varchar(255) DEFAULT NULL, # query varchar(255) DEFAULT NULL,
terminal_domain varchar(50) DEFAULT NULL, # terminal_domain varchar(50) DEFAULT NULL,
terminal_intent varchar(50) DEFAULT NULL, # terminal_intent varchar(50) DEFAULT NULL,
distribution_gree_domain varchar(50) DEFAULT NULL, # distribution_gree_domain varchar(50) DEFAULT NULL,
distribution_gree_intent varchar(50) DEFAULT NULL, # distribution_gree_intent varchar(50) DEFAULT NULL,
response_text text, # response_text text,
emotion_class varchar(50) DEFAULT NULL, # emotion_class varchar(50) DEFAULT NULL,
skill_id varchar(100) DEFAULT NULL, # skill_id varchar(100) DEFAULT NULL,
voice_portal smallint NOT NULL, # voice_portal smallint NOT NULL,
service_nlu varchar(50) DEFAULT NULL, # service_nlu varchar(50) DEFAULT NULL,
service_type smallint NOT NULL, # service_type smallint NOT NULL,
slots text, # slots text,
yzs_request_id varchar(50) DEFAULT NULL, # yzs_request_id varchar(50) DEFAULT NULL,
yzs_remote_ip varchar(15) DEFAULT NULL, # yzs_remote_ip varchar(15) DEFAULT NULL,
yzs_app_key varchar(50) DEFAULT NULL, # yzs_app_key varchar(50) DEFAULT NULL,
yzs_ud_id varchar(50) DEFAULT NULL, # yzs_ud_id varchar(50) DEFAULT NULL,
yzs_user_id varchar(50) DEFAULT NULL, # yzs_user_id varchar(50) DEFAULT NULL,
yzs_intent text, # yzs_intent text,
yzs_general text, # yzs_general text,
yzs_nlu_time varchar(20) DEFAULT NULL, # yzs_nlu_time varchar(20) DEFAULT NULL,
get_body_time varchar(20) DEFAULT NULL, # get_body_time varchar(20) DEFAULT NULL,
gree_nlu_time varchar(20) DEFAULT NULL, # gree_nlu_time varchar(20) DEFAULT NULL,
get_homeid_time varchar(20) DEFAULT NULL, # get_homeid_time varchar(20) DEFAULT NULL,
tencent_nlu_time varchar(20) DEFAULT NULL, # tencent_nlu_time varchar(20) DEFAULT NULL,
cost_time varchar(20) DEFAULT NULL, # cost_time varchar(20) DEFAULT NULL,
PRIMARY KEY (id, date_time) # PRIMARY KEY (id, date_time)
) PARTITION BY RANGE (date_time); # ) PARTITION BY RANGE (date_time);
""")) # """))
db.session.commit() # db.session.commit()
application/script/cmdline.py
View file @ 7cfb16a4
...@@ -13,6 +13,7 @@ ...@@ -13,6 +13,7 @@
# Import third-party modules # Import third-party modules
import click import click
from flask.cli import with_appcontext from flask.cli import with_appcontext
from sqlalchemy import text
@click.command("init") @click.command("init")
...@@ -26,7 +27,46 @@ def init(): ...@@ -26,7 +27,46 @@ def init():
from application.extensions.init_sqlalchemy import db from application.extensions.init_sqlalchemy import db
# Uncomment below lines to create a new log entry. # Uncomment below lines to create a new log entry.
# click.echo("create log") click.echo('create tables')
# db.session.add(user) with db.app.app_context():
# db.session.commit() cfg = db.app.config.Database
# click.echo("created log") db.session.execute(text(f"""
CREATE TABLE IF NOT EXISTS {cfg.TableName} (
id SERIAL NOT NULL,
date_time TIMESTAMP WITH TIME ZONE NOT NULL,
uuid varchar(100) DEFAULT NULL,
mid varchar(50) DEFAULT NULL,
mid_type varchar(50) DEFAULT NULL,
mac_wifi varchar(50) DEFAULT NULL,
mac_voice varchar(50) DEFAULT NULL,
code smallint DEFAULT NULL,
query varchar(255) DEFAULT NULL,
terminal_domain varchar(50) DEFAULT NULL,
terminal_intent varchar(50) DEFAULT NULL,
distribution_gree_domain varchar(50) DEFAULT NULL,
distribution_gree_intent varchar(50) DEFAULT NULL,
response_text text,
emotion_class varchar(50) DEFAULT NULL,
skill_id varchar(100) DEFAULT NULL,
voice_portal smallint NOT NULL,
service_nlu varchar(50) DEFAULT NULL,
service_type smallint NOT NULL,
slots text,
yzs_request_id varchar(50) DEFAULT NULL,
yzs_remote_ip varchar(15) DEFAULT NULL,
yzs_app_key varchar(50) DEFAULT NULL,
yzs_ud_id varchar(50) DEFAULT NULL,
yzs_user_id varchar(50) DEFAULT NULL,
yzs_intent text,
yzs_general text,
yzs_nlu_time varchar(20) DEFAULT NULL,
get_body_time varchar(20) DEFAULT NULL,
gree_nlu_time varchar(20) DEFAULT NULL,
get_homeid_time varchar(20) DEFAULT NULL,
tencent_nlu_time varchar(20) DEFAULT NULL,
cost_time varchar(20) DEFAULT NULL,
PRIMARY KEY (id, date_time)
) PARTITION BY RANGE (date_time);
"""))
db.session.commit()
click.echo('created tables')
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment