删除curd层

applications/view/admin/admin_log.py

@@ -9,46 +9,32 @@ from applications.common.curd import model_to_dicts
 admin_log = Blueprint('adminLog', __name__, url_prefix='/admin/log')
 
 
-#                               ----------------------------------------------------------
-#                               -------------------------  日志管理 --------------------------
-#                               ----------------------------------------------------------
-
-
+# 日志管理
 @admin_log.get('/')
 @authorize("admin:log:main")
 def index():
     return render_template('admin/admin_log/main.html')
 
 
-#                               ==========================================================
-#                                                            登录日志
-#                               ==========================================================
-
-
+# 登录日志
 @admin_log.get('/loginLog')
 @authorize("admin:log:main")
 def login_log():
-    log = AdminLog.query.filter_by(url='/admin/login').order_by(desc(AdminLog.create_time)).layui_paginate()
-    count = AdminLog.query.filter_by(url='/admin/login').count()
-    data = model_to_dicts(Schema=LogSchema, model=log.items)
-
-    return table_api(data=data, count=count)
-
-
-#                               ==========================================================
-#                                                            操作日志
-#                               ==========================================================
+    # orm查询
+    # 使用分页获取data需要.items
+    log = AdminLog.query.filter_by(url='/passport/login').order_by(desc(AdminLog.create_time)).layui_paginate()
+    count = AdminLog.query.filter_by(url='/passport/login').count()
+    return table_api(data= model_to_dicts(schema=LogSchema, data=log.items), count=count)
 
 
+# 操作日志
 @admin_log.get('/operateLog')
 @authorize("admin:log:main")
 def operate_log():
-    page = request.args.get('page', type=int)
-    limit = request.args.get('limit', type=int)
+    # orm查询
+    # 使用分页获取data需要.items
     log = AdminLog.query.filter(
-        AdminLog.url != '/admin/login').order_by(
-        desc(AdminLog.create_time)).paginate(
-        page=page, per_page=limit, error_out=False)
-    count = AdminLog.query.filter(AdminLog.url != '/admin/login').count()
-    data = model_to_dicts(Schema=LogSchema, model=log.items)
-    return table_api(data=data, count=count)
+        AdminLog.url != '/passport/login').order_by(
+        desc(AdminLog.create_time)).layui_paginate()
+    count = AdminLog.query.filter(AdminLog.url != '/passport/login').count()
+    return table_api(data=model_to_dicts(schema=LogSchema, data=log.items), count=count)

applications/view/admin/dict.py

@@ -1,12 +1,12 @@
 from flask import Blueprint, render_template, request, jsonify
 
 from applications.common import curd
+from applications.common.helper import ModelFilter
 from applications.common.utils.http import table_api, success_api, fail_api
 from applications.common.utils.rights import authorize
 from applications.common.utils.validate import xss_escape
 from applications.extensions import db
 from applications.models import DictType, DictData
-from applications.common.admin import dict_curd
 from applications.schemas import DictTypeSchema, DictDataSchema
 
 admin_dict = Blueprint('adminDict', __name__, url_prefix='/admin/dict')
@@ -22,13 +22,17 @@ def main():
 @admin_dict.get('/dictType/data')
 @authorize("admin:dict:main", log=True)
 def dict_type_data():
+    # 获取请求参数
     type_name = xss_escape(request.args.get('typeName', type=str))
-    dict_all = DictType.query
+    # 查询参数构造
+    mf = ModelFilter()
     if type_name:
-        dict_all = dict_all.filter(DictType.type_name.like('%' + type_name + '%'))
-    dict_all = dict_all.layui_paginate()
+        mf.vague(field_name="type_name", value=type_name)
+    # orm查询
+    # 使用分页获取data需要.items
+    dict_all = DictType.query.filter(mf.get_filter(DictType)).layui_paginate()
     count = DictType.query.count()
-    data = curd.model_to_dicts(Schema=DictTypeSchema, model=dict_all.items)
+    data = curd.model_to_dicts(schema=DictTypeSchema, data=dict_all.items)
     return table_api(data=data, count=count)
 
 
