wip(semantic):数据模型语义化

applications/view/department.py

@@ -1,7 +1,7 @@
 from flask import render_template, request
 
 from applications.common.utils.rights import authorize
-from applications.models import Dept
+from applications.models import CompanyDepartment
 from applications.view import index_bp
 
 
@@ -21,5 +21,5 @@ def add():
 @authorize("admin:dept:edit", log=True)
 def edit():
     dept_id = request.args.get("deptId", type=int)
-    dept = Dept.query.get(dept_id)
+    dept = CompanyDepartment.query.get(dept_id)
     return render_template('department/edit.html', dept=dept)

applications/view/logs_view.py

@@ -23,7 +23,7 @@ def login_log():
     limit = request.args.get('limit', type=int)
     log_paginate = AdminLog.query.filter_by(
         url='/passport/login').order_by(
-        desc(AdminLog.create_time)).paginate(
+        desc(AdminLog.create_at)).paginate(
         page=page, per_page=limit, error_out=False)
     data = marshal(log_paginate.items, log_fields)
 
@@ -37,7 +37,7 @@ def operate_log():
     limit = request.args.get('limit', type=int)
     log_paginate = AdminLog.query.filter(
         AdminLog.url != '/passport/login').order_by(
-        desc(AdminLog.create_time)).paginate(
+        desc(AdminLog.create_at)).paginate(
         page=page, per_page=limit, error_out=False)
     data = marshal(log_paginate.items, log_fields)
     return table_api(data=data, count=log_paginate.total)

applications/view/rights.py

@@ -1,7 +1,7 @@
 from flask import render_template
 
 from applications.common.utils.rights import authorize
-from applications.models import Power
+from applications.models import RightsPower
 from applications.view import index_bp
 
 
@@ -14,7 +14,7 @@ def rights_index():
 @index_bp.get('/rights/power/<int:power_id>')
 @authorize("admin:power:edit", log=True)
 def get(power_id):
-    power = Power.query.filter_by(id=power_id).first()
+    power = RightsPower.query.filter_by(id=power_id).first()
     icon = str(power.icon).split()
     if len(icon) == 2:
         icon = icon[1]

applications/view/roles.py

@@ -2,7 +2,7 @@ from flask import Blueprint, render_template
 
 from applications.common.utils.rights import authorize
 
-from applications.models import Role
+from applications.models import RightsRole
 
 role_bp = Blueprint('role', __name__, url_prefix='/admin/role')
 
@@ -25,5 +25,5 @@ def power(_id):
 @authorize("admin:role:edit", log=True)
 @role_bp.get('/edit/<int:role_id>')
 def role_editor(role_id):
-    role = Role.query.filter_by(id=role_id).first()
+    role = RightsRole.query.filter_by(id=role_id).first()
     return render_template('roles/edit.html', role=role)

applications/view/users.py

@@ -3,7 +3,7 @@ from flask_login import login_required, current_user
 from sqlalchemy import desc
 
 from applications.common.utils.rights import authorize
-from applications.models import AdminLog, Role, User
+from applications.models import AdminLog, RightsRole, CompanyUser
 
 from . import index_bp
 
@@ -19,7 +19,7 @@ def users_main():
 @login_required
 def users_center():
     user_logs = AdminLog.query.filter_by(url='/passport/login').filter_by(uid=current_user.id).order_by(
-        desc(AdminLog.create_time)).limit(10)
+        desc(AdminLog.create_at)).limit(10)
     return render_template('users/profile.html', user_info=current_user, user_logs=user_logs)
 
 
@@ -27,8 +27,8 @@ def users_center():
 @authorize("admin:user:edit", log=True)
 def users_user_id_view(user_id):
     #  获取编辑用户信息
-    user = User.query.filter_by(id=user_id).first()
-    roles = Role.query.all()
+    user = CompanyUser.query.filter_by(id=user_id).first()
+    roles = RightsRole.query.all()
     checked_roles = []
     for r in user.role:
         checked_roles.append(r.id)