chore(优化): 优化代码结构

backend/dvadmin/system/fixtures/initSerializer.py

@@ -6,8 +6,11 @@ from rest_framework import serializers
 os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'application.settings')
 import django
 django.setup()
-from dvadmin.system.models import Role, Dept, Users, Menu, MenuButton, ApiWhiteList, Dictionary, SystemConfig, \
+from dvadmin.system.models import (
+    Role, Dept, Users, Menu, MenuButton,
+    ApiWhiteList, Dictionary, SystemConfig,
     RoleMenuPermission, RoleMenuButtonPermission
+)
 from dvadmin.utils.serializers import CustomModelSerializer
 
 
@@ -50,7 +53,6 @@ class MenuButtonInitSerializer(CustomModelSerializer):
         read_only_fields = ["id"]
 
 
-
 class MenuInitSerializer(CustomModelSerializer):
     """
     递归深度获取数信息(用于生成初始化json文件)
@@ -139,8 +141,8 @@ class RoleMenuInitSerializer(CustomModelSerializer):
     """
     初始化角色菜单(用于生成初始化json文件)
     """
-    role_key = serializers.CharField(max_length=100,required=True)
-    menu_component_name = serializers.CharField(max_length=100,required=True)
+    role_key = serializers.CharField(max_length=100, required=True)
+    menu_component_name = serializers.CharField(max_length=100, required=True)
 
     def create(self, validated_data):
         init_data = self.initial_data
@@ -154,7 +156,7 @@ class RoleMenuInitSerializer(CustomModelSerializer):
 
     class Meta:
         model = RoleMenuPermission
-        fields = ['role_key','menu_component_name','creator', 'dept_belong_id']
+        fields = ['role_key', 'menu_component_name', 'creator', 'dept_belong_id']
         read_only_fields = ["id"]
         extra_kwargs = {
             'role': {'required': False},
@@ -168,8 +170,8 @@ class RoleMenuButtonInitSerializer(CustomModelSerializer):
     """
     初始化角色菜单按钮(用于生成初始化json文件)
     """
-    role_key = serializers.CharField(max_length=100,required=True)
-    menu_button_value = serializers.CharField(max_length=100,required=True)
+    role_key = serializers.CharField(max_length=100, required=True)
+    menu_button_value = serializers.CharField(max_length=100, required=True)
     data_range = serializers.CharField(max_length=100, required=False)
 
     def create(self, validated_data):
@@ -186,7 +188,7 @@ class RoleMenuButtonInitSerializer(CustomModelSerializer):
 
     class Meta:
         model = RoleMenuButtonPermission
-        fields = ['role_key','menu_button_value','data_range','dept','creator', 'dept_belong_id']
+        fields = ['role_key', 'menu_button_value','data_range','dept','creator', 'dept_belong_id']
         read_only_fields = ["id"]
         extra_kwargs = {
             'role': {'required': False},
@@ -196,7 +198,6 @@ class RoleMenuButtonInitSerializer(CustomModelSerializer):
         }
 
 
-
 class ApiWhiteListInitSerializer(CustomModelSerializer):
     """
     初始化获取数信息(用于生成初始化json文件)

backend/dvadmin/system/fixtures/initialize.py

@@ -8,9 +8,11 @@ os.environ.setdefault("DJANGO_SETTINGS_MODULE", "application.settings")
 django.setup()
 
 from dvadmin.utils.core_initialize import CoreInitialize
-from dvadmin.system.fixtures.initSerializer import UsersInitSerializer, DeptInitSerializer, RoleInitSerializer, \
-    MenuInitSerializer, ApiWhiteListInitSerializer, DictionaryInitSerializer, SystemConfigInitSerializer, \
-    RoleMenuInitSerializer, RoleMenuButtonInitSerializer
+from dvadmin.system.fixtures.initSerializer import (
+    UsersInitSerializer, DeptInitSerializer, RoleInitSerializer,
+    MenuInitSerializer, ApiWhiteListInitSerializer, DictionaryInitSerializer,
+    SystemConfigInitSerializer, RoleMenuInitSerializer, RoleMenuButtonInitSerializer
+)
 
 
 class Initialize(CoreInitialize):
@@ -51,7 +53,6 @@ class Initialize(CoreInitialize):
         """
         self.init_base(RoleMenuButtonInitSerializer, unique_fields=['role', 'menu_button'])
 
-
     def init_api_white_list(self):
         """
         初始API白名单

backend/dvadmin/system/urls.py

@@ -29,13 +29,11 @@ system_url.register(r'area', AreaViewSet)
 system_url.register(r'file', FileViewSet)
 system_url.register(r'api_white_list', ApiWhiteListViewSet)
 system_url.register(r'system_config', SystemConfigViewSet)
-system_url.register(r'message_center',MessageCenterViewSet)
+system_url.register(r'message_center', MessageCenterViewSet)
 system_url.register(r'role_menu_button_permission', RoleMenuButtonPermissionViewSet)
 system_url.register(r'role_menu_permission', RoleMenuPermissionViewSet)
 
 
-
-
 urlpatterns = [
     path('user/export/', UserViewSet.as_view({'post': 'export_data', })),
     path('user/import/', UserViewSet.as_view({'get': 'import_data', 'post': 'import_data'})),

backend/dvadmin/utils/models.py

@@ -6,8 +6,6 @@
 @Created on: 2021/5/31 031 22:08
 @Remark: 公共基础model类
 """
-import uuid
-
 from django.apps import apps
 from django.db import models
 from django.db.models import QuerySet
@@ -20,8 +18,6 @@ class SoftDeleteQuerySet(QuerySet):
     pass
 
 
-
-
 class SoftDeleteManager(models.Manager):
     """支持软删除"""
 
@@ -40,7 +36,7 @@ class SoftDeleteManager(models.Manager):
             return SoftDeleteQuerySet(self.model, using=self._db).exclude(is_deleted=False)
         return SoftDeleteQuerySet(self.model).exclude(is_deleted=True)
 
-    def get_by_natural_key(self,name):
+    def get_by_natural_key(self, name):
         return SoftDeleteQuerySet(self.model).get(username=name)
 
 
@@ -86,8 +82,6 @@ class CoreModel(models.Model):
         verbose_name_plural = verbose_name
 
 
-
-
 def get_all_models_objects(model_name=None):
     """
     获取所有 models 对象