Merge remote-tracking branch 'origin/dyf-device' into 6170

# Conflicts:
#	fys-admin/src/main/java/com/fuyuanshen/web/service/device/DeviceBizService.java
#	fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/vo/LocationHistoryDetailVo.java

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

@@ -25,6 +25,13 @@ public class Device extends TenantEntity {
     @Schema(title = "ID")
     private Long id;
 
+    /**
+     * 设备ID
+     */
+    @TableField(exist = false)
+    @Schema(title = "设备ID")
+    private Long deviceId;
+
     @Schema(title = "设备记录ID")
     @TableField(exist = false)
     private Long assignId;

fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/query/DeviceQueryCriteria.java

@@ -101,13 +101,11 @@ public class DeviceQueryCriteria extends BaseEntity {
      */
     private Boolean isAdmin = false;
 
-
     /**
      * 设备所属分组
      */
     private Long groupId;
 
-
     /**
      * 设备地区
      */

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

@@ -0,0 +1,44 @@
+package com.fuyuanshen.equipment.domain.vo;
+
+import lombok.Data;
+
+/**
+ * 报警信息
+ *
+ * @author: 默苍璃
+ * @date: 2025-09-0114:24
+ */
+@Data
+public class AlarmInformationVo {
+
+    /**
+     * 报警总数
+     */
+    private Integer alarmsTotal = 0;
+
+    /**
+     * 总处理报警
+     */
+    private Integer processingAlarm = 0;
+
+    /**
+     * 强制报警
+     */
+    private Integer alarmForced = 0;
+
+    /**
+     * 撞击闯入
+     */
+    private Integer intrusionImpact = 0;
+
+    /**
+     * 手动报警
+     */
+    private Integer alarmManual = 0;
+
+    /**
+     * 电子围栏
+     */
+    private Integer fenceElectronic = 0;
+
+}

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

@@ -0,0 +1,34 @@
+package com.fuyuanshen.equipment.domain.vo;
+
+import lombok.Data;
+
+/**
+ * 数据总览
+ *
+ * @author: 默苍璃
+ * @date: 2025-09-0114:24
+ */
+@Data
+public class DataOverviewVo {
+
+    /**
+     * 设备数据量
+     */
+    private Integer devicesNumber = 0;
+
+    /**
+     * 在线设备
+     */
+    private Integer equipmentOnline = 0;
+
+    /**
+     * 新增绑定设备
+     */
+    private Integer bindingNew = 0;
+
+    /**
+     * 异常设备
+     */
+    private Integer equipmentAbnormal = 0;
+
+}

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

@@ -9,6 +9,7 @@ import cn.idev.excel.annotation.ExcelProperty;
 import com.fuyuanshen.common.excel.annotation.ExcelDictFormat;
 import com.fuyuanshen.common.excel.convert.ExcelDictConvert;
 import io.github.linpeilie.annotations.AutoMapper;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
 import java.io.Serial;
@@ -118,7 +119,7 @@ public class DeviceAlarmVo implements Serializable {
      * 报警持续时间
      */
     @ExcelProperty(value = "报警持续时间")
-    private Long durationTime;
+    private String durationTime;
 
     /**
      * 0已处理，1未处理
@@ -126,5 +127,11 @@ public class DeviceAlarmVo implements Serializable {
     @ExcelProperty(value = "0已处理，1未处理")
     private Integer treatmentState;
 
+    /**
+     * 设备图片
+     * device_pic
+     */
+    @Schema(name = "设备图片")
+    private String devicePic;
 
 }

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

@@ -0,0 +1,29 @@
+package com.fuyuanshen.equipment.domain.vo;
+
+import lombok.Data;
+
+/**
+ * 设备分类
+ *
+ * @author: 默苍璃
+ * @date: 2025-09-0114:24
+ */
+@Data
+public class EquipmentClassificationVo {
+
+    /**
+     * 4G设备
+     */
+    private Integer equipment4G = 0;
+
+    /**
+     * 蓝牙设备
+     */
+    private Integer deviceBluetooth = 0;
+
+    /**
+     * 4G & 蓝牙 设备
+     */
+    private Integer devices4GAndBluetooth = 0;
+
+}