sql工单列表接口保持v1的数据结构

Author: hhyo

sql/templates/rollback.html

@@ -42,6 +42,8 @@
             cardView: false,                    //是否显示详细视图
             toolbar: "#toolbar",               //指明自定义的toolbar
             detailView: true,                  //是否显示父子表
+            totalField: "count",
+            dataField: "results",
             //格式化详情
             detailFormatter: function (index, row) {
                 var html = [];

sql/templates/sqlworkflow.html

@@ -160,6 +160,8 @@ <h4 class="modal-title text-danger">工单日志</h4>
                 detailView: false,                  //是否显示父子表
                 locale: 'zh-CN',                    //本地化
                 toolbar: "#toolbar",               //指明自定义的toolbar
+                totalField: "count",
+                dataField: "results",
                 queryParamsType: '',
                 //请求服务数据时所传参数
                 queryParams:
@@ -175,7 +177,7 @@ <h4 class="modal-title text-danger">工单日志</h4>
                         }
                         return {
                             page: params.pageNumber,
-                            page_size: params.pageSize,
+                            size: params.pageSize,
                             status: $("#navStatus").val(),
                             instance_id: $("#instance_id").val(),
                             group_id: $("#group_id").val(),

sql/utils/sql_review.py

@@ -63,6 +63,13 @@ def can_execute(user, workflow_id):
     :param workflow_id:
     :return:
     """
+    if not any(
+        [
+            user.has_perm("sql.sql_execute"),
+            user.has_perm("sql.sql_execute_for_resource_group"),
+        ]
+    ):
+        return False
     result = False
     # 保证工单当前是可执行状态
     with transaction.atomic():

sql_api/api_views/sql_workflow.py

@@ -20,7 +20,7 @@
 from sql.models import SqlWorkflow
 from sql.utils.resource_group import user_groups
 from sql_api.filters import SqlWorkflowFilter
-from sql_api.pagination import BootStrapTablePagination
+from sql_api.pagination import CustomizedPaginationV2
 from sql_api.permissions.sql_workflow import SqlWorkFlowViewPermission
 from sql_api.serializers.sql_workflow import (
     ExecuteCheckSerializer,
@@ -93,7 +93,7 @@ def post(self, request):
 class SqlWorkflowView(viewsets.ModelViewSet):
     permission_classes = [IsAuthenticated, SqlWorkFlowViewPermission]
     serializer_class = SqlWorkflowSerializer
-    pagination_class = BootStrapTablePagination
+    pagination_class = CustomizedPaginationV2
     filter_backends = [
         filters.SearchFilter,
         django_filters.rest_framework.DjangoFilterBackend,
@@ -114,7 +114,7 @@ def get_queryset(self):
             pass
         # 非管理员，拥有审核权限、资源组粒度执行权限的，可以查看组内所有工单
         elif user.has_perm("sql.sql_review") or user.has_perm(
-            "sql.sql_execute_for_resource_group"
+                "sql.sql_execute_for_resource_group"
         ):
             filter_dict["group_id__in"] = [
                 group.group_id for group in user_groups(user)
@@ -151,3 +151,9 @@ def rollback_sql(self, request, *args, **kwargs):
     def alter_run_date(self, request, *args, **kwargs):
         kwargs["partial"] = True
         return self.update(request, *args, **kwargs)
+
+    @action(methods=["post"], detail=True)
+    def execute(self, request, *args, **kwargs):
+        obj = self.get_object()
+        data = self.get_serializer().execute(obj)
+        return Response(data)

sql_api/filters.py

@@ -1,4 +1,4 @@
-from django_filters import rest_framework as filters, DateTimeFromToRangeFilter
+from django_filters import rest_framework as filters, DateFromToRangeFilter
 from sql.models import Users, Instance, SqlWorkflowContent, WorkflowAudit, SqlWorkflow
 
 
@@ -47,7 +47,7 @@ class Meta:
 
 
 class SqlWorkflowFilter(filters.FilterSet):
-    create_time = DateTimeFromToRangeFilter()
+    create_time = DateFromToRangeFilter()
 
     class Meta:
         model = SqlWorkflow

sql_api/pagination.py

@@ -31,14 +31,9 @@ def get_paginated_response(self, data):
         )
 
 
-class BootStrapTablePagination(PageNumberPagination):
-    """
-    自定义分页器，返回bootstrap-table需要的格式
-    """
+class CustomizedPaginationV2(PageNumberPagination):
+    """V2的分页器"""
 
     page_size = 14
-
-    def get_paginated_response(self, data):
-        return Response(
-            OrderedDict([("total", self.page.paginator.count), ("rows", data)])
-        )
+    page_size_query_param = "size"
+    max_page_size = None

sql_api/permissions/sql_workflow.py

@@ -9,17 +9,19 @@
 
 from rest_framework import permissions
 
-from sql.utils.sql_review import can_view, can_rollback
+from sql.utils.sql_review import can_view, can_rollback, can_execute, on_correct_time_period
 from sql.utils.workflow_audit import Audit
 
 
 class SqlWorkFlowViewPermission(permissions.BasePermission):
     """SQL工单权限校验"""
 
-    message = "你无权操作当前工单"
+    message = "你没有获取工单列表的权限"
+    obj_message = "工单状态不正确或者你没有该工单的权限"
 
     def has_permission(self, request, view):
-        self.message = "你没有获取工单列表的权限"
+        """列表权限"""
+        self.message = self.message
         return any(
             [
                 request.user.has_perm("sql.menu_sqlworkflow"),
@@ -28,16 +30,28 @@ def has_permission(self, request, view):
         )
 
     def has_retrieve_permission(self, request, view, obj):
-        self.message = "你无权操作当前工单"
+        """详情权限"""
+        self.message = self.obj_message
         return can_view(request.user, obj.id)
 
     def has_rollback_sql_permission(self, request, view, obj):
-        self.message = "工单状态不正确或者你没有该工单的权限"
+        """回滚语句权限"""
+        self.message = self.obj_message
         return can_rollback(request.user, obj.id)
 
     def has_alter_run_date_permission(self, request, view, obj):
-        self.message = "工单状态不正确或者你没有该工单的权限"
+        """修改执行时间范围权限"""
+        self.message = self.obj_message
         return Audit.can_review(request.user, obj.id, 2)
 
+    def has_execute_permission(self, request, view, obj):
+        """执行语句权限"""
+        self.message = self.obj_message
+        if not can_execute(request.user, obj.id):
+            return False
+        if not on_correct_time_period(obj.id):
+            self.message = "不在可执行时间范围内，如果需要修改执行时间请重新提交工单!"
+            return False
+
     def has_object_permission(self, request, view, obj):
         return getattr(self, f"has_{view.action}_permission")(request, view, obj)

sql_api/serializers/sql_workflow.py

@@ -133,6 +133,16 @@ def rollback_sql(obj):
             logger.error(traceback.format_exc())
             raise serializers.ValidationError({"errors": msg})
 
+    @staticmethod
+    def execute(obj):
+        """执行工单"""
+        try:
+            query_engine = get_engine(instance=obj.instance)
+            return query_engine.execute_workflow(workflow=obj)
+        except Exception as msg:
+            logger.error(traceback.format_exc())
+            raise serializers.ValidationError({"errors": msg})
+
     class Meta:
         model = SqlWorkflow
         fields = "__all__"