修正月三相不平衡度读取问题

availCap/src/main/java/AvailCapMain.java

@@ -388,6 +388,11 @@ public class AvailCapMain {
                     tfUbs.addAll(sqliteDb.queryTfMonthUb(feeder + tfMonthUbTableName));
                 }
                 System.out.println(tfUbs.size());
+//                TfUb tfUb = tfUbs.get(4);
+//                System.out.println(tfUb.devName);
+//                for (int i = 0; i < 30; i++) {
+//                    System.out.println(tfUb.monthUb[i] + ",");
+//                }
                 break;
             }
             case "linePassRate": {
@@ -442,8 +447,15 @@ public class AvailCapMain {
                 }
                 double[] seasonCluster2 = sqliteDb.querySeasonSwitchI(args[2] + switchTableName + HistoryData.seasonClusterTable, args[3], 2, 96);
                 double[] seasonMax2 = sqliteDb.querySeasonSwitchI(args[2] + switchTableName + HistoryData.seasonTable, args[3], 2, 96);
+                double[] cap1 = sqliteDb.queryAvailCap(args[2] + availCapTableName, args[3], 1, 96);
                 double[] cap2 = sqliteDb.queryAvailCap(args[2] + availCapTableName, args[3], 2, 96);
-                System.out.println();
+                double[] cap3 = sqliteDb.queryAvailCap(args[2] + availCapTableName, args[3], 3, 96);
+                double[] cap4 = sqliteDb.queryAvailCap(args[2] + availCapTableName, args[3], 4, 96);
+//                System.out.println("时段,1,2,3,4");
+//                for (int i = 0; i < 24; i++) {
+//                    System.out.println(i + "," + cap1[4 * i] + "," + cap2[4 * i] + "," + cap3[4 * i] + "," + cap4[4 * i]);
+//                }
+//                System.out.println();
                 break;
             }
             case "lineWinter": {

availCap/src/main/java/AvailCapModel.java

@@ -658,6 +658,9 @@ public class AvailCapModel {
                     List<String> sqls = new LinkedList<>();
                     for (int j = 0; j < pointNum; j++) {
                         // 电流不转成容量
+                        if (availCap[season - 1][j] < 0) {
+                            availCap[season - 1][j] = 0;
+                        }
                         String insertSql = "insert into " + resultTableName + " values(" +
                                 "'" + ps.getResource(edge.getEquips().get(0)).getProperty("NAME") + "','" + mRID +
                                 "'," + season + "," + availCap[season - 1][j] + ")";

availCap/src/main/java/HistoryData.java

@@ -891,7 +891,7 @@ public class HistoryData {
                 Iterator<TFData> iterator = tfDatas.iterator();
                 while (iterator.hasNext()) {
                     TFData tfData = iterator.next();
-                    long time = tfData.getData().getTime();
+                    long time = tfData.getDate().getTime();
                     Calendar calendar = Calendar.getInstance();
                     calendar.setTimeInMillis(time);
                     int hour = calendar.get(Calendar.HOUR_OF_DAY);
@@ -1076,7 +1076,7 @@ public class HistoryData {
                 Iterator<TFData> iterator = tfDatas.iterator();
                 while (iterator.hasNext()) {
                     TFData tfData = iterator.next();
-                    long time = tfData.getData().getTime();
+                    long time = tfData.getDate().getTime();
                     Calendar calendar = Calendar.getInstance();
                     calendar.setTimeInMillis(time);
                     int day = calendar.get(Calendar.DAY_OF_MONTH);
@@ -1138,7 +1138,7 @@ public class HistoryData {
                 Iterator<TFData> iterator = tfDatas.iterator();
                 while (iterator.hasNext()) {
                     TFData tfData = iterator.next();
-                    long time = tfData.getData().getTime();
+                    long time = tfData.getDate().getTime();
                     Calendar calendar = Calendar.getInstance();
                     calendar.setTimeInMillis(time);
                     int hour = calendar.get(Calendar.HOUR_OF_DAY);
@@ -1193,7 +1193,7 @@ public class HistoryData {
                     Iterator<TFData> iterator = tfDatas.iterator();
                     while (iterator.hasNext()) {
                         TFData tfData = iterator.next();
-                        long time = tfData.getData().getTime();
+                        long time = tfData.getDate().getTime();
                         Calendar calendar = Calendar.getInstance();
                         calendar.setTimeInMillis(time);
                         int hour = calendar.get(Calendar.HOUR_OF_DAY);

availCap/src/main/java/SqliteDb.java

@@ -595,7 +595,7 @@ public class SqliteDb {
                 TFData tfData = new TFData();
                 tfData.setDevName(rs.getString("devName"));
                 tfData.setmRID(mRID);
-                tfData.setData(rs.getTimestamp("date"));
+                tfData.setDate(rs.getTimestamp("date"));
                 tfData.setIa(rs.getDouble("Ia"));
                 tfData.setIb(rs.getDouble("Ib"));
                 tfData.setIc(rs.getDouble("Ic"));
@@ -642,7 +642,7 @@ public class SqliteDb {
                 TFData tfData = new TFData();
                 tfData.setDevName(rs.getString("devName"));
                 tfData.setmRID(mRID);
-                tfData.setData(rs.getTimestamp("date"));
+                tfData.setDate(rs.getTimestamp("date"));
                 tfData.setIa(rs.getDouble("Ia"));
                 tfData.setIb(rs.getDouble("Ib"));
                 tfData.setIc(rs.getDouble("Ic"));
@@ -1191,7 +1191,7 @@ public class SqliteDb {
                 tfUb.setUb(rs.getDouble("ub"));
                 double[] monthUb = new double[30];
                 for (int i = 0; i < 30; i++) {
-                    monthUb[0] = rs.getDouble("monthUb" + (i + 1));
+                    monthUb[i] = rs.getDouble("monthUb" + (i + 1));
                 }
                 tfUb.setMonthUb(monthUb);
                 tfUbs.add(tfUb);

availCap/src/main/java/TFData.java

@@ -3,7 +3,7 @@ import java.sql.Timestamp;
 public class TFData {
     String devName;
     String mRID;
-    Timestamp data;
+    Timestamp date;
     double Ia;
     double Ib;
     double Ic;
@@ -27,12 +27,12 @@ public class TFData {
         return mRID;
     }
 
-    public void setData(Timestamp data) {
-        this.data = data;
+    public void setDate(Timestamp date) {
+        this.date = date;
     }
 
-    public Timestamp getData() {
-        return data;
+    public Timestamp getDate() {
+        return date;
     }
 
     public void setIa(double ia) {