优化后台计算算法

realtime/generationXK-service/pom.xml

@@ -125,6 +125,10 @@
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-maven-plugin</artifactId>
                 <version>2.7.1</version>
+                <configuration>
+                    <!--maven编译时将本地引用的jar包一起打包-->
+                    <includeSystemScope>true</includeSystemScope>
+                </configuration>
                 <executions>
                     <execution>
                         <goals>

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

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

@@ -2,6 +2,10 @@ package com.gyee.generation.mapper.auto;
 
 import com.gyee.generation.model.auto.ProEconBrownoutsEvent2;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Update;
+
+import java.util.Date;
 
 /**
  * <p>
@@ -13,4 +17,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  */
 public interface ProEconBrownoutsEvent2Mapper extends BaseMapper<ProEconBrownoutsEvent2> {
 
+    @Update("update pro_econ_brownouts_event2   set start_time=#{start_time},loss_power=#{loss_power},stop_hours=#{stop_hours}  where id=#{id}")
+    public int  updateBrownouts2(@Param(value = "start_time") Date start_time, @Param(value = "loss_power")Double loss_power,
+                                @Param(value = "stop_hours")Double stop_hours, @Param(value = "id")String id);
 }

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

@@ -2,6 +2,10 @@ package com.gyee.generation.mapper.auto;
 
 import com.gyee.generation.model.auto.ProEconBrownoutsEvent;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Update;
+
+import java.util.Date;
 
 /**
  * <p>
@@ -13,4 +17,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  */
 public interface ProEconBrownoutsEventMapper extends BaseMapper<ProEconBrownoutsEvent> {
 
+    @Update("update pro_econ_brownouts_event   set start_time=#{start_time},loss_power=#{loss_power},stop_hours=#{stop_hours}  where id=#{id}")
+    public int  updateBrownouts(@Param(value = "start_time") Date start_time, @Param(value = "loss_power")Double loss_power,
+                                    @Param(value = "stop_hours")Double stop_hours, @Param(value = "id")String id);
 }

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

@@ -2,6 +2,10 @@ package com.gyee.generation.mapper.auto;
 
 import com.gyee.generation.model.auto.ProEconInterruption;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Update;
+
+import java.util.Date;
 
 /**
  * <p>
@@ -13,4 +17,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  */
 public interface ProEconInterruptionMapper extends BaseMapper<ProEconInterruption> {
 
+    @Update("update pro_econ_interruption   set start_time=#{start_time},stop_hours=#{stop_hours}  where id=#{id}")
+    public int  updateInterruption(@Param(value = "start_time") Date start_time,
+                                        @Param(value = "stop_hours")Double stop_hours, @Param(value = "id")Long id);
 }

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

@@ -2,6 +2,10 @@ package com.gyee.generation.mapper.auto;
 
 import com.gyee.generation.model.auto.ProEconMainBrownouts2;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Update;
+
+import java.util.Date;
 
 /**
  * <p>
@@ -13,4 +17,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  */
 public interface ProEconMainBrownouts2Mapper extends BaseMapper<ProEconMainBrownouts2> {
 
+    @Update("update pro_econ_main_brownouts2   set start_time=#{start_time},loss_power=#{loss_power},stop_hours=#{stop_hours}  where id=#{id}")
+    public int  updateMainBrownouts2(@Param(value = "start_time") Date start_time, @Param(value = "loss_power")Double loss_power,
+                                    @Param(value = "stop_hours")Double stop_hours, @Param(value = "id")String id);
 }

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

@@ -2,6 +2,10 @@ package com.gyee.generation.mapper.auto;
 
 import com.gyee.generation.model.auto.ProEconMainBrownouts;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Update;
+
+import java.util.Date;
 
 /**
  * <p>
@@ -13,4 +17,8 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  */
 public interface ProEconMainBrownoutsMapper extends BaseMapper<ProEconMainBrownouts> {
 
+
+    @Update("update pro_econ_main_brownouts   set start_time=#{start_time},loss_power=#{loss_power},stop_hours=#{stop_hours}  where id=#{id}")
+    public int  updateMainBrownouts(@Param(value = "start_time") Date start_time, @Param(value = "loss_power")Double loss_power,
+                                    @Param(value = "stop_hours")Double stop_hours, @Param(value = "id")String id);
 }

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

@@ -2,6 +2,10 @@ package com.gyee.generation.mapper.auto;
 
 import com.gyee.generation.model.auto.ProEconShutdownEvent2;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Update;
+
+import java.util.Date;
 
 /**
  * <p>
@@ -13,4 +17,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  */
 public interface ProEconShutdownEvent2Mapper extends BaseMapper<ProEconShutdownEvent2> {
 
+    @Update("update pro_econ_shutdown_event2   set start_time=#{start_time},loss_power=#{loss_power},stop_hours=#{stop_hours}  where id=#{id}")
+    public int  updateShutdownevent2(@Param(value = "start_time") Date start_time, @Param(value = "loss_power")Double loss_power,
+                                    @Param(value = "stop_hours")Double stop_hours, @Param(value = "id")String id);
 }

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

@@ -2,6 +2,10 @@ package com.gyee.generation.mapper.auto;
 
 import com.gyee.generation.model.auto.ProEconShutdownEvent;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Update;
+
+import java.util.Date;
 
 /**
  * <p>
@@ -13,4 +17,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  */
 public interface ProEconShutdownEventMapper extends BaseMapper<ProEconShutdownEvent> {
 
+    @Update("update pro_econ_shutdown_event   set start_time=#{start_time},loss_power=#{loss_power},stop_hours=#{stop_hours}  where id=#{id}")
+    public int  updateShutdownevent(@Param(value = "start_time") Date start_time, @Param(value = "loss_power")Double loss_power,
+                                    @Param(value = "stop_hours")Double stop_hours, @Param(value = "id")String id);
 }

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

@@ -2,6 +2,10 @@ package com.gyee.generation.mapper.auto;
 
 import com.gyee.generation.model.auto.ProEconWindturbineStatus;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Update;
+
+import java.util.Date;
 
 /**
  * <p>
@@ -13,4 +17,8 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  */
 public interface ProEconWindturbineStatusMapper extends BaseMapper<ProEconWindturbineStatus> {
 
+
+    @Update("update pro_econ_windturbine_status   set start_time=#{start_time},loss_power=#{loss_power},stop_hours=#{stop_hours}  where id=#{id}")
+    public int  updateWindturbineStatus(@Param(value = "start_time") Date start_time, @Param(value = "loss_power")Double loss_power,
+                                    @Param(value = "stop_hours")Double stop_hours, @Param(value = "id")Long id);
 }

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

@@ -317,7 +317,8 @@ public class LimitEventnewService {
 //                updateWrapper.set("start_time", vo.getStartTime());
 //                updateWrapper.set("loss_power", vo.getLossPower());
 //                updateWrapper.set("stop_hours", vo.getStopHours());
-                proEconMainBrownoutsService.update(vo, updateWrapper);
+//                proEconMainBrownoutsService.update(vo, updateWrapper);
+                proEconMainBrownoutsService.updateMainBrownouts(vo.getStartTime(),vo.getLossPower(),vo.getStopHours(),vo.getId());
             }
 
             for (ProEconMainBrownouts2 vo : updateMainBrownouts2ls) {
@@ -325,7 +326,8 @@ public class LimitEventnewService {
 //                updateWrapper.set("start_time", vo.getStartTime());
 //                updateWrapper.set("loss_power", vo.getLossPower());
 //                updateWrapper.set("stop_hours", vo.getStopHours());
-                proEconMainBrownouts2Service.update(vo, updateWrapper);
+//                proEconMainBrownouts2Service.update(vo, updateWrapper);
+                proEconMainBrownouts2Service.updateMainBrownouts2(vo.getStartTime(),vo.getLossPower(),vo.getStopHours(),vo.getId());
             }
 
         }
