From 691311e750b9d9d28b38862977e347e938155f47 Mon Sep 17 00:00:00 2001
From: ZhuDongming <773644075@qq.com>
Date: Fri, 16 Aug 2019 09:40:22 +0800
Subject: [PATCH] 最大值和最小值按钮美化并加效果
---
src/main/java/com/moral/controller/ScreenController.java | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/moral/controller/ScreenController.java b/src/main/java/com/moral/controller/ScreenController.java
index 1797eaa..03e24df 100644
--- a/src/main/java/com/moral/controller/ScreenController.java
+++ b/src/main/java/com/moral/controller/ScreenController.java
@@ -1174,13 +1174,17 @@
String mac = parameters.get("mac").toString();
if (mac != null && mac.length() != 0) {
List<Map<String, Object>> sensorList = historyMinutelyService.getSensorData(parameters);
+ List<Map<String, Object>> sensorListMin = historyMinutelyService.getSensorDataMin(parameters);
+ List<Map<String, Object>> sensorListMax = historyMinutelyService.getSensorDataMax(parameters);
JSONObject params = new JSONObject();
params.put("sensorInfo", sensorList);
+ params.put("sensorInfoMin", sensorListMin);
+ params.put("sensorInfoMax", sensorListMax);
String paramsJson = params.toJSONString();
model.addObject("uavTrajectoryParams", paramsJson);
model.setViewName("uavTrajectory");
return model;
- }else {
+ } else {
StringBuilder msg = new StringBuilder();
msg.append(" param[0] mac:");
msg.append(mac);
--
Gitblit v1.8.0