计算服务修改

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

@@ -1,88 +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-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();
-//     */
-//
+@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/service/EquipmentInfo1Service.java

@@ -86,23 +86,56 @@ public class EquipmentInfo1Service {
 //                    edosUtil,latch)).start();
 //        }
 //        latch.await();
+//
+//        for (Map.Entry<String, List<ProBasicEquipment>> entry : CacheContext.wpwtmap.entrySet()) {
+//
+//
+//            final CountDownLatch latch = new CountDownLatch(entry.getValue().size());
+//            for (ProBasicEquipment wt : entry.getValue()) {
+//                if (!wpls.contains(wt.getWindpowerstationId())) {
+//                    wpls.add(wt.getWindpowerstationId());
+//                }
+//
+//                new Thread(new EquipmentInfo1Thread(executor,  wt,  pep1map,
+//                        recordDate,  end,  begin,dayls,
+//                        edosUtil,latch)).start();
+//
+//            }
+//            latch.await();
+//        }
+        List<ProBasicEquipment> wttemps = new ArrayList<>();
 
-        for (Map.Entry<String, List<ProBasicEquipment>> entry : CacheContext.wpwtmap.entrySet()) {
+        for(ProBasicEquipment wt:CacheContext.wtls) {
 
+            if (!wpls.contains(wt.getWindpowerstationId())) {
+                wpls.add(wt.getWindpowerstationId());
+            }
+            wttemps.add(wt);
+            if (wttemps.size() == 500) {
 
-            final CountDownLatch latch = new CountDownLatch(entry.getValue().size());
-            for (ProBasicEquipment wt : entry.getValue()) {
-                if (!wpls.contains(wt.getWindpowerstationId())) {
-                    wpls.add(wt.getWindpowerstationId());
+                final CountDownLatch latch = new CountDownLatch(500);
+                for (ProBasicEquipment wt1 : wttemps) {
+                    new Thread(new EquipmentInfo1Thread(executor, wt1, pep1map,
+                            recordDate, end, begin, dayls,
+                            edosUtil, latch)).start();
                 }
+                latch.await();
+                wttemps = new ArrayList<>();
+            }
 
-                new Thread(new EquipmentInfo1Thread(executor,  wt,  pep1map,
-                        recordDate,  end,  begin,dayls,
-                        edosUtil,latch)).start();
+        }
 
+        if (!wttemps.isEmpty()) {
+            final CountDownLatch latch = new CountDownLatch(wttemps.size());
+            for (ProBasicEquipment wt1 : wttemps) {
+                new Thread(new EquipmentInfo1Thread(executor, wt1, pep1map,
+                        recordDate, end, begin, dayls,
+                        edosUtil, latch)).start();
             }
             latch.await();
         }
+
+
         c=Calendar.getInstance();
         c.setTime(recordDate);
 

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

@@ -41,9 +41,8 @@ public class EquipmentInfo2Service {
     public void calEquipmentInfoDay(Date recordDate) throws Exception {
         Calendar c = Calendar.getInstance();
         c.setTime(recordDate);
-        if(c.get(Calendar.MINUTE)==0)
-        {
-            c.add(Calendar.DAY_OF_MONTH,-1);
+        if (c.get(Calendar.MINUTE) == 0) {
+            c.add(Calendar.DAY_OF_MONTH, -1);
         }
 
         c.set(Calendar.HOUR_OF_DAY, 23);
@@ -109,25 +108,55 @@ public class EquipmentInfo2Service {
 //                    edosUtil,latch)).start();
 //        }
 //        latch.await();
+//
+//        for (Map.Entry<String, List<ProBasicEquipment>> entry : CacheContext.wpwtmap.entrySet()) {
+//
+//
+//            final CountDownLatch latch = new CountDownLatch(entry.getValue().size());
+//            for (ProBasicEquipment wt : entry.getValue()) {
+//                if (!wpls.contains(wt.getWindpowerstationId())) {
+//                    wpls.add(wt.getWindpowerstationId());
+//                }
+//
+//                new Thread(new EquipmentInfo2Thread(executor,  wt,  pep2map,
+//                    recordDate,  end,  begin,dayls,
+//                    edosUtil,latch)).start();
+//
+//            }
+//            latch.await();
+//        }
+        List<ProBasicEquipment> wttemps = new ArrayList<>();
 
-        for (Map.Entry<String, List<ProBasicEquipment>> entry : CacheContext.wpwtmap.entrySet()) {
-
+        for(ProBasicEquipment wt:CacheContext.wtls) {
 
-            final CountDownLatch latch = new CountDownLatch(entry.getValue().size());
-            for (ProBasicEquipment wt : entry.getValue()) {
-                if (!wpls.contains(wt.getWindpowerstationId())) {
-                    wpls.add(wt.getWindpowerstationId());
+            if (!wpls.contains(wt.getWindpowerstationId())) {
+                wpls.add(wt.getWindpowerstationId());
+            }
+            wttemps.add(wt);
+            if (wttemps.size() == 500) {
+
+                final CountDownLatch latch = new CountDownLatch(500);
+                for (ProBasicEquipment wt1 : wttemps) {
+                    new Thread(new EquipmentInfo2Thread(executor, wt1, pep2map,
+                            recordDate, end, begin, dayls,
+                            edosUtil, latch)).start();
                 }
+                latch.await();
+                wttemps = new ArrayList<>();
+            }
 
-                new Thread(new EquipmentInfo2Thread(executor,  wt,  pep2map,
-                    recordDate,  end,  begin,dayls,
-                    edosUtil,latch)).start();
+        }
 
+        if (!wttemps.isEmpty()) {
+            final CountDownLatch latch = new CountDownLatch(wttemps.size());
+            for (ProBasicEquipment wt1 : wttemps) {
+                new Thread(new EquipmentInfo2Thread(executor, wt1, pep2map,
+                        recordDate, end, begin, dayls,
+                        edosUtil, latch)).start();
             }
             latch.await();
         }
 
-
         c = Calendar.getInstance();
         c.setTime(recordDate);
 

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

@@ -119,21 +119,52 @@ public class EquipmentInfo3Service {
 //                    edosUtil,latch)).start();
 //        }
 //        latch.await();
+//
+//
+//        for (Map.Entry<String, List<ProBasicEquipment>> entry : CacheContext.wpwtmap.entrySet()) {
+//
+//
+//            final CountDownLatch latch = new CountDownLatch(entry.getValue().size());
+//            for (ProBasicEquipment wt : entry.getValue()) {
+//                if (!wpls.contains(wt.getWindpowerstationId())) {
+//                    wpls.add(wt.getWindpowerstationId());
+//                }
+//
+//                new Thread(new EquipmentInfo3Thread(executor,  wt,  pep3map,
+//                        recordDate,  end,  begin,dayls,
+//                        edosUtil,latch)).start();
+//
+//            }
+//            latch.await();
+//        }
+        List<ProBasicEquipment> wttemps = new ArrayList<>();
 
+        for(ProBasicEquipment wt:CacheContext.wtls) {
 
-        for (Map.Entry<String, List<ProBasicEquipment>> entry : CacheContext.wpwtmap.entrySet()) {
-
-
-            final CountDownLatch latch = new CountDownLatch(entry.getValue().size());
-            for (ProBasicEquipment wt : entry.getValue()) {
-                if (!wpls.contains(wt.getWindpowerstationId())) {
-                    wpls.add(wt.getWindpowerstationId());
+            if (!wpls.contains(wt.getWindpowerstationId())) {
+                wpls.add(wt.getWindpowerstationId());
+            }
+            wttemps.add(wt);
+            if (wttemps.size() == 500) {
+
+                final CountDownLatch latch = new CountDownLatch(500);
+                for (ProBasicEquipment wt1 : wttemps) {
+                    new Thread(new EquipmentInfo3Thread(executor, wt1, pep3map,
+                            recordDate, end, begin, dayls,
+                            edosUtil, latch)).start();
                 }
+                latch.await();
+                wttemps = new ArrayList<>();
+            }
 
-                new Thread(new EquipmentInfo3Thread(executor,  wt,  pep3map,
-                        recordDate,  end,  begin,dayls,
-                        edosUtil,latch)).start();
+        }
 
+        if (!wttemps.isEmpty()) {
+            final CountDownLatch latch = new CountDownLatch(wttemps.size());
+            for (ProBasicEquipment wt1 : wttemps) {
+                new Thread(new EquipmentInfo3Thread(executor, wt1, pep3map,
+                        recordDate, end, begin, dayls,
+                        edosUtil, latch)).start();
             }
             latch.await();
         }

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

@@ -1654,11 +1654,11 @@ public class PowerCurveFittingByTimeService {
 
             for(int j=i-10;j<i;j++)
             {
-                //设置时间为10分钟前，10钟前有停机事件数据进行过滤
-                if (ztls.get(j).getPointValueInDouble() == 4) {
-
-                    return false;
-                }
+//                //设置时间为10分钟前，10钟前有停机事件数据进行过滤
+//                if (ztls.get(j).getPointValueInDouble() == 4) {
+//
+//                    return false;
+//                }
                 //设置时间为10分钟后，运行后10分钟数据进行过滤
                 if (ztls.get(j).getPointValueInDouble() != 2) {
 
@@ -1667,6 +1667,22 @@ public class PowerCurveFittingByTimeService {
             }
         }
 
+        int number=i+10;
+
+        if(number>ztls.size())
+        {
+            number=ztls.size();
+        }
+
+        for(int j=i;j<number;j++)
+        {
+
+            //设置时间为10分钟后，运行后10分钟数据进行过滤
+            if (ztls.get(j).getPointValueInDouble() != 2) {
+
+                return false;
+            }
+        }
 
         if (CacheContext.wtmap.containsKey(windturbineId)) {
             String modelid = CacheContext.wtmap.get(windturbineId).getModelId();

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

@@ -39,7 +39,7 @@ public class WindDeviationService {
     public void save(String begin,String end){
 
         Map<String, Map<String, ProBasicEquipmentPoint>> wtpAimap = CacheContext.wtpAimap;
-        List<ProBasicEquipment> wtls = CacheContext.wtls;
+        List<ProBasicEquipment> wtfdls = CacheContext.wtfdls;
         Map<String, Double> modelpower = CacheContext.modelpower;
         List<ProEconEquipmentDeviatSpeed> speedsResultList = new ArrayList<>();
         List<ProEconEquipmentDeviatPower> powersResultList = new ArrayList<>();
@@ -54,7 +54,7 @@ public class WindDeviationService {
             del.lambda().eq(ProEconEquipmentDeviatSpeed::getRecordDate,date);
             proEconEquipmentDeviatSpeedService.remove(del);
 
-            wtls.stream().forEach(wt->{
+            wtfdls.stream().forEach(wt->{
                 if (wt.getEquipmentCategory()==-1){
                     Map<String, ProBasicEquipmentPoint> equipmentPointMap = wtpAimap.get(wt.getId());
 

realtime/generationXK-service/src/main/java/com/gyee/generation/util/realtimesource/math/LineUtil.java

@@ -35,6 +35,8 @@ public class LineUtil {
 
         double[] coefficient = multiLine(arrX, arrY, length, dimension);
 
+        double gl=0.0;
+
         for (double i = arrX[0]; i <= arrX[arrX.length - 1]; i += scale)
         {
             PointVo point = new PointVo();
@@ -49,7 +51,12 @@ public class LineUtil {
                 }else
                 {
                     double temp=coefficient[j] * Math.pow(point.getX(), (double)j);
-                    point.setY(point.getY()+temp);
+
+                    if(temp>0)
+                    {
+                        point.setY(point.getY()+temp);
+                    }
+
                 }
 
             }
@@ -72,6 +79,11 @@ public class LineUtil {
                 max = point.getY();
             }
 
+            if(point.getY()<gl)
+            {
+                point.setY(gl);
+            }
+            gl=point.getY();
             points.add(point);
         }
         builder(points, min, max);