From f1e25082a58c8cb57dd45d226d3a94f4af4a0677 Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Mon, 05 Feb 2018 15:07:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/moral/controller/SensorController.java | 11 +++++++++++
1 files changed, 11 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/moral/controller/SensorController.java b/src/main/java/com/moral/controller/SensorController.java
index b64ee4f..476714d 100644
--- a/src/main/java/com/moral/controller/SensorController.java
+++ b/src/main/java/com/moral/controller/SensorController.java
@@ -19,6 +19,10 @@
public PageBean pageList(PageBean pageBean) {
return sensorService.queryByPageBean(pageBean);
}
+ @GetMapping("list-by-vid")
+ public PageBean pageListByVersionId(Integer versionId){
+ return sensorService.queryByVersionId(versionId);
+ }
@PostMapping("delete-by-ids")
public ResultBean deleteByIds(@RequestBody Integer [] ids){
sensorService.deleteByIds(ids);
@@ -31,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