修改风机故障损失电量修改

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

@@ -1,9 +1,13 @@
 package com.gyee.generation;
 
+import com.gyee.generation.service.ReCalSevice;
+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;
+
 /**
  * @ClassName : GenerationMain
  * @Author : xieshengjie
@@ -188,5 +192,23 @@ public class GenerationMain {
 //
 //        /*************************redis缓存**************************/
 //
+
+
+        /*************************重算设备历史数据**************************/
+        Calendar c = Calendar.getInstance();
+
+
+        c.add(Calendar.DAY_OF_MONTH, -1);
+        ReCalSevice reCalSevice = SpringUtils.getBean("reCalSevice");
+//        //重算风机
+//        reCalSevice.calWt(c.getTime());
+        //重算逆变器
+        reCalSevice.calIn(c.getTime());
+
+
+
+        /*************************重算设备历史数据**************************/
+
+
     }
 }

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

@@ -1,91 +1,91 @@
-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-executor2.properties")
-@PropertySource("classpath:xxl-job-executor3.properties")
-////@PropertySource("classpath:xxl-job-executor4.properties")
-//@PropertySource("classpath:xxl-job-executor5.properties")
-//@PropertySource("classpath:xxl-job-executorWPLY.properties")
-//@PropertySource("classpath:xxl-job-executorRG.properties")
-//@PropertySource("classpath:xxl-job-executorJN.properties")
+//package com.gyee.generation.config;
 //
-//@PropertySource("classpath:xxl-job-accuracy.properties")
-//@PropertySource("classpath:xxl-job-7001.properties")
-//@PropertySource("classpath:xxl-job-7002.properties")
-//@PropertySource("classpath:xxl-job-7003.properties")
-//@PropertySource("classpath:xxl-job-executorGF000.properties")
-//@PropertySource("classpath:xxl-job-executorGF001.properties")
-//@PropertySource("classpath:xxl-job-executorGF002.properties")
-//@PropertySource("classpath:xxl-job-executorGF003.properties")
-//@PropertySource("classpath:xxl-job-executorGF004.properties")
-//@PropertySource("classpath:xxl-job-executorGF005.properties")
-//@PropertySource("classpath:xxl-job-executorGF006.properties")
-//@PropertySource("classpath:xxl-job-executorGF007.properties")
-//@PropertySource("classpath:xxl-job-executorGF008.properties")
-//@PropertySource("classpath:xxl-job-region.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();
-     */
-
-
-}
+//
+//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-executor2.properties")
+//@PropertySource("classpath:xxl-job-executor3.properties")
+//////@PropertySource("classpath:xxl-job-executor4.properties")
+////@PropertySource("classpath:xxl-job-executor5.properties")
+////@PropertySource("classpath:xxl-job-executorWPLY.properties")
+////@PropertySource("classpath:xxl-job-executorRG.properties")
+////@PropertySource("classpath:xxl-job-executorJN.properties")
+////
+////@PropertySource("classpath:xxl-job-accuracy.properties")
+////@PropertySource("classpath:xxl-job-7001.properties")
+////@PropertySource("classpath:xxl-job-7002.properties")
+////@PropertySource("classpath:xxl-job-7003.properties")
+////@PropertySource("classpath:xxl-job-executorGF000.properties")
+////@PropertySource("classpath:xxl-job-executorGF001.properties")
+////@PropertySource("classpath:xxl-job-executorGF002.properties")
+////@PropertySource("classpath:xxl-job-executorGF003.properties")
+////@PropertySource("classpath:xxl-job-executorGF004.properties")
+////@PropertySource("classpath:xxl-job-executorGF005.properties")
+////@PropertySource("classpath:xxl-job-executorGF006.properties")
+////@PropertySource("classpath:xxl-job-executorGF007.properties")
+////@PropertySource("classpath:xxl-job-executorGF008.properties")
+////@PropertySource("classpath:xxl-job-region.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/ReCalSevice.java

