问题优化

zhaoqingang

2024-12-13 f2c43713b16e821f4a1ae97804c60f18734d5f6a

 app/models/role_model.py

@@ -27,6 +27,7 @@
    dataScope = Column(Integer)
    status = Column(String(10), default="0")
    creator = Column(Integer)
    role_type = Column(Integer, default=1)

    # 包含资源
    resources = relationship('ResourceModel',
@@ -66,18 +67,38 @@
        return json


    def to_dict(self):
        json = {
            'roleId': self.id,
            'createTime': self.created_at.strftime('%Y-%m-%d %H:%M:%S'),
            'updateTime': self.updated_at.strftime('%Y-%m-%d %H:%M:%S'),
            'roleName': self.name,
            'remark': self.description,
            'iconCls': self.iconCls,
            'roleSort': self.seq,
            'status': self.status,
            'roleKey': self.roleKey,
            'dataScope': self.dataScope
        }
        return json

class RoleData(BaseModel):
    remark: Optional[str] = ""
    roleName: str
    roleKey: Optional[str] = ""
    dataScope: Optional[int] = 0


class RoleStatus(BaseModel):
    role_id: str
    roleId: str
    status: constr(min_length=1, max_length=1, pattern='^(0|1)$')


class RoleEdit(BaseModel):
    role_id: str
    roleId: str
    remark: Optional[str] = ""
    roleName: Optional[str] = ""
    resources: Optional[list] = []
    roleKey: Optional[str] = ""
    dataScope: Optional[int] = 0
    editType: int