单机月度分析接口修改

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

@@ -1,9 +1,14 @@
 package com.gyee.generation;
 
+import com.gyee.generation.service.*;
+import com.gyee.generation.util.SpringUtils;
 import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 
+import java.util.Calendar;
+import java.util.Date;
+
 /**
  * @ClassName : GenerationMain
  * @Author : xieshengjie
@@ -14,7 +19,7 @@ import org.springframework.boot.autoconfigure.SpringBootApplication;
 @MapperScan("com.gyee.generation.mapper")
 public class GenerationMain {
     public static void main(String[] args) throws Exception {
-        SpringApplication.run(GenerationMain.class,args);
+        SpringApplication.run(GenerationMain.class, args);
 
 
 //        InitialPointGoldenXkService InitialPointGoldenXkService= SpringUtils.getBean("initialPointGoldenXkService");
@@ -54,80 +59,80 @@ public class GenerationMain {
 
 //        Date date =new Date();
 //
-//        Calendar c=Calendar.getInstance();
-//        c.set(Calendar.MONTH,10);
-//        c.set(Calendar.DAY_OF_MONTH,30);
-//        Date date =c.getTime();
-//        for(int i=0;i<2;i++)
-//        {
-//            WindPowerInfo1Service windPowerInfo1Service= SpringUtils.getBean("windPowerInfo1Service");
-//
-//            windPowerInfo1Service.calLineInfoDay(date);
-//            windPowerInfo1Service.calProjectInfoDay(date);
-//            windPowerInfo1Service.calWindpowerInfoDay(date);
-//            windPowerInfo1Service.calCompanyInfoDay(date);
-//            windPowerInfo1Service.calRegionInfoDay(date);
-//
-//            WindPowerInfo2Service windPowerInfo2Service= SpringUtils.getBean("windPowerInfo2Service");
-//            windPowerInfo2Service.calLineInfoDay(date);
-//            windPowerInfo2Service.calProjectInfoDay(date);
-//            windPowerInfo2Service.calWindpowerInfoDay(date);
-//            windPowerInfo2Service.calCompanyInfoDay(date);
-//            windPowerInfo2Service.calRegionInfoDay(date);
-//
-//            WindPowerInfo3Service windPowerInfo3Service= SpringUtils.getBean("windPowerInfo3Service");
-//            windPowerInfo3Service.calLineInfoDay(date);
-//            windPowerInfo3Service.calProjectInfoDay(date);
-//            windPowerInfo3Service.calWindpowerInfoDay(date);
-//            windPowerInfo3Service.calCompanyInfoDay(date);
-//            windPowerInfo3Service.calRegionInfoDay(date);
-//
-//            WindPowerInfo4Service windPowerInfo4Service= SpringUtils.getBean("windPowerInfo4Service");
-//            windPowerInfo4Service.calLineInfoDay(date);
-//            windPowerInfo4Service.calProjectInfoDay(date);
-//            windPowerInfo4Service.calWindpowerInfoDay(date);
-//            windPowerInfo4Service.calCompanyInfoDay(date);
-//            windPowerInfo4Service.calRegionInfoDay(date);
-//
-//            WindPowerInfo5Service windPowerInfo5Service= SpringUtils.getBean("windPowerInfo5Service");
-//            windPowerInfo5Service.calLineInfoDay(date);
-//            windPowerInfo5Service.calProjectInfoDay(date);
-//            windPowerInfo5Service.calWindpowerInfoDay(date);
-//            windPowerInfo5Service.calCompanyInfoDay(date);
-//            windPowerInfo5Service.calRegionInfoDay(date);
-//
-//            WindPowerInfo6Service windPowerInfo6Service= SpringUtils.getBean("windPowerInfo6Service");
-//            windPowerInfo6Service.calLineInfoDay(date);
-//            windPowerInfo6Service.calProjectInfoDay(date);
-//            windPowerInfo6Service.calWindpowerInfoDay(date);
-//            windPowerInfo6Service.calCompanyInfoDay(date);
-//            windPowerInfo6Service.calRegionInfoDay(date);
-//
-//
-//                    EquipmentInfo1Service equipmentInfo1Service= SpringUtils.getBean("equipmentInfo1Service");
-//        equipmentInfo1Service.calEquipmentInfoDay(date);
-//        EquipmentInfo2Service equipmentInfo2Service= SpringUtils.getBean("equipmentInfo2Service");
-//        equipmentInfo2Service.calEquipmentInfoDay(date);
-//        EquipmentInfo3Service equipmentInfo3Service= SpringUtils.getBean("equipmentInfo3Service");
-//        equipmentInfo3Service.calEquipmentInfoDay(date);
-//        EquipmentInfo4Service equipmentInfo4Service= SpringUtils.getBean("equipmentInfo4Service");
-//        equipmentInfo4Service.calEquipmentInfoDay(date);
-//        EquipmentInfo5Service equipmentInfo5Service= SpringUtils.getBean("equipmentInfo5Service");
-//        equipmentInfo5Service.calEquipmentInfoDay(date);
-//
-//
-//        WtAlysisDayService wtAlysisDayService= SpringUtils.getBean("wtAlysisDayService");
-//        wtAlysisDayService.calEquipmentInfoDay(date);
-//            c.add(Calendar.DAY_OF_MONTH,1);
-//            date =c.getTime();
-//
-//                    EquipmentInfoDayTopService equipmentInfoDayTopService= SpringUtils.getBean("equipmentInfoDayTopService");
-//        equipmentInfoDayTopService.calEquipmentInfoDayTop(new Date());
-//        equipmentInfoDayTopService.calEquipmentInfoMonthTop(new Date());
-//        equipmentInfoDayTopService.calEquipmentInfoYearTop(new Date());
-//        }
-//
+        Calendar c=Calendar.getInstance();
+        c.set(Calendar.MONTH,7);
+        c.set(Calendar.DAY_OF_MONTH,2);
+        Date date =c.getTime();
+
+        for (int i = 0; i < 30; i++) {
+            WindPowerInfo1Service windPowerInfo1Service = SpringUtils.getBean("windPowerInfo1Service");
+
+            windPowerInfo1Service.calLineInfoDay(date);
+            windPowerInfo1Service.calProjectInfoDay(date);
+            windPowerInfo1Service.calWindpowerInfoDay(date);
+            windPowerInfo1Service.calCompanyInfoDay(date);
+            windPowerInfo1Service.calRegionInfoDay(date);
+
+            WindPowerInfo2Service windPowerInfo2Service = SpringUtils.getBean("windPowerInfo2Service");
+            windPowerInfo2Service.calLineInfoDay(date);
+            windPowerInfo2Service.calProjectInfoDay(date);
+            windPowerInfo2Service.calWindpowerInfoDay(date);
+            windPowerInfo2Service.calCompanyInfoDay(date);
+            windPowerInfo2Service.calRegionInfoDay(date);
+
+            WindPowerInfo3Service windPowerInfo3Service = SpringUtils.getBean("windPowerInfo3Service");
+            windPowerInfo3Service.calLineInfoDay(date);
+            windPowerInfo3Service.calProjectInfoDay(date);
+            windPowerInfo3Service.calWindpowerInfoDay(date);
+            windPowerInfo3Service.calCompanyInfoDay(date);
+            windPowerInfo3Service.calRegionInfoDay(date);
+
+            WindPowerInfo4Service windPowerInfo4Service = SpringUtils.getBean("windPowerInfo4Service");
+            windPowerInfo4Service.calLineInfoDay(date);
+            windPowerInfo4Service.calProjectInfoDay(date);
+            windPowerInfo4Service.calWindpowerInfoDay(date);
+            windPowerInfo4Service.calCompanyInfoDay(date);
+            windPowerInfo4Service.calRegionInfoDay(date);
+
+            WindPowerInfo5Service windPowerInfo5Service = SpringUtils.getBean("windPowerInfo5Service");
+            windPowerInfo5Service.calLineInfoDay(date);
+            windPowerInfo5Service.calProjectInfoDay(date);
+            windPowerInfo5Service.calWindpowerInfoDay(date);
+            windPowerInfo5Service.calCompanyInfoDay(date);
+            windPowerInfo5Service.calRegionInfoDay(date);
+
+            WindPowerInfo6Service windPowerInfo6Service = SpringUtils.getBean("windPowerInfo6Service");
+            windPowerInfo6Service.calLineInfoDay(date);
+            windPowerInfo6Service.calProjectInfoDay(date);
+            windPowerInfo6Service.calWindpowerInfoDay(date);
+            windPowerInfo6Service.calCompanyInfoDay(date);
+            windPowerInfo6Service.calRegionInfoDay(date);
+
+
+            EquipmentInfo1Service equipmentInfo1Service = SpringUtils.getBean("equipmentInfo1Service");
+            equipmentInfo1Service.calEquipmentInfoDay(date);
+            EquipmentInfo2Service equipmentInfo2Service = SpringUtils.getBean("equipmentInfo2Service");
+            equipmentInfo2Service.calEquipmentInfoDay(date);
+            EquipmentInfo3Service equipmentInfo3Service = SpringUtils.getBean("equipmentInfo3Service");
+            equipmentInfo3Service.calEquipmentInfoDay(date);
+            EquipmentInfo4Service equipmentInfo4Service = SpringUtils.getBean("equipmentInfo4Service");
+            equipmentInfo4Service.calEquipmentInfoDay(date);
+            EquipmentInfo5Service equipmentInfo5Service = SpringUtils.getBean("equipmentInfo5Service");
+            equipmentInfo5Service.calEquipmentInfoDay(date);
+
+
+            WtAlysisDayService wtAlysisDayService = SpringUtils.getBean("wtAlysisDayService");
+            wtAlysisDayService.calEquipmentInfoDay(date);
+
+            EquipmentInfoDayTopService equipmentInfoDayTopService = SpringUtils.getBean("equipmentInfoDayTopService");
+            equipmentInfoDayTopService.calEquipmentInfoDayTop(date);
+            equipmentInfoDayTopService.calEquipmentInfoMonthTop(date);
+            equipmentInfoDayTopService.calEquipmentInfoYearTop(date);
+            c.add(Calendar.DAY_OF_MONTH, 1);
+            date = c.getTime();
+
 
+        }
 
 
 //        Calendar c=Calendar.getInstance();
@@ -164,6 +169,6 @@ public class GenerationMain {
 //        date =c.getTime();
 //
 //        wpwindDayInfoService.calWpwindDayInfo(c.getTime());
-System.out.println("完成");
+        System.out.println("完成");
     }
 }

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

@@ -8,7 +8,6 @@ import com.gyee.generation.init.CacheContext;
 import com.gyee.generation.model.auto.ProBasicEquipment;
 import com.gyee.generation.model.auto.ProBasicEquipmentPoint;
 import com.gyee.generation.model.auto.ProEconEquipmentInfo15minute;
-import com.gyee.generation.model.auto.ProEconEquipmentInfoDay5;
 import com.gyee.generation.service.auto.IProEconEquipmentInfo15minuteService;
 import com.gyee.generation.util.DateUtils;
 import com.gyee.generation.util.realtimesource.IEdosUtil;
@@ -44,10 +43,10 @@ public class EquipmentInfo15minuteService {
         c.add(Calendar.MINUTE,-15);
         Date begin= DateUtils.truncate(c.getTime());
 
-        QueryWrapper<ProEconEquipmentInfoDay5> queryWrapper = new QueryWrapper<>();
+        QueryWrapper<ProEconEquipmentInfo15minute> queryWrapper = new QueryWrapper<>();
         queryWrapper.ge("record_date",DateUtils.truncate(recordDate));
         //判断是否有重复记录，先删除重复记录
-        List<String> idls = proEconEquipmentInfo15minuteService.list()
+        List<String> idls = proEconEquipmentInfo15minuteService.list(queryWrapper)
                .stream()
 //                .filter(i -> i.getRecordDate().compareTo(DateUtils.truncate(recordDate))==0
 //                        && CacheContext.wtmap.containsKey(i.getWindturbineId())

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

@@ -1492,7 +1492,7 @@ public class PowerCurveFittingByTimeService {
     }
 
     //功率曲线拟合
-    public void curveFittingBuilder(Date begin, Date end, int dimension, double scale, String pointIdGL, String pointIdFS, String pointIdZT, List<PointVo> sjglPoints, List<PointVo> zyglPoints, String windturbineId) throws Exception {
+    private void curveFittingBuilder(Date begin, Date end, int dimension, double scale, String pointIdGL, String pointIdFS, String pointIdZT, List<PointVo> sjglPoints, List<PointVo> zyglPoints, String windturbineId) throws Exception {
         double maxPower = windturbineCapacity.get(windturbineId) * 1.3;
         double maxSpeed = 25;
         List<PointfVo> sjglnhpoints = new ArrayList<>();

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

@@ -561,8 +561,9 @@ public class WindPowerInfo1Service {
 
         //判断是否有重复记录，先删除重复记录
         QueryWrapper<ProEconPowerstationInfoDay1> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("record_date",DateUtils.truncate(recordDate)).eq("location",Location.wp.getValue());
-        List<String> idls = proEconPowerstationInfoDay1Service.list().stream()
+        queryWrapper.eq("record_date",DateUtils.truncate(recordDate))
+                .eq("location",Location.wp.getValue());
+        List<String> idls = proEconPowerstationInfoDay1Service.list(queryWrapper).stream()
 //                .filter(i -> i.getRecordDate().compareTo(DateUtils.truncate(recordDate)) == 0
 //                        && CacheContext.wpmap.containsKey(i.getWindpowerstationId())
 //                        && i.getLocation().equals(Location.wp.getValue()))

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

@@ -559,7 +559,7 @@ public class WindPowerInfo2Service {
         QueryWrapper<ProEconPowerstationInfoDay2> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("record_date",DateUtils.truncate(recordDate))
                 .eq("location",Location.ln.getValue());
-        List<String> idls = proEconPowerstationInfoDay2Service.list().stream()
+        List<String> idls = proEconPowerstationInfoDay2Service.list(queryWrapper).stream()
 //                .filter(i -> i.getRecordDate().compareTo(DateUtils.truncate(recordDate)) == 0
 //                        && CacheContext.lnmap.containsKey(i.getLineId())
 //                        && i.getLocation().equals(Location.ln.getValue()))

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

@@ -539,10 +539,10 @@ public class WindPowerInfo4Service {
         Date begin = DateUtils.truncate(c.getTime());
 
         //判断是否有重复记录，先删除重复记录
-        QueryWrapper<ProEconPowerstationInfoDay1> queryWrapper = new QueryWrapper<>();
+        QueryWrapper<ProEconPowerstationInfoDay4> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("record_date",DateUtils.truncate(recordDate))
                 .eq("location",Location.pj.getValue());
-        List<String> idls = proEconPowerstationInfoDay4Service.list().stream()
+        List<String> idls = proEconPowerstationInfoDay4Service.list(queryWrapper).stream()
 //                .filter(i -> i.getRecordDate().compareTo(DateUtils.truncate(recordDate)) == 0
 //                        && CacheContext.pjmap.containsKey(i.getProjectId())
 //                        && i.getLocation().equals(Location.pj.getValue()))

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

@@ -464,7 +464,7 @@ public class WindPowerInfo6Service {
         //判断是否有重复记录，先删除重复记录
         QueryWrapper<ProEconPowerstationInfoDay6> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("record_date",DateUtils.truncate(recordDate)).eq("location",Location.pj.getValue());
-        List<String> idls = proEconPowerstationInfoDay6Service.list().stream()
+        List<String> idls = proEconPowerstationInfoDay6Service.list(queryWrapper).stream()
 //                .filter(i -> i.getRecordDate().compareTo(DateUtils.truncate(recordDate)) == 0
 //                        && CacheContext.pjmap.containsKey(i.getProjectId())
 //                        && i.getLocation().equals(Location.pj.getValue()))

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

@@ -32,7 +32,7 @@ public class WtwindDayInfoService {
     /**
      * 计算场站风资源信息
      */
