From 0d16824a3fb24ee0540c110ee4500b501b310954 Mon Sep 17 00:00:00 2001
From: xufenglei <xufenglei>
Date: Mon, 22 Jul 2019 15:53:38 +0800
Subject: [PATCH] update
---
src/main/java/com/moral/controller/ScreenController.java | 180 ++++++++++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 138 insertions(+), 42 deletions(-)
diff --git a/src/main/java/com/moral/controller/ScreenController.java b/src/main/java/com/moral/controller/ScreenController.java
index f9c053d..61c46c2 100644
--- a/src/main/java/com/moral/controller/ScreenController.java
+++ b/src/main/java/com/moral/controller/ScreenController.java
@@ -1,8 +1,58 @@
package com.moral.controller;
+import static com.moral.common.util.ResourceUtil.getValue;
+import static com.moral.common.util.WebUtils.getParametersStartingWith;
+
+import java.io.BufferedReader;
+import java.io.ByteArrayInputStream;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.PrintWriter;
+import java.net.HttpURLConnection;
+import java.net.URL;
+import java.text.DecimalFormat;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.stream.Collectors;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+
+import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.net.ftp.FTPClient;
+import org.apache.http.HttpResponse;
+import org.apache.log4j.Logger;
+import org.dom4j.Document;
+import org.dom4j.Element;
+import org.dom4j.io.SAXReader;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.cglib.beans.BeanMap;
+import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.util.ObjectUtils;
+import org.springframework.web.bind.annotation.CrossOrigin;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.servlet.ModelAndView;
+import org.xml.sax.InputSource;
+
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
+import com.googlecode.aviator.AviatorEvaluator;
+import com.googlecode.aviator.Expression;
import com.moral.common.bean.Constants;
import com.moral.common.bean.JsonData;
import com.moral.common.bean.PageResult;
@@ -44,51 +94,12 @@
import com.moral.service.SensorService;
import com.moral.service.SensorUnitService;
import com.moral.service.WeatherService;
+import com.moral.util.TempAllocationUtils;
+
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
-import org.apache.commons.collections.CollectionUtils;
-import org.apache.commons.net.ftp.FTPClient;
-import org.apache.log4j.Logger;
-import org.dom4j.Document;
-import org.dom4j.Element;
-import org.dom4j.io.SAXReader;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.cglib.beans.BeanMap;
-import org.springframework.data.redis.core.RedisTemplate;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.util.ObjectUtils;
-import org.springframework.web.bind.annotation.CrossOrigin;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.bind.annotation.RestController;
-import org.springframework.web.servlet.ModelAndView;
-import org.xml.sax.InputSource;
-
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletRequest;
-import java.io.BufferedReader;
-import java.io.ByteArrayInputStream;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-import java.util.stream.Collectors;
-
-import static com.moral.common.util.ResourceUtil.getValue;
-import static com.moral.common.util.WebUtils.getParametersStartingWith;
/**
* The Class ScreenController.������������
@@ -968,6 +979,22 @@
})
public ResultBean<List<Map<String, Object>>> AIForecast (HttpServletRequest request) throws Exception {
Map<String, Object> parameters = getParametersStartingWith(request, null);
+ //System.out.println(parameters);
+ String monitorPoint = (String) parameters.get("monitorPoint");
+ 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"));
@@ -976,6 +1003,15 @@
// monitorPointService.isCompensateCalculation(parameters);
List<Map<String, Object>> list = historyMinutelyService.getMonitorPointOrDeviceAvgData(parameters);
+ Map<String, Object> mpMap = new HashMap<>();
+ mpMap = monitorPointService.selectAllById(monitorPoint);
+ //������������map���������������������������������������������������
+ Map<String, Object> weatherParameters = new HashMap<>();
+ weatherParameters.put("organizationId", mpMap.get("organization_id"));
+ weatherParameters.put("time", intoTime);
+ //������������������
+ Map<String, Object> weatherMap = weatherService.get15DayWeatherDataByRegion(weatherParameters);
+ Map<String, Object> tempMap = TempAllocationUtils.tempAllocation(weatherMap);
//������������������
Map<String, Map<String, Object>> sensorUnitMap = sensorUnitService.getSensorsByMonitPointId(monitor_point_id);
@@ -983,26 +1019,86 @@
String time = map.get("time").toString();
time = time.substring(time.length() - 2);
map.put("time", Integer.valueOf(time));
+ map.put("temp", tempMap.get(map.get("time").toString()));
List<Number> values = new ArrayList<Number>();
List<String> units = new ArrayList<String>();
for (String string : sensorKeys) {
if(sensorUnitMap!=null && !sensorUnitMap.isEmpty()) {
if(sensorUnitMap.get(string)!=null) {
units.add(sensorUnitMap.get(string).get("name").toString());
+ String rules = sensorUnitMap.get(string).get("rules").toString();
+ rules = rules.replace("{0}", "a");
+ rules = rules.replace("d", "");
+ Expression expression = AviatorEvaluator.compile(rules);
+ Double value;
+ Map<String, Object> ev = new HashMap<>();
+ ev.put("a", map.get(string));
+ value = (Double) expression.execute(ev);
+ //������������������
+ DecimalFormat df = new DecimalFormat("#.00");
+ value = Double.parseDouble(df.format(value));
+ values.add(value);
}else {
Map<String, Object> sensorMap = sensorService.getSensorBySensorKey(string);
units.add(sensorMap.get("unit").toString());
+ values.add((Number) map.remove(string));
}
}else {
Map<String, Object> sensorMap = sensorService.getSensorBySensorKey(string);
units.add(sensorMap.get("unit").toString());
+ values.add((Number) map.remove(string));
}
- values.add((Number) map.remove(string));
+ //values.add((Number) map.remove(string));
}
map.put("values", values);
map.put("units", units);
}
return new ResultBean<List<Map<String, Object>>>(list);
}
+
+ @GetMapping("getWeather")
+ @ApiOperation(value = "������������������", notes = "������������������")
+ @ApiImplicitParams(value = {
+ @ApiImplicitParam(name = "organizationId", defaultValue = "5", value = "���������������������id", required = true, paramType = "query", dataType = "String"),
+ @ApiImplicitParam(name = "time", value = "������,���(���������2018-03-06)", required = true, paramType = "query", dataType = "String"),
+ })
+ public ResultBean<Map<String, Object>> getWeather(HttpServletRequest request) throws Exception {
+ Map<String, Object> parameters = getParametersStartingWith(request, null);
+ Map<String, Object> map = weatherService.get15DayWeatherDataByRegion(parameters);
+ /*Map<String, Object> tempMap = new HashMap<>();
+ Double tempDay = Double.parseDouble(map.get("tempDay").toString());
+ Double tempNight = Double.parseDouble(map.get("tempNight").toString());
+ Double time5 = tempNight;
+ Double time13 = tempDay;
+ Double difference = tempDay-tempNight;
+ Double dif_8 = difference/8;
+ Double dif_16 = difference/16;
+ tempMap.put("5", time5);
+ tempMap.put("13", time13);
+ String time = null;
+ Double t = time5;
+ for(int i=4;i>=0;i--) {
+ time = ""+i;
+ t = t+dif_16;
+ String tempLast = ""+Math.round(t);
+ tempMap.put(time, tempLast);
+ }
+ Double y = time5;
+ for(int i=6;i<13;i++) {
+ time = ""+i;
+ y = y+dif_8;
+ String tempLast = ""+Math.round(y);
+ tempMap.put(time, tempLast);
+ }
+ Double z = time13;
+ for(int i=14;i<=23;i++) {
+ time = ""+i;
+ z = z-dif_16;
+ String tempLast = ""+Math.round(z);
+ tempMap.put(time, tempLast);
+ }*/
+ Map<String, Object> tempMap = TempAllocationUtils.tempAllocation(map);
+ return new ResultBean<Map<String, Object>>(tempMap);
+ }
}
--
Gitblit v1.8.0