Merge branch 'main' into dyf-device

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

@@ -16,11 +16,6 @@ public class AppDeviceDetailVo {
     @ExcelProperty(value = "设备ID")
     private Long deviceId;
 
-    /**
-     * 手机号
-     */
-    @ExcelProperty(value = "手机号")
-    private String phonenumber;
 
     /**
      * 设备名称
@@ -74,4 +69,34 @@ public class AppDeviceDetailVo {
      * 发送信息
      */
     private String sendMsg;
+
+    //"{\"deviceImei\":\"AA\",\"mainLightMode\":\"1\",\"laserLightMode\":\"0\",\"batteryPercentage\":\"60\",\"chargeState\":\"1\",\"batteryRemainingTime\":\"200\",\"timestamp\":1753871635241}"
+    //设备主灯档位
+    private String mainLightMode;
+
+    //激光灯档位
+    private String laserLightMode;
+
+    //电量百分比
+    private String batteryPercentage;
+
+    //充电状态（0没有充电，1正在充电，2为已充满）
+    private String chargeState;
+
+    //电池剩余续航时间200分钟
+    private String batteryRemainingTime;
+
+    /**
+     * 在线状态(0离线，1在线)
+     */
+    private Integer onlineStatus;
+
+    // 经度
+    private String longitude;
+
+    // 纬度
+    private String latitude;
+
+    // 逆解析地址
+    private String address;
 }

fys-modules/fys-app/src/main/java/com/fuyuanshen/app/service/impl/AppUserServiceImpl.java

@@ -1,5 +1,10 @@
 package com.fuyuanshen.app.service.impl;
 
+import cn.dev33.satoken.exception.NotLoginException;
+import cn.dev33.satoken.stp.StpUtil;
+import cn.hutool.core.util.ObjectUtil;
+import com.fuyuanshen.common.core.constant.Constants;
+import com.fuyuanshen.common.core.domain.model.AppLoginUser;
 import com.fuyuanshen.common.core.utils.MapstructUtils;
 import com.fuyuanshen.common.core.utils.StringUtils;
 import com.fuyuanshen.common.mybatis.core.page.TableDataInfo;
@@ -7,6 +12,9 @@ import com.fuyuanshen.common.mybatis.core.page.PageQuery;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.fuyuanshen.common.satoken.utils.AppLoginHelper;
+import com.fuyuanshen.common.satoken.utils.LoginHelper;
+import com.fuyuanshen.common.tenant.helper.TenantHelper;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
@@ -16,6 +24,7 @@ import com.fuyuanshen.app.domain.AppUser;
 import com.fuyuanshen.app.mapper.AppUserMapper;
 import com.fuyuanshen.app.service.IAppUserService;
 
+import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 import java.util.Collection;

fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/vo/AppDeviceVo.java

@@ -57,4 +57,23 @@ public class AppDeviceVo implements Serializable {
      */
     private Date bindingTime;
 
+    /**
+     * 在线状态(0离线，1在线)
+     */
+    private Integer onlineStatus;
+
+    /**
+     * 电量 百分比
+     */
+    private String battery;
+
+    /**
+     * 纬度
+     */
+    private String latitude;
+
+    /**
+     * 经度
+     */
+    private String longitude;
 }