From 539a7077cbf638a5aa9ae5e46c17be96daba7d9b Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Mon, 02 Jul 2018 10:54:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/moral/controller/MonitorPointController.java | 11 +++++++++++
1 files changed, 11 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/moral/controller/MonitorPointController.java b/src/main/java/com/moral/controller/MonitorPointController.java
index 8076b91..b32c4ba 100644
--- a/src/main/java/com/moral/controller/MonitorPointController.java
+++ b/src/main/java/com/moral/controller/MonitorPointController.java
@@ -6,9 +6,13 @@
import com.moral.service.MonitorPointService;
import org.springframework.web.bind.annotation.*;
+import static com.moral.common.util.WebUtils.getParametersStartingWith;
+
import java.util.List;
+import java.util.Map;
import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
@RestController
@@ -52,5 +56,12 @@
List<MonitorPoint> monitorPoints = monitorPointService.getMonitorPointsByName(name);
return new ResultBean<List<MonitorPoint>>(monitorPoints);
}
+
+ @GetMapping("list/region")
+ public ResultBean<List<MonitorPoint>> getMonitorPointsByRegion(HttpServletRequest request) {
+ Map<String, Object> parameters = getParametersStartingWith(request, null);
+ List<MonitorPoint> monitorPoints = monitorPointService.getMonitorPointsByRegion(parameters);
+ return new ResultBean<List<MonitorPoint>>(monitorPoints);
+ }
}
--
Gitblit v1.8.0