修改计划完成率

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

@@ -295,15 +295,15 @@ public class LargeScreenImpl {
         Double sumValue = list != null && !list.isEmpty() ? (Double) list.get(0).get("sum_value") : 0;
         //计算年完成百分比
         Double ybfb = sumValue > 0 ? mapdta.get("YFD") / sumValue * 100 : 0;
-        ybfb = new BigDecimal(ybfb).setScale(4, BigDecimal.ROUND_HALF_UP).doubleValue();
+        ybfb = new BigDecimal(ybfb).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue();
 
         mapdta.put("YJHWC", ybfb);
         QueryWrapper<StationPlan> wrapper1 = new QueryWrapper<>();
         wrapper1.select("ifnull(sum(value), 0) as sum_value");
         List<Map<String, Object>> list1 = StationPlanMapper.selectMaps(wrapper1);
         Double sumValuen = list1 != null && !list1.isEmpty() ? (Double) list1.get(0).get("sum_value") : 0;
-        Double ybfbn = sumValuen > 0 ? mapdta.get("NFD") / sumValue * 100 : 0;
-        ybfbn = new BigDecimal(ybfbn).setScale(4, BigDecimal.ROUND_HALF_UP).doubleValue();
+        Double ybfbn = sumValuen > 0 ? mapdta.get("NFD") / sumValuen * 100 : 0;
+        ybfbn = new BigDecimal(ybfbn).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue();
         mapdta.put("NJHWC", ybfbn);
         try {
             emqKeeper.getMqttClient().publish("qyyxzb/"+s, JSON.toJSONString(mapdta).getBytes(),0,false);

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

@@ -786,7 +786,7 @@ public class MonitoringServiceImpl {
     public void getTotalData() {
         //计算所有场站年计划完成量
         int year = Calendar.getInstance().get(Calendar.YEAR);
-        int Moon = Calendar.getInstance().get(Calendar.MONTH);
+        int Moon = Calendar.getInstance().get(Calendar.MONTH)+1;
         LambdaQueryWrapper<StationPlan> query =  new LambdaQueryWrapper<>();
         query.eq(StationPlan::getYear,String.valueOf(year));
         List<StationPlan> stationPlans = stationPlanMapper.selectList(query);
@@ -794,7 +794,7 @@ public class MonitoringServiceImpl {
         double fdzValue = stationPlans.stream().filter(e -> e.getStationType().equals("FDZ")).mapToDouble(StationPlan::getValue).sum();
         double gfvalue = yearValue - fdzValue;
 
-        double moonValue =  stationPlans.stream().filter(e ->e.getMonthly().equals(Moon)).mapToDouble(StationPlan::getValue).sum();
+        double moonValue =  stationPlans.stream().filter(e ->e.getMonthly().equals(String.valueOf(Moon))).mapToDouble(StationPlan::getValue).sum();
 
         //查询风电站年计划完成量
 //
@@ -905,15 +905,15 @@ public class MonitoringServiceImpl {
         HashMap<String, String> stringHashMap10 = new HashMap<>();
         stringHashMap10.put("title", String.format(CommonConstans.Twodecimalplaces, powerOfMonthFD.get() + powerOfMonthGF.get() * CommonConstans.pvGenPoweActornew));
         resultMap.put("Moon", String.format(CommonConstans.Fourdecimalplaces, powerOfMonthFD.get() + powerOfMonthGF.get() * CommonConstans.pvGenPoweActornew));
-        resultMap.put("YJHWC", String.format(CommonConstans.Twodecimalplaces, (powerOfMonthFD.get() + powerOfMonthGF.get() * CommonConstans.pvGenPoweActornew)/moonValue));
+        resultMap.put("YJHWC", String.format(CommonConstans.Twodecimalplaces, (powerOfMonthFD.get() + powerOfMonthGF.get() * CommonConstans.pvGenPoweActornew)/moonValue* 100));
         list2.add(stringHashMap10);
         HashMap<String, String> stringHashMap11 = new HashMap<>();
         stringHashMap11.put("title", String.format(CommonConstans.Fourdecimalplaces, powerOfAnnualFD.get() + powerOfAnnualGF.get() * CommonConstans.pvGenPoweActornew));
         resultMap.put("Year",String.format(CommonConstans.Fourdecimalplaces, powerOfAnnualFD.get() + powerOfAnnualGF.get() * CommonConstans.pvGenPoweActornew));
         list2.add(stringHashMap11);
         HashMap<String, String> stringHashMap12 = new HashMap<>();
-        stringHashMap12.put("title", String.format(CommonConstans.Twodecimalplaces, (powerOfAnnualFD.get() + powerOfAnnualGF.get()*CommonConstans.pvGenPoweActornew) /yearValue));
-        resultMap.put("NJHWC",String.format(CommonConstans.Twodecimalplaces, (powerOfAnnualFD.get() + powerOfAnnualGF.get()*CommonConstans.pvGenPoweActornew) /yearValue));
+        stringHashMap12.put("title", String.format(CommonConstans.Twodecimalplaces, (powerOfAnnualFD.get() + powerOfAnnualGF.get()*CommonConstans.pvGenPoweActornew) /yearValue* 100));
+        resultMap.put("NJHWC",String.format(CommonConstans.Twodecimalplaces, (powerOfAnnualFD.get() + powerOfAnnualGF.get()*CommonConstans.pvGenPoweActornew) /yearValue* 100));
         list2.add(stringHashMap12);
         page2.setRecords(list2);
         Double totalAnnual = (powerOfAnnualFD.get() + powerOfAnnualGF.get() * CommonConstans.pvGenPoweActornew);