Merge branch 'dyf-device' into 6170

fys-modules/fys-equipment/src/main/resources/mapper/equipment/DeviceAlarmMapper.xml

@@ -6,7 +6,7 @@
 
     <!-- 查询设备告警列表 -->
     <select id="selectVoPage" resultType="com.fuyuanshen.equipment.domain.vo.DeviceAlarmVo">
-        select *, d.device_mac as deviceMac, d.device_imei as deviceImei,
+        select *, d.device_mac as deviceMac, d.device_imei as deviceImei,d.device_name as deviceName,
         d.type_name as deviceTypeName, d.device_pic as devicePic
         from device_alarm da
         left join device d on da.device_id = d.id
@@ -30,4 +30,20 @@
         </where>
     </select>
 
+
+    <!-- 根据设备IMEI查询最新的一条告警数据 -->
+    <select id="selectLatestByDeviceImei" resultType="com.fuyuanshen.equipment.domain.vo.DeviceAlarmVo">
+        select *, d.device_mac as deviceMac, d.device_imei as deviceImei,
+        d.type_name as deviceTypeName, d.device_pic as devicePic
+        from device_alarm da
+        left join device d on da.device_id = d.id
+        left join device_type dt on dt.id = da.device_type
+        <where>
+            da.device_imei = #{deviceImei}
+        </where>
+        order by da.create_time desc
+        limit 1
+    </select>
+
+
 </mapper>

fys-modules/fys-equipment/src/main/resources/mapper/equipment/DeviceFenceAccessRecordMapper.xml

@@ -4,29 +4,26 @@
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.fuyuanshen.equipment.mapper.DeviceFenceAccessRecordMapper">
 
-    <!-- 分页查询围栏进出记录列表 -->
+    <!-- 修改后的分页查询围栏进出记录列表 -->
     <select id="selectVoPageWithFenceAndDeviceName"
             resultType="com.fuyuanshen.equipment.domain.vo.DeviceFenceAccessRecordVo">
-        SELECT
-        r.id,
-        r.fence_id,
-        f.name AS fence_name,
-        r.device_id,
-        d.device_name,
-        r.user_id,
-        r.event_type,
-        r.latitude,
-        r.longitude,
-        r.accuracy,
-        r.event_time,
-        r.create_time
+        SELECT r.id,
+               r.fence_id,
+               f.name AS fence_name,
+               r.device_id,
+               d.device_name,
+               r.user_id,
+               r.event_type,
+               r.latitude,
+               r.longitude,
+               r.accuracy,
+               r.event_time,
+               r.create_time
         FROM device_fence_access_record r
-        LEFT JOIN device_geo_fence f ON r.fence_id = f.id
-        LEFT JOIN device d ON r.device_id = d.id
-        <where>
+                 LEFT JOIN device_geo_fence f ON r.fence_id = f.id
+                 LEFT JOIN device d ON r.device_id = d.id
             ${ew.customSqlSegment}
-        </where>
         ORDER BY r.id ASC
     </select>
 
-</mapper>
+</mapper>

fys-modules/fys-equipment/src/main/resources/mapper/equipment/DeviceMapper.xml

@@ -423,4 +423,9 @@
           AND MONTH (dl.create_time) = #{month}
     </select>
 
+    <!-- 根据设备IMEI查询设备 -->
+    <select id="selectDeviceByImei" resultType="com.fuyuanshen.equipment.domain.Device">
+        SELECT * FROM device WHERE device_imei = #{deviceImei}
+    </select>
+
 </mapper>