From 05022bc66c5596c9230944f14f6c13d65c0a7430 Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Tue, 20 Oct 2020 08:36:39 +0800
Subject: [PATCH] 修改获取六参接口在每五分钟的前二十秒无法获取数据的BUG
---
src/main/java/com/moral/controller/ScreenController.java | 260 ++++++++++++++++++++++++++++-----------------------
1 files changed, 142 insertions(+), 118 deletions(-)
diff --git a/src/main/java/com/moral/controller/ScreenController.java b/src/main/java/com/moral/controller/ScreenController.java
index f7bd691..40c2ba1 100644
--- a/src/main/java/com/moral/controller/ScreenController.java
+++ b/src/main/java/com/moral/controller/ScreenController.java
@@ -39,12 +39,14 @@
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;
@@ -69,6 +71,7 @@
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.*;
@@ -162,6 +165,8 @@
@Resource
private DeviceRoadService deviceRoadService;
+ @Resource
+ private ScreenVersionService screenVersionService;
/**
* Screen login. ������������
@@ -680,21 +685,21 @@
/*
- * ���������monitorPoint=368&mac=p5dnd7a0392018&sensorKey=e92&time=2020-08-11
- * ���������������������������
- * */
+ * ���������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);
- 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 {
+ 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));
@@ -712,8 +717,6 @@
}
return new ResultBean<List<Map<String, Object>>>(list);
}
-
-
@GetMapping("report_alarm_datas")
@@ -862,7 +865,6 @@
List<Map<String, Object>> monitorList = historyMinutelyService.getMonitorPointOrDeviceAvgData(parameters);
List<Map<String, Object>> areaList = hangzhouAqiService.getAreaAvgDataByAreaCode(parameters);
-
if (areaList.isEmpty() && monitorList.isEmpty()) {
return new ResultBean<List<Map<String, Object>>>(resultList);
} else if (areaList.isEmpty()) {
@@ -1062,9 +1064,9 @@
List<MonitorPoint> monitorPoints = monitorPointService.getMonitorPointsAndDevicesByRegion(parameters);
//������������monitorPoint������������������device.getName()������������
for (MonitorPoint monitorPoint : monitorPoints) {
- List<Device> deviceList=monitorPoint.getDevices();
+ List<Device> deviceList = monitorPoint.getDevices();
deviceList.sort((Device o1, Device o2) -> {
- return o1.getName().compareTo(o2.getName());
+ return o1.getName().compareTo(o2.getName());
});
}
return new ResultBean<List<MonitorPoint>>(monitorPoints);
@@ -1511,7 +1513,7 @@
String et = parameters.get("endTime").toString();
String endYearAndDay = et.substring(0, st.lastIndexOf("-"));
String endHour = et.substring(et.lastIndexOf("-") + 1);
- String endTime=endYearAndDay + " " + endHour + ":00:00";
+ String endTime = endYearAndDay + " " + endHour + ":00:00";
/* int endHourValue = Integer.valueOf(endHour);
int startHourValue = Integer.valueOf(startHour);
if (endHourValue <= startHourValue) {
@@ -1923,8 +1925,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")));
@@ -1962,32 +1964,31 @@
@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();
+ 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 = 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());
+ 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 {
+ } else {
continue;
}
}
- latlngMap.put("latlng",list);
+ latlngMap.put("latlng", list);
return latlngMap;
}
-
@GetMapping("/windAndDeviceData")
@@ -1996,17 +1997,17 @@
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";
+ 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;
+ if (month < 10) {
+ mon = "0" + month;
+ } else {
+ mon = "" + month;
}
- String table="history_minutely_"+year+mon;
- List list=deviceService.byMonitorIdGetDeviceAndWind(monitorPointId,time,table);
+ String table = "history_minutely_" + year + mon;
+ List list = deviceService.byMonitorIdGetDeviceAndWind(monitorPointId, time, table);
return list;
}
@@ -2017,17 +2018,17 @@
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";
+ 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;
+ if (month < 10) {
+ mon = "0" + month;
+ } else {
+ mon = "" + month;
}
- String table="history_minutely_"+year+mon;
- List list=deviceService.byMonitorIdGetDeviceAndWindSpecial(monitorPointId,time,table);
+ String table = "history_minutely_" + year + mon;
+ List list = deviceService.byMonitorIdGetDeviceAndWindSpecial(monitorPointId, time, table);
return list;
}
@@ -2078,7 +2079,7 @@
}
@PostMapping("updateForecastWeather")
- public void updateForecastWeather(HttpServletRequest request){
+ public void updateForecastWeather(HttpServletRequest request) {
Map<String, Object> parameters = getParametersStartingWith(request, null);
weatherService.updateForecastWeather(parameters);
}
@@ -2103,10 +2104,10 @@
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"));
+ 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){
+ if (startTime.length() == 10 && endTime.length() == 10) {
//������������������
Date dd = new Date();
//���������
@@ -2115,7 +2116,7 @@
String nowTime = sim.format(dd);
int days = endTime.compareTo(nowTime);
//System.out.println(days);
- List<String> dayList = DatesUtil.findDaysStr(startTime,endTime);
+ List<String> dayList = DatesUtil.findDaysStr(startTime, endTime);
//System.out.println("dayList:"+dayList);
/*if (days<0){
Date date=null;
@@ -2131,86 +2132,86 @@
endTime=new SimpleDateFormat("yyyy-MM-dd").format(calendar.getTime());
}*/
List<Map<String, Object>> sameDayHourlyList = null;
- if (days>=0){
+ if (days >= 0) {
SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
//������������������������
String currentTime = df.format(dd);
- sameDayHourlyList = historyHourlyService.getDataByTimeSlot(mac,nowTime,currentTime);
+ sameDayHourlyList = historyHourlyService.getDataByTimeSlot(mac, nowTime, currentTime);
}
- List<Map<String, Object>> dataList = historyDailyService.getDataByTimeSlot(mac,startTime,endTime);
- if (dataList.isEmpty()){
+ 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) {
+ 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));
+ 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 {
+ } else {
continue;
}
}
- if(!oneSensorMap.containsKey(day)){
- oneSensorMap.put(day,"");
+ if (!oneSensorMap.containsKey(day)) {
+ oneSensorMap.put(day, "");
}
}
Double avg = 0.0;
- if (sameDayHourlyList != null){
- for (Map sameDayHourlyMap:sameDayHourlyList){
+ 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++){
+ for (int i = 0; i < arr.size(); i++) {
sum += arr.get(i);
}
avg = sum / arr.size();
}
- oneSensorMap.put(nowTime,avg);
+ oneSensorMap.put(nowTime, avg);
}
list.add(oneSensorMap);
}
- }else if (startTime.length()==13&&endTime.length()==13){
+ } 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";
+ 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";
+ endTime_sb.replace(10, 11, " ");
+ endTime = endTime_sb.toString() + ":00:00";
- List<String> hoursList = DatesUtil.findHoursStr(startTime,endTime);
+ 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()){
+ 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) {
+ 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));
+ if (hourlyMap.get("time").toString().equals(hour + ".0")) {
+ oneSensorMap.put(hourlyMap.get("time").toString().substring(0, 19), dataJson.getJSONArray(key).get(2));
break;
- }else {
+ } else {
continue;
}
}
- if(!oneSensorMap.containsKey(hour)){
- oneSensorMap.put(hour,"");
+ if (!oneSensorMap.containsKey(hour)) {
+ oneSensorMap.put(hour, "");
}
}
/*for (Map<String, Object> hourlyMap: hourlyList) {
@@ -2220,12 +2221,11 @@
}*/
list.add(oneSensorMap);
}
- }else {
+ } else {
return null;
}
return new ResultBean<List<Map<String, Object>>>(list);
}
-
@GetMapping("/contrastFactor")
@@ -2236,41 +2236,65 @@
@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);
+ 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){
+ 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 = "������" )
+ @GetMapping("multiDeviceContrast")
+ @ApiOperation(value = "���������������������", notes = "���������������������")
@ApiImplicitParams(value = {
- @ApiImplicitParam(name = "lonAndLat", value = "���������", required = true, paramType = "query", dataType = "String")})
- public ModelAndView lianxian(HttpServletRequest request,ModelAndView model) throws Exception {
+ @ApiImplicitParam(name = "macs", value = "������mac,���������������������������", required = true, paramType = "query", dataType = "String"),
+ @ApiImplicitParam(name = "sensorKey", value = "���������key", required = true, paramType = "query", dataType = "String"),
+ @ApiImplicitParam(name = "time", value = "������,������(���������2018-03-12)", required = true, paramType = "query", dataType = "String"),})
+ public ResultBean<List<Map<String, Object>>> multiDeviceSensor(HttpServletRequest request) throws Exception {
Map<String, Object> parameters = getParametersStartingWith(request, null);
- String mac= (String) parameters.get("lonAndLat");
- String[] ll= mac.split(",");
+ ParameterUtils.getTimeType4Time(parameters);
+ List<Map<String, Object>> list = historyMinutelyService.getMultiDeviceSensorData(parameters);
+ return new ResultBean<List<Map<String, Object>>>(list);
+ }
- 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);
+ /*
+ * ���������������������������������������������
+ */
+ @GetMapping("screenVersion")
+ public Map<String, Object> getScreenVersion(HttpServletRequest request) {
+ Map<String, Object> parameters = getParametersStartingWith(request, null);
+ String version = parameters.get("version").toString();
+ return screenVersionService.getScreenVersion(version);
+ }
- params.put("mt",distance1);
- params.put("mt1",distance2);
- params.put("mt2",distance3);
- model.addObject("params", params);
- model.setViewName("lianxian");
- return model;
- }*/
+ @GetMapping("devices-sensors-excel")
+ @ApiOperation(value = "���������������������������������", notes = "���������������������������������")
+ @ApiImplicitParams(value = {
+ @ApiImplicitParam(name = "monitor_point_id", defaultValue = "5", value = "������������id", required = true, paramType = "query", dataType = "String"),
+ @ApiImplicitParam(name = "sensorKey", value = "���������key,������������������", required = true, paramType = "query", dataType = "String"),
+ @ApiImplicitParam(name = "time", value = "������(���������2020-04-09)", required = true, paramType = "query", dataType = "String")})
+ public ResultBean<List<Map<String, Object>>> getDevicesToExcel(HttpServletRequest request) throws Exception {
+ Map<String, Object> parameters = WebUtils.getParametersStartingWith(request, null);
+ ParameterUtils.getTimeType4Time(parameters);
+ /*String[] sensorKeys = parameters.get("sensorKey").toString().split(",");
+ parameters.put("sensorKeys", Arrays.asList(sensorKeys));
+ List<String> macList = new ArrayList<>();
+ List<MonitorPoint> monitorPoints = monitorPointService.getMonitorPointsAndDevicesByRegion(parameters);
+ for (MonitorPoint m : monitorPoints) {
+ for (Device d : m.getDevices()) {
+ macList.add(d.getMac());
+ }
+ }
+ parameters.put("macs", macList);
+ List<Map<String, Object>> list = new ArrayList<>();
+ if (!CollectionUtils.isEmpty(macList)) {
+ list = historyMinutelyService.getDevicesAvgDataToExcel(parameters);
+ }*/
+ List<Map<String, Object>> list = historyMinutelyService.getDevicesSensorsToExcel(parameters);
+ return new ResultBean<List<Map<String, Object>>>(list);
+ }
}
--
Gitblit v1.8.0