更新监盘数据接口

amos-boot-system-jxiop/amos-boot-module-jxiop-monitor-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/controller/MonitorFanIdxController.java

@@ -238,7 +238,7 @@ public class MonitorFanIdxController extends BaseController {
 
         objects.add(data6);
         Map<String, Object> data7 = new HashMap<>();
-        data7.put("title",String.format("%.2f",Double.parseDouble(columnMap.get("日发电量").toString())/ (Double.parseDouble(columnMap.get("装机容量").toString())*1000)));
+        data7.put("title",String.format("%.2f",((Double.parseDouble(columnMap.get("日发电量").toString())*10)/ (Double.parseDouble(columnMap.get("装机容量").toString())))));
         objects.add(data7);
 
         IPage<Map<String,Object>> result = new Page<>();
@@ -589,7 +589,7 @@ public class MonitorFanIdxController extends BaseController {
         //日-月-年-发电量需要保留四位小数问题修改
         for (String column : columnList) {
             Double result = commonService.getTotalByIndicatior(mapList, column);
-            columnMap.put(column, String.format("%.4f",result));
+            columnMap.put(column, String.format("%.4f",result/10000));
         }
         for (String column : syLists) {
             Double result = commonService.getNumByIndicatior(boosterGatewayId, column);
@@ -607,10 +607,6 @@ public class MonitorFanIdxController extends BaseController {
         Double capacityl = commonService.getStationCapactityByStationWerks(stationBasic.getStationNumber());
         //装机容量保留两位小数
         columnMap.put("装机容量",String.format("%.2f",capacityl));
-
-
-
-
         List<Map<String,Object>> objects = new ArrayList<>();
         Map<String, Object> data = new HashMap<>();
         data.put("title",columnMap.get("装机容量").toString());
@@ -642,8 +638,6 @@ public class MonitorFanIdxController extends BaseController {
         Map<String, Object> data9 = new HashMap<>();
         data9.put("title","0.00%");//综合效率
         objects.add(data9);
-
-
         IPage<Map<String,Object>> result = new Page<>();
         result.setRecords(objects);
         result.setCurrent(1);

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

@@ -302,22 +302,26 @@ public class CommonServiceImpl {
     //二氧化硫贡献度
     SocialContributionDto so2 = new SocialContributionDto();
     /** 社会贡献原始计算公式，后边的数据已经经过处理
-     //二氧化碳计算公式  *10000*832/10000/1000/1000
-     //标准煤计算公式  *10000*304.9/10000/1000/1000
-     //碳粉尘计算公式 *10000*0.032/1000/1000
-     //二氧化硫计算公式  =A2*10000*0.16/1000/1000
+     发电量完成率=（月/年）发电量/（月/年）发电量指标
+     小时数完成率=（月/年）可利用小时/（月/年）可利用小时数指标
+     可利用小时(h)=（日/月/年）发电量（万kW·h）/装机容量（万kW）
+     二氧化碳减排量（万t）=发电量（万kW·h）*0.79
+     节约标准煤（万t）=发电量（万kW·h）*0.29
+     炭粉尘减排量（t）=发电量（万kW·h）*0.30
+     二氧化硫减排量（t）=发电量（万kW·h）*1.51
+     氮氧化物减排量（t）=发电量（万kW·h）*1.69
      */
         co2.setUnit("二氧化碳减排量（万t）");
-        co2.setTitle(String.format("%.2f",totalSocialContribution * 0.000832));
+        co2.setTitle(String.format("%.2f",totalSocialContribution * 0.79));
         socialContributionDtoList.add(co2);
         coal.setUnit("节约标准煤（万t）");
-        coal.setTitle(String.format("%.2f",totalSocialContribution * 0.0003049));
+        coal.setTitle(String.format("%.2f",(totalSocialContribution * 0.29)/10000));
         socialContributionDtoList.add(coal);
         toner.setUnit("碳粉尘减排量（万t）");
-        toner.setTitle(String.format("%.2f",totalSocialContribution * 0.00032));
+        toner.setTitle(String.format("%.2f",(totalSocialContribution * 0.30)/10000));
         socialContributionDtoList.add(toner);
         so2.setUnit("二氧化硫减排量（万t）");
-        so2.setTitle(String.format("%.2f",totalSocialContribution * 0.0016));
+        so2.setTitle(String.format("%.2f",(totalSocialContribution * 1.51)/10000));
         socialContributionDtoList.add(so2);
         socialContributionDtoPage.setRecords(socialContributionDtoList);
         socialContributionDtoPage.setTotal(100);