功能变化: 重构初始化功能

backend/dvadmin/system/views/api_white_list.py

@@ -22,19 +22,7 @@ class ApiWhiteListSerializer(CustomModelSerializer):
         read_only_fields = ["id"]
 
 
-class ApiWhiteListInitSerializer(CustomModelSerializer):
-    """
-    初始化获取数信息(用于生成初始化json文件)
-    """
 
-    class Meta:
-        model = ApiWhiteList
-        fields = ['url', 'method', 'enable_datasource', 'creator', 'dept_belong_id']
-        read_only_fields = ["id"]
-        extra_kwargs = {
-            'creator': {'write_only': True},
-            'dept_belong_id': {'write_only': True}
-        }
 
 
 class ApiWhiteListViewSet(CustomModelViewSet):

backend/dvadmin/system/views/dept.py

@@ -55,49 +55,7 @@ class DeptImportSerializer(CustomModelSerializer):
         read_only_fields = ["id"]
 
 
-class DeptInitSerializer(CustomModelSerializer):
-    """
-    递归深度获取数信息(用于生成初始化json文件)
-    """
-    children = serializers.SerializerMethodField()
 
-    def get_children(self, obj: Dept):
-        data = []
-        instance = Dept.objects.filter(parent_id=obj.id)
-        if instance:
-            serializer = DeptInitSerializer(instance=instance, many=True)
-            data = serializer.data
-        return data
-
-    def save(self, **kwargs):
-        instance = super().save(**kwargs)
-        children = self.initial_data.get('children')
-        if children:
-            for menu_data in children:
-                menu_data['parent'] = instance.id
-                filter_data = {
-                    "name": menu_data['name'],
-                    "parent": menu_data['parent'],
-                    "key": menu_data['key']
-                }
-                instance_obj = Dept.objects.filter(**filter_data).first()
-                if instance_obj and not self.initial_data.get('reset'):
-                    continue
-                serializer = DeptInitSerializer(instance_obj, data=menu_data, request=self.request)
-                serializer.is_valid(raise_exception=True)
-                serializer.save()
-
-        return instance
-
-    class Meta:
-        model = Dept
-        fields = ['name', 'sort', 'owner', 'phone', 'email', 'status', 'parent', 'creator', 'dept_belong_id',
-                  'children', 'key']
-        extra_kwargs = {
-            'creator': {'write_only': True},
-            'dept_belong_id': {'write_only': True}
-        }
-        read_only_fields = ['id', 'children']
 
 
 class DeptCreateUpdateSerializer(CustomModelSerializer):

backend/dvadmin/system/views/dictionary.py

@@ -27,48 +27,7 @@ class DictionarySerializer(CustomModelSerializer):
         read_only_fields = ["id"]
 
 
-class DictionaryInitSerializer(CustomModelSerializer):
-    """
-    初始化获取数信息(用于生成初始化json文件)
-    """
-    children = serializers.SerializerMethodField()
 
-    def get_children(self, obj: Dictionary):
-        data = []
-        instance = Dictionary.objects.filter(parent_id=obj.id)
-        if instance:
-            serializer = DictionaryInitSerializer(instance=instance, many=True)
-            data = serializer.data
-        return data
-
-    def save(self, **kwargs):
-        instance = super().save(**kwargs)
-        children = self.initial_data.get('children')
-        # 菜单表
-        if children:
-            for data in children:
-                data['parent'] = instance.id
-                filter_data = {
-                    "value": data['value'],
-                    "parent": data['parent']
-                }
-                instance_obj = Dictionary.objects.filter(**filter_data).first()
-                if instance_obj and not self.initial_data.get('reset'):
-                    continue
-                serializer = DictionaryInitSerializer(instance_obj, data=data, request=self.request)
-                serializer.is_valid(raise_exception=True)
-                serializer.save()
-        return instance
-
-    class Meta:
-        model = Dictionary
-        fields = ['label', 'value', 'parent', 'type', 'color', 'is_value', 'status', 'sort', 'remark', 'creator',
-                  'dept_belong_id', 'children']
-        read_only_fields = ["id"]
-        extra_kwargs = {
-            'creator': {'write_only': True},
-            'dept_belong_id': {'write_only': True}
-        }
 
 
 class DictionaryCreateUpdateSerializer(CustomModelSerializer):

