From ac721d301cb218f08244009f7953db45028ee0e6 Mon Sep 17 00:00:00 2001
From: 于紫祥_1901 <email@yuzixiang_1910>
Date: Sat, 10 Oct 2020 11:05:00 +0800
Subject: [PATCH] update
---
src/main/java/com/moral/controller/ScreenController.java | 420 +++++++++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 349 insertions(+), 71 deletions(-)
diff --git a/src/main/java/com/moral/controller/ScreenController.java b/src/main/java/com/moral/controller/ScreenController.java
index ca6b595..5078ce8 100644
--- a/src/main/java/com/moral/controller/ScreenController.java
+++ b/src/main/java/com/moral/controller/ScreenController.java
@@ -1,24 +1,13 @@
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;
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
+import java.util.*;
import java.util.stream.Collectors;
import javax.annotation.Resource;
@@ -26,6 +15,7 @@
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
+
import com.alibaba.fastjson.JSONObject;
import com.googlecode.aviator.AviatorEvaluator;
import com.googlecode.aviator.Expression;
@@ -38,52 +28,23 @@
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;
import com.moral.entity.charts.DataSortCondition;
import com.moral.entity.layout.RealTimeDeviceLayout;
-import com.moral.service.AccountService;
-import com.moral.service.AlarmConfigService;
-import com.moral.service.AlarmDailyService;
-import com.moral.service.AreaService;
-import com.moral.service.DeviceService;
-import com.moral.service.DeviceVersionService;
-import com.moral.service.DictionaryDataService;
-import com.moral.service.HangzhouAqiService;
-import com.moral.service.HistoryDailyService;
-import com.moral.service.HistoryHourlyService;
-import com.moral.service.HistoryMinutelyService;
-import com.moral.service.HistoryService;
-import com.moral.service.MachineActivateService;
-import com.moral.service.MonitorPointService;
-import com.moral.service.OrganizationLayoutService;
-import com.moral.service.OrganizationService;
-import com.moral.service.QualityDailyService;
-import com.moral.service.SensorService;
-import com.moral.service.SensorUnitService;
-import com.moral.service.WeatherService;
-import com.moral.util.AQICalculation;
-import com.moral.util.MyLatLng;
-import com.moral.util.TempAllocationUtils;
+import com.moral.service.*;
+import com.moral.util.*;
-import com.moral.util.mapUtils;
-
+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;
@@ -108,9 +69,9 @@
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.servlet.ModelAndView;
import org.xml.sax.InputSource;
-
import static com.moral.common.util.ResourceUtil.getValue;
import static com.moral.common.util.WebUtils.getParametersStartingWith;
+import static java.util.Calendar.*;
/**
* The Class ScreenController.������������
@@ -135,6 +96,9 @@
MonitorPointService monitorPointService;
@Resource
DeviceVersionService deviceVersionService;
+
+ /* @Resource
+ HistorySpecialService historySpecialService;*/
/**
* The screen service.
@@ -194,6 +158,10 @@
@Resource
private QualityDailyService qualityDailyService;
+
+ @Resource
+ private DeviceRoadService deviceRoadService;
+
/**
* Screen login. ������������
@@ -710,28 +678,43 @@
return new ResultBean<List<MonitorPoint>>(monitorPoints);
}
+
+ /*
+ * ���������monitorPoint=368&mac=p5dnd7a0392018&sensorKey=e92&time=2020-08-11
+ * ���������������������������
+ * */
@GetMapping("report_avg_datas")
public ResultBean<List<Map<String, Object>>> getMonitorPointOrDeviceAvgData(HttpServletRequest request)
throws Exception {
Map<String, Object> parameters = getParametersStartingWith(request, null);
+ //������������������������������������������������
ParameterUtils.getTimeType4Time(parameters);
- parameters.put("monitorPointId", parameters.remove("monitorPoint"));
- Object sensorKey = parameters.remove("sensorKey");
- parameters.put("sensors", Arrays.asList(sensorKey));
- // monitorPointService.isCompensateCalculation(parameters);
- List<Map<String, Object>> list = historyMinutelyService.getMonitorPointOrDeviceAvgData(parameters);
-
- for (Map<String, Object> map : list) {
- 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);
+ String time1= (String) parameters.get("time");
+ String mac1= (String) parameters.get("mac");
+ List<Map<String, Object>> list=null;
+ if (mac1!=null && mac1.equals("p5dnd7a0392018") && time1.substring(0,4).equals("2019") ){
+ list=null;
+ }else {
+ parameters.put("monitorPointId", parameters.remove("monitorPoint"));
+ Object sensorKey = parameters.remove("sensorKey");
+ parameters.put("sensors", Arrays.asList(sensorKey));
+ // monitorPointService.isCompensateCalculation(parameters);
+ list = historyMinutelyService.getMonitorPointOrDeviceAvgData(parameters);
+ for (Map<String, Object> map : list) {
+ 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);
+ }
+ map.put("value", map.remove(sensorKey));
}
- map.put("value", map.remove(sensorKey));
}
return new ResultBean<List<Map<String, Object>>>(list);
}
+
+
+
@GetMapping("report_alarm_datas")
public ResultBean<List<Map<String, Object>>> getAlarmData(HttpServletRequest request) throws Exception {
@@ -1077,6 +1060,13 @@
throws Exception {
Map<String, Object> parameters = WebUtils.getParametersStartingWith(request, null);
List<MonitorPoint> monitorPoints = monitorPointService.getMonitorPointsAndDevicesByRegion(parameters);
+ //������������monitorPoint������������������device.getName()������������
+ for (MonitorPoint monitorPoint : monitorPoints) {
+ List<Device> deviceList=monitorPoint.getDevices();
+ deviceList.sort((Device o1, Device o2) -> {
+ return o1.getName().compareTo(o2.getName());
+ });
+ }
return new ResultBean<List<MonitorPoint>>(monitorPoints);
}
@@ -1519,13 +1509,15 @@
String startHour = st.substring(st.lastIndexOf("-") + 1);
String startTime = startYearAndDay + " " + startHour + ":00:00";
String et = parameters.get("endTime").toString();
+ String endYearAndDay = et.substring(0, st.lastIndexOf("-"));
String endHour = et.substring(et.lastIndexOf("-") + 1);
- int endHourValue = Integer.valueOf(endHour);
+ String endTime=endYearAndDay + " " + endHour + ":00:00";
+ /* int endHourValue = Integer.valueOf(endHour);
int startHourValue = Integer.valueOf(startHour);
if (endHourValue <= startHourValue) {
endHourValue = startHourValue + 1;
}
- String endTime = startYearAndDay + " " + endHourValue + ":00:00";
+ String endTime = startYearAndDay + " " + endHourValue + ":00:00";*/
parameters.put("startTime", startTime);
parameters.put("endTime", endTime);
String mac = parameters.get("mac").toString();
@@ -1540,6 +1532,7 @@
params.put("sensorInfo", sensorList);
params.put("sensorsMap", sensorsMap);
String paramsJson = params.toJSONString();
+ //System.out.println(paramsJson);
model.addObject("carTrajectoryParams", paramsJson);
model.setViewName("cartrajectory");
return model;
@@ -1631,6 +1624,7 @@
@RequestMapping(value = "/newMap-page", method = RequestMethod.GET)
public ModelAndView newMap(ModelAndView model, @RequestParam("areaCode") long code,
@RequestParam("accountId") int accountId) {
+
Account account = accountService.getAccountById(accountId);
List<MonitorPoint> monitorPointList = monitorPointService.getMonitorPointListByAccountId(accountId);
String regionName = areaService.queryFullNameByCode(code);
@@ -1929,8 +1923,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")));
@@ -1966,28 +1960,121 @@
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());
+ if (device.getState()!=4+""){
+ devMap.put("state",device.getState());
+ }
+ 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(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;
+ }
+ String table="history_minutely_"+year+mon;
+ List list=deviceService.byMonitorIdGetDeviceAndWind(monitorPointId,time,table);
+ return list;
+ }
+
+ //������������
+ @GetMapping("/windAndDeviceDataByArea")
+ @ResponseBody
+ public List windAndDeviceDataByArea(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;
+ }
+ String table="history_minutely_"+year+mon;
+ List list=deviceService.byMonitorIdGetDeviceAndWindSpecial(monitorPointId,time,table);
+ return list;
+ }
+
@GetMapping("forecastO3")
@ApiOperation(value = "���������������������������", notes = "���������������������������")
@ApiImplicitParams(value = {
@ApiImplicitParam(name = "monitorPointId", defaultValue = "1", value = "���������id", required = true, paramType = "query", dataType = "String"),
- @ApiImplicitParam(name = "time", value = "������(���������2020-03-19)", required = true, paramType = "query", dataType = "String")})
+ @ApiImplicitParam(name = "time", value = "���6���(���������2020-03-19)", required = true, paramType = "query", dataType = "String")})
public ResultBean<List<Map<String, Object>>> getWeatherNextDayDataByRegion(HttpServletRequest request) throws Exception {
Map<String, Object> parameters = getParametersStartingWith(request, null);
- parameters.put("typeFormat", "%Y-%m-%d %H:%i:%s");
List<Map<String, Object>> resultList = weatherService.getForecastAndReal(parameters);
return new ResultBean<List<Map<String, Object>>>(resultList);
}
@GetMapping("weatherData")
- @ApiOperation(value = "������city���������������������������", notes = "������city���������������������������")
+ @ApiOperation(value = "������city���������������������������������", notes = "������city���������������������������������")
@ApiImplicitParams(value = {
@ApiImplicitParam(name = "city", value = "���������", required = true, paramType = "query", dataType = "String"),
@ApiImplicitParam(name = "time", value = "������(���������2020-03-19)", required = true, paramType = "query", dataType = "String")})
public ResultBean<List<Map<String, Object>>> getWeatherData(HttpServletRequest request) throws Exception {
Map<String, Object> parameters = getParametersStartingWith(request, null);
- parameters.put("typeFormat", "%Y-%m-%d %H:%i:%s");
List<Map<String, Object>> weatherList = weatherService.getWeatherData(parameters);
return new ResultBean<List<Map<String, Object>>>(weatherList);
+ }
+
+ @GetMapping("weatherDataDay")
+ @ApiOperation(value = "������city���������������������", notes = "������city���������������������")
+ @ApiImplicitParams(value = {
+ @ApiImplicitParam(name = "city", value = "���������", required = true, paramType = "query", dataType = "String"),
+ @ApiImplicitParam(name = "time", value = "������(���������2020-03-19)", required = true, paramType = "query", dataType = "String")})
+ public ResultBean<List<Map<String, Object>>> getWeatherDataByDay(HttpServletRequest request) throws Exception {
+ Map<String, Object> parameters = getParametersStartingWith(request, null);
+ List<Map<String, Object>> weatherList = weatherService.getWeatherDataByDay(parameters);
+ return new ResultBean<List<Map<String, Object>>>(weatherList);
+ }
+
+ @GetMapping("monitorDeviceData")
+ @ApiOperation(value = "���������������5������������������������", notes = "���������������5������������������������")
+ @ApiImplicitParams(value = {
+ @ApiImplicitParam(name = "city", value = "���������", required = true, paramType = "query", dataType = "String"),
+ @ApiImplicitParam(name = "time", value = "������(���������2020-03-15)", required = true, paramType = "query", dataType = "String"),
+ @ApiImplicitParam(name = "type", value = "������(5���������m,������������h)", required = true, paramType = "query", dataType = "String"),
+ @ApiImplicitParam(name = "range", value = "������������������������(������������������m,���������a)", required = true, paramType = "query", dataType = "String")})
+ public ResultBean<List<Map<String, Object>>> get5MinutesOrHalfHour(HttpServletRequest request) throws Exception {
+ Map<String, Object> parameters = getParametersStartingWith(request, null);
+ List<Map<String, Object>> deviceData = historyMinutelyService.get5MinutesOrHalfHour(parameters);
+ return new ResultBean<List<Map<String, Object>>>(deviceData);
}
@PostMapping("updateForecastWeather")
@@ -1995,4 +2082,195 @@
Map<String, Object> parameters = getParametersStartingWith(request, null);
weatherService.updateForecastWeather(parameters);
}
+
+ @GetMapping("dataByTimeSlot")
+ @ApiOperation(value = "������������������������������������", notes = "������������������������������������")
+ @ApiImplicitParams(value = {
+ @ApiImplicitParam(name = "mac", value = "mac������", required = true, paramType = "query", dataType = "String"),
+ @ApiImplicitParam(name = "startTime", value = "������������(���������2020-08-03/2020-08-03-13)", required = true, paramType = "query", dataType = "String"),
+ @ApiImplicitParam(name = "endTime", value = "������������(���������2020-08-04/2020-08-04-14)", required = true, paramType = "query", dataType = "String")})
+ public ResultBean<List<Map<String, Object>>> getDataByTimeSlot(HttpServletRequest request) throws Exception {
+ Map<String, Object> parameters = getParametersStartingWith(request, null);
+ String mac = parameters.get("mac").toString();
+ String startTime = parameters.get("startTime").toString();
+ String endTime = parameters.get("endTime").toString();
+ //������������������������������
+ Calendar calendar = getInstance();
+ DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
+ List<Map<String, Object>> list = new ArrayList();
+ Map device = deviceService.getAllFieldByMac(parameters);
+ Map monitorPointMap = monitorPointService.selectAllById(device.get("monitor_point_id").toString());
+ List<Map<String, Object>> device_sensorList = sensorService.getSensorByDeviceId(device.get("id").toString());
+ Map<String, Object> device_sensorUnit_map = new HashMap<>();
+ for (Map<String, Object> device_sensorMap : device_sensorList) {
+ device_sensorUnit_map.put(device_sensorMap.get("sensor_key").toString(),device_sensorMap.get("unit"));
+ }
+ Map<String, String> sensorMap = sensorService.getSensorsMap(parameters);
+ if (startTime.length()==10&&endTime.length()==10){
+ //������������������
+ Date dd = new Date();
+ //���������
+ SimpleDateFormat sim = new SimpleDateFormat("yyyy-MM-dd");
+ //������������������������
+ String nowTime = sim.format(dd);
+ int days = endTime.compareTo(nowTime);
+ //System.out.println(days);
+ List<String> dayList = DatesUtil.findDaysStr(startTime,endTime);
+ //System.out.println("dayList:"+dayList);
+ /*if (days<0){
+ Date date=null;
+ try {
+ date = new SimpleDateFormat("yy-MM-dd").parse(endTime);
+ } catch (ParseException e) {
+ e.printStackTrace();
+ }
+ calendar.setTime(date);
+ int day=calendar.get(Calendar.DATE);
+ calendar.set(Calendar.DATE,day+1);
+
+ endTime=new SimpleDateFormat("yyyy-MM-dd").format(calendar.getTime());
+ }*/
+ List<Map<String, Object>> sameDayHourlyList = null;
+ if (days>=0){
+ SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+ //������������������������
+ String currentTime = df.format(dd);
+ sameDayHourlyList = historyHourlyService.getDataByTimeSlot(mac,nowTime,currentTime);
+ }
+ List<Map<String, Object>> dataList = historyDailyService.getDataByTimeSlot(mac,startTime,endTime);
+ if (dataList.isEmpty()){
+ return null;
+ }
+ Set<String> keys = sensorMap.keySet();
+ for (String key:keys) {
+ Map<String,Object> oneSensorMap = new LinkedHashMap<>();
+ oneSensorMap.put("monitorPointName",monitorPointMap.get("name"));
+ oneSensorMap.put("deviceName",device.get("name"));
+ oneSensorMap.put("sersorKey",sensorMap.get(key)+"���"+device_sensorUnit_map.get(key)+"���");
+ for (String day:dayList) {
+ for (Map<String, Object> dataMap: dataList) {
+ JSONObject dataJson = JSONObject.parseObject(dataMap.get("json").toString());
+ if (dataMap.get("time").toString().equals(day+" 00:00:00.0")){
+ oneSensorMap.put(dataMap.get("time").toString().substring(0,10),dataJson.getJSONArray(key).get(2));
+ break;
+ }else {
+ continue;
+ }
+ }
+ if(!oneSensorMap.containsKey(day)){
+ oneSensorMap.put(day,"");
+ }
+ }
+
+ Double avg = 0.0;
+ if (sameDayHourlyList != null){
+ for (Map sameDayHourlyMap:sameDayHourlyList){
+ List<Double> arr = new ArrayList<>();
+ JSONObject hourlyJson = JSONObject.parseObject(sameDayHourlyMap.get("json").toString());
+ arr.add(Double.parseDouble(hourlyJson.getJSONArray(key).get(2).toString()));
+ Double sum = 0.0;
+ for (int i=0;i<arr.size();i++){
+ sum += arr.get(i);
+ }
+ avg = sum / arr.size();
+ }
+ oneSensorMap.put(nowTime,avg);
+ }
+ list.add(oneSensorMap);
+ }
+ }else if (startTime.length()==13&&endTime.length()==13){
+ StringBuilder startTime_sb = new StringBuilder(startTime);
+ startTime_sb.replace(10,11," ");
+ startTime = startTime_sb.toString()+":00:00";
+ StringBuilder endTime_sb = new StringBuilder(endTime);
+ endTime_sb.replace(10,11," ");
+ endTime = endTime_sb.toString()+":00:00";
+
+ List<String> hoursList = DatesUtil.findHoursStr(startTime,endTime);
+ //System.out.println("hoursList:"+hoursList);
+
+ List<Map<String, Object>> hourlyList = historyHourlyService.getDataByTimeSlot(mac,startTime,endTime);
+ if (hourlyList.isEmpty()){
+ return null;
+ }
+ Set<String> keys = sensorMap.keySet();
+ for (String key:keys) {
+ Map<String,Object> oneSensorMap = new LinkedHashMap<>();
+ oneSensorMap.put("monitorPointName",monitorPointMap.get("name"));
+ oneSensorMap.put("deviceName",device.get("name"));
+ oneSensorMap.put("sersorKey",sensorMap.get(key)+"���"+device_sensorUnit_map.get(key)+"���");
+ for (String hour:hoursList) {
+ for (Map<String, Object> hourlyMap: hourlyList) {
+ JSONObject dataJson = JSONObject.parseObject(hourlyMap.get("json").toString());
+ if (hourlyMap.get("time").toString().equals(hour+".0")){
+ oneSensorMap.put(hourlyMap.get("time").toString().substring(0,19),dataJson.getJSONArray(key).get(2));
+ break;
+ }else {
+ continue;
+ }
+ }
+ if(!oneSensorMap.containsKey(hour)){
+ oneSensorMap.put(hour,"");
+ }
+ }
+ /*for (Map<String, Object> hourlyMap: hourlyList) {
+ JSONObject hourlyJson = JSONObject.parseObject(hourlyMap.get("json").toString());
+ oneSensorMap.put(hourlyMap.get("time").toString().substring(0,19),hourlyJson.getJSONArray(key).get(2));
+
+ }*/
+ list.add(oneSensorMap);
+ }
+ }else {
+ return null;
+ }
+ return new ResultBean<List<Map<String, Object>>>(list);
+ }
+
+
+
+ @GetMapping("/contrastFactor")
+ @ApiOperation(value = "������������", notes = "������������")
+ @ApiImplicitParams(value = {
+ @ApiImplicitParam(name = "mac", value = "������mac", required = true, paramType = "query", dataType = "String"),
+ @ApiImplicitParam(name = "sensor", value = "������", required = true, paramType = "query", dataType = "String"),
+ @ApiImplicitParam(name = "time", value = "������(���������2020-03-19���20���21)", required = true, paramType = "query", dataType = "String")})
+ public ResultBean<List<Map<String, Object>>> contrastFactor(HttpServletRequest request) throws Exception {
+ Map<String, Object> parameters = getParametersStartingWith(request, null);
+ List list=historyHourlyService.getDataByMacAndTime(parameters);
+ //System.out.println(list);
+ return new ResultBean<List<Map<String, Object>>>(list);
+ }
+
+ @GetMapping("/getAlarm")
+ @ResponseBody
+ public List<DeviceRoad> getAlarm(@Param("windData") String windData,@Param("code") String code,@Param("mac") String mac,@Param("speedLevel")String speedLevel){
+ List<DeviceRoad> alarmData = deviceRoadService.getAlarmData(windData, code, mac, speedLevel);
+ return alarmData;
+}
+
+ @GetMapping("/lianxian")
+ @ApiOperation(value = "������", notes = "������" )
+ @ApiImplicitParams(value = {
+ @ApiImplicitParam(name = "lonAndLat", value = "���������", required = true, paramType = "query", dataType = "String")})
+ public ModelAndView lianxian(HttpServletRequest request,ModelAndView model) throws Exception {
+ Map<String, Object> parameters = getParametersStartingWith(request, null);
+ String mac= (String) parameters.get("lonAndLat");
+ String[] ll= mac.split(",");
+
+ JSONObject params = new JSONObject();
+ params.put("ll",ll);
+ Double[] array= {116.885217,38.299148};
+ Double[] array1= {116.87061,38.322828};
+ Double[] array2= {116.855206,38.325162};
+ Double distance1=mapUtils.getDistance(Double.parseDouble(ll[0]),Double.parseDouble(ll[1]),116.885217,38.299148);
+ Double distance2=mapUtils.getDistance(Double.parseDouble(ll[0]),Double.parseDouble(ll[1]),116.87061,38.322828);
+ Double distance3=mapUtils.getDistance(Double.parseDouble(ll[0]),Double.parseDouble(ll[1]),116.855206,38.325162);
+
+ params.put("mt",distance1);
+ params.put("mt1",distance2);
+ params.put("mt2",distance3);
+ model.addObject("params", params);
+ model.setViewName("lianxian");
+ return model;
+ }
}
--
Gitblit v1.8.0