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/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