Prechádzať zdrojové kódy

配置最后执行步骤数为999,以便后续添加中间步骤

wzl 6 mesiacov pred
rodič
commit
fc31b78e04

+ 1 - 1
app_run.py

@@ -17,7 +17,7 @@ def get_exec_data(run_count=1):
     return data
 
 
-def run(save_db=True, run_count=1, yaml_config=None, step=0, end=6):
+def run(save_db=True, run_count=1, yaml_config=None, step=0, end=999):
     update_timeout_trans_data()
     data = get_exec_data(run_count)
 

+ 1 - 1
etl/common/BaseDataTrans.py

@@ -14,7 +14,7 @@ from utils.log.trans_log import trans_print, set_trance_id
 
 
 class BaseDataTrans(object):
-    def __init__(self, data: dict = None, save_db=True, yaml_config=None, step=0, end=6):
+    def __init__(self, data: dict = None, save_db=True, yaml_config=None, step=0, end=999):
 
         self.id = data['id']
         self.task_name = data['task_name']

+ 1 - 1
etl/wind_power/fault_warn/FaultWarnTrans.py

@@ -15,7 +15,7 @@ from utils.log.trans_log import trans_print
 
 class FaultWarnTrans(BaseDataTrans):
 
-    def __init__(self, data: dict = None, save_db=True, yaml_config=None, step=0, end=6):
+    def __init__(self, data: dict = None, save_db=True, yaml_config=None, step=0, end=999):
         super(FaultWarnTrans, self).__init__(data, save_db, yaml_config, step, end)
         self.engine_count = 0
         self.min_date = None

+ 1 - 1
etl/wind_power/min_sec/MinSecTrans.py

@@ -17,7 +17,7 @@ from utils.log.trans_log import trans_print
 
 class MinSecTrans(BaseDataTrans):
 
-    def __init__(self, data: dict = None, save_db=True, yaml_config=None, step=0, end=6):
+    def __init__(self, data: dict = None, save_db=True, yaml_config=None, step=0, end=999):
         super(MinSecTrans, self).__init__(data, save_db, yaml_config, step, end)
         self.statistics_map = multiprocessing.Manager().dict()
         self.trans_param = self.get_trans_param()

+ 0 - 18
service/trans_conf_service.py

@@ -106,24 +106,6 @@ def get_batch_exec_data() -> dict:
     return data[0]
 
 
-def get_data_by_id(id):
-    query_exec_sql = f"""
-    SELECT
-        t.*,a.field_name,b.batch_name
-    FROM
-        data_transfer t INNER JOIN wind_field a on t.field_code = a.field_code
-        inner join wind_field_batch b on t.id = b.id
-    WHERE
-         t.trans_sys_status in (-1,1,2) and t.transfer_status = 2 and t.id = '{id}'
-    AND t.read_dir != ''
-    """
-
-    data = trans.execute(query_exec_sql)
-    if type(data) == tuple:
-        return None
-    return data[0]
-
-
 def create_wave_table(table_name, save_db=True):
     if save_db:
         exec_sql = f"""