发电能力分析额定功率与温度算法接口

power-fitting/src/main/java/com/gyee/power/fitting/common/alg/MpptFittingAlg.java

@@ -1,29 +1,10 @@
 package com.gyee.power.fitting.common.alg;
 
-//package easyexcel;
-
-import com.alibaba.excel.EasyExcel;
-import com.alibaba.excel.context.AnalysisContext;
-import com.alibaba.excel.event.AnalysisEventListener;
-import java.util.Iterator;
-import java.util.LinkedList;
 import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-//绘制曲线需要
-import  java.awt.*;
-import  javax.swing.*;
-import  java.awt.geom.GeneralPath;
-
 
-import com.gyee.power.fitting.model.custom.LineCurveFitting;
 import com.gyee.power.fitting.model.custom.PointVo;
 
 import java.util.ArrayList;
-import java.util.List;
-
-import java.math.BigDecimal;
 
 import org.apache.commons.math3.fitting.PolynomialCurveFitter;
 import org.apache.commons.math3.fitting.WeightedObservedPoints;

power-fitting/src/main/java/com/gyee/power/fitting/common/alg/PowerFittingALG.java

@@ -381,7 +381,7 @@ public class PowerFittingALG {
         //过滤对风偏差
         for (int i = 0; i < points.size(); i++){
             PowerPointData item = points.get(i);
-            if (item.getSpeed() < 4.5 || item.getSpeed() >= 10.5)
+            if (item.getSpeed() < 4.5 || item.getSpeed() >= 10.5 && item.getMxzt() != 2)
                 continue;
 
             list.add(item);
@@ -392,7 +392,7 @@ public class PowerFittingALG {
             double[] value = map.get(speed);
             double power = item.getPower() < 0 ? 0 : item.getPower();
             value[0] = power < value[0] ? power : value[0]; //最小值
-            value[1] = power > value[1] ? power : value[1]; //最小值
+            value[1] = power > value[1] ? power : value[1]; //最大值
         }
 
         DecimalFormat sf = new DecimalFormat("0.00");
@@ -401,7 +401,7 @@ public class PowerFittingALG {
             Integer speed = Math.toIntExact(Math.round(item.getSpeed()));
             int ele = (int) (Math.abs(item.getFx()) + Math.abs(item.getAngle()));
             int index = ele - 180;
-            if (index >= -15 && index <= 15) {
+            if (index >= -30 && index <= 30 && item.getPower() > 0) {
                 double[] value = map.get(speed);
                 double v = (item.getPower() - value[0]) / (value[1] - value[0]);
                 double s[] = {speed, index, Double.valueOf(sf.format(v)).doubleValue()};
@@ -409,7 +409,6 @@ public class PowerFittingALG {
             }
         }
 
-
         return result;
     }
 

power-fitting/src/main/java/com/gyee/power/fitting/common/alg/PowerTemperatureAlg.java

@@ -0,0 +1,78 @@
+package com.gyee.power.fitting.common.alg;
+
+
+import com.gyee.power.fitting.model.custom.PowerPointData;
+
+import java.util.*;
+
+/**
+ * 温度功率算法
+ */
+public class PowerTemperatureAlg {
+
+
+    /**
+     * 风速大于12m时的平均额定功率与额定功率的差值
+     * @param points  测点数据
+     * @param power   该型号风机的额定功率
+     * @param minT    最小温度
+     * @param maxT    最大温度
+     * 统计跨度温度内是否欠满发   实发总功率/次数 - 理论功率
+     */
+    public static Map<String, Integer> temperatureRatedPower(List<PowerPointData> points, double power, double minT, double maxT){
+        Map<Integer, int[]> map = new TreeMap<>(); //[0]计数  [1]功率求和
+        int mint = (int) minT;
+        int maxt = (int) maxT;
+        int split = 5;  //温度间隔步调5°
+
+        points.stream().filter(f -> !(f.getSpeed() < 12.0 || f.getSpeed() > 25.0 || f.getMxzt() != 2))
+                .sorted(Comparator.comparing(PowerPointData::getHjwd)).forEach(item -> {
+            int T = (int) item.getHjwd();
+            if (!map.containsKey(T)) {
+                map.put(T, new int[2]);
+            }
+            int[] value = map.get(T);
+            value[0]++;
+            value[1] += item.getPower();
+        });
+
+        Map<String, Integer> result = new LinkedHashMap<>();
+        for (int i = mint; i <= maxt; i+=split){
+            int count = 0;
+            double totalPower = 0;
+            for (int j = 0; j < split; j++){
+                if (!map.containsKey(i + j))
+                    continue;
+                count += map.get(i + j)[0];
+                totalPower += map.get(i + j)[1];
+            }
+            result.put("(" + i + "," + (i + split) + "]", (int)(totalPower/count - power));
+        }
+
+        return result;
+    }
+
+
+    /**
+     * 额定功率vs.温度分析
+     * @param points  测点
+     * @return  风速大于12m/s满发状态时的
+     */
+    public static List<int[]> temperatureRatedPower(List<PowerPointData> points){
+        List<int[]> list = new ArrayList<>();
+        points.stream().filter(f -> f.getSpeed() >= 12.0 && f.getSpeed() <= 25.0 && f.getMxzt() == 2)
+                .sorted(Comparator.comparing(PowerPointData::getHjwd)).forEach(item -> {
+                    int t = (int) item.getHjwd();
+                    int v = (int) item.getPower();
+                    int[] temp = new int[]{t, v};
+                    list.add(temp);
+                });
+        return list;
+    }
+
+
+    public static void main(String[] args){
+        for (int i = -4; i <= 28; i+=5)
+            System.out.println(i);
+    }
+}

power-fitting/src/main/java/com/gyee/power/fitting/common/alg/WindDirectionALG.java

@@ -55,10 +55,12 @@ public class WindDirectionALG {
      * @return
      */
     public static int[] fxRadarRoses(List<PowerPointData> list){
-        int[] count = new int[32];
+        int[] count = new int[16];
         list.stream().sorted(Comparator.comparing(PowerPointData::getSpeed)).forEach(item -> {
             int df = windDFAngle(item.getDfwc());
-            count[df] ++;
+            if (count[df] < 1000) {
+                count[df]++;
+            }
         });
 
         return count;
@@ -88,10 +90,10 @@ public class WindDirectionALG {
      * 2:90-135
      * .。。。。。。
      * @param
-     * @return params: 0,1,2。。。。。15
+     * @return
      */
     private static int windDFAngle(double angle){
-        int split = 32;  //风向分为16个角度
+        int split = 16;  //风向分为8个角度
         double interval = (double)360 / split;
         angle = angle > 360 ? 720 - 360 : angle;
         int index = (int) (Math.abs(angle) / interval);

power-fitting/src/main/java/com/gyee/power/fitting/controller/analyse/PowerTemperatureController.java

@@ -0,0 +1,32 @@
+package com.gyee.power.fitting.controller.analyse;
+
+
+import com.alibaba.fastjson.JSONObject;
+import com.gyee.power.fitting.common.result.JsonResult;
+import com.gyee.power.fitting.common.result.ResultCode;
+import com.gyee.power.fitting.service.custom.temperature.PowerTemperatureService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * 功率温度分析
+ */
+@RestController
+@CrossOrigin
+@RequestMapping("/temperature")
+public class PowerTemperatureController {
+
+    @Autowired
+    private PowerTemperatureService powerTemperatureService;
+
+    /***
+     * 与温度有关的稳定功率
+     * @param ids  预处理数据的id
+     * @return
+     */
+    @GetMapping("rated/power")
+    public JSONObject ratedPower(String ids){
+        Object o = powerTemperatureService.ratedPower(ids);
+        return JsonResult.successData(ResultCode.SUCCESS, o);
+    }
+}

power-fitting/src/main/java/com/gyee/power/fitting/controller/analyse/RatioController.java

@@ -1,33 +0,0 @@
-package com.gyee.power.fitting.controller.analyse;
-
-import com.alibaba.fastjson.JSONObject;
-import com.gyee.power.fitting.common.result.JsonResult;
-import com.gyee.power.fitting.common.result.ResultCode;
-import com.gyee.power.fitting.service.custom.ratio.RatioService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-/**
- */
-@RestController
-@CrossOrigin
-@RequestMapping("/wind")
-public class RatioController {
-
-    @Autowired
-    private RatioService ratioService;
-
-    /**
-     * 对风偏差分析
-     * @param ids  预处理数据 ids
-     * @param mode 拟合方式  0：单台统计   1：合并统计
-     * @return
-     */
-    @GetMapping("deviation/ratio")
-    public JSONObject fsRoses(String ids, @RequestParam(value = "mode",  required = false) Integer mode){
-        mode = mode == null ? 0 : mode;
-        Object o = ratioService.windDeviationRatio(ids, mode);
-        return JsonResult.successData(ResultCode.SUCCESS, o);
-    }
-
-}

power-fitting/src/main/java/com/gyee/power/fitting/controller/analyse/WindDirectionController.java

@@ -4,7 +4,8 @@ package com.gyee.power.fitting.controller.analyse;
 import com.alibaba.fastjson.JSONObject;
 import com.gyee.power.fitting.common.result.JsonResult;
 import com.gyee.power.fitting.common.result.ResultCode;
-import com.gyee.power.fitting.service.custom.fx.WindDirectionService;
+import com.gyee.power.fitting.service.custom.socket.RatioService;
+import com.gyee.power.fitting.service.custom.windresource.WindDirectionService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -18,6 +19,9 @@ import org.springframework.web.bind.annotation.*;
 public class WindDirectionController {
 
     @Autowired
+    private RatioService ratioService;
+
+    @Autowired
     private WindDirectionService windDirectionService;
 
     /***
@@ -45,4 +49,17 @@ public class WindDirectionController {
         Object o = windDirectionService.fxCountRoses(ids, mode);
         return JsonResult.successData(ResultCode.SUCCESS, o);
     }
+
+    /**
+     * 对风偏差分析
+     * @param ids  预处理数据 ids
+     * @param mode 拟合方式  0：单台统计   1：合并统计
+     * @return
+     */
+    @GetMapping("deviation/ratio")
+    public JSONObject fsDeviationRatio(String ids, @RequestParam(value = "mode",  required = false) Integer mode){
+        mode = mode == null ? 0 : mode;
+        Object o = ratioService.windDeviationRatio(ids, mode);
+        return JsonResult.successData(ResultCode.SUCCESS, o);
+    }
 }

power-fitting/src/main/java/com/gyee/power/fitting/model/custom/PowerPointData.java

@@ -26,6 +26,7 @@ public class PowerPointData {
             this.fx = Double.valueOf(df.format(Double.valueOf(str[7])));
             this.dfwc = Double.valueOf(df.format(Double.valueOf(str[8])));
             this.angle = Double.valueOf(df.format(Double.valueOf(str[9])));
+            this.hjwd = Double.valueOf(df.format(Double.valueOf(str[10])));
         }
         if (isFilter)
             this.filter = Integer.valueOf(str[str.length - 1]);
@@ -47,7 +48,7 @@ public class PowerPointData {
     @Desc(value = "转速", remark = "1")
     private double rr = 0;
 
-    //明细状态
+    //明细状态  0-待机  1-手动停机  2-正常发电  3-缺陷降出力  4-限电降出力  5-限电停机  6-故障停机  7-场内受累停机  8-检修停机  9-场内受累检修  10-电网受累  11-环境受累  12-风机离线
     @Desc(value = "风机状态", remark = "1")
     private int mxzt = 0;
 
@@ -71,6 +72,9 @@ public class PowerPointData {
     @Desc(value = "偏航角度", remark = "1")
     private double angle = 0;
 
+    @Desc(value = "环境温度", remark = "1")
+    private double hjwd = 0;
+
     //是否过滤  0:不过滤 1:过滤
     @Desc(value = "筛选", remark = "0")
     private int filter = 0;

power-fitting/src/main/java/com/gyee/power/fitting/service/custom/ratio/RatioService.java

@@ -1,4 +1,4 @@
-package com.gyee.power.fitting.service.custom.ratio;
+package com.gyee.power.fitting.service.custom.socket;
 
 
 import com.gyee.power.fitting.common.alg.PowerFittingALG;

power-fitting/src/main/java/com/gyee/power/fitting/service/custom/temperature/PowerTemperatureService.java

@@ -0,0 +1,83 @@
+package com.gyee.power.fitting.service.custom.temperature;
+
+import com.gyee.power.fitting.common.alg.PowerTemperatureAlg;
+import com.gyee.power.fitting.common.spring.InitialRunner;
+import com.gyee.power.fitting.common.util.FileUtil;
+import com.gyee.power.fitting.model.Modelpowerdetails;
+import com.gyee.power.fitting.model.Powerfittinganalysis;
+import com.gyee.power.fitting.model.custom.PowerPointData;
+import com.gyee.power.fitting.service.PowerfittinganalysisService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+
+@Service
+public class PowerTemperatureService {
+
+    @Autowired
+    private PowerfittinganalysisService powerService;
+
+    /**
+     * 与温度有关的额定功率
+     * @param ids
+     */
+    public Object ratedPower(String ids) {
+        List<Powerfittinganalysis> list = powerService.selectListByIds(ids);
+        if (list == null || list.size() == 0)
+            return null;
+
+        List<Object> result = new ArrayList<>();
+        for (Powerfittinganalysis obj : list){
+            List<Modelpowerdetails> ls = InitialRunner.modelPowerDetailMap.get(InitialRunner.wtMap.get(obj.getWindturbine()).getModelid());
+            Double theoryPower = ls.get(ls.size() - 1).getTheorypower(); //理论功率
+            Map<String, Object> map = csvParse(obj);//数据解析
+            List<PowerPointData> data = (List<PowerPointData>) map.get("data");
+            Object res = PowerTemperatureAlg.temperatureRatedPower(data, theoryPower, (Double) map.get("minT"), (Double) map.get("maxT"));
+            List<int[]> rp = PowerTemperatureAlg.temperatureRatedPower(data);
+
+            Map<String, Object> mp = new HashMap<>();
+            mp.put("wt", obj.getWindturbine());
+            mp.put("power", InitialRunner.equipmentMap.get(InitialRunner.wtMap.get(obj.getWindturbine()).getModelid()));
+            mp.put("res1", res);
+            mp.put("res2", rp);
+            result.add(mp);
+        }
+
+        return result;
+    }
+
+
+
+    /**
+     * csv 文件解析成对象
+     * @param obj
+     * @return
+     */
+    private Map<String, Object> csvParse(Powerfittinganalysis obj){
+        Map<String, Object> map = new HashMap<>();
+        double minT = 0.0;
+        double maxT = 0.0;
+        List<PowerPointData> ls = new ArrayList<>();
+        List<String> content = FileUtil.readFile(obj.getPath(), true);
+        for (int i = 1; i < content.size(); i++){
+            String[] split = content.get(i).split(",");
+            PowerPointData data = new PowerPointData(split, true);
+            if (data.getSpeed() < 0 || data.getPower() < 0)
+                continue;
+            data.setWtId(obj.getWindturbine());
+
+            minT = data.getHjwd() < minT ? data.getHjwd() : minT;
+            maxT = data.getHjwd() > maxT ? data.getHjwd() : maxT;
+            ls.add(data);
+        }
+        map.put("data", ls);
+        map.put("minT", minT);
+        map.put("maxT", maxT);
+        return map;
+    }
+}

power-fitting/src/main/java/com/gyee/power/fitting/service/custom/fx/WindDirectionService.java

@@ -1,4 +1,4 @@
-package com.gyee.power.fitting.service.custom.fx;
+package com.gyee.power.fitting.service.custom.windresource;
 
 import com.gyee.power.fitting.common.alg.PowerFittingALG;
 import com.gyee.power.fitting.common.alg.WindDirectionALG;

power-fitting/src/main/resources/application.yaml

@@ -9,8 +9,8 @@ gyee:
   file-path-fitting: data\fitting\
   # 数据压缩下载
   file-path-download: data\zip\
-  # 风机实发功率\风机风速\发电机转速\明细状态\风机日发电量\实时欠发状态\风向\对风角度（对风误差）\偏航角度  顺序不能乱
-  points: AI130,AI022,AI128,ZTMX,RFDL,RSSQFZT,AI008,AI036,AI034
+  # 风机实发功率\风机风速\发电机转速\明细状态\风机日发电量\实时欠发状态\风向\对风角度（对风误差）\偏航角度\环境温度  顺序不能乱
+  points: AI130,AI022,AI128,ZTMX,RFDL,RSSQFZT,AI008,AI036,AI034,AI056
   # 数据准备时由于数据量太大，初始一个默认间隔，用于适配器取数
   interval: 20