From 0d3583b86f33b7839a4a7d0917a70ab0eb9f1eb2 Mon Sep 17 00:00:00 2001
From: 于紫祥_1901 <email@yuzixiang_1910>
Date: Thu, 13 Aug 2020 10:07:33 +0800
Subject: [PATCH] 风场图update
---
src/main/java/com/moral/util/LatLngTransformation.java | 1
src/main/java/com/moral/controller/ScreenController.java | 45 ++++++----------------
src/main/java/com/moral/service/impl/DeviceServiceImpl.java | 45 ++--------------------
3 files changed, 18 insertions(+), 73 deletions(-)
diff --git a/src/main/java/com/moral/controller/ScreenController.java b/src/main/java/com/moral/controller/ScreenController.java
index f47e3e1..7535f2a 100644
--- a/src/main/java/com/moral/controller/ScreenController.java
+++ b/src/main/java/com/moral/controller/ScreenController.java
@@ -91,6 +91,7 @@
import static com.moral.common.util.ResourceUtil.getValue;
import static com.moral.common.util.WebUtils.getParametersStartingWith;
+import static java.util.Calendar.*;
/**
* The Class ScreenController.������������
@@ -1975,39 +1976,19 @@
@GetMapping("/windAndDeviceData")
@ResponseBody
- public List windAndDeviceData() {
- String monitorPointId="539";
- Calendar c = Calendar.getInstance();//������������������������������������ ������������������������������
- int year = c.get(Calendar.YEAR);
- int month = c.get(Calendar.MONTH);
- String mon="";
- if (month+1<10){
- mon="0"+(month+1);
+ public List windAndDeviceData(String monitorPointId) {
+ Calendar calendar = Calendar.getInstance();
+ calendar.set(Calendar.MINUTE, (calendar.get(Calendar.MINUTE) - 2));
+ SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm");
+ String time = df.format(calendar.getTime())+":00";
+ int year = calendar.get(Calendar.YEAR);
+ int month = calendar.get(Calendar.MONTH) + 1;
+ String mon;
+ if (month<10){
+ mon="0"+month;
}else {
- mon=(month+1)+"";
+ mon=""+month;
}
- int date = c.get(Calendar.DATE);
- String dt="";
- if(date<10){
- dt="0"+date;
- }else {
- dt=""+date;
- }
- int hour = c.get(Calendar.HOUR_OF_DAY);
- String hu="";
- if (hour<10){
- hu="0"+hour;
- }else {
- hu=""+hour;
- }
- int minute = c.get(Calendar.MINUTE);
- String mu="";
- if (minute<10){
- mu="0"+minute;
- }else {
- mu=""+minute;
- }
- String time=year + "-" + mon + "-" + dt + " " +hu + ":" +46 + ":" + "00";
String table="history_minutely_"+year+mon;
List list=deviceService.byMonitorIdGetDeviceAndWind(monitorPointId,time,table);
return list;
@@ -2052,7 +2033,7 @@
String startTime = parameters.get("startTime").toString();
String endTime = parameters.get("endTime").toString();
//������������������������������
- Calendar calendar = Calendar.getInstance();
+ Calendar calendar = getInstance();
DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
List<Map<String, Object>> list = new ArrayList();
Map device = deviceService.getAllFieldByMac(parameters);
diff --git a/src/main/java/com/moral/service/impl/DeviceServiceImpl.java b/src/main/java/com/moral/service/impl/DeviceServiceImpl.java
index 6ef4f98..aa5a013 100644
--- a/src/main/java/com/moral/service/impl/DeviceServiceImpl.java
+++ b/src/main/java/com/moral/service/impl/DeviceServiceImpl.java
@@ -719,65 +719,30 @@
@Override
public List byMonitorIdGetDeviceAndWind(String id,String time,String tab) {
-
List<DeviceAndWind> deviceAndWinds=deviceMapper.byMonitorIdGetDeviceAndWind(Integer.parseInt(id),time,tab);
System.out.println(time);
List loList=new ArrayList();
List laList=new ArrayList();
Double U=0.0;
Double V=0.0;
- log.info("deviceAndWinds="+deviceAndWinds.size());
for (DeviceAndWind andWind : deviceAndWinds) {
Double lo=andWind.getLongitude();
Double la=andWind.getLatitude();
- log.info("lo="+lo);
List list= LatLngTransformation.Convert_BD09_To_GCJ02(la,lo);
- log.info("list2="+list);
Double transLo=(Double) list.get(0);
Double transLa=(Double) list.get(1);
loList.add(transLo);
laList.add(transLa);
}
- log.info(loList.size());
- log.info(loList);
- Double loma=0.0;
- Double lomi=0.0;
- Double lama=0.0;
- Double lami=0.0;
-
-
- if (loList.size()>0){
- loma= (Double) loList.get(0);
- lomi= (Double) loList.get(0);
- }
- if (laList.size()>0){
- lama= (Double) laList.get(0);
- lami= (Double) laList.get(0);
- }
- for (int i = 1; i <loList.size() ; i++) {
- if (loma<=(Double) loList.get(i)){
- loma=(Double) loList.get(i);
- }
- if (lomi>=(Double) loList.get(i)){
- lomi=(Double) loList.get(i);
- }
- }
-
- for (int i = 1; i <laList.size() ; i++) {
- if (lama<=(Double) laList.get(i)){
- lama=(Double) laList.get(i);
- }
- if (lami>=(Double) laList.get(i)){
- lami=(Double) laList.get(i);
- }
- }
-
+ Double loma= (Double) Collections.max(loList);
+ Double lomi= (Double) Collections.min(loList);
+ Double lama= (Double) Collections.max(laList);
+ Double lami= (Double) Collections.min(laList);
Map laLaMap=new HashMap();
laLaMap.put("maxLo",loma);
laLaMap.put("minLo",lomi);
laLaMap.put("maxLa",lama);
- laLaMap.put("lami",lami);
- System.out.println(laLaMap);
+ laLaMap.put("minLa",lami);
Double lo1=lomi-250*0.00001141;
Double lo2=loma+250*0.00001141;
diff --git a/src/main/java/com/moral/util/LatLngTransformation.java b/src/main/java/com/moral/util/LatLngTransformation.java
index 1000cd5..cc445a0 100644
--- a/src/main/java/com/moral/util/LatLngTransformation.java
+++ b/src/main/java/com/moral/util/LatLngTransformation.java
@@ -41,7 +41,6 @@
lat = z * Math.sin(theta);
list.add(lng);
list.add(lat);
- log.info("list="+list);
return list;
}
}
--
Gitblit v1.8.0