From 2ac80d588a68f60084d8bcc02aabd18c91100267 Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Tue, 29 May 2018 14:50:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/moral/controller/DeviceController.java | 10 ++++++++++
1 files changed, 10 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/moral/controller/DeviceController.java b/src/main/java/com/moral/controller/DeviceController.java
index 468425f..1fad118 100644
--- a/src/main/java/com/moral/controller/DeviceController.java
+++ b/src/main/java/com/moral/controller/DeviceController.java
@@ -6,11 +6,14 @@
import com.moral.service.DeviceService;
import org.springframework.web.bind.annotation.*;
+import static com.moral.common.util.WebUtils.getParametersStartingWith;
+
import java.util.Date;
import java.util.List;
import java.util.Map;
import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
@RestController
@RequestMapping("device")
@@ -49,4 +52,11 @@
List<Device> devices = deviceService.getDevicesByMonitorPointId(monitorPointId);
return new ResultBean<List<Device>>(devices);
}
+
+ @GetMapping("professionId")
+ public ResultBean<List<Device>> getDevicesByProfessionId(HttpServletRequest request) {
+ Map<String, Object> parameters = getParametersStartingWith(request, null);
+ List<Device> devices = deviceService.getDevicesByProfessionId(parameters);
+ return new ResultBean<List<Device>>(devices);
+ }
}
--
Gitblit v1.8.0