From 2ba556d21ec1c8e0213708c7bbc3f02548ada6c1 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期四, 15 六月 2023 12:14:48 +0800
Subject: [PATCH] 添加 溯源ID 属性
---
src/main/java/com/yssh/entity/Report.java | 16 ++++++++++++++--
1 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/yssh/entity/Report.java b/src/main/java/com/yssh/entity/Report.java
index 6682227..bd41333 100644
--- a/src/main/java/com/yssh/entity/Report.java
+++ b/src/main/java/com/yssh/entity/Report.java
@@ -9,6 +9,9 @@
* @date 2023-06-18
*/
public class Report {
+ @ApiModelProperty(value = "婧簮ID")
+ private String id;
+
@ApiModelProperty(value = "鐐逛綅鍚嶇О")
private String name;
@@ -48,7 +51,8 @@
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) {
+ this.id = id;
this.name = name;
this.lon = lon;
this.lat = lat;
@@ -85,10 +89,18 @@
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,
+ return new Report(wd.getSuYuanId(), wd.getLocationName(), c1.getX(), c1.getY(), wd.getValue(), time,
speed1, dir, maxVal, dis1, maxDir, isSame);
}
+ public String getId() {
+ return id;
+ }
+
+ public void setId(String id) {
+ this.id = id;
+ }
+
public String getName() {
return name;
}
--
Gitblit v1.9.3