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 | 62 +++++++++++++++++++++++++++----
1 files changed, 54 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/yssh/entity/Report.java b/src/main/java/com/yssh/entity/Report.java
index 6682227..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;
@@ -45,10 +43,21 @@
@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;
}
/**
@@ -85,8 +96,19 @@
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() {
@@ -184,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