风资源

web/runeconomy-xk/src/main/java/com/gyee/runeconomy/controller/Windresourceanalysis/WindresourceanalysisController.java

@@ -1,9 +1,12 @@
 package com.gyee.runeconomy.controller.Windresourceanalysis;
 
+import com.alibaba.fastjson.JSONObject;
 import com.gyee.runeconomy.dto.AjaxResult;
 import com.gyee.runeconomy.dto.DataVo;
 import com.gyee.runeconomy.dto.WindspeedVo;
 import com.gyee.runeconomy.dto.pewpVo;
+import com.gyee.runeconomy.dto.result.JsonResult;
+import com.gyee.runeconomy.dto.result.ResultCode;
 import com.gyee.runeconomy.service.Windresourceanalysis.WindresourceanalysisService;
 import com.gyee.runeconomy.util.StringUtils;
 import io.swagger.annotations.Api;
@@ -13,6 +16,7 @@ import io.swagger.annotations.ApiOperation;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
 
 import javax.annotation.Resource;
@@ -73,13 +77,14 @@ public class WindresourceanalysisController {
     @ResponseBody
     @ApiOperation(value = "首页实时数据", notes = "首页实时数据")
     @ApiImplicitParams({
+            @ApiImplicitParam(name = "wpid", value = "场站", required = true, dataType = "string", paramType = "query"),
             @ApiImplicitParam(name = "Data", value = "日期", required = true, dataType = "string", paramType = "query")
     })
-    public AjaxResult GroupRealtime(String Data) throws Exception {
+    public AjaxResult GroupRealtime(String wpid,String Data) throws Exception {
 
         List<DataVo> resultList = new ArrayList<>();
-        if (StringUtils.notEmp(Data)) {
-            resultList = windresourceanalysisService.GroupRealtimevalue(Data);
+        if (StringUtils.notEmp(wpid)) {
+            resultList = windresourceanalysisService.GroupRealtimevalue(wpid,Data);
         }
 
         if (null != resultList) {
@@ -90,4 +95,40 @@ public class WindresourceanalysisController {
 
     }
 
+    @GetMapping("/FDGroupRealtime")
+    @ResponseBody
+    @ApiOperation(value = "首页实时数据", notes = "首页实时数据")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "wpid", value = "场站", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "Data", value = "日期", required = true, dataType = "string", paramType = "query")
+    })
+    public AjaxResult fdGroupRealtime(String wpid,String Data) throws Exception {
+
+        List<DataVo> resultList = new ArrayList<>();
+        if (StringUtils.notEmp(wpid)) {
+            resultList = windresourceanalysisService.fdGroupRealtimevalue(wpid,Data);
+        }
+
+        if (null != resultList) {
+            return AjaxResult.successData(200, resultList);
+        } else {
+            return AjaxResult.error(500, "操作失败");
+        }
+
+    }
+
+
+    /***
+     * 风速风向玫瑰图
+     * @param wpid  预处理数据的id
+     * @param mode 统计方式   0：单台统计   1：合并统计
+     * @return
+     */
+    @GetMapping("/roses")
+    @ResponseBody
+    public JSONObject fsRoses(String wpid, @RequestParam(value = "mode",  required = false) Integer mode ,String Data) throws Exception {
+        mode = mode == null ? 0 : mode;
+        Object o = windresourceanalysisService.fxRoses(wpid,mode,Data);
+        return JsonResult.successData(ResultCode.SUCCESS, o);
+    }
 }

web/runeconomy-xk/src/main/java/com/gyee/runeconomy/dto/WindspeedVo.java

@@ -18,23 +18,33 @@ public class WindspeedVo {
      * 平均风速
      */
 
-    private Double pjfs;
+    private Double pjfs = 0.0;
 
     /**
      * 最大风速
      */
 
-    private Double zdfs;
+    private Double zdfs = 0.0;
 
     /**
      * 最小风速
      */
-    private Double zxfs;
+    private Double zxfs = 0.0;
 
     /**
      * 平均风向
      */
-    private Double pjfx;
+    private Double pjfx = 0.0;
+
+    private Long hours;
+
+    public Long getHours() {
+        return hours;
+    }
+
+    public void setHours(Long hours) {
+        this.hours = hours;
+    }
 
     public String getWpid() {
         return wpid;

web/runeconomy-xk/src/main/java/com/gyee/runeconomy/dto/result/JsonResult.java

@@ -0,0 +1,67 @@
+package com.gyee.runeconomy.dto.result;
+
+import com.alibaba.fastjson.JSONObject;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.HashMap;
+
+@Data
+public class JsonResult extends HashMap<String, Object> implements Serializable {
+
+    private Integer code;
+    private String message;
+    private Object data;
+    private ResultCode resultCode;
+
+    public static JSONObject error(){
+        JSONObject json = new JSONObject();
+        json.put("code", ResultCode.SUCCESS.getCode());
+        json.put("msg", ResultCode.SUCCESS.getMessage());
+        return json;
+    }
+
+    public static JSONObject error(ResultCode resultCode){
+        JSONObject json = new JSONObject();
+        json.put("code", resultCode.getCode());
+        json.put("msg", resultCode.getMessage());
+        return json;
+    }
+
+    public static JSONObject error(int code, String message){
+        JSONObject json = new JSONObject();
+        json.put("code", code);
+        json.put("msg", message);
+        return json;
+    }
+
+    public static JSONObject success(){
+        JSONObject json = new JSONObject();
+        json.put("code", ResultCode.SUCCESS.getCode());
+        json.put("msg", ResultCode.SUCCESS.getMessage());
+        return json;
+    }
+
+    public static JSONObject seccess(int code, String message){
+        JSONObject json = new JSONObject();
+        json.put("code", code);
+        json.put("msg", message);
+        return json;
+    }
+
+    public static JSONObject success(ResultCode resultCode){
+        JSONObject json = new JSONObject();
+        json.put("code", resultCode.getCode());
+        json.put("msg", resultCode.getMessage());
+        return json;
+    }
+
+    public static JSONObject successData(ResultCode code, Object data){
+        JSONObject json = new JSONObject();
+        json.put("code", code.getCode());
+        json.put("msg", code.getMessage());
+        json.put("data", data != null ? data : null);
+        return json;
+    }
+
+}

web/runeconomy-xk/src/main/java/com/gyee/runeconomy/dto/result/ResultCode.java

@@ -0,0 +1,89 @@
+package com.gyee.runeconomy.dto.result;
+
+/*
+ * #1001～1999 区间表示参数错误
+ * #2001～2999 区间表示用户错误
+ * #3001～3999 区间表示权限异常
+ */
+
+public enum ResultCode {
+    /* 成功 */
+    SUCCESS(200, "成功"),
+    SUCCESS_DATA_PREPARE(200, "数据已提交，稍后查看"),
+
+    /* 默认失败 */
+    ERROR(4000, "失败"),
+    ERROR_FILE_NO(4001, "文件未找到"),
+    ERROR_FILE_TYPE(4002, "文件类型不正确"),
+    ERROR_FILE_DATA(4003, "数据为空"),
+    ERROR_DATA_TYPE(4004, "数据格式不正确"),
+    ERROR_CONNECT(4005, "数据库连接异常"),
+    ERROR_DATA(4006, "数据库操作失败"),
+    ERROR_DATA_REPEAT(4007, "数据已存在"),
+    ERROR_SQL(4008, "sql语法不正确"),
+    ERROR_MODEL(4009, "自算功率数据为空"),
+
+
+    /* 参数错误：1000～1999 */
+    PARAM_NOT_VALID(1001, "参数无效"),
+    PARAM_IS_BLANK(1002, "参数为空"),
+    PARAM_TYPE_ERROR(1003, "参数类型错误"),
+    PARAM_NOT_COMPLETE(1004, "参数缺失"),
+    ERROR_DATA_DIR(1005, "目录创建失败"),
+    ERROR_DATA_FILE(1006, "文件上传失败"),
+
+    /* 用户错误 */
+    USER_NOT_LOGIN(2001, "用户未登录"),
+    USER_ACCOUNT_ERROR(2002, "账号或密码错误"),
+    USER_FAIL_LOGIN(2003, "登录失败"),
+    USER_OUT_LOGIN(2004, "登出成功"),
+    USER_ERROR_TOKEN(2005, "登录已过期，请重新登录"),
+
+    /* 业务错误 */
+    NO_PERMISSION(3001, "没有权限"),
+    ERROR_ENABLE(3002, "模型为启用状态，不允许删除"),
+    ERROR_TASK(3003, "有正在进行的任务，请稍后在试");
+
+    private Integer code;
+    private String message;
+
+    ResultCode(Integer code) {
+        this.code = code;
+    }
+
+    ResultCode(Integer code, String message) {
+        this.code = code;
+        this.message = message;
+    }
+
+    public Integer getCode() {
+        return code;
+    }
+
+    public void setCode(Integer code) {
+        this.code = code;
+    }
+
+    public String getMessage() {
+        return message;
+    }
+
+    public void setMessage(String message) {
+        this.message = message;
+    }
+
+    /**
+     * 根据code获取message
+     *
+     * @param code
+     * @return
+     */
+    public static String getMessageByCode(Integer code) {
+        for (ResultCode ele : values()) {
+            if (ele.getCode().equals(code)) {
+                return ele.getMessage();
+            }
+        }
+        return null;
+    }
+}

web/runeconomy-xk/src/main/java/com/gyee/runeconomy/dto/speed/Desc.java

@@ -0,0 +1,22 @@
+package com.gyee.runeconomy.dto.speed;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+
+/**
+ * 配置通过注解
+ */
+@Target(ElementType.FIELD)
+@Retention(RetentionPolicy.RUNTIME)
+public @interface Desc {
+
+    String des();
+
+    String uniformCode() default "";
+
+    String remark() default "";
+
+}

web/runeconomy-xk/src/main/java/com/gyee/runeconomy/dto/speed/PowerPointData.java

@@ -0,0 +1,126 @@
+package com.gyee.runeconomy.dto.speed;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.math.RoundingMode;
+import java.text.DecimalFormat;
+
+/**
+ * 数据准备的测点
+ * remark  0：表示该字段不在前端显示  1：表示该字段在前端显示
+ */
+@Data
+public class PowerPointData {
+
+    public PowerPointData(){}
+
+    public PowerPointData(String[] str, boolean isFilter){
+        DecimalFormat df = new DecimalFormat("0.00");
+            this.time = str[0];
+            this.power = Double.valueOf(df.format(Double.valueOf(str[1])));
+            this.speed = Double.valueOf(df.format(Double.valueOf(str[2])));
+            this.rr = Double.valueOf(df.format(Double.valueOf(str[3])));
+            this.mxzt = Double.valueOf(str[4]).intValue();
+            this.dl = Double.valueOf(df.format(Double.valueOf(str[5])));
+            this.qfzt = Double.valueOf(str[6]).intValue();
+            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])));
+            this.yp1 = Double.valueOf(df.format(Double.valueOf(str[11])));
+            this.yp2 = Double.valueOf(df.format(Double.valueOf(str[12])));
+            this.yp3 = Double.valueOf(df.format(Double.valueOf(str[13])));
+            if (isFilter){
+                BigDecimal bd = new BigDecimal(str[str.length - 1]);
+                bd = bd.setScale(2, RoundingMode.HALF_UP);
+                this.filter =  bd.intValue();
+            }
+
+
+    }
+
+    //时间
+    @Desc(des = "时间", remark = "1")
+    private String time = "1970-01-01 00:00:00";
+
+    //功率 AI114
+    @Desc(des = "功率", uniformCode = "AI114", remark = "1")
+    private double power = 0;
+
+    //风速 AI066
+    @Desc(des = "风速", uniformCode = "AI066", remark = "1")
+    private double speed = 0;
+
+    //转速 AI060
+    @Desc(des = "转速",  uniformCode = "AI060", remark = "1")
+    private double rr = 0;
+
+    //明细状态
+    // 0-待机  1-手动停机  2-正常发电  3-缺陷降出力  4-限电降出力  5-限电停机  6-故障停机
+    // 7-场内受累停机  8-检修停机  9-场内受累检修  10-电网受累  11-环境受累  12-风机离线 MXZT
+    @Desc(des = "风机状态",  uniformCode = "MXZT", remark = "1")
+    private int mxzt = 0;
+
+    //电量 RFDL
+    @Desc(des = "电量",  uniformCode = "RFDL", remark = "1")
+    private double dl = 0;
+
+    //欠发状态 SSQFZT
+    @Desc(des = "欠发状态",  uniformCode = "RQFZT", remark = "1")
+    private int qfzt = 0;
+
+
+    //风向 AI067
+    @Desc(des = "风向",  uniformCode = "AI067", remark = "1")
+    private double fx = 0;
+
+    //对风误差
+    @Desc(des = "对风误差",  uniformCode = "AI073", remark = "1")
+    private double dfwc = 0;
+
+    //偏航角度 AI073
+    @Desc(des = "偏航角度",  uniformCode = "AI073", remark = "1")
+    private double angle = 0;
+
+    /**
+     * AI072
+     */
+    @Desc(des = "环境温度",  uniformCode = "AI072", remark = "1")
+    private double hjwd = 0;
+
+    @Desc(des = "叶片1",  uniformCode = "AI082", remark = "1")
+    private double yp1 = 0;
+
+    @Desc(des = "叶片2",  uniformCode = "AI083", remark = "1")
+    private double yp2 = 0;
+
+    @Desc(des = "叶片3",  uniformCode = "AI084", remark = "1")
+    private double yp3 = 0;
+
+    //是否过滤  0:不过滤 1:过滤
+    @Desc(des = "筛选", remark = "0")
+    private int filter = 0;
+
+    private String wtId;
+
+    @Override
+    public String toString() {
+        return "PowerPointData{" +
+                "time='" + time + '\'' +
+                ", power=" + power +
+                ", speed=" + speed +
+                ", rr=" + rr +
+                ", mxzt=" + mxzt +
+                ", dl=" + dl +
+                ", qfzt=" + qfzt +
+                ", fx=" + fx +
+                ", dfwc=" + dfwc +
+                ", angle=" + angle +
+                ", hjwd=" + hjwd +
+                ", filter=" + filter +
+                ", wtId='" + wtId + '\'' +
+                '}';
+    }
+}
+

