''wip(semantic):调整序列化返回结果

applications/models/rights/power.py

@@ -1,4 +1,4 @@
-import datetime
+from flask_restful import fields
 
 from applications.extensions import db
 from ..base import BaseModel
@@ -15,9 +15,40 @@ class RightsPower(db.Model, BaseModel):
     parent_id = db.Column(db.Integer, db.ForeignKey("rt_power.id"), comment='父类编号')
     icon = db.Column(db.String(128), comment='图标')
     sort = db.Column(db.Integer, comment='排序')
-    create_time = db.Column(db.DateTime, default=datetime.datetime.now, comment='创建时间')
-
-    update_time = db.Column(db.DateTime, default=datetime.datetime.now, onupdate=datetime.datetime.now, comment='更新时间')
-    enable = db.Column(db.Integer, comment='是否开启')
+    enable = db.Column(db.Boolean, comment='是否开启')
 
     parent = db.relationship("RightsPower", remote_side=[id])  # 自关联
+
+    @staticmethod
+    def fields():
+        return {
+            'powerId': fields.String(attribute="id"),
+            'powerName': fields.String(attribute="name"),
+            'powerType': fields.String(attribute="type"),
+            'powerUrl': fields.String(attribute="url"),
+            'openType': fields.String(attribute="open_type"),
+            'parentId': fields.String(attribute="parent_id"),
+            'icon': fields.String,
+            'sort': fields.Integer,
+            'create_at': fields.DateTime,
+            'update_at': fields.DateTime,
+            'enable': fields.Integer,
+        }
+
+    @staticmethod
+    def fields2():
+        return {
+            'id': fields.Integer,
+            'title': fields.String(attribute="name"),
+            'type': fields.String,
+            'code': fields.String,
+            'href': fields.String(attribute="url"),
+            'openType': fields.String(attribute="open_type"),
+            'parent_id': fields.Integer,
+            'icon': fields.String,
+            'sort': fields.Integer,
+            'enable': fields.Boolean,
+            'update_at': fields.DateTime,
+            'create_at': fields.DateTime,
+
+        }

applications/models/rights/role.py

@@ -1,3 +1,5 @@
+from flask_restful import fields
+
 from applications.extensions import db
 from ..base import BaseModel
 
@@ -7,9 +9,23 @@ class RightsRole(db.Model, BaseModel):
     id = db.Column(db.Integer, primary_key=True, comment='角色ID')
     name = db.Column(db.String(255), comment='角色名称')
     code = db.Column(db.String(255), comment='角色标识')
-    enable = db.Column(db.Integer, comment='是否启用')
-    remark = db.Column(db.String(255), comment='备注')
+    enable = db.Column(db.Boolean, comment='是否启用')
+    comment = db.Column(db.String(255), comment='备注')
     details = db.Column(db.String(255), comment='详情')
     sort = db.Column(db.Integer, comment='排序')
 
     power = db.relationship('RightsPower', secondary="rt_role_power", backref=db.backref('role'))
+
+    @staticmethod
+    def fields():
+        return {
+            'id': fields.Integer,
+            'roleName': fields.String(attribute="name"),
+            'roleCode': fields.String(attribute="code"),
+            'enable': fields.Boolean,
+            'comment': fields.String,
+            'details': fields.String,
+            'sort': fields.Integer,
+            'create_at': fields.DateTime,
+            'update_at': fields.DateTime,
+        }