From ff8e858fc5da5de2739da2e1bf425f5c075091ba Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Wed, 09 May 2018 10:21:44 +0800
Subject: [PATCH] mobile app 设备详情
---
src/main/java/com/moral/service/DeviceService.java | 2 ++
src/main/java/com/moral/controller/MobileController.java | 9 ++++++++-
src/main/java/com/moral/service/impl/DeviceServiceImpl.java | 6 ++++++
3 files changed, 16 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/moral/controller/MobileController.java b/src/main/java/com/moral/controller/MobileController.java
index abe5d9b..5ce114d 100644
--- a/src/main/java/com/moral/controller/MobileController.java
+++ b/src/main/java/com/moral/controller/MobileController.java
@@ -74,7 +74,14 @@
OperateUser operateUser = operateUserService.updatePassword(uid,password,newpassword);
return new AppData<OperateUser>(operateUser);
}
-
+ /**
+ * ������ ������id ���������������������
+ */
+ @RequestMapping("deviceInfo")
+ public AppData<Device> deviceInfo(Integer id){
+ Device device = deviceService.queryById(id);
+ return new AppData<Device>(device);
+ }
/**
*
* @param equDeviceAdapter
diff --git a/src/main/java/com/moral/service/DeviceService.java b/src/main/java/com/moral/service/DeviceService.java
index ff611fc..0074580 100644
--- a/src/main/java/com/moral/service/DeviceService.java
+++ b/src/main/java/com/moral/service/DeviceService.java
@@ -38,4 +38,6 @@
List<Device> getDevicesByMonitorPointId(Integer monitorPointId);
List<Map<String,String>> queryDevicesState(List<String> macList,Boolean withData);
+
+ Device queryById(Integer id);
}
diff --git a/src/main/java/com/moral/service/impl/DeviceServiceImpl.java b/src/main/java/com/moral/service/impl/DeviceServiceImpl.java
index fa2f3b6..d68aa2e 100644
--- a/src/main/java/com/moral/service/impl/DeviceServiceImpl.java
+++ b/src/main/java/com/moral/service/impl/DeviceServiceImpl.java
@@ -405,4 +405,10 @@
}).collect(Collectors.toList());
return list;
}
+
+ @Override
+ public Device queryById(Integer id) {
+ return deviceMapper.selectByPrimaryKey(id);
+ }
+
}
--
Gitblit v1.8.0