@@ -0,0 +1,115 @@
+package com.gyee.generation.service;
+
+import com.gyee.generation.GenerationMain;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.text.SimpleDateFormat;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.concurrent.TimeUnit;
+
+@Service
+public class ReCalSevice {
+
+    @Resource
+    private EquipmentInfo1Service equipmentInfo1Service;
+
+    @Resource
+    private EquipmentInfo2Service equipmentInfo2Service;
+    @Resource
+    private EquipmentInfo3Service equipmentInfo3Service;
+
+    @Resource
+    private EquipmentInfoDayTopService equipmentInfoDayTopService;
+    @Resource
+    private EquipmentInfo5Service equipmentInfo5Service;
+    @Resource
+    private WtAlysisDayService wtAlysisDayService;
+    @Resource
+    private EquipmentInfo4Service equipmentInfo4Service;
+
+    public void calWt(Date recordDate) throws Exception {
+
+        Calendar c = Calendar.getInstance();
+        Logger logger = LoggerFactory.getLogger(GenerationMain.class);
+
+
+        c.setTime(recordDate);
+        c.set(Calendar.HOUR_OF_DAY, 23);
+        c.set(Calendar.MINUTE, 59);
+        c.set(Calendar.SECOND, 59);
+        Date begin = c.getTime();
+        Date end = null;
+        SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        logger.info(df.format(c.getTime()).toString());
+
+
+        equipmentInfo1Service.calEquipmentInfoDay(begin);
+        logger.info("equipmentInfo1Service完成一次!。。。。。。");
+        TimeUnit.SECONDS.sleep(3);
+        equipmentInfo2Service.calEquipmentInfoDay(begin);
+        logger.info("equipmentInfo2Service完成一次!。。。。。。");
+        TimeUnit.SECONDS.sleep(3);
+        equipmentInfo3Service.calEquipmentInfoDay(begin);
+        logger.info("equipmentInfo3Service完成一次!。。。。。。");
+        TimeUnit.SECONDS.sleep(3);
+        logger.info("equipmentInfo5Service开始!。。。。。。");
+
+        TimeUnit.SECONDS.sleep(3);
+        equipmentInfo5Service.calEquipmentInfoDay(begin);
+        logger.info("equipmentInfo5Service完成一次!。。。。。。");
+        logger.info("equipmentInfo4Service开始!。。。。。。");
+        equipmentInfo4Service.calEquipmentInfoDay(begin);
+        logger.info("equipmentInfo4Service完成一次!。。。。。。");
+
+
+        equipmentInfoDayTopService.calEquipmentInfoDayTop(begin);
+        equipmentInfoDayTopService.calEquipmentInfoMonthTop(begin);
+        equipmentInfoDayTopService.calEquipmentInfoYearTop(begin);
+
+        TimeUnit.SECONDS.sleep(3);
+        logger.info("wtAlysisyService开始!。。。。。。");
+        wtAlysisDayService.calEquipmentInfoDay(begin);
+        logger.info("wtAlysisyService完成!。。。。。。");
+        end = new Date();
+        logger.info(df.format(end).toString());
+        logger.info("完成一次!。。。。。。");
+        logger.info("执行用时" + com.gyee.generation.util.DateUtils.secondsDiff(begin, end) + "秒");
+    }
+
+
+    public void calIn(Date recordDate) throws Exception {
+
+        Calendar c = Calendar.getInstance();
+        Logger logger = LoggerFactory.getLogger(GenerationMain.class);
+
+
+        c.setTime(recordDate);
+        c.set(Calendar.HOUR_OF_DAY, 23);
+        c.set(Calendar.MINUTE, 59);
+        c.set(Calendar.SECOND, 59);
+        Date begin = c.getTime();
+        Date end = null;
+        SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        logger.info(df.format(c.getTime()).toString());
+
+
+        equipmentInfo1Service.calEquipmentInfoDay(begin);
+        logger.info("equipmentInfo1Service完成一次!。。。。。。");
+        TimeUnit.SECONDS.sleep(3);
+        equipmentInfo2Service.calEquipmentInfoDay(begin);
+        logger.info("equipmentInfo2Service完成一次!。。。。。。");
+        TimeUnit.SECONDS.sleep(3);
+        equipmentInfo3Service.calEquipmentInfoDay(begin);
+        logger.info("equipmentInfo3Service完成一次!。。。。。。");
+        TimeUnit.SECONDS.sleep(3);
+
+        end = new Date();
+        logger.info(df.format(end).toString());
+        logger.info("完成一次!。。。。。。");
+        logger.info("执行用时" + com.gyee.generation.util.DateUtils.secondsDiff(begin, end) + "秒");
+    }
+}