diff --git a/ruoyi-api/sis-api/src/main/java/org/dromara/sis/api/RemoteDeviceService.java b/ruoyi-api/sis-api/src/main/java/org/dromara/sis/api/RemoteDeviceService.java
index c8f5a62c..9fd4fbc7 100644
--- a/ruoyi-api/sis-api/src/main/java/org/dromara/sis/api/RemoteDeviceService.java
+++ b/ruoyi-api/sis-api/src/main/java/org/dromara/sis/api/RemoteDeviceService.java
@@ -1,5 +1,6 @@
 package org.dromara.sis.api;
 
+import org.dromara.sis.api.domain.RemoteDeviceStateStatistics;
 import org.dromara.sis.api.domain.RemoteSdkChannel;
 import org.dromara.sis.api.domain.RemoteSisDeviceChannel;
 import org.dromara.sis.api.domain.RemoteSisDeviceManage;
@@ -69,4 +70,11 @@ public interface RemoteDeviceService {
      * @return 返回更新成功数量
      */
     Integer updateChannelInfo(List<RemoteSisDeviceChannel> updateData);
+
+    /**
+     * 统计监控设备在线数量
+     * @return 返回统计数据
+     */
+    RemoteDeviceStateStatistics statisticsMonitorState();
+
 }
diff --git a/ruoyi-api/sis-api/src/main/java/org/dromara/sis/api/domain/RemoteDeviceStateStatistics.java b/ruoyi-api/sis-api/src/main/java/org/dromara/sis/api/domain/RemoteDeviceStateStatistics.java
new file mode 100644
index 00000000..7c40c1bb
--- /dev/null
+++ b/ruoyi-api/sis-api/src/main/java/org/dromara/sis/api/domain/RemoteDeviceStateStatistics.java
@@ -0,0 +1,14 @@
+package org.dromara.sis.api.domain;
+
+import lombok.Data;
+
+@Data
+public class RemoteDeviceStateStatistics {
+
+    private Integer onLine;
+
+    private Integer offLine;
+
+    private Integer total;
+
+}
diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/controller/BigScreen/ScreenController.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/controller/BigScreen/ScreenController.java
deleted file mode 100644
index 45c04266..00000000
--- a/ruoyi-modules/Property/src/main/java/org/dromara/property/controller/BigScreen/ScreenController.java
+++ /dev/null
@@ -1,60 +0,0 @@
-package org.dromara.property.controller.BigScreen;
-
-
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-import org.dromara.common.core.domain.R;
-import org.dromara.common.web.core.BaseController;
-import org.dromara.property.domain.MeetBooking;
-import org.dromara.property.domain.vo.BigScreen.TodayMeetCountVo;
-import org.dromara.property.domain.vo.BigScreen.TodayVisitorCountVo;
-import org.dromara.property.domain.vo.BigScreen.TypeWorkOrderHistogramVo;
-import org.dromara.property.service.IMeetBookingService;
-import org.dromara.property.service.IServiceWorkOrdersService;
-import org.dromara.property.service.ITbVisitorManagementService;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * @author yuyongle
- * @version 1.0
- * @description: 大屏接口
- * @date 2025/9/9 9:57
- */
-@Validated
-@RequiredArgsConstructor
-@RestController
-@RequestMapping("/screen")
-public class ScreenController extends BaseController {
-
-    private final IServiceWorkOrdersService serviceWorkOrdersService;
-    private final IMeetBookingService meetBookingService;
-    private final ITbVisitorManagementService tbVisitorManagementService;
-
-    /**
-     * 大屏工单柱状图
-     */
-    @GetMapping("/typeWorkOrderHistogram")
-    public R<List<TypeWorkOrderHistogramVo>> typeWorkOrderHistogram() {
-        return R.ok(serviceWorkOrdersService.typeWorkOrderHistogram());
-    }
-    /**
-     * 大屏会议室总数和当天预约数统计
-     */
-    @GetMapping("/todayMeetCount")
-    public R<TodayMeetCountVo> todayMeetCount() {
-        return R.ok(meetBookingService.todayMeetCount());
-    }
-    /**
-     * 大屏访客记录统计
-     */
-    @GetMapping("/todayVisitorCount")
-    public R<List<TodayVisitorCountVo>> todayVisitorCount() {
-        return R.ok(tbVisitorManagementService.todayVisitorCount());
-    }
-}
diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/controller/cockpit/DriverController.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/controller/cockpit/DriverController.java
index ea8bb2ce..7c31859f 100644
--- a/ruoyi-modules/Property/src/main/java/org/dromara/property/controller/cockpit/DriverController.java
+++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/controller/cockpit/DriverController.java
@@ -1,13 +1,86 @@
 package org.dromara.property.controller.cockpit;
 
+import cn.hutool.core.lang.Assert;
+import jakarta.annotation.Resource;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.dubbo.config.annotation.DubboReference;
+import org.dromara.common.core.domain.R;
+import org.dromara.property.domain.vo.cockpit.DeviceState;
+import org.dromara.sis.api.RemoteDeviceService;
+import org.dromara.sis.api.domain.RemoteDeviceStateStatistics;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.ArrayList;
+import java.util.List;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.TimeUnit;
+
 /**
- * 大屏设备接口
+ * 大屏设备相关接口
  */
+@Slf4j
 @RestController
 @RequestMapping("/cockpit")
 public class DriverController {
 
+
+    @Resource
+    private ScheduledExecutorService executeService;
+    @DubboReference
+    private RemoteDeviceService remoteDeviceService;
+
+    /**
+     * 获取设备状态接口
+     *
+     * @param deviceType 0:全部，1：监控设备，2：水表，3t：电表，4：灯孔，5：门禁
+     * @return 返回设备状态数据
+     */
+    @GetMapping("/device/state/{deviceType}")
+    public R<?> getDeviceState(@PathVariable Integer deviceType) throws InterruptedException {
+        Assert.isTrue(deviceType <= 5 && deviceType >= 0, "未知的设备类型");
+        int searchNum = deviceType == 0 ? 5 : 1;
+        List<DeviceState> result = new ArrayList<>(searchNum);
+        CountDownLatch countDownLatch = new CountDownLatch(searchNum);
+        // 查询监控设备状态
+        if (deviceType == 0 || deviceType == 1) {
+            executeService.execute(() -> {
+                RemoteDeviceStateStatistics remoteDeviceStateStatistics = remoteDeviceService.statisticsMonitorState();
+                if (remoteDeviceStateStatistics != null) {
+                    DeviceState state = new DeviceState();
+                    state.setType(1);
+                    state.setTypeName("监控设备");
+                    state.setOnLine(remoteDeviceStateStatistics.getOnLine());
+                    state.setTotal(remoteDeviceStateStatistics.getTotal());
+                    result.add(state);
+                }
+                countDownLatch.countDown();
+            });
+        }
+        //查询水表
+        if (deviceType == 0 || deviceType == 2) {
+
+        }
+        // 查询电表
+        if (deviceType == 0 || deviceType == 3) {
+
+        }
+        // 查询灯
+        if (deviceType == 0 || deviceType == 4) {
+
+        }
+        // 查询门禁
+        if (deviceType == 0 || deviceType == 5) {
+
+        }
+        /**
+         * 默认10S，超过自动结束
+         */
+        countDownLatch.await(10, TimeUnit.SECONDS);
+        return R.ok(result);
+    }
+
 }
diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/controller/cockpit/PropertyPersonController.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/controller/cockpit/PropertyPersonController.java
index f1a79c0e..96d3917f 100644
--- a/ruoyi-modules/Property/src/main/java/org/dromara/property/controller/cockpit/PropertyPersonController.java
+++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/controller/cockpit/PropertyPersonController.java
@@ -1,11 +1,20 @@
 package org.dromara.property.controller.cockpit;
 
+import jakarta.annotation.Resource;
 import org.apache.dubbo.config.annotation.DubboReference;
 import org.dromara.common.core.domain.R;
+import org.dromara.property.domain.vo.BigScreen.TodayMeetCountVo;
+import org.dromara.property.domain.vo.BigScreen.TodayVisitorCountVo;
+import org.dromara.property.domain.vo.BigScreen.TypeWorkOrderHistogramVo;
+import org.dromara.property.service.IMeetBookingService;
+import org.dromara.property.service.IServiceWorkOrdersService;
+import org.dromara.property.service.ITbVisitorManagementService;
 import org.dromara.system.api.RemoteUserService;
+import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -14,6 +23,14 @@ import java.util.Map;
 @RestController
 @RequestMapping("/cockpit")
 public class PropertyPersonController {
+
+    @Resource
+    private IServiceWorkOrdersService serviceWorkOrdersService;
+    @Resource
+    private IMeetBookingService meetBookingService;
+    @Resource
+    private ITbVisitorManagementService tbVisitorManagementService;
+
     @DubboReference
     private RemoteUserService remoteUserService;
 
@@ -22,4 +39,27 @@ public class PropertyPersonController {
         return R.ok(remoteUserService.seelectOrgcount());
     }
 
+    /**
+     * 大屏工单柱状图
+     */
+    @GetMapping("/screen/typeWorkOrderHistogram")
+    public R<List<TypeWorkOrderHistogramVo>> typeWorkOrderHistogram() {
+        return R.ok(serviceWorkOrdersService.typeWorkOrderHistogram());
+    }
+
+    /**
+     * 大屏会议室总数和当天预约数统计
+     */
+    @GetMapping("/screen/todayMeetCount")
+    public R<TodayMeetCountVo> todayMeetCount() {
+        return R.ok(meetBookingService.todayMeetCount());
+    }
+
+    /**
+     * 大屏访客记录统计
+     */
+    @GetMapping("/screen/todayVisitorCount")
+    public R<List<TodayVisitorCountVo>> todayVisitorCount() {
+        return R.ok(tbVisitorManagementService.todayVisitorCount());
+    }
 }
diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/cockpit/DeviceState.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/cockpit/DeviceState.java
new file mode 100644
index 00000000..2301c5c6
--- /dev/null
+++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/cockpit/DeviceState.java
@@ -0,0 +1,26 @@
+package org.dromara.property.domain.vo.cockpit;
+
+import lombok.Data;
+
+@Data
+public class DeviceState {
+    /**
+     * 设备类型
+     */
+    private Integer type;
+
+    /**
+     * 设备类型名称
+     */
+    private String typeName;
+
+    /**
+     * 在线数
+     */
+    private Integer onLine;
+
+    /**
+     * 总数
+     */
+    private Integer total;
+}
diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/tasks/HeartbeatTasks.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/tasks/HeartbeatTasks.java
index 60249a4f..f6822196 100644
--- a/ruoyi-modules/Property/src/main/java/org/dromara/property/tasks/HeartbeatTasks.java
+++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/tasks/HeartbeatTasks.java
@@ -1,5 +1,6 @@
 package org.dromara.property.tasks;
 
+import jakarta.annotation.Resource;
 import org.springframework.stereotype.Component;
 
 import java.util.Map;
