Преглед на файлове

python不支持方法重载,注释风向玫瑰中的同名方法outputJsonData

zhouyang.xie преди 1 месец
родител
ревизия
5b11470d80
променени са 1 файла, в които са добавени 20 реда и са изтрити 20 реда
  1. 20 20
      dataAnalysisBusiness/algorithm/windDirectionFrequencyAnalyst.py

+ 20 - 20
dataAnalysisBusiness/algorithm/windDirectionFrequencyAnalyst.py

@@ -253,26 +253,26 @@ class WindDirectionFrequencyAnalyst(AnalystNotFilter):
         # 返回结果数据框
         return result_df
 
-    def outputJsonData(self, conf: Contract, outputAnalysisDir: str, turbineModelInfo: pd.Series, dataFrameMerge: pd.DataFrame) -> pd.DataFrame:
-        turbineCodes = dataFrameMerge[Field_CodeOfTurbine].unique()
-
-        result_rows = []
-        for turbineCode in turbineCodes:
-            jsonDictionary = self.convert2Json(turbineModelInfo, turbineCodes=turbineCode, dataFrameOfTurbines=dataFrameMerge)
-            jsonFileName = f"风向玫瑰图{turbineCode}.json"
-            jsonFilePath = os.path.join(outputAnalysisDir, jsonFileName)
-            JsonUtil.write_json(jsonDictionary, file_path=jsonFilePath)
-            result_rows.append({
-                Field_Return_TypeAnalyst: self.typeAnalyst(),
-                Field_PowerFarmCode: conf.dataContract.dataFilter.powerFarmID,
-                Field_Return_BatchCode: conf.dataContract.dataFilter.dataBatchNum,
-                Field_CodeOfTurbine: turbineCode,
-                Field_Return_FilePath: jsonFilePath,
-                Field_Return_IsSaveDatabase: True
-            })
-
-        returnDatas = pd.DataFrame(result_rows)
-        return returnDatas
+    # def outputJsonData(self, conf: Contract, outputAnalysisDir: str, turbineModelInfo: pd.Series, dataFrameMerge: pd.DataFrame) -> pd.DataFrame:
+    #     turbineCodes = dataFrameMerge[Field_CodeOfTurbine].unique()
+
+    #     result_rows = []
+    #     for turbineCode in turbineCodes:
+    #         jsonDictionary = self.convert2Json(turbineModelInfo, turbineCodes=turbineCode, dataFrameOfTurbines=dataFrameMerge)
+    #         jsonFileName = f"风向玫瑰图{turbineCode}.json"
+    #         jsonFilePath = os.path.join(outputAnalysisDir, jsonFileName)
+    #         JsonUtil.write_json(jsonDictionary, file_path=jsonFilePath)
+    #         result_rows.append({
+    #             Field_Return_TypeAnalyst: self.typeAnalyst(),
+    #             Field_PowerFarmCode: conf.dataContract.dataFilter.powerFarmID,
+    #             Field_Return_BatchCode: conf.dataContract.dataFilter.dataBatchNum,
+    #             Field_CodeOfTurbine: turbineCode,
+    #             Field_Return_FilePath: jsonFilePath,
+    #             Field_Return_IsSaveDatabase: True
+    #         })
+
+    #     returnDatas = pd.DataFrame(result_rows)
+    #     return returnDatas
 
     def outputJsonData(self, conf: Contract, outputAnalysisDir: str, turbineModelInfo: pd.Series, dataFrameMerge: pd.DataFrame) -> pd.DataFrame:
         turbineCodes = dataFrameMerge[Field_CodeOfTurbine].unique()