From a70d997b5b21ece4205ef50f04e86442a077657f Mon Sep 17 00:00:00 2001
From: chen_xi <276999030@qq.com>
Date: Fri, 30 Jun 2023 10:50:22 +0800
Subject: [PATCH] 补充提交
---
screen-api/src/main/java/com/moral/api/service/impl/HistoryFiveMinutelyServiceImpl.java | 36 ++++++++++++++++--------------------
1 files changed, 16 insertions(+), 20 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..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
@@ -2,10 +2,7 @@
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSON;
-import com.baomidou.mybatisplus.core.conditions.ISqlSegment;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.segments.MergeSegments;
-import com.baomidou.mybatisplus.core.conditions.segments.NormalSegmentList;
import com.moral.api.config.mybatis.MybatisPlusConfig;
import com.moral.api.entity.*;
import com.moral.api.mapper.HistoryFiveMinutelyMapper;
@@ -161,7 +158,6 @@
//������������
windData = historyFiveMinutelyMapper.getAreaWindData(params);
}
- log.info("���������������{}", windData);
return getWindData(windData);
}
@@ -350,25 +346,23 @@
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 * 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);
-
List<Double> uList = new ArrayList<>();
List<Double> vList = new ArrayList<>();
@@ -376,6 +370,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 +420,8 @@
}
}
}
+
+
String uData = "\"" + "data" + "\"" + ": " + uList;
String vData = "\"" + "data" + "\"" + ": " + vList;
@@ -442,6 +439,7 @@
String s1 = "[" + "{" + header1 + ", " + uData + "}" + ", " + "{" + header2 + ", " + vData + "}" + "]";
+ //System.out.println(s1);
JSONArray jsonArray = JSONArray.parseArray(s1);
list.add(jsonArray);
@@ -485,6 +483,4 @@
MybatisPlusConfig.tableName.remove();
return result;
}
-
-
}
--
Gitblit v1.8.0