Commit 76edcf40 authored by wujiang's avatar wujiang

修改实施功率占比

parent 948cdc1e
...@@ -301,8 +301,6 @@ ...@@ -301,8 +301,6 @@
<select id="getCountJpStationdata" resultType="com.yeejoin.amos.boot.module.hygf.api.dto.JpStationDto"> <select id="getCountJpStationdata" resultType="com.yeejoin.amos.boot.module.hygf.api.dto.JpStationDto">
select select
ROUND(sum(real_time_power),3) realTimePower, ROUND(sum(real_time_power),3) realTimePower,
ROUND(sum(capacity)/1000,3) capacity, ROUND(sum(capacity)/1000,3) capacity,
......
...@@ -485,7 +485,7 @@ public class JpStationController extends BaseController { ...@@ -485,7 +485,7 @@ public class JpStationController extends BaseController {
if(jpStation==null){ if(jpStation==null){
jpStation = new JpStationDto(); jpStation = new JpStationDto();
} }
if (jpStation != null && jpStation.getRealTimePower() != null && jpStation.getRatedPower() != null && jpStation.getRatedPower() > 0) { if (jpStation != null && jpStation.getRealTimePower() != null && jpStation.getCapacity() != null && jpStation.getCapacity() > 0) {
map.put("value", String.format("%.4f", jpStation.getRealTimePower() / (jpStation.getCapacity() * FDXSS))); map.put("value", String.format("%.4f", jpStation.getRealTimePower() / (jpStation.getCapacity() * FDXSS)));
} else { } else {
map.put("value", 0); map.put("value", 0);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment