From dad714704451fbcc04b48d4efcb460410e7a8aa0 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Wed, 19 Aug 2020 14:47:32 +0800
Subject: [PATCH] update
---
src/main/java/com/moral/controller/ScreenController.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/moral/controller/ScreenController.java b/src/main/java/com/moral/controller/ScreenController.java
index df64fdd..207fe08 100644
--- a/src/main/java/com/moral/controller/ScreenController.java
+++ b/src/main/java/com/moral/controller/ScreenController.java
@@ -1978,7 +1978,7 @@
@ResponseBody
public List windAndDeviceData(String monitorPointId) {
Calendar calendar = Calendar.getInstance();
- calendar.set(Calendar.MINUTE, (calendar.get(Calendar.MINUTE) - 4));
+ calendar.set(Calendar.MINUTE, (calendar.get(Calendar.MINUTE) - 2));
SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm");
String time = df.format(calendar.getTime())+":00";
int year = calendar.get(Calendar.YEAR);
--
Gitblit v1.8.0