Merge branch 'master' of http://49.4.49.126:3000/GYEE_R.D/Gyee_Frame_NX

src/main/java/com/gyee/frame/service/websocket/GenreSetPushService.java

@@ -364,13 +364,13 @@ public class GenreSetPushService {
 
             if (id.equals(QS)) {
                 // 减排二氧化碳
-                Double jpeyht = realApiUtil.getRealData(ConstantTR.JPEYHT).getPointValueInDouble();
+                int jpeyht = (int) (realApiUtil.getRealData(ConstantTR.JPEYHT).getPointValueInDouble() * 10000);
                 // 节约标煤
-                Double jybm = realApiUtil.getRealData(ConstantTR.JYBM).getPointValueInDouble();
+                int jybm = (int)(realApiUtil.getRealData(ConstantTR.JYBM).getPointValueInDouble() * 10000);
                 // 减排二氧化硫
-                Double jpeyhl = realApiUtil.getRealData(ConstantTR.JPEYHL).getPointValueInDouble();
+                int jpeyhl = (int)(realApiUtil.getRealData(ConstantTR.JPEYHL).getPointValueInDouble() * 10000);
                 // 节约水
-                Double jys = realApiUtil.getRealData(ConstantTR.JYS).getPointValueInDouble();
+                int jys = (int)(realApiUtil.getRealData(ConstantTR.JYS).getPointValueInDouble() * 10000);
 
                 Double gfsjgl = realApiUtil.getRealData(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(GF, Constant.TPOINT_WP_SJGL)).getPointValueInDouble();