@@ -378,7 +380,8 @@ public class LimitEventnewService {
 //                updateWrapper.set("start_time", vo.getStartTime());
 //                updateWrapper.set("loss_power", vo.getLossPower());
 //                updateWrapper.set("stop_hours", vo.getStopHours());
-                proEconBrownoutsEventService.update(vo, updateWrapper);
+//                proEconBrownoutsEventService.update(vo, updateWrapper);
+                proEconBrownoutsEventService.updateBrownouts(vo.getStartTime(),vo.getLossPower(),vo.getStopHours(),vo.getId());
             }
 
 
@@ -425,7 +428,8 @@ public class LimitEventnewService {
 //                updateWrapper.set("start_time", vo.getStartTime());
 //                updateWrapper.set("loss_power", vo.getLossPower());
 //                updateWrapper.set("stop_hours", vo.getStopHours());
-                proEconBrownoutsEvent2Service.update(vo, updateWrapper);
+//                proEconBrownoutsEvent2Service.update(vo, updateWrapper);
+                proEconBrownoutsEvent2Service.updateBrownouts2(vo.getStartTime(),vo.getLossPower(),vo.getStopHours(),vo.getId());
             }
 
 

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

@@ -370,7 +370,7 @@ public class PowerCurveFittingByTimeService {
         for (ProBasicEquipment wt : CacheContext.wtls) {
             String windturbineId = wt.getId();
 
-            if(wt.getWindpowerstationId().contains(WpType.GDC.id))
+            if(wt.getWindpowerstationId().contains(WpType.GDC.id) )
             {
                 continue;
             }
@@ -1378,110 +1378,104 @@ public class PowerCurveFittingByTimeService {
     private void insertPoints2(List<PointVo> monthSjglls, List<PointVo> monthZyglls, String windturbineId) {
 
 
-//        List<Integer> wtpcfidls = proEconWtPowerCurveFittingService.list()
-//                .stream().filter(i -> i.getWindturbineId().equals(windturbineId))
-//                .map(ProEconWtPowerCurveFitting::getId).collect(Collectors.toList());
-//
-//
-//        for (int i = 0; i < wtpcfidls.size(); i++) {
-//            proEconWtPowerCurveFittingService.removeByIds(wtpcfidls);
-//        }
 
-        proEconWtPowerCurveFittingService.deleteProEconWtPowerCurveFitting();
+        if(!monthSjglls.isEmpty() && !monthZyglls.isEmpty())
+        {
+            QueryWrapper<ProEconWtPowerCurveFitting> queryWrapper = new QueryWrapper<>();
+            if (com.gyee.common.model.StringUtils.isNotEmpty(windturbineId)){
+                queryWrapper.eq("windturbine_id",windturbineId);
+            }
 
-        List<ProEconWtPowerCurveFitting> wtcfls=new ArrayList<>();
-        if (monthSjglls.size() == monthZyglls.size()) {
-            for (int i = 0; i < monthSjglls.size(); i++) {
-                ProEconWtPowerCurveFitting item = new ProEconWtPowerCurveFitting();
+            List<ProEconWtPowerCurveFitting> ls= proEconWtPowerCurveFittingService.list(queryWrapper);
 
-                item.setWindturbineId(windturbineId);
+            List<Long> wtpcfidls = ls.stream().map(ProEconWtPowerCurveFitting::getId).collect(Collectors.toList());
 
-                if (CacheContext.wtmap.containsKey(windturbineId)) {
+            for (int i = 0; i < wtpcfidls.size(); i++) {
+                proEconWtPowerCurveFittingService.removeByIds(wtpcfidls);
+            }
 
-                    ProBasicEquipment wt = CacheContext.wtmap.get(windturbineId);
-                    if (wt.getWindpowerstationId().contains(WpType.GDC.id)) {
-                        continue;
-                        // item.SPEED = Double.Truncate(pointsF1[i].X);
-                    } else {
-                        boolean l = String.valueOf(monthSjglls.get(i).getX()).contains(".");
-                        if (l) {
+
+//        proEconWtPowerCurveFittingService.deleteProEconWtPowerCurveFitting();
+            List<ProEconWtPowerCurveFitting> wtcfls=new ArrayList<>();
+            if (monthSjglls.size() == monthZyglls.size()) {
+                for (int i = 0; i < monthSjglls.size(); i++) {
+                    ProEconWtPowerCurveFitting item = new ProEconWtPowerCurveFitting();
+
+                    item.setWindturbineId(windturbineId);
+                    if (CacheContext.wtmap.containsKey(windturbineId)) {
+                        ProBasicEquipment wt = CacheContext.wtmap.get(windturbineId);
+                        if (wt.getWindpowerstationId().contains(WpType.GDC.id)) {
                             continue;
+                            // item.SPEED = Double.Truncate(pointsF1[i].X);
+                        } else {
+                            //item.setSpeed(sjglls.get(i).getX());
+                            item.setSpeed(StringUtils.round(monthSjglls.get(i).getX(),2));
                         }
-                        item.setSpeed(monthSjglls.get(i).getX());
-                        item.setSpeed(StringUtils.round(monthSjglls.get(i).getX(),2));
+//                    item.setActualPower(sjglls.get(i).getY());
+//                    item.setOptimalPower(zyglls.get(i).getY());
+                        item.setActualPower(StringUtils.round(monthSjglls.get(i).getY(),2));
+                        item.setOptimalPower(StringUtils.round(monthSjglls.get(i).getY(),2));
+                        wtcfls.add(item);
+                        // proEconWtCurveFittingMonthService.save(item);
                     }
 
-
-//                    item.setActualPower(monthSjglls.get(i).getY());
-//                    item.setOptimalPower(monthZyglls.get(i).getY());
-
-                    item.setActualPower(StringUtils.round(monthSjglls.get(i).getY(),2));
-                    item.setOptimalPower(StringUtils.round(monthZyglls.get(i).getY(),2));
-
-                    wtcfls.add(item);
-                    //proEconWtPowerCurveFittingService.save(item);
                 }
+            } else {
+                logger.warn(String.format("下标不一致的风机编号：{0}，实际功率：{1}，最有功率：{2}", windturbineId, monthSjglls.size(), monthZyglls.size()));
 
-            }
-        } else {
 
-            logger.warn(String.format("下标不一致的风机编号：{0}，实际功率：{1}，最有功率：{2}", windturbineId, monthSjglls.size(), monthZyglls.size()));
+                for (int i = 0; i < monthSjglls.size(); i++) {
+                    ProEconWtPowerCurveFitting item = new ProEconWtPowerCurveFitting();
+                    item.setWindturbineId(windturbineId);
+                    if (CacheContext.wtmap.containsKey(windturbineId)) {
 
-            for (int i = 0; i < monthSjglls.size(); i++) {
-                ProEconWtPowerCurveFitting item = new ProEconWtPowerCurveFitting();
+                        ProBasicEquipment wt = CacheContext.wtmap.get(windturbineId);
+                        if (wt.getWindpowerstationId().contains(WpType.GDC.id)) {
+                            continue;
+                            //item.SPEED = Double.Truncate(pointsF1[i].X);
+                        } else {
 
-                item.setWindturbineId(windturbineId);
+//                        item.setSpeed(sjglls.get(i).getX());
+                            item.setSpeed(StringUtils.round(monthSjglls.get(i).getX(),2));
+                        }
+//                    item.setActualPower(sjglls.get(i).getY());
 
-                if (CacheContext.wtmap.containsKey(windturbineId)) {
+                        int finalI = i;
+                        OptionalDouble op = monthZyglls.stream().filter(x -> Objects.equals(x.getX(), monthSjglls.get(finalI).getX())).mapToDouble(PointVo::getY).findFirst();
 
-                    ProBasicEquipment wt = CacheContext.wtmap.get(windturbineId);
-                    if (wt.getWindpowerstationId().contains(WpType.GDC.id)) {
-                        continue;
-                        //item.SPEED = Double.Truncate(pointsF1[i].X);
-                    } else {
-                        boolean l = String.valueOf(monthSjglls.get(i).getX()).contains(".");
-                        if (l) {
-                            continue;
+                        if (op.isPresent()) {
+                            item.setOptimalPower(op.getAsDouble());
+                        } else {
+                            item.setOptimalPower(0.0);
                         }
-//                        item.setSpeed(monthSjglls.get(i).getX());
-                        item.setSpeed(StringUtils.round(monthSjglls.get(i).getX(),2));
+                        item.setActualPower(StringUtils.round(monthSjglls.get(i).getY(),2));
+                        item.setOptimalPower(StringUtils.round(monthSjglls.get(i).getY(),2));
+                        wtcfls.add(item);
+                        //proEconWtCurveFittingMonthService.save(item);
                     }
 
+                }
+            }
+            //*********************************************当月曲线偏差记录**********************************************************/
 
-//                    item.setActualPower(monthSjglls.get(i).getY());
-                    int finalI = i;
-                    OptionalDouble op = monthZyglls.stream().filter(x -> Objects.equals(x.getX(), monthSjglls.get(finalI).getX())).mapToDouble(PointVo::getY).findFirst();
 
-                    if (op.isPresent()) {
-                        item.setOptimalPower(op.getAsDouble());
-                    } else {
-                        item.setOptimalPower(0.0);
-                    }
-                    item.setActualPower(StringUtils.round(monthSjglls.get(i).getY(),2));
-                    item.setOptimalPower(StringUtils.round(monthZyglls.get(i).getY(),2));
-                    wtcfls.add(item);
-                    //proEconWtPowerCurveFittingService.save(item);
+            List<ProEconWtPowerCurveFitting> templs=new ArrayList<>();
+            for(ProEconWtPowerCurveFitting vo:wtcfls)
+            {
+                templs.add(vo);
+                if(templs.size()==100)
+                {
+                    proEconWtPowerCurveFittingService.saveBatch(templs);
+                    templs=new ArrayList<>();
                 }
-
             }
-        }
-
 
-        List<ProEconWtPowerCurveFitting> templs=new ArrayList<>();
-        for(ProEconWtPowerCurveFitting vo:wtcfls)
-        {
-            templs.add(vo);
-            if(templs.size()==100)
+            if(!templs.isEmpty())
             {
                 proEconWtPowerCurveFittingService.saveBatch(templs);
-                templs=new ArrayList<>();
             }
         }
 
-        if(!templs.isEmpty())
-        {
-            proEconWtPowerCurveFittingService.saveBatch(templs);
-        }
 //        proEconWtPowerCurveFittingService.saveBatch(wtcfls);
     }
 
@@ -1739,11 +1733,11 @@ public class PowerCurveFittingByTimeService {
                 List<PointData> ztpoints = new ArrayList<>();
                 if (!glpointstemp.isEmpty() && !fspointstemp.isEmpty() && !ztpointstemp.isEmpty() && glpointstemp.size() == fspointstemp.size() && fspointstemp.size() == ztpointstemp.size()) {
                     for (int i = 0; i < glpointstemp.size(); i++) {
-                        if (filterData(glpointstemp.get(i), fspointstemp.get(i), ztpointstemp,qfzttemp,i, maxPower,maxSpeed, windturbineId)) {
+//                        if (filterData(glpointstemp.get(i), fspointstemp.get(i), ztpointstemp,qfzttemp,i, maxPower,maxSpeed, windturbineId)) {
                             glpoints.add(glpointstemp.get(i));
                             fspoints.add(fspointstemp.get(i));
                             ztpoints.add(ztpointstemp.get(i));
-                        }
+//                        }
                     }
                 }
 

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

@@ -62,15 +62,9 @@ public class ShutdownnewService {
         Map<String, ProEconShutdownEvent2> oldShutdownEvent2 = new HashMap<>();
 
         List<ProBasicEquipment> wtls = new ArrayList<>();
-        for (ProBasicEquipment wt : CacheContext.wtls) {
 
-            if (wt.getWindpowerstationId().contains("GDC")) {
-                continue;
-            }
-
-            wtls.add(wt);
-        }
-        for (ProBasicEquipment wt : wtls) {
+        wtls.addAll(CacheContext.wtls);
+        for (ProBasicEquipment wt : wtls ) {
             Map<String, ProBasicEquipmentPoint> windturbinetestingpointnewMap = CacheContext.wtpAimap.get(wt.getId());
 
             //取实时状态数据 赋值给status
@@ -176,10 +170,10 @@ public class ShutdownnewService {
             }
 
             if (wtStatusMap.containsKey(wtId)) {
-                if(wtId.equals("SXJ_KGDL_YF_F_WT_0043_EQ"))
-                {
-                    System.out.println("");
-                }
+//                if(wtId.equals("SXJ_KGDL_YF_F_WT_0043_EQ"))
+//                {
+//                    System.out.println("");
+//                }
                 PointData wtPoint = wtStatusMap.get(wtId);
                 //获取当前时间
                 Date currentTime = recordDate;
@@ -253,7 +247,8 @@ public class ShutdownnewService {
 //            updateWrapper.set("start_time", vo.getStartTime());
 //            updateWrapper.set("loss_power", vo.getLossPower());
 //            updateWrapper.set("stop_hours", vo.getStopHours());
-            proEconShutdownEventService.update(vo, updateWrapper);
+//            proEconShutdownEventService.update(vo, updateWrapper);
+            proEconShutdownEventService.updateShutdownevent(vo.getStartTime(),vo.getLossPower(),vo.getStopHours(),vo.getId());
         }
 
         for (ProEconShutdownEvent2 vo : updateProEconShutdownEvent2ls) {
@@ -261,21 +256,25 @@ public class ShutdownnewService {
 //            updateWrapper.set("start_time", vo.getStartTime());
 //            updateWrapper.set("loss_power", vo.getLossPower());
 //            updateWrapper.set("stop_hours", vo.getStopHours());
-            proEconShutdownEvent2Service.update(vo, updateWrapper);
+//            proEconShutdownEvent2Service.update(vo, updateWrapper);
+            proEconShutdownEvent2Service.updateShutdownevent2(vo.getStartTime(),vo.getLossPower(),vo.getStopHours(),vo.getId());
         }
         for (ProEconWindturbineStatus vo : updateProEconWindturbineStatusls) {
             UpdateWrapper<ProEconWindturbineStatus> updateWrapper = new UpdateWrapper<>();
 //            updateWrapper.set("start_time", vo.getStartTime());
 //            updateWrapper.set("loss_power", vo.getLossPower());
 //            updateWrapper.set("stop_hours", vo.getStopHours());
-            proEconWindturbineStatusService.update(vo, updateWrapper);
+//            proEconWindturbineStatusService.update(vo, updateWrapper);
+            proEconWindturbineStatusService.updateWindturbineStatus(vo.getStartTime(),vo.getLossPower(),vo.getStopHours(),vo.getId());
+
         }
 
         for (ProEconInterruption vo : updateProEconInterruptionls) {
             UpdateWrapper<ProEconInterruption> updateWrapper = new UpdateWrapper<>();
 //            updateWrapper.set("start_time", vo.getStartTime());
 //            updateWrapper.set("stop_hours", vo.getStopHours());
-            proEconInterruptionService.update(vo, updateWrapper);
+//            proEconInterruptionService.update(vo, updateWrapper);
+            proEconInterruptionService.updateInterruption(vo.getStartTime(),vo.getStopHours(),vo.getId());
         }
 
         List<ProEconWindturbineStatus> temp1ls = new ArrayList<>();

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

@@ -3,6 +3,8 @@ package com.gyee.generation.service.auto;
 import com.gyee.generation.model.auto.ProEconBrownoutsEvent2;
 import com.baomidou.mybatisplus.extension.service.IService;
 
+import java.util.Date;
+
 /**
  * <p>
  * 与停机事件关联（限电停机时），数据库中无关联，程序控制 服务类
@@ -13,4 +15,5 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface IProEconBrownoutsEvent2Service extends IService<ProEconBrownoutsEvent2> {
 
+    public int  updateBrownouts2(Date start_time, Double loss_power, Double stop_hours, String id);
 }

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

@@ -3,6 +3,8 @@ package com.gyee.generation.service.auto;
 import com.gyee.generation.model.auto.ProEconBrownoutsEvent;
 import com.baomidou.mybatisplus.extension.service.IService;
 
+import java.util.Date;
+
 /**
  * <p>
  * 与停机事件关联（限电停机时），数据库中无关联，程序控制 服务类
@@ -13,4 +15,5 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface IProEconBrownoutsEventService extends IService<ProEconBrownoutsEvent> {
 
+    public int  updateBrownouts(Date start_time, Double loss_power, Double stop_hours, String id);
 }

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

@@ -3,6 +3,8 @@ package com.gyee.generation.service.auto;
 import com.gyee.generation.model.auto.ProEconInterruption;
 import com.baomidou.mybatisplus.extension.service.IService;
 
+import java.util.Date;
+
 /**
  * <p>
  * 根据风电机状态判断通讯中断并记录。 服务类
@@ -13,4 +15,6 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface IProEconInterruptionService extends IService<ProEconInterruption> {
 
+    public int  updateInterruption(Date start_time, Double stop_hours, Long id);
+
 }

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

@@ -3,6 +3,8 @@ package com.gyee.generation.service.auto;
 import com.gyee.generation.model.auto.ProEconMainBrownouts2;
 import com.baomidou.mybatisplus.extension.service.IService;
 
+import java.util.Date;
+
 /**
  * <p>
  * 限电事件主表 服务类
@@ -13,4 +15,5 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface IProEconMainBrownouts2Service extends IService<ProEconMainBrownouts2> {
 
+    public int  updateMainBrownouts2(Date start_time, Double loss_power, Double stop_hours, String id);
 }

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

@@ -3,6 +3,8 @@ package com.gyee.generation.service.auto;
 import com.gyee.generation.model.auto.ProEconMainBrownouts;
 import com.baomidou.mybatisplus.extension.service.IService;
 
+import java.util.Date;
+
 /**
  * <p>
  * 限电事件主表 服务类
@@ -13,4 +15,5 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface IProEconMainBrownoutsService extends IService<ProEconMainBrownouts> {
 
+    public int  updateMainBrownouts(Date start_time, Double loss_power, Double stop_hours, String id);
 }

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

@@ -3,6 +3,8 @@ package com.gyee.generation.service.auto;
 import com.gyee.generation.model.auto.ProEconShutdownEvent2;
 import com.baomidou.mybatisplus.extension.service.IService;
 
+import java.util.Date;
+
 /**
  * <p>
  * 停机事件2 服务类
@@ -13,4 +15,5 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface IProEconShutdownEvent2Service extends IService<ProEconShutdownEvent2> {
 
+    public int  updateShutdownevent2(Date start_time, Double loss_power, Double stop_hours, String id);
 }

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

@@ -3,6 +3,8 @@ package com.gyee.generation.service.auto;
 import com.gyee.generation.model.auto.ProEconShutdownEvent;
 import com.baomidou.mybatisplus.extension.service.IService;
 
+import java.util.Date;
+
 /**
  * <p>
  * 停机事件 服务类
@@ -13,4 +15,5 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface IProEconShutdownEventService extends IService<ProEconShutdownEvent> {
 
+    public int  updateShutdownevent(Date start_time, Double loss_power, Double stop_hours, String id);
 }

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

@@ -3,6 +3,8 @@ package com.gyee.generation.service.auto;
 import com.gyee.generation.model.auto.ProEconWindturbineStatus;
 import com.baomidou.mybatisplus.extension.service.IService;
 
+import java.util.Date;
+
 /**
  * <p>
  * 与停机事件关联（限电停机时），数据库中无关联，程序控制 服务类
@@ -13,4 +15,5 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface IProEconWindturbineStatusService extends IService<ProEconWindturbineStatus> {
 
+    public int  updateWindturbineStatus(Date start_time, Double loss_power, Double stop_hours, Long id);
 }

realtime/generationXK-service/src/main/java/com/gyee/generation/service/auto/impl/ProEconBrownoutsEvent2ServiceImpl.java

@@ -1,11 +1,14 @@
 package com.gyee.generation.service.auto.impl;
 
-import com.gyee.generation.model.auto.ProEconBrownoutsEvent2;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.gyee.generation.mapper.auto.ProEconBrownoutsEvent2Mapper;
+import com.gyee.generation.model.auto.ProEconBrownoutsEvent2;
 import com.gyee.generation.service.auto.IProEconBrownoutsEvent2Service;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 
+import javax.annotation.Resource;
+import java.util.Date;
+
 /**
  * <p>
  * 与停机事件关联（限电停机时），数据库中无关联，程序控制 服务实现类
@@ -17,4 +20,12 @@ import org.springframework.stereotype.Service;
 @Service
 public class ProEconBrownoutsEvent2ServiceImpl extends ServiceImpl<ProEconBrownoutsEvent2Mapper, ProEconBrownoutsEvent2> implements IProEconBrownoutsEvent2Service {
 
+    @Resource
+    private ProEconBrownoutsEvent2Mapper proEconBrownoutsEvent2Mapper;
+    public int  updateBrownouts2(Date start_time, Double loss_power, Double stop_hours, String id)
+    {
+        int i=0;
+        i=proEconBrownoutsEvent2Mapper.updateBrownouts2( start_time,loss_power, stop_hours, id);
+        return i;
+    }
 }

realtime/generationXK-service/src/main/java/com/gyee/generation/service/auto/impl/ProEconBrownoutsEventServiceImpl.java

@@ -1,11 +1,14 @@
 package com.gyee.generation.service.auto.impl;
 
-import com.gyee.generation.model.auto.ProEconBrownoutsEvent;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.gyee.generation.mapper.auto.ProEconBrownoutsEventMapper;
+import com.gyee.generation.model.auto.ProEconBrownoutsEvent;
 import com.gyee.generation.service.auto.IProEconBrownoutsEventService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 
+import javax.annotation.Resource;
+import java.util.Date;
+
 /**
  * <p>
  * 与停机事件关联（限电停机时），数据库中无关联，程序控制 服务实现类
@@ -17,4 +20,12 @@ import org.springframework.stereotype.Service;
 @Service
 public class ProEconBrownoutsEventServiceImpl extends ServiceImpl<ProEconBrownoutsEventMapper, ProEconBrownoutsEvent> implements IProEconBrownoutsEventService {
 
+    @Resource
+    private ProEconBrownoutsEventMapper proEconBrownoutsEventMapper;
+    public int  updateBrownouts(Date start_time, Double loss_power, Double stop_hours, String id)
+    {
+        int i=0;
+        i=proEconBrownoutsEventMapper.updateBrownouts( start_time,loss_power, stop_hours, id);
+        return i;
+    }
 }

realtime/generationXK-service/src/main/java/com/gyee/generation/service/auto/impl/ProEconInterruptionServiceImpl.java

@@ -1,11 +1,14 @@
 package com.gyee.generation.service.auto.impl;
 
-import com.gyee.generation.model.auto.ProEconInterruption;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.gyee.generation.mapper.auto.ProEconInterruptionMapper;
+import com.gyee.generation.model.auto.ProEconInterruption;
 import com.gyee.generation.service.auto.IProEconInterruptionService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 
+import javax.annotation.Resource;
+import java.util.Date;
+
 /**
  * <p>
  * 根据风电机状态判断通讯中断并记录。 服务实现类
@@ -17,4 +20,14 @@ import org.springframework.stereotype.Service;
 @Service
 public class ProEconInterruptionServiceImpl extends ServiceImpl<ProEconInterruptionMapper, ProEconInterruption> implements IProEconInterruptionService {
 
+    @Resource
+    private ProEconInterruptionMapper proEconInterruptionMapper;
+
+    public int  updateInterruption(Date start_time, Double stop_hours, Long id)
+    {
+        int i=0;
+        i=proEconInterruptionMapper.updateInterruption( start_time, stop_hours, id);
+        return i;
+    }
+
 }

realtime/generationXK-service/src/main/java/com/gyee/generation/service/auto/impl/ProEconMainBrownouts2ServiceImpl.java

@@ -1,11 +1,14 @@
 package com.gyee.generation.service.auto.impl;
 
-import com.gyee.generation.model.auto.ProEconMainBrownouts2;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.gyee.generation.mapper.auto.ProEconMainBrownouts2Mapper;
+import com.gyee.generation.model.auto.ProEconMainBrownouts2;
 import com.gyee.generation.service.auto.IProEconMainBrownouts2Service;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 
+import javax.annotation.Resource;
+import java.util.Date;
+
 /**
  * <p>
  * 限电事件主表 服务实现类
@@ -16,5 +19,12 @@ import org.springframework.stereotype.Service;
  */
 @Service
 public class ProEconMainBrownouts2ServiceImpl extends ServiceImpl<ProEconMainBrownouts2Mapper, ProEconMainBrownouts2> implements IProEconMainBrownouts2Service {
-
+    @Resource
+    private ProEconMainBrownouts2Mapper proEconMainBrownouts2Mapper;
+    public int  updateMainBrownouts2(Date start_time, Double loss_power, Double stop_hours, String id)
+    {
+        int i=0;
+        i=proEconMainBrownouts2Mapper.updateMainBrownouts2( start_time,loss_power, stop_hours, id);
+        return i;
+    }
 }

realtime/generationXK-service/src/main/java/com/gyee/generation/service/auto/impl/ProEconMainBrownoutsServiceImpl.java

@@ -1,11 +1,14 @@
 package com.gyee.generation.service.auto.impl;
 
-import com.gyee.generation.model.auto.ProEconMainBrownouts;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.gyee.generation.mapper.auto.ProEconMainBrownoutsMapper;
+import com.gyee.generation.model.auto.ProEconMainBrownouts;
 import com.gyee.generation.service.auto.IProEconMainBrownoutsService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 
+import javax.annotation.Resource;
+import java.util.Date;
+
 /**
  * <p>
  * 限电事件主表 服务实现类
@@ -17,4 +20,12 @@ import org.springframework.stereotype.Service;
 @Service
 public class ProEconMainBrownoutsServiceImpl extends ServiceImpl<ProEconMainBrownoutsMapper, ProEconMainBrownouts> implements IProEconMainBrownoutsService {
 
+    @Resource
+    private ProEconMainBrownoutsMapper proEconMainBrownoutsMapper;
+    public int  updateMainBrownouts(Date start_time, Double loss_power, Double stop_hours, String id)
+    {
+        int i=0;
+        i=proEconMainBrownoutsMapper.updateMainBrownouts( start_time,loss_power, stop_hours, id);
+        return i;
+    }
 }

realtime/generationXK-service/src/main/java/com/gyee/generation/service/auto/impl/ProEconShutdownEvent2ServiceImpl.java

@@ -1,11 +1,14 @@
 package com.gyee.generation.service.auto.impl;
 
-import com.gyee.generation.model.auto.ProEconShutdownEvent2;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.gyee.generation.mapper.auto.ProEconShutdownEvent2Mapper;
+import com.gyee.generation.model.auto.ProEconShutdownEvent2;
 import com.gyee.generation.service.auto.IProEconShutdownEvent2Service;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 
+import javax.annotation.Resource;
+import java.util.Date;
+
 /**
  * <p>
  * 停机事件2 服务实现类
@@ -17,4 +20,12 @@ import org.springframework.stereotype.Service;
 @Service
 public class ProEconShutdownEvent2ServiceImpl extends ServiceImpl<ProEconShutdownEvent2Mapper, ProEconShutdownEvent2> implements IProEconShutdownEvent2Service {
 
+    @Resource
+    private ProEconShutdownEvent2Mapper proEconShutdownEvent2Mapper;
+    public int  updateShutdownevent2(Date start_time, Double loss_power, Double stop_hours, String id)
+    {
+        int i=0;
+        i=proEconShutdownEvent2Mapper.updateShutdownevent2( start_time,loss_power, stop_hours, id);
+        return i;
+    }
 }

realtime/generationXK-service/src/main/java/com/gyee/generation/service/auto/impl/ProEconShutdownEventServiceImpl.java

@@ -1,11 +1,14 @@
 package com.gyee.generation.service.auto.impl;
 
-import com.gyee.generation.model.auto.ProEconShutdownEvent;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.gyee.generation.mapper.auto.ProEconShutdownEventMapper;
+import com.gyee.generation.model.auto.ProEconShutdownEvent;
 import com.gyee.generation.service.auto.IProEconShutdownEventService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 
+import javax.annotation.Resource;
+import java.util.Date;
+
 /**
  * <p>
  * 停机事件 服务实现类
@@ -17,4 +20,12 @@ import org.springframework.stereotype.Service;
 @Service
 public class ProEconShutdownEventServiceImpl extends ServiceImpl<ProEconShutdownEventMapper, ProEconShutdownEvent> implements IProEconShutdownEventService {
 
+    @Resource
+    private ProEconShutdownEventMapper proEconShutdownEventMapper;
+    public int  updateShutdownevent(Date start_time, Double loss_power,Double stop_hours,String id)
+    {
+        int i=0;
+        i=proEconShutdownEventMapper.updateShutdownevent( start_time,loss_power, stop_hours, id);
+        return i;
+    }
 }

realtime/generationXK-service/src/main/java/com/gyee/generation/service/auto/impl/ProEconWindturbineStatusServiceImpl.java

@@ -6,6 +6,9 @@ import com.gyee.generation.service.auto.IProEconWindturbineStatusService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 
+import javax.annotation.Resource;
+import java.util.Date;
+
 /**
  * <p>
  * 与停机事件关联（限电停机时），数据库中无关联，程序控制 服务实现类
@@ -17,4 +20,13 @@ import org.springframework.stereotype.Service;
 @Service
 public class ProEconWindturbineStatusServiceImpl extends ServiceImpl<ProEconWindturbineStatusMapper, ProEconWindturbineStatus> implements IProEconWindturbineStatusService {
 
+    @Resource
+    private ProEconWindturbineStatusMapper proEconWindturbineStatusMapper;
+
+    public int  updateWindturbineStatus(Date start_time, Double loss_power, Double stop_hours, Long id)
+    {
+        int i=0;
+        i=proEconWindturbineStatusMapper.updateWindturbineStatus( start_time,loss_power, stop_hours, id);
+        return i;
+    }
 }

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

@@ -569,4 +569,442 @@ public class SaticSchedulePgTask {
         }
         XxlJobHelper.log("对风偏差率调度任务处理完成!........");
     }
+
+
+//    /**
+//     * 天镇光电站停机记录
+//     * 每两秒执行一次
+//     */
+//    @XxlJob("shutdown_SXJ_KGDL_TZ_GDC_STA")
+//    public void shutdown_SXJ_KGDL_TZ_GDC_STA()  {
+//
+//        XxlJobHelper.log("天镇光电站停机记录调度程序执行开始!........");
+//
+//        try {
+//            shutdownnewService.execShutdown(new Date(),"SXJ_KGDL_TZ_GDC_STA");
+//
+//        } catch (Exception e) {
+//            e.printStackTrace();
+//        }
+//        XxlJobHelper.log("天镇光电站停机记录调度任务处理完成!........");
+//    }
+//
+//
+//    /**
+//     * 平遥朱坑风电场停机记录
+//     * 每两秒执行一次
+//     */
+//    @XxlJob("shutdown_SXJ_KGDL_ZK_FDC_STA")
+//    public void shutdown_SXJ_KGDL_ZK_FDC_STA()  {
+//
+//        XxlJobHelper.log("平遥朱坑风电场停机记录调度程序执行开始!........");
+//
+//        try {
+//            shutdownnewService.execShutdown(new Date(),"SXJ_KGDL_ZK_FDC_STA");
+//
+//        } catch (Exception e) {
+//            e.printStackTrace();
+//        }
+//        XxlJobHelper.log("平遥朱坑风电场停机记录调度任务处理完成!........");
+//    }
+//
+//
+//    /**
+//     * 山阴荣新光电站停机记录
+//     * 每两秒执行一次
+//     */
+//    @XxlJob("shutdown_SXJ_KGDL_SY_GDC_STA")
+//    public void shutdown_SXJ_KGDL_SY_GDC_STA()  {
+//
+//        XxlJobHelper.log("山阴荣新光电站停机记录调度程序执行开始!........");
+//
+//        try {
+//            shutdownnewService.execShutdown(new Date(),"SXJ_KGDL_SY_GDC_STA");
+//
+//        } catch (Exception e) {
+//            e.printStackTrace();
+//        }
+//        XxlJobHelper.log("山阴荣新光电站停机记录调度任务处理完成!........");
+//    }
+//
+//
+//    /**
+//     * 平鲁高家堰风电场停机记录
+//     * 每两秒执行一次
+//     */
+//    @XxlJob("shutdown_SXJ_KGDL_GJY_FDC_STA")
+//    public void shutdown_SXJ_KGDL_GJY_FDC_STA()  {
+//
+//        XxlJobHelper.log("平鲁高家堰风电场停机记录调度程序执行开始!........");
+//
+//        try {
+//            shutdownnewService.execShutdown(new Date(),"SXJ_KGDL_GJY_FDC_STA");
+//
+//        } catch (Exception e) {
+//            e.printStackTrace();
+//        }
+//        XxlJobHelper.log("平鲁高家堰风电场停机记录调度任务处理完成!........");
+//    }
+//
+//    /**
+//     * 平鲁败虎堡风电场停机记录
+//     * 每两秒执行一次
+//     */
+//    @XxlJob("shutdown_SXJ_KGDL_BHB_FDC_STA")
+//    public void shutdown_SXJ_KGDL_BHB_FDC_STA()  {
+//
+//        XxlJobHelper.log("平鲁败虎堡风电场停机记录调度程序执行开始!........");
+//
+//        try {
+//            shutdownnewService.execShutdown(new Date(),"SXJ_KGDL_BHB_FDC_STA");
+//
+//        } catch (Exception e) {
+//            e.printStackTrace();
+//        }
+//        XxlJobHelper.log("平鲁败虎堡风电场停机记录调度任务处理完成!........");
+//    }
+//
+//    /**
+//     * 平鲁红石峁风电场停机记录
+//     * 每两秒执行一次
+//     */
+//    @XxlJob("shutdown_SXJ_KGDL_HSM_FDC_STA")
+//    public void shutdown_SXJ_KGDL_HSM_FDC_STA()  {
+//
+//        XxlJobHelper.log("平鲁红石峁风电场停机记录调度程序执行开始!........");
+//
+//        try {
+//            shutdownnewService.execShutdown(new Date(),"SXJ_KGDL_HSM_FDC_STA");
+//
+//        } catch (Exception e) {
+//            e.printStackTrace();
+//        }
+//        XxlJobHelper.log("平鲁红石峁风电场停机记录调度任务处理完成!........");
+//    }
+//
+//    /**
+//     * 寿阳羊头崖风电场停机记录
+//     * 每两秒执行一次
+//     */
+//    @XxlJob("shutdown_SXJ_KGDL_YTY_FDC_STA")
+//    public void shutdown_SXJ_KGDL_YTY_FDC_STA()  {
+//
+//        XxlJobHelper.log("寿阳羊头崖风电场停机记录调度程序执行开始!........");
+//
+//        try {
+//            shutdownnewService.execShutdown(new Date(),"SXJ_KGDL_YTY_FDC_STA");
+//
+//        } catch (Exception e) {
+//            e.printStackTrace();
+//        }
+//        XxlJobHelper.log("寿阳羊头崖风电场停机记录调度任务处理完成!........");
+//    }
+//
+//
+//    /**
+//     * 平鲁败虎堡三期风电场停机记录
+//     * 每两秒执行一次
+//     */
+//    @XxlJob("shutdown_SXJ_KGDL_BHB3_FDC_STA")
+//    public void shutdown_SXJ_KGDL_BHB3_FDC_STA()  {
+//
+//        XxlJobHelper.log("平鲁败虎堡三期风电场停机记录调度程序执行开始!........");
+//
+//        try {
+//            shutdownnewService.execShutdown(new Date(),"SXJ_KGDL_BHB3_FDC_STA");
+//
+//        } catch (Exception e) {
+//            e.printStackTrace();
+//        }
+//        XxlJobHelper.log("平鲁败虎堡三期风电场停机记录调度任务处理完成!........");
+//    }
+//
+//    /**
+//     * 繁峙均然光伏电站停机记录
+//     * 每两秒执行一次
+//     */
+//    @XxlJob("shutdown_SXJ_KGDL_JR_GDC_STA")
+//    public void shutdown_SXJ_KGDL_JR_GDC_STA()  {
+//
+//        XxlJobHelper.log("繁峙均然光伏电站停机记录调度程序执行开始!........");
+//
+//        try {
+//            shutdownnewService.execShutdown(new Date(),"SXJ_KGDL_JR_GDC_STA");
+//
+//        } catch (Exception e) {
+//            e.printStackTrace();
+//        }
+//        XxlJobHelper.log("繁峙均然光伏电站停机记录调度任务处理完成!........");
+//    }
+//
+//    /**
+//     * 宁武盘道梁风电场停机记录
+//     * 每两秒执行一次
+//     */
+//    @XxlJob("shutdown_SXJ_KGDL_PDL_FDC_STA")
+//    public void shutdown_SXJ_KGDL_PDL_FDC_STA()  {
+//
+//        XxlJobHelper.log("宁武盘道梁风电场停机记录调度程序执行开始!........");
+//
+//        try {
+//            shutdownnewService.execShutdown(new Date(),"SXJ_KGDL_PDL_FDC_STA");
+//
+//        } catch (Exception e) {
+//            e.printStackTrace();
+//        }
+//        XxlJobHelper.log("宁武盘道梁风电场停机记录调度任务处理完成!........");
+//    }
+//
+//    /**
+//     * 朔城区牛家岭风电场停机记录
+//     * 每两秒执行一次
+//     */
+//    @XxlJob("shutdown_SXJ_KGDL_NJL_FDC_STA")
+//    public void shutdown_SXJ_KGDL_NJL_FDC_STA()  {
+//
+//        XxlJobHelper.log("朔城区牛家岭风电场停机记录调度程序执行开始!........");
+//
+//        try {
+//            shutdownnewService.execShutdown(new Date(),"SXJ_KGDL_NJL_FDC_STA");
+//
+//        } catch (Exception e) {
+//            e.printStackTrace();
+//        }
+//        XxlJobHelper.log("朔城区牛家岭风电场停机记录调度任务处理完成!........");
+//    }
+//
+//
+//    /**
+//     * 寿阳尹灵芝风电场停机记录
+//     * 每两秒执行一次
+//     */
+//    @XxlJob("shutdown_SXJ_KGDL_YLZ_FDC_STA")
+//    public void shutdown_SXJ_KGDL_YLZ_FDC_STA()  {
+//
+//        XxlJobHelper.log("寿阳尹灵芝风电场停机记录调度程序执行开始!........");
+//
+//        try {
+//            shutdownnewService.execShutdown(new Date(),"SXJ_KGDL_YLZ_FDC_STA");
+//
+//        } catch (Exception e) {
+//            e.printStackTrace();
+//        }
+//        XxlJobHelper.log("寿阳尹灵芝风电场停机记录调度任务处理完成!........");
+//    }
+//
+//    /**
+//     * 阳高蔚家堡光伏电站停机记录
+//     * 每两秒执行一次
+//     */
+//    @XxlJob("shutdown_SXJ_KGDL_YG_GDC_STA")
+//    public void shutdown_SXJ_KGDL_YG_GDC_STA()  {
+//
+//        XxlJobHelper.log("阳高蔚家堡光伏电站停机记录调度程序执行开始!........");
+//
+//        try {
+//            shutdownnewService.execShutdown(new Date(),"SXJ_KGDL_YG_GDC_STA");
+//
+//        } catch (Exception e) {
+//            e.printStackTrace();
+//        }
+//        XxlJobHelper.log("阳高蔚家堡光伏电站停机记录调度任务处理完成!........");
+//    }
+//
+//    /**
+//     * 平鲁禹丰风电场停机记录
+//     * 每两秒执行一次
+//     */
+//    @XxlJob("shutdown_SXJ_KGDL_YF_FDC_STA")
+//    public void shutdown_SXJ_KGDL_YF_FDC_STA()  {
+//
+//        XxlJobHelper.log("平鲁禹丰风电场停机记录调度程序执行开始!........");
+//
+//        try {
+//            shutdownnewService.execShutdown(new Date(),"SXJ_KGDL_YF_FDC_STA");
+//
+//        } catch (Exception e) {
+//            e.printStackTrace();
+//        }
+//        XxlJobHelper.log("平鲁禹丰风电场停机记录调度任务处理完成!........");
+//    }
+//
+//    /**
+//     * 寿阳平头镇风电场停机记录
+//     * 每两秒执行一次
+//     */
+//    @XxlJob("shutdown_SXJ_KGDL_PTZ_FDC_STA")
+//    public void shutdown_SXJ_KGDL_PTZ_FDC_STA()  {
+//
+//        XxlJobHelper.log("寿阳平头镇风电场停机记录调度程序执行开始!........");
+//
+//        try {
+//            shutdownnewService.execShutdown(new Date(),"SXJ_KGDL_PTZ_FDC_STA");
+//
+//        } catch (Exception e) {
+//            e.printStackTrace();
+//        }
+//        XxlJobHelper.log("寿阳平头镇风电场停机记录调度任务处理完成!........");
+//    }
+//
+//    /**
+//     * 右玉小五台风电场停机记录
+//     * 每两秒执行一次
+//     */
+//    @XxlJob("shutdown_SXJ_KGDL_XWT_FDC_STA")
+//    public void shutdown_SXJ_KGDL_XWT_FDC_STA()  {
+//
+//        XxlJobHelper.log("右玉小五台风电场停机记录调度程序执行开始!........");
+//
+//        try {
+//            shutdownnewService.execShutdown(new Date(),"SXJ_KGDL_XWT_FDC_STA");
+//
+//        } catch (Exception e) {
+//            e.printStackTrace();
+//        }
+//        XxlJobHelper.log("右玉小五台风电场停机记录调度任务处理完成!........");
+//    }
+//
+//    /**
+//     * 方山孙家山光伏电站停机记录
+//     * 每两秒执行一次
+//     */
+//    @XxlJob("shutdown_SXJ_KGDL_FS_GDC_STA")
+//    public void shutdown_SXJ_KGDL_FS_GDC_STA()  {
+//
+//        XxlJobHelper.log("方山孙家山光伏电站停机记录调度程序执行开始!........");
+//
+//        try {
+//            shutdownnewService.execShutdown(new Date(),"SXJ_KGDL_FS_GDC_STA");
+//
+//        } catch (Exception e) {
+//            e.printStackTrace();
+//        }
+//        XxlJobHelper.log("方山孙家山光伏电站停机记录调度任务处理完成!........");
+//    }
+//
+//    /**
+//     * 右玉丁家窑风电场停机记录
+//     * 每两秒执行一次
+//     */
+//    @XxlJob("shutdown_SXJ_KGDL_DJY_FDC_STA")
+//    public void shutdown_SXJ_KGDL_DJY_FDC_STA()  {
+//
+//        XxlJobHelper.log("右玉丁家窑风电场停机记录调度程序执行开始!........");
+//
+//        try {
+//            shutdownnewService.execShutdown(new Date(),"SXJ_KGDL_DJY_FDC_STA");
+//
+//        } catch (Exception e) {
+//            e.printStackTrace();
+//        }
+//        XxlJobHelper.log("右玉丁家窑风电场停机记录调度任务处理完成!........");
+//    }
+//
+//    /**
+//     * 怀仁初晨光伏电站停机记录
+//     * 每两秒执行一次
+//     */
+//    @XxlJob("shutdown_SXJ_KGDL_HR_GDC_STA")
+//    public void shutdown_SXJ_KGDL_HR_GDC_STA()  {
+//
+//        XxlJobHelper.log("怀仁初晨光伏电站停机记录调度程序执行开始!........");
+//
+//        try {
+//            shutdownnewService.execShutdown(new Date(),"SXJ_KGDL_HR_GDC_STA");
+//
+//        } catch (Exception e) {
+//            e.printStackTrace();
+//        }
+//        XxlJobHelper.log("怀仁初晨光伏电站停机记录调度任务处理完成!........");
+//    }
+//
+//    /**
+//     * 应县晶辉光伏电站停机记录
+//     * 每两秒执行一次
+//     */
+//    @XxlJob("shutdown_SXJ_KGDL_YX_GDC_STA")
+//    public void shutdown_SXJ_KGDL_YX_GDC_STA()  {
+//
+//        XxlJobHelper.log("应县晶辉光伏电站停机记录调度程序执行开始!........");
+//
+//        try {
+//            shutdownnewService.execShutdown(new Date(),"SXJ_KGDL_YX_GDC_STA");
+//
+//        } catch (Exception e) {
+//            e.printStackTrace();
+//        }
+//        XxlJobHelper.log("应县晶辉光伏电站停机记录调度任务处理完成!........");
+//    }
+//
+//    /**
+//     * 右玉右卫光伏电站停机记录
+//     * 每两秒执行一次
+//     */
+//    @XxlJob("shutdown_SXJ_KGDL_YY_GDC_STA")
+//    public void shutdown_SXJ_KGDL_YY_GDC_STA()  {
+//
+//        XxlJobHelper.log("右玉右卫光伏电站停机记录调度程序执行开始!........");
+//
+//        try {
+//            shutdownnewService.execShutdown(new Date(),"SXJ_KGDL_YY_GDC_STA");
+//
+//        } catch (Exception e) {
+//            e.printStackTrace();
+//        }
+//        XxlJobHelper.log("右玉右卫光伏电站停机记录调度任务处理完成!........");
+//    }
+//
+//    /**
+//     * 平鲁阻虎光伏电站停机记录
+//     * 每两秒执行一次
+//     */
+//    @XxlJob("shutdown_SXJ_KGDL_PL_GDC_STA")
+//    public void shutdown_SXJ_KGDL_PL_GDC_STA()  {
+//
+//        XxlJobHelper.log("平鲁阻虎光伏电站停机记录调度程序执行开始!........");
+//
+//        try {
+//            shutdownnewService.execShutdown(new Date(),"SXJ_KGDL_PL_GDC_STA");
+//
+//        } catch (Exception e) {
+//            e.printStackTrace();
+//        }
+//        XxlJobHelper.log("平鲁阻虎光伏电站停机记录调度任务处理完成!........");
+//    }
+//
+//    /**
+//     * 内蒙米粮局风电场停机记录
+//     * 每两秒执行一次
+//     */
+//    @XxlJob("shutdown_NMM_KGDL_MLJ_FDC_STA")
+//    public void shutdown_NMM_KGDL_MLJ_FDC_STA()  {
+//
+//        XxlJobHelper.log("内蒙米粮局风电场停机记录调度程序执行开始!........");
+//
+//        try {
+//            shutdownnewService.execShutdown(new Date(),"NMM_KGDL_MLJ_FDC_STA");
+//
+//        } catch (Exception e) {
+//            e.printStackTrace();
+//        }
+//        XxlJobHelper.log("内蒙米粮局风电场停机记录调度任务处理完成!........");
+//    }
+//
+//    /**
+//     * 屯留吾元光伏电站停机记录
+//     * 每两秒执行一次
+//     */
+//    @XxlJob("shutdown_SXJ_KGDL_TL_GDC_STA")
+//    public void shutdown_SXJ_KGDL_TL_GDC_STA()  {
+//
+//        XxlJobHelper.log("屯留吾元光伏电站停机记录调度程序执行开始!........");
+//
+//        try {
+//            shutdownnewService.execShutdown(new Date(),"SXJ_KGDL_TL_GDC_STA");
+//
+//        } catch (Exception e) {
+//            e.printStackTrace();
+//        }
+//        XxlJobHelper.log("屯留吾元光伏电站停机记录调度任务处理完成!........");
+//    }
 }

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

@@ -117,7 +117,7 @@ db:
 
 #参与计算的场站
 #runWindpowerstation: SXJ_KGDL_GJY_FDC_STA
-runWindpowerstation: 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_STASXJ_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_TL_GDC_STA
+runWindpowerstation: 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_TL_GDC_STA
 #计算状态用ai或者di
 clauStatus:
   ai: GJY03_GC,YLZ01_GC,PTZ02_GC   #配置期次

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

@@ -0,0 +1,25 @@
+### xxl-job admin address list, such as "http://address" or "http://address01,http://address02"
+#xxl.job.admin.addresses=http://localhost:8175/xxl-job-admin
+xxl.job.admin.addresses=http://10.81.3.152:8175/xxl-job-admin
+### xxl-job, access token
+xxl.job.accessToken=
+
+### xxl-job executor appname
+### 场站计算
+xxl.job.executor.appname=generationTarget-job-4
+### 区域公司计算
+#xxl.job.executor.appname=generationRG-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=9205
+#区域端口
+#xxl.job.executor.port=9202
+
+### xxl-job executor log-path
+xxl.job.executor.logpath=/data/nem/computeEngine/logs
+### xxl-job executor log-retention-days
+xxl.job.executor.logretentiondays=30
+

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

@@ -1,6 +1,7 @@
 package com.gyee.generation;
 
-import com.gyee.generation.service.*;
+import com.gyee.generation.service.InputOrOutPutService;
+import com.gyee.generation.service.ShutdownnewService;
 import com.gyee.generation.util.DateUtils;
 import com.gyee.generation.util.SpringUtils;
 import org.springframework.boot.SpringApplication;
@@ -15,7 +16,7 @@ public class HealthTest {
         SpringApplication.run(GenerationMain.class, args);
         InputOrOutPutService inputOrOutPutService= SpringUtils.getBean("inputOrOutPutService");
 
-        inputOrOutPutService.initialInputOrOutputSpeed();
+//        inputOrOutPutService.initialInputOrOutputSpeed();
         Calendar c = Calendar.getInstance();
         Date begin=null;
         Date end=null;
@@ -23,7 +24,7 @@ public class HealthTest {
 //        cacheService.initRedisCache();
 //
 //
-
+//
 //        //
 //        System.out.println("故障转换率记录调度程序执行开始!。。。。。。");
 //        TimelinessRateService timelinessRateService = SpringUtils.getBean("timelinessRateService");
@@ -76,18 +77,18 @@ public class HealthTest {
 //
 //
 //
-//        begin=new Date();
-//        System.out.println("停机记录调度程序执行开始!。。。。。。");
-//        ShutdownnewService shutdownnewService= SpringUtils.getBean("shutdownnewService");
-////       List<ProBasicPowerstation> wpls=new ArrayList<>();
-////
-////        ProBasicPowerstation wp=  CacheContext.wpmap.get("SXJ_KGDL_GJY_FDC_STA");
-////       wpls.add(wp);
-////        List<ProBasicEquipment> wtls=CacheContext.wpwtmap.get("SXJ_KGDL_GJY_FDC_STA");
-//        shutdownnewService.execShutdown(c.getTime());
-//        end=new Date();
-//        System.out.println("执行用时"+ DateUtils.secondsDiff(begin,end) +"秒");
-//        System.out.println("停机记录调度程序执行结束!。。。。。。");
+        begin=new Date();
+        System.out.println("停机记录调度程序执行开始!。。。。。。");
+        ShutdownnewService shutdownnewService= SpringUtils.getBean("shutdownnewService");
+//       List<ProBasicPowerstation> wpls=new ArrayList<>();
+//
+//        ProBasicPowerstation wp=  CacheContext.wpmap.get("SXJ_KGDL_GJY_FDC_STA");
+//       wpls.add(wp);
+//        List<ProBasicEquipment> wtls=CacheContext.wpwtmap.get("SXJ_KGDL_GJY_FDC_STA");
+        shutdownnewService.execShutdown(c.getTime());
+        end=new Date();
+        System.out.println("执行用时"+ DateUtils.secondsDiff(begin,end) +"秒");
+        System.out.println("停机记录调度程序执行结束!。。。。。。");
 //
 //
 //        begin=new Date();
@@ -110,18 +111,18 @@ public class HealthTest {
 //        System.out.println("曲线拟合调度程序执行开始!。。。。。。");
 //        PowerCurveFittingByTimeService powerCurveFittingByTimeService= SpringUtils.getBean("powerCurveFittingByTimeService");
 //
-//        XxlJobHelper.log("日序执行开始!........");
-//        powerCurveFittingByTimeService.cureFittingDay(c.getTime());
-//        XxlJobHelper.log("日处理完成!........");
-//
+////        XxlJobHelper.log("日序执行开始!........");
+////        powerCurveFittingByTimeService.cureFittingDay(c.getTime());
+////        XxlJobHelper.log("日处理完成!........");
+////
 //        XxlJobHelper.log("月序执行开始!........");
-//        powerCurveFittingByTimeService.cureFittingMonth(c.getTime(),"0");
+//        powerCurveFittingByTimeService.cureFittingMonth(c.getTime(),"1");
 //        XxlJobHelper.log("月处理完成!........");
-//
-//        XxlJobHelper.log("年序执行开始!........");
-//        powerCurveFittingByTimeService.cureFittingYear(c.getTime());
-//        XxlJobHelper.log("年处理完成!........");
-//
+////
+////        XxlJobHelper.log("年序执行开始!........");
+////        powerCurveFittingByTimeService.cureFittingYear(c.getTime());
+////        XxlJobHelper.log("年处理完成!........");
+////
 //        end=new Date();
 //        System.out.println("执行用时"+ DateUtils.secondsDiff(begin,end) +"秒");
 //        System.out.println("曲线拟合调度程序执行结束!。。。。。。");
@@ -177,13 +178,13 @@ public class HealthTest {
 //        System.out.println("场站指标记录调度程序执行结束!。。。。。。");
 //
 //
-        begin=new Date();
-        System.out.println("设备指标记录调度程序执行开始!。。。。。。");
-       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");
+//        begin=new Date();
+//        System.out.println("设备指标记录调度程序执行开始!。。。。。。");
+//       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");
 //
@@ -195,16 +196,16 @@ public class HealthTest {
 //
 //        equipmentInfo4Service.calEquipmentInfoDay(c.getTime());
 //
-        equipmentInfo5Service.calEquipmentInfoDay(c.getTime());
+//        equipmentInfo5Service.calEquipmentInfoDay(c.getTime());
 //
 //        equipmentInfoDayTopService.calEquipmentInfoDayTop(c.getTime());
 //        equipmentInfoDayTopService.calEquipmentInfoMonthTop(c.getTime());
 //        equipmentInfoDayTopService.calEquipmentInfoYearTop(c.getTime());
 //
 //        wtAlysisDayService.calEquipmentInfoDay(c.getTime());
-        end=new Date();
-        System.out.println("执行用时"+ DateUtils.secondsDiff(begin,end) +"秒");
-        System.out.println("设备指标记录调度程序执行结束!。。。。。。");
+//        end=new Date();
+//        System.out.println("执行用时"+ DateUtils.secondsDiff(begin,end) +"秒");
+//        System.out.println("设备指标记录调度程序执行结束!。。。。。。");
 //
 //
 //