对风偏差接口修改过滤

common/src/main/java/com/gyee/common/contant/ContantXk.java

@@ -181,6 +181,7 @@ public class ContantXk {
     public static final String CJ_WGGL = "AI107";  //风向
     public static final String CJ_DFJD = "AI073";  //对风角度
     public static final String CJ_PHJD = "AI028";  //偏航角度
+    public static final String CJ_JCWZ = "DI1338";  //机舱位置
 
     public static final String TPOINT_WP_AGC = "AGC002";// agc
     public static final String TPOINT_WP_CXGL = "AGC001";// 出线

runeconomy-xk/src/main/java/com/gyee/runeconomy/controller/WindDirection/WindDirectionController.java

@@ -32,7 +32,7 @@ public class WindDirectionController {
     }
 
     /**
-     * 对风偏差分析
+     * 对风偏差分析图
 
      * @return
      */

runeconomy-xk/src/main/java/com/gyee/runeconomy/service/WindDirection/WindALG.java

@@ -3,6 +3,7 @@ package com.gyee.runeconomy.service.WindDirection;
 
 
 import com.gyee.runeconomy.dto.result.PowerPointData;
+import com.gyee.runeconomy.model.auto.ProBasicEquipment;
 import com.gyee.runeconomy.util.DateUtils;
 
 import java.text.DecimalFormat;
@@ -239,12 +240,12 @@ public class WindALG {
      * @param list
      * @return
      */
-    public static int[] fxRadarRoses(List<PowerPointData> list){
+    public static int[] fxRadarRoses(List<PowerPointData> list,List<ProBasicEquipment> collect){
 
         try {
             int[] count = new int[16];
             list.stream().sorted(Comparator.comparing(PowerPointData::getSpeed)).forEach(item -> {
-                int df = windDFAngle(item.getDfwc());
+                int df = windDFAngle(item.getDfwc(),collect);
                 if (count.length > df && count[df] < 1000) {
                     count[df]++;
                 }
@@ -284,23 +285,29 @@ public class WindALG {
 
 
     /**
-     * 对风偏差散点过滤  统计-50 到 50的
+     * 对风偏差分析图散点过滤  统计-50 到 50的
      * 频次
      * @param list
      *
      *
      * @return
      */
-    public static List<Point> windDeviationScatter(List<PowerPointData> list){
+    public static List<Point> windDeviationScatter(List<PowerPointData> list,List<ProBasicEquipment> equipments){
         //正负偏差 [-50,-49,....,0,1,2,.....50]
         List<Point> ls = new ArrayList<>();
         LinkedHashSet<Double> keys = new LinkedHashSet<>();  //散点太多去重
         //次数统计
         for (int i = 0; i < list.size(); i++){
             PowerPointData item = list.get(i);
-            int ele = (int)Math.round((item.getFx() + Math.abs(item.getDfwc())));
+            double dfwc = 0;
+            if (equipments.size()>0) {
+                dfwc = Math.abs(item.getDfwc()) * 57.2958;//对风误差-弧度转角度
+            } else {
+                dfwc = Math.abs(item.getDfwc());
+            }
+            int ele = (int)Math.round((item.getFx() + dfwc));
             int index = ele - 180;
-            if (index >= -50 && index <= 50) {
+            if (index >= -50 && index <= 50 && item.getSpeed() > 0) {
                 double key = Math.abs(index) + item.getSpeed();
                 if (!keys.contains(key))
                     ls.add(new Point(index, item.getSpeed()));
@@ -348,7 +355,8 @@ public class WindALG {
             for (int i = 0; i < list.size(); i++){
                 PowerPointData item = list.get(i);
                 Integer speed = Math.toIntExact(Math.round(item.getSpeed()));
-                int ele = (int) (Math.abs(item.getFx()) + Math.abs(item.getAngle()));
+//                int ele = (int) (Math.abs(item.getFx()) + Math.abs(item.getAngle()));
+                int ele = (int) (Math.abs(item.getFx()) + Math.abs(item.getYp1() - item.getFx()));//此处叶片1为机舱位置
                 int index = ele - 180;
                 if (index >= -30 && index <= 30 && item.getPower() > 0) {
                     avg += index;
@@ -414,11 +422,18 @@ public class WindALG {
      * @param
      * @return
      */
-    private static int windDFAngle(double angle){
+    private static int windDFAngle(double angle,List<ProBasicEquipment> collect){
         int split = 16;  //风向分为8个角度
+        double dfwc =0;
         double interval = (double)360 / split;
         angle = angle > 360 ? 720 - 360 : angle;
-        int index = (int) (Math.abs(angle) / interval);
+        if (collect.size()>0){
+            dfwc = Math.abs(angle) * 57.2958;
+        } else {
+            dfwc = Math.abs(angle);
+        }
+
+        int index = (int) (Math.abs(dfwc) / interval);
         return index;
     }
 

runeconomy-xk/src/main/java/com/gyee/runeconomy/service/WindDirection/WindDirectionService.java

@@ -5,10 +5,13 @@ import com.gyee.runeconomy.dto.result.PowerPointData;
 import com.gyee.runeconomy.init.CacheContext;
 import com.gyee.runeconomy.model.auto.ProBasicEquipment;
 import com.gyee.runeconomy.model.auto.ProBasicEquipmentPoint;
+import com.gyee.runeconomy.model.auto.ProBasicModelPower;
 import com.gyee.runeconomy.service.auto.IProBasicEquipmentPointService;
+import com.gyee.runeconomy.util.DateUtil;
 import com.gyee.runeconomy.util.DateUtils;
 import com.gyee.runeconomy.util.realtimesource.feign.RemoteServiceBuilder;
 import com.gyee.runeconomy.util.realtimesource.feign.TsDoubleData;
+import io.swagger.models.auth.In;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -16,6 +19,7 @@ import java.text.ParseException;
 import java.util.*;
 import java.util.function.Function;
 import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 @Service
 public class WindDirectionService {
@@ -41,6 +45,9 @@ public class WindDirectionService {
         if (list == null || list.size() == 0)
             return null;
 
+        List<ProBasicEquipment> collect = CacheContext.wtls.stream()
+                .filter(w -> wtid.equals(w.getId()) && w.getProjectId().contains("02")).collect(Collectors.toList());
+
         // 初始化设备点
         Map<EquipmentPointType, ProBasicEquipmentPoint> points = Arrays.stream(EquipmentPointType.values())
                 .collect(Collectors.toMap(type -> type, type -> getEquipmentPoint(wtid, type)));
@@ -48,7 +55,7 @@ public class WindDirectionService {
         // 获取历史数据
         Map<EquipmentPointType, List<TsDoubleData>> historyData = points.entrySet().stream()
                 .collect(Collectors.toMap(Map.Entry::getKey,
-                        entry -> getSortedHistory(entry.getValue(), startDate.getTime(), endDate.getTime(), 900)));
+                        entry -> getSortedHistory(entry.getValue(), startDate.getTime(), endDate.getTime(), 600)));
 
         // 创建时间戳到数据的映射表
         Map<Long, TsDoubleData> pjfsMap = historyData.get(EquipmentPointType.PJFS).stream()
@@ -61,6 +68,10 @@ public class WindDirectionService {
                 .collect(Collectors.toMap(TsDoubleData::getTs, Function.identity(), (a, b) -> a));
         Map<Long, TsDoubleData> glMap = historyData.get(EquipmentPointType.GL).stream()
                 .collect(Collectors.toMap(TsDoubleData::getTs, Function.identity(), (a, b) -> a));
+        Map<Long, TsDoubleData> jcwzMap = historyData.get(EquipmentPointType.JCWZ).stream()
+                .collect(Collectors.toMap(TsDoubleData::getTs, Function.identity(), (a, b) -> a));
+        Map<Long, TsDoubleData> ssqfztMap = historyData.get(EquipmentPointType.ssqfzt).stream()
+                .collect(Collectors.toMap(TsDoubleData::getTs, Function.identity(), (a, b) -> a));
 
         // 构造结果数据
         List<PowerPointData> lslist = new ArrayList<>();
@@ -71,29 +82,186 @@ public class WindDirectionService {
             TsDoubleData dfwcData = dfwcMap.get(ts);
             TsDoubleData phjdData = phjdMap.get(ts);
             TsDoubleData glData = glMap.get(ts);
+            TsDoubleData jcwzData = jcwzMap.get(ts);
+            TsDoubleData ssqfztData = ssqfztMap.get(ts);
 
             PowerPointData data = new PowerPointData();
             data.setTime(DateUtils.formatTimestamp(ts));
-            data.setFx(fxData.getDoubleValue());
+            if (fxData.getDoubleValue() < 0) {
+                data.setFx(fxData.getDoubleValue() + 360);
+            } else {
+                data.setFx(fxData.getDoubleValue());
+            }
             data.setSpeed(fsData != null ? fsData.getDoubleValue() : 0);
             data.setMxzt(ztData != null ? (int) ztData.getDoubleValue() : 0);
             data.setDfwc(dfwcData != null ? dfwcData.getDoubleValue() : 0);
             data.setAngle(phjdData != null ? phjdData.getDoubleValue() : 0);
             data.setPower(glData != null ? glData.getDoubleValue() : 0);
+            data.setYp1(jcwzData != null ? jcwzData.getDoubleValue() : 0);//将机舱位置添加到叶片1中，因没有机舱位置
+            data.setQfzt(ssqfztData != null ? (int) ssqfztData.getDoubleValue() : 0);
             lslist.add(data);
         }
 
+
+        /**
+         * 数据预处理
+         *
+         * @param list   预处理的数据
+         * @param map    风速对应的保证功率
+         * @param maxs   最大风速
+         * @param mins   最小风速
+         * @param maxp   最大功率
+         * @param minp   最小功率
+         * @param isfbw  是否并网
+         * @param isfhl  是否合理值
+         * @param isbw   并网后10分钟
+         * @param istj   停机前10分钟
+         * @param isglpc 功率曲线偏差
+         * @param isqfh  是否欠符合
+         * @param qfhdj  欠符合等级
+         * @param xd     是否限电
+         * @return
+         */
+        /* 风速  ->  保证功率  来自数据库 **/
+        List<ProBasicModelPower> modelPowerList = CacheContext.modelPowerDetailNewMap.get(CacheContext.wtmap.get(wtid).getModelId());
+        Map<Double, Double> modelPowerMap = modelPowerList.stream().collect(Collectors.toMap(ProBasicModelPower::getSpeed, ProBasicModelPower::getEnsurePower));
+        String timeBW = DateUtil.format(new Date(0), DateUtil.DATE_TIME_PATTERN);
+        List<PowerPointData> tempei = new ArrayList<>();
+        List<PowerPointData> tempqf = new ArrayList<>();
+
+        Boolean isqfh = true;
+        Integer qfhdj = 2;
+        Boolean isfbw= true;
+        Integer xd = 1;
+        Double mins = 3.0;
+        Double maxs = 25.0;
+        Double minp = 0.0;
+        Double maxp = 0.0;
+        Boolean isfhl =true;
+        Boolean isbw =true;
+        Boolean istj =true;
+        Boolean isglpc =true;
+
+        if(list==null || list.size()==0) System.out.println("预处理数据数量为0。");
+
+        Double maxPower = Collections.max(modelPowerMap.values());//最大保证功率
+        maxp=maxPower*1.05;
+
+        //TODO 数据过滤  // 0正常，1过滤掉
+        for (PowerPointData item : lslist) {
+            int filter = 0;
+            int fjstatus = 0;
+            if (timeBW == DateUtil.format(new Date(0), DateUtil.DATE_TIME_PATTERN)) {
+                timeBW = item.getTime();
+            }
+            // 过滤非并网值  风机状态不等于2
+            if (filter == 0 && isfbw && item.getMxzt() != 2) {
+                filter = 1;
+                fjstatus = 1;
+                timeBW = item.getTime();
+            } else {
+                filter = 0;
+                fjstatus = 0;
+            }
+
+            //过滤限电状态，风机状态等于4或者5
+            if (xd == 1 && filter == 0 && isfbw && (item.getMxzt() == 8 || item.getMxzt() == 9)) {
+                filter = 1;
+                fjstatus = 1;
+                timeBW = item.getTime();
+            }
+            // 按给定风速功率过滤
+            if (item.getSpeed() < mins || item.getSpeed() > maxs || item.getPower() < minp || item.getPower() > maxp) {
+                filter = 1;
+            }
+            // 过滤非合理值 并网状态下功率小于等于0
+            if (filter == 0 && isfhl && item.getSpeed() < 0 && item.getPower() <= minp) {
+                filter = 1;
+            }
+            // 过滤并网后十分钟
+            if (filter == 0 && isbw) {
+                if (DateUtil.getTimeDiff(item.getTime(), timeBW) <= 10)
+                    filter = 1;
+            }
+            // 过滤停机前十分钟
+            if (istj) {
+                if (fjstatus == 0) {
+                    if (tempei.size() > 0) {
+                        if (DateUtil.getTimeDiff(tempei.get(0).getTime(), timeBW) >= 10) {
+                            tempei.remove(0);
+                        }
+                    }
+                    tempei.add(item);
+                } else {
+                    for (PowerPointData temp : tempei) {
+                        temp.setFilter(1);
+                    }
+                    tempei.clear();
+                }
+            }
+            //欠发
+            if (filter == 0 && item.getSpeed() >= 6 && item.getSpeed() < 12.5 && isqfh && qfhdj < item.getQfzt()) {
+                filter = 1;
+                for (PowerPointData temp : tempqf) {
+                    temp.setFilter(1);
+                }
+            } else if (filter == 0 && item.getSpeed() >= 12.5 && isqfh && qfhdj < 1) {
+                filter = 1;
+                for (PowerPointData temp : tempqf) {
+                    temp.setFilter(1);
+                }
+            }
+            if (tempqf.size() > 0) {
+                if (DateUtil.getTimeDiff(tempqf.get(0).getTime(), item.getTime()) >= 5) {
+                    tempqf.remove(0);
+                }
+            }
+            tempqf.add(0, item);
+            item.setFilter(filter);
+
+            //功率曲线偏差
+            if (isglpc) {
+                if (modelPowerMap.containsKey(item.getSpeed())) {
+
+                    double power = modelPowerMap.get(item.getSpeed());  //不同风速对应的保证功率
+                    double k = item.getPower() / power;  //保证功率/实际功率   k:偏差百分比
+                    if (item.getPower() > 0) {
+                        if (k < 0.95 && maxPower <= power) {
+                            item.setFilter(1);
+                        }
+                        if (k < 0.9 && maxPower > power) {
+                            item.setFilter(1);
+                        }
+                        if (k < 0.85 && item.getSpeed() < 6 && item.getSpeed() > 4) {
+                            item.setFilter(1);
+                        }
+
+                        if (k < 0.9 && item.getSpeed() <= 4 && item.getSpeed() > 3.5) {
+                            item.setFilter(1);
+                        }
+                    }
+                }
+            }
+        }
+
+
+        List<PowerPointData> filterls = new ArrayList<>();
+        for (PowerPointData ls : lslist){
+            if (ls.getFilter() != 1) {
+                filterls.add(ls);
+            }
+        }
         List<Object> result = new ArrayList<>();
 
         for (ProBasicEquipment obj : list) {
             Map<String, Object> map = new HashMap<>();
             map.put("wt", obj.getAname());
-            map.put("ys", WindALG.fxNewRoses(lslist));//风速、风向
-            map.put("speeedtime", WindALG.speedtimeNewRoses(lslist));//风速
-            map.put("roses", WindALG.fxysNewRoses(lslist));//风速、风向
-            map.put("count", WindALG.fxNewCountRoses(lslist));//风速、风向
-            map.put("radar", WindALG.fxRadarRoses(lslist));//对风误差
-            map.put("frequency", WindALG.windDeviationPoint(lslist)); //风速、风向、明细状态、功率、偏航角度
+            map.put("ys", WindALG.fxNewRoses(filterls));//风速、风向
+            map.put("speeedtime", WindALG.speedtimeNewRoses(filterls));//风速
+            map.put("roses", WindALG.fxysNewRoses(filterls));//风速、风向
+            map.put("count", WindALG.fxNewCountRoses(filterls));//风速、风向
+            map.put("radar", WindALG.fxRadarRoses(filterls,collect));//对风误差
+            map.put("frequency", WindALG.windDeviationPoint(filterls)); //风速、风向、明细状态、功率、偏航角度
             result.add(map);
         }
 
@@ -112,6 +280,10 @@ public class WindDirectionService {
         Date endDate = sjcl[1];
 
         List<Object> list = new ArrayList<>();
+
+        List<ProBasicEquipment> equipments = CacheContext.wtls.stream()
+                .filter(w -> wtid.equals(w.getId()) && w.getProjectId().contains("02"))
+                .collect(Collectors.toList());
         // 初始化设备点
         Map<EquipmentPointType, ProBasicEquipmentPoint> points = Arrays.stream(EquipmentPointType.values())
                 .collect(Collectors.toMap(type -> type, type -> getEquipmentPoint(wtid, type)));
@@ -119,34 +291,208 @@ public class WindDirectionService {
         // 获取历史数据
         Map<EquipmentPointType, List<TsDoubleData>> historyData = points.entrySet().stream()
                 .collect(Collectors.toMap(Map.Entry::getKey,
-                        entry -> getSortedHistory(entry.getValue(), startDate.getTime(), endDate.getTime(), 900)));
+                        entry -> getSortedHistory(entry.getValue(), startDate.getTime(), endDate.getTime(), 600)));
 
         // 创建时间戳到数据的映射表
         Map<Long, TsDoubleData> pjfsMap = historyData.get(EquipmentPointType.PJFS).stream()
                 .collect(Collectors.toMap(TsDoubleData::getTs, Function.identity(), (a, b) -> a));
+        Map<Long, TsDoubleData> sbztMap = historyData.get(EquipmentPointType.SBZT).stream()
+                .collect(Collectors.toMap(TsDoubleData::getTs, Function.identity(), (a, b) -> a));
         Map<Long, TsDoubleData> dfwcMap = historyData.get(EquipmentPointType.DFWC).stream()
                 .collect(Collectors.toMap(TsDoubleData::getTs, Function.identity(), (a, b) -> a));
+        Map<Long, TsDoubleData> phjdMap = historyData.get(EquipmentPointType.PHJD).stream()
+                .collect(Collectors.toMap(TsDoubleData::getTs, Function.identity(), (a, b) -> a));
+        Map<Long, TsDoubleData> glMap = historyData.get(EquipmentPointType.GL).stream()
+                .collect(Collectors.toMap(TsDoubleData::getTs, Function.identity(), (a, b) -> a));
+        Map<Long, TsDoubleData> jcwzMap = historyData.get(EquipmentPointType.JCWZ).stream()
+                .collect(Collectors.toMap(TsDoubleData::getTs, Function.identity(), (a, b) -> a));
+        Map<Long, TsDoubleData> ssqfztMap = historyData.get(EquipmentPointType.ssqfzt).stream()
+                .collect(Collectors.toMap(TsDoubleData::getTs, Function.identity(), (a, b) -> a));
 
         // 构造结果数据
         List<PowerPointData> lslist = new ArrayList<>();
         for (TsDoubleData fxData : historyData.get(EquipmentPointType.PJFX)) {
             long ts = fxData.getTs();
             TsDoubleData fsData = pjfsMap.get(ts);
+            TsDoubleData ztData = sbztMap.get(ts);
             TsDoubleData dfwcData = dfwcMap.get(ts);
+            TsDoubleData phjdData = phjdMap.get(ts);
+            TsDoubleData glData = glMap.get(ts);
+            TsDoubleData jcwzData = jcwzMap.get(ts);
+            TsDoubleData ssqfztData = ssqfztMap.get(ts);
 
             PowerPointData data = new PowerPointData();
             data.setTime(DateUtils.formatTimestamp(ts));
-            data.setFx(fxData.getDoubleValue());
+            if (fxData.getDoubleValue() < 0) {
+                data.setFx(fxData.getDoubleValue() + 360);
+            } else {
+                data.setFx(fxData.getDoubleValue());
+            }
             data.setSpeed(fsData != null ? fsData.getDoubleValue() : 0);
+            data.setMxzt(ztData != null ? (int) ztData.getDoubleValue() : 0);
             data.setDfwc(dfwcData != null ? dfwcData.getDoubleValue() : 0);
+            data.setAngle(phjdData != null ? phjdData.getDoubleValue() : 0);
+            data.setPower(glData != null ? glData.getDoubleValue() : 0);
+            data.setYp1(jcwzData != null ? jcwzData.getDoubleValue() : 0);//将机舱位置添加到叶片1中，因没有机舱位置
+            data.setQfzt(ssqfztData != null ? (int) ssqfztData.getDoubleValue() : 0);
             lslist.add(data);
         }
 
+
+        /**
+         * 数据预处理
+         *
+         * @param list   预处理的数据
+         * @param map    风速对应的保证功率
+         * @param maxs   最大风速
+         * @param mins   最小风速
+         * @param maxp   最大功率
+         * @param minp   最小功率
+         * @param isfbw  是否并网
+         * @param isfhl  是否合理值
+         * @param isbw   并网后10分钟
+         * @param istj   停机前10分钟
+         * @param isglpc 功率曲线偏差
+         * @param isqfh  是否欠符合
+         * @param qfhdj  欠符合等级
+         * @param xd     是否限电
+         * @return
+         */
+        /* 风速  ->  保证功率  来自数据库 **/
+        List<ProBasicModelPower> modelPowerList = CacheContext.modelPowerDetailNewMap.get(CacheContext.wtmap.get(wtid).getModelId());
+        Map<Double, Double> modelPowerMap = modelPowerList.stream().collect(Collectors.toMap(ProBasicModelPower::getSpeed, ProBasicModelPower::getEnsurePower));
+        String timeBW = DateUtil.format(new Date(0), DateUtil.DATE_TIME_PATTERN);
+        List<PowerPointData> tempei = new ArrayList<>();
+        List<PowerPointData> tempqf = new ArrayList<>();
+
+        Boolean isqfh = true;
+        Integer qfhdj = 2;
+        Boolean isfbw= true;
+        Integer xd = 1;
+        Double mins = 3.0;
+        Double maxs = 25.0;
+        Double minp = 0.0;
+        Double maxp = 0.0;
+        Boolean isfhl =true;
+        Boolean isbw =true;
+        Boolean istj =true;
+        Boolean isglpc =true;
+
+        if(list==null || list.size()==0) System.out.println("预处理数据数量为0。");
+
+        Double maxPower = Collections.max(modelPowerMap.values());//最大保证功率
+        maxp=maxPower*1.05;
+
+        //TODO 数据过滤  // 0正常，1过滤掉
+        for (PowerPointData item : lslist) {
+            int filter = 0;
+            int fjstatus = 0;
+            if (timeBW == DateUtil.format(new Date(0), DateUtil.DATE_TIME_PATTERN)) {
+                timeBW = item.getTime();
+            }
+            // 过滤非并网值  风机状态不等于2
+            if (filter == 0 && isfbw && item.getMxzt() != 2) {
+                filter = 1;
+                fjstatus = 1;
+                timeBW = item.getTime();
+            } else {
+                filter = 0;
+                fjstatus = 0;
+            }
+
+            //过滤限电状态，风机状态等于4或者5
+            if (xd == 1 && filter == 0 && isfbw && (item.getMxzt() == 8 || item.getMxzt() == 9)) {
+                filter = 1;
+                fjstatus = 1;
+                timeBW = item.getTime();
+            }
+            // 按给定风速功率过滤
+            if (item.getSpeed() < mins || item.getSpeed() > maxs || item.getPower() < minp || item.getPower() > maxp) {
+                filter = 1;
+            }
+            // 过滤非合理值 并网状态下功率小于等于0
+            if (filter == 0 && isfhl && item.getSpeed() < 0 && item.getPower() <= minp) {
+                filter = 1;
+            }
+            // 过滤并网后十分钟
+            if (filter == 0 && isbw) {
+                if (DateUtil.getTimeDiff(item.getTime(), timeBW) <= 10)
+                    filter = 1;
+            }
+            // 过滤停机前十分钟
+            if (istj) {
+                if (fjstatus == 0) {
+                    if (tempei.size() > 0) {
+                        if (DateUtil.getTimeDiff(tempei.get(0).getTime(), timeBW) >= 10) {
+                            tempei.remove(0);
+                        }
+                    }
+                    tempei.add(item);
+                } else {
+                    for (PowerPointData temp : tempei) {
+                        temp.setFilter(1);
+                    }
+                    tempei.clear();
+                }
+            }
+            //欠发
+            if (filter == 0 && item.getSpeed() >= 6 && item.getSpeed() < 12.5 && isqfh && qfhdj < item.getQfzt()) {
+                filter = 1;
+                for (PowerPointData temp : tempqf) {
+                    temp.setFilter(1);
+                }
+            } else if (filter == 0 && item.getSpeed() >= 12.5 && isqfh && qfhdj < 1) {
+                filter = 1;
+                for (PowerPointData temp : tempqf) {
+                    temp.setFilter(1);
+                }
+            }
+            if (tempqf.size() > 0) {
+                if (DateUtil.getTimeDiff(tempqf.get(0).getTime(), item.getTime()) >= 5) {
+                    tempqf.remove(0);
+                }
+            }
+            tempqf.add(0, item);
+            item.setFilter(filter);
+
+            //功率曲线偏差
+            if (isglpc) {
+                if (modelPowerMap.containsKey(item.getSpeed())) {
+
+                    double power = modelPowerMap.get(item.getSpeed());  //不同风速对应的保证功率
+                    double k = item.getPower() / power;  //保证功率/实际功率   k:偏差百分比
+                    if (item.getPower() > 0) {
+                        if (k < 0.95 && maxPower <= power) {
+                            item.setFilter(1);
+                        }
+                        if (k < 0.9 && maxPower > power) {
+                            item.setFilter(1);
+                        }
+                        if (k < 0.85 && item.getSpeed() < 6 && item.getSpeed() > 4) {
+                            item.setFilter(1);
+                        }
+
+                        if (k < 0.9 && item.getSpeed() <= 4 && item.getSpeed() > 3.5) {
+                            item.setFilter(1);
+                        }
+                    }
+                }
+            }
+        }
+
+
+        List<PowerPointData> filterls = new ArrayList<>();
+        for (PowerPointData ls : lslist){
+            if (ls.getFilter() != 1) {
+                filterls.add(ls);
+            }
+        }
+
         List<ProBasicEquipment> listObj = CacheContext.wtls.stream().filter(wt -> wtid.equals(wt.getId())).collect(Collectors.toList());
 
             listObj.forEach(obj -> {
-                int[] count = WindALG.windDeviationRatio(lslist);//风向、对风误差
-                List<Point> scatter = WindALG.windDeviationScatter(lslist);//风速、风向、对风误差
+                int[] count = WindALG.windDeviationRatio(filterls);//风向、对风误差
+                List<Point> scatter = WindALG.windDeviationScatter(filterls,equipments);//风速、风向、对风误差
                 Map<String, Object> map = new HashMap<>();
                 map.put("wtId", obj.getAname());
                 map.put("count", count);
@@ -178,7 +524,9 @@ public class WindDirectionService {
         SBZT(ContantXk.MXZT),
         DFWC(ContantXk.CJ_DFJD),
         GL(ContantXk.CJ_SSGL),
-        PHJD(ContantXk.CJ_PHJD);
+        PHJD(ContantXk.CJ_PHJD),
+        JCWZ(ContantXk.CJ_JCWZ),
+        ssqfzt(ContantXk.SSQFZT);
 
         private final String code;
 

runeconomy-xk/src/main/java/com/gyee/runeconomy/service/auto/impl/NewDataFittingService.java

@@ -319,7 +319,7 @@ public class NewDataFittingService {
                 PowerPointData pd = new PowerPointData(split, true);
                 if (pd.getSpeed() < 0 || pd.getPower() < 0)
                     continue;
-                pd.setWtId(pf.getWindturbineId());
+                pd.setWtId(pf.getCode());
                 if (0 == pd.getFilter())
                     yyd.add(pd);   //没有过滤
                 if (1 == pd.getFilter())

runeconomy-xk/src/main/java/com/gyee/runeconomy/util/DateUtil.java

@@ -0,0 +1,685 @@
+package com.gyee.runeconomy.util;
+
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.time.DateFormatUtils;
+
+import java.lang.management.ManagementFactory;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.time.Instant;
+import java.time.LocalDateTime;
+import java.time.ZoneId;
+import java.time.format.DateTimeFormatter;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.TimeZone;
+
+@Slf4j
+public class DateUtil {
+
+    /**
+     * 获取当前时间
+     *
+     * @return
+     */
+    public static String getCurrentDate() {
+        SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss");
+        String date = df.format(new Date());
+        return date;
+    }
+    /**
+     * 获取当前时间日
+     *
+     * @return
+     */
+    public static String getCurrentDate1() {
+        SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd");
+        String date = df.format(new Date());
+        return date;
+    }
+
+    // 自定义方法，将时间字符串转换为毫秒
+    public static long getTimeInMillis(String timeStr) throws Exception {
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm"); // 根据你的时间格式调整
+        Date date = sdf.parse(timeStr); // 解析时间字符串
+        return date.getTime(); // 返回毫秒值
+    }
+    /**
+     * 获取前 N 小时的时间
+     *
+     * @param hour
+     * @return
+     */
+    public static String getPreviousDate(int hour) {
+        Calendar calendar = Calendar.getInstance();
+        calendar.set(Calendar.HOUR_OF_DAY, calendar.get(Calendar.HOUR_OF_DAY) - hour);
+        SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        String date = df.format(calendar.getTime());
+        return date;
+    }
+
+    /**
+     * 获取当前时间后 N 小时的时间
+     *
+     * @param hour
+     * @return
+     */
+    public static String getNextDate(int hour) {
+        Calendar calendar = Calendar.getInstance();
+        calendar.set(Calendar.HOUR_OF_DAY, calendar.get(Calendar.HOUR_OF_DAY) + hour);
+        SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        String date = df.format(calendar.getTime());
+        return date;
+    }
+
+    /**
+     * 获取当前时间后 N 小时的时间
+     *
+     * @param hour
+     * @return
+     */
+    public static Long getNextDateTimestamp(int hour) {
+        Calendar calendar = Calendar.getInstance();
+        calendar.set(Calendar.HOUR_OF_DAY, calendar.get(Calendar.HOUR_OF_DAY) + hour);
+        long time = calendar.getTime().getTime();
+        return time;
+    }
+
+
+    /**
+     * 字符串时间转时间戳
+     * @param time
+     * @return
+     */
+    public static Long covertDateTimestamp(String time){
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        long stamp = 0;
+        try {
+            stamp = sdf.parse(time).getTime();
+        } catch (ParseException e) {
+            e.printStackTrace();
+        }
+
+        return stamp;
+    }
+
+    /**
+     * 时间格式(yyyy-MM-dd)
+     */
+    public final static String DATE_PATTERN = "yyyy-MM-dd";
+
+    /**
+     * 时间格式(yyyy-MM)
+     */
+    public final static String DATE_PATTERN_MONTH = "yyyy-MM";
+    /**
+     * 时间格式(yyyy-MM-dd HH:mm:ss)
+     */
+    public final static String DATE_TIME_PATTERN = "yyyy-MM-dd HH:mm:ss";
+
+    public static String format(Date date) {
+        return format(date, DATE_PATTERN);
+    }
+
+    public static String formatMonth(Date date) {
+        return format(date, DATE_PATTERN_MONTH);
+    }
+
+    public static String formatDateTime(Date date) {
+        return format(date, DATE_TIME_PATTERN);
+    }
+    /**
+     * 时间转换
+     *
+     * @param date
+     * @param pattern
+     * @return
+     */
+    public static String format(Date date, String pattern) {
+        if (date != null) {
+            SimpleDateFormat df = new SimpleDateFormat(pattern);
+            return df.format(date);
+        }
+        return null;
+    }
+
+    /**
+     * 字符串格式化
+     * @param time
+     * @param pattern
+     * @return
+     */
+    public static String format(String time,String pattern) {
+        SimpleDateFormat sdf = new SimpleDateFormat(pattern);
+        Date dateTime = null;
+        try {
+            dateTime = sdf.parse(time);
+        } catch (ParseException e) {
+            e.printStackTrace();
+
+        }
+        return format(dateTime, pattern);
+    }
+
+    /**
+     * 时间转换
+     *
+     * @param time
+     * @param pattern
+     * @return
+     */
+    public static String format(Long time, String pattern) {
+        SimpleDateFormat sdf = new SimpleDateFormat(pattern);
+        Date date = new Date(time);
+        String format = sdf.format(date);
+        return format;
+    }
+
+
+    public static String YYYY = "yyyy";
+
+    public static String YYYY_MM = "yyyy-MM";
+
+    public static String YYYY_MM_DD_CHN = "yyyy年MM月dd日";
+
+    public static String YYYY_MM_DD = "yyyy-MM-dd";
+
+    public static String YYYYMMDDHHMMSS = "yyyyMMddHHmmss";
+
+    public static String YYYY_MM_DD_HH_MM_SS = "yyyy-MM-dd HH:mm:ss";
+
+    private static String[] parsePatterns = {
+            "yyyy-MM-dd", "yyyy-MM-dd HH:mm:ss", "yyyy-MM-dd HH:mm", "yyyy-MM",
+            "yyyy/MM/dd", "yyyy/MM/dd HH:mm:ss", "yyyy/MM/dd HH:mm", "yyyy/MM",
+            "yyyy.MM.dd", "yyyy.MM.dd HH:mm:ss", "yyyy.MM.dd HH:mm", "yyyy.MM"};
+
+    /**
+     * 获取当前Date型日期
+     *
+     * @return Date() 当前日期
+     */
+    public static Date getNowDate() {
+        return new Date();
+    }
+
+    /**
+     * 获取当前日期, 默认格式为yyyy-MM-dd
+     *
+     * @return String
+     */
+    public static String getDate() {
+        return dateTimeNow(YYYY_MM_DD);
+    }
+
+    public static final String getTimeDiff() {
+        return dateTimeNow(YYYY_MM_DD_HH_MM_SS);
+    }
+
+    public static final String dateTimeNow() {
+        return dateTimeNow(YYYYMMDDHHMMSS);
+    }
+
+    public static final String dateTimeNow(final String format) {
+        return parseDateToStr(format, new Date());
+    }
+
+    public static final String dateTime(final Date date) {
+        return parseDateToStr(YYYY_MM_DD, date);
+    }
+
+    public static final String parseDateToStr(final String format, final Date date) {
+        return new SimpleDateFormat(format).format(date);
+    }
+
+    public static final Date dateTime(final String format, final String ts) {
+        try {
+            return new SimpleDateFormat(format).parse(ts);
+        } catch (ParseException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    /**
+     * 获取0点0分0秒值
+     * @param date
+     * @return
+     */
+    public static final Date dateZeroFormat(Date date){
+        Calendar cal = Calendar.getInstance();
+        cal.setTime(date);
+        cal.set(cal.get(Calendar.YEAR), cal.get(Calendar.MONTH), cal.get(Calendar.DAY_OF_MONTH),
+                0, 0, 0);
+        Date time = cal.getTime();
+        return time;
+    }
+
+    /**
+     * 日期路径 即年/月/日 如2018/08/08
+     */
+    public static final String datePath() {
+        Date now = new Date();
+        return DateFormatUtils.format(now, "yyyy/MM/dd");
+    }
+
+    /**
+     * 日期路径 即年/月/日 如20180808
+     */
+    public static final String dateTime() {
+        Date now = new Date();
+        return DateFormatUtils.format(now, "yyyyMMdd");
+    }
+
+    /**
+     * 日期型字符串转化为日期 格式
+     */
+    public static Date parseDate(String s, Object str) {
+        if (str == null) {
+            return null;
+        }
+        try {
+            return parseDate(str.toString(), parsePatterns);
+        } catch (Exception e) {
+            return null;
+        }
+    }
+
+    /**
+     * 获取服务器启动时间
+     */
+    public static Date getServerStartDate() {
+        long time = ManagementFactory.getRuntimeMXBean().getStartTime();
+        return new Date(time);
+    }
+
+    /**
+     * 计算两个时间差
+     */
+    public static String getDatePoor(Date endDate, Date nowDate) {
+        long nd = 1000 * 24 * 60 * 60;
+        long nh = 1000 * 60 * 60;
+        long nm = 1000 * 60;
+        // long ns = 1000;
+        // 获得两个时间的毫秒时间差异
+        long diff = endDate.getTime() - nowDate.getTime();
+        // 计算差多少天
+        long day = diff / nd;
+        // 计算差多少小时
+        long hour = diff % nd / nh;
+        // 计算差多少分钟
+        long min = diff % nd % nh / nm;
+        // 计算差多少秒//输出结果
+        // long sec = diff % nd % nh % nm / ns;
+        return day + "天" + hour + "小时" + min + "分钟";
+    }
+
+    /**
+     * 将时间的时分秒毫秒字段去掉
+     *
+     * @param date
+     * @return
+     */
+    public static Date truncate(Date date) {
+        Calendar cal = Calendar.getInstance();
+        cal.setTime(date);
+        cal.set(Calendar.HOUR_OF_DAY, 0);
+        cal.set(Calendar.MINUTE, 0);
+        cal.set(Calendar.SECOND, 0);
+        cal.set(Calendar.MILLISECOND, 0);
+        return cal.getTime();
+    }
+    public static Date[] sjcl (String kssj,String jssj) throws ParseException {
+
+        // 时间格式，格式是 "yyyy-MM-dd HH:mm"
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+
+        // 将字符串转换为 Date 对象
+        Date kssjDate = sdf.parse(kssj);
+        Date jssjDate = sdf.parse(jssj);
+
+        // 创建 Calendar 对象
+        Calendar kssjCalendar = Calendar.getInstance();
+        Calendar jssjCalendar = Calendar.getInstance();
+
+        // 将 Date 设置到 Calendar 对象中
+        kssjCalendar.setTime(kssjDate);
+        jssjCalendar.setTime(jssjDate);
+
+        // 设置 endDate 为当天的 23:59:59
+        jssjCalendar.set(Calendar.HOUR_OF_DAY, 23);
+        jssjCalendar.set(Calendar.MINUTE, 59);
+        jssjCalendar.set(Calendar.SECOND, 59);
+        jssjCalendar.set(Calendar.MILLISECOND, 999);
+
+        // 获取 startDate 和 endDate
+        Date startDate = kssjCalendar.getTime();
+        Date endDate = jssjCalendar.getTime();
+        return new Date[] {startDate, endDate};
+    }
+
+    // 工具方法：格式化时间戳
+    public static String formatTimestamp(long timestamp) {
+        LocalDateTime dateTime = LocalDateTime.ofInstant(Instant.ofEpochMilli(timestamp), ZoneId.systemDefault());
+        return dateTime.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
+    }
+    /**
+     * 计算两个时间之间差的天数(取整后)
+     *
+     * @param d1
+     * @param d2
+     * @return
+     */
+    public static int daysDiff(Date d1, Date d2) {
+        return (int) Math.floor(Math.abs((d1.getTime() - d2.getTime())) / (60 * 60 * 24 * 1000));
+    }
+
+    /**
+     * 将字符串日期转换成日期类型
+     *
+     * @param time
+     * @return
+     */
+    public static Date parseStrtoDate(String time) {
+
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+        Date dateTime = null;
+        try {
+            dateTime = sdf.parse(time);
+        } catch (ParseException e) {
+            e.printStackTrace();
+
+        }
+        return dateTime;
+    }
+
+    public static Date parseStrtoDate(String time,String pattern) {
+
+        SimpleDateFormat sdf = new SimpleDateFormat(pattern);
+        Date dateTime = null;
+        try {
+            dateTime = sdf.parse(time);
+        } catch (ParseException e) {
+            e.printStackTrace();
+
+        }
+        return dateTime;
+    }
+
+    public static Date str2DateTime(String time,String pattern) {
+
+        SimpleDateFormat sdf = new SimpleDateFormat(pattern);
+        Date dateTime = null;
+        try {
+            dateTime = sdf.parse(time);
+        } catch (ParseException e) {
+            e.printStackTrace();
+
+        }
+        return dateTime;
+    }
+    public static Date str2DateTime(String time) {
+        return str2DateTime(time,DATE_TIME_PATTERN);
+    }
+
+    /**
+     * 加减年份
+     */
+    public static Date dateTimeAddYear(Date date,int k) {
+        Calendar instance = Calendar.getInstance();
+        instance.setTime(date);
+        instance.add(Calendar.YEAR,k);
+        return instance.getTime();
+    }
+
+    public static String datetime2Str(Date time,String pattern) {
+        SimpleDateFormat sdf = new SimpleDateFormat(pattern);
+        return sdf.format(time);
+    }
+    public static String datetime2Str(Date time) {
+        return datetime2Str(time,DATE_TIME_PATTERN);
+    }
+
+    public static double hoursDiff1(Date d1, Date d2) {
+        return Math.floor(Math.abs((d1.getTime() - d2.getTime())) / (double) (60 * 60 * 1000));
+    }
+
+    public static double hoursDiff2(Date d1, Date d2) {
+        return Math.abs((d1.getTime() - d2.getTime())) / (double) (60 * 60 * 1000);
+    }
+
+    /**
+     * 计算两个时间之间差的分钟数(取整后)
+     *
+     * @param d1
+     * @param d2
+     * @return
+     */
+    public static int minutesDiff(Date d1, Date d2) {
+        return (int) Math.floor(Math.abs((d1.getTime() - d2.getTime())) / (60 * 1000));
+    }
+
+    /**
+     * 计算两个时间之间差的分钟数(取整后)
+     *
+     * @param d1
+     * @param d2
+     * @return
+     */
+    public static double minutesDiff2(Date d1, Date d2) {
+        return Math.floor(Math.abs((d1.getTime() - d2.getTime())) / (60 * 1000));
+    }
+
+    /**
+     * 获取系统时间
+     *
+     * @return
+     */
+    public static Date now() {
+        return new Date();
+    }
+
+    /**
+     * 获取当前月的第一天
+     *
+     * @return
+     */
+    public static String getCurrtenFirstDay() {
+
+        Calendar c = Calendar.getInstance();
+        // c.add(Calendar.MONTH, 0);
+        c.set(Calendar.DAY_OF_MONTH, 1);
+        return new SimpleDateFormat("yyyy-MM-dd").format(c.getTime());
+    }
+
+    /**
+     * 获取当前月的最后一天
+     *
+     * @return
+     */
+    public static String getCurrtenLastDay() {
+
+        Calendar ca = Calendar.getInstance();
+        ca.set(Calendar.DAY_OF_MONTH, ca.getActualMaximum(Calendar.DAY_OF_MONTH));
+        return new SimpleDateFormat("yyyy-MM-dd").format(ca.getTime());
+    }
+    /**
+     * 计算两个时间之间差的小时数(取整后)
+     *
+     * @param d1
+     * @param d2
+     * @return
+     */
+    public static int hoursDiff(Date d1, Date d2) {
+        return (int) Math.floor(Math.abs((d1.getTime() - d2.getTime())) / (60 * 60 * 1000));
+    }
+
+    /**
+     * 获取当前整点数
+     *
+     * @return
+     */
+    public static Date getCurrHourTime(Date date) {
+        Calendar ca = Calendar.getInstance();
+        int minute = ca.get(Calendar.MINUTE);
+        if (minute < 30) {
+            ca.set(Calendar.MINUTE, 30);
+        } else {
+            ca.add(Calendar.HOUR, 1);
+            ca.set(Calendar.MINUTE, 0);
+        }
+
+        ca.set(Calendar.SECOND, 5);
+        date = ca.getTime();
+
+        return date;
+    }
+
+    //普通时间转为UTC
+    public static String localToUTC(String localTimeStr) {
+        try {
+            Date localDate = getLocalSDF().parse(localTimeStr);
+            return getUTCSDF().format(localDate);
+        } catch (ParseException e) {
+            e.printStackTrace();
+        }
+        return null;
+    }
+    //UTC转为普通时间
+    public static String utcToLocal(String utcTimeStr) {
+        try {
+            Date date = getUTCSDF().parse(utcTimeStr);
+            return getLocalSDF().format(date);
+
+        } catch (ParseException e) {
+            e.printStackTrace();
+        }
+        return null;
+    }
+
+    private static SimpleDateFormat getLocalSDF() {
+        return new SimpleDateFormat(YYYY_MM_DD_HH_MM_SS);
+    }
+
+    private static SimpleDateFormat getUTCSDF() {
+        SimpleDateFormat utcSDF = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSS'Z'");
+        utcSDF.setTimeZone(TimeZone.getTimeZone("UTC"));
+        return utcSDF;
+    }
+
+    // 获取两个时间相差分钟数
+    public static int getTimeDiff(String oldTime, String newTime) {
+        int diff = 0;
+        SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        long NTime = 0;
+        long OTime = 0;
+        try {
+            NTime = df.parse(newTime).getTime();
+            //从对象中拿到时间
+            OTime = df.parse(oldTime).getTime();
+            diff = (int) (Math.abs((NTime-OTime))/1000/60);
+        } catch (ParseException e) {
+        }
+
+        return diff;
+    }
+
+
+    /**
+     * 获取去年同一时间
+     * @return
+     */
+
+    public static String getLastYearCurrentDate(String date, String pattern){
+        SimpleDateFormat sdf = new SimpleDateFormat(pattern);
+        Calendar cal = Calendar.getInstance();
+        cal.setTime(parseStrtoDate(date, pattern));
+        cal.add(Calendar.YEAR, -1);
+        return sdf.format(cal.getTime());
+    }
+
+    /**
+     * @return 当天零点
+     */
+    public static Date today0am() {
+        Calendar day = Calendar.getInstance();
+        day.set(Calendar.HOUR_OF_DAY, 0);
+        day.set(Calendar.MINUTE, 0);
+        day.set(Calendar.SECOND, 0);
+        day.set(Calendar.MILLISECOND, 0);
+        return day.getTime();
+    }
+
+    /**
+     * 在指定时间上加指定的天数
+     *
+     * @param date
+     * @param day
+     * @return
+     */
+    public static Date addDays(Date date, int day) {
+        Calendar cal = Calendar.getInstance();
+        cal.setTime(date);
+        cal.add(Calendar.DAY_OF_MONTH, day);
+        return cal.getTime();
+    }
+
+    /**
+     * 在指定的时间上加指定的月数
+     *
+     * @param date
+     * @param month
+     * @return
+     */
+    public static Date addMonths(Date date, int month) {
+        Calendar cal = Calendar.getInstance();
+        cal.setTime(date);
+        cal.add(Calendar.MONTH, month);
+        return cal.getTime();
+    }
+
+    /**
+     * 在指定的时间上加指定的月数
+     *
+     * @param date
+     * @param year
+     * @return
+     */
+    public static Date addYears(Date date, int year) {
+        Calendar cal = Calendar.getInstance();
+        cal.setTime(date);
+        cal.add(Calendar.YEAR, year);
+        return cal.getTime();
+    }
+
+    /**
+     * 在指定时间上加指定的小时
+     *
+     * @param date
+     * @param hour
+     * @return
+     */
+    public static Date addHours(Date date, int hour) {
+        return new Date(date.getTime() + hour * 3600 * 1000);
+    }
+
+    /**
+     * 在指定时间上加指定的分钟
+     *
+     * @param date
+     * @param m
+     * @return
+     */
+    public static Date addMinutes(Date date, int m) {
+        return new Date(date.getTime() + m * 60 * 1000);
+    }
+
+    /**
+     * 在指定时间上加指定的秒
+     *
+     * @param date
+     * @param s
+     * @return
+     */
+    public static Date addSeconds(Date date, int s) {
+        return new Date(date.getTime() + s * 1000);
+    }
+}