refactor(重构程序&目录结构)

applications/api/rights/roles.py

@@ -1,28 +1,28 @@
 from flask_restful import Resource, reqparse, marshal
 
-from applications.common.utils.http import table_api, success_api, fail_api
-from applications.extensions import db
-from applications.models import RightsPower, RightsRole, CompanyUser
+from common.utils.http import table_api, success_api, fail_api
+from extensions import db
+from models import RightModels, RoleModels, UserModels
 
 
 def remove_role(role_id):
     """ 删除角色 """
-    role = RightsRole.query.filter_by(id=role_id).first()
+    role = RoleModels.query.filter_by(id=role_id).first()
     # 删除该角色的权限
     power_id_list = []
     for p in role.power:
         power_id_list.append(p.id)
 
-    powers = RightsPower.query.filter(RightsPower.id.in_(power_id_list)).all()
+    powers = RightModels.query.filter(RightModels.id.in_(power_id_list)).all()
     for p in powers:
         role.power.remove(p)
     user_id_list = []
     for u in role.user:
         user_id_list.append(u.id)
-    users = CompanyUser.query.filter(CompanyUser.id.in_(user_id_list)).all()
+    users = UserModels.query.filter(UserModels.id.in_(user_id_list)).all()
     for u in users:
         role.user.remove(u)
-    r = RightsRole.query.filter_by(id=role_id).delete()
+    r = RoleModels.query.filter_by(id=role_id).delete()
     db.session.commit()
     return r
 
@@ -46,11 +46,11 @@ class RoleRolesResource(Resource):
 
         filters = []
         if res.role_name:
-            filters.append(RightsRole.name.like('%' + res.role_name + '%'))
+            filters.append(RoleModels.name.like('%' + res.role_name + '%'))
         if res.role_code:
-            filters.append(RightsRole.code.like('%' + res.role_code + '%'))
+            filters.append(RoleModels.code.like('%' + res.role_code + '%'))
 
-        paginate = RightsRole.query.filter(*filters).paginate(page=res.page, per_page=res.limit, error_out=False)
+        paginate = RoleModels.query.filter(*filters).paginate(page=res.page, per_page=res.limit, error_out=False)
 
         return table_api(result={'items': [{'id': item.id,
                                             'roleName': item.name,
@@ -59,7 +59,7 @@ class RoleRolesResource(Resource):
                                             'comment': item.comment,
                                             'details': item.details,
                                             'sort': item.sort,
-                                            'create_at': str(item.create_at), } for item in paginate.items],
+                                             } for item in paginate.items],
                                  'total': paginate.total}
                          , code=0)
 
@@ -85,7 +85,7 @@ class RoleRoleResource(Resource):
 
         res = parser.parse_args()
 
-        role = RightsRole(
+        role = RoleModels(
             details=res.details,
             enable=res.enable,
             code=res.role_code,
@@ -116,7 +116,7 @@ class RoleRoleResource(Resource):
             "details": res.details
         }
 
-        role = RightsRole.query.filter_by(id=role_id).update(data)
+        role = RoleModels.query.filter_by(id=role_id).update(data)
         db.session.commit()
         if not role:
             return fail_api(message="更新角色失败")
@@ -127,7 +127,7 @@ class RoleEnableResource(Resource):
     """启用用户"""
 
     def put(self, role_id):
-        ret = RightsRole.query.get(role_id)
+        ret = RoleModels.query.get(role_id)
         ret.enable = not ret.enable
         db.session.commit()
 
@@ -141,11 +141,11 @@ class RolePowerResource(Resource):
 
     def get(self, role_id):
         # 获取角色权限
-        role = RightsRole.query.filter_by(id=role_id).first()
+        role = RoleModels.query.filter_by(id=role_id).first()
         # 获取权限列表的 id
         check_powers_list = [rp.id for rp in role.power]
-        powers = RightsPower.query.all()  # 获取所有的权限
-        powers = marshal(powers, RightsPower.fields())
+        powers = RightModels.query.all()  # 获取所有的权限
+        powers = marshal(powers, RightModels.fields())
         for i in powers:
             if int(i.get("powerId")) in check_powers_list:
                 i["checkArr"] = "1"
@@ -166,14 +166,14 @@ class RolePowerResource(Resource):
         power_list = res.power_ids.split(',')
 
         """ 更新角色权限 """
-        role = RightsRole.query.filter_by(id=role_id).first()
+        role = RoleModels.query.filter_by(id=role_id).first()
         power_id_list = []
         for p in role.power:
             power_id_list.append(p.id)
-        powers = RightsPower.query.filter(RightsPower.id.in_(power_id_list)).all()
+        powers = RightModels.query.filter(RightModels.id.in_(power_id_list)).all()
         for p in powers:
             role.power.remove(p)
-        powers = RightsPower.query.filter(RightsPower.id.in_(power_list)).all()
+        powers = RightModels.query.filter(RightModels.id.in_(power_list)).all()
         for p in powers:
             role.power.append(p)
         db.session.commit()