From 2b3c06ae70b16b83063158d092094619579a4d7b Mon Sep 17 00:00:00 2001
From: 于紫祥_1901 <email@yuzixiang_1910>
Date: Tue, 27 Oct 2020 14:40:12 +0800
Subject: [PATCH] 风场更新
---
src/main/java/com/moral/controller/ScreenController.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/moral/controller/ScreenController.java b/src/main/java/com/moral/controller/ScreenController.java
index 1b6ff2b..e7459a2 100644
--- a/src/main/java/com/moral/controller/ScreenController.java
+++ b/src/main/java/com/moral/controller/ScreenController.java
@@ -2023,7 +2023,7 @@
Calendar calendar = Calendar.getInstance();
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";
+ //String time = df.format(calendar.getTime()) + ":00";
int year = calendar.get(Calendar.YEAR);
int month = calendar.get(Calendar.MONTH) + 1;
String mon;
@@ -2033,7 +2033,7 @@
mon = "" + month;
}
String table = "history_minutely_" + year + mon;
- List list = deviceService.byMonitorIdGetDeviceAndWind(monitorPointId, time, table);
+ List list = deviceService.byMonitorIdGetDeviceAndWind(monitorPointId,table);
return list;
}
@@ -2054,7 +2054,7 @@
mon = "" + month;
}
String table = "history_minutely_" + year + mon;
- List list = deviceService.byMonitorIdGetDeviceAndWindSpecial(monitorPointId, time, table);
+ List list = deviceService.byMonitorIdGetDeviceAndWindSpecial(monitorPointId,table);
return list;
}
--
Gitblit v1.8.0