From caa8596884dac891a8b5c4fcf85dd2f7a12812f5 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期日, 18 六月 2023 19:33:13 +0800
Subject: [PATCH] 1
---
src/main/java/com/yssh/entity/Report.java | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/yssh/entity/Report.java b/src/main/java/com/yssh/entity/Report.java
index 42c4d25..0208e3b 100644
--- a/src/main/java/com/yssh/entity/Report.java
+++ b/src/main/java/com/yssh/entity/Report.java
@@ -72,23 +72,23 @@
String time = wd.getTableName().replace("su_yuan_", "");
double lastVal = 0;
- double speed1 = CalculateUtils.getWindSpeed(suYuan.getV(), suYuan.getU());
+ double speed1 = CalculateUtils.round2(CalculateUtils.getWindSpeed(suYuan.getV(), suYuan.getU()));
double direction1 = CalculateUtils.getWindDirection(suYuan.getV(), suYuan.getU());
String dir = CalculateUtils.getDir(direction1);
double maxVal = suMax.getVocsValue();
- double dis = CalculateUtils.getDistance2(c1.getX(), c1.getY(), c2.getX(), c2.getY());
+ //double dis = CalculateUtils.getDistance2(c1.getX(), c1.getY(), c2.getX(), c2.getY());
double dis1 = CalculateUtils.getDistance1(c1.getX(), c1.getY(), c2.getX(), c2.getY());
- double angle = CalculateUtils.getAngle(c1.getX(), c1.getY(), c2.getX(), c2.getY());
+ double angle = CalculateUtils.getAngle2(c1.getX(), c1.getY(), c2.getX(), c2.getY());
double speed2 = CalculateUtils.getWindSpeed(suMax.getV(), suMax.getU());
double direction2 = CalculateUtils.getWindDirection(suMax.getV(), suMax.getU());
- String maxDir = CalculateUtils.getDir(direction2);
- int isSame = (Math.abs(direction1 - direction2) < 15 && Math.abs(speed1 - speed2) < 0.3) ? 1 : 0;
+ String maxDir = CalculateUtils.getDir(angle);
+ int isSame = (Math.abs(direction1 - direction2) < 30 && Math.abs(speed1 - speed2) < 0.5) ? 1 : 0;
return new Report(wd.getLocationName(), c1.getX(), c1.getY(), wd.getValue(), lastVal, time,
- speed1, dir, maxVal, dis, maxDir, isSame);
+ speed1, dir, maxVal, dis1, maxDir, isSame);
}
public String getName() {
--
Gitblit v1.9.3