From 17d054803583cd870dc15dc16551563ff619c658 Mon Sep 17 00:00:00 2001
From: jpy <812110275@qq.com>
Date: Sat, 27 May 2023 16:12:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
screen-api/src/main/java/com/moral/api/service/impl/HistoryFiveMinutelyServiceImpl.java | 39 +++++++++++++++++++++++++--------------
1 files changed, 25 insertions(+), 14 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/service/impl/HistoryFiveMinutelyServiceImpl.java b/screen-api/src/main/java/com/moral/api/service/impl/HistoryFiveMinutelyServiceImpl.java
index db9b73f..f86fc30 100644
--- a/screen-api/src/main/java/com/moral/api/service/impl/HistoryFiveMinutelyServiceImpl.java
+++ b/screen-api/src/main/java/com/moral/api/service/impl/HistoryFiveMinutelyServiceImpl.java
@@ -32,6 +32,8 @@
import org.springframework.util.ObjectUtils;
import java.util.*;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
/**
* <p>
@@ -161,7 +163,6 @@
//������������
windData = historyFiveMinutelyMapper.getAreaWindData(params);
}
- log.info("���������������{}", windData);
return getWindData(windData);
}
@@ -304,6 +305,8 @@
List<Object> list = new ArrayList<>();
List<Map<String, Object>> mapList = new ArrayList<>();
for (WindData data : windData) {
+
+
//������
Double longitude = data.getLongitude();
//������
@@ -351,20 +354,20 @@
laLaMap.put("maxLa", lama);
laLaMap.put("minLa", lami);
- //Double lo1 = lomi - length * 0.00001141;
- Double lo1 = lomi - length * 0.000001141 * 2;
- //Double lo2 = loma + length * 0.00001141;
- Double lo2 = loma + length * 0.000001141 * 2;
- Double la2 = lami - length * 0.000000899 * 2;
- //Double la2 = lami - length * 0.00000899;
- Double la1 = lama + length * 0.000000899 * 2;
- //Double la1 = lama + length * 0.00000899;
+ Double lo1 = lomi - length * 0.00001141;
+// Double lo1 = lomi - length * 0.000001141 * 2;
+ Double lo2 = loma + length * 0.00001141;
+// Double lo2 = loma + length * 0.000001141 * 2;
+// Double la2 = lami - length * 0.000000899 * 2;
+ Double la2 = lami - length * 0.00000899;
+// Double la1 = lama + length * 0.000000899 * 2;
+ Double la1 = lama + length * 0.00000899;
- //double dx = 0.00001141 * perdlen;
- //double dy = 0.00000899 * perdlen;
+ double dx = 0.00001141 * perdlen;
+ double dy = 0.00000899 * perdlen;
- double dx = 0.000001141 * perdlen * 2;
- double dy = 0.000000899 * perdlen * 2;
+// double dx = 0.000001141 * perdlen * 2;
+// double dy = 0.000000899 * perdlen * 2;
int nx = (int) Math.floor((lo2 - lo1) / dx);
int ny = (int) Math.floor((la1 - la2) / dy);
@@ -376,6 +379,7 @@
int y;
for (int i = 0; i < mapList.size(); i++) {
+
Double lo = (Double) mapList.get(i).get("lo");
Double la = (Double) mapList.get(i).get("la");
x = (int) Math.floor((lo - lo1) / dx);
@@ -425,6 +429,7 @@
}
}
}
+
String uData = "\"" + "data" + "\"" + ": " + uList;
String vData = "\"" + "data" + "\"" + ": " + vList;
@@ -486,5 +491,11 @@
return result;
}
-
+ public static void main(String[] args) {
+ ArrayList<Double> objects = new ArrayList<>();
+ for (int i = 0; i < 7949760L; i++) {
+ objects.add(0.0d);
+ }
+ System.out.println(objects.size());
+ }
}
--
Gitblit v1.8.0