|
@@ -8,6 +8,7 @@ import com.gyee.common.model.StringUtils;
|
|
import com.gyee.common.util.CommonUtils;
|
|
import com.gyee.common.util.CommonUtils;
|
|
import com.gyee.common.util.DateUtils;
|
|
import com.gyee.common.util.DateUtils;
|
|
import com.gyee.common.util.DoubleUtils;
|
|
import com.gyee.common.util.DoubleUtils;
|
|
|
|
+import com.gyee.common.util.SortUtils;
|
|
import com.gyee.ghost.init.CacheContext;
|
|
import com.gyee.ghost.init.CacheContext;
|
|
import com.gyee.ghost.model.auto.Fanoperation;
|
|
import com.gyee.ghost.model.auto.Fanoperation;
|
|
import com.gyee.ghost.model.auto.Windturbine;
|
|
import com.gyee.ghost.model.auto.Windturbine;
|
|
@@ -20,7 +21,6 @@ import java.util.ArrayList;
|
|
import java.util.Date;
|
|
import java.util.Date;
|
|
import java.util.List;
|
|
import java.util.List;
|
|
import java.util.Optional;
|
|
import java.util.Optional;
|
|
-import java.util.stream.Collectors;
|
|
|
|
|
|
|
|
@Service
|
|
@Service
|
|
public class GhostService {
|
|
public class GhostService {
|
|
@@ -86,8 +86,6 @@ public class GhostService {
|
|
fanoperation.setRecorddate(date);
|
|
fanoperation.setRecorddate(date);
|
|
fanoperation.setStormtime(0.0);
|
|
fanoperation.setStormtime(0.0);
|
|
|
|
|
|
-
|
|
|
|
-
|
|
|
|
resultList.add(fanoperation);
|
|
resultList.add(fanoperation);
|
|
});
|
|
});
|
|
|
|
|
|
@@ -115,6 +113,7 @@ public class GhostService {
|
|
qw.groupBy("windturbineid,windturbinename");
|
|
qw.groupBy("windturbineid,windturbinename");
|
|
List<Fanoperation> list = fanoperationService.list(qw);
|
|
List<Fanoperation> list = fanoperationService.list(qw);
|
|
resultList.addAll(list);
|
|
resultList.addAll(list);
|
|
|
|
+ SortUtils.sort(resultList,"windturbineid",SortUtils.ASC);
|
|
|
|
|
|
qw.clear();
|
|
qw.clear();
|
|
qw.select("sum(generatingcapacity) generatingcapacity,sum(theoreticalcapacity) theoreticalcapacity,sum(daynhgzssdl) daynhgzssdl,sum(daynhwhssdl) daynhwhssdl,sum(daynhxdssdl) daynhxdssdl,sum(daynhqfdl) daynhqfdl,sum(daynhcfdl) daynhcfdl,avg(availability) availability,avg(powerfactor) powerfactor,sum(runtime) runtime,sum(maintime) maintime,sum(faulttime) faulttime,sum(stoptime) stoptime,sum(stormtime) stormtime,sum(offtime) offtime");
|
|
qw.select("sum(generatingcapacity) generatingcapacity,sum(theoreticalcapacity) theoreticalcapacity,sum(daynhgzssdl) daynhgzssdl,sum(daynhwhssdl) daynhwhssdl,sum(daynhxdssdl) daynhxdssdl,sum(daynhqfdl) daynhqfdl,sum(daynhcfdl) daynhcfdl,avg(availability) availability,avg(powerfactor) powerfactor,sum(runtime) runtime,sum(maintime) maintime,sum(faulttime) faulttime,sum(stoptime) stoptime,sum(stormtime) stormtime,sum(offtime) offtime");
|
|
@@ -123,8 +122,11 @@ public class GhostService {
|
|
qw.eq("windpowerstationid",wpid);
|
|
qw.eq("windpowerstationid",wpid);
|
|
}
|
|
}
|
|
List<Fanoperation> hjlist = fanoperationService.list(qw);
|
|
List<Fanoperation> hjlist = fanoperationService.list(qw);
|
|
- if (StringUtils.isNotEmpty(hjlist)){
|
|
|
|
- resultList.add(hjlist.get(0));
|
|
|
|
|
|
+ if (StringUtils.isNotNull(hjlist)){
|
|
|
|
+ Fanoperation fanoperation = hjlist.get(0);
|
|
|
|
+ fanoperation.setWindpowerstationid("合计");
|
|
|
|
+ fanoperation.setWindturbinename("合计");
|
|
|
|
+ resultList.add(fanoperation);
|
|
}
|
|
}
|
|
return resultList;
|
|
return resultList;
|
|
}
|
|
}
|