|
|
@@ -183,10 +183,13 @@ public class ShareController extends BaseController {
|
|
|
}
|
|
|
}
|
|
|
List<PvPowerStation> pvPowerStationList = pvPowerStationService.selectPvPowerStationList(new PvPowerStation());
|
|
|
- for (PvPowerStation pvPowerStation : pvPowerStationList){
|
|
|
+ for (PvPowerStation pvPowerStation : pvPowerStationList) {
|
|
|
zzjrl += pvPowerStation.getRatingPower();
|
|
|
zzj += pvPowerStation.getInverterCnt();
|
|
|
}
|
|
|
+ if (zzjrl != 0) {
|
|
|
+ zzjrl = Math.round(zzjrl * 10) / 10.0;
|
|
|
+ }
|
|
|
json.put("zzj", zzj);
|
|
|
json.put("zzjrl", zzjrl);
|
|
|
json.put("yx", yx);
|
|
|
@@ -217,10 +220,10 @@ public class ShareController extends BaseController {
|
|
|
int lx = 0;
|
|
|
int jx = 0;
|
|
|
Windplant windplant = windplantService.selectWindplantById(Convert.toLong(stationNo));
|
|
|
- if (ObjectUtil.isNotNull(windplant)){
|
|
|
+ if (ObjectUtil.isNotNull(windplant)) {
|
|
|
zzjrl += windplant.getInstallPower();
|
|
|
List<WfProjectCwWtg> wfProjectCwWtgList = wfProjectCwWtgService.selectWfProjectCwWtgByWindplantNo(windplant.getWindplantNo());
|
|
|
- if (wfProjectCwWtgList.size() > 0){
|
|
|
+ if (wfProjectCwWtgList.size() > 0) {
|
|
|
zzj += wfProjectCwWtgList.size();
|
|
|
for (WfProjectCwWtg wfProjectCwWtg : wfProjectCwWtgList) {
|
|
|
if (wfProjectCwWtg.getMag() == 1) {//运行
|
hlf