From 56dcc7eff80a8f12a1ca2e52a4c886bd8a5b793e Mon Sep 17 00:00:00 2001
From: resonate <1650473152@qq.com>
Date: Sun, 23 Jan 2022 14:29:15 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=A1=A8=E5=91=BD=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 entrance/models.py                     | 24 ++++++++++++++++++++----
 modules/sys/models/__init__.py         |  9 ---------
 modules/sys/models/admin_dept.py       |  2 +-
 modules/sys/models/admin_dict.py       |  6 +++---
 modules/sys/models/admin_log.py        |  2 +-
 modules/sys/models/admin_photo.py      |  2 +-
 modules/sys/models/admin_power.py      |  2 +-
 modules/sys/models/admin_role.py       |  2 +-
 modules/sys/models/admin_role_power.py |  2 +-
 modules/sys/models/admin_user.py       |  2 +-
 modules/sys/models/admin_user_role.py  |  2 +-
 modules/sys/models/user.py             | 22 ----------------------
 modules/sys/view/user.py               |  8 ++++----
 13 files changed, 35 insertions(+), 50 deletions(-)
 delete mode 100644 modules/sys/models/__init__.py
 delete mode 100644 modules/sys/models/user.py

diff --git a/entrance/models.py b/entrance/models.py
index dcf7259..ad48e09 100644
--- a/entrance/models.py
+++ b/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 = {
-    user
-}
+model_lists: list = [
+    Dept,
+    DictType, DictData,
+    AdminLog,
+    Photo,
+    Power,
+    Role,
+    role_power,
+    User,
+    user_role
+]
diff --git a/modules/sys/models/__init__.py b/modules/sys/models/__init__.py
deleted file mode 100644
index 2d3fd14..0000000
--- a/modules/sys/models/__init__.py
+++ /dev/null
@@ -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
diff --git a/modules/sys/models/admin_dept.py b/modules/sys/models/admin_dept.py
index 09007cb..413f82e 100644
--- a/modules/sys/models/admin_dept.py
+++ b/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="部门名称")
diff --git a/modules/sys/models/admin_dict.py b/modules/sys/models/admin_dict.py
index 5b38af1..7ed90f6 100644
--- a/modules/sys/models/admin_dict.py
+++ b/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='更新时间')
\ No newline at end of file
+    update_time = Column(DateTime, default=datetime.datetime.now, onupdate=datetime.datetime.now, comment='更新时间')
diff --git a/modules/sys/models/admin_log.py b/modules/sys/models/admin_log.py
index 264a7d2..cd58767 100644
--- a/modules/sys/models/admin_log.py
+++ b/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)
diff --git a/modules/sys/models/admin_photo.py b/modules/sys/models/admin_photo.py
index a8c9ba9..47ae27a 100644
--- a/modules/sys/models/admin_photo.py
+++ b/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))
diff --git a/modules/sys/models/admin_power.py b/modules/sys/models/admin_power.py
index d0c0009..cc55800 100644
--- a/modules/sys/models/admin_power.py
+++ b/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='权限类型')
diff --git a/modules/sys/models/admin_role.py b/modules/sys/models/admin_role.py
index efc4d29..3241ddf 100644
--- a/modules/sys/models/admin_role.py
+++ b/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='角色标识')
diff --git a/modules/sys/models/admin_role_power.py b/modules/sys/models/admin_role_power.py
index 8d49bc7..a2e9419 100644
--- a/modules/sys/models/admin_role_power.py
+++ b/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='角色编号'),
diff --git a/modules/sys/models/admin_user.py b/modules/sys/models/admin_user.py
index 4ad8761..6324db6 100644
--- a/modules/sys/models/admin_user.py
+++ b/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='真实名字')
diff --git a/modules/sys/models/admin_user_role.py b/modules/sys/models/admin_user_role.py
index 90fff9c..d884bb2 100644
--- a/modules/sys/models/admin_user_role.py
+++ b/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='角色编号'),
diff --git a/modules/sys/models/user.py b/modules/sys/models/user.py
deleted file mode 100644
index cbf7239..0000000
--- a/modules/sys/models/user.py
+++ /dev/null
@@ -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
diff --git a/modules/sys/view/user.py b/modules/sys/view/user.py
index 108da19..8075e33 100644
--- a/modules/sys/view/user.py
+++ b/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()
-        print(data)
-        return jsonify(data)
+        pass
+        # data, total = db.session.query(User.id, User.username).layui_paginate_json()
+        # print(data)
+        # return jsonify(data)