atedPowerWindSpeed/TemperatureLargeComponents修改文件名和向数据库传递参数

dataAnalysisBusiness/algorithm/ratedPowerWindSpeedAnalyst.py

@@ -116,7 +116,7 @@ class RatedPowerWindSpeedAnalyst(AnalystWithGoodBadPoint):
         # fig.write_html(htmlFilePath)
         # 保存Json
         # 将JSON对象保存到文件
-        output_json_path = os.path.join(outputAnalysisDir, "额定满发风速功率分布(10min)(环境温度大于25度).json")
+        output_json_path = os.path.join(outputAnalysisDir, "total_more_25.json")
         with open(output_json_path, 'w', encoding='utf-8') as f:
             import json
             json.dump(json_output, f, ensure_ascii=False, indent=4)
@@ -126,6 +126,7 @@ class RatedPowerWindSpeedAnalyst(AnalystWithGoodBadPoint):
             Field_PowerFarmCode: conf.dataContract.dataFilter.powerFarmID,
             Field_Return_BatchCode: conf.dataContract.dataFilter.dataBatchNum,
             Field_CodeOfTurbine: 'total',
+            Field_MillTypeCode: 'total_less_25',
             Field_Return_FilePath: output_json_path,
             Field_Return_IsSaveDatabase: True
         })
@@ -206,7 +207,7 @@ class RatedPowerWindSpeedAnalyst(AnalystWithGoodBadPoint):
         # fig.write_html(htmlFilePath)
                 # 保存Json
         # 将JSON对象保存到文件
-        output_json_path2 = os.path.join(outputAnalysisDir, "额定满发风速功率分布(10min)(环境温度小于25度).json")
+        output_json_path2 = os.path.join(outputAnalysisDir, "total_less_25.json")
         with open(output_json_path2, 'w', encoding='utf-8') as f:
             import json
             json.dump(json_output2, f, ensure_ascii=False, indent=4)
@@ -216,6 +217,7 @@ class RatedPowerWindSpeedAnalyst(AnalystWithGoodBadPoint):
             Field_PowerFarmCode: conf.dataContract.dataFilter.powerFarmID,
             Field_Return_BatchCode: conf.dataContract.dataFilter.dataBatchNum,
             Field_CodeOfTurbine: 'total',
+            Field_MillTypeCode: 'total_less_25',
             Field_Return_FilePath: output_json_path2,
             Field_Return_IsSaveDatabase: True
         })

dataAnalysisBusiness/algorithm/temperatureLargeComponentsAnalyst.py

@@ -227,7 +227,7 @@ class TemperatureLargeComponentsAnalyst(AnalystWithGoodBadLimitPoint):
             }
 
             # 将JSON对象保存到文件
-            output_json_path = os.path.join(outputPath,f"{turbineModelInfo[Field_MillTypeCode]}.json")
+            output_json_path = os.path.join(outputPath,f"{column}_{turbineModelInfo[Field_MillTypeCode]}.json")
             with open(output_json_path, 'w', encoding='utf-8') as f:
                 import json
                 json.dump(json_output, f, ensure_ascii=False, indent=4)
@@ -256,7 +256,7 @@ class TemperatureLargeComponentsAnalyst(AnalystWithGoodBadLimitPoint):
                 Field_PowerFarmCode: conf.dataContract.dataFilter.powerFarmID,
                 Field_Return_BatchCode: conf.dataContract.dataFilter.dataBatchNum,
                 Field_CodeOfTurbine: 'total',
-                Field_MillTypeCode: turbineModelInfo[Field_MillTypeCode],
+                Field_MillTypeCode: f'{column}_{turbineModelInfo[Field_MillTypeCode]}',
                 Field_Return_FilePath: output_json_path,
                 Field_Return_IsSaveDatabase: True
             })