From a332264920c9cd9226d566c19e36e5d5b5549c1b Mon Sep 17 00:00:00 2001
From: ZhuDongming <773644075@qq.com>
Date: Mon, 12 Aug 2019 15:11:31 +0800
Subject: [PATCH] Merge branch 'master' of http://blit.7drlb.com:8888/r/screen_api_v2
---
src/main/java/com/moral/controller/ScreenController.java | 21 ---------------------
1 files changed, 0 insertions(+), 21 deletions(-)
diff --git a/src/main/java/com/moral/controller/ScreenController.java b/src/main/java/com/moral/controller/ScreenController.java
index 0471836..662378a 100644
--- a/src/main/java/com/moral/controller/ScreenController.java
+++ b/src/main/java/com/moral/controller/ScreenController.java
@@ -1190,25 +1190,4 @@
}
}
- @GetMapping("/getSensors")
- @ApiOperation(value = "���������������������", notes = "���������������������")
- @ApiImplicitParams(value = {
- @ApiImplicitParam(name = "mac", value = "������mac������������p5dnd7a0392068���", required = true, paramType = "query", dataType = "String"),
- @ApiImplicitParam(name = "startTime", value = "������������(���������2019-07-17 17:07:00)", required = false, paramType = "query", dataType = "String"),
- @ApiImplicitParam(name = "endTime", value = "������������(���������2019-07-17 17:07:00)", required = false, paramType = "query", dataType = "String")
- })
- public ResultBean getSensors(HttpServletRequest request) throws Exception{
- Map<String, Object> parameters = WebUtils.getParametersStartingWith(request, null);
- String mac = parameters.get("mac").toString();
- if (mac != null && mac.length() != 0) {
- List<Map<String, Object>> sensorList = historyMinutelyService.getSensorData(parameters);
- if(sensorList.size()==0){
- return new ResultBean("������������������",1);
- }else{
- return new ResultBean("���������������",0);
- }
- }
- return null;
- }
-
}
--
Gitblit v1.8.0