From 186ec9dcec258b3cead27c6874a828b9f48e1c8b Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Fri, 28 Aug 2020 13:55:15 +0800
Subject: [PATCH] update

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

diff --git a/src/main/java/com/moral/controller/MonitorPointController.java b/src/main/java/com/moral/controller/MonitorPointController.java
index 9174cf5..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
@@ -35,7 +39,7 @@
      */
     @GetMapping("get-by-id")
     public ResultBean getById(Integer id){
-        MonitorPoint monitorPoint = monitorPointService.selectWithRelationById(id);
+        MonitorPoint monitorPoint = monitorPointService.queryWithRelationById(id);
         ResultBean resultBean = new ResultBean(ResultBean.SUCCESS);
         resultBean.setData(monitorPoint);
         return resultBean;
@@ -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