|
@@ -16,10 +16,7 @@ import org.springframework.stereotype.Service;
|
|
|
import javax.annotation.Resource;
|
|
|
import java.sql.Timestamp;
|
|
|
import java.text.SimpleDateFormat;
|
|
|
-import java.util.ArrayList;
|
|
|
-import java.util.Date;
|
|
|
-import java.util.List;
|
|
|
-import java.util.Optional;
|
|
|
+import java.util.*;
|
|
|
import java.util.stream.Collectors;
|
|
|
|
|
|
@Service
|
|
@@ -201,6 +198,7 @@ public class GhostService {
|
|
|
Fanoperation fanoperation = hjlist.get(0);
|
|
|
fanoperation.setWindturbineid("合计");
|
|
|
fanoperation.setWindturbinename("合计");
|
|
|
+ fanoperation.setAvailability(DoubleUtils.keepPrecision(fanoperation.getAvailability(),2));
|
|
|
resultList.add(fanoperation);
|
|
|
}
|
|
|
return resultList;
|
|
@@ -223,7 +221,7 @@ public class GhostService {
|
|
|
SortUtils.sort(resultList,"windturbineid",SortUtils.ASC);
|
|
|
|
|
|
qw.clear();
|
|
|
- qw.select("windturbineid,windturbinename,sum(generatingcapacity) generatingcapacity,min(inputsmall) inputsmall,max(inputsmallspeed) inputsmallspeed,max(edinputsmallspeed) edinputsmallspeed,max(edinputsavgspeed) edinputsavgspeed,max(edinputbigpower) edinputbigpower,max(edinputavgpower) edinputavgpower,avg(availability) availability,sum(faultcount) faultcount,sum(faulttime) faulttime");
|
|
|
+ qw.select("sum(generatingcapacity) generatingcapacity,min(inputsmall) inputsmall,max(inputsmallspeed) inputsmallspeed,max(edinputsmallspeed) edinputsmallspeed,max(edinputsavgspeed) edinputsavgspeed,max(edinputbigpower) edinputbigpower,max(edinputavgpower) edinputavgpower,avg(availability) availability,sum(faultcount) faultcount,sum(faulttime) faulttime");
|
|
|
qw.ge("recorddate",begin).le("recorddate",end);
|
|
|
if (StringUtils.isNotEmpty(wpid)){
|
|
|
qw.eq("windpowerstationid",wpid);
|
|
@@ -233,8 +231,29 @@ public class GhostService {
|
|
|
Nature nature = hjlist.get(0);
|
|
|
nature.setWindturbineid("合计");
|
|
|
nature.setWindturbinename("合计");
|
|
|
+ nature.setAvailability(DoubleUtils.keepPrecision(nature.getAvailability(),2));
|
|
|
resultList.add(nature);
|
|
|
}
|
|
|
return resultList;
|
|
|
}
|
|
|
+
|
|
|
+ public List<Shutdownevent> shutdownevent(String wpid, String beginDate, String endDate) {
|
|
|
+ List<Shutdownevent> resultList = new ArrayList<>();
|
|
|
+ Map<String, String> stopmap = CacheContext.stopmap;
|
|
|
+ Date begin = DateUtils.parseDate(beginDate);
|
|
|
+ Date end = DateUtils.parseDate(endDate);
|
|
|
+ QueryWrapper<Shutdownevent> qw = new QueryWrapper<>();
|
|
|
+ qw.ge("stoptime",begin).le("stoptime",end);
|
|
|
+ if (StringUtils.isNotEmpty(wpid)){
|
|
|
+ qw.eq("windpowerstationid",wpid);
|
|
|
+ }
|
|
|
+ List<Shutdownevent> shutdowneventList = shutdowneventService.list(qw);
|
|
|
+ shutdowneventList.stream().forEach(shutdownevent->{
|
|
|
+ String stoptypeid = shutdownevent.getStoptypeid();
|
|
|
+ shutdownevent.setStoptypeid(stopmap.get(stoptypeid));
|
|
|
+ resultList.add(shutdownevent);
|
|
|
+ });
|
|
|
+
|
|
|
+ return resultList;
|
|
|
+ }
|
|
|
}
|