web/runeconomy-xk/src/main/java/com/gyee/runeconomy/dto/speed/WindDirectionALG.java

@@ -0,0 +1,292 @@
+package com.gyee.runeconomy.dto.speed;
+
+import java.text.DecimalFormat;
+import java.util.*;
+
+/**
+ * 风向玫瑰图
+ * 风向频次玫瑰图
+ */
+public class WindDirectionALG {
+
+    /**
+     * 风速风向玫瑰图
+     * 风速：[0,2.5) [2.5,5) [5,7.5) [7.5,10) [10,12.5) [12.5,15) [15,17.5) [17.5,20) [20,22.5) [22.5,25) [25,inf)  11
+     * @param list
+     */
+    public static Object fxRoses(List<PowerPointData> list){
+        int[][] count = new int[11][16];
+
+        list.stream().forEach(item -> {
+            int fx = windFXAngle(item.getFx());
+            int speed = windSpeed(item.getSpeed());
+            if (speed < 11 && fx < 16)
+                count[speed][fx] = 1;
+        });
+
+        return count;
+    }
+
+
+    /**
+     * 风向频次玫瑰图
+     * 风速：[0,2.5) [2.5,5) [5,7.5) [7.5,10) [10,12.5) [12.5,15) [15,17.5) [17.5,20) [20,22.5) [22.5,25) [25,inf)  11
+     * @param list
+     */
+    public static int[][] fxCountRoses(List<PowerPointData> list){
+        int[][] count = new int[11][16];
+        list.stream().sorted(Comparator.comparing(PowerPointData::getSpeed)).forEach(item -> {
+            int fx = windFXAngle(item.getFx());
+            int speed = windSpeed(item.getSpeed());
+            if (speed < 11 && fx < 16)
+                count[speed][fx] ++;
+        });
+
+        return count;
+    }
+
+
+    /**
+     * 风向频次雷达图
+     * @param list
+     * @return
+     */
+    public static int[] fxRadarRoses(List<PowerPointData> list){
+
+        try {
+            int[] count = new int[16];
+            list.stream().sorted(Comparator.comparing(PowerPointData::getSpeed)).forEach(item -> {
+                int df = windDFAngle(item.getDfwc());
+                if (count.length > df && count[df] < 1000) {
+                    count[df]++;
+                }
+            });
+            return count;
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return null;
+
+    }
+
+
+    /**
+     * 静风频率计算 、平均风速计算
+     * @param list  风速数组
+     * @param cutInSpeed 切入风速
+     * @return
+     */
+    public static List<Double> frequency(List<Double> list, double cutInSpeed){
+        List<Double> result = new ArrayList<>();
+        DecimalFormat df = new DecimalFormat("0.00");
+        int count = 0;
+        double speed = 0.0;
+        for (Double fs : list){
+            speed += fs;
+            if (fs < cutInSpeed)
+                count ++;
+        }
+        double frequency = list.size() > 0 ? Double.valueOf(df.format(((double)count / list.size() * 100 ))) : 0;
+        double speedAVG = list.size() > 0 ? Double.valueOf(df.format(speed/list.size())) : 0;
+        result.add(frequency);
+        result.add(speedAVG);
+        return result;
+    }
+
+
+
+    /**
+     * 对风偏差散点过滤  统计-50 到 50的
+     * 频次
+     * @param list
+     *
+     *
+     * @return
+     */
+//    public static List<Point> windDeviationScatter(List<PowerPointData> list){
+//        //正负偏差 [-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())));
+//            int index = ele - 180;
+//            if (index >= -50 && index <= 50) {
+//                double key = Math.abs(index) + item.getSpeed();
+//                if (!keys.contains(key))
+//                    ls.add(new Point(index, item.getSpeed()));
+//                keys.add(key);
+//            }
+//        }
+//
+//        return ls;
+//    }
+
+
+    /**
+     * 静态偏航对风分析
+     * 对风偏差散点过滤  统计-15 到 15的  正负偏差 [-15,-14,....,0,1,2,.....15]
+     * 数据为二维数组 内层数组为3项. 第一项表示Y轴索引（风速）,  第二项代表X轴的索引（正负偏差） 第三项代表value值.
+     * @param points
+     * @return
+     */
+    public static Map<String, Object> windDeviationPoint(List<PowerPointData> points){
+        try {
+            List<PowerPointData> list = new ArrayList<>();
+            List<Object> temp = new ArrayList<>();
+            Map<String, Object> result = new HashMap<>();
+            Map<Integer, double[]> map = new LinkedHashMap<>();
+
+            //过滤对风偏差
+            for (int i = 0; i < points.size(); i++){
+                PowerPointData item = points.get(i);
+                if ((item.getSpeed() < 4.5 || item.getSpeed() >= 10.5) && item.getMxzt() != 2)
+                    continue;
+
+                list.add(item);
+                Integer speed = Math.toIntExact(Math.round(item.getSpeed()));
+                if (!map.containsKey(speed))
+                    map.put(speed, new double[2]);  //[0]最小值 [1]最大值
+
+                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]; //最大值
+            }
+
+            int avg = 0;
+            DecimalFormat sf = new DecimalFormat("0.00");
+            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 index = ele - 180;
+                if (index >= -30 && index <= 30 && item.getPower() > 0) {
+                    avg += index;
+                    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()};
+                    temp.add(s);
+                }
+            }
+            result.put("data", temp);
+            result.put("avg", temp.size() > 0 ? avg/temp.size() : 0);
+
+            return result;
+        } catch (NumberFormatException e) {
+            e.printStackTrace();
+        }
+        return null;
+    }
+
+
+    /**
+     * 对风偏差频次统计  统计-50 到 50
+     * @param list
+     * @return
+     */
+    public static int[] windDeviationRatio(List<PowerPointData> list){
+        int[] pc = new int[101];  //正负偏差 [-50,-49,....,0,1,2,.....50]
+        //次数统计
+        for (int i = 0; i < list.size(); i++){
+            PowerPointData item = list.get(i);
+            int ele = (int) (Math.abs(item.getFx()) + Math.abs(item.getDfwc()));
+            int index = ele - 180;
+            if (index >= -50 && index <= 50)
+                pc[50-(index > 0 ? -index : Math.abs(index))]++;
+        }
+
+        return pc;
+    }
+
+
+    /**
+     * 风向划分
+     * 0:0-22.5
+     * 1:22.5-45
+     * 2:90-135
+     * .。。。。。。
+     * @param fx
+     * @return params: 0,1,2。。。。。15
+     */
+    private static int windFXAngle(double fx){
+        int split = 16;  //风向分为16个角度
+        double angle = (double)360 / split;
+        int index = Math.abs((int) (fx / angle));
+        return index;
+    }
+
+    /**
+     * 对风角度计算
+     * 0:0-22.5
+     * 1:22.5-45
+     * 2:90-135
+     * .。。。。。。
+     * @param
+     * @return
+     */
+    private static int windDFAngle(double angle){
+        int split = 16;  //风向分为8个角度
+        double interval = (double)360 / split;
+        angle = angle > 360 ? 720 - 360 : angle;
+        int index = (int) (Math.abs(angle) / interval);
+        return index;
+    }
+
+    /**
+     * 风速区域划分
+     * @param speed
+     * @return
+     */
+    private static int windSpeed(double speed){
+        if (speed < 2.5)
+            return 0;
+        else if (speed < 5)
+            return 1;
+        else if (speed < 7.5)
+            return 2;
+        else if (speed < 10)
+            return 3;
+        else if (speed < 12.5)
+            return 4;
+        else if (speed < 15)
+            return 5;
+        else if (speed < 17.5)
+            return 6;
+        else if (speed < 20)
+            return 7;
+        else if (speed < 22.5)
+            return 8;
+        else if (speed < 25)
+            return 9;
+        else
+            return 10;
+    }
+
+
+    /**
+     * 数据聚合  间隔10
+     * @param list
+     * @return
+     */
+    private static Object arrayDistinct(List<List<Double>> list){
+        for (List<Double> item : list){
+            List<Double> lt = new ArrayList<>();
+            LinkedHashSet<Integer> ls = new LinkedHashSet<>();
+            item.forEach(ele -> {
+                if (ele == null)
+                    return;
+                int v = (int) (ele / 10);
+                if (!ls.contains(v))
+                    lt.add(ele);
+
+                ls.add(v);
+            });
+            item.clear();
+            item.addAll(lt);
+        }
+
+        return list;
+    }
+}