@@ -12,7 +13,10 @@ import java.util.concurrent.*;
  */
 @Component
 public class HeartbeatTasks {
-    private final ScheduledExecutorService scheduler = Executors.newSingleThreadScheduledExecutor();
+
+    @Resource
+    private ScheduledExecutorService scheduler;
+
     private final Map<String, ScheduledFuture<?>> tasks = new ConcurrentHashMap<>();
 
     public void startHeartbeatTask(String taskId, Runnable task, long intervalMs, long durationMs) {
diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/controller/AlarmPushController.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/controller/AlarmPushController.java
index 71440087..166e358f 100644
--- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/controller/AlarmPushController.java
+++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/controller/AlarmPushController.java
@@ -2,7 +2,7 @@ package org.dromara.sis.controller;
 
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.dromara.sis.domain.AlarmRecord;
+import org.dromara.sis.domain.entity.AlarmRecord;
 import org.dromara.sis.domain.bo.SisAlarmEventsBo;
 import org.dromara.sis.domain.enums.EventBigTypeEnum;
 import org.dromara.sis.domain.enums.EventSmallTypeEnum;
@@ -10,6 +10,7 @@ import org.dromara.sis.service.AlarmRecordService;
 import org.dromara.sis.service.ISisAlarmEventsService;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
+import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -30,6 +31,8 @@ public class AlarmPushController {
 
     private final AlarmRecordService alarmRecordService;
     private final ISisAlarmEventsService sisAlarmEventsService;
+    private final ThreadPoolTaskExecutor executor;
+
 
     /**
      * 接收单条告警数据推送
diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/bo/SisAcDeviceRefBo.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/bo/SisAcDeviceRefBo.java
index 789cbc30..4b6a57cf 100644
--- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/bo/SisAcDeviceRefBo.java
+++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/bo/SisAcDeviceRefBo.java
@@ -7,7 +7,7 @@ import lombok.EqualsAndHashCode;
 import org.dromara.common.core.validate.AddGroup;
 import org.dromara.common.core.validate.EditGroup;
 import org.dromara.common.mybatis.core.domain.BaseEntity;
-import org.dromara.sis.domain.SisAcDeviceRef;
+import org.dromara.sis.domain.entity.SisAcDeviceRef;
 
 /**
  * 门禁⇄监控点关联业务对象 sis_ac_device_ref
diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/bo/SisAccessControlBo.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/bo/SisAccessControlBo.java
index 970b7dd4..18048b2c 100644
--- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/bo/SisAccessControlBo.java
+++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/bo/SisAccessControlBo.java
@@ -8,7 +8,7 @@ import lombok.EqualsAndHashCode;
 import org.dromara.common.core.validate.AddGroup;
 import org.dromara.common.core.validate.EditGroup;
 import org.dromara.common.mybatis.core.domain.BaseEntity;
-import org.dromara.sis.domain.SisAccessControl;
+import org.dromara.sis.domain.entity.SisAccessControl;
 
 import java.util.List;
 
diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/bo/SisAlarmEventAttachmentsBo.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/bo/SisAlarmEventAttachmentsBo.java
index a66bb97c..970e8aa4 100644
--- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/bo/SisAlarmEventAttachmentsBo.java
+++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/bo/SisAlarmEventAttachmentsBo.java
@@ -7,7 +7,7 @@ import lombok.EqualsAndHashCode;
 import org.dromara.common.core.validate.AddGroup;
 import org.dromara.common.core.validate.EditGroup;
 import org.dromara.common.mybatis.core.domain.BaseEntity;
-import org.dromara.sis.domain.SisAlarmEventAttachments;
+import org.dromara.sis.domain.entity.SisAlarmEventAttachments;
 
 /**
  * 【请填写功能名称】业务对象 sis_alarm_event_attachments
diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/bo/SisAlarmEventProcessBo.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/bo/SisAlarmEventProcessBo.java
index cdb672d8..1ea76e9a 100644
--- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/bo/SisAlarmEventProcessBo.java
+++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/bo/SisAlarmEventProcessBo.java
@@ -7,7 +7,7 @@ import lombok.EqualsAndHashCode;
 import org.dromara.common.core.validate.AddGroup;
 import org.dromara.common.core.validate.EditGroup;
 import org.dromara.common.mybatis.core.domain.BaseEntity;
-import org.dromara.sis.domain.SisAlarmEventProcess;
+import org.dromara.sis.domain.entity.SisAlarmEventProcess;
 
 import java.util.Date;
 
diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/bo/SisAlarmEventsBo.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/bo/SisAlarmEventsBo.java
index b2f5b3f2..22498858 100644
--- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/bo/SisAlarmEventsBo.java
+++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/bo/SisAlarmEventsBo.java
@@ -7,7 +7,7 @@ import lombok.EqualsAndHashCode;
 import org.dromara.common.core.validate.AddGroup;
 import org.dromara.common.core.validate.EditGroup;
 import org.dromara.common.mybatis.core.domain.BaseEntity;
-import org.dromara.sis.domain.SisAlarmEvents;
+import org.dromara.sis.domain.entity.SisAlarmEvents;
 import org.springframework.format.annotation.DateTimeFormat;
 
 import java.util.Date;
diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/bo/SisAuthGroupBo.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/bo/SisAuthGroupBo.java
index 5c5934cd..7a80cd81 100644
--- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/bo/SisAuthGroupBo.java
+++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/bo/SisAuthGroupBo.java
@@ -1,6 +1,6 @@
 package org.dromara.sis.domain.bo;
 
-import org.dromara.sis.domain.SisAuthGroup;
+import org.dromara.sis.domain.entity.SisAuthGroup;
 import org.dromara.common.mybatis.core.domain.BaseEntity;
 import org.dromara.common.core.validate.AddGroup;
 import org.dromara.common.core.validate.EditGroup;
diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/bo/SisAuthGroupRefBo.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/bo/SisAuthGroupRefBo.java
index 84935f36..991eef57 100644
--- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/bo/SisAuthGroupRefBo.java
+++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/bo/SisAuthGroupRefBo.java
@@ -1,6 +1,6 @@
 package org.dromara.sis.domain.bo;
 
-import org.dromara.sis.domain.SisAuthGroupRef;
+import org.dromara.sis.domain.entity.SisAuthGroupRef;
 import org.dromara.common.mybatis.core.domain.BaseEntity;
 import org.dromara.common.core.validate.AddGroup;
 import org.dromara.common.core.validate.EditGroup;
diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/bo/SisAuthRecordBo.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/bo/SisAuthRecordBo.java
index 3b7b7298..688413c2 100644
--- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/bo/SisAuthRecordBo.java
+++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/bo/SisAuthRecordBo.java
@@ -1,6 +1,6 @@
 package org.dromara.sis.domain.bo;
 
-import org.dromara.sis.domain.SisAuthRecord;
+import org.dromara.sis.domain.entity.SisAuthRecord;
 import org.dromara.common.mybatis.core.domain.BaseEntity;
 import org.dromara.common.core.validate.AddGroup;
 import org.dromara.common.core.validate.EditGroup;
@@ -9,7 +9,6 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import jakarta.validation.constraints.*;
 import java.util.Date;
-import com.fasterxml.jackson.annotation.JsonFormat;
 
 /**
  * 授权记录业务对象 sis_auth_record
diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/bo/SisDeviceBindRefBo.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/bo/SisDeviceBindRefBo.java
index ea6fb647..42f3bce7 100644
--- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/bo/SisDeviceBindRefBo.java
+++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/bo/SisDeviceBindRefBo.java
@@ -1,6 +1,6 @@
 package org.dromara.sis.domain.bo;
 
-import org.dromara.sis.domain.SisDeviceBindRef;
+import org.dromara.sis.domain.entity.SisDeviceBindRef;
 import org.dromara.common.mybatis.core.domain.BaseEntity;
 import org.dromara.common.core.validate.AddGroup;
 import org.dromara.common.core.validate.EditGroup;
diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/bo/SisDeviceChannelBo.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/bo/SisDeviceChannelBo.java
index a73c10e4..69d4d78a 100644
--- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/bo/SisDeviceChannelBo.java
+++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/bo/SisDeviceChannelBo.java
@@ -8,7 +8,7 @@ import lombok.EqualsAndHashCode;
 import org.dromara.common.core.validate.AddGroup;
 import org.dromara.common.core.validate.EditGroup;
 import org.dromara.common.mybatis.core.domain.BaseEntity;
-import org.dromara.sis.domain.SisDeviceChannel;
+import org.dromara.sis.domain.entity.SisDeviceChannel;
 
 /**
  * 设备通道管理业务对象 sis_device_channel
diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/bo/SisDeviceGroupBo.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/bo/SisDeviceGroupBo.java
index 4a2c0ed9..ad3c4ad9 100644
--- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/bo/SisDeviceGroupBo.java
+++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/bo/SisDeviceGroupBo.java
@@ -1,6 +1,6 @@
 package org.dromara.sis.domain.bo;
 
-import org.dromara.sis.domain.SisDeviceGroup;
+import org.dromara.sis.domain.entity.SisDeviceGroup;
 import org.dromara.common.mybatis.core.domain.BaseEntity;
 import org.dromara.common.core.validate.AddGroup;
 import org.dromara.common.core.validate.EditGroup;
diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/bo/SisDeviceManageBo.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/bo/SisDeviceManageBo.java
index dd747269..6dc8bef0 100644
--- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/bo/SisDeviceManageBo.java
+++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/bo/SisDeviceManageBo.java
@@ -8,7 +8,7 @@ import lombok.EqualsAndHashCode;
 import org.dromara.common.core.validate.AddGroup;
 import org.dromara.common.core.validate.EditGroup;
 import org.dromara.common.mybatis.core.domain.BaseEntity;
-import org.dromara.sis.domain.SisDeviceManage;
+import org.dromara.sis.domain.entity.SisDeviceManage;
 
 /**
  * 设备管理业务对象 sis_device_manage
diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/bo/SisDevicePointBo.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/bo/SisDevicePointBo.java
index 0d796e4c..4f10dd27 100644
--- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/bo/SisDevicePointBo.java
+++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/bo/SisDevicePointBo.java
@@ -1,6 +1,6 @@
 package org.dromara.sis.domain.bo;
 
-import org.dromara.sis.domain.SisDevicePoint;
+import org.dromara.sis.domain.entity.SisDevicePoint;
 import org.dromara.common.mybatis.core.domain.BaseEntity;
 import org.dromara.common.core.validate.AddGroup;
 import org.dromara.common.core.validate.EditGroup;
diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/bo/SisEEightRefBo.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/bo/SisEEightRefBo.java
index fcf80fc9..5b8593cc 100644
--- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/bo/SisEEightRefBo.java
+++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/bo/SisEEightRefBo.java
@@ -8,7 +8,7 @@ import lombok.EqualsAndHashCode;
 import org.dromara.common.core.validate.AddGroup;
 import org.dromara.common.core.validate.EditGroup;
 import org.dromara.common.mybatis.core.domain.BaseEntity;
-import org.dromara.sis.domain.SisEEightRef;
+import org.dromara.sis.domain.entity.SisEEightRef;
 
 import java.util.List;
 
diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/bo/SisElevatorFloorChannelRefBo.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/bo/SisElevatorFloorChannelRefBo.java
index b9cb019e..6e597851 100644
--- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/bo/SisElevatorFloorChannelRefBo.java
+++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/bo/SisElevatorFloorChannelRefBo.java
@@ -1,6 +1,6 @@
 package org.dromara.sis.domain.bo;
 
-import org.dromara.sis.domain.SisElevatorFloorChannelRef;
+import org.dromara.sis.domain.entity.SisElevatorFloorChannelRef;
 import org.dromara.common.mybatis.core.domain.BaseEntity;
 import org.dromara.common.core.validate.AddGroup;
 import org.dromara.common.core.validate.EditGroup;
diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/bo/SisElevatorFloorRefBo.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/bo/SisElevatorFloorRefBo.java
index 3a1f6739..55ed7251 100644
--- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/bo/SisElevatorFloorRefBo.java
+++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/bo/SisElevatorFloorRefBo.java
@@ -1,6 +1,6 @@
 package org.dromara.sis.domain.bo;
 
-import org.dromara.sis.domain.SisElevatorFloorRef;
+import org.dromara.sis.domain.entity.SisElevatorFloorRef;
 import org.dromara.common.mybatis.core.domain.BaseEntity;
 import org.dromara.common.core.validate.AddGroup;
 import org.dromara.common.core.validate.EditGroup;
diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/bo/SisElevatorInfoBo.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/bo/SisElevatorInfoBo.java
index b7393564..7db66efc 100644
--- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/bo/SisElevatorInfoBo.java
+++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/bo/SisElevatorInfoBo.java
@@ -8,7 +8,7 @@ import lombok.EqualsAndHashCode;
 import org.dromara.common.core.validate.AddGroup;
 import org.dromara.common.core.validate.EditGroup;
 import org.dromara.common.mybatis.core.domain.BaseEntity;
-import org.dromara.sis.domain.SisElevatorInfo;
+import org.dromara.sis.domain.entity.SisElevatorInfo;
 
 import java.util.Date;
 import java.util.List;
diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/bo/SisLibDeviceImgRefBo.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/bo/SisLibDeviceImgRefBo.java
index 1d05bf2a..f4c4ffa4 100644
--- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/bo/SisLibDeviceImgRefBo.java
+++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/bo/SisLibDeviceImgRefBo.java
@@ -1,6 +1,6 @@
 package org.dromara.sis.domain.bo;
 
-import org.dromara.sis.domain.SisLibDeviceImgRef;
+import org.dromara.sis.domain.entity.SisLibDeviceImgRef;
 import org.dromara.common.mybatis.core.domain.BaseEntity;
 import org.dromara.common.core.validate.AddGroup;
 import org.dromara.common.core.validate.EditGroup;
diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/bo/SisLibDeviceRefBo.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/bo/SisLibDeviceRefBo.java
index 669701a1..de40f5e3 100644
--- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/bo/SisLibDeviceRefBo.java
+++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/bo/SisLibDeviceRefBo.java
@@ -4,7 +4,7 @@ import io.github.linpeilie.annotations.AutoMapper;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.dromara.common.mybatis.core.domain.BaseEntity;
-import org.dromara.sis.domain.SisLibDeviceRef;
+import org.dromara.sis.domain.entity.SisLibDeviceRef;
 import org.dromara.common.core.validate.AddGroup;
 import org.dromara.common.core.validate.EditGroup;
 import jakarta.validation.constraints.*;
diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/bo/SisLibImgRefBo.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/bo/SisLibImgRefBo.java
index 6340fa5e..a55f0fd0 100644
--- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/bo/SisLibImgRefBo.java
+++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/bo/SisLibImgRefBo.java
@@ -1,6 +1,6 @@
 package org.dromara.sis.domain.bo;
 
-import org.dromara.sis.domain.SisLibImgRef;
+import org.dromara.sis.domain.entity.SisLibImgRef;
 import org.dromara.common.mybatis.core.domain.BaseEntity;
 import org.dromara.common.core.validate.AddGroup;
 import org.dromara.common.core.validate.EditGroup;
diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/bo/SisPersonLibBo.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/bo/SisPersonLibBo.java
index 7ecb0d95..c830e6d9 100644
--- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/bo/SisPersonLibBo.java
+++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/bo/SisPersonLibBo.java
@@ -8,7 +8,7 @@ import lombok.EqualsAndHashCode;
 import org.dromara.common.core.validate.AddGroup;
 import org.dromara.common.core.validate.EditGroup;
 import org.dromara.common.mybatis.core.domain.BaseEntity;
-import org.dromara.sis.domain.SisPersonLib;
+import org.dromara.sis.domain.entity.SisPersonLib;
 
 /**
  * 人像库业务对象 tb_person_lib
diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/bo/SisPersonLibImgBo.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/bo/SisPersonLibImgBo.java
index 96ba4ed7..db3421a4 100644
--- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/bo/SisPersonLibImgBo.java
+++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/bo/SisPersonLibImgBo.java
@@ -1,6 +1,6 @@
 package org.dromara.sis.domain.bo;
 
-import org.dromara.sis.domain.SisPersonLibImg;
+import org.dromara.sis.domain.entity.SisPersonLibImg;
 import org.dromara.common.mybatis.core.domain.BaseEntity;
 import org.dromara.common.core.validate.AddGroup;
 import org.dromara.common.core.validate.EditGroup;
diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/bo/TbFactoryBo.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/bo/TbFactoryBo.java
index e3a13218..8ab291a4 100644
--- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/bo/TbFactoryBo.java
+++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/bo/TbFactoryBo.java
@@ -8,7 +8,7 @@ import lombok.EqualsAndHashCode;
 import org.dromara.common.core.validate.AddGroup;
 import org.dromara.common.core.validate.EditGroup;
 import org.dromara.common.mybatis.core.domain.BaseEntity;
-import org.dromara.sis.domain.TbFactory;
+import org.dromara.sis.domain.entity.TbFactory;
 
 /**
  * 厂商管理业务对象 td_factory
diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/covert/CommonBeanCovert.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/covert/CommonBeanCovert.java
index 3af91a2c..d733fb6f 100644
--- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/covert/CommonBeanCovert.java
+++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/covert/CommonBeanCovert.java
@@ -3,8 +3,8 @@ package org.dromara.sis.domain.covert;
 import org.dromara.sis.api.domain.RemoteSdkChannel;
 import org.dromara.sis.api.domain.RemoteSisDeviceChannel;
 import org.dromara.sis.api.domain.RemoteSisDeviceManage;
-import org.dromara.sis.domain.SisDeviceChannel;
-import org.dromara.sis.domain.SisDeviceManage;
+import org.dromara.sis.domain.entity.SisDeviceChannel;
+import org.dromara.sis.domain.entity.SisDeviceManage;
 import org.dromara.sis.sdk.hik.DeviceInfo;
 import org.mapstruct.Mapper;
 import org.mapstruct.factory.Mappers;
diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/AlarmRecord.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/entity/AlarmRecord.java
similarity index 99%
rename from ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/AlarmRecord.java
rename to ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/entity/AlarmRecord.java
index 6cb61678..947d29d8 100644
--- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/AlarmRecord.java
+++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/entity/AlarmRecord.java
@@ -1,4 +1,4 @@
-package org.dromara.sis.domain;
+package org.dromara.sis.domain.entity;
 
 import com.baomidou.mybatisplus.annotation.*;
 import lombok.Data;
diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/AlarmTaskOperator.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/entity/AlarmTaskOperator.java
similarity index 97%
rename from ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/AlarmTaskOperator.java
rename to ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/entity/AlarmTaskOperator.java
index 388b5cd6..c28d34d3 100644
--- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/AlarmTaskOperator.java
+++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/entity/AlarmTaskOperator.java
@@ -1,4 +1,4 @@
-package org.dromara.sis.domain;
+package org.dromara.sis.domain.entity;
 
 import com.baomidou.mybatisplus.annotation.*;
 import lombok.Data;
diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/SisAcDeviceRef.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/entity/SisAcDeviceRef.java
similarity index 94%
rename from ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/SisAcDeviceRef.java
rename to ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/entity/SisAcDeviceRef.java
index 18302933..629c4c4c 100644
--- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/SisAcDeviceRef.java
+++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/entity/SisAcDeviceRef.java
@@ -1,4 +1,4 @@
-package org.dromara.sis.domain;
+package org.dromara.sis.domain.entity;
 
 import org.dromara.common.tenant.core.TenantEntity;
 import com.baomidou.mybatisplus.annotation.*;
diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/SisAccessControl.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/entity/SisAccessControl.java
similarity index 97%
rename from ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/SisAccessControl.java
rename to ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/entity/SisAccessControl.java
index 3445a59f..4b1672aa 100644
--- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/SisAccessControl.java
+++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/entity/SisAccessControl.java
@@ -1,4 +1,4 @@
-package org.dromara.sis.domain;
+package org.dromara.sis.domain.entity;
 
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/SisAlarmEventAttachments.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/entity/SisAlarmEventAttachments.java
similarity index 95%
rename from ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/SisAlarmEventAttachments.java
rename to ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/entity/SisAlarmEventAttachments.java
index 808aacc7..e1518821 100644
--- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/SisAlarmEventAttachments.java
+++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/entity/SisAlarmEventAttachments.java
@@ -1,4 +1,4 @@
-package org.dromara.sis.domain;
+package org.dromara.sis.domain.entity;
 
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/SisAlarmEventProcess.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/entity/SisAlarmEventProcess.java
similarity index 96%
rename from ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/SisAlarmEventProcess.java
rename to ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/entity/SisAlarmEventProcess.java
index c411c04a..ed2648f5 100644
--- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/SisAlarmEventProcess.java
+++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/entity/SisAlarmEventProcess.java
@@ -1,4 +1,4 @@
-package org.dromara.sis.domain;
+package org.dromara.sis.domain.entity;
 
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/SisAlarmEvents.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/entity/SisAlarmEvents.java
similarity index 98%
rename from ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/SisAlarmEvents.java
rename to ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/entity/SisAlarmEvents.java
index eb0585db..3d4d51be 100644
--- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/SisAlarmEvents.java
+++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/entity/SisAlarmEvents.java
@@ -1,4 +1,4 @@
-package org.dromara.sis.domain;
+package org.dromara.sis.domain.entity;
 
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/SisAuthGroup.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/entity/SisAuthGroup.java
similarity index 95%
rename from ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/SisAuthGroup.java
rename to ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/entity/SisAuthGroup.java
index 9ac999a0..400dd886 100644
--- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/SisAuthGroup.java
+++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/entity/SisAuthGroup.java
@@ -1,4 +1,4 @@
-package org.dromara.sis.domain;
+package org.dromara.sis.domain.entity;
 
 import org.dromara.common.tenant.core.TenantEntity;
 import com.baomidou.mybatisplus.annotation.*;
diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/SisAuthGroupRef.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/entity/SisAuthGroupRef.java
similarity index 95%
rename from ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/SisAuthGroupRef.java
rename to ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/entity/SisAuthGroupRef.java
index 3d4d6493..81018e3d 100644
--- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/SisAuthGroupRef.java
+++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/entity/SisAuthGroupRef.java
@@ -1,4 +1,4 @@
-package org.dromara.sis.domain;
+package org.dromara.sis.domain.entity;
 
 import org.dromara.common.tenant.core.TenantEntity;
 import com.baomidou.mybatisplus.annotation.*;
diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/SisAuthRecord.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/entity/SisAuthRecord.java
similarity index 95%
rename from ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/SisAuthRecord.java
rename to ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/entity/SisAuthRecord.java
index 52767289..37e88f4f 100644
--- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/SisAuthRecord.java
+++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/entity/SisAuthRecord.java
@@ -1,4 +1,4 @@
-package org.dromara.sis.domain;
+package org.dromara.sis.domain.entity;
 
 import org.dromara.common.tenant.core.TenantEntity;
 import com.baomidou.mybatisplus.annotation.*;
diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/SisDeviceBindRef.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/entity/SisDeviceBindRef.java
similarity index 96%
rename from ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/SisDeviceBindRef.java
rename to ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/entity/SisDeviceBindRef.java
index dff03c38..f70481b5 100644
--- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/SisDeviceBindRef.java
+++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/entity/SisDeviceBindRef.java
@@ -1,4 +1,4 @@
-package org.dromara.sis.domain;
+package org.dromara.sis.domain.entity;
 
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/SisDeviceChannel.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/entity/SisDeviceChannel.java
similarity index 97%
rename from ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/SisDeviceChannel.java
rename to ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/entity/SisDeviceChannel.java
index 2b125e7a..7c182c4e 100644
--- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/SisDeviceChannel.java
+++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/entity/SisDeviceChannel.java
@@ -1,4 +1,4 @@
-package org.dromara.sis.domain;
+package org.dromara.sis.domain.entity;
 
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/SisDeviceGroup.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/entity/SisDeviceGroup.java
similarity index 95%
rename from ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/SisDeviceGroup.java
rename to ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/entity/SisDeviceGroup.java
index 48937e1f..1561d90e 100644
--- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/SisDeviceGroup.java
+++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/entity/SisDeviceGroup.java
@@ -1,4 +1,4 @@
-package org.dromara.sis.domain;
+package org.dromara.sis.domain.entity;
 
 import org.dromara.common.tenant.core.TenantEntity;
 import com.baomidou.mybatisplus.annotation.*;
diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/SisDeviceManage.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/entity/SisDeviceManage.java
similarity index 97%
rename from ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/SisDeviceManage.java
rename to ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/entity/SisDeviceManage.java
index db2f9f84..947b2d08 100644
--- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/SisDeviceManage.java
+++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/entity/SisDeviceManage.java
@@ -1,4 +1,4 @@
-package org.dromara.sis.domain;
+package org.dromara.sis.domain.entity;
 
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/SisDevicePoint.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/entity/SisDevicePoint.java
similarity index 97%
rename from ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/SisDevicePoint.java
rename to ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/entity/SisDevicePoint.java
index e77ff14a..ea2b4f41 100644
--- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/SisDevicePoint.java
+++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/entity/SisDevicePoint.java
@@ -1,4 +1,4 @@
-package org.dromara.sis.domain;
+package org.dromara.sis.domain.entity;
 
 import org.dromara.common.tenant.core.TenantEntity;
 import com.baomidou.mybatisplus.annotation.*;
diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/SisEEightRef.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/entity/SisEEightRef.java
similarity index 96%
rename from ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/SisEEightRef.java
rename to ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/entity/SisEEightRef.java
index e3c3dead..2cd5a176 100644
--- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/SisEEightRef.java
+++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/entity/SisEEightRef.java
@@ -1,4 +1,4 @@
-package org.dromara.sis.domain;
+package org.dromara.sis.domain.entity;
 
 import org.dromara.common.tenant.core.TenantEntity;
 import com.baomidou.mybatisplus.annotation.*;
diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/SisElevatorFloorChannelRef.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/entity/SisElevatorFloorChannelRef.java
similarity index 95%
rename from ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/SisElevatorFloorChannelRef.java
rename to ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/entity/SisElevatorFloorChannelRef.java
index c66d023a..f76fddf1 100644
--- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/SisElevatorFloorChannelRef.java
+++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/entity/SisElevatorFloorChannelRef.java
@@ -1,4 +1,4 @@
-package org.dromara.sis.domain;
+package org.dromara.sis.domain.entity;
 
 import org.dromara.common.tenant.core.TenantEntity;
 import com.baomidou.mybatisplus.annotation.*;
diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/SisElevatorFloorRef.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/entity/SisElevatorFloorRef.java
similarity index 96%
rename from ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/SisElevatorFloorRef.java
rename to ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/entity/SisElevatorFloorRef.java
index 5405f5ad..2de33aa0 100644
--- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/SisElevatorFloorRef.java
+++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/entity/SisElevatorFloorRef.java
@@ -1,4 +1,4 @@
-package org.dromara.sis.domain;
+package org.dromara.sis.domain.entity;
 
 import org.dromara.common.tenant.core.TenantEntity;
 import com.baomidou.mybatisplus.annotation.*;
diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/SisElevatorInfo.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/entity/SisElevatorInfo.java
similarity index 96%
rename from ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/SisElevatorInfo.java
rename to ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/entity/SisElevatorInfo.java
index de33a5fb..7bb7ce26 100644
--- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/SisElevatorInfo.java
+++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/entity/SisElevatorInfo.java
@@ -1,11 +1,10 @@
-package org.dromara.sis.domain;
+package org.dromara.sis.domain.entity;
 
 import org.dromara.common.tenant.core.TenantEntity;
 import com.baomidou.mybatisplus.annotation.*;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import java.util.Date;
-import com.fasterxml.jackson.annotation.JsonFormat;
 
 import java.io.Serial;
 
diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/SisLibDeviceImgRef.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/entity/SisLibDeviceImgRef.java
similarity index 95%
rename from ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/SisLibDeviceImgRef.java
rename to ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/entity/SisLibDeviceImgRef.java
index da57319d..04dc7294 100644
--- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/SisLibDeviceImgRef.java
+++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/entity/SisLibDeviceImgRef.java
@@ -1,4 +1,4 @@
-package org.dromara.sis.domain;
+package org.dromara.sis.domain.entity;
 
 import org.dromara.common.tenant.core.TenantEntity;
 import com.baomidou.mybatisplus.annotation.*;
diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/SisLibDeviceRef.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/entity/SisLibDeviceRef.java
similarity index 96%
rename from ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/SisLibDeviceRef.java
rename to ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/entity/SisLibDeviceRef.java
index 610c61c4..331a600e 100644
--- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/SisLibDeviceRef.java
+++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/entity/SisLibDeviceRef.java
@@ -1,4 +1,4 @@
-package org.dromara.sis.domain;
+package org.dromara.sis.domain.entity;
 
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/SisLibImgRef.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/entity/SisLibImgRef.java
similarity index 94%
rename from ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/SisLibImgRef.java
rename to ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/entity/SisLibImgRef.java
index 474bbeda..2805dfd5 100644
--- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/SisLibImgRef.java
+++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/entity/SisLibImgRef.java
@@ -1,4 +1,4 @@
-package org.dromara.sis.domain;
+package org.dromara.sis.domain.entity;
 
 import org.dromara.common.tenant.core.TenantEntity;
 import com.baomidou.mybatisplus.annotation.*;
diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/SisPersonLib.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/entity/SisPersonLib.java
similarity index 95%
rename from ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/SisPersonLib.java
rename to ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/entity/SisPersonLib.java
index 459a3c90..2cc401bf 100644
--- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/SisPersonLib.java
+++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/entity/SisPersonLib.java
@@ -1,4 +1,4 @@
-package org.dromara.sis.domain;
+package org.dromara.sis.domain.entity;
 
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/SisPersonLibImg.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/entity/SisPersonLibImg.java
similarity index 97%
rename from ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/SisPersonLibImg.java
rename to ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/entity/SisPersonLibImg.java
index 30cee049..77dc8293 100644
--- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/SisPersonLibImg.java
+++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/entity/SisPersonLibImg.java
@@ -1,4 +1,4 @@
-package org.dromara.sis.domain;
+package org.dromara.sis.domain.entity;
 
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/TbFactory.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/entity/TbFactory.java
similarity index 95%
rename from ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/TbFactory.java
rename to ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/entity/TbFactory.java
index 7d624037..8808cec6 100644
--- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/TbFactory.java
+++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/entity/TbFactory.java
@@ -1,4 +1,4 @@
-package org.dromara.sis.domain;
+package org.dromara.sis.domain.entity;
 
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/model/SisAcDevice.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/model/SisAcDevice.java
index 4d13565b..410d2d91 100644
--- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/model/SisAcDevice.java
+++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/model/SisAcDevice.java
@@ -2,7 +2,7 @@ package org.dromara.sis.domain.model;
 
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import org.dromara.sis.domain.SisDeviceManage;
+import org.dromara.sis.domain.entity.SisDeviceManage;
 
 @EqualsAndHashCode(callSuper = true)
 @Data
diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/vo/DeviceStateStatistics.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/vo/DeviceStateStatistics.java
new file mode 100644
index 00000000..d9e2080f
--- /dev/null
+++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/vo/DeviceStateStatistics.java
@@ -0,0 +1,14 @@
+package org.dromara.sis.domain.vo;
+
+import lombok.Data;
+
+@Data
+public class DeviceStateStatistics {
+
+    private Integer onLine;
+
+    private Integer offLine;
+
+    private Integer total;
+
+}
diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/vo/SisAcDeviceRefVo.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/vo/SisAcDeviceRefVo.java
index b80d5a73..97309b85 100644
--- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/vo/SisAcDeviceRefVo.java
+++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/vo/SisAcDeviceRefVo.java
@@ -2,16 +2,12 @@ package org.dromara.sis.domain.vo;
 
 import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
 import cn.idev.excel.annotation.ExcelProperty;
-import org.dromara.common.excel.annotation.ExcelDictFormat;
-import org.dromara.common.excel.convert.ExcelDictConvert;
 import io.github.linpeilie.annotations.AutoMapper;
 import lombok.Data;
-import org.dromara.sis.domain.SisAcDeviceRef;
+import org.dromara.sis.domain.entity.SisAcDeviceRef;
 
 import java.io.Serial;
 import java.io.Serializable;
-import java.util.Date;
-
 
 
 /**
diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/vo/SisAccessControlVo.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/vo/SisAccessControlVo.java
index d9d30feb..88203c02 100644
--- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/vo/SisAccessControlVo.java
+++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/vo/SisAccessControlVo.java
@@ -1,6 +1,6 @@
 package org.dromara.sis.domain.vo;
 
-import org.dromara.sis.domain.SisAccessControl;
+import org.dromara.sis.domain.entity.SisAccessControl;
 import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
 import cn.idev.excel.annotation.ExcelProperty;
 import io.github.linpeilie.annotations.AutoMapper;
diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/vo/SisAlarmEventAttachmentsVo.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/vo/SisAlarmEventAttachmentsVo.java
index f1b965aa..b8fa0b5c 100644
--- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/vo/SisAlarmEventAttachmentsVo.java
+++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/vo/SisAlarmEventAttachmentsVo.java
@@ -6,7 +6,7 @@ import io.github.linpeilie.annotations.AutoMapper;
 import lombok.Data;
 import org.dromara.common.translation.annotation.Translation;
 import org.dromara.common.translation.constant.TransConstant;
-import org.dromara.sis.domain.SisAlarmEventAttachments;
+import org.dromara.sis.domain.entity.SisAlarmEventAttachments;
 
 import java.io.Serial;
 import java.io.Serializable;
diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/vo/SisAlarmEventProcessVo.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/vo/SisAlarmEventProcessVo.java
index e9b533e4..2c6aed1e 100644
--- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/vo/SisAlarmEventProcessVo.java
+++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/vo/SisAlarmEventProcessVo.java
@@ -4,7 +4,7 @@ import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
 import cn.idev.excel.annotation.ExcelProperty;
 import io.github.linpeilie.annotations.AutoMapper;
 import lombok.Data;
-import org.dromara.sis.domain.SisAlarmEventProcess;
+import org.dromara.sis.domain.entity.SisAlarmEventProcess;
 
 import java.io.Serial;
 import java.io.Serializable;
diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/vo/SisAlarmEventsVo.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/vo/SisAlarmEventsVo.java
index 3b87887e..918caf96 100644
--- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/vo/SisAlarmEventsVo.java
+++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/vo/SisAlarmEventsVo.java
@@ -6,7 +6,7 @@ import io.github.linpeilie.annotations.AutoMapper;
 import lombok.Data;
 import org.dromara.common.translation.annotation.Translation;
 import org.dromara.common.translation.constant.TransConstant;
-import org.dromara.sis.domain.SisAlarmEvents;
+import org.dromara.sis.domain.entity.SisAlarmEvents;
 
 import java.io.Serial;
 import java.io.Serializable;
diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/vo/SisAuthGroupRefVo.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/vo/SisAuthGroupRefVo.java
index ead82fbe..37f1571d 100644
--- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/vo/SisAuthGroupRefVo.java
+++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/vo/SisAuthGroupRefVo.java
@@ -1,6 +1,6 @@
 package org.dromara.sis.domain.vo;
 
-import org.dromara.sis.domain.SisAuthGroupRef;
+import org.dromara.sis.domain.entity.SisAuthGroupRef;
 import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
 import cn.idev.excel.annotation.ExcelProperty;
 import org.dromara.common.excel.annotation.ExcelDictFormat;
diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/vo/SisAuthGroupVo.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/vo/SisAuthGroupVo.java
index 2e16205c..2d013f04 100644
--- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/vo/SisAuthGroupVo.java
+++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/vo/SisAuthGroupVo.java
@@ -1,18 +1,14 @@
 package org.dromara.sis.domain.vo;
 
-import org.dromara.sis.domain.SisAuthGroup;
+import org.dromara.sis.domain.entity.SisAuthGroup;
 import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
 import cn.idev.excel.annotation.ExcelProperty;
-import org.dromara.common.excel.annotation.ExcelDictFormat;
-import org.dromara.common.excel.convert.ExcelDictConvert;
 import io.github.linpeilie.annotations.AutoMapper;
 import lombok.Data;
 
 import java.io.Serial;
 import java.io.Serializable;
 import java.util.Collection;
-import java.util.Date;
-
 
 
 /**
diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/vo/SisAuthRecordVo.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/vo/SisAuthRecordVo.java
index c8ebd1dd..2710d87e 100644
--- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/vo/SisAuthRecordVo.java
+++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/vo/SisAuthRecordVo.java
@@ -1,7 +1,7 @@
 package org.dromara.sis.domain.vo;
 
 import java.util.Date;
-import org.dromara.sis.domain.SisAuthRecord;
+import org.dromara.sis.domain.entity.SisAuthRecord;
 import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
 import cn.idev.excel.annotation.ExcelProperty;
 import io.github.linpeilie.annotations.AutoMapper;
diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/vo/SisDeviceBindRefVo.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/vo/SisDeviceBindRefVo.java
index 9c5a13e6..db5f6646 100644
--- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/vo/SisDeviceBindRefVo.java
+++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/vo/SisDeviceBindRefVo.java
@@ -1,17 +1,13 @@
 package org.dromara.sis.domain.vo;
 
-import org.dromara.sis.domain.SisDeviceBindRef;
+import org.dromara.sis.domain.entity.SisDeviceBindRef;
 import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
 import cn.idev.excel.annotation.ExcelProperty;
-import org.dromara.common.excel.annotation.ExcelDictFormat;
-import org.dromara.common.excel.convert.ExcelDictConvert;
 import io.github.linpeilie.annotations.AutoMapper;
 import lombok.Data;
 
 import java.io.Serial;
 import java.io.Serializable;
-import java.util.Date;
-
 
 
 /**
diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/vo/SisDeviceChannelVo.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/vo/SisDeviceChannelVo.java
index 95f32d2d..30019030 100644
--- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/vo/SisDeviceChannelVo.java
+++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/vo/SisDeviceChannelVo.java
@@ -1,17 +1,13 @@
 package org.dromara.sis.domain.vo;
 
-import org.dromara.sis.domain.SisDeviceChannel;
+import org.dromara.sis.domain.entity.SisDeviceChannel;
 import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
 import cn.idev.excel.annotation.ExcelProperty;
-import org.dromara.common.excel.annotation.ExcelDictFormat;
-import org.dromara.common.excel.convert.ExcelDictConvert;
 import io.github.linpeilie.annotations.AutoMapper;
 import lombok.Data;
 
 import java.io.Serial;
 import java.io.Serializable;
-import java.util.Date;
-
 
 
 /**
diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/vo/SisDeviceGroupVo.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/vo/SisDeviceGroupVo.java
index 0ed3550f..8800094d 100644
--- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/vo/SisDeviceGroupVo.java
+++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/vo/SisDeviceGroupVo.java
@@ -1,17 +1,13 @@
 package org.dromara.sis.domain.vo;
 
-import org.dromara.sis.domain.SisDeviceGroup;
+import org.dromara.sis.domain.entity.SisDeviceGroup;
 import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
 import cn.idev.excel.annotation.ExcelProperty;
-import org.dromara.common.excel.annotation.ExcelDictFormat;
-import org.dromara.common.excel.convert.ExcelDictConvert;
 import io.github.linpeilie.annotations.AutoMapper;
 import lombok.Data;
 
 import java.io.Serial;
 import java.io.Serializable;
-import java.util.Date;
-
 
 
 /**
diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/vo/SisDeviceManageVo.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/vo/SisDeviceManageVo.java
index 46c1aefe..e97661fd 100644
--- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/vo/SisDeviceManageVo.java
+++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/vo/SisDeviceManageVo.java
@@ -6,7 +6,7 @@ import io.github.linpeilie.annotations.AutoMapper;
 import lombok.Data;
 import org.dromara.common.translation.annotation.Translation;
 import org.dromara.common.translation.constant.TransConstant;
-import org.dromara.sis.domain.SisDeviceManage;
+import org.dromara.sis.domain.entity.SisDeviceManage;
 
 import java.io.Serial;
 import java.io.Serializable;
diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/vo/SisDevicePointVo.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/vo/SisDevicePointVo.java
index a453e8d3..c899be55 100644
--- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/vo/SisDevicePointVo.java
+++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/vo/SisDevicePointVo.java
@@ -6,7 +6,7 @@ import io.github.linpeilie.annotations.AutoMapper;
 import lombok.Data;
 import org.dromara.common.excel.annotation.ExcelDictFormat;
 import org.dromara.common.excel.convert.ExcelDictConvert;
-import org.dromara.sis.domain.SisDevicePoint;
+import org.dromara.sis.domain.entity.SisDevicePoint;
 
 import java.io.Serial;
 import java.io.Serializable;
diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/vo/SisEEightRefVo.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/vo/SisEEightRefVo.java
index 3f664f1f..5d1ebacc 100644
--- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/vo/SisEEightRefVo.java
+++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/vo/SisEEightRefVo.java
@@ -1,16 +1,13 @@
 package org.dromara.sis.domain.vo;
 
-import org.dromara.sis.domain.SisEEightRef;
+import org.dromara.sis.domain.entity.SisEEightRef;
 import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
 import cn.idev.excel.annotation.ExcelProperty;
-import org.dromara.common.excel.annotation.ExcelDictFormat;
-import org.dromara.common.excel.convert.ExcelDictConvert;
 import io.github.linpeilie.annotations.AutoMapper;
 import lombok.Data;
 
 import java.io.Serial;
 import java.io.Serializable;
-import java.util.Date;
 import java.util.List;
 
 
diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/vo/SisElevatorFloorChannelRefVo.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/vo/SisElevatorFloorChannelRefVo.java
index 68a9101a..2a3ca775 100644
--- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/vo/SisElevatorFloorChannelRefVo.java
+++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/vo/SisElevatorFloorChannelRefVo.java
@@ -1,17 +1,13 @@
 package org.dromara.sis.domain.vo;
 
-import org.dromara.sis.domain.SisElevatorFloorChannelRef;
+import org.dromara.sis.domain.entity.SisElevatorFloorChannelRef;
 import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
 import cn.idev.excel.annotation.ExcelProperty;
-import org.dromara.common.excel.annotation.ExcelDictFormat;
-import org.dromara.common.excel.convert.ExcelDictConvert;
 import io.github.linpeilie.annotations.AutoMapper;
 import lombok.Data;
 
 import java.io.Serial;
 import java.io.Serializable;
-import java.util.Date;
-
 
 
 /**
diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/vo/SisElevatorFloorRefVo.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/vo/SisElevatorFloorRefVo.java
index 2c330d3b..2ec409d8 100644
--- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/vo/SisElevatorFloorRefVo.java
+++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/vo/SisElevatorFloorRefVo.java
@@ -1,6 +1,6 @@
 package org.dromara.sis.domain.vo;
 
-import org.dromara.sis.domain.SisElevatorFloorRef;
+import org.dromara.sis.domain.entity.SisElevatorFloorRef;
 import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
 import cn.idev.excel.annotation.ExcelProperty;
 import io.github.linpeilie.annotations.AutoMapper;
diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/vo/SisElevatorInfoVo.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/vo/SisElevatorInfoVo.java
index d6c3734b..1937b184 100644
--- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/vo/SisElevatorInfoVo.java
+++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/vo/SisElevatorInfoVo.java
@@ -4,7 +4,7 @@ import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
 import cn.idev.excel.annotation.ExcelProperty;
 import io.github.linpeilie.annotations.AutoMapper;
 import lombok.Data;
-import org.dromara.sis.domain.SisElevatorInfo;
+import org.dromara.sis.domain.entity.SisElevatorInfo;
 
 import java.io.Serial;
 import java.io.Serializable;
diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/vo/SisLibDeviceImgRefVo.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/vo/SisLibDeviceImgRefVo.java
index 74e2945b..4a9a71f4 100644
--- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/vo/SisLibDeviceImgRefVo.java
+++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/vo/SisLibDeviceImgRefVo.java
@@ -1,6 +1,6 @@
 package org.dromara.sis.domain.vo;
 
-import org.dromara.sis.domain.SisLibDeviceImgRef;
+import org.dromara.sis.domain.entity.SisLibDeviceImgRef;
 import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
 import cn.idev.excel.annotation.ExcelProperty;
 import io.github.linpeilie.annotations.AutoMapper;
diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/vo/SisLibDeviceRefVo.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/vo/SisLibDeviceRefVo.java
index 07bc69d2..7c4b1e9e 100644
--- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/vo/SisLibDeviceRefVo.java
+++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/vo/SisLibDeviceRefVo.java
@@ -1,6 +1,6 @@
 package org.dromara.sis.domain.vo;
 
-import org.dromara.sis.domain.SisLibDeviceRef;
+import org.dromara.sis.domain.entity.SisLibDeviceRef;
 import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
 import cn.idev.excel.annotation.ExcelProperty;
 import io.github.linpeilie.annotations.AutoMapper;
diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/vo/SisLibImgRefVo.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/vo/SisLibImgRefVo.java
index f209f62b..5bcfc1b1 100644
--- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/vo/SisLibImgRefVo.java
+++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/vo/SisLibImgRefVo.java
@@ -1,6 +1,6 @@
 package org.dromara.sis.domain.vo;
 
-import org.dromara.sis.domain.SisLibImgRef;
+import org.dromara.sis.domain.entity.SisLibImgRef;
 import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
 import cn.idev.excel.annotation.ExcelProperty;
 import io.github.linpeilie.annotations.AutoMapper;
diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/vo/SisPersonLibImgVo.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/vo/SisPersonLibImgVo.java
index 0d9ac89a..10ccc404 100644
--- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/vo/SisPersonLibImgVo.java
+++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/vo/SisPersonLibImgVo.java
@@ -4,7 +4,7 @@ import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
 import cn.idev.excel.annotation.ExcelProperty;
 import io.github.linpeilie.annotations.AutoMapper;
 import lombok.Data;
-import org.dromara.sis.domain.SisPersonLibImg;
+import org.dromara.sis.domain.entity.SisPersonLibImg;
 
 import java.io.Serial;
 import java.io.Serializable;
diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/vo/SisPersonLibVo.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/vo/SisPersonLibVo.java
index 2d184e38..1db6ae8e 100644
--- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/vo/SisPersonLibVo.java
+++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/vo/SisPersonLibVo.java
@@ -4,7 +4,7 @@ import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
 import cn.idev.excel.annotation.ExcelProperty;
 import io.github.linpeilie.annotations.AutoMapper;
 import lombok.Data;
-import org.dromara.sis.domain.SisPersonLib;
+import org.dromara.sis.domain.entity.SisPersonLib;
 
 import java.io.Serial;
 import java.io.Serializable;
diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/vo/TbFactoryVo.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/vo/TbFactoryVo.java
index 81a045cb..2e2b79c9 100644
--- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/vo/TbFactoryVo.java
+++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/vo/TbFactoryVo.java
@@ -4,7 +4,7 @@ import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
 import cn.idev.excel.annotation.ExcelProperty;
 import io.github.linpeilie.annotations.AutoMapper;
 import lombok.Data;
-import org.dromara.sis.domain.TbFactory;
+import org.dromara.sis.domain.entity.TbFactory;
 
 import java.io.Serial;
 import java.io.Serializable;
diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/dubbo/RemoteDeviceServiceImpl.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/dubbo/RemoteDeviceServiceImpl.java
index 695701c0..42f24d2f 100644
--- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/dubbo/RemoteDeviceServiceImpl.java
+++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/dubbo/RemoteDeviceServiceImpl.java
@@ -5,12 +5,15 @@ import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.dubbo.config.annotation.DubboService;
 import org.dromara.sis.api.RemoteDeviceService;
+import org.dromara.sis.api.domain.RemoteDeviceStateStatistics;
 import org.dromara.sis.api.domain.RemoteSdkChannel;
 import org.dromara.sis.api.domain.RemoteSisDeviceChannel;
 import org.dromara.sis.api.domain.RemoteSisDeviceManage;
-import org.dromara.sis.domain.SisDeviceChannel;
-import org.dromara.sis.domain.SisDeviceManage;
+import org.dromara.sis.api.enums.DeviceTypeEnum;
 import org.dromara.sis.domain.covert.CommonBeanCovert;
+import org.dromara.sis.domain.entity.SisDeviceChannel;
+import org.dromara.sis.domain.entity.SisDeviceManage;
+import org.dromara.sis.domain.vo.DeviceStateStatistics;
 import org.dromara.sis.sdk.hik.HikConstants;
 import org.dromara.sis.service.ISisDeviceChannelService;
 import org.dromara.sis.service.ISisDeviceManageService;
@@ -114,4 +117,17 @@ public class RemoteDeviceServiceImpl implements RemoteDeviceService {
         }
         return num;
     }
+
+    @Override
+    public RemoteDeviceStateStatistics statisticsMonitorState() {
+        DeviceStateStatistics deviceStateStatistics = deviceChannelService.statisticsDeviceState(DeviceTypeEnum.IPC.getType());
+        if (deviceStateStatistics != null) {
+            RemoteDeviceStateStatistics stateStatistics = new RemoteDeviceStateStatistics();
+            stateStatistics.setOnLine(deviceStateStatistics.getOnLine());
+            stateStatistics.setOffLine(deviceStateStatistics.getOffLine());
+            stateStatistics.setTotal(deviceStateStatistics.getTotal());
+            return stateStatistics;
+        }
+        return null;
+    }
 }
diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/dubbo/RemoteSosImpl.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/dubbo/RemoteSosImpl.java
index d181166f..1979c4a5 100644
--- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/dubbo/RemoteSosImpl.java
+++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/dubbo/RemoteSosImpl.java
@@ -7,7 +7,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.apache.dubbo.config.annotation.DubboService;
 import org.dromara.sis.api.RemoteSos;
 import org.dromara.sis.api.domain.RemoteAlarmRecord;
-import org.dromara.sis.domain.AlarmRecord;
+import org.dromara.sis.domain.entity.AlarmRecord;
 import org.dromara.sis.service.AlarmRecordService;
 import org.springframework.beans.BeanUtils;
 
diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/mapper/AlarmRecordMapper.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/mapper/AlarmRecordMapper.java
index 72aa362d..20988cd6 100644
--- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/mapper/AlarmRecordMapper.java
+++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/mapper/AlarmRecordMapper.java
@@ -3,7 +3,7 @@ package org.dromara.sis.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
-import org.dromara.sis.domain.AlarmRecord;
+import org.dromara.sis.domain.entity.AlarmRecord;
 import org.springframework.stereotype.Repository;
 
 /**
diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/mapper/AlarmTaskOperatorMapper.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/mapper/AlarmTaskOperatorMapper.java
index 71758569..72becedc 100644
--- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/mapper/AlarmTaskOperatorMapper.java
+++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/mapper/AlarmTaskOperatorMapper.java
@@ -2,7 +2,7 @@ package org.dromara.sis.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
-import org.dromara.sis.domain.AlarmTaskOperator;
+import org.dromara.sis.domain.entity.AlarmTaskOperator;
 import org.springframework.stereotype.Repository;
 
 /**
diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/mapper/SisAcDeviceRefMapper.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/mapper/SisAcDeviceRefMapper.java
index 799b9aaa..f6bd7529 100644
--- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/mapper/SisAcDeviceRefMapper.java
+++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/mapper/SisAcDeviceRefMapper.java
@@ -1,7 +1,7 @@
 package org.dromara.sis.mapper;
 
 import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
-import org.dromara.sis.domain.SisAcDeviceRef;
+import org.dromara.sis.domain.entity.SisAcDeviceRef;
 import org.dromara.sis.domain.model.SisAcDevice;
 import org.dromara.sis.domain.vo.SisAcDeviceRefVo;
 
diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/mapper/SisAccessControlMapper.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/mapper/SisAccessControlMapper.java
index 226224b8..0b953ad9 100644
--- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/mapper/SisAccessControlMapper.java
+++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/mapper/SisAccessControlMapper.java
@@ -2,7 +2,7 @@ package org.dromara.sis.mapper;
 
 import org.apache.ibatis.annotations.Mapper;
 import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
-import org.dromara.sis.domain.SisAccessControl;
+import org.dromara.sis.domain.entity.SisAccessControl;
 import org.dromara.sis.domain.vo.SisAccessControlVo;
 
 /**
diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/mapper/SisAlarmEventAttachmentsMapper.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/mapper/SisAlarmEventAttachmentsMapper.java
index 3a830a97..33ebad43 100644
--- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/mapper/SisAlarmEventAttachmentsMapper.java
+++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/mapper/SisAlarmEventAttachmentsMapper.java
@@ -1,7 +1,7 @@
 package org.dromara.sis.mapper;
 
 import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
-import org.dromara.sis.domain.SisAlarmEventAttachments;
+import org.dromara.sis.domain.entity.SisAlarmEventAttachments;
 import org.dromara.sis.domain.vo.SisAlarmEventAttachmentsVo;
 
 /**
diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/mapper/SisAlarmEventProcessMapper.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/mapper/SisAlarmEventProcessMapper.java
index 01ee9666..2465cfc0 100644
--- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/mapper/SisAlarmEventProcessMapper.java
+++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/mapper/SisAlarmEventProcessMapper.java
@@ -1,6 +1,6 @@
 package org.dromara.sis.mapper;
 
-import org.dromara.sis.domain.SisAlarmEventProcess;
+import org.dromara.sis.domain.entity.SisAlarmEventProcess;
 import org.dromara.sis.domain.vo.SisAlarmEventProcessVo;
 import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
 
diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/mapper/SisAlarmEventsMapper.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/mapper/SisAlarmEventsMapper.java
index 890ae9f8..efa352df 100644
--- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/mapper/SisAlarmEventsMapper.java
+++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/mapper/SisAlarmEventsMapper.java
@@ -5,7 +5,7 @@ import org.apache.ibatis.annotations.Param;
 import org.dromara.common.mybatis.annotation.DataColumn;
 import org.dromara.common.mybatis.annotation.DataPermission;
 import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
-import org.dromara.sis.domain.SisAlarmEvents;
+import org.dromara.sis.domain.entity.SisAlarmEvents;
 import org.dromara.sis.domain.bo.SisAlarmEventsBo;
 import org.dromara.sis.domain.vo.QueryStatisticsAlarmVo;
 import org.dromara.sis.domain.vo.SisAlarmEventsVo;
diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/mapper/SisAuthGroupMapper.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/mapper/SisAuthGroupMapper.java
index d5b94bdb..a5e9c227 100644
--- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/mapper/SisAuthGroupMapper.java
+++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/mapper/SisAuthGroupMapper.java
@@ -1,7 +1,7 @@
 package org.dromara.sis.mapper;
 
 import org.apache.ibatis.annotations.Mapper;
-import org.dromara.sis.domain.SisAuthGroup;
+import org.dromara.sis.domain.entity.SisAuthGroup;
 import org.dromara.sis.domain.vo.SisAuthGroupVo;
 import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
 
diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/mapper/SisAuthGroupRefMapper.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/mapper/SisAuthGroupRefMapper.java
index 42cf832a..c411b774 100644
--- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/mapper/SisAuthGroupRefMapper.java
+++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/mapper/SisAuthGroupRefMapper.java
@@ -1,7 +1,7 @@
 package org.dromara.sis.mapper;
 
 import org.apache.ibatis.annotations.Mapper;
-import org.dromara.sis.domain.SisAuthGroupRef;
+import org.dromara.sis.domain.entity.SisAuthGroupRef;
 import org.dromara.sis.domain.vo.SisAuthGroupRefVo;
 import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
 
diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/mapper/SisAuthRecordMapper.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/mapper/SisAuthRecordMapper.java
index 32775288..751a0a19 100644
--- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/mapper/SisAuthRecordMapper.java
+++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/mapper/SisAuthRecordMapper.java
@@ -1,7 +1,7 @@
 package org.dromara.sis.mapper;
 
 import org.apache.ibatis.annotations.Mapper;
-import org.dromara.sis.domain.SisAuthRecord;
+import org.dromara.sis.domain.entity.SisAuthRecord;
 import org.dromara.sis.domain.vo.SisAuthRecordVo;
 import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
 
diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/mapper/SisDataSyncMapper.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/mapper/SisDataSyncMapper.java
index 463b07d0..9296fd34 100644
--- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/mapper/SisDataSyncMapper.java
+++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/mapper/SisDataSyncMapper.java
@@ -1,7 +1,7 @@
 package org.dromara.sis.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.dromara.sis.domain.SisAlarmEvents;
+import org.dromara.sis.domain.entity.SisAlarmEvents;
 
 public interface SisDataSyncMapper extends BaseMapper<SisAlarmEvents> {
 }
diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/mapper/SisDeviceBindRefMapper.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/mapper/SisDeviceBindRefMapper.java
index 09a8a2d7..4d46b028 100644
--- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/mapper/SisDeviceBindRefMapper.java
+++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/mapper/SisDeviceBindRefMapper.java
@@ -1,6 +1,6 @@
 package org.dromara.sis.mapper;
 
-import org.dromara.sis.domain.SisDeviceBindRef;
+import org.dromara.sis.domain.entity.SisDeviceBindRef;
 import org.dromara.sis.domain.vo.SisDeviceBindRefVo;
 import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
 
diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/mapper/SisDeviceChannelMapper.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/mapper/SisDeviceChannelMapper.java
index 7f7c33b9..5472d08f 100644
--- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/mapper/SisDeviceChannelMapper.java
+++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/mapper/SisDeviceChannelMapper.java
@@ -2,7 +2,8 @@ package org.dromara.sis.mapper;
 
 import org.apache.ibatis.annotations.Param;
 import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
-import org.dromara.sis.domain.SisDeviceChannel;
+import org.dromara.sis.domain.entity.SisDeviceChannel;
+import org.dromara.sis.domain.vo.DeviceStateStatistics;
 import org.dromara.sis.domain.vo.SisDeviceChannelVo;
 
 /**
@@ -14,4 +15,6 @@ import org.dromara.sis.domain.vo.SisDeviceChannelVo;
 public interface SisDeviceChannelMapper extends BaseMapperPlus<SisDeviceChannel, SisDeviceChannelVo> {
 
     SisDeviceChannel queryChannels(@Param("deviceIp") String deviceIp, @Param("channelNo") String channelNo);
+
+    DeviceStateStatistics statisticsDeviceState(int type);
 }
diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/mapper/SisDeviceGroupMapper.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/mapper/SisDeviceGroupMapper.java
index 0a0ec601..8c0116cd 100644
--- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/mapper/SisDeviceGroupMapper.java
+++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/mapper/SisDeviceGroupMapper.java
@@ -1,6 +1,6 @@
 package org.dromara.sis.mapper;
 
-import org.dromara.sis.domain.SisDeviceGroup;
+import org.dromara.sis.domain.entity.SisDeviceGroup;
 import org.dromara.sis.domain.vo.SisDeviceGroupVo;
 import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
 
diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/mapper/SisDeviceManageMapper.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/mapper/SisDeviceManageMapper.java
index f70b28da..c7cc89dd 100644
--- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/mapper/SisDeviceManageMapper.java
+++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/mapper/SisDeviceManageMapper.java
@@ -2,7 +2,7 @@ package org.dromara.sis.mapper;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.apache.ibatis.annotations.Param;
-import org.dromara.sis.domain.SisDeviceManage;
+import org.dromara.sis.domain.entity.SisDeviceManage;
 import org.dromara.sis.domain.bo.SisDeviceManageBo;
 import org.dromara.sis.domain.vo.SisDeviceManageVo;
 import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/mapper/SisDevicePointMapper.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/mapper/SisDevicePointMapper.java
index dbd6c393..5ef0a6cb 100644
--- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/mapper/SisDevicePointMapper.java
+++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/mapper/SisDevicePointMapper.java
@@ -1,6 +1,6 @@
 package org.dromara.sis.mapper;
 
-import org.dromara.sis.domain.SisDevicePoint;
+import org.dromara.sis.domain.entity.SisDevicePoint;
 import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
 import org.dromara.sis.domain.vo.SisDevicePointVo;
 
diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/mapper/SisEEightRefMapper.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/mapper/SisEEightRefMapper.java
index 090a6be1..2762d297 100644
--- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/mapper/SisEEightRefMapper.java
+++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/mapper/SisEEightRefMapper.java
@@ -1,6 +1,6 @@
 package org.dromara.sis.mapper;
 
-import org.dromara.sis.domain.SisEEightRef;
+import org.dromara.sis.domain.entity.SisEEightRef;
 import org.dromara.sis.domain.vo.SisEEightRefVo;
 import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
 
diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/mapper/SisElevatorFloorChannelRefMapper.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/mapper/SisElevatorFloorChannelRefMapper.java
index 27ce7a9b..052874b0 100644
--- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/mapper/SisElevatorFloorChannelRefMapper.java
+++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/mapper/SisElevatorFloorChannelRefMapper.java
@@ -1,7 +1,7 @@
 package org.dromara.sis.mapper;
 
 import org.apache.ibatis.annotations.Mapper;
-import org.dromara.sis.domain.SisElevatorFloorChannelRef;
+import org.dromara.sis.domain.entity.SisElevatorFloorChannelRef;
 import org.dromara.sis.domain.vo.SisElevatorFloorChannelRefVo;
 import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
 
diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/mapper/SisElevatorFloorRefMapper.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/mapper/SisElevatorFloorRefMapper.java
index c2fecf47..c68903db 100644
--- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/mapper/SisElevatorFloorRefMapper.java
+++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/mapper/SisElevatorFloorRefMapper.java
@@ -1,7 +1,7 @@
 package org.dromara.sis.mapper;
 
 import org.apache.ibatis.annotations.Mapper;
-import org.dromara.sis.domain.SisElevatorFloorRef;
+import org.dromara.sis.domain.entity.SisElevatorFloorRef;
 import org.dromara.sis.domain.vo.SisElevatorFloorRefVo;
 import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
 
diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/mapper/SisElevatorInfoMapper.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/mapper/SisElevatorInfoMapper.java
index daf43e0b..5d64215b 100644
--- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/mapper/SisElevatorInfoMapper.java
+++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/mapper/SisElevatorInfoMapper.java
@@ -1,7 +1,7 @@
 package org.dromara.sis.mapper;
 
 import org.apache.ibatis.annotations.Mapper;
-import org.dromara.sis.domain.SisElevatorInfo;
+import org.dromara.sis.domain.entity.SisElevatorInfo;
 import org.dromara.sis.domain.vo.SisElevatorInfoVo;
 import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
 
diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/mapper/SisLibDeviceImgRefMapper.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/mapper/SisLibDeviceImgRefMapper.java
index 02dd47fa..47ac3cb2 100644
--- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/mapper/SisLibDeviceImgRefMapper.java
+++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/mapper/SisLibDeviceImgRefMapper.java
@@ -1,6 +1,6 @@
 package org.dromara.sis.mapper;
 
-import org.dromara.sis.domain.SisLibDeviceImgRef;
+import org.dromara.sis.domain.entity.SisLibDeviceImgRef;
 import org.dromara.sis.domain.vo.SisLibDeviceImgRefVo;
 import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
 
diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/mapper/SisLibDeviceRefMapper.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/mapper/SisLibDeviceRefMapper.java
index 96e0ce70..68858532 100644
--- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/mapper/SisLibDeviceRefMapper.java
+++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/mapper/SisLibDeviceRefMapper.java
@@ -1,7 +1,7 @@
 package org.dromara.sis.mapper;
 
 import org.apache.ibatis.annotations.Param;
-import org.dromara.sis.domain.SisLibDeviceRef;
+import org.dromara.sis.domain.entity.SisLibDeviceRef;
 import org.dromara.sis.domain.bo.AccessControlLibDeviceBo;
 import org.dromara.sis.domain.vo.SisLibDeviceRefVo;
 import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/mapper/SisLibImgRefMapper.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/mapper/SisLibImgRefMapper.java
index 1fd6e0e3..dade6d06 100644
--- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/mapper/SisLibImgRefMapper.java
+++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/mapper/SisLibImgRefMapper.java
@@ -1,6 +1,6 @@
 package org.dromara.sis.mapper;
 
-import org.dromara.sis.domain.SisLibImgRef;
+import org.dromara.sis.domain.entity.SisLibImgRef;
 import org.dromara.sis.domain.vo.SisLibImgRefVo;
 import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
 
diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/mapper/SisPersonLibImgMapper.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/mapper/SisPersonLibImgMapper.java
index 0739cebb..a3e0d43b 100644
--- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/mapper/SisPersonLibImgMapper.java
+++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/mapper/SisPersonLibImgMapper.java
@@ -1,7 +1,7 @@
 package org.dromara.sis.mapper;
 
 import org.apache.ibatis.annotations.Mapper;
-import org.dromara.sis.domain.SisPersonLibImg;
+import org.dromara.sis.domain.entity.SisPersonLibImg;
 import org.dromara.sis.domain.vo.SisPersonLibImgVo;
 import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
 
diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/mapper/SisPersonLibMapper.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/mapper/SisPersonLibMapper.java
index 40cdf676..4c38894e 100644
--- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/mapper/SisPersonLibMapper.java
+++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/mapper/SisPersonLibMapper.java
@@ -1,6 +1,6 @@
 package org.dromara.sis.mapper;
 
-import org.dromara.sis.domain.SisPersonLib;
+import org.dromara.sis.domain.entity.SisPersonLib;
 import org.dromara.sis.domain.vo.SisPersonLibVo;
 import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
 
diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/mapper/TbFactoryMapper.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/mapper/TbFactoryMapper.java
index 8718d0b9..03e9d28d 100644
--- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/mapper/TbFactoryMapper.java
+++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/mapper/TbFactoryMapper.java
@@ -2,7 +2,7 @@ package org.dromara.sis.mapper;
 
 import org.apache.ibatis.annotations.Mapper;
 import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
-import org.dromara.sis.domain.TbFactory;
+import org.dromara.sis.domain.entity.TbFactory;
 import org.dromara.sis.domain.vo.TbFactoryVo;
 
 /**
diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/runner/HikDeviceApplicationRunner.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/runner/HikDeviceApplicationRunner.java
index 12f6c9af..064b3eae 100644
--- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/runner/HikDeviceApplicationRunner.java
+++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/runner/HikDeviceApplicationRunner.java
@@ -9,7 +9,7 @@ import org.apache.dubbo.config.annotation.DubboReference;
 import org.dromara.common.core.utils.SpringUtils;
 import org.dromara.property.api.RemoteFloorService;
 import org.dromara.property.api.domain.vo.RemoteFloorVo;
-import org.dromara.sis.domain.SisDeviceManage;
+import org.dromara.sis.domain.entity.SisDeviceManage;
 import org.dromara.sis.domain.vo.SisElevatorInfoVo;
 import org.dromara.sis.sdk.hik.HikApiService;
 import org.dromara.sis.service.ISisDeviceManageService;
diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/zkmedia/MediaServiceImpl.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/zkmedia/MediaServiceImpl.java
index 70ccf193..6d881229 100644
--- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/zkmedia/MediaServiceImpl.java
+++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/zkmedia/MediaServiceImpl.java
@@ -6,7 +6,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.dromara.sis.api.enums.FactoryNoEnum;
 import org.dromara.sis.config.HikEqpConfig;
 import org.dromara.sis.config.ZLMediaKitConfig;
-import org.dromara.sis.domain.SisDeviceChannel;
+import org.dromara.sis.domain.entity.SisDeviceChannel;
 import org.dromara.sis.sdk.hik.HikApiService;
 import org.dromara.sis.sdk.hik.PlayBackBo;
 import org.dromara.sis.sdk.zkmedia.model.*;
diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/AlarmRecordService.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/AlarmRecordService.java
index ab9631fb..76f5ffaf 100644
--- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/AlarmRecordService.java
+++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/AlarmRecordService.java
@@ -2,7 +2,7 @@ package org.dromara.sis.service;
 
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import org.dromara.sis.domain.AlarmRecord;
+import org.dromara.sis.domain.entity.AlarmRecord;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.List;
diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/AlarmTaskOperatorService.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/AlarmTaskOperatorService.java
index 8faac488..736a4f0a 100644
--- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/AlarmTaskOperatorService.java
+++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/AlarmTaskOperatorService.java
@@ -2,7 +2,7 @@ package org.dromara.sis.service;
 
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import org.dromara.sis.domain.AlarmTaskOperator;
+import org.dromara.sis.domain.entity.AlarmTaskOperator;
 import org.springframework.transaction.annotation.Transactional;
 
 
diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/ISisAcDeviceRefService.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/ISisAcDeviceRefService.java
index 86b00b93..6c23b119 100644
--- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/ISisAcDeviceRefService.java
+++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/ISisAcDeviceRefService.java
@@ -2,8 +2,7 @@ package org.dromara.sis.service;
 
 import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
-import org.dromara.sis.domain.SisAcDeviceRef;
-import org.dromara.sis.domain.SisDeviceManage;
+import org.dromara.sis.domain.entity.SisAcDeviceRef;
 import org.dromara.sis.domain.bo.SisAcDeviceRefBo;
 import org.dromara.sis.domain.model.SisAcDevice;
 import org.dromara.sis.domain.vo.SisAcDeviceRefVo;
diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/ISisAlarmEventAttachmentsService.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/ISisAlarmEventAttachmentsService.java
index 53bfbeb9..c6db13cd 100644
--- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/ISisAlarmEventAttachmentsService.java
+++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/ISisAlarmEventAttachmentsService.java
@@ -2,7 +2,7 @@ package org.dromara.sis.service;
 
 import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
-import org.dromara.sis.domain.SisAlarmEventAttachments;
+import org.dromara.sis.domain.entity.SisAlarmEventAttachments;
 import org.dromara.sis.domain.bo.SisAlarmEventAttachmentsBo;
 import org.dromara.sis.domain.vo.SisAlarmEventAttachmentsVo;
 
diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/ISisAlarmEventProcessService.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/ISisAlarmEventProcessService.java
index db91d49a..5b48445d 100644
--- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/ISisAlarmEventProcessService.java
+++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/ISisAlarmEventProcessService.java
@@ -2,7 +2,7 @@ package org.dromara.sis.service;
 
 import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
-import org.dromara.sis.domain.SisAlarmEventProcess;
+import org.dromara.sis.domain.entity.SisAlarmEventProcess;
 import org.dromara.sis.domain.bo.SisAlarmEventProcessBo;
 import org.dromara.sis.domain.vo.SisAlarmEventProcessVo;
 
diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/ISisAlarmEventsService.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/ISisAlarmEventsService.java
index 5b386a3e..b722efd1 100644
--- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/ISisAlarmEventsService.java
+++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/ISisAlarmEventsService.java
@@ -3,7 +3,7 @@ package org.dromara.sis.service;
 import org.dromara.common.core.domain.TreeNode;
 import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
-import org.dromara.sis.domain.SisAlarmEvents;
+import org.dromara.sis.domain.entity.SisAlarmEvents;
 import org.dromara.sis.domain.bo.SisAlarmEventsBo;
 import org.dromara.sis.domain.bo.alarm.AlarmAssignmentBo;
 import org.dromara.sis.domain.bo.alarm.AlarmCompleteBo;
diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/ISisAuthGroupService.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/ISisAuthGroupService.java
index 202d36ab..37f44842 100644
--- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/ISisAuthGroupService.java
+++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/ISisAuthGroupService.java
@@ -1,6 +1,5 @@
 package org.dromara.sis.service;
 
-import org.dromara.sis.domain.SisAuthGroup;
 import org.dromara.sis.domain.vo.SisAuthGroupVo;
 import org.dromara.sis.domain.bo.SisAuthGroupBo;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/ISisDeviceBindRefService.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/ISisDeviceBindRefService.java
index 8b04d92c..dcb80788 100644
--- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/ISisDeviceBindRefService.java
+++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/ISisDeviceBindRefService.java
@@ -2,7 +2,7 @@ package org.dromara.sis.service;
 
 import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
-import org.dromara.sis.domain.SisDeviceBindRef;
+import org.dromara.sis.domain.entity.SisDeviceBindRef;
 import org.dromara.sis.domain.bo.SisDeviceBindRefBo;
 import org.dromara.sis.domain.vo.SisDeviceBindRefVo;
 
diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/ISisDeviceChannelService.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/ISisDeviceChannelService.java
index 360dce23..233444bf 100644
--- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/ISisDeviceChannelService.java
+++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/ISisDeviceChannelService.java
@@ -4,9 +4,10 @@ import jakarta.validation.constraints.NotEmpty;
 import org.dromara.common.core.domain.TreeNode;
 import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
-import org.dromara.sis.domain.SisDeviceChannel;
 import org.dromara.sis.domain.bo.SisDeviceChannelBo;
 import org.dromara.sis.domain.bo.SisDeviceManageBo;
+import org.dromara.sis.domain.entity.SisDeviceChannel;
+import org.dromara.sis.domain.vo.DeviceStateStatistics;
 import org.dromara.sis.domain.vo.SisDeviceChannelVo;
 
 import java.util.Collection;
@@ -146,4 +147,11 @@ public interface ISisDeviceChannelService {
      * @return 返回通道信息
      */
     SisDeviceChannel queryByNvrIpAndChannelNo(String deviceIp, Integer channelNo);
+
+    /**
+     * 根据设备类型统计设备在线情况
+     * @param type 设备类型
+     * @return 返回统计结果
+     */
+    DeviceStateStatistics statisticsDeviceState(int type);
 }
diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/ISisDeviceGroupService.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/ISisDeviceGroupService.java
index f4d468cf..172a9282 100644
--- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/ISisDeviceGroupService.java
+++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/ISisDeviceGroupService.java
@@ -1,6 +1,5 @@
 package org.dromara.sis.service;
 
-import org.dromara.sis.domain.SisDeviceGroup;
 import org.dromara.sis.domain.vo.SisDeviceGroupVo;
 import org.dromara.sis.domain.bo.SisDeviceGroupBo;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/ISisDeviceManageService.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/ISisDeviceManageService.java
index 745faef2..34b500b0 100644
--- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/ISisDeviceManageService.java
+++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/ISisDeviceManageService.java
@@ -3,8 +3,7 @@ package org.dromara.sis.service;
 import org.dromara.common.core.domain.TreeNode;
 import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
-import org.dromara.sis.api.domain.RemoteSisDeviceManage;
-import org.dromara.sis.domain.SisDeviceManage;
+import org.dromara.sis.domain.entity.SisDeviceManage;
 import org.dromara.sis.domain.bo.SisDeviceManageBo;
 import org.dromara.sis.domain.vo.SisDeviceManageVo;
 
diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/ISisDevicePointService.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/ISisDevicePointService.java
index b9afc805..c4857085 100644
--- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/ISisDevicePointService.java
+++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/ISisDevicePointService.java
@@ -1,6 +1,5 @@
 package org.dromara.sis.service;
 
-import org.dromara.sis.domain.SisDevicePoint;
 import org.dromara.sis.domain.vo.SisDevicePointVo;
 import org.dromara.sis.domain.bo.SisDevicePointBo;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/ISisElevatorFloorChannelRefService.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/ISisElevatorFloorChannelRefService.java
index c48676bb..cc8d514c 100644
--- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/ISisElevatorFloorChannelRefService.java
+++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/ISisElevatorFloorChannelRefService.java
@@ -1,6 +1,6 @@
 package org.dromara.sis.service;
 
-import org.dromara.sis.domain.SisElevatorFloorChannelRef;
+import org.dromara.sis.domain.entity.SisElevatorFloorChannelRef;
 import org.dromara.sis.domain.vo.SisElevatorFloorChannelRefVo;
 import org.dromara.sis.domain.bo.SisElevatorFloorChannelRefBo;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/ISisElevatorFloorRefService.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/ISisElevatorFloorRefService.java
index cad946f1..98959fb5 100644
--- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/ISisElevatorFloorRefService.java
+++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/ISisElevatorFloorRefService.java
@@ -1,6 +1,6 @@
 package org.dromara.sis.service;
 
-import org.dromara.sis.domain.SisElevatorFloorChannelRef;
+import org.dromara.sis.domain.entity.SisElevatorFloorChannelRef;
 import org.dromara.sis.domain.vo.SisElevatorFloorRefVo;
 import org.dromara.sis.domain.bo.SisElevatorFloorRefBo;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/ISisLibDeviceRefService.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/ISisLibDeviceRefService.java
index f04edb1b..18ba1f38 100644
--- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/ISisLibDeviceRefService.java
+++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/ISisLibDeviceRefService.java
@@ -2,7 +2,7 @@ package org.dromara.sis.service;
 
 import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
-import org.dromara.sis.domain.SisLibDeviceRef;
+import org.dromara.sis.domain.entity.SisLibDeviceRef;
 import org.dromara.sis.domain.bo.AccessControlLibDeviceBo;
 import org.dromara.sis.domain.bo.SisLibDeviceRefBo;
 import org.dromara.sis.domain.vo.SisLibDeviceRefVo;
diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/ISisLibImgRefService.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/ISisLibImgRefService.java
index 3168a7b0..9f53b068 100644
--- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/ISisLibImgRefService.java
+++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/ISisLibImgRefService.java
@@ -1,6 +1,6 @@
 package org.dromara.sis.service;
 
-import org.dromara.sis.domain.SisLibImgRef;
+import org.dromara.sis.domain.entity.SisLibImgRef;
 import org.dromara.sis.domain.vo.SisLibImgRefVo;
 import org.dromara.sis.domain.bo.SisLibImgRefBo;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/AlarmRecordServiceImpl.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/AlarmRecordServiceImpl.java
index b4cf0382..3fbac564 100644
--- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/AlarmRecordServiceImpl.java
+++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/AlarmRecordServiceImpl.java
@@ -5,8 +5,8 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 
 import lombok.extern.slf4j.Slf4j;
-import org.dromara.sis.domain.AlarmRecord;
-import org.dromara.sis.domain.AlarmTaskOperator;
+import org.dromara.sis.domain.entity.AlarmRecord;
+import org.dromara.sis.domain.entity.AlarmTaskOperator;
 import org.dromara.sis.mapper.AlarmRecordMapper;
 import org.dromara.sis.service.AlarmRecordService;
 import org.dromara.sis.service.AlarmTaskOperatorService;
diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/AlarmTaskOperatorServiceImpl.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/AlarmTaskOperatorServiceImpl.java
index 053102b2..dd9b012a 100644
--- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/AlarmTaskOperatorServiceImpl.java
+++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/AlarmTaskOperatorServiceImpl.java
@@ -3,7 +3,7 @@ package org.dromara.sis.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import lombok.extern.slf4j.Slf4j;
-import org.dromara.sis.domain.AlarmTaskOperator;
+import org.dromara.sis.domain.entity.AlarmTaskOperator;
 import org.dromara.sis.mapper.AlarmTaskOperatorMapper;
 import org.dromara.sis.service.AlarmTaskOperatorService;
 import org.springframework.stereotype.Service;
diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/EventAlarmReportServiceImpl.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/EventAlarmReportServiceImpl.java
index de931050..7d678cf7 100644
--- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/EventAlarmReportServiceImpl.java
+++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/EventAlarmReportServiceImpl.java
@@ -13,7 +13,7 @@ import org.dromara.property.api.RemoteAttendanceService;
 import org.dromara.property.api.RemoteFloorService;
 import org.dromara.property.api.domain.vo.RemoteAttendanceUserGroupVo;
 import org.dromara.property.api.domain.vo.RemoteFloorVo;
-import org.dromara.sis.domain.SisAlarmEvents;
+import org.dromara.sis.domain.entity.SisAlarmEvents;
 import org.dromara.sis.domain.bo.alarm.AlarmAssignmentBo;
 import org.dromara.sis.domain.enums.ControlTypeEnum;
 import org.dromara.sis.domain.enums.EventSmallTypeEnum;
diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/SisAcDeviceRefServiceImpl.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/SisAcDeviceRefServiceImpl.java
index 74b05459..bd2a2883 100644
--- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/SisAcDeviceRefServiceImpl.java
+++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/SisAcDeviceRefServiceImpl.java
@@ -8,8 +8,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.dromara.common.core.utils.MapstructUtils;
 import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
-import org.dromara.sis.domain.SisAcDeviceRef;
-import org.dromara.sis.domain.SisDeviceManage;
+import org.dromara.sis.domain.entity.SisAcDeviceRef;
 import org.dromara.sis.domain.bo.SisAcDeviceRefBo;
 import org.dromara.sis.domain.model.SisAcDevice;
 import org.dromara.sis.domain.vo.SisAcDeviceRefVo;
diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/SisAccessControlServiceImpl.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/SisAccessControlServiceImpl.java
index e9d54e02..64c01d9a 100644
--- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/SisAccessControlServiceImpl.java
+++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/SisAccessControlServiceImpl.java
@@ -16,9 +16,9 @@ import org.dromara.common.core.utils.TreeUtils;
 import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
 import org.dromara.property.api.RemoteFloorService;
-import org.dromara.sis.domain.SisAcDeviceRef;
-import org.dromara.sis.domain.SisAccessControl;
-import org.dromara.sis.domain.SisDeviceBindRef;
+import org.dromara.sis.domain.entity.SisAcDeviceRef;
+import org.dromara.sis.domain.entity.SisAccessControl;
+import org.dromara.sis.domain.entity.SisDeviceBindRef;
 import org.dromara.sis.domain.bo.SisAccessControlBo;
 import org.dromara.sis.domain.enums.ControlTypeEnum;
 import org.dromara.sis.domain.model.SisAcDevice;
diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/SisAlarmEventAttachmentsServiceImpl.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/SisAlarmEventAttachmentsServiceImpl.java
index 8af6a7db..f4a65225 100644
--- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/SisAlarmEventAttachmentsServiceImpl.java
+++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/SisAlarmEventAttachmentsServiceImpl.java
@@ -8,7 +8,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.dromara.common.core.utils.MapstructUtils;
 import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
-import org.dromara.sis.domain.SisAlarmEventAttachments;
+import org.dromara.sis.domain.entity.SisAlarmEventAttachments;
 import org.dromara.sis.domain.bo.SisAlarmEventAttachmentsBo;
 import org.dromara.sis.domain.vo.SisAlarmEventAttachmentsVo;
 import org.dromara.sis.mapper.SisAlarmEventAttachmentsMapper;
diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/SisAlarmEventProcessServiceImpl.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/SisAlarmEventProcessServiceImpl.java
index a6eeb1c5..9606c86e 100644
--- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/SisAlarmEventProcessServiceImpl.java
+++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/SisAlarmEventProcessServiceImpl.java
@@ -9,7 +9,7 @@ import org.dromara.common.core.utils.MapstructUtils;
 import org.dromara.common.core.utils.StringUtils;
 import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
-import org.dromara.sis.domain.SisAlarmEventProcess;
+import org.dromara.sis.domain.entity.SisAlarmEventProcess;
 import org.dromara.sis.domain.bo.SisAlarmEventProcessBo;
 import org.dromara.sis.domain.vo.SisAlarmEventAttachmentsVo;
 import org.dromara.sis.domain.vo.SisAlarmEventProcessVo;
diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/SisAlarmEventsServiceImpl.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/SisAlarmEventsServiceImpl.java
index ad02e492..211cc790 100644
--- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/SisAlarmEventsServiceImpl.java
+++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/SisAlarmEventsServiceImpl.java
@@ -24,10 +24,10 @@ import org.dromara.property.api.RemoteAttendanceService;
 import org.dromara.property.api.domain.vo.RemoteAttendanceUserGroupVo;
 import org.dromara.resource.api.RemoteFileService;
 import org.dromara.resource.api.domain.RemoteFile;
-import org.dromara.sis.domain.SisAlarmEventAttachments;
-import org.dromara.sis.domain.SisAlarmEventProcess;
-import org.dromara.sis.domain.SisAlarmEvents;
-import org.dromara.sis.domain.SisDeviceManage;
+import org.dromara.sis.domain.entity.SisAlarmEventAttachments;
+import org.dromara.sis.domain.entity.SisAlarmEventProcess;
+import org.dromara.sis.domain.entity.SisAlarmEvents;
+import org.dromara.sis.domain.entity.SisDeviceManage;
 import org.dromara.sis.domain.bo.SisAlarmEventsBo;
 import org.dromara.sis.domain.bo.alarm.AlarmAssignmentBo;
 import org.dromara.sis.domain.bo.alarm.AlarmCompleteBo;
diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/SisAuthGroupRefServiceImpl.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/SisAuthGroupRefServiceImpl.java
index 605a381f..bef3889e 100644
--- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/SisAuthGroupRefServiceImpl.java
+++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/SisAuthGroupRefServiceImpl.java
@@ -20,7 +20,7 @@ import org.dromara.sis.service.ISisElevatorInfoService;
 import org.springframework.stereotype.Service;
 import org.dromara.sis.domain.bo.SisAuthGroupRefBo;
 import org.dromara.sis.domain.vo.SisAuthGroupRefVo;
-import org.dromara.sis.domain.SisAuthGroupRef;
+import org.dromara.sis.domain.entity.SisAuthGroupRef;
 import org.dromara.sis.mapper.SisAuthGroupRefMapper;
 import org.dromara.sis.service.ISisAuthGroupRefService;
 import org.springframework.transaction.annotation.Transactional;
diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/SisAuthGroupServiceImpl.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/SisAuthGroupServiceImpl.java
index 880cd7b0..234a125b 100644
--- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/SisAuthGroupServiceImpl.java
+++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/SisAuthGroupServiceImpl.java
@@ -10,14 +10,13 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.dromara.sis.domain.SisElevatorFloorRef;
 import org.dromara.sis.domain.vo.SisAuthGroupRefVo;
 import org.dromara.sis.domain.vo.SisElevatorFloorRefVo;
 import org.dromara.sis.service.*;
 import org.springframework.stereotype.Service;
 import org.dromara.sis.domain.bo.SisAuthGroupBo;
 import org.dromara.sis.domain.vo.SisAuthGroupVo;
-import org.dromara.sis.domain.SisAuthGroup;
+import org.dromara.sis.domain.entity.SisAuthGroup;
 import org.dromara.sis.mapper.SisAuthGroupMapper;
 import org.springframework.transaction.annotation.Transactional;
 
diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/SisAuthRecordServiceImpl.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/SisAuthRecordServiceImpl.java
index 4f2feb61..1bf055bc 100644
--- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/SisAuthRecordServiceImpl.java
+++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/SisAuthRecordServiceImpl.java
@@ -27,7 +27,7 @@ import org.dromara.sis.service.*;
 import org.springframework.stereotype.Service;
 import org.dromara.sis.domain.bo.SisAuthRecordBo;
 import org.dromara.sis.domain.vo.SisAuthRecordVo;
-import org.dromara.sis.domain.SisAuthRecord;
+import org.dromara.sis.domain.entity.SisAuthRecord;
 import org.dromara.sis.mapper.SisAuthRecordMapper;
 import org.springframework.transaction.annotation.Transactional;
 
diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/SisDeviceBindRefServiceImpl.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/SisDeviceBindRefServiceImpl.java
index 7c1f6bd5..e990aac3 100644
--- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/SisDeviceBindRefServiceImpl.java
+++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/SisDeviceBindRefServiceImpl.java
@@ -9,7 +9,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.dromara.common.core.utils.MapstructUtils;
 import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
-import org.dromara.sis.domain.SisDeviceBindRef;
+import org.dromara.sis.domain.entity.SisDeviceBindRef;
 import org.dromara.sis.domain.bo.SisDeviceBindRefBo;
 import org.dromara.sis.domain.vo.SisDeviceBindRefVo;
 import org.dromara.sis.mapper.SisDeviceBindRefMapper;
diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/SisDeviceChannelServiceImpl.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/SisDeviceChannelServiceImpl.java
index 354644a1..3c7c8aac 100644
--- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/SisDeviceChannelServiceImpl.java
+++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/SisDeviceChannelServiceImpl.java
@@ -15,9 +15,10 @@ import org.dromara.common.core.utils.TreeUtils;
 import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
 import org.dromara.sis.api.enums.DeviceTypeEnum;
-import org.dromara.sis.domain.SisDeviceChannel;
+import org.dromara.sis.domain.entity.SisDeviceChannel;
 import org.dromara.sis.domain.bo.SisDeviceChannelBo;
 import org.dromara.sis.domain.bo.SisDeviceManageBo;
+import org.dromara.sis.domain.vo.DeviceStateStatistics;
 import org.dromara.sis.domain.vo.SisDeviceChannelVo;
 import org.dromara.sis.domain.vo.SisDeviceGroupVo;
 import org.dromara.sis.mapper.SisDeviceChannelMapper;
@@ -345,4 +346,9 @@ public class SisDeviceChannelServiceImpl implements ISisDeviceChannelService {
         lqw.eq(SisDeviceChannel::getNvrChannelNo, channelNo);
         return baseMapper.selectOne(lqw);
     }
+
+    @Override
+    public DeviceStateStatistics statisticsDeviceState(int type) {
+        return baseMapper.statisticsDeviceState(type);
+    }
 }
diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/SisDeviceGroupServiceImpl.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/SisDeviceGroupServiceImpl.java
index 4c3ab3f7..fb3b1f77 100644
--- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/SisDeviceGroupServiceImpl.java
+++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/SisDeviceGroupServiceImpl.java
@@ -12,7 +12,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 import org.dromara.sis.domain.bo.SisDeviceGroupBo;
 import org.dromara.sis.domain.vo.SisDeviceGroupVo;
-import org.dromara.sis.domain.SisDeviceGroup;
+import org.dromara.sis.domain.entity.SisDeviceGroup;
 import org.dromara.sis.mapper.SisDeviceGroupMapper;
 import org.dromara.sis.service.ISisDeviceGroupService;
 
diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/SisDeviceManageServiceImpl.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/SisDeviceManageServiceImpl.java
index 16e0cc68..01e7be9d 100644
--- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/SisDeviceManageServiceImpl.java
+++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/SisDeviceManageServiceImpl.java
@@ -13,9 +13,8 @@ import org.dromara.common.core.utils.SpringUtils;
 import org.dromara.common.core.utils.StringUtils;
 import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
-import org.dromara.sis.api.domain.RemoteSisDeviceManage;
 import org.dromara.sis.api.enums.FactoryNoEnum;
-import org.dromara.sis.domain.SisDeviceManage;
+import org.dromara.sis.domain.entity.SisDeviceManage;
 import org.dromara.sis.domain.bo.SisDeviceManageBo;
 import org.dromara.sis.domain.vo.SisDeviceManageVo;
 import org.dromara.sis.mapper.SisDeviceManageMapper;
diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/SisDevicePointServiceImpl.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/SisDevicePointServiceImpl.java
index 90109c0d..ab4f268a 100644
--- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/SisDevicePointServiceImpl.java
+++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/SisDevicePointServiceImpl.java
@@ -12,7 +12,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 import org.dromara.sis.domain.bo.SisDevicePointBo;
 import org.dromara.sis.domain.vo.SisDevicePointVo;
-import org.dromara.sis.domain.SisDevicePoint;
+import org.dromara.sis.domain.entity.SisDevicePoint;
 import org.dromara.sis.mapper.SisDevicePointMapper;
 import org.dromara.sis.service.ISisDevicePointService;
 
diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/SisEEightRefServiceImpl.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/SisEEightRefServiceImpl.java
index 7e82e9eb..325542f3 100644
--- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/SisEEightRefServiceImpl.java
+++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/SisEEightRefServiceImpl.java
@@ -9,7 +9,7 @@ import org.dromara.common.core.utils.MapstructUtils;
 import org.dromara.common.core.utils.StringUtils;
 import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
-import org.dromara.sis.domain.SisEEightRef;
+import org.dromara.sis.domain.entity.SisEEightRef;
 import org.dromara.sis.domain.bo.SisEEightRefBo;
 import org.dromara.sis.domain.vo.SisEEightRefVo;
 import org.dromara.sis.mapper.SisEEightRefMapper;
diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/SisElevatorFloorChannelRefServiceImpl.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/SisElevatorFloorChannelRefServiceImpl.java
index e54158cf..e5a254ed 100644
--- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/SisElevatorFloorChannelRefServiceImpl.java
+++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/SisElevatorFloorChannelRefServiceImpl.java
@@ -12,7 +12,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 import org.dromara.sis.domain.bo.SisElevatorFloorChannelRefBo;
 import org.dromara.sis.domain.vo.SisElevatorFloorChannelRefVo;
-import org.dromara.sis.domain.SisElevatorFloorChannelRef;
+import org.dromara.sis.domain.entity.SisElevatorFloorChannelRef;
 import org.dromara.sis.mapper.SisElevatorFloorChannelRefMapper;
 import org.dromara.sis.service.ISisElevatorFloorChannelRefService;
 import org.springframework.transaction.annotation.Transactional;
diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/SisElevatorFloorRefServiceImpl.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/SisElevatorFloorRefServiceImpl.java
index a1253e12..06f5f853 100644
--- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/SisElevatorFloorRefServiceImpl.java
+++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/SisElevatorFloorRefServiceImpl.java
@@ -9,13 +9,13 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.dromara.sis.domain.SisElevatorFloorChannelRef;
+import org.dromara.sis.domain.entity.SisElevatorFloorChannelRef;
 import org.dromara.sis.domain.vo.SisElevatorFloorChannelRefVo;
 import org.dromara.sis.service.ISisElevatorFloorChannelRefService;
 import org.springframework.stereotype.Service;
 import org.dromara.sis.domain.bo.SisElevatorFloorRefBo;
 import org.dromara.sis.domain.vo.SisElevatorFloorRefVo;
-import org.dromara.sis.domain.SisElevatorFloorRef;
+import org.dromara.sis.domain.entity.SisElevatorFloorRef;
 import org.dromara.sis.mapper.SisElevatorFloorRefMapper;
 import org.dromara.sis.service.ISisElevatorFloorRefService;
 import org.springframework.transaction.annotation.Transactional;
diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/SisElevatorInfoServiceImpl.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/SisElevatorInfoServiceImpl.java
index 449cca79..8fec614f 100644
--- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/SisElevatorInfoServiceImpl.java
+++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/SisElevatorInfoServiceImpl.java
@@ -15,9 +15,9 @@ import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
 import org.dromara.property.api.RemoteBuildingService;
 import org.dromara.property.api.domain.vo.RemoteBuildingVo;
-import org.dromara.sis.domain.SisDeviceBindRef;
-import org.dromara.sis.domain.SisElevatorFloorChannelRef;
-import org.dromara.sis.domain.SisElevatorInfo;
+import org.dromara.sis.domain.entity.SisDeviceBindRef;
+import org.dromara.sis.domain.entity.SisElevatorFloorChannelRef;
+import org.dromara.sis.domain.entity.SisElevatorInfo;
 import org.dromara.sis.domain.bo.SisElevatorInfoBo;
 import org.dromara.sis.domain.enums.ControlTypeEnum;
 import org.dromara.sis.domain.vo.SisDeviceManageVo;
diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/SisLibDeviceImgRefServiceImpl.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/SisLibDeviceImgRefServiceImpl.java
index 4f52040a..dd9f32f5 100644
--- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/SisLibDeviceImgRefServiceImpl.java
+++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/SisLibDeviceImgRefServiceImpl.java
@@ -1,7 +1,6 @@
 package org.dromara.sis.service.impl;
 
 import org.dromara.common.core.utils.MapstructUtils;
-import org.dromara.common.core.utils.StringUtils;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
 import org.dromara.common.mybatis.core.page.PageQuery;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -12,7 +11,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 import org.dromara.sis.domain.bo.SisLibDeviceImgRefBo;
 import org.dromara.sis.domain.vo.SisLibDeviceImgRefVo;
-import org.dromara.sis.domain.SisLibDeviceImgRef;
+import org.dromara.sis.domain.entity.SisLibDeviceImgRef;
 import org.dromara.sis.mapper.SisLibDeviceImgRefMapper;
 import org.dromara.sis.service.ISisLibDeviceImgRefService;
 
diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/SisLibDeviceRefServiceImpl.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/SisLibDeviceRefServiceImpl.java
index acbbf81e..8b140838 100644
--- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/SisLibDeviceRefServiceImpl.java
+++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/SisLibDeviceRefServiceImpl.java
@@ -9,7 +9,7 @@ import org.dromara.common.core.utils.MapstructUtils;
 import org.dromara.common.core.utils.StringUtils;
 import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
-import org.dromara.sis.domain.SisLibDeviceRef;
+import org.dromara.sis.domain.entity.SisLibDeviceRef;
 import org.dromara.sis.domain.bo.AccessControlLibDeviceBo;
 import org.dromara.sis.domain.bo.SisLibDeviceRefBo;
 import org.dromara.sis.domain.vo.SisLibDeviceRefVo;
diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/SisLibImgRefServiceImpl.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/SisLibImgRefServiceImpl.java
index 4a0a0c74..681d184e 100644
--- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/SisLibImgRefServiceImpl.java
+++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/SisLibImgRefServiceImpl.java
@@ -2,7 +2,6 @@ package org.dromara.sis.service.impl;
 
 import cn.hutool.core.lang.Assert;
 import org.dromara.common.core.utils.MapstructUtils;
-import org.dromara.common.core.utils.StringUtils;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
 import org.dromara.common.mybatis.core.page.PageQuery;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -13,7 +12,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 import org.dromara.sis.domain.bo.SisLibImgRefBo;
 import org.dromara.sis.domain.vo.SisLibImgRefVo;
-import org.dromara.sis.domain.SisLibImgRef;
+import org.dromara.sis.domain.entity.SisLibImgRef;
 import org.dromara.sis.mapper.SisLibImgRefMapper;
 import org.dromara.sis.service.ISisLibImgRefService;
 import org.springframework.transaction.annotation.Transactional;
diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/SisPersonLibImgServiceImpl.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/SisPersonLibImgServiceImpl.java
index f1c5a5be..d4c65a44 100644
--- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/SisPersonLibImgServiceImpl.java
+++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/SisPersonLibImgServiceImpl.java
@@ -14,10 +14,9 @@ import org.dromara.common.core.utils.StringUtils;
 import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
 import org.dromara.resource.api.RemoteFileService;
-import org.dromara.sis.domain.SisPersonLibImg;
+import org.dromara.sis.domain.entity.SisPersonLibImg;
 import org.dromara.sis.domain.bo.SisPersonLibImgBo;
 import org.dromara.sis.domain.vo.*;
-import org.dromara.sis.dubbo.RemoteSisAuthServiceImpl;
 import org.dromara.sis.mapper.SisPersonLibImgMapper;
 import org.dromara.sis.sdk.huawei.HuaWeiBoxApi;
 import org.dromara.sis.sdk.huawei.domain.AddHWPersonReq;
diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/SisPersonLibServiceImpl.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/SisPersonLibServiceImpl.java
index ed2e26cd..bf6bd476 100644
--- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/SisPersonLibServiceImpl.java
+++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/SisPersonLibServiceImpl.java
@@ -10,7 +10,7 @@ import org.dromara.common.core.utils.MapstructUtils;
 import org.dromara.common.core.utils.StringUtils;
 import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
-import org.dromara.sis.domain.SisPersonLib;
+import org.dromara.sis.domain.entity.SisPersonLib;
 import org.dromara.sis.domain.bo.SisPersonLibBo;
 import org.dromara.sis.domain.vo.SisPersonLibVo;
 import org.dromara.sis.mapper.SisPersonLibMapper;
diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/TbFactoryServiceImpl.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/TbFactoryServiceImpl.java
index 450127ae..ee6fedb8 100644
--- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/TbFactoryServiceImpl.java
+++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/TbFactoryServiceImpl.java
@@ -9,7 +9,7 @@ import org.dromara.common.core.utils.MapstructUtils;
 import org.dromara.common.core.utils.StringUtils;
 import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
-import org.dromara.sis.domain.TbFactory;
+import org.dromara.sis.domain.entity.TbFactory;
 import org.dromara.sis.domain.bo.TbFactoryBo;
 import org.dromara.sis.domain.vo.TbFactoryVo;
 import org.dromara.sis.mapper.TbFactoryMapper;
diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/task/DataSyncTask.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/task/DataSyncTask.java
index c6abb5bd..d9fc3df5 100644
--- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/task/DataSyncTask.java
+++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/task/DataSyncTask.java
@@ -1,11 +1,7 @@
 package org.dromara.sis.task;
 
 import lombok.extern.slf4j.Slf4j;
-import org.apache.dubbo.config.annotation.DubboReference;
-import org.dromara.property.api.RemoteFloorService;
-import org.dromara.property.api.domain.vo.RemoteFloorVo;
-import org.dromara.sis.domain.AlarmRecord;
-import org.dromara.sis.domain.SisAlarmEvents;
+import org.dromara.sis.domain.entity.AlarmRecord;
 import org.dromara.sis.domain.bo.SisAlarmEventsBo;
 import org.dromara.sis.domain.enums.EventBigTypeEnum;
 import org.dromara.sis.domain.enums.EventSmallTypeEnum;
@@ -13,7 +9,6 @@ import org.dromara.sis.service.AlarmRecordService;
 import org.dromara.sis.service.ApiService;
 import org.dromara.sis.service.ISisAlarmEventsService;
 import org.springframework.beans.factory.annotation.Value;
-import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
 
 import java.util.*;
diff --git a/ruoyi-modules/Sis/src/main/resources/mapper/sis/SisDeviceChannelMapper.xml b/ruoyi-modules/Sis/src/main/resources/mapper/sis/SisDeviceChannelMapper.xml
index ced25e96..e911e488 100644
--- a/ruoyi-modules/Sis/src/main/resources/mapper/sis/SisDeviceChannelMapper.xml
+++ b/ruoyi-modules/Sis/src/main/resources/mapper/sis/SisDeviceChannelMapper.xml
@@ -3,8 +3,18 @@
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="org.dromara.sis.mapper.SisDeviceChannelMapper">
+    <select id="statisticsDeviceState" resultType="org.dromara.sis.domain.vo.DeviceStateStatistics">
+        SELECT
+            SUM(IF( device_status = 1, 1, 0 )) `onLine`,
+            SUM( IF ( device_status != 1, 1, 0 ) ) offLine,
+            count( 1 ) total
+        FROM
+            sis_device_manage
+        WHERE
+            device_type = #{type}
+    </select>
 
-    <select id="queryChannels" resultType="org.dromara.sis.domain.SisDeviceChannel">
+    <select id="queryChannels" resultType="org.dromara.sis.domain.entity.SisDeviceChannel">
         SELECT *
         FROM sis_device_channel
         WHERE device_ip = #{deviceIp}