From 7c76ac548a5e31809d1ef650ea8efe7ddd67aef8 Mon Sep 17 00:00:00 2001 From: yanta Date: Thu, 18 Jul 2024 11:12:32 +0800 Subject: [PATCH] =?UTF-8?q?black=20=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sql/sql_workflow.py | 5 ++++- sql/utils/sql_review.py | 5 +++-- sql_api/api_workflow.py | 10 ++++++++-- 3 files changed, 15 insertions(+), 5 deletions(-) diff --git a/sql/sql_workflow.py b/sql/sql_workflow.py index 830c8909f5..5848cdc2e6 100644 --- a/sql/sql_workflow.py +++ b/sql/sql_workflow.py @@ -308,7 +308,10 @@ def execute(request): } return render(request, "error.html", context) sys_config = SysConfig() - if not request.user.is_superuser and on_query_low_peak_time_ddl(workflow_id) is False: + if ( + not request.user.is_superuser + and on_query_low_peak_time_ddl(workflow_id) is False + ): start = sys_config.get("query_low_peak_start", 0) end = sys_config.get("query_low_peak_end", 24) context = { diff --git a/sql/utils/sql_review.py b/sql/utils/sql_review.py index b44eb3649a..bbbee0b60c 100644 --- a/sql/utils/sql_review.py +++ b/sql/utils/sql_review.py @@ -40,6 +40,7 @@ def can_execute(user, workflow_id): result = True return result + def on_query_low_peak_time_ddl(workflow_id, run_date=None): """ 判断是否是ddl,ddl必须在业务低峰期执行,包括人工执行和定时执行 @@ -49,8 +50,8 @@ def on_query_low_peak_time_ddl(workflow_id, run_date=None): """ config = SysConfig() workflow_detail = SqlWorkflow.objects.get(id=workflow_id) - start = int(config.get("query_low_peak_start", "")) - end = int(config.get("query_low_peak_end", "")) + start = int(config.get("query_low_peak_start", 0)) + end = int(config.get("query_low_peak_end", 0)) result = True ctime = run_date or datetime.datetime.now() hour = ctime.hour diff --git a/sql_api/api_workflow.py b/sql_api/api_workflow.py index b2533ff2b0..33a455eac8 100644 --- a/sql_api/api_workflow.py +++ b/sql_api/api_workflow.py @@ -341,11 +341,17 @@ def post(self, request): } ) sys_config = SysConfig() - if not request.user.is_superuser and on_query_low_peak_time_ddl(workflow_id) is False: + if ( + not request.user.is_superuser + and on_query_low_peak_time_ddl(workflow_id) is False + ): start = sys_config.get("query_low_peak_start", 0) end = sys_config.get("query_low_peak_end", 24) raise serializers.ValidationError( - {"errMsg": "管理员设置了业务低峰期时间范围:每天%s:00至%s,你只能在业务低峰时间范围执行DDL工单操作!" % (start, end)} + { + "errMsg": "管理员设置了业务低峰期时间范围:每天%s:00至%s,你只能在业务低峰时间范围执行DDL工单操作!" + % (start, end) + } ) # 获取审核信息