From dba54bf8c8f9299d61c05bf3a941708ea399c998 Mon Sep 17 00:00:00 2001
From: ZhuDongming <773644075@qq.com>
Date: Sun, 26 Apr 2020 15:20:22 +0800
Subject: [PATCH] update excel多个工作表导出
---
src/main/java/com/moral/controller/ScreenController.java | 373 ++++++++++++++++++++++++++++++++++-------------------
1 files changed, 240 insertions(+), 133 deletions(-)
diff --git a/src/main/java/com/moral/controller/ScreenController.java b/src/main/java/com/moral/controller/ScreenController.java
index 3c6991a..e4bb92c 100644
--- a/src/main/java/com/moral/controller/ScreenController.java
+++ b/src/main/java/com/moral/controller/ScreenController.java
@@ -4,12 +4,15 @@
import java.io.ByteArrayInputStream;
import java.io.InputStream;
import java.io.InputStreamReader;
+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.LinkedHashMap;
import java.util.List;
@@ -17,7 +20,11 @@
import java.util.Optional;
import java.util.stream.Collectors;
+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;
@@ -90,12 +97,11 @@
import com.moral.service.WeatherService;
import com.moral.util.AQICalculation;
import com.moral.util.TempAllocationUtils;
+
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletRequest;
import static com.moral.common.util.ResourceUtil.getValue;
import static com.moral.common.util.WebUtils.getParametersStartingWith;
@@ -198,6 +204,58 @@
resultMap.put("accountId", -1);
} else {
resultMap = accountService.screenLogin(parameters);
+ // ������������������������������������������
+ Object orgId = resultMap.get("orgId");
+ if (resultMap.get("orgId") != null && resultMap.get("orgId") instanceof Integer) {
+ StringBuilder areaNamesBuilder = new StringBuilder("������");
+ if (!((Integer) orgId).equals(dictionaryDataService.querySupperOrgId())) {
+ Organization organization = organizationService.getOrganizationById((Integer) orgId);
+ if (organization.getAreaNames() != null) {
+ Map<String, String> areaNameMap = BeanUtils.beanToMap(organization.getAreaNames());
+ List<String> names = areaNameMap.entrySet().stream().filter(item -> {
+ return item.getValue() != null;
+ }).map(item -> {
+ return item.getValue();
+ }).collect(Collectors.toList());
+ AreaNames areaNames = organization.getAreaNames();
+ areaNamesBuilder.append("/");
+ areaNamesBuilder.append(String.join("/", names));
+ }
+ // ������������
+ if (organization.getRank() != null && organization.getRank() == 0) {
+ resultMap.put("type", "enterprise");
+ } else {
+ resultMap.put("type", "government");
+ }
+ Number mapAreaCode = null;
+ if (organization.getVillageCode() != null) {
+ mapAreaCode = organization.getVillageCode();
+ } else if (organization.getTownCode() != null) {
+ mapAreaCode = organization.getTownCode();
+ } else if (organization.getAreaCode() != null) {
+ mapAreaCode = organization.getAreaCode();
+ } else if (organization.getCityCode() != null) {
+ mapAreaCode = organization.getCityCode();
+ } else if (organization.getProvinceCode() != null) {
+ mapAreaCode = organization.getProvinceCode();
+ }
+ resultMap.put("mapAreaCode", mapAreaCode.toString());
+ }
+ resultMap.put("mapPath", areaNamesBuilder.toString());
+ }
+ }
+ return resultMap;
+ }
+
+ @GetMapping("loginNew")
+ public Map<String, Object> screenLoginNew(HttpServletRequest request) {
+ Map<String, Object> resultMap = new HashMap<String, Object>();
+ Map<String, Object> parameters = getParametersStartingWith(request, null);
+ if (!(parameters.containsKey("account") && parameters.containsKey("password"))) {
+ resultMap.put("msg", "������������������������������������");
+ resultMap.put("accountId", -1);
+ } else {
+ resultMap = accountService.screenLoginNew(parameters);
// ������������������������������������������
Object orgId = resultMap.get("orgId");
if (resultMap.get("orgId") != null && resultMap.get("orgId") instanceof Integer) {
@@ -368,15 +426,15 @@
Map<String, Object> parameters = getParametersStartingWith(request, null);
return historyMinutelyService.getDayAQIByDevice(parameters);
}
-
+
@GetMapping("hour-aqi")
@ApiOperation(value = "���������������AQI", notes = "���������������AQI")
@ApiImplicitParams(value = {
@ApiImplicitParam(name = "mac", value = "������mac������", required = true, paramType = "query", dataType = "String")
})
public Map<String, Object> getHourAQIByDevice(HttpServletRequest request) {
- Map<String, Object> parameters = getParametersStartingWith(request, null);
- return historyService.gitHourlyAQIByMacAndTimeslot(parameters);
+ Map<String, Object> parameters = getParametersStartingWith(request, null);
+ return historyService.gitHourlyAQIByMacAndTimeslot(parameters);
}
/**
@@ -536,6 +594,12 @@
model.setViewName("403");
return model;
}
+ }
+
+ @GetMapping("/getSensorsMap")
+ public List<Map<String, String>> getSensorsMapOnly(String mac) {
+ List<Map<String, String>> sensorsMapList = sensorService.getSensorsMaps(mac);
+ return sensorsMapList;
}
@RequestMapping(value = "/get-monitorpoints", method = RequestMethod.GET)
@@ -868,8 +932,8 @@
@ApiImplicitParam(name = "time", defaultValue = "2019", value = "���������������", required = true, paramType = "query", dataType = "String"),
@ApiImplicitParam(name = "sensorKey", defaultValue = "e27", value = "������������������������key", required = true, paramType = "query", dataType = "String"),
@ApiImplicitParam(name = "regionCode", defaultValue = "130000", value = "���������", required = true, paramType = "query", dataType = "String"),
- @ApiImplicitParam(name = "monitorPointId", value = "���������id", required = false, paramType = "query", dataType = "int"),
- @ApiImplicitParam(name = "mac", value = "������mac", required = false, paramType = "query", dataType = "String")})
+ @ApiImplicitParam(name = "monitorPointId", value = "���������id(���������376)", required = false, paramType = "query", dataType = "int"),
+ @ApiImplicitParam(name = "mac", value = "������mac(���������vocscxwnm00001)", required = false, paramType = "query", dataType = "String")})
public ResultBean<List<Map<String, Object>>> getemissionsData(HttpServletRequest request) throws Exception {
Map<String, Object> parameters = WebUtils.getParametersStartingWith(request, null);
List<Map<String, Object>> result = historyDailyService.getEmissionsData(parameters);
@@ -922,10 +986,10 @@
@GetMapping("/map-traceability")
@ApiOperation(value = "������������������", notes = "������������������")
@ApiImplicitParams(value = {
- @ApiImplicitParam(name = "monitorPointId", value = "���������id", required = true, paramType = "query", dataType = "int"),
- @ApiImplicitParam(name = "mac", value = "������mac������", required = true, paramType = "query", dataType = "String"),
- @ApiImplicitParam(name = "sensorKey", value = "������������������������key", required = true, paramType = "query", dataType = "String"),
- @ApiImplicitParam(name = "time", value = "������������", required = true, paramType = "query", dataType = "String")})
+ @ApiImplicitParam(name = "monitorPointId", value = "���������id(���������319)", required = true, paramType = "query", dataType = "int"),
+ @ApiImplicitParam(name = "mac", value = "������mac������(���������p5dnd7a0391993)", required = true, paramType = "query", dataType = "String"),
+ @ApiImplicitParam(name = "sensorKey", value = "������������������������key(���������e1)", required = true, paramType = "query", dataType = "String"),
+ @ApiImplicitParam(name = "time", value = "������������(���������2019-09-08)", required = true, paramType = "query", dataType = "String")})
public ModelAndView traceability(ModelAndView model, HttpServletRequest request) throws Exception {
Map<String, Object> parameters = WebUtils.getParametersStartingWith(request, null);
Integer monitorPointId = Integer.parseInt(parameters.get("monitorPointId").toString());
@@ -991,50 +1055,48 @@
List<Map<String, Object>> map = sensorUnitService.getSensorsByMonitPointId2(monitor_point_id);
return new ResultBean<List<Map<String, Object>>>(map);
}
-
+
@GetMapping("getSensorByDeviceId")
- @ApiOperation(value = "������������������������", notes = "������������������������")
- @ApiImplicitParams(value = {
- @ApiImplicitParam(name = "id", value = "������id", required = true, paramType = "query", dataType = "String")
- })
- public ResultBean<List<Map<String, Object>>> getSensorByDeviceId(HttpServletRequest request) throws Exception {
- Map<String, Object> parameters = WebUtils.getParametersStartingWith(request, null);
- String id = (String) parameters.get("id");
- List<Map<String, Object>> list = sensorService.getSensorByDeviceId(id);
- Map<String,Object> map = list.get(0);
- String monitor_point_id = map.get("monitor_point_id").toString();
- List<Map<String, Object>> sensorUnitList = sensorUnitService.getSensorsByMonitPointId2(monitor_point_id);
- System.out.println(sensorUnitList);
- for (Map<String, Object> sensorMap : list) {
- for (Map<String, Object> sensorUnitMap : sensorUnitList) {
- if (sensorUnitMap.get("sensor_key").equals(sensorMap.get("sensor_key"))) {
- sensorMap.put("unit", sensorUnitMap.get("name"));
- }
- }
- }
- return new ResultBean<List<Map<String, Object>>>(list);
- }
-
- @GetMapping("getSensorWithUnitByMonitorPointId")
- @ApiOperation(value = "������������������������", notes = "������������������������")
- @ApiImplicitParams(value = {
- @ApiImplicitParam(name = "monitor_point_id", value = "������id", required = true, paramType = "query", dataType = "String")
- })
- public ResultBean<List<Map<String, Object>>> getSensorWithUnitByMonitorPointId(HttpServletRequest request) throws Exception {
- Map<String, Object> parameters = WebUtils.getParametersStartingWith(request, null);
- String monitor_point_id = (String) parameters.get("monitor_point_id");
- List<Map<String, Object>> list = sensorService.getSensorByMonitorPointId(monitor_point_id);
- List<Map<String, Object>> sensorUnitList = sensorUnitService.getSensorsByMonitPointId2(monitor_point_id);
- System.out.println(sensorUnitList);
- for (Map<String, Object> sensorMap : list) {
- for (Map<String, Object> sensorUnitMap : sensorUnitList) {
- if (sensorUnitMap.get("sensor_key").equals(sensorMap.get("sensor_key"))) {
- sensorMap.put("unit", sensorUnitMap.get("name"));
- }
- }
- }
- return new ResultBean<List<Map<String, Object>>>(list);
- }
+ @ApiOperation(value = "������������������������", notes = "������������������������")
+ @ApiImplicitParams(value = {
+ @ApiImplicitParam(name = "id", value = "������id", required = true, paramType = "query", dataType = "String")
+ })
+ public ResultBean<List<Map<String, Object>>> getSensorByDeviceId(HttpServletRequest request) throws Exception {
+ Map<String, Object> parameters = WebUtils.getParametersStartingWith(request, null);
+ String id = (String) parameters.get("id");
+ List<Map<String, Object>> list = sensorService.getSensorByDeviceId(id);
+ Map<String, Object> map = list.get(0);
+ String monitor_point_id = map.get("monitor_point_id").toString();
+ List<Map<String, Object>> sensorUnitList = sensorUnitService.getSensorsByMonitPointId2(monitor_point_id);
+ for (Map<String, Object> sensorMap : list) {
+ for (Map<String, Object> sensorUnitMap : sensorUnitList) {
+ if (sensorUnitMap.get("sensor_key").equals(sensorMap.get("sensor_key"))) {
+ sensorMap.put("unit", sensorUnitMap.get("name"));
+ }
+ }
+ }
+ return new ResultBean<List<Map<String, Object>>>(list);
+ }
+
+ @GetMapping("getSensorWithUnitByMonitorPointId")
+ @ApiOperation(value = "������������������������", notes = "������������������������")
+ @ApiImplicitParams(value = {
+ @ApiImplicitParam(name = "monitor_point_id", value = "������id", required = true, paramType = "query", dataType = "String")
+ })
+ public ResultBean<List<Map<String, Object>>> getSensorWithUnitByMonitorPointId(HttpServletRequest request) throws Exception {
+ Map<String, Object> parameters = WebUtils.getParametersStartingWith(request, null);
+ String monitor_point_id = (String) parameters.get("monitor_point_id");
+ List<Map<String, Object>> list = sensorService.getSensorByMonitorPointId(monitor_point_id);
+ List<Map<String, Object>> sensorUnitList = sensorUnitService.getSensorsByMonitPointId2(monitor_point_id);
+ for (Map<String, Object> sensorMap : list) {
+ for (Map<String, Object> sensorUnitMap : sensorUnitList) {
+ if (sensorUnitMap.get("sensor_key").equals(sensorMap.get("sensorKey"))) {
+ sensorMap.put("unit", sensorUnitMap.get("name"));
+ }
+ }
+ }
+ return new ResultBean<List<Map<String, Object>>>(list);
+ }
@GetMapping("AIForecast")
@ApiOperation(value = "AI������", notes = "AI������")
@@ -1049,25 +1111,15 @@
//System.out.println(parameters);
String monitorPoint = (String) parameters.get("monitorPoint");
String intoTime = parameters.get("time").toString();
- String[] timeArray = intoTime.split("-");
- //System.out.println(timeArray);
- Integer year = Integer.parseInt(timeArray[0]);
- Integer mon = Integer.parseInt(timeArray[1]);
- if (mon > 1) {
- mon = mon - 1;
- } else {
- mon = 12;
- year = year - 1;
- }
- String alterTime = year.toString() + "-" + mon.toString() + "-" + timeArray[2];
- //System.out.println(alterTime);
+ Date date = new SimpleDateFormat("yy-MM-dd").parse(intoTime);
+ DateFormat df1 = new SimpleDateFormat("yyyy-MM-dd");
+ String alterTime = df1.format(date.getTime() - 15 * 24 * 60 * 60 * 1000);
parameters.put("time", alterTime);
ParameterUtils.getTimeType4Time(parameters);
String monitor_point_id = (String) parameters.get("monitorPoint");
parameters.put("monitorPointId", parameters.remove("monitorPoint"));
String[] sensorKeys = parameters.remove("sensorKey").toString().split(",");
parameters.put("sensors", Arrays.asList(sensorKeys));
- // monitorPointService.isCompensateCalculation(parameters);
List<Map<String, Object>> list = historyMinutelyService.getMonitorPointOrDeviceAvgData(parameters);
Map<String, Object> mpMap = new HashMap<>();
@@ -1077,8 +1129,18 @@
weatherParameters.put("organizationId", mpMap.get("organization_id"));
weatherParameters.put("time", intoTime);
//������������������
- Map<String, Object> weatherMap = weatherService.get15DayWeatherDataByRegion(weatherParameters);
- Map<String, Object> tempMap = TempAllocationUtils.tempAllocation(weatherMap);
+ Map<String, Object> weatherMap = new HashMap<>();
+ Map<String, Object> tempMap = new HashMap<>();
+ Boolean tf = false;
+ for (int i = 0; i < sensorKeys.length; i++) {
+ if (sensorKeys[i].equals("e7")) {
+ tf = true;
+ }
+ }
+ if (tf) {
+ weatherMap = weatherService.get15DayWeatherDataByRegion(weatherParameters);
+ tempMap = TempAllocationUtils.tempAllocation(weatherMap);
+ }
//������������������
Map<String, Map<String, Object>> sensorUnitMap = sensorUnitService.getSensorsByMonitPointId(monitor_point_id);
@@ -1086,7 +1148,9 @@
String time = map.get("time").toString();
time = time.substring(time.length() - 2);
map.put("time", Integer.valueOf(time));
- map.put("temp", tempMap.get(map.get("time").toString()));
+ if (tempMap != null) {
+ map.put("temp", tempMap.get(map.get("time").toString()));
+ }
List<Number> values = new ArrayList<Number>();
List<String> units = new ArrayList<String>();
for (String string : sensorKeys) {
@@ -1132,38 +1196,6 @@
public ResultBean<Map<String, Object>> getWeather(HttpServletRequest request) throws Exception {
Map<String, Object> parameters = getParametersStartingWith(request, null);
Map<String, Object> map = weatherService.get15DayWeatherDataByRegion(parameters);
- /*Map<String, Object> tempMap = new HashMap<>();
- Double tempDay = Double.parseDouble(map.get("tempDay").toString());
- Double tempNight = Double.parseDouble(map.get("tempNight").toString());
- Double time5 = tempNight;
- Double time13 = tempDay;
- Double difference = tempDay-tempNight;
- Double dif_8 = difference/8;
- Double dif_16 = difference/16;
- tempMap.put("5", time5);
- tempMap.put("13", time13);
- String time = null;
- Double t = time5;
- for(int i=4;i>=0;i--) {
- time = ""+i;
- t = t+dif_16;
- String tempLast = ""+Math.round(t);
- tempMap.put(time, tempLast);
- }
- Double y = time5;
- for(int i=6;i<13;i++) {
- time = ""+i;
- y = y+dif_8;
- String tempLast = ""+Math.round(y);
- tempMap.put(time, tempLast);
- }
- Double z = time13;
- for(int i=14;i<=23;i++) {
- time = ""+i;
- z = z-dif_16;
- String tempLast = ""+Math.round(z);
- tempMap.put(time, tempLast);
- }*/
Map<String, Object> tempMap = TempAllocationUtils.tempAllocation(map);
return new ResultBean<Map<String, Object>>(tempMap);
}
@@ -1203,7 +1235,7 @@
params.put("sensorInfo", sensorList);
params.put("sensorInfoMin", sensorListMin);
params.put("sensorInfoMax", sensorListMax);
- params.put("sensorsMap",sensorsMap);
+ params.put("sensorsMap", sensorsMap);
String paramsJson = params.toJSONString();
model.addObject("uavTrajectoryParams", paramsJson);
model.setViewName("uavtrajectory");
@@ -1234,7 +1266,13 @@
LocalDateTime timeLocalDateTime = LocalDateTime.parse(time, dateTimeFormatter);
int month = timeLocalDateTime.getMonth().getValue();
Point dirPoint = historyHourlyService.getDirPoint(parameters);
- Map<String, Object> getPollutionSourceData = historyHourlyService.getPollutionSourceData(parameters);
+ Map<String, Object> getPollutionSourceData = historyHourlyService.getPollutionSourceDataByHour(parameters);
+ if (MapUtils.isEmpty(getPollutionSourceData)) {
+ getPollutionSourceData = historyHourlyService.getPollutionSourceDataAll(parameters);
+ }
+ if (MapUtils.isEmpty(getPollutionSourceData)) {
+ getPollutionSourceData = new HashMap<>();
+ }
String mac = parameters.get("mac").toString();
Device device = deviceService.getDeviceByMac(mac, false);
JSONObject params = new JSONObject();
@@ -1247,12 +1285,12 @@
model.setViewName("pollutionsource");
return model;
}
-
+
@GetMapping("getAirQualityComparison")
@ApiOperation(value = "������������������", notes = "������������������")
@ApiImplicitParams(value = {
@ApiImplicitParam(name = "organizationId", defaultValue = "5", value = "���������������������id", required = true, paramType = "query", dataType = "String"),
- @ApiImplicitParam(name = "monitor_point_id", defaultValue = "5", value = "������������id", required = true, paramType = "query", dataType = "String")})
+ @ApiImplicitParam(name = "monitor_point_id", defaultValue = "5", value = "������������id", required = true, paramType = "query", dataType = "String")})
public ResultBean<Map<String, Object>> getAirQualityComparison(HttpServletRequest request) throws Exception {
Map<String, Object> parameters = getParametersStartingWith(request, null);
Map<String, Object> map = weatherService.getWeatherDataByRegion(parameters);
@@ -1264,38 +1302,107 @@
sensorMap.put("e10", Double.parseDouble(map.get("co").toString()));
sensorMap.put("e15", Double.parseDouble(map.get("o3").toString()));
Map<String, Object> StateControl = AQICalculation.hourlyAQI(sensorMap);
- System.out.println("StateControl:"+StateControl);
Map<String, Object> hourAqi = historyService.gitHourlyAQIByMonitorPointIdAndTimeslot(parameters);
- System.out.println("hourAqi:"+hourAqi);
Map<String, Object> returnMap = new HashMap<>();
returnMap.put("MonitorPointAQI", hourAqi.get("AQI"));
returnMap.put("StateControlAQI", StateControl.get("AQI"));
return new ResultBean<Map<String, Object>>(returnMap);
}
-
- @GetMapping("mointorPointRank")
- @ApiOperation(value = "������������������", notes = "������������������")
- @ApiImplicitParams(value = {
- @ApiImplicitParam(name = "accountId", value = "������id", required = true, paramType = "query", dataType = "String"),
- @ApiImplicitParam(name = "sensor", value = "������", required = true, paramType = "query", dataType = "String")
- })
- public ResultBean<List<Map<String, Object>>> getMointorPointRank(HttpServletRequest request){
- Map<String, Object> parameters = WebUtils.getParametersStartingWith(request, null);
- String id = parameters.get("accountId").toString();
- String sensor = parameters.get("sensor").toString();
- Map<String, Object> account = accountService.getOrganizationIdByAccountId(id);
- //������������id������������������������������
- account.put("sensor", sensor);
- List<Map<String, Object>> rankList = historyService.getMointorPointRankByOrganizationId(account);
- List<Map<String, Object>> returnList = new ArrayList<>();
- for (Map<String, Object> map : rankList) {
- boolean contains = map.containsKey("sensor");
- if (contains) {
- returnList.add(map);
- }
- }
- return new ResultBean<List<Map<String, Object>>>(returnList);
- }
-
+
+ @GetMapping("mointorPointRank")
+ @ApiOperation(value = "������������������", notes = "������������������")
+ @ApiImplicitParams(value = {
+ @ApiImplicitParam(name = "accountId", value = "������id", required = true, paramType = "query", dataType = "String"),
+ @ApiImplicitParam(name = "sensor", value = "������", required = true, paramType = "query", dataType = "String")
+ })
+ public ResultBean<List<Map<String, Object>>> getMointorPointRank(HttpServletRequest request) {
+ Map<String, Object> parameters = WebUtils.getParametersStartingWith(request, null);
+ String id = parameters.get("accountId").toString();
+ String sensor = parameters.get("sensor").toString();
+ Map<String, Object> account = accountService.getOrganizationIdByAccountId(id);
+ //������������id������������������������������
+ account.put("sensor", sensor);
+ List<Map<String, Object>> rankList = historyService.getMointorPointRankByOrganizationId(account);
+ List<Map<String, Object>> returnList = new ArrayList<>();
+ for (Map<String, Object> map : rankList) {
+ boolean contains = map.containsKey("sensor");
+ if (contains) {
+ returnList.add(map);
+ }
+ }
+ return new ResultBean<List<Map<String, Object>>>(returnList);
+ }
+
+ @GetMapping("/carTrajectory")
+ @ApiOperation(value = "���������������������", notes = "���������������������")
+ @ApiImplicitParams(value = {
+ @ApiImplicitParam(name = "mac", value = "������mac������������p5dnd7a0392082���", 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 carTrajectory(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 endYearAndDay = et.substring(0, et.lastIndexOf("-"));
+ String endHour = et.substring(et.lastIndexOf("-") + 1);
+ String endTime = endYearAndDay + " " + endHour + ":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("carTrajectoryParams", paramsJson);
+ model.setViewName("cartrajectory");
+ 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 = {
+ @ApiImplicitParam(name = "sensorKey", value = "���������key", required = true, paramType = "query", dataType = "String"),
+ @ApiImplicitParam(name = "organizationId", defaultValue = "8", value = "���������������������id", required = true, paramType = "query", dataType = "Integer"),
+ @ApiImplicitParam(name = "regionCode", defaultValue = "320583", value = "���������", required = true, paramType = "query", dataType = "String"),
+ @ApiImplicitParam(name = "time", value = "������(���������2020-04-09���2019-04)", required = true, paramType = "query", dataType = "String")})
+ public ResultBean<List<Map<String, Object>>> getDevicesDataToExcel(HttpServletRequest request) throws Exception {
+ Map<String, Object> parameters = WebUtils.getParametersStartingWith(request, null);
+ ParameterUtils.getTimeType4Time(parameters);
+ Object sensorKey = parameters.get("sensorKey");
+ parameters.put("sensorKeys", Arrays.asList(sensorKey));
+ 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);
+ }
+ return new ResultBean<List<Map<String, Object>>>(list);
+ }
+
}
--
Gitblit v1.8.0