运行监盘-全国碳排放计算错误问题修改

amos-boot-system-jxiop/amos-boot-module-jxiop-monitor-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/constants/CommonConstans.java

@@ -23,25 +23,30 @@ public class CommonConstans {
 //            装机容量=场站所有逆变器装机容量总和
 //
 //    通用：
-//    发电量完成率=（月/年）发电量/（月/年）发电量指标
-//    小时数完成率=（月/年）可利用小时/（月/年）可利用小时数指标
-//    可利用小时(h)=（日/月/年）发电量（万kW·h）/装机容量（万kW）
-//    二氧化碳减排量（万t）=发电量（万kW·h）*0.997 * 10 / 10000
-    public static final Double carbonDioxide = 0.997 * 10 / 10000;
-    //    节约标准煤（万t）=发电量（万kW·h）*0.29
-    public static final Double standardCoal = 0.29/10000;
-    //    炭粉尘减排量（t）=发电量（万kW·h）*0.30
-    public static final Double toner = 0.30;
-    //    二氧化硫减排量（t）=发电量（万kW·h）*1.51
-    public static final Double sulfurDioxide = 1.51;
-    //    氮氧化物减排量（t）=发电量（万kW·h）*1.69
-    public static final Double oxynitride = 1.69;
+//           ◎节省标准煤：发电量0.410
+//            ◎节省千克原煤：发电量0.559810
+//            ◎减排千克“二氧化碳”：发电量0.99710
+//            ◎减排千克“碳粉尘”：发电量0.27210
+//            ◎减排千克二氧化硫：发电量0.0310
+//            ◎减排千克氮氧化物：发电量0.01510
+    // 二氧化碳
+    public static final Double carbonDioxide = 0.997 * 10;
+    //标准煤
+    public static final Double standardCoal = 0.4 * 10;
+    //炭粉尘减排量
+    public static final Double toner = 0.272 * 10;
+    //二氧化硫减排量
+    public static final Double sulfurDioxide = 0.03 * 10;
+    //氮氧化物减排量
+    public static final Double oxynitride = 0.015 * 10;
+    //千克转吨
+    public static final Double kgToT = 0.001;
     //吨转万吨
     public static final Double tToWT = 0.0001;
     //万Kwh转MV
     public static final Integer wkwhToMv = 10;
     //kw转MV
-    public static final Double kwToMv =0.0001 ;
+    public static final Double kwToMv = 0.0001;
 
 
 //    正常运行	发电状态=1
@@ -109,11 +114,11 @@ public class CommonConstans {
     public static final String QueryStringDisplayNameKeyword = "displayName.keyword";
     public static final String QueryStringIsAlarm = "isAlarm";
     public static final String QueryStringIsAlarmKeyword = "isAlarm.keyword";
-    public static final String  Twodecimalplaces= "%.2f";
+    public static final String Twodecimalplaces = "%.2f";
     public static final String Fourdecimalplaces = "%.4f";
     public static final String QueryStringFrontMoudleNotKeyWord = "frontModule";
     //泰和的发电量数据
-    public static final List<String> taiHeGenIndicator = new ArrayList<>(Arrays.asList("泰和日发电量总和","泰和月发电量总和","泰和年发电量总和"));
+    public static final List<String> taiHeGenIndicator = new ArrayList<>(Arrays.asList("泰和日发电量总和", "泰和月发电量总和", "泰和年发电量总和"));
     public static final String taiHeGenIndicatorDay = "泰和日发电量总和";
     public static final String taiHeGenIndicatorMonth = "泰和月发电量总和";
     public static final String taiHeGenIndicatorYear = "泰和年发电量总和";

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

@@ -362,17 +362,17 @@ public class CommonServiceImpl {
          二氧化硫减排量（t）=发电量（万kW·h）*1.51
          氮氧化物减排量（t）=发电量（万kW·h）*1.69
          */
-        co2.setUnit("二氧化碳减排量（万t）");
-        co2.setTitle(String.format("%.2f", totalSocialContribution * CommonConstans.carbonDioxide));
+        co2.setUnit("二氧化碳减排量（t）");
+        co2.setTitle(String.format("%.2f", totalSocialContribution * CommonConstans.carbonDioxide*CommonConstans.kgToT));
         socialContributionDtoList.add(co2);
-        coal.setUnit("节约标准煤（万t）");
-        coal.setTitle(String.format("%.2f", (totalSocialContribution * CommonConstans.standardCoal)));
+        coal.setUnit("节约标准煤（t）");
+        coal.setTitle(String.format("%.2f", (totalSocialContribution * CommonConstans.standardCoal*CommonConstans.kgToT)));
         socialContributionDtoList.add(coal);
-        toner.setUnit("碳粉尘减排量（万t）");
-        toner.setTitle(String.format("%.2f", (totalSocialContribution * CommonConstans.toner * CommonConstans.tToWT)));
+        toner.setUnit("碳粉尘减排量（t）");
+        toner.setTitle(String.format("%.2f", (totalSocialContribution * CommonConstans.toner * CommonConstans.kgToT)));
         socialContributionDtoList.add(toner);
-        so2.setUnit("二氧化硫减排量（万t）");
-        so2.setTitle(String.format("%.2f", (totalSocialContribution * CommonConstans.sulfurDioxide * CommonConstans.tToWT)));
+        so2.setUnit("二氧化硫减排量（t）");
+        so2.setTitle(String.format("%.2f", (totalSocialContribution * CommonConstans.sulfurDioxide * CommonConstans.kgToT)));
         socialContributionDtoList.add(so2);
         socialContributionDtoPage.setRecords(socialContributionDtoList);
         socialContributionDtoPage.setTotal(100);

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

@@ -1044,20 +1044,20 @@ public class MonitoringServiceImpl {
         page2.setRecords(list2);
         Double totalAnnual = (powerOfAnnualFD + powerOfAnnualGF);
         HashMap<String, String> stringHashMap13 = new HashMap<>();
-        stringHashMap13.put("title1", String.format(CommonConstans.Twodecimalplaces, (totalAnnual * CommonConstans.carbonDioxide)));
-        stringHashMap13.put("title2", "二氧化碳减排量（万t）");
+        stringHashMap13.put("title1", String.format(CommonConstans.Twodecimalplaces, (totalAnnual * CommonConstans.carbonDioxide * CommonConstans.kgToT)));
+        stringHashMap13.put("title2", "二氧化碳减排量（t）");
         list3.add(stringHashMap13);
         HashMap<String, String> stringHashMap14 = new HashMap<>();
-        stringHashMap14.put("title1", String.format(CommonConstans.Twodecimalplaces, (totalAnnual * CommonConstans.standardCoal)));
-        stringHashMap14.put("title2", "节约标准煤（万t）");
+        stringHashMap14.put("title1", String.format(CommonConstans.Twodecimalplaces, (totalAnnual * CommonConstans.standardCoal * CommonConstans.kgToT)));
+        stringHashMap14.put("title2", "节约标准煤（t）");
         list3.add(stringHashMap14);
         HashMap<String, String> stringHashMap15 = new HashMap<>();
-        stringHashMap15.put("title1", String.format(CommonConstans.Twodecimalplaces, (totalAnnual * CommonConstans.toner * CommonConstans.tToWT)));
-        stringHashMap15.put("title2", "碳粉尘减排量（万t）");
+        stringHashMap15.put("title1", String.format(CommonConstans.Twodecimalplaces, (totalAnnual * CommonConstans.toner * CommonConstans.kgToT)));
+        stringHashMap15.put("title2", "碳粉尘减排量（t）");
         list3.add(stringHashMap15);
         HashMap<String, String> stringHashMap16 = new HashMap<>();
-        stringHashMap16.put("title1", String.format(CommonConstans.Twodecimalplaces, (totalAnnual * CommonConstans.sulfurDioxide * CommonConstans.tToWT)));
-        stringHashMap16.put("title2", "二氧化硫减排量（万t）");
+        stringHashMap16.put("title1", String.format(CommonConstans.Twodecimalplaces, (totalAnnual * CommonConstans.sulfurDioxide * CommonConstans.kgToT)));
+        stringHashMap16.put("title2", "二氧化硫减排量（t）");
         list3.add(stringHashMap16);
         page3.setRecords(list3);
         try {