Merge remote-tracking branch 'origin/master'

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

@@ -1,14 +1,11 @@
 package com.gyee.generation;
 
-import com.gyee.generation.service.*;
+import com.gyee.generation.service.InputOrOutPutService;
 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
@@ -50,8 +47,24 @@ public class GenerationMain {
 //        powerCurveFittingByTimeService.cureFittingYear(date);
 //        CacheService cacheService= SpringUtils.getBean("cacheService");
 //        cacheService.initRedisCache();
-//        InputOrOutPutService inputOrOutPutService= SpringUtils.getBean("inputOrOutPutService");
+        InputOrOutPutService inputOrOutPutService= SpringUtils.getBean("inputOrOutPutService");
 //       inputOrOutPutService.inputOrOutput(new Date());
+//        Calendar c=Calendar.getInstance();
+//        c.set(Calendar.MONTH,7);
+//        c.set(Calendar.DAY_OF_MONTH,2);
+//        c.set(Calendar.HOUR_OF_DAY, 0);
+//        c.set(Calendar.MINUTE, 0);
+//        c.set(Calendar.SECOND, 0);
+//        c.set(Calendar.MILLISECOND, 0);
+//        Date date = c.getTime();
+//
+//       for(int i=0;i<288*10;i++)
+//       {
+//           inputOrOutPutService.inputOrOutputSpeed(date);
+//           c.add(Calendar.MINUTE, 6);
+//           date = c.getTime();
+//           System.out.println("date"+DateUtils.toDate1(date));
+//       }
 //        while (true)
 //        {
 //            inputOrOutPutService.inputOrOutputSpeed(new Date());
@@ -60,11 +73,12 @@ public class GenerationMain {
 //        Date date =new Date();
 //
 //        Calendar c=Calendar.getInstance();
-//        c.set(Calendar.MONTH,7);
-//        c.set(Calendar.DAY_OF_MONTH,2);
-//        Date date =c.getTime();
+//        c.set(Calendar.MONTH,11);
+//        c.set(Calendar.DAY_OF_MONTH,1);
+//        Date date = DateUtils.truncate(c.getTime());
+//
+//        for (int i = 0; i < 15; i++) {
 //
-//        for (int i = 0; i < 30; i++) {
 //            WindPowerInfo1Service windPowerInfo1Service = SpringUtils.getBean("windPowerInfo1Service");
 //
 //            windPowerInfo1Service.calLineInfoDay(date);
@@ -130,7 +144,7 @@ public class GenerationMain {
 //            equipmentInfoDayTopService.calEquipmentInfoYearTop(date);
 //            c.add(Calendar.DAY_OF_MONTH, 1);
 //            date = c.getTime();
-//
+//            System.out.println(DateUtils.toDate1(date)+"完成");
 //
 //        }
 

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

@@ -1,70 +1,70 @@
-package com.gyee.generation.config;
-
-
-import com.xxl.job.core.executor.impl.XxlJobSpringExecutor;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.context.EnvironmentAware;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.PropertySource;
-import org.springframework.core.env.Environment;
-
-/**
- * xxl-job config
- *
- * @author xuxueli 2017-04-28
- */
-
-
-@Configuration
-@PropertySource("classpath:xxl-job-executor.properties")
-//@PropertySource("classpath:xxl-job-executorWPGD.properties")
-//@PropertySource("classpath:xxl-job-executorRG.properties")
-public class XxlJobConfig implements EnvironmentAware {
-    private Environment env;
-
-
-    @Override
-    public void setEnvironment(Environment environment) {
-        this.env=environment;
-    }
-
-    private Logger logger = LoggerFactory.getLogger(XxlJobConfig.class);
-
-
-
-    @Bean
-    public XxlJobSpringExecutor xxlJobExecutor() {
-    logger.info(">>>>>>>>>>> xxl-job config init.");
-    XxlJobSpringExecutor xxlJobSpringExecutor = new XxlJobSpringExecutor();
-    xxlJobSpringExecutor.setAdminAddresses(env.getProperty("xxl.job.admin.addresses"));
-    xxlJobSpringExecutor.setAppname(env.getProperty("xxl.job.executor.appname"));
-    xxlJobSpringExecutor.setAddress(env.getProperty("xxl.job.executor.address"));
-    xxlJobSpringExecutor.setIp(env.getProperty("xxl.job.executor.ip"));
-    xxlJobSpringExecutor.setPort(Integer.parseInt(env.getProperty("xxl.job.executor.port")));
-    xxlJobSpringExecutor.setAccessToken(env.getProperty("xxl.job.accessToken"));
-    xxlJobSpringExecutor.setLogPath(env.getProperty("xxl.job.executor.logpath"));
-    xxlJobSpringExecutor.setLogRetentionDays(Integer.parseInt(env.getProperty("xxl.job.executor.logretentiondays")));
-    return xxlJobSpringExecutor;
-    }
-
-    /**
-    * 针对多网卡、容器内部署等情况，可借助 "spring-cloud-commons" 提供的 "InetUtils" 组件灵活定制注册IP；
-    *
-    *      1、引入依赖：
-    *          <dependency>
-    *             <groupId>org.springframework.cloud</groupId>
-    *             <artifactId>spring-cloud-commons</artifactId>
-    *             <version>${version}</version>
-    *         </dependency>
-    *
-    *      2、配置文件，或者容器启动变量
-    *          spring.cloud.inetutils.preferred-networks: 'xxx.xxx.xxx.'
-    *
-    *      3、获取IP
-    *          String ip_ = inetUtils.findFirstNonLoopbackHostInfo().getIpAddress();
-    */
-
-
-}
+//package com.gyee.generation.config;
+//
+//
+//import com.xxl.job.core.executor.impl.XxlJobSpringExecutor;
+//import org.slf4j.Logger;
+//import org.slf4j.LoggerFactory;
+//import org.springframework.context.EnvironmentAware;
+//import org.springframework.context.annotation.Bean;
+//import org.springframework.context.annotation.Configuration;
+//import org.springframework.context.annotation.PropertySource;
+//import org.springframework.core.env.Environment;
+//
+///**
+// * xxl-job config
+// *
+// * @author xuxueli 2017-04-28
+// */
+//
+//
+//@Configuration
+//@PropertySource("classpath:xxl-job-executor.properties")
+////@PropertySource("classpath:xxl-job-executorWPGD.properties")
+////@PropertySource("classpath:xxl-job-executorRG.properties")
+//public class XxlJobConfig implements EnvironmentAware {
+//    private Environment env;
+//
+//
+//    @Override
+//    public void setEnvironment(Environment environment) {
+//        this.env=environment;
+//    }
+//
+//    private Logger logger = LoggerFactory.getLogger(XxlJobConfig.class);
+//
+//
+//
+//    @Bean
+//    public XxlJobSpringExecutor xxlJobExecutor() {
+//    logger.info(">>>>>>>>>>> xxl-job config init.");
+//    XxlJobSpringExecutor xxlJobSpringExecutor = new XxlJobSpringExecutor();
+//    xxlJobSpringExecutor.setAdminAddresses(env.getProperty("xxl.job.admin.addresses"));
+//    xxlJobSpringExecutor.setAppname(env.getProperty("xxl.job.executor.appname"));
+//    xxlJobSpringExecutor.setAddress(env.getProperty("xxl.job.executor.address"));
+//    xxlJobSpringExecutor.setIp(env.getProperty("xxl.job.executor.ip"));
+//    xxlJobSpringExecutor.setPort(Integer.parseInt(env.getProperty("xxl.job.executor.port")));
+//    xxlJobSpringExecutor.setAccessToken(env.getProperty("xxl.job.accessToken"));
+//    xxlJobSpringExecutor.setLogPath(env.getProperty("xxl.job.executor.logpath"));
+//    xxlJobSpringExecutor.setLogRetentionDays(Integer.parseInt(env.getProperty("xxl.job.executor.logretentiondays")));
+//    return xxlJobSpringExecutor;
+//    }
+//
+//    /**
+//    * 针对多网卡、容器内部署等情况，可借助 "spring-cloud-commons" 提供的 "InetUtils" 组件灵活定制注册IP；
+//    *
+//    *      1、引入依赖：
+//    *          <dependency>
+//    *             <groupId>org.springframework.cloud</groupId>
+//    *             <artifactId>spring-cloud-commons</artifactId>
+//    *             <version>${version}</version>
+//    *         </dependency>
+//    *
+//    *      2、配置文件，或者容器启动变量
+//    *          spring.cloud.inetutils.preferred-networks: 'xxx.xxx.xxx.'
+//    *
+//    *      3、获取IP
+//    *          String ip_ = inetUtils.findFirstNonLoopbackHostInfo().getIpAddress();
+//    */
+//
+//
+//}

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

@@ -87,6 +87,7 @@ public class InputOrOutPutService {
                 for(int i=0;i<statusls.size();i++)
                 {
 
+
                     if(wtLastStatusMap.containsKey(wt.getId()))
                     {
                         lastStatus=wtLastStatusMap.get(wt.getId());
@@ -96,6 +97,10 @@ public class InputOrOutPutService {
                     PointData ssfspo=ssfsls.get(i);
                     double status=StringUtils.round(statuspo.getPointValueInDouble(),0);
 
+                    if(i==0)
+                    {
+                        lastStatus=status;
+                    }
                     if (!Objects.equals(lastStatus, status))
                     {
 
@@ -118,6 +123,7 @@ public class InputOrOutPutService {
                             {
                                 proEconInputOrOutputSpeedService.save(input);
                             }
+                            lastStatus=status;
 
                         }
                         else if (lastStatus == 2 && status== 0)
@@ -136,6 +142,7 @@ public class InputOrOutPutService {
                             {
                                 proEconInputOrOutputSpeedService.save(input);
                             }
+                            lastStatus=status;
                         }
 
                         wtLastStatusMap.put(wt.getId(), status);

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

@@ -149,6 +149,37 @@ public class WtAlysisDayService {
 
                 double ssdl=gzss+jxss+xnss+xdss+slss;
                 pewp.setRssdl(StringUtils.round(ssdl,2));
+
+                pewp.setYfdl(dayinfo.getYfdl());
+                pewp.setYpjfs(dayinfo.getYpjfs());
+                pewp.setYpjgl(dayinfo.getYpjgl());
+                pewp.setYyfdl(dayinfo.getYllfdl());
+
+
+                gzss=dayinfo.getYgzssdl();
+                jxss=dayinfo.getYjxssdl();
+                xnss=dayinfo.getYxnssdl();
+                xdss=dayinfo.getYxdtjssdl()+dayinfo.getYxdjclssdl();
+                slss=dayinfo.getYcwsltqssdl()+dayinfo.getYcwsldwssdl();
+
+                ssdl=gzss+jxss+xnss+xdss+slss;
+                pewp.setYssdl(StringUtils.round(ssdl,2));
+
+                pewp.setNfdl(dayinfo.getNfdl());
+                pewp.setNpjfs(dayinfo.getNpjfs());
+                pewp.setNpjgl(dayinfo.getNpjgl());
+                pewp.setNyfdl(dayinfo.getNllfdl());
+
+
+                gzss=dayinfo.getNgzssdl();
+                jxss=dayinfo.getNjxssdl();
+                xnss=dayinfo.getNxnssdl();
+                xdss=dayinfo.getNxdtjssdl()+dayinfo.getNxdjclssdl();
+                slss=dayinfo.getNcwsltqssdl()+dayinfo.getNcwsldwssdl();
+
+                ssdl=gzss+jxss+xnss+xdss+slss;
+                pewp.setNssdl(StringUtils.round(ssdl,2));
+
             }
 
 
@@ -164,12 +195,36 @@ public class WtAlysisDayService {
                 int dayTimes=24;
                 double sbklyl =  new BigDecimal(dayTimes-dayinfo.getRgztjxs()).divide(new BigDecimal(dayTimes), 2, RoundingMode.HALF_EVEN).multiply(new BigDecimal(100)).doubleValue();//风机平均设备可利用率
                 pewp.setRsbklyl(StringUtils.round(sbklyl, 2));
+
+                pewp.setYyxxs(dayinfo.getYyxxs());
+                pewp.setYgzxs(dayinfo.getYgztjxs());
+                pewp.setYjxxs(dayinfo.getYjxtjxs());
+                pewp.setYzdxs(dayinfo.getYxdxs());
+                pewp.setYzdxs(dayinfo.getYtxzdxs());
+                c.setTime(recordDate);
+                int days=c.get(Calendar.DAY_OF_MONTH);
+                dayTimes=24*days;
+                sbklyl =  new BigDecimal(dayTimes-dayinfo.getYgztjxs()).divide(new BigDecimal(dayTimes), 2, RoundingMode.HALF_EVEN).multiply(new BigDecimal(100)).doubleValue();//风机平均设备可利用率
+                pewp.setYsbklyl(StringUtils.round(sbklyl, 2));
+
+                pewp.setNyxxs(dayinfo.getNyxxs());
+                pewp.setNgzxs(dayinfo.getNgztjxs());
+                pewp.setNjxxs(dayinfo.getNjxtjxs());
+                pewp.setNzdxs(dayinfo.getNxdxs());
+                pewp.setNzdxs(dayinfo.getNtxzdxs());
+
+                days=c.get(Calendar.DAY_OF_YEAR);
+                dayTimes=24*days;
+                sbklyl =  new BigDecimal(dayTimes-dayinfo.getNgztjxs()).divide(new BigDecimal(dayTimes), 2, RoundingMode.HALF_EVEN).multiply(new BigDecimal(100)).doubleValue();//风机平均设备可利用率
+                pewp.setNsbklyl(StringUtils.round(sbklyl, 2));
             }
 
             if(eqday3map.containsKey(wt.getId()))
             {
                 ProEconEquipmentInfoDay3 dayinfo= eqday3map.get(wt.getId());
                 pewp.setRtjcs(dayinfo.getRgztjcs()+dayinfo.getRjxtjcs());
+                pewp.setYtjcs(dayinfo.getYgztjcs()+dayinfo.getYjxtjcs());
+                pewp.setNtjcs(dayinfo.getNgztjcs()+dayinfo.getNjxtjcs());
 
             }
 
@@ -180,6 +235,14 @@ public class WtAlysisDayService {
                 pewp.setRsjbz(dayinfo.getRqxpcbbzsj());
                 pewp.setRyxfs(dayinfo.getRyxfss());
 
+                pewp.setYnhyd(dayinfo.getYnhyd());
+                pewp.setYsjbz(dayinfo.getYqxpcbbzsj());
+                pewp.setYyxfs(dayinfo.getYyxfss());
+
+                pewp.setNnhyd(dayinfo.getNnhyd());
+                pewp.setNsjbz(dayinfo.getNqxpcbbzsj());
+                pewp.setNyxfs(dayinfo.getNyxfss());
+
             }
             //昨日的统计结果
             List<ProEconWtAlysisDay> pepidls =new ArrayList<>();
@@ -264,7 +327,7 @@ public class WtAlysisDayService {
         //*******************************************年信息统计*********************************************************/
         if(pepidls.isEmpty())
         {
-            pewp.setYbbhcs(pewp.getRbbhcs());
+            pewp.setNbbhcs(pewp.getRbbhcs());
 
         }else
         {

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

@@ -91,8 +91,8 @@ db:
   url: http://192.168.11.250:8011/ts
   #url: http://124.70.75.91:8011/ts
 #参与计算的场站
-runWindpowerstation: SD_GDDL_WHWD_FDC_STA,SD_GDDL_WHXQ_FDC_STA,SD_GDDL_RZLX_FDC_STA,SD_GDDL_QDJN_FDC_STA,SD_SXNY_FXFC_FDC_STA,SD_SXNY_LXLN_FDC_STA,SD_SXNY_LQJS_FDC_STA,SD_SXNY_ZYFS_FDC_STA,SD_LYDL_BH2_FDC_STA,SD_GDDL_RZWL_FDC_STA,SD_SXNY_PLHS_FDC_STA,SD_SXNY_ZYXD_FDC_STA,SD_GDDL_DZXJ_FDC_STA,SD_GDDL_XTTA_FDC_STA,SD_GDDL_WFZC_FDC_STA,SD_SXNY_JNSS_FDC_STA,SD_SXNY_WFBH_FDC_STA,SD_LYDL_CG_FDC_STA,SD_LYDL_FJ_FDC_STA,SD_LYDL_YS_FDC_STA,SD_SXNY_JNCQ_FDC_STA,SD_LYDL_BH1_FDC_STA,SD_GHTZ_HZJ_GDC_STA
-#runWindpowerstation: SD_GDDL_RZLX_FDC_STA
+#runWindpowerstation: SD_GDDL_WHWD_FDC_STA,SD_GDDL_WHXQ_FDC_STA,SD_GDDL_RZLX_FDC_STA,SD_GDDL_QDJN_FDC_STA,SD_SXNY_FXFC_FDC_STA,SD_SXNY_LXLN_FDC_STA,SD_SXNY_LQJS_FDC_STA,SD_SXNY_ZYFS_FDC_STA,SD_LYDL_BH2_FDC_STA,SD_GDDL_RZWL_FDC_STA,SD_SXNY_PLHS_FDC_STA,SD_SXNY_ZYXD_FDC_STA,SD_GDDL_DZXJ_FDC_STA,SD_GDDL_XTTA_FDC_STA,SD_GDDL_WFZC_FDC_STA,SD_SXNY_JNSS_FDC_STA,SD_SXNY_WFBH_FDC_STA,SD_LYDL_CG_FDC_STA,SD_LYDL_FJ_FDC_STA,SD_LYDL_YS_FDC_STA,SD_SXNY_JNCQ_FDC_STA,SD_LYDL_BH1_FDC_STA,SD_GHTZ_HZJ_GDC_STA
+runWindpowerstation: SD_GDDL_RZLX_FDC_STA,SD_GDDL_RZWL_FDC_STA
 #计算状态用ai或者di
 clauStatus:
   ai: GJY03_GC,YLZ01_GC,PTZ02_GC   #配置期次

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

@@ -92,7 +92,7 @@ db:
   url: http://124.70.75.91:8011/ts
 #参与计算的场站
 #runWindpowerstation: SD_GDDL_RZLX_FDC_STA,SD_GDDL_QDJN_FDC_STA,SD_GDDL_WHWD_FDC_STA,SD_GDDL_WHXQ_FDC_STA,SD_GDDL_RZWL_FDC_STA,SD_GDDL_WFZC_FDC_STA,SD_GDDL_DZXJ_FDC_STA,SD_GDDL_XTTA_FDC_STA,SD_GDDL_BH1_FDC_STA,SD_GDDL_BH2_FDC_STA,SD_GDDL_CG_FDC_STA,SD_GDDL_FJ_FDC_STA,SD_GDDL_YS_FDC_STA,SD_GDDL_FXFC_FDC_STA,SD_GDDL_JNSS_FDC_STA,SD_GDDL_WFBH_FDC_STA,SD_GDDL_PLHS_FDC_STA,SD_GDDL_JNCQ_FDC_STA,SD_GDDL_LXLN_FDC_STA,SD_GDDL_LQJS_FDC_STA,SD_GDDL_ZYXD_FDC_STA,SD_GDDL_ZYFS_FDC_STA
-runWindpowerstation: SD_GDDL_RZLX_FDC_STA
+runWindpowerstation: SD_GDDL_RZLX_FDC_STA,SD_GDDL_RZWL_FDC_STA
 #计算状态用ai或者di
 clauStatus:
   ai: GJY03_GC,YLZ01_GC,PTZ02_GC   #配置期次