web/runeconomy-xk/src/main/java/com/gyee/runeconomy/service/Windresourceanalysis/WindresourceanalysisService.java

@@ -7,9 +7,12 @@ import com.gyee.common.util.DateUtils;
 import com.gyee.runeconomy.dto.DataVo;
 import com.gyee.runeconomy.dto.WindspeedVo;
 import com.gyee.runeconomy.dto.pewpVo;
+import com.gyee.runeconomy.dto.speed.PowerPointData;
+import com.gyee.runeconomy.dto.speed.WindDirectionALG;
 import com.gyee.runeconomy.init.CacheContext;
 import com.gyee.runeconomy.model.auto.ProBasicPowerstation;
 import com.gyee.runeconomy.model.auto.ProBasicPowerstationPoint;
+import com.gyee.runeconomy.model.auto.ProBasicWeatherStation;
 import com.gyee.runeconomy.service.auto.IProBasicPowerstationPointService;
 import com.gyee.runeconomy.service.auto.IProEconPowerstationInfoDay1Service;
 import com.gyee.runeconomy.util.realtimesource.IEdosUtil;
@@ -36,7 +39,7 @@ public class WindresourceanalysisService {
 
     public List<WindspeedVo> Comprehensive(String Data) throws Exception {
 
-        List<ProBasicPowerstation> wplsf = CacheContext.wplsf;
+        List<ProBasicWeatherStation> wplsf = CacheContext.weawpls.stream().filter(w -> w.getWindpowerstationId().endsWith("FDC_STA")).collect(Collectors.toList());
 
         //转换时间为Date类型
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
@@ -60,62 +63,48 @@ public class WindresourceanalysisService {
         Date endTime = calendar1.getTime();
 
         ProBasicPowerstationPoint pjfs = null;
-        List<WindspeedVo> vos = new ArrayList<>();
-        for (ProBasicPowerstation wp : wplsf) {
-
-            pjfs = proBasicPowerstationPointService.getPowerstationPoint(wp.getId(), ContantXk.GCGZQD);
-
-            if (pjfs != null && pjfs != null) {
-                List<PointData> pjfsls = edosUtil.getHistoryDatasRaw(pjfs.getNemCode(), startTime.getTime() / 1000, endTime.getTime() / 1000);
-
-                if (pjfsls != null && !pjfsls.isEmpty()) {
-
-                    List<PointData> filterls = new ArrayList<>();
-                    for (PointData po : pjfsls) {
-                        if (po.getPointValueInDouble() > 10) {
-                            filterls.add(po);
-                        }
-                    }
-
-
-                    if (!filterls.isEmpty()) {
-
-                        Date beginTime1 = new Date(filterls.get(0).getPointTime());
-                        Date endTime1 = new Date(filterls.get(filterls.size() - 1).getPointTime());
+        ProBasicPowerstationPoint pjfx = null;
 
-                        double hours = DateUtils.hoursDiff(beginTime1, endTime1);
+        List<WindspeedVo> vos = new ArrayList<>();
 
-                        DoubleSummaryStatistics summaryStatistics = filterls.stream().mapToDouble(PointData::getPointValueInDouble).summaryStatistics();
+        for (ProBasicWeatherStation wp : wplsf) {
+            if (wp.getId().contains("GJYF02")) continue;
 
-                        double sum = filterls.stream()
-                                .mapToDouble(PointData::getPointValueInDouble)
-                                .sum();
+            pjfs = proBasicPowerstationPointService.getPowerstationPoint(wp.getId(), ContantXk.FCCFTFS70);
+            pjfx = proBasicPowerstationPointService.getPowerstationPoint(wp.getId(), ContantXk.FCCFTFX70);
 
-                         WindspeedVo vo = new WindspeedVo();
-                        vo.setWpid(wp.getId());
-                        vo.setName(wp.getName());
+            List<ProBasicPowerstation> collect = CacheContext.wplsf.stream().filter(c -> c.getId().equals(wp.getWindpowerstationId())).collect(Collectors.toList());
 
-                        //日最大风速
-                        vo.setZdfs(StringUtils.round(summaryStatistics.getMax() /1000, 2));
-//                        vo.getPjfs(StringUtils.round(summaryStatistics.getAverage()));
+            WindspeedVo vo = new WindspeedVo();
 
-                        vos.add(vo);
-                        //日最小风速
-//                    pewp.setRzxfs(StringUtils.round(summaryStatistics.getMin(), 2));
+            if (pjfs.getNemCode() != null && !pjfs.getNemCode().equals("INITIAL")) {
 
-                        double avg = StringUtils.round(summaryStatistics.getAverage(), 2);
+                List<PointData> maxs = edosUtil.getHistStat(pjfs, startTime.getTime() / 1000, endTime.getTime() / 1000, (long) 1, null, 0);
+                List<PointData> mins = edosUtil.getHistStat(pjfs, startTime.getTime() / 1000, endTime.getTime() / 1000, (long) 1, null, 1);
+                List<PointData> ave = edosUtil.getHistStat(pjfs, startTime.getTime() / 1000, endTime.getTime() / 1000, (long) 1, null, 2);
 
-                        double result = new BigDecimal(avg * hours).divide(new BigDecimal(1000), 2, RoundingMode.HALF_EVEN).doubleValue();
-//                        vo.setZfzd(StringUtils.round(result,2));
+                double avenum = ave.get(0).getPointValueInDouble();
+                double maxsnum = maxs.get(0).getPointValueInDouble();
+                double minsnum = mins.get(0).getPointValueInDouble();
 
-                        //日平均风速
-//                    pewp.setRpjfs(result);
+                vo.setWpid(wp.getWindpowerstationId());
+                vo.setName(collect.get(0).getName());
+                vo.setPjfs(StringUtils.round(avenum, 2));
+                vo.setZdfs(StringUtils.round(maxsnum, 2));
+                vo.setZxfs(StringUtils.round(minsnum, 2));
 
 
-                    }
+            }
+            if (pjfx.getNemCode() != null && !pjfs.getNemCode().equals("INITIAL")) {
+                List<PointData> maxs = edosUtil.getHistStat(pjfx, startTime.getTime() / 1000, endTime.getTime() / 1000, (long) 1, null, 0);
+                List<PointData> mins = edosUtil.getHistStat(pjfx, startTime.getTime() / 1000, endTime.getTime() / 1000, (long) 1, null, 1);
+                List<PointData> ave = edosUtil.getHistStat(pjfx, startTime.getTime() / 1000, endTime.getTime() / 1000, (long) 1, null, 2);
 
-                }
+                double avefx = ave.get(0).getPointValueInDouble();
+                vo.setPjfx(StringUtils.round(avefx, 2));
+                vos.add(vo);
             }
+
         }
 
         return vos;
@@ -166,7 +155,7 @@ public class WindresourceanalysisService {
 
             pjfs = proBasicPowerstationPointService.getPowerstationPoint(wp.getId(), ContantXk.GCGZQD);
 
-            if (pjfs != null && pjfs != null) {
+            if (pjfs != null) {
                 List<PointData> pjfsls = edosUtil.getHistoryDatasRaw(pjfs.getNemCode(), startTime.getTime() / 1000, endTime.getTime() / 1000);
 
                 if (pjfsls != null && !pjfsls.isEmpty()) {
@@ -179,43 +168,43 @@ public class WindresourceanalysisService {
                     }
 
 
-                if (!filterls.isEmpty()) {
+                    if (!filterls.isEmpty()) {
 
-                    Date beginTime1 = new Date(filterls.get(0).getPointTime());
-                    Date endTime1 = new Date(filterls.get(filterls.size() - 1).getPointTime());
+                        Date beginTime1 = new Date(filterls.get(0).getPointTime());
+                        Date endTime1 = new Date(filterls.get(filterls.size() - 1).getPointTime());
 
-                    double hours = DateUtils.hoursDiff(beginTime1, endTime1);
+                        double hours = DateUtils.hoursDiff(beginTime1, endTime1);
 
-                    DoubleSummaryStatistics summaryStatistics = filterls.stream().mapToDouble(PointData::getPointValueInDouble).summaryStatistics();
+                        DoubleSummaryStatistics summaryStatistics = filterls.stream().mapToDouble(PointData::getPointValueInDouble).summaryStatistics();
 
-                    double sum = filterls.stream()
-                            .mapToDouble(PointData::getPointValueInDouble)
-                            .sum();
-                    pewpVo vo = new pewpVo();
-                    vo.setWpid(wp.getId());
-                    vo.setName(wp.getName());
+                        double sum = filterls.stream()
+                                .mapToDouble(PointData::getPointValueInDouble)
+                                .sum();
+                        pewpVo vo = new pewpVo();
+                        vo.setWpid(wp.getId());
+                        vo.setName(wp.getName());
 
-                    //日最大辐照度
-                    vo.setZdfdz(StringUtils.round(summaryStatistics.getMax() /1000, 2));
-                    vo.setRcsj(beginTime1);
-                    vo.setRlsj(endTime1);
-                    vo.setCxsj(hours);
-                    vos.add(vo);
-                    //日最小风速
+                        //日最大辐照度
+                        vo.setZdfdz(StringUtils.round(summaryStatistics.getMax() / 1000, 2));
+                        vo.setRcsj(beginTime1);
+                        vo.setRlsj(endTime1);
+                        vo.setCxsj(hours);
+                        vos.add(vo);
+                        //日最小风速
 //                    pewp.setRzxfs(StringUtils.round(summaryStatistics.getMin(), 2));
 
-                    double avg = StringUtils.round(summaryStatistics.getAverage(), 2);
+                        double avg = StringUtils.round(summaryStatistics.getAverage(), 2);
 
-                    double result = new BigDecimal(avg * hours).divide(new BigDecimal(1000), 2, RoundingMode.HALF_EVEN).doubleValue();
-                    vo.setZfzd(StringUtils.round(result,2));
+                        double result = new BigDecimal(avg * hours).divide(new BigDecimal(1000), 2, RoundingMode.HALF_EVEN).doubleValue();
+                        vo.setZfzd(StringUtils.round(result, 2));
 
-                    //日平均风速
+                        //日平均风速
 //                    pewp.setRpjfs(result);
 
 
-                }
+                    }
 
-            }
+                }
             }
         }
 
@@ -223,7 +212,7 @@ public class WindresourceanalysisService {
     }
 
 
-    public List<DataVo> GroupRealtimevalue(String Data) throws Exception {
+    public List<DataVo> GroupRealtimevalue(String wpid, String Data) throws Exception {
 
         List<DataVo> vos = new ArrayList<DataVo>();
 
@@ -240,28 +229,272 @@ public class WindresourceanalysisService {
 
         Date startTime = calendar.getTime();
 
+//        Calendar calendar1 = Calendar.getInstance();
+//        calendar1.setTime(date);
+//        calendar1.set(Calendar.HOUR_OF_DAY, 23);
+//        calendar1.set(Calendar.MINUTE, 59);
+//        calendar1.set(Calendar.SECOND, 59);
+//
+//        Date endTime = calendar1.getTime();
         Calendar calendar1 = Calendar.getInstance();
         calendar1.setTime(date);
-        calendar1.set(Calendar.HOUR_OF_DAY, 23);
-        calendar1.set(Calendar.MINUTE, 59);
-        calendar1.set(Calendar.SECOND, 59);
 
+        // 获取当前日期
+        Calendar today = Calendar.getInstance();
+        today.set(Calendar.HOUR_OF_DAY, 0);
+        today.set(Calendar.MINUTE, 0);
+        today.set(Calendar.SECOND, 0);
+
+        // 判断是否是当天
+        if (calendar1.get(Calendar.YEAR) == today.get(Calendar.YEAR) &&
+                calendar1.get(Calendar.DAY_OF_YEAR) == today.get(Calendar.DAY_OF_YEAR)) {
+            // 当天，设置endTime为当前时间
+            Date now = new Date();
+            calendar1.setTime(now);
+        } else {
+            // 非当天，设置endTime为传入的date的23:59:59
+            calendar1.set(Calendar.HOUR_OF_DAY, 23);
+            calendar1.set(Calendar.MINUTE, 59);
+            calendar1.set(Calendar.SECOND, 59);
+        }
         Date endTime = calendar1.getTime();
         ProBasicPowerstationPoint gzzs = null;
-        List<ProBasicPowerstation> wplsG = CacheContext.wplsG.stream().filter(c->c.getOrderNum().equals(15)).collect(Collectors.toList());
-        gzzs = proBasicPowerstationPointService.getPowerstationPoint(wplsG.get(0).getId(), ContantXk.GCGZQD);
+//        List<ProBasicPowerstation> wplsG = CacheContext.wplsG.stream().filter(c->c.getOrderNum().equals(15)).collect(Collectors.toList());
+        gzzs = proBasicPowerstationPointService.getPowerstationPoint(wpid, ContantXk.GCGZQD);
+
+
+        List<PointData> gzzsls = edosUtil.getHistoryDatasRaw(gzzs.getNemCode(), startTime.getTime() / 1000, endTime.getTime() / 1000);
+        double temp6 = 0;
+        for (int i = 0; i < gzzsls.size(); i++) {
+            DataVo vo = new DataVo();
+            temp6 = gzzsls.get(i).getPointValueInDouble();
+            vo.setValue6(com.gyee.runeconomy.util.StringUtils.round(temp6, 2));
+            vo.setTime(gzzsls.get(i).getPointTime());
+            vos.add(vo);
+        }
 
+        return vos;
+    }
 
-            List<PointData> gzzsls = edosUtil.getHistoryDatasRaw(gzzs.getNemCode(), startTime.getTime() / 1000, endTime.getTime() / 1000);
-            double temp6 = 0;
-            for (int i = 0; i < gzzsls.size(); i++) {
-                DataVo vo = new DataVo();
-                temp6 = gzzsls.get(i).getPointValueInDouble();
-                vo.setValue6(com.gyee.runeconomy.util.StringUtils.round(temp6, 2));
-                vo.setTime(gzzsls.get(i).getPointTime());
-                vos.add(vo);
-            }
+    public List<DataVo> fdGroupRealtimevalue(String wpid, String Data) throws Exception {
+
+        List<DataVo> vos = new ArrayList<DataVo>();
+
+        //转换时间为Date类型
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+        Date date = sdf.parse(Data);
+
+        Calendar calendar = Calendar.getInstance();
+        calendar.setTime(date);
+        calendar.add(Calendar.DAY_OF_MONTH, -1);
+        calendar.set(Calendar.HOUR_OF_DAY, 23);
+        calendar.set(Calendar.MINUTE, 59);
+        calendar.set(Calendar.SECOND, 59);
+
+        Date startTime = calendar.getTime();
+
+//        Calendar calendar1 = Calendar.getInstance();
+//        calendar1.setTime(date);
+//        calendar1.set(Calendar.HOUR_OF_DAY, 23);
+//        calendar1.set(Calendar.MINUTE, 59);
+//        calendar1.set(Calendar.SECOND, 59);
+//
+//        Date endTime = calendar1.getTime();
+
+        Calendar calendar1 = Calendar.getInstance();
+        calendar1.setTime(date);
+
+        // 获取当前日期
+        Calendar today = Calendar.getInstance();
+        today.set(Calendar.HOUR_OF_DAY, 0);
+        today.set(Calendar.MINUTE, 0);
+        today.set(Calendar.SECOND, 0);
+
+        // 判断是否是当天
+        if (calendar1.get(Calendar.YEAR) == today.get(Calendar.YEAR) &&
+                calendar1.get(Calendar.DAY_OF_YEAR) == today.get(Calendar.DAY_OF_YEAR)) {
+            // 当天，设置endTime为当前时间
+            Date now = new Date();
+            calendar1.setTime(now);
+        } else {
+            // 非当天，设置endTime为传入的date的23:59:59
+            calendar1.set(Calendar.HOUR_OF_DAY, 23);
+            calendar1.set(Calendar.MINUTE, 59);
+            calendar1.set(Calendar.SECOND, 59);
+        }
+        Date endTime = calendar1.getTime();
+
+
+        ProBasicPowerstationPoint gzzs = null;
+        List<ProBasicWeatherStation> wplsf = null;
+        if (wpid.contains("GJY_FDC")) {
+            wplsf = CacheContext.weawpls.stream().filter(w -> w.getWindpowerstationId().equals(wpid) && w.getId().contains("GJYF01")).collect(Collectors.toList());
+        } else {
+            wplsf = CacheContext.weawpls.stream().filter(w -> w.getWindpowerstationId().equals(wpid)).collect(Collectors.toList());
+        }
+
+        gzzs = proBasicPowerstationPointService.getPowerstationPoint(wplsf.get(0).getId(), ContantXk.FCCFTFS70);
+
+
+//        List<PointData> gzzsls = edosUtil.getHistoryDatasRaw(gzzs.getNemCode(), startTime.getTime() / 1000, endTime.getTime() / 1000);
+        List<PointData> gzzsls = edosUtil.getHistoryDatasSnap(gzzs, startTime.getTime() / 1000, endTime.getTime() / 1000, null, 900L);
+
+        double temp6 = 0;
+        for (int i = 0; i < gzzsls.size(); i++) {
+            DataVo vo = new DataVo();
+            temp6 = gzzsls.get(i).getPointValueInDouble();
+            vo.setValue6(StringUtils.round(temp6, 2));
+            vo.setTime(gzzsls.get(i).getPointTime());
+            vos.add(vo);
+        }
 
         return vos;
     }
+
+
+    /**
+     * 风向玫瑰图\风向频率玫瑰图
+     *
+     * @param wpid 预处理数据的id
+     * @param mode 0:单台风机  1:多台风机合并
+     * @return
+     */
+    public Object fxRoses(String wpid, int mode, String Data) throws Exception {
+
+        List<ProBasicWeatherStation> wplsf = CacheContext.weawpls.stream().filter(w -> w.getWindpowerstationId().equals(wpid)).collect(Collectors.toList());
+
+        //转换时间为Date类型
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+        Date date = sdf.parse(Data);
+
+        Calendar calendar = Calendar.getInstance();
+        calendar.setTime(date);
+        calendar.add(Calendar.DAY_OF_MONTH, -1);
+        calendar.set(Calendar.HOUR_OF_DAY, 23);
+        calendar.set(Calendar.MINUTE, 59);
+        calendar.set(Calendar.SECOND, 59);
+
+        Date startTime = calendar.getTime();
+
+        Calendar calendar1 = Calendar.getInstance();
+        calendar1.setTime(date);
+
+        // 获取当前日期
+        Calendar today = Calendar.getInstance();
+        today.set(Calendar.HOUR_OF_DAY, 0);
+        today.set(Calendar.MINUTE, 0);
+        today.set(Calendar.SECOND, 0);
+
+        // 判断是否是当天
+        if (calendar1.get(Calendar.YEAR) == today.get(Calendar.YEAR) &&
+                calendar1.get(Calendar.DAY_OF_YEAR) == today.get(Calendar.DAY_OF_YEAR)) {
+            // 当天，设置endTime为当前时间
+            Date now = new Date();
+            calendar1.setTime(now);
+        } else {
+            // 非当天，设置endTime为传入的date的23:59:59
+            calendar1.set(Calendar.HOUR_OF_DAY, 23);
+            calendar1.set(Calendar.MINUTE, 59);
+            calendar1.set(Calendar.SECOND, 59);
+        }
+        Date endTime = calendar1.getTime();
+
+        ProBasicPowerstationPoint pjfs = null;
+        ProBasicPowerstationPoint pjfx = null;
+
+        List<WindspeedVo> vos = new ArrayList<>();
+
+        for (ProBasicWeatherStation ww : wplsf) {
+            if (ww.getId().contains("GJYF02")) continue;
+
+            pjfs = proBasicPowerstationPointService.getPowerstationPoint(ww.getId(), ContantXk.FCCFTFS70);
+            pjfx = proBasicPowerstationPointService.getPowerstationPoint(ww.getId(), ContantXk.FCCFTFX70);
+
+            List<ProBasicPowerstation> collect = CacheContext.wplsf.stream().filter(c -> c.getId().equals(ww.getWindpowerstationId())).collect(Collectors.toList());
+
+            if (pjfs.getNemCode() != null && !pjfs.getNemCode().equals("INITIAL")) {
+
+                List<PointData> pjfsls = edosUtil.getHistoryDatasSnap(pjfs, startTime.getTime() / 1000, endTime.getTime() / 1000, null, 900L);
+                List<PointData> pjfxls = edosUtil.getHistoryDatasSnap(pjfx, startTime.getTime() / 1000, endTime.getTime() / 1000, null, 900L);
+
+                double temp1 = 0;
+                for (int i = 0; i < pjfsls.size(); i++) {
+                    WindspeedVo vo = new WindspeedVo();
+                    temp1 = pjfsls.get(i).getPointValueInDouble();
+                    vo.setWpid(ww.getId());
+                    vo.setHours(pjfsls.get(i).getPointTime());
+                    vo.setPjfs(temp1);
+                    vos.add(vo);
+                }
+
+                if (pjfxls != null && pjfxls.size() > 1) {
+                    vos.stream().forEach(i -> {
+                        Optional<PointData> optional = pjfxls.stream()
+                                .filter(j -> j.getPointTime().equals(i.getHours()))
+                                .findFirst();
+                        if (optional.isPresent()) {
+                            PointData tqinfoday = optional.get();
+                            i.setPjfx(tqinfoday.getPointValueInDouble());
+                        }
+                    });
+                }
+            }
+
+        }
+
+        List<Object> result = new ArrayList<>();
+        if (mode == 0){
+
+                Map<String, Object> map = new HashMap<>();
+            List<PowerPointData> ls = new ArrayList<>();
+                for (WindspeedVo v : vos) {
+                    PowerPointData data = new PowerPointData();
+                    data.setFx(v.getPjfx());
+                    data.setSpeed(v.getPjfs());
+                    ls.add(data);
+                }
+                map.put("wt", wpid);
+                map.put("roses", WindDirectionALG.fxRoses(ls));
+                map.put("count", WindDirectionALG.fxCountRoses(ls));
+//                map.put("radar", WindDirectionALG.fxRadarRoses(ls));
+//                map.put("frequency", WindDirectionALG.windDeviationPoint(ls));
+                result.add(map);
+
+        }
+        if (mode == 1){
+            List<PowerPointData> ls = new ArrayList<>();
+            for (WindspeedVo obj : vos)
+                ls.addAll(csvParse(obj));
+            Map<String, Object> map = new HashMap<>();
+            map.put("wt", "merge");
+            map.put("roses", WindDirectionALG.fxRoses(ls));
+            map.put("count", WindDirectionALG.fxCountRoses(ls));
+//            map.put("radar", WindDirectionALG.fxRadarRoses(ls));
+//            map.put("frequency", WindDirectionALG.windDeviationPoint(ls));
+            result.add(map);
+        }
+
+        return result;
+    }
+
+    /**
+     * csv 文件解析成对象
+     * @param obj
+     * @return
+     */
+    private List<PowerPointData> csvParse(WindspeedVo obj){
+        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();
+//            if (data.getSpeed() < 0 || data.getPower() < 0)
+//                continue;
+            data.setWtId(obj.getWpid());
+            data.setFx(obj.getPjfx());
+            data.setSpeed(obj.getPjfs());
+            ls.add(data);
+//        }
+        return ls;
+    }
 }

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

@@ -94,6 +94,11 @@ public class ProBasicPowerstationPointServiceImpl extends ServiceImpl<ProBasicPo
                         point = map.get(uniformCode);
                     }
                 }
+            } else if (CacheContext.weatherwppointmap.containsKey(wpId)) {
+                Map<String, ProBasicPowerstationPoint> map = CacheContext.weatherwppointmap.get(wpId);
+                if (map.containsKey(uniformCode)) {
+                    point = map.get(uniformCode);
+                }
             }
         }