From 2d4d397ce9ea8e53d4a63b6463c02a7586fb27ea Mon Sep 17 00:00:00 2001 From: ZhuDongming <773644075@qq.com> Date: Thu, 08 Aug 2019 17:03:55 +0800 Subject: [PATCH] Merge branch 'master' of http://blit.7drlb.com:8888/r/screen_api_v2 --- 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