修改数据单位转化系数

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

@@ -75,7 +75,7 @@ public class JpStationController extends BaseController {
     private static String ZX="在线";
     private static String LX="离线";
     private static String BJ="报警";
-
+    private static int FDXSS=1000;
     /**
      * 新增第三方场站
      *
@@ -492,13 +492,13 @@ public class JpStationController extends BaseController {
         Map<String,Object> map=new HashMap<>();
         DecimalFormat format2 = new DecimalFormat("0.00");
         //炭
-        map.put("carbon",format2.format(jpStation.getAccumulatedPower()*CARBON));
+        map.put("carbon",format2.format(jpStation.getAccumulatedPower()*FDXSS*CARBON));
         //硫
-        map.put("sulfur",format2.format(jpStation.getAccumulatedPower()*SULFUR));
+        map.put("sulfur",format2.format(jpStation.getAccumulatedPower()*FDXSS*SULFUR));
         //粉尘
-        map.put("dust",format2.format(jpStation.getAccumulatedPower()*DUST));
+        map.put("dust",format2.format(jpStation.getAccumulatedPower()*FDXSS*DUST));
         //煤
-        map.put("coal",format2.format(jpStation.getAccumulatedPower()*COAL));
+        map.put("coal",format2.format(jpStation.getAccumulatedPower()*FDXSS*COAL));
         itemList.add(map);
         result.setCurrent(1);
         result.setTotal(1);

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

@@ -60,6 +60,8 @@ public class JpStationServiceImpl extends BaseService<JpStationDto,JpStation,JpS
     @Autowired
     YearGenerateMapper   yearGenerateMapper;
 
+    private static double FDL=0.0001;
+
     /**
      * 分页查询
      */
@@ -229,7 +231,7 @@ public class JpStationServiceImpl extends BaseService<JpStationDto,JpStation,JpS
                     for (int i = 0; i < listx.size(); i++) {
                         if(datum.getDate().equals(listx.get(i).toString())){
                             listy.remove(i);
-                            String format = datum.getNum()!=null?new DecimalFormat("0.000").format(datum.getNum()):null;
+                            String format = datum.getNum()!=null?new DecimalFormat("0.000").format(datum.getNum()*FDL):null;
                             listy.add(i,format);
                             break;
                         }