Commit 258e55b8 authored by 桂秋月's avatar 桂秋月

1

parent 980b03c9
......@@ -6,8 +6,7 @@
<component name="ChangeListManager">
<list default="true" id="65ec9bc1-9334-4fb0-a73d-621c8e760de6" name="Default Changelist" comment="">
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/logs/2022-02-09.log" beforeDir="false" afterPath="$PROJECT_DIR$/logs/2022-02-09.log" afterDir="false" />
<change beforePath="$PROJECT_DIR$/model_data_api/model/modelsData_model.py" beforeDir="false" afterPath="$PROJECT_DIR$/model_data_api/model/modelsData_model.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/model_data_api/model/base_model.py" beforeDir="false" afterPath="$PROJECT_DIR$/model_data_api/model/base_model.py" afterDir="false" />
</list>
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
......
......@@ -3,3 +3,4 @@
[2022-02-09 14:29:01 autoreload.py:_check_file:201 INFO] /Users/dm/Desktop/python_script/model-data-test/model_data_api/model/base_model.py modified; restarting server
[2022-02-09 14:31:20 autoreload.py:_check_file:201 INFO] /Users/dm/Desktop/python_script/model-data-test/model_data_api/model/base_model.py modified; restarting server
[2022-02-09 14:44:07 autoreload.py:_check_file:201 INFO] /Users/dm/Desktop/python_script/model-data-test/model_data_api/model/modelsData_model.py modified; restarting server
[2022-02-09 15:06:39 autoreload.py:_check_file:201 INFO] /Users/dm/Desktop/python_script/model-data-test/model_data_api/model/base_model.py modified; restarting server
......@@ -62,7 +62,7 @@ class BaseManager:
def get_json(self,result):
logging.ERROR('base result:'+str(result)+str(type(result)))
try:
#try:
if isinstance(result, Iterable):
tmp = [dict(zip(res.__dict__.keys(), res.__dict__.values())) for res in result]
for t in tmp:
......@@ -71,9 +71,9 @@ class BaseManager:
tmp = dict(zip(result.__dict__.keys(), result.__dict__.values()))
tmp.pop('_sa_instance_state')
return tmp
except BaseException as e:
print(e.args)
raise TypeError('Type error of parameter')
# except BaseException as e:
# print(e.args)
# raise TypeError('Type error of parameter')
# def __default__(self,obj):
# if isinstance(obj, datetime):
......
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