|
|
@@ -290,8 +290,8 @@ class BaseAnalyst(ABC):
|
|
|
return self.filterCommon(dataFrame, conf)
|
|
|
|
|
|
def analysisOfTurbines(self, outputAnalysisDir, conf: Contract, turbineCodes):
|
|
|
- self.logger.info(
|
|
|
- f"typeAnalyst: {self.typeAnalyst()} method: analysisOfTurbines , turbineCodes : {turbineCodes}")
|
|
|
+ # self.logger.info(
|
|
|
+ # f"typeAnalyst: {self.typeAnalyst()} method: analysisOfTurbines , turbineCodes : {turbineCodes}")
|
|
|
return self.turbinesAnalysis(outputAnalysisDir, conf, turbineCodes)
|
|
|
|
|
|
def turbinesAnalysis(self, outputAnalysisDir, conf: Contract, turbineCodes):
|
|
|
@@ -640,22 +640,22 @@ class BaseAnalyst(ABC):
|
|
|
|
|
|
dataFrames.append(dataFrameOfTurbine)
|
|
|
self.logger.info(
|
|
|
- f"data frame append,dataBatchNum: {dataBatchNum} turbineCode: {turbineCode}")
|
|
|
+ f"typeAnalyst: {self.typeAnalyst()} data frame append,dataBatchNum: {dataBatchNum} timeGranularity: {timeGranularity} turbineCode: {turbineCode}")
|
|
|
except Exception as exc:
|
|
|
raise exc
|
|
|
|
|
|
dataFrameOfTurbines = pd.concat(dataFrames, ignore_index=True)
|
|
|
|
|
|
self.logger.info(
|
|
|
- f"data frame concat dataBatchNum: {dataBatchNum} timeGranularity: {timeGranularity} finish")
|
|
|
+ f"typeAnalyst: {self.typeAnalyst()} data frame concat dataBatchNum: {dataBatchNum} timeGranularity: {timeGranularity} finish")
|
|
|
if dataFrameOfTurbines.empty:
|
|
|
excption = CustomError(102)
|
|
|
self.logger.warning(
|
|
|
- f"{excption.message} Power Farm: {conf.dataContract.dataFilter.powerFarmID} Batch : {conf.dataContract.dataFilter.dataBatchNum} Time Granularity : {timeGranularity}")
|
|
|
+ f"{excption.message} typeAnalyst: {self.typeAnalyst()} Power Farm: {conf.dataContract.dataFilter.powerFarmID} Batch : {conf.dataContract.dataFilter.dataBatchNum} Time Granularity : {timeGranularity}")
|
|
|
raise excption
|
|
|
else:
|
|
|
self.logger.info(
|
|
|
- f"data frame concat dataBatchNum: {dataBatchNum} timeGranularity: {timeGranularity} dataFrameOfTurbines : {dataFrameOfTurbines}")
|
|
|
+ f"typeAnalyst: {self.typeAnalyst()} data frame concat dataBatchNum: {dataBatchNum} timeGranularity: {timeGranularity} dataFrameOfTurbines : {dataFrameOfTurbines}")
|
|
|
if Field_DeviceCode in dataFrameOfTurbines.columns and Field_CodeOfTurbine not in dataFrameOfTurbines.columns:
|
|
|
dataFrameOfTurbines = dataFrameOfTurbines.rename(
|
|
|
columns={Field_DeviceCode: Field_CodeOfTurbine})
|
