解决冲突

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

@@ -1047,7 +1047,7 @@ public class MonitorFanIdxController extends BaseController {
         Double totalAnnual = (powerOfAnnualFD.get() + powerOfAnnualGF.get());
         HashMap<String, String> stringHashMap13 = new HashMap<>();
         stringHashMap13.put("title", String.format(CommonConstans.Twodecimalplaces, (totalAnnual * CommonConstans.carbonDioxide * CommonConstans.kgToT)));
-        stringHashMap13.put("unit", "二氧化碳减排量（ft）");
+        stringHashMap13.put("unit", "二氧化碳减排量（t）");
         list3.add(stringHashMap13);
         HashMap<String, String> stringHashMap14 = new HashMap<>();
         stringHashMap14.put("title", String.format(CommonConstans.Twodecimalplaces, (totalAnnual * CommonConstans.standardCoal * CommonConstans.kgToT)));

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

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