修改表命名

entrance/models.py

@@ -1,5 +1,21 @@
-from modules.sys.models import user
+from modules.sys.models.admin_dept import Dept
+from modules.sys.models.admin_dict import DictType, DictData
+from modules.sys.models.admin_log import AdminLog
+from modules.sys.models.admin_photo import Photo
+from modules.sys.models.admin_power import Power
+from modules.sys.models.admin_role import Role
+from modules.sys.models.admin_role_power import role_power
+from modules.sys.models.admin_user import User
+from modules.sys.models.admin_user_role import user_role
 
-model_lists = {
+model_lists: list = [
-    user
+    Dept,
-}
+    DictType, DictData,
+    AdminLog,
+    Photo,
+    Power,
+    Role,
+    role_power,
+    User,
+    user_role
+]

modules/sys/models/__init__.py

@@ -1,9 +0,0 @@
-from .admin_dept import Dept
-from .admin_dict import DictType, DictData
-from .admin_log import AdminLog
-from .admin_photo import Photo
-from .admin_power import Power
-from .admin_role import Role
-from .admin_role_power import role_power
-from .admin_user import User
-from .admin_user_role import user_role

modules/sys/models/admin_dept.py

@@ -4,7 +4,7 @@ from common.model import BaseModel, Column, Integer, String, Text, DateTime
 
 
 class Dept(BaseModel):
-    __tablename__ = 'admin_dept'
+    __tablename__ = 'sys_dept'
     id = Column(Integer, primary_key=True, comment="部门ID")
     parent_id = Column(Integer, comment="父级编号")
     dept_name = Column(String(50), comment="部门名称")

modules/sys/models/admin_dict.py

@@ -4,7 +4,7 @@ from common.model import BaseModel, Column, Integer, String, DateTime
 
 
 class DictType(BaseModel):
-    __tablename__ = 'admin_dict_type'
+    __tablename__ = 'sys_dict_type'
     id = Column(Integer, primary_key=True)
     type_name = Column(String(255), comment='字典类型名称')
     type_code = Column(String(255), comment='字典类型标识')
@@ -15,7 +15,7 @@ class DictType(BaseModel):
 
 
 class DictData(BaseModel):
-    __tablename__ = 'admin_dict_data'
+    __tablename__ = 'sys_dict_data'
     id = Column(Integer, primary_key=True)
     data_label = Column(String(255), comment='字典类型名称')
     data_value = Column(String(255), comment='字典类型标识')
@@ -24,4 +24,4 @@ class DictData(BaseModel):
     enable = Column(Integer, comment='是否开启')
     remark = Column(String(255), comment='备注')
     create_time = Column(DateTime, default=datetime.datetime.now, comment='创建时间')
-    update_time = Column(DateTime, default=datetime.datetime.now, onupdate=datetime.datetime.now, comment='更新时间')
+    update_time = Column(DateTime, default=datetime.datetime.now, onupdate=datetime.datetime.now, comment='更新时间')

modules/sys/models/admin_log.py

@@ -4,7 +4,7 @@ from common.model import BaseModel, Column, Integer, String, Text, DateTime
 
 
 class AdminLog(BaseModel):
-    __tablename__ = 'admin_admin_log'
+    __tablename__ = 'sys_admin_log'
     id = Column(Integer, primary_key=True)
     method = Column(String(10))
     uid = Column(Integer)

modules/sys/models/admin_photo.py

@@ -4,7 +4,7 @@ from common.model import BaseModel, Integer, Column, String, CHAR, DateTime
 
 
 class Photo(BaseModel):
-    __tablename__ = 'admin_photo'
+    __tablename__ = 'sys_photo'
     id = Column(Integer, primary_key=True)
     name = Column(String(255), nullable=False)
     href = Column(String(255))

modules/sys/models/admin_power.py

@@ -4,7 +4,7 @@ from common.model import BaseModel, Column, Integer, String, DateTime
 
 
 class Power(BaseModel):
-    __tablename__ = 'admin_power'
+    __tablename__ = 'sys_power'
     id = Column(Integer, primary_key=True, comment='权限编号')
     name = Column(String(255), comment='权限名称')
     type = Column(String(1), comment='权限类型')

modules/sys/models/admin_role.py

@@ -3,7 +3,7 @@ from common.model import BaseModel, Column, String, Integer, DateTime,relationsh
 
 
 class Role(BaseModel):
-    __tablename__ = 'admin_role'
+    __tablename__ = 'sys_role'
     id = Column(Integer, primary_key=True, comment='角色ID')
     name = Column(String(255), comment='角色名称')
     code = Column(String(255), comment='角色标识')

modules/sys/models/admin_role_power.py

@@ -1,7 +1,7 @@
 from common.model import Column, Table, Integer, ForeignKey
 
 role_power = Table(
-    "admin_role_power",
+    "sys_role_power",
     Column("id", Integer, primary_key=True, autoincrement=True, comment='标识'),
     Column("power_id", Integer, ForeignKey("admin_power.id"), comment='用户编号'),
     Column("role_id", Integer, ForeignKey("admin_role.id"), comment='角色编号'),

modules/sys/models/admin_user.py

@@ -6,7 +6,7 @@ from common.model import BaseModel, Column, Integer, String, DateTime, relations
 
 
 class User(BaseModel, UserMixin):
-    __tablename__ = 'admin_user'
+    __tablename__ = 'sys_user'
     id = Column(Integer, primary_key=True, autoincrement=True, comment='用户ID')
     username = Column(String(20), comment='用户名')
     realname = Column(String(20), comment='真实名字')

modules/sys/models/admin_user_role.py

@@ -1,7 +1,7 @@
 from common.model import Table, Column, Integer, ForeignKey
 
 user_role = Table(
-    "admin_user_role",
+    "sys_user_role",
     Column("id", Integer, primary_key=True, autoincrement=True, comment='标识'),
     Column("user_id", Integer, ForeignKey("admin_user.id"), comment='用户编号'),
     Column("role_id", Integer, ForeignKey("admin_role.id"), comment='角色编号'),

modules/sys/models/user.py

@@ -1,22 +0,0 @@
-from common.BaseModel import BaseBaseModel, Column, String, Integer
-from pydantic import BaseBaseModel as PBaseModel
-
-
-class User(BaseBaseModel):
-    __tablename__ = 'admin_user'
-    id = Column(Integer, primary_key=True, autoincrement=True, comment='用户ID')
-    username = Column(String(20), comment='用户名')
-
-
-class Test(BaseBaseModel):
-    __tablename__ = 'admin_test'
-    id = Column(Integer, primary_key=True, autoincrement=True, comment='ID')
-    name = Column(String(20), comment='名')
-
-
-class Userschema(PBaseModel):
-    id: int
-    username: str
-
-    class Config:
-        orm_mode = True

modules/sys/view/user.py

@@ -6,7 +6,6 @@ from flask import jsonify
 from pydantic import BaseModel, ValidationError, constr, parse_obj_as
 
 from entrance.extend.orm import db
-from modules.sys.models.user import User, Userschema, Test
 
 user = Blueprint('sys', __name__, url_prefix='/user')
 
@@ -14,6 +13,7 @@ user = Blueprint('sys', __name__, url_prefix='/user')
 @user.route('/')
 class UserView(View):
     def get(self):
-        data, total = db.session.query(User.id, User.username).layui_paginate_json()
+        pass
-        print(data)
+        # data, total = db.session.query(User.id, User.username).layui_paginate_json()
-        return jsonify(data)
+        # print(data)
+        # return jsonify(data)