pg数据统计接口修改

realtime/generationXK-service/src/main/java/com/gyee/generation/service/EquipmentInfo15minuteService.java

@@ -35,20 +35,34 @@ public class EquipmentInfo15minuteService {
     /**
      * 计算设备15分钟信息
      */
-    public void calLineInfoMinute15(Date recordDate) throws Exception {
+    public void calEquipmentInfo15minute(Date recordDate) throws Exception {
         Calendar c=Calendar.getInstance();
         c.setTime(recordDate);
 
+       int minute= c.get(Calendar.MINUTE);
+        if(minute>=0 && minute<15){
+            c.set(Calendar.MINUTE,0);
+        }
+        else if(minute>=15 && minute<30)
+        {
+            c.set(Calendar.MINUTE,15);
+        }else if(minute>=30 && minute<45){
+           c.set(Calendar.MINUTE,30);
+       }else if(minute>=45 ){
+           c.set(Calendar.MINUTE,45);
+       }
+       c.set(Calendar.SECOND,0);
         Date end=c.getTime();
         c.add(Calendar.MINUTE,-15);
         Date begin= DateUtils.truncate(c.getTime());
 
         QueryWrapper<ProEconEquipmentInfo15minute> queryWrapper = new QueryWrapper<>();
-        queryWrapper.ge("record_date",DateUtils.truncate(recordDate));
+        queryWrapper.ge("record_date",recordDate);
+
         //判断是否有重复记录，先删除重复记录
         List<String> idls = proEconEquipmentInfo15minuteService.list(queryWrapper)
                .stream()
-//                .filter(i -> i.getRecordDate().compareTo(DateUtils.truncate(recordDate))==0
+//                .filter(i -> i.getRecordDate().compareTo(recordDate)==0
 //                        && CacheContext.wtmap.containsKey(i.getWindturbineId())
 //           )
                 .map(ProEconEquipmentInfo15minute::getId)
@@ -72,7 +86,7 @@ public class EquipmentInfo15minuteService {
                 pewp.setLineId(wt.getLineId());
                 pewp.setProjectId(wt.getProjectId());
                 pewp.setRegionId(wt.getRegionId());
-                pewp.setRecordDate(DateUtils.truncate(recordDate));
+                pewp.setRecordDate(recordDate);
 
 
 
@@ -336,8 +350,6 @@ public class EquipmentInfo15minuteService {
 
                     }
 
-
-
                 }
 
             }

realtime/generationXK-service/src/main/java/com/gyee/generation/service/ShutdownnewService.java

@@ -586,8 +586,6 @@ public class ShutdownnewService {
     }
 
 
-
-
     private  String newMethod( String windturbineId, Date begin, Date end)
     {
         String result = "";
@@ -665,21 +663,16 @@ public class ShutdownnewService {
                 }
             }
 
-
-
-
             //日故障损失电量
             if(wtpointmap.containsKey(ContantXk.NGZSSDL) )
             {
 
                 double endvalue;
 
-
                 List<String> pointid=new ArrayList<>();
                 pointid.add(wtpointmap.get(ContantXk.NGZSSDL).getNemCode());
                 List<PointData> xdend=edosUtil.getHistMatrix(pointid,startDate.getTime()/1000);
 
-
                 if(xdend.size()==1)
                 {
 
@@ -691,7 +684,6 @@ public class ShutdownnewService {
                 }
             }
 
-
         }
 
         return result;

realtime/generationXK-service/src/main/java/com/gyee/generation/task/SaticSchedulePgTask.java

@@ -67,6 +67,33 @@ public class SaticSchedulePgTask {
     @Resource
     private WtwindDayInfoService wtwindDayInfoService;
 
+    @Resource
+    private PowerCurveFittingByTimeGfService powerCurveFittingByTimeGfService;
+
+
+    @Resource
+    private EquipmentInfo15minuteService equipmentInfo15minuteService;
+
+
+
+    //3.添加定时任务
+    /**
+     * 切入切出统计
+     * 每分钟执行一次
+     */
+
+    @XxlJob("calEquipmentInfo15minute_PG")
+    public void calEquipmentInfo15minute_PG()  {
+
+
+        XxlJobHelper.log("切入切出状态切换记录调度程序执行开始!........");
+        try {
+            equipmentInfo15minuteService.calEquipmentInfo15minute(new Date());
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        XxlJobHelper.log("切入切出状态切换记录调度任务处理完成!........");
+    }
 
     //3.添加定时任务
     /**
@@ -157,6 +184,12 @@ public class SaticSchedulePgTask {
             powerCurveFittingByTimeService.cureFittingMonth(date,"0");
             powerCurveFittingByTimeService.cureFittingYear(date);
 
+            powerCurveFittingByTimeGfService.cureFittingDay(date);
+            powerCurveFittingByTimeGfService.cureFittingMonth(date,"0");
+            powerCurveFittingByTimeGfService.cureFittingYear(date);
+
+
+
         } catch (Exception e) {
             e.printStackTrace();
         }