From a0341d4100c15c57fb645fd1f23225563e306712 Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Wed, 28 Feb 2018 10:55:55 +0800
Subject: [PATCH] 设备和监控点 两模块修改,同步reids里的信息。数据字典功能添加

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

diff --git a/src/main/java/com/moral/controller/MonitorPointController.java b/src/main/java/com/moral/controller/MonitorPointController.java
index 73d7170..8076b91 100644
--- a/src/main/java/com/moral/controller/MonitorPointController.java
+++ b/src/main/java/com/moral/controller/MonitorPointController.java
@@ -6,6 +6,8 @@
 import com.moral.service.MonitorPointService;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.List;
+
 import javax.annotation.Resource;
 
 
@@ -33,7 +35,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;
@@ -44,4 +46,11 @@
         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);
+	}
+
 }

--
Gitblit v1.8.0