用户，角色，权限增加是否启用，修补菜单排序

applications/service/admin/index.py

@@ -30,8 +30,12 @@ def add_auth_session():
     role = current_user.role
     user_power = []
     for i in role:
-        for y in i.power:
-            user_power.append(y.code)
+        if i.enable == 0:
+            continue
+        for p in i.power:
+            if p.enable == 0:
+                continue
+            user_power.append(p.code)
     session['permissions'] = user_power
 
 
@@ -46,19 +50,24 @@ def make_menu_tree():
     role = current_user.role
     power0 = []
     power1 = []
-    print(role)
     for i in role:
-        for y in i.power:
-            if int(y.type) == 0:
-                power0.append(y)
+        if i.enable == 0:
+            continue
+        for p in i.power:
+            if p.enable == 0:
+                continue
+            if int(p.type) == 0:
+                power0.append(p)
             else:
-                power1.append(y)
+                power1.append(p)
 
     power_schema = PowerSchema(many=True)  # 用已继承ma.ModelSchema类的自定制类生成序列化类
     power0_dict = power_schema.dump(power0)  # 生成可序列化对象
     power1_dict = power_schema.dump(power1)  # 生成可序列化对象
-    print(power0)
-    print(power1)
+    power0_dict = sorted(power0_dict, key=lambda i: i['sort'])
+    power1_dict = sorted(power1_dict, key=lambda i: i['sort'])
+    # print(power0)
+    # print(power1)
 
     menu = []
 

applications/service/admin/power.py

@@ -55,7 +55,8 @@ def save_power(req):
         name=powerName,
         type=powerType,
         url=powerUrl,
-        sort=sort
+        sort=sort,
+        enable=1
     )
     r = db.session.add(power)
     db.session.commit()
@@ -68,7 +69,7 @@ def get_power_by_id(id):
     return p
 
 
-# 更新角色
+# 更新权限
 def update_power(req_json):
     id = req_json.get("powerId")
     data = {
@@ -88,6 +89,26 @@ def update_power(req_json):
     return power
 
 
+# 启动权限
+def enable_status(id):
+    enable = 1
+    user = Power.query.filter_by(id=id).update({"enable": enable})
+    if user:
+        db.session.commit()
+        return True
+    return False
+
+
+# 停用权限
+def disable_status(id):
+    enable = 0
+    user = Power.query.filter_by(id=id).update({"enable": enable})
+    if user:
+        db.session.commit()
+        return True
+    return False
+
+
 # 删除权限（目前没有判断父节点自动删除子节点）
 def remove_power(id):
     power = Power.query.filter_by(id=id).first()
@@ -101,3 +122,9 @@ def remove_power(id):
     r = Power.query.filter_by(id=id).delete()
     db.session.commit()
     return r
+
+
+# 批量删除权限
+def batch_remove(ids):
+    for id in ids:
+        remove_power(id)

applications/service/admin/role.py

@@ -127,6 +127,28 @@ def update_role_power(id, power_list):
     db.session.commit()
 
 
+# 启动角色
+def enable_status(id):
+    enable = 1
+    role = Role.query.filter_by(id=id).update({"enable": enable})
+    if role:
+        db.session.commit()
+        return True
+    return False
+
+
+# 停用角色
+def disable_status(id):
+    enable = 0
+    role = Role.query.filter_by(id=id).update({"enable": enable})
+    if role:
+        db.session.commit()
+        return True
+    return False
+
+
+
+
 # 删除角色
 def remove_role(id):
     role = Role.query.filter_by(id=id).first()

applications/service/admin/user.py

@@ -17,7 +17,7 @@ class UserSchema(ma.Schema):
     id = fields.Integer()
     username = fields.Str()
     realname = fields.Str()
-    enable = fields.Bool()
+    enable = fields.Integer()
     create_at = fields.DateTime()
     update_at = fields.DateTime()
 
@@ -102,12 +102,24 @@ def delete_by_id(id):
     return res
 
 
-def update_status(status):
-    user = User.query.filter_by(id=id).update({'status': status})
+# 启动用户
+def enable_status(id):
+    enable = 1
+    user = User.query.filter_by(id=id).update({"enable": enable})
     if user:
         db.session.commit()
-        return jsonify(msg="更新成功", code=200)
-    return jsonify(msg="出错啦", code=999)
+        return True
+    return False
+
+
+# 停用用户
+def disable_status(id):
+    enable = 0
+    user = User.query.filter_by(id=id).update({"enable": enable})
+    if user:
+        db.session.commit()
+        return True
+    return False
 
 
 # 批量删除