sql工单执行操作迁移至api

Author: hhyo

sql/sql_workflow.py

@@ -97,154 +97,6 @@ def passed(request):
     return HttpResponseRedirect(reverse("sql:detail", args=(workflow_id,)))
 
 
-def execute(request):
-    """
-    执行SQL
-    :param request:
-    :return:
-    """
-    # 校验多个权限
-    if not (
-        request.user.has_perm("sql.sql_execute")
-        or request.user.has_perm("sql.sql_execute_for_resource_group")
-    ):
-        raise PermissionDenied
-    workflow_id = int(request.POST.get("workflow_id", 0))
-    if workflow_id == 0:
-        context = {"errMsg": "workflow_id参数为空."}
-        return render(request, "error.html", context)
-
-    if can_execute(request.user, workflow_id) is False:
-        context = {"errMsg": "你无权操作当前工单！"}
-        return render(request, "error.html", context)
-
-    if on_correct_time_period(workflow_id) is False:
-        context = {"errMsg": "不在可执行时间范围内，如果需要修改执行时间请重新提交工单!"}
-        return render(request, "error.html", context)
-    # 获取审核信息
-    audit_id = Audit.detail_by_workflow_id(
-        workflow_id=workflow_id, workflow_type=WorkflowDict.workflow_type["sqlreview"]
-    ).audit_id
-    # 根据执行模式进行对应修改
-    mode = request.POST.get("mode")
-    # 交由系统执行
-    if mode == "auto":
-        # 修改工单状态为排队中
-        SqlWorkflow(id=workflow_id, status="workflow_queuing").save(
-            update_fields=["status"]
-        )
-        # 删除定时执行任务
-        schedule_name = f"sqlreview-timing-{workflow_id}"
-        del_schedule(schedule_name)
-        # 加入执行队列
-        async_task(
-            "sql.utils.execute_sql.execute",
-            workflow_id,
-            request.user,
-            hook="sql.utils.execute_sql.execute_callback",
-            timeout=-1,
-            task_name=f"sqlreview-execute-{workflow_id}",
-        )
-        # 增加工单日志
-        Audit.add_log(
-            audit_id=audit_id,
-            operation_type=5,
-            operation_type_desc="执行工单",
-            operation_info="工单执行排队中",
-            operator=request.user.username,
-            operator_display=request.user.display,
-        )
-
-    # 线下手工执行
-    elif mode == "manual":
-        # 将流程状态修改为执行结束
-        SqlWorkflow(
-            id=workflow_id,
-            status="workflow_finish",
-            finish_time=datetime.datetime.now(),
-        ).save(update_fields=["status", "finish_time"])
-        # 增加工单日志
-        Audit.add_log(
-            audit_id=audit_id,
-            operation_type=6,
-            operation_type_desc="手工工单",
-            operation_info="确认手工执行结束",
-            operator=request.user.username,
-            operator_display=request.user.display,
-        )
-        # 开启了Execute阶段通知参数才发送消息通知
-        sys_config = SysConfig()
-        is_notified = (
-            "Execute" in sys_config.get("notify_phase_control").split(",")
-            if sys_config.get("notify_phase_control")
-            else True
-        )
-        if is_notified:
-            notify_for_execute(SqlWorkflow.objects.get(id=workflow_id))
-    return HttpResponseRedirect(reverse("sql:detail", args=(workflow_id,)))
-
-
-def timing_task(request):
-    """
-    定时执行SQL
-    :param request:
-    :return:
-    """
-    # 校验多个权限
-    if not (
-        request.user.has_perm("sql.sql_execute")
-        or request.user.has_perm("sql.sql_execute_for_resource_group")
-    ):
-        raise PermissionDenied
-    workflow_id = request.POST.get("workflow_id")
-    run_date = request.POST.get("run_date")
-    if run_date is None or workflow_id is None:
-        context = {"errMsg": "时间不能为空"}
-        return render(request, "error.html", context)
-    elif run_date < datetime.datetime.now().strftime("%Y-%m-%d %H:%M:%S"):
-        context = {"errMsg": "时间不能小于当前时间"}
-        return render(request, "error.html", context)
-    workflow_detail = SqlWorkflow.objects.get(id=workflow_id)
-
-    if can_timingtask(request.user, workflow_id) is False:
-        context = {"errMsg": "你无权操作当前工单！"}
-        return render(request, "error.html", context)
-
-    run_date = datetime.datetime.strptime(run_date, "%Y-%m-%d %H:%M")
-    schedule_name = f"sqlreview-timing-{workflow_id}"
-
-    if on_correct_time_period(workflow_id, run_date) is False:
-        context = {"errMsg": "不在可执行时间范围内，如果需要修改执    行时间请重新提交工单!"}
-        return render(request, "error.html", context)
-
-    # 使用事务保持数据一致性
-    try:
-        with transaction.atomic():
-            # 将流程状态修改为定时执行
-            workflow_detail.status = "workflow_timingtask"
-            workflow_detail.save()
-            # 调用添加定时任务
-            add_sql_schedule(schedule_name, run_date, workflow_id)
-            # 增加工单日志
-            audit_id = Audit.detail_by_workflow_id(
-                workflow_id=workflow_id,
-                workflow_type=WorkflowDict.workflow_type["sqlreview"],
-            ).audit_id
-            Audit.add_log(
-                audit_id=audit_id,
-                operation_type=4,
-                operation_type_desc="定时执行",
-                operation_info="定时执行时间：{}".format(run_date),
-                operator=request.user.username,
-                operator_display=request.user.display,
-            )
-    except Exception as msg:
-        logger.error(f"定时执行工单报错，错误信息：{traceback.format_exc()}")
-        context = {"errMsg": msg}
-        return render(request, "error.html", context)
-    return HttpResponseRedirect(reverse("sql:detail", args=(workflow_id,)))
-
-
 def cancel(request):
     """
     终止流程

sql/templates/detail.html

@@ -9,10 +9,12 @@ <h4 style="display: inline;">
         </h4>
         <!--只允许发起人提交其他实例-->
         {% if user.username == workflow_detail.engineer %}
-            <a type='button' id="btnSubmitOtherCluster" class='btn btn-warning' href="/submitotherinstance/">上线其他实例</a>
+            <a type='button' id="btnSubmitOtherCluster" class='btn btn-warning'
+               href="/submitotherinstance/">上线其他实例</a>
         {% endif %}
         {% if is_can_review or is_can_execute or is_can_rollback or user.is_superuser %}
-            <a type='button' id="btnViewSql" class='btn btn-default' onclick="loading(this)" href="/editsql/">查看提交信息</a>
+            <a type='button' id="btnViewSql" class='btn btn-default' onclick="loading(this)"
+               href="/editsql/">查看提交信息</a>
         {% endif %}
     </div>
     <input type="hidden" id="sqlMaxRowNumber" value="{{ rows|length }}">
@@ -194,29 +196,18 @@ <h4 style="display: inline;">
     {% endif %}
     <!--立即执行按钮-->
     {% if is_can_execute %}
-        <form id="from-execute" action="/execute/" method="post" style="display:inline-block;">
-            {% csrf_token %}
-            <input type="hidden" name="mode" value="auto">
-            <input type="hidden" name="workflow_id" value="{{ workflow_detail.id }}">
-            <input type="button" id="btnExecuteOnly" class="btn btn-danger"
-                   value="立即执行"/>
-        </form>
+        <input type="button" id="btnExecuteOnly" class="btn btn-danger" value="立即执行"/>
         {% if manual %}
-            <form id="from-execute-manual" action="/execute/" method="post" style="display:inline-block;">
-                {% csrf_token %}
-                <input type="hidden" name="mode" value="manual">
-                <input type="hidden" name="workflow_id" value="{{ workflow_detail.id }}">
-                <input type="button" id="btnExecuteOnly-manual" class="btn btn-warning"
-                       value="已手动完成"/>
-            </form>
+            <input type="button" id="btnExecuteOnly-manual" class="btn btn-warning" value="已手动完成"/>
         {% endif %}
     {% endif %}
     <!--定时执行按钮-->
     {% if is_can_timingtask %}
         {% if workflow_detail.status == 'workflow_review_pass' %}
             <input type="button" class="btn btn-info" data-toggle="modal" data-target="#cronComfirm" value="定时执行"/>
         {% elif workflow_detail.status == 'workflow_timingtask' %}
-            <input type="button" class="btn btn-info" data-toggle="modal" data-target="#cronComfirm" value="执行时间变更"/>
+            <input type="button" class="btn btn-info" data-toggle="modal" data-target="#cronComfirm"
+                   value="执行时间变更"/>
         {% endif %}
     {% endif %}
     <!--终止执行按钮-->
@@ -279,8 +270,6 @@ <h4 class="modal-title text-danger">定时执行SQL</h4>
                     </div>
                     <div class="modal-footer">
                         <button type="button" class="btn btn-info" data-dismiss="modal">取消</button>
-
-                        <input type="hidden" name="workflow_id" value="{{ workflow_detail.id }}">
                         <input type="button" id="btnAddsqlcronjob" class="btn btn-danger" value="确认提交"/>
                     </div>
 
@@ -465,20 +454,22 @@ <h4 class="modal-title text-danger">修改可执行时间</h4>
             } else {
                 var isContinue = confirm("请确认是否立即执行？");
             }
-            var formExecuteOnly = $("#from-execute");
             if (isContinue) {
-                formExecuteOnly.submit();
-                loading(this)
+                sqlWorkflowAction('post', 'execute', JSON.stringify({
+                        "mode": "auto",
+                    }, $(this).attr('id')
+                ))
             }
         });
 
         // 执行确认手工执行
         $("#btnExecuteOnly-manual").click(function () {
             var isContinue = confirm("请确认是否已经手工执行结束？");
-            var formExecuteOnly = $("#from-execute-manual");
             if (isContinue) {
-                formExecuteOnly.submit();
-                loading(this)
+                sqlWorkflowAction('post', 'execute', JSON.stringify({
+                        "mode": "manual",
+                    }, $(this).attr('id')
+                ))
             }
         });
 
@@ -506,33 +497,47 @@ <h4 class="modal-title text-danger">修改可执行时间</h4>
 
         // 定时时间校验
         $("#btnAddsqlcronjob").click(function () {
-            //获取form对象，判断输入，通过则提交
-            var formAddsqlcronjo = $("#from-addsqlcronjob");
-            if ($("#run_date").val()) {
-                loading(this);
-                formAddsqlcronjo.submit();
+            let run_date = $("#run_date").val()
+            if (run_date) {
+                sqlWorkflowAction('post', 'timing_task', JSON.stringify({
+                        "run_date": run_date,
+                    }, $(this).attr('id')
+                ))
             } else {
                 alert('请填写定时执行时间')
             }
         });
 
         // 修改可执行时间
         $("#btnalterExecutabletime").click(function () {
+            sqlWorkflowAction('patch', 'alter_run_date', JSON.stringify({
+                    run_date_start: $("#run_date_start").val(),
+                    run_date_end: $("#run_date_end").val(),
+                }, $(this).attr('id')
+            ))
+        });
+
+        // 按钮禁用
+        function loading(obj) {
+            $(obj).button('loading').delay(2500).queue(function () {
+                $(obj).button('reset');
+                $(obj).dequeue();
+            });
+        }
+
+        // 工单操作
+        function sqlWorkflowAction(http_method ,action, data, btnAttrId) {
             $.ajax({
-                type: "patch",
-                url: "/api/v2/workflow/sql/{{ workflow_detail.id }}/alter_run_date/",
+                type: http_method,
+                url: "/api/v2/workflow/sql/{{ workflow_detail.id }}/" + action + "/",
                 dataType: "json",
                 contentType: 'application/json;',
-                data: JSON.stringify({
-                        run_date_start: $("#run_date_start").val(),
-                        run_date_end: $("#run_date_end").val(),
-                    }
-                ),
+                data: data,
                 beforeSend: function (xhr) {
-                    $('#btnalterExecutabletime').button('loading')
+                    $('#' + btnAttrId).button('loading')
                 },
                 complete: function () {
-                    $('#btnalterExecutabletime').button('reset')
+                    $('#' + btnAttrId).button('reset')
                 },
                 success: function (data) {
                     window.location.reload();
@@ -545,15 +550,8 @@ <h4 class="modal-title text-danger">修改可执行时间</h4>
                     }
                 }
             });
-        });
-
-        // 按钮禁用
-        function loading(obj) {
-            $(obj).button('loading').delay(2500).queue(function () {
-                $(obj).button('reset');
-                $(obj).dequeue();
-            });
         }
+
     </script>
     <!--表格初始化 -->
     <script>

sql/tests.py

@@ -1502,23 +1502,6 @@ def testWorkflowPassedView(self, _can_review, _audit, _detail_by_id):
         self.wf1.refresh_from_db()
         self.assertEqual(self.wf1.status, "workflow_review_pass")
 
-    @patch("sql.sql_workflow.Audit.add_log")
-    @patch("sql.sql_workflow.Audit.detail_by_workflow_id")
-    @patch("sql.sql_workflow.can_execute")
-    def test_workflow_execute(self, mock_can_excute, mock_detail_by_id, mock_add_log):
-        """测试工单执行"""
-        c = Client()
-        c.force_login(self.executor1)
-        r = c.post("/execute/")
-        self.assertContains(r, "workflow_id参数为空.")
-        mock_can_excute.return_value = False
-        r = c.post("/execute/", data={"workflow_id": self.wf2.id})
-        self.assertContains(r, "你无权操作当前工单！")
-        mock_can_excute.return_value = True
-        mock_detail_by_id = 123
-        r = c.post("/execute/", data={"workflow_id": self.wf2.id, "mode": "manual"})
-        self.wf2.refresh_from_db()
-        self.assertEqual("workflow_finish", self.wf2.status)
 
     @patch("sql.sql_workflow.Audit.add_log")
     @patch("sql.sql_workflow.Audit.detail_by_workflow_id")

sql/urls.py

@@ -41,8 +41,6 @@
     path("submitotherinstance/", views.submit_sql),
     path("detail/<int:workflow_id>/", views.detail, name="detail"),
     path("passed/", sql_workflow.passed),
-    path("execute/", sql_workflow.execute),
-    path("timingtask/", sql_workflow.timing_task),
     path("cancel/", sql_workflow.cancel),
     path("rollback/", views.rollback),
     path("sqlanalyze/", views.sqlanalyze),