@@ -78,7 +82,7 @@ def dict_type_update():
 def dict_type_enable():
     _id = request.json.get('id')
     if id:
-        res = dict_curd.enable_dict_type_status(_id)
+        res = curd.enable_status(DictType,_id)
         if not res:
             return fail_api(msg="出错啦")
         return success_api("启动成功")
@@ -91,7 +95,7 @@ def dict_type_enable():
 def dict_type_dis_enable():
     _id = request.json.get('id')
     if id:
-        res = dict_curd.disable_dict_type_status(_id)
+        res = curd.disable_status(DictType,_id)
         if not res:
             return fail_api(msg="出错啦")
         return success_api("禁用成功")
@@ -102,7 +106,7 @@ def dict_type_dis_enable():
 @admin_dict.delete('/dictType/remove/<int:_id>')
 @authorize("admin:dict:remove", log=True)
 def dict_type_delete(_id):
-    res = dict_curd.delete_type_by_id(_id)
+    res = curd.delete_one_by_id(DictType,_id)
     if not res:
         return fail_api(msg="删除失败")
     return success_api(msg="删除成功")
@@ -114,7 +118,7 @@ def dict_code_data():
     type_code = xss_escape(request.args.get('typeCode', type=str))
     dict_data = DictData.query.filter_by(type_code=type_code).layui_paginate()
     count = DictType.query.count()
-    data = curd.model_to_dicts(Schema=DictDataSchema, model=dict_data.items)
+    data = curd.model_to_dicts(schema=DictDataSchema, data=dict_data.items)
     return table_api(data=data, count=count)
 
 

applications/view/admin/file.py

@@ -5,7 +5,7 @@ from applications.common.utils.http import fail_api, success_api, table_api
 from applications.common.utils.rights import authorize
 from applications.extensions import db
 from applications.models import Photo
-from applications.common.admin import file_curd
+from applications.common.utils import upload as upload_curd
 
 admin_file = Blueprint('adminFile', __name__, url_prefix='/admin/file')
 
@@ -23,7 +23,7 @@ def index():
 def table():
     page = request.args.get('page', type=int)
     limit = request.args.get('limit', type=int)
-    data, count = file_curd.get_photo(page=page, limit=limit)
+    data, count = upload_curd.get_photo(page=page, limit=limit)
     return table_api(data=data, count=count)
 
 
@@ -41,7 +41,7 @@ def upload_api():
     if 'file' in request.files:
         photo = request.files['file']
         mime = request.files['file'].content_type
