From 2f55cebbad3dea187a5f91d16ec80a9677dab699 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期三, 13 十一月 2024 11:16:53 +0800
Subject: [PATCH] 1

---
 src/main/java/com/yssh/entity/Report.java |   67 ++++++++++++++++++++++++++++-----
 1 files changed, 56 insertions(+), 11 deletions(-)

diff --git a/src/main/java/com/yssh/entity/Report.java b/src/main/java/com/yssh/entity/Report.java
index a567a72..a6850fa 100644
--- a/src/main/java/com/yssh/entity/Report.java
+++ b/src/main/java/com/yssh/entity/Report.java
@@ -3,12 +3,10 @@
 import com.yssh.utils.CalculateUtils;
 import io.swagger.annotations.ApiModelProperty;
 
-/**
- * 鎶ュ憡
- * @author WWW
- * @date 2023-06-18
- */
 public class Report {
+    @ApiModelProperty(value = "婧簮ID")
+    private String id;
+
     @ApiModelProperty(value = "鐐逛綅鍚嶇О")
     private String name;
 
@@ -39,16 +37,27 @@
     @ApiModelProperty(value = "璺濈")
     private double dis;
 
-    @ApiModelProperty(value = "500m鑼冨洿鏈�澶у�肩殑鏂瑰悜")
+    @ApiModelProperty(value = "500m鑼冨洿鏈�澶у�肩殑椋庡悜")
     private String maxDir;
 
     @ApiModelProperty(value = "鏄惁涓�鑷�")
     private int isSame;
 
+    @ApiModelProperty(value = "鏈�澶у�肩殑ID")
+    private String maxId;
+
+    @ApiModelProperty(value = "鏈�澶у�肩殑鍦板悕")
+    private String maxAddr;
+
+    @ApiModelProperty(value = "婧簮绫�")
+    private SuYuan700 su;
+
     public Report() {
     }
 
-    public Report(String name, double lon, double lat, double val, String time, double speed, String dir, double maxVal, double dis, String maxDir, int isSame) {
+    public Report(String id, String name, double lon, double lat, double val, String time, double speed,
+                  String dir, double maxVal, double dis, String maxDir, int isSame, String maxId, String maxAddr) {
+        this.id = id;
         this.name = name;
         this.lon = lon;
         this.lat = lat;
@@ -60,6 +69,8 @@
         this.dis = dis;
         this.maxDir = maxDir;
         this.isSame = isSame;
+        this.maxId = maxId;
+        this.maxAddr = maxAddr;
     }
 
     /**
@@ -70,7 +81,6 @@
         Coordinate c2 = CalculateUtils.getCoordinate(suMax);
 
         String time = wd.getTableName().replace("su_yuan_", "");
-        double lastVal = 0;
         double speed1 = CalculateUtils.round2(CalculateUtils.getWindSpeed(suYuan.getV(), suYuan.getU()));
         double direction1 = CalculateUtils.getWindDirection(suYuan.getV(), suYuan.getU());
         String dir = CalculateUtils.getDir(direction1);
@@ -83,11 +93,22 @@
 
         double speed2 = CalculateUtils.getWindSpeed(suMax.getV(), suMax.getU());
         double direction2 = CalculateUtils.getWindDirection(suMax.getV(), suMax.getU());
-        String maxDir = CalculateUtils.getDir(angle);
+        String maxDir = CalculateUtils.getDir(direction2); // CalculateUtils.getDir(angle);
         int isSame = (Math.abs(direction1 - direction2) <= 45 && Math.abs(speed1 - speed2) <= 0.5) ? 1 : 0;
 
-        return new Report(wd.getLocationName(), c1.getX(), c1.getY(), wd.getValue(), time,
-                speed1, dir, maxVal, dis1, maxDir, isSame);
+        String[] strs = suMax.getId().split("_");
+        String maxId = (Integer.parseInt(strs[0]) / 10) + "_" + (Integer.parseInt(strs[1]) / 10);
+
+        return new Report(wd.getSuYuanId(), wd.getLocationName(), c1.getX(), c1.getY(), wd.getValue(), time,
+                speed1, dir, maxVal, dis1, maxDir, isSame, maxId, suMax.getAddr());
+    }
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
     }
 
     public String getName() {
@@ -185,4 +206,28 @@
     public void setIsSame(int isSame) {
         this.isSame = isSame;
     }
+
+    public String getMaxId() {
+        return maxId;
+    }
+
+    public void setMaxId(String maxId) {
+        this.maxId = maxId;
+    }
+
+    public String getMaxAddr() {
+        return maxAddr;
+    }
+
+    public void setMaxAddr(String maxAddr) {
+        this.maxAddr = maxAddr;
+    }
+
+    public SuYuan700 getSu() {
+        return su;
+    }
+
+    public void setSu(SuYuan700 su) {
+        this.su = su;
+    }
 }

--
Gitblit v1.9.3