From 67a7a24b47d71dd843dd0b17c5cdf9f519e29d5d Mon Sep 17 00:00:00 2001
From: ZhuDongming <773644075@qq.com>
Date: Tue, 30 Jun 2020 13:20:25 +0800
Subject: [PATCH] update大屏左侧站点设备查询优化及设备因子名称显示null问题

---
 src/main/java/com/moral/controller/MonitorPointController.java |   20 ++++++++++++++++++++
 1 files changed, 20 insertions(+), 0 deletions(-)

diff --git a/src/main/java/com/moral/controller/MonitorPointController.java b/src/main/java/com/moral/controller/MonitorPointController.java
index 68c5c1b..b32c4ba 100644
--- a/src/main/java/com/moral/controller/MonitorPointController.java
+++ b/src/main/java/com/moral/controller/MonitorPointController.java
@@ -6,7 +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
@@ -44,4 +50,18 @@
         ResultBean resultBean = new ResultBean(ResultBean.SUCCESS);
         return resultBean;
     }
+    
+    @GetMapping("list/{name}")
+	public ResultBean<List<MonitorPoint>> getMonitorPointsByName(@PathVariable("name") String name) {
+		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