-        file_url = file_curd.upload_one(photo=photo, mime=mime)
+        file_url = upload_curd.upload_one(photo=photo, mime=mime)
         res = {
             "msg": "上传成功",
             "code": 0,
@@ -58,7 +58,7 @@ def upload_api():
 @authorize("admin:file:delete", log=True)
 def delete():
     _id = request.form.get('id')
-    res = file_curd.delete_photo_by_id(_id)
+    res = upload_curd.delete_photo_by_id(_id)
     if res:
         return success_api(msg="删除成功")
     else:

applications/view/admin/power.py

@@ -1,12 +1,11 @@
 from flask import Blueprint, render_template, request, jsonify
 
 from applications.common import curd
-from applications.common.admin import power_curd
 from applications.common.utils.http import success_api, fail_api
 from applications.common.utils.rights import authorize
 from applications.common.utils.validate import xss_escape
 from applications.extensions import db
-from applications.models import Power
+from applications.models import Power, Role
 from applications.schemas import PowerSchema2
 
 admin_power = Blueprint('adminPower', __name__, url_prefix='/admin/power')
@@ -22,9 +21,8 @@ def index():
 @authorize("admin:power:main", log=True)
 def data():
     power = Power.query.all()
-    res = curd.model_to_dicts(Schema=PowerSchema2, model=power)
     res = {
-        "data": res
+        "data": curd.model_to_dicts(schema=PowerSchema2, data=power)
     }
     return jsonify(res)
 
@@ -39,7 +37,7 @@ def add():
 @authorize("admin:power:main", log=True)
 def select_parent():
     power = Power.query.all()
-    res = curd.model_to_dicts(Schema=PowerSchema2, model=power)
+    res = curd.model_to_dicts(schema=PowerSchema2, data=power)
     res.append({"powerId": 0, "powerName": "顶级权限", "parentId": -1})
     res = {
         "status": {"code": 200, "message": "默认"},
@@ -141,10 +139,19 @@ def dis_enable():
 
 
 # 权限删除
-@admin_power.delete('/remove/<int:_id>')
+@admin_power.delete('/remove/<int:id>')
 @authorize("admin:power:remove", log=True)
-def remove(_id):
-    r = power_curd.remove_power(_id)
+def remove(id):
+    power = Power.query.filter_by(id=id).first()
+    role_id_list = []
+    roles = power.role
+    for role in roles:
+        role_id_list.append(role.id)
+    roles = Role.query.filter(Role.id.in_(role_id_list)).all()
+    for p in roles:
+        power.role.remove(p)
+    r = Power.query.filter_by(id=id).delete()
+    db.session.commit()
     if r:
         return success_api(msg="删除成功")
     else:
@@ -156,5 +163,15 @@ def remove(_id):
 @authorize("admin:power:remove", log=True)
 def batch_remove():
     ids = request.form.getlist('ids[]')
-    power_curd.batch_remove(ids)
+    for id in ids:
+        power = Power.query.filter_by(id=id).first()
+        role_id_list = []
+        roles = power.role
+        for role in roles:
+            role_id_list.append(role.id)
+        roles = Role.query.filter(Role.id.in_(role_id_list)).all()
+        for p in roles:
+            power.role.remove(p)
+        r = Power.query.filter_by(id=id).delete()
+        db.session.commit()
     return success_api(msg="批量删除成功")

applications/view/admin/role.py

@@ -23,17 +23,21 @@ def main():
 @admin_role.get('/data')
 @authorize("admin:role:main", log=True)
 def table():
+    # 获取请求参数
     role_name = xss_escape(request.args.get('roleName', type=str))
     role_code = xss_escape(request.args.get('roleCode', type=str))
+    # 查询参数构造
     mf = ModelFilter()
     if role_name:
         mf.vague(field_name="name", value=role_name)
     if role_code:
         mf.vague(field_name="code", value=role_code)
+    # orm查询
+    # 使用分页获取data需要.items
     role = Role.query.filter(mf.get_filter(Role)).layui_paginate()
     count = Role.query.count()
-    data = model_to_dicts(Schema=RoleSchema, model=role.items)
-    return table_api(data=data, count=count)
+    # 返回api
+    return table_api(data=model_to_dicts(schema=RoleSchema, data=role.items), count=count)
 
 
 # 角色增加

applications/view/admin/user.py

@@ -27,9 +27,11 @@ def main():
 @admin_user.get('/data')
 @authorize("admin:user:main", log=True)
 def data():
+    # 获取请求参数
     real_name = xss_escape(request.args.get('realName', type=str))
     username = xss_escape(request.args.get('username', type=str))
     dept_id = request.args.get('deptId', type=int)
+    # 查询参数构造
     mf = ModelFilter()
     if real_name:
         mf.vague(field_name="name", value=real_name)
@@ -37,10 +39,12 @@ def data():
         mf.vague(field_name="username", value=username)
     if dept_id:
         mf.exact(field_name="dept_id", value=dept_id)
+    # orm查询
+    # 使用分页获取data需要.items
     user = User.query.filter(mf.get_filter(model=User)).layui_paginate()
     count = User.query.count()
-    data = model_to_dicts(Schema=UserSchema, model=user.items)
-    return table_api(data=data, count=count)
+    # 返回api
+    return table_api(data=model_to_dicts(schema=UserSchema, data=user.items), count=count)
 
 
 # 用户增加