Merge branch 'dyf-device' into 6170

fys-admin/src/main/java/com/fuyuanshen/global/mqtt/listener/RedisKeyExpirationListener.java

@@ -71,6 +71,8 @@ public class RedisKeyExpirationListener implements MessageListener {
                             deviceUpdateWrapper.eq("device_imei", element);
                             deviceUpdateWrapper.set("online_status", 0);
                             deviceMapper.update(deviceUpdateWrapper);
+                        }else{
+                            RedisUtils.deleteObject(deviceOnlineStatusRedisKey);
                         }
                     } finally {
                         //释放锁

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(62));
+            RedisUtils.setCacheObject(deviceOnlineStatusRedisKey, "1", Duration.ofSeconds(65));
         }
 
         String state = payloadDict.getStr("state");

fys-admin/src/main/java/com/fuyuanshen/global/queue/MqttMessageConsumer.java

@@ -98,21 +98,24 @@ public class MqttMessageConsumer {
         String threadName = Thread.currentThread().getName();
         try {
             log.info("业务处理线程 {} 开始处理消息: {}", threadName, message);
-            String deviceOnlineStatusRedisKey = GlobalConstants.GLOBAL_REDIS_KEY+ DEVICE_KEY_PREFIX+ message + DeviceRedisKeyConstants.DEVICE_ONLINE_STATUS_KEY_PREFIX ;
+//            String deviceOnlineStatusRedisKey = GlobalConstants.GLOBAL_REDIS_KEY+ DEVICE_KEY_PREFIX+ message + DeviceRedisKeyConstants.DEVICE_ONLINE_STATUS_KEY_PREFIX ;
-            String deviceOnlineStatusRedis = RedisUtils.getCacheObject(deviceOnlineStatusRedisKey);
+//            String deviceOnlineStatusRedis = RedisUtils.getCacheObject(deviceOnlineStatusRedisKey);
-            if(StringUtils.isBlank(deviceOnlineStatusRedis)){
+//            if(StringUtils.isBlank(deviceOnlineStatusRedis)){
+//                UpdateWrapper<Device> updateWrapper = new UpdateWrapper<>();
+//                updateWrapper.eq("device_imei", message)
+//                        .set("online_status", 1);
+//                deviceMapper.update(updateWrapper);
+//            }
+            QueryWrapper<Device> queryWrapper = new QueryWrapper<>();
+            queryWrapper.eq("device_imei", message);
+            queryWrapper.eq("online_status", 1);
+            Long count = deviceMapper.selectCount(queryWrapper);
+            if(count == 0){
                 UpdateWrapper<Device> updateWrapper = new UpdateWrapper<>();
                 updateWrapper.eq("device_imei", message)
                         .set("online_status", 1);
                 deviceMapper.update(updateWrapper);
             }
-//            QueryWrapper<Device> queryWrapper = new QueryWrapper<>();
-//            queryWrapper.eq("device_imei", message);
-//            queryWrapper.eq("online_status", 1);
-//            Long count = deviceMapper.selectCount(queryWrapper);
-//            if(count == 0){
-//
-//            }
             // 模拟业务处理耗时
 //            Thread.sleep(200);
             

fys-modules/fys-app/src/main/java/com/fuyuanshen/app/domain/vo/AppDeviceShareVo.java

@@ -114,4 +114,9 @@ public class AppDeviceShareVo implements Serializable {
      * 创建时间
      */
     private String createTime;
+
+    /**
+     * 设备详情页面
+     */
+    private String detailPageUrl;
 }

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

@@ -239,8 +239,7 @@
         where d.device_mac = #{deviceMac}
     </select>
     <select id="queryWebDeviceList" resultType="com.fuyuanshen.equipment.domain.vo.WebDeviceVo">
-        select d.id, d.device_name, d.device_name,
+        select DISTINCT d.id, d.device_name,
-        d.device_name,
         d.device_mac,
         d.device_sn,
         d.device_imei,
@@ -255,7 +254,7 @@
         c.binding_time
         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 and c.communication_mode = 0
+        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)
         <if test="criteria.deviceType != null">
@@ -285,7 +284,7 @@
         <if test="criteria.onlineStatus != null">
             and d.online_status = #{criteria.onlineStatus}
         </if>
-        ORDER BY d.create_time DESC
+        ORDER BY c.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