From 2bc319c2c241d7646cb6805f9364cb7416edfa0a Mon Sep 17 00:00:00 2001
From: ZhuDongming <773644075@qq.com>
Date: Mon, 22 Jun 2020 17:31:09 +0800
Subject: [PATCH] add websocket实时发送设备数据，显示风向等信息
---
src/main/java/com/moral/controller/ScreenController.java | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/moral/controller/ScreenController.java b/src/main/java/com/moral/controller/ScreenController.java
index d8ebe59..ee04af0 100644
--- a/src/main/java/com/moral/controller/ScreenController.java
+++ b/src/main/java/com/moral/controller/ScreenController.java
@@ -1719,7 +1719,7 @@
params.put("unit",parameters.get("unit"));
params.put("description",parameters.get("description"));
String paramsJson = params.toJSONString();
- model.addObject("uavDroppointParams", paramsJson);
+ model.addObject("uavChannelParams", paramsJson);
model.setViewName("uavchannel");
return model;
} else {
@@ -1748,8 +1748,8 @@
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);
+ int endHourValue = Integer.parseInt(endHour);
+ int startHourValue = Integer.parseInt(startHour);
if (endHourValue <= startHourValue) {
endHourValue = startHourValue + 1;
}
@@ -1767,7 +1767,7 @@
params.put("unit",parameters.get("unit"));
params.put("description",parameters.get("description"));
String paramsJson = params.toJSONString();
- model.addObject("uavDroppointParams", paramsJson);
+ model.addObject("uavTracingParams", paramsJson);
model.setViewName("uavtracing");
return model;
} else {
--
Gitblit v1.8.0