From 4a99552e883976adc8b726499caaebbe36f19ea7 Mon Sep 17 00:00:00 2001
From: 于紫祥_1901 <email@yuzixiang_1910>
Date: Mon, 06 Jul 2020 10:25:22 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/moral/controller/ScreenController.java | 6 ++----
1 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/moral/controller/ScreenController.java b/src/main/java/com/moral/controller/ScreenController.java
index cba5ca9..676b2c9 100644
--- a/src/main/java/com/moral/controller/ScreenController.java
+++ b/src/main/java/com/moral/controller/ScreenController.java
@@ -1687,7 +1687,7 @@
params.put("description",parameters.get("description"));
String paramsJson = params.toJSONString();
model.addObject("uavDroppointParams", paramsJson);
- model.setViewName("uavdroppointnew");
+ model.setViewName("uavdroppoint");
return model;
} else {
StringBuilder msg = new StringBuilder();
@@ -1735,7 +1735,7 @@
params.put("description",parameters.get("description"));
String paramsJson = params.toJSONString();
model.addObject("uavChannelParams", paramsJson);
- model.setViewName("uavchannel");
+ model.setViewName("uavchannelnew");
return model;
} else {
StringBuilder msg = new StringBuilder();
@@ -1856,8 +1856,6 @@
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);
--
Gitblit v1.8.0