修改实时理论功率绑定测点

web/runeconomy-xk/src/main/java/com/gyee/runeconomy/model/vo/SingleAnalysisVo.java

@@ -54,6 +54,8 @@ public class SingleAnalysisVo implements java.io.Serializable {
     private Double zdxs;
     //运行小时
     private Double yxxs;
+    //运行小时
+    private Double djxs;
     //利用小时
     private Double lyxs;
     //设备可利用率

web/runeconomy-xk/src/main/java/com/gyee/runeconomy/service/singleanalysis/SingleAnalysisService.java

@@ -834,13 +834,13 @@ public class SingleAnalysisService {
                 vo.setLlfdl(StringUtils.round(llfdl, 2));
 
                 double powerProduction = 0;
-                if (CacheContext.modelMap.containsKey(wt.getId())) {
-                    ProEconEquipmentmodel model = CacheContext.modelMap.get(wt.getId());
+                if (CacheContext.modelMap.containsKey(wt.getModelId())) {
+                    ProEconEquipmentmodel model = CacheContext.modelMap.get(wt.getModelId());
                     powerProduction = model.getPowerProduction();
                 }
                 double lyxs = 0.0;
                 if (powerProduction != 0) {
-                    lyxs = new BigDecimal(fdl).divide(new BigDecimal(powerProduction/10000), 2, RoundingMode.HALF_EVEN).doubleValue();//风机平均利用小时
+                    lyxs = new BigDecimal(wtd.getYfdl()).divide(new BigDecimal(powerProduction), 2, RoundingMode.HALF_EVEN).doubleValue();//风机平均利用小时
                 }
 
 
@@ -854,6 +854,7 @@ public class SingleAnalysisService {
 
             }
 
+//            vo.setYxfss(StringUtils.round(dayTimes, 2));
             if (eqday2map.containsKey(wt.getId())) {
 
                 ProEconEquipmentInfoDay2 wtd = eqday2map.get(wt.getId());
@@ -861,6 +862,7 @@ public class SingleAnalysisService {
                 double yxxs = null != wtd.getYyxxs() ? wtd.getYyxxs() : 0.0;//风机运行小时合计
                 double gzxs = null != wtd.getYgztjxs() ? wtd.getYgztjxs() : 0.0;//风机故障小时合计
                 double jxxs = null != wtd.getYjxtjxs() ? wtd.getYjxtjxs() : 0.0;//风机检修小时合计
+                double djxs = null != wtd.getYdjxs() ? wtd.getYdjxs() : 0.0;//风机待机小时合计
                 double tjxs = null != wtd.getYxdxs() ? wtd.getYxdxs() : 0.0;//风限电小时合计
                 double zdxs = null != wtd.getYtxzdxs() ? wtd.getYtxzdxs() : 0.0;//风机中断小时合计
                 double sbklyl = new BigDecimal(dayTimes - gzxs).divide(new BigDecimal(dayTimes), 2, RoundingMode.HALF_EVEN).multiply(new BigDecimal(100)).doubleValue();//风机平均设备可利用率
@@ -868,7 +870,9 @@ public class SingleAnalysisService {
 
 
                 double yxfss = dayTimes - gzxs - jxxs;//风机平均有效风
-                vo.setYxxs(StringUtils.round(yxfss, 2));
+
+//                System.out.println(yxfss);
+                vo.setYxfss(StringUtils.round(yxfss, 2));
                 vo.setDxklyxs(StringUtils.round(dxklyxs, 2));
                 vo.setSbklyl(StringUtils.round(sbklyl, 2));
                 vo.setYxxs(StringUtils.round(yxxs, 2));
@@ -876,7 +880,7 @@ public class SingleAnalysisService {
                 vo.setJxxs(StringUtils.round(jxxs, 2));
                 vo.setTjxs(StringUtils.round(tjxs, 2));
                 vo.setZdxs(StringUtils.round(zdxs, 2));
-
+                vo.setDjxs(StringUtils.round(djxs, 2));
 
             }
 
@@ -994,6 +998,13 @@ public class SingleAnalysisService {
                         if (map1.containsKey(wtd.getRecordDate().getTime())) {
                             ProEconEquipmentInfoDay1 daypo = map1.get(wtd.getRecordDate().getTime());
                             double fdl = null != daypo.getRfdl() ? daypo.getRfdl() : 0.0;//风机发电量合计
+                            if(CacheContext.modelMap.containsKey(wt.getModelId()))
+                            {
+                                ProEconEquipmentmodel model=CacheContext.modelMap.get(wt.getModelId());
+                                double lyxs = new BigDecimal(fdl).divide(new BigDecimal(model.getPowerProduction()), 2, RoundingMode.HALF_UP).doubleValue();
+                                vo.setLyxs(lyxs);
+                            }
+
                             fdl = new BigDecimal(fdl).divide(new BigDecimal(10000), 2, RoundingMode.HALF_UP).doubleValue();
                             double fs = null != daypo.getRpjfs() ? daypo.getRpjfs() : 0.0;//风机平均风速
                             vo.setFdl(StringUtils.round(fdl, 2));