From 43b45a739b9e17171f057f538dfbaa4c2f0e359d Mon Sep 17 00:00:00 2001
From: 于紫祥_1901 <email@yuzixiang_1910>
Date: Thu, 13 Aug 2020 09:47:16 +0800
Subject: [PATCH] 风场图update
---
src/main/java/com/moral/controller/ScreenController.java | 2 +-
src/main/java/com/moral/service/impl/DeviceServiceImpl.java | 1 +
2 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/moral/controller/ScreenController.java b/src/main/java/com/moral/controller/ScreenController.java
index cbdb6e6..f47e3e1 100644
--- a/src/main/java/com/moral/controller/ScreenController.java
+++ b/src/main/java/com/moral/controller/ScreenController.java
@@ -2007,7 +2007,7 @@
}else {
mu=""+minute;
}
- String time=year + "-" + mon + "-" + dt + " " +hu + ":" +mu + ":" + "00";
+ String time=year + "-" + mon + "-" + dt + " " +hu + ":" +46 + ":" + "00";
String table="history_minutely_"+year+mon;
List list=deviceService.byMonitorIdGetDeviceAndWind(monitorPointId,time,table);
return list;
diff --git a/src/main/java/com/moral/service/impl/DeviceServiceImpl.java b/src/main/java/com/moral/service/impl/DeviceServiceImpl.java
index 8b0cff8..6ef4f98 100644
--- a/src/main/java/com/moral/service/impl/DeviceServiceImpl.java
+++ b/src/main/java/com/moral/service/impl/DeviceServiceImpl.java
@@ -721,6 +721,7 @@
public List byMonitorIdGetDeviceAndWind(String id,String time,String tab) {
List<DeviceAndWind> deviceAndWinds=deviceMapper.byMonitorIdGetDeviceAndWind(Integer.parseInt(id),time,tab);
+ System.out.println(time);
List loList=new ArrayList();
List laList=new ArrayList();
Double U=0.0;
--
Gitblit v1.8.0