监盘接口调整

amos-boot-system-jxiop/amos-boot-module-jxiop-monitor-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/service/impl/MonitoringServiceImpl.java

@@ -217,7 +217,7 @@ public class MonitoringServiceImpl {
                     completionOfPowerIndicatorsDto.setActivePower(String.valueOf(commonServiceImpl.getTotalByIndicatior(mapList, "有功功率")));
                     completionOfPowerIndicatorsDto.setDailyPower(String.valueOf(commonServiceImpl.getTotalByIndicatior(mapList, "日发电量")));
                     completionOfPowerIndicatorsDto.setMonthlyPower(String.valueOf(commonServiceImpl.getTotalByIndicatior(mapList, "月发电量")));
-                    completionOfPowerIndicatorsDto.setAnnualPower(String.valueOf(commonServiceImpl.getTotalByIndicatior(mapList, "年发电量")));
+                    completionOfPowerIndicatorsDto.setAnnualPower(String.format("%.2f",new BigDecimal(commonServiceImpl.getTotalByIndicatior(mapList, "年发电量"))));
                 }
 
 
@@ -811,7 +811,7 @@ public class MonitoringServiceImpl {
         stringHashMap11.put("title", String.format("%.2f",powerOfAnnualFD .get() + powerOfAnnualGF.get()));
         list2.add(stringHashMap11);
         HashMap<String, String> stringHashMap12 = new HashMap<>();
-        stringHashMap12.put("title", String.format("%.2f", (powerOfAnnualFD.get() + powerOfAnnualGF.get()) / totalInstall.doubleValue()));
+        stringHashMap12.put("title", String.format("%.2f", (powerOfAnnualFD.get()%200 + powerOfAnnualGF.get()%200)/2 ));
         list2.add(stringHashMap12);
         page2.setRecords(list2);
         HashMap<String, String> stringHashMap13 = new HashMap<>();