控制中心查询

fys-admin/src/main/java/com/fuyuanshen/global/mqtt/receiver/ReceiverMessageHandler.java

@@ -54,7 +54,7 @@ public class ReceiverMessageHandler implements MessageHandler {
             RedisUtils.offerDeduplicated(queueKey,dedupKey,deviceImei, Duration.ofHours(24));
             //在线状态
             String deviceOnlineStatusRedisKey = GlobalConstants.GLOBAL_REDIS_KEY+ DEVICE_KEY_PREFIX+ deviceImei + DeviceRedisKeyConstants.DEVICE_ONLINE_STATUS_KEY_PREFIX ;
-            RedisUtils.setCacheObject(deviceOnlineStatusRedisKey, "1", Duration.ofSeconds(65));
+            RedisUtils.setCacheObject(deviceOnlineStatusRedisKey, "1", Duration.ofSeconds(120));
         }
 
         String state = payloadDict.getStr("state");

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

@@ -239,7 +239,7 @@
         where d.device_mac = #{deviceMac}
     </select>
     <select id="queryWebDeviceList" resultType="com.fuyuanshen.equipment.domain.vo.WebDeviceVo">
-        select DISTINCT d.id, d.device_name,
+        select * from (select  d.id, d.device_name,
         d.device_mac,
         d.device_sn,
         d.device_imei,
@@ -251,40 +251,41 @@
         ap.name personnelBy,
         d.device_status,
         d.online_status,
-        c.binding_time
+        c.binding_time,
+        ROW_NUMBER() OVER (PARTITION BY d.id ORDER BY c.binding_time) AS row_num
         from device d
         inner join device_type dt on d.device_type = dt.id
         inner join app_device_bind_record c on d.id = c.device_id
         left join app_personnel_info ap on ap.device_id = d.id
-        where dt.communication_mode in (0, 2)
+        where dt.communication_mode in (0, 2) ) a where a.row_num = 1
         <if test="criteria.deviceType != null">
-            and d.device_type = #{criteria.deviceType}
+            and a.device_type = #{criteria.deviceType}
         </if>
         <if test="criteria.deviceName != null and criteria.deviceName != ''">
-            and d.device_name like concat('%', #{criteria.deviceName}, '%')
+            and a.device_name like concat('%', #{criteria.deviceName}, '%')
         </if>
         <if test="criteria.deviceImei != null and criteria.deviceImei != ''">
-            and (d.device_imei = #{criteria.deviceImei}
+            and (a.device_imei = #{criteria.deviceImei}
         </if>
         <if test="criteria.content != null and criteria.content != ''">
-            AND d.device_imei = #{criteria.content} or d.device_mac = #{criteria.content}
+            AND a.device_imei = #{criteria.content} or a.device_mac = #{criteria.content}
         </if>
         <if test="criteria.deviceStatus != null">
-            and d.device_status = #{criteria.deviceStatus}
+            and a.device_status = #{criteria.deviceStatus}
         </if>
         <if test="criteria.personnelBy != null and criteria.personnelBy != ''">
-            and ap.name like concat('%', #{criteria.personnelBy}, '%')
+            and a.personnelBy like concat('%', #{criteria.personnelBy}, '%')
         </if>
         <if test="criteria.communicationMode != null">
-            and dt.communication_mode = #{criteria.communicationMode}
+            and a.communication_mode = #{criteria.communicationMode}
         </if>
         <if test="criteria.groupId != null">
-            and d.group_id = #{criteria.groupId}
+            and a.group_id = #{criteria.groupId}
         </if>
         <if test="criteria.onlineStatus != null">
-            and d.online_status = #{criteria.onlineStatus}
+            and a.online_status = #{criteria.onlineStatus}
         </if>
-        ORDER BY c.binding_time DESC
+        ORDER BY a.binding_time DESC
     </select>
     <select id="getLocationHistory" resultType="com.fuyuanshen.equipment.domain.vo.LocationHistoryVo">
         select a.id,a.device_name,a.device_type,b.type_name deviceTypeName,a.device_imei,a.device_mac from device a