修改震动获取数据方式-转速不在作为一个独立测点

etl/wind_power/wave/WaveTrans.py

@@ -6,7 +6,7 @@ from service.trans_service import get_wave_conf, save_df_to_db, get_or_create_wa
     get_wave_data, delete_exist_wave_data
 from utils.file.trans_methods import *
 from utils.systeminfo.sysinfo import get_available_cpu_count_with_percent
-
+from os.path import *
 
 class WaveTrans(object):
 
@@ -55,8 +55,6 @@ class WaveTrans(object):
         for point in mesure_poins:
             map_dict[wave_conf[point]] = point.replace('conf_', '')
 
-        map_dict['rotational_speed'] = 'rotational_speed'
-
         with multiprocessing.Pool(split_count) as pool:
             file_datas = pool.starmap(self.get_data_exec, [(base_param_exec, i) for i in all_files])
 
@@ -69,14 +67,12 @@ class WaveTrans(object):
 
             if mesure_point_name in map_dict.keys():
                 result_list.append(
-                    [wind_turbine_name, time_stamp, sampling_frequency, 'rotational_speed', [float(rotational_speed)]])
-
-                result_list.append(
-                    [wind_turbine_name, time_stamp, sampling_frequency, mesure_point_name, mesure_data])
+                    [wind_turbine_name, time_stamp, rotational_speed, sampling_frequency, mesure_point_name,
+                     mesure_data])
 
         df = pd.DataFrame(result_list,
-                          columns=['wind_turbine_name', 'time_stamp', 'sampling_frequency', 'mesure_point_name',
-                                   'mesure_data'])
+                          columns=['wind_turbine_name', 'time_stamp', 'rotational_speed', 'sampling_frequency',
+                                   'mesure_point_name', 'mesure_data'])
         df['time_stamp'] = pd.to_datetime(df['time_stamp'], errors='coerce')
         df['mesure_point_name'] = df['mesure_point_name'].map(map_dict)
         df.dropna(subset=['mesure_point_name'], inplace=True)

tmp_file/test_wave.py

@@ -3,9 +3,16 @@ from os import *
 
 sys.path.insert(0, path.abspath(__file__).split("tmp_file")[0])
 
-from etl.wind_power.wave.WaveTrans import WaveTrans
 
 if __name__ == '__main__':
+    env = 'dev'
+    if len(sys.argv) >= 2:
+        env = sys.argv[1]
+
+    conf_path = path.abspath(__file__).split("tmp_file")[0] + f"/conf/etl_config_{env}.yaml"
+    environ['ETL_CONF'] = conf_path
+    environ['env'] = env
+    from etl.wind_power.wave.WaveTrans import WaveTrans
     test = WaveTrans('SKF001', r'/home/wzl/test_data/sdk_data/sdk_data', r'/home/wzl/test_data/sdk_data')
     # test = WaveTrans('SKF001', r'D:\data\sdk_data\sdk_data_less', r'/home/wzl/test_data/sdk_data')