Commit b09b0e2f authored by chenzhao's avatar chenzhao

修改代码

parent 991d4dad
...@@ -21,7 +21,7 @@ public class CommonConstans { ...@@ -21,7 +21,7 @@ public class CommonConstans {
// 二氧化碳减排量(万t)=发电量(万kW·h)*0.997 * 10 / 10000 // 二氧化碳减排量(万t)=发电量(万kW·h)*0.997 * 10 / 10000
public static final Double carbonDioxide = 0.997 * 10 / 10000; public static final Double carbonDioxide = 0.997 * 10 / 10000;
// 节约标准煤(万t)=发电量(万kW·h)*0.29 // 节约标准煤(万t)=发电量(万kW·h)*0.29
public static final Double standardCoal = 0.29; public static final Double standardCoal = 0.29/10000;
// 炭粉尘减排量(t)=发电量(万kW·h)*0.30 // 炭粉尘减排量(t)=发电量(万kW·h)*0.30
public static final Double toner = 0.30; public static final Double toner = 0.30;
// 二氧化硫减排量(t)=发电量(万kW·h)*1.51 // 二氧化硫减排量(t)=发电量(万kW·h)*1.51
......
...@@ -819,8 +819,8 @@ public class MonitoringServiceImpl { ...@@ -819,8 +819,8 @@ public class MonitoringServiceImpl {
//装机容量 //装机容量
HashMap<String, String> stringHashMap = new HashMap<>(); HashMap<String, String> stringHashMap = new HashMap<>();
BigDecimal totalInstall = new BigDecimal(getInstallCapity(stationBasicListAll)); BigDecimal totalInstall = new BigDecimal(getInstallCapity(stationBasicListAll));
stringHashMap.put("title", totalInstall.toString()); // stringHashMap.put("title", totalInstall.toString());
stringHashMap.put("data", ""); //stringHashMap.put("data", "");
// list.add(stringHashMap); // list.add(stringHashMap);
//风电站 //风电站
HashMap<String, String> stringHashMap1 = new HashMap<>(); HashMap<String, String> stringHashMap1 = new HashMap<>();
......
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