From 9a3d7f190717a6e3af608ffa0d78c66b6bcc0e8a Mon Sep 17 00:00:00 2001
From: 于紫祥_1901 <email@yuzixiang_1910>
Date: Thu, 10 Sep 2020 15:23:07 +0800
Subject: [PATCH] 因子对比
---
src/main/java/com/moral/controller/ScreenController.java | 970 ++++++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 829 insertions(+), 141 deletions(-)
diff --git a/src/main/java/com/moral/controller/ScreenController.java b/src/main/java/com/moral/controller/ScreenController.java
index 0a39b4f..637e37d 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;
@@ -15,32 +13,9 @@
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
-import org.apache.commons.collections.CollectionUtils;
-import org.apache.commons.collections.MapUtils;
-import org.apache.commons.net.ftp.FTPClient;
-import org.apache.log4j.Logger;
-import org.dom4j.Document;
-import org.dom4j.Element;
-import org.dom4j.io.SAXReader;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.cglib.beans.BeanMap;
-import org.springframework.data.redis.core.RedisTemplate;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.util.ObjectUtils;
-import org.springframework.web.bind.annotation.CrossOrigin;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.bind.annotation.RestController;
-import org.springframework.web.servlet.ModelAndView;
-import org.xml.sax.InputSource;
-
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;
@@ -53,15 +28,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;
@@ -87,16 +54,43 @@
import com.moral.service.SensorService;
import com.moral.service.SensorUnitService;
import com.moral.service.WeatherService;
-import com.moral.util.AQICalculation;
-import com.moral.util.TempAllocationUtils;
+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;
+import org.apache.ibatis.annotations.Param;
+import org.apache.log4j.Logger;
+import org.dom4j.Document;
+import org.dom4j.Element;
+import org.dom4j.io.SAXReader;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.cglib.beans.BeanMap;
+import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.util.ObjectUtils;
+import org.springframework.web.bind.annotation.CrossOrigin;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.ResponseBody;
+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.������������
@@ -180,6 +174,7 @@
@Resource
private QualityDailyService qualityDailyService;
+
/**
* Screen login. ������������
@@ -594,6 +589,12 @@
return sensorsMapList;
}
+ @GetMapping("/getSensorsAllMap")
+ public List<Map<String, String>> getSensorsAllMap(String mac) {
+ List<Map<String, String>> sensorsMapList = sensorService.getSensorsAllMap();
+ return sensorsMapList;
+ }
+
@RequestMapping(value = "/get-monitorpoints", method = RequestMethod.GET)
@ResponseBody
public ResultBean getMonitorpointList(@RequestParam("orgId") String orgId, MapBounds mapBounds,
@@ -612,6 +613,15 @@
@RequestMapping(value = "/get-devices", method = RequestMethod.GET)
@ResponseBody
+ @ApiOperation(value = "������������", notes = "������������")
+ @ApiImplicitParams(value = {
+ @ApiImplicitParam(name = "orgId", defaultValue = "5", value = "������Id", required = true, paramType = "query", dataType = "Integer"),
+ @ApiImplicitParam(name = "regionCode", defaultValue = "320583", value = "������������", required = true, paramType = "query", dataType = "String"),
+ @ApiImplicitParam(name = "Fe", defaultValue = "31.485018", value = "���������������", required = true, paramType = "query", dataType = "String"),
+ @ApiImplicitParam(name = "Ge", defaultValue = "121.378395", value = "���������������", required = true, paramType = "query", dataType = "String"),
+ @ApiImplicitParam(name = "Ke", defaultValue = "31.296614", value = "���������������", required = true, paramType = "query", dataType = "String"),
+ @ApiImplicitParam(name = "Le", defaultValue = "120.59651", value = "���������������", required = true, paramType = "query", dataType = "String")
+ })
public ResultBean getDevices(@RequestParam("orgId") Integer orgId, MapBounds mapBounds,
@RequestParam("regionCode") String regionCode) {
ResultBean<List<Device>> resultBean = new ResultBean();
@@ -696,6 +706,9 @@
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));
}
return new ResultBean<List<Map<String, Object>>>(list);
@@ -838,119 +851,131 @@
parameters.put("monitorPointId", parameters.remove("monitorPoint"));
parameters.put("areaCode", parameters.remove("areaCode"));
String[] sensorKeys = parameters.remove("sensorKey").toString().split(",");
+ String type = parameters.get("type").toString();
String s = sensorKeys[0];
parameters.put("sensors", Arrays.asList(sensorKeys));
parameters.put("sensors2", s);
- List<Map<String, Object>> monitorList = historyMinutelyService.getMonitorPointOrDeviceAvgData(parameters);
- for (Map<String, Object> monitorMap : monitorList) {
- String time = monitorMap.get("time").toString();
- time = time.substring(time.length() - 2);
- monitorMap.put("time", Integer.valueOf(time));
- }
- Integer maxTime = 0;
- Integer max1 = 0;
- if (monitorList.size() != 0) {
- Map<String, Object> monitorMap = monitorList.get(monitorList.size() - 1);
- max1 = Integer.valueOf(monitorMap.get("time").toString());
- } else {
- max1 = 0;
- }
- String sensorKey1 = s;
- switch (s) {
- case "e1":
- sensorKey1 = "PM2_5";
- break;
- case "e2":
- sensorKey1 = "PM10";
- break;
- case "e10":
- sensorKey1 = "CO";
- break;
- case "e11":
- sensorKey1 = "SO2";
- break;
- case "e15":
- sensorKey1 = "O3";
- break;
- case "e16":
- sensorKey1 = "NO2";
- break;
- default:
- break;
- }
-
- parameters.put("sensors1", sensorKey1);
-
- List<Map<String, Object>> areaList = historyMinutelyService.getAreaAvgDataByAreaCode(parameters);
-
- if (areaList.isEmpty()) {
- Integer areaCode = Integer.valueOf(request.getParameter("areaCode"));
- areaCode = hangzhouAqiService.queryCityCode(areaCode);
- parameters.remove("areaCode");
- parameters.put("areaCode", String.valueOf(areaCode));
- areaList = historyMinutelyService.getAreaAvgDataByAreaCode(parameters);
- }
-
- for (Map<String, Object> areaMap : areaList) {
- String time = areaMap.get("time").toString();
- time = time.substring(time.length() - 2);
- areaMap.put("time", Integer.valueOf(time));
- }
-
- Integer max = 0;
- if (areaList.size() != 0) {
- Map<String, Object> areaMap = areaList.get(areaList.size() - 1);
- max = Integer.valueOf(areaMap.get("time").toString());
- } else {
- max = 0;
- }
-
- if (max1 >= max) {
- maxTime = max1;
- } else {
- maxTime = max;
- }
ArrayList<Map<String, Object>> resultList = new ArrayList<>();
- for (int i = 0; i <= maxTime; i++) {
- resultList.add(null);
+ 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()) {
+ resultList.addAll(monitorList);
+ for (Map<String, Object> resultMap : resultList) {
+ String time = resultMap.get("time").toString();
+ time = time.substring(time.length() - 2);
+ resultMap.put("time", Integer.valueOf(time));
+ List<String> values = new ArrayList<>();
+ values.add("");
+ values.add(resultMap.remove(s).toString());
+ resultMap.put("values", values);
+ }
+ return new ResultBean<List<Map<String, Object>>>(resultList);
+ } else if (monitorList.isEmpty()) {
+ resultList.addAll(areaList);
+ for (Map<String, Object> resultMap : resultList) {
+ String time = resultMap.get("time").toString();
+ time = time.substring(time.length() - 2);
+ resultMap.put("time", Integer.valueOf(time));
+ List<String> values = new ArrayList<>();
+ values.add(resultMap.remove(s).toString());
+ values.add("");
+ resultMap.put("values", values);
+ }
+ return new ResultBean<List<Map<String, Object>>>(resultList);
}
- for (Map<String, Object> areaMap : areaList) {
- Integer time = Integer.valueOf(areaMap.get("time").toString());
- resultList.set(time, areaMap);
+ for (Map<String, Object> map : areaList) {
+ String time = map.get("time").toString();
+ time = time.substring(time.length() - 2);
+ map.put("time", Integer.valueOf(time));
}
- for (Map<String, Object> resultMap : resultList) {
- for (Map<String, Object> monitorMap : monitorList) {
- ArrayList<String> values = new ArrayList<>();
- String monitorTime = monitorMap.get("time").toString();
- if (resultMap != null) {
- String resultTime = resultMap.get("time").toString();
- if (resultTime.equals(monitorTime)) {
- String value = resultMap.remove(s).toString();
- String value1 = monitorMap.get(s).toString();
- values.add(value);
- values.add(value1);
- resultMap.put("values", values);
- }
- } else {
- String value1 = monitorMap.get(s).toString();
- values.add(null);
- values.add(value1);
- }
+ for (Map<String, Object> m : monitorList) {
+ String time = m.get("time").toString();
+ time = time.substring(time.length() - 2);
+ m.put("time", Integer.valueOf(time));
+ }
+
+ Integer maxTime;
+ Map<String, Object> areaMap = areaList.get(areaList.size() - 1);
+ Integer areaMax = Integer.valueOf(areaMap.get("time").toString());
+ Map<String, Object> monitorMap = monitorList.get(monitorList.size() - 1);
+ Integer monitorMax = Integer.valueOf(monitorMap.get("time").toString());
+
+ if (type.equals("day")) {
+ if (areaMax >= monitorMax) {
+ maxTime = areaMax + 1;
+ } else {
+ maxTime = monitorMax + 1;
+ }
+ } else {
+ if (areaMax >= monitorMax) {
+ maxTime = areaMax;
+ } else {
+ maxTime = monitorMax;
}
}
- resultList.removeAll(Collections.singleton(null));
+ for (int i = 0; i < maxTime; i++) {
+ resultList.add(null);
+ }
- for (Map<String, Object> resultMap : resultList) {
- if (resultMap.containsKey(s)) {
+ for (Map<String, Object> map : areaList) {
+ Integer time = Integer.valueOf(map.get("time").toString());
+ if (type.equals("day")) {
+ resultList.set(time, map);
+ } else {
+ resultList.set(time - 1, map);
+ }
+ }
+
+ for (int i = 0; i < resultList.size(); i++) {
+ if (resultList.get(i) == null) {
+ Map<String, Object> hashMap = new HashMap<>();
+ if (type.equals("day")) {
+ hashMap.put("time", i);
+ } else {
+ hashMap.put("time", i + 1);
+ }
+ hashMap.put(s, "");
+ resultList.set(i, hashMap);
+ }
+ }
+
+ for (Map<String, Object> map1 : monitorList) {
+ ArrayList<String> values = new ArrayList<>();
+ Integer time = Integer.valueOf(map1.get("time").toString());
+ Map<String, Object> map;
+ if (type.equals("day")) {
+ map = resultList.get(time);
+ } else {
+ map = resultList.get(time - 1);
+ }
+ values.add(map.remove(s).toString());
+ values.add(map1.get(s).toString());
+ map.put("values", values);
+ }
+
+ for (Map<String, Object> map : resultList) {
+ if (map.containsKey(s)) {
ArrayList<String> values = new ArrayList<>();
- values.add(resultMap.remove(s).toString());
- values.add(null);
- resultMap.put("values", values);
+ values.add(map.remove(s).toString());
+ values.add("");
+ map.put("values", values);
+ }
+ }
+
+ Iterator<Map<String, Object>> it = resultList.iterator();
+ while (it.hasNext()) {
+ Map<String, Object> next = it.next();
+ ArrayList<String> values = (ArrayList<String>) next.get("values");
+ if (values.get(0).equals("") && values.get(1).equals("")) {
+ it.remove();
}
}
return new ResultBean<List<Map<String, Object>>>(resultList);
@@ -1163,9 +1188,7 @@
public ResultBean<Map<String, Object>> getSensor(HttpServletRequest request) throws Exception {
Map<String, Object> parameters = WebUtils.getParametersStartingWith(request, null);
String mac = (String) parameters.get("mac");
- //System.out.println("ScreenController-----getSensor-----mac:"+mac);
Map<String, Object> map = sensorUnitService.getSensorByMac(mac);
- System.out.println("ScreenController-----getSensor-----map:"+map);
return new ResultBean<Map<String, Object>>(map);
}*/
@@ -1233,7 +1256,6 @@
})
public ResultBean<List<Map<String, Object>>> AIForecast(HttpServletRequest request) throws Exception {
Map<String, Object> parameters = getParametersStartingWith(request, null);
- //System.out.println(parameters);
String monitorPoint = (String) parameters.get("monitorPoint");
String intoTime = parameters.get("time").toString();
Date date = new SimpleDateFormat("yy-MM-dd").parse(intoTime);
@@ -1512,6 +1534,54 @@
}
}
+ @GetMapping("/trajectoryDataShow")
+ @ApiOperation(value = "���������������", notes = "���������������")
+ @ApiImplicitParams(value = {
+ @ApiImplicitParam(name = "mac", value = "������mac������������p5dnd7a0392081���", required = true, paramType = "query", dataType = "String"),
+ @ApiImplicitParam(name = "startTime", value = "������������(���������2020-03-19-14)", required = true, paramType = "query", dataType = "String"),
+ @ApiImplicitParam(name = "endTime", value = "������������(���������2020-03-19-17)", required = true, paramType = "query", dataType = "String")
+ })
+ public ModelAndView trajectoryDataShow(ModelAndView model, HttpServletRequest request) throws Exception {
+ Map<String, Object> parameters = WebUtils.getParametersStartingWith(request, null);
+ String st = parameters.get("startTime").toString();
+ String startYearAndDay = st.substring(0, st.lastIndexOf("-"));
+ String startHour = st.substring(st.lastIndexOf("-") + 1);
+ String startTime = startYearAndDay + " " + startHour + ":00:00";
+ String et = parameters.get("endTime").toString();
+ String endHour = et.substring(et.lastIndexOf("-") + 1);
+ int endHourValue = Integer.valueOf(endHour);
+ int startHourValue = Integer.valueOf(startHour);
+ if (endHourValue <= startHourValue) {
+ endHourValue = startHourValue + 1;
+ }
+ String endTime = startYearAndDay + " " + endHourValue + ":00:00";
+ parameters.put("startTime", startTime);
+ parameters.put("endTime", endTime);
+ String mac = parameters.get("mac").toString();
+ if (mac != null && mac.length() != 0) {
+ List<List<Map<String, Object>>> sensorData = historyService.getCarSensorData(parameters);
+ Map<String, String> sensorsMap = sensorService.getSensorsMap(parameters);
+ List<Map<String, Object>> sensorList = new ArrayList<>();
+ if (sensorData.size() == 3) {
+ sensorList = sensorData.get(0);
+ }
+ JSONObject params = new JSONObject();
+ params.put("sensorInfo", sensorList);
+ params.put("sensorsMap", sensorsMap);
+ String paramsJson = params.toJSONString();
+ model.addObject("trajectoryParams", paramsJson);
+ model.setViewName("trajectorydatashow");
+ return model;
+ } else {
+ StringBuilder msg = new StringBuilder();
+ msg.append(" param[0] mac:");
+ msg.append(mac);
+ log.warn(msg);
+ model.setViewName("403");
+ return model;
+ }
+ }
+
@GetMapping("device-excel")
@ApiOperation(value = "������������������������", notes = "������������������������")
@ApiImplicitParams(value = {
@@ -1539,4 +1609,622 @@
return new ResultBean<List<Map<String, Object>>>(list);
}
+ @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);
+
+ if (account != null && regionName != null) {
+ Object sensors = sensorService.queryAll();
+ JSONObject params = new JSONObject();
+ params.put("regionCode", code);
+ params.put("regionName", regionName);
+ params.put("accountId", accountId);
+ params.put("orgId", account.getOrganizationId());
+ params.put("sensors", sensors);
+ String paramsJson = params.toJSONString();
+ model.addObject("mapParams", paramsJson);
+ model.setViewName("newmap");
+ return model;
+ } else {
+ StringBuilder msg = new StringBuilder();
+ msg.append(" param[0] areaCode:");
+ msg.append(code);
+ msg.append(" param[0] accountId:");
+ msg.append(accountId);
+ log.warn(msg);
+ model.setViewName("403");
+ return model;
+ }
+ }
+
+ @GetMapping("/uavDroppoint")
+ @ApiOperation(value = "���������������������", notes = "���������������������")
+ @ApiImplicitParams(value = {
+ @ApiImplicitParam(name = "mac", value = "������mac������������p5dnd7a0392068���", required = true, paramType = "query", dataType = "String"),
+ @ApiImplicitParam(name = "sensorKey", value = "���������key", required = true, paramType = "query", dataType = "String"),
+ @ApiImplicitParam(name = "startTime", value = "������������(���������2019-07-17-17)", required = true, paramType = "query", dataType = "String"),
+ @ApiImplicitParam(name = "endTime", value = "������������(���������2019-07-17-18)", required = true, paramType = "query", dataType = "String")
+ })
+ public ModelAndView uavDroppoint(ModelAndView model, HttpServletRequest request) throws Exception {
+ Map<String, Object> parameters = WebUtils.getParametersStartingWith(request, null);
+ String st = parameters.get("startTime").toString();
+ String startYearAndDay = st.substring(0, st.lastIndexOf("-"));
+ String startHour = st.substring(st.lastIndexOf("-") + 1);
+ String startTime = startYearAndDay + " " + startHour + ":00:00";
+ String et = parameters.get("endTime").toString();
+ String endHour = et.substring(et.lastIndexOf("-") + 1);
+ int endHourValue = Integer.valueOf(endHour);
+ int startHourValue = Integer.valueOf(startHour);
+ if (endHourValue <= startHourValue) {
+ endHourValue = startHourValue + 1;
+ }
+ String endTime = startYearAndDay + " " + endHourValue + ":00:00";
+ parameters.put("startTime", startTime);
+ parameters.put("endTime", endTime);
+ String mac = parameters.get("mac").toString();
+ if (mac != null && mac.length() != 0) {
+ List<Map<String, Object>> sensorData = historyService.getUavSensorData(parameters);
+ Map<String, String> sensorsMap = sensorService.getSensorsMap(parameters);
+ JSONObject params = new JSONObject();
+ params.put("sensorInfo", sensorData);
+ params.put("sensorsMap", sensorsMap);
+ params.put("sensorKey", parameters.get("sensorKey"));
+ params.put("unit", parameters.get("unit"));
+ params.put("description", parameters.get("description"));
+ String paramsJson = params.toJSONString();
+ model.addObject("uavDroppointParams", paramsJson);
+ model.setViewName("uavdroppoint");
+ return model;
+ } else {
+ StringBuilder msg = new StringBuilder();
+ msg.append(" param[0] mac:");
+ msg.append(mac);
+ log.warn(msg);
+ model.setViewName("403");
+ return model;
+ }
+ }
+
+ @GetMapping("/uavChannel")
+ @ApiOperation(value = "������������������������������", notes = "������������������������������")
+ @ApiImplicitParams(value = {
+ @ApiImplicitParam(name = "mac", value = "������mac������������p5dnd7a0392068���", required = true, paramType = "query", dataType = "String"),
+ @ApiImplicitParam(name = "sensorKey", value = "���������key", required = true, paramType = "query", dataType = "String"),
+ @ApiImplicitParam(name = "startTime", value = "������������(���������2019-07-17-17)", required = true, paramType = "query", dataType = "String"),
+ @ApiImplicitParam(name = "endTime", value = "������������(���������2019-07-17-18)", required = true, paramType = "query", dataType = "String")
+ })
+ public ModelAndView uavChannel(ModelAndView model, HttpServletRequest request) throws Exception {
+ Map<String, Object> parameters = WebUtils.getParametersStartingWith(request, null);
+ String st = parameters.get("startTime").toString();
+ String startYearAndDay = st.substring(0, st.lastIndexOf("-"));
+ String startHour = st.substring(st.lastIndexOf("-") + 1);
+ String startTime = startYearAndDay + " " + startHour + ":00:00";
+ String et = parameters.get("endTime").toString();
+ String endHour = et.substring(et.lastIndexOf("-") + 1);
+ int endHourValue = Integer.valueOf(endHour);
+ int startHourValue = Integer.valueOf(startHour);
+ if (endHourValue <= startHourValue) {
+ endHourValue = startHourValue + 1;
+ }
+ String endTime = startYearAndDay + " " + endHourValue + ":00:00";
+ parameters.put("startTime", startTime);
+ parameters.put("endTime", endTime);
+ String mac = parameters.get("mac").toString();
+ if (mac != null && mac.length() != 0) {
+ List<Map<String, Object>> sensorData = historyService.getUavSensorData(parameters);
+ Map<String, String> sensorsMap = sensorService.getSensorsMap(parameters);
+ JSONObject params = new JSONObject();
+ params.put("sensorInfo", sensorData);
+ params.put("sensorsMap", sensorsMap);
+ params.put("sensorKey", parameters.get("sensorKey"));
+ params.put("unit", parameters.get("unit"));
+ params.put("description", parameters.get("description"));
+ String paramsJson = params.toJSONString();
+ model.addObject("uavChannelParams", paramsJson);
+ model.setViewName("uavchannelnew");
+ return model;
+ } else {
+ StringBuilder msg = new StringBuilder();
+ msg.append(" param[0] mac:");
+ msg.append(mac);
+ log.warn(msg);
+ model.setViewName("403");
+ return model;
+ }
+ }
+
+ @GetMapping("/uavTracing")
+ @ApiOperation(value = "���������������������", notes = "���������������������")
+ @ApiImplicitParams(value = {
+ @ApiImplicitParam(name = "mac", value = "������mac������������p5dnd7a0392068���", required = true, paramType = "query", dataType = "String"),
+ @ApiImplicitParam(name = "sensorKey", value = "���������key", required = true, paramType = "query", dataType = "String"),
+ @ApiImplicitParam(name = "startTime", value = "������������(���������2019-07-17-17)", required = true, paramType = "query", dataType = "String"),
+ @ApiImplicitParam(name = "endTime", value = "������������(���������2019-07-17-18)", required = true, paramType = "query", dataType = "String")
+ })
+ public ModelAndView uavTracing(ModelAndView model, HttpServletRequest request) throws Exception {
+ Map<String, Object> parameters = WebUtils.getParametersStartingWith(request, null);
+ String st = parameters.get("startTime").toString();
+ String startYearAndDay = st.substring(0, st.lastIndexOf("-"));
+ String startHour = st.substring(st.lastIndexOf("-") + 1);
+ String startTime = startYearAndDay + " " + startHour + ":00:00";
+ String et = parameters.get("endTime").toString();
+ String endHour = et.substring(et.lastIndexOf("-") + 1);
+ int endHourValue = Integer.parseInt(endHour);
+ int startHourValue = Integer.parseInt(startHour);
+ if (endHourValue <= startHourValue) {
+ endHourValue = startHourValue + 1;
+ }
+ String endTime = startYearAndDay + " " + endHourValue + ":00:00";
+ parameters.put("startTime", startTime);
+ parameters.put("endTime", endTime);
+ String mac = parameters.get("mac").toString();
+ if (mac != null && mac.length() != 0) {
+ List<Map<String, Object>> sensorData = historyService.getUavSensorData(parameters);
+ Map<String, String> sensorsMap = sensorService.getSensorsMap(parameters);
+ JSONObject params = new JSONObject();
+ params.put("sensorInfo", sensorData);
+ params.put("sensorsMap", sensorsMap);
+ params.put("sensorKey", parameters.get("sensorKey"));
+ params.put("unit", parameters.get("unit"));
+ params.put("description", parameters.get("description"));
+ String paramsJson = params.toJSONString();
+ model.addObject("uavTracingParams", paramsJson);
+ model.setViewName("uavtracing");
+ return model;
+ } else {
+ StringBuilder msg = new StringBuilder();
+ msg.append(" param[0] mac:");
+ msg.append(mac);
+ log.warn(msg);
+ model.setViewName("403");
+ return model;
+ }
+ }
+
+ @GetMapping("/purify")
+ @ApiOperation(value = "���������������������", notes = "���������������������")
+ @ApiImplicitParams(value = {
+ @ApiImplicitParam(name = "monitorPointId", value = "������Id", required = true, paramType = "query", dataType = "String"),
+ @ApiImplicitParam(name = "sensorKey", value = "������", required = true, paramType = "query", dataType = "String"),
+ @ApiImplicitParam(name = "time", value = "������(���������2020-03-19-14)", required = true, paramType = "query", dataType = "String")})
+ public ModelAndView PurificationRate(HttpServletRequest request, ModelAndView model) {
+ Map<String, Object> parameters = WebUtils.getParametersStartingWith(request, null);
+ String monitPointIdS = (String) parameters.get("monitorPointId");
+ String sensor = (String) parameters.get("sensorKey");
+ String time = (String) parameters.get("time");
+ String YearAndDay = time.substring(0, time.lastIndexOf("-"));
+ String Hour = time.substring(time.lastIndexOf("-") + 1);
+ String Time = YearAndDay + " " + Hour + ":00:00";
+ int monitPointId = Integer.parseInt(monitPointIdS);
+ JSONObject params = monitorPointService.getMonitorPointById(monitPointId, Time, 1, sensor);
+ String paramsJson = params.toJSONString();
+ model.addObject("mapParams", paramsJson);
+ model.setViewName("purityMap");
+ return model;
+ }
+
+
+ @GetMapping("/collection")
+ @ApiOperation(value = "���������������������", notes = "���������������������")
+ @ApiImplicitParams(value = {
+ @ApiImplicitParam(name = "monitorPointId", value = "������Id", required = true, paramType = "query", dataType = "String"),
+ @ApiImplicitParam(name = "time", value = "������(���������2020-03-19-14)", required = true, paramType = "query", dataType = "String")})
+ public ModelAndView collectionRate(HttpServletRequest request, ModelAndView model) {
+ Map<String, Object> parameters = WebUtils.getParametersStartingWith(request, null);
+ String monitPointIdS = (String) parameters.get("monitorPointId");
+ String sensor = "";
+ String time = (String) parameters.get("time");
+ String YearAndDay = time.substring(0, time.lastIndexOf("-"));
+ String Hour = time.substring(time.lastIndexOf("-") + 1);
+ String Time = YearAndDay + " " + Hour + ":00:00";
+ int monitPointId = Integer.parseInt(monitPointIdS);
+ //������������������
+ JSONObject params = monitorPointService.getMonitorPointById(monitPointId, Time, 2, sensor);
+ model.addObject("params", params);
+ model.setViewName("pressureMap");
+ return model;
+ }
+
+
+ @GetMapping("/unorganizedEmissions")
+ @ApiOperation(value = "���������������", notes = "���������������")
+ @ApiImplicitParams(value = {
+ @ApiImplicitParam(name = "monitorPointId", value = "������Id", required = true, paramType = "query", dataType = "String"),
+ @ApiImplicitParam(name = "sensorKey", value = "������", required = true, paramType = "query", dataType = "String"),
+ // @ApiImplicitParam(name = "sensorKey", value = "���������key,���������������������������", required = true, paramType = "query", dataType = "String"),
+ @ApiImplicitParam(name = "time", value = "������(���������2020-03-19-14)", required = true, paramType = "query", dataType = "String")})
+ public ModelAndView unorganizedEmissions(HttpServletRequest request, ModelAndView model) {
+ Map<String, Object> parameters = WebUtils.getParametersStartingWith(request, null);
+ String monitPointIdS = (String) parameters.get("monitorPointId");
+ String sensor = (String) parameters.get("sensorKey");
+ String time = (String) parameters.get("time");
+ String YearAndDay = time.substring(0, time.lastIndexOf("-"));
+ String Hour = time.substring(time.lastIndexOf("-") + 1);
+ String Time = YearAndDay + " " + Hour + ":00:00";
+ int monitPointId = Integer.parseInt(monitPointIdS);
+ //������������������
+ JSONObject params = monitorPointService.getMonitorPointById(monitPointId, Time, 3, sensor);
+ model.addObject("params", params);
+ model.setViewName("unorganizedMap");
+ return model;
+ }
+
+
+ @GetMapping("/unorganizedEmissionsRealTime")
+ @ApiOperation(value = "���������������������", notes = "���������������������")
+ @ApiImplicitParams(value = {
+ @ApiImplicitParam(name = "monitorPointId", value = "������Id", required = true, paramType = "query", dataType = "String"),
+ @ApiImplicitParam(name = "sensorKey", value = "������", required = true, paramType = "query", dataType = "String"),
+ @ApiImplicitParam(name = "accountId", value = "������id", required = false, paramType = "query", dataType = "String")})
+ public ModelAndView unorganizedEmissionsBackups(HttpServletRequest request, ModelAndView model) {
+ Map<String, Object> parameters = WebUtils.getParametersStartingWith(request, null);
+ String monitPointIdS = (String) parameters.get("monitorPointId");
+ String sensor = (String) parameters.get("sensorKey");
+ String accountId = (String) parameters.get("accountId");
+ Account account = accountService.getAccountById(Integer.parseInt(accountId));
+ int monitPointId = Integer.parseInt(monitPointIdS);
+ JSONObject params = monitorPointService.getMacList(monitPointId);
+ params.put("accountId", accountId);
+ params.put("orgId", account.getOrganizationId());
+ params.put("sensor", sensor);
+ //������������������
+ //JSONObject params=monitorPointService.getMonitorPointById(monitPointId,Time,3,sensor);
+ // model.addObject("params",params);
+ model.addObject("params", params);
+ model.setViewName("newUnorganizedMap");
+ return model;
+ }
+
+ @GetMapping("/chooseDevice")
+ @ResponseBody
+ public Object unorganizedEmissionsBackups(String wind, String monitPointId) {
+ JSONObject params = new JSONObject();
+ Double windDir = Double.parseDouble(wind);
+ List<Device> deviceList = deviceService.getDeviceById2(Integer.parseInt(monitPointId));
+ Map<String, Object> longAndLatiMap;
+ List<Map> longAndLatiList = new ArrayList<>();//������������������������������������windList������������������������������������������������������������������
+ List<Device> preAngleDeviceList = new ArrayList<Device>(); //���������������������������������������
+ for (int f = 0; f < deviceList.size(); f++) {
+ for (int h = 0; h < deviceList.size(); h++) {
+ if (f != h) {
+ longAndLatiMap = new HashMap<String, Object>();
+ longAndLatiMap.put("h", h);
+ longAndLatiMap.put("f", f);
+ Double angle = mapUtils.getAngle(
+ new MyLatLng((Double) deviceList.get(h).getLongitude(),
+ (Double) deviceList.get(h).getLatitude()),
+ new MyLatLng((Double) deviceList.get(f).getLongitude(),
+ (Double) deviceList.get(f).getLatitude()));
+ Double angleDiff = Math.abs(angle - windDir);
+ longAndLatiMap.put("angle", angleDiff);
+ longAndLatiList.add(longAndLatiMap);
+ }
+ }
+ }
+ Double minAngle = (Double) longAndLatiList.get(0).get("angle");
+ int indexAngle = 0;
+ for (int j = 1; j < longAndLatiList.size(); j++) {
+ if (minAngle > (Double) longAndLatiList.get(j).get("angle")) {
+ minAngle = (Double) longAndLatiList.get(j).get("angle");
+ indexAngle = j;
+ }else {
+ indexAngle=indexAngle;
+ }
+ }
+ preAngleDeviceList.add(deviceList.get((Integer) longAndLatiList.get(indexAngle).get("h")));
+ preAngleDeviceList.add(deviceList.get((Integer) longAndLatiList.get(indexAngle).get("f")));
+ Double length = mapUtils.getDistance((Double) preAngleDeviceList.get(0).getLongitude(), (Double) preAngleDeviceList.get(0).getLatitude(),
+ (Double) preAngleDeviceList.get(1).getLongitude(), (Double) preAngleDeviceList.get(1).getLatitude());
+ Double subLength = length / 5;
+ Double subLength1 = length / 6.1;
+ Double angle = mapUtils.getAngle(
+ new MyLatLng((Double) preAngleDeviceList.get(0).getLongitude(),
+ (Double) preAngleDeviceList.get(0).getLatitude()),
+ new MyLatLng((Double) preAngleDeviceList.get(1).getLongitude(),
+ (Double) preAngleDeviceList.get(1).getLatitude()));
+ List locationList = new ArrayList();
+ String[] firstLocation = mapUtils.calLocationByDistanceAndLocationAndDirection(angle, (Double) preAngleDeviceList.get(0).getLongitude(),
+ (Double) preAngleDeviceList.get(0).getLatitude(), subLength);
+ String[] secondLoction = mapUtils.calLocationByDistanceAndLocationAndDirection(angle, Double.parseDouble(firstLocation[0]),
+ Double.parseDouble(firstLocation[1]), subLength);
+ String[] thirdLocation = mapUtils.calLocationByDistanceAndLocationAndDirection(angle, Double.parseDouble(secondLoction[0]),
+ Double.parseDouble(secondLoction[1]), subLength);
+ String[] fourthLoction = mapUtils.calLocationByDistanceAndLocationAndDirection(angle, Double.parseDouble(thirdLocation[0]),
+ Double.parseDouble(thirdLocation[1]), subLength);
+ String[] fivethLoction = mapUtils.calLocationByDistanceAndLocationAndDirection(angle, Double.parseDouble(fourthLoction[0]),
+ Double.parseDouble(fourthLoction[1]), subLength1);
+ locationList.add(firstLocation);
+ locationList.add(secondLoction);
+ locationList.add(thirdLocation);
+ locationList.add(fourthLoction);
+ locationList.add(fivethLoction);
+ String preAngleDeviceString = JSON.toJSON(preAngleDeviceList).toString();
+ params.put("preAngleDeviceString", preAngleDeviceString);//���������������������������
+ params.put("locationList", locationList);
+ 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 = "���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);
+ List<Map<String, Object>> resultList = weatherService.getForecastAndReal(parameters);
+ return new ResultBean<List<Map<String, Object>>>(resultList);
+ }
+
+ @GetMapping("weatherData")
+ @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);
+ 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")
+ public void updateForecastWeather(HttpServletRequest request){
+ 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);
+ }
}
--
Gitblit v1.8.0