From 17b02d1c3496999bf67c88616379d514ca986b67 Mon Sep 17 00:00:00 2001
From: jpy <812110275@qq.com>
Date: Sat, 27 May 2023 16:52:10 +0800
Subject: [PATCH] test
---
screen-api/src/main/java/com/moral/api/service/impl/HistoryFiveMinutelyServiceImpl.java | 27 ++++++++++++++-------------
1 files changed, 14 insertions(+), 13 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 bcac3d4..1328f06 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
@@ -346,21 +346,20 @@
laLaMap.put("minLo", lomi);
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 * 4;
- //Double lo2 = loma + length * 0.00001141;
- Double lo2 = loma + length * 0.000001141 * 4;
- Double la2 = lami - length * 0.000000899 * 4;
- //Double la2 = lami - length * 0.00000899;
- Double la1 = lama + length * 0.000000899 * 4;
- //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 * 4;
- double dy = 0.000000899 * perdlen * 4;
+ //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);
@@ -422,6 +421,7 @@
}
}
+
String uData = "\"" + "data" + "\"" + ": " + uList;
String vData = "\"" + "data" + "\"" + ": " + vList;
@@ -439,6 +439,7 @@
String s1 = "[" + "{" + header1 + ", " + uData + "}" + ", " + "{" + header2 + ", " + vData + "}" + "]";
+ //System.out.println(s1);
JSONArray jsonArray = JSONArray.parseArray(s1);
list.add(jsonArray);
--
Gitblit v1.8.0