修改代码生成接口,optional的设值为None
This commit is contained in:
parent
31a57ce329
commit
b1fa11fc9f
|
@ -13,7 +13,7 @@ class ReceiveFileAdd(BaseModel):
|
||||||
name: str
|
name: str
|
||||||
receive_order_id: str
|
receive_order_id: str
|
||||||
receive_subject_file_id: int
|
receive_subject_file_id: int
|
||||||
file_path: Optional[str]
|
file_path: Optional[str] = None
|
||||||
|
|
||||||
|
|
||||||
class ReceiveFileAddOptional(ReceiveFileAdd, metaclass=AllOptional):
|
class ReceiveFileAddOptional(ReceiveFileAdd, metaclass=AllOptional):
|
||||||
|
|
|
@ -10,21 +10,21 @@ class ReceiveOrderId(BaseModel):
|
||||||
|
|
||||||
|
|
||||||
class ReceiveOrderAdd(BaseModel):
|
class ReceiveOrderAdd(BaseModel):
|
||||||
subject: Optional[Any]
|
subject: Optional[Any] = None
|
||||||
subject_id: int
|
subject_id: int
|
||||||
sender_company: str
|
sender_company: str
|
||||||
sender_phone: Optional[str]
|
sender_phone: Optional[str] = None
|
||||||
sender_email: Optional[str]
|
sender_email: Optional[str] = None
|
||||||
sender_name: Optional[str]
|
sender_name: Optional[str] = None
|
||||||
sender_wx: Optional[str]
|
sender_wx: Optional[str] = None
|
||||||
contact_user_id: Optional[str]
|
contact_user_id: Optional[str] = None
|
||||||
url_code: Optional[str]
|
url_code: Optional[str] = None
|
||||||
code: Optional[str]
|
code: Optional[str] = None
|
||||||
state: Any
|
state: Any
|
||||||
files: Optional[List[Any]]
|
files: Optional[List[Any]] = None
|
||||||
create_time: Optional[datetime]
|
create_time: Optional[datetime] = None
|
||||||
finish_time: Optional[datetime]
|
finish_time: Optional[datetime] = None
|
||||||
notice_logs: Optional[List[Any]]
|
notice_logs: Optional[List[Any]] = None
|
||||||
|
|
||||||
|
|
||||||
class ReceiveOrderAddOptional(ReceiveOrderAdd, metaclass=AllOptional):
|
class ReceiveOrderAddOptional(ReceiveOrderAdd, metaclass=AllOptional):
|
||||||
|
|
|
@ -13,7 +13,7 @@ class ReceiveOrderNoticeLogAdd(BaseModel):
|
||||||
subject_id: str
|
subject_id: str
|
||||||
account: str
|
account: str
|
||||||
notice_type: Any
|
notice_type: Any
|
||||||
notice_time: Optional[datetime]
|
notice_time: Optional[datetime]= None
|
||||||
|
|
||||||
|
|
||||||
class ReceiveOrderNoticeLogAddOptional(ReceiveOrderNoticeLogAdd, metaclass=AllOptional):
|
class ReceiveOrderNoticeLogAddOptional(ReceiveOrderNoticeLogAdd, metaclass=AllOptional):
|
||||||
|
|
|
@ -11,13 +11,13 @@ class ReceiveSubjectId(BaseModel):
|
||||||
|
|
||||||
class ReceiveSubjectAdd(BaseModel):
|
class ReceiveSubjectAdd(BaseModel):
|
||||||
name: str
|
name: str
|
||||||
start_time: Optional[datetime]
|
start_time: Optional[datetime]= None
|
||||||
finish_time: Optional[datetime]
|
finish_time: Optional[datetime]= None
|
||||||
state: Any
|
state: Any
|
||||||
folder_name: Optional[str]
|
folder_name: Optional[str]= None
|
||||||
create_time: Optional[datetime]
|
create_time: Optional[datetime]= None
|
||||||
des: Any
|
des: Any
|
||||||
files: Optional[List[Any]]
|
files: Optional[List[Any]]= None
|
||||||
|
|
||||||
|
|
||||||
class ReceiveSubjectAddOptional(ReceiveSubjectAdd, metaclass=AllOptional):
|
class ReceiveSubjectAddOptional(ReceiveSubjectAdd, metaclass=AllOptional):
|
||||||
|
|
|
@ -14,8 +14,8 @@ class ReceiveSubjectFileAdd(BaseModel):
|
||||||
subject_id: int
|
subject_id: int
|
||||||
type: str
|
type: str
|
||||||
des: Any
|
des: Any
|
||||||
template_path: Optional[str]
|
template_path: Optional[str] = None
|
||||||
file_size_limit: Optional[float]
|
file_size_limit: Optional[float] = None
|
||||||
|
|
||||||
|
|
||||||
class ReceiveSubjectFileAddOptional(ReceiveSubjectFileAdd, metaclass=AllOptional):
|
class ReceiveSubjectFileAddOptional(ReceiveSubjectFileAdd, metaclass=AllOptional):
|
||||||
|
|
|
@ -88,18 +88,18 @@ def make_code_from_model(template_path, save_path, model: Type[DeclarativeMeta],
|
||||||
continue
|
continue
|
||||||
if col_base_type in ['int', 'float', 'date', 'datetime', 'bool', 'str']:
|
if col_base_type in ['int', 'float', 'date', 'datetime', 'bool', 'str']:
|
||||||
if col.server_default or col.default or col.nullable:
|
if col.server_default or col.default or col.nullable:
|
||||||
add_code_line = f"{key}: Optional[{col_base_type}]"
|
add_code_line = f"{key}: Optional[{col_base_type}] = None"
|
||||||
else:
|
else:
|
||||||
add_code_line = f"{key}: {col_base_type}"
|
add_code_line = f"{key}: {col_base_type}"
|
||||||
elif col_base_type in ['relation']:
|
elif col_base_type in ['relation']:
|
||||||
if col_config.relation.relation_type == 'o2o':
|
if col_config.relation.relation_type == 'o2o':
|
||||||
add_code_line = f"{key}: {'Optional[Any]'}"
|
add_code_line = f"{key}: {'Optional[Any]'} = None"
|
||||||
elif col_config.relation.relation_type == 'o2m':
|
elif col_config.relation.relation_type == 'o2m':
|
||||||
add_code_line = f"{key}: {'Optional[List[Any]]'}"
|
add_code_line = f"{key}: {'Optional[List[Any]]'} = None"
|
||||||
elif col_config.relation.relation_type == 'm2m':
|
elif col_config.relation.relation_type == 'm2m':
|
||||||
add_code_line = f"{key}: {'Optional[List[Any]]'}"
|
add_code_line = f"{key}: {'Optional[List[Any]]'} = None"
|
||||||
elif col_config.relation.relation_type == 'm2o':
|
elif col_config.relation.relation_type == 'm2o':
|
||||||
add_code_line = f"{key}: {'Optional[Any]'}"
|
add_code_line = f"{key}: {'Optional[Any]'} = None"
|
||||||
else:
|
else:
|
||||||
if col_base_type in ["json", 'jsonb']:
|
if col_base_type in ["json", 'jsonb']:
|
||||||
add_code_line = f"{key}: {'Optional[Dict[Any,Any]]'} = {'{}'}"
|
add_code_line = f"{key}: {'Optional[Dict[Any,Any]]'} = {'{}'}"
|
||||||
|
|
Loading…
Reference in New Issue