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

web/runeconomy-xk/src/main/java/com/gyee/runeconomy/service/auto/impl/ProEconEquipmentInfoDayTopServiceImpl.java

@@ -98,13 +98,24 @@ public class ProEconEquipmentInfoDayTopServiceImpl extends ServiceImpl<ProEconEq
         }
         if (null != types && types.equals(2)) {
 
-            qw.lambda().eq(ProEconEquipmentInfoDayTop::getMonth, Integer.valueOf(result));
-            qw.lambda().eq(ProEconEquipmentInfoDayTop::getYear, Integer.valueOf(str1));
+//            Calendar c= Calendar.getInstance();
+//            c.set(Calendar.YEAR,Integer.valueOf(str1));
+//            c.set(Calendar.MONTH,Integer.valueOf(result)-1);
+//            c.set(Calendar.DAY_OF_MONTH, c.getActualMaximum(Calendar.DAY_OF_MONTH));
+
+
+            qw.lambda().eq(ProEconEquipmentInfoDayTop::getRecordDate, DateUtils.parseDate(date));
             qw.lambda().eq(ProEconEquipmentInfoDayTop::getTypes, 2);
+
+            qw.lambda().orderByDesc(ProEconEquipmentInfoDayTop::getRecordDate);
         }
         if (null != types && types.equals(3)) {
-            qw.lambda().eq(ProEconEquipmentInfoDayTop::getYear, Integer.valueOf(str1));
+//            Calendar c= Calendar.getInstance();
+//            c.set(Calendar.YEAR,Integer.valueOf(str1));
+//            c.set(Calendar.DAY_OF_YEAR, c.getActualMaximum(Calendar.DAY_OF_YEAR));
+            qw.lambda().eq(ProEconEquipmentInfoDayTop::getRecordDate, DateUtils.parseDate(date));
             qw.lambda().eq(ProEconEquipmentInfoDayTop::getTypes, 3);
+            qw.lambda().orderByDesc(ProEconEquipmentInfoDayTop::getRecordDate);
         }
 
 

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

@@ -811,11 +811,17 @@ public class SingleAnalysisService {
                 double fs = null != wtd.getYpjfs() ? wtd.getYpjfs() : 0.0;//风机平均风速
 
                 double gzss = null != wtd.getYgzssdl() ? wtd.getYgzssdl() : 0.0;//风机故障损失合计
+                gzss=new BigDecimal(gzss).divide(new BigDecimal(10000), 2, RoundingMode.HALF_UP).doubleValue();
                 double jxss = null != wtd.getYjxssdl() ? wtd.getYjxssdl() : 0.0;//风机检修损失合计
+                jxss=new BigDecimal(jxss).divide(new BigDecimal(10000), 2, RoundingMode.HALF_UP).doubleValue();
                 double xdss = null != wtd.getYxdtjssdl() ? wtd.getYxdtjssdl() : 0.0;//风机限电损失合计
+                xdss=new BigDecimal(xdss).divide(new BigDecimal(10000), 2, RoundingMode.HALF_UP).doubleValue();
                 double xnss = null != wtd.getYxnssdl() ? wtd.getYxnssdl() : 0.0;//风机性能损失时合计
+                xnss=new BigDecimal(xnss).divide(new BigDecimal(10000), 2, RoundingMode.HALF_UP).doubleValue();
                 double ycwsldwssdl = null != wtd.getYcwsldwssdl() ? wtd.getYcwsldwssdl() : 0.0;//场外受累电网损失电量
+                ycwsldwssdl=new BigDecimal(ycwsldwssdl).divide(new BigDecimal(10000), 2, RoundingMode.HALF_UP).doubleValue();
                 double ycwsltqssdl = null != wtd.getYcwsltqssdl() ? wtd.getYcwsldwssdl() : 0.0;//场外受累天气损失电量
+                ycwsltqssdl=new BigDecimal(ycwsltqssdl).divide(new BigDecimal(10000), 2, RoundingMode.HALF_UP).doubleValue();
                 double slss = StringUtils.round(ycwsldwssdl + ycwsltqssdl, 2);
 
                 double llfdl = fdl + gzss + jxss + xdss + xnss + slss; //理论发电量
@@ -834,7 +840,7 @@ public class SingleAnalysisService {
                 }
                 double lyxs = 0.0;
                 if (powerProduction != 0) {
-                    lyxs = new BigDecimal(fdl).divide(new BigDecimal(powerProduction), 2, RoundingMode.HALF_EVEN).doubleValue();//风机平均利用小时
+                    lyxs = new BigDecimal(fdl).divide(new BigDecimal(powerProduction/10000), 2, RoundingMode.HALF_EVEN).doubleValue();//风机平均利用小时
                 }