Skip to content

A
amos-boot-biz
Commit e00c9231 authored by tangwei's avatar tangwei
Browse files
Options

解决冲突

parents c08e0bf3 f9be872e
Show whitespace changes
Inline Side-by-side
Showing with 4 additions and 4 deletions
amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/controller/JpInverterController.java
View file @ e00c9231
...@@ -412,10 +412,10 @@ public class JpInverterController extends BaseController { ...@@ -412,10 +412,10 @@ public class JpInverterController extends BaseController {
query.orderByDesc(JpInverter::getUpdateTime); query.orderByDesc(JpInverter::getUpdateTime);
JpInverter jpInverter = jpInverterServiceImpl.getBaseMapper().selectList(query).get(0); JpInverter jpInverter = jpInverterServiceImpl.getBaseMapper().selectList(query).get(0);
jpInverter.setDayPowerGeneration(jpInverter.getDayPowerGeneration()!=null?jpInverter.getDayPowerGeneration():0); jpInverter.setDayPowerGeneration(jpInverter.getDayPowerGeneration()!=null?Double.valueOf(String.format("%.3f",jpInverter.getDayPowerGeneration())):0);
jpInverter.setMonthPowerGeneration(jpInverter.getMonthPowerGeneration()!=null?jpInverter.getMonthPowerGeneration():0); jpInverter.setMonthPowerGeneration(jpInverter.getMonthPowerGeneration()!=null?Double.valueOf(String.format("%.3f",jpInverter.getMonthPowerGeneration())):0);
jpInverter.setYearPowerGeneration(jpInverter.getYearPowerGeneration()!=null?jpInverter.getYearPowerGeneration():0); jpInverter.setYearPowerGeneration(jpInverter.getYearPowerGeneration()!=null?Double.valueOf(String.format("%.3f",jpInverter.getYearPowerGeneration())):0);
jpInverter.setTotalPowerGeneration(jpInverter.getTotalPowerGeneration()!=null?jpInverter.getTotalPowerGeneration()/1000:0); jpInverter.setTotalPowerGeneration(jpInverter.getTotalPowerGeneration()!=null? Double.valueOf(String.format("%.3f",jpInverter.getTotalPowerGeneration()/1000)) :0);
JpInverterDto jpInverterDto = new JpInverterDto(); JpInverterDto jpInverterDto = new JpInverterDto();
......
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