From dbed3099ea0dd2a517b739f29943d4ee529760e6 Mon Sep 17 00:00:00 2001
From: xufenglei <xufenglei>
Date: Mon, 17 Jun 2019 15:23:45 +0800
Subject: [PATCH] Merge branch 'master' of http://xufenglei@blit.7drlb.com:8888/r/screen_api_v2.git
---
src/main/java/com/moral/controller/ScreenController.java | 171 +++++++++++++++++++++++++++++++++++++++++----------------
1 files changed, 123 insertions(+), 48 deletions(-)
diff --git a/src/main/java/com/moral/controller/ScreenController.java b/src/main/java/com/moral/controller/ScreenController.java
index 99f35a6..f9c053d 100644
--- a/src/main/java/com/moral/controller/ScreenController.java
+++ b/src/main/java/com/moral/controller/ScreenController.java
@@ -1,48 +1,5 @@
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.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.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;
@@ -85,12 +42,53 @@
import com.moral.service.OrganizationService;
import com.moral.service.QualityDailyService;
import com.moral.service.SensorService;
+import com.moral.service.SensorUnitService;
import com.moral.service.WeatherService;
-
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.������������
@@ -109,6 +107,8 @@
@Resource
SensorService sensorService;
+ @Resource
+ SensorUnitService sensorUnitService;
@Resource
MonitorPointService monitorPointService;
@Resource
@@ -899,17 +899,19 @@
String mac = parameters.get("mac").toString();
String sensorKey = parameters.get("sensorKey").toString();
String time = parameters.get("time").toString();
- Long code = monitorPoint.getAreaCode().longValue();
- String regionName = areaService.queryFullNameByCode(code);
- Device device = deviceService.getDeviceByMac(mac, false);
if (monitorPoint != null && mac != null && sensorKey != null && time != null) {
Map<String, Double> resultMap = historyDailyService.getTraceabilityData(parameters);
JSONObject params = new JSONObject();
+ Long code = monitorPoint.getAreaCode().longValue();
+ String regionName = areaService.queryFullNameByCode(code);
+ Device device = deviceService.getDeviceByMac(mac, false);
+ Device deviceSecond = deviceService.getDeviceByLongitudeAsc(mac);
params.put("sensorInfo", resultMap);
params.put("regionCode", code);
params.put("regionName", regionName);
params.put("monitorPoint", monitorPoint);
params.put("device", device);
+ params.put("deviceSecond",deviceSecond);
String paramsJson = params.toJSONString();
model.addObject("traceabilityParams", paramsJson);
model.setViewName("traceability");
@@ -917,7 +919,7 @@
} else {
StringBuilder msg = new StringBuilder();
msg.append(" param[0] monitorPointId:");
- msg.append(monitorPointId.toString());
+ msg.append(monitorPointId);
msg.append(" param[0] mac:");
msg.append(mac);
msg.append(" param[0] sensorKey:");
@@ -929,5 +931,78 @@
return model;
}
}
+
+ /*@GetMapping("getSensor")
+ @ApiOperation(value = "������������", notes = "������������")
+ @ApiImplicitParams(value = {
+ @ApiImplicitParam(name = "mac", value = "������MN���", required = true, paramType = "query", dataType = "String")
+ })
+ public ResultBean<Map<String, Object>> getSensor(HttpServletRequest request) throws Exception {
+ Map<String, Object> parameters = WebUtils.getParametersStartingWith(request, null);
+ String mac = (String) parameters.get("mac");
+ //System.out.println("ScreenController-----getSensor-----mac:"+mac);
+ Map<String, Object> map = sensorUnitService.getSensorByMac(mac);
+ System.out.println("ScreenController-----getSensor-----map:"+map);
+ return new ResultBean<Map<String, Object>>(map);
+ }*/
+
+ @GetMapping("getSensorByMonitorPointId")
+ @ApiOperation(value = "������������", notes = "������������")
+ @ApiImplicitParams(value = {
+ @ApiImplicitParam(name = "monitor_point_id", value = "������������id", required = true, paramType = "query", dataType = "String")
+ })
+ public ResultBean<List<Map<String, Object>>> getSensorByMonitorPointId(HttpServletRequest request) throws Exception {
+ Map<String, Object> parameters = WebUtils.getParametersStartingWith(request, null);
+ String monitor_point_id = (String) parameters.get("monitor_point_id");
+ List<Map<String, Object>> map = sensorUnitService.getSensorsByMonitPointId2(monitor_point_id);
+ return new ResultBean<List<Map<String, Object>>>(map);
+ }
+
+ @GetMapping("AIForecast")
+ @ApiOperation(value = "AI������", notes = "AI������")
+ @ApiImplicitParams(value = {
+ @ApiImplicitParam(name = "monitorPoint", value = "���������id", required = true, paramType = "query", dataType = "String"),
+ @ApiImplicitParam(name = "mac", value = "������mac", required = false, paramType = "query", dataType = "String"),
+ @ApiImplicitParam(name = "sensorKey", value = "���������key,���������������������������", required = true, paramType = "query", dataType = "String"),
+ @ApiImplicitParam(name = "time", value = "������,���(���������2018-03-06)", required = true, paramType = "query", dataType = "String"),
+ })
+ public ResultBean<List<Map<String, Object>>> AIForecast (HttpServletRequest request) throws Exception {
+ Map<String, Object> parameters = getParametersStartingWith(request, null);
+ ParameterUtils.getTimeType4Time(parameters);
+ String monitor_point_id = (String) parameters.get("monitorPoint");
+ parameters.put("monitorPointId", parameters.remove("monitorPoint"));
+ String[] sensorKeys = parameters.remove("sensorKey").toString().split(",");
+ parameters.put("sensors", Arrays.asList(sensorKeys));
+ // monitorPointService.isCompensateCalculation(parameters);
+ List<Map<String, Object>> list = historyMinutelyService.getMonitorPointOrDeviceAvgData(parameters);
+
+ //������������������
+ Map<String, Map<String, Object>> sensorUnitMap = sensorUnitService.getSensorsByMonitPointId(monitor_point_id);
+
+ for (Map<String, Object> map : list) {
+ String time = map.get("time").toString();
+ time = time.substring(time.length() - 2);
+ map.put("time", Integer.valueOf(time));
+ 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());
+ }else {
+ Map<String, Object> sensorMap = sensorService.getSensorBySensorKey(string);
+ units.add(sensorMap.get("unit").toString());
+ }
+ }else {
+ Map<String, Object> sensorMap = sensorService.getSensorBySensorKey(string);
+ units.add(sensorMap.get("unit").toString());
+ }
+ values.add((Number) map.remove(string));
+ }
+ map.put("values", values);
+ map.put("units", units);
+ }
+ return new ResultBean<List<Map<String, Object>>>(list);
+ }
}
--
Gitblit v1.8.0