首页bug修改

web/runeconomy-xk/src/main/java/com/gyee/runeconomy/service/monitor/MonitorService.java

@@ -560,6 +560,7 @@ public class MonitorService {
                     //实时功率
                     ProBasicPowerstationPoint sjglvalue = proBasicPowerstationPointService.getPowerstationPoint(wpId, ContantXk.SSZGL);
                     sjgl = edosUtil.getRealData(sjglvalue).getPointValueInDouble() + (fdlr * 1000) + (gflr * 1000);
+                    sjgl = sjgl /1000;
                 } else if (wpId.contains(FD)) {
                     //实时功率
                     ProBasicPowerstationPoint sjglvalue = proBasicPowerstationPointService.getPowerstationPoint(wpId, ContantXk.SSZGL);
@@ -619,8 +620,10 @@ public class MonitorService {
                     //实时功率
                     ProBasicPowerstationPoint fdsjglvalue = proBasicPowerstationPointService.getPowerstationPoint(str.substring(0, str.indexOf("0")) + "-1", ContantXk.SSZGL);
                     fdsjgl = edosUtil.getRealData(fdsjglvalue).getPointValueInDouble() + (fdlr * 1000);
+                    fdsjgl= fdsjgl / 1000;
                     ProBasicPowerstationPoint gfsjglvalue = proBasicPowerstationPointService.getPowerstationPoint(str.substring(0, str.indexOf("0")) + "-2", ContantXk.SSZGL);
                     gfsjgl = edosUtil.getRealData(gfsjglvalue).getPointValueInDouble() + (gflr * 1000);
+                    gfsjgl = gfsjgl / 1000;
                 }
                 if (wpId.contains(FD)) {
                     ProBasicPowerstationPoint fdsjglvalue = proBasicPowerstationPointService.getPowerstationPoint(wpId, ContantXk.SSZGL);
@@ -658,6 +661,9 @@ public class MonitorService {
                 //实时功率
                 ProBasicPowerstationPoint sjglvalue = proBasicPowerstationPointService.getPowerstationPoint(wpId, ContantXk.SSZGL);
                 sjgl = edosUtil.getRealData(sjglvalue).getPointValueInDouble();
+                sjgl = sjgl /1000;
+                fdsjgl = sjgl;
+                gfsjgl = sjgl;
 
                 //实时风速
                 ProBasicPowerstationPoint ssfsvalue = proBasicPowerstationPointService.getPowerstationPoint(wpId, ContantXk.SSPJFS);
@@ -681,6 +687,7 @@ public class MonitorService {
                 //理论功率
                 ProBasicPowerstationPoint llglvalue = proBasicPowerstationPointService.getPowerstationPoint(wpId, ContantXk.SSZNHGLZS);
                 llgl = edosUtil.getRealData(llglvalue).getPointValueInDouble();
+                llgl = llgl /1000;
 
                 //节约水
                 ProBasicPowerstationPoint jysvalue = proBasicPowerstationPointService.getPowerstationPoint(wpId, ContantXk.JYS);

web/runeconomy-xk/src/main/java/com/gyee/runeconomy/service/monitor/StationMonitorService.java

@@ -152,7 +152,7 @@ public class StationMonitorService {
         nfdl = new BigDecimal(nfdl).divide(new BigDecimal(10000), 2, RoundingMode.HALF_EVEN).doubleValue();
         resultMap.put("nfdl", nfdl);
         resultMap.put("sspjfsgzd", realData.get(24).getPointValueInDouble());
-        resultMap.put("yggl", MathUtil.twoBit(realData.get(25).getPointValueInDouble()));
+        resultMap.put("yggl", MathUtil.twoBit(realData.get(25).getPointValueInDouble() /1000));
         resultMap.put("fhl", (proBasicPowerstation.getJrwindCapacity() + proBasicPowerstation.getJrCapacity()) != 0 ? realData.get(25).getPointValueInDouble() / (proBasicPowerstation.getJrwindCapacity() + proBasicPowerstation.getJrCapacity()) * 100 : 0);
         resultMap.put("ylyxs", realData.get(26).getPointValueInDouble());
         resultMap.put("nlyxs", realData.get(27).getPointValueInDouble());