Skip to content

S
sparrowzz
Commit 671c0903 by xiang
Options

Merge branch 'master' of https://github.com/shufengdong/sgoolprojects

parents 7995c82c b09d0c05
正在显示 包含 30 行增加 和 15 行删除
jinyun/availCap/src/main/java/com/jinyun/cap/AvailCapMain.java
...@@ -388,6 +388,11 @@ public class AvailCapMain { ...@@ -388,6 +388,11 @@ public class AvailCapMain {
tfUbs.addAll(sqliteDb.queryTfMonthUb(feeder + tfMonthUbTableName)); tfUbs.addAll(sqliteDb.queryTfMonthUb(feeder + tfMonthUbTableName));
} }
System.out.println(tfUbs.size()); 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; break;
} }
case "linePassRate": { case "linePassRate": {
...@@ -442,8 +447,15 @@ public class AvailCapMain { ...@@ -442,8 +447,15 @@ public class AvailCapMain {
} }
double[] seasonCluster2 = sqliteDb.querySeasonSwitchI(args[2] + switchTableName + HistoryData.seasonClusterTable, args[3], 2, 96); 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[] 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); 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; break;
} }
case "lineWinter": { case "lineWinter": {
......
jinyun/availCap/src/main/java/com/jinyun/cap/AvailCapModel.java
...@@ -660,6 +660,9 @@ public class AvailCapModel { ...@@ -660,6 +660,9 @@ public class AvailCapModel {
List<String> sqls = new LinkedList<>(); List<String> sqls = new LinkedList<>();
for (int j = 0; j < pointNum; j++) { for (int j = 0; j < pointNum; j++) {
// 电流不转成容量 // 电流不转成容量
if (availCap[season - 1][j] < 0) {
availCap[season - 1][j] = 0;
}
String insertSql = "insert into " + resultTableName + " values(" + String insertSql = "insert into " + resultTableName + " values(" +
"'" + ps.getResource(edge.getEquips().get(0)).getProperty("NAME") + "','" + mRID + "'" + ps.getResource(edge.getEquips().get(0)).getProperty("NAME") + "','" + mRID +
"'," + season + "," + availCap[season - 1][j] + ")"; "'," + season + "," + availCap[season - 1][j] + ")";
......
jinyun/availCap/src/main/java/com/jinyun/cap/HistoryData.java
...@@ -893,7 +893,7 @@ public class HistoryData { ...@@ -893,7 +893,7 @@ public class HistoryData {
Iterator<TFData> iterator = tfDatas.iterator(); Iterator<TFData> iterator = tfDatas.iterator();
while (iterator.hasNext()) { while (iterator.hasNext()) {
TFData tfData = iterator.next(); TFData tfData = iterator.next();
long time = tfData.getData().getTime(); long time = tfData.getDate().getTime();
Calendar calendar = Calendar.getInstance(); Calendar calendar = Calendar.getInstance();
calendar.setTimeInMillis(time); calendar.setTimeInMillis(time);
int hour = calendar.get(Calendar.HOUR_OF_DAY); int hour = calendar.get(Calendar.HOUR_OF_DAY);
...@@ -1067,18 +1067,18 @@ public class HistoryData { ...@@ -1067,18 +1067,18 @@ 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()) {
TFData tfData = iterator.next(); TFData tfData = iterator.next();
long time = tfData.getData().getTime(); long time = tfData.getDate().getTime();
Calendar calendar = Calendar.getInstance(); Calendar calendar = Calendar.getInstance();
calendar.setTimeInMillis(time); calendar.setTimeInMillis(time);
int day = calendar.get(Calendar.DAY_OF_MONTH); int day = calendar.get(Calendar.DAY_OF_MONTH);
...@@ -1091,6 +1091,7 @@ public class HistoryData { ...@@ -1091,6 +1091,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) {
...@@ -1118,7 +1119,6 @@ public class HistoryData { ...@@ -1118,7 +1119,6 @@ public class HistoryData {
} }
} }
} }
}
/** /**
* 按季节聚类公变负荷历史数据和三相最大不平衡度 * 按季节聚类公变负荷历史数据和三相最大不平衡度
...@@ -1140,7 +1140,7 @@ public class HistoryData { ...@@ -1140,7 +1140,7 @@ public class HistoryData {
Iterator<TFData> iterator = tfDatas.iterator(); Iterator<TFData> iterator = tfDatas.iterator();
while (iterator.hasNext()) { while (iterator.hasNext()) {
TFData tfData = iterator.next(); TFData tfData = iterator.next();
long time = tfData.getData().getTime(); long time = tfData.getDate().getTime();
Calendar calendar = Calendar.getInstance(); Calendar calendar = Calendar.getInstance();
calendar.setTimeInMillis(time); calendar.setTimeInMillis(time);
int hour = calendar.get(Calendar.HOUR_OF_DAY); int hour = calendar.get(Calendar.HOUR_OF_DAY);
...@@ -1195,7 +1195,7 @@ public class HistoryData { ...@@ -1195,7 +1195,7 @@ public class HistoryData {
Iterator<TFData> iterator = tfDatas.iterator(); Iterator<TFData> iterator = tfDatas.iterator();
while (iterator.hasNext()) { while (iterator.hasNext()) {
TFData tfData = iterator.next(); TFData tfData = iterator.next();
long time = tfData.getData().getTime(); long time = tfData.getDate().getTime();
Calendar calendar = Calendar.getInstance(); Calendar calendar = Calendar.getInstance();
calendar.setTimeInMillis(time); calendar.setTimeInMillis(time);
int hour = calendar.get(Calendar.HOUR_OF_DAY); int hour = calendar.get(Calendar.HOUR_OF_DAY);
......
jinyun/availCap/src/main/java/com/jinyun/cap/SqliteDb.java
...@@ -597,7 +597,7 @@ public class SqliteDb { ...@@ -597,7 +597,7 @@ public class SqliteDb {
TFData tfData = new TFData(); TFData tfData = new TFData();
tfData.setDevName(rs.getString("devName")); tfData.setDevName(rs.getString("devName"));
tfData.setmRID(mRID); tfData.setmRID(mRID);
tfData.setData(rs.getTimestamp("date")); tfData.setDate(rs.getTimestamp("date"));
tfData.setIa(rs.getDouble("Ia")); tfData.setIa(rs.getDouble("Ia"));
tfData.setIb(rs.getDouble("Ib")); tfData.setIb(rs.getDouble("Ib"));
tfData.setIc(rs.getDouble("Ic")); tfData.setIc(rs.getDouble("Ic"));
...@@ -644,7 +644,7 @@ public class SqliteDb { ...@@ -644,7 +644,7 @@ public class SqliteDb {
TFData tfData = new TFData(); TFData tfData = new TFData();
tfData.setDevName(rs.getString("devName")); tfData.setDevName(rs.getString("devName"));
tfData.setmRID(mRID); tfData.setmRID(mRID);
tfData.setData(rs.getTimestamp("date")); tfData.setDate(rs.getTimestamp("date"));
tfData.setIa(rs.getDouble("Ia")); tfData.setIa(rs.getDouble("Ia"));
tfData.setIb(rs.getDouble("Ib")); tfData.setIb(rs.getDouble("Ib"));
tfData.setIc(rs.getDouble("Ic")); tfData.setIc(rs.getDouble("Ic"));
...@@ -1193,7 +1193,7 @@ public class SqliteDb { ...@@ -1193,7 +1193,7 @@ public class SqliteDb {
tfUb.setUb(rs.getDouble("ub")); tfUb.setUb(rs.getDouble("ub"));
double[] monthUb = new double[30]; double[] monthUb = new double[30];
for (int i = 0; i < 30; i++) { for (int i = 0; i < 30; i++) {
monthUb[0] = rs.getDouble("monthUb" + (i + 1)); monthUb[i] = rs.getDouble("monthUb" + (i + 1));
} }
tfUb.setMonthUb(monthUb); tfUb.setMonthUb(monthUb);
tfUbs.add(tfUb); tfUbs.add(tfUb);
......
jinyun/availCap/src/main/java/com/jinyun/cap/TFData.java
...@@ -5,7 +5,7 @@ import java.sql.Timestamp; ...@@ -5,7 +5,7 @@ import java.sql.Timestamp;
public class TFData { public class TFData {
String devName; String devName;
String mRID; String mRID;
Timestamp data; Timestamp date;
double Ia; double Ia;
double Ib; double Ib;
double Ic; double Ic;
...@@ -29,12 +29,12 @@ public class TFData { ...@@ -29,12 +29,12 @@ public class TFData {
return mRID; return mRID;
} }
public void setData(Timestamp data) { public void setDate(Timestamp date) {
this.data = data; this.date = date;
} }
public Timestamp getData() { public Timestamp getDate() {
return data; return date;
} }
public void setIa(double ia) { public void setIa(double ia) {
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论