|
@@ -84,7 +84,7 @@ public class InfodayService {
|
|
double maxpower = 0;
|
|
double maxpower = 0;
|
|
double minpower = 0;
|
|
double minpower = 0;
|
|
try {
|
|
try {
|
|
- ztmxSnap = edosUtil.getHistoryDatasSnap(ztmxpoint, samedayZero.getTime() / 1000, addDays.getTime() / 1000, null, 60l);
|
|
|
|
|
|
+ ztmxSnap = edosUtil.getHistoryDatasSnap(ztmxpoint, samedayZero.getTime() / 1000, addDays.getTime() / 1000, 1440l, 60l);
|
|
ssfsSnap = edosUtil.getHistoryDatasSnap(ssfsPoint, samedayZero.getTime() / 1000, addDays.getTime() / 1000, null, 60l);
|
|
ssfsSnap = edosUtil.getHistoryDatasSnap(ssfsPoint, samedayZero.getTime() / 1000, addDays.getTime() / 1000, null, 60l);
|
|
scadafdl = edosUtil.getSectionData(fdlPoint, endOfDay.getTime()).getPointValueInDouble();
|
|
scadafdl = edosUtil.getSectionData(fdlPoint, endOfDay.getTime()).getPointValueInDouble();
|
|
scadayfdl = edosUtil.getSectionData(yfdlPoint, endOfDay.getTime()).getPointValueInDouble();
|
|
scadayfdl = edosUtil.getSectionData(yfdlPoint, endOfDay.getTime()).getPointValueInDouble();
|
|
@@ -256,6 +256,10 @@ public class InfodayService {
|
|
delQW.eq("recorddate",DateUtils.parseDate(day));
|
|
delQW.eq("recorddate",DateUtils.parseDate(day));
|
|
windpowerinfodayService.remove(delQW);
|
|
windpowerinfodayService.remove(delQW);
|
|
|
|
|
|
|
|
+ QueryWrapper<Windturbineinfoday> wtinfodayQW = new QueryWrapper<>();
|
|
|
|
+ wtinfodayQW.eq("recorddate",DateUtils.parseDate(day));
|
|
|
|
+ List<Windturbineinfoday> windturbineinfodayList = windturbineinfodayService.list(wtinfodayQW);
|
|
|
|
+
|
|
|
|
|
|
lines.stream().forEach(line -> {
|
|
lines.stream().forEach(line -> {
|
|
Map<String, Windpowerstationpointnew> linepointnewMap = lnPointmap.get(line.getId());
|
|
Map<String, Windpowerstationpointnew> linepointnewMap = lnPointmap.get(line.getId());
|
|
@@ -341,6 +345,20 @@ public class InfodayService {
|
|
windpowerinfoday.setYearbe(DoubleUtils.keepPrecision(ngwgwdl,2));
|
|
windpowerinfoday.setYearbe(DoubleUtils.keepPrecision(ngwgwdl,2));
|
|
windpowerinfoday.setMonthae(DoubleUtils.keepPrecision(ynwgwdl,2));
|
|
windpowerinfoday.setMonthae(DoubleUtils.keepPrecision(ynwgwdl,2));
|
|
windpowerinfoday.setYearae(DoubleUtils.keepPrecision(nnwgwdl,2));
|
|
windpowerinfoday.setYearae(DoubleUtils.keepPrecision(nnwgwdl,2));
|
|
|
|
+
|
|
|
|
+
|
|
|
|
+ List<Windturbineinfoday> collect = windturbineinfodayList.stream().filter(windturbineinfoday -> CacheContext.wmap.get(windturbineinfoday.getWindturbineid()).getLineid().equals(line.getId())).collect(Collectors.toList());
|
|
|
|
+ Double runhours = collect.stream().mapToDouble((i) -> i.getRunhours()).summaryStatistics().getSum();
|
|
|
|
+ Double stophours = collect.stream().mapToDouble((i) -> i.getStophours()).summaryStatistics().getSum();
|
|
|
|
+ Double faulthours = collect.stream().mapToDouble((i) -> i.getFaulthours()).summaryStatistics().getSum();
|
|
|
|
+ Double maintainhours = collect.stream().mapToDouble((i) -> i.getMaintainhours()).summaryStatistics().getSum();
|
|
|
|
+ Double interrupthours = collect.stream().mapToDouble((i) -> i.getInterrupthours()).summaryStatistics().getSum();
|
|
|
|
+ windpowerinfoday.setRunhours(runhours);
|
|
|
|
+ windpowerinfoday.setStophours(stophours);
|
|
|
|
+ windpowerinfoday.setFaulthours(faulthours);
|
|
|
|
+ windpowerinfoday.setMaintainhours(maintainhours);
|
|
|
|
+ windpowerinfoday.setInterrupthours(interrupthours);
|
|
|
|
+
|
|
resultList.add(windpowerinfoday);
|
|
resultList.add(windpowerinfoday);
|
|
});
|
|
});
|
|
|
|
|
|
@@ -428,6 +446,18 @@ public class InfodayService {
|
|
windpowerinfoday.setYearbe(DoubleUtils.keepPrecision(ngwgwdl,2));
|
|
windpowerinfoday.setYearbe(DoubleUtils.keepPrecision(ngwgwdl,2));
|
|
windpowerinfoday.setMonthae(DoubleUtils.keepPrecision(ynwgwdl,2));
|
|
windpowerinfoday.setMonthae(DoubleUtils.keepPrecision(ynwgwdl,2));
|
|
windpowerinfoday.setYearae(DoubleUtils.keepPrecision(nnwgwdl,2));
|
|
windpowerinfoday.setYearae(DoubleUtils.keepPrecision(nnwgwdl,2));
|
|
|
|
+
|
|
|
|
+ List<Windturbineinfoday> collect = windturbineinfodayList.stream().filter(windturbineinfoday -> CacheContext.wmap.get(windturbineinfoday.getWindturbineid()).getProjectid().equals(project.getId())).collect(Collectors.toList());
|
|
|
|
+ Double runhours = collect.stream().mapToDouble((i) -> i.getRunhours()).summaryStatistics().getSum();
|
|
|
|
+ Double stophours = collect.stream().mapToDouble((i) -> i.getStophours()).summaryStatistics().getSum();
|
|
|
|
+ Double faulthours = collect.stream().mapToDouble((i) -> i.getFaulthours()).summaryStatistics().getSum();
|
|
|
|
+ Double maintainhours = collect.stream().mapToDouble((i) -> i.getMaintainhours()).summaryStatistics().getSum();
|
|
|
|
+ Double interrupthours = collect.stream().mapToDouble((i) -> i.getInterrupthours()).summaryStatistics().getSum();
|
|
|
|
+ windpowerinfoday.setRunhours(runhours);
|
|
|
|
+ windpowerinfoday.setStophours(stophours);
|
|
|
|
+ windpowerinfoday.setFaulthours(faulthours);
|
|
|
|
+ windpowerinfoday.setMaintainhours(maintainhours);
|
|
|
|
+ windpowerinfoday.setInterrupthours(interrupthours);
|
|
resultList.add(windpowerinfoday);
|
|
resultList.add(windpowerinfoday);
|
|
});
|
|
});
|
|
wplist.stream().forEach(wp -> {
|
|
wplist.stream().forEach(wp -> {
|
|
@@ -514,6 +544,18 @@ public class InfodayService {
|
|
windpowerinfoday.setYearbe(DoubleUtils.keepPrecision(ngwgwdl,2));
|
|
windpowerinfoday.setYearbe(DoubleUtils.keepPrecision(ngwgwdl,2));
|
|
windpowerinfoday.setMonthae(DoubleUtils.keepPrecision(ynwgwdl,2));
|
|
windpowerinfoday.setMonthae(DoubleUtils.keepPrecision(ynwgwdl,2));
|
|
windpowerinfoday.setYearae(DoubleUtils.keepPrecision(nnwgwdl,2));
|
|
windpowerinfoday.setYearae(DoubleUtils.keepPrecision(nnwgwdl,2));
|
|
|
|
+
|
|
|
|
+ List<Windturbineinfoday> collect = windturbineinfodayList.stream().filter(windturbineinfoday -> CacheContext.wmap.get(windturbineinfoday.getWindturbineid()).getWindpowerstationid().equals(wp.getId())).collect(Collectors.toList());
|
|
|
|
+ Double runhours = collect.stream().mapToDouble((i) -> i.getRunhours()).summaryStatistics().getSum();
|
|
|
|
+ Double stophours = collect.stream().mapToDouble((i) -> i.getStophours()).summaryStatistics().getSum();
|
|
|
|
+ Double faulthours = collect.stream().mapToDouble((i) -> i.getFaulthours()).summaryStatistics().getSum();
|
|
|
|
+ Double maintainhours = collect.stream().mapToDouble((i) -> i.getMaintainhours()).summaryStatistics().getSum();
|
|
|
|
+ Double interrupthours = collect.stream().mapToDouble((i) -> i.getInterrupthours()).summaryStatistics().getSum();
|
|
|
|
+ windpowerinfoday.setRunhours(runhours);
|
|
|
|
+ windpowerinfoday.setStophours(stophours);
|
|
|
|
+ windpowerinfoday.setFaulthours(faulthours);
|
|
|
|
+ windpowerinfoday.setMaintainhours(maintainhours);
|
|
|
|
+ windpowerinfoday.setInterrupthours(interrupthours);
|
|
resultList.add(windpowerinfoday);
|
|
resultList.add(windpowerinfoday);
|
|
});
|
|
});
|
|
windpowerinfodayService.saveBatch(resultList);
|
|
windpowerinfodayService.saveBatch(resultList);
|