Merge branch 'developer' of http://36.40.66.175:5000/moa/jxdj_zx/amos-boot-zx-biz into developer

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/controller/JpStationController.java

@@ -40,10 +40,25 @@ import java.util.stream.Collectors;
 @RequestMapping(value = "/jp-station")
 public class JpStationController extends BaseController {
 
-    private static Double CARBON = 0.997 * 0.001;
-    private static Double SULFUR = 0.03 * 0.001;
-    private static Double DUST = 0.272 * 0.001;
-    private static Double COAL = 0.4 * 0.001;
+//    //炭
+//    private static Double CARBON = 0.997 * 0.001;
+//    //硫
+//    private static Double SULFUR = 0.03 * 0.001;
+//    //粉尘
+//    private static Double DUST = 0.272 * 0.001;
+//    //煤
+//    private static Double COAL = 0.4 * 0.001;
+
+    //炭
+    private static Double CARBON = 832 * 0.001 * 0.001;
+    //硫
+    private static Double SULFUR = 0.16 * 0.001 * 0.001;
+    //粉尘
+    private static Double DUST = 0.032 * 0.001 * 0.001;
+    //煤
+    private static Double COAL = 304.9 * 0.001 * 0.001;
+
+
     private static String ZX = "在线";
     private static String LX = "离线";
     private static String BJ = "报警";
@@ -543,6 +558,8 @@ public class JpStationController extends BaseController {
         map.put("dust", format2.format(accumulatedPower * FDXSS * DUST));
         //煤
         map.put("coal", format2.format(accumulatedPower * FDXSS * COAL));
+
+
         itemList.add(map);
         result.setCurrent(1);
         result.setTotal(1);