-    public void calWpwindDayInfo(Date recordDate) throws Exception {
+    public void calWtwindDayInfo(Date recordDate) throws Exception {
 
 
         Calendar c = Calendar.getInstance();

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

@@ -1,8 +1,6 @@
 package com.gyee.generation.task;
 
 
-import com.gyee.common.util.DateUtils;
-import com.gyee.generation.init.CacheContext;
 import com.gyee.generation.service.*;
 import com.xxl.job.core.context.XxlJobHelper;
 import com.xxl.job.core.handler.annotation.XxlJob;
@@ -29,7 +27,7 @@ public class SaticSchedulePgTask {
     @Resource
     private LimitEventnewService limitEventnewService;
     @Resource
-    private PowerCurveFittingService powerCurveFittingService;
+    private PowerCurveFittingByTimeService powerCurveFittingByTimeService;
     @Resource
     private ShutdownnewService shutdownnewService;
     @Resource
@@ -63,6 +61,31 @@ public class SaticSchedulePgTask {
     @Resource
     private WtAlysisDayService wtAlysisDayService;
 
+    @Resource
+    private WpwindDayInfoService wpwindDayInfoService;
+
+    @Resource
+    private WtwindDayInfoService wtwindDayInfoService;
+
+
+    //3.添加定时任务
+    /**
+     * 切入切出统计
+     * 每分钟执行一次
+     */
+
+    @XxlJob("inputOrOutPutSpeed_PG")
+    public void inputOrOutPutSpeed_PG()  {
+
+
+        XxlJobHelper.log("切入切出状态切换记录调度程序执行开始!........");
+        try {
+            inputOrOutPutService.inputOrOutputSpeed(new Date());
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        XxlJobHelper.log("切入切出状态切换记录调度任务处理完成!........");
+    }
 
     //3.添加定时任务
     /**
@@ -130,7 +153,9 @@ public class SaticSchedulePgTask {
 
         Date date=new Date();
         try {
-            powerCurveFittingService.cureFitting(date,DateUtils.truncate(date),0, CacheContext.wtls);
+            powerCurveFittingByTimeService.cureFittingDay(date);
+            powerCurveFittingByTimeService.cureFittingMonth(date,"0");
+            powerCurveFittingByTimeService.cureFittingYear(date);
 
         } catch (Exception e) {
             e.printStackTrace();
@@ -296,7 +321,7 @@ public class SaticSchedulePgTask {
 
         equipmentInfo5Service.calEquipmentInfoDay(date);
 
-        wtAlysisDayService.calEquipmentInfoDay(date);
+
 
         XxlJobHelper.log("设备指标调度程序执行完成!........");
 
@@ -325,8 +350,8 @@ public class SaticSchedulePgTask {
      * 每天执行一次
      */
 
-    @XxlJob("indturbineGoodness_PG")
-    public void indturbineGoodness_PG()  {
+    @XxlJob("windturbineGoodness_PG")
+    public void windturbineGoodness_PG()  {
 
 
         XxlJobHelper.log("功率一致性系数和拟合优度统计调度程序执行开始!........");
@@ -337,4 +362,44 @@ public class SaticSchedulePgTask {
         }
         XxlJobHelper.log("功率一致性系数和拟合优度统计调度任务处理完成!........");
     }
+
+
+    @XxlJob("wtAlysisDay_PG")
+    public void wtAlysisDay_PG()  {
+
+
+        XxlJobHelper.log("分析数据统计调度程序执行开始!........");
+        try {
+            wtAlysisDayService.calEquipmentInfoDay(new Date());
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        XxlJobHelper.log("分析数据统计调度任务处理完成!........");
+    }
+
+    @XxlJob("wtwindDayInfo_PG")
+    public void wtwindDayInfo_PG()  {
+
+
+        XxlJobHelper.log("设备数据统计调度程序执行开始!........");
+        try {
+            wpwindDayInfoService.calWpwindDayInfo(new Date());
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        XxlJobHelper.log("设备数据统计调度任务处理完成!........");
+    }
+
+    @XxlJob("wpwindDayInfo_PG")
+    public void wpwindDayInfo_PG()  {
+
+
+        XxlJobHelper.log("设备数据统计调度程序执行开始!........");
+        try {
+            wtwindDayInfoService.calWtwindDayInfo(new Date());
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        XxlJobHelper.log("设备数据统计调度任务处理完成!........");
+    }
 }

realtime/generationXK-service/src/main/resources/application-yun.yml

@@ -34,12 +34,12 @@ spring:
   datasource:
     type: com.alibaba.druid.pool.DruidDataSource
     driver-class-name: org.postgresql.Driver
-    url: jdbc:postgresql://192.168.11.248:5432/IMS_NEM_SD?rewriteBatchedStatements=true
-    username: postgres
-    password: postgres
-#    url: jdbc:postgresql://124.70.75.91:5432/jn_test?rewriteBatchedStatements=true
+#    url: jdbc:postgresql://192.168.11.248:5432/IMS_NEM_SD?rewriteBatchedStatements=true
 #    username: postgres
-#    password: gd123
+#    password: postgres
+    url: jdbc:postgresql://124.70.75.91:5432/jn_test?rewriteBatchedStatements=true
+    username: postgres
+    password: gd123
     oracle-schema=:
     #    type: com.alibaba.druid.pool.DruidDataSource
     #    url: jdbc:mysql://127.0.0.1:3306/test?characterEncoding=utf8&serverTimezone=UTC

realtime/generationXK-service/src/main/resources/application.yml

@@ -1,6 +1,6 @@
 spring:
   profiles:
 #    active: xk
-    active: xk
+    active: yun
 
 #    active: td

realtime/generationXK-service/src/main/resources/xxl-job-executor.properties

@@ -10,7 +10,7 @@ xxl.job.executor.appname=generation-job
 xxl.job.executor.address=
 ### xxl-job executor server-info
 xxl.job.executor.ip=
-xxl.job.executor.port=9101
+xxl.job.executor.port=9201
 ### xxl-job executor log-path
 xxl.job.executor.logpath=E:\\jobs\\generation-job
 ### xxl-job executor log-retention-days