From 0099e6c9db0c858cb6905477830c79305dca39bb Mon Sep 17 00:00:00 2001
From: 于紫祥_1901 <email@yuzixiang_1910>
Date: Fri, 06 Nov 2020 13:42:27 +0800
Subject: [PATCH] 校准值
---
src/main/java/com/moral/service/DeviceService.java | 2 ++
src/main/resources/mapper/DeviceMapper.xml | 13 +++++++++++--
src/main/java/com/moral/mapper/DeviceMapper.java | 2 ++
src/main/java/com/moral/controller/ScreenController.java | 17 +++++++++++++++++
src/main/java/com/moral/service/impl/DeviceServiceImpl.java | 5 +++++
5 files changed, 37 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/moral/controller/ScreenController.java b/src/main/java/com/moral/controller/ScreenController.java
index 8ecd5e6..fcf8f30 100644
--- a/src/main/java/com/moral/controller/ScreenController.java
+++ b/src/main/java/com/moral/controller/ScreenController.java
@@ -2596,4 +2596,21 @@
}
return 0;
}
+
+ @RequestMapping("/biaozhun")
+ @ResponseBody
+ public List<Device> queryDevice(String macOrName){
+ List<Device> deviceList = new ArrayList<>();
+ if (!macOrName.equals("")){
+ deviceList= deviceService.getDevice(macOrName);
+ }
+ return deviceList;
+ }
+
+ @RequestMapping("/getSensor")
+ @ResponseBody
+ public List<Map<String, Object>> getSensor(String id){
+ List<Map<String, Object>> allSensors = sensorService.getSensorByDeviceId(id);
+ return allSensors;
+ }
}
\ No newline at end of file
diff --git a/src/main/java/com/moral/mapper/DeviceMapper.java b/src/main/java/com/moral/mapper/DeviceMapper.java
index 8135b01..0df5409 100644
--- a/src/main/java/com/moral/mapper/DeviceMapper.java
+++ b/src/main/java/com/moral/mapper/DeviceMapper.java
@@ -89,4 +89,6 @@
List<Map<String, Object>> getDevicesByMpId(int mpId);
String byMacGetOrgId(String mac);
+
+ List<Device> getDevice(String macOrName);
}
\ No newline at end of file
diff --git a/src/main/java/com/moral/service/DeviceService.java b/src/main/java/com/moral/service/DeviceService.java
index 06e5674..a59ca69 100644
--- a/src/main/java/com/moral/service/DeviceService.java
+++ b/src/main/java/com/moral/service/DeviceService.java
@@ -86,4 +86,6 @@
List<Device> getDeviceByCodeAndId(String code,String id);
String byMacGetOrgId(String mac);
+ //������mac������������������������������������
+ List<Device> getDevice(String macOrName);
}
diff --git a/src/main/java/com/moral/service/impl/DeviceServiceImpl.java b/src/main/java/com/moral/service/impl/DeviceServiceImpl.java
index 52829e6..8d30c75 100644
--- a/src/main/java/com/moral/service/impl/DeviceServiceImpl.java
+++ b/src/main/java/com/moral/service/impl/DeviceServiceImpl.java
@@ -1088,4 +1088,9 @@
return deviceMapper.byMacGetOrgId(mac);
}
+ @Override
+ public List<Device> getDevice(String macOrName) {
+ return deviceMapper.getDevice(macOrName);
+ }
+
}
diff --git a/src/main/resources/mapper/DeviceMapper.xml b/src/main/resources/mapper/DeviceMapper.xml
index 59935ea..b3b9f3d 100644
--- a/src/main/resources/mapper/DeviceMapper.xml
+++ b/src/main/resources/mapper/DeviceMapper.xml
@@ -457,8 +457,13 @@
<select id="getDeviceById1" resultType="com.moral.entity.Device">
SELECT d.* FROM `device` as d,monitor_point as mp,device_property as dp where d.monitor_point_id=mp.id and d.id=dp.id and dp.device_tech=1 and d.monitor_point_id=#{id}
</select>
- <select id="getDeviceById2" resultType="com.moral.entity.Device">
- SELECT d.* FROM `device` as d,monitor_point as mp,device_property as dp where d.monitor_point_id=mp.id and d.id=dp.id and dp.device_tech=2 and d.monitor_point_id=#{id}
+ <select id="getDeviceById2" resultType="com.moral.entity.Device">
+ SELECT d.*
+ FROM `device` as d,monitor_point as mp,device_property as dp
+ where d.monitor_point_id=mp.id
+ and d.id=dp.id
+ and dp.device_tech=2
+ and d.monitor_point_id=#{id}
</select>
<select id="getDeviceById3" resultType="com.moral.entity.Device">
SELECT d.* FROM `device` as d,monitor_point as mp,device_property as dp where d.monitor_point_id=mp.id and d.id=dp.id and dp.device_tech=3 and d.monitor_point_id=#{id}
@@ -565,4 +570,8 @@
<select id="getDevicesByMpId" resultType="java.util.Map">
select name,mac from device where monitor_point_id=#{mpId} and is_delete=0
</select>
+ <select id="getDevice" resultType="com.moral.entity.Device">
+ select * from device
+ where mac like concat('%',#{macOrName},'%')
+ </select>
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0