修改部分分析员内部细节

dataAnalysisBusiness/algorithm/generatorSpeedPowerAnalyst.py

@@ -157,7 +157,6 @@ class GeneratorSpeedPowerAnalyst(AnalystWithGoodPoint):
         }]
         }
 
-
         # 保存图片
         outputFilePathPNG = os.path.join(
             outputAnalysisDir, f"{name[0]}.png")
@@ -180,7 +179,6 @@ class GeneratorSpeedPowerAnalyst(AnalystWithGoodPoint):
             Field_Return_FilePath: output_json_path,
             Field_Return_IsSaveDatabase: True
         })
-        result = []
         result.append({
             Field_Return_TypeAnalyst: self.typeAnalyst(),
             Field_PowerFarmCode: conf.dataContract.dataFilter.powerFarmID,
@@ -459,6 +457,7 @@ class GeneratorSpeedPowerAnalyst(AnalystWithGoodPoint):
             Field_PowerFarmCode: conf.dataContract.dataFilter.powerFarmID,
             Field_Return_BatchCode: conf.dataContract.dataFilter.dataBatchNum,
             Field_CodeOfTurbine:Const_Output_Total,
+            Field_MillTypeCode:turbineModelInfo[Field_MillTypeCode],
             Field_Return_FilePath: output_json_path,
             Field_Return_IsSaveDatabase: True
         })

dataAnalysisBusiness/algorithm/generatorSpeedTorqueAnalyst.py

@@ -464,6 +464,7 @@ class GeneratorSpeedTorqueAnalyst(AnalystWithGoodPoint):
             Field_PowerFarmCode: conf.dataContract.dataFilter.powerFarmID,
             Field_Return_BatchCode: conf.dataContract.dataFilter.dataBatchNum,
             Field_CodeOfTurbine:Const_Output_Total,
+            Field_MillTypeCode:turbineModelInfo[Field_MillTypeCode],
             Field_Return_FilePath: output_json_path,
             Field_Return_IsSaveDatabase: True
         })

dataAnalysisBusiness/algorithm/powerCurveAnalyst.py

@@ -47,9 +47,9 @@ class PowerCurveAnalyst(AnalystWithGoodPoint):
             powerCurveDataOfTurbines = self.dataReprocess(
                 currDataFrameOfTurbines, self.binsWindSpeed)
 
-            returnData = self.drawOfPowerCurve(
-                powerCurveDataOfTurbines, outputAnalysisDir, conf, dataFrameOfContractPowerCurve, currTurbineModeInfo)
-            returnDatas.append(returnData)
+            # returnData = self.drawOfPowerCurve(
+            #     powerCurveDataOfTurbines, outputAnalysisDir, conf, dataFrameOfContractPowerCurve, currTurbineModeInfo)
+            # returnDatas.append(returnData)
 
             returnJsonData= self.outputPowerCurveData(conf,outputAnalysisDir,currTurbineModeInfo,powerCurveDataOfTurbines,dataFrameOfContractPowerCurve)
             returnDatas.append(returnJsonData)
@@ -62,7 +62,7 @@ class PowerCurveAnalyst(AnalystWithGoodPoint):
         turbineCodes = powerCurveDataOfTurbines[Field_CodeOfTurbine].unique()
         jsonDictionary = self.convert2Json(turbineModelInfo,turbineCodes=turbineCodes,
                                        dataFrameOfTurbines=powerCurveDataOfTurbines, dataFrameOfContract=dataFrameOfContractPowerCurve)
-        jsonFileName = f"功率曲线数据-{turbineModelInfo[Field_MillTypeCode]}.json"
+        jsonFileName = f"power_curve-{turbineModelInfo[Field_MillTypeCode]}.json"
         jsonFilePath = os.path.join(outputAnalysisDir, jsonFileName)
 
         JsonUtil.write_json(jsonDictionary, file_path=jsonFilePath)
@@ -72,13 +72,14 @@ class PowerCurveAnalyst(AnalystWithGoodPoint):
             Field_PowerFarmCode: conf.dataContract.dataFilter.powerFarmID,
             Field_Return_BatchCode: conf.dataContract.dataFilter.dataBatchNum,
             Field_CodeOfTurbine: Const_Output_Total,
+            Field_MillTypeCode:turbineModelInfo[Field_MillTypeCode],
             Field_Return_FilePath: jsonFilePath,
             Field_Return_IsSaveDatabase: True
         })
 
         for turbineCode in turbineCodes:
             data:pd.DataFrame=powerCurveDataOfTurbines[powerCurveDataOfTurbines[Field_CodeOfTurbine]==turbineCode]
-            jsonFileName2 = f"功率曲线数据-{data[Field_NameOfTurbine].iloc[0]}.json"
+            jsonFileName2 = f"power_curve-{data[Field_NameOfTurbine].iloc[0]}.json"
             jsonFilePath2 = os.path.join(outputAnalysisDir, jsonFileName2)
             JsonUtil.write_json(jsonDictionary, file_path=jsonFilePath2)
             result_rows.append({

dataAnalysisBusiness/algorithm/windDirectionFrequencyAnalyst.py

@@ -285,7 +285,7 @@ class WindDirectionFrequencyAnalyst(AnalystNotFilter):
                 if isinstance(enginName, pd.Series):
                     enginName = enginName.iloc[0]
             jsonDictionary = self.convert2Json(turbineModelInfo, turbineCode, dataFrameMerge)
-            jsonFileName = f"风向玫瑰图_{enginName}.json"
+            jsonFileName = f"wind_direction_frequency{enginName}.json"
             jsonFilePath = os.path.join(outputAnalysisDir, jsonFileName)
             JsonUtil.write_json(jsonDictionary, file_path=jsonFilePath)
             result_rows.append({
@@ -338,9 +338,9 @@ class WindDirectionFrequencyAnalyst(AnalystNotFilter):
                 "engineTypeCode": engineTypeCode,
                 "engineTypeName": engineTypeName,
                 "axes": {
-                    "radial": "频率百分比",
+                    "radial": "频率百分比(%)",
                     "angular": "风向",
-                    "levelname": "风速"
+                    "levelname": "风速(m/s)"
                 },
                 "data": [turbine_info]
             }