公变三相不平衡度分析由季度改为年度

availCap/src/main/java/HistoryData.java

@@ -1065,13 +1065,13 @@ public class HistoryData {
         Map<String, String> tfNameToMRID = sqliteDb.queryNameToMRID(tfTable);
         Map<String, String> tfNameToMRID = sqliteDb.queryNameToMRID(tfTable);
         for (String name : tfNameToMRID.keySet()) {
         for (String name : tfNameToMRID.keySet()) {
             String mRID = tfNameToMRID.get(name);
             String mRID = tfNameToMRID.get(name);
-            for (int season = 1; season < 5; season++) {
             double tfRatedCap = sqliteDb.queryTFCap(tfParamTable, mRID);
             double tfRatedCap = sqliteDb.queryTFCap(tfParamTable, mRID);
             double tfMaxP = sqliteDb.queryMaxTFP(tfSeasonTable, mRID, -1) / 1000;
             double tfMaxP = sqliteDb.queryMaxTFP(tfSeasonTable, mRID, -1) / 1000;
             double ub = 0;  // 年平均三相不平衡度
             double ub = 0;  // 年平均三相不平衡度
             int ubCount = 0;
             int ubCount = 0;
             double[] monthUb = new double[31];  // 月三相不平衡度
             double[] monthUb = new double[31];  // 月三相不平衡度
             int[] count = new int[31];
             int[] count = new int[31];
+            for (int season = 1; season < 5; season++) {
                 List<TFData> tfDatas = sqliteDb.queryTFData(tfTable, mRID, season);
                 List<TFData> tfDatas = sqliteDb.queryTFData(tfTable, mRID, season);
                 Iterator<TFData> iterator = tfDatas.iterator();
                 Iterator<TFData> iterator = tfDatas.iterator();
                 while (iterator.hasNext()) {
                 while (iterator.hasNext()) {
@@ -1089,6 +1089,7 @@ public class HistoryData {
                     monthUb[day - 1] += ubI[0];
                     monthUb[day - 1] += ubI[0];
                     count[day - 1]++;
                     count[day - 1]++;
                 }
                 }
+            }
             ub /= ubCount;
             ub /= ubCount;
             for (int j = 0; j < 31; j++) {
             for (int j = 0; j < 31; j++) {
                 if (count[j] > 0) {
                 if (count[j] > 0) {
@@ -1116,7 +1117,6 @@ public class HistoryData {
             }
             }
         }
         }
     }
     }
-    }
 
 
     /**
     /**
      * 按季节聚类公变负荷历史数据和三相最大不平衡度
      * 按季节聚类公变负荷历史数据和三相最大不平衡度