历史计算修改

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

@@ -15,18 +15,22 @@ import org.springframework.boot.autoconfigure.SpringBootApplication;
 public class GenerationMain {
     public static void main(String[] args) throws Exception {
         SpringApplication.run(GenerationMain.class, args);
-//
+
 //
 //        Calendar c = Calendar.getInstance();
 //        Date begin = null;
 //        Date end = null;
-//        c.set(Calendar.DAY_OF_MONTH, 10);
+//        c.set(Calendar.MONTH,5);
+//        c.set(Calendar.DAY_OF_MONTH, 1);
+//
 //
 //        c.setTime(DateUtils.truncate(c.getTime()));
 //
+//
+//
 //        begin = new Date();
 //        System.out.println("设备指标记录调度程序执行开始!。。。。。。");
-//        for (int i = 0; i < 8; i++) {
+//        for (int i = 0; i < 122; i++) {
 //
 //
 //            System.out.println(DateUtils.format(c.getTime(), "yyyy-MM-dd HH:mm:ss").toString());
@@ -40,17 +44,6 @@ public class GenerationMain {
 //            WtAlysisDayService wtAlysisDayService = SpringUtils.getBean("wtAlysisDayService");
 //
 //            equipmentInfo1Service.calEquipmentInfoDay(c.getTime());
-//            equipmentInfo2Service.calEquipmentInfoDay(c.getTime());
-//            equipmentInfo3Service.calEquipmentInfoDay(c.getTime());
-//            equipmentInfo5Service.calEquipmentInfoDay(c.getTime());
-//            equipmentInfo4Service.calEquipmentInfoDay(c.getTime());
-//
-//
-//            equipmentInfoDayTopService.calEquipmentInfoDayTop(c.getTime());
-//            equipmentInfoDayTopService.calEquipmentInfoMonthTop(c.getTime());
-//            equipmentInfoDayTopService.calEquipmentInfoYearTop(c.getTime());
-//
-//            wtAlysisDayService.calEquipmentInfoDay(c.getTime());
 //
 //
 //
@@ -67,22 +60,8 @@ public class GenerationMain {
 //            windPowerInfo1Service.calCompanyInfoDay(c.getTime());
 //            windPowerInfo1Service.calRegionInfoDay(c.getTime());
 //
-//            windPowerInfo2Service.calLineInfoDay(c.getTime());
-//            windPowerInfo2Service.calProjectInfoDay(c.getTime());
-//            windPowerInfo2Service.calWindpowerInfoDay(c.getTime());
-//            windPowerInfo2Service.calCompanyInfoDay(c.getTime());
-//            windPowerInfo2Service.calRegionInfoDay(c.getTime());
 //
-//            windPowerInfo3Service.calLineInfoDay(c.getTime());
-//            windPowerInfo3Service.calProjectInfoDay(c.getTime());
-//            windPowerInfo3Service.calWindpowerInfoDay(c.getTime());
-//            windPowerInfo3Service.calCompanyInfoDay(c.getTime());
-//            windPowerInfo3Service.calRegionInfoDay(c.getTime());
 //
-//            windPowerInfo4Service.calLineInfoDay(c.getTime());
-//            windPowerInfo4Service.calProjectInfoDay(c.getTime());
-//            windPowerInfo4Service.calWindpowerInfoDay(c.getTime());
-//            windPowerInfo4Service.calCompanyInfoDay(c.getTime());
 //
 //            c.add(Calendar.DAY_OF_MONTH, 1);
 //            System.out.println(end);
@@ -93,65 +72,6 @@ public class GenerationMain {
 //        System.out.println("执行用时"+ DateUtils.secondsDiff(begin,end) +"秒");
 //        System.out.println(end);
 
-//        c.set(Calendar.DAY_OF_MONTH, 1);
-//        c.setTime(DateUtils.truncate(c.getTime()));
-//        System.out.println("场站指标记录调度程序执行开始!。。。。。。");
-//        for (int i = 0; i < 17; i++) {
-//
-//
-//            System.out.println(DateUtils.format(c.getTime(), "yyyy-MM-dd HH:mm:ss").toString());
-//
-//            WindPowerInfo1Service windPowerInfo1Service = SpringUtils.getBean("windPowerInfo1Service");
-//            WindPowerInfo2Service windPowerInfo2Service = SpringUtils.getBean("windPowerInfo2Service");
-//            WindPowerInfo3Service windPowerInfo3Service = SpringUtils.getBean("windPowerInfo3Service");
-//            WindPowerInfo4Service windPowerInfo4Service = SpringUtils.getBean("windPowerInfo4Service");
-////            WindPowerInfo5Service windPowerInfo5Service = SpringUtils.getBean("windPowerInfo5Service");
-//            WindPowerInfo6Service windPowerInfo6Service = SpringUtils.getBean("windPowerInfo6Service");
-//
-//            windPowerInfo1Service.calLineInfoDay(c.getTime());
-//            windPowerInfo1Service.calProjectInfoDay(c.getTime());
-//            windPowerInfo1Service.calWindpowerInfoDay(c.getTime());
-//            windPowerInfo1Service.calCompanyInfoDay(c.getTime());
-//            windPowerInfo1Service.calRegionInfoDay(c.getTime());
-//
-////            windPowerInfo2Service.calLineInfoDay(c.getTime());
-////            windPowerInfo2Service.calProjectInfoDay(c.getTime());
-////            windPowerInfo2Service.calWindpowerInfoDay(c.getTime());
-////            windPowerInfo2Service.calCompanyInfoDay(c.getTime());
-////            windPowerInfo2Service.calRegionInfoDay(c.getTime());
-//
-////            windPowerInfo3Service.calLineInfoDay(c.getTime());
-////            windPowerInfo3Service.calProjectInfoDay(c.getTime());
-////            windPowerInfo3Service.calWindpowerInfoDay(c.getTime());
-////            windPowerInfo3Service.calCompanyInfoDay(c.getTime());
-////            windPowerInfo3Service.calRegionInfoDay(c.getTime());
-//
-//            windPowerInfo4Service.calLineInfoDay(c.getTime());
-//            windPowerInfo4Service.calProjectInfoDay(c.getTime());
-//            windPowerInfo4Service.calWindpowerInfoDay(c.getTime());
-//            windPowerInfo4Service.calCompanyInfoDay(c.getTime());
-////            windPowerInfo4Service.calRegionInfoDay(c.getTime());
-//
-////            windPowerInfo5Service.calLineInfoDay(c.getTime());
-////            windPowerInfo5Service.calProjectInfoDay(c.getTime());
-////            windPowerInfo5Service.calWindpowerInfoDay(c.getTime());
-////            windPowerInfo5Service.calCompanyInfoDay(c.getTime());
-////            windPowerInfo5Service.calRegionInfoDay(c.getTime());
-////
-////            windPowerInfo6Service.calLineInfoDay(c.getTime());
-////            windPowerInfo6Service.calProjectInfoDay(c.getTime());
-////            windPowerInfo6Service.calWindpowerInfoDay(c.getTime());
-////            windPowerInfo6Service.calCompanyInfoDay(c.getTime());
-////            windPowerInfo6Service.calRegionInfoDay(c.getTime());
-//
-//            c.add(Calendar.DAY_OF_MONTH, 1);
-//
-//            System.out.println("完成一次!。。。。。。");
-//        }
-//
-//        end = new Date();
-//        System.out.println("执行用时" + DateUtils.secondsDiff(begin, end) + "秒");
-//        System.out.println("场站指标记录调度程序执行结束!。。。。。。");
 
 
         System.out.println("完成");

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

@@ -1,87 +1,88 @@
-//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")
+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")
-////
-////@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-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-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();
-//     */
-//
+//@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-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/config/mybatis/CustomizedSqlInjector.java

@@ -0,0 +1,22 @@
+package com.gyee.generation.config.mybatis;
+
+import com.baomidou.mybatisplus.core.injector.AbstractMethod;
+import com.baomidou.mybatisplus.core.injector.DefaultSqlInjector;
+
+import java.util.List;
+
+/**
+ * 自定义方法SQL注入器
+ */
+public class CustomizedSqlInjector extends DefaultSqlInjector {
+    /**
+     * 如果只需增加方法，保留mybatis plus自带方法，
+     * 可以先获取super.getMethodList()，再添加add
+     */
+    @Override
+    public List<AbstractMethod> getMethodList(Class<?> mapperClass) {
+        List<AbstractMethod> methodList = super.getMethodList(mapperClass);
+        methodList.add(new InsertOrUpdateBath());
+        return methodList;
+    }
+}

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

@@ -0,0 +1,75 @@
+package com.gyee.generation.config.mybatis;
+
+
+import com.baomidou.mybatisplus.core.injector.AbstractMethod;
+        import com.baomidou.mybatisplus.core.metadata.TableInfo;
+        import org.apache.ibatis.executor.keygen.NoKeyGenerator;
+        import org.apache.ibatis.mapping.MappedStatement;
+        import org.apache.ibatis.mapping.SqlSource;
+        import org.springframework.util.StringUtils;
+
+public class InsertOrUpdateBath extends AbstractMethod {
+
+    @Override
+    public MappedStatement injectMappedStatement(Class<?> mapperClass, Class<?> modelClass, TableInfo tableInfo) {
+        final String sql = "<script>insert into %s %s values %s ON DUPLICATE KEY UPDATE %s</script>";
+        final String tableName = tableInfo.getTableName();
+        final String filedSql = prepareFieldSql(tableInfo);
+        final String modelValuesSql = prepareModelValuesSql(tableInfo);
+        final String duplicateKeySql =prepareDuplicateKeySql(tableInfo);
+        final String sqlResult = String.format(sql, tableName, filedSql, modelValuesSql,duplicateKeySql);
+        //System.out.println("savaorupdatesqlsql="+sqlResult);
+        SqlSource sqlSource = languageDriver.createSqlSource(configuration, sqlResult, modelClass);
+        return this.addInsertMappedStatement(mapperClass, modelClass, "mysqlInsertOrUpdateBath", sqlSource, new NoKeyGenerator(), null, null);
+    }
+
+    /**
+     * 准备ON DUPLICATE KEY UPDATE sql
+     * @param tableInfo
+     * @return
+     */
+    private String prepareDuplicateKeySql(TableInfo tableInfo) {
+        final StringBuilder duplicateKeySql = new StringBuilder();
+        if(!StringUtils.isEmpty(tableInfo.getKeyColumn())) {
+            duplicateKeySql.append(tableInfo.getKeyColumn()).append("=values(").append(tableInfo.getKeyColumn()).append("),");
+        }
+
+        tableInfo.getFieldList().forEach(x -> {
+            duplicateKeySql.append(x.getColumn())
+                    .append("=values(")
+                    .append(x.getColumn())
+                    .append("),");
+        });
+        duplicateKeySql.delete(duplicateKeySql.length() - 1, duplicateKeySql.length());
+        return duplicateKeySql.toString();
+    }
+
+    /**
+     * 准备属性名
+     * @param tableInfo
+     * @return
+     */
+    private String prepareFieldSql(TableInfo tableInfo) {
+        StringBuilder fieldSql = new StringBuilder();
+        fieldSql.append(tableInfo.getKeyColumn()).append(",");
+        tableInfo.getFieldList().forEach(x -> {
+            fieldSql.append(x.getColumn()).append(",");
+        });
+        fieldSql.delete(fieldSql.length() - 1, fieldSql.length());
+        fieldSql.insert(0, "(");
+        fieldSql.append(")");
+        return fieldSql.toString();
+    }
+
+    private String prepareModelValuesSql(TableInfo tableInfo){
+        final StringBuilder valueSql = new StringBuilder();
+        valueSql.append("<foreach collection=\"list\" item=\"item\" index=\"index\" open=\"(\" separator=\"),(\" close=\")\">");
+        if(!StringUtils.isEmpty(tableInfo.getKeyProperty())) {
+            valueSql.append("#{item.").append(tableInfo.getKeyProperty()).append("},");
+        }
+        tableInfo.getFieldList().forEach(x -> valueSql.append("#{item.").append(x.getProperty()).append("},"));
+        valueSql.delete(valueSql.length() - 1, valueSql.length());
+        valueSql.append("</foreach>");
+        return valueSql.toString();
+    }
+}

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

@@ -0,0 +1,28 @@
+package com.gyee.generation.config.mybatis;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * 根Mapper，给表Mapper继承用的，可以自定义通用方法
+ * {@link BaseMapper}
+ * {@link com.baomidou.mybatisplus.extension.service.IService}
+ * {@link com.baomidou.mybatisplus.extension.service.impl.ServiceImpl}
+ */
+public interface RootMapper<T> extends BaseMapper<T> {
+
+    /**
+     * 自定义批量插入
+     * 如果要自动填充，@Param(xx) xx参数名必须是 list/collection/array 3个的其中之一
+     */
+    int insertBatch(@Param("list") List<T> list);
+
+    /**
+     * 自定义批量新增或更新
+     * 如果要自动填充，@Param(xx) xx参数名必须是 list/collection/array 3个的其中之一
+     */
+    int insertOrUpdateBath(@Param("list") List<T> list);
+
+}

realtime/generationXK-service/src/main/java/com/gyee/generation/mapper/auto/ProEconEquipmentInfoDay1Mapper.java

@@ -1,7 +1,7 @@
 package com.gyee.generation.mapper.auto;
 
+import com.gyee.generation.config.mybatis.RootMapper;
 import com.gyee.generation.model.auto.ProEconEquipmentInfoDay1;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**
  * <p>
@@ -11,6 +11,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * @author shilin
  * @since 2022-11-01
  */
-public interface ProEconEquipmentInfoDay1Mapper extends BaseMapper<ProEconEquipmentInfoDay1> {
+public interface ProEconEquipmentInfoDay1Mapper extends RootMapper<ProEconEquipmentInfoDay1> {
 
 }

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

@@ -5,6 +5,7 @@ import com.gyee.common.contant.ContantXk;
 import com.gyee.common.model.PointData;
 import com.gyee.common.model.StringUtils;
 import com.gyee.generation.init.CacheContext;
+import com.gyee.generation.mapper.auto.ProEconEquipmentInfoDay1Mapper;
 import com.gyee.generation.model.auto.ProBasicEquipment;
 import com.gyee.generation.model.auto.ProBasicEquipmentPoint;
 import com.gyee.generation.model.auto.ProEconEquipmentInfoDay1;
@@ -32,6 +33,9 @@ public class EquipmentInfo1Service {
     private IProEconEquipmentInfoDay1Service proEconEquipmentInfoDay1Service;
     @Resource
     private Executor executor;
+
+    @Resource
+    private ProEconEquipmentInfoDay1Mapper proEconEquipmentInfoDay1Mapper;
     /**
      * 计算设备日信息
      */
@@ -46,29 +50,6 @@ public class EquipmentInfo1Service {
 
         Date begin= DateUtils.truncate(c.getTime());
 
-//        QueryWrapper<ProEconEquipmentInfoDay1> queryWrapper = new QueryWrapper<>();
-//        queryWrapper.eq("record_date",recordDate);
-//        //判断是否有重复记录，先删除重复记录
-//        List<String> idls = proEconEquipmentInfoDay1Service.list(queryWrapper).stream()
-//                .map(ProEconEquipmentInfoDay1::getId)
-//                .collect(Collectors.toList());
-//
-//        List<String> tempids=new ArrayList<>();
-//
-//        for(int i=0;i<idls.size();i++)
-//        {
-//            tempids.add(idls.get(i));
-//            if(tempids.size()==100)
-//            {
-//                proEconEquipmentInfoDay1Service.removeByIds(tempids);
-//                tempids=new ArrayList<>();
-//            }
-//        }
-//
-//        if(!tempids.isEmpty())
-//        {
-//            proEconEquipmentInfoDay1Service.removeByIds(tempids);
-//        }
 
         Map<String,ProEconEquipmentInfoDay1> pep1map=new HashMap<>();
         Calendar cl=Calendar.getInstance();
@@ -89,48 +70,9 @@ public class EquipmentInfo1Service {
         }
 
         List<ProEconEquipmentInfoDay1> dayls=new ArrayList<>();
-        final CountDownLatch latch = new CountDownLatch(+CacheContext.wtfdls.size());
-        for(ProBasicEquipment wt:CacheContext.wtfdls)
+        final CountDownLatch latch = new CountDownLatch(+CacheContext.wtls.size());
+        for(ProBasicEquipment wt:CacheContext.wtls)
         {
-//            if(CacheContext.wtpAimap.containsKey(wt.getId()))
-//            {
-//                Map<String, ProBasicEquipmentPoint> pointmap=CacheContext.wtpAimap.get(wt.getId());
-//
-//                ProEconEquipmentInfoDay1 pewp=new ProEconEquipmentInfoDay1();
-//                Initial.initial(pewp);
-//                pewp.setCompanyId(wt.getCompanyId());
-//                pewp.setWindpowerstationId(wt.getWindpowerstationId());
-//                pewp.setLineId(wt.getLineId());
-//                pewp.setProjectId(wt.getProjectId());
-//                pewp.setRegionId(wt.getRegionId());
-//                pewp.setRecordDate(DateUtils.truncate(recordDate));
-//                pewp.setWindturbineId(wt.getId());
-//                //昨日的统计结果
-//                List<ProEconEquipmentInfoDay1> pep1ls =new ArrayList<>();
-////                Calendar cl=Calendar.getInstance();
-////                cl.setTime(recordDate);
-////                if(cl.get(Calendar.DAY_OF_MONTH)!=1)
-////                {
-////                    QueryWrapper<ProEconEquipmentInfoDay1> queryWrapper2 = new QueryWrapper<>();
-////                    queryWrapper2.eq("record_date",cl.getTime())
-////                            .eq("windturbine_Id",wt.getId());
-////                    pepid1ls = proEconEquipmentInfoDay1Service.list(queryWrapper2);
-//////                            .stream()
-//////                            .filter(i -> i.getRecordDate().compareTo(DateUtils.truncate(cl.getTime())) == 0
-//////                                    && CacheContext.wtmap.containsKey(i.getWindturbineId())
-//////                            ).collect(Collectors.toList());
-////                }
-//
-//                if(pep1map.containsKey(wt.getId()))
-//                {
-//                    pep1ls.add(pep1map.get(wt.getId()));
-//                }
-//                extracted(recordDate, end, begin, pointmap, pewp,pep1ls);
-//
-//                dayls.add(pewp);
-//                // proEconEquipmentInfoDay1Service.save(pewp);
-//
-//            }
 
             new Thread(new EquipmentInfo1Thread(executor,  wt,  pep1map,
                     recordDate,  end,  begin,dayls,
@@ -161,7 +103,7 @@ public class EquipmentInfo1Service {
         for(int i=0;i<idls.size();i++)
         {
             tempids.add(idls.get(i));
-            if(tempids.size()==100)
+            if(tempids.size()==1000)
             {
                 proEconEquipmentInfoDay1Service.removeByIds(tempids);
                 tempids=new ArrayList<>();
@@ -179,7 +121,7 @@ public class EquipmentInfo1Service {
             if(StringUtils.notEmp(vo) && StringUtils.notEmp(vo.getWindturbineId()))
             {
                 templs.add(vo);
-                if(templs.size()==100)
+                if(templs.size()==1000)
                 {
                     proEconEquipmentInfoDay1Service.saveBatch(templs);
                     templs=new ArrayList<>();
@@ -192,7 +134,27 @@ public class EquipmentInfo1Service {
         {
             proEconEquipmentInfoDay1Service.saveBatch(templs);
         }
-//        proEconEquipmentInfoDay1Service.saveBatch(dayls);
+//
+//        List<ProEconEquipmentInfoDay1> templs=new ArrayList<>();
+//        for(ProEconEquipmentInfoDay1 vo:dayls)
+//        {
+//            if(StringUtils.notEmp(vo) && StringUtils.notEmp(vo.getWindturbineId()))
+//            {
+//                templs.add(vo);
+//                if(templs.size()==1000)
+//                {
+//                    proEconEquipmentInfoDay1Mapper.insertOrUpdateBath(templs);
+//                    templs=new ArrayList<>();
+//                }
+//            }
+//
+//        }
+//
+//        if(!templs.isEmpty())
+//        {
+//            proEconEquipmentInfoDay1Mapper.insertOrUpdateBath(templs);
+//        }
+//
     }
 
     private void extracted(Date recordDate, Date end, Date begin,Map<String, ProBasicEquipmentPoint> pointmap, ProEconEquipmentInfoDay1 pewp,List<ProEconEquipmentInfoDay1> pepid1ls) throws Exception {

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

@@ -57,7 +57,7 @@ public class EquipmentInfo2Service {
 //        for(int i=0;i<idls.size();i++)
 //        {
 //            tempids.add(idls.get(i));
-//            if(tempids.size()==100)
+//            if(tempids.size()==1000)
 //            {
 //                proEconEquipmentInfoDay2Service.removeByIds(tempids);
 //                tempids=new ArrayList<>();
@@ -156,7 +156,7 @@ public class EquipmentInfo2Service {
         for(int i=0;i<idls.size();i++)
         {
             tempids.add(idls.get(i));
-            if(tempids.size()==100)
+            if(tempids.size()==1000)
             {
                 proEconEquipmentInfoDay2Service.removeByIds(tempids);
                 tempids=new ArrayList<>();
@@ -175,7 +175,7 @@ public class EquipmentInfo2Service {
             if(StringUtils.notEmp(vo) && StringUtils.notEmp(vo.getWindturbineId()))
             {
                 templs.add(vo);
-                if(templs.size()==100)
+                if(templs.size()==1000)
                 {
                     proEconEquipmentInfoDay2Service.saveBatch(templs);
                     templs=new ArrayList<>();

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

@@ -64,7 +64,7 @@ public class EquipmentInfo3Service {
 //        for(int i=0;i<idls.size();i++)
 //        {
 //            tempids.add(idls.get(i));
-//            if(tempids.size()==100)
+//            if(tempids.size()==1000)
 //            {
 //                proEconEquipmentInfoDay3Service.removeByIds(tempids);
 //                tempids=new ArrayList<>();
@@ -166,7 +166,7 @@ public class EquipmentInfo3Service {
         for(int i=0;i<idls.size();i++)
         {
             tempids.add(idls.get(i));
-            if(tempids.size()==100)
+            if(tempids.size()==1000)
             {
                 proEconEquipmentInfoDay3Service.removeByIds(tempids);
                 tempids=new ArrayList<>();
@@ -184,7 +184,7 @@ public class EquipmentInfo3Service {
             if(StringUtils.notEmp(vo) && StringUtils.notEmp(vo.getWindturbineId()))
             {
                 templs.add(vo);
-                if(templs.size()==100)
+                if(templs.size()==1000)
                 {
                     proEconEquipmentInfoDay3Service.saveBatch(templs);
                     templs=new ArrayList<>();

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

@@ -96,7 +96,7 @@ public class EquipmentInfo4Service {
 //        for(int i=0;i<idls.size();i++)
 //        {
 //            tempids.add(idls.get(i));
-//            if(tempids.size()==100)
+//            if(tempids.size()==1000)
 //            {
 //                proEconEquipmentInfoDay4Service.removeByIds(tempids);
 //                tempids=new ArrayList<>();
@@ -313,7 +313,7 @@ public class EquipmentInfo4Service {
         for(int i=0;i<idls.size();i++)
         {
             tempids.add(idls.get(i));
-            if(tempids.size()==100)
+            if(tempids.size()==1000)
             {
                 proEconEquipmentInfoDay4Service.removeByIds(tempids);
                 tempids=new ArrayList<>();
@@ -326,14 +326,13 @@ public class EquipmentInfo4Service {
         }
 
 
-
         List<ProEconEquipmentInfoDay4> templs=new ArrayList<>();
         for(ProEconEquipmentInfoDay4 vo:dayls)
         {
             if(StringUtils.notEmp(vo.getWindturbineId()))
             {
                 templs.add(vo);
-                if(templs.size()==100)
+                if(templs.size()==1000)
                 {
                     proEconEquipmentInfoDay4Service.saveBatch(templs);
                     templs=new ArrayList<>();

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

@@ -174,7 +174,7 @@ public class EquipmentInfo5Service {
 //        for(int i=0;i<dayInfoids.size();i++)
 //        {
 //            tempids.add(dayInfoids.get(i));
-//            if(tempids.size()==100)
+//            if(tempids.size()==1000)
 //            {
 //                proEconEquipmentInfoDay5Service.removeByIds(tempids);
 //                tempids=new ArrayList<>();
@@ -212,7 +212,7 @@ public class EquipmentInfo5Service {
         for(int i=0;i<dayInfoids.size();i++)
         {
             tempids.add(dayInfoids.get(i));
-            if(tempids.size()==100)
+            if(tempids.size()==1000)
             {
                 proEconEquipmentInfoDay5Service.removeByIds(tempids);
                 tempids=new ArrayList<>();
@@ -230,7 +230,7 @@ public class EquipmentInfo5Service {
             if(StringUtils.notEmp(vo.getWindturbineId()))
             {
                 templs.add(vo);
-                if(templs.size()==100)
+                if(templs.size()==1000)
                 {
                     proEconEquipmentInfoDay5Service.saveBatch(templs);
                     templs=new ArrayList<>();

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

@@ -272,7 +272,7 @@ public class EquipmentInfo6Service {
             for(ProEconEquipmentInfoDay6 vo:resultList)
             {
                 templs.add(vo);
-                if(templs.size()==100)
+                if(templs.size()==1000)
                 {
                     proEconEquipmentInfoDay6Service.saveOrUpdateBatch(templs);
                     templs=new ArrayList<>();
@@ -354,7 +354,7 @@ public class EquipmentInfo6Service {
             for(ProEconPowerstationInfoDay7 vo:lnResultlist)
             {
                 templs.add(vo);
-                if(templs.size()==100)
+                if(templs.size()==1000)
                 {
                     proEconPowerstationInfoDay7Service.saveOrUpdateBatch(templs);
                     templs=new ArrayList<>();
@@ -407,7 +407,7 @@ public class EquipmentInfo6Service {
             for(ProEconPowerstationInfoDay7 vo:pjResultlist)
             {
                 temp2ls.add(vo);
-                if(temp2ls.size()==100)
+                if(temp2ls.size()==1000)
                 {
                     proEconPowerstationInfoDay7Service.saveOrUpdateBatch(temp2ls);
                     temp2ls=new ArrayList<>();
@@ -459,7 +459,7 @@ public class EquipmentInfo6Service {
             for(ProEconPowerstationInfoDay7 vo:wpResultlist)
             {
                 temp3ls.add(vo);
-                if(temp3ls.size()==100)
+                if(temp3ls.size()==1000)
                 {
                     proEconPowerstationInfoDay7Service.saveOrUpdateBatch(temp3ls);
                     temp3ls=new ArrayList<>();

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

@@ -49,7 +49,7 @@ public class EquipmentInfoDayTopService {
 //        for(int i=0;i<idls.size();i++)
 //        {
 //            tempids.add(idls.get(i));
-//            if(tempids.size()==100)
+//            if(tempids.size()==1000)
 //            {
 //                proEconEquipmentInfoDayTopService.removeByIds(tempids);
 //                tempids=new ArrayList<>();
@@ -113,7 +113,7 @@ public class EquipmentInfoDayTopService {
             for(int i=0;i<idls.size();i++)
             {
                 tempids.add(idls.get(i));
-                if(tempids.size()==100)
+                if(tempids.size()==1000)
                 {
                     proEconEquipmentInfoDayTopService.removeByIds(tempids);
                     tempids=new ArrayList<>();
@@ -130,7 +130,7 @@ public class EquipmentInfoDayTopService {
             for(ProEconEquipmentInfoDayTop vo:topls)
             {
                 templs.add(vo);
-                if(templs.size()==100)
+                if(templs.size()==1000)
                 {
                     proEconEquipmentInfoDayTopService.saveBatch(templs);
                     templs=new ArrayList<>();
@@ -207,7 +207,7 @@ public class EquipmentInfoDayTopService {
             for(int i=0;i<idls.size();i++)
             {
                 tempids.add(idls.get(i));
-                if(tempids.size()==100)
+                if(tempids.size()==1000)
                 {
                     proEconEquipmentInfoDayTopService.removeByIds(tempids);
                     tempids=new ArrayList<>();
@@ -223,7 +223,7 @@ public class EquipmentInfoDayTopService {
             for(ProEconEquipmentInfoDayTop vo:topls)
             {
                 templs.add(vo);
-                if(templs.size()==100)
+                if(templs.size()==1000)
                 {
                     proEconEquipmentInfoDayTopService.saveBatch(templs);
                     templs=new ArrayList<>();
@@ -297,7 +297,7 @@ public class EquipmentInfoDayTopService {
             for(int i=0;i<idls.size();i++)
             {
                 tempids.add(idls.get(i));
-                if(tempids.size()==100)
+                if(tempids.size()==1000)
                 {
                     proEconEquipmentInfoDayTopService.removeByIds(tempids);
                     tempids=new ArrayList<>();
@@ -313,7 +313,7 @@ public class EquipmentInfoDayTopService {
             for(ProEconEquipmentInfoDayTop vo:topls)
             {
                 templs.add(vo);
-                if(templs.size()==100)
+                if(templs.size()==1000)
                 {
                     proEconEquipmentInfoDayTopService.saveBatch(templs);
                     templs=new ArrayList<>();

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

@@ -291,7 +291,7 @@ public class PowerCurveFittingByTimeGfService {
             for(ProEconCurveFittingSub vo:subls)
             {
                 templs.add(vo);
-                if(templs.size()==100)
+                if(templs.size()==1000)
                 {
                     proEconCurveFittingSubService.saveOrUpdateBatch(templs);
                     templs=new ArrayList<>();
@@ -318,7 +318,7 @@ public class PowerCurveFittingByTimeGfService {
         for(ProEconCurveFittingMain vo:mainls)
         {
             templs.add(vo);
-            if(templs.size()==100)
+            if(templs.size()==1000)
             {
                 proEconCurveFittingMainService.saveOrUpdateBatch(templs);
                 templs=new ArrayList<>();
@@ -580,7 +580,7 @@ public class PowerCurveFittingByTimeGfService {
             for(ProEconCurveFittMonthSub vo:subls)
             {
                 templs.add(vo);
-                if(templs.size()==100)
+                if(templs.size()==1000)
                 {
                     proEconCurveFittMonthSubService.saveOrUpdateBatch(templs);
                     templs=new ArrayList<>();
@@ -609,7 +609,7 @@ public class PowerCurveFittingByTimeGfService {
         for(ProEconCurveFittMonthMain vo:mainls)
         {
             templs.add(vo);
-            if(templs.size()==100)
+            if(templs.size()==1000)
             {
                 proEconCurveFittMonthMainService.saveOrUpdateBatch(templs);
                 templs=new ArrayList<>();
@@ -893,7 +893,7 @@ public class PowerCurveFittingByTimeGfService {
             for(ProEconCurveFittYearSub vo:subls)
             {
                 templs.add(vo);
-                if(templs.size()==100)
+                if(templs.size()==1000)
                 {
                     proEconCurveFittYearSubService.saveOrUpdateBatch(templs);
                     templs=new ArrayList<>();
@@ -919,7 +919,7 @@ public class PowerCurveFittingByTimeGfService {
         for(ProEconCurveFittYearMain vo:mainls)
         {
             templs.add(vo);
-            if(templs.size()==100)
+            if(templs.size()==1000)
             {
                 proEconCurveFittYearMainService.saveOrUpdateBatch(templs);
                 templs=new ArrayList<>();
@@ -1167,7 +1167,7 @@ public class PowerCurveFittingByTimeGfService {
         for(ProEconWtCurveFitting vo:wtcfls)
         {
             templs.add(vo);
-            if(templs.size()==100)
+            if(templs.size()==1000)
             {
                 proEconWtCurveFittingService.saveOrUpdateBatch(templs);
                 templs=new ArrayList<>();
@@ -1262,7 +1262,7 @@ public class PowerCurveFittingByTimeGfService {
         for(ProEconWtCurveFittingMonth vo:wtcfls)
         {
             templs.add(vo);
-            if(templs.size()==100)
+            if(templs.size()==1000)
             {
                 proEconWtCurveFittingMonthService.saveOrUpdateBatch(templs);
                 templs=new ArrayList<>();
@@ -1350,7 +1350,7 @@ public class PowerCurveFittingByTimeGfService {
         for(ProEconWtCurveFittingYear vo:wtcfls)
         {
             templs.add(vo);
-            if(templs.size()==100)
+            if(templs.size()==1000)
             {
                 proEconWtCurveFittingYearService.saveOrUpdateBatch(templs);
                 templs=new ArrayList<>();
@@ -1454,7 +1454,7 @@ public class PowerCurveFittingByTimeGfService {
         for(ProEconWtPowerCurveFitting vo:wtcfls)
         {
             templs.add(vo);
-            if(templs.size()==100)
+            if(templs.size()==1000)
             {
                 proEconWtPowerCurveFittingService.saveOrUpdateBatch(templs);
                 templs=new ArrayList<>();

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

@@ -306,7 +306,7 @@ public class PowerCurveFittingByTimeService {
             for(ProEconCurveFittingSub vo:subls)
             {
                 templs.add(vo);
-                if(templs.size()==100)
+                if(templs.size()==1000)
                 {
                     proEconCurveFittingSubService.saveBatch(templs);
                     templs=new ArrayList<>();
@@ -332,7 +332,7 @@ public class PowerCurveFittingByTimeService {
         for(ProEconCurveFittingMain vo:mainls)
         {
             templs.add(vo);
-            if(templs.size()==100)
+            if(templs.size()==1000)
             {
                 proEconCurveFittingMainService.saveBatch(templs);
                 templs=new ArrayList<>();
@@ -610,7 +610,7 @@ public class PowerCurveFittingByTimeService {
             for(ProEconCurveFittMonthSub vo:subls)
             {
                 templs.add(vo);
-                if(templs.size()==100)
+                if(templs.size()==1000)
                 {
                     proEconCurveFittMonthSubService.saveBatch(templs);
                     templs=new ArrayList<>();
@@ -639,7 +639,7 @@ public class PowerCurveFittingByTimeService {
         for(ProEconCurveFittMonthMain vo:mainls)
         {
             templs.add(vo);
-            if(templs.size()==100)
+            if(templs.size()==1000)
             {
                 proEconCurveFittMonthMainService.saveBatch(templs);
                 templs=new ArrayList<>();
@@ -937,7 +937,7 @@ public class PowerCurveFittingByTimeService {
             for(ProEconCurveFittYearSub vo:subls)
             {
                 templs.add(vo);
-                if(templs.size()==100)
+                if(templs.size()==1000)
                 {
                     proEconCurveFittYearSubService.saveBatch(templs);
                     templs=new ArrayList<>();
@@ -962,7 +962,7 @@ public class PowerCurveFittingByTimeService {
         for(ProEconCurveFittYearMain vo:mainls)
         {
             templs.add(vo);
-            if(templs.size()==100)
+            if(templs.size()==1000)
             {
                 proEconCurveFittYearMainService.saveBatch(templs);
                 templs=new ArrayList<>();
@@ -1215,7 +1215,7 @@ public class PowerCurveFittingByTimeService {
         for(ProEconWtCurveFitting vo:wtcfls)
         {
             templs.add(vo);
-            if(templs.size()==100)
+            if(templs.size()==1000)
             {
                 proEconWtCurveFittingService.saveBatch(templs);
                 templs=new ArrayList<>();
@@ -1313,7 +1313,7 @@ public class PowerCurveFittingByTimeService {
         for(ProEconWtCurveFittingMonth vo:wtcfls)
         {
             templs.add(vo);
-            if(templs.size()==100)
+            if(templs.size()==1000)
             {
                 proEconWtCurveFittingMonthService.saveBatch(templs);
                 templs=new ArrayList<>();
@@ -1406,7 +1406,7 @@ public class PowerCurveFittingByTimeService {
         for(ProEconWtCurveFittingYear vo:wtcfls)
         {
             templs.add(vo);
-            if(templs.size()==100)
+            if(templs.size()==1000)
             {
                 proEconWtCurveFittingYearService.saveBatch(templs);
                 templs=new ArrayList<>();
@@ -1509,7 +1509,7 @@ public class PowerCurveFittingByTimeService {
             for(ProEconWtPowerCurveFitting vo:wtcfls)
             {
                 templs.add(vo);
-                if(templs.size()==100)
+                if(templs.size()==1000)
                 {
                     proEconWtPowerCurveFittingService.saveBatch(templs);
                     templs=new ArrayList<>();

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

@@ -445,7 +445,7 @@ public class ShutdownService {
                 for(ProEconWindturbineStatus vo:windturbineStatusls)
                 {
                     templs.add(vo);
-                    if(templs.size()==100)
+                    if(templs.size()==1000)
                     {
                         proEconWindturbineStatusService.saveOrUpdateBatch(templs);
                         templs=new ArrayList<>();
@@ -464,7 +464,7 @@ public class ShutdownService {
                 for(ProEconShutdownEvent vo:shutdwonEventls)
                 {
                     templs.add(vo);
-                    if(templs.size()==100)
+                    if(templs.size()==1000)
                     {
                         proEconShutdownEventService.saveOrUpdateBatch(templs);
                         templs=new ArrayList<>();
@@ -484,7 +484,7 @@ public class ShutdownService {
                 for(ProEconShutdownEvent2 vo:shutdwonEvent2ls)
                 {
                     templs.add(vo);
-                    if(templs.size()==100)
+                    if(templs.size()==1000)
                     {
                         proEconShutdownEvent2Service.saveOrUpdateBatch(templs);
                         templs=new ArrayList<>();
@@ -504,7 +504,7 @@ public class ShutdownService {
                 for(ProEconInterruption vo:interrupls)
                 {
                     templs.add(vo);
-                    if(templs.size()==100)
+                    if(templs.size()==1000)
                     {
                         proEconInterruptionService.saveOrUpdateBatch(templs);
                         templs=new ArrayList<>();

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

@@ -70,7 +70,7 @@ public class TimelinessRateService {
 //        for(int i=0;i<deleteitems.size();i++)
 //        {
 //            tempids.add(deleteitems.get(i));
-//            if(tempids.size()==100)
+//            if(tempids.size()==1000)
 //            {
 //                proEconFaultLiminatedefectsService.removeByIds(tempids);
 //                tempids=new ArrayList<>();
@@ -175,7 +175,7 @@ public class TimelinessRateService {
         for(int i=0;i<deleteitems.size();i++)
         {
             tempids.add(deleteitems.get(i));
-            if(tempids.size()==100)
+            if(tempids.size()==1000)
             {
                 proEconFaultLiminatedefectsService.removeByIds(tempids);
                 tempids=new ArrayList<>();
@@ -202,7 +202,7 @@ public class TimelinessRateService {
         {
 
             templs.add(vo);
-            if(templs.size()==100)
+            if(templs.size()==1000)
             {
                 proEconFaultLiminatedefectsService.saveBatch(templs);
                 templs=new ArrayList<>();

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

@@ -561,22 +561,7 @@ public class WindPowerInfo1Service {
         Date begin = DateUtils.truncate(c.getTime());
 
 
-        //判断是否有重复记录，先删除重复记录
-        QueryWrapper<ProEconPowerstationInfoDay1> queryWrapper = new QueryWrapper<>();
-        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()))
-                .map(ProEconPowerstationInfoDay1::getId)
-                .collect(Collectors.toList());
 
-        if (idls.size() > 0) {
-
-            proEconPowerstationInfoDay1Service.removeByIds(idls);
-
-        }
 
         Map<String,List<ProEconEquipmentInfoDay1>> pep1map=new HashMap<>();
         QueryWrapper<ProEconEquipmentInfoDay1> queryWrapper2 = new QueryWrapper<>();
@@ -645,11 +630,28 @@ 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(queryWrapper).stream()
+//                .filter(i -> i.getRecordDate().compareTo(DateUtils.truncate(recordDate)) == 0
+//                        && CacheContext.wpmap.containsKey(i.getWindpowerstationId())
+//                        && i.getLocation().equals(Location.wp.getValue()))
+                .map(ProEconPowerstationInfoDay1::getId)
+                .collect(Collectors.toList());
+
+        if (idls.size() > 0) {
+
+            proEconPowerstationInfoDay1Service.removeByIds(idls);
+
+        }
         List<ProEconPowerstationInfoDay1> templs=new ArrayList<>();
         for(ProEconPowerstationInfoDay1 vo:dayls)
         {
             templs.add(vo);
-            if(templs.size()==100)
+            if(templs.size()==1000)
             {
                 proEconPowerstationInfoDay1Service.saveBatch(templs);
                 templs=new ArrayList<>();
@@ -674,22 +676,7 @@ public class WindPowerInfo1Service {
 
         Date begin = DateUtils.truncate(c.getTime());
 
-        //判断是否有重复记录，先删除重复记录
-        QueryWrapper<ProEconPowerstationInfoDay1> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("record_date",DateUtils.truncate(recordDate))
-                .eq("location",Location.pj.getValue());
-        List<String> idls = proEconPowerstationInfoDay1Service.list(queryWrapper).stream()
-//                .filter(i -> i.getRecordDate().compareTo(DateUtils.truncate(recordDate)) == 0
-//                        && CacheContext.pjmap.containsKey(i.getProjectId())
-//                        && i.getLocation().equals(Location.pj.getValue()))
-                .map(ProEconPowerstationInfoDay1::getId)
-                .collect(Collectors.toList());
-
-        if (idls.size() > 0) {
-
-            proEconPowerstationInfoDay1Service.removeByIds(idls);
 
-        }
 
 
         Map<String,List<ProEconEquipmentInfoDay1>> pep1map=new HashMap<>();
@@ -762,11 +749,28 @@ public class WindPowerInfo1Service {
 
         }
 
+
+        //判断是否有重复记录，先删除重复记录
+        QueryWrapper<ProEconPowerstationInfoDay1> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("record_date",DateUtils.truncate(recordDate))
+                .eq("location",Location.pj.getValue());
+        List<String> idls = proEconPowerstationInfoDay1Service.list(queryWrapper).stream()
+//                .filter(i -> i.getRecordDate().compareTo(DateUtils.truncate(recordDate)) == 0
+//                        && CacheContext.pjmap.containsKey(i.getProjectId())
+//                        && i.getLocation().equals(Location.pj.getValue()))
+                .map(ProEconPowerstationInfoDay1::getId)
+                .collect(Collectors.toList());
+
+        if (idls.size() > 0) {
+
+            proEconPowerstationInfoDay1Service.removeByIds(idls);
+
+        }
         List<ProEconPowerstationInfoDay1> templs=new ArrayList<>();
         for(ProEconPowerstationInfoDay1 vo:dayls)
         {
             templs.add(vo);
-            if(templs.size()==100)
+            if(templs.size()==1000)
             {
                 proEconPowerstationInfoDay1Service.saveBatch(templs);
                 templs=new ArrayList<>();
@@ -791,22 +795,7 @@ public class WindPowerInfo1Service {
 
         Date begin = DateUtils.truncate(c.getTime());
 
-        //判断是否有重复记录，先删除重复记录
-        QueryWrapper<ProEconPowerstationInfoDay1> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("record_date",DateUtils.truncate(recordDate))
-                .eq("location",Location.ln.getValue());
-        List<String> idls = proEconPowerstationInfoDay1Service.list(queryWrapper).stream()
-//                .filter(i -> i.getRecordDate().compareTo(DateUtils.truncate(recordDate)) == 0
-//                        && CacheContext.lnmap.containsKey(i.getLineId())
-//                        && i.getLocation().equals(Location.ln.getValue()))
-                .map(ProEconPowerstationInfoDay1::getId)
-                .collect(Collectors.toList());
-
-        if (idls.size() > 0) {
-
-            proEconPowerstationInfoDay1Service.removeByIds(idls);
 
-        }
 
         Map<String,List<ProEconEquipmentInfoDay1>> pep1map=new HashMap<>();
         QueryWrapper<ProEconEquipmentInfoDay1> queryWrapper2 = new QueryWrapper<>();
@@ -864,11 +853,29 @@ public class WindPowerInfo1Service {
 
         }
 
+
+        //判断是否有重复记录，先删除重复记录
+        QueryWrapper<ProEconPowerstationInfoDay1> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("record_date",DateUtils.truncate(recordDate))
+                .eq("location",Location.ln.getValue());
+        List<String> idls = proEconPowerstationInfoDay1Service.list(queryWrapper).stream()
+//                .filter(i -> i.getRecordDate().compareTo(DateUtils.truncate(recordDate)) == 0
+//                        && CacheContext.lnmap.containsKey(i.getLineId())
+//                        && i.getLocation().equals(Location.ln.getValue()))
+                .map(ProEconPowerstationInfoDay1::getId)
+                .collect(Collectors.toList());
+
+        if (idls.size() > 0) {
+
+            proEconPowerstationInfoDay1Service.removeByIds(idls);
+
+        }
+
         List<ProEconPowerstationInfoDay1> templs=new ArrayList<>();
         for(ProEconPowerstationInfoDay1 vo:dayls)
         {
             templs.add(vo);
-            if(templs.size()==100)
+            if(templs.size()==1000)
             {
                 proEconPowerstationInfoDay1Service.saveBatch(templs);
                 templs=new ArrayList<>();

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

@@ -399,22 +399,7 @@ public class WindPowerInfo2Service {
         Date begin = DateUtils.truncate(c.getTime());
 
 
-        //判断是否有重复记录，先删除重复记录
-        QueryWrapper<ProEconPowerstationInfoDay2> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("record_date",DateUtils.truncate(recordDate)).eq("location",Location.wp.getValue());
 
-        List<String> idls = proEconPowerstationInfoDay2Service.list(queryWrapper).stream()
-//                .filter(i -> i.getRecordDate().compareTo(DateUtils.truncate(recordDate)) == 0
-//                        && CacheContext.wpmap.containsKey(i.getWindpowerstationId())
-//                        && i.getLocation().equals(Location.wp.getValue()))
-                .map(ProEconPowerstationInfoDay2::getId)
-                .collect(Collectors.toList());
-
-        if (idls.size() > 0) {
-
-            proEconPowerstationInfoDay2Service.removeByIds(idls);
-
-        }
 
         List<ProEconPowerstationInfoDay2> dayls=new ArrayList<>();
         for (ProBasicPowerstation wp : CacheContext.wpls) {
@@ -464,11 +449,29 @@ public class WindPowerInfo2Service {
 
         }
 
+
+        //判断是否有重复记录，先删除重复记录
+        QueryWrapper<ProEconPowerstationInfoDay2> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("record_date",DateUtils.truncate(recordDate)).eq("location",Location.wp.getValue());
+
+        List<String> idls = proEconPowerstationInfoDay2Service.list(queryWrapper).stream()
+//                .filter(i -> i.getRecordDate().compareTo(DateUtils.truncate(recordDate)) == 0
+//                        && CacheContext.wpmap.containsKey(i.getWindpowerstationId())
+//                        && i.getLocation().equals(Location.wp.getValue()))
+                .map(ProEconPowerstationInfoDay2::getId)
+                .collect(Collectors.toList());
+
+        if (idls.size() > 0) {
+
+            proEconPowerstationInfoDay2Service.removeByIds(idls);
+
+        }
+
         List<ProEconPowerstationInfoDay2> templs=new ArrayList<>();
         for(ProEconPowerstationInfoDay2 vo:dayls)
         {
             templs.add(vo);
-            if(templs.size()==100)
+            if(templs.size()==1000)
             {
                 proEconPowerstationInfoDay2Service.saveBatch(templs);
                 templs=new ArrayList<>();
@@ -493,22 +496,6 @@ public class WindPowerInfo2Service {
 
         Date begin = DateUtils.truncate(c.getTime());
 
-        //判断是否有重复记录，先删除重复记录
-        QueryWrapper<ProEconPowerstationInfoDay2> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("record_date",DateUtils.truncate(recordDate))
-                .eq("location",Location.pj.getValue());
-        List<String> idls = proEconPowerstationInfoDay2Service.list(queryWrapper).stream()
-//                .filter(i -> i.getRecordDate().compareTo(DateUtils.truncate(recordDate)) == 0
-//                        && CacheContext.pjmap.containsKey(i.getProjectId())
-//                        && i.getLocation().equals(Location.pj.getValue()))
-                        .map(ProEconPowerstationInfoDay2::getId)
-                .collect(Collectors.toList());
-
-        if (idls.size() > 0) {
-
-            proEconPowerstationInfoDay2Service.removeByIds(idls);
-
-        }
 
         List<ProEconPowerstationInfoDay2> dayls=new ArrayList<>();
         for (ProBasicProject pj : CacheContext.pjls) {
@@ -559,11 +546,29 @@ public class WindPowerInfo2Service {
 
 
         }
+
+        //判断是否有重复记录，先删除重复记录
+        QueryWrapper<ProEconPowerstationInfoDay2> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("record_date",DateUtils.truncate(recordDate))
+                .eq("location",Location.pj.getValue());
+        List<String> idls = proEconPowerstationInfoDay2Service.list(queryWrapper).stream()
+//                .filter(i -> i.getRecordDate().compareTo(DateUtils.truncate(recordDate)) == 0
+//                        && CacheContext.pjmap.containsKey(i.getProjectId())
+//                        && i.getLocation().equals(Location.pj.getValue()))
+                .map(ProEconPowerstationInfoDay2::getId)
+                .collect(Collectors.toList());
+
+        if (idls.size() > 0) {
+
+            proEconPowerstationInfoDay2Service.removeByIds(idls);
+
+        }
+
         List<ProEconPowerstationInfoDay2> templs=new ArrayList<>();
         for(ProEconPowerstationInfoDay2 vo:dayls)
         {
             templs.add(vo);
-            if(templs.size()==100)
+            if(templs.size()==1000)
             {
                 proEconPowerstationInfoDay2Service.saveBatch(templs);
                 templs=new ArrayList<>();
@@ -588,22 +593,7 @@ public class WindPowerInfo2Service {
 
         Date begin = DateUtils.truncate(c.getTime());
 
-        //判断是否有重复记录，先删除重复记录
-        QueryWrapper<ProEconPowerstationInfoDay2> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("record_date",DateUtils.truncate(recordDate))
-                .eq("location",Location.ln.getValue());
-        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()))
-                .map(ProEconPowerstationInfoDay2::getId)
-                .collect(Collectors.toList());
-
-        if (idls.size() > 0) {
-
-            proEconPowerstationInfoDay2Service.removeByIds(idls);
 
-        }
 
         List<ProEconPowerstationInfoDay2> dayls=new ArrayList<>();
         for (ProBasicLine ln : CacheContext.lnls) {
@@ -659,11 +649,28 @@ 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(queryWrapper).stream()
+//                .filter(i -> i.getRecordDate().compareTo(DateUtils.truncate(recordDate)) == 0
+//                        && CacheContext.lnmap.containsKey(i.getLineId())
+//                        && i.getLocation().equals(Location.ln.getValue()))
+                .map(ProEconPowerstationInfoDay2::getId)
+                .collect(Collectors.toList());
+
+        if (idls.size() > 0) {
+
+            proEconPowerstationInfoDay2Service.removeByIds(idls);
+
+        }
         List<ProEconPowerstationInfoDay2> templs=new ArrayList<>();
         for(ProEconPowerstationInfoDay2 vo:dayls)
         {
             templs.add(vo);
-            if(templs.size()==100)
+            if(templs.size()==1000)
             {
                 proEconPowerstationInfoDay2Service.saveBatch(templs);
                 templs=new ArrayList<>();

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

@@ -402,21 +402,7 @@ public class WindPowerInfo3Service {
 //        List<ProEconPowerstationInfoDay3> wpinfodayls=new ArrayList<>();
 
 
-        //判断是否有重复记录，先删除重复记录
-        QueryWrapper<ProEconPowerstationInfoDay3> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("record_date",DateUtils.truncate(recordDate)).eq("location",Location.wp.getValue());
-        List<String> idls = proEconPowerstationInfoDay3Service.list(queryWrapper).stream()
-//                .filter(i -> i.getRecordDate().compareTo(DateUtils.truncate(recordDate)) == 0
-//                        && CacheContext.wpmap.containsKey(i.getWindpowerstationId())
-//                        && i.getLocation().equals(Location.wp.getValue()))
-                .map(ProEconPowerstationInfoDay3::getId)
-                .collect(Collectors.toList());
 
-        if (idls.size() > 0) {
-
-            proEconPowerstationInfoDay3Service.removeByIds(idls);
-
-        }
         List<ProEconPowerstationInfoDay3> dayls=new ArrayList<>();
         for (ProBasicPowerstation wp : CacheContext.wpls) {
             if (CacheContext.wppointmap.containsKey(wp.getId())) {
@@ -463,11 +449,28 @@ public class WindPowerInfo3Service {
 
         }
 
+
+        //判断是否有重复记录，先删除重复记录
+        QueryWrapper<ProEconPowerstationInfoDay3> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("record_date",DateUtils.truncate(recordDate)).eq("location",Location.wp.getValue());
+        List<String> idls = proEconPowerstationInfoDay3Service.list(queryWrapper).stream()
+//                .filter(i -> i.getRecordDate().compareTo(DateUtils.truncate(recordDate)) == 0
+//                        && CacheContext.wpmap.containsKey(i.getWindpowerstationId())
+//                        && i.getLocation().equals(Location.wp.getValue()))
+                .map(ProEconPowerstationInfoDay3::getId)
+                .collect(Collectors.toList());
+
+        if (idls.size() > 0) {
+
+            proEconPowerstationInfoDay3Service.removeByIds(idls);
+
+        }
+
         List<ProEconPowerstationInfoDay3> templs=new ArrayList<>();
         for(ProEconPowerstationInfoDay3 vo:dayls)
         {
             templs.add(vo);
-            if(templs.size()==100)
+            if(templs.size()==1000)
             {
                 proEconPowerstationInfoDay3Service.saveBatch(templs);
                 templs=new ArrayList<>();
@@ -492,22 +495,7 @@ public class WindPowerInfo3Service {
 
         Date begin = DateUtils.truncate(c.getTime());
 
-        //判断是否有重复记录，先删除重复记录
-        QueryWrapper<ProEconPowerstationInfoDay3> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("record_date",DateUtils.truncate(recordDate))
-                .eq("location",Location.pj.getValue());
-        List<String> idls = proEconPowerstationInfoDay3Service.list(queryWrapper).stream()
-//                .filter(i -> i.getRecordDate().compareTo(DateUtils.truncate(recordDate)) == 0
-//                        && CacheContext.pjmap.containsKey(i.getProjectId())
-//                        && i.getLocation().equals(Location.pj.getValue()))
-                .map(ProEconPowerstationInfoDay3::getId)
-                .collect(Collectors.toList());
 
-        if (idls.size() > 0) {
-
-            proEconPowerstationInfoDay3Service.removeByIds(idls);
-
-        }
         List<ProEconPowerstationInfoDay3> dayls=new ArrayList<>();
         for (ProBasicProject pj : CacheContext.pjls) {
 //            if(CacheContext.wppointmap.containsKey(pj.getId()))
@@ -557,12 +545,27 @@ public class WindPowerInfo3Service {
 
 
         }
+        //判断是否有重复记录，先删除重复记录
+        QueryWrapper<ProEconPowerstationInfoDay3> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("record_date",DateUtils.truncate(recordDate))
+                .eq("location",Location.pj.getValue());
+        List<String> idls = proEconPowerstationInfoDay3Service.list(queryWrapper).stream()
+//                .filter(i -> i.getRecordDate().compareTo(DateUtils.truncate(recordDate)) == 0
+//                        && CacheContext.pjmap.containsKey(i.getProjectId())
+//                        && i.getLocation().equals(Location.pj.getValue()))
+                .map(ProEconPowerstationInfoDay3::getId)
+                .collect(Collectors.toList());
+
+        if (idls.size() > 0) {
 
+            proEconPowerstationInfoDay3Service.removeByIds(idls);
+
+        }
         List<ProEconPowerstationInfoDay3> templs=new ArrayList<>();
         for(ProEconPowerstationInfoDay3 vo:dayls)
         {
             templs.add(vo);
-            if(templs.size()==100)
+            if(templs.size()==1000)
             {
                 proEconPowerstationInfoDay3Service.saveBatch(templs);
                 templs=new ArrayList<>();
@@ -587,22 +590,7 @@ public class WindPowerInfo3Service {
 
         Date begin = DateUtils.truncate(c.getTime());
 
-        //判断是否有重复记录，先删除重复记录
-        QueryWrapper<ProEconPowerstationInfoDay3> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("record_date",DateUtils.truncate(recordDate))
-                .eq("location",Location.ln.getValue());
-        List<String> idls = proEconPowerstationInfoDay3Service.list(queryWrapper).stream()
-//                .filter(i -> i.getRecordDate().compareTo(DateUtils.truncate(recordDate)) == 0
-//                        && CacheContext.lnmap.containsKey(i.getLineId())
-//                        && i.getLocation().equals(Location.ln.getValue()))
-                .map(ProEconPowerstationInfoDay3::getId)
-                .collect(Collectors.toList());
-
-        if (idls.size() > 0) {
-
-            proEconPowerstationInfoDay3Service.removeByIds(idls);
 
-        }
         List<ProEconPowerstationInfoDay3> dayls=new ArrayList<>();
         for (ProBasicLine ln : CacheContext.lnls) {
 //            if(CacheContext.linepointmap.containsKey(ln.getId()))
@@ -656,12 +644,27 @@ public class WindPowerInfo3Service {
 
 
         //      }
+        //判断是否有重复记录，先删除重复记录
+        QueryWrapper<ProEconPowerstationInfoDay3> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("record_date",DateUtils.truncate(recordDate))
+                .eq("location",Location.ln.getValue());
+        List<String> idls = proEconPowerstationInfoDay3Service.list(queryWrapper).stream()
+//                .filter(i -> i.getRecordDate().compareTo(DateUtils.truncate(recordDate)) == 0
+//                        && CacheContext.lnmap.containsKey(i.getLineId())
+//                        && i.getLocation().equals(Location.ln.getValue()))
+                .map(ProEconPowerstationInfoDay3::getId)
+                .collect(Collectors.toList());
 
+        if (idls.size() > 0) {
+
+            proEconPowerstationInfoDay3Service.removeByIds(idls);
+
+        }
         List<ProEconPowerstationInfoDay3> templs=new ArrayList<>();
         for(ProEconPowerstationInfoDay3 vo:dayls)
         {
             templs.add(vo);
-            if(templs.size()==100)
+            if(templs.size()==1000)
             {
                 proEconPowerstationInfoDay3Service.saveBatch(templs);
                 templs=new ArrayList<>();

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

@@ -427,21 +427,7 @@ public class WindPowerInfo4Service {
 //        List<ProEconPowerstationInfoDay4> wpinfodayls = new ArrayList<>();
 
 
-        //判断是否有重复记录，先删除重复记录
-        QueryWrapper<ProEconPowerstationInfoDay4> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("record_date", DateUtils.truncate(recordDate)).eq("location", Location.wp.getValue());
-        List<String> idls = proEconPowerstationInfoDay4Service.list(queryWrapper).stream()
-//                .filter(i -> i.getRecordDate().compareTo(DateUtils.truncate(recordDate)) == 0
-//                        && CacheContext.wpmap.containsKey(i.getWindpowerstationId())
-//                        && i.getLocation().equals(Location.wp.getValue()))
-                .map(ProEconPowerstationInfoDay4::getId)
-                .collect(Collectors.toList());
 
-        if (idls.size() > 0) {
-
-            proEconPowerstationInfoDay4Service.removeByIds(idls);
-
-        }
         List<ProEconPowerstationInfoDay4> dayls = new ArrayList<>();
         for (ProBasicPowerstation wp : CacheContext.wpls) {
             if (CacheContext.wppointmap.containsKey(wp.getId())) {
@@ -528,10 +514,26 @@ public class WindPowerInfo4Service {
 
         }
 
+        //判断是否有重复记录，先删除重复记录
+        QueryWrapper<ProEconPowerstationInfoDay4> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("record_date", DateUtils.truncate(recordDate)).eq("location", Location.wp.getValue());
+        List<String> idls = proEconPowerstationInfoDay4Service.list(queryWrapper).stream()
+//                .filter(i -> i.getRecordDate().compareTo(DateUtils.truncate(recordDate)) == 0
+//                        && CacheContext.wpmap.containsKey(i.getWindpowerstationId())
+//                        && i.getLocation().equals(Location.wp.getValue()))
+                .map(ProEconPowerstationInfoDay4::getId)
+                .collect(Collectors.toList());
+
+        if (idls.size() > 0) {
+
+            proEconPowerstationInfoDay4Service.removeByIds(idls);
+
+        }
+
         List<ProEconPowerstationInfoDay4> templs = new ArrayList<>();
         for (ProEconPowerstationInfoDay4 vo : dayls) {
             templs.add(vo);
-            if (templs.size() == 100) {
+            if (templs.size() == 1000) {
                 proEconPowerstationInfoDay4Service.saveBatch(templs);
                 templs = new ArrayList<>();
             }
@@ -554,22 +556,7 @@ public class WindPowerInfo4Service {
 
         Date begin = DateUtils.truncate(c.getTime());
 
-        //判断是否有重复记录，先删除重复记录
-        QueryWrapper<ProEconPowerstationInfoDay4> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("record_date", DateUtils.truncate(recordDate))
-                .eq("location", Location.pj.getValue());
-        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()))
-                .map(ProEconPowerstationInfoDay4::getId)
-                .collect(Collectors.toList());
-
-        if (idls.size() > 0) {
 
-            proEconPowerstationInfoDay4Service.removeByIds(idls);
-
-        }
         List<ProEconPowerstationInfoDay4> dayls = new ArrayList<>();
         for (ProBasicProject pj : CacheContext.pjls) {
 //            if (CacheContext.wppointmap.containsKey(pj.getId())) {
@@ -659,10 +646,27 @@ public class WindPowerInfo4Service {
 
 
         }
+
+        //判断是否有重复记录，先删除重复记录
+        QueryWrapper<ProEconPowerstationInfoDay4> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("record_date", DateUtils.truncate(recordDate))
+                .eq("location", Location.pj.getValue());
+        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()))
+                .map(ProEconPowerstationInfoDay4::getId)
+                .collect(Collectors.toList());
+
+        if (idls.size() > 0) {
+
+            proEconPowerstationInfoDay4Service.removeByIds(idls);
+
+        }
         List<ProEconPowerstationInfoDay4> templs = new ArrayList<>();
         for (ProEconPowerstationInfoDay4 vo : dayls) {
             templs.add(vo);
-            if (templs.size() == 100) {
+            if (templs.size() == 1000) {
                 proEconPowerstationInfoDay4Service.saveBatch(templs);
                 templs = new ArrayList<>();
             }
@@ -685,20 +689,7 @@ public class WindPowerInfo4Service {
 
         Date begin = DateUtils.truncate(c.getTime());
 
-        //判断是否有重复记录，先删除重复记录
-        QueryWrapper<ProEconPowerstationInfoDay4> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("record_date", DateUtils.truncate(recordDate))
-                .eq("location", Location.ln.getValue());
-        List<String> idls = proEconPowerstationInfoDay4Service.list(queryWrapper).stream()
-
-                .map(ProEconPowerstationInfoDay4::getId)
-                .collect(Collectors.toList());
-
-        if (idls.size() > 0) {
 
-            proEconPowerstationInfoDay4Service.removeByIds(idls);
-
-        }
         List<ProEconPowerstationInfoDay4> dayls = new ArrayList<>();
         for (ProBasicLine ln : CacheContext.lnls) {
 
@@ -774,10 +765,24 @@ public class WindPowerInfo4Service {
 
         }
 
+        //判断是否有重复记录，先删除重复记录
+        QueryWrapper<ProEconPowerstationInfoDay4> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("record_date", DateUtils.truncate(recordDate))
+                .eq("location", Location.ln.getValue());
+        List<String> idls = proEconPowerstationInfoDay4Service.list(queryWrapper).stream()
+
+                .map(ProEconPowerstationInfoDay4::getId)
+                .collect(Collectors.toList());
+
+        if (idls.size() > 0) {
+
+            proEconPowerstationInfoDay4Service.removeByIds(idls);
+
+        }
         List<ProEconPowerstationInfoDay4> templs = new ArrayList<>();
         for (ProEconPowerstationInfoDay4 vo : dayls) {
             templs.add(vo);
-            if (templs.size() == 100) {
+            if (templs.size() == 1000) {
                 proEconPowerstationInfoDay4Service.saveBatch(templs);
                 templs = new ArrayList<>();
             }

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

@@ -352,21 +352,7 @@ public class WindPowerInfo5Service {
 //        List<ProEconPowerstationInfoDay5> wpinfodayls=new ArrayList<>();
 
 
-        //判断是否有重复记录，先删除重复记录
-        QueryWrapper<ProEconPowerstationInfoDay5> queryWrapper= new QueryWrapper<>();
-        queryWrapper.eq("record_date",DateUtils.truncate(recordDate)).eq("location",Location.wp.getValue());
-        List<String> idls = proEconPowerstationInfoDay5Service.list(queryWrapper).stream()
-//                .filter(i -> i.getRecordDate().compareTo(DateUtils.truncate(recordDate)) == 0
-//                        && CacheContext.wpmap.containsKey(i.getWindpowerstationId())
-//                        && i.getLocation().equals(Location.wp.getValue()))
-                        .map(ProEconPowerstationInfoDay5::getId)
-                .collect(Collectors.toList());
-
-        if (idls.size() > 0) {
-
-            proEconPowerstationInfoDay5Service.removeByIds(idls);
 
-        }
         List<ProEconPowerstationInfoDay5> dayls=new ArrayList<>();
         for (ProBasicPowerstation wp : CacheContext.wpls) {
             if (CacheContext.wppointmap.containsKey(wp.getId())) {
@@ -412,11 +398,27 @@ public class WindPowerInfo5Service {
 
 
         }
+
+        //判断是否有重复记录，先删除重复记录
+        QueryWrapper<ProEconPowerstationInfoDay5> queryWrapper= new QueryWrapper<>();
+        queryWrapper.eq("record_date",DateUtils.truncate(recordDate)).eq("location",Location.wp.getValue());
+        List<String> idls = proEconPowerstationInfoDay5Service.list(queryWrapper).stream()
+//                .filter(i -> i.getRecordDate().compareTo(DateUtils.truncate(recordDate)) == 0
+//                        && CacheContext.wpmap.containsKey(i.getWindpowerstationId())
+//                        && i.getLocation().equals(Location.wp.getValue()))
+                .map(ProEconPowerstationInfoDay5::getId)
+                .collect(Collectors.toList());
+
+        if (idls.size() > 0) {
+
+            proEconPowerstationInfoDay5Service.removeByIds(idls);
+
+        }
         List<ProEconPowerstationInfoDay5> templs=new ArrayList<>();
         for(ProEconPowerstationInfoDay5 vo:dayls)
         {
             templs.add(vo);
-            if(templs.size()==100)
+            if(templs.size()==1000)
             {
                 proEconPowerstationInfoDay5Service.saveBatch(templs);
                 templs=new ArrayList<>();
@@ -441,21 +443,7 @@ public class WindPowerInfo5Service {
 //
 //        Date begin= DateUtils.truncate(c.getTime());
 
-        //判断是否有重复记录，先删除重复记录
-        QueryWrapper<ProEconPowerstationInfoDay5> queryWrapper= new QueryWrapper<>();
-        queryWrapper.eq("record_date",DateUtils.truncate(recordDate)).eq("location",Location.pj.getValue());
-        List<String> idls = proEconPowerstationInfoDay5Service.list(queryWrapper).stream()
-//                .filter(i -> i.getRecordDate().compareTo(DateUtils.truncate(recordDate)) == 0
-//                        && CacheContext.pjmap.containsKey(i.getProjectId())
-//                        && i.getLocation().equals(Location.pj.getValue()))
-                .map(ProEconPowerstationInfoDay5::getId)
-                .collect(Collectors.toList());
-
-        if (idls.size() > 0) {
 
-            proEconPowerstationInfoDay5Service.removeByIds(idls);
-
-        }
         List<ProEconPowerstationInfoDay5> dayls=new ArrayList<>();
         for (ProBasicProject pj : CacheContext.pjls) {
             if (CacheContext.propointmap.containsKey(pj.getId())) {
@@ -504,11 +492,27 @@ public class WindPowerInfo5Service {
 
 
         }
+
+        //判断是否有重复记录，先删除重复记录
+        QueryWrapper<ProEconPowerstationInfoDay5> queryWrapper= new QueryWrapper<>();
+        queryWrapper.eq("record_date",DateUtils.truncate(recordDate)).eq("location",Location.pj.getValue());
+        List<String> idls = proEconPowerstationInfoDay5Service.list(queryWrapper).stream()
+//                .filter(i -> i.getRecordDate().compareTo(DateUtils.truncate(recordDate)) == 0
+//                        && CacheContext.pjmap.containsKey(i.getProjectId())
+//                        && i.getLocation().equals(Location.pj.getValue()))
+                .map(ProEconPowerstationInfoDay5::getId)
+                .collect(Collectors.toList());
+
+        if (idls.size() > 0) {
+
+            proEconPowerstationInfoDay5Service.removeByIds(idls);
+
+        }
         List<ProEconPowerstationInfoDay5> templs=new ArrayList<>();
         for(ProEconPowerstationInfoDay5 vo:dayls)
         {
             templs.add(vo);
-            if(templs.size()==100)
+            if(templs.size()==1000)
             {
                 proEconPowerstationInfoDay5Service.saveBatch(templs);
                 templs=new ArrayList<>();
@@ -533,21 +537,7 @@ public class WindPowerInfo5Service {
 //
 //        Date begin= DateUtils.truncate(c.getTime());
 
-        //判断是否有重复记录，先删除重复记录
-        QueryWrapper<ProEconPowerstationInfoDay5> queryWrapper= new QueryWrapper<>();
-        queryWrapper.eq("record_date",DateUtils.truncate(recordDate)).eq("location",Location.ln.getValue());
-        List<String> idls = proEconPowerstationInfoDay5Service.list(queryWrapper).stream()
-//                .filter(i -> i.getRecordDate().compareTo(DateUtils.truncate(recordDate)) == 0
-//                        && CacheContext.lnmap.containsKey(i.getLineId())
-//                        && i.getLocation().equals(Location.ln.getValue()))
-                .map(ProEconPowerstationInfoDay5::getId)
-                .collect(Collectors.toList());
-
-        if (idls.size() > 0) {
-
-            proEconPowerstationInfoDay5Service.removeByIds(idls);
 
-        }
         List<ProEconPowerstationInfoDay5> dayls=new ArrayList<>();
         for (ProBasicLine ln : CacheContext.lnls) {
             if (CacheContext.linepointmap.containsKey(ln.getId())) {
@@ -578,7 +568,7 @@ public class WindPowerInfo5Service {
                 cl.setTime(recordDate);
                 cl.add(Calendar.DAY_OF_MONTH,-1);
                 QueryWrapper<ProEconPowerstationInfoDay5> queryWrapper2= new QueryWrapper<>();
-                queryWrapper.eq("record_date",DateUtils.truncate(cl.getTime())).eq("location",Location.ln.getValue()).eq("line_id",ln.getId());
+                queryWrapper2.eq("record_date",DateUtils.truncate(cl.getTime())).eq("location",Location.ln.getValue()).eq("line_id",ln.getId());
                 pepid1ls = proEconPowerstationInfoDay5Service.list(queryWrapper2);
 //                        .stream()
 //                        .filter(i -> i.getRecordDate().compareTo(DateUtils.truncate(cl.getTime())) == 0
@@ -601,11 +591,27 @@ public class WindPowerInfo5Service {
 
 
         }
+
+        //判断是否有重复记录，先删除重复记录
+        QueryWrapper<ProEconPowerstationInfoDay5> queryWrapper= new QueryWrapper<>();
+        queryWrapper.eq("record_date",DateUtils.truncate(recordDate)).eq("location",Location.ln.getValue());
+        List<String> idls = proEconPowerstationInfoDay5Service.list(queryWrapper).stream()
+//                .filter(i -> i.getRecordDate().compareTo(DateUtils.truncate(recordDate)) == 0
+//                        && CacheContext.lnmap.containsKey(i.getLineId())
+//                        && i.getLocation().equals(Location.ln.getValue()))
+                .map(ProEconPowerstationInfoDay5::getId)
+                .collect(Collectors.toList());
+
+        if (idls.size() > 0) {
+
+            proEconPowerstationInfoDay5Service.removeByIds(idls);
+
+        }
         List<ProEconPowerstationInfoDay5> templs=new ArrayList<>();
         for(ProEconPowerstationInfoDay5 vo:dayls)
         {
             templs.add(vo);
-            if(templs.size()==100)
+            if(templs.size()==1000)
             {
                 proEconPowerstationInfoDay5Service.saveBatch(templs);
                 templs=new ArrayList<>();

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

@@ -393,21 +393,7 @@ public class WindPowerInfo6Service {
 //        List<ProEconPowerstationInfoDay6> wpinfodayls=new ArrayList<>();
 
 
-        //判断是否有重复记录，先删除重复记录
-        QueryWrapper<ProEconPowerstationInfoDay6> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("record_date",DateUtils.truncate(recordDate)).eq("location",Location.wp.getValue());
-        List<String> idls = proEconPowerstationInfoDay6Service.list(queryWrapper).stream()
-//                .filter(i -> i.getRecordDate().compareTo(DateUtils.truncate(recordDate)) == 0
-//                        && CacheContext.wpmap.containsKey(i.getWindpowerstationId())
-//                        && i.getLocation().equals(Location.wp.getValue()))
-                .map(ProEconPowerstationInfoDay6::getId)
-                .collect(Collectors.toList());
 
-        if (idls.size() > 0) {
-
-            proEconPowerstationInfoDay6Service.removeByIds(idls);
-
-        }
         List<ProEconPowerstationInfoDay6> dayls=new ArrayList<>();
         for (ProBasicPowerstation wp : CacheContext.wpls) {
             if (CacheContext.wppointmap.containsKey(wp.getId())) {
@@ -449,6 +435,22 @@ public class WindPowerInfo6Service {
 
 
         }
+
+        //判断是否有重复记录，先删除重复记录
+        QueryWrapper<ProEconPowerstationInfoDay6> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("record_date",DateUtils.truncate(recordDate)).eq("location",Location.wp.getValue());
+        List<String> idls = proEconPowerstationInfoDay6Service.list(queryWrapper).stream()
+//                .filter(i -> i.getRecordDate().compareTo(DateUtils.truncate(recordDate)) == 0
+//                        && CacheContext.wpmap.containsKey(i.getWindpowerstationId())
+//                        && i.getLocation().equals(Location.wp.getValue()))
+                .map(ProEconPowerstationInfoDay6::getId)
+                .collect(Collectors.toList());
+
+        if (idls.size() > 0) {
+
+            proEconPowerstationInfoDay6Service.removeByIds(idls);
+
+        }
         proEconPowerstationInfoDay6Service.saveBatch(dayls);
     }
 
@@ -463,21 +465,7 @@ public class WindPowerInfo6Service {
 
         Date begin = DateUtils.truncate(c.getTime());
 
-        //判断是否有重复记录，先删除重复记录
-        QueryWrapper<ProEconPowerstationInfoDay6> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("record_date",DateUtils.truncate(recordDate)).eq("location",Location.pj.getValue());
-        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()))
-                .map(ProEconPowerstationInfoDay6::getId)
-                .collect(Collectors.toList());
-
-        if (idls.size() > 0) {
-
-            proEconPowerstationInfoDay6Service.removeByIds(idls);
 
-        }
         List<ProEconPowerstationInfoDay6> dayls=new ArrayList<>();
         for (ProBasicProject pj : CacheContext.pjls) {
             if (CacheContext.propointmap.containsKey(pj.getId())) {
@@ -524,6 +512,22 @@ 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(queryWrapper).stream()
+//                .filter(i -> i.getRecordDate().compareTo(DateUtils.truncate(recordDate)) == 0
+//                        && CacheContext.pjmap.containsKey(i.getProjectId())
+//                        && i.getLocation().equals(Location.pj.getValue()))
+                .map(ProEconPowerstationInfoDay6::getId)
+                .collect(Collectors.toList());
+
+        if (idls.size() > 0) {
+
+            proEconPowerstationInfoDay6Service.removeByIds(idls);
+
+        }
         proEconPowerstationInfoDay6Service.saveBatch(dayls);
     }
 
@@ -538,21 +542,7 @@ public class WindPowerInfo6Service {
 
         Date begin = DateUtils.truncate(c.getTime());
 
-        //判断是否有重复记录，先删除重复记录
-        QueryWrapper<ProEconPowerstationInfoDay6> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("record_date",DateUtils.truncate(recordDate)).eq("location",Location.ln.getValue());
-        List<String> idls = proEconPowerstationInfoDay6Service.list(queryWrapper).stream()
-//                .filter(i -> i.getRecordDate().compareTo(DateUtils.truncate(recordDate)) == 0
-//                        && CacheContext.lnmap.containsKey(i.getLineId())
-//                        && i.getLocation().equals(Location.ln.getValue()))
-                .map(ProEconPowerstationInfoDay6::getId)
-                .collect(Collectors.toList());
-
-        if (idls.size() > 0) {
 
-            proEconPowerstationInfoDay6Service.removeByIds(idls);
-
-        }
         List<ProEconPowerstationInfoDay6> dayls=new ArrayList<>();
         for (ProBasicLine ln : CacheContext.lnls) {
             if (CacheContext.linepointmap.containsKey(ln.getId())) {
@@ -602,6 +592,22 @@ public class WindPowerInfo6Service {
 
 
         }
+
+        //判断是否有重复记录，先删除重复记录
+        QueryWrapper<ProEconPowerstationInfoDay6> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("record_date",DateUtils.truncate(recordDate)).eq("location",Location.ln.getValue());
+        List<String> idls = proEconPowerstationInfoDay6Service.list(queryWrapper).stream()
+//                .filter(i -> i.getRecordDate().compareTo(DateUtils.truncate(recordDate)) == 0
+//                        && CacheContext.lnmap.containsKey(i.getLineId())
+//                        && i.getLocation().equals(Location.ln.getValue()))
+                .map(ProEconPowerstationInfoDay6::getId)
+                .collect(Collectors.toList());
+
+        if (idls.size() > 0) {
+
+            proEconPowerstationInfoDay6Service.removeByIds(idls);
+
+        }
         proEconPowerstationInfoDay6Service.saveBatch(dayls);
     }
 

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

@@ -56,7 +56,7 @@ public class WindturbineGoodnessService {
 //        for(int i=0;i<idls.size();i++)
 //        {
 //            tempids.add(idls.get(i));
-//            if(tempids.size()==100)
+//            if(tempids.size()==1000)
 //            {
 //                proEconWindturbineGoodnessService.removeByIds(tempids);
 //                tempids=new ArrayList<>();
@@ -188,7 +188,7 @@ public class WindturbineGoodnessService {
         for(int i=0;i<idls.size();i++)
         {
             tempids.add(idls.get(i));
-            if(tempids.size()==100)
+            if(tempids.size()==1000)
             {
                 proEconWindturbineGoodnessService.removeByIds(tempids);
                 tempids=new ArrayList<>();
@@ -204,7 +204,7 @@ public class WindturbineGoodnessService {
         for(ProEconWindturbineGoodness vo:vos)
         {
             templs.add(vo);
-            if(templs.size()==100)
+            if(templs.size()==1000)
             {
                 proEconWindturbineGoodnessService.saveOrUpdateBatch(templs);
                 templs=new ArrayList<>();

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

@@ -113,7 +113,7 @@ public class WpwindDayInfoService {
         for(ProEconWpwindDayInfo vo:dayls)
         {
             templs.add(vo);
-            if(templs.size()==100)
+            if(templs.size()==1000)
             {
                 proEconWpwindDayInfoService.saveOrUpdateBatch(templs);
                 templs=new ArrayList<>();

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

@@ -124,7 +124,7 @@ public class WtAlysisDayService {
 //        for(int i=0;i<idls.size();i++)
 //        {
 //            tempids.add(idls.get(i));
-//            if(tempids.size()==100)
+//            if(tempids.size()==1000)
 //            {
 //                proEconWtAlysisDayService.removeByIds(tempids);
 //                tempids=new ArrayList<>();
@@ -312,7 +312,7 @@ public class WtAlysisDayService {
         for(int i=0;i<idls.size();i++)
         {
             tempids.add(idls.get(i));
-            if(tempids.size()==100)
+            if(tempids.size()==1000)
             {
                 proEconWtAlysisDayService.removeByIds(tempids);
                 tempids=new ArrayList<>();
@@ -332,7 +332,7 @@ public class WtAlysisDayService {
             {
                 vo.setId(SnowflakeGenerator.generateId());
                 templs.add(vo);
-                if(templs.size()==100)
+                if(templs.size()==1000)
                 {
                     proEconWtAlysisDayService.saveBatch(templs);
                     templs=new ArrayList<>();

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

@@ -113,7 +113,7 @@ public class WtwindDayInfoService {
         for(ProEconWtwindDayInfo vo:dayls)
         {
             templs.add(vo);
-            if(templs.size()==100)
+            if(templs.size()==1000)
             {
                 proEconWtwindDayInfoService.saveOrUpdateBatch(templs);
                 templs=new ArrayList<>();

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

@@ -179,108 +179,6 @@ public class CycleCalculationService {
 
                     if (ssztmx == 12 || ssztmx == 13) {
                         continue;
-//                        if (!runWpids.contains(wt.getWindpowerstationId())) {
-//                            wtResultList.add(PointUtil.createPointData(date, 0, rfdlPoint.getNemCode(), rfdlPoint.getName()));
-//                            wtResultList.add(PointUtil.createPointData(date, 0, yfdlPoint.getNemCode(), yfdlPoint.getName()));
-//                            wtResultList.add(PointUtil.createPointData(date, 0, nfdlPoint.getNemCode(), nfdlPoint.getName()));
-//                        }
-//
-//
-//                        wtResultList.add(PointUtil.createPointData(date, 0, fdl15Point.getNemCode(), fdl15Point.getName()));
-//
-//                        wtResultList.add(PointUtil.createPointData(date, 0, rzhdPoint.getNemCode(), rzhdPoint.getName()));
-//
-//                        wtResultList.add(PointUtil.createPointData(date, 0, yzhdPoint.getNemCode(), yzhdPoint.getName()));
-//
-//                        wtResultList.add(PointUtil.createPointData(date, 0, nzhdPoint.getNemCode(), nzhdPoint.getName()));
-//
-//                        wtResultList.add(PointUtil.createPointData(date, 0, zhd15Point.getNemCode(), zhd15Point.getName()));
-//
-//
-//                        if (wt.getId().contains("_WT_")) {
-//                            wtResultList.add(PointUtil.createPointData(date, 0, rpjfsPoint.getNemCode(), rpjfsPoint.getName()));
-//                            wtResultList.add(PointUtil.createPointData(date, 0, ypjfsPoint.getNemCode(), ypjfsPoint.getName()));
-//                            wtResultList.add(PointUtil.createPointData(date, 0, npjfsPoint.getNemCode(), npjfsPoint.getName()));
-//                            wtResultList.add(PointUtil.createPointData(date, 0, pjfs15Point.getNemCode(), pjfs15Point.getName()));
-//                        } else {
-//                            wtResultList.add(PointUtil.createPointData(date, 0, rpjgzdPoint.getNemCode(), rpjgzdPoint.getName()));
-//                            wtResultList.add(PointUtil.createPointData(date, 0, ypjgzdPoint.getNemCode(), ypjgzdPoint.getName()));
-//                            wtResultList.add(PointUtil.createPointData(date, 0, npjgzdPoint.getNemCode(), npjgzdPoint.getName()));
-//                            wtResultList.add(PointUtil.createPointData(date, 0, pjgzd15Point.getNemCode(), pjgzd15Point.getName()));
-//                        }
-//
-//                        wtResultList.add(PointUtil.createPointData(date, 0, rpjglPoint.getNemCode(), rpjglPoint.getName()));
-//                        wtResultList.add(PointUtil.createPointData(date, 0, ypjglPoint.getNemCode(), ypjglPoint.getName()));
-//                        wtResultList.add(PointUtil.createPointData(date, 0, npjglPoint.getNemCode(), npjglPoint.getName()));
-//                        wtResultList.add(PointUtil.createPointData(date, 0, pjgl15Point.getNemCode(), pjgl15Point.getName()));
-//                        wtResultList.add(PointUtil.createPointData(date, 0, rkydlPoint.getNemCode(), rkydlPoint.getName()));
-//                        wtResultList.add(PointUtil.createPointData(date, 0, ykydlPoint.getNemCode(), ykydlPoint.getName()));
-//                        wtResultList.add(PointUtil.createPointData(date, 0, nkydlPoint.getNemCode(), nkydlPoint.getName()));
-//                        wtResultList.add(PointUtil.createPointData(date, 0, kydl15Point.getNemCode(), kydl15Point.getName()));
-//                        wtResultList.add(PointUtil.createPointData(date, 0, rlldlzsPoint.getNemCode(), rkydlPoint.getName()));
-//                        wtResultList.add(PointUtil.createPointData(date, 0, ylldlzsPoint.getNemCode(), ykydlPoint.getName()));
-//                        wtResultList.add(PointUtil.createPointData(date, 0, nlldlzsPoint.getNemCode(), nkydlPoint.getName()));
-//                        wtResultList.add(PointUtil.createPointData(date, 0, lldl15zsPoint.getNemCode(), kydl15Point.getName()));
-//                        wtResultList.add(PointUtil.createPointData(date, 0, rgzssPoint.getNemCode(), rgzssPoint.getName()));
-//                        wtResultList.add(PointUtil.createPointData(date, 0, rgzslPoint.getNemCode(), rgzslPoint.getName()));
-//                        wtResultList.add(PointUtil.createPointData(date, 0, rjxssPoint.getNemCode(), rjxssPoint.getName()));
-//                        wtResultList.add(PointUtil.createPointData(date, 0, rjxslPoint.getNemCode(), rjxslPoint.getName()));
-//                        wtResultList.add(PointUtil.createPointData(date, 0, rdjssPoint.getNemCode(), rdjssPoint.getName()));
-//                        wtResultList.add(PointUtil.createPointData(date, 0, rsdtjPoint.getNemCode(), rsdtjPoint.getName()));
-//                        wtResultList.add(PointUtil.createPointData(date, 0, rxnssPoint.getNemCode(), rxnssPoint.getName()));
-//                        wtResultList.add(PointUtil.createPointData(date, 0, rfdjclPoint.getNemCode(), rfdjclPoint.getName()));
-//                        wtResultList.add(PointUtil.createPointData(date, 0, rxdjclPoint.getNemCode(), rxdjclPoint.getName()));
-//                        wtResultList.add(PointUtil.createPointData(date, 0, rxdtjPoint.getNemCode(), rxdtjPoint.getName()));
-//                        wtResultList.add(PointUtil.createPointData(date, 0, rdwslPoint.getNemCode(), rdwslPoint.getName()));
-//                        wtResultList.add(PointUtil.createPointData(date, 0, rhjslPoint.getNemCode(), rhjslPoint.getName()));
-//                        wtResultList.add(PointUtil.createPointData(date, 0, rqfdlPoint.getNemCode(), rqfdlPoint.getName()));
-//                        wtResultList.add(PointUtil.createPointData(date, 0, rzfdlPoint.getNemCode(), rzfdlPoint.getName()));
-//                        wtResultList.add(PointUtil.createPointData(date, 0, rllfdlPoint.getNemCode(), rllfdlPoint.getName()));
-//                        wtResultList.add(PointUtil.createPointData(date, 0, ygzssPoint.getNemCode(), ygzssPoint.getName()));
-//                        wtResultList.add(PointUtil.createPointData(date, 0, ygzslPoint.getNemCode(), ygzslPoint.getName()));
-//                        wtResultList.add(PointUtil.createPointData(date, 0, yjxssPoint.getNemCode(), yjxssPoint.getName()));
-//                        wtResultList.add(PointUtil.createPointData(date, 0, yjxslPoint.getNemCode(), yjxslPoint.getName()));
-//                        wtResultList.add(PointUtil.createPointData(date, 0, ydjssPoint.getNemCode(), ydjssPoint.getName()));
-//                        wtResultList.add(PointUtil.createPointData(date, 0, ysdtjPoint.getNemCode(), ysdtjPoint.getName()));
-//                        wtResultList.add(PointUtil.createPointData(date, 0, yxnssPoint.getNemCode(), yxnssPoint.getName()));
-//                        wtResultList.add(PointUtil.createPointData(date, 0, yfdjclPoint.getNemCode(), yfdjclPoint.getName()));
-//                        wtResultList.add(PointUtil.createPointData(date, 0, yxdjclPoint.getNemCode(), yxdjclPoint.getName()));
-//                        wtResultList.add(PointUtil.createPointData(date, 0, yxdtjPoint.getNemCode(), yxdtjPoint.getName()));
-//                        wtResultList.add(PointUtil.createPointData(date, 0, ydwslPoint.getNemCode(), ydwslPoint.getName()));
-//                        wtResultList.add(PointUtil.createPointData(date, 0, yhjslPoint.getNemCode(), yhjslPoint.getName()));
-//                        wtResultList.add(PointUtil.createPointData(date, 0, yqfdlPoint.getNemCode(), yqfdlPoint.getName()));
-//                        wtResultList.add(PointUtil.createPointData(date, 0, yzfdlPoint.getNemCode(), yzfdlPoint.getName()));
-//                        wtResultList.add(PointUtil.createPointData(date, 0, yllfdlPoint.getNemCode(), yllfdlPoint.getName()));
-//                        wtResultList.add(PointUtil.createPointData(date, 0, ngzssPoint.getNemCode(), ngzssPoint.getName()));
-//                        wtResultList.add(PointUtil.createPointData(date, 0, ngzslPoint.getNemCode(), ngzslPoint.getName()));
-//                        wtResultList.add(PointUtil.createPointData(date, 0, njxssPoint.getNemCode(), njxssPoint.getName()));
-//                        wtResultList.add(PointUtil.createPointData(date, 0, njxslPoint.getNemCode(), njxslPoint.getName()));
-//                        wtResultList.add(PointUtil.createPointData(date, 0, ndjssPoint.getNemCode(), ndjssPoint.getName()));
-//                        wtResultList.add(PointUtil.createPointData(date, 0, nsdtjPoint.getNemCode(), nsdtjPoint.getName()));
-//                        wtResultList.add(PointUtil.createPointData(date, 0, nxnssPoint.getNemCode(), nxnssPoint.getName()));
-//                        wtResultList.add(PointUtil.createPointData(date, 0, nfdjclPoint.getNemCode(), nfdjclPoint.getName()));
-//                        wtResultList.add(PointUtil.createPointData(date, 0, nxdjclPoint.getNemCode(), nxdjclPoint.getName()));
-//                        wtResultList.add(PointUtil.createPointData(date, 0, nxdtjPoint.getNemCode(), nxdtjPoint.getName()));
-//                        wtResultList.add(PointUtil.createPointData(date, 0, ndwslPoint.getNemCode(), ndwslPoint.getName()));
-//                        wtResultList.add(PointUtil.createPointData(date, 0, nhjslPoint.getNemCode(), nhjslPoint.getName()));
-//                        wtResultList.add(PointUtil.createPointData(date, 0, nqfdlPoint.getNemCode(), nqfdlPoint.getName()));
-//                        wtResultList.add(PointUtil.createPointData(date, 0, nzfdlPoint.getNemCode(), nzfdlPoint.getName()));
-//                        wtResultList.add(PointUtil.createPointData(date, 0, nllfdlPoint.getNemCode(), nllfdlPoint.getName()));
-//                        wtResultList.add(PointUtil.createPointData(date, 0, gzss15Point.getNemCode(), gzss15Point.getName()));
-//                        wtResultList.add(PointUtil.createPointData(date, 0, gzsl15Point.getNemCode(), gzsl15Point.getName()));
-//                        wtResultList.add(PointUtil.createPointData(date, 0, jxss15Point.getNemCode(), jxss15Point.getName()));
-//                        wtResultList.add(PointUtil.createPointData(date, 0, jxsl15Point.getNemCode(), jxsl15Point.getName()));
-//                        wtResultList.add(PointUtil.createPointData(date, 0, djss15Point.getNemCode(), djss15Point.getName()));
-//                        wtResultList.add(PointUtil.createPointData(date, 0, sdtj15Point.getNemCode(), sdtj15Point.getName()));
-//                        wtResultList.add(PointUtil.createPointData(date, 0, xnss15Point.getNemCode(), xnss15Point.getName()));
-//                        wtResultList.add(PointUtil.createPointData(date, 0, fdjcl15Point.getNemCode(), fdjcl15Point.getName()));
-//                        wtResultList.add(PointUtil.createPointData(date, 0, xdjcl15Point.getNemCode(), xdjcl15Point.getName()));
-//                        wtResultList.add(PointUtil.createPointData(date, 0, xdtj15Point.getNemCode(), xdtj15Point.getName()));
-//                        wtResultList.add(PointUtil.createPointData(date, 0, dwsl15Point.getNemCode(), dwsl15Point.getName()));
-//                        wtResultList.add(PointUtil.createPointData(date, 0, hjsl15Point.getNemCode(), hjsl15Point.getName()));
-//                        wtResultList.add(PointUtil.createPointData(date, 0, qfdl15Point.getNemCode(), qfdl15Point.getName()));
-//                        wtResultList.add(PointUtil.createPointData(date, 0, zfdl15Point.getNemCode(), zfdl15Point.getName()));
-//                        wtResultList.add(PointUtil.createPointData(date, 0, llfdl15Point.getNemCode(), llfdl15Point.getName()));
 
                     }
                     else
@@ -398,13 +296,13 @@ public class CycleCalculationService {
                         //检修受累
                         double jxsl = generalLoss(mxztPointDatas, zsglPointDatas, ssglPointDatas, 7);
                         //待机
-                        double djss = generalLoss(mxztPointDatas, zsglPointDatas, ssglPointDatas, 0);
+                        double djss = generalLoss(mxztPointDatas, zsglPointDatas, ssglPointDatas, 0)*0.1;
                         //手动停机
-                        double sdtj = generalLoss(mxztPointDatas, zsglPointDatas, ssglPointDatas, 1);
+                        double sdtj = generalLoss(mxztPointDatas, zsglPointDatas, ssglPointDatas, 1)*0.1;
                         //性能
-                        double xnss = generalLoss(mxztPointDatas, zsglPointDatas, ssglPointDatas, 2);
+                        double xnss = generalLoss(mxztPointDatas, zsglPointDatas, ssglPointDatas, 2)*0.1;
                         //发电降出力
-                        double fdjcl = generalLoss(mxztPointDatas, zsglPointDatas, ssglPointDatas, 3);
+                        double fdjcl = generalLoss(mxztPointDatas, zsglPointDatas, ssglPointDatas, 3)*0.1;
                         //限电降出力
                         double xdjcl = generalLoss(mxztPointDatas, zsglPointDatas, ssglPointDatas, 8);
                         //限电停机
@@ -527,13 +425,13 @@ public class CycleCalculationService {
                             rjxsl = DoubleUtils.sum(lsjxsl, jxsl);
 
                             double lsdjss = edosUtil.getSectionData(rdjssPoint, currentDate.getTime()).getPointValueInDouble();
-                            rdjss = DoubleUtils.sum(lsdjss, djss)*0.1;
+                            rdjss = DoubleUtils.sum(lsdjss, djss);
                             double lssdtj = edosUtil.getSectionData(rsdtjPoint, currentDate.getTime()).getPointValueInDouble();
-                            rsdtj = DoubleUtils.sum(lssdtj, sdtj)*0.1;;
+                            rsdtj = DoubleUtils.sum(lssdtj, sdtj);
                             double lsxnss = edosUtil.getSectionData(rxnssPoint, currentDate.getTime()).getPointValueInDouble();
-                            rxnss = DoubleUtils.sum(lsxnss, xnss)*0.1;;
+                            rxnss = DoubleUtils.sum(lsxnss, xnss);;
                             double lsfdjcl = edosUtil.getSectionData(rfdjclPoint, currentDate.getTime()).getPointValueInDouble();
-                            rfdjcl = DoubleUtils.sum(lsfdjcl, fdjcl)*0.1;;
+                            rfdjcl = DoubleUtils.sum(lsfdjcl, fdjcl);;
 
 
                             double lsxdjcl = edosUtil.getSectionData(rxdjclPoint, currentDate.getTime()).getPointValueInDouble();

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

@@ -31,12 +31,12 @@ public class RealtimeService {
      * @throws Exception
      */
     public void savaRealtimeTarget() throws Exception {
-        Calendar c = Calendar.getInstance();
-        Date begin=null;
-        Date end=null;
-
-        begin=new Date();
-        System.out.println("实时指标调度程序执行开始!。。。。。。");
+//        Calendar c = Calendar.getInstance();
+//        Date begin=null;
+//        Date end=null;
+//
+//        begin=new Date();
+//        System.out.println("实时指标调度程序执行开始!。。。。。。");
         List<ProBasicEquipment> wtls = CacheContext.wtls;
         List<ProBasicLine> lnls = CacheContext.lnls;
         List<ProBasicProject> pjls = CacheContext.pjls;
@@ -213,9 +213,9 @@ public class RealtimeService {
         }
         edosUtil.sendMultiPoint(wtResultList);
 
-        end=new Date();
-        System.out.println("执行用时"+ DateUtils.millisecondDiff(begin,end) +"秒");
-        System.out.println("实时计算指标调度程序执行结束!。。。。。。");
+//        end=new Date();
+//        System.out.println("执行用时"+ DateUtils.millisecondDiff(begin,end) +"秒");
+//        System.out.println("实时计算指标调度程序执行结束!。。。。。。");
 
 
     }

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

@@ -1570,19 +1570,27 @@ public class StatusService {
 
     public void startStatusReal() throws Exception {
 
-        System.out.println("状态判定调度程序执行开始!。。。。。。");
+
         while (true)
         {
+            Date begin=new Date();
+            System.out.println("状态判定调度程序执行开始!。。。。。。");
 //            Calendar c = Calendar.getInstance();
 //            Date begin=c.getTime();
 //            Date end=null;
 //            System.out.println("状态判定调度程序执行开始!。。。。。。");
             statusReal();
-            Thread.sleep(200);
+
 //            end=new Date();
 //            System.out.println("执行用时"+ DateUtils.secondsDiff(begin,end) +"秒");
 //            System.out.println("状态判定调度程序执行结束!。。。。。。");
 //            System.out.println("完成!。。。。。。");
+
+            Date end=new Date();
+            System.out.println("执行用时"+ DateUtils.secondsDiff(begin,end) +"秒");
+            System.out.println("设状态判定调度程序执行结束!。。。。。。");
+
+            Thread.sleep(200);
         }
     }
     public void startMiddleStatusReal() throws Exception {

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

@@ -226,7 +226,7 @@ public class BrownoutsThreadPool implements Callable<String>, Serializable {
             for(ProEconBrownoutsEvent vo:proEconBrownoutsEventls)
             {
                 templs.add(vo);
-                if(templs.size()==100)
+                if(templs.size()==1000)
                 {
                     proEconBrownoutsEventService.saveOrUpdateBatch(templs);
                     templs=new ArrayList<>();
@@ -243,7 +243,7 @@ public class BrownoutsThreadPool implements Callable<String>, Serializable {
             for(ProEconBrownoutsEvent2 vo:proEconBrownoutsEvent2ls)
             {
                 templs2.add(vo);
-                if(templs2.size()==100)
+                if(templs2.size()==1000)
                 {
                     proEconBrownoutsEvent2Service.saveOrUpdateBatch(templs2);
                     templs2=new ArrayList<>();

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

@@ -65,10 +65,10 @@ public class EquipmentInfo1ThreadPool implements Callable<String>, Serializable
 		// //便于观察，等待一段时间
 
 		try {
-			if(wt.getId().equals("SXJ_KGDL_BHB_F_WT_0005_EQ"))
-			{
-				System.out.println("");
-			}
+//			if(wt.getId().equals("SXJ_KGDL_BHB_F_WT_0005_EQ"))
+//			{
+//				System.out.println("");
+//			}
 			if(CacheContext.wtpAimap.containsKey(wt.getId()))
 			{
 				Map<String, ProBasicEquipmentPoint> pointmap=CacheContext.wtpAimap.get(wt.getId());
@@ -466,26 +466,77 @@ public class EquipmentInfo1ThreadPool implements Callable<String>, Serializable
 		}else
 		{
 
+			if(pewp.getWindpowerstationId().contains(WpType.FDC.id))
+			{
+				//*******************************************日信息统计*********************************************************/
+				if(pointmap.containsKey(ContantXk.YPJFS))
+				{
+					ProBasicEquipmentPoint point= pointmap.get(ContantXk.YPJFS);
+					List<PointData> pointls=edosUtil.getHistoryDatasSnap(point.getNemCode(), begin.getTime()/1000, end.getTime()/1000);
 
+					pointls = pointls.stream().filter(n -> (n.getPointValueInDouble() >0 && n.getPointValueInDouble() <30)).collect(Collectors.toList());
+
+					if(!pointls.isEmpty())
+					{
+						DoubleSummaryStatistics summaryStatistics=pointls.stream().mapToDouble(PointData::getPointValueInDouble).summaryStatistics();
+						//月最大风速
+						if(summaryStatistics.getMax()>30)
+						{
+							pewp.setYzdfs(StringUtils.round(25,2));
+
+						}else
+						{
+							pewp.setYzdfs(StringUtils.round(summaryStatistics.getMax(),2));
+						}
+
+						//月最小风速
+
+						if(summaryStatistics.getMin()<0)
+						{
+							pewp.setYzxfs(StringUtils.round(0,2));
+						}else
+						{
+							pewp.setYzxfs(StringUtils.round(summaryStatistics.getMin(),2));
+						}
+						//月平均风速
+
+						if(summaryStatistics.getAverage()>30)
+						{
+							pewp.setYpjfs(StringUtils.round(25,2));
+						}else if(summaryStatistics.getAverage()<0)
+						{
+							pewp.setYpjfs(StringUtils.round(0,2));
+						}
+						else
+						{
+							pewp.setYpjfs(StringUtils.round(summaryStatistics.getAverage(),2));
+						}
+					}
 
-			if(pointmap.containsKey(ContantXk.YPJFS))
+				}
+			}else
 			{
-				ProBasicEquipmentPoint point= pointmap.get(ContantXk.YPJFS);
-				List<PointData> pointls=edosUtil.getHistoryDatasSnap(point.getNemCode(), begin.getTime()/1000, end.getTime()/1000);
-				if(!pointls.isEmpty())
+				//*******************************************日信息统计*********************************************************/
+				if(pointmap.containsKey(ContantXk.YPJGZD))
 				{
-					DoubleSummaryStatistics summaryStatistics=pointls.stream().mapToDouble(PointData::getPointValueInDouble).summaryStatistics();
-					//月最大风速
-					pewp.setYzdfs(StringUtils.round(summaryStatistics.getMax(),2));
+					ProBasicEquipmentPoint point= pointmap.get(ContantXk.YPJGZD);
+					List<PointData> pointls=edosUtil.getHistoryDatasSnap(point.getNemCode(), begin.getTime()/1000, end.getTime()/1000);
+					if(!pointls.isEmpty())
+					{
+						DoubleSummaryStatistics summaryStatistics=pointls.stream().mapToDouble(PointData::getPointValueInDouble).summaryStatistics();
+						//月最大风速
+						pewp.setYzdfs(StringUtils.round(summaryStatistics.getMax(),2));
+						//月最小风速
+						pewp.setYzxfs(StringUtils.round(summaryStatistics.getMin(),2));
+						//月平均风速
+						pewp.setYpjfs(StringUtils.round(summaryStatistics.getAverage(),2));
+					}
 
-					//月最小风速
-					pewp.setYzxfs(StringUtils.round(summaryStatistics.getMin(),2));
-					//月平均风速
-					pewp.setYpjfs(StringUtils.round(summaryStatistics.getAverage(),2));
 				}
-
 			}
 
+
+
 			if(pointmap.containsKey(ContantXk.YPJGL))
 			{
 				ProBasicEquipmentPoint point= pointmap.get(ContantXk.YPJGL);
@@ -767,25 +818,76 @@ public class EquipmentInfo1ThreadPool implements Callable<String>, Serializable
 		}else
 		{
 
-			if(pointmap.containsKey(ContantXk.NPJFS))
+			if(pewp.getWindpowerstationId().contains(WpType.FDC.id))
 			{
-				ProBasicEquipmentPoint point= pointmap.get(ContantXk.NPJFS);
-				List<PointData> pointls=edosUtil.getHistoryDatasSnap(point.getNemCode(), begin.getTime()/1000, end.getTime()/1000);
-				if(!pointls.isEmpty())
+				//*******************************************日信息统计*********************************************************/
+				if(pointmap.containsKey(ContantXk.NPJFS))
 				{
-					DoubleSummaryStatistics summaryStatistics=pointls.stream().mapToDouble(PointData::getPointValueInDouble).summaryStatistics();
-					//年最大风速
-					pewp.setNzdfs(StringUtils.round(summaryStatistics.getMax(),2));
+					ProBasicEquipmentPoint point= pointmap.get(ContantXk.NPJFS);
+					List<PointData> pointls=edosUtil.getHistoryDatasSnap(point.getNemCode(), begin.getTime()/1000, end.getTime()/1000);
+
+					pointls = pointls.stream().filter(n -> (n.getPointValueInDouble() >0 && n.getPointValueInDouble() <30)).collect(Collectors.toList());
 
-					//年最小风速
+					if(!pointls.isEmpty())
+					{
+						DoubleSummaryStatistics summaryStatistics=pointls.stream().mapToDouble(PointData::getPointValueInDouble).summaryStatistics();
+						//年最大风速
+						if(summaryStatistics.getMax()>30)
+						{
+							pewp.setNzdfs(StringUtils.round(25,2));
+
+						}else
+						{
+							pewp.setNzdfs(StringUtils.round(summaryStatistics.getMax(),2));
+						}
+
+						//年最小风速
+
+						if(summaryStatistics.getMin()<0)
+						{
+							pewp.setNzxfs(StringUtils.round(0,2));
+						}else
+						{
+							pewp.setNzxfs(StringUtils.round(summaryStatistics.getMin(),2));
+						}
+						//年平均风速
+
+						if(summaryStatistics.getAverage()>30)
+						{
+							pewp.setNpjfs(StringUtils.round(25,2));
+						}else if(summaryStatistics.getAverage()<0)
+						{
+							pewp.setNpjfs(StringUtils.round(0,2));
+						}
+						else
+						{
+							pewp.setNpjfs(StringUtils.round(summaryStatistics.getAverage(),2));
+						}
+					}
 
-					pewp.setNzxfs(StringUtils.round(summaryStatistics.getMin(),2));
-					//年平均风速
-					pewp.setNpjfs(StringUtils.round(summaryStatistics.getAverage(),2));
 				}
+			}else
+			{
+				//*******************************************日信息统计*********************************************************/
+				if(pointmap.containsKey(ContantXk.NPJGZD))
+				{
+					ProBasicEquipmentPoint point= pointmap.get(ContantXk.NPJGZD);
+					List<PointData> pointls=edosUtil.getHistoryDatasSnap(point.getNemCode(), begin.getTime()/1000, end.getTime()/1000);
+					if(!pointls.isEmpty())
+					{
+						DoubleSummaryStatistics summaryStatistics=pointls.stream().mapToDouble(PointData::getPointValueInDouble).summaryStatistics();
+						//年最大风速
+						pewp.setNzdfs(StringUtils.round(summaryStatistics.getMax(),2));
+						//年最小风速
+						pewp.setNzxfs(StringUtils.round(summaryStatistics.getMin(),2));
+						//年平均风速
+						pewp.setNpjfs(StringUtils.round(summaryStatistics.getAverage(),2));
+					}
 
+				}
 			}
 
+
 			if(pointmap.containsKey(ContantXk.NPJGL))
 			{
 				ProBasicEquipmentPoint point= pointmap.get(ContantXk.NPJGL);

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

@@ -233,7 +233,7 @@ public class MainBrownoutsThreadPool implements Callable<String>, Serializable {
             for(ProEconMainBrownouts vo:proEconMainBrownoutsls)
             {
                 templs.add(vo);
-                if(templs.size()==100)
+                if(templs.size()==1000)
                 {
                     proEconMainBrownoutsService.saveOrUpdateBatch(templs);
                     templs=new ArrayList<>();
@@ -250,7 +250,7 @@ public class MainBrownoutsThreadPool implements Callable<String>, Serializable {
             for(ProEconMainBrownouts2 vo:proEconMainBrownouts2ls)
             {
                 templs2.add(vo);
-                if(templs2.size()==100)
+                if(templs2.size()==1000)
                 {
                     proEconMainBrownouts2Service.saveOrUpdateBatch(templs2);
                     templs2=new ArrayList<>();

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

@@ -357,7 +357,7 @@ public class ShutdownnewThreadPool implements Callable<String>, Serializable {
 				for(ProEconWindturbineStatus vo:windturbineStatusls)
 				{
 					templs.add(vo);
-					if(templs.size()==100)
+					if(templs.size()==1000)
 					{
 						proEconWindturbineStatusService.saveOrUpdateBatch(templs);
 						templs=new ArrayList<>();
@@ -376,7 +376,7 @@ public class ShutdownnewThreadPool implements Callable<String>, Serializable {
 				for(ProEconShutdownEvent vo:shutdwonEventls)
 				{
 					templs.add(vo);
-					if(templs.size()==100)
+					if(templs.size()==1000)
 					{
 						proEconShutdownEventService.saveOrUpdateBatch(templs);
 						templs=new ArrayList<>();
@@ -396,7 +396,7 @@ public class ShutdownnewThreadPool implements Callable<String>, Serializable {
 				for(ProEconShutdownEvent2 vo:shutdwonEvent2ls)
 				{
 					templs.add(vo);
-					if(templs.size()==100)
+					if(templs.size()==1000)
 					{
 						proEconShutdownEvent2Service.saveOrUpdateBatch(templs);
 						templs=new ArrayList<>();
@@ -416,7 +416,7 @@ public class ShutdownnewThreadPool implements Callable<String>, Serializable {
 				for(ProEconInterruption vo:interrupls)
 				{
 					templs.add(vo);
-					if(templs.size()==100)
+					if(templs.size()==1000)
 					{
 						proEconInterruptionService.saveOrUpdateBatch(templs);
 						templs=new ArrayList<>();

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

@@ -131,8 +131,9 @@ db:
 
 #参与计算的场站
 #runWindpowerstation: SXJ_KGDL_BHB_FDC_STA
-#runWindpowerstation: SXJ_KGDL_DJY_FDC_STA,SXJ_KGDL_NJL_FDC_STA,SXJ_KGDL_YF_FDC_STA,SXJ_KGDL_YLZ_FDC_STA,SXJ_KGDL_XWT_FDC_STA,SXJ_KGDL_PTZ_FDC_STA,SXJ_KGDL_GJY_FDC_STA,SXJ_KGDL_BHB_FDC_STA,SXJ_KGDL_HSM_FDC_STA,SXJ_KGDL_YTY_FDC_STA,SXJ_KGDL_BHB3_FDC_STA,SXJ_KGDL_SY_GDC_STA,SXJ_KGDL_PDL_FDC_STA,SXJ_KGDL_ZK_FDC_STA,SXJ_KGDL_JR_GDC_STA,SXJ_KGDL_FS_GDC_STA,SXJ_KGDL_HR_GDC_STA,SXJ_KGDL_YY_GDC_STA,SXJ_KGDL_PL_GDC_STA,SXJ_KGDL_YG_GDC_STA,SXJ_KGDL_YX_GDC_STA,SXJ_KGDL_TZ_GDC_STA,SXJ_KGDL_TL_GDC_STA
-runWindpowerstation: SXJ_KGDL_DJY_FDC_STA,SXJ_KGDL_NJL_FDC_STA,SXJ_KGDL_YF_FDC_STA,SXJ_KGDL_YLZ_FDC_STA,SXJ_KGDL_XWT_FDC_STA,SXJ_KGDL_PTZ_FDC_STA,SXJ_KGDL_GJY_FDC_STA,SXJ_KGDL_BHB_FDC_STA,SXJ_KGDL_HSM_FDC_STA,SXJ_KGDL_YTY_FDC_STA,SXJ_KGDL_BHB3_FDC_STA,SXJ_KGDL_PDL_FDC_STA,SXJ_KGDL_ZK_FDC_STA
+runWindpowerstation: SXJ_KGDL_DJY_FDC_STA,SXJ_KGDL_NJL_FDC_STA,SXJ_KGDL_YF_FDC_STA,SXJ_KGDL_YLZ_FDC_STA,SXJ_KGDL_XWT_FDC_STA,SXJ_KGDL_PTZ_FDC_STA,SXJ_KGDL_GJY_FDC_STA,SXJ_KGDL_BHB_FDC_STA,SXJ_KGDL_HSM_FDC_STA,SXJ_KGDL_YTY_FDC_STA,SXJ_KGDL_BHB3_FDC_STA,SXJ_KGDL_SY_GDC_STA,SXJ_KGDL_PDL_FDC_STA,SXJ_KGDL_ZK_FDC_STA,SXJ_KGDL_JR_GDC_STA,SXJ_KGDL_FS_GDC_STA,SXJ_KGDL_HR_GDC_STA,SXJ_KGDL_YY_GDC_STA,SXJ_KGDL_PL_GDC_STA,SXJ_KGDL_YG_GDC_STA,SXJ_KGDL_YX_GDC_STA,SXJ_KGDL_TZ_GDC_STA,SXJ_KGDL_TL_GDC_STA
+#runWindpowerstation: SXJ_KGDL_DJY_FDC_STA,SXJ_KGDL_NJL_FDC_STA,SXJ_KGDL_YF_FDC_STA,SXJ_KGDL_YLZ_FDC_STA,SXJ_KGDL_XWT_FDC_STA,SXJ_KGDL_PTZ_FDC_STA,SXJ_KGDL_GJY_FDC_STA,SXJ_KGDL_BHB_FDC_STA,SXJ_KGDL_HSM_FDC_STA,SXJ_KGDL_YTY_FDC_STA,SXJ_KGDL_BHB3_FDC_STA,SXJ_KGDL_PDL_FDC_STA,SXJ_KGDL_ZK_FDC_STA
+#runWindpowerstation: SXJ_KGDL_SY_GDC_STA,SXJ_KGDL_JR_GDC_STA,SXJ_KGDL_FS_GDC_STA,SXJ_KGDL_HR_GDC_STA,SXJ_KGDL_YY_GDC_STA,SXJ_KGDL_PL_GDC_STA,SXJ_KGDL_YG_GDC_STA,SXJ_KGDL_YX_GDC_STA,SXJ_KGDL_TZ_GDC_STA,SXJ_KGDL_TL_GDC_STA,SXJ_KGDL_SY_GDC_STA
 
 #计算状态用ai或者di
 clauStatus:

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

@@ -1,5 +1,5 @@
 ### xxl-job admin address list, such as "http://address" or "http://address01,http://address02"
-xxl.job.admin.addresses=http://localhost:8179/xxl-job-admin
+xxl.job.admin.addresses=http://10.81.3.152:8179/xxl-job-admin
 
 ### xxl-job, access token
 xxl.job.accessToken=

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

@@ -0,0 +1,25 @@
+### xxl-job admin address list, such as "http://address" or "http://address01,http://address02"
+xxl.job.admin.addresses=http://10.81.3.152:8179/xxl-job-admin
+
+### xxl-job, access token
+xxl.job.accessToken=
+
+### xxl-job executor appname
+### 场站计算
+#xxl.job.executor.appname=generationWP-job
+### 区域公司计算
+xxl.job.executor.appname=generationGF000-job
+### xxl-job executor registry-address: default use address to registry , otherwise use ip:port if address is null
+xxl.job.executor.address=
+### xxl-job executor server-info
+xxl.job.executor.ip=
+#场站端口
+#xxl.job.executor.port=9201
+#区域端口
+xxl.job.executor.port=9310
+
+### xxl-job executor log-path
+xxl.job.executor.logpath=E:\gyee\log\GFlog
+### xxl-job executor log-retention-days
+xxl.job.executor.logretentiondays=30
+

realtime/generationXK-service/src/test/java/com/gyee/generation/HealthTest.java

@@ -17,7 +17,7 @@ public class HealthTest {
         InitialRedisService initialRedisService= SpringUtils.getBean("initialRedisService");
 
 
-//        inputOrOutPutService.initialInputOrOutputSpeed();
+        inputOrOutPutService.initialInputOrOutputSpeed();
         Calendar c = Calendar.getInstance();
         Date begin=null;
         Date end=null;
@@ -137,6 +137,7 @@ public class HealthTest {
 //        System.out.println("曲线拟合调度程序执行结束!。。。。。。");
 //
 //
+//        c.set(Calendar.DAY_OF_MONTH,1);
 //        begin=new Date();
 //        System.out.println("场站指标记录调度程序执行开始!。。。。。。");
 //        WindPowerInfo1Service windPowerInfo1Service= SpringUtils.getBean("windPowerInfo1Service");
@@ -145,7 +146,8 @@ public class HealthTest {
 //        WindPowerInfo4Service windPowerInfo4Service= SpringUtils.getBean("windPowerInfo4Service");
 //        WindPowerInfo5Service windPowerInfo5Service= SpringUtils.getBean("windPowerInfo5Service");
 //        WindPowerInfo6Service windPowerInfo6Service= SpringUtils.getBean("windPowerInfo6Service");
-//
+//        for(int i=0;i<20;i++)
+//        {
 //        windPowerInfo1Service.calLineInfoDay(c.getTime());
 //        windPowerInfo1Service.calProjectInfoDay(c.getTime());
 //        windPowerInfo1Service.calWindpowerInfoDay(c.getTime());
@@ -181,56 +183,62 @@ public class HealthTest {
 //        windPowerInfo6Service.calWindpowerInfoDay(c.getTime());
 //        windPowerInfo6Service.calCompanyInfoDay(c.getTime());
 //        windPowerInfo6Service.calRegionInfoDay(c.getTime());
+//           c.add(Calendar.DAY_OF_MONTH,1);
 //
+//            System.out.println("完成一次!。。。。。。");
+//        }
+////
 //        end=new Date();
 //        System.out.println("执行用时"+ DateUtils.secondsDiff(begin,end) +"秒");
 //        System.out.println("场站指标记录调度程序执行结束!。。。。。。");
 //
 //
 //
-
-        c.set(Calendar.DAY_OF_MONTH,18);
+//
+        c.set(Calendar.DAY_OF_MONTH,19);
 
         c.setTime(DateUtils.truncate(c.getTime()));
 
         begin=new Date();
         System.out.println("设备指标记录调度程序执行开始!。。。。。。");
-//        for(int i=0;i<2;i++)
-//        {
-
-
-
+////        for(int i=0;i<2;i++)
+////        {
+//
+//
+//
             System.out.println(DateUtils.format(c.getTime(),"yyyy-MM-dd HH:mm:ss").toString());
             EquipmentInfo1Service equipmentInfo1Service= SpringUtils.getBean("equipmentInfo1Service");
-            EquipmentInfo2Service equipmentInfo2Service= SpringUtils.getBean("equipmentInfo2Service");
-            EquipmentInfo3Service equipmentInfo3Service= SpringUtils.getBean("equipmentInfo3Service");
-            EquipmentInfo4Service equipmentInfo4Service= SpringUtils.getBean("equipmentInfo4Service");
-            EquipmentInfo5Service equipmentInfo5Service= SpringUtils.getBean("equipmentInfo5Service");
-            EquipmentInfoDayTopService equipmentInfoDayTopService= SpringUtils.getBean("equipmentInfoDayTopService");
-            WtAlysisDayService wtAlysisDayService= SpringUtils.getBean("wtAlysisDayService");
-
+//            EquipmentInfo2Service equipmentInfo2Service= SpringUtils.getBean("equipmentInfo2Service");
+//            EquipmentInfo3Service equipmentInfo3Service= SpringUtils.getBean("equipmentInfo3Service");
+//            EquipmentInfo4Service equipmentInfo4Service= SpringUtils.getBean("equipmentInfo4Service");
+//            EquipmentInfo5Service equipmentInfo5Service= SpringUtils.getBean("equipmentInfo5Service");
+//            EquipmentInfoDayTopService equipmentInfoDayTopService= SpringUtils.getBean("equipmentInfoDayTopService");
+//            WtAlysisDayService wtAlysisDayService= SpringUtils.getBean("wtAlysisDayService");
+//
             equipmentInfo1Service.calEquipmentInfoDay(c.getTime());
-            equipmentInfo2Service.calEquipmentInfoDay(c.getTime());
-
-            equipmentInfo3Service.calEquipmentInfoDay(c.getTime());
-
-
-
-            equipmentInfo5Service.calEquipmentInfoDay(c.getTime());
-
-            equipmentInfo4Service.calEquipmentInfoDay(c.getTime());
+//            equipmentInfo2Service.calEquipmentInfoDay(c.getTime());
 //
-            equipmentInfoDayTopService.calEquipmentInfoDayTop(c.getTime());
-            equipmentInfoDayTopService.calEquipmentInfoMonthTop(c.getTime());
-            equipmentInfoDayTopService.calEquipmentInfoYearTop(c.getTime());
-
-            wtAlysisDayService.calEquipmentInfoDay(c.getTime());
-
-            c.add(Calendar.DAY_OF_MONTH,1);
+//            equipmentInfo3Service.calEquipmentInfoDay(c.getTime());
+//
+//
+//
+//            equipmentInfo5Service.calEquipmentInfoDay(c.getTime());
+//
+//            equipmentInfo4Service.calEquipmentInfoDay(c.getTime());
+////
+//            equipmentInfoDayTopService.calEquipmentInfoDayTop(c.getTime());
+//            equipmentInfoDayTopService.calEquipmentInfoMonthTop(c.getTime());
+//            equipmentInfoDayTopService.calEquipmentInfoYearTop(c.getTime());
+//
+//            wtAlysisDayService.calEquipmentInfoDay(c.getTime());
+//
+//            c.add(Calendar.DAY_OF_MONTH,1);
 
 //            System.out.println("完成一次!。。。。。。");
 //        }
 
+
+
         end=new Date();
         System.out.println("执行用时"+ DateUtils.secondsDiff(begin,end) +"秒");
         System.out.println("设备指标记录调度程序执行结束!。。。。。。");

realtime/generationXK-service/src/test/java/com/gyee/generation/RealTest.java

@@ -14,7 +14,7 @@ public class RealTest {
     public static void main(String[] args) throws Exception {
         SpringApplication.run(GenerationMain.class, args);
         StatusService statusService= SpringUtils.getBean("statusService");
-        CycleCalculationService cycleCalculationService= SpringUtils.getBean("cycleCalculationService");
+        CycleCalculationRebuildService cycleCalculationRebuildService= SpringUtils.getBean("cycleCalculationRebuildService");
 
         CalculationService calculationService= SpringUtils.getBean("calculationService");
         RealtimeService realtimeService= SpringUtils.getBean("realtimeService");
@@ -27,15 +27,34 @@ public class RealTest {
         Date end=null;
 //        CacheService cacheService= SpringUtils.getBean("cacheService");
 //        cacheService.initRedisCache();
+//
+//        c.set(Calendar.DAY_OF_MONTH,19);
 
+//        c.set(Calendar.HOUR_OF_DAY, 9);
+//        c.set(Calendar.MINUTE, 0);
+//        c.set(Calendar.SECOND, 0);
+//        c.set(Calendar.MILLISECOND, 0);
+//
+//        c.setTime(DateUtils.truncate(c.getTime()));
 
         begin=new Date();
-        System.out.println("状态判定调度程序执行开始!。。。。。。");
+        System.out.println("设备指标记录调度程序执行开始!。。。。。。");
+//        for(int i=0;i<19;i++)
+//        {
 
 //        statusService.middleStatusReal();
-//        statusService.startStatusReal();
+        statusService.startStatusReal();
 //        calculationService.calWp();
-        cycleCalculationService.saveCyle();
+//            cycleCalculationRebuildService.saveCyle();
+
+        c.add(Calendar.DAY_OF_MONTH,1);
+
+            System.out.println("完成一次!。。。。。。");
+//        }
+
+        end=new Date();
+        System.out.println("执行用时"+ DateUtils.secondsDiff(begin,end) +"秒");
+        System.out.println("设备指标记录调度程序执行结束!。。。。。。");
 
 //        realtimeService.savaRealtimeTarget();
 
@@ -45,11 +64,11 @@ public class RealTest {
 //        realtimeService.savaRealtimeTarget();
 
 //        regionCalreService.aqts();
-
-        end=new Date();
-        System.out.println("执行用时"+ DateUtils.millisecondDiff(begin,end) +"秒");
-        System.out.println("状态判定调度程序执行结束!。。。。。。");
-        System.out.println("完成!。。。。。。");
+//
+//        end=new Date();
+//        System.out.println("执行用时"+ DateUtils.millisecondDiff(begin,end) +"秒");
+//        System.out.println("状态判定调度程序执行结束!。。。。。。");
+//        System.out.println("完成!。。。。。。");
 //
 //
 //