变桨-功率 分析 机型驱动方式修改

dataAnalysisBusiness/algorithm/pitchGeneratorSpeedAnalyst.py

@@ -107,9 +107,6 @@ class PitchGeneratorSpeedAnalyst(AnalystWithGoodBadPoint):
             if isinstance(engineTypeCode, pd.Series):
                 engineTypeCode = engineTypeCode.iloc[0]
 
-            engineMillInfo=self.common.getTurbineModelByCode(engineTypeCode,self.turbineModelInfo)
-            curvedMotionType= engineMillInfo[Field_MotionType]
-
             engineTypeName = turbineModelInfo.get(Field_MachineTypeCode, "")
             if isinstance(engineTypeName, pd.Series):
                 engineTypeName = engineTypeName.iloc[0]
@@ -122,7 +119,6 @@ class PitchGeneratorSpeedAnalyst(AnalystWithGoodBadPoint):
                 "analysisTypeCode": "变桨和发电机转速协调性分析",
                 "engineCode": engineTypeCode,
                 "engineTypeName": engineTypeName,
-                "curvedMotionType":curvedMotionType,
                 "xaixs": "发电机转速(r/min)",
                 "yaixs": "桨距角(°)",
                 "data": [{

dataAnalysisBusiness/algorithm/pitchPowerAnalyst.py

@@ -134,6 +134,9 @@ class PitchPowerAnalyst(AnalystWithGoodBadPoint):
             if isinstance(engineTypeCode, pd.Series):
                 engineTypeCode = engineTypeCode.iloc[0]
 
+            engineMillInfo=self.common.getTurbineModelByCode(engineTypeCode,self.turbineModelInfo)
+            curvedMotionType= engineMillInfo[Field_MotionType]
+
             engineTypeName = turbineModelInfo.get(Field_MachineTypeCode, "")
             if isinstance(engineTypeName, pd.Series):
                 engineTypeName = engineTypeName.iloc[0]
@@ -142,6 +145,7 @@ class PitchPowerAnalyst(AnalystWithGoodBadPoint):
                 "analysisTypeCode": "变桨和有功功率协调性分析",
                 "engineCode": engineTypeCode,
                 "engineTypeName": engineTypeName,
+                "curvedMotionType":curvedMotionType,
                 "xaixs": "功率(kW)",
                 "yaixs": "桨距角(°)",
                 "data": [{