backend/dvadmin/system/views/login.py

@@ -109,7 +109,7 @@ class LoginView(TokenObtainPairView):
         except:
             return DetailResponse(msg='该账号未注册')
         # 获得用户后，校验密码并签发token
-        if check_password(password,user.password):
+        if check_password(make_password(password),user.password):
             return DetailResponse(msg='密码错误')
         result = {
            "name":user.name,

backend/dvadmin/system/views/menu.py

@@ -10,7 +10,6 @@ from rest_framework import serializers
 from rest_framework.decorators import action
 
 from dvadmin.system.models import Menu, MenuButton, RoleMenuPermission
-from dvadmin.system.views.menu_button import MenuButtonInitSerializer
 from dvadmin.utils.json_response import SuccessResponse
 from dvadmin.utils.serializers import CustomModelSerializer
 from dvadmin.utils.viewset import CustomModelViewSet
@@ -54,72 +53,7 @@ class MenuCreateSerializer(CustomModelSerializer):
         read_only_fields = ["id"]
 
 
-class MenuInitSerializer(CustomModelSerializer):
-    """
-    递归深度获取数信息(用于生成初始化json文件)
-    """
-    name = serializers.CharField(required=False)
-    children = serializers.SerializerMethodField()
-    menu_button = serializers.SerializerMethodField()
 
-    def get_children(self, obj: Menu):
-        data = []
-        instance = Menu.objects.filter(parent_id=obj.id)
-        if instance:
-            serializer = MenuInitSerializer(instance=instance, many=True)
-            data = serializer.data
-        return data
-
-    def get_menu_button(self, obj: Menu):
-        data = []
-        instance = obj.menuPermission.order_by('method')
-        if instance:
-            data = list(instance.values('name', 'value', 'api', 'method'))
-        return data
-
-    def save(self, **kwargs):
-        instance = super().save(**kwargs)
-        children = self.initial_data.get('children')
-        menu_button = self.initial_data.get('menu_button')
-        # 菜单表
-        if children:
-            for menu_data in children:
-                menu_data['parent'] = instance.id
-                filter_data = {
-                    "name": menu_data['name'],
-                    "web_path": menu_data['web_path'],
-                    "component": menu_data['component'],
-                    "component_name": menu_data['component_name'],
-                }
-                instance_obj = Menu.objects.filter(**filter_data).first()
-                if instance_obj and not self.initial_data.get('reset'):
-                    continue
-                serializer = MenuInitSerializer(instance_obj, data=menu_data, request=self.request)
-                serializer.is_valid(raise_exception=True)
-                serializer.save()
-        # 菜单按钮
-        if menu_button:
-            for menu_button_data in menu_button:
-                menu_button_data['menu'] = instance.id
-                filter_data = {
-                    "menu": menu_button_data['menu'],
-                    "value": menu_button_data['value']
-                }
-                instance_obj = MenuButton.objects.filter(**filter_data).first()
-                serializer = MenuButtonInitSerializer(instance_obj, data=menu_button_data, request=self.request)
-                serializer.is_valid(raise_exception=True)
-                serializer.save()
-        return instance
-
-    class Meta:
-        model = Menu
-        fields = ['name', 'icon', 'sort', 'is_link', 'is_catalog', 'web_path', 'component', 'component_name', 'status',
-                  'cache', 'visible', 'parent', 'children', 'menu_button', 'creator', 'dept_belong_id']
-        extra_kwargs = {
-            'creator': {'write_only': True},
-            'dept_belong_id': {'write_only': True}
-        }
-        read_only_fields = ['id', 'children']
 
 
 class WebRouterSerializer(CustomModelSerializer):

backend/dvadmin/system/views/menu_button.py

@@ -27,15 +27,7 @@ class MenuButtonSerializer(CustomModelSerializer):
         read_only_fields = ["id"]
 
 
-class MenuButtonInitSerializer(CustomModelSerializer):
-    """
-    初始化菜单按钮-序列化器
-    """
 
-    class Meta:
-        model = MenuButton
-        fields = ['id', 'name', 'value', 'api', 'method', 'menu']
-        read_only_fields = ["id"]
 
 class MenuButtonCreateUpdateSerializer(CustomModelSerializer):
     """

backend/dvadmin/system/views/role.py

@@ -31,20 +31,7 @@ class RoleSerializer(CustomModelSerializer):
         read_only_fields = ["id"]
 
 
-class RoleInitSerializer(CustomModelSerializer):
-    """
-    初始化获取数信息(用于生成初始化json文件)
-    """
 
-    class Meta:
-        model = Role
-        fields = ['name', 'key', 'sort', 'status', 'admin',
-                  'creator', 'dept_belong_id']
-        read_only_fields = ["id"]
-        extra_kwargs = {
-            'creator': {'write_only': True},
-            'dept_belong_id': {'write_only': True}
-        }
 
 
 class RoleCreateUpdateSerializer(CustomModelSerializer):

backend/dvadmin/system/views/system_config.py

@@ -43,48 +43,6 @@ class SystemConfigCreateSerializer(CustomModelSerializer):
         return value
 
 
-class SystemConfigInitSerializer(CustomModelSerializer):
-    """
-    初始化获取数信息(用于生成初始化json文件)
-    """
-    children = serializers.SerializerMethodField()
-
-    def get_children(self, obj: SystemConfig):
-        data = []
-        instance = SystemConfig.objects.filter(parent_id=obj.id)
-        if instance:
-            serializer = SystemConfigInitSerializer(instance=instance, many=True)
-            data = serializer.data
-        return data
-
-    def save(self, **kwargs):
-        instance = super().save(**kwargs)
-        children = self.initial_data.get('children')
-        # 菜单表
-        if children:
-            for data in children:
-                data['parent'] = instance.id
-                filter_data = {
-                    "key": data['key'],
-                    "parent": data['parent']
-                }
-                instance_obj = SystemConfig.objects.filter(**filter_data).first()
-                if instance_obj and not self.initial_data.get('reset'):
-                    continue
-                serializer = SystemConfigInitSerializer(instance_obj, data=data, request=self.request)
-                serializer.is_valid(raise_exception=True)
-                serializer.save()
-        return instance
-
-    class Meta:
-        model = SystemConfig
-        fields = ['parent', 'title', 'key', 'value', 'sort', 'status', 'data_options', 'form_item_type', 'rule',
-                  'placeholder', 'setting', 'creator', 'dept_belong_id', 'children']
-        read_only_fields = ["id"]
-        extra_kwargs = {
-            'creator': {'write_only': True},
-            'dept_belong_id': {'write_only': True}
-        }
 
 
 class SystemConfigSerializer(CustomModelSerializer):

backend/dvadmin/system/views/user.py

@@ -60,32 +60,7 @@ class UserSerializer(CustomModelSerializer):
         return serializer.data
 
 
-class UsersInitSerializer(CustomModelSerializer):
-    """
-    初始化获取数信息(用于生成初始化json文件)
-    """
 
-    def save(self, **kwargs):
-        instance = super().save(**kwargs)
-        role_key = self.initial_data.get('role_key', [])
-        role_ids = Role.objects.filter(key__in=role_key).values_list('id', flat=True)
-        instance.role.set(role_ids)
-        dept_key = self.initial_data.get('dept_key', None)
-        dept_id = Dept.objects.filter(key=dept_key).first()
-        instance.dept = dept_id
-        instance.save()
-        return instance
-
-    class Meta:
-        model = Users
-        fields = ["username", "email", 'mobile', 'avatar', "name", 'gender', 'user_type', "dept", 'user_type',
-                  'first_name', 'last_name', 'email', 'is_staff', 'is_active', 'creator', 'dept_belong_id',
-                  'password', 'last_login', 'is_superuser']
-        read_only_fields = ['id']
-        extra_kwargs = {
-            'creator': {'write_only': True},
-            'dept_belong_id': {'write_only': True}
-        }
 
 
 class UserCreateSerializer(CustomModelSerializer):