diff --git a/fys-admin/src/main/java/com/fuyuanshen/app/controller/AppDeviceShareController.java b/fys-admin/src/main/java/com/fuyuanshen/app/controller/AppDeviceShareController.java
index 581c934d..09efc627 100644
--- a/fys-admin/src/main/java/com/fuyuanshen/app/controller/AppDeviceShareController.java
+++ b/fys-admin/src/main/java/com/fuyuanshen/app/controller/AppDeviceShareController.java
@@ -52,7 +52,7 @@ public class AppDeviceShareController extends BaseController {
      */
     @GetMapping("/deviceShareList")
     public TableDataInfo<AppDeviceShareVo> list(AppDeviceShareBo bo, PageQuery pageQuery) {
-        return deviceShareService.queryPageList(bo, pageQuery);
+        return appDeviceShareService.queryPageList(bo, pageQuery);
     }
 
     /**
diff --git a/fys-admin/src/main/java/com/fuyuanshen/app/service/AppDeviceShareService.java b/fys-admin/src/main/java/com/fuyuanshen/app/service/AppDeviceShareService.java
index ea5e1f6f..15dc7de7 100644
--- a/fys-admin/src/main/java/com/fuyuanshen/app/service/AppDeviceShareService.java
+++ b/fys-admin/src/main/java/com/fuyuanshen/app/service/AppDeviceShareService.java
@@ -1,7 +1,9 @@
 package com.fuyuanshen.app.service;
 
+import com.alibaba.fastjson2.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fuyuanshen.app.domain.AppDeviceShare;
 import com.fuyuanshen.app.domain.AppPersonnelInfo;
 import com.fuyuanshen.app.domain.bo.AppDeviceShareBo;
@@ -16,12 +18,15 @@ import com.fuyuanshen.common.core.exception.ServiceException;
 import com.fuyuanshen.common.core.exception.user.CaptchaExpireException;
 import com.fuyuanshen.common.core.utils.MessageUtils;
 import com.fuyuanshen.common.core.utils.StringUtils;
+import com.fuyuanshen.common.mybatis.core.page.PageQuery;
+import com.fuyuanshen.common.mybatis.core.page.TableDataInfo;
 import com.fuyuanshen.common.redis.utils.RedisUtils;
 import com.fuyuanshen.common.satoken.utils.AppLoginHelper;
 import com.fuyuanshen.equipment.domain.Device;
 import com.fuyuanshen.equipment.domain.DeviceType;
 import com.fuyuanshen.equipment.mapper.DeviceMapper;
 import com.fuyuanshen.equipment.mapper.DeviceTypeMapper;
+import com.fuyuanshen.global.mqtt.constants.DeviceRedisKeyConstants;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
@@ -30,6 +35,9 @@ import java.util.Arrays;
 import java.util.Date;
 import java.util.List;
 
+import static com.fuyuanshen.common.core.constant.GlobalConstants.GLOBAL_REDIS_KEY;
+import static com.fuyuanshen.global.mqtt.constants.DeviceRedisKeyConstants.*;
+
 
 @RequiredArgsConstructor
 @Slf4j
@@ -44,6 +52,52 @@ public class AppDeviceShareService {
 
     private final AppPersonnelInfoMapper appPersonnelInfoMapper;
 
+    public TableDataInfo<AppDeviceShareVo> queryPageList(AppDeviceShareBo bo, PageQuery pageQuery) {
+        Long userId = AppLoginHelper.getUserId();
+        bo.setCreateBy(userId);
+        LambdaQueryWrapper<AppDeviceShare> lqw = new LambdaQueryWrapper<>();
+        Page<AppDeviceShareVo> result = appDeviceShareMapper.selectVoPage(pageQuery.build(), lqw);
+        List<AppDeviceShareVo> records = result.getRecords();
+        records.forEach(item-> {
+            Device device = deviceMapper.selectById(item.getDeviceId());
+            if(device != null){
+                item.setDevicePic(device.getDevicePic());
+                item.setDeviceName(device.getDeviceName());
+                item.setDeviceImei(device.getDeviceImei());
+            }
+
+            //设备在线状态
+            String onlineStatus = RedisUtils.getCacheObject(GLOBAL_REDIS_KEY+ DEVICE_KEY_PREFIX+ item.getDeviceImei() + DeviceRedisKeyConstants.DEVICE_ONLINE_STATUS_KEY_PREFIX);
+            if(StringUtils.isNotBlank(onlineStatus)){
+
+                item.setOnlineStatus(1);
+            }else{
+                item.setOnlineStatus(0);
+            }
+            String deviceStatus = RedisUtils.getCacheObject(GLOBAL_REDIS_KEY + DEVICE_KEY_PREFIX+ item.getDeviceImei() + DEVICE_STATUS_KEY_PREFIX);
+            // 获取电量
+            if(StringUtils.isNotBlank(deviceStatus)){
+                JSONObject jsonObject = JSONObject.parseObject(deviceStatus);
+                item.setBattery(jsonObject.getString("batteryPercentage"));
+            }else{
+                item.setBattery("0");
+            }
+
+            String location = RedisUtils.getCacheObject(GLOBAL_REDIS_KEY +DEVICE_KEY_PREFIX+ item.getDeviceImei()+ DEVICE_LOCATION_KEY_PREFIX);
+            if(StringUtils.isNotBlank(location)){
+                JSONObject jsonObject = JSONObject.parseObject(location);
+                item.setLatitude(jsonObject.getString("latitude"));
+                item.setLongitude(jsonObject.getString("longitude"));
+            }
+
+            String alarmStatus = RedisUtils.getCacheObject(GLOBAL_REDIS_KEY +DEVICE_KEY_PREFIX+ item.getDeviceImei()+ DEVICE_ALARM_KEY_PREFIX);
+            if(StringUtils.isNotBlank(alarmStatus)){
+                item.setAlarmStatus(alarmStatus);
+            }
+        });
+        return TableDataInfo.build(result);
+    }
+
     public AppDeviceShareDetailVo getInfo(Long id) {
 
         LambdaQueryWrapper<AppDeviceShare> queryWrapper = new LambdaQueryWrapper<>();
diff --git a/fys-modules/fys-app/src/main/java/com/fuyuanshen/app/domain/vo/AppDeviceShareVo.java b/fys-modules/fys-app/src/main/java/com/fuyuanshen/app/domain/vo/AppDeviceShareVo.java
index b9ea67d8..d1f2055c 100644
--- a/fys-modules/fys-app/src/main/java/com/fuyuanshen/app/domain/vo/AppDeviceShareVo.java
+++ b/fys-modules/fys-app/src/main/java/com/fuyuanshen/app/domain/vo/AppDeviceShareVo.java
@@ -73,4 +73,29 @@ public class AppDeviceShareVo implements Serializable {
 
     // 设备图片
     private String devicePic;
+
+    /**
+     * 在线状态(0离线，1在线)
+     */
+    private Integer onlineStatus;
+
+    /**
+     * 电量 百分比
+     */
+    private String battery;
+
+    /**
+     * 纬度
+     */
+    private String latitude;
+
+    /**
+     * 经度
+     */
+    private String longitude;
+
+    /**
+     * 告警状态(0解除告警，1告警)
+     */
+    private String alarmStatus;
 }