From d6a0ac523af2db9216d30fabf1063c095c5b41e1 Mon Sep 17 00:00:00 2001
From: xufenglei <xufenglei>
Date: Fri, 06 Jul 2018 15:52:39 +0800
Subject: [PATCH] app接口
---
src/main/java/com/moral/controller/ScreenController.java | 20 +++++++++++++++-----
1 files changed, 15 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/moral/controller/ScreenController.java b/src/main/java/com/moral/controller/ScreenController.java
index d02d6d6..064270e 100644
--- a/src/main/java/com/moral/controller/ScreenController.java
+++ b/src/main/java/com/moral/controller/ScreenController.java
@@ -60,7 +60,7 @@
@RequestMapping("/screen")
//@CrossOrigin(origins = "*", maxAge = 3600)
@SuppressWarnings({ "rawtypes", "unchecked", "unused" })
-@Api(tags = "Screen", description = "������������")
+@Api(tags = "Screen", description = "������������")
public class ScreenController {
public static Logger log = Logger.getLogger(ScreenController.class);
@Resource
@@ -599,7 +599,7 @@
} else {
MonitorPoint monitorPoint = monitorPointService.queryMonitorPointById(Integer.parseInt(primaryKey));
- List<DeviceVersion> versionList = deviceVersionService.queryByOrgId(monitorPoint.getOrganizationId());
+ List<DeviceVersion> versionList = deviceVersionService.queryByMpointId(monitorPoint.getId());
if(versionList.size() > 0) {
List<Integer> versionNolist = versionList.stream().map(item -> {
return item.getVersion();
@@ -610,10 +610,10 @@
}
}
}
- if(rtdLayout.getDefaultMonitorItems().size() == 0 ) {
+ if(rtdLayout!=null && rtdLayout.getDefaultMonitorItems().size() == 0 ) {
rtdLayout.getDefaultMonitorItems().addAll(rtdLayout.getCoreMonitorItems());
}
- return new ResultBean(rtdLayout);
+ return new ResultBean(rtdLayout == null? new RealTimeDeviceLayout():rtdLayout);
}
@GetMapping("report_avg_data")
@@ -626,7 +626,12 @@
})
public ResultBean<List<Map<String, Object>>> getMonitorPointOrDeviceAvgDataBySensorKey(HttpServletRequest request) throws Exception {
Map<String, Object> parameters = getParametersStartingWith(request, null);
- parameters.put("type", "month");
+ int length = ((String)parameters.get("time")).split("-").length;
+ if (length == 2) {
+ parameters.put("type", "month");
+ } else if (length == 3){
+ parameters.put("type", "day");
+ }
parameters.put("monitorPointId", parameters.remove("monitorPoint"));
String[] sensorKeys = parameters.remove("sensorKey").toString().split(",");
parameters.put("sensors", Arrays.asList(sensorKeys));
@@ -636,6 +641,11 @@
String time = map.get("time").toString();
time = time.substring(time.length() - 2);
map.put("time", Integer.valueOf(time));
+ List<Number> values = new ArrayList<Number>();
+ for (String string : sensorKeys) {
+ values.add((Number) map.remove(string));
+ }
+ map.put("values", values);
}
return new ResultBean<List<Map<String, Object>>>(list);
}
--
Gitblit v1.8.0