From ad89f4965a05d37aeea1481c4ab53e21ab85ca2f Mon Sep 17 00:00:00 2001
From: 于紫祥_1901 <email@yuzixiang_1910>
Date: Wed, 12 Aug 2020 09:32:58 +0800
Subject: [PATCH] 风场图update
---
src/main/java/com/moral/controller/ScreenController.java | 95 ++++++++++++++++++++++++++++++++++++++---------
1 files changed, 77 insertions(+), 18 deletions(-)
diff --git a/src/main/java/com/moral/controller/ScreenController.java b/src/main/java/com/moral/controller/ScreenController.java
index 566eb6d..a4d4a42 100644
--- a/src/main/java/com/moral/controller/ScreenController.java
+++ b/src/main/java/com/moral/controller/ScreenController.java
@@ -1,9 +1,7 @@
package com.moral.controller;
-import java.io.BufferedReader;
-import java.io.ByteArrayInputStream;
-import java.io.InputStream;
-import java.io.InputStreamReader;
+import java.io.*;
+import java.lang.reflect.Array;
import java.text.DateFormat;
import java.text.DecimalFormat;
import java.text.SimpleDateFormat;
@@ -17,7 +15,9 @@
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
+
import com.alibaba.fastjson.JSONObject;
+import com.google.gson.Gson;
import com.googlecode.aviator.AviatorEvaluator;
import com.googlecode.aviator.Expression;
import com.moral.common.bean.Constants;
@@ -29,15 +29,7 @@
import com.moral.common.util.ValidateUtil;
import com.moral.common.util.WebUtils;
import com.moral.common.xml.Version;
-import com.moral.entity.Account;
-import com.moral.entity.AreaNames;
-import com.moral.entity.Device;
-import com.moral.entity.DeviceVersion;
-import com.moral.entity.MapBounds;
-import com.moral.entity.MonitorPoint;
-import com.moral.entity.Organization;
-import com.moral.entity.Point;
-import com.moral.entity.Region;
+import com.moral.entity.*;
import com.moral.entity.alarm.AlarmConfig;
import com.moral.entity.alarm.AlarmConfigValue;
import com.moral.entity.alarm.AlarmSensorLevel;
@@ -65,12 +57,14 @@
import com.moral.service.WeatherService;
import com.moral.util.*;
+import com.rabbitmq.client.*;
+import com.rabbitmq.client.Channel;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
+import jdk.nashorn.internal.runtime.regexp.joni.Regex;
import net.sf.json.JSONString;
-
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.collections.MapUtils;
import org.apache.commons.net.ftp.FTPClient;
@@ -712,8 +706,8 @@
String time = map.get("time").toString();
time = time.substring(time.length() - 2);
map.put("time", Integer.valueOf(time));
- if (parameters.get("type").equals("day")) {
- map.put("time", Integer.valueOf(time) + 1);
+ if(parameters.get("type").equals("day")){
+ map.put("time", Integer.valueOf(time)+1);
}
map.put("value", map.remove(sensorKey));
}
@@ -1916,8 +1910,8 @@
if (minAngle > (Double) longAndLatiList.get(j).get("angle")) {
minAngle = (Double) longAndLatiList.get(j).get("angle");
indexAngle = j;
- } else {
- indexAngle = indexAngle;
+ }else {
+ indexAngle=indexAngle;
}
}
preAngleDeviceList.add(deviceList.get((Integer) longAndLatiList.get(indexAngle).get("h")));
@@ -1953,6 +1947,71 @@
return params;
}
+ @GetMapping("/allDevice")
+ @ResponseBody
+ public Map<String,List> getAllDevice() {
+ List<String> macList=deviceService.getAllMac();
+ Map<String,List> latlngMap=new HashMap<String,List>();
+ Map devMap=null;
+ List list=new ArrayList();
+ for (String mac : macList) {
+ devMap=new HashMap();
+ if (mac!=null){
+ Device device=deviceService.byMacGetDevice(mac);
+ List list1= LatLngTransformation.Convert_BD09_To_GCJ02(device.getLatitude(),device.getLongitude());
+ devMap.put("lat",list1.get(1));
+ devMap.put("lng",list1.get(0));
+ devMap.put("monitorPointId",device.getMonitorPointId());
+ //System.out.println(device);
+ list.add(devMap);
+ }else {
+ continue;
+ }
+ }
+ latlngMap.put("latlng",list);
+ return latlngMap;
+ }
+
+
+
+ @GetMapping("/windAndDeviceData")
+ @ResponseBody
+ public List windAndDeviceData(HttpServletRequest request, String monitorPointId) {
+ 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);
+ }else {
+ mon=(month+1)+"";
+ }
+ 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 + ":" +mu + ":" + "00";
+ String table="history_minutely_"+year+mon;
+ List list=deviceService.byMonitorIdGetDeviceAndWind(monitorPointId,time,table);
+ return list;
+ }
@GetMapping("forecastO3")
@ApiOperation(value = "���������������������������", notes = "���������������������������")
@ApiImplicitParams(value = {
--
Gitblit v1.8.0