|
@@ -83,14 +83,30 @@ public class GenerateBackPassDataService {
|
|
|
|
|
|
private final WindPowerReal15MinFD0040Service windPowerReal15MinFD0040Service;
|
|
|
|
|
|
+ private final WindPowerReal15MinFD0056Service windPowerReal15MinFD0056Service;
|
|
|
+
|
|
|
private final PvPowerReal15MinGF0001Service pvPowerReal15MinGF0001Service;
|
|
|
|
|
|
private final PvPowerReal15MinGF0002Service pvPowerReal15MinGF0002Service;
|
|
|
|
|
|
+ private final PvPowerReal15MinGF0003Service pvPowerReal15MinGF0003Service;
|
|
|
+
|
|
|
+ private final PvPowerReal15MinGF0004Service pvPowerReal15MinGF0004Service;
|
|
|
+
|
|
|
+ private final PvPowerReal15MinGF0005Service pvPowerReal15MinGF0005Service;
|
|
|
+
|
|
|
+ private final PvPowerReal15MinGF0006Service pvPowerReal15MinGF0006Service;
|
|
|
+
|
|
|
+ private final PvPowerReal15MinGF0007Service pvPowerReal15MinGF0007Service;
|
|
|
+
|
|
|
+ private final PvPowerReal15MinGF0008Service pvPowerReal15MinGF0008Service;
|
|
|
+
|
|
|
private final PvPowerReal15MinGF0012Service pvPowerReal15MinGF0012Service;
|
|
|
|
|
|
private final PvPowerReal15MinGF0013Service pvPowerReal15MinGF0013Service;
|
|
|
|
|
|
+ private final PvPowerReal15MinGF0016Service pvPowerReal15MinGF0016Service;
|
|
|
+
|
|
|
private final PvPowerReal15MinGF0019Service pvPowerReal15MinGF0019Service;
|
|
|
|
|
|
private static final String IMAGE_TYPE = "jpg";
|
|
@@ -164,7 +180,15 @@ public class GenerateBackPassDataService {
|
|
|
JiaYueWindPowerDqResultCoverFD0003Service jiaYueWindPowerDqResultCoverFD0003Service,JiaYueWindPowerDqResultCoverFD0004Service jiaYueWindPowerDqResultCoverFD0004Service,JiaYueWindPowerDqResultCoverFD0005Service jiaYueWindPowerDqResultCoverFD0005Service,JiaYueWindPowerDqResultCoverFD0006Service jiaYueWindPowerDqResultCoverFD0006Service,
|
|
|
JiaYueWindPowerDqResultCoverFD0007Service jiaYueWindPowerDqResultCoverFD0007Service,JiaYueWindPowerDqResultCoverFD0029Service jiaYueWindPowerDqResultCoverFD0029Service,JiaYueWindPowerDqResultCoverFD0030Service jiaYueWindPowerDqResultCoverFD0030Service,JiaYueWindPowerDqResultCoverFD0031Service jiaYueWindPowerDqResultCoverFD0031Service,JiaYueWindPowerCdqResultCoverFD0040Service jiaYueWindPowerCdqResultCoverFD0040Service,JiaYueWindPowerCdqResultCoverGF0001Service jiaYueWindPowerCdqResultCoverGF0001Service,JiaYueWindPowerCdqResultCoverGF0002Service jiaYueWindPowerCdqResultCoverGF0002Service,JiaYueWindPowerCdqResultCoverGF0012Service jiaYueWindPowerCdqResultCoverGF0012Service,JiaYueWindPowerCdqResultCoverGF0013Service jiaYueWindPowerCdqResultCoverGF0013Service,JiaYueWindPowerCdqResultCoverFD0001Service jiaYueWindPowerCdqResultCoverFD0001Service,JiaYueWindPowerCdqResultCoverFD0002Service jiaYueWindPowerCdqResultCoverFD0002Service,
|
|
|
JiaYueWindPowerCdqResultCoverFD0003Service jiaYueWindPowerCdqResultCoverFD0003Service,JiaYueWindPowerCdqResultCoverFD0004Service jiaYueWindPowerCdqResultCoverFD0004Service,JiaYueWindPowerCdqResultCoverFD0005Service jiaYueWindPowerCdqResultCoverFD0005Service,JiaYueWindPowerCdqResultCoverFD0006Service jiaYueWindPowerCdqResultCoverFD0006Service,
|
|
|
- JiaYueWindPowerCdqResultCoverFD0007Service jiaYueWindPowerCdqResultCoverFD0007Service,JiaYueWindPowerCdqResultCoverFD0029Service jiaYueWindPowerCdqResultCoverFD0029Service,JiaYueWindPowerCdqResultCoverFD0030Service jiaYueWindPowerCdqResultCoverFD0030Service,JiaYueWindPowerCdqResultCoverFD0031Service jiaYueWindPowerCdqResultCoverFD0031Service){
|
|
|
+ JiaYueWindPowerCdqResultCoverFD0007Service jiaYueWindPowerCdqResultCoverFD0007Service,JiaYueWindPowerCdqResultCoverFD0029Service jiaYueWindPowerCdqResultCoverFD0029Service,JiaYueWindPowerCdqResultCoverFD0030Service jiaYueWindPowerCdqResultCoverFD0030Service,JiaYueWindPowerCdqResultCoverFD0031Service jiaYueWindPowerCdqResultCoverFD0031Service,
|
|
|
+ PvPowerReal15MinGF0003Service pvPowerReal15MinGF0003Service,
|
|
|
+ PvPowerReal15MinGF0004Service pvPowerReal15MinGF0004Service,
|
|
|
+ PvPowerReal15MinGF0005Service pvPowerReal15MinGF0005Service,
|
|
|
+ PvPowerReal15MinGF0006Service pvPowerReal15MinGF0006Service,
|
|
|
+ PvPowerReal15MinGF0007Service pvPowerReal15MinGF0007Service,
|
|
|
+ PvPowerReal15MinGF0008Service pvPowerReal15MinGF0008Service,
|
|
|
+ PvPowerReal15MinGF0016Service pvPowerReal15MinGF0016Service,
|
|
|
+ WindPowerReal15MinFD0056Service windPowerReal15MinFD0056Service){
|
|
|
this.windPowerReal15MinFD0001Service = windPowerReal15MinFD0001Service;
|
|
|
this.windPowerReal15MinFD0002Service = windPowerReal15MinFD0002Service;
|
|
|
this.windPowerReal15MinFD0003Service = windPowerReal15MinFD0003Service;
|
|
@@ -187,10 +211,18 @@ public class GenerateBackPassDataService {
|
|
|
this.windPowerReal15MinFD0030Service = windPowerReal15MinFD0030Service;
|
|
|
this.windPowerReal15MinFD0031Service = windPowerReal15MinFD0031Service;
|
|
|
this.windPowerReal15MinFD0040Service = windPowerReal15MinFD0040Service;
|
|
|
+ this.windPowerReal15MinFD0056Service = windPowerReal15MinFD0056Service;
|
|
|
this.pvPowerReal15MinGF0001Service = pvPowerReal15MinGF0001Service;
|
|
|
this.pvPowerReal15MinGF0002Service = pvPowerReal15MinGF0002Service;
|
|
|
+ this.pvPowerReal15MinGF0003Service = pvPowerReal15MinGF0003Service;
|
|
|
+ this.pvPowerReal15MinGF0004Service = pvPowerReal15MinGF0004Service;
|
|
|
+ this.pvPowerReal15MinGF0005Service = pvPowerReal15MinGF0005Service;
|
|
|
+ this.pvPowerReal15MinGF0006Service = pvPowerReal15MinGF0006Service;
|
|
|
+ this.pvPowerReal15MinGF0007Service = pvPowerReal15MinGF0007Service;
|
|
|
+ this.pvPowerReal15MinGF0008Service = pvPowerReal15MinGF0008Service;
|
|
|
this.pvPowerReal15MinGF0012Service = pvPowerReal15MinGF0012Service;
|
|
|
this.pvPowerReal15MinGF0013Service = pvPowerReal15MinGF0013Service;
|
|
|
+ this.pvPowerReal15MinGF0016Service = pvPowerReal15MinGF0016Service;
|
|
|
this.pvPowerReal15MinGF0019Service = pvPowerReal15MinGF0019Service;
|
|
|
this.jiaYueWindPowerDqResultCoverFD0001Service = jiaYueWindPowerDqResultCoverFD0001Service;
|
|
|
this.jiaYueWindPowerDqResultCoverFD0002Service = jiaYueWindPowerDqResultCoverFD0002Service;
|
|
@@ -270,16 +302,16 @@ public class GenerateBackPassDataService {
|
|
|
electricField9.setSign("FD0009");
|
|
|
|
|
|
ElectricField electricField10 = new ElectricField();
|
|
|
- electricField9.setStationCode("J01138");
|
|
|
- electricField9.setSign("FD0010");
|
|
|
+ electricField10.setStationCode("J01138");
|
|
|
+ electricField10.setSign("FD0010");
|
|
|
|
|
|
ElectricField electricField15 = new ElectricField();
|
|
|
- electricField9.setStationCode("J01139");
|
|
|
- electricField9.setSign("FD0015");
|
|
|
+ electricField15.setStationCode("J01139");
|
|
|
+ electricField15.setSign("FD0015");
|
|
|
|
|
|
ElectricField electricField16 = new ElectricField();
|
|
|
- electricField9.setStationCode("J01140");
|
|
|
- electricField9.setSign("FD0016");
|
|
|
+ electricField16.setStationCode("J01140");
|
|
|
+ electricField16.setSign("FD0016");
|
|
|
|
|
|
ElectricField electricField17 = new ElectricField();
|
|
|
electricField17.setStationCode("J01123");
|
|
@@ -302,12 +334,12 @@ public class GenerateBackPassDataService {
|
|
|
electricField21.setSign("FD0021");
|
|
|
|
|
|
ElectricField electricField22 = new ElectricField();
|
|
|
- electricField21.setStationCode("J01141");
|
|
|
- electricField21.setSign("FD0022");
|
|
|
+ electricField22.setStationCode("J01141");
|
|
|
+ electricField22.setSign("FD0022");
|
|
|
|
|
|
ElectricField electricField25 = new ElectricField();
|
|
|
- electricField21.setStationCode("J01142");
|
|
|
- electricField21.setSign("FD0025");
|
|
|
+ electricField25.setStationCode("J01142");
|
|
|
+ electricField25.setSign("FD0025");
|
|
|
|
|
|
ElectricField electricField29 = new ElectricField();
|
|
|
electricField29.setStationCode("J01034");
|
|
@@ -318,12 +350,16 @@ public class GenerateBackPassDataService {
|
|
|
electricField30.setSign("FD0030");
|
|
|
|
|
|
ElectricField electricField31 = new ElectricField();
|
|
|
- electricField30.setStationCode("J01043");
|
|
|
- electricField30.setSign("FD0031");
|
|
|
+ electricField31.setStationCode("J01043");
|
|
|
+ electricField31.setSign("FD0031");
|
|
|
|
|
|
ElectricField electricField40 = new ElectricField();
|
|
|
- electricField30.setStationCode("J01166");
|
|
|
- electricField30.setSign("FD0040");
|
|
|
+ electricField40.setStationCode("J01166");
|
|
|
+ electricField40.setSign("FD0040");
|
|
|
+
|
|
|
+ ElectricField electricField56 = new ElectricField();
|
|
|
+ electricField56.setStationCode("J01233");
|
|
|
+ electricField56.setSign("FD0056");
|
|
|
// 光伏电站
|
|
|
ElectricField electricFieldGF0001 = new ElectricField();
|
|
|
electricFieldGF0001.setStationCode("J01056");
|
|
@@ -333,6 +369,30 @@ public class GenerateBackPassDataService {
|
|
|
electricFieldGF0002.setStationCode("J01057");
|
|
|
electricFieldGF0002.setSign("GF0002");
|
|
|
|
|
|
+ ElectricField electricFieldGF0003 = new ElectricField();
|
|
|
+ electricFieldGF0003.setStationCode("J01203");
|
|
|
+ electricFieldGF0003.setSign("GF0003");
|
|
|
+
|
|
|
+ ElectricField electricFieldGF0004 = new ElectricField();
|
|
|
+ electricFieldGF0004.setStationCode("J01208");
|
|
|
+ electricFieldGF0004.setSign("GF0004");
|
|
|
+
|
|
|
+ ElectricField electricFieldGF0005 = new ElectricField();
|
|
|
+ electricFieldGF0005.setStationCode("J01206");
|
|
|
+ electricFieldGF0005.setSign("GF0005");
|
|
|
+
|
|
|
+ ElectricField electricFieldGF0006 = new ElectricField();
|
|
|
+ electricFieldGF0006.setStationCode("J01205");
|
|
|
+ electricFieldGF0006.setSign("GF0006");
|
|
|
+
|
|
|
+ ElectricField electricFieldGF0007 = new ElectricField();
|
|
|
+ electricFieldGF0007.setStationCode("J01207");
|
|
|
+ electricFieldGF0007.setSign("GF0007");
|
|
|
+
|
|
|
+ ElectricField electricFieldGF0008 = new ElectricField();
|
|
|
+ electricFieldGF0008.setStationCode("J01204");
|
|
|
+ electricFieldGF0008.setSign("GF0008");
|
|
|
+
|
|
|
ElectricField electricFieldGF0012 = new ElectricField();
|
|
|
electricFieldGF0012.setStationCode("J01061");
|
|
|
electricFieldGF0012.setSign("GF0012");
|
|
@@ -341,6 +401,10 @@ public class GenerateBackPassDataService {
|
|
|
electricFieldGF0013.setStationCode("J01062");
|
|
|
electricFieldGF0013.setSign("GF0013");
|
|
|
|
|
|
+ ElectricField electricFieldGF0016 = new ElectricField();
|
|
|
+ electricFieldGF0016.setStationCode("J01231");
|
|
|
+ electricFieldGF0016.setSign("GF0016");
|
|
|
+
|
|
|
ElectricField electricFieldGF0019 = new ElectricField();
|
|
|
electricFieldGF0019.setStationCode("J01175");
|
|
|
electricFieldGF0019.setSign("GF0019");
|
|
@@ -367,10 +431,18 @@ public class GenerateBackPassDataService {
|
|
|
electricFieldList.add(electricField30);
|
|
|
electricFieldList.add(electricField31);
|
|
|
electricFieldList.add(electricField40);
|
|
|
+ electricFieldList.add(electricField56);
|
|
|
electricFieldList.add(electricFieldGF0001);
|
|
|
electricFieldList.add(electricFieldGF0002);
|
|
|
+ electricFieldList.add(electricFieldGF0003);
|
|
|
+ electricFieldList.add(electricFieldGF0004);
|
|
|
+ electricFieldList.add(electricFieldGF0005);
|
|
|
+ electricFieldList.add(electricFieldGF0006);
|
|
|
+ electricFieldList.add(electricFieldGF0007);
|
|
|
+ electricFieldList.add(electricFieldGF0008);
|
|
|
electricFieldList.add(electricFieldGF0012);
|
|
|
electricFieldList.add(electricFieldGF0013);
|
|
|
+ electricFieldList.add(electricFieldGF0016);
|
|
|
electricFieldList.add(electricFieldGF0019);
|
|
|
//
|
|
|
// // 开始日期和结束日期
|
|
@@ -531,10 +603,18 @@ public class GenerateBackPassDataService {
|
|
|
List<WindPowerReal15MinFD0030> windPowerReal15MinFD0030List = new ArrayList<>();
|
|
|
List<WindPowerReal15MinFD0031> windPowerReal15MinFD0031List = new ArrayList<>();
|
|
|
List<WindPowerReal15MinFD0040> windPowerReal15MinFD0040List = new ArrayList<>();
|
|
|
+ List<WindPowerReal15MinFD0056> windPowerReal15MinFD0056List = new ArrayList<>();
|
|
|
List<PvPowerReal15MinGF0001> pvPowerReal15MinGF0001List = new ArrayList<>();
|
|
|
List<PvPowerReal15MinGF0002> pvPowerReal15MinGF0002List = new ArrayList<>();
|
|
|
+ List<PvPowerReal15MinGF0003> pvPowerReal15MinGF0003List = new ArrayList<>();
|
|
|
+ List<PvPowerReal15MinGF0004> pvPowerReal15MinGF0004List = new ArrayList<>();
|
|
|
+ List<PvPowerReal15MinGF0005> pvPowerReal15MinGF0005List = new ArrayList<>();
|
|
|
+ List<PvPowerReal15MinGF0006> pvPowerReal15MinGF0006List = new ArrayList<>();
|
|
|
+ List<PvPowerReal15MinGF0007> pvPowerReal15MinGF0007List = new ArrayList<>();
|
|
|
+ List<PvPowerReal15MinGF0008> pvPowerReal15MinGF0008List = new ArrayList<>();
|
|
|
List<PvPowerReal15MinGF0012> pvPowerReal15MinGF0012List = new ArrayList<>();
|
|
|
List<PvPowerReal15MinGF0013> pvPowerReal15MinGF0013List = new ArrayList<>();
|
|
|
+ List<PvPowerReal15MinGF0016> pvPowerReal15MinGF0016List = new ArrayList<>();
|
|
|
List<PvPowerReal15MinGF0019> pvPowerReal15MinGF0019List = new ArrayList<>();
|
|
|
|
|
|
switch (electricField.getSign()){
|
|
@@ -604,18 +684,42 @@ public class GenerateBackPassDataService {
|
|
|
case "FD0040":
|
|
|
windPowerReal15MinFD0040List = windPowerReal15MinFD0040Service.getAll(new Date(startTime), new Date(startTime + 24 * 60 * 60 * 1000L - 1000));
|
|
|
break;
|
|
|
+ case "FD0056":
|
|
|
+ windPowerReal15MinFD0056List = windPowerReal15MinFD0056Service.getAll(new Date(startTime), new Date(startTime + 24 * 60 * 60 * 1000L - 1000));
|
|
|
+ break;
|
|
|
case "GF0001":
|
|
|
pvPowerReal15MinGF0001List = pvPowerReal15MinGF0001Service.getAll(new Date(startTime), new Date(startTime + 24 * 60 * 60 * 1000L - 1000));
|
|
|
break;
|
|
|
case "GF0002":
|
|
|
pvPowerReal15MinGF0002List = pvPowerReal15MinGF0002Service.getAll(new Date(startTime), new Date(startTime + 24 * 60 * 60 * 1000L - 1000));
|
|
|
break;
|
|
|
+ case "GF0003":
|
|
|
+ pvPowerReal15MinGF0003List = pvPowerReal15MinGF0003Service.getAll(new Date(startTime), new Date(startTime + 24 * 60 * 60 * 1000L - 1000));
|
|
|
+ break;
|
|
|
+ case "GF0004":
|
|
|
+ pvPowerReal15MinGF0004List = pvPowerReal15MinGF0004Service.getAll(new Date(startTime), new Date(startTime + 24 * 60 * 60 * 1000L - 1000));
|
|
|
+ break;
|
|
|
+ case "GF0005":
|
|
|
+ pvPowerReal15MinGF0005List = pvPowerReal15MinGF0005Service.getAll(new Date(startTime), new Date(startTime + 24 * 60 * 60 * 1000L - 1000));
|
|
|
+ break;
|
|
|
+ case "GF0006":
|
|
|
+ pvPowerReal15MinGF0006List = pvPowerReal15MinGF0006Service.getAll(new Date(startTime), new Date(startTime + 24 * 60 * 60 * 1000L - 1000));
|
|
|
+ break;
|
|
|
+ case "GF0007":
|
|
|
+ pvPowerReal15MinGF0007List = pvPowerReal15MinGF0007Service.getAll(new Date(startTime), new Date(startTime + 24 * 60 * 60 * 1000L - 1000));
|
|
|
+ break;
|
|
|
+ case "GF0008":
|
|
|
+ pvPowerReal15MinGF0008List = pvPowerReal15MinGF0008Service.getAll(new Date(startTime), new Date(startTime + 24 * 60 * 60 * 1000L - 1000));
|
|
|
+ break;
|
|
|
case "GF0012":
|
|
|
pvPowerReal15MinGF0012List = pvPowerReal15MinGF0012Service.getAll(new Date(startTime), new Date(startTime + 24 * 60 * 60 * 1000L - 1000));
|
|
|
break;
|
|
|
case "GF0013":
|
|
|
pvPowerReal15MinGF0013List = pvPowerReal15MinGF0013Service.getAll(new Date(startTime), new Date(startTime + 24 * 60 * 60 * 1000L - 1000));
|
|
|
break;
|
|
|
+ case "GF0016":
|
|
|
+ pvPowerReal15MinGF0016List = pvPowerReal15MinGF0016Service.getAll(new Date(startTime), new Date(startTime + 24 * 60 * 60 * 1000L - 1000));
|
|
|
+ break;
|
|
|
case "GF0019":
|
|
|
pvPowerReal15MinGF0019List = pvPowerReal15MinGF0019Service.getAll(new Date(startTime), new Date(startTime + 24 * 60 * 60 * 1000L - 1000));
|
|
|
break;
|
|
@@ -956,6 +1060,21 @@ public class GenerateBackPassDataService {
|
|
|
instContent.append(PLACE);
|
|
|
}
|
|
|
}
|
|
|
+ if (electricField.getSign().equals("FD0056")) {
|
|
|
+ List<WindPowerReal15MinFD0056> filterList = windPowerReal15MinFD0056List.stream().filter(p -> p.getDateTime().atZone(ZoneId.systemDefault()).toEpochSecond() * 1000L == finalTime).collect(Collectors.toList());
|
|
|
+ BigDecimal avg = new BigDecimal(0);
|
|
|
+ //取前15分钟的平均值 13:30取13:16-13:30的平均值
|
|
|
+ for (WindPowerReal15MinFD0056 p : filterList) {
|
|
|
+ avg = avg.add(new BigDecimal(p.getActivePower()));
|
|
|
+ }
|
|
|
+ if (!filterList.isEmpty()) {
|
|
|
+ content.append(avg.divide(new BigDecimal(filterList.size()), 2, RoundingMode.HALF_UP)).append("|");
|
|
|
+ instContent.append(filterList.get(0).getActivePower()).append("|");
|
|
|
+ } else {
|
|
|
+ content.append(PLACE);
|
|
|
+ instContent.append(PLACE);
|
|
|
+ }
|
|
|
+ }
|
|
|
if (electricField.getSign().equals("GF0001")) {
|
|
|
List<PvPowerReal15MinGF0001> filterList = pvPowerReal15MinGF0001List.stream().filter(p -> p.getDateTime().atZone(ZoneId.systemDefault()).toEpochSecond() * 1000L == finalTime).collect(Collectors.toList());
|
|
|
BigDecimal avg = new BigDecimal(0);
|
|
@@ -986,6 +1105,96 @@ public class GenerateBackPassDataService {
|
|
|
instContent.append(PLACE);
|
|
|
}
|
|
|
}
|
|
|
+ if (electricField.getSign().equals("GF0003")) {
|
|
|
+ List<PvPowerReal15MinGF0003> filterList = pvPowerReal15MinGF0003List.stream().filter(p -> p.getDateTime().atZone(ZoneId.systemDefault()).toEpochSecond() * 1000L == finalTime).collect(Collectors.toList());
|
|
|
+ BigDecimal avg = new BigDecimal(0);
|
|
|
+ //取前15分钟的平均值 13:30取13:16-13:30的平均值
|
|
|
+ for (PvPowerReal15MinGF0003 p : filterList) {
|
|
|
+ avg = avg.add(new BigDecimal(p.getActivePower()));
|
|
|
+ }
|
|
|
+ if (!filterList.isEmpty()) {
|
|
|
+ content.append(avg.divide(new BigDecimal(filterList.size()), 2, RoundingMode.HALF_UP)).append("|");
|
|
|
+ instContent.append(filterList.get(0).getActivePower()).append("|");
|
|
|
+ } else {
|
|
|
+ content.append(PLACE);
|
|
|
+ instContent.append(PLACE);
|
|
|
+ }
|
|
|
+ }
|
|
|
+ if (electricField.getSign().equals("GF0004")) {
|
|
|
+ List<PvPowerReal15MinGF0004> filterList = pvPowerReal15MinGF0004List.stream().filter(p -> p.getDateTime().atZone(ZoneId.systemDefault()).toEpochSecond() * 1000L == finalTime).collect(Collectors.toList());
|
|
|
+ BigDecimal avg = new BigDecimal(0);
|
|
|
+ //取前15分钟的平均值 13:30取13:16-13:30的平均值
|
|
|
+ for (PvPowerReal15MinGF0004 p : filterList) {
|
|
|
+ avg = avg.add(new BigDecimal(p.getActivePower()));
|
|
|
+ }
|
|
|
+ if (!filterList.isEmpty()) {
|
|
|
+ content.append(avg.divide(new BigDecimal(filterList.size()), 2, RoundingMode.HALF_UP)).append("|");
|
|
|
+ instContent.append(filterList.get(0).getActivePower()).append("|");
|
|
|
+ } else {
|
|
|
+ content.append(PLACE);
|
|
|
+ instContent.append(PLACE);
|
|
|
+ }
|
|
|
+ }
|
|
|
+ if (electricField.getSign().equals("GF0005")) {
|
|
|
+ List<PvPowerReal15MinGF0005> filterList = pvPowerReal15MinGF0005List.stream().filter(p -> p.getDateTime().atZone(ZoneId.systemDefault()).toEpochSecond() * 1000L == finalTime).collect(Collectors.toList());
|
|
|
+ BigDecimal avg = new BigDecimal(0);
|
|
|
+ //取前15分钟的平均值 13:30取13:16-13:30的平均值
|
|
|
+ for (PvPowerReal15MinGF0005 p : filterList) {
|
|
|
+ avg = avg.add(new BigDecimal(p.getActivePower()));
|
|
|
+ }
|
|
|
+ if (!filterList.isEmpty()) {
|
|
|
+ content.append(avg.divide(new BigDecimal(filterList.size()), 2, RoundingMode.HALF_UP)).append("|");
|
|
|
+ instContent.append(filterList.get(0).getActivePower()).append("|");
|
|
|
+ } else {
|
|
|
+ content.append(PLACE);
|
|
|
+ instContent.append(PLACE);
|
|
|
+ }
|
|
|
+ }
|
|
|
+ if (electricField.getSign().equals("GF0006")) {
|
|
|
+ List<PvPowerReal15MinGF0006> filterList = pvPowerReal15MinGF0006List.stream().filter(p -> p.getDateTime().atZone(ZoneId.systemDefault()).toEpochSecond() * 1000L == finalTime).collect(Collectors.toList());
|
|
|
+ BigDecimal avg = new BigDecimal(0);
|
|
|
+ //取前15分钟的平均值 13:30取13:16-13:30的平均值
|
|
|
+ for (PvPowerReal15MinGF0006 p : filterList) {
|
|
|
+ avg = avg.add(new BigDecimal(p.getActivePower()));
|
|
|
+ }
|
|
|
+ if (!filterList.isEmpty()) {
|
|
|
+ content.append(avg.divide(new BigDecimal(filterList.size()), 2, RoundingMode.HALF_UP)).append("|");
|
|
|
+ instContent.append(filterList.get(0).getActivePower()).append("|");
|
|
|
+ } else {
|
|
|
+ content.append(PLACE);
|
|
|
+ instContent.append(PLACE);
|
|
|
+ }
|
|
|
+ }
|
|
|
+ if (electricField.getSign().equals("GF0007")) {
|
|
|
+ List<PvPowerReal15MinGF0007> filterList = pvPowerReal15MinGF0007List.stream().filter(p -> p.getDateTime().atZone(ZoneId.systemDefault()).toEpochSecond() * 1000L == finalTime).collect(Collectors.toList());
|
|
|
+ BigDecimal avg = new BigDecimal(0);
|
|
|
+ //取前15分钟的平均值 13:30取13:16-13:30的平均值
|
|
|
+ for (PvPowerReal15MinGF0007 p : filterList) {
|
|
|
+ avg = avg.add(new BigDecimal(p.getActivePower()));
|
|
|
+ }
|
|
|
+ if (!filterList.isEmpty()) {
|
|
|
+ content.append(avg.divide(new BigDecimal(filterList.size()), 2, RoundingMode.HALF_UP)).append("|");
|
|
|
+ instContent.append(filterList.get(0).getActivePower()).append("|");
|
|
|
+ } else {
|
|
|
+ content.append(PLACE);
|
|
|
+ instContent.append(PLACE);
|
|
|
+ }
|
|
|
+ }
|
|
|
+ if (electricField.getSign().equals("GF0008")) {
|
|
|
+ List<PvPowerReal15MinGF0008> filterList = pvPowerReal15MinGF0008List.stream().filter(p -> p.getDateTime().atZone(ZoneId.systemDefault()).toEpochSecond() * 1000L == finalTime).collect(Collectors.toList());
|
|
|
+ BigDecimal avg = new BigDecimal(0);
|
|
|
+ //取前15分钟的平均值 13:30取13:16-13:30的平均值
|
|
|
+ for (PvPowerReal15MinGF0008 p : filterList) {
|
|
|
+ avg = avg.add(new BigDecimal(p.getActivePower()));
|
|
|
+ }
|
|
|
+ if (!filterList.isEmpty()) {
|
|
|
+ content.append(avg.divide(new BigDecimal(filterList.size()), 2, RoundingMode.HALF_UP)).append("|");
|
|
|
+ instContent.append(filterList.get(0).getActivePower()).append("|");
|
|
|
+ } else {
|
|
|
+ content.append(PLACE);
|
|
|
+ instContent.append(PLACE);
|
|
|
+ }
|
|
|
+ }
|
|
|
if (electricField.getSign().equals("GF0012")) {
|
|
|
List<PvPowerReal15MinGF0012> filterList = pvPowerReal15MinGF0012List.stream().filter(p -> p.getDateTime().atZone(ZoneId.systemDefault()).toEpochSecond() * 1000L == finalTime).collect(Collectors.toList());
|
|
|
BigDecimal avg = new BigDecimal(0);
|
|
@@ -1016,6 +1225,21 @@ public class GenerateBackPassDataService {
|
|
|
instContent.append(PLACE);
|
|
|
}
|
|
|
}
|
|
|
+ if (electricField.getSign().equals("GF0016")) {
|
|
|
+ List<PvPowerReal15MinGF0016> filterList = pvPowerReal15MinGF0016List.stream().filter(p -> p.getDateTime().atZone(ZoneId.systemDefault()).toEpochSecond() * 1000L == finalTime).collect(Collectors.toList());
|
|
|
+ BigDecimal avg = new BigDecimal(0);
|
|
|
+ //取前15分钟的平均值 13:30取13:16-13:30的平均值
|
|
|
+ for (PvPowerReal15MinGF0016 p : filterList) {
|
|
|
+ avg = avg.add(new BigDecimal(p.getActivePower()));
|
|
|
+ }
|
|
|
+ if (!filterList.isEmpty()) {
|
|
|
+ content.append(avg.divide(new BigDecimal(filterList.size()), 2, RoundingMode.HALF_UP)).append("|");
|
|
|
+ instContent.append(filterList.get(0).getActivePower()).append("|");
|
|
|
+ } else {
|
|
|
+ content.append(PLACE);
|
|
|
+ instContent.append(PLACE);
|
|
|
+ }
|
|
|
+ }
|
|
|
if (electricField.getSign().equals("GF0019")) {
|
|
|
List<PvPowerReal15MinGF0019> filterList = pvPowerReal15MinGF0019List.stream().filter(p -> p.getDateTime().atZone(ZoneId.systemDefault()).toEpochSecond() * 1000L == finalTime).collect(Collectors.toList());
|
|
|
BigDecimal avg = new BigDecimal(0);
|