From 15c4ec98dace455967335a27d0f0efdcdfc61f29 Mon Sep 17 00:00:00 2001
From: lizijie <lzjiiie@163.com>
Date: Sat, 22 Jun 2019 17:18:48 +0800
Subject: [PATCH] 生成预测数据
---
src/main/java/com/moral/service/impl/SensorUnitServiceImpl.java | 2 +-
src/main/java/com/moral/controller/ScreenController.java | 16 ++++++++++++++++
2 files changed, 17 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/moral/controller/ScreenController.java b/src/main/java/com/moral/controller/ScreenController.java
index f9c053d..d5be0ad 100644
--- a/src/main/java/com/moral/controller/ScreenController.java
+++ b/src/main/java/com/moral/controller/ScreenController.java
@@ -89,6 +89,7 @@
import static com.moral.common.util.ResourceUtil.getValue;
import static com.moral.common.util.WebUtils.getParametersStartingWith;
+import static org.assertj.core.api.Assertions.in;
/**
* The Class ScreenController.������������
@@ -968,6 +969,21 @@
})
public ResultBean<List<Map<String, Object>>> AIForecast (HttpServletRequest request) throws Exception {
Map<String, Object> parameters = getParametersStartingWith(request, null);
+ //System.out.println(parameters);
+ String intoTime = parameters.get("time").toString();
+ String[] timeArray = intoTime.split("-");
+ //System.out.println(timeArray);
+ Integer year = Integer.parseInt(timeArray[0]);
+ Integer mon = Integer.parseInt(timeArray[1]);
+ if(mon>1) {
+ mon = mon-1;
+ }else {
+ mon = 12;
+ year = year-1;
+ }
+ String alterTime = year.toString()+"-"+mon.toString()+"-"+timeArray[2];
+ //System.out.println(alterTime);
+ parameters.put("time", alterTime);
ParameterUtils.getTimeType4Time(parameters);
String monitor_point_id = (String) parameters.get("monitorPoint");
parameters.put("monitorPointId", parameters.remove("monitorPoint"));
diff --git a/src/main/java/com/moral/service/impl/SensorUnitServiceImpl.java b/src/main/java/com/moral/service/impl/SensorUnitServiceImpl.java
index 75143fd..064d1d4 100644
--- a/src/main/java/com/moral/service/impl/SensorUnitServiceImpl.java
+++ b/src/main/java/com/moral/service/impl/SensorUnitServiceImpl.java
@@ -121,7 +121,7 @@
String name = (String) sensorMap.get("name");
sensorUnitMap.put(sensor_key, innerMap);
}
- System.out.println(sensorUnitMap);
+ //System.out.println(sensorUnitMap);
return sensorUnitMap;
} else {
Map<String, Map<String, Object>> sensorUnitMap = null;
--
Gitblit v1.8.0