From 746d419165c66d6a1f33a0a9df199e0b6daf3114 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Mon, 19 Oct 2020 16:18:05 +0800
Subject: [PATCH] 地图显示位置异常问题
---
src/main/java/com/moral/controller/ScreenController.java | 43 ++++++++++++++++++++++++++++++++++++++-----
1 files changed, 38 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/moral/controller/ScreenController.java b/src/main/java/com/moral/controller/ScreenController.java
index b86fa8d..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.*;
@@ -164,6 +167,7 @@
@Resource
private ScreenVersionService screenVersionService;
+
/**
* Screen login. ������������
*
@@ -2244,24 +2248,53 @@
return alarmData;
}
- @GetMapping("multiDeviceSensor")
+ @GetMapping("multiDeviceContrast")
@ApiOperation(value = "���������������������", notes = "���������������������")
@ApiImplicitParams(value = {
- @ApiImplicitParam(name = "monitorPoint", value = "���������id", required = true, paramType = "query", dataType = "String"),
@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);
ParameterUtils.getTimeType4Time(parameters);
- List<Map<String, Object>> multiDeviceSensorData = historyMinutelyService.getMultiDeviceSensorData(parameters);
- return new ResultBean<List<Map<String, Object>>>(multiDeviceSensorData);
+ List<Map<String, Object>> list = historyMinutelyService.getMultiDeviceSensorData(parameters);
+ return new ResultBean<List<Map<String, Object>>>(list);
}
+ /*
+ * ���������������������������������������������
+ */
@GetMapping("screenVersion")
- public Map<String, Object> getScreenVersion(HttpServletRequest request) {
+ public Map<String, Object> getScreenVersion(HttpServletRequest request) {
Map<String, Object> parameters = getParametersStartingWith(request, null);
String version = parameters.get("version").toString();
return screenVersionService.getScreenVersion(version);
}
+
+ @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