From 0468f3f30b6591a89259b6c0429ea92719ba7eea Mon Sep 17 00:00:00 2001 From: kf_wuhao <15392746632@qq.com> Date: Mon, 11 Jan 2021 20:12:21 +0800 Subject: [PATCH] update --- model/model.py | 15 ++++++++------- task/add_user_flag.py | 8 ++++---- task/first_recharge.py | 6 +++--- task/repair_gunfu.py | 4 ++-- task/summary_assets.py | 13 ++++++------- task/summary_func.py | 5 +++-- task/summary_join_hd.py | 13 ++++++------- task/summary_open_hd.py | 2 +- 8 files changed, 33 insertions(+), 33 deletions(-) diff --git a/model/model.py b/model/model.py index aa40e2f..3f45d29 100644 --- a/model/model.py +++ b/model/model.py @@ -12,17 +12,18 @@ class BaseModel(BModel): class GBaseModel(BaseModel): platform: str = Field(None, title="平台", alias='_platform') - channel_name: str = Field(None, title="channel", alias='_channel_name') - owner_name: str = Field(None, title="owner", alias='_owner_name') - channel_uid: str = Field(None, title="channel_uid", alias='_channel_uid') - device_id: str = Field(None, title='device_id', alias='_device_id') - district_server_id: int = Field(None, title="区服id", alias='_district_server_id') - game_role_id: str = Field(None, title="角色id", alias='_game_role_id') + channel_name: str = Field(..., min_length=1, title="channel", alias='_channel_name') + owner_name: str = Field(..., min_length=1, title="owner", alias='_owner_name') + channel_uid: str = Field(..., min_length=1, title="channel_uid", alias='_channel_uid') + device_id: str = Field(..., min_length=1, title='device_id', alias='_device_id') + district_server_id: int = Field(..., title="区服id", alias='_district_server_id') + game_role_id: str = Field(..., min_length=1, title="角色id", alias='_game_role_id') event_time: int = Field(..., title="事件时间", alias='_event_time') - role_create_time: int = Field(None, title="角色创建时间") role_level: int = Field(None, title="角色等级") role_vip: int = Field(None, title="角色vip等级") role_stage: IntStr = Field(None, title="关卡") + role_create_time: int = Field(None, title="角色创建时间") + diff --git a/task/add_user_flag.py b/task/add_user_flag.py index 6d8e766..617bf7c 100644 --- a/task/add_user_flag.py +++ b/task/add_user_flag.py @@ -15,10 +15,10 @@ class AddUserFlag(Task): """ class Model(BaseModel): - game_role_id: str = Field(..., title="角色id", alias='_game_role_id') - device_id: str = Field(..., title='设备id', alias='_device_id') - channel_uid: str = Field(..., title="channel_uid", alias='_channel_uid') - role_create_time: int = Field(..., title="注册时间戳") + game_role_id: str = Field(..., min_length=1, title="角色id", alias='_game_role_id') + device_id: str = Field(..., min_length=1, title='设备id', alias='_device_id') + channel_uid: str = Field(..., min_length=1, title="channel_uid", alias='_channel_uid') + role_create_time: int = Field(..., min_length=1, title="注册时间戳") def cleaning(self, cursor_list): for cursor in cursor_list: # type:dict diff --git a/task/first_recharge.py b/task/first_recharge.py index f58e149..1397b24 100644 --- a/task/first_recharge.py +++ b/task/first_recharge.py @@ -19,9 +19,9 @@ class FirstRecharge(Task): role_vip: int = Field(None, title='vip等级') role_stage: IntStr = Field(None, title='关卡') money: IntFloat = Field(..., title='金额') - game_role_id: str = Field(..., title='角色id', alias='_game_role_id') - orderid: str = Field(..., title='订单号') - proid: str = Field(..., title='计费点') + game_role_id: str = Field(..., min_length=1, title='角色id', alias='_game_role_id') + orderid: str = Field(..., min_length=1, title='订单号') + proid: str = Field(..., min_length=1, title='计费点') cdate: int = Field(..., title='当天0点') @classmethod diff --git a/task/repair_gunfu.py b/task/repair_gunfu.py index 90bf5fa..fa6bd11 100644 --- a/task/repair_gunfu.py +++ b/task/repair_gunfu.py @@ -15,8 +15,8 @@ class RepairGunfu(Task): """ class Model(BaseModel): - game_role_id: str = Field(None, title="角色id", alias='_game_role_id') - device_id: str = Field(..., title='设备id', alias='_device_id') + game_role_id: str = Field(..., min_length=1, title="角色id", alias='_game_role_id') + device_id: str = Field(..., min_length=1, title='设备id', alias='_device_id') def cleaning(self, cursor_list): for cursor in cursor_list: # type:dict diff --git a/task/summary_assets.py b/task/summary_assets.py index c3e6473..836f628 100644 --- a/task/summary_assets.py +++ b/task/summary_assets.py @@ -17,14 +17,13 @@ class SummaryAssets(Task): class Model(BaseModel): id: MdbObjectId = Field(..., title="id", alias='_id') - channel_name: str = Field(None, title="channel", alias='_channel_name') - owner_name: str = Field(None, title="owner", alias='_owner_name') - channel_uid: str = Field(None, title="channel_uid", alias='_channel_uid') - device_id: str = Field(None, title='device_id', alias='_device_id') - district_server_id: int = Field(None, title="区服id", alias='_district_server_id') - game_role_id: str = Field(None, title="角色id", alias='_game_role_id') + channel_name: str = Field(..., min_length=1, title="channel", alias='_channel_name') + owner_name: str = Field(...,min_length=1, title="owner", alias='_owner_name') + channel_uid: str = Field(..., min_length=1, title="channel_uid", alias='_channel_uid') + device_id: str = Field(..., min_length=1, title='device_id', alias='_device_id') + district_server_id: int = Field(..., title="区服id", alias='_district_server_id') + game_role_id: str = Field(..., min_length=1, title="角色id", alias='_game_role_id') event_time: int = Field(..., title="事件时间", alias='_event_time') - role_create_time: int = Field(None, title="角色创建时间") role_level: int = Field(None, title="角色等级") role_vip: int = Field(None, title="角色vip等级") role_stage: IntStr = Field(None, title="关卡") diff --git a/task/summary_func.py b/task/summary_func.py index ace8791..5a8d1b0 100644 --- a/task/summary_func.py +++ b/task/summary_func.py @@ -1,4 +1,5 @@ import traceback +from typing import List, Dict from pymongo import UpdateOne from pydantic import Field @@ -16,8 +17,8 @@ class SummaryFunc(Task): class Model(GBaseModel): id: MdbObjectId = Field(..., title="id", alias='_id') - prize: list = Field(None, title='奖励') - need: list = Field(None, title='消耗') + prize: List[Dict] = Field(None, title='奖励') + need: List[Dict] = Field(None, title='消耗') ftype: str = Field(..., title='功能') data: dict = Field(None, title='功能数据') cdate: int = Field(..., title='当天0点') diff --git a/task/summary_join_hd.py b/task/summary_join_hd.py index 637c8de..9eff6e1 100644 --- a/task/summary_join_hd.py +++ b/task/summary_join_hd.py @@ -18,14 +18,13 @@ class SummaryJoinHd(Task): class Model(BaseModel): id: MdbObjectId = Field(..., title="id", alias='_id') - channel_name: str = Field(None, title="channel", alias='_channel_name') - owner_name: str = Field(None, title="owner", alias='_owner_name') - channel_uid: str = Field(None, title="channel_uid", alias='_channel_uid') - device_id: str = Field(None, title='device_id', alias='_device_id') - district_server_id: int = Field(None, title="区服id", alias='_district_server_id') - game_role_id: str = Field(None, title="角色id", alias='_game_role_id') + channel_name: str = Field(..., min_length=1, title="channel", alias='_channel_name') + owner_name: str = Field(..., min_length=1, title="owner", alias='_owner_name') + channel_uid: str = Field(..., min_length=1, title="channel_uid", alias='_channel_uid') + device_id: str = Field(..., min_length=1, title='device_id', alias='_device_id') + district_server_id: int = Field(..., title="区服id", alias='_district_server_id') + game_role_id: str = Field(..., min_length=1, title="角色id", alias='_game_role_id') event_time: int = Field(..., title="事件时间", alias='_event_time') - role_create_time: int = Field(None, title="角色创建时间") role_level: int = Field(None, title="角色等级") role_vip: int = Field(None, title="角色vip等级") role_stage: IntStr = Field(None, title="关卡") diff --git a/task/summary_open_hd.py b/task/summary_open_hd.py index dbd4b06..c5ffd76 100644 --- a/task/summary_open_hd.py +++ b/task/summary_open_hd.py @@ -16,7 +16,7 @@ class SummaryOpenHd(Task): class Model(GBaseModel): id: MdbObjectId = Field(..., title="id", alias='_id') - htype: str = Field(None, title='活动类型') + htype: str = Field(..., title='活动类型') cdate: int = Field(..., title='当天0点') def cleaning(self, cursor_list):