From 57cb796b40a983afcff66edf967e2a1eb513b870 Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Fri, 02 Feb 2018 14:19:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/moral/controller/DeviceController.java | 9 +++++++++
1 files changed, 9 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/moral/controller/DeviceController.java b/src/main/java/com/moral/controller/DeviceController.java
index 0cbbc34..762416c 100644
--- a/src/main/java/com/moral/controller/DeviceController.java
+++ b/src/main/java/com/moral/controller/DeviceController.java
@@ -6,6 +6,8 @@
import com.moral.service.DeviceService;
import org.springframework.web.bind.annotation.*;
+import java.util.List;
+
import javax.annotation.Resource;
@RestController
@@ -30,4 +32,11 @@
ResultBean resultBean = new ResultBean(ResultBean.SUCCESS);
return resultBean;
}
+
+ @GetMapping("monitorPointId")
+ public ResultBean<List<Device>> getDevicesByMonitorPointId(@RequestParam(name="monitorPointId")Integer monitorPointId) {
+
+ List<Device> devices = deviceService.getDevicesByMonitorPointId(monitorPointId);
+ return new ResultBean<List<Device>>(devices);
+ }
}
--
Gitblit v1.8.0