|
|
@@ -23,12 +23,15 @@ class FaultAnalyst(AnalystNotFilter):
|
|
|
return ["fault"]
|
|
|
|
|
|
def turbinesAnalysis(self, outputAnalysisDir, conf: Contract, turbineCodes):
|
|
|
+ # 1. 抓取数据
|
|
|
dictionary = self.processTurbineData(turbineCodes, conf, self.selectColumns())
|
|
|
- dataFrameMerge = self.userDataFrame(dictionary, conf.dataContract.configAnalysis, self)
|
|
|
|
|
|
- # 增加空数据保护
|
|
|
+ # 2. 直接获取 "fault" key 的数据, 绕过父类的 userDataFrame 方法，因为它会读取错误的配置文件 ('minute')
|
|
|
+ dataFrameMerge = dictionary.get("fault", pd.DataFrame())
|
|
|
+
|
|
|
+ # 3. 增加空数据保护
|
|
|
if dataFrameMerge.empty:
|
|
|
- print("Warning: No fault data found for the selected turbines.")
|
|
|
+ # print("Warning: No fault data found for the selected turbines.")
|
|
|
return pd.DataFrame()
|
|
|
|
|
|
return self.get_result(dataFrameMerge, outputAnalysisDir, conf)
|
Xmia