Skip to content

E
evm-store
Commit 1c08ef6e authored by wanli's avatar wanli
Browse files
Options

修复框架目前发发现的所有bug

parent e3e9ca7a
Hide whitespace changes
Inline Side-by-side
Showing with 405 additions and 290 deletions
tools/build_out/controllers/app.py
View file @ 1c08ef6e
......@@ -8,61 +8,66 @@ class AppResource(object):
def __init__(self):
super().__init__()
def get(self, params):
def get(self, uuid, params):
# handle business
logger.warn(params)
filters = []
result = AppModel.query.filter(*filters).order_by(AppModel.app_name).paginate(params.get('page', 1), params.get('pageSize', 10), error_out=False)
return result
filters = [AppModel.is_delete==False, AppModel.uuid==uuid]
result = AppModel.query.filter(*filters).first()
if result:
return (True, result)
return (False, result)
def getList(self, params):
# handle business
logger.warn(params)
filters = []
result = AppModel.query.filter(*filters).order_by(AppModel.app_name).paginate(params.get('page', 1), params.get('pageSize', 10), error_out=False)
filters = [AppModel.is_delete==False]
result = AppModel.query.filter(*filters).order_by(AppModel.create_at).paginate(params.get('page', 1), params.get('pageSize', 10), error_out=False)
return result
return (True, result.items, result.total)
def post(self, params, jwt=None):
def post(self, params, jwt={}):
# handle business
result = AppModel.query.filter(AppModel.app_name == params.get('app_name')).first()
if result and result.is_delete:
result.is_delete = False
result.update_by = jwt['id']
result.update_by = jwt.get("id", "")
result.update_date = datetime.now()
db.session.commit()
return response_result(ResponseCode.OK)
return (True, None)
elif result and result.is_delete == False:
return response_result(ResponseCode.EXISTS_ERROR)
return (False, "record code exists")
result = AppModel(**params)
db.session.add(result)
db.session.commit()
return response_result(ResponseCode.OK)
return (True, None)
def put(self, id, params, jwt=None):
def put(self, uuid, params, jwt={}):
# handle business
result = AppModel.query.get(id)
if not result: return response_result(ResponseCode.NO_DATA)
result = AppModel.query.filter(AppModel.uuid==uuid).first()
if not result:
return (False, "record not exists")
if params:
for key, value in params.items():
if value != None: setattr(result, key, value)
result.update_by = jwt['id']
result.update_by = jwt.get("id", "")
result.update_date = datetime.now()
db.session.commit()
return (True, None)
else:
return response_result(ResponseCode.PARAM_NULL)
return (False, "params is null")
def delete(self, id, jwt=None):
def delete(self, uuid, jwt={}):
# handle business
result = AppModel.query.get(id)
if not result: return response_result(ResponseCode.NO_DATA_FOUND)
else:
result.update_by = jwt['id']
result.update_date = datetime.now()
result.is_delete = True
db.session.delete(result)
db.session.commit()
result = AppModel.query.filter(AppModel.uuid==uuid).first()
if not result:
return (False, "record not exists")
result.update_by = jwt.get("id", "")
result.update_date = datetime.now()
result.is_delete = True
db.session.delete(result)
db.session.commit()
return (True, None)
appManager = AppResource()
\ No newline at end of file
tools/build_out/controllers/area.py
View file @ 1c08ef6e
from datetime import datetime
from application.app import db
from models.area import AreaModel
from models import engine, BaseModel
from webcreator.log import logger
from webcreator.response import ResponseCode, response_result
......@@ -9,34 +8,25 @@ class AreaResource(object):
def __init__(self):
super().__init__()
def get(self, params):
def get(self, uuid, params):
# handle business
logger.warn("============================>")
logger.warn(params)
filters = [AreaModel.is_delete==False]
logger.warn("/////////////////////////////")
logger.warn("<<<<<<<<>>>>>>>>")
result = db.session.query(AreaModel).filter().order_by(AreaModel.create_at).all()
logger.warn(result)
logger.warn("|||||||||||||||||||||||||||||")
return result
filters = [AreaModel.is_delete==False, AreaModel.uuid==uuid]
result = AreaModel.query.filter(*filters).first()
if result:
return (True, result)
return (False, result)
def getList(self, params):
# handle business
logger.warn(params)
filters = []
# result = AreaModel.query.filter(AreaModel.is_delete==False).order_by(AreaModel.create_at).all()
result = AreaModel.query.filter(*filters).order_by(AreaModel.areaId).paginate(params.get('page', 1), params.get('pageSize', 10), error_out=False)
logger.warn(result)
logger.warn("$$$$$$$$$$$$$$$$$$$$$$$$$$$$$")
filters = [AreaModel.is_delete==False]
result = AreaModel.query.filter(*filters).order_by(AreaModel.create_at).paginate(params.get('page', 1), params.get('pageSize', 10), error_out=False)
return result
return (True, result.items, result.total)
def post(self, params, jwt=None):
def post(self, params, jwt={}):
# handle business
result = AreaModel.query.filter(AreaModel.areaCode == params.get('areaCode')).first()
logger.warn(result)
if result and result.is_delete:
result.is_delete = False
result.update_by = jwt.get("id", "")
......@@ -44,35 +34,40 @@ class AreaResource(object):
db.session.commit()
return (True, None)
elif result and result.is_delete == False:
return (False, "area code exists")
return (False, "record code exists")
result = AreaModel(**params)
db.session.add(result)
db.session.commit()
return (True, None)
def put(self, id, params, jwt=None):
def put(self, uuid, params, jwt={}):
# handle business
result = AreaModel.query.get(id)
if not result: return response_result(ResponseCode.NO_DATA)
result = AreaModel.query.filter(AreaModel.uuid==uuid).first()
if not result:
return (False, "record not exists")
if params:
for key, value in params.items():
if value != None: setattr(result, key, value)
result.update_by = jwt['id']
result.update_by = jwt.get("id", "")
result.update_date = datetime.now()
db.session.commit()
return (True, None)
else:
return response_result(ResponseCode.PARAM_NULL)
return (False, "params is null")
def delete(self, id, jwt=None):
def delete(self, uuid, jwt={}):
# handle business
result = AreaModel.query.get(id)
if not result: return response_result(ResponseCode.NO_DATA_FOUND)
else:
result.update_by = jwt['id']
result.update_date = datetime.now()
result.is_delete = True
db.session.delete(result)
db.session.commit()
result = AreaModel.query.filter(AreaModel.uuid==uuid).first()
if not result:
return (False, "record not exists")
result.update_by = jwt.get("id", "")
result.update_date = datetime.now()
result.is_delete = True
db.session.delete(result)
db.session.commit()
return (True, None)
areaManager = AreaResource()
\ No newline at end of file
tools/build_out/controllers/login.py
View file @ 1c08ef6e
......@@ -8,61 +8,66 @@ class LoginResource(object):
def __init__(self):
super().__init__()
def get(self, params):
def get(self, uuid, params):
# handle business
logger.warn(params)
filters = []
result = LoginModel.query.filter(*filters).order_by(LoginModel.user).paginate(params.get('page', 1), params.get('pageSize', 10), error_out=False)
return result
filters = [LoginModel.is_delete==False, LoginModel.uuid==uuid]
result = LoginModel.query.filter(*filters).first()
if result:
return (True, result)
return (False, result)
def getList(self, params):
# handle business
logger.warn(params)
filters = []
result = LoginModel.query.filter(*filters).order_by(LoginModel.user).paginate(params.get('page', 1), params.get('pageSize', 10), error_out=False)
filters = [LoginModel.is_delete==False]
result = LoginModel.query.filter(*filters).order_by(LoginModel.create_at).paginate(params.get('page', 1), params.get('pageSize', 10), error_out=False)
return result
return (True, result.items, result.total)
def post(self, params, jwt=None):
def post(self, params, jwt={}):
# handle business
result = LoginModel.query.filter(LoginModel.user == params.get('user')).first()
if result and result.is_delete:
result.is_delete = False
result.update_by = jwt['id']
result.update_by = jwt.get("id", "")
result.update_date = datetime.now()
db.session.commit()
return response_result(ResponseCode.OK)
return (True, None)
elif result and result.is_delete == False:
return response_result(ResponseCode.EXISTS_ERROR)
return (False, "record code exists")
result = LoginModel(**params)
db.session.add(result)
db.session.commit()
return response_result(ResponseCode.OK)
return (True, None)
def put(self, id, params, jwt=None):
def put(self, uuid, params, jwt={}):
# handle business
result = LoginModel.query.get(id)
if not result: return response_result(ResponseCode.NO_DATA)
result = LoginModel.query.filter(LoginModel.uuid==uuid).first()
if not result:
return (False, "record not exists")
if params:
for key, value in params.items():
if value != None: setattr(result, key, value)
result.update_by = jwt['id']
result.update_by = jwt.get("id", "")
result.update_date = datetime.now()
db.session.commit()
return (True, None)
else:
return response_result(ResponseCode.PARAM_NULL)
return (False, "params is null")
def delete(self, id, jwt=None):
def delete(self, uuid, jwt={}):
# handle business
result = LoginModel.query.get(id)
if not result: return response_result(ResponseCode.NO_DATA_FOUND)
else:
result.update_by = jwt['id']
result.update_date = datetime.now()
result.is_delete = True
db.session.delete(result)
db.session.commit()
result = LoginModel.query.filter(LoginModel.uuid==uuid).first()
if not result:
return (False, "record not exists")
result.update_by = jwt.get("id", "")
result.update_date = datetime.now()
result.is_delete = True
db.session.delete(result)
db.session.commit()
return (True, None)
loginManager = LoginResource()
\ No newline at end of file
tools/build_out/controllers/package.py
View file @ 1c08ef6e
......@@ -8,61 +8,66 @@ class PackageResource(object):
def __init__(self):
super().__init__()
def get(self, params):
def get(self, uuid, params):
# handle business
logger.warn(params)
filters = []
result = PackageModel.query.filter(*filters).order_by(PackageModel.app).paginate(params.get('page', 1), params.get('pageSize', 10), error_out=False)
return result
filters = [PackageModel.is_delete==False, PackageModel.uuid==uuid]
result = PackageModel.query.filter(*filters).first()
if result:
return (True, result)
return (False, result)
def getList(self, params):
# handle business
logger.warn(params)
filters = []
result = PackageModel.query.filter(*filters).order_by(PackageModel.app).paginate(params.get('page', 1), params.get('pageSize', 10), error_out=False)
filters = [PackageModel.is_delete==False]
result = PackageModel.query.filter(*filters).order_by(PackageModel.create_at).paginate(params.get('page', 1), params.get('pageSize', 10), error_out=False)
return result
return (True, result.items, result.total)
def post(self, params, jwt=None):
def post(self, params, jwt={}):
# handle business
result = PackageModel.query.filter(PackageModel.app == params.get('app')).first()
if result and result.is_delete:
result.is_delete = False
result.update_by = jwt['id']
result.update_by = jwt.get("id", "")
result.update_date = datetime.now()
db.session.commit()
return response_result(ResponseCode.OK)
return (True, None)
elif result and result.is_delete == False:
return response_result(ResponseCode.EXISTS_ERROR)
return (False, "record code exists")
result = PackageModel(**params)
db.session.add(result)
db.session.commit()
return response_result(ResponseCode.OK)
return (True, None)
def put(self, id, params, jwt=None):
def put(self, uuid, params, jwt={}):
# handle business
result = PackageModel.query.get(id)
if not result: return response_result(ResponseCode.NO_DATA)
result = PackageModel.query.filter(PackageModel.uuid==uuid).first()
if not result:
return (False, "record not exists")
if params:
for key, value in params.items():
if value != None: setattr(result, key, value)
result.update_by = jwt['id']
result.update_by = jwt.get("id", "")
result.update_date = datetime.now()
db.session.commit()
return (True, None)
else:
return response_result(ResponseCode.PARAM_NULL)
return (False, "params is null")
def delete(self, id, jwt=None):
def delete(self, uuid, jwt={}):
# handle business
result = PackageModel.query.get(id)
if not result: return response_result(ResponseCode.NO_DATA_FOUND)
else:
result.update_by = jwt['id']
result.update_date = datetime.now()
result.is_delete = True
db.session.delete(result)
db.session.commit()
result = PackageModel.query.filter(PackageModel.uuid==uuid).first()
if not result:
return (False, "record not exists")
result.update_by = jwt.get("id", "")
result.update_date = datetime.now()
result.is_delete = True
db.session.delete(result)
db.session.commit()
return (True, None)
packageManager = PackageResource()
\ No newline at end of file
tools/build_out/controllers/user.py
View file @ 1c08ef6e
......@@ -8,61 +8,66 @@ class UserResource(object):
def __init__(self):
super().__init__()
def get(self, params):
def get(self, uuid, params):
# handle business
logger.warn(params)
filters = []
result = UserModel.query.filter(*filters).order_by(UserModel.app_name).paginate(params.get('page', 1), params.get('pageSize', 10), error_out=False)
return result
filters = [UserModel.is_delete==False, UserModel.uuid==uuid]
result = UserModel.query.filter(*filters).first()
if result:
return (True, result)
return (False, result)
def getList(self, params):
# handle business
logger.warn(params)
filters = []
result = UserModel.query.filter(*filters).order_by(UserModel.app_name).paginate(params.get('page', 1), params.get('pageSize', 10), error_out=False)
filters = [UserModel.is_delete==False]
result = UserModel.query.filter(*filters).order_by(UserModel.create_at).paginate(params.get('page', 1), params.get('pageSize', 10), error_out=False)
return result
return (True, result.items, result.total)
def post(self, params, jwt=None):
def post(self, params, jwt={}):
# handle business
result = UserModel.query.filter(UserModel.app_name == params.get('app_name')).first()
if result and result.is_delete:
result.is_delete = False
result.update_by = jwt['id']
result.update_by = jwt.get("id", "")
result.update_date = datetime.now()
db.session.commit()
return response_result(ResponseCode.OK)
return (True, None)
elif result and result.is_delete == False:
return response_result(ResponseCode.EXISTS_ERROR)
return (False, "record code exists")
result = UserModel(**params)
db.session.add(result)
db.session.commit()
return response_result(ResponseCode.OK)
return (True, None)
def put(self, id, params, jwt=None):
def put(self, uuid, params, jwt={}):
# handle business
result = UserModel.query.get(id)
if not result: return response_result(ResponseCode.NO_DATA)
result = UserModel.query.filter(UserModel.uuid==uuid).first()
if not result:
return (False, "record not exists")
if params:
for key, value in params.items():
if value != None: setattr(result, key, value)
result.update_by = jwt['id']
result.update_by = jwt.get("id", "")
result.update_date = datetime.now()
db.session.commit()
return (True, None)
else:
return response_result(ResponseCode.PARAM_NULL)
return (False, "params is null")
def delete(self, id, jwt=None):
def delete(self, uuid, jwt={}):
# handle business
result = UserModel.query.get(id)
if not result: return response_result(ResponseCode.NO_DATA_FOUND)
else:
result.update_by = jwt['id']
result.update_date = datetime.now()
result.is_delete = True
db.session.delete(result)
db.session.commit()
result = UserModel.query.filter(UserModel.uuid==uuid).first()
if not result:
return (False, "record not exists")
result.update_by = jwt.get("id", "")
result.update_date = datetime.now()
result.is_delete = True
db.session.delete(result)
db.session.commit()
return (True, None)
userManager = UserResource()
\ No newline at end of file
tools/build_out/models/__init__.py
View file @ 1c08ef6e
......@@ -54,5 +54,5 @@ session.add_all(
)
session.commit()
our_user = session.query(MyModel).filter_by(name='ed').first()
print(our_user)
\ No newline at end of file
# our_user = session.query(MyModel).filter_by(name='ed').first()
# print(our_user)
\ No newline at end of file
tools/build_out/models/app.py
View file @ 1c08ef6e
......@@ -72,7 +72,6 @@ class PostAppSchema(ma.SQLAlchemySchema):
app_review = ma.auto_field()
postAppSchema = PostAppSchema()
postAppsSchema = PostAppSchema(many=True)
class DeleteAppSchema(ma.SQLAlchemySchema):
class Meta:
......@@ -98,6 +97,7 @@ class GetListAppSchema(ma.SQLAlchemySchema):
app_arch = ma.auto_field()
getListAppSchema = GetListAppSchema()
getListAppsSchema = GetListAppSchema(many=True)
class GetAppSchema(ma.SQLAlchemySchema):
class Meta:
......
tools/build_out/models/area.py
View file @ 1c08ef6e
......@@ -58,7 +58,6 @@ class PostAreaSchema(ma.SQLAlchemySchema):
center = ma.auto_field()
postAreaSchema = PostAreaSchema()
postAreasSchema = PostAreaSchema(many=True)
class DeleteAreaSchema(ma.SQLAlchemySchema):
class Meta:
......@@ -84,6 +83,7 @@ class GetListAreaSchema(ma.SQLAlchemySchema):
field = fields.String(required=False, length=None)
getListAreaSchema = GetListAreaSchema()
getListAreasSchema = GetListAreaSchema(many=True)
class GetAreaSchema(ma.SQLAlchemySchema):
class Meta:
......@@ -105,10 +105,10 @@ class PutAreaSchema(ma.SQLAlchemySchema):
unknown = EXCLUDE # 未知字段默认排除
model = AreaModel
areaName = ma.auto_field()
level = ma.auto_field()
parentId = ma.auto_field()
hasChildren = ma.auto_field()
areaName = fields.String(required=False, length=None)
level = fields.Integer(required=False)
parentId = fields.String(required=False, length=None)
hasChildren = fields.Boolean(required=False)
field = fields.String(required=False, length=None)
putAreaSchema = PutAreaSchema()
tools/build_out/models/login.py
View file @ 1c08ef6e
......@@ -49,7 +49,6 @@ class PostLoginSchema(ma.SQLAlchemySchema):
password = fields.String(required=True, length=64)
postLoginSchema = PostLoginSchema()
postLoginsSchema = PostLoginSchema(many=True)
class GetListLoginSchema(ma.SQLAlchemySchema):
class Meta:
......@@ -67,6 +66,7 @@ class GetListLoginSchema(ma.SQLAlchemySchema):
operator = ma.auto_field()
getListLoginSchema = GetListLoginSchema()
getListLoginsSchema = GetListLoginSchema(many=True)
class GetLoginSchema(ma.SQLAlchemySchema):
class Meta:
......
tools/build_out/models/package.py
View file @ 1c08ef6e
......@@ -71,6 +71,7 @@ class GetListPackageSchema(ma.SQLAlchemySchema):
operator = ma.auto_field()
getListPackageSchema = GetListPackageSchema()
getListPackagesSchema = GetListPackageSchema(many=True)
class GetPackageSchema(ma.SQLAlchemySchema):
class Meta:
......
tools/build_out/models/user.py
View file @ 1c08ef6e
......@@ -72,7 +72,6 @@ class PostUserSchema(ma.SQLAlchemySchema):
app_review = ma.auto_field()
postUserSchema = PostUserSchema()
postUsersSchema = PostUserSchema(many=True)
class DeleteUserSchema(ma.SQLAlchemySchema):
class Meta:
......@@ -98,6 +97,7 @@ class GetListUserSchema(ma.SQLAlchemySchema):
app_arch = ma.auto_field()
getListUserSchema = GetListUserSchema()
getListUsersSchema = GetListUserSchema(many=True)
class GetUserSchema(ma.SQLAlchemySchema):
class Meta:
......
tools/build_out/views/app.py
View file @ 1c08ef6e
......@@ -3,7 +3,7 @@ from flask_restful import Resource
from flask_restful.reqparse import RequestParser
from flask_jwt_extended import ( jwt_required, get_jwt_identity )
from application.signal_manager import signalManager
from models.app import postAppSchema,deleteAppSchema,getListAppSchema,getAppSchema,putAppSchema
from models.app import postAppSchema,deleteAppSchema,getListAppSchema,getListAppsSchema,getAppSchema,putAppSchema
from webcreator.log import logger
from webcreator.response import ResponseCode, response_result
......@@ -23,21 +23,28 @@ class AppResourceList(Resource):
json_payload = request.json
logger.warn(json_payload)
data = getListAppSchema.load(json_payload)
result = signalManager.actionGetApp.emit(data)
result = signalManager.actionGetListApp.emit(data)
json_dumps = getListAppSchema.dump(result)
return jsonify(json_dumps), 200
if result[0]:
json_dumps = getListAppsSchema.dump(result[1])
logger.warn(json_dumps)
return response_result(ResponseCode.OK, data=json_dumps, count=result[2])
return response_result(ResponseCode.REQUEST_ERROR)
except Exception as e:
current_app.logger.error(e)
return response_result(ResponseCode.DB_ERROR)
@jwt_required
@jwt_required(locations=["headers"])
def post(self):
try:
json_payload = request.json
data = postAppSchema.load(json_payload)
result = signalManager.actionPostApp.emit(data)
json_dumps = postAppSchema.dump(result)
return jsonify(json_dumps), 200
if result[0] == False:
# json_dumps = postAppSchema.dump(result)
return response_result(ResponseCode.REQUEST_ERROR, msg=result[1])
logger.warn(result)
return response_result(ResponseCode.OK)
except Exception as e:
current_app.logger.error(e)
return response_result(ResponseCode.DB_ERROR)
......@@ -49,7 +56,7 @@ class AppResource(Resource):
# 特殊参数，即不是从json获取参数的接口，可以将这个注释打开
# self.parser = RequestParser()
@jwt_required
@jwt_required(locations=["headers"])
def get(self, uuid):
# 特殊参数，即不是从json获取参数的接口，可以将这个注释打开
# self.parser.add_argument("page", type=int, location="args", default=1)
......@@ -60,37 +67,42 @@ class AppResource(Resource):
json_payload = request.json
print("========>", uuid, json_payload)
data = getAppSchema.load(json_payload)
result = signalManager.actionGetApp.emit(data)
json_dumps = getAppSchema.dump(result)
return jsonify(json_dumps), 200
result = signalManager.actionGetApp.emit(uuid, data)
if result[0]:
json_dumps = getAppSchema.dump(result[1])
return response_result(ResponseCode.OK, data=json_dumps)
return response_result(ResponseCode.NO_DATA)
except Exception as e:
current_app.logger.error(e)
return response_result(ResponseCode.DB_ERROR)
@jwt_required
@jwt_required(locations=["headers"])
def put(self, uuid):
try:
json_payload = request.json
print("========>", uuid, json_payload)
data = putAppSchema.load(json_payload)
result = signalManager.actionPutApp.emit(data)
json_dumps = putAppSchema.dump(result)
return jsonify(json_dumps), 200
result = signalManager.actionPutApp.emit(uuid, data)
if result[0] == True:
# json_dumps = putAppSchema.dump(result)
return response_result(ResponseCode.OK)
return response_result(ResponseCode.NOTHING_CHANGE, msg=result[1])
except Exception as e:
current_app.logger.error(e)
return response_result(ResponseCode.DB_ERROR)
@jwt_required
@jwt_required(locations=["headers"])
def delete(self, uuid):
try:
json_payload = request.json
print("========>", uuid, json_payload)
data = deleteAppSchema.load(json_payload)
result = signalManager.actionDeleteApp.emit(data)
json_dumps = deleteAppSchema.dump(result)
return jsonify(json_dumps), 200
# data = deleteAppSchema.load(json_payload)
result = signalManager.actionDeleteApp.emit(uuid)
if result[0] == True:
return response_result(ResponseCode.OK)
return response_result(ResponseCode.REQUEST_ERROR, msg=result[1])
except Exception as e:
current_app.logger.error(e)
return response_result(ResponseCode.DB_ERROR)
tools/build_out/views/area.py
View file @ 1c08ef6e
......@@ -3,7 +3,7 @@ from flask_restful import Resource
from flask_restful.reqparse import RequestParser
from flask_jwt_extended import ( jwt_required, get_jwt_identity )
from application.signal_manager import signalManager
from models.area import postAreaSchema,deleteAreaSchema,getListAreaSchema,getAreaSchema,putAreaSchema
from models.area import postAreaSchema,deleteAreaSchema,getListAreaSchema,getListAreasSchema,getAreaSchema,putAreaSchema
from webcreator.log import logger
from webcreator.response import ResponseCode, response_result
......@@ -23,33 +23,31 @@ class AreaResourceList(Resource):
json_payload = request.json
logger.warn(json_payload)
data = getListAreaSchema.load(json_payload)
logger.warn("######################")
result = signalManager.actionGetArea.emit(data)
logger.warn("^^^^^^^^^^^^^^^^^^^^^^^^^^^^^")
logger.warn(result)
# json_dumps = result
# json_dumps = getListAreaSchema.dump(result)
# logger.warn(json_dumps)
return response_result(ResponseCode.OK, data=result)
result = signalManager.actionGetListArea.emit(data)
json_dumps = getListAreaSchema.dump(result)
if result[0]:
json_dumps = getListAreasSchema.dump(result[1])
logger.warn(json_dumps)
return response_result(ResponseCode.OK, data=json_dumps, count=result[2])
return response_result(ResponseCode.REQUEST_ERROR)
except Exception as e:
current_app.logger.error(e)
return response_result(ResponseCode.SERVER_ERROR)
return response_result(ResponseCode.DB_ERROR)
# @jwt_required
@jwt_required(locations=["headers"])
def post(self):
try:
json_payload = request.json
data = postAreaSchema.load(json_payload)
logger.warn(data)
result = signalManager.actionPostArea.emit(data)
if result[0] == False:
# json_dumps = postAreaSchema.dump(result)
return response_result(ResponseCode.REQUEST_ERROR, msg=result[1])
logger.warn(result)
# json_dumps = postAreaSchema.dump(result)
return response_result(ResponseCode.OK)
except Exception as e:
current_app.logger.error(e)
return response_result(ResponseCode.SERVER_ERROR)
return response_result(ResponseCode.DB_ERROR)
class AreaResource(Resource):
......@@ -58,7 +56,7 @@ class AreaResource(Resource):
# 特殊参数，即不是从json获取参数的接口，可以将这个注释打开
# self.parser = RequestParser()
@jwt_required
@jwt_required(locations=["headers"])
def get(self, uuid):
# 特殊参数，即不是从json获取参数的接口，可以将这个注释打开
# self.parser.add_argument("page", type=int, location="args", default=1)
......@@ -69,37 +67,42 @@ class AreaResource(Resource):
json_payload = request.json
print("========>", uuid, json_payload)
data = getAreaSchema.load(json_payload)
result = signalManager.actionGetArea.emit(data)
json_dumps = getAreaSchema.dump(result)
return jsonify(json_dumps), 200
result = signalManager.actionGetArea.emit(uuid, data)
if result[0]:
json_dumps = getAreaSchema.dump(result[1])
return response_result(ResponseCode.OK, data=json_dumps)
return response_result(ResponseCode.NO_DATA)
except Exception as e:
current_app.logger.error(e)
return response_result(ResponseCode.DB_ERROR)
@jwt_required
@jwt_required(locations=["headers"])
def put(self, uuid):
try:
json_payload = request.json
print("========>", uuid, json_payload)
data = putAreaSchema.load(json_payload)
result = signalManager.actionPutArea.emit(data)
json_dumps = putAreaSchema.dump(result)
return jsonify(json_dumps), 200
result = signalManager.actionPutArea.emit(uuid, data)
if result[0] == True:
# json_dumps = putAreaSchema.dump(result)
return response_result(ResponseCode.OK)
return response_result(ResponseCode.NOTHING_CHANGE, msg=result[1])
except Exception as e:
current_app.logger.error(e)
return response_result(ResponseCode.DB_ERROR)
@jwt_required
@jwt_required(locations=["headers"])
def delete(self, uuid):
try:
json_payload = request.json
print("========>", uuid, json_payload)
data = deleteAreaSchema.load(json_payload)
result = signalManager.actionDeleteArea.emit(data)
json_dumps = deleteAreaSchema.dump(result)
return jsonify(json_dumps), 200
# data = deleteAreaSchema.load(json_payload)
result = signalManager.actionDeleteArea.emit(uuid)
if result[0] == True:
return response_result(ResponseCode.OK)
return response_result(ResponseCode.REQUEST_ERROR, msg=result[1])
except Exception as e:
current_app.logger.error(e)
return response_result(ResponseCode.DB_ERROR)
tools/build_out/views/login.py
View file @ 1c08ef6e
......@@ -3,7 +3,7 @@ from flask_restful import Resource
from flask_restful.reqparse import RequestParser
from flask_jwt_extended import ( jwt_required, get_jwt_identity )
from application.signal_manager import signalManager
from models.login import postLoginSchema,getListLoginSchema,getLoginSchema
from models.login import postLoginSchema,getListLoginSchema,getListLoginsSchema,getLoginSchema
from webcreator.log import logger
from webcreator.response import ResponseCode, response_result
......@@ -23,9 +23,13 @@ class LoginResourceList(Resource):
json_payload = request.json
logger.warn(json_payload)
data = getListLoginSchema.load(json_payload)
result = signalManager.actionGetLogin.emit(data)
result = signalManager.actionGetListLogin.emit(data)
json_dumps = getListLoginSchema.dump(result)
return jsonify(json_dumps), 200
if result[0]:
json_dumps = getListLoginsSchema.dump(result[1])
logger.warn(json_dumps)
return response_result(ResponseCode.OK, data=json_dumps, count=result[2])
return response_result(ResponseCode.REQUEST_ERROR)
except Exception as e:
current_app.logger.error(e)
return response_result(ResponseCode.DB_ERROR)
......@@ -35,8 +39,11 @@ class LoginResourceList(Resource):
json_payload = request.json
data = postLoginSchema.load(json_payload)
result = signalManager.actionPostLogin.emit(data)
json_dumps = postLoginSchema.dump(result)
return jsonify(json_dumps), 200
if result[0] == False:
# json_dumps = postLoginSchema.dump(result)
return response_result(ResponseCode.REQUEST_ERROR, msg=result[1])
logger.warn(result)
return response_result(ResponseCode.OK)
except Exception as e:
current_app.logger.error(e)
return response_result(ResponseCode.DB_ERROR)
......@@ -48,7 +55,7 @@ class LoginResource(Resource):
# 特殊参数，即不是从json获取参数的接口，可以将这个注释打开
# self.parser = RequestParser()
@jwt_required
@jwt_required(locations=["headers"])
def get(self, uuid):
# 特殊参数，即不是从json获取参数的接口，可以将这个注释打开
# self.parser.add_argument("page", type=int, location="args", default=1)
......@@ -59,9 +66,11 @@ class LoginResource(Resource):
json_payload = request.json
print("========>", uuid, json_payload)
data = getLoginSchema.load(json_payload)
result = signalManager.actionGetLogin.emit(data)
json_dumps = getLoginSchema.dump(result)
return jsonify(json_dumps), 200
result = signalManager.actionGetLogin.emit(uuid, data)
if result[0]:
json_dumps = getLoginSchema.dump(result[1])
return response_result(ResponseCode.OK, data=json_dumps)
return response_result(ResponseCode.NO_DATA)
except Exception as e:
current_app.logger.error(e)
return response_result(ResponseCode.DB_ERROR)
tools/build_out/views/package.py
View file @ 1c08ef6e
......@@ -3,7 +3,7 @@ from flask_restful import Resource
from flask_restful.reqparse import RequestParser
from flask_jwt_extended import ( jwt_required, get_jwt_identity )
from application.signal_manager import signalManager
from models.package import getListPackageSchema,getPackageSchema
from models.package import getListPackageSchema,getListPackagesSchema,getPackageSchema
from webcreator.log import logger
from webcreator.response import ResponseCode, response_result
......@@ -23,9 +23,13 @@ class PackageResourceList(Resource):
json_payload = request.json
logger.warn(json_payload)
data = getListPackageSchema.load(json_payload)
result = signalManager.actionGetPackage.emit(data)
result = signalManager.actionGetListPackage.emit(data)
json_dumps = getListPackageSchema.dump(result)
return jsonify(json_dumps), 200
if result[0]:
json_dumps = getListPackagesSchema.dump(result[1])
logger.warn(json_dumps)
return response_result(ResponseCode.OK, data=json_dumps, count=result[2])
return response_result(ResponseCode.REQUEST_ERROR)
except Exception as e:
current_app.logger.error(e)
return response_result(ResponseCode.DB_ERROR)
......@@ -36,7 +40,7 @@ class PackageResource(Resource):
# 特殊参数，即不是从json获取参数的接口，可以将这个注释打开
# self.parser = RequestParser()
@jwt_required
@jwt_required(locations=["headers"])
def get(self, uuid):
# 特殊参数，即不是从json获取参数的接口，可以将这个注释打开
# self.parser.add_argument("page", type=int, location="args", default=1)
......@@ -47,9 +51,11 @@ class PackageResource(Resource):
json_payload = request.json
print("========>", uuid, json_payload)
data = getPackageSchema.load(json_payload)
result = signalManager.actionGetPackage.emit(data)
json_dumps = getPackageSchema.dump(result)
return jsonify(json_dumps), 200
result = signalManager.actionGetPackage.emit(uuid, data)
if result[0]:
json_dumps = getPackageSchema.dump(result[1])
return response_result(ResponseCode.OK, data=json_dumps)
return response_result(ResponseCode.NO_DATA)
except Exception as e:
current_app.logger.error(e)
return response_result(ResponseCode.DB_ERROR)
tools/build_out/views/user.py
View file @ 1c08ef6e
......@@ -3,7 +3,7 @@ from flask_restful import Resource
from flask_restful.reqparse import RequestParser
from flask_jwt_extended import ( jwt_required, get_jwt_identity )
from application.signal_manager import signalManager
from models.user import postUserSchema,deleteUserSchema,getListUserSchema,getUserSchema,putUserSchema
from models.user import postUserSchema,deleteUserSchema,getListUserSchema,getListUsersSchema,getUserSchema,putUserSchema
from webcreator.log import logger
from webcreator.response import ResponseCode, response_result
......@@ -23,21 +23,28 @@ class UserResourceList(Resource):
json_payload = request.json
logger.warn(json_payload)
data = getListUserSchema.load(json_payload)
result = signalManager.actionGetUser.emit(data)
result = signalManager.actionGetListUser.emit(data)
json_dumps = getListUserSchema.dump(result)
return jsonify(json_dumps), 200
if result[0]:
json_dumps = getListUsersSchema.dump(result[1])
logger.warn(json_dumps)
return response_result(ResponseCode.OK, data=json_dumps, count=result[2])
return response_result(ResponseCode.REQUEST_ERROR)
except Exception as e:
current_app.logger.error(e)
return response_result(ResponseCode.DB_ERROR)
@jwt_required
@jwt_required(locations=["headers"])
def post(self):
try:
json_payload = request.json
data = postUserSchema.load(json_payload)
result = signalManager.actionPostUser.emit(data)
json_dumps = postUserSchema.dump(result)
return jsonify(json_dumps), 200
if result[0] == False:
# json_dumps = postUserSchema.dump(result)
return response_result(ResponseCode.REQUEST_ERROR, msg=result[1])
logger.warn(result)
return response_result(ResponseCode.OK)
except Exception as e:
current_app.logger.error(e)
return response_result(ResponseCode.DB_ERROR)
......@@ -49,7 +56,7 @@ class UserResource(Resource):
# 特殊参数，即不是从json获取参数的接口，可以将这个注释打开
# self.parser = RequestParser()
@jwt_required
@jwt_required(locations=["headers"])
def get(self, uuid):
# 特殊参数，即不是从json获取参数的接口，可以将这个注释打开
# self.parser.add_argument("page", type=int, location="args", default=1)
......@@ -60,37 +67,42 @@ class UserResource(Resource):
json_payload = request.json
print("========>", uuid, json_payload)
data = getUserSchema.load(json_payload)
result = signalManager.actionGetUser.emit(data)
json_dumps = getUserSchema.dump(result)
return jsonify(json_dumps), 200
result = signalManager.actionGetUser.emit(uuid, data)
if result[0]:
json_dumps = getUserSchema.dump(result[1])
return response_result(ResponseCode.OK, data=json_dumps)
return response_result(ResponseCode.NO_DATA)
except Exception as e:
current_app.logger.error(e)
return response_result(ResponseCode.DB_ERROR)
@jwt_required
@jwt_required(locations=["headers"])
def put(self, uuid):
try:
json_payload = request.json
print("========>", uuid, json_payload)
data = putUserSchema.load(json_payload)
result = signalManager.actionPutUser.emit(data)
json_dumps = putUserSchema.dump(result)
return jsonify(json_dumps), 200
result = signalManager.actionPutUser.emit(uuid, data)
if result[0] == True:
# json_dumps = putUserSchema.dump(result)
return response_result(ResponseCode.OK)
return response_result(ResponseCode.NOTHING_CHANGE, msg=result[1])
except Exception as e:
current_app.logger.error(e)
return response_result(ResponseCode.DB_ERROR)
@jwt_required
@jwt_required(locations=["headers"])
def delete(self, uuid):
try:
json_payload = request.json
print("========>", uuid, json_payload)
data = deleteUserSchema.load(json_payload)
result = signalManager.actionDeleteUser.emit(data)
json_dumps = deleteUserSchema.dump(result)
return jsonify(json_dumps), 200
# data = deleteUserSchema.load(json_payload)
result = signalManager.actionDeleteUser.emit(uuid)
if result[0] == True:
return response_result(ResponseCode.OK)
return response_result(ResponseCode.REQUEST_ERROR, msg=result[1])
except Exception as e:
current_app.logger.error(e)
return response_result(ResponseCode.DB_ERROR)
tools/config.json
View file @ 1c08ef6e
......@@ -272,6 +272,7 @@
"dataType": "String",
"location": "args",
"default": "",
"priority": true,
"required": false
},
{
......@@ -279,6 +280,7 @@
"dataType": "Integer",
"location": "args",
"default": 0,
"priority": true,
"required": false
},
{
......@@ -286,6 +288,7 @@
"dataType": "String",
"location": "args",
"default": null,
"priority": true,
"required": false
},
{
......@@ -293,6 +296,7 @@
"dataType": "Boolean",
"location": "args",
"default": false,
"priority": true,
"required": false
},
{
......@@ -300,6 +304,7 @@
"dataType": "String",
"location": "args",
"default": null,
"priority": true,
"required": false
}
]
......
tools/gen_code.py
View file @ 1c08ef6e
from fs.copy import copy_fs
from fs.copy import copy_fs, copy_file
from jinja2 import Environment, FileSystemLoader
import fs
import json
import os
import re
import hashlib
import time
import shutil
'''
流程：
......@@ -149,15 +151,46 @@ def readConfig():
result = json.loads(f.read())
return result
# 备份数据库，判断目标文件夹下是否有.db文件，有的话，先备份到临时目录，待文件复制完成后，再放回原来位置
def backup_database():
global output_dir
target_dir = os.sep.join([os.path.dirname(output_dir), "tmp"])
if not os.path.exists(target_dir):
os.makedirs(target_dir)
home_fs = fs.open_fs(output_dir)
for file in home_fs.glob('*.db', namespaces=['details']):
# print(file.path, os.path.normpath(os.sep.join([output_dir, file.path])))
# copyFiles(os.path.normpath(os.sep.join([output_dir, file.path])), target_dir)
shutil.copy(os.path.normpath(os.sep.join([output_dir, file.path])), target_dir)
# 恢复数据库，代码生成完成后，需要把之前复制的数据库文件，恢复到原来位置
def restore_database():
global output_dir
target_dir = os.sep.join([os.path.dirname(output_dir), "tmp"])
if not os.path.exists(target_dir):
return
home_fs = fs.open_fs(target_dir)
for file in home_fs.glob('*.db', namespaces=['details']):
# copyFiles(os.path.normpath(os.sep.join([target_dir, file.path])), output_dir)
shutil.copy(os.path.normpath(os.sep.join([target_dir, file.path])), output_dir)
home_fs = fs.open_fs(target_dir)
home_fs.removetree("/")
if home_fs.exists("/"):
os.removedirs(target_dir)
def run():
global input_dir
global output_dir
input_dir = os.sep.join([os.getcwd(), "resources"])
output_dir = os.sep.join([os.getcwd(), "build_out"])
backup_database()
copyFiles(input_dir, output_dir)
config = readConfig()
# print(config)
parseConfig(config)
restore_database()
print("success ......")
if __name__ == "__main__":
......
tools/resources/models/__init__.py
View file @ 1c08ef6e
......@@ -54,5 +54,5 @@ session.add_all(
)
session.commit()
our_user = session.query(MyModel).filter_by(name='ed').first()
print(our_user)
\ No newline at end of file
# our_user = session.query(MyModel).filter_by(name='ed').first()
# print(our_user)
\ No newline at end of file
tools/templates/controller.tpl
View file @ 1c08ef6e
......@@ -8,61 +8,66 @@ class {{ config['name'] | letterUpper }}Resource(object):
def __init__(self):
super().__init__()
def get(self, params):
def get(self, uuid, params):
# handle business
logger.warn(params)
filters = []
result = {{ config['name'] | letterUpper }}Model.query.filter(*filters).order_by({{ config['name'] | letterUpper }}Model.{{ config["model"]["fields"][0]["name"] }}).paginate(params.get('page', 1), params.get('pageSize', 10), error_out=False)
return result
filters = [{{ config['name'] | letterUpper }}Model.is_delete==False, {{ config['name'] | letterUpper }}Model.uuid==uuid]
result = {{ config['name'] | letterUpper }}Model.query.filter(*filters).first()
if result:
return (True, result)
return (False, result)
def getList(self, params):
# handle business
logger.warn(params)
filters = []
result = {{ config['name'] | letterUpper }}Model.query.filter(*filters).order_by({{ config['name'] | letterUpper }}Model.{{ config["model"]["fields"][0]["name"] }}).paginate(params.get('page', 1), params.get('pageSize', 10), error_out=False)
filters = [{{ config['name'] | letterUpper }}Model.is_delete==False]
result = {{ config['name'] | letterUpper }}Model.query.filter(*filters).order_by({{ config['name'] | letterUpper }}Model.create_at).paginate(params.get('page', 1), params.get('pageSize', 10), error_out=False)
return result
return (True, result.items, result.total)
def post(self, params, jwt=None):
def post(self, params, jwt={}):
# handle business
result = {{ config['name'] | letterUpper }}Model.query.filter({{ config['name'] | letterUpper }}Model.{{ config["model"]["fields"][0]["name"] }} == params.get('{{ config["model"]["fields"][0]["name"] }}')).first()
if result and result.is_delete:
result.is_delete = False
result.update_by = jwt['id']
result.update_by = jwt.get("id", "")
result.update_date = datetime.now()
db.session.commit()
return (True, None)
elif result and result.is_delete == False:
return (False, "exists")
return (False, "record code exists")
result = {{ config['name'] | letterUpper }}Model(**params)
db.session.add(result)
db.session.commit()
return (True, None)
def put(self, id, params, jwt=None):
def put(self, uuid, params, jwt={}):
# handle business
result = {{ config['name'] | letterUpper }}Model.query.get(id)
if not result: return response_result(ResponseCode.NO_DATA)
result = {{ config['name'] | letterUpper }}Model.query.filter({{ config['name'] | letterUpper }}Model.uuid==uuid).first()
if not result:
return (False, "record not exists")
if params:
for key, value in params.items():
if value != None: setattr(result, key, value)
result.update_by = jwt['id']
result.update_by = jwt.get("id", "")
result.update_date = datetime.now()
db.session.commit()
return (True, None)
else:
return response_result(ResponseCode.PARAM_NULL)
return (False, "params is null")
def delete(self, id, jwt=None):
def delete(self, uuid, jwt={}):
# handle business
result = {{ config['name'] | letterUpper }}Model.query.get(id)
if not result: return response_result(ResponseCode.NO_DATA_FOUND)
else:
result.update_by = jwt['id']
result.update_date = datetime.now()
result.is_delete = True
db.session.delete(result)
db.session.commit()
result = {{ config['name'] | letterUpper }}Model.query.filter({{ config['name'] | letterUpper }}Model.uuid==uuid).first()
if not result:
return (False, "record not exists")
result.update_by = jwt.get("id", "")
result.update_date = datetime.now()
result.is_delete = True
db.session.delete(result)
db.session.commit()
return (True, None)
{{ config["name"] }}Manager = {{ config['name'] | letterUpper }}Resource()
\ No newline at end of file
tools/templates/model.tpl
View file @ 1c08ef6e
......@@ -69,7 +69,9 @@ class {{ key | letterUpper }}{{ config['name'] | letterUpper }}Schema(ma.SQLAlch
#}
{%- for p in value['params'] %}
{%- if p.get("name") in fields %}
{%- if p.get("priority") %}
{{ p.get("name") }} = fields.{{ p.get("dataType") }}(required={{ p.get("required") }}{%- if p.get("dataType") == "String" %}, length={{ p.get("length") }}{%- endif %})
{%- elif p.get("name") in fields %}
{{ p.get("name") }} = ma.auto_field()
{%- else %}
{{ p.get("name") }} = fields.{{ p.get("dataType") }}(required={{ p.get("required") }}{%- if p.get("dataType") == "String" %}, length={{ p.get("length") }}{%- endif %})
......@@ -77,7 +79,7 @@ class {{ key | letterUpper }}{{ config['name'] | letterUpper }}Schema(ma.SQLAlch
{%- endfor %}
{{ key }}{{ config['name'] | letterUpper }}Schema = {{ key | letterUpper }}{{ config['name'] | letterUpper }}Schema()
{%- if key == "post" %}
{%- if key == "getList" %}
{{ key }}{{ config['name'] | letterUpper }}sSchema = {{ key | letterUpper }}{{ config['name'] | letterUpper }}Schema(many=True)
{%- endif %}
{% endfor %}
\ No newline at end of file
tools/templates/view.tpl
View file @ 1c08ef6e
......@@ -5,7 +5,7 @@ from flask_jwt_extended import ( jwt_required, get_jwt_identity )
from application.signal_manager import signalManager
{%- set pipe = joiner(",") %}
from models.{{ config['name'] }} import {% for k, v in config["view"].items() -%}
{{ pipe() }}{{ k }}{{ config['name'] | letterUpper }}Schema
{{ pipe() }}{{ k }}{{ config['name'] | letterUpper }}Schema{% if k == "getList" %}{{ pipe() }}{{ k }}{{ config['name'] | letterUpper }}sSchema{% endif %}
{%- endfor %}
from webcreator.log import logger
from webcreator.response import ResponseCode, response_result
......@@ -18,7 +18,7 @@ class {{ config['name'] | letterUpper }}ResourceList(Resource):
{%- if config["view"]["getList"] %}
{% if config["view"]["getList"]["auth"] %}
@jwt_required
@jwt_required(locations=["headers"])
{%- endif %}
def get(self):
# 特殊参数，即不是从json获取参数的接口，可以将这个注释打开
......@@ -30,9 +30,13 @@ class {{ config['name'] | letterUpper }}ResourceList(Resource):
json_payload = request.json
logger.warn(json_payload)
data = getList{{ config['name'] | letterUpper }}Schema.load(json_payload)
result = signalManager.actionGet{{ config["name"] | letterUpper }}.emit(data)
result = signalManager.actionGetList{{ config["name"] | letterUpper }}.emit(data)
json_dumps = getList{{ config['name'] | letterUpper }}Schema.dump(result)
return jsonify(json_dumps), 200
if result[0]:
json_dumps = getList{{ config['name'] | letterUpper }}sSchema.dump(result[1])
logger.warn(json_dumps)
return response_result(ResponseCode.OK, data=json_dumps, count=result[2])
return response_result(ResponseCode.REQUEST_ERROR)
except Exception as e:
current_app.logger.error(e)
return response_result(ResponseCode.DB_ERROR)
......@@ -40,15 +44,18 @@ class {{ config['name'] | letterUpper }}ResourceList(Resource):
{%- if config["view"]["post"] %}
{% if config["view"]["post"]["auth"] %}
@jwt_required
@jwt_required(locations=["headers"])
{%- endif %}
def post(self):
try:
json_payload = request.json
data = post{{ config['name'] | letterUpper }}Schema.load(json_payload)
result = signalManager.actionPost{{ config["name"] | letterUpper }}.emit(data)
json_dumps = post{{ config['name'] | letterUpper }}Schema.dump(result)
return jsonify(json_dumps), 200
if result[0] == False:
# json_dumps = post{{ config["name"] | letterUpper }}Schema.dump(result)
return response_result(ResponseCode.REQUEST_ERROR, msg=result[1])
logger.warn(result)
return response_result(ResponseCode.OK)
except Exception as e:
current_app.logger.error(e)
return response_result(ResponseCode.DB_ERROR)
......@@ -62,7 +69,7 @@ class {{ config['name'] | letterUpper }}Resource(Resource):
{%- if config["view"]["get"] %}
{% if config["view"]["get"]["auth"] %}
@jwt_required
@jwt_required(locations=["headers"])
{%- endif %}
def get(self, uuid):
# 特殊参数，即不是从json获取参数的接口，可以将这个注释打开
......@@ -74,9 +81,11 @@ class {{ config['name'] | letterUpper }}Resource(Resource):
json_payload = request.json
print("========>", uuid, json_payload)
data = get{{ config['name'] | letterUpper }}Schema.load(json_payload)
result = signalManager.actionGet{{ config["name"] | letterUpper }}.emit(data)
json_dumps = get{{ config['name'] | letterUpper }}Schema.dump(result)
return jsonify(json_dumps), 200
result = signalManager.actionGet{{ config["name"] | letterUpper }}.emit(uuid, data)
if result[0]:
json_dumps = get{{ config['name'] | letterUpper }}Schema.dump(result[1])
return response_result(ResponseCode.OK, data=json_dumps)
return response_result(ResponseCode.NO_DATA)
except Exception as e:
current_app.logger.error(e)
return response_result(ResponseCode.DB_ERROR)
......@@ -84,16 +93,18 @@ class {{ config['name'] | letterUpper }}Resource(Resource):
{%- if config["view"]["put"] %}
{% if config["view"]["put"]["auth"] %}
@jwt_required
@jwt_required(locations=["headers"])
{%- endif %}
def put(self, uuid):
try:
json_payload = request.json
print("========>", uuid, json_payload)
data = put{{ config['name'] | letterUpper }}Schema.load(json_payload)
result = signalManager.actionPut{{ config["name"] | letterUpper }}.emit(data)
json_dumps = put{{ config['name'] | letterUpper }}Schema.dump(result)
return jsonify(json_dumps), 200
result = signalManager.actionPut{{ config["name"] | letterUpper }}.emit(uuid, data)
if result[0] == True:
# json_dumps = put{{ config['name'] | letterUpper }}Schema.dump(result)
return response_result(ResponseCode.OK)
return response_result(ResponseCode.NOTHING_CHANGE, msg=result[1])
except Exception as e:
current_app.logger.error(e)
return response_result(ResponseCode.DB_ERROR)
......@@ -101,16 +112,17 @@ class {{ config['name'] | letterUpper }}Resource(Resource):
{%- if config["view"]["delete"] %}
{% if config["view"]["delete"]["auth"] %}
@jwt_required
@jwt_required(locations=["headers"])
{%- endif %}
def delete(self, uuid):
try:
json_payload = request.json
print("========>", uuid, json_payload)
data = delete{{ config['name'] | letterUpper }}Schema.load(json_payload)
result = signalManager.actionDelete{{ config["name"] | letterUpper }}.emit(data)
json_dumps = delete{{ config['name'] | letterUpper }}Schema.dump(result)
return jsonify(json_dumps), 200
# data = delete{{ config['name'] | letterUpper }}Schema.load(json_payload)
result = signalManager.actionDelete{{ config["name"] | letterUpper }}.emit(uuid)
if result[0] == True:
return response_result(ResponseCode.OK)
return response_result(ResponseCode.REQUEST_ERROR, msg=result[1])
except Exception as e:
current_app.logger.error(e)
return response_result(ResponseCode.DB_ERROR)
......
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