Commit 8f3f8ec6 authored by wujiang's avatar wujiang

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

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