From 154b73d12f9e39039fc7b099beab3881c94b2d8d Mon Sep 17 00:00:00 2001
From: ZhuDongming <773644075@qq.com>
Date: Thu, 21 Nov 2019 12:42:00 +0800
Subject: [PATCH] update：请求合并
---
src/main/java/com/moral/controller/ScreenController.java | 40 ++++++++++++++--------------------------
1 files changed, 14 insertions(+), 26 deletions(-)
diff --git a/src/main/java/com/moral/controller/ScreenController.java b/src/main/java/com/moral/controller/ScreenController.java
index 042724a..0fd3457 100644
--- a/src/main/java/com/moral/controller/ScreenController.java
+++ b/src/main/java/com/moral/controller/ScreenController.java
@@ -545,21 +545,9 @@
}
@GetMapping("/getSensorsMap")
- public ResultBean getSensorsMapOnly(String mac){
- Map<String, String> paramMap = sensorService.getSensorsMapOnly(mac);
- ResultBean<Map<String, String>> resultBean = new ResultBean();
- resultBean.setData(paramMap);
- resultBean.setCode(ResultBean.SUCCESS);
- return resultBean;
- }
-
- @GetMapping("/getSensorsUnitMap")
- public ResultBean getSensorsUnitMap(String mac){
- Map<String, String> paramMap = sensorService.getSensorsUnitMap(mac);
- ResultBean<Map<String, String>> resultBean = new ResultBean();
- resultBean.setData(paramMap);
- resultBean.setCode(ResultBean.SUCCESS);
- return resultBean;
+ public List<Map<String, String>> getSensorsMapOnly(String mac) {
+ List<Map<String, String>> sensorsMapList = sensorService.getSensorsMaps(mac);
+ return sensorsMapList;
}
@RequestMapping(value = "/get-monitorpoints", method = RequestMethod.GET)
@@ -1049,8 +1037,8 @@
String monitor_point_id = (String) parameters.get("monitor_point_id");
List<Map<String, Object>> list = sensorService.getSensorByMonitorPointId(monitor_point_id);
List<Map<String, Object>> sensorUnitList = sensorUnitService.getSensorsByMonitPointId2(monitor_point_id);
- System.out.println("list:"+list);
- System.out.println("sensorUnitList:"+sensorUnitList);
+ System.out.println("list:" + list);
+ System.out.println("sensorUnitList:" + sensorUnitList);
for (Map<String, Object> sensorMap : list) {
for (Map<String, Object> sensorUnitMap : sensorUnitList) {
if (sensorUnitMap.get("sensor_key").equals(sensorMap.get("sensorKey"))) {
@@ -1076,7 +1064,7 @@
String intoTime = parameters.get("time").toString();
Date date = new SimpleDateFormat("yy-MM-dd").parse(intoTime);
DateFormat df1 = new SimpleDateFormat("yyyy-MM-dd");
- String alterTime = df1.format(date.getTime()-15*24*60*60*1000);
+ String alterTime = df1.format(date.getTime() - 15 * 24 * 60 * 60 * 1000);
parameters.put("time", alterTime);
ParameterUtils.getTimeType4Time(parameters);
String monitor_point_id = (String) parameters.get("monitorPoint");
@@ -1095,15 +1083,15 @@
Map<String, Object> weatherMap = new HashMap<>();
Map<String, Object> tempMap = new HashMap<>();
Boolean tf = false;
- for(int i=0;i<sensorKeys.length;i++) {
- if(sensorKeys[i].equals("e7")) {
- tf = true;
- }
+ for (int i = 0; i < sensorKeys.length; i++) {
+ if (sensorKeys[i].equals("e7")) {
+ tf = true;
+ }
}
if (tf) {
weatherMap = weatherService.get15DayWeatherDataByRegion(weatherParameters);
tempMap = TempAllocationUtils.tempAllocation(weatherMap);
- }
+ }
//������������������
Map<String, Map<String, Object>> sensorUnitMap = sensorUnitService.getSensorsByMonitPointId(monitor_point_id);
@@ -1111,9 +1099,9 @@
String time = map.get("time").toString();
time = time.substring(time.length() - 2);
map.put("time", Integer.valueOf(time));
- if (tempMap!=null) {
- map.put("temp", tempMap.get(map.get("time").toString()));
- }
+ if (tempMap != null) {
+ 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) {
--
Gitblit v1.8.0