From b534e3bd25610bde0b7dc51306660365542e318d Mon Sep 17 00:00:00 2001
From: ZhuDongming <773644075@qq.com>
Date: Tue, 07 Jul 2020 10:08:15 +0800
Subject: [PATCH] update
---
src/main/java/com/moral/controller/ScreenController.java | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/moral/controller/ScreenController.java b/src/main/java/com/moral/controller/ScreenController.java
index 204acc3..79c159c 100644
--- a/src/main/java/com/moral/controller/ScreenController.java
+++ b/src/main/java/com/moral/controller/ScreenController.java
@@ -719,6 +719,9 @@
String time = map.get("time").toString();
time = time.substring(time.length() - 2);
map.put("time", Integer.valueOf(time));
+ if(parameters.get("type").equals("day")){
+ map.put("time", Integer.valueOf(time)+1);
+ }
map.put("value", map.remove(sensorKey));
}
return new ResultBean<List<Map<String, Object>>>(list);
@@ -1687,7 +1690,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();
@@ -1856,8 +1859,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