From 22713a6cb6bed3e3f2cdfffae58161fabbb5d120 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期四, 20 七月 2023 10:35:19 +0800
Subject: [PATCH] 1

---
 src/main/java/com/yssh/entity/Report.java |   17 +++++++++++++++--
 1 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/yssh/entity/Report.java b/src/main/java/com/yssh/entity/Report.java
index 84b5628..e582283 100644
--- a/src/main/java/com/yssh/entity/Report.java
+++ b/src/main/java/com/yssh/entity/Report.java
@@ -51,10 +51,14 @@
     @ApiModelProperty(value = "鏈�澶у�肩殑ID")
     private String maxId;
 
+    @ApiModelProperty(value = "鏈�澶у�肩殑鍦板悕")
+    private String maxAddr;
+
     public Report() {
     }
 
-    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) {
+    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;
@@ -68,6 +72,7 @@
         this.maxDir = maxDir;
         this.isSame = isSame;
         this.maxId = maxId;
+        this.maxAddr = maxAddr;
     }
 
     /**
@@ -97,7 +102,7 @@
         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);
+                speed1, dir, maxVal, dis1, maxDir, isSame, maxId, suMax.getAddr());
     }
 
     public String getId() {
@@ -211,4 +216,12 @@
     public void setMaxId(String maxId) {
         this.maxId = maxId;
     }
+
+    public String getMaxAddr() {
+        return maxAddr;
+    }
+
+    public void setMaxAddr(String maxAddr) {
+        this.maxAddr = maxAddr;
+    }
 }

--
Gitblit v1.9.3