From e125b445697a6b8c2b5cc5c57f31249c5088c1c9 Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Fri, 26 Jan 2018 14:44:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/moral/controller/SensorController.java | 7 +++++++
1 files changed, 7 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/moral/controller/SensorController.java b/src/main/java/com/moral/controller/SensorController.java
index f6f616d..476714d 100644
--- a/src/main/java/com/moral/controller/SensorController.java
+++ b/src/main/java/com/moral/controller/SensorController.java
@@ -35,4 +35,11 @@
ResultBean resultBean = new ResultBean(ResultBean.SUCCESS);
return resultBean;
}
+
+ @GetMapping("all")
+ public ResultBean<List<Sensor>> getAllSensors() {
+ List<Sensor> sensors = sensorService.getAllSensors();
+ return new ResultBean<List<Sensor>>(sensors);
+ }
+
}
--
Gitblit v1.8.0