过滤查询，完善基础功能，解决unicode编码问题，增加磁盘监控对于docker容器的判断

applications/service/admin/power.py

@@ -28,6 +28,7 @@ def get_power_dict():
     return power_dict
 
 
+# 选择父节点
 def select_parent():
     power = Power.query.all()
     power_schema = PowerSchema(many=True)
@@ -36,6 +37,7 @@ def select_parent():
     return power_dict
 
 
+# 增加权限
 def save_power(req):
     icon = req.get("icon")
     openType = req.get("openType")
@@ -44,6 +46,7 @@ def save_power(req):
     powerName = req.get("powerName")
     powerType = req.get("powerType")
     powerUrl = req.get("powerUrl")
+    sort = req.get("sort")
     power = Power(
         icon=icon,
         open_type=openType,
@@ -51,13 +54,36 @@ def save_power(req):
         code=powerCode,
         name=powerName,
         type=powerType,
-        url=powerUrl
+        url=powerUrl,
+        sort=sort
     )
     r = db.session.add(power)
     db.session.commit()
     return r
 
 
+# 根据id查询权限
+def get_power_by_id(id):
+    p = Power.query.filter_by(id=id).first()
+    return p
+
+
+# 更新角色
+def update_power(req_json):
+    id = req_json.get("roleId")
+    data = {
+        "code": req_json.get("roleCode"),
+        "name": req_json.get("roleName"),
+        "sort": req_json.get("sort"),
+        "enable": req_json.get("enable"),
+        "details": req_json.get("details")
+    }
+    print(data)
+    role = Role.query.filter_by(id=id).update(data)
+    db.session.commit()
+    return role
+
+
 # 删除权限（目前没有判断父节点自动删除子节点）
 def remove_power(id):
     power = Power.query.filter_by(id=id).first()

applications/service/admin/role.py

@@ -1,5 +1,6 @@
 from flask_marshmallow import Marshmallow
 from marshmallow import fields
+from sqlalchemy import and_
 
 from applications.models import db
 from applications.models.admin import Role, Power
@@ -33,25 +34,24 @@ class PowerSchema(ma.Schema):  # 序列化类
     enable = fields.Integer()
 
 
-'''
-获取用户的sqlalchemy对象
-分页器
-'''
-
-
-def get_role_data(page, limit):
-    role = Role.query.paginate(page=page, per_page=limit, error_out=False)
+# 获取角色对象
+def get_role_data(page, limit, filters):
+    role = Role.query.filter(and_(*[getattr(Role, k).like(v) for k, v in filters.items()])).paginate(page=page,
+                                                                                                     per_page=limit,
+                                                                                                     error_out=False)
     count = Role.query.count()
     return role, count
 
 
-def get_role_data_dict(page, limit):
-    role, count = get_role_data(page, limit)
+# 获取角色dict
+def get_role_data_dict(page, limit, filters):
+    role, count = get_role_data(page, limit, filters)
     role_schema = RoleSchema(many=True)  # 用已继承ma.ModelSchema类的自定制类生成序列化类
     output = role_schema.dump(role.items)  # 生成可序列化对象
     return output, count
 
 
+# 增加角色
 def add_role(req):
     details = req.get("details")
     enable = req.get("enable")
@@ -69,6 +69,29 @@ def add_role(req):
     db.session.commit()
 
 
+# 通过id获取角色
+def get_role_by_id(id):
+    r = Role.query.filter_by(id=id).first()
+    return r
+
+
+# 更新角色
+def update_role(req_json):
+    id =req_json.get("roleId")
+    data ={
+        "code":req_json.get("roleCode"),
+        "name":req_json.get("roleName"),
+        "sort":req_json.get("sort"),
+        "enable":req_json.get("enable"),
+        "details":req_json.get("details")
+    }
+    print(data)
+    role = Role.query.filter_by(id=id).update(data)
+    db.session.commit()
+    return role
+
+
+# 获取角色的权限
 def get_role_power(id):
     role = Role.query.filter_by(id=id).first()
     check_powers = role.power
@@ -86,6 +109,7 @@ def get_role_power(id):
     return output
 
 
+# 更新角色权限
 def update_role_power(id, power_list):
     role = Role.query.filter_by(id=id).first()
     power_id_list = []

applications/service/admin/user.py

@@ -2,6 +2,7 @@ from flask import jsonify
 from flask_login import current_user
 from flask_marshmallow import Marshmallow
 from marshmallow import fields
+from sqlalchemy import and_
 from sqlalchemy.sql import exists
 
 from applications.models import db
@@ -27,8 +28,8 @@ class UserSchema(ma.Schema):
 '''
 
 
-def get_user_data(page, limit):
-    user = User.query.paginate(page=page, per_page=limit, error_out=False)
+def get_user_data(page, limit,filters):
+    user = User.query.filter(and_(*[getattr(User, k).like(v) for k,v in filters.items()])).paginate(page=page, per_page=limit, error_out=False)
     count = User.query.count()
     return user, count
 
@@ -39,8 +40,8 @@ def get_user_data(page, limit):
 '''
 
 
-def get_user_data_dict(page, limit):
-    user, count = get_user_data(page, limit)
+def get_user_data_dict(page, limit, filters):
+    user, count = get_user_data(page, limit,filters)
     user_schema = UserSchema(many=True)  # 用已继承ma.ModelSchema类的自定制类生成序列化类
     output = user_schema.dump(user.items)  # 生成可序列化对象
     return output, count
@@ -104,10 +105,7 @@ def update_user_role(id, roles_list):
     user = User.query.filter_by(id=id).first()
     roles_id = []
     for role in user.role:
-        print(role)
         roles_id.append(role.id)
-    print('---------------------')
-    print(roles_id)
     roles = Role.query.filter(Role.id.in_(roles_id)).all()
     for r in roles:
         user.role.remove(r)