From e786ed5d01635555dac37c69003bdbbf757d69d8 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Wed, 18 Nov 2020 17:46:21 +0800
Subject: [PATCH] 从history获取数据接口更新为从history日表获取

---
 src/main/resources/mapper/DeviceMapper.xml |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/src/main/resources/mapper/DeviceMapper.xml b/src/main/resources/mapper/DeviceMapper.xml
index 26a07f6..cbdd370 100644
--- a/src/main/resources/mapper/DeviceMapper.xml
+++ b/src/main/resources/mapper/DeviceMapper.xml
@@ -572,6 +572,9 @@
     </select>
     <select id="getDevice" resultType="com.moral.entity.Device">
         select * from device
-        where name like concat('%',#{macOrName},'%')
+        where mac like concat('%',#{macOrName},'%')
+    </select>
+    <select id="getDeviceByCityCode" resultType="com.moral.entity.Device">
+        SELECT d.* FROM `monitor_point` mt,device d where d.monitor_point_id=mt.id and d.state!=4 and mt.city_code=130900
     </select>
 </mapper>
\ No newline at end of file

--
Gitblit v1.8.0