diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/AlarmController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/AlarmController.java
new file mode 100644
index 0000000..1795cf1
--- /dev/null
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/AlarmController.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.modular.system.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.stereotype.Controller;
+
+/**
+ * <p>
+ * 报警记录表 前端控制器
+ * </p>
+ *
+ * @author zyj
+ * @since 2023-05-25
+ */
+@Controller
+@RequestMapping("/system/alarm")
+public class AlarmController {
+
+}

diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/AlarmController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/AlarmController.java
new file mode 100644
index 0000000..1795cf1
--- /dev/null
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/AlarmController.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.modular.system.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.stereotype.Controller;
+
+/**
+ * <p>
+ * 报警记录表 前端控制器
+ * </p>
+ *
+ * @author zyj
+ * @since 2023-05-25
+ */
+@Controller
+@RequestMapping("/system/alarm")
+public class AlarmController {
+
+}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusAlarmController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusAlarmController.java
deleted file mode 100644
index 1f82ebb..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusAlarmController.java
+++ /dev/null
@@ -1,102 +0,0 @@
-package com.casic.missiles.modular.system.controller;
-
-
-import cn.hutool.core.util.ObjectUtil;
-import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.core.base.controller.BaseController;
-import com.casic.missiles.core.page.PageFactory;
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.AlarmUpload;
-import com.casic.missiles.modular.system.dto.DeviceDetailDTO;
-import com.casic.missiles.modular.system.entity.BusAlarm;
-import com.casic.missiles.modular.system.service.IBusAlarmService;
-import io.swagger.annotations.*;
-import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.*;
-
-import org.springframework.stereotype.Controller;
-
-import static com.casic.missiles.model.response.ResponseData.DEFAULT_SUCCESS_MESSAGE;
-import static com.casic.missiles.modular.system.consts.AlarmConst.ALARM_STATUS_MANUAL_CANCEL;
-
-/**
- * <p>
- * 报警记录表 前端控制器
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@Api(tags = "报警管理接口")
-@Controller
-@RequestMapping("/alarm")
-@RequiredArgsConstructor
-public class BusAlarmController extends BaseController {
-
-    private final IBusAlarmService alarmService;
-
-    @ApiOperation("报警上报接口")
-    @PostMapping("/upload")
-    @ResponseBody
-    public Object upload(@RequestBody AlarmUpload alarmUpload){
-        alarmService.alarmUpload(alarmUpload);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("报警列表分页查询")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "workTitle", value = "作业名称",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "projectId", value = "作业ID",dataType = "Long", paramType = "query",example = "0"),
-            @ApiImplicitParam(name = "alarmStatus", value = "报警状态",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "projectState", value = "作业状态",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "alarmType", value = "报警类型",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "alarmStartTime", value = "报警开始时间",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "alarmEndTime", value = "报警结束时间",dataType = "String", paramType = "query")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = BusAlarm.class),
-    })
-    @GetMapping("/listPage")
-    @ResponseBody
-    public Object listPage(String workTitle,Long projectId,String alarmStatus,String projectState,String alarmType,String alarmStartTime,String alarmEndTime){
-        Page<BusAlarm> page = PageFactory.defaultPage();
-        QueryWrapper<BusAlarm> queryWrapper = new QueryWrapper<>();
-        if(StrUtil.isNotEmpty(workTitle)){
-            queryWrapper.like("p.WORK_TITLE",workTitle);
-        }
-        if(ObjectUtil.isNotEmpty(projectId)){
-            queryWrapper.eq("alarm.PROJECT_ID",projectId);
-        }
-        if(StrUtil.isNotEmpty(alarmStatus)){
-            queryWrapper.eq("alarm.ALARM_STATUS",alarmStatus);
-        }
-        if(StrUtil.isNotEmpty(projectState)){
-            queryWrapper.eq("p.PROJECT_STATE",projectState);
-        }
-        if(StrUtil.isNotEmpty(alarmType)){
-            queryWrapper.eq("alarm.ALARM_TYPE",alarmType);
-        }
-        if(StrUtil.isNotEmpty(alarmStartTime)){
-            queryWrapper.ge("alarm.ALARM_TIME",alarmStartTime);
-        }
-        if(StrUtil.isNotEmpty(alarmEndTime)){
-            queryWrapper.le("alarm.ALARM_TIME",alarmEndTime);
-        }
-        page = alarmService.listPage(page,queryWrapper);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-    @ApiOperation("消警")
-    @PostMapping("/cancel")
-    @ResponseBody
-    public Object cancel(@RequestParam("alarmId") Long alarmId){
-        UpdateWrapper<BusAlarm> updateWrapper = new UpdateWrapper<>();
-        updateWrapper.eq("ID",alarmId);
-        updateWrapper.set("ALARM_STATUS",ALARM_STATUS_MANUAL_CANCEL);
-        alarmService.update(updateWrapper);
-        return ResponseData.success();
-    }
-}

diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/AlarmController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/AlarmController.java
new file mode 100644
index 0000000..1795cf1
--- /dev/null
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/AlarmController.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.modular.system.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.stereotype.Controller;
+
+/**
+ * <p>
+ * 报警记录表 前端控制器
+ * </p>
+ *
+ * @author zyj
+ * @since 2023-05-25
+ */
+@Controller
+@RequestMapping("/system/alarm")
+public class AlarmController {
+
+}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusAlarmController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusAlarmController.java
deleted file mode 100644
index 1f82ebb..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusAlarmController.java
+++ /dev/null
@@ -1,102 +0,0 @@
-package com.casic.missiles.modular.system.controller;
-
-
-import cn.hutool.core.util.ObjectUtil;
-import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.core.base.controller.BaseController;
-import com.casic.missiles.core.page.PageFactory;
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.AlarmUpload;
-import com.casic.missiles.modular.system.dto.DeviceDetailDTO;
-import com.casic.missiles.modular.system.entity.BusAlarm;
-import com.casic.missiles.modular.system.service.IBusAlarmService;
-import io.swagger.annotations.*;
-import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.*;
-
-import org.springframework.stereotype.Controller;
-
-import static com.casic.missiles.model.response.ResponseData.DEFAULT_SUCCESS_MESSAGE;
-import static com.casic.missiles.modular.system.consts.AlarmConst.ALARM_STATUS_MANUAL_CANCEL;
-
-/**
- * <p>
- * 报警记录表 前端控制器
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@Api(tags = "报警管理接口")
-@Controller
-@RequestMapping("/alarm")
-@RequiredArgsConstructor
-public class BusAlarmController extends BaseController {
-
-    private final IBusAlarmService alarmService;
-
-    @ApiOperation("报警上报接口")
-    @PostMapping("/upload")
-    @ResponseBody
-    public Object upload(@RequestBody AlarmUpload alarmUpload){
-        alarmService.alarmUpload(alarmUpload);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("报警列表分页查询")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "workTitle", value = "作业名称",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "projectId", value = "作业ID",dataType = "Long", paramType = "query",example = "0"),
-            @ApiImplicitParam(name = "alarmStatus", value = "报警状态",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "projectState", value = "作业状态",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "alarmType", value = "报警类型",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "alarmStartTime", value = "报警开始时间",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "alarmEndTime", value = "报警结束时间",dataType = "String", paramType = "query")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = BusAlarm.class),
-    })
-    @GetMapping("/listPage")
-    @ResponseBody
-    public Object listPage(String workTitle,Long projectId,String alarmStatus,String projectState,String alarmType,String alarmStartTime,String alarmEndTime){
-        Page<BusAlarm> page = PageFactory.defaultPage();
-        QueryWrapper<BusAlarm> queryWrapper = new QueryWrapper<>();
-        if(StrUtil.isNotEmpty(workTitle)){
-            queryWrapper.like("p.WORK_TITLE",workTitle);
-        }
-        if(ObjectUtil.isNotEmpty(projectId)){
-            queryWrapper.eq("alarm.PROJECT_ID",projectId);
-        }
-        if(StrUtil.isNotEmpty(alarmStatus)){
-            queryWrapper.eq("alarm.ALARM_STATUS",alarmStatus);
-        }
-        if(StrUtil.isNotEmpty(projectState)){
-            queryWrapper.eq("p.PROJECT_STATE",projectState);
-        }
-        if(StrUtil.isNotEmpty(alarmType)){
-            queryWrapper.eq("alarm.ALARM_TYPE",alarmType);
-        }
-        if(StrUtil.isNotEmpty(alarmStartTime)){
-            queryWrapper.ge("alarm.ALARM_TIME",alarmStartTime);
-        }
-        if(StrUtil.isNotEmpty(alarmEndTime)){
-            queryWrapper.le("alarm.ALARM_TIME",alarmEndTime);
-        }
-        page = alarmService.listPage(page,queryWrapper);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-    @ApiOperation("消警")
-    @PostMapping("/cancel")
-    @ResponseBody
-    public Object cancel(@RequestParam("alarmId") Long alarmId){
-        UpdateWrapper<BusAlarm> updateWrapper = new UpdateWrapper<>();
-        updateWrapper.eq("ID",alarmId);
-        updateWrapper.set("ALARM_STATUS",ALARM_STATUS_MANUAL_CANCEL);
-        alarmService.update(updateWrapper);
-        return ResponseData.success();
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusEventController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusEventController.java
deleted file mode 100644
index dde5aad..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusEventController.java
+++ /dev/null
@@ -1,41 +0,0 @@
-package com.casic.missiles.modular.system.controller;
-
-
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.entity.BusEvent;
-import com.casic.missiles.modular.system.service.IBusEventService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.ResponseBody;
-
-/**
- * <p>
- * 事件表 前端控制器
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@Controller
-@RequestMapping("/event")
-@Api(tags = "事件上报")
-@RequiredArgsConstructor
-public class BusEventController {
-
-    private final IBusEventService eventService;
-
-    @ApiOperation("事件上报")
-    @PostMapping("add")
-    @ResponseBody
-    public Object add(@RequestBody BusEvent busEvent){
-        eventService.saveBusEvent(busEvent);
-        return ResponseData.success();
-    }
-
-}

diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/AlarmController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/AlarmController.java
new file mode 100644
index 0000000..1795cf1
--- /dev/null
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/AlarmController.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.modular.system.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.stereotype.Controller;
+
+/**
+ * <p>
+ * 报警记录表 前端控制器
+ * </p>
+ *
+ * @author zyj
+ * @since 2023-05-25
+ */
+@Controller
+@RequestMapping("/system/alarm")
+public class AlarmController {
+
+}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusAlarmController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusAlarmController.java
deleted file mode 100644
index 1f82ebb..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusAlarmController.java
+++ /dev/null
@@ -1,102 +0,0 @@
-package com.casic.missiles.modular.system.controller;
-
-
-import cn.hutool.core.util.ObjectUtil;
-import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.core.base.controller.BaseController;
-import com.casic.missiles.core.page.PageFactory;
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.AlarmUpload;
-import com.casic.missiles.modular.system.dto.DeviceDetailDTO;
-import com.casic.missiles.modular.system.entity.BusAlarm;
-import com.casic.missiles.modular.system.service.IBusAlarmService;
-import io.swagger.annotations.*;
-import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.*;
-
-import org.springframework.stereotype.Controller;
-
-import static com.casic.missiles.model.response.ResponseData.DEFAULT_SUCCESS_MESSAGE;
-import static com.casic.missiles.modular.system.consts.AlarmConst.ALARM_STATUS_MANUAL_CANCEL;
-
-/**
- * <p>
- * 报警记录表 前端控制器
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@Api(tags = "报警管理接口")
-@Controller
-@RequestMapping("/alarm")
-@RequiredArgsConstructor
-public class BusAlarmController extends BaseController {
-
-    private final IBusAlarmService alarmService;
-
-    @ApiOperation("报警上报接口")
-    @PostMapping("/upload")
-    @ResponseBody
-    public Object upload(@RequestBody AlarmUpload alarmUpload){
-        alarmService.alarmUpload(alarmUpload);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("报警列表分页查询")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "workTitle", value = "作业名称",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "projectId", value = "作业ID",dataType = "Long", paramType = "query",example = "0"),
-            @ApiImplicitParam(name = "alarmStatus", value = "报警状态",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "projectState", value = "作业状态",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "alarmType", value = "报警类型",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "alarmStartTime", value = "报警开始时间",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "alarmEndTime", value = "报警结束时间",dataType = "String", paramType = "query")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = BusAlarm.class),
-    })
-    @GetMapping("/listPage")
-    @ResponseBody
-    public Object listPage(String workTitle,Long projectId,String alarmStatus,String projectState,String alarmType,String alarmStartTime,String alarmEndTime){
-        Page<BusAlarm> page = PageFactory.defaultPage();
-        QueryWrapper<BusAlarm> queryWrapper = new QueryWrapper<>();
-        if(StrUtil.isNotEmpty(workTitle)){
-            queryWrapper.like("p.WORK_TITLE",workTitle);
-        }
-        if(ObjectUtil.isNotEmpty(projectId)){
-            queryWrapper.eq("alarm.PROJECT_ID",projectId);
-        }
-        if(StrUtil.isNotEmpty(alarmStatus)){
-            queryWrapper.eq("alarm.ALARM_STATUS",alarmStatus);
-        }
-        if(StrUtil.isNotEmpty(projectState)){
-            queryWrapper.eq("p.PROJECT_STATE",projectState);
-        }
-        if(StrUtil.isNotEmpty(alarmType)){
-            queryWrapper.eq("alarm.ALARM_TYPE",alarmType);
-        }
-        if(StrUtil.isNotEmpty(alarmStartTime)){
-            queryWrapper.ge("alarm.ALARM_TIME",alarmStartTime);
-        }
-        if(StrUtil.isNotEmpty(alarmEndTime)){
-            queryWrapper.le("alarm.ALARM_TIME",alarmEndTime);
-        }
-        page = alarmService.listPage(page,queryWrapper);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-    @ApiOperation("消警")
-    @PostMapping("/cancel")
-    @ResponseBody
-    public Object cancel(@RequestParam("alarmId") Long alarmId){
-        UpdateWrapper<BusAlarm> updateWrapper = new UpdateWrapper<>();
-        updateWrapper.eq("ID",alarmId);
-        updateWrapper.set("ALARM_STATUS",ALARM_STATUS_MANUAL_CANCEL);
-        alarmService.update(updateWrapper);
-        return ResponseData.success();
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusEventController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusEventController.java
deleted file mode 100644
index dde5aad..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusEventController.java
+++ /dev/null
@@ -1,41 +0,0 @@
-package com.casic.missiles.modular.system.controller;
-
-
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.entity.BusEvent;
-import com.casic.missiles.modular.system.service.IBusEventService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.ResponseBody;
-
-/**
- * <p>
- * 事件表 前端控制器
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@Controller
-@RequestMapping("/event")
-@Api(tags = "事件上报")
-@RequiredArgsConstructor
-public class BusEventController {
-
-    private final IBusEventService eventService;
-
-    @ApiOperation("事件上报")
-    @PostMapping("add")
-    @ResponseBody
-    public Object add(@RequestBody BusEvent busEvent){
-        eventService.saveBusEvent(busEvent);
-        return ResponseData.success();
-    }
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
index 03abc5f..aa50d78 100644
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
@@ -1,121 +1,20 @@
 package com.casic.missiles.modular.system.controller;
 
 
-import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.core.base.controller.BaseController;
-import com.casic.missiles.core.page.PageFactory;
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.DeviceDetailDTO;
-import com.casic.missiles.modular.system.entity.Device;
-import com.casic.missiles.modular.system.service.IDeviceExtService;
-import com.casic.missiles.modular.system.service.IDeviceService;
-import io.swagger.annotations.*;
-import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.RequestMapping;
 
 import org.springframework.stereotype.Controller;
 
-import java.time.LocalDateTime;
-import java.util.Date;
-import java.util.List;
-
-import static com.casic.missiles.model.response.ResponseData.DEFAULT_SUCCESS_MESSAGE;
-
 /**
  * <p>
- *  前端控制器
+ * 设备记录表 前端控制器
  * </p>
  *
  * @author zyj
- * @since 2023-04-14
+ * @since 2023-05-25
  */
-@Api(tags = "设备管理接口")
-@RequiredArgsConstructor
 @Controller
-@RequestMapping("/device")
-public class DeviceController extends BaseController {
-    private final IDeviceService deviceService;
-    private final IDeviceExtService deviceExtService;
-
-    @ApiOperation("设备分页列表")
-    @ApiImplicitParams({
-        @ApiImplicitParam(name = "deviceType", value = "设备类型",dataType = "String", paramType = "query"),
-        @ApiImplicitParam(name = "deviceCode", value = "设备编号",dataType = "String", paramType = "query"),
-        @ApiImplicitParam(name = "status", value = "设备状态",dataType = "String", paramType = "query"),
-        @ApiImplicitParam(name = "projectId", value = "作业ID（如果传此参数，列表中返回该作业使用的设备）",dataType = "Long", paramType = "query", example = "0")
-    })
-    @ApiResponses({
-        @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = DeviceDetailDTO.class),
-    })
-    @GetMapping("listPage")
-    @ResponseBody
-    public Object listPage(String deviceType, String deviceCode, String status,Long projectId){
-        Page<DeviceDetailDTO> page = PageFactory.defaultPage();
-        QueryWrapper<DeviceDetailDTO> queryWrapper = new QueryWrapper<>();
-        if(StrUtil.isNotEmpty(deviceType)){
-            queryWrapper.eq("DEVICE_TYPE",deviceType);
-        }
-        if(StrUtil.isNotEmpty(deviceCode)){
-            queryWrapper.like("DEVICE_CODE",deviceCode);
-        }
-        page = deviceService.listPage(page,queryWrapper,status,projectId);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-    @ApiOperation("新增设备")
-    @PostMapping("add")
-    @ResponseBody
-    public Object add(@RequestBody DeviceDetailDTO deviceDetailDTO){
-        deviceService.saveDevice(deviceDetailDTO);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("编辑设备")
-    @PostMapping("update")
-    @ResponseBody
-    public Object update(@RequestBody DeviceDetailDTO deviceDetailDTO){
-        deviceService.updateDevice(deviceDetailDTO);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("删除设备")
-    @PostMapping("delete")
-    @ResponseBody
-    public Object delete(@ApiParam("设备id列表")@RequestBody List<Long> deviceIds){
-        deviceService.deleteDevices(deviceIds);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("设置甲烷阈值")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "gasIp", value = "安全树甲烷设备IP",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "gasPort", value = "安全树甲烷端口",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "threshold", value = "甲烷阈值",dataType = "String", paramType = "query")
-    })
-    @PostMapping("setThreshold")
-    @ResponseBody
-    public Object setThreshold(String gasIp,String gasPort,String threshold){
-        deviceExtService.setGasThreshold(gasIp, gasPort, threshold);
-        return ResponseData.success();
-    }
-
-
-    @ApiOperation("查询甲烷阈值")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "gasIp", value = "安全树甲烷设备IP",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "gasPort", value = "安全树甲烷端口",dataType = "String", paramType = "query")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = "{\"code\": 200,\"data\": \"100\",\"message\": \"请求成功\",\"success\": true}",response = String.class),
-    })
-    @GetMapping("getThreshold")
-    @ResponseBody
-    public Object getThreshold(String gasIp,String gasPort){
-        String data = deviceExtService.getGasThreshold(gasIp, gasPort);
-        return ResponseData.success(data);
-    }
-
+@RequestMapping("/system/device")
+public class DeviceController {
 
 }

diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/AlarmController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/AlarmController.java
new file mode 100644
index 0000000..1795cf1
--- /dev/null
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/AlarmController.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.modular.system.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.stereotype.Controller;
+
+/**
+ * <p>
+ * 报警记录表 前端控制器
+ * </p>
+ *
+ * @author zyj
+ * @since 2023-05-25
+ */
+@Controller
+@RequestMapping("/system/alarm")
+public class AlarmController {
+
+}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusAlarmController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusAlarmController.java
deleted file mode 100644
index 1f82ebb..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusAlarmController.java
+++ /dev/null
@@ -1,102 +0,0 @@
-package com.casic.missiles.modular.system.controller;
-
-
-import cn.hutool.core.util.ObjectUtil;
-import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.core.base.controller.BaseController;
-import com.casic.missiles.core.page.PageFactory;
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.AlarmUpload;
-import com.casic.missiles.modular.system.dto.DeviceDetailDTO;
-import com.casic.missiles.modular.system.entity.BusAlarm;
-import com.casic.missiles.modular.system.service.IBusAlarmService;
-import io.swagger.annotations.*;
-import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.*;
-
-import org.springframework.stereotype.Controller;
-
-import static com.casic.missiles.model.response.ResponseData.DEFAULT_SUCCESS_MESSAGE;
-import static com.casic.missiles.modular.system.consts.AlarmConst.ALARM_STATUS_MANUAL_CANCEL;
-
-/**
- * <p>
- * 报警记录表 前端控制器
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@Api(tags = "报警管理接口")
-@Controller
-@RequestMapping("/alarm")
-@RequiredArgsConstructor
-public class BusAlarmController extends BaseController {
-
-    private final IBusAlarmService alarmService;
-
-    @ApiOperation("报警上报接口")
-    @PostMapping("/upload")
-    @ResponseBody
-    public Object upload(@RequestBody AlarmUpload alarmUpload){
-        alarmService.alarmUpload(alarmUpload);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("报警列表分页查询")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "workTitle", value = "作业名称",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "projectId", value = "作业ID",dataType = "Long", paramType = "query",example = "0"),
-            @ApiImplicitParam(name = "alarmStatus", value = "报警状态",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "projectState", value = "作业状态",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "alarmType", value = "报警类型",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "alarmStartTime", value = "报警开始时间",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "alarmEndTime", value = "报警结束时间",dataType = "String", paramType = "query")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = BusAlarm.class),
-    })
-    @GetMapping("/listPage")
-    @ResponseBody
-    public Object listPage(String workTitle,Long projectId,String alarmStatus,String projectState,String alarmType,String alarmStartTime,String alarmEndTime){
-        Page<BusAlarm> page = PageFactory.defaultPage();
-        QueryWrapper<BusAlarm> queryWrapper = new QueryWrapper<>();
-        if(StrUtil.isNotEmpty(workTitle)){
-            queryWrapper.like("p.WORK_TITLE",workTitle);
-        }
-        if(ObjectUtil.isNotEmpty(projectId)){
-            queryWrapper.eq("alarm.PROJECT_ID",projectId);
-        }
-        if(StrUtil.isNotEmpty(alarmStatus)){
-            queryWrapper.eq("alarm.ALARM_STATUS",alarmStatus);
-        }
-        if(StrUtil.isNotEmpty(projectState)){
-            queryWrapper.eq("p.PROJECT_STATE",projectState);
-        }
-        if(StrUtil.isNotEmpty(alarmType)){
-            queryWrapper.eq("alarm.ALARM_TYPE",alarmType);
-        }
-        if(StrUtil.isNotEmpty(alarmStartTime)){
-            queryWrapper.ge("alarm.ALARM_TIME",alarmStartTime);
-        }
-        if(StrUtil.isNotEmpty(alarmEndTime)){
-            queryWrapper.le("alarm.ALARM_TIME",alarmEndTime);
-        }
-        page = alarmService.listPage(page,queryWrapper);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-    @ApiOperation("消警")
-    @PostMapping("/cancel")
-    @ResponseBody
-    public Object cancel(@RequestParam("alarmId") Long alarmId){
-        UpdateWrapper<BusAlarm> updateWrapper = new UpdateWrapper<>();
-        updateWrapper.eq("ID",alarmId);
-        updateWrapper.set("ALARM_STATUS",ALARM_STATUS_MANUAL_CANCEL);
-        alarmService.update(updateWrapper);
-        return ResponseData.success();
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusEventController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusEventController.java
deleted file mode 100644
index dde5aad..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusEventController.java
+++ /dev/null
@@ -1,41 +0,0 @@
-package com.casic.missiles.modular.system.controller;
-
-
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.entity.BusEvent;
-import com.casic.missiles.modular.system.service.IBusEventService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.ResponseBody;
-
-/**
- * <p>
- * 事件表 前端控制器
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@Controller
-@RequestMapping("/event")
-@Api(tags = "事件上报")
-@RequiredArgsConstructor
-public class BusEventController {
-
-    private final IBusEventService eventService;
-
-    @ApiOperation("事件上报")
-    @PostMapping("add")
-    @ResponseBody
-    public Object add(@RequestBody BusEvent busEvent){
-        eventService.saveBusEvent(busEvent);
-        return ResponseData.success();
-    }
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
index 03abc5f..aa50d78 100644
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
@@ -1,121 +1,20 @@
 package com.casic.missiles.modular.system.controller;
 
 
-import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.core.base.controller.BaseController;
-import com.casic.missiles.core.page.PageFactory;
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.DeviceDetailDTO;
-import com.casic.missiles.modular.system.entity.Device;
-import com.casic.missiles.modular.system.service.IDeviceExtService;
-import com.casic.missiles.modular.system.service.IDeviceService;
-import io.swagger.annotations.*;
-import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.RequestMapping;
 
 import org.springframework.stereotype.Controller;
 
-import java.time.LocalDateTime;
-import java.util.Date;
-import java.util.List;
-
-import static com.casic.missiles.model.response.ResponseData.DEFAULT_SUCCESS_MESSAGE;
-
 /**
  * <p>
- *  前端控制器
+ * 设备记录表 前端控制器
  * </p>
  *
  * @author zyj
- * @since 2023-04-14
+ * @since 2023-05-25
  */
-@Api(tags = "设备管理接口")
-@RequiredArgsConstructor
 @Controller
-@RequestMapping("/device")
-public class DeviceController extends BaseController {
-    private final IDeviceService deviceService;
-    private final IDeviceExtService deviceExtService;
-
-    @ApiOperation("设备分页列表")
-    @ApiImplicitParams({
-        @ApiImplicitParam(name = "deviceType", value = "设备类型",dataType = "String", paramType = "query"),
-        @ApiImplicitParam(name = "deviceCode", value = "设备编号",dataType = "String", paramType = "query"),
-        @ApiImplicitParam(name = "status", value = "设备状态",dataType = "String", paramType = "query"),
-        @ApiImplicitParam(name = "projectId", value = "作业ID（如果传此参数，列表中返回该作业使用的设备）",dataType = "Long", paramType = "query", example = "0")
-    })
-    @ApiResponses({
-        @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = DeviceDetailDTO.class),
-    })
-    @GetMapping("listPage")
-    @ResponseBody
-    public Object listPage(String deviceType, String deviceCode, String status,Long projectId){
-        Page<DeviceDetailDTO> page = PageFactory.defaultPage();
-        QueryWrapper<DeviceDetailDTO> queryWrapper = new QueryWrapper<>();
-        if(StrUtil.isNotEmpty(deviceType)){
-            queryWrapper.eq("DEVICE_TYPE",deviceType);
-        }
-        if(StrUtil.isNotEmpty(deviceCode)){
-            queryWrapper.like("DEVICE_CODE",deviceCode);
-        }
-        page = deviceService.listPage(page,queryWrapper,status,projectId);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-    @ApiOperation("新增设备")
-    @PostMapping("add")
-    @ResponseBody
-    public Object add(@RequestBody DeviceDetailDTO deviceDetailDTO){
-        deviceService.saveDevice(deviceDetailDTO);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("编辑设备")
-    @PostMapping("update")
-    @ResponseBody
-    public Object update(@RequestBody DeviceDetailDTO deviceDetailDTO){
-        deviceService.updateDevice(deviceDetailDTO);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("删除设备")
-    @PostMapping("delete")
-    @ResponseBody
-    public Object delete(@ApiParam("设备id列表")@RequestBody List<Long> deviceIds){
-        deviceService.deleteDevices(deviceIds);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("设置甲烷阈值")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "gasIp", value = "安全树甲烷设备IP",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "gasPort", value = "安全树甲烷端口",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "threshold", value = "甲烷阈值",dataType = "String", paramType = "query")
-    })
-    @PostMapping("setThreshold")
-    @ResponseBody
-    public Object setThreshold(String gasIp,String gasPort,String threshold){
-        deviceExtService.setGasThreshold(gasIp, gasPort, threshold);
-        return ResponseData.success();
-    }
-
-
-    @ApiOperation("查询甲烷阈值")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "gasIp", value = "安全树甲烷设备IP",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "gasPort", value = "安全树甲烷端口",dataType = "String", paramType = "query")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = "{\"code\": 200,\"data\": \"100\",\"message\": \"请求成功\",\"success\": true}",response = String.class),
-    })
-    @GetMapping("getThreshold")
-    @ResponseBody
-    public Object getThreshold(String gasIp,String gasPort){
-        String data = deviceExtService.getGasThreshold(gasIp, gasPort);
-        return ResponseData.success(data);
-    }
-
+@RequestMapping("/system/device")
+public class DeviceController {
 
 }
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/OverviewController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/OverviewController.java
deleted file mode 100644
index 7570504..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/OverviewController.java
+++ /dev/null
@@ -1,70 +0,0 @@
-package com.casic.missiles.modular.system.controller;
-
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.AlarmTypeCountDTO;
-import com.casic.missiles.modular.system.dto.DeviceLocationDTO;
-import com.casic.missiles.modular.system.dto.WorkerLocationDTO;
-import com.casic.missiles.modular.system.service.IBusAlarmService;
-import com.casic.missiles.modular.system.service.IProjectDeviceService;
-import com.casic.missiles.modular.system.service.IProjectWorkerService;
-import io.swagger.annotations.*;
-import lombok.RequiredArgsConstructor;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.ResponseBody;
-
-import static com.casic.missiles.model.response.ResponseData.DEFAULT_SUCCESS_MESSAGE;
-import static com.casic.missiles.modular.system.consts.AlarmConst.ALARM_STATUS_ON;
-
-@Api(tags = "首页看板接口")
-@Controller
-@RequestMapping("overview")
-@RequiredArgsConstructor
-public class OverviewController {
-
-    private final IBusAlarmService alarmService;
-    private final IProjectDeviceService projectDeviceService;
-
-    private final IProjectWorkerService projectWorkerService;
-
-
-    @ApiOperation("报警统计接口")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "projectId", value = "作业ID",dataType = "Long", paramType = "query", example = "0")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = AlarmTypeCountDTO.class),
-    })
-    @GetMapping("/alarmCount")
-    @ResponseBody
-    public Object alarmCount(Long projectId){
-        return ResponseData.success(alarmService.alarmCount(projectId,ALARM_STATUS_ON));
-    }
-
-    @ApiOperation("设备列表接口")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "projectId", value = "作业ID",dataType = "Long", paramType = "query", example = "0")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = DeviceLocationDTO.class),
-    })
-    @GetMapping("/deviceList")
-    @ResponseBody
-    public Object deviceList(Long projectId){
-        return ResponseData.success(projectDeviceService.selectDeviceLocationList(projectId));
-    }
-
-    @ApiOperation("人员列表接口")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "projectId", value = "作业ID",dataType = "Long", paramType = "query", example = "0")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = WorkerLocationDTO.class),
-    })
-    @GetMapping("/workerList")
-    @ResponseBody
-    public Object workerList(Long projectId){
-        return ResponseData.success(projectWorkerService.selectWorkerLocationDTO(projectId));
-    }
-}

diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/AlarmController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/AlarmController.java
new file mode 100644
index 0000000..1795cf1
--- /dev/null
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/AlarmController.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.modular.system.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.stereotype.Controller;
+
+/**
+ * <p>
+ * 报警记录表 前端控制器
+ * </p>
+ *
+ * @author zyj
+ * @since 2023-05-25
+ */
+@Controller
+@RequestMapping("/system/alarm")
+public class AlarmController {
+
+}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusAlarmController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusAlarmController.java
deleted file mode 100644
index 1f82ebb..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusAlarmController.java
+++ /dev/null
@@ -1,102 +0,0 @@
-package com.casic.missiles.modular.system.controller;
-
-
-import cn.hutool.core.util.ObjectUtil;
-import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.core.base.controller.BaseController;
-import com.casic.missiles.core.page.PageFactory;
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.AlarmUpload;
-import com.casic.missiles.modular.system.dto.DeviceDetailDTO;
-import com.casic.missiles.modular.system.entity.BusAlarm;
-import com.casic.missiles.modular.system.service.IBusAlarmService;
-import io.swagger.annotations.*;
-import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.*;
-
-import org.springframework.stereotype.Controller;
-
-import static com.casic.missiles.model.response.ResponseData.DEFAULT_SUCCESS_MESSAGE;
-import static com.casic.missiles.modular.system.consts.AlarmConst.ALARM_STATUS_MANUAL_CANCEL;
-
-/**
- * <p>
- * 报警记录表 前端控制器
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@Api(tags = "报警管理接口")
-@Controller
-@RequestMapping("/alarm")
-@RequiredArgsConstructor
-public class BusAlarmController extends BaseController {
-
-    private final IBusAlarmService alarmService;
-
-    @ApiOperation("报警上报接口")
-    @PostMapping("/upload")
-    @ResponseBody
-    public Object upload(@RequestBody AlarmUpload alarmUpload){
-        alarmService.alarmUpload(alarmUpload);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("报警列表分页查询")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "workTitle", value = "作业名称",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "projectId", value = "作业ID",dataType = "Long", paramType = "query",example = "0"),
-            @ApiImplicitParam(name = "alarmStatus", value = "报警状态",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "projectState", value = "作业状态",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "alarmType", value = "报警类型",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "alarmStartTime", value = "报警开始时间",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "alarmEndTime", value = "报警结束时间",dataType = "String", paramType = "query")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = BusAlarm.class),
-    })
-    @GetMapping("/listPage")
-    @ResponseBody
-    public Object listPage(String workTitle,Long projectId,String alarmStatus,String projectState,String alarmType,String alarmStartTime,String alarmEndTime){
-        Page<BusAlarm> page = PageFactory.defaultPage();
-        QueryWrapper<BusAlarm> queryWrapper = new QueryWrapper<>();
-        if(StrUtil.isNotEmpty(workTitle)){
-            queryWrapper.like("p.WORK_TITLE",workTitle);
-        }
-        if(ObjectUtil.isNotEmpty(projectId)){
-            queryWrapper.eq("alarm.PROJECT_ID",projectId);
-        }
-        if(StrUtil.isNotEmpty(alarmStatus)){
-            queryWrapper.eq("alarm.ALARM_STATUS",alarmStatus);
-        }
-        if(StrUtil.isNotEmpty(projectState)){
-            queryWrapper.eq("p.PROJECT_STATE",projectState);
-        }
-        if(StrUtil.isNotEmpty(alarmType)){
-            queryWrapper.eq("alarm.ALARM_TYPE",alarmType);
-        }
-        if(StrUtil.isNotEmpty(alarmStartTime)){
-            queryWrapper.ge("alarm.ALARM_TIME",alarmStartTime);
-        }
-        if(StrUtil.isNotEmpty(alarmEndTime)){
-            queryWrapper.le("alarm.ALARM_TIME",alarmEndTime);
-        }
-        page = alarmService.listPage(page,queryWrapper);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-    @ApiOperation("消警")
-    @PostMapping("/cancel")
-    @ResponseBody
-    public Object cancel(@RequestParam("alarmId") Long alarmId){
-        UpdateWrapper<BusAlarm> updateWrapper = new UpdateWrapper<>();
-        updateWrapper.eq("ID",alarmId);
-        updateWrapper.set("ALARM_STATUS",ALARM_STATUS_MANUAL_CANCEL);
-        alarmService.update(updateWrapper);
-        return ResponseData.success();
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusEventController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusEventController.java
deleted file mode 100644
index dde5aad..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusEventController.java
+++ /dev/null
@@ -1,41 +0,0 @@
-package com.casic.missiles.modular.system.controller;
-
-
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.entity.BusEvent;
-import com.casic.missiles.modular.system.service.IBusEventService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.ResponseBody;
-
-/**
- * <p>
- * 事件表 前端控制器
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@Controller
-@RequestMapping("/event")
-@Api(tags = "事件上报")
-@RequiredArgsConstructor
-public class BusEventController {
-
-    private final IBusEventService eventService;
-
-    @ApiOperation("事件上报")
-    @PostMapping("add")
-    @ResponseBody
-    public Object add(@RequestBody BusEvent busEvent){
-        eventService.saveBusEvent(busEvent);
-        return ResponseData.success();
-    }
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
index 03abc5f..aa50d78 100644
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
@@ -1,121 +1,20 @@
 package com.casic.missiles.modular.system.controller;
 
 
-import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.core.base.controller.BaseController;
-import com.casic.missiles.core.page.PageFactory;
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.DeviceDetailDTO;
-import com.casic.missiles.modular.system.entity.Device;
-import com.casic.missiles.modular.system.service.IDeviceExtService;
-import com.casic.missiles.modular.system.service.IDeviceService;
-import io.swagger.annotations.*;
-import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.RequestMapping;
 
 import org.springframework.stereotype.Controller;
 
-import java.time.LocalDateTime;
-import java.util.Date;
-import java.util.List;
-
-import static com.casic.missiles.model.response.ResponseData.DEFAULT_SUCCESS_MESSAGE;
-
 /**
  * <p>
- *  前端控制器
+ * 设备记录表 前端控制器
  * </p>
  *
  * @author zyj
- * @since 2023-04-14
+ * @since 2023-05-25
  */
-@Api(tags = "设备管理接口")
-@RequiredArgsConstructor
 @Controller
-@RequestMapping("/device")
-public class DeviceController extends BaseController {
-    private final IDeviceService deviceService;
-    private final IDeviceExtService deviceExtService;
-
-    @ApiOperation("设备分页列表")
-    @ApiImplicitParams({
-        @ApiImplicitParam(name = "deviceType", value = "设备类型",dataType = "String", paramType = "query"),
-        @ApiImplicitParam(name = "deviceCode", value = "设备编号",dataType = "String", paramType = "query"),
-        @ApiImplicitParam(name = "status", value = "设备状态",dataType = "String", paramType = "query"),
-        @ApiImplicitParam(name = "projectId", value = "作业ID（如果传此参数，列表中返回该作业使用的设备）",dataType = "Long", paramType = "query", example = "0")
-    })
-    @ApiResponses({
-        @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = DeviceDetailDTO.class),
-    })
-    @GetMapping("listPage")
-    @ResponseBody
-    public Object listPage(String deviceType, String deviceCode, String status,Long projectId){
-        Page<DeviceDetailDTO> page = PageFactory.defaultPage();
-        QueryWrapper<DeviceDetailDTO> queryWrapper = new QueryWrapper<>();
-        if(StrUtil.isNotEmpty(deviceType)){
-            queryWrapper.eq("DEVICE_TYPE",deviceType);
-        }
-        if(StrUtil.isNotEmpty(deviceCode)){
-            queryWrapper.like("DEVICE_CODE",deviceCode);
-        }
-        page = deviceService.listPage(page,queryWrapper,status,projectId);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-    @ApiOperation("新增设备")
-    @PostMapping("add")
-    @ResponseBody
-    public Object add(@RequestBody DeviceDetailDTO deviceDetailDTO){
-        deviceService.saveDevice(deviceDetailDTO);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("编辑设备")
-    @PostMapping("update")
-    @ResponseBody
-    public Object update(@RequestBody DeviceDetailDTO deviceDetailDTO){
-        deviceService.updateDevice(deviceDetailDTO);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("删除设备")
-    @PostMapping("delete")
-    @ResponseBody
-    public Object delete(@ApiParam("设备id列表")@RequestBody List<Long> deviceIds){
-        deviceService.deleteDevices(deviceIds);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("设置甲烷阈值")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "gasIp", value = "安全树甲烷设备IP",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "gasPort", value = "安全树甲烷端口",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "threshold", value = "甲烷阈值",dataType = "String", paramType = "query")
-    })
-    @PostMapping("setThreshold")
-    @ResponseBody
-    public Object setThreshold(String gasIp,String gasPort,String threshold){
-        deviceExtService.setGasThreshold(gasIp, gasPort, threshold);
-        return ResponseData.success();
-    }
-
-
-    @ApiOperation("查询甲烷阈值")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "gasIp", value = "安全树甲烷设备IP",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "gasPort", value = "安全树甲烷端口",dataType = "String", paramType = "query")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = "{\"code\": 200,\"data\": \"100\",\"message\": \"请求成功\",\"success\": true}",response = String.class),
-    })
-    @GetMapping("getThreshold")
-    @ResponseBody
-    public Object getThreshold(String gasIp,String gasPort){
-        String data = deviceExtService.getGasThreshold(gasIp, gasPort);
-        return ResponseData.success(data);
-    }
-
+@RequestMapping("/system/device")
+public class DeviceController {
 
 }
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/OverviewController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/OverviewController.java
deleted file mode 100644
index 7570504..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/OverviewController.java
+++ /dev/null
@@ -1,70 +0,0 @@
-package com.casic.missiles.modular.system.controller;
-
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.AlarmTypeCountDTO;
-import com.casic.missiles.modular.system.dto.DeviceLocationDTO;
-import com.casic.missiles.modular.system.dto.WorkerLocationDTO;
-import com.casic.missiles.modular.system.service.IBusAlarmService;
-import com.casic.missiles.modular.system.service.IProjectDeviceService;
-import com.casic.missiles.modular.system.service.IProjectWorkerService;
-import io.swagger.annotations.*;
-import lombok.RequiredArgsConstructor;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.ResponseBody;
-
-import static com.casic.missiles.model.response.ResponseData.DEFAULT_SUCCESS_MESSAGE;
-import static com.casic.missiles.modular.system.consts.AlarmConst.ALARM_STATUS_ON;
-
-@Api(tags = "首页看板接口")
-@Controller
-@RequestMapping("overview")
-@RequiredArgsConstructor
-public class OverviewController {
-
-    private final IBusAlarmService alarmService;
-    private final IProjectDeviceService projectDeviceService;
-
-    private final IProjectWorkerService projectWorkerService;
-
-
-    @ApiOperation("报警统计接口")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "projectId", value = "作业ID",dataType = "Long", paramType = "query", example = "0")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = AlarmTypeCountDTO.class),
-    })
-    @GetMapping("/alarmCount")
-    @ResponseBody
-    public Object alarmCount(Long projectId){
-        return ResponseData.success(alarmService.alarmCount(projectId,ALARM_STATUS_ON));
-    }
-
-    @ApiOperation("设备列表接口")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "projectId", value = "作业ID",dataType = "Long", paramType = "query", example = "0")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = DeviceLocationDTO.class),
-    })
-    @GetMapping("/deviceList")
-    @ResponseBody
-    public Object deviceList(Long projectId){
-        return ResponseData.success(projectDeviceService.selectDeviceLocationList(projectId));
-    }
-
-    @ApiOperation("人员列表接口")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "projectId", value = "作业ID",dataType = "Long", paramType = "query", example = "0")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = WorkerLocationDTO.class),
-    })
-    @GetMapping("/workerList")
-    @ResponseBody
-    public Object workerList(Long projectId){
-        return ResponseData.success(projectWorkerService.selectWorkerLocationDTO(projectId));
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/WorkSiteInfoController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/WorkSiteInfoController.java
deleted file mode 100644
index af36d69..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/WorkSiteInfoController.java
+++ /dev/null
@@ -1,130 +0,0 @@
-package com.casic.missiles.modular.system.controller;
-
-
-import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.core.base.controller.BaseController;
-import com.casic.missiles.core.page.PageFactory;
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.WorkSiteDetailDTO;
-import com.casic.missiles.modular.system.entity.WorkSiteInfo;
-import com.casic.missiles.modular.system.service.IWorkSiteInfoService;
-import io.swagger.annotations.*;
-import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.*;
-
-import org.springframework.stereotype.Controller;
-
-import java.util.List;
-
-import static com.casic.missiles.model.response.ResponseData.DEFAULT_SUCCESS_MESSAGE;
-
-/**
- * <p>
- * 作业现场表 前端控制器
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@Controller
-@RequestMapping("/site")
-@Api(tags = "作业现场管理")
-@RequiredArgsConstructor
-public class WorkSiteInfoController extends BaseController {
-
-
-    private final IWorkSiteInfoService workSiteInfoService;
-
-    @ApiOperation("新增作业现场")
-    @PostMapping("add")
-    @ResponseBody
-    public Object addWorkSite(@RequestBody WorkSiteDetailDTO workSiteDetailDTO){
-        workSiteInfoService.addWorkSiteInfo(workSiteDetailDTO);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("编辑作业现场")
-    @PostMapping("update")
-    @ResponseBody
-    public Object updateWorkSite(@RequestBody WorkSiteDetailDTO workSiteDetailDTO){
-        workSiteInfoService.updateWorkSiteInfo(workSiteDetailDTO);
-        return ResponseData.success();
-    }
-
-
-    @ApiOperation("删除作业现场")
-    @PostMapping("delete")
-    @ResponseBody
-    public Object delete(@ApiParam("作业现场id列表")@RequestBody List<Long> projectIds){
-        workSiteInfoService.deleteProjects(projectIds);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("查询作业现场详情")
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = WorkSiteDetailDTO.class),
-    })
-    @GetMapping("detail")
-    @ResponseBody
-    public Object delete(@ApiParam(value = "作业现场id", example = "0")@RequestParam Long projectId){
-        WorkSiteDetailDTO detailDTO = workSiteInfoService.getWorkSiteDetail(projectId);
-        return ResponseData.success(detailDTO);
-    }
-
-    @ApiOperation("分页列表查询")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "workTitle",value = "作业名称", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "workRoad",value = "所属道路", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "workPersonName",value = "责任人姓名", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "startDate",value = "注册开始日期", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "endDate",value = "注册结束日期", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "projectState",value = "当前状态（字典值）", dataType = "String", paramType = "query")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = WorkSiteInfo.class),
-    })
-    @GetMapping("listPage")
-    @ResponseBody
-    public Object listPage(String workTitle,String workRoad,String workPersonName,String projectState,String startDate,String endDate){
-        Page<WorkSiteInfo> page = PageFactory.defaultPage();
-        QueryWrapper<WorkSiteInfo> queryWrapper = new QueryWrapper<>();
-        if(StrUtil.isNotEmpty(workTitle)){
-            queryWrapper.like("WORK_TITLE",workTitle);
-        }
-        if(StrUtil.isNotEmpty(workRoad)){
-            queryWrapper.like("WORK_ROAD",workRoad);
-        }
-        if(StrUtil.isNotEmpty(workPersonName)){
-            queryWrapper.like("WORKER_NAME",workPersonName);
-        }
-        if(StrUtil.isNotEmpty(projectState)){
-            queryWrapper.eq("PROJECT_STATE",projectState);
-        }
-        if(StrUtil.isNotEmpty(startDate)){
-            queryWrapper.ge("br_work_site_info.CREATE_TIME",startDate + " 00:00:00");
-        }
-        if(StrUtil.isNotEmpty(endDate)){
-            queryWrapper.le("br_work_site_info.CREATE_TIME",endDate + " 23:59:59");
-        }
-        page = workSiteInfoService.selectListPage(page,queryWrapper);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-    @ApiOperation("开始作业")
-    @PostMapping("start")
-    @ResponseBody
-    public Object start(@ApiParam(value = "作业现场id",example = "0")@RequestParam Long projectId){
-        workSiteInfoService.start(projectId);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("完成作业")
-    @PostMapping("finish")
-    @ResponseBody
-    public Object finish(@ApiParam(value = "作业现场id", example = "0")@RequestParam Long projectId){
-        workSiteInfoService.finish(projectId);
-        return ResponseData.success();
-    }
-}

diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/AlarmController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/AlarmController.java
new file mode 100644
index 0000000..1795cf1
--- /dev/null
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/AlarmController.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.modular.system.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.stereotype.Controller;
+
+/**
+ * <p>
+ * 报警记录表 前端控制器
+ * </p>
+ *
+ * @author zyj
+ * @since 2023-05-25
+ */
+@Controller
+@RequestMapping("/system/alarm")
+public class AlarmController {
+
+}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusAlarmController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusAlarmController.java
deleted file mode 100644
index 1f82ebb..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusAlarmController.java
+++ /dev/null
@@ -1,102 +0,0 @@
-package com.casic.missiles.modular.system.controller;
-
-
-import cn.hutool.core.util.ObjectUtil;
-import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.core.base.controller.BaseController;
-import com.casic.missiles.core.page.PageFactory;
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.AlarmUpload;
-import com.casic.missiles.modular.system.dto.DeviceDetailDTO;
-import com.casic.missiles.modular.system.entity.BusAlarm;
-import com.casic.missiles.modular.system.service.IBusAlarmService;
-import io.swagger.annotations.*;
-import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.*;
-
-import org.springframework.stereotype.Controller;
-
-import static com.casic.missiles.model.response.ResponseData.DEFAULT_SUCCESS_MESSAGE;
-import static com.casic.missiles.modular.system.consts.AlarmConst.ALARM_STATUS_MANUAL_CANCEL;
-
-/**
- * <p>
- * 报警记录表 前端控制器
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@Api(tags = "报警管理接口")
-@Controller
-@RequestMapping("/alarm")
-@RequiredArgsConstructor
-public class BusAlarmController extends BaseController {
-
-    private final IBusAlarmService alarmService;
-
-    @ApiOperation("报警上报接口")
-    @PostMapping("/upload")
-    @ResponseBody
-    public Object upload(@RequestBody AlarmUpload alarmUpload){
-        alarmService.alarmUpload(alarmUpload);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("报警列表分页查询")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "workTitle", value = "作业名称",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "projectId", value = "作业ID",dataType = "Long", paramType = "query",example = "0"),
-            @ApiImplicitParam(name = "alarmStatus", value = "报警状态",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "projectState", value = "作业状态",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "alarmType", value = "报警类型",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "alarmStartTime", value = "报警开始时间",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "alarmEndTime", value = "报警结束时间",dataType = "String", paramType = "query")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = BusAlarm.class),
-    })
-    @GetMapping("/listPage")
-    @ResponseBody
-    public Object listPage(String workTitle,Long projectId,String alarmStatus,String projectState,String alarmType,String alarmStartTime,String alarmEndTime){
-        Page<BusAlarm> page = PageFactory.defaultPage();
-        QueryWrapper<BusAlarm> queryWrapper = new QueryWrapper<>();
-        if(StrUtil.isNotEmpty(workTitle)){
-            queryWrapper.like("p.WORK_TITLE",workTitle);
-        }
-        if(ObjectUtil.isNotEmpty(projectId)){
-            queryWrapper.eq("alarm.PROJECT_ID",projectId);
-        }
-        if(StrUtil.isNotEmpty(alarmStatus)){
-            queryWrapper.eq("alarm.ALARM_STATUS",alarmStatus);
-        }
-        if(StrUtil.isNotEmpty(projectState)){
-            queryWrapper.eq("p.PROJECT_STATE",projectState);
-        }
-        if(StrUtil.isNotEmpty(alarmType)){
-            queryWrapper.eq("alarm.ALARM_TYPE",alarmType);
-        }
-        if(StrUtil.isNotEmpty(alarmStartTime)){
-            queryWrapper.ge("alarm.ALARM_TIME",alarmStartTime);
-        }
-        if(StrUtil.isNotEmpty(alarmEndTime)){
-            queryWrapper.le("alarm.ALARM_TIME",alarmEndTime);
-        }
-        page = alarmService.listPage(page,queryWrapper);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-    @ApiOperation("消警")
-    @PostMapping("/cancel")
-    @ResponseBody
-    public Object cancel(@RequestParam("alarmId") Long alarmId){
-        UpdateWrapper<BusAlarm> updateWrapper = new UpdateWrapper<>();
-        updateWrapper.eq("ID",alarmId);
-        updateWrapper.set("ALARM_STATUS",ALARM_STATUS_MANUAL_CANCEL);
-        alarmService.update(updateWrapper);
-        return ResponseData.success();
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusEventController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusEventController.java
deleted file mode 100644
index dde5aad..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusEventController.java
+++ /dev/null
@@ -1,41 +0,0 @@
-package com.casic.missiles.modular.system.controller;
-
-
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.entity.BusEvent;
-import com.casic.missiles.modular.system.service.IBusEventService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.ResponseBody;
-
-/**
- * <p>
- * 事件表 前端控制器
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@Controller
-@RequestMapping("/event")
-@Api(tags = "事件上报")
-@RequiredArgsConstructor
-public class BusEventController {
-
-    private final IBusEventService eventService;
-
-    @ApiOperation("事件上报")
-    @PostMapping("add")
-    @ResponseBody
-    public Object add(@RequestBody BusEvent busEvent){
-        eventService.saveBusEvent(busEvent);
-        return ResponseData.success();
-    }
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
index 03abc5f..aa50d78 100644
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
@@ -1,121 +1,20 @@
 package com.casic.missiles.modular.system.controller;
 
 
-import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.core.base.controller.BaseController;
-import com.casic.missiles.core.page.PageFactory;
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.DeviceDetailDTO;
-import com.casic.missiles.modular.system.entity.Device;
-import com.casic.missiles.modular.system.service.IDeviceExtService;
-import com.casic.missiles.modular.system.service.IDeviceService;
-import io.swagger.annotations.*;
-import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.RequestMapping;
 
 import org.springframework.stereotype.Controller;
 
-import java.time.LocalDateTime;
-import java.util.Date;
-import java.util.List;
-
-import static com.casic.missiles.model.response.ResponseData.DEFAULT_SUCCESS_MESSAGE;
-
 /**
  * <p>
- *  前端控制器
+ * 设备记录表 前端控制器
  * </p>
  *
  * @author zyj
- * @since 2023-04-14
+ * @since 2023-05-25
  */
-@Api(tags = "设备管理接口")
-@RequiredArgsConstructor
 @Controller
-@RequestMapping("/device")
-public class DeviceController extends BaseController {
-    private final IDeviceService deviceService;
-    private final IDeviceExtService deviceExtService;
-
-    @ApiOperation("设备分页列表")
-    @ApiImplicitParams({
-        @ApiImplicitParam(name = "deviceType", value = "设备类型",dataType = "String", paramType = "query"),
-        @ApiImplicitParam(name = "deviceCode", value = "设备编号",dataType = "String", paramType = "query"),
-        @ApiImplicitParam(name = "status", value = "设备状态",dataType = "String", paramType = "query"),
-        @ApiImplicitParam(name = "projectId", value = "作业ID（如果传此参数，列表中返回该作业使用的设备）",dataType = "Long", paramType = "query", example = "0")
-    })
-    @ApiResponses({
-        @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = DeviceDetailDTO.class),
-    })
-    @GetMapping("listPage")
-    @ResponseBody
-    public Object listPage(String deviceType, String deviceCode, String status,Long projectId){
-        Page<DeviceDetailDTO> page = PageFactory.defaultPage();
-        QueryWrapper<DeviceDetailDTO> queryWrapper = new QueryWrapper<>();
-        if(StrUtil.isNotEmpty(deviceType)){
-            queryWrapper.eq("DEVICE_TYPE",deviceType);
-        }
-        if(StrUtil.isNotEmpty(deviceCode)){
-            queryWrapper.like("DEVICE_CODE",deviceCode);
-        }
-        page = deviceService.listPage(page,queryWrapper,status,projectId);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-    @ApiOperation("新增设备")
-    @PostMapping("add")
-    @ResponseBody
-    public Object add(@RequestBody DeviceDetailDTO deviceDetailDTO){
-        deviceService.saveDevice(deviceDetailDTO);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("编辑设备")
-    @PostMapping("update")
-    @ResponseBody
-    public Object update(@RequestBody DeviceDetailDTO deviceDetailDTO){
-        deviceService.updateDevice(deviceDetailDTO);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("删除设备")
-    @PostMapping("delete")
-    @ResponseBody
-    public Object delete(@ApiParam("设备id列表")@RequestBody List<Long> deviceIds){
-        deviceService.deleteDevices(deviceIds);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("设置甲烷阈值")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "gasIp", value = "安全树甲烷设备IP",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "gasPort", value = "安全树甲烷端口",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "threshold", value = "甲烷阈值",dataType = "String", paramType = "query")
-    })
-    @PostMapping("setThreshold")
-    @ResponseBody
-    public Object setThreshold(String gasIp,String gasPort,String threshold){
-        deviceExtService.setGasThreshold(gasIp, gasPort, threshold);
-        return ResponseData.success();
-    }
-
-
-    @ApiOperation("查询甲烷阈值")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "gasIp", value = "安全树甲烷设备IP",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "gasPort", value = "安全树甲烷端口",dataType = "String", paramType = "query")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = "{\"code\": 200,\"data\": \"100\",\"message\": \"请求成功\",\"success\": true}",response = String.class),
-    })
-    @GetMapping("getThreshold")
-    @ResponseBody
-    public Object getThreshold(String gasIp,String gasPort){
-        String data = deviceExtService.getGasThreshold(gasIp, gasPort);
-        return ResponseData.success(data);
-    }
-
+@RequestMapping("/system/device")
+public class DeviceController {
 
 }
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/OverviewController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/OverviewController.java
deleted file mode 100644
index 7570504..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/OverviewController.java
+++ /dev/null
@@ -1,70 +0,0 @@
-package com.casic.missiles.modular.system.controller;
-
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.AlarmTypeCountDTO;
-import com.casic.missiles.modular.system.dto.DeviceLocationDTO;
-import com.casic.missiles.modular.system.dto.WorkerLocationDTO;
-import com.casic.missiles.modular.system.service.IBusAlarmService;
-import com.casic.missiles.modular.system.service.IProjectDeviceService;
-import com.casic.missiles.modular.system.service.IProjectWorkerService;
-import io.swagger.annotations.*;
-import lombok.RequiredArgsConstructor;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.ResponseBody;
-
-import static com.casic.missiles.model.response.ResponseData.DEFAULT_SUCCESS_MESSAGE;
-import static com.casic.missiles.modular.system.consts.AlarmConst.ALARM_STATUS_ON;
-
-@Api(tags = "首页看板接口")
-@Controller
-@RequestMapping("overview")
-@RequiredArgsConstructor
-public class OverviewController {
-
-    private final IBusAlarmService alarmService;
-    private final IProjectDeviceService projectDeviceService;
-
-    private final IProjectWorkerService projectWorkerService;
-
-
-    @ApiOperation("报警统计接口")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "projectId", value = "作业ID",dataType = "Long", paramType = "query", example = "0")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = AlarmTypeCountDTO.class),
-    })
-    @GetMapping("/alarmCount")
-    @ResponseBody
-    public Object alarmCount(Long projectId){
-        return ResponseData.success(alarmService.alarmCount(projectId,ALARM_STATUS_ON));
-    }
-
-    @ApiOperation("设备列表接口")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "projectId", value = "作业ID",dataType = "Long", paramType = "query", example = "0")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = DeviceLocationDTO.class),
-    })
-    @GetMapping("/deviceList")
-    @ResponseBody
-    public Object deviceList(Long projectId){
-        return ResponseData.success(projectDeviceService.selectDeviceLocationList(projectId));
-    }
-
-    @ApiOperation("人员列表接口")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "projectId", value = "作业ID",dataType = "Long", paramType = "query", example = "0")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = WorkerLocationDTO.class),
-    })
-    @GetMapping("/workerList")
-    @ResponseBody
-    public Object workerList(Long projectId){
-        return ResponseData.success(projectWorkerService.selectWorkerLocationDTO(projectId));
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/WorkSiteInfoController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/WorkSiteInfoController.java
deleted file mode 100644
index af36d69..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/WorkSiteInfoController.java
+++ /dev/null
@@ -1,130 +0,0 @@
-package com.casic.missiles.modular.system.controller;
-
-
-import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.core.base.controller.BaseController;
-import com.casic.missiles.core.page.PageFactory;
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.WorkSiteDetailDTO;
-import com.casic.missiles.modular.system.entity.WorkSiteInfo;
-import com.casic.missiles.modular.system.service.IWorkSiteInfoService;
-import io.swagger.annotations.*;
-import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.*;
-
-import org.springframework.stereotype.Controller;
-
-import java.util.List;
-
-import static com.casic.missiles.model.response.ResponseData.DEFAULT_SUCCESS_MESSAGE;
-
-/**
- * <p>
- * 作业现场表 前端控制器
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@Controller
-@RequestMapping("/site")
-@Api(tags = "作业现场管理")
-@RequiredArgsConstructor
-public class WorkSiteInfoController extends BaseController {
-
-
-    private final IWorkSiteInfoService workSiteInfoService;
-
-    @ApiOperation("新增作业现场")
-    @PostMapping("add")
-    @ResponseBody
-    public Object addWorkSite(@RequestBody WorkSiteDetailDTO workSiteDetailDTO){
-        workSiteInfoService.addWorkSiteInfo(workSiteDetailDTO);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("编辑作业现场")
-    @PostMapping("update")
-    @ResponseBody
-    public Object updateWorkSite(@RequestBody WorkSiteDetailDTO workSiteDetailDTO){
-        workSiteInfoService.updateWorkSiteInfo(workSiteDetailDTO);
-        return ResponseData.success();
-    }
-
-
-    @ApiOperation("删除作业现场")
-    @PostMapping("delete")
-    @ResponseBody
-    public Object delete(@ApiParam("作业现场id列表")@RequestBody List<Long> projectIds){
-        workSiteInfoService.deleteProjects(projectIds);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("查询作业现场详情")
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = WorkSiteDetailDTO.class),
-    })
-    @GetMapping("detail")
-    @ResponseBody
-    public Object delete(@ApiParam(value = "作业现场id", example = "0")@RequestParam Long projectId){
-        WorkSiteDetailDTO detailDTO = workSiteInfoService.getWorkSiteDetail(projectId);
-        return ResponseData.success(detailDTO);
-    }
-
-    @ApiOperation("分页列表查询")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "workTitle",value = "作业名称", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "workRoad",value = "所属道路", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "workPersonName",value = "责任人姓名", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "startDate",value = "注册开始日期", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "endDate",value = "注册结束日期", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "projectState",value = "当前状态（字典值）", dataType = "String", paramType = "query")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = WorkSiteInfo.class),
-    })
-    @GetMapping("listPage")
-    @ResponseBody
-    public Object listPage(String workTitle,String workRoad,String workPersonName,String projectState,String startDate,String endDate){
-        Page<WorkSiteInfo> page = PageFactory.defaultPage();
-        QueryWrapper<WorkSiteInfo> queryWrapper = new QueryWrapper<>();
-        if(StrUtil.isNotEmpty(workTitle)){
-            queryWrapper.like("WORK_TITLE",workTitle);
-        }
-        if(StrUtil.isNotEmpty(workRoad)){
-            queryWrapper.like("WORK_ROAD",workRoad);
-        }
-        if(StrUtil.isNotEmpty(workPersonName)){
-            queryWrapper.like("WORKER_NAME",workPersonName);
-        }
-        if(StrUtil.isNotEmpty(projectState)){
-            queryWrapper.eq("PROJECT_STATE",projectState);
-        }
-        if(StrUtil.isNotEmpty(startDate)){
-            queryWrapper.ge("br_work_site_info.CREATE_TIME",startDate + " 00:00:00");
-        }
-        if(StrUtil.isNotEmpty(endDate)){
-            queryWrapper.le("br_work_site_info.CREATE_TIME",endDate + " 23:59:59");
-        }
-        page = workSiteInfoService.selectListPage(page,queryWrapper);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-    @ApiOperation("开始作业")
-    @PostMapping("start")
-    @ResponseBody
-    public Object start(@ApiParam(value = "作业现场id",example = "0")@RequestParam Long projectId){
-        workSiteInfoService.start(projectId);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("完成作业")
-    @PostMapping("finish")
-    @ResponseBody
-    public Object finish(@ApiParam(value = "作业现场id", example = "0")@RequestParam Long projectId){
-        workSiteInfoService.finish(projectId);
-        return ResponseData.success();
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/WorkerController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/WorkerController.java
deleted file mode 100644
index 796f94c..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/WorkerController.java
+++ /dev/null
@@ -1,136 +0,0 @@
-package com.casic.missiles.modular.system.controller;
-
-
-import cn.hutool.core.util.ObjectUtil;
-import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.core.base.controller.BaseController;
-import com.casic.missiles.core.page.PageFactory;
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.DeviceDetailDTO;
-import com.casic.missiles.modular.system.entity.Device;
-import com.casic.missiles.modular.system.entity.Worker;
-import com.casic.missiles.modular.system.service.IWorkerService;
-import io.swagger.annotations.*;
-import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.*;
-
-import org.springframework.stereotype.Controller;
-
-import java.util.Date;
-import java.util.List;
-
-import static com.casic.missiles.model.response.ResponseData.DEFAULT_SUCCESS_MESSAGE;
-
-/**
- * <p>
- *  前端控制器
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@Controller
-@RequestMapping("/worker")
-@RequiredArgsConstructor
-@Api(tags = "人员管理接口")
-public class WorkerController extends BaseController {
-
-    private final IWorkerService workerService;
-
-    @ApiOperation("分页列表查询")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "name",value = "姓名", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "deptId",value = "所属部门", dataType = "Long", paramType = "query", example = "0"),
-            @ApiImplicitParam(name = "status",value = "当前状态（字典值）", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "startDate",value = "注册开始日期", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "endDate",value = "注册结束日期", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "workerType",value = "人员类型（字典值）", dataType = "String", paramType = "query")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = Worker.class),
-    })
-    @GetMapping("listPage")
-    @ResponseBody
-    public Object listPage(String name,Long deptId, String status,String startDate,String endDate,String workerType){
-        Page<Worker> page = PageFactory.defaultPage();
-        QueryWrapper<Worker> queryWrapper = new QueryWrapper<>();
-        if(StrUtil.isNotEmpty(name)){
-            queryWrapper.like("WORKER_NAME",name);
-        }
-        if(ObjectUtil.isNotEmpty(deptId)){
-            queryWrapper.eq("DEPT_ID",deptId);
-        }
-        if(StrUtil.isNotEmpty(workerType)){
-            queryWrapper.eq("WORKER_TYPE",workerType);
-        }
-        if(StrUtil.isNotEmpty(startDate)){
-            queryWrapper.ge("CREATE_TIME",startDate + " 00:00:00");
-        }
-        if(StrUtil.isNotEmpty(endDate)){
-            queryWrapper.le("CREATE_TIME",endDate + " 23:59:59");
-        }
-        if(StrUtil.isNotEmpty(status)){
-            queryWrapper.eq("`STATUS`",status);
-        }
-        page = workerService.selectListPage(page,queryWrapper);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-    @ApiOperation("新增人员")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "worker", value = "人员信息", dataType = "Worker", paramType = "body", required = true),
-            @ApiImplicitParam(name = "projectId", value = "项目ID(入场申请需要)", dataType = "Long", paramType = "query", example = "0")
-    })
-    @PostMapping("add")
-    @ResponseBody
-    public Object add(@ApiParam("worker")@RequestBody Worker worker,
-                      @RequestParam(required = false) Long projectId){
-        workerService.addWorker(worker,projectId);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("编辑人员")
-    @PostMapping("update")
-    @ResponseBody
-    public Object update(@RequestBody Worker worker){
-        workerService.updateById(worker);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("删除人员")
-    @PostMapping("delete")
-    @ResponseBody
-    public Object delete(@ApiParam("人员id列表")@RequestBody List<Long> workIds){
-        workerService.removeByIds(workIds);
-        return ResponseData.success();
-    }
-
-
-    @ApiOperation(value = "获取人脸图片",notes = "返回人脸图片url")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "cameraIp",value = "摄像头IP", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "cameraPort",value = "摄像头端口号", dataType = "String", paramType = "query"),
-    })
-    @GetMapping("/face/register")
-    @ResponseBody
-    public Object faceRegister(String cameraIp,String cameraPort){
-        return ResponseData.success(workerService.faceRegister(cameraIp, cameraPort));
-    }
-
-
-    @ApiOperation(value = "查询临时入场人员列表")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "projectId", value = "项目ID",required = true,dataType = "Long", paramType = "query", example = "0")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = Worker.class),
-    })
-    @GetMapping("/projectTempWorker")
-    @ResponseBody
-    public Object projectTempWorker(Long projectId){
-        return ResponseData.success(workerService.projectTempWorker(projectId));
-    }
-
-}

diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/AlarmController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/AlarmController.java
new file mode 100644
index 0000000..1795cf1
--- /dev/null
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/AlarmController.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.modular.system.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.stereotype.Controller;
+
+/**
+ * <p>
+ * 报警记录表 前端控制器
+ * </p>
+ *
+ * @author zyj
+ * @since 2023-05-25
+ */
+@Controller
+@RequestMapping("/system/alarm")
+public class AlarmController {
+
+}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusAlarmController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusAlarmController.java
deleted file mode 100644
index 1f82ebb..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusAlarmController.java
+++ /dev/null
@@ -1,102 +0,0 @@
-package com.casic.missiles.modular.system.controller;
-
-
-import cn.hutool.core.util.ObjectUtil;
-import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.core.base.controller.BaseController;
-import com.casic.missiles.core.page.PageFactory;
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.AlarmUpload;
-import com.casic.missiles.modular.system.dto.DeviceDetailDTO;
-import com.casic.missiles.modular.system.entity.BusAlarm;
-import com.casic.missiles.modular.system.service.IBusAlarmService;
-import io.swagger.annotations.*;
-import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.*;
-
-import org.springframework.stereotype.Controller;
-
-import static com.casic.missiles.model.response.ResponseData.DEFAULT_SUCCESS_MESSAGE;
-import static com.casic.missiles.modular.system.consts.AlarmConst.ALARM_STATUS_MANUAL_CANCEL;
-
-/**
- * <p>
- * 报警记录表 前端控制器
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@Api(tags = "报警管理接口")
-@Controller
-@RequestMapping("/alarm")
-@RequiredArgsConstructor
-public class BusAlarmController extends BaseController {
-
-    private final IBusAlarmService alarmService;
-
-    @ApiOperation("报警上报接口")
-    @PostMapping("/upload")
-    @ResponseBody
-    public Object upload(@RequestBody AlarmUpload alarmUpload){
-        alarmService.alarmUpload(alarmUpload);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("报警列表分页查询")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "workTitle", value = "作业名称",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "projectId", value = "作业ID",dataType = "Long", paramType = "query",example = "0"),
-            @ApiImplicitParam(name = "alarmStatus", value = "报警状态",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "projectState", value = "作业状态",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "alarmType", value = "报警类型",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "alarmStartTime", value = "报警开始时间",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "alarmEndTime", value = "报警结束时间",dataType = "String", paramType = "query")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = BusAlarm.class),
-    })
-    @GetMapping("/listPage")
-    @ResponseBody
-    public Object listPage(String workTitle,Long projectId,String alarmStatus,String projectState,String alarmType,String alarmStartTime,String alarmEndTime){
-        Page<BusAlarm> page = PageFactory.defaultPage();
-        QueryWrapper<BusAlarm> queryWrapper = new QueryWrapper<>();
-        if(StrUtil.isNotEmpty(workTitle)){
-            queryWrapper.like("p.WORK_TITLE",workTitle);
-        }
-        if(ObjectUtil.isNotEmpty(projectId)){
-            queryWrapper.eq("alarm.PROJECT_ID",projectId);
-        }
-        if(StrUtil.isNotEmpty(alarmStatus)){
-            queryWrapper.eq("alarm.ALARM_STATUS",alarmStatus);
-        }
-        if(StrUtil.isNotEmpty(projectState)){
-            queryWrapper.eq("p.PROJECT_STATE",projectState);
-        }
-        if(StrUtil.isNotEmpty(alarmType)){
-            queryWrapper.eq("alarm.ALARM_TYPE",alarmType);
-        }
-        if(StrUtil.isNotEmpty(alarmStartTime)){
-            queryWrapper.ge("alarm.ALARM_TIME",alarmStartTime);
-        }
-        if(StrUtil.isNotEmpty(alarmEndTime)){
-            queryWrapper.le("alarm.ALARM_TIME",alarmEndTime);
-        }
-        page = alarmService.listPage(page,queryWrapper);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-    @ApiOperation("消警")
-    @PostMapping("/cancel")
-    @ResponseBody
-    public Object cancel(@RequestParam("alarmId") Long alarmId){
-        UpdateWrapper<BusAlarm> updateWrapper = new UpdateWrapper<>();
-        updateWrapper.eq("ID",alarmId);
-        updateWrapper.set("ALARM_STATUS",ALARM_STATUS_MANUAL_CANCEL);
-        alarmService.update(updateWrapper);
-        return ResponseData.success();
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusEventController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusEventController.java
deleted file mode 100644
index dde5aad..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusEventController.java
+++ /dev/null
@@ -1,41 +0,0 @@
-package com.casic.missiles.modular.system.controller;
-
-
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.entity.BusEvent;
-import com.casic.missiles.modular.system.service.IBusEventService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.ResponseBody;
-
-/**
- * <p>
- * 事件表 前端控制器
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@Controller
-@RequestMapping("/event")
-@Api(tags = "事件上报")
-@RequiredArgsConstructor
-public class BusEventController {
-
-    private final IBusEventService eventService;
-
-    @ApiOperation("事件上报")
-    @PostMapping("add")
-    @ResponseBody
-    public Object add(@RequestBody BusEvent busEvent){
-        eventService.saveBusEvent(busEvent);
-        return ResponseData.success();
-    }
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
index 03abc5f..aa50d78 100644
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
@@ -1,121 +1,20 @@
 package com.casic.missiles.modular.system.controller;
 
 
-import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.core.base.controller.BaseController;
-import com.casic.missiles.core.page.PageFactory;
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.DeviceDetailDTO;
-import com.casic.missiles.modular.system.entity.Device;
-import com.casic.missiles.modular.system.service.IDeviceExtService;
-import com.casic.missiles.modular.system.service.IDeviceService;
-import io.swagger.annotations.*;
-import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.RequestMapping;
 
 import org.springframework.stereotype.Controller;
 
-import java.time.LocalDateTime;
-import java.util.Date;
-import java.util.List;
-
-import static com.casic.missiles.model.response.ResponseData.DEFAULT_SUCCESS_MESSAGE;
-
 /**
  * <p>
- *  前端控制器
+ * 设备记录表 前端控制器
  * </p>
  *
  * @author zyj
- * @since 2023-04-14
+ * @since 2023-05-25
  */
-@Api(tags = "设备管理接口")
-@RequiredArgsConstructor
 @Controller
-@RequestMapping("/device")
-public class DeviceController extends BaseController {
-    private final IDeviceService deviceService;
-    private final IDeviceExtService deviceExtService;
-
-    @ApiOperation("设备分页列表")
-    @ApiImplicitParams({
-        @ApiImplicitParam(name = "deviceType", value = "设备类型",dataType = "String", paramType = "query"),
-        @ApiImplicitParam(name = "deviceCode", value = "设备编号",dataType = "String", paramType = "query"),
-        @ApiImplicitParam(name = "status", value = "设备状态",dataType = "String", paramType = "query"),
-        @ApiImplicitParam(name = "projectId", value = "作业ID（如果传此参数，列表中返回该作业使用的设备）",dataType = "Long", paramType = "query", example = "0")
-    })
-    @ApiResponses({
-        @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = DeviceDetailDTO.class),
-    })
-    @GetMapping("listPage")
-    @ResponseBody
-    public Object listPage(String deviceType, String deviceCode, String status,Long projectId){
-        Page<DeviceDetailDTO> page = PageFactory.defaultPage();
-        QueryWrapper<DeviceDetailDTO> queryWrapper = new QueryWrapper<>();
-        if(StrUtil.isNotEmpty(deviceType)){
-            queryWrapper.eq("DEVICE_TYPE",deviceType);
-        }
-        if(StrUtil.isNotEmpty(deviceCode)){
-            queryWrapper.like("DEVICE_CODE",deviceCode);
-        }
-        page = deviceService.listPage(page,queryWrapper,status,projectId);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-    @ApiOperation("新增设备")
-    @PostMapping("add")
-    @ResponseBody
-    public Object add(@RequestBody DeviceDetailDTO deviceDetailDTO){
-        deviceService.saveDevice(deviceDetailDTO);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("编辑设备")
-    @PostMapping("update")
-    @ResponseBody
-    public Object update(@RequestBody DeviceDetailDTO deviceDetailDTO){
-        deviceService.updateDevice(deviceDetailDTO);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("删除设备")
-    @PostMapping("delete")
-    @ResponseBody
-    public Object delete(@ApiParam("设备id列表")@RequestBody List<Long> deviceIds){
-        deviceService.deleteDevices(deviceIds);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("设置甲烷阈值")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "gasIp", value = "安全树甲烷设备IP",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "gasPort", value = "安全树甲烷端口",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "threshold", value = "甲烷阈值",dataType = "String", paramType = "query")
-    })
-    @PostMapping("setThreshold")
-    @ResponseBody
-    public Object setThreshold(String gasIp,String gasPort,String threshold){
-        deviceExtService.setGasThreshold(gasIp, gasPort, threshold);
-        return ResponseData.success();
-    }
-
-
-    @ApiOperation("查询甲烷阈值")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "gasIp", value = "安全树甲烷设备IP",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "gasPort", value = "安全树甲烷端口",dataType = "String", paramType = "query")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = "{\"code\": 200,\"data\": \"100\",\"message\": \"请求成功\",\"success\": true}",response = String.class),
-    })
-    @GetMapping("getThreshold")
-    @ResponseBody
-    public Object getThreshold(String gasIp,String gasPort){
-        String data = deviceExtService.getGasThreshold(gasIp, gasPort);
-        return ResponseData.success(data);
-    }
-
+@RequestMapping("/system/device")
+public class DeviceController {
 
 }
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/OverviewController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/OverviewController.java
deleted file mode 100644
index 7570504..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/OverviewController.java
+++ /dev/null
@@ -1,70 +0,0 @@
-package com.casic.missiles.modular.system.controller;
-
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.AlarmTypeCountDTO;
-import com.casic.missiles.modular.system.dto.DeviceLocationDTO;
-import com.casic.missiles.modular.system.dto.WorkerLocationDTO;
-import com.casic.missiles.modular.system.service.IBusAlarmService;
-import com.casic.missiles.modular.system.service.IProjectDeviceService;
-import com.casic.missiles.modular.system.service.IProjectWorkerService;
-import io.swagger.annotations.*;
-import lombok.RequiredArgsConstructor;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.ResponseBody;
-
-import static com.casic.missiles.model.response.ResponseData.DEFAULT_SUCCESS_MESSAGE;
-import static com.casic.missiles.modular.system.consts.AlarmConst.ALARM_STATUS_ON;
-
-@Api(tags = "首页看板接口")
-@Controller
-@RequestMapping("overview")
-@RequiredArgsConstructor
-public class OverviewController {
-
-    private final IBusAlarmService alarmService;
-    private final IProjectDeviceService projectDeviceService;
-
-    private final IProjectWorkerService projectWorkerService;
-
-
-    @ApiOperation("报警统计接口")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "projectId", value = "作业ID",dataType = "Long", paramType = "query", example = "0")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = AlarmTypeCountDTO.class),
-    })
-    @GetMapping("/alarmCount")
-    @ResponseBody
-    public Object alarmCount(Long projectId){
-        return ResponseData.success(alarmService.alarmCount(projectId,ALARM_STATUS_ON));
-    }
-
-    @ApiOperation("设备列表接口")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "projectId", value = "作业ID",dataType = "Long", paramType = "query", example = "0")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = DeviceLocationDTO.class),
-    })
-    @GetMapping("/deviceList")
-    @ResponseBody
-    public Object deviceList(Long projectId){
-        return ResponseData.success(projectDeviceService.selectDeviceLocationList(projectId));
-    }
-
-    @ApiOperation("人员列表接口")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "projectId", value = "作业ID",dataType = "Long", paramType = "query", example = "0")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = WorkerLocationDTO.class),
-    })
-    @GetMapping("/workerList")
-    @ResponseBody
-    public Object workerList(Long projectId){
-        return ResponseData.success(projectWorkerService.selectWorkerLocationDTO(projectId));
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/WorkSiteInfoController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/WorkSiteInfoController.java
deleted file mode 100644
index af36d69..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/WorkSiteInfoController.java
+++ /dev/null
@@ -1,130 +0,0 @@
-package com.casic.missiles.modular.system.controller;
-
-
-import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.core.base.controller.BaseController;
-import com.casic.missiles.core.page.PageFactory;
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.WorkSiteDetailDTO;
-import com.casic.missiles.modular.system.entity.WorkSiteInfo;
-import com.casic.missiles.modular.system.service.IWorkSiteInfoService;
-import io.swagger.annotations.*;
-import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.*;
-
-import org.springframework.stereotype.Controller;
-
-import java.util.List;
-
-import static com.casic.missiles.model.response.ResponseData.DEFAULT_SUCCESS_MESSAGE;
-
-/**
- * <p>
- * 作业现场表 前端控制器
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@Controller
-@RequestMapping("/site")
-@Api(tags = "作业现场管理")
-@RequiredArgsConstructor
-public class WorkSiteInfoController extends BaseController {
-
-
-    private final IWorkSiteInfoService workSiteInfoService;
-
-    @ApiOperation("新增作业现场")
-    @PostMapping("add")
-    @ResponseBody
-    public Object addWorkSite(@RequestBody WorkSiteDetailDTO workSiteDetailDTO){
-        workSiteInfoService.addWorkSiteInfo(workSiteDetailDTO);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("编辑作业现场")
-    @PostMapping("update")
-    @ResponseBody
-    public Object updateWorkSite(@RequestBody WorkSiteDetailDTO workSiteDetailDTO){
-        workSiteInfoService.updateWorkSiteInfo(workSiteDetailDTO);
-        return ResponseData.success();
-    }
-
-
-    @ApiOperation("删除作业现场")
-    @PostMapping("delete")
-    @ResponseBody
-    public Object delete(@ApiParam("作业现场id列表")@RequestBody List<Long> projectIds){
-        workSiteInfoService.deleteProjects(projectIds);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("查询作业现场详情")
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = WorkSiteDetailDTO.class),
-    })
-    @GetMapping("detail")
-    @ResponseBody
-    public Object delete(@ApiParam(value = "作业现场id", example = "0")@RequestParam Long projectId){
-        WorkSiteDetailDTO detailDTO = workSiteInfoService.getWorkSiteDetail(projectId);
-        return ResponseData.success(detailDTO);
-    }
-
-    @ApiOperation("分页列表查询")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "workTitle",value = "作业名称", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "workRoad",value = "所属道路", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "workPersonName",value = "责任人姓名", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "startDate",value = "注册开始日期", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "endDate",value = "注册结束日期", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "projectState",value = "当前状态（字典值）", dataType = "String", paramType = "query")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = WorkSiteInfo.class),
-    })
-    @GetMapping("listPage")
-    @ResponseBody
-    public Object listPage(String workTitle,String workRoad,String workPersonName,String projectState,String startDate,String endDate){
-        Page<WorkSiteInfo> page = PageFactory.defaultPage();
-        QueryWrapper<WorkSiteInfo> queryWrapper = new QueryWrapper<>();
-        if(StrUtil.isNotEmpty(workTitle)){
-            queryWrapper.like("WORK_TITLE",workTitle);
-        }
-        if(StrUtil.isNotEmpty(workRoad)){
-            queryWrapper.like("WORK_ROAD",workRoad);
-        }
-        if(StrUtil.isNotEmpty(workPersonName)){
-            queryWrapper.like("WORKER_NAME",workPersonName);
-        }
-        if(StrUtil.isNotEmpty(projectState)){
-            queryWrapper.eq("PROJECT_STATE",projectState);
-        }
-        if(StrUtil.isNotEmpty(startDate)){
-            queryWrapper.ge("br_work_site_info.CREATE_TIME",startDate + " 00:00:00");
-        }
-        if(StrUtil.isNotEmpty(endDate)){
-            queryWrapper.le("br_work_site_info.CREATE_TIME",endDate + " 23:59:59");
-        }
-        page = workSiteInfoService.selectListPage(page,queryWrapper);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-    @ApiOperation("开始作业")
-    @PostMapping("start")
-    @ResponseBody
-    public Object start(@ApiParam(value = "作业现场id",example = "0")@RequestParam Long projectId){
-        workSiteInfoService.start(projectId);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("完成作业")
-    @PostMapping("finish")
-    @ResponseBody
-    public Object finish(@ApiParam(value = "作业现场id", example = "0")@RequestParam Long projectId){
-        workSiteInfoService.finish(projectId);
-        return ResponseData.success();
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/WorkerController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/WorkerController.java
deleted file mode 100644
index 796f94c..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/WorkerController.java
+++ /dev/null
@@ -1,136 +0,0 @@
-package com.casic.missiles.modular.system.controller;
-
-
-import cn.hutool.core.util.ObjectUtil;
-import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.core.base.controller.BaseController;
-import com.casic.missiles.core.page.PageFactory;
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.DeviceDetailDTO;
-import com.casic.missiles.modular.system.entity.Device;
-import com.casic.missiles.modular.system.entity.Worker;
-import com.casic.missiles.modular.system.service.IWorkerService;
-import io.swagger.annotations.*;
-import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.*;
-
-import org.springframework.stereotype.Controller;
-
-import java.util.Date;
-import java.util.List;
-
-import static com.casic.missiles.model.response.ResponseData.DEFAULT_SUCCESS_MESSAGE;
-
-/**
- * <p>
- *  前端控制器
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@Controller
-@RequestMapping("/worker")
-@RequiredArgsConstructor
-@Api(tags = "人员管理接口")
-public class WorkerController extends BaseController {
-
-    private final IWorkerService workerService;
-
-    @ApiOperation("分页列表查询")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "name",value = "姓名", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "deptId",value = "所属部门", dataType = "Long", paramType = "query", example = "0"),
-            @ApiImplicitParam(name = "status",value = "当前状态（字典值）", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "startDate",value = "注册开始日期", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "endDate",value = "注册结束日期", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "workerType",value = "人员类型（字典值）", dataType = "String", paramType = "query")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = Worker.class),
-    })
-    @GetMapping("listPage")
-    @ResponseBody
-    public Object listPage(String name,Long deptId, String status,String startDate,String endDate,String workerType){
-        Page<Worker> page = PageFactory.defaultPage();
-        QueryWrapper<Worker> queryWrapper = new QueryWrapper<>();
-        if(StrUtil.isNotEmpty(name)){
-            queryWrapper.like("WORKER_NAME",name);
-        }
-        if(ObjectUtil.isNotEmpty(deptId)){
-            queryWrapper.eq("DEPT_ID",deptId);
-        }
-        if(StrUtil.isNotEmpty(workerType)){
-            queryWrapper.eq("WORKER_TYPE",workerType);
-        }
-        if(StrUtil.isNotEmpty(startDate)){
-            queryWrapper.ge("CREATE_TIME",startDate + " 00:00:00");
-        }
-        if(StrUtil.isNotEmpty(endDate)){
-            queryWrapper.le("CREATE_TIME",endDate + " 23:59:59");
-        }
-        if(StrUtil.isNotEmpty(status)){
-            queryWrapper.eq("`STATUS`",status);
-        }
-        page = workerService.selectListPage(page,queryWrapper);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-    @ApiOperation("新增人员")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "worker", value = "人员信息", dataType = "Worker", paramType = "body", required = true),
-            @ApiImplicitParam(name = "projectId", value = "项目ID(入场申请需要)", dataType = "Long", paramType = "query", example = "0")
-    })
-    @PostMapping("add")
-    @ResponseBody
-    public Object add(@ApiParam("worker")@RequestBody Worker worker,
-                      @RequestParam(required = false) Long projectId){
-        workerService.addWorker(worker,projectId);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("编辑人员")
-    @PostMapping("update")
-    @ResponseBody
-    public Object update(@RequestBody Worker worker){
-        workerService.updateById(worker);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("删除人员")
-    @PostMapping("delete")
-    @ResponseBody
-    public Object delete(@ApiParam("人员id列表")@RequestBody List<Long> workIds){
-        workerService.removeByIds(workIds);
-        return ResponseData.success();
-    }
-
-
-    @ApiOperation(value = "获取人脸图片",notes = "返回人脸图片url")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "cameraIp",value = "摄像头IP", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "cameraPort",value = "摄像头端口号", dataType = "String", paramType = "query"),
-    })
-    @GetMapping("/face/register")
-    @ResponseBody
-    public Object faceRegister(String cameraIp,String cameraPort){
-        return ResponseData.success(workerService.faceRegister(cameraIp, cameraPort));
-    }
-
-
-    @ApiOperation(value = "查询临时入场人员列表")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "projectId", value = "项目ID",required = true,dataType = "Long", paramType = "query", example = "0")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = Worker.class),
-    })
-    @GetMapping("/projectTempWorker")
-    @ResponseBody
-    public Object projectTempWorker(Long projectId){
-        return ResponseData.success(workerService.projectTempWorker(projectId));
-    }
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/AlarmTypeCountDTO.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/AlarmTypeCountDTO.java
deleted file mode 100644
index 1a165a1..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/AlarmTypeCountDTO.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.casic.missiles.modular.system.dto;
-
-import io.swagger.annotations.ApiModel;
-import lombok.Data;
-
-@ApiModel(value = "AlarmTypeCountDTO",description = "报警类型统计（首页）")
-@Data
-public class AlarmTypeCountDTO {
-
-    private String alarmType;
-    private String alarmTypeName;
-    private Integer alarmCount;
-}

diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/AlarmController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/AlarmController.java
new file mode 100644
index 0000000..1795cf1
--- /dev/null
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/AlarmController.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.modular.system.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.stereotype.Controller;
+
+/**
+ * <p>
+ * 报警记录表 前端控制器
+ * </p>
+ *
+ * @author zyj
+ * @since 2023-05-25
+ */
+@Controller
+@RequestMapping("/system/alarm")
+public class AlarmController {
+
+}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusAlarmController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusAlarmController.java
deleted file mode 100644
index 1f82ebb..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusAlarmController.java
+++ /dev/null
@@ -1,102 +0,0 @@
-package com.casic.missiles.modular.system.controller;
-
-
-import cn.hutool.core.util.ObjectUtil;
-import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.core.base.controller.BaseController;
-import com.casic.missiles.core.page.PageFactory;
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.AlarmUpload;
-import com.casic.missiles.modular.system.dto.DeviceDetailDTO;
-import com.casic.missiles.modular.system.entity.BusAlarm;
-import com.casic.missiles.modular.system.service.IBusAlarmService;
-import io.swagger.annotations.*;
-import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.*;
-
-import org.springframework.stereotype.Controller;
-
-import static com.casic.missiles.model.response.ResponseData.DEFAULT_SUCCESS_MESSAGE;
-import static com.casic.missiles.modular.system.consts.AlarmConst.ALARM_STATUS_MANUAL_CANCEL;
-
-/**
- * <p>
- * 报警记录表 前端控制器
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@Api(tags = "报警管理接口")
-@Controller
-@RequestMapping("/alarm")
-@RequiredArgsConstructor
-public class BusAlarmController extends BaseController {
-
-    private final IBusAlarmService alarmService;
-
-    @ApiOperation("报警上报接口")
-    @PostMapping("/upload")
-    @ResponseBody
-    public Object upload(@RequestBody AlarmUpload alarmUpload){
-        alarmService.alarmUpload(alarmUpload);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("报警列表分页查询")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "workTitle", value = "作业名称",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "projectId", value = "作业ID",dataType = "Long", paramType = "query",example = "0"),
-            @ApiImplicitParam(name = "alarmStatus", value = "报警状态",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "projectState", value = "作业状态",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "alarmType", value = "报警类型",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "alarmStartTime", value = "报警开始时间",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "alarmEndTime", value = "报警结束时间",dataType = "String", paramType = "query")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = BusAlarm.class),
-    })
-    @GetMapping("/listPage")
-    @ResponseBody
-    public Object listPage(String workTitle,Long projectId,String alarmStatus,String projectState,String alarmType,String alarmStartTime,String alarmEndTime){
-        Page<BusAlarm> page = PageFactory.defaultPage();
-        QueryWrapper<BusAlarm> queryWrapper = new QueryWrapper<>();
-        if(StrUtil.isNotEmpty(workTitle)){
-            queryWrapper.like("p.WORK_TITLE",workTitle);
-        }
-        if(ObjectUtil.isNotEmpty(projectId)){
-            queryWrapper.eq("alarm.PROJECT_ID",projectId);
-        }
-        if(StrUtil.isNotEmpty(alarmStatus)){
-            queryWrapper.eq("alarm.ALARM_STATUS",alarmStatus);
-        }
-        if(StrUtil.isNotEmpty(projectState)){
-            queryWrapper.eq("p.PROJECT_STATE",projectState);
-        }
-        if(StrUtil.isNotEmpty(alarmType)){
-            queryWrapper.eq("alarm.ALARM_TYPE",alarmType);
-        }
-        if(StrUtil.isNotEmpty(alarmStartTime)){
-            queryWrapper.ge("alarm.ALARM_TIME",alarmStartTime);
-        }
-        if(StrUtil.isNotEmpty(alarmEndTime)){
-            queryWrapper.le("alarm.ALARM_TIME",alarmEndTime);
-        }
-        page = alarmService.listPage(page,queryWrapper);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-    @ApiOperation("消警")
-    @PostMapping("/cancel")
-    @ResponseBody
-    public Object cancel(@RequestParam("alarmId") Long alarmId){
-        UpdateWrapper<BusAlarm> updateWrapper = new UpdateWrapper<>();
-        updateWrapper.eq("ID",alarmId);
-        updateWrapper.set("ALARM_STATUS",ALARM_STATUS_MANUAL_CANCEL);
-        alarmService.update(updateWrapper);
-        return ResponseData.success();
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusEventController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusEventController.java
deleted file mode 100644
index dde5aad..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusEventController.java
+++ /dev/null
@@ -1,41 +0,0 @@
-package com.casic.missiles.modular.system.controller;
-
-
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.entity.BusEvent;
-import com.casic.missiles.modular.system.service.IBusEventService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.ResponseBody;
-
-/**
- * <p>
- * 事件表 前端控制器
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@Controller
-@RequestMapping("/event")
-@Api(tags = "事件上报")
-@RequiredArgsConstructor
-public class BusEventController {
-
-    private final IBusEventService eventService;
-
-    @ApiOperation("事件上报")
-    @PostMapping("add")
-    @ResponseBody
-    public Object add(@RequestBody BusEvent busEvent){
-        eventService.saveBusEvent(busEvent);
-        return ResponseData.success();
-    }
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
index 03abc5f..aa50d78 100644
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
@@ -1,121 +1,20 @@
 package com.casic.missiles.modular.system.controller;
 
 
-import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.core.base.controller.BaseController;
-import com.casic.missiles.core.page.PageFactory;
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.DeviceDetailDTO;
-import com.casic.missiles.modular.system.entity.Device;
-import com.casic.missiles.modular.system.service.IDeviceExtService;
-import com.casic.missiles.modular.system.service.IDeviceService;
-import io.swagger.annotations.*;
-import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.RequestMapping;
 
 import org.springframework.stereotype.Controller;
 
-import java.time.LocalDateTime;
-import java.util.Date;
-import java.util.List;
-
-import static com.casic.missiles.model.response.ResponseData.DEFAULT_SUCCESS_MESSAGE;
-
 /**
  * <p>
- *  前端控制器
+ * 设备记录表 前端控制器
  * </p>
  *
  * @author zyj
- * @since 2023-04-14
+ * @since 2023-05-25
  */
-@Api(tags = "设备管理接口")
-@RequiredArgsConstructor
 @Controller
-@RequestMapping("/device")
-public class DeviceController extends BaseController {
-    private final IDeviceService deviceService;
-    private final IDeviceExtService deviceExtService;
-
-    @ApiOperation("设备分页列表")
-    @ApiImplicitParams({
-        @ApiImplicitParam(name = "deviceType", value = "设备类型",dataType = "String", paramType = "query"),
-        @ApiImplicitParam(name = "deviceCode", value = "设备编号",dataType = "String", paramType = "query"),
-        @ApiImplicitParam(name = "status", value = "设备状态",dataType = "String", paramType = "query"),
-        @ApiImplicitParam(name = "projectId", value = "作业ID（如果传此参数，列表中返回该作业使用的设备）",dataType = "Long", paramType = "query", example = "0")
-    })
-    @ApiResponses({
-        @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = DeviceDetailDTO.class),
-    })
-    @GetMapping("listPage")
-    @ResponseBody
-    public Object listPage(String deviceType, String deviceCode, String status,Long projectId){
-        Page<DeviceDetailDTO> page = PageFactory.defaultPage();
-        QueryWrapper<DeviceDetailDTO> queryWrapper = new QueryWrapper<>();
-        if(StrUtil.isNotEmpty(deviceType)){
-            queryWrapper.eq("DEVICE_TYPE",deviceType);
-        }
-        if(StrUtil.isNotEmpty(deviceCode)){
-            queryWrapper.like("DEVICE_CODE",deviceCode);
-        }
-        page = deviceService.listPage(page,queryWrapper,status,projectId);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-    @ApiOperation("新增设备")
-    @PostMapping("add")
-    @ResponseBody
-    public Object add(@RequestBody DeviceDetailDTO deviceDetailDTO){
-        deviceService.saveDevice(deviceDetailDTO);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("编辑设备")
-    @PostMapping("update")
-    @ResponseBody
-    public Object update(@RequestBody DeviceDetailDTO deviceDetailDTO){
-        deviceService.updateDevice(deviceDetailDTO);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("删除设备")
-    @PostMapping("delete")
-    @ResponseBody
-    public Object delete(@ApiParam("设备id列表")@RequestBody List<Long> deviceIds){
-        deviceService.deleteDevices(deviceIds);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("设置甲烷阈值")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "gasIp", value = "安全树甲烷设备IP",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "gasPort", value = "安全树甲烷端口",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "threshold", value = "甲烷阈值",dataType = "String", paramType = "query")
-    })
-    @PostMapping("setThreshold")
-    @ResponseBody
-    public Object setThreshold(String gasIp,String gasPort,String threshold){
-        deviceExtService.setGasThreshold(gasIp, gasPort, threshold);
-        return ResponseData.success();
-    }
-
-
-    @ApiOperation("查询甲烷阈值")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "gasIp", value = "安全树甲烷设备IP",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "gasPort", value = "安全树甲烷端口",dataType = "String", paramType = "query")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = "{\"code\": 200,\"data\": \"100\",\"message\": \"请求成功\",\"success\": true}",response = String.class),
-    })
-    @GetMapping("getThreshold")
-    @ResponseBody
-    public Object getThreshold(String gasIp,String gasPort){
-        String data = deviceExtService.getGasThreshold(gasIp, gasPort);
-        return ResponseData.success(data);
-    }
-
+@RequestMapping("/system/device")
+public class DeviceController {
 
 }
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/OverviewController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/OverviewController.java
deleted file mode 100644
index 7570504..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/OverviewController.java
+++ /dev/null
@@ -1,70 +0,0 @@
-package com.casic.missiles.modular.system.controller;
-
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.AlarmTypeCountDTO;
-import com.casic.missiles.modular.system.dto.DeviceLocationDTO;
-import com.casic.missiles.modular.system.dto.WorkerLocationDTO;
-import com.casic.missiles.modular.system.service.IBusAlarmService;
-import com.casic.missiles.modular.system.service.IProjectDeviceService;
-import com.casic.missiles.modular.system.service.IProjectWorkerService;
-import io.swagger.annotations.*;
-import lombok.RequiredArgsConstructor;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.ResponseBody;
-
-import static com.casic.missiles.model.response.ResponseData.DEFAULT_SUCCESS_MESSAGE;
-import static com.casic.missiles.modular.system.consts.AlarmConst.ALARM_STATUS_ON;
-
-@Api(tags = "首页看板接口")
-@Controller
-@RequestMapping("overview")
-@RequiredArgsConstructor
-public class OverviewController {
-
-    private final IBusAlarmService alarmService;
-    private final IProjectDeviceService projectDeviceService;
-
-    private final IProjectWorkerService projectWorkerService;
-
-
-    @ApiOperation("报警统计接口")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "projectId", value = "作业ID",dataType = "Long", paramType = "query", example = "0")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = AlarmTypeCountDTO.class),
-    })
-    @GetMapping("/alarmCount")
-    @ResponseBody
-    public Object alarmCount(Long projectId){
-        return ResponseData.success(alarmService.alarmCount(projectId,ALARM_STATUS_ON));
-    }
-
-    @ApiOperation("设备列表接口")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "projectId", value = "作业ID",dataType = "Long", paramType = "query", example = "0")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = DeviceLocationDTO.class),
-    })
-    @GetMapping("/deviceList")
-    @ResponseBody
-    public Object deviceList(Long projectId){
-        return ResponseData.success(projectDeviceService.selectDeviceLocationList(projectId));
-    }
-
-    @ApiOperation("人员列表接口")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "projectId", value = "作业ID",dataType = "Long", paramType = "query", example = "0")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = WorkerLocationDTO.class),
-    })
-    @GetMapping("/workerList")
-    @ResponseBody
-    public Object workerList(Long projectId){
-        return ResponseData.success(projectWorkerService.selectWorkerLocationDTO(projectId));
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/WorkSiteInfoController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/WorkSiteInfoController.java
deleted file mode 100644
index af36d69..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/WorkSiteInfoController.java
+++ /dev/null
@@ -1,130 +0,0 @@
-package com.casic.missiles.modular.system.controller;
-
-
-import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.core.base.controller.BaseController;
-import com.casic.missiles.core.page.PageFactory;
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.WorkSiteDetailDTO;
-import com.casic.missiles.modular.system.entity.WorkSiteInfo;
-import com.casic.missiles.modular.system.service.IWorkSiteInfoService;
-import io.swagger.annotations.*;
-import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.*;
-
-import org.springframework.stereotype.Controller;
-
-import java.util.List;
-
-import static com.casic.missiles.model.response.ResponseData.DEFAULT_SUCCESS_MESSAGE;
-
-/**
- * <p>
- * 作业现场表 前端控制器
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@Controller
-@RequestMapping("/site")
-@Api(tags = "作业现场管理")
-@RequiredArgsConstructor
-public class WorkSiteInfoController extends BaseController {
-
-
-    private final IWorkSiteInfoService workSiteInfoService;
-
-    @ApiOperation("新增作业现场")
-    @PostMapping("add")
-    @ResponseBody
-    public Object addWorkSite(@RequestBody WorkSiteDetailDTO workSiteDetailDTO){
-        workSiteInfoService.addWorkSiteInfo(workSiteDetailDTO);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("编辑作业现场")
-    @PostMapping("update")
-    @ResponseBody
-    public Object updateWorkSite(@RequestBody WorkSiteDetailDTO workSiteDetailDTO){
-        workSiteInfoService.updateWorkSiteInfo(workSiteDetailDTO);
-        return ResponseData.success();
-    }
-
-
-    @ApiOperation("删除作业现场")
-    @PostMapping("delete")
-    @ResponseBody
-    public Object delete(@ApiParam("作业现场id列表")@RequestBody List<Long> projectIds){
-        workSiteInfoService.deleteProjects(projectIds);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("查询作业现场详情")
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = WorkSiteDetailDTO.class),
-    })
-    @GetMapping("detail")
-    @ResponseBody
-    public Object delete(@ApiParam(value = "作业现场id", example = "0")@RequestParam Long projectId){
-        WorkSiteDetailDTO detailDTO = workSiteInfoService.getWorkSiteDetail(projectId);
-        return ResponseData.success(detailDTO);
-    }
-
-    @ApiOperation("分页列表查询")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "workTitle",value = "作业名称", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "workRoad",value = "所属道路", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "workPersonName",value = "责任人姓名", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "startDate",value = "注册开始日期", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "endDate",value = "注册结束日期", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "projectState",value = "当前状态（字典值）", dataType = "String", paramType = "query")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = WorkSiteInfo.class),
-    })
-    @GetMapping("listPage")
-    @ResponseBody
-    public Object listPage(String workTitle,String workRoad,String workPersonName,String projectState,String startDate,String endDate){
-        Page<WorkSiteInfo> page = PageFactory.defaultPage();
-        QueryWrapper<WorkSiteInfo> queryWrapper = new QueryWrapper<>();
-        if(StrUtil.isNotEmpty(workTitle)){
-            queryWrapper.like("WORK_TITLE",workTitle);
-        }
-        if(StrUtil.isNotEmpty(workRoad)){
-            queryWrapper.like("WORK_ROAD",workRoad);
-        }
-        if(StrUtil.isNotEmpty(workPersonName)){
-            queryWrapper.like("WORKER_NAME",workPersonName);
-        }
-        if(StrUtil.isNotEmpty(projectState)){
-            queryWrapper.eq("PROJECT_STATE",projectState);
-        }
-        if(StrUtil.isNotEmpty(startDate)){
-            queryWrapper.ge("br_work_site_info.CREATE_TIME",startDate + " 00:00:00");
-        }
-        if(StrUtil.isNotEmpty(endDate)){
-            queryWrapper.le("br_work_site_info.CREATE_TIME",endDate + " 23:59:59");
-        }
-        page = workSiteInfoService.selectListPage(page,queryWrapper);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-    @ApiOperation("开始作业")
-    @PostMapping("start")
-    @ResponseBody
-    public Object start(@ApiParam(value = "作业现场id",example = "0")@RequestParam Long projectId){
-        workSiteInfoService.start(projectId);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("完成作业")
-    @PostMapping("finish")
-    @ResponseBody
-    public Object finish(@ApiParam(value = "作业现场id", example = "0")@RequestParam Long projectId){
-        workSiteInfoService.finish(projectId);
-        return ResponseData.success();
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/WorkerController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/WorkerController.java
deleted file mode 100644
index 796f94c..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/WorkerController.java
+++ /dev/null
@@ -1,136 +0,0 @@
-package com.casic.missiles.modular.system.controller;
-
-
-import cn.hutool.core.util.ObjectUtil;
-import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.core.base.controller.BaseController;
-import com.casic.missiles.core.page.PageFactory;
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.DeviceDetailDTO;
-import com.casic.missiles.modular.system.entity.Device;
-import com.casic.missiles.modular.system.entity.Worker;
-import com.casic.missiles.modular.system.service.IWorkerService;
-import io.swagger.annotations.*;
-import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.*;
-
-import org.springframework.stereotype.Controller;
-
-import java.util.Date;
-import java.util.List;
-
-import static com.casic.missiles.model.response.ResponseData.DEFAULT_SUCCESS_MESSAGE;
-
-/**
- * <p>
- *  前端控制器
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@Controller
-@RequestMapping("/worker")
-@RequiredArgsConstructor
-@Api(tags = "人员管理接口")
-public class WorkerController extends BaseController {
-
-    private final IWorkerService workerService;
-
-    @ApiOperation("分页列表查询")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "name",value = "姓名", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "deptId",value = "所属部门", dataType = "Long", paramType = "query", example = "0"),
-            @ApiImplicitParam(name = "status",value = "当前状态（字典值）", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "startDate",value = "注册开始日期", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "endDate",value = "注册结束日期", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "workerType",value = "人员类型（字典值）", dataType = "String", paramType = "query")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = Worker.class),
-    })
-    @GetMapping("listPage")
-    @ResponseBody
-    public Object listPage(String name,Long deptId, String status,String startDate,String endDate,String workerType){
-        Page<Worker> page = PageFactory.defaultPage();
-        QueryWrapper<Worker> queryWrapper = new QueryWrapper<>();
-        if(StrUtil.isNotEmpty(name)){
-            queryWrapper.like("WORKER_NAME",name);
-        }
-        if(ObjectUtil.isNotEmpty(deptId)){
-            queryWrapper.eq("DEPT_ID",deptId);
-        }
-        if(StrUtil.isNotEmpty(workerType)){
-            queryWrapper.eq("WORKER_TYPE",workerType);
-        }
-        if(StrUtil.isNotEmpty(startDate)){
-            queryWrapper.ge("CREATE_TIME",startDate + " 00:00:00");
-        }
-        if(StrUtil.isNotEmpty(endDate)){
-            queryWrapper.le("CREATE_TIME",endDate + " 23:59:59");
-        }
-        if(StrUtil.isNotEmpty(status)){
-            queryWrapper.eq("`STATUS`",status);
-        }
-        page = workerService.selectListPage(page,queryWrapper);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-    @ApiOperation("新增人员")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "worker", value = "人员信息", dataType = "Worker", paramType = "body", required = true),
-            @ApiImplicitParam(name = "projectId", value = "项目ID(入场申请需要)", dataType = "Long", paramType = "query", example = "0")
-    })
-    @PostMapping("add")
-    @ResponseBody
-    public Object add(@ApiParam("worker")@RequestBody Worker worker,
-                      @RequestParam(required = false) Long projectId){
-        workerService.addWorker(worker,projectId);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("编辑人员")
-    @PostMapping("update")
-    @ResponseBody
-    public Object update(@RequestBody Worker worker){
-        workerService.updateById(worker);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("删除人员")
-    @PostMapping("delete")
-    @ResponseBody
-    public Object delete(@ApiParam("人员id列表")@RequestBody List<Long> workIds){
-        workerService.removeByIds(workIds);
-        return ResponseData.success();
-    }
-
-
-    @ApiOperation(value = "获取人脸图片",notes = "返回人脸图片url")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "cameraIp",value = "摄像头IP", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "cameraPort",value = "摄像头端口号", dataType = "String", paramType = "query"),
-    })
-    @GetMapping("/face/register")
-    @ResponseBody
-    public Object faceRegister(String cameraIp,String cameraPort){
-        return ResponseData.success(workerService.faceRegister(cameraIp, cameraPort));
-    }
-
-
-    @ApiOperation(value = "查询临时入场人员列表")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "projectId", value = "项目ID",required = true,dataType = "Long", paramType = "query", example = "0")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = Worker.class),
-    })
-    @GetMapping("/projectTempWorker")
-    @ResponseBody
-    public Object projectTempWorker(Long projectId){
-        return ResponseData.success(workerService.projectTempWorker(projectId));
-    }
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/AlarmTypeCountDTO.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/AlarmTypeCountDTO.java
deleted file mode 100644
index 1a165a1..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/AlarmTypeCountDTO.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.casic.missiles.modular.system.dto;
-
-import io.swagger.annotations.ApiModel;
-import lombok.Data;
-
-@ApiModel(value = "AlarmTypeCountDTO",description = "报警类型统计（首页）")
-@Data
-public class AlarmTypeCountDTO {
-
-    private String alarmType;
-    private String alarmTypeName;
-    private Integer alarmCount;
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/AlarmUpload.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/AlarmUpload.java
deleted file mode 100644
index 73d7799..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/AlarmUpload.java
+++ /dev/null
@@ -1,46 +0,0 @@
-package com.casic.missiles.modular.system.dto;
-
-import cn.hutool.core.util.StrUtil;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-@ApiModel(value = "AlarmUpload",description = "报警上传")
-@Data
-public class AlarmUpload {
-
-    @ApiModelProperty(value = "摄像头ip")
-    private String cameraIp;
-
-    @ApiModelProperty(value = "摄像头端口")
-    private String cameraPort;
-    @ApiModelProperty(value = "安全树甲烷设备ip")
-    private String gasIp;
-    @ApiModelProperty(value = "安全树甲烷设备端口")
-    private String gasPort;
-    @ApiModelProperty(value = "报警值")
-    private String alarmValue;
-    @ApiModelProperty(value = "报警时间")
-    private String alarmTime;
-    @ApiModelProperty(value = "报警类型")
-    private String alarmType;
-    @ApiModelProperty(value = "报警图片")
-    private String alarmImage;
-    @ApiModelProperty(value = "报警内容")
-    private String alarmContent;
-
-    @Override
-    public String toString() {
-        return "AlarmUpload{" +
-                "cameraIp='" + cameraIp + '\'' +
-                ", cameraPort='" + cameraPort + '\'' +
-                ", gasIp='" + gasIp + '\'' +
-                ", gasPort='" + gasPort + '\'' +
-                ", alarmValue='" + alarmValue + '\'' +
-                ", alarmTime='" + alarmTime + '\'' +
-                ", alarmType='" + alarmType + '\'' +
-                ", alarmImage='" + (StrUtil.isNotEmpty(alarmImage) ? alarmImage.substring(0,50) : "null") + '\'' +
-                ", alarmContent='" + alarmContent + '\'' +
-                '}';
-    }
-}

diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/AlarmController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/AlarmController.java
new file mode 100644
index 0000000..1795cf1
--- /dev/null
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/AlarmController.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.modular.system.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.stereotype.Controller;
+
+/**
+ * <p>
+ * 报警记录表 前端控制器
+ * </p>
+ *
+ * @author zyj
+ * @since 2023-05-25
+ */
+@Controller
+@RequestMapping("/system/alarm")
+public class AlarmController {
+
+}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusAlarmController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusAlarmController.java
deleted file mode 100644
index 1f82ebb..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusAlarmController.java
+++ /dev/null
@@ -1,102 +0,0 @@
-package com.casic.missiles.modular.system.controller;
-
-
-import cn.hutool.core.util.ObjectUtil;
-import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.core.base.controller.BaseController;
-import com.casic.missiles.core.page.PageFactory;
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.AlarmUpload;
-import com.casic.missiles.modular.system.dto.DeviceDetailDTO;
-import com.casic.missiles.modular.system.entity.BusAlarm;
-import com.casic.missiles.modular.system.service.IBusAlarmService;
-import io.swagger.annotations.*;
-import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.*;
-
-import org.springframework.stereotype.Controller;
-
-import static com.casic.missiles.model.response.ResponseData.DEFAULT_SUCCESS_MESSAGE;
-import static com.casic.missiles.modular.system.consts.AlarmConst.ALARM_STATUS_MANUAL_CANCEL;
-
-/**
- * <p>
- * 报警记录表 前端控制器
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@Api(tags = "报警管理接口")
-@Controller
-@RequestMapping("/alarm")
-@RequiredArgsConstructor
-public class BusAlarmController extends BaseController {
-
-    private final IBusAlarmService alarmService;
-
-    @ApiOperation("报警上报接口")
-    @PostMapping("/upload")
-    @ResponseBody
-    public Object upload(@RequestBody AlarmUpload alarmUpload){
-        alarmService.alarmUpload(alarmUpload);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("报警列表分页查询")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "workTitle", value = "作业名称",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "projectId", value = "作业ID",dataType = "Long", paramType = "query",example = "0"),
-            @ApiImplicitParam(name = "alarmStatus", value = "报警状态",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "projectState", value = "作业状态",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "alarmType", value = "报警类型",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "alarmStartTime", value = "报警开始时间",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "alarmEndTime", value = "报警结束时间",dataType = "String", paramType = "query")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = BusAlarm.class),
-    })
-    @GetMapping("/listPage")
-    @ResponseBody
-    public Object listPage(String workTitle,Long projectId,String alarmStatus,String projectState,String alarmType,String alarmStartTime,String alarmEndTime){
-        Page<BusAlarm> page = PageFactory.defaultPage();
-        QueryWrapper<BusAlarm> queryWrapper = new QueryWrapper<>();
-        if(StrUtil.isNotEmpty(workTitle)){
-            queryWrapper.like("p.WORK_TITLE",workTitle);
-        }
-        if(ObjectUtil.isNotEmpty(projectId)){
-            queryWrapper.eq("alarm.PROJECT_ID",projectId);
-        }
-        if(StrUtil.isNotEmpty(alarmStatus)){
-            queryWrapper.eq("alarm.ALARM_STATUS",alarmStatus);
-        }
-        if(StrUtil.isNotEmpty(projectState)){
-            queryWrapper.eq("p.PROJECT_STATE",projectState);
-        }
-        if(StrUtil.isNotEmpty(alarmType)){
-            queryWrapper.eq("alarm.ALARM_TYPE",alarmType);
-        }
-        if(StrUtil.isNotEmpty(alarmStartTime)){
-            queryWrapper.ge("alarm.ALARM_TIME",alarmStartTime);
-        }
-        if(StrUtil.isNotEmpty(alarmEndTime)){
-            queryWrapper.le("alarm.ALARM_TIME",alarmEndTime);
-        }
-        page = alarmService.listPage(page,queryWrapper);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-    @ApiOperation("消警")
-    @PostMapping("/cancel")
-    @ResponseBody
-    public Object cancel(@RequestParam("alarmId") Long alarmId){
-        UpdateWrapper<BusAlarm> updateWrapper = new UpdateWrapper<>();
-        updateWrapper.eq("ID",alarmId);
-        updateWrapper.set("ALARM_STATUS",ALARM_STATUS_MANUAL_CANCEL);
-        alarmService.update(updateWrapper);
-        return ResponseData.success();
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusEventController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusEventController.java
deleted file mode 100644
index dde5aad..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusEventController.java
+++ /dev/null
@@ -1,41 +0,0 @@
-package com.casic.missiles.modular.system.controller;
-
-
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.entity.BusEvent;
-import com.casic.missiles.modular.system.service.IBusEventService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.ResponseBody;
-
-/**
- * <p>
- * 事件表 前端控制器
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@Controller
-@RequestMapping("/event")
-@Api(tags = "事件上报")
-@RequiredArgsConstructor
-public class BusEventController {
-
-    private final IBusEventService eventService;
-
-    @ApiOperation("事件上报")
-    @PostMapping("add")
-    @ResponseBody
-    public Object add(@RequestBody BusEvent busEvent){
-        eventService.saveBusEvent(busEvent);
-        return ResponseData.success();
-    }
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
index 03abc5f..aa50d78 100644
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
@@ -1,121 +1,20 @@
 package com.casic.missiles.modular.system.controller;
 
 
-import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.core.base.controller.BaseController;
-import com.casic.missiles.core.page.PageFactory;
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.DeviceDetailDTO;
-import com.casic.missiles.modular.system.entity.Device;
-import com.casic.missiles.modular.system.service.IDeviceExtService;
-import com.casic.missiles.modular.system.service.IDeviceService;
-import io.swagger.annotations.*;
-import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.RequestMapping;
 
 import org.springframework.stereotype.Controller;
 
-import java.time.LocalDateTime;
-import java.util.Date;
-import java.util.List;
-
-import static com.casic.missiles.model.response.ResponseData.DEFAULT_SUCCESS_MESSAGE;
-
 /**
  * <p>
- *  前端控制器
+ * 设备记录表 前端控制器
  * </p>
  *
  * @author zyj
- * @since 2023-04-14
+ * @since 2023-05-25
  */
-@Api(tags = "设备管理接口")
-@RequiredArgsConstructor
 @Controller
-@RequestMapping("/device")
-public class DeviceController extends BaseController {
-    private final IDeviceService deviceService;
-    private final IDeviceExtService deviceExtService;
-
-    @ApiOperation("设备分页列表")
-    @ApiImplicitParams({
-        @ApiImplicitParam(name = "deviceType", value = "设备类型",dataType = "String", paramType = "query"),
-        @ApiImplicitParam(name = "deviceCode", value = "设备编号",dataType = "String", paramType = "query"),
-        @ApiImplicitParam(name = "status", value = "设备状态",dataType = "String", paramType = "query"),
-        @ApiImplicitParam(name = "projectId", value = "作业ID（如果传此参数，列表中返回该作业使用的设备）",dataType = "Long", paramType = "query", example = "0")
-    })
-    @ApiResponses({
-        @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = DeviceDetailDTO.class),
-    })
-    @GetMapping("listPage")
-    @ResponseBody
-    public Object listPage(String deviceType, String deviceCode, String status,Long projectId){
-        Page<DeviceDetailDTO> page = PageFactory.defaultPage();
-        QueryWrapper<DeviceDetailDTO> queryWrapper = new QueryWrapper<>();
-        if(StrUtil.isNotEmpty(deviceType)){
-            queryWrapper.eq("DEVICE_TYPE",deviceType);
-        }
-        if(StrUtil.isNotEmpty(deviceCode)){
-            queryWrapper.like("DEVICE_CODE",deviceCode);
-        }
-        page = deviceService.listPage(page,queryWrapper,status,projectId);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-    @ApiOperation("新增设备")
-    @PostMapping("add")
-    @ResponseBody
-    public Object add(@RequestBody DeviceDetailDTO deviceDetailDTO){
-        deviceService.saveDevice(deviceDetailDTO);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("编辑设备")
-    @PostMapping("update")
-    @ResponseBody
-    public Object update(@RequestBody DeviceDetailDTO deviceDetailDTO){
-        deviceService.updateDevice(deviceDetailDTO);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("删除设备")
-    @PostMapping("delete")
-    @ResponseBody
-    public Object delete(@ApiParam("设备id列表")@RequestBody List<Long> deviceIds){
-        deviceService.deleteDevices(deviceIds);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("设置甲烷阈值")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "gasIp", value = "安全树甲烷设备IP",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "gasPort", value = "安全树甲烷端口",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "threshold", value = "甲烷阈值",dataType = "String", paramType = "query")
-    })
-    @PostMapping("setThreshold")
-    @ResponseBody
-    public Object setThreshold(String gasIp,String gasPort,String threshold){
-        deviceExtService.setGasThreshold(gasIp, gasPort, threshold);
-        return ResponseData.success();
-    }
-
-
-    @ApiOperation("查询甲烷阈值")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "gasIp", value = "安全树甲烷设备IP",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "gasPort", value = "安全树甲烷端口",dataType = "String", paramType = "query")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = "{\"code\": 200,\"data\": \"100\",\"message\": \"请求成功\",\"success\": true}",response = String.class),
-    })
-    @GetMapping("getThreshold")
-    @ResponseBody
-    public Object getThreshold(String gasIp,String gasPort){
-        String data = deviceExtService.getGasThreshold(gasIp, gasPort);
-        return ResponseData.success(data);
-    }
-
+@RequestMapping("/system/device")
+public class DeviceController {
 
 }
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/OverviewController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/OverviewController.java
deleted file mode 100644
index 7570504..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/OverviewController.java
+++ /dev/null
@@ -1,70 +0,0 @@
-package com.casic.missiles.modular.system.controller;
-
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.AlarmTypeCountDTO;
-import com.casic.missiles.modular.system.dto.DeviceLocationDTO;
-import com.casic.missiles.modular.system.dto.WorkerLocationDTO;
-import com.casic.missiles.modular.system.service.IBusAlarmService;
-import com.casic.missiles.modular.system.service.IProjectDeviceService;
-import com.casic.missiles.modular.system.service.IProjectWorkerService;
-import io.swagger.annotations.*;
-import lombok.RequiredArgsConstructor;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.ResponseBody;
-
-import static com.casic.missiles.model.response.ResponseData.DEFAULT_SUCCESS_MESSAGE;
-import static com.casic.missiles.modular.system.consts.AlarmConst.ALARM_STATUS_ON;
-
-@Api(tags = "首页看板接口")
-@Controller
-@RequestMapping("overview")
-@RequiredArgsConstructor
-public class OverviewController {
-
-    private final IBusAlarmService alarmService;
-    private final IProjectDeviceService projectDeviceService;
-
-    private final IProjectWorkerService projectWorkerService;
-
-
-    @ApiOperation("报警统计接口")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "projectId", value = "作业ID",dataType = "Long", paramType = "query", example = "0")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = AlarmTypeCountDTO.class),
-    })
-    @GetMapping("/alarmCount")
-    @ResponseBody
-    public Object alarmCount(Long projectId){
-        return ResponseData.success(alarmService.alarmCount(projectId,ALARM_STATUS_ON));
-    }
-
-    @ApiOperation("设备列表接口")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "projectId", value = "作业ID",dataType = "Long", paramType = "query", example = "0")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = DeviceLocationDTO.class),
-    })
-    @GetMapping("/deviceList")
-    @ResponseBody
-    public Object deviceList(Long projectId){
-        return ResponseData.success(projectDeviceService.selectDeviceLocationList(projectId));
-    }
-
-    @ApiOperation("人员列表接口")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "projectId", value = "作业ID",dataType = "Long", paramType = "query", example = "0")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = WorkerLocationDTO.class),
-    })
-    @GetMapping("/workerList")
-    @ResponseBody
-    public Object workerList(Long projectId){
-        return ResponseData.success(projectWorkerService.selectWorkerLocationDTO(projectId));
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/WorkSiteInfoController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/WorkSiteInfoController.java
deleted file mode 100644
index af36d69..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/WorkSiteInfoController.java
+++ /dev/null
@@ -1,130 +0,0 @@
-package com.casic.missiles.modular.system.controller;
-
-
-import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.core.base.controller.BaseController;
-import com.casic.missiles.core.page.PageFactory;
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.WorkSiteDetailDTO;
-import com.casic.missiles.modular.system.entity.WorkSiteInfo;
-import com.casic.missiles.modular.system.service.IWorkSiteInfoService;
-import io.swagger.annotations.*;
-import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.*;
-
-import org.springframework.stereotype.Controller;
-
-import java.util.List;
-
-import static com.casic.missiles.model.response.ResponseData.DEFAULT_SUCCESS_MESSAGE;
-
-/**
- * <p>
- * 作业现场表 前端控制器
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@Controller
-@RequestMapping("/site")
-@Api(tags = "作业现场管理")
-@RequiredArgsConstructor
-public class WorkSiteInfoController extends BaseController {
-
-
-    private final IWorkSiteInfoService workSiteInfoService;
-
-    @ApiOperation("新增作业现场")
-    @PostMapping("add")
-    @ResponseBody
-    public Object addWorkSite(@RequestBody WorkSiteDetailDTO workSiteDetailDTO){
-        workSiteInfoService.addWorkSiteInfo(workSiteDetailDTO);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("编辑作业现场")
-    @PostMapping("update")
-    @ResponseBody
-    public Object updateWorkSite(@RequestBody WorkSiteDetailDTO workSiteDetailDTO){
-        workSiteInfoService.updateWorkSiteInfo(workSiteDetailDTO);
-        return ResponseData.success();
-    }
-
-
-    @ApiOperation("删除作业现场")
-    @PostMapping("delete")
-    @ResponseBody
-    public Object delete(@ApiParam("作业现场id列表")@RequestBody List<Long> projectIds){
-        workSiteInfoService.deleteProjects(projectIds);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("查询作业现场详情")
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = WorkSiteDetailDTO.class),
-    })
-    @GetMapping("detail")
-    @ResponseBody
-    public Object delete(@ApiParam(value = "作业现场id", example = "0")@RequestParam Long projectId){
-        WorkSiteDetailDTO detailDTO = workSiteInfoService.getWorkSiteDetail(projectId);
-        return ResponseData.success(detailDTO);
-    }
-
-    @ApiOperation("分页列表查询")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "workTitle",value = "作业名称", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "workRoad",value = "所属道路", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "workPersonName",value = "责任人姓名", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "startDate",value = "注册开始日期", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "endDate",value = "注册结束日期", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "projectState",value = "当前状态（字典值）", dataType = "String", paramType = "query")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = WorkSiteInfo.class),
-    })
-    @GetMapping("listPage")
-    @ResponseBody
-    public Object listPage(String workTitle,String workRoad,String workPersonName,String projectState,String startDate,String endDate){
-        Page<WorkSiteInfo> page = PageFactory.defaultPage();
-        QueryWrapper<WorkSiteInfo> queryWrapper = new QueryWrapper<>();
-        if(StrUtil.isNotEmpty(workTitle)){
-            queryWrapper.like("WORK_TITLE",workTitle);
-        }
-        if(StrUtil.isNotEmpty(workRoad)){
-            queryWrapper.like("WORK_ROAD",workRoad);
-        }
-        if(StrUtil.isNotEmpty(workPersonName)){
-            queryWrapper.like("WORKER_NAME",workPersonName);
-        }
-        if(StrUtil.isNotEmpty(projectState)){
-            queryWrapper.eq("PROJECT_STATE",projectState);
-        }
-        if(StrUtil.isNotEmpty(startDate)){
-            queryWrapper.ge("br_work_site_info.CREATE_TIME",startDate + " 00:00:00");
-        }
-        if(StrUtil.isNotEmpty(endDate)){
-            queryWrapper.le("br_work_site_info.CREATE_TIME",endDate + " 23:59:59");
-        }
-        page = workSiteInfoService.selectListPage(page,queryWrapper);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-    @ApiOperation("开始作业")
-    @PostMapping("start")
-    @ResponseBody
-    public Object start(@ApiParam(value = "作业现场id",example = "0")@RequestParam Long projectId){
-        workSiteInfoService.start(projectId);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("完成作业")
-    @PostMapping("finish")
-    @ResponseBody
-    public Object finish(@ApiParam(value = "作业现场id", example = "0")@RequestParam Long projectId){
-        workSiteInfoService.finish(projectId);
-        return ResponseData.success();
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/WorkerController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/WorkerController.java
deleted file mode 100644
index 796f94c..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/WorkerController.java
+++ /dev/null
@@ -1,136 +0,0 @@
-package com.casic.missiles.modular.system.controller;
-
-
-import cn.hutool.core.util.ObjectUtil;
-import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.core.base.controller.BaseController;
-import com.casic.missiles.core.page.PageFactory;
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.DeviceDetailDTO;
-import com.casic.missiles.modular.system.entity.Device;
-import com.casic.missiles.modular.system.entity.Worker;
-import com.casic.missiles.modular.system.service.IWorkerService;
-import io.swagger.annotations.*;
-import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.*;
-
-import org.springframework.stereotype.Controller;
-
-import java.util.Date;
-import java.util.List;
-
-import static com.casic.missiles.model.response.ResponseData.DEFAULT_SUCCESS_MESSAGE;
-
-/**
- * <p>
- *  前端控制器
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@Controller
-@RequestMapping("/worker")
-@RequiredArgsConstructor
-@Api(tags = "人员管理接口")
-public class WorkerController extends BaseController {
-
-    private final IWorkerService workerService;
-
-    @ApiOperation("分页列表查询")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "name",value = "姓名", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "deptId",value = "所属部门", dataType = "Long", paramType = "query", example = "0"),
-            @ApiImplicitParam(name = "status",value = "当前状态（字典值）", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "startDate",value = "注册开始日期", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "endDate",value = "注册结束日期", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "workerType",value = "人员类型（字典值）", dataType = "String", paramType = "query")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = Worker.class),
-    })
-    @GetMapping("listPage")
-    @ResponseBody
-    public Object listPage(String name,Long deptId, String status,String startDate,String endDate,String workerType){
-        Page<Worker> page = PageFactory.defaultPage();
-        QueryWrapper<Worker> queryWrapper = new QueryWrapper<>();
-        if(StrUtil.isNotEmpty(name)){
-            queryWrapper.like("WORKER_NAME",name);
-        }
-        if(ObjectUtil.isNotEmpty(deptId)){
-            queryWrapper.eq("DEPT_ID",deptId);
-        }
-        if(StrUtil.isNotEmpty(workerType)){
-            queryWrapper.eq("WORKER_TYPE",workerType);
-        }
-        if(StrUtil.isNotEmpty(startDate)){
-            queryWrapper.ge("CREATE_TIME",startDate + " 00:00:00");
-        }
-        if(StrUtil.isNotEmpty(endDate)){
-            queryWrapper.le("CREATE_TIME",endDate + " 23:59:59");
-        }
-        if(StrUtil.isNotEmpty(status)){
-            queryWrapper.eq("`STATUS`",status);
-        }
-        page = workerService.selectListPage(page,queryWrapper);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-    @ApiOperation("新增人员")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "worker", value = "人员信息", dataType = "Worker", paramType = "body", required = true),
-            @ApiImplicitParam(name = "projectId", value = "项目ID(入场申请需要)", dataType = "Long", paramType = "query", example = "0")
-    })
-    @PostMapping("add")
-    @ResponseBody
-    public Object add(@ApiParam("worker")@RequestBody Worker worker,
-                      @RequestParam(required = false) Long projectId){
-        workerService.addWorker(worker,projectId);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("编辑人员")
-    @PostMapping("update")
-    @ResponseBody
-    public Object update(@RequestBody Worker worker){
-        workerService.updateById(worker);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("删除人员")
-    @PostMapping("delete")
-    @ResponseBody
-    public Object delete(@ApiParam("人员id列表")@RequestBody List<Long> workIds){
-        workerService.removeByIds(workIds);
-        return ResponseData.success();
-    }
-
-
-    @ApiOperation(value = "获取人脸图片",notes = "返回人脸图片url")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "cameraIp",value = "摄像头IP", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "cameraPort",value = "摄像头端口号", dataType = "String", paramType = "query"),
-    })
-    @GetMapping("/face/register")
-    @ResponseBody
-    public Object faceRegister(String cameraIp,String cameraPort){
-        return ResponseData.success(workerService.faceRegister(cameraIp, cameraPort));
-    }
-
-
-    @ApiOperation(value = "查询临时入场人员列表")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "projectId", value = "项目ID",required = true,dataType = "Long", paramType = "query", example = "0")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = Worker.class),
-    })
-    @GetMapping("/projectTempWorker")
-    @ResponseBody
-    public Object projectTempWorker(Long projectId){
-        return ResponseData.success(workerService.projectTempWorker(projectId));
-    }
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/AlarmTypeCountDTO.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/AlarmTypeCountDTO.java
deleted file mode 100644
index 1a165a1..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/AlarmTypeCountDTO.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.casic.missiles.modular.system.dto;
-
-import io.swagger.annotations.ApiModel;
-import lombok.Data;
-
-@ApiModel(value = "AlarmTypeCountDTO",description = "报警类型统计（首页）")
-@Data
-public class AlarmTypeCountDTO {
-
-    private String alarmType;
-    private String alarmTypeName;
-    private Integer alarmCount;
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/AlarmUpload.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/AlarmUpload.java
deleted file mode 100644
index 73d7799..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/AlarmUpload.java
+++ /dev/null
@@ -1,46 +0,0 @@
-package com.casic.missiles.modular.system.dto;
-
-import cn.hutool.core.util.StrUtil;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-@ApiModel(value = "AlarmUpload",description = "报警上传")
-@Data
-public class AlarmUpload {
-
-    @ApiModelProperty(value = "摄像头ip")
-    private String cameraIp;
-
-    @ApiModelProperty(value = "摄像头端口")
-    private String cameraPort;
-    @ApiModelProperty(value = "安全树甲烷设备ip")
-    private String gasIp;
-    @ApiModelProperty(value = "安全树甲烷设备端口")
-    private String gasPort;
-    @ApiModelProperty(value = "报警值")
-    private String alarmValue;
-    @ApiModelProperty(value = "报警时间")
-    private String alarmTime;
-    @ApiModelProperty(value = "报警类型")
-    private String alarmType;
-    @ApiModelProperty(value = "报警图片")
-    private String alarmImage;
-    @ApiModelProperty(value = "报警内容")
-    private String alarmContent;
-
-    @Override
-    public String toString() {
-        return "AlarmUpload{" +
-                "cameraIp='" + cameraIp + '\'' +
-                ", cameraPort='" + cameraPort + '\'' +
-                ", gasIp='" + gasIp + '\'' +
-                ", gasPort='" + gasPort + '\'' +
-                ", alarmValue='" + alarmValue + '\'' +
-                ", alarmTime='" + alarmTime + '\'' +
-                ", alarmType='" + alarmType + '\'' +
-                ", alarmImage='" + (StrUtil.isNotEmpty(alarmImage) ? alarmImage.substring(0,50) : "null") + '\'' +
-                ", alarmContent='" + alarmContent + '\'' +
-                '}';
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/DeviceDetailDTO.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/DeviceDetailDTO.java
deleted file mode 100644
index ea518d9..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/DeviceDetailDTO.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package com.casic.missiles.modular.system.dto;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.casic.missiles.modular.system.entity.Device;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-@ApiModel("DeviceDetailDTO")
-@Data
-public class DeviceDetailDTO extends Device {
-
-    @ApiModelProperty(value = "摄像头编号")
-    private String cameraCode;
-
-    @ApiModelProperty(value = "摄像头IP")
-    private String cameraIp;
-
-    @ApiModelProperty(value = "摄像头端口")
-    private String cameraPort;
-
-    @ApiModelProperty(value = "激甲编号")
-    private String gasCode;
-
-    @ApiModelProperty(value = "激甲IP")
-    private String gasIp;
-
-    @ApiModelProperty(value = "激甲端口")
-    private String gasPort;
-
-    @ApiModelProperty(value = "智能帽衬编号")
-    private String hatLiningCode;
-}

diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/AlarmController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/AlarmController.java
new file mode 100644
index 0000000..1795cf1
--- /dev/null
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/AlarmController.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.modular.system.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.stereotype.Controller;
+
+/**
+ * <p>
+ * 报警记录表 前端控制器
+ * </p>
+ *
+ * @author zyj
+ * @since 2023-05-25
+ */
+@Controller
+@RequestMapping("/system/alarm")
+public class AlarmController {
+
+}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusAlarmController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusAlarmController.java
deleted file mode 100644
index 1f82ebb..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusAlarmController.java
+++ /dev/null
@@ -1,102 +0,0 @@
-package com.casic.missiles.modular.system.controller;
-
-
-import cn.hutool.core.util.ObjectUtil;
-import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.core.base.controller.BaseController;
-import com.casic.missiles.core.page.PageFactory;
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.AlarmUpload;
-import com.casic.missiles.modular.system.dto.DeviceDetailDTO;
-import com.casic.missiles.modular.system.entity.BusAlarm;
-import com.casic.missiles.modular.system.service.IBusAlarmService;
-import io.swagger.annotations.*;
-import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.*;
-
-import org.springframework.stereotype.Controller;
-
-import static com.casic.missiles.model.response.ResponseData.DEFAULT_SUCCESS_MESSAGE;
-import static com.casic.missiles.modular.system.consts.AlarmConst.ALARM_STATUS_MANUAL_CANCEL;
-
-/**
- * <p>
- * 报警记录表 前端控制器
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@Api(tags = "报警管理接口")
-@Controller
-@RequestMapping("/alarm")
-@RequiredArgsConstructor
-public class BusAlarmController extends BaseController {
-
-    private final IBusAlarmService alarmService;
-
-    @ApiOperation("报警上报接口")
-    @PostMapping("/upload")
-    @ResponseBody
-    public Object upload(@RequestBody AlarmUpload alarmUpload){
-        alarmService.alarmUpload(alarmUpload);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("报警列表分页查询")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "workTitle", value = "作业名称",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "projectId", value = "作业ID",dataType = "Long", paramType = "query",example = "0"),
-            @ApiImplicitParam(name = "alarmStatus", value = "报警状态",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "projectState", value = "作业状态",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "alarmType", value = "报警类型",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "alarmStartTime", value = "报警开始时间",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "alarmEndTime", value = "报警结束时间",dataType = "String", paramType = "query")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = BusAlarm.class),
-    })
-    @GetMapping("/listPage")
-    @ResponseBody
-    public Object listPage(String workTitle,Long projectId,String alarmStatus,String projectState,String alarmType,String alarmStartTime,String alarmEndTime){
-        Page<BusAlarm> page = PageFactory.defaultPage();
-        QueryWrapper<BusAlarm> queryWrapper = new QueryWrapper<>();
-        if(StrUtil.isNotEmpty(workTitle)){
-            queryWrapper.like("p.WORK_TITLE",workTitle);
-        }
-        if(ObjectUtil.isNotEmpty(projectId)){
-            queryWrapper.eq("alarm.PROJECT_ID",projectId);
-        }
-        if(StrUtil.isNotEmpty(alarmStatus)){
-            queryWrapper.eq("alarm.ALARM_STATUS",alarmStatus);
-        }
-        if(StrUtil.isNotEmpty(projectState)){
-            queryWrapper.eq("p.PROJECT_STATE",projectState);
-        }
-        if(StrUtil.isNotEmpty(alarmType)){
-            queryWrapper.eq("alarm.ALARM_TYPE",alarmType);
-        }
-        if(StrUtil.isNotEmpty(alarmStartTime)){
-            queryWrapper.ge("alarm.ALARM_TIME",alarmStartTime);
-        }
-        if(StrUtil.isNotEmpty(alarmEndTime)){
-            queryWrapper.le("alarm.ALARM_TIME",alarmEndTime);
-        }
-        page = alarmService.listPage(page,queryWrapper);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-    @ApiOperation("消警")
-    @PostMapping("/cancel")
-    @ResponseBody
-    public Object cancel(@RequestParam("alarmId") Long alarmId){
-        UpdateWrapper<BusAlarm> updateWrapper = new UpdateWrapper<>();
-        updateWrapper.eq("ID",alarmId);
-        updateWrapper.set("ALARM_STATUS",ALARM_STATUS_MANUAL_CANCEL);
-        alarmService.update(updateWrapper);
-        return ResponseData.success();
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusEventController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusEventController.java
deleted file mode 100644
index dde5aad..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusEventController.java
+++ /dev/null
@@ -1,41 +0,0 @@
-package com.casic.missiles.modular.system.controller;
-
-
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.entity.BusEvent;
-import com.casic.missiles.modular.system.service.IBusEventService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.ResponseBody;
-
-/**
- * <p>
- * 事件表 前端控制器
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@Controller
-@RequestMapping("/event")
-@Api(tags = "事件上报")
-@RequiredArgsConstructor
-public class BusEventController {
-
-    private final IBusEventService eventService;
-
-    @ApiOperation("事件上报")
-    @PostMapping("add")
-    @ResponseBody
-    public Object add(@RequestBody BusEvent busEvent){
-        eventService.saveBusEvent(busEvent);
-        return ResponseData.success();
-    }
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
index 03abc5f..aa50d78 100644
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
@@ -1,121 +1,20 @@
 package com.casic.missiles.modular.system.controller;
 
 
-import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.core.base.controller.BaseController;
-import com.casic.missiles.core.page.PageFactory;
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.DeviceDetailDTO;
-import com.casic.missiles.modular.system.entity.Device;
-import com.casic.missiles.modular.system.service.IDeviceExtService;
-import com.casic.missiles.modular.system.service.IDeviceService;
-import io.swagger.annotations.*;
-import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.RequestMapping;
 
 import org.springframework.stereotype.Controller;
 
-import java.time.LocalDateTime;
-import java.util.Date;
-import java.util.List;
-
-import static com.casic.missiles.model.response.ResponseData.DEFAULT_SUCCESS_MESSAGE;
-
 /**
  * <p>
- *  前端控制器
+ * 设备记录表 前端控制器
  * </p>
  *
  * @author zyj
- * @since 2023-04-14
+ * @since 2023-05-25
  */
-@Api(tags = "设备管理接口")
-@RequiredArgsConstructor
 @Controller
-@RequestMapping("/device")
-public class DeviceController extends BaseController {
-    private final IDeviceService deviceService;
-    private final IDeviceExtService deviceExtService;
-
-    @ApiOperation("设备分页列表")
-    @ApiImplicitParams({
-        @ApiImplicitParam(name = "deviceType", value = "设备类型",dataType = "String", paramType = "query"),
-        @ApiImplicitParam(name = "deviceCode", value = "设备编号",dataType = "String", paramType = "query"),
-        @ApiImplicitParam(name = "status", value = "设备状态",dataType = "String", paramType = "query"),
-        @ApiImplicitParam(name = "projectId", value = "作业ID（如果传此参数，列表中返回该作业使用的设备）",dataType = "Long", paramType = "query", example = "0")
-    })
-    @ApiResponses({
-        @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = DeviceDetailDTO.class),
-    })
-    @GetMapping("listPage")
-    @ResponseBody
-    public Object listPage(String deviceType, String deviceCode, String status,Long projectId){
-        Page<DeviceDetailDTO> page = PageFactory.defaultPage();
-        QueryWrapper<DeviceDetailDTO> queryWrapper = new QueryWrapper<>();
-        if(StrUtil.isNotEmpty(deviceType)){
-            queryWrapper.eq("DEVICE_TYPE",deviceType);
-        }
-        if(StrUtil.isNotEmpty(deviceCode)){
-            queryWrapper.like("DEVICE_CODE",deviceCode);
-        }
-        page = deviceService.listPage(page,queryWrapper,status,projectId);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-    @ApiOperation("新增设备")
-    @PostMapping("add")
-    @ResponseBody
-    public Object add(@RequestBody DeviceDetailDTO deviceDetailDTO){
-        deviceService.saveDevice(deviceDetailDTO);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("编辑设备")
-    @PostMapping("update")
-    @ResponseBody
-    public Object update(@RequestBody DeviceDetailDTO deviceDetailDTO){
-        deviceService.updateDevice(deviceDetailDTO);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("删除设备")
-    @PostMapping("delete")
-    @ResponseBody
-    public Object delete(@ApiParam("设备id列表")@RequestBody List<Long> deviceIds){
-        deviceService.deleteDevices(deviceIds);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("设置甲烷阈值")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "gasIp", value = "安全树甲烷设备IP",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "gasPort", value = "安全树甲烷端口",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "threshold", value = "甲烷阈值",dataType = "String", paramType = "query")
-    })
-    @PostMapping("setThreshold")
-    @ResponseBody
-    public Object setThreshold(String gasIp,String gasPort,String threshold){
-        deviceExtService.setGasThreshold(gasIp, gasPort, threshold);
-        return ResponseData.success();
-    }
-
-
-    @ApiOperation("查询甲烷阈值")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "gasIp", value = "安全树甲烷设备IP",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "gasPort", value = "安全树甲烷端口",dataType = "String", paramType = "query")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = "{\"code\": 200,\"data\": \"100\",\"message\": \"请求成功\",\"success\": true}",response = String.class),
-    })
-    @GetMapping("getThreshold")
-    @ResponseBody
-    public Object getThreshold(String gasIp,String gasPort){
-        String data = deviceExtService.getGasThreshold(gasIp, gasPort);
-        return ResponseData.success(data);
-    }
-
+@RequestMapping("/system/device")
+public class DeviceController {
 
 }
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/OverviewController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/OverviewController.java
deleted file mode 100644
index 7570504..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/OverviewController.java
+++ /dev/null
@@ -1,70 +0,0 @@
-package com.casic.missiles.modular.system.controller;
-
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.AlarmTypeCountDTO;
-import com.casic.missiles.modular.system.dto.DeviceLocationDTO;
-import com.casic.missiles.modular.system.dto.WorkerLocationDTO;
-import com.casic.missiles.modular.system.service.IBusAlarmService;
-import com.casic.missiles.modular.system.service.IProjectDeviceService;
-import com.casic.missiles.modular.system.service.IProjectWorkerService;
-import io.swagger.annotations.*;
-import lombok.RequiredArgsConstructor;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.ResponseBody;
-
-import static com.casic.missiles.model.response.ResponseData.DEFAULT_SUCCESS_MESSAGE;
-import static com.casic.missiles.modular.system.consts.AlarmConst.ALARM_STATUS_ON;
-
-@Api(tags = "首页看板接口")
-@Controller
-@RequestMapping("overview")
-@RequiredArgsConstructor
-public class OverviewController {
-
-    private final IBusAlarmService alarmService;
-    private final IProjectDeviceService projectDeviceService;
-
-    private final IProjectWorkerService projectWorkerService;
-
-
-    @ApiOperation("报警统计接口")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "projectId", value = "作业ID",dataType = "Long", paramType = "query", example = "0")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = AlarmTypeCountDTO.class),
-    })
-    @GetMapping("/alarmCount")
-    @ResponseBody
-    public Object alarmCount(Long projectId){
-        return ResponseData.success(alarmService.alarmCount(projectId,ALARM_STATUS_ON));
-    }
-
-    @ApiOperation("设备列表接口")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "projectId", value = "作业ID",dataType = "Long", paramType = "query", example = "0")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = DeviceLocationDTO.class),
-    })
-    @GetMapping("/deviceList")
-    @ResponseBody
-    public Object deviceList(Long projectId){
-        return ResponseData.success(projectDeviceService.selectDeviceLocationList(projectId));
-    }
-
-    @ApiOperation("人员列表接口")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "projectId", value = "作业ID",dataType = "Long", paramType = "query", example = "0")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = WorkerLocationDTO.class),
-    })
-    @GetMapping("/workerList")
-    @ResponseBody
-    public Object workerList(Long projectId){
-        return ResponseData.success(projectWorkerService.selectWorkerLocationDTO(projectId));
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/WorkSiteInfoController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/WorkSiteInfoController.java
deleted file mode 100644
index af36d69..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/WorkSiteInfoController.java
+++ /dev/null
@@ -1,130 +0,0 @@
-package com.casic.missiles.modular.system.controller;
-
-
-import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.core.base.controller.BaseController;
-import com.casic.missiles.core.page.PageFactory;
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.WorkSiteDetailDTO;
-import com.casic.missiles.modular.system.entity.WorkSiteInfo;
-import com.casic.missiles.modular.system.service.IWorkSiteInfoService;
-import io.swagger.annotations.*;
-import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.*;
-
-import org.springframework.stereotype.Controller;
-
-import java.util.List;
-
-import static com.casic.missiles.model.response.ResponseData.DEFAULT_SUCCESS_MESSAGE;
-
-/**
- * <p>
- * 作业现场表 前端控制器
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@Controller
-@RequestMapping("/site")
-@Api(tags = "作业现场管理")
-@RequiredArgsConstructor
-public class WorkSiteInfoController extends BaseController {
-
-
-    private final IWorkSiteInfoService workSiteInfoService;
-
-    @ApiOperation("新增作业现场")
-    @PostMapping("add")
-    @ResponseBody
-    public Object addWorkSite(@RequestBody WorkSiteDetailDTO workSiteDetailDTO){
-        workSiteInfoService.addWorkSiteInfo(workSiteDetailDTO);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("编辑作业现场")
-    @PostMapping("update")
-    @ResponseBody
-    public Object updateWorkSite(@RequestBody WorkSiteDetailDTO workSiteDetailDTO){
-        workSiteInfoService.updateWorkSiteInfo(workSiteDetailDTO);
-        return ResponseData.success();
-    }
-
-
-    @ApiOperation("删除作业现场")
-    @PostMapping("delete")
-    @ResponseBody
-    public Object delete(@ApiParam("作业现场id列表")@RequestBody List<Long> projectIds){
-        workSiteInfoService.deleteProjects(projectIds);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("查询作业现场详情")
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = WorkSiteDetailDTO.class),
-    })
-    @GetMapping("detail")
-    @ResponseBody
-    public Object delete(@ApiParam(value = "作业现场id", example = "0")@RequestParam Long projectId){
-        WorkSiteDetailDTO detailDTO = workSiteInfoService.getWorkSiteDetail(projectId);
-        return ResponseData.success(detailDTO);
-    }
-
-    @ApiOperation("分页列表查询")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "workTitle",value = "作业名称", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "workRoad",value = "所属道路", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "workPersonName",value = "责任人姓名", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "startDate",value = "注册开始日期", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "endDate",value = "注册结束日期", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "projectState",value = "当前状态（字典值）", dataType = "String", paramType = "query")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = WorkSiteInfo.class),
-    })
-    @GetMapping("listPage")
-    @ResponseBody
-    public Object listPage(String workTitle,String workRoad,String workPersonName,String projectState,String startDate,String endDate){
-        Page<WorkSiteInfo> page = PageFactory.defaultPage();
-        QueryWrapper<WorkSiteInfo> queryWrapper = new QueryWrapper<>();
-        if(StrUtil.isNotEmpty(workTitle)){
-            queryWrapper.like("WORK_TITLE",workTitle);
-        }
-        if(StrUtil.isNotEmpty(workRoad)){
-            queryWrapper.like("WORK_ROAD",workRoad);
-        }
-        if(StrUtil.isNotEmpty(workPersonName)){
-            queryWrapper.like("WORKER_NAME",workPersonName);
-        }
-        if(StrUtil.isNotEmpty(projectState)){
-            queryWrapper.eq("PROJECT_STATE",projectState);
-        }
-        if(StrUtil.isNotEmpty(startDate)){
-            queryWrapper.ge("br_work_site_info.CREATE_TIME",startDate + " 00:00:00");
-        }
-        if(StrUtil.isNotEmpty(endDate)){
-            queryWrapper.le("br_work_site_info.CREATE_TIME",endDate + " 23:59:59");
-        }
-        page = workSiteInfoService.selectListPage(page,queryWrapper);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-    @ApiOperation("开始作业")
-    @PostMapping("start")
-    @ResponseBody
-    public Object start(@ApiParam(value = "作业现场id",example = "0")@RequestParam Long projectId){
-        workSiteInfoService.start(projectId);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("完成作业")
-    @PostMapping("finish")
-    @ResponseBody
-    public Object finish(@ApiParam(value = "作业现场id", example = "0")@RequestParam Long projectId){
-        workSiteInfoService.finish(projectId);
-        return ResponseData.success();
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/WorkerController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/WorkerController.java
deleted file mode 100644
index 796f94c..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/WorkerController.java
+++ /dev/null
@@ -1,136 +0,0 @@
-package com.casic.missiles.modular.system.controller;
-
-
-import cn.hutool.core.util.ObjectUtil;
-import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.core.base.controller.BaseController;
-import com.casic.missiles.core.page.PageFactory;
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.DeviceDetailDTO;
-import com.casic.missiles.modular.system.entity.Device;
-import com.casic.missiles.modular.system.entity.Worker;
-import com.casic.missiles.modular.system.service.IWorkerService;
-import io.swagger.annotations.*;
-import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.*;
-
-import org.springframework.stereotype.Controller;
-
-import java.util.Date;
-import java.util.List;
-
-import static com.casic.missiles.model.response.ResponseData.DEFAULT_SUCCESS_MESSAGE;
-
-/**
- * <p>
- *  前端控制器
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@Controller
-@RequestMapping("/worker")
-@RequiredArgsConstructor
-@Api(tags = "人员管理接口")
-public class WorkerController extends BaseController {
-
-    private final IWorkerService workerService;
-
-    @ApiOperation("分页列表查询")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "name",value = "姓名", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "deptId",value = "所属部门", dataType = "Long", paramType = "query", example = "0"),
-            @ApiImplicitParam(name = "status",value = "当前状态（字典值）", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "startDate",value = "注册开始日期", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "endDate",value = "注册结束日期", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "workerType",value = "人员类型（字典值）", dataType = "String", paramType = "query")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = Worker.class),
-    })
-    @GetMapping("listPage")
-    @ResponseBody
-    public Object listPage(String name,Long deptId, String status,String startDate,String endDate,String workerType){
-        Page<Worker> page = PageFactory.defaultPage();
-        QueryWrapper<Worker> queryWrapper = new QueryWrapper<>();
-        if(StrUtil.isNotEmpty(name)){
-            queryWrapper.like("WORKER_NAME",name);
-        }
-        if(ObjectUtil.isNotEmpty(deptId)){
-            queryWrapper.eq("DEPT_ID",deptId);
-        }
-        if(StrUtil.isNotEmpty(workerType)){
-            queryWrapper.eq("WORKER_TYPE",workerType);
-        }
-        if(StrUtil.isNotEmpty(startDate)){
-            queryWrapper.ge("CREATE_TIME",startDate + " 00:00:00");
-        }
-        if(StrUtil.isNotEmpty(endDate)){
-            queryWrapper.le("CREATE_TIME",endDate + " 23:59:59");
-        }
-        if(StrUtil.isNotEmpty(status)){
-            queryWrapper.eq("`STATUS`",status);
-        }
-        page = workerService.selectListPage(page,queryWrapper);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-    @ApiOperation("新增人员")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "worker", value = "人员信息", dataType = "Worker", paramType = "body", required = true),
-            @ApiImplicitParam(name = "projectId", value = "项目ID(入场申请需要)", dataType = "Long", paramType = "query", example = "0")
-    })
-    @PostMapping("add")
-    @ResponseBody
-    public Object add(@ApiParam("worker")@RequestBody Worker worker,
-                      @RequestParam(required = false) Long projectId){
-        workerService.addWorker(worker,projectId);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("编辑人员")
-    @PostMapping("update")
-    @ResponseBody
-    public Object update(@RequestBody Worker worker){
-        workerService.updateById(worker);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("删除人员")
-    @PostMapping("delete")
-    @ResponseBody
-    public Object delete(@ApiParam("人员id列表")@RequestBody List<Long> workIds){
-        workerService.removeByIds(workIds);
-        return ResponseData.success();
-    }
-
-
-    @ApiOperation(value = "获取人脸图片",notes = "返回人脸图片url")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "cameraIp",value = "摄像头IP", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "cameraPort",value = "摄像头端口号", dataType = "String", paramType = "query"),
-    })
-    @GetMapping("/face/register")
-    @ResponseBody
-    public Object faceRegister(String cameraIp,String cameraPort){
-        return ResponseData.success(workerService.faceRegister(cameraIp, cameraPort));
-    }
-
-
-    @ApiOperation(value = "查询临时入场人员列表")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "projectId", value = "项目ID",required = true,dataType = "Long", paramType = "query", example = "0")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = Worker.class),
-    })
-    @GetMapping("/projectTempWorker")
-    @ResponseBody
-    public Object projectTempWorker(Long projectId){
-        return ResponseData.success(workerService.projectTempWorker(projectId));
-    }
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/AlarmTypeCountDTO.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/AlarmTypeCountDTO.java
deleted file mode 100644
index 1a165a1..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/AlarmTypeCountDTO.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.casic.missiles.modular.system.dto;
-
-import io.swagger.annotations.ApiModel;
-import lombok.Data;
-
-@ApiModel(value = "AlarmTypeCountDTO",description = "报警类型统计（首页）")
-@Data
-public class AlarmTypeCountDTO {
-
-    private String alarmType;
-    private String alarmTypeName;
-    private Integer alarmCount;
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/AlarmUpload.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/AlarmUpload.java
deleted file mode 100644
index 73d7799..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/AlarmUpload.java
+++ /dev/null
@@ -1,46 +0,0 @@
-package com.casic.missiles.modular.system.dto;
-
-import cn.hutool.core.util.StrUtil;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-@ApiModel(value = "AlarmUpload",description = "报警上传")
-@Data
-public class AlarmUpload {
-
-    @ApiModelProperty(value = "摄像头ip")
-    private String cameraIp;
-
-    @ApiModelProperty(value = "摄像头端口")
-    private String cameraPort;
-    @ApiModelProperty(value = "安全树甲烷设备ip")
-    private String gasIp;
-    @ApiModelProperty(value = "安全树甲烷设备端口")
-    private String gasPort;
-    @ApiModelProperty(value = "报警值")
-    private String alarmValue;
-    @ApiModelProperty(value = "报警时间")
-    private String alarmTime;
-    @ApiModelProperty(value = "报警类型")
-    private String alarmType;
-    @ApiModelProperty(value = "报警图片")
-    private String alarmImage;
-    @ApiModelProperty(value = "报警内容")
-    private String alarmContent;
-
-    @Override
-    public String toString() {
-        return "AlarmUpload{" +
-                "cameraIp='" + cameraIp + '\'' +
-                ", cameraPort='" + cameraPort + '\'' +
-                ", gasIp='" + gasIp + '\'' +
-                ", gasPort='" + gasPort + '\'' +
-                ", alarmValue='" + alarmValue + '\'' +
-                ", alarmTime='" + alarmTime + '\'' +
-                ", alarmType='" + alarmType + '\'' +
-                ", alarmImage='" + (StrUtil.isNotEmpty(alarmImage) ? alarmImage.substring(0,50) : "null") + '\'' +
-                ", alarmContent='" + alarmContent + '\'' +
-                '}';
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/DeviceDetailDTO.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/DeviceDetailDTO.java
deleted file mode 100644
index ea518d9..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/DeviceDetailDTO.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package com.casic.missiles.modular.system.dto;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.casic.missiles.modular.system.entity.Device;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-@ApiModel("DeviceDetailDTO")
-@Data
-public class DeviceDetailDTO extends Device {
-
-    @ApiModelProperty(value = "摄像头编号")
-    private String cameraCode;
-
-    @ApiModelProperty(value = "摄像头IP")
-    private String cameraIp;
-
-    @ApiModelProperty(value = "摄像头端口")
-    private String cameraPort;
-
-    @ApiModelProperty(value = "激甲编号")
-    private String gasCode;
-
-    @ApiModelProperty(value = "激甲IP")
-    private String gasIp;
-
-    @ApiModelProperty(value = "激甲端口")
-    private String gasPort;
-
-    @ApiModelProperty(value = "智能帽衬编号")
-    private String hatLiningCode;
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/WorkSiteDetailDTO.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/WorkSiteDetailDTO.java
deleted file mode 100644
index 29378ff..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/WorkSiteDetailDTO.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package com.casic.missiles.modular.system.dto;
-
-import com.casic.missiles.modular.system.entity.ProjectDevice;
-import com.casic.missiles.modular.system.entity.ProjectWorker;
-import com.casic.missiles.modular.system.entity.WorkSiteInfo;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.util.List;
-
-@Data
-@ApiModel("WorkSiteDetailDTO")
-public class WorkSiteDetailDTO extends WorkSiteInfo {
-
-    @ApiModelProperty(value = "安全树列表",dataType = "ProjectDevice")
-    private List<ProjectDevice> deviceList;
-
-    @ApiModelProperty(value = "人员列表",dataType = "ProjectWorker")
-    private List<ProjectWorker> workerList;
-
-
-
-
-}

diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/AlarmController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/AlarmController.java
new file mode 100644
index 0000000..1795cf1
--- /dev/null
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/AlarmController.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.modular.system.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.stereotype.Controller;
+
+/**
+ * <p>
+ * 报警记录表 前端控制器
+ * </p>
+ *
+ * @author zyj
+ * @since 2023-05-25
+ */
+@Controller
+@RequestMapping("/system/alarm")
+public class AlarmController {
+
+}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusAlarmController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusAlarmController.java
deleted file mode 100644
index 1f82ebb..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusAlarmController.java
+++ /dev/null
@@ -1,102 +0,0 @@
-package com.casic.missiles.modular.system.controller;
-
-
-import cn.hutool.core.util.ObjectUtil;
-import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.core.base.controller.BaseController;
-import com.casic.missiles.core.page.PageFactory;
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.AlarmUpload;
-import com.casic.missiles.modular.system.dto.DeviceDetailDTO;
-import com.casic.missiles.modular.system.entity.BusAlarm;
-import com.casic.missiles.modular.system.service.IBusAlarmService;
-import io.swagger.annotations.*;
-import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.*;
-
-import org.springframework.stereotype.Controller;
-
-import static com.casic.missiles.model.response.ResponseData.DEFAULT_SUCCESS_MESSAGE;
-import static com.casic.missiles.modular.system.consts.AlarmConst.ALARM_STATUS_MANUAL_CANCEL;
-
-/**
- * <p>
- * 报警记录表 前端控制器
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@Api(tags = "报警管理接口")
-@Controller
-@RequestMapping("/alarm")
-@RequiredArgsConstructor
-public class BusAlarmController extends BaseController {
-
-    private final IBusAlarmService alarmService;
-
-    @ApiOperation("报警上报接口")
-    @PostMapping("/upload")
-    @ResponseBody
-    public Object upload(@RequestBody AlarmUpload alarmUpload){
-        alarmService.alarmUpload(alarmUpload);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("报警列表分页查询")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "workTitle", value = "作业名称",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "projectId", value = "作业ID",dataType = "Long", paramType = "query",example = "0"),
-            @ApiImplicitParam(name = "alarmStatus", value = "报警状态",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "projectState", value = "作业状态",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "alarmType", value = "报警类型",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "alarmStartTime", value = "报警开始时间",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "alarmEndTime", value = "报警结束时间",dataType = "String", paramType = "query")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = BusAlarm.class),
-    })
-    @GetMapping("/listPage")
-    @ResponseBody
-    public Object listPage(String workTitle,Long projectId,String alarmStatus,String projectState,String alarmType,String alarmStartTime,String alarmEndTime){
-        Page<BusAlarm> page = PageFactory.defaultPage();
-        QueryWrapper<BusAlarm> queryWrapper = new QueryWrapper<>();
-        if(StrUtil.isNotEmpty(workTitle)){
-            queryWrapper.like("p.WORK_TITLE",workTitle);
-        }
-        if(ObjectUtil.isNotEmpty(projectId)){
-            queryWrapper.eq("alarm.PROJECT_ID",projectId);
-        }
-        if(StrUtil.isNotEmpty(alarmStatus)){
-            queryWrapper.eq("alarm.ALARM_STATUS",alarmStatus);
-        }
-        if(StrUtil.isNotEmpty(projectState)){
-            queryWrapper.eq("p.PROJECT_STATE",projectState);
-        }
-        if(StrUtil.isNotEmpty(alarmType)){
-            queryWrapper.eq("alarm.ALARM_TYPE",alarmType);
-        }
-        if(StrUtil.isNotEmpty(alarmStartTime)){
-            queryWrapper.ge("alarm.ALARM_TIME",alarmStartTime);
-        }
-        if(StrUtil.isNotEmpty(alarmEndTime)){
-            queryWrapper.le("alarm.ALARM_TIME",alarmEndTime);
-        }
-        page = alarmService.listPage(page,queryWrapper);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-    @ApiOperation("消警")
-    @PostMapping("/cancel")
-    @ResponseBody
-    public Object cancel(@RequestParam("alarmId") Long alarmId){
-        UpdateWrapper<BusAlarm> updateWrapper = new UpdateWrapper<>();
-        updateWrapper.eq("ID",alarmId);
-        updateWrapper.set("ALARM_STATUS",ALARM_STATUS_MANUAL_CANCEL);
-        alarmService.update(updateWrapper);
-        return ResponseData.success();
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusEventController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusEventController.java
deleted file mode 100644
index dde5aad..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusEventController.java
+++ /dev/null
@@ -1,41 +0,0 @@
-package com.casic.missiles.modular.system.controller;
-
-
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.entity.BusEvent;
-import com.casic.missiles.modular.system.service.IBusEventService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.ResponseBody;
-
-/**
- * <p>
- * 事件表 前端控制器
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@Controller
-@RequestMapping("/event")
-@Api(tags = "事件上报")
-@RequiredArgsConstructor
-public class BusEventController {
-
-    private final IBusEventService eventService;
-
-    @ApiOperation("事件上报")
-    @PostMapping("add")
-    @ResponseBody
-    public Object add(@RequestBody BusEvent busEvent){
-        eventService.saveBusEvent(busEvent);
-        return ResponseData.success();
-    }
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
index 03abc5f..aa50d78 100644
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
@@ -1,121 +1,20 @@
 package com.casic.missiles.modular.system.controller;
 
 
-import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.core.base.controller.BaseController;
-import com.casic.missiles.core.page.PageFactory;
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.DeviceDetailDTO;
-import com.casic.missiles.modular.system.entity.Device;
-import com.casic.missiles.modular.system.service.IDeviceExtService;
-import com.casic.missiles.modular.system.service.IDeviceService;
-import io.swagger.annotations.*;
-import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.RequestMapping;
 
 import org.springframework.stereotype.Controller;
 
-import java.time.LocalDateTime;
-import java.util.Date;
-import java.util.List;
-
-import static com.casic.missiles.model.response.ResponseData.DEFAULT_SUCCESS_MESSAGE;
-
 /**
  * <p>
- *  前端控制器
+ * 设备记录表 前端控制器
  * </p>
  *
  * @author zyj
- * @since 2023-04-14
+ * @since 2023-05-25
  */
-@Api(tags = "设备管理接口")
-@RequiredArgsConstructor
 @Controller
-@RequestMapping("/device")
-public class DeviceController extends BaseController {
-    private final IDeviceService deviceService;
-    private final IDeviceExtService deviceExtService;
-
-    @ApiOperation("设备分页列表")
-    @ApiImplicitParams({
-        @ApiImplicitParam(name = "deviceType", value = "设备类型",dataType = "String", paramType = "query"),
-        @ApiImplicitParam(name = "deviceCode", value = "设备编号",dataType = "String", paramType = "query"),
-        @ApiImplicitParam(name = "status", value = "设备状态",dataType = "String", paramType = "query"),
-        @ApiImplicitParam(name = "projectId", value = "作业ID（如果传此参数，列表中返回该作业使用的设备）",dataType = "Long", paramType = "query", example = "0")
-    })
-    @ApiResponses({
-        @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = DeviceDetailDTO.class),
-    })
-    @GetMapping("listPage")
-    @ResponseBody
-    public Object listPage(String deviceType, String deviceCode, String status,Long projectId){
-        Page<DeviceDetailDTO> page = PageFactory.defaultPage();
-        QueryWrapper<DeviceDetailDTO> queryWrapper = new QueryWrapper<>();
-        if(StrUtil.isNotEmpty(deviceType)){
-            queryWrapper.eq("DEVICE_TYPE",deviceType);
-        }
-        if(StrUtil.isNotEmpty(deviceCode)){
-            queryWrapper.like("DEVICE_CODE",deviceCode);
-        }
-        page = deviceService.listPage(page,queryWrapper,status,projectId);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-    @ApiOperation("新增设备")
-    @PostMapping("add")
-    @ResponseBody
-    public Object add(@RequestBody DeviceDetailDTO deviceDetailDTO){
-        deviceService.saveDevice(deviceDetailDTO);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("编辑设备")
-    @PostMapping("update")
-    @ResponseBody
-    public Object update(@RequestBody DeviceDetailDTO deviceDetailDTO){
-        deviceService.updateDevice(deviceDetailDTO);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("删除设备")
-    @PostMapping("delete")
-    @ResponseBody
-    public Object delete(@ApiParam("设备id列表")@RequestBody List<Long> deviceIds){
-        deviceService.deleteDevices(deviceIds);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("设置甲烷阈值")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "gasIp", value = "安全树甲烷设备IP",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "gasPort", value = "安全树甲烷端口",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "threshold", value = "甲烷阈值",dataType = "String", paramType = "query")
-    })
-    @PostMapping("setThreshold")
-    @ResponseBody
-    public Object setThreshold(String gasIp,String gasPort,String threshold){
-        deviceExtService.setGasThreshold(gasIp, gasPort, threshold);
-        return ResponseData.success();
-    }
-
-
-    @ApiOperation("查询甲烷阈值")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "gasIp", value = "安全树甲烷设备IP",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "gasPort", value = "安全树甲烷端口",dataType = "String", paramType = "query")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = "{\"code\": 200,\"data\": \"100\",\"message\": \"请求成功\",\"success\": true}",response = String.class),
-    })
-    @GetMapping("getThreshold")
-    @ResponseBody
-    public Object getThreshold(String gasIp,String gasPort){
-        String data = deviceExtService.getGasThreshold(gasIp, gasPort);
-        return ResponseData.success(data);
-    }
-
+@RequestMapping("/system/device")
+public class DeviceController {
 
 }
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/OverviewController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/OverviewController.java
deleted file mode 100644
index 7570504..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/OverviewController.java
+++ /dev/null
@@ -1,70 +0,0 @@
-package com.casic.missiles.modular.system.controller;
-
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.AlarmTypeCountDTO;
-import com.casic.missiles.modular.system.dto.DeviceLocationDTO;
-import com.casic.missiles.modular.system.dto.WorkerLocationDTO;
-import com.casic.missiles.modular.system.service.IBusAlarmService;
-import com.casic.missiles.modular.system.service.IProjectDeviceService;
-import com.casic.missiles.modular.system.service.IProjectWorkerService;
-import io.swagger.annotations.*;
-import lombok.RequiredArgsConstructor;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.ResponseBody;
-
-import static com.casic.missiles.model.response.ResponseData.DEFAULT_SUCCESS_MESSAGE;
-import static com.casic.missiles.modular.system.consts.AlarmConst.ALARM_STATUS_ON;
-
-@Api(tags = "首页看板接口")
-@Controller
-@RequestMapping("overview")
-@RequiredArgsConstructor
-public class OverviewController {
-
-    private final IBusAlarmService alarmService;
-    private final IProjectDeviceService projectDeviceService;
-
-    private final IProjectWorkerService projectWorkerService;
-
-
-    @ApiOperation("报警统计接口")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "projectId", value = "作业ID",dataType = "Long", paramType = "query", example = "0")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = AlarmTypeCountDTO.class),
-    })
-    @GetMapping("/alarmCount")
-    @ResponseBody
-    public Object alarmCount(Long projectId){
-        return ResponseData.success(alarmService.alarmCount(projectId,ALARM_STATUS_ON));
-    }
-
-    @ApiOperation("设备列表接口")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "projectId", value = "作业ID",dataType = "Long", paramType = "query", example = "0")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = DeviceLocationDTO.class),
-    })
-    @GetMapping("/deviceList")
-    @ResponseBody
-    public Object deviceList(Long projectId){
-        return ResponseData.success(projectDeviceService.selectDeviceLocationList(projectId));
-    }
-
-    @ApiOperation("人员列表接口")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "projectId", value = "作业ID",dataType = "Long", paramType = "query", example = "0")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = WorkerLocationDTO.class),
-    })
-    @GetMapping("/workerList")
-    @ResponseBody
-    public Object workerList(Long projectId){
-        return ResponseData.success(projectWorkerService.selectWorkerLocationDTO(projectId));
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/WorkSiteInfoController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/WorkSiteInfoController.java
deleted file mode 100644
index af36d69..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/WorkSiteInfoController.java
+++ /dev/null
@@ -1,130 +0,0 @@
-package com.casic.missiles.modular.system.controller;
-
-
-import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.core.base.controller.BaseController;
-import com.casic.missiles.core.page.PageFactory;
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.WorkSiteDetailDTO;
-import com.casic.missiles.modular.system.entity.WorkSiteInfo;
-import com.casic.missiles.modular.system.service.IWorkSiteInfoService;
-import io.swagger.annotations.*;
-import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.*;
-
-import org.springframework.stereotype.Controller;
-
-import java.util.List;
-
-import static com.casic.missiles.model.response.ResponseData.DEFAULT_SUCCESS_MESSAGE;
-
-/**
- * <p>
- * 作业现场表 前端控制器
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@Controller
-@RequestMapping("/site")
-@Api(tags = "作业现场管理")
-@RequiredArgsConstructor
-public class WorkSiteInfoController extends BaseController {
-
-
-    private final IWorkSiteInfoService workSiteInfoService;
-
-    @ApiOperation("新增作业现场")
-    @PostMapping("add")
-    @ResponseBody
-    public Object addWorkSite(@RequestBody WorkSiteDetailDTO workSiteDetailDTO){
-        workSiteInfoService.addWorkSiteInfo(workSiteDetailDTO);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("编辑作业现场")
-    @PostMapping("update")
-    @ResponseBody
-    public Object updateWorkSite(@RequestBody WorkSiteDetailDTO workSiteDetailDTO){
-        workSiteInfoService.updateWorkSiteInfo(workSiteDetailDTO);
-        return ResponseData.success();
-    }
-
-
-    @ApiOperation("删除作业现场")
-    @PostMapping("delete")
-    @ResponseBody
-    public Object delete(@ApiParam("作业现场id列表")@RequestBody List<Long> projectIds){
-        workSiteInfoService.deleteProjects(projectIds);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("查询作业现场详情")
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = WorkSiteDetailDTO.class),
-    })
-    @GetMapping("detail")
-    @ResponseBody
-    public Object delete(@ApiParam(value = "作业现场id", example = "0")@RequestParam Long projectId){
-        WorkSiteDetailDTO detailDTO = workSiteInfoService.getWorkSiteDetail(projectId);
-        return ResponseData.success(detailDTO);
-    }
-
-    @ApiOperation("分页列表查询")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "workTitle",value = "作业名称", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "workRoad",value = "所属道路", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "workPersonName",value = "责任人姓名", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "startDate",value = "注册开始日期", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "endDate",value = "注册结束日期", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "projectState",value = "当前状态（字典值）", dataType = "String", paramType = "query")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = WorkSiteInfo.class),
-    })
-    @GetMapping("listPage")
-    @ResponseBody
-    public Object listPage(String workTitle,String workRoad,String workPersonName,String projectState,String startDate,String endDate){
-        Page<WorkSiteInfo> page = PageFactory.defaultPage();
-        QueryWrapper<WorkSiteInfo> queryWrapper = new QueryWrapper<>();
-        if(StrUtil.isNotEmpty(workTitle)){
-            queryWrapper.like("WORK_TITLE",workTitle);
-        }
-        if(StrUtil.isNotEmpty(workRoad)){
-            queryWrapper.like("WORK_ROAD",workRoad);
-        }
-        if(StrUtil.isNotEmpty(workPersonName)){
-            queryWrapper.like("WORKER_NAME",workPersonName);
-        }
-        if(StrUtil.isNotEmpty(projectState)){
-            queryWrapper.eq("PROJECT_STATE",projectState);
-        }
-        if(StrUtil.isNotEmpty(startDate)){
-            queryWrapper.ge("br_work_site_info.CREATE_TIME",startDate + " 00:00:00");
-        }
-        if(StrUtil.isNotEmpty(endDate)){
-            queryWrapper.le("br_work_site_info.CREATE_TIME",endDate + " 23:59:59");
-        }
-        page = workSiteInfoService.selectListPage(page,queryWrapper);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-    @ApiOperation("开始作业")
-    @PostMapping("start")
-    @ResponseBody
-    public Object start(@ApiParam(value = "作业现场id",example = "0")@RequestParam Long projectId){
-        workSiteInfoService.start(projectId);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("完成作业")
-    @PostMapping("finish")
-    @ResponseBody
-    public Object finish(@ApiParam(value = "作业现场id", example = "0")@RequestParam Long projectId){
-        workSiteInfoService.finish(projectId);
-        return ResponseData.success();
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/WorkerController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/WorkerController.java
deleted file mode 100644
index 796f94c..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/WorkerController.java
+++ /dev/null
@@ -1,136 +0,0 @@
-package com.casic.missiles.modular.system.controller;
-
-
-import cn.hutool.core.util.ObjectUtil;
-import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.core.base.controller.BaseController;
-import com.casic.missiles.core.page.PageFactory;
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.DeviceDetailDTO;
-import com.casic.missiles.modular.system.entity.Device;
-import com.casic.missiles.modular.system.entity.Worker;
-import com.casic.missiles.modular.system.service.IWorkerService;
-import io.swagger.annotations.*;
-import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.*;
-
-import org.springframework.stereotype.Controller;
-
-import java.util.Date;
-import java.util.List;
-
-import static com.casic.missiles.model.response.ResponseData.DEFAULT_SUCCESS_MESSAGE;
-
-/**
- * <p>
- *  前端控制器
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@Controller
-@RequestMapping("/worker")
-@RequiredArgsConstructor
-@Api(tags = "人员管理接口")
-public class WorkerController extends BaseController {
-
-    private final IWorkerService workerService;
-
-    @ApiOperation("分页列表查询")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "name",value = "姓名", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "deptId",value = "所属部门", dataType = "Long", paramType = "query", example = "0"),
-            @ApiImplicitParam(name = "status",value = "当前状态（字典值）", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "startDate",value = "注册开始日期", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "endDate",value = "注册结束日期", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "workerType",value = "人员类型（字典值）", dataType = "String", paramType = "query")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = Worker.class),
-    })
-    @GetMapping("listPage")
-    @ResponseBody
-    public Object listPage(String name,Long deptId, String status,String startDate,String endDate,String workerType){
-        Page<Worker> page = PageFactory.defaultPage();
-        QueryWrapper<Worker> queryWrapper = new QueryWrapper<>();
-        if(StrUtil.isNotEmpty(name)){
-            queryWrapper.like("WORKER_NAME",name);
-        }
-        if(ObjectUtil.isNotEmpty(deptId)){
-            queryWrapper.eq("DEPT_ID",deptId);
-        }
-        if(StrUtil.isNotEmpty(workerType)){
-            queryWrapper.eq("WORKER_TYPE",workerType);
-        }
-        if(StrUtil.isNotEmpty(startDate)){
-            queryWrapper.ge("CREATE_TIME",startDate + " 00:00:00");
-        }
-        if(StrUtil.isNotEmpty(endDate)){
-            queryWrapper.le("CREATE_TIME",endDate + " 23:59:59");
-        }
-        if(StrUtil.isNotEmpty(status)){
-            queryWrapper.eq("`STATUS`",status);
-        }
-        page = workerService.selectListPage(page,queryWrapper);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-    @ApiOperation("新增人员")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "worker", value = "人员信息", dataType = "Worker", paramType = "body", required = true),
-            @ApiImplicitParam(name = "projectId", value = "项目ID(入场申请需要)", dataType = "Long", paramType = "query", example = "0")
-    })
-    @PostMapping("add")
-    @ResponseBody
-    public Object add(@ApiParam("worker")@RequestBody Worker worker,
-                      @RequestParam(required = false) Long projectId){
-        workerService.addWorker(worker,projectId);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("编辑人员")
-    @PostMapping("update")
-    @ResponseBody
-    public Object update(@RequestBody Worker worker){
-        workerService.updateById(worker);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("删除人员")
-    @PostMapping("delete")
-    @ResponseBody
-    public Object delete(@ApiParam("人员id列表")@RequestBody List<Long> workIds){
-        workerService.removeByIds(workIds);
-        return ResponseData.success();
-    }
-
-
-    @ApiOperation(value = "获取人脸图片",notes = "返回人脸图片url")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "cameraIp",value = "摄像头IP", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "cameraPort",value = "摄像头端口号", dataType = "String", paramType = "query"),
-    })
-    @GetMapping("/face/register")
-    @ResponseBody
-    public Object faceRegister(String cameraIp,String cameraPort){
-        return ResponseData.success(workerService.faceRegister(cameraIp, cameraPort));
-    }
-
-
-    @ApiOperation(value = "查询临时入场人员列表")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "projectId", value = "项目ID",required = true,dataType = "Long", paramType = "query", example = "0")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = Worker.class),
-    })
-    @GetMapping("/projectTempWorker")
-    @ResponseBody
-    public Object projectTempWorker(Long projectId){
-        return ResponseData.success(workerService.projectTempWorker(projectId));
-    }
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/AlarmTypeCountDTO.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/AlarmTypeCountDTO.java
deleted file mode 100644
index 1a165a1..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/AlarmTypeCountDTO.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.casic.missiles.modular.system.dto;
-
-import io.swagger.annotations.ApiModel;
-import lombok.Data;
-
-@ApiModel(value = "AlarmTypeCountDTO",description = "报警类型统计（首页）")
-@Data
-public class AlarmTypeCountDTO {
-
-    private String alarmType;
-    private String alarmTypeName;
-    private Integer alarmCount;
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/AlarmUpload.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/AlarmUpload.java
deleted file mode 100644
index 73d7799..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/AlarmUpload.java
+++ /dev/null
@@ -1,46 +0,0 @@
-package com.casic.missiles.modular.system.dto;
-
-import cn.hutool.core.util.StrUtil;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-@ApiModel(value = "AlarmUpload",description = "报警上传")
-@Data
-public class AlarmUpload {
-
-    @ApiModelProperty(value = "摄像头ip")
-    private String cameraIp;
-
-    @ApiModelProperty(value = "摄像头端口")
-    private String cameraPort;
-    @ApiModelProperty(value = "安全树甲烷设备ip")
-    private String gasIp;
-    @ApiModelProperty(value = "安全树甲烷设备端口")
-    private String gasPort;
-    @ApiModelProperty(value = "报警值")
-    private String alarmValue;
-    @ApiModelProperty(value = "报警时间")
-    private String alarmTime;
-    @ApiModelProperty(value = "报警类型")
-    private String alarmType;
-    @ApiModelProperty(value = "报警图片")
-    private String alarmImage;
-    @ApiModelProperty(value = "报警内容")
-    private String alarmContent;
-
-    @Override
-    public String toString() {
-        return "AlarmUpload{" +
-                "cameraIp='" + cameraIp + '\'' +
-                ", cameraPort='" + cameraPort + '\'' +
-                ", gasIp='" + gasIp + '\'' +
-                ", gasPort='" + gasPort + '\'' +
-                ", alarmValue='" + alarmValue + '\'' +
-                ", alarmTime='" + alarmTime + '\'' +
-                ", alarmType='" + alarmType + '\'' +
-                ", alarmImage='" + (StrUtil.isNotEmpty(alarmImage) ? alarmImage.substring(0,50) : "null") + '\'' +
-                ", alarmContent='" + alarmContent + '\'' +
-                '}';
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/DeviceDetailDTO.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/DeviceDetailDTO.java
deleted file mode 100644
index ea518d9..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/DeviceDetailDTO.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package com.casic.missiles.modular.system.dto;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.casic.missiles.modular.system.entity.Device;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-@ApiModel("DeviceDetailDTO")
-@Data
-public class DeviceDetailDTO extends Device {
-
-    @ApiModelProperty(value = "摄像头编号")
-    private String cameraCode;
-
-    @ApiModelProperty(value = "摄像头IP")
-    private String cameraIp;
-
-    @ApiModelProperty(value = "摄像头端口")
-    private String cameraPort;
-
-    @ApiModelProperty(value = "激甲编号")
-    private String gasCode;
-
-    @ApiModelProperty(value = "激甲IP")
-    private String gasIp;
-
-    @ApiModelProperty(value = "激甲端口")
-    private String gasPort;
-
-    @ApiModelProperty(value = "智能帽衬编号")
-    private String hatLiningCode;
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/WorkSiteDetailDTO.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/WorkSiteDetailDTO.java
deleted file mode 100644
index 29378ff..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/WorkSiteDetailDTO.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package com.casic.missiles.modular.system.dto;
-
-import com.casic.missiles.modular.system.entity.ProjectDevice;
-import com.casic.missiles.modular.system.entity.ProjectWorker;
-import com.casic.missiles.modular.system.entity.WorkSiteInfo;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.util.List;
-
-@Data
-@ApiModel("WorkSiteDetailDTO")
-public class WorkSiteDetailDTO extends WorkSiteInfo {
-
-    @ApiModelProperty(value = "安全树列表",dataType = "ProjectDevice")
-    private List<ProjectDevice> deviceList;
-
-    @ApiModelProperty(value = "人员列表",dataType = "ProjectWorker")
-    private List<ProjectWorker> workerList;
-
-
-
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/WorkerLocationDTO.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/WorkerLocationDTO.java
deleted file mode 100644
index 6fd7b24..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/WorkerLocationDTO.java
+++ /dev/null
@@ -1,68 +0,0 @@
-package com.casic.missiles.modular.system.dto;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-@ApiModel(value = "WorkerLocationDTO",description = "人员位置列表（首页）")
-@Data
-public class WorkerLocationDTO {
-
-    @ApiModelProperty("人员ID")
-    private Long workerId;
-
-    @ApiModelProperty("人员姓名")
-    private String workerName;
-
-    @ApiModelProperty("安全帽编号")
-    private String hatCode;
-
-    @ApiModelProperty("安全帽ID")
-    private Long hatId;
-
-    @ApiModelProperty("背心编号")
-    private String vastCode;
-
-    @ApiModelProperty("手环编号")
-    private String braceletCode;
-
-    @ApiModelProperty("位置")
-    private String location;
-
-    @ApiModelProperty("时间")
-    private String time;
-
-    @ApiModelProperty("经度")
-    private String lng;
-
-    @ApiModelProperty("纬度")
-    private String lat;
-
-    @ApiModelProperty("心率")
-    private String heartRate;
-
-    @ApiModelProperty("血氧")
-    private String bloodOxygen;
-
-    @ApiModelProperty("一氧化碳")
-    private String co;
-
-    @ApiModelProperty("甲烷")
-    private String gas;
-
-    @ApiModelProperty("硫化氢")
-    private String h2s;
-
-    @ApiModelProperty("氧气")
-    private String o2;
-
-    @ApiModelProperty("信号")
-    private String signal;
-
-    @ApiModelProperty("电量")
-    private String cell;
-
-    @ApiModelProperty("是否报警")
-    private boolean alarmFlag;
-}

diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/AlarmController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/AlarmController.java
new file mode 100644
index 0000000..1795cf1
--- /dev/null
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/AlarmController.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.modular.system.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.stereotype.Controller;
+
+/**
+ * <p>
+ * 报警记录表 前端控制器
+ * </p>
+ *
+ * @author zyj
+ * @since 2023-05-25
+ */
+@Controller
+@RequestMapping("/system/alarm")
+public class AlarmController {
+
+}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusAlarmController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusAlarmController.java
deleted file mode 100644
index 1f82ebb..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusAlarmController.java
+++ /dev/null
@@ -1,102 +0,0 @@
-package com.casic.missiles.modular.system.controller;
-
-
-import cn.hutool.core.util.ObjectUtil;
-import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.core.base.controller.BaseController;
-import com.casic.missiles.core.page.PageFactory;
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.AlarmUpload;
-import com.casic.missiles.modular.system.dto.DeviceDetailDTO;
-import com.casic.missiles.modular.system.entity.BusAlarm;
-import com.casic.missiles.modular.system.service.IBusAlarmService;
-import io.swagger.annotations.*;
-import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.*;
-
-import org.springframework.stereotype.Controller;
-
-import static com.casic.missiles.model.response.ResponseData.DEFAULT_SUCCESS_MESSAGE;
-import static com.casic.missiles.modular.system.consts.AlarmConst.ALARM_STATUS_MANUAL_CANCEL;
-
-/**
- * <p>
- * 报警记录表 前端控制器
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@Api(tags = "报警管理接口")
-@Controller
-@RequestMapping("/alarm")
-@RequiredArgsConstructor
-public class BusAlarmController extends BaseController {
-
-    private final IBusAlarmService alarmService;
-
-    @ApiOperation("报警上报接口")
-    @PostMapping("/upload")
-    @ResponseBody
-    public Object upload(@RequestBody AlarmUpload alarmUpload){
-        alarmService.alarmUpload(alarmUpload);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("报警列表分页查询")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "workTitle", value = "作业名称",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "projectId", value = "作业ID",dataType = "Long", paramType = "query",example = "0"),
-            @ApiImplicitParam(name = "alarmStatus", value = "报警状态",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "projectState", value = "作业状态",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "alarmType", value = "报警类型",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "alarmStartTime", value = "报警开始时间",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "alarmEndTime", value = "报警结束时间",dataType = "String", paramType = "query")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = BusAlarm.class),
-    })
-    @GetMapping("/listPage")
-    @ResponseBody
-    public Object listPage(String workTitle,Long projectId,String alarmStatus,String projectState,String alarmType,String alarmStartTime,String alarmEndTime){
-        Page<BusAlarm> page = PageFactory.defaultPage();
-        QueryWrapper<BusAlarm> queryWrapper = new QueryWrapper<>();
-        if(StrUtil.isNotEmpty(workTitle)){
-            queryWrapper.like("p.WORK_TITLE",workTitle);
-        }
-        if(ObjectUtil.isNotEmpty(projectId)){
-            queryWrapper.eq("alarm.PROJECT_ID",projectId);
-        }
-        if(StrUtil.isNotEmpty(alarmStatus)){
-            queryWrapper.eq("alarm.ALARM_STATUS",alarmStatus);
-        }
-        if(StrUtil.isNotEmpty(projectState)){
-            queryWrapper.eq("p.PROJECT_STATE",projectState);
-        }
-        if(StrUtil.isNotEmpty(alarmType)){
-            queryWrapper.eq("alarm.ALARM_TYPE",alarmType);
-        }
-        if(StrUtil.isNotEmpty(alarmStartTime)){
-            queryWrapper.ge("alarm.ALARM_TIME",alarmStartTime);
-        }
-        if(StrUtil.isNotEmpty(alarmEndTime)){
-            queryWrapper.le("alarm.ALARM_TIME",alarmEndTime);
-        }
-        page = alarmService.listPage(page,queryWrapper);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-    @ApiOperation("消警")
-    @PostMapping("/cancel")
-    @ResponseBody
-    public Object cancel(@RequestParam("alarmId") Long alarmId){
-        UpdateWrapper<BusAlarm> updateWrapper = new UpdateWrapper<>();
-        updateWrapper.eq("ID",alarmId);
-        updateWrapper.set("ALARM_STATUS",ALARM_STATUS_MANUAL_CANCEL);
-        alarmService.update(updateWrapper);
-        return ResponseData.success();
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusEventController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusEventController.java
deleted file mode 100644
index dde5aad..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusEventController.java
+++ /dev/null
@@ -1,41 +0,0 @@
-package com.casic.missiles.modular.system.controller;
-
-
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.entity.BusEvent;
-import com.casic.missiles.modular.system.service.IBusEventService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.ResponseBody;
-
-/**
- * <p>
- * 事件表 前端控制器
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@Controller
-@RequestMapping("/event")
-@Api(tags = "事件上报")
-@RequiredArgsConstructor
-public class BusEventController {
-
-    private final IBusEventService eventService;
-
-    @ApiOperation("事件上报")
-    @PostMapping("add")
-    @ResponseBody
-    public Object add(@RequestBody BusEvent busEvent){
-        eventService.saveBusEvent(busEvent);
-        return ResponseData.success();
-    }
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
index 03abc5f..aa50d78 100644
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
@@ -1,121 +1,20 @@
 package com.casic.missiles.modular.system.controller;
 
 
-import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.core.base.controller.BaseController;
-import com.casic.missiles.core.page.PageFactory;
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.DeviceDetailDTO;
-import com.casic.missiles.modular.system.entity.Device;
-import com.casic.missiles.modular.system.service.IDeviceExtService;
-import com.casic.missiles.modular.system.service.IDeviceService;
-import io.swagger.annotations.*;
-import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.RequestMapping;
 
 import org.springframework.stereotype.Controller;
 
-import java.time.LocalDateTime;
-import java.util.Date;
-import java.util.List;
-
-import static com.casic.missiles.model.response.ResponseData.DEFAULT_SUCCESS_MESSAGE;
-
 /**
  * <p>
- *  前端控制器
+ * 设备记录表 前端控制器
  * </p>
  *
  * @author zyj
- * @since 2023-04-14
+ * @since 2023-05-25
  */
-@Api(tags = "设备管理接口")
-@RequiredArgsConstructor
 @Controller
-@RequestMapping("/device")
-public class DeviceController extends BaseController {
-    private final IDeviceService deviceService;
-    private final IDeviceExtService deviceExtService;
-
-    @ApiOperation("设备分页列表")
-    @ApiImplicitParams({
-        @ApiImplicitParam(name = "deviceType", value = "设备类型",dataType = "String", paramType = "query"),
-        @ApiImplicitParam(name = "deviceCode", value = "设备编号",dataType = "String", paramType = "query"),
-        @ApiImplicitParam(name = "status", value = "设备状态",dataType = "String", paramType = "query"),
-        @ApiImplicitParam(name = "projectId", value = "作业ID（如果传此参数，列表中返回该作业使用的设备）",dataType = "Long", paramType = "query", example = "0")
-    })
-    @ApiResponses({
-        @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = DeviceDetailDTO.class),
-    })
-    @GetMapping("listPage")
-    @ResponseBody
-    public Object listPage(String deviceType, String deviceCode, String status,Long projectId){
-        Page<DeviceDetailDTO> page = PageFactory.defaultPage();
-        QueryWrapper<DeviceDetailDTO> queryWrapper = new QueryWrapper<>();
-        if(StrUtil.isNotEmpty(deviceType)){
-            queryWrapper.eq("DEVICE_TYPE",deviceType);
-        }
-        if(StrUtil.isNotEmpty(deviceCode)){
-            queryWrapper.like("DEVICE_CODE",deviceCode);
-        }
-        page = deviceService.listPage(page,queryWrapper,status,projectId);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-    @ApiOperation("新增设备")
-    @PostMapping("add")
-    @ResponseBody
-    public Object add(@RequestBody DeviceDetailDTO deviceDetailDTO){
-        deviceService.saveDevice(deviceDetailDTO);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("编辑设备")
-    @PostMapping("update")
-    @ResponseBody
-    public Object update(@RequestBody DeviceDetailDTO deviceDetailDTO){
-        deviceService.updateDevice(deviceDetailDTO);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("删除设备")
-    @PostMapping("delete")
-    @ResponseBody
-    public Object delete(@ApiParam("设备id列表")@RequestBody List<Long> deviceIds){
-        deviceService.deleteDevices(deviceIds);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("设置甲烷阈值")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "gasIp", value = "安全树甲烷设备IP",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "gasPort", value = "安全树甲烷端口",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "threshold", value = "甲烷阈值",dataType = "String", paramType = "query")
-    })
-    @PostMapping("setThreshold")
-    @ResponseBody
-    public Object setThreshold(String gasIp,String gasPort,String threshold){
-        deviceExtService.setGasThreshold(gasIp, gasPort, threshold);
-        return ResponseData.success();
-    }
-
-
-    @ApiOperation("查询甲烷阈值")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "gasIp", value = "安全树甲烷设备IP",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "gasPort", value = "安全树甲烷端口",dataType = "String", paramType = "query")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = "{\"code\": 200,\"data\": \"100\",\"message\": \"请求成功\",\"success\": true}",response = String.class),
-    })
-    @GetMapping("getThreshold")
-    @ResponseBody
-    public Object getThreshold(String gasIp,String gasPort){
-        String data = deviceExtService.getGasThreshold(gasIp, gasPort);
-        return ResponseData.success(data);
-    }
-
+@RequestMapping("/system/device")
+public class DeviceController {
 
 }
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/OverviewController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/OverviewController.java
deleted file mode 100644
index 7570504..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/OverviewController.java
+++ /dev/null
@@ -1,70 +0,0 @@
-package com.casic.missiles.modular.system.controller;
-
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.AlarmTypeCountDTO;
-import com.casic.missiles.modular.system.dto.DeviceLocationDTO;
-import com.casic.missiles.modular.system.dto.WorkerLocationDTO;
-import com.casic.missiles.modular.system.service.IBusAlarmService;
-import com.casic.missiles.modular.system.service.IProjectDeviceService;
-import com.casic.missiles.modular.system.service.IProjectWorkerService;
-import io.swagger.annotations.*;
-import lombok.RequiredArgsConstructor;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.ResponseBody;
-
-import static com.casic.missiles.model.response.ResponseData.DEFAULT_SUCCESS_MESSAGE;
-import static com.casic.missiles.modular.system.consts.AlarmConst.ALARM_STATUS_ON;
-
-@Api(tags = "首页看板接口")
-@Controller
-@RequestMapping("overview")
-@RequiredArgsConstructor
-public class OverviewController {
-
-    private final IBusAlarmService alarmService;
-    private final IProjectDeviceService projectDeviceService;
-
-    private final IProjectWorkerService projectWorkerService;
-
-
-    @ApiOperation("报警统计接口")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "projectId", value = "作业ID",dataType = "Long", paramType = "query", example = "0")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = AlarmTypeCountDTO.class),
-    })
-    @GetMapping("/alarmCount")
-    @ResponseBody
-    public Object alarmCount(Long projectId){
-        return ResponseData.success(alarmService.alarmCount(projectId,ALARM_STATUS_ON));
-    }
-
-    @ApiOperation("设备列表接口")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "projectId", value = "作业ID",dataType = "Long", paramType = "query", example = "0")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = DeviceLocationDTO.class),
-    })
-    @GetMapping("/deviceList")
-    @ResponseBody
-    public Object deviceList(Long projectId){
-        return ResponseData.success(projectDeviceService.selectDeviceLocationList(projectId));
-    }
-
-    @ApiOperation("人员列表接口")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "projectId", value = "作业ID",dataType = "Long", paramType = "query", example = "0")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = WorkerLocationDTO.class),
-    })
-    @GetMapping("/workerList")
-    @ResponseBody
-    public Object workerList(Long projectId){
-        return ResponseData.success(projectWorkerService.selectWorkerLocationDTO(projectId));
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/WorkSiteInfoController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/WorkSiteInfoController.java
deleted file mode 100644
index af36d69..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/WorkSiteInfoController.java
+++ /dev/null
@@ -1,130 +0,0 @@
-package com.casic.missiles.modular.system.controller;
-
-
-import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.core.base.controller.BaseController;
-import com.casic.missiles.core.page.PageFactory;
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.WorkSiteDetailDTO;
-import com.casic.missiles.modular.system.entity.WorkSiteInfo;
-import com.casic.missiles.modular.system.service.IWorkSiteInfoService;
-import io.swagger.annotations.*;
-import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.*;
-
-import org.springframework.stereotype.Controller;
-
-import java.util.List;
-
-import static com.casic.missiles.model.response.ResponseData.DEFAULT_SUCCESS_MESSAGE;
-
-/**
- * <p>
- * 作业现场表 前端控制器
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@Controller
-@RequestMapping("/site")
-@Api(tags = "作业现场管理")
-@RequiredArgsConstructor
-public class WorkSiteInfoController extends BaseController {
-
-
-    private final IWorkSiteInfoService workSiteInfoService;
-
-    @ApiOperation("新增作业现场")
-    @PostMapping("add")
-    @ResponseBody
-    public Object addWorkSite(@RequestBody WorkSiteDetailDTO workSiteDetailDTO){
-        workSiteInfoService.addWorkSiteInfo(workSiteDetailDTO);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("编辑作业现场")
-    @PostMapping("update")
-    @ResponseBody
-    public Object updateWorkSite(@RequestBody WorkSiteDetailDTO workSiteDetailDTO){
-        workSiteInfoService.updateWorkSiteInfo(workSiteDetailDTO);
-        return ResponseData.success();
-    }
-
-
-    @ApiOperation("删除作业现场")
-    @PostMapping("delete")
-    @ResponseBody
-    public Object delete(@ApiParam("作业现场id列表")@RequestBody List<Long> projectIds){
-        workSiteInfoService.deleteProjects(projectIds);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("查询作业现场详情")
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = WorkSiteDetailDTO.class),
-    })
-    @GetMapping("detail")
-    @ResponseBody
-    public Object delete(@ApiParam(value = "作业现场id", example = "0")@RequestParam Long projectId){
-        WorkSiteDetailDTO detailDTO = workSiteInfoService.getWorkSiteDetail(projectId);
-        return ResponseData.success(detailDTO);
-    }
-
-    @ApiOperation("分页列表查询")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "workTitle",value = "作业名称", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "workRoad",value = "所属道路", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "workPersonName",value = "责任人姓名", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "startDate",value = "注册开始日期", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "endDate",value = "注册结束日期", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "projectState",value = "当前状态（字典值）", dataType = "String", paramType = "query")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = WorkSiteInfo.class),
-    })
-    @GetMapping("listPage")
-    @ResponseBody
-    public Object listPage(String workTitle,String workRoad,String workPersonName,String projectState,String startDate,String endDate){
-        Page<WorkSiteInfo> page = PageFactory.defaultPage();
-        QueryWrapper<WorkSiteInfo> queryWrapper = new QueryWrapper<>();
-        if(StrUtil.isNotEmpty(workTitle)){
-            queryWrapper.like("WORK_TITLE",workTitle);
-        }
-        if(StrUtil.isNotEmpty(workRoad)){
-            queryWrapper.like("WORK_ROAD",workRoad);
-        }
-        if(StrUtil.isNotEmpty(workPersonName)){
-            queryWrapper.like("WORKER_NAME",workPersonName);
-        }
-        if(StrUtil.isNotEmpty(projectState)){
-            queryWrapper.eq("PROJECT_STATE",projectState);
-        }
-        if(StrUtil.isNotEmpty(startDate)){
-            queryWrapper.ge("br_work_site_info.CREATE_TIME",startDate + " 00:00:00");
-        }
-        if(StrUtil.isNotEmpty(endDate)){
-            queryWrapper.le("br_work_site_info.CREATE_TIME",endDate + " 23:59:59");
-        }
-        page = workSiteInfoService.selectListPage(page,queryWrapper);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-    @ApiOperation("开始作业")
-    @PostMapping("start")
-    @ResponseBody
-    public Object start(@ApiParam(value = "作业现场id",example = "0")@RequestParam Long projectId){
-        workSiteInfoService.start(projectId);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("完成作业")
-    @PostMapping("finish")
-    @ResponseBody
-    public Object finish(@ApiParam(value = "作业现场id", example = "0")@RequestParam Long projectId){
-        workSiteInfoService.finish(projectId);
-        return ResponseData.success();
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/WorkerController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/WorkerController.java
deleted file mode 100644
index 796f94c..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/WorkerController.java
+++ /dev/null
@@ -1,136 +0,0 @@
-package com.casic.missiles.modular.system.controller;
-
-
-import cn.hutool.core.util.ObjectUtil;
-import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.core.base.controller.BaseController;
-import com.casic.missiles.core.page.PageFactory;
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.DeviceDetailDTO;
-import com.casic.missiles.modular.system.entity.Device;
-import com.casic.missiles.modular.system.entity.Worker;
-import com.casic.missiles.modular.system.service.IWorkerService;
-import io.swagger.annotations.*;
-import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.*;
-
-import org.springframework.stereotype.Controller;
-
-import java.util.Date;
-import java.util.List;
-
-import static com.casic.missiles.model.response.ResponseData.DEFAULT_SUCCESS_MESSAGE;
-
-/**
- * <p>
- *  前端控制器
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@Controller
-@RequestMapping("/worker")
-@RequiredArgsConstructor
-@Api(tags = "人员管理接口")
-public class WorkerController extends BaseController {
-
-    private final IWorkerService workerService;
-
-    @ApiOperation("分页列表查询")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "name",value = "姓名", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "deptId",value = "所属部门", dataType = "Long", paramType = "query", example = "0"),
-            @ApiImplicitParam(name = "status",value = "当前状态（字典值）", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "startDate",value = "注册开始日期", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "endDate",value = "注册结束日期", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "workerType",value = "人员类型（字典值）", dataType = "String", paramType = "query")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = Worker.class),
-    })
-    @GetMapping("listPage")
-    @ResponseBody
-    public Object listPage(String name,Long deptId, String status,String startDate,String endDate,String workerType){
-        Page<Worker> page = PageFactory.defaultPage();
-        QueryWrapper<Worker> queryWrapper = new QueryWrapper<>();
-        if(StrUtil.isNotEmpty(name)){
-            queryWrapper.like("WORKER_NAME",name);
-        }
-        if(ObjectUtil.isNotEmpty(deptId)){
-            queryWrapper.eq("DEPT_ID",deptId);
-        }
-        if(StrUtil.isNotEmpty(workerType)){
-            queryWrapper.eq("WORKER_TYPE",workerType);
-        }
-        if(StrUtil.isNotEmpty(startDate)){
-            queryWrapper.ge("CREATE_TIME",startDate + " 00:00:00");
-        }
-        if(StrUtil.isNotEmpty(endDate)){
-            queryWrapper.le("CREATE_TIME",endDate + " 23:59:59");
-        }
-        if(StrUtil.isNotEmpty(status)){
-            queryWrapper.eq("`STATUS`",status);
-        }
-        page = workerService.selectListPage(page,queryWrapper);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-    @ApiOperation("新增人员")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "worker", value = "人员信息", dataType = "Worker", paramType = "body", required = true),
-            @ApiImplicitParam(name = "projectId", value = "项目ID(入场申请需要)", dataType = "Long", paramType = "query", example = "0")
-    })
-    @PostMapping("add")
-    @ResponseBody
-    public Object add(@ApiParam("worker")@RequestBody Worker worker,
-                      @RequestParam(required = false) Long projectId){
-        workerService.addWorker(worker,projectId);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("编辑人员")
-    @PostMapping("update")
-    @ResponseBody
-    public Object update(@RequestBody Worker worker){
-        workerService.updateById(worker);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("删除人员")
-    @PostMapping("delete")
-    @ResponseBody
-    public Object delete(@ApiParam("人员id列表")@RequestBody List<Long> workIds){
-        workerService.removeByIds(workIds);
-        return ResponseData.success();
-    }
-
-
-    @ApiOperation(value = "获取人脸图片",notes = "返回人脸图片url")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "cameraIp",value = "摄像头IP", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "cameraPort",value = "摄像头端口号", dataType = "String", paramType = "query"),
-    })
-    @GetMapping("/face/register")
-    @ResponseBody
-    public Object faceRegister(String cameraIp,String cameraPort){
-        return ResponseData.success(workerService.faceRegister(cameraIp, cameraPort));
-    }
-
-
-    @ApiOperation(value = "查询临时入场人员列表")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "projectId", value = "项目ID",required = true,dataType = "Long", paramType = "query", example = "0")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = Worker.class),
-    })
-    @GetMapping("/projectTempWorker")
-    @ResponseBody
-    public Object projectTempWorker(Long projectId){
-        return ResponseData.success(workerService.projectTempWorker(projectId));
-    }
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/AlarmTypeCountDTO.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/AlarmTypeCountDTO.java
deleted file mode 100644
index 1a165a1..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/AlarmTypeCountDTO.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.casic.missiles.modular.system.dto;
-
-import io.swagger.annotations.ApiModel;
-import lombok.Data;
-
-@ApiModel(value = "AlarmTypeCountDTO",description = "报警类型统计（首页）")
-@Data
-public class AlarmTypeCountDTO {
-
-    private String alarmType;
-    private String alarmTypeName;
-    private Integer alarmCount;
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/AlarmUpload.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/AlarmUpload.java
deleted file mode 100644
index 73d7799..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/AlarmUpload.java
+++ /dev/null
@@ -1,46 +0,0 @@
-package com.casic.missiles.modular.system.dto;
-
-import cn.hutool.core.util.StrUtil;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-@ApiModel(value = "AlarmUpload",description = "报警上传")
-@Data
-public class AlarmUpload {
-
-    @ApiModelProperty(value = "摄像头ip")
-    private String cameraIp;
-
-    @ApiModelProperty(value = "摄像头端口")
-    private String cameraPort;
-    @ApiModelProperty(value = "安全树甲烷设备ip")
-    private String gasIp;
-    @ApiModelProperty(value = "安全树甲烷设备端口")
-    private String gasPort;
-    @ApiModelProperty(value = "报警值")
-    private String alarmValue;
-    @ApiModelProperty(value = "报警时间")
-    private String alarmTime;
-    @ApiModelProperty(value = "报警类型")
-    private String alarmType;
-    @ApiModelProperty(value = "报警图片")
-    private String alarmImage;
-    @ApiModelProperty(value = "报警内容")
-    private String alarmContent;
-
-    @Override
-    public String toString() {
-        return "AlarmUpload{" +
-                "cameraIp='" + cameraIp + '\'' +
-                ", cameraPort='" + cameraPort + '\'' +
-                ", gasIp='" + gasIp + '\'' +
-                ", gasPort='" + gasPort + '\'' +
-                ", alarmValue='" + alarmValue + '\'' +
-                ", alarmTime='" + alarmTime + '\'' +
-                ", alarmType='" + alarmType + '\'' +
-                ", alarmImage='" + (StrUtil.isNotEmpty(alarmImage) ? alarmImage.substring(0,50) : "null") + '\'' +
-                ", alarmContent='" + alarmContent + '\'' +
-                '}';
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/DeviceDetailDTO.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/DeviceDetailDTO.java
deleted file mode 100644
index ea518d9..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/DeviceDetailDTO.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package com.casic.missiles.modular.system.dto;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.casic.missiles.modular.system.entity.Device;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-@ApiModel("DeviceDetailDTO")
-@Data
-public class DeviceDetailDTO extends Device {
-
-    @ApiModelProperty(value = "摄像头编号")
-    private String cameraCode;
-
-    @ApiModelProperty(value = "摄像头IP")
-    private String cameraIp;
-
-    @ApiModelProperty(value = "摄像头端口")
-    private String cameraPort;
-
-    @ApiModelProperty(value = "激甲编号")
-    private String gasCode;
-
-    @ApiModelProperty(value = "激甲IP")
-    private String gasIp;
-
-    @ApiModelProperty(value = "激甲端口")
-    private String gasPort;
-
-    @ApiModelProperty(value = "智能帽衬编号")
-    private String hatLiningCode;
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/WorkSiteDetailDTO.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/WorkSiteDetailDTO.java
deleted file mode 100644
index 29378ff..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/WorkSiteDetailDTO.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package com.casic.missiles.modular.system.dto;
-
-import com.casic.missiles.modular.system.entity.ProjectDevice;
-import com.casic.missiles.modular.system.entity.ProjectWorker;
-import com.casic.missiles.modular.system.entity.WorkSiteInfo;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.util.List;
-
-@Data
-@ApiModel("WorkSiteDetailDTO")
-public class WorkSiteDetailDTO extends WorkSiteInfo {
-
-    @ApiModelProperty(value = "安全树列表",dataType = "ProjectDevice")
-    private List<ProjectDevice> deviceList;
-
-    @ApiModelProperty(value = "人员列表",dataType = "ProjectWorker")
-    private List<ProjectWorker> workerList;
-
-
-
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/WorkerLocationDTO.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/WorkerLocationDTO.java
deleted file mode 100644
index 6fd7b24..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/WorkerLocationDTO.java
+++ /dev/null
@@ -1,68 +0,0 @@
-package com.casic.missiles.modular.system.dto;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-@ApiModel(value = "WorkerLocationDTO",description = "人员位置列表（首页）")
-@Data
-public class WorkerLocationDTO {
-
-    @ApiModelProperty("人员ID")
-    private Long workerId;
-
-    @ApiModelProperty("人员姓名")
-    private String workerName;
-
-    @ApiModelProperty("安全帽编号")
-    private String hatCode;
-
-    @ApiModelProperty("安全帽ID")
-    private Long hatId;
-
-    @ApiModelProperty("背心编号")
-    private String vastCode;
-
-    @ApiModelProperty("手环编号")
-    private String braceletCode;
-
-    @ApiModelProperty("位置")
-    private String location;
-
-    @ApiModelProperty("时间")
-    private String time;
-
-    @ApiModelProperty("经度")
-    private String lng;
-
-    @ApiModelProperty("纬度")
-    private String lat;
-
-    @ApiModelProperty("心率")
-    private String heartRate;
-
-    @ApiModelProperty("血氧")
-    private String bloodOxygen;
-
-    @ApiModelProperty("一氧化碳")
-    private String co;
-
-    @ApiModelProperty("甲烷")
-    private String gas;
-
-    @ApiModelProperty("硫化氢")
-    private String h2s;
-
-    @ApiModelProperty("氧气")
-    private String o2;
-
-    @ApiModelProperty("信号")
-    private String signal;
-
-    @ApiModelProperty("电量")
-    private String cell;
-
-    @ApiModelProperty("是否报警")
-    private boolean alarmFlag;
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Alarm.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Alarm.java
new file mode 100644
index 0000000..4d2b7ef
--- /dev/null
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Alarm.java
@@ -0,0 +1,103 @@
+package com.casic.missiles.modular.system.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import java.util.Date;
+
+/**
+ * <p>
+ * 报警记录表
+ * </p>
+ *
+ * @author zyj
+ * @since 2023-05-25
+ */
+@Data
+@TableName("bus_alarm")
+public class Alarm implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    @TableId(value = "ID",type = IdType.ASSIGN_ID)
+    private Long id;
+
+    /**
+     * 设备ID
+     */
+    @TableField("DEVICE_ID")
+    private Long deviceId;
+
+    /**
+     * 报警类型
+     */
+    @TableField("ALARM_TYPE")
+    private String alarmType;
+
+    /**
+     * 报警时间
+     */
+    @TableField("ALARM_TIME")
+    private Date alarmTime;
+
+    /**
+     * 报警状态
+     */
+    @TableField("ALARM_STATUS")
+    private String alarmStatus;
+
+    /**
+     * 报警位置
+     */
+    @TableField("ALARM_LOCATION")
+    private String alarmLocation;
+
+    /**
+     * 报警图片
+     */
+    @TableField("ALARM_IMAGE")
+    private String alarmImage;
+
+    /**
+     * 视频通道号
+     */
+    @TableField("CHANNEL_NO")
+    private Integer channelNo;
+
+    /**
+     * 报警内容
+     */
+    @TableField("ALARM_CONTENT")
+    private String alarmContent;
+
+    /**
+     * 消警时间
+     */
+    @TableField("CANCEL_TIME")
+    private Date cancelTime;
+
+
+    @Override
+    public String toString() {
+        return "Alarm{" +
+            "id=" + id +
+            ", deviceId=" + deviceId +
+            ", alarmType=" + alarmType +
+            ", alarmTime=" + alarmTime +
+            ", alarmStatus=" + alarmStatus +
+            ", alarmLocation=" + alarmLocation +
+            ", alarmImage=" + alarmImage +
+            ", channelNo=" + channelNo +
+            ", alarmContent=" + alarmContent +
+            ", cancelTime=" + cancelTime +
+        "}";
+    }
+}

diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/AlarmController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/AlarmController.java
new file mode 100644
index 0000000..1795cf1
--- /dev/null
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/AlarmController.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.modular.system.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.stereotype.Controller;
+
+/**
+ * <p>
+ * 报警记录表 前端控制器
+ * </p>
+ *
+ * @author zyj
+ * @since 2023-05-25
+ */
+@Controller
+@RequestMapping("/system/alarm")
+public class AlarmController {
+
+}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusAlarmController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusAlarmController.java
deleted file mode 100644
index 1f82ebb..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusAlarmController.java
+++ /dev/null
@@ -1,102 +0,0 @@
-package com.casic.missiles.modular.system.controller;
-
-
-import cn.hutool.core.util.ObjectUtil;
-import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.core.base.controller.BaseController;
-import com.casic.missiles.core.page.PageFactory;
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.AlarmUpload;
-import com.casic.missiles.modular.system.dto.DeviceDetailDTO;
-import com.casic.missiles.modular.system.entity.BusAlarm;
-import com.casic.missiles.modular.system.service.IBusAlarmService;
-import io.swagger.annotations.*;
-import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.*;
-
-import org.springframework.stereotype.Controller;
-
-import static com.casic.missiles.model.response.ResponseData.DEFAULT_SUCCESS_MESSAGE;
-import static com.casic.missiles.modular.system.consts.AlarmConst.ALARM_STATUS_MANUAL_CANCEL;
-
-/**
- * <p>
- * 报警记录表 前端控制器
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@Api(tags = "报警管理接口")
-@Controller
-@RequestMapping("/alarm")
-@RequiredArgsConstructor
-public class BusAlarmController extends BaseController {
-
-    private final IBusAlarmService alarmService;
-
-    @ApiOperation("报警上报接口")
-    @PostMapping("/upload")
-    @ResponseBody
-    public Object upload(@RequestBody AlarmUpload alarmUpload){
-        alarmService.alarmUpload(alarmUpload);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("报警列表分页查询")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "workTitle", value = "作业名称",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "projectId", value = "作业ID",dataType = "Long", paramType = "query",example = "0"),
-            @ApiImplicitParam(name = "alarmStatus", value = "报警状态",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "projectState", value = "作业状态",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "alarmType", value = "报警类型",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "alarmStartTime", value = "报警开始时间",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "alarmEndTime", value = "报警结束时间",dataType = "String", paramType = "query")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = BusAlarm.class),
-    })
-    @GetMapping("/listPage")
-    @ResponseBody
-    public Object listPage(String workTitle,Long projectId,String alarmStatus,String projectState,String alarmType,String alarmStartTime,String alarmEndTime){
-        Page<BusAlarm> page = PageFactory.defaultPage();
-        QueryWrapper<BusAlarm> queryWrapper = new QueryWrapper<>();
-        if(StrUtil.isNotEmpty(workTitle)){
-            queryWrapper.like("p.WORK_TITLE",workTitle);
-        }
-        if(ObjectUtil.isNotEmpty(projectId)){
-            queryWrapper.eq("alarm.PROJECT_ID",projectId);
-        }
-        if(StrUtil.isNotEmpty(alarmStatus)){
-            queryWrapper.eq("alarm.ALARM_STATUS",alarmStatus);
-        }
-        if(StrUtil.isNotEmpty(projectState)){
-            queryWrapper.eq("p.PROJECT_STATE",projectState);
-        }
-        if(StrUtil.isNotEmpty(alarmType)){
-            queryWrapper.eq("alarm.ALARM_TYPE",alarmType);
-        }
-        if(StrUtil.isNotEmpty(alarmStartTime)){
-            queryWrapper.ge("alarm.ALARM_TIME",alarmStartTime);
-        }
-        if(StrUtil.isNotEmpty(alarmEndTime)){
-            queryWrapper.le("alarm.ALARM_TIME",alarmEndTime);
-        }
-        page = alarmService.listPage(page,queryWrapper);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-    @ApiOperation("消警")
-    @PostMapping("/cancel")
-    @ResponseBody
-    public Object cancel(@RequestParam("alarmId") Long alarmId){
-        UpdateWrapper<BusAlarm> updateWrapper = new UpdateWrapper<>();
-        updateWrapper.eq("ID",alarmId);
-        updateWrapper.set("ALARM_STATUS",ALARM_STATUS_MANUAL_CANCEL);
-        alarmService.update(updateWrapper);
-        return ResponseData.success();
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusEventController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusEventController.java
deleted file mode 100644
index dde5aad..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusEventController.java
+++ /dev/null
@@ -1,41 +0,0 @@
-package com.casic.missiles.modular.system.controller;
-
-
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.entity.BusEvent;
-import com.casic.missiles.modular.system.service.IBusEventService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.ResponseBody;
-
-/**
- * <p>
- * 事件表 前端控制器
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@Controller
-@RequestMapping("/event")
-@Api(tags = "事件上报")
-@RequiredArgsConstructor
-public class BusEventController {
-
-    private final IBusEventService eventService;
-
-    @ApiOperation("事件上报")
-    @PostMapping("add")
-    @ResponseBody
-    public Object add(@RequestBody BusEvent busEvent){
-        eventService.saveBusEvent(busEvent);
-        return ResponseData.success();
-    }
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
index 03abc5f..aa50d78 100644
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
@@ -1,121 +1,20 @@
 package com.casic.missiles.modular.system.controller;
 
 
-import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.core.base.controller.BaseController;
-import com.casic.missiles.core.page.PageFactory;
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.DeviceDetailDTO;
-import com.casic.missiles.modular.system.entity.Device;
-import com.casic.missiles.modular.system.service.IDeviceExtService;
-import com.casic.missiles.modular.system.service.IDeviceService;
-import io.swagger.annotations.*;
-import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.RequestMapping;
 
 import org.springframework.stereotype.Controller;
 
-import java.time.LocalDateTime;
-import java.util.Date;
-import java.util.List;
-
-import static com.casic.missiles.model.response.ResponseData.DEFAULT_SUCCESS_MESSAGE;
-
 /**
  * <p>
- *  前端控制器
+ * 设备记录表 前端控制器
  * </p>
  *
  * @author zyj
- * @since 2023-04-14
+ * @since 2023-05-25
  */
-@Api(tags = "设备管理接口")
-@RequiredArgsConstructor
 @Controller
-@RequestMapping("/device")
-public class DeviceController extends BaseController {
-    private final IDeviceService deviceService;
-    private final IDeviceExtService deviceExtService;
-
-    @ApiOperation("设备分页列表")
-    @ApiImplicitParams({
-        @ApiImplicitParam(name = "deviceType", value = "设备类型",dataType = "String", paramType = "query"),
-        @ApiImplicitParam(name = "deviceCode", value = "设备编号",dataType = "String", paramType = "query"),
-        @ApiImplicitParam(name = "status", value = "设备状态",dataType = "String", paramType = "query"),
-        @ApiImplicitParam(name = "projectId", value = "作业ID（如果传此参数，列表中返回该作业使用的设备）",dataType = "Long", paramType = "query", example = "0")
-    })
-    @ApiResponses({
-        @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = DeviceDetailDTO.class),
-    })
-    @GetMapping("listPage")
-    @ResponseBody
-    public Object listPage(String deviceType, String deviceCode, String status,Long projectId){
-        Page<DeviceDetailDTO> page = PageFactory.defaultPage();
-        QueryWrapper<DeviceDetailDTO> queryWrapper = new QueryWrapper<>();
-        if(StrUtil.isNotEmpty(deviceType)){
-            queryWrapper.eq("DEVICE_TYPE",deviceType);
-        }
-        if(StrUtil.isNotEmpty(deviceCode)){
-            queryWrapper.like("DEVICE_CODE",deviceCode);
-        }
-        page = deviceService.listPage(page,queryWrapper,status,projectId);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-    @ApiOperation("新增设备")
-    @PostMapping("add")
-    @ResponseBody
-    public Object add(@RequestBody DeviceDetailDTO deviceDetailDTO){
-        deviceService.saveDevice(deviceDetailDTO);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("编辑设备")
-    @PostMapping("update")
-    @ResponseBody
-    public Object update(@RequestBody DeviceDetailDTO deviceDetailDTO){
-        deviceService.updateDevice(deviceDetailDTO);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("删除设备")
-    @PostMapping("delete")
-    @ResponseBody
-    public Object delete(@ApiParam("设备id列表")@RequestBody List<Long> deviceIds){
-        deviceService.deleteDevices(deviceIds);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("设置甲烷阈值")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "gasIp", value = "安全树甲烷设备IP",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "gasPort", value = "安全树甲烷端口",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "threshold", value = "甲烷阈值",dataType = "String", paramType = "query")
-    })
-    @PostMapping("setThreshold")
-    @ResponseBody
-    public Object setThreshold(String gasIp,String gasPort,String threshold){
-        deviceExtService.setGasThreshold(gasIp, gasPort, threshold);
-        return ResponseData.success();
-    }
-
-
-    @ApiOperation("查询甲烷阈值")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "gasIp", value = "安全树甲烷设备IP",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "gasPort", value = "安全树甲烷端口",dataType = "String", paramType = "query")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = "{\"code\": 200,\"data\": \"100\",\"message\": \"请求成功\",\"success\": true}",response = String.class),
-    })
-    @GetMapping("getThreshold")
-    @ResponseBody
-    public Object getThreshold(String gasIp,String gasPort){
-        String data = deviceExtService.getGasThreshold(gasIp, gasPort);
-        return ResponseData.success(data);
-    }
-
+@RequestMapping("/system/device")
+public class DeviceController {
 
 }
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/OverviewController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/OverviewController.java
deleted file mode 100644
index 7570504..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/OverviewController.java
+++ /dev/null
@@ -1,70 +0,0 @@
-package com.casic.missiles.modular.system.controller;
-
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.AlarmTypeCountDTO;
-import com.casic.missiles.modular.system.dto.DeviceLocationDTO;
-import com.casic.missiles.modular.system.dto.WorkerLocationDTO;
-import com.casic.missiles.modular.system.service.IBusAlarmService;
-import com.casic.missiles.modular.system.service.IProjectDeviceService;
-import com.casic.missiles.modular.system.service.IProjectWorkerService;
-import io.swagger.annotations.*;
-import lombok.RequiredArgsConstructor;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.ResponseBody;
-
-import static com.casic.missiles.model.response.ResponseData.DEFAULT_SUCCESS_MESSAGE;
-import static com.casic.missiles.modular.system.consts.AlarmConst.ALARM_STATUS_ON;
-
-@Api(tags = "首页看板接口")
-@Controller
-@RequestMapping("overview")
-@RequiredArgsConstructor
-public class OverviewController {
-
-    private final IBusAlarmService alarmService;
-    private final IProjectDeviceService projectDeviceService;
-
-    private final IProjectWorkerService projectWorkerService;
-
-
-    @ApiOperation("报警统计接口")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "projectId", value = "作业ID",dataType = "Long", paramType = "query", example = "0")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = AlarmTypeCountDTO.class),
-    })
-    @GetMapping("/alarmCount")
-    @ResponseBody
-    public Object alarmCount(Long projectId){
-        return ResponseData.success(alarmService.alarmCount(projectId,ALARM_STATUS_ON));
-    }
-
-    @ApiOperation("设备列表接口")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "projectId", value = "作业ID",dataType = "Long", paramType = "query", example = "0")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = DeviceLocationDTO.class),
-    })
-    @GetMapping("/deviceList")
-    @ResponseBody
-    public Object deviceList(Long projectId){
-        return ResponseData.success(projectDeviceService.selectDeviceLocationList(projectId));
-    }
-
-    @ApiOperation("人员列表接口")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "projectId", value = "作业ID",dataType = "Long", paramType = "query", example = "0")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = WorkerLocationDTO.class),
-    })
-    @GetMapping("/workerList")
-    @ResponseBody
-    public Object workerList(Long projectId){
-        return ResponseData.success(projectWorkerService.selectWorkerLocationDTO(projectId));
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/WorkSiteInfoController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/WorkSiteInfoController.java
deleted file mode 100644
index af36d69..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/WorkSiteInfoController.java
+++ /dev/null
@@ -1,130 +0,0 @@
-package com.casic.missiles.modular.system.controller;
-
-
-import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.core.base.controller.BaseController;
-import com.casic.missiles.core.page.PageFactory;
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.WorkSiteDetailDTO;
-import com.casic.missiles.modular.system.entity.WorkSiteInfo;
-import com.casic.missiles.modular.system.service.IWorkSiteInfoService;
-import io.swagger.annotations.*;
-import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.*;
-
-import org.springframework.stereotype.Controller;
-
-import java.util.List;
-
-import static com.casic.missiles.model.response.ResponseData.DEFAULT_SUCCESS_MESSAGE;
-
-/**
- * <p>
- * 作业现场表 前端控制器
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@Controller
-@RequestMapping("/site")
-@Api(tags = "作业现场管理")
-@RequiredArgsConstructor
-public class WorkSiteInfoController extends BaseController {
-
-
-    private final IWorkSiteInfoService workSiteInfoService;
-
-    @ApiOperation("新增作业现场")
-    @PostMapping("add")
-    @ResponseBody
-    public Object addWorkSite(@RequestBody WorkSiteDetailDTO workSiteDetailDTO){
-        workSiteInfoService.addWorkSiteInfo(workSiteDetailDTO);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("编辑作业现场")
-    @PostMapping("update")
-    @ResponseBody
-    public Object updateWorkSite(@RequestBody WorkSiteDetailDTO workSiteDetailDTO){
-        workSiteInfoService.updateWorkSiteInfo(workSiteDetailDTO);
-        return ResponseData.success();
-    }
-
-
-    @ApiOperation("删除作业现场")
-    @PostMapping("delete")
-    @ResponseBody
-    public Object delete(@ApiParam("作业现场id列表")@RequestBody List<Long> projectIds){
-        workSiteInfoService.deleteProjects(projectIds);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("查询作业现场详情")
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = WorkSiteDetailDTO.class),
-    })
-    @GetMapping("detail")
-    @ResponseBody
-    public Object delete(@ApiParam(value = "作业现场id", example = "0")@RequestParam Long projectId){
-        WorkSiteDetailDTO detailDTO = workSiteInfoService.getWorkSiteDetail(projectId);
-        return ResponseData.success(detailDTO);
-    }
-
-    @ApiOperation("分页列表查询")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "workTitle",value = "作业名称", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "workRoad",value = "所属道路", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "workPersonName",value = "责任人姓名", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "startDate",value = "注册开始日期", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "endDate",value = "注册结束日期", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "projectState",value = "当前状态（字典值）", dataType = "String", paramType = "query")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = WorkSiteInfo.class),
-    })
-    @GetMapping("listPage")
-    @ResponseBody
-    public Object listPage(String workTitle,String workRoad,String workPersonName,String projectState,String startDate,String endDate){
-        Page<WorkSiteInfo> page = PageFactory.defaultPage();
-        QueryWrapper<WorkSiteInfo> queryWrapper = new QueryWrapper<>();
-        if(StrUtil.isNotEmpty(workTitle)){
-            queryWrapper.like("WORK_TITLE",workTitle);
-        }
-        if(StrUtil.isNotEmpty(workRoad)){
-            queryWrapper.like("WORK_ROAD",workRoad);
-        }
-        if(StrUtil.isNotEmpty(workPersonName)){
-            queryWrapper.like("WORKER_NAME",workPersonName);
-        }
-        if(StrUtil.isNotEmpty(projectState)){
-            queryWrapper.eq("PROJECT_STATE",projectState);
-        }
-        if(StrUtil.isNotEmpty(startDate)){
-            queryWrapper.ge("br_work_site_info.CREATE_TIME",startDate + " 00:00:00");
-        }
-        if(StrUtil.isNotEmpty(endDate)){
-            queryWrapper.le("br_work_site_info.CREATE_TIME",endDate + " 23:59:59");
-        }
-        page = workSiteInfoService.selectListPage(page,queryWrapper);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-    @ApiOperation("开始作业")
-    @PostMapping("start")
-    @ResponseBody
-    public Object start(@ApiParam(value = "作业现场id",example = "0")@RequestParam Long projectId){
-        workSiteInfoService.start(projectId);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("完成作业")
-    @PostMapping("finish")
-    @ResponseBody
-    public Object finish(@ApiParam(value = "作业现场id", example = "0")@RequestParam Long projectId){
-        workSiteInfoService.finish(projectId);
-        return ResponseData.success();
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/WorkerController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/WorkerController.java
deleted file mode 100644
index 796f94c..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/WorkerController.java
+++ /dev/null
@@ -1,136 +0,0 @@
-package com.casic.missiles.modular.system.controller;
-
-
-import cn.hutool.core.util.ObjectUtil;
-import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.core.base.controller.BaseController;
-import com.casic.missiles.core.page.PageFactory;
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.DeviceDetailDTO;
-import com.casic.missiles.modular.system.entity.Device;
-import com.casic.missiles.modular.system.entity.Worker;
-import com.casic.missiles.modular.system.service.IWorkerService;
-import io.swagger.annotations.*;
-import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.*;
-
-import org.springframework.stereotype.Controller;
-
-import java.util.Date;
-import java.util.List;
-
-import static com.casic.missiles.model.response.ResponseData.DEFAULT_SUCCESS_MESSAGE;
-
-/**
- * <p>
- *  前端控制器
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@Controller
-@RequestMapping("/worker")
-@RequiredArgsConstructor
-@Api(tags = "人员管理接口")
-public class WorkerController extends BaseController {
-
-    private final IWorkerService workerService;
-
-    @ApiOperation("分页列表查询")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "name",value = "姓名", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "deptId",value = "所属部门", dataType = "Long", paramType = "query", example = "0"),
-            @ApiImplicitParam(name = "status",value = "当前状态（字典值）", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "startDate",value = "注册开始日期", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "endDate",value = "注册结束日期", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "workerType",value = "人员类型（字典值）", dataType = "String", paramType = "query")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = Worker.class),
-    })
-    @GetMapping("listPage")
-    @ResponseBody
-    public Object listPage(String name,Long deptId, String status,String startDate,String endDate,String workerType){
-        Page<Worker> page = PageFactory.defaultPage();
-        QueryWrapper<Worker> queryWrapper = new QueryWrapper<>();
-        if(StrUtil.isNotEmpty(name)){
-            queryWrapper.like("WORKER_NAME",name);
-        }
-        if(ObjectUtil.isNotEmpty(deptId)){
-            queryWrapper.eq("DEPT_ID",deptId);
-        }
-        if(StrUtil.isNotEmpty(workerType)){
-            queryWrapper.eq("WORKER_TYPE",workerType);
-        }
-        if(StrUtil.isNotEmpty(startDate)){
-            queryWrapper.ge("CREATE_TIME",startDate + " 00:00:00");
-        }
-        if(StrUtil.isNotEmpty(endDate)){
-            queryWrapper.le("CREATE_TIME",endDate + " 23:59:59");
-        }
-        if(StrUtil.isNotEmpty(status)){
-            queryWrapper.eq("`STATUS`",status);
-        }
-        page = workerService.selectListPage(page,queryWrapper);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-    @ApiOperation("新增人员")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "worker", value = "人员信息", dataType = "Worker", paramType = "body", required = true),
-            @ApiImplicitParam(name = "projectId", value = "项目ID(入场申请需要)", dataType = "Long", paramType = "query", example = "0")
-    })
-    @PostMapping("add")
-    @ResponseBody
-    public Object add(@ApiParam("worker")@RequestBody Worker worker,
-                      @RequestParam(required = false) Long projectId){
-        workerService.addWorker(worker,projectId);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("编辑人员")
-    @PostMapping("update")
-    @ResponseBody
-    public Object update(@RequestBody Worker worker){
-        workerService.updateById(worker);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("删除人员")
-    @PostMapping("delete")
-    @ResponseBody
-    public Object delete(@ApiParam("人员id列表")@RequestBody List<Long> workIds){
-        workerService.removeByIds(workIds);
-        return ResponseData.success();
-    }
-
-
-    @ApiOperation(value = "获取人脸图片",notes = "返回人脸图片url")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "cameraIp",value = "摄像头IP", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "cameraPort",value = "摄像头端口号", dataType = "String", paramType = "query"),
-    })
-    @GetMapping("/face/register")
-    @ResponseBody
-    public Object faceRegister(String cameraIp,String cameraPort){
-        return ResponseData.success(workerService.faceRegister(cameraIp, cameraPort));
-    }
-
-
-    @ApiOperation(value = "查询临时入场人员列表")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "projectId", value = "项目ID",required = true,dataType = "Long", paramType = "query", example = "0")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = Worker.class),
-    })
-    @GetMapping("/projectTempWorker")
-    @ResponseBody
-    public Object projectTempWorker(Long projectId){
-        return ResponseData.success(workerService.projectTempWorker(projectId));
-    }
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/AlarmTypeCountDTO.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/AlarmTypeCountDTO.java
deleted file mode 100644
index 1a165a1..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/AlarmTypeCountDTO.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.casic.missiles.modular.system.dto;
-
-import io.swagger.annotations.ApiModel;
-import lombok.Data;
-
-@ApiModel(value = "AlarmTypeCountDTO",description = "报警类型统计（首页）")
-@Data
-public class AlarmTypeCountDTO {
-
-    private String alarmType;
-    private String alarmTypeName;
-    private Integer alarmCount;
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/AlarmUpload.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/AlarmUpload.java
deleted file mode 100644
index 73d7799..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/AlarmUpload.java
+++ /dev/null
@@ -1,46 +0,0 @@
-package com.casic.missiles.modular.system.dto;
-
-import cn.hutool.core.util.StrUtil;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-@ApiModel(value = "AlarmUpload",description = "报警上传")
-@Data
-public class AlarmUpload {
-
-    @ApiModelProperty(value = "摄像头ip")
-    private String cameraIp;
-
-    @ApiModelProperty(value = "摄像头端口")
-    private String cameraPort;
-    @ApiModelProperty(value = "安全树甲烷设备ip")
-    private String gasIp;
-    @ApiModelProperty(value = "安全树甲烷设备端口")
-    private String gasPort;
-    @ApiModelProperty(value = "报警值")
-    private String alarmValue;
-    @ApiModelProperty(value = "报警时间")
-    private String alarmTime;
-    @ApiModelProperty(value = "报警类型")
-    private String alarmType;
-    @ApiModelProperty(value = "报警图片")
-    private String alarmImage;
-    @ApiModelProperty(value = "报警内容")
-    private String alarmContent;
-
-    @Override
-    public String toString() {
-        return "AlarmUpload{" +
-                "cameraIp='" + cameraIp + '\'' +
-                ", cameraPort='" + cameraPort + '\'' +
-                ", gasIp='" + gasIp + '\'' +
-                ", gasPort='" + gasPort + '\'' +
-                ", alarmValue='" + alarmValue + '\'' +
-                ", alarmTime='" + alarmTime + '\'' +
-                ", alarmType='" + alarmType + '\'' +
-                ", alarmImage='" + (StrUtil.isNotEmpty(alarmImage) ? alarmImage.substring(0,50) : "null") + '\'' +
-                ", alarmContent='" + alarmContent + '\'' +
-                '}';
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/DeviceDetailDTO.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/DeviceDetailDTO.java
deleted file mode 100644
index ea518d9..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/DeviceDetailDTO.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package com.casic.missiles.modular.system.dto;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.casic.missiles.modular.system.entity.Device;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-@ApiModel("DeviceDetailDTO")
-@Data
-public class DeviceDetailDTO extends Device {
-
-    @ApiModelProperty(value = "摄像头编号")
-    private String cameraCode;
-
-    @ApiModelProperty(value = "摄像头IP")
-    private String cameraIp;
-
-    @ApiModelProperty(value = "摄像头端口")
-    private String cameraPort;
-
-    @ApiModelProperty(value = "激甲编号")
-    private String gasCode;
-
-    @ApiModelProperty(value = "激甲IP")
-    private String gasIp;
-
-    @ApiModelProperty(value = "激甲端口")
-    private String gasPort;
-
-    @ApiModelProperty(value = "智能帽衬编号")
-    private String hatLiningCode;
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/WorkSiteDetailDTO.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/WorkSiteDetailDTO.java
deleted file mode 100644
index 29378ff..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/WorkSiteDetailDTO.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package com.casic.missiles.modular.system.dto;
-
-import com.casic.missiles.modular.system.entity.ProjectDevice;
-import com.casic.missiles.modular.system.entity.ProjectWorker;
-import com.casic.missiles.modular.system.entity.WorkSiteInfo;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.util.List;
-
-@Data
-@ApiModel("WorkSiteDetailDTO")
-public class WorkSiteDetailDTO extends WorkSiteInfo {
-
-    @ApiModelProperty(value = "安全树列表",dataType = "ProjectDevice")
-    private List<ProjectDevice> deviceList;
-
-    @ApiModelProperty(value = "人员列表",dataType = "ProjectWorker")
-    private List<ProjectWorker> workerList;
-
-
-
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/WorkerLocationDTO.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/WorkerLocationDTO.java
deleted file mode 100644
index 6fd7b24..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/WorkerLocationDTO.java
+++ /dev/null
@@ -1,68 +0,0 @@
-package com.casic.missiles.modular.system.dto;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-@ApiModel(value = "WorkerLocationDTO",description = "人员位置列表（首页）")
-@Data
-public class WorkerLocationDTO {
-
-    @ApiModelProperty("人员ID")
-    private Long workerId;
-
-    @ApiModelProperty("人员姓名")
-    private String workerName;
-
-    @ApiModelProperty("安全帽编号")
-    private String hatCode;
-
-    @ApiModelProperty("安全帽ID")
-    private Long hatId;
-
-    @ApiModelProperty("背心编号")
-    private String vastCode;
-
-    @ApiModelProperty("手环编号")
-    private String braceletCode;
-
-    @ApiModelProperty("位置")
-    private String location;
-
-    @ApiModelProperty("时间")
-    private String time;
-
-    @ApiModelProperty("经度")
-    private String lng;
-
-    @ApiModelProperty("纬度")
-    private String lat;
-
-    @ApiModelProperty("心率")
-    private String heartRate;
-
-    @ApiModelProperty("血氧")
-    private String bloodOxygen;
-
-    @ApiModelProperty("一氧化碳")
-    private String co;
-
-    @ApiModelProperty("甲烷")
-    private String gas;
-
-    @ApiModelProperty("硫化氢")
-    private String h2s;
-
-    @ApiModelProperty("氧气")
-    private String o2;
-
-    @ApiModelProperty("信号")
-    private String signal;
-
-    @ApiModelProperty("电量")
-    private String cell;
-
-    @ApiModelProperty("是否报警")
-    private boolean alarmFlag;
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Alarm.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Alarm.java
new file mode 100644
index 0000000..4d2b7ef
--- /dev/null
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Alarm.java
@@ -0,0 +1,103 @@
+package com.casic.missiles.modular.system.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import java.util.Date;
+
+/**
+ * <p>
+ * 报警记录表
+ * </p>
+ *
+ * @author zyj
+ * @since 2023-05-25
+ */
+@Data
+@TableName("bus_alarm")
+public class Alarm implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    @TableId(value = "ID",type = IdType.ASSIGN_ID)
+    private Long id;
+
+    /**
+     * 设备ID
+     */
+    @TableField("DEVICE_ID")
+    private Long deviceId;
+
+    /**
+     * 报警类型
+     */
+    @TableField("ALARM_TYPE")
+    private String alarmType;
+
+    /**
+     * 报警时间
+     */
+    @TableField("ALARM_TIME")
+    private Date alarmTime;
+
+    /**
+     * 报警状态
+     */
+    @TableField("ALARM_STATUS")
+    private String alarmStatus;
+
+    /**
+     * 报警位置
+     */
+    @TableField("ALARM_LOCATION")
+    private String alarmLocation;
+
+    /**
+     * 报警图片
+     */
+    @TableField("ALARM_IMAGE")
+    private String alarmImage;
+
+    /**
+     * 视频通道号
+     */
+    @TableField("CHANNEL_NO")
+    private Integer channelNo;
+
+    /**
+     * 报警内容
+     */
+    @TableField("ALARM_CONTENT")
+    private String alarmContent;
+
+    /**
+     * 消警时间
+     */
+    @TableField("CANCEL_TIME")
+    private Date cancelTime;
+
+
+    @Override
+    public String toString() {
+        return "Alarm{" +
+            "id=" + id +
+            ", deviceId=" + deviceId +
+            ", alarmType=" + alarmType +
+            ", alarmTime=" + alarmTime +
+            ", alarmStatus=" + alarmStatus +
+            ", alarmLocation=" + alarmLocation +
+            ", alarmImage=" + alarmImage +
+            ", channelNo=" + channelNo +
+            ", alarmContent=" + alarmContent +
+            ", cancelTime=" + cancelTime +
+        "}";
+    }
+}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusAlarm.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusAlarm.java
deleted file mode 100644
index efb4a23..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusAlarm.java
+++ /dev/null
@@ -1,159 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.alibaba.fastjson.annotation.JSONField;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.time.LocalDateTime;
-import java.util.Date;
-
-/**
- * <p>
- * 报警记录表
- * </p>
- *
- * @author zyj
- * @since 2023-05-16
- */
-@Data
-@ApiModel("Alarm")
-@TableName("br_bus_alarm")
-public class BusAlarm implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 项目ID
-     */
-    @ApiModelProperty(value = "项目ID")
-    @TableField("PROJECT_ID")
-    private Long projectId;
-
-    /**
-     * 设备ID
-     */
-    @ApiModelProperty(value = "设备ID")
-    @TableField("DEVICE_ID")
-    private Long deviceId;
-
-    /**
-     * 报警类型
-     */
-    @ApiModelProperty(value = "报警类型")
-    @TableField("ALARM_TYPE")
-    private String alarmType;
-
-    /**
-     * 报警状态
-     */
-    @ApiModelProperty(value = "报警状态")
-    @TableField("ALARM_STATUS")
-    private String alarmStatus;
-
-    /**
-     * 报警值
-     */
-    @ApiModelProperty(value = "报警值")
-    @TableField("ALARM_VALUE")
-    private String alarmValue;
-
-    /**
-     * 报警图片
-     */
-    @ApiModelProperty(value = "报警图片")
-    @TableField("ALARM_IMAGE")
-    private String alarmImage;
-
-    /**
-     * 报警内容
-     */
-    @ApiModelProperty(value = "报警内容")
-    @TableField("ALARM_CONTENT")
-    private String alarmContent;
-
-    /**
-     * 报警时间
-     */
-    @ApiModelProperty(value = "报警时间")
-    @TableField("ALARM_TIME")
-    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
-    private Date alarmTime;
-
-    /**
-     * 消警时间
-     */
-    @ApiModelProperty(value = "消警时间")
-    @TableField("CANCEL_TIME")
-    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
-    private Date cancelTime;
-
-    /**
-     * 报警位置经度
-     */
-    @ApiModelProperty(value = "报警位置经度")
-    @TableField("ALARM_LNG")
-    private String alarmLng;
-
-    /**
-     * 报警位置纬度
-     */
-    @ApiModelProperty(value = "报警位置纬度")
-    @TableField("ALARM_LAT")
-    private String alarmLat;
-
-    @ApiModelProperty("报警类型名称")
-    @TableField(exist = false)
-    private String alarmStatusName;
-    @ApiModelProperty("报警类型名称")
-    @TableField(exist = false)
-    private String alarmTypeName;
-    @ApiModelProperty("作业名称")
-    @TableField(exist = false)
-    private String workTitle;
-    @ApiModelProperty("所属道路")
-    @TableField(exist = false)
-    private String workRoad;
-    @ApiModelProperty("作业状态")
-    @TableField(exist = false)
-    private String projectState;
-    @ApiModelProperty("作业状态名称")
-    @TableField(exist = false)
-    private String projectStateName;
-    @ApiModelProperty("负责人姓名")
-    @TableField(exist = false)
-    private String workPersonName;
-    @ApiModelProperty("负责人联系方式")
-    @TableField(exist = false)
-    private String workPersonPhoneNumber;
-
-
-    @Override
-    public String toString() {
-        return "BusAlarm{" +
-                "id=" + id +
-                ", projectId=" + projectId +
-                ", deviceId=" + deviceId +
-                ", alarmType=" + alarmType +
-                ", alarmValue=" + alarmValue +
-                ", alarmStatus=" + alarmStatus +
-                ", alarmImage=" + alarmImage +
-                ", alarmContent=" + alarmContent +
-                ", alarmTime=" + alarmTime +
-                ", cancelTime=" + cancelTime +
-                ", alarmLng=" + alarmLng +
-                ", alarmLat=" + alarmLat +
-                "}";
-    }
-}

diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/AlarmController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/AlarmController.java
new file mode 100644
index 0000000..1795cf1
--- /dev/null
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/AlarmController.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.modular.system.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.stereotype.Controller;
+
+/**
+ * <p>
+ * 报警记录表 前端控制器
+ * </p>
+ *
+ * @author zyj
+ * @since 2023-05-25
+ */
+@Controller
+@RequestMapping("/system/alarm")
+public class AlarmController {
+
+}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusAlarmController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusAlarmController.java
deleted file mode 100644
index 1f82ebb..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusAlarmController.java
+++ /dev/null
@@ -1,102 +0,0 @@
-package com.casic.missiles.modular.system.controller;
-
-
-import cn.hutool.core.util.ObjectUtil;
-import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.core.base.controller.BaseController;
-import com.casic.missiles.core.page.PageFactory;
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.AlarmUpload;
-import com.casic.missiles.modular.system.dto.DeviceDetailDTO;
-import com.casic.missiles.modular.system.entity.BusAlarm;
-import com.casic.missiles.modular.system.service.IBusAlarmService;
-import io.swagger.annotations.*;
-import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.*;
-
-import org.springframework.stereotype.Controller;
-
-import static com.casic.missiles.model.response.ResponseData.DEFAULT_SUCCESS_MESSAGE;
-import static com.casic.missiles.modular.system.consts.AlarmConst.ALARM_STATUS_MANUAL_CANCEL;
-
-/**
- * <p>
- * 报警记录表 前端控制器
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@Api(tags = "报警管理接口")
-@Controller
-@RequestMapping("/alarm")
-@RequiredArgsConstructor
-public class BusAlarmController extends BaseController {
-
-    private final IBusAlarmService alarmService;
-
-    @ApiOperation("报警上报接口")
-    @PostMapping("/upload")
-    @ResponseBody
-    public Object upload(@RequestBody AlarmUpload alarmUpload){
-        alarmService.alarmUpload(alarmUpload);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("报警列表分页查询")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "workTitle", value = "作业名称",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "projectId", value = "作业ID",dataType = "Long", paramType = "query",example = "0"),
-            @ApiImplicitParam(name = "alarmStatus", value = "报警状态",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "projectState", value = "作业状态",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "alarmType", value = "报警类型",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "alarmStartTime", value = "报警开始时间",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "alarmEndTime", value = "报警结束时间",dataType = "String", paramType = "query")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = BusAlarm.class),
-    })
-    @GetMapping("/listPage")
-    @ResponseBody
-    public Object listPage(String workTitle,Long projectId,String alarmStatus,String projectState,String alarmType,String alarmStartTime,String alarmEndTime){
-        Page<BusAlarm> page = PageFactory.defaultPage();
-        QueryWrapper<BusAlarm> queryWrapper = new QueryWrapper<>();
-        if(StrUtil.isNotEmpty(workTitle)){
-            queryWrapper.like("p.WORK_TITLE",workTitle);
-        }
-        if(ObjectUtil.isNotEmpty(projectId)){
-            queryWrapper.eq("alarm.PROJECT_ID",projectId);
-        }
-        if(StrUtil.isNotEmpty(alarmStatus)){
-            queryWrapper.eq("alarm.ALARM_STATUS",alarmStatus);
-        }
-        if(StrUtil.isNotEmpty(projectState)){
-            queryWrapper.eq("p.PROJECT_STATE",projectState);
-        }
-        if(StrUtil.isNotEmpty(alarmType)){
-            queryWrapper.eq("alarm.ALARM_TYPE",alarmType);
-        }
-        if(StrUtil.isNotEmpty(alarmStartTime)){
-            queryWrapper.ge("alarm.ALARM_TIME",alarmStartTime);
-        }
-        if(StrUtil.isNotEmpty(alarmEndTime)){
-            queryWrapper.le("alarm.ALARM_TIME",alarmEndTime);
-        }
-        page = alarmService.listPage(page,queryWrapper);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-    @ApiOperation("消警")
-    @PostMapping("/cancel")
-    @ResponseBody
-    public Object cancel(@RequestParam("alarmId") Long alarmId){
-        UpdateWrapper<BusAlarm> updateWrapper = new UpdateWrapper<>();
-        updateWrapper.eq("ID",alarmId);
-        updateWrapper.set("ALARM_STATUS",ALARM_STATUS_MANUAL_CANCEL);
-        alarmService.update(updateWrapper);
-        return ResponseData.success();
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusEventController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusEventController.java
deleted file mode 100644
index dde5aad..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusEventController.java
+++ /dev/null
@@ -1,41 +0,0 @@
-package com.casic.missiles.modular.system.controller;
-
-
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.entity.BusEvent;
-import com.casic.missiles.modular.system.service.IBusEventService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.ResponseBody;
-
-/**
- * <p>
- * 事件表 前端控制器
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@Controller
-@RequestMapping("/event")
-@Api(tags = "事件上报")
-@RequiredArgsConstructor
-public class BusEventController {
-
-    private final IBusEventService eventService;
-
-    @ApiOperation("事件上报")
-    @PostMapping("add")
-    @ResponseBody
-    public Object add(@RequestBody BusEvent busEvent){
-        eventService.saveBusEvent(busEvent);
-        return ResponseData.success();
-    }
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
index 03abc5f..aa50d78 100644
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
@@ -1,121 +1,20 @@
 package com.casic.missiles.modular.system.controller;
 
 
-import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.core.base.controller.BaseController;
-import com.casic.missiles.core.page.PageFactory;
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.DeviceDetailDTO;
-import com.casic.missiles.modular.system.entity.Device;
-import com.casic.missiles.modular.system.service.IDeviceExtService;
-import com.casic.missiles.modular.system.service.IDeviceService;
-import io.swagger.annotations.*;
-import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.RequestMapping;
 
 import org.springframework.stereotype.Controller;
 
-import java.time.LocalDateTime;
-import java.util.Date;
-import java.util.List;
-
-import static com.casic.missiles.model.response.ResponseData.DEFAULT_SUCCESS_MESSAGE;
-
 /**
  * <p>
- *  前端控制器
+ * 设备记录表 前端控制器
  * </p>
  *
  * @author zyj
- * @since 2023-04-14
+ * @since 2023-05-25
  */
-@Api(tags = "设备管理接口")
-@RequiredArgsConstructor
 @Controller
-@RequestMapping("/device")
-public class DeviceController extends BaseController {
-    private final IDeviceService deviceService;
-    private final IDeviceExtService deviceExtService;
-
-    @ApiOperation("设备分页列表")
-    @ApiImplicitParams({
-        @ApiImplicitParam(name = "deviceType", value = "设备类型",dataType = "String", paramType = "query"),
-        @ApiImplicitParam(name = "deviceCode", value = "设备编号",dataType = "String", paramType = "query"),
-        @ApiImplicitParam(name = "status", value = "设备状态",dataType = "String", paramType = "query"),
-        @ApiImplicitParam(name = "projectId", value = "作业ID（如果传此参数，列表中返回该作业使用的设备）",dataType = "Long", paramType = "query", example = "0")
-    })
-    @ApiResponses({
-        @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = DeviceDetailDTO.class),
-    })
-    @GetMapping("listPage")
-    @ResponseBody
-    public Object listPage(String deviceType, String deviceCode, String status,Long projectId){
-        Page<DeviceDetailDTO> page = PageFactory.defaultPage();
-        QueryWrapper<DeviceDetailDTO> queryWrapper = new QueryWrapper<>();
-        if(StrUtil.isNotEmpty(deviceType)){
-            queryWrapper.eq("DEVICE_TYPE",deviceType);
-        }
-        if(StrUtil.isNotEmpty(deviceCode)){
-            queryWrapper.like("DEVICE_CODE",deviceCode);
-        }
-        page = deviceService.listPage(page,queryWrapper,status,projectId);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-    @ApiOperation("新增设备")
-    @PostMapping("add")
-    @ResponseBody
-    public Object add(@RequestBody DeviceDetailDTO deviceDetailDTO){
-        deviceService.saveDevice(deviceDetailDTO);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("编辑设备")
-    @PostMapping("update")
-    @ResponseBody
-    public Object update(@RequestBody DeviceDetailDTO deviceDetailDTO){
-        deviceService.updateDevice(deviceDetailDTO);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("删除设备")
-    @PostMapping("delete")
-    @ResponseBody
-    public Object delete(@ApiParam("设备id列表")@RequestBody List<Long> deviceIds){
-        deviceService.deleteDevices(deviceIds);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("设置甲烷阈值")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "gasIp", value = "安全树甲烷设备IP",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "gasPort", value = "安全树甲烷端口",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "threshold", value = "甲烷阈值",dataType = "String", paramType = "query")
-    })
-    @PostMapping("setThreshold")
-    @ResponseBody
-    public Object setThreshold(String gasIp,String gasPort,String threshold){
-        deviceExtService.setGasThreshold(gasIp, gasPort, threshold);
-        return ResponseData.success();
-    }
-
-
-    @ApiOperation("查询甲烷阈值")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "gasIp", value = "安全树甲烷设备IP",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "gasPort", value = "安全树甲烷端口",dataType = "String", paramType = "query")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = "{\"code\": 200,\"data\": \"100\",\"message\": \"请求成功\",\"success\": true}",response = String.class),
-    })
-    @GetMapping("getThreshold")
-    @ResponseBody
-    public Object getThreshold(String gasIp,String gasPort){
-        String data = deviceExtService.getGasThreshold(gasIp, gasPort);
-        return ResponseData.success(data);
-    }
-
+@RequestMapping("/system/device")
+public class DeviceController {
 
 }
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/OverviewController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/OverviewController.java
deleted file mode 100644
index 7570504..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/OverviewController.java
+++ /dev/null
@@ -1,70 +0,0 @@
-package com.casic.missiles.modular.system.controller;
-
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.AlarmTypeCountDTO;
-import com.casic.missiles.modular.system.dto.DeviceLocationDTO;
-import com.casic.missiles.modular.system.dto.WorkerLocationDTO;
-import com.casic.missiles.modular.system.service.IBusAlarmService;
-import com.casic.missiles.modular.system.service.IProjectDeviceService;
-import com.casic.missiles.modular.system.service.IProjectWorkerService;
-import io.swagger.annotations.*;
-import lombok.RequiredArgsConstructor;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.ResponseBody;
-
-import static com.casic.missiles.model.response.ResponseData.DEFAULT_SUCCESS_MESSAGE;
-import static com.casic.missiles.modular.system.consts.AlarmConst.ALARM_STATUS_ON;
-
-@Api(tags = "首页看板接口")
-@Controller
-@RequestMapping("overview")
-@RequiredArgsConstructor
-public class OverviewController {
-
-    private final IBusAlarmService alarmService;
-    private final IProjectDeviceService projectDeviceService;
-
-    private final IProjectWorkerService projectWorkerService;
-
-
-    @ApiOperation("报警统计接口")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "projectId", value = "作业ID",dataType = "Long", paramType = "query", example = "0")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = AlarmTypeCountDTO.class),
-    })
-    @GetMapping("/alarmCount")
-    @ResponseBody
-    public Object alarmCount(Long projectId){
-        return ResponseData.success(alarmService.alarmCount(projectId,ALARM_STATUS_ON));
-    }
-
-    @ApiOperation("设备列表接口")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "projectId", value = "作业ID",dataType = "Long", paramType = "query", example = "0")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = DeviceLocationDTO.class),
-    })
-    @GetMapping("/deviceList")
-    @ResponseBody
-    public Object deviceList(Long projectId){
-        return ResponseData.success(projectDeviceService.selectDeviceLocationList(projectId));
-    }
-
-    @ApiOperation("人员列表接口")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "projectId", value = "作业ID",dataType = "Long", paramType = "query", example = "0")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = WorkerLocationDTO.class),
-    })
-    @GetMapping("/workerList")
-    @ResponseBody
-    public Object workerList(Long projectId){
-        return ResponseData.success(projectWorkerService.selectWorkerLocationDTO(projectId));
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/WorkSiteInfoController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/WorkSiteInfoController.java
deleted file mode 100644
index af36d69..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/WorkSiteInfoController.java
+++ /dev/null
@@ -1,130 +0,0 @@
-package com.casic.missiles.modular.system.controller;
-
-
-import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.core.base.controller.BaseController;
-import com.casic.missiles.core.page.PageFactory;
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.WorkSiteDetailDTO;
-import com.casic.missiles.modular.system.entity.WorkSiteInfo;
-import com.casic.missiles.modular.system.service.IWorkSiteInfoService;
-import io.swagger.annotations.*;
-import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.*;
-
-import org.springframework.stereotype.Controller;
-
-import java.util.List;
-
-import static com.casic.missiles.model.response.ResponseData.DEFAULT_SUCCESS_MESSAGE;
-
-/**
- * <p>
- * 作业现场表 前端控制器
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@Controller
-@RequestMapping("/site")
-@Api(tags = "作业现场管理")
-@RequiredArgsConstructor
-public class WorkSiteInfoController extends BaseController {
-
-
-    private final IWorkSiteInfoService workSiteInfoService;
-
-    @ApiOperation("新增作业现场")
-    @PostMapping("add")
-    @ResponseBody
-    public Object addWorkSite(@RequestBody WorkSiteDetailDTO workSiteDetailDTO){
-        workSiteInfoService.addWorkSiteInfo(workSiteDetailDTO);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("编辑作业现场")
-    @PostMapping("update")
-    @ResponseBody
-    public Object updateWorkSite(@RequestBody WorkSiteDetailDTO workSiteDetailDTO){
-        workSiteInfoService.updateWorkSiteInfo(workSiteDetailDTO);
-        return ResponseData.success();
-    }
-
-
-    @ApiOperation("删除作业现场")
-    @PostMapping("delete")
-    @ResponseBody
-    public Object delete(@ApiParam("作业现场id列表")@RequestBody List<Long> projectIds){
-        workSiteInfoService.deleteProjects(projectIds);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("查询作业现场详情")
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = WorkSiteDetailDTO.class),
-    })
-    @GetMapping("detail")
-    @ResponseBody
-    public Object delete(@ApiParam(value = "作业现场id", example = "0")@RequestParam Long projectId){
-        WorkSiteDetailDTO detailDTO = workSiteInfoService.getWorkSiteDetail(projectId);
-        return ResponseData.success(detailDTO);
-    }
-
-    @ApiOperation("分页列表查询")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "workTitle",value = "作业名称", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "workRoad",value = "所属道路", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "workPersonName",value = "责任人姓名", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "startDate",value = "注册开始日期", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "endDate",value = "注册结束日期", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "projectState",value = "当前状态（字典值）", dataType = "String", paramType = "query")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = WorkSiteInfo.class),
-    })
-    @GetMapping("listPage")
-    @ResponseBody
-    public Object listPage(String workTitle,String workRoad,String workPersonName,String projectState,String startDate,String endDate){
-        Page<WorkSiteInfo> page = PageFactory.defaultPage();
-        QueryWrapper<WorkSiteInfo> queryWrapper = new QueryWrapper<>();
-        if(StrUtil.isNotEmpty(workTitle)){
-            queryWrapper.like("WORK_TITLE",workTitle);
-        }
-        if(StrUtil.isNotEmpty(workRoad)){
-            queryWrapper.like("WORK_ROAD",workRoad);
-        }
-        if(StrUtil.isNotEmpty(workPersonName)){
-            queryWrapper.like("WORKER_NAME",workPersonName);
-        }
-        if(StrUtil.isNotEmpty(projectState)){
-            queryWrapper.eq("PROJECT_STATE",projectState);
-        }
-        if(StrUtil.isNotEmpty(startDate)){
-            queryWrapper.ge("br_work_site_info.CREATE_TIME",startDate + " 00:00:00");
-        }
-        if(StrUtil.isNotEmpty(endDate)){
-            queryWrapper.le("br_work_site_info.CREATE_TIME",endDate + " 23:59:59");
-        }
-        page = workSiteInfoService.selectListPage(page,queryWrapper);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-    @ApiOperation("开始作业")
-    @PostMapping("start")
-    @ResponseBody
-    public Object start(@ApiParam(value = "作业现场id",example = "0")@RequestParam Long projectId){
-        workSiteInfoService.start(projectId);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("完成作业")
-    @PostMapping("finish")
-    @ResponseBody
-    public Object finish(@ApiParam(value = "作业现场id", example = "0")@RequestParam Long projectId){
-        workSiteInfoService.finish(projectId);
-        return ResponseData.success();
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/WorkerController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/WorkerController.java
deleted file mode 100644
index 796f94c..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/WorkerController.java
+++ /dev/null
@@ -1,136 +0,0 @@
-package com.casic.missiles.modular.system.controller;
-
-
-import cn.hutool.core.util.ObjectUtil;
-import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.core.base.controller.BaseController;
-import com.casic.missiles.core.page.PageFactory;
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.DeviceDetailDTO;
-import com.casic.missiles.modular.system.entity.Device;
-import com.casic.missiles.modular.system.entity.Worker;
-import com.casic.missiles.modular.system.service.IWorkerService;
-import io.swagger.annotations.*;
-import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.*;
-
-import org.springframework.stereotype.Controller;
-
-import java.util.Date;
-import java.util.List;
-
-import static com.casic.missiles.model.response.ResponseData.DEFAULT_SUCCESS_MESSAGE;
-
-/**
- * <p>
- *  前端控制器
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@Controller
-@RequestMapping("/worker")
-@RequiredArgsConstructor
-@Api(tags = "人员管理接口")
-public class WorkerController extends BaseController {
-
-    private final IWorkerService workerService;
-
-    @ApiOperation("分页列表查询")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "name",value = "姓名", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "deptId",value = "所属部门", dataType = "Long", paramType = "query", example = "0"),
-            @ApiImplicitParam(name = "status",value = "当前状态（字典值）", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "startDate",value = "注册开始日期", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "endDate",value = "注册结束日期", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "workerType",value = "人员类型（字典值）", dataType = "String", paramType = "query")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = Worker.class),
-    })
-    @GetMapping("listPage")
-    @ResponseBody
-    public Object listPage(String name,Long deptId, String status,String startDate,String endDate,String workerType){
-        Page<Worker> page = PageFactory.defaultPage();
-        QueryWrapper<Worker> queryWrapper = new QueryWrapper<>();
-        if(StrUtil.isNotEmpty(name)){
-            queryWrapper.like("WORKER_NAME",name);
-        }
-        if(ObjectUtil.isNotEmpty(deptId)){
-            queryWrapper.eq("DEPT_ID",deptId);
-        }
-        if(StrUtil.isNotEmpty(workerType)){
-            queryWrapper.eq("WORKER_TYPE",workerType);
-        }
-        if(StrUtil.isNotEmpty(startDate)){
-            queryWrapper.ge("CREATE_TIME",startDate + " 00:00:00");
-        }
-        if(StrUtil.isNotEmpty(endDate)){
-            queryWrapper.le("CREATE_TIME",endDate + " 23:59:59");
-        }
-        if(StrUtil.isNotEmpty(status)){
-            queryWrapper.eq("`STATUS`",status);
-        }
-        page = workerService.selectListPage(page,queryWrapper);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-    @ApiOperation("新增人员")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "worker", value = "人员信息", dataType = "Worker", paramType = "body", required = true),
-            @ApiImplicitParam(name = "projectId", value = "项目ID(入场申请需要)", dataType = "Long", paramType = "query", example = "0")
-    })
-    @PostMapping("add")
-    @ResponseBody
-    public Object add(@ApiParam("worker")@RequestBody Worker worker,
-                      @RequestParam(required = false) Long projectId){
-        workerService.addWorker(worker,projectId);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("编辑人员")
-    @PostMapping("update")
-    @ResponseBody
-    public Object update(@RequestBody Worker worker){
-        workerService.updateById(worker);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("删除人员")
-    @PostMapping("delete")
-    @ResponseBody
-    public Object delete(@ApiParam("人员id列表")@RequestBody List<Long> workIds){
-        workerService.removeByIds(workIds);
-        return ResponseData.success();
-    }
-
-
-    @ApiOperation(value = "获取人脸图片",notes = "返回人脸图片url")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "cameraIp",value = "摄像头IP", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "cameraPort",value = "摄像头端口号", dataType = "String", paramType = "query"),
-    })
-    @GetMapping("/face/register")
-    @ResponseBody
-    public Object faceRegister(String cameraIp,String cameraPort){
-        return ResponseData.success(workerService.faceRegister(cameraIp, cameraPort));
-    }
-
-
-    @ApiOperation(value = "查询临时入场人员列表")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "projectId", value = "项目ID",required = true,dataType = "Long", paramType = "query", example = "0")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = Worker.class),
-    })
-    @GetMapping("/projectTempWorker")
-    @ResponseBody
-    public Object projectTempWorker(Long projectId){
-        return ResponseData.success(workerService.projectTempWorker(projectId));
-    }
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/AlarmTypeCountDTO.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/AlarmTypeCountDTO.java
deleted file mode 100644
index 1a165a1..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/AlarmTypeCountDTO.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.casic.missiles.modular.system.dto;
-
-import io.swagger.annotations.ApiModel;
-import lombok.Data;
-
-@ApiModel(value = "AlarmTypeCountDTO",description = "报警类型统计（首页）")
-@Data
-public class AlarmTypeCountDTO {
-
-    private String alarmType;
-    private String alarmTypeName;
-    private Integer alarmCount;
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/AlarmUpload.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/AlarmUpload.java
deleted file mode 100644
index 73d7799..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/AlarmUpload.java
+++ /dev/null
@@ -1,46 +0,0 @@
-package com.casic.missiles.modular.system.dto;
-
-import cn.hutool.core.util.StrUtil;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-@ApiModel(value = "AlarmUpload",description = "报警上传")
-@Data
-public class AlarmUpload {
-
-    @ApiModelProperty(value = "摄像头ip")
-    private String cameraIp;
-
-    @ApiModelProperty(value = "摄像头端口")
-    private String cameraPort;
-    @ApiModelProperty(value = "安全树甲烷设备ip")
-    private String gasIp;
-    @ApiModelProperty(value = "安全树甲烷设备端口")
-    private String gasPort;
-    @ApiModelProperty(value = "报警值")
-    private String alarmValue;
-    @ApiModelProperty(value = "报警时间")
-    private String alarmTime;
-    @ApiModelProperty(value = "报警类型")
-    private String alarmType;
-    @ApiModelProperty(value = "报警图片")
-    private String alarmImage;
-    @ApiModelProperty(value = "报警内容")
-    private String alarmContent;
-
-    @Override
-    public String toString() {
-        return "AlarmUpload{" +
-                "cameraIp='" + cameraIp + '\'' +
-                ", cameraPort='" + cameraPort + '\'' +
-                ", gasIp='" + gasIp + '\'' +
-                ", gasPort='" + gasPort + '\'' +
-                ", alarmValue='" + alarmValue + '\'' +
-                ", alarmTime='" + alarmTime + '\'' +
-                ", alarmType='" + alarmType + '\'' +
-                ", alarmImage='" + (StrUtil.isNotEmpty(alarmImage) ? alarmImage.substring(0,50) : "null") + '\'' +
-                ", alarmContent='" + alarmContent + '\'' +
-                '}';
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/DeviceDetailDTO.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/DeviceDetailDTO.java
deleted file mode 100644
index ea518d9..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/DeviceDetailDTO.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package com.casic.missiles.modular.system.dto;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.casic.missiles.modular.system.entity.Device;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-@ApiModel("DeviceDetailDTO")
-@Data
-public class DeviceDetailDTO extends Device {
-
-    @ApiModelProperty(value = "摄像头编号")
-    private String cameraCode;
-
-    @ApiModelProperty(value = "摄像头IP")
-    private String cameraIp;
-
-    @ApiModelProperty(value = "摄像头端口")
-    private String cameraPort;
-
-    @ApiModelProperty(value = "激甲编号")
-    private String gasCode;
-
-    @ApiModelProperty(value = "激甲IP")
-    private String gasIp;
-
-    @ApiModelProperty(value = "激甲端口")
-    private String gasPort;
-
-    @ApiModelProperty(value = "智能帽衬编号")
-    private String hatLiningCode;
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/WorkSiteDetailDTO.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/WorkSiteDetailDTO.java
deleted file mode 100644
index 29378ff..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/WorkSiteDetailDTO.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package com.casic.missiles.modular.system.dto;
-
-import com.casic.missiles.modular.system.entity.ProjectDevice;
-import com.casic.missiles.modular.system.entity.ProjectWorker;
-import com.casic.missiles.modular.system.entity.WorkSiteInfo;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.util.List;
-
-@Data
-@ApiModel("WorkSiteDetailDTO")
-public class WorkSiteDetailDTO extends WorkSiteInfo {
-
-    @ApiModelProperty(value = "安全树列表",dataType = "ProjectDevice")
-    private List<ProjectDevice> deviceList;
-
-    @ApiModelProperty(value = "人员列表",dataType = "ProjectWorker")
-    private List<ProjectWorker> workerList;
-
-
-
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/WorkerLocationDTO.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/WorkerLocationDTO.java
deleted file mode 100644
index 6fd7b24..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/WorkerLocationDTO.java
+++ /dev/null
@@ -1,68 +0,0 @@
-package com.casic.missiles.modular.system.dto;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-@ApiModel(value = "WorkerLocationDTO",description = "人员位置列表（首页）")
-@Data
-public class WorkerLocationDTO {
-
-    @ApiModelProperty("人员ID")
-    private Long workerId;
-
-    @ApiModelProperty("人员姓名")
-    private String workerName;
-
-    @ApiModelProperty("安全帽编号")
-    private String hatCode;
-
-    @ApiModelProperty("安全帽ID")
-    private Long hatId;
-
-    @ApiModelProperty("背心编号")
-    private String vastCode;
-
-    @ApiModelProperty("手环编号")
-    private String braceletCode;
-
-    @ApiModelProperty("位置")
-    private String location;
-
-    @ApiModelProperty("时间")
-    private String time;
-
-    @ApiModelProperty("经度")
-    private String lng;
-
-    @ApiModelProperty("纬度")
-    private String lat;
-
-    @ApiModelProperty("心率")
-    private String heartRate;
-
-    @ApiModelProperty("血氧")
-    private String bloodOxygen;
-
-    @ApiModelProperty("一氧化碳")
-    private String co;
-
-    @ApiModelProperty("甲烷")
-    private String gas;
-
-    @ApiModelProperty("硫化氢")
-    private String h2s;
-
-    @ApiModelProperty("氧气")
-    private String o2;
-
-    @ApiModelProperty("信号")
-    private String signal;
-
-    @ApiModelProperty("电量")
-    private String cell;
-
-    @ApiModelProperty("是否报警")
-    private boolean alarmFlag;
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Alarm.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Alarm.java
new file mode 100644
index 0000000..4d2b7ef
--- /dev/null
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Alarm.java
@@ -0,0 +1,103 @@
+package com.casic.missiles.modular.system.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import java.util.Date;
+
+/**
+ * <p>
+ * 报警记录表
+ * </p>
+ *
+ * @author zyj
+ * @since 2023-05-25
+ */
+@Data
+@TableName("bus_alarm")
+public class Alarm implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    @TableId(value = "ID",type = IdType.ASSIGN_ID)
+    private Long id;
+
+    /**
+     * 设备ID
+     */
+    @TableField("DEVICE_ID")
+    private Long deviceId;
+
+    /**
+     * 报警类型
+     */
+    @TableField("ALARM_TYPE")
+    private String alarmType;
+
+    /**
+     * 报警时间
+     */
+    @TableField("ALARM_TIME")
+    private Date alarmTime;
+
+    /**
+     * 报警状态
+     */
+    @TableField("ALARM_STATUS")
+    private String alarmStatus;
+
+    /**
+     * 报警位置
+     */
+    @TableField("ALARM_LOCATION")
+    private String alarmLocation;
+
+    /**
+     * 报警图片
+     */
+    @TableField("ALARM_IMAGE")
+    private String alarmImage;
+
+    /**
+     * 视频通道号
+     */
+    @TableField("CHANNEL_NO")
+    private Integer channelNo;
+
+    /**
+     * 报警内容
+     */
+    @TableField("ALARM_CONTENT")
+    private String alarmContent;
+
+    /**
+     * 消警时间
+     */
+    @TableField("CANCEL_TIME")
+    private Date cancelTime;
+
+
+    @Override
+    public String toString() {
+        return "Alarm{" +
+            "id=" + id +
+            ", deviceId=" + deviceId +
+            ", alarmType=" + alarmType +
+            ", alarmTime=" + alarmTime +
+            ", alarmStatus=" + alarmStatus +
+            ", alarmLocation=" + alarmLocation +
+            ", alarmImage=" + alarmImage +
+            ", channelNo=" + channelNo +
+            ", alarmContent=" + alarmContent +
+            ", cancelTime=" + cancelTime +
+        "}";
+    }
+}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusAlarm.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusAlarm.java
deleted file mode 100644
index efb4a23..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusAlarm.java
+++ /dev/null
@@ -1,159 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.alibaba.fastjson.annotation.JSONField;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.time.LocalDateTime;
-import java.util.Date;
-
-/**
- * <p>
- * 报警记录表
- * </p>
- *
- * @author zyj
- * @since 2023-05-16
- */
-@Data
-@ApiModel("Alarm")
-@TableName("br_bus_alarm")
-public class BusAlarm implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 项目ID
-     */
-    @ApiModelProperty(value = "项目ID")
-    @TableField("PROJECT_ID")
-    private Long projectId;
-
-    /**
-     * 设备ID
-     */
-    @ApiModelProperty(value = "设备ID")
-    @TableField("DEVICE_ID")
-    private Long deviceId;
-
-    /**
-     * 报警类型
-     */
-    @ApiModelProperty(value = "报警类型")
-    @TableField("ALARM_TYPE")
-    private String alarmType;
-
-    /**
-     * 报警状态
-     */
-    @ApiModelProperty(value = "报警状态")
-    @TableField("ALARM_STATUS")
-    private String alarmStatus;
-
-    /**
-     * 报警值
-     */
-    @ApiModelProperty(value = "报警值")
-    @TableField("ALARM_VALUE")
-    private String alarmValue;
-
-    /**
-     * 报警图片
-     */
-    @ApiModelProperty(value = "报警图片")
-    @TableField("ALARM_IMAGE")
-    private String alarmImage;
-
-    /**
-     * 报警内容
-     */
-    @ApiModelProperty(value = "报警内容")
-    @TableField("ALARM_CONTENT")
-    private String alarmContent;
-
-    /**
-     * 报警时间
-     */
-    @ApiModelProperty(value = "报警时间")
-    @TableField("ALARM_TIME")
-    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
-    private Date alarmTime;
-
-    /**
-     * 消警时间
-     */
-    @ApiModelProperty(value = "消警时间")
-    @TableField("CANCEL_TIME")
-    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
-    private Date cancelTime;
-
-    /**
-     * 报警位置经度
-     */
-    @ApiModelProperty(value = "报警位置经度")
-    @TableField("ALARM_LNG")
-    private String alarmLng;
-
-    /**
-     * 报警位置纬度
-     */
-    @ApiModelProperty(value = "报警位置纬度")
-    @TableField("ALARM_LAT")
-    private String alarmLat;
-
-    @ApiModelProperty("报警类型名称")
-    @TableField(exist = false)
-    private String alarmStatusName;
-    @ApiModelProperty("报警类型名称")
-    @TableField(exist = false)
-    private String alarmTypeName;
-    @ApiModelProperty("作业名称")
-    @TableField(exist = false)
-    private String workTitle;
-    @ApiModelProperty("所属道路")
-    @TableField(exist = false)
-    private String workRoad;
-    @ApiModelProperty("作业状态")
-    @TableField(exist = false)
-    private String projectState;
-    @ApiModelProperty("作业状态名称")
-    @TableField(exist = false)
-    private String projectStateName;
-    @ApiModelProperty("负责人姓名")
-    @TableField(exist = false)
-    private String workPersonName;
-    @ApiModelProperty("负责人联系方式")
-    @TableField(exist = false)
-    private String workPersonPhoneNumber;
-
-
-    @Override
-    public String toString() {
-        return "BusAlarm{" +
-                "id=" + id +
-                ", projectId=" + projectId +
-                ", deviceId=" + deviceId +
-                ", alarmType=" + alarmType +
-                ", alarmValue=" + alarmValue +
-                ", alarmStatus=" + alarmStatus +
-                ", alarmImage=" + alarmImage +
-                ", alarmContent=" + alarmContent +
-                ", alarmTime=" + alarmTime +
-                ", cancelTime=" + cancelTime +
-                ", alarmLng=" + alarmLng +
-                ", alarmLat=" + alarmLat +
-                "}";
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusEvent.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusEvent.java
deleted file mode 100644
index a0b7543..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusEvent.java
+++ /dev/null
@@ -1,100 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.time.LocalDateTime;
-import java.util.Date;
-import java.util.List;
-
-/**
- * <p>
- * 事件表
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@TableName("br_bus_event")
-@Data
-@ApiModel("BusEvent")
-public class BusEvent implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @ApiModelProperty("事件ID")
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 事件标题
-     */
-    @ApiModelProperty("事件名称")
-    @TableField("EVENT_TITLE")
-    private String eventTitle;
-
-    /**
-     * 上报人员
-     */
-    @ApiModelProperty("上报人员")
-    @TableField("UPLOAD_NAME")
-    private String uploadName;
-
-    /**
-     * 联系方式
-     */
-    @ApiModelProperty("联系方式")
-    @TableField("PHONE_NUMBER")
-    private String phoneNumber;
-
-    /**
-     * 事件描述
-     */
-    @ApiModelProperty("事件描述")
-    @TableField("EVENT_DESCRIPTION")
-    private String eventDescription;
-
-    @ApiModelProperty("经度")
-    @TableField("LNG")
-    private String lng;
-
-    @ApiModelProperty("纬度")
-    @TableField("LAT")
-    private String lat;
-
-    /**
-     * 事件上传时间
-     */
-    @ApiModelProperty("事件上传时间")
-    @TableField("CREATE_TIME")
-    private Date createTime;
-
-    @ApiModelProperty("事件照片")
-    @TableField(exist = false)
-    private List<BusEventImage> imageList;
-
-
-
-    @Override
-    public String toString() {
-        return "BusEvent{" +
-            "id=" + id +
-            ", eventTitle=" + eventTitle +
-            ", uploadName=" + uploadName +
-            ", phoneNumber=" + phoneNumber +
-            ", eventDescription=" + eventDescription +
-            ", lng=" + lng +
-            ", lat=" + lat +
-            ", createTime=" + createTime +
-        "}";
-    }
-}

diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/AlarmController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/AlarmController.java
new file mode 100644
index 0000000..1795cf1
--- /dev/null
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/AlarmController.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.modular.system.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.stereotype.Controller;
+
+/**
+ * <p>
+ * 报警记录表 前端控制器
+ * </p>
+ *
+ * @author zyj
+ * @since 2023-05-25
+ */
+@Controller
+@RequestMapping("/system/alarm")
+public class AlarmController {
+
+}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusAlarmController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusAlarmController.java
deleted file mode 100644
index 1f82ebb..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusAlarmController.java
+++ /dev/null
@@ -1,102 +0,0 @@
-package com.casic.missiles.modular.system.controller;
-
-
-import cn.hutool.core.util.ObjectUtil;
-import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.core.base.controller.BaseController;
-import com.casic.missiles.core.page.PageFactory;
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.AlarmUpload;
-import com.casic.missiles.modular.system.dto.DeviceDetailDTO;
-import com.casic.missiles.modular.system.entity.BusAlarm;
-import com.casic.missiles.modular.system.service.IBusAlarmService;
-import io.swagger.annotations.*;
-import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.*;
-
-import org.springframework.stereotype.Controller;
-
-import static com.casic.missiles.model.response.ResponseData.DEFAULT_SUCCESS_MESSAGE;
-import static com.casic.missiles.modular.system.consts.AlarmConst.ALARM_STATUS_MANUAL_CANCEL;
-
-/**
- * <p>
- * 报警记录表 前端控制器
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@Api(tags = "报警管理接口")
-@Controller
-@RequestMapping("/alarm")
-@RequiredArgsConstructor
-public class BusAlarmController extends BaseController {
-
-    private final IBusAlarmService alarmService;
-
-    @ApiOperation("报警上报接口")
-    @PostMapping("/upload")
-    @ResponseBody
-    public Object upload(@RequestBody AlarmUpload alarmUpload){
-        alarmService.alarmUpload(alarmUpload);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("报警列表分页查询")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "workTitle", value = "作业名称",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "projectId", value = "作业ID",dataType = "Long", paramType = "query",example = "0"),
-            @ApiImplicitParam(name = "alarmStatus", value = "报警状态",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "projectState", value = "作业状态",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "alarmType", value = "报警类型",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "alarmStartTime", value = "报警开始时间",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "alarmEndTime", value = "报警结束时间",dataType = "String", paramType = "query")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = BusAlarm.class),
-    })
-    @GetMapping("/listPage")
-    @ResponseBody
-    public Object listPage(String workTitle,Long projectId,String alarmStatus,String projectState,String alarmType,String alarmStartTime,String alarmEndTime){
-        Page<BusAlarm> page = PageFactory.defaultPage();
-        QueryWrapper<BusAlarm> queryWrapper = new QueryWrapper<>();
-        if(StrUtil.isNotEmpty(workTitle)){
-            queryWrapper.like("p.WORK_TITLE",workTitle);
-        }
-        if(ObjectUtil.isNotEmpty(projectId)){
-            queryWrapper.eq("alarm.PROJECT_ID",projectId);
-        }
-        if(StrUtil.isNotEmpty(alarmStatus)){
-            queryWrapper.eq("alarm.ALARM_STATUS",alarmStatus);
-        }
-        if(StrUtil.isNotEmpty(projectState)){
-            queryWrapper.eq("p.PROJECT_STATE",projectState);
-        }
-        if(StrUtil.isNotEmpty(alarmType)){
-            queryWrapper.eq("alarm.ALARM_TYPE",alarmType);
-        }
-        if(StrUtil.isNotEmpty(alarmStartTime)){
-            queryWrapper.ge("alarm.ALARM_TIME",alarmStartTime);
-        }
-        if(StrUtil.isNotEmpty(alarmEndTime)){
-            queryWrapper.le("alarm.ALARM_TIME",alarmEndTime);
-        }
-        page = alarmService.listPage(page,queryWrapper);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-    @ApiOperation("消警")
-    @PostMapping("/cancel")
-    @ResponseBody
-    public Object cancel(@RequestParam("alarmId") Long alarmId){
-        UpdateWrapper<BusAlarm> updateWrapper = new UpdateWrapper<>();
-        updateWrapper.eq("ID",alarmId);
-        updateWrapper.set("ALARM_STATUS",ALARM_STATUS_MANUAL_CANCEL);
-        alarmService.update(updateWrapper);
-        return ResponseData.success();
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusEventController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusEventController.java
deleted file mode 100644
index dde5aad..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusEventController.java
+++ /dev/null
@@ -1,41 +0,0 @@
-package com.casic.missiles.modular.system.controller;
-
-
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.entity.BusEvent;
-import com.casic.missiles.modular.system.service.IBusEventService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.ResponseBody;
-
-/**
- * <p>
- * 事件表 前端控制器
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@Controller
-@RequestMapping("/event")
-@Api(tags = "事件上报")
-@RequiredArgsConstructor
-public class BusEventController {
-
-    private final IBusEventService eventService;
-
-    @ApiOperation("事件上报")
-    @PostMapping("add")
-    @ResponseBody
-    public Object add(@RequestBody BusEvent busEvent){
-        eventService.saveBusEvent(busEvent);
-        return ResponseData.success();
-    }
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
index 03abc5f..aa50d78 100644
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
@@ -1,121 +1,20 @@
 package com.casic.missiles.modular.system.controller;
 
 
-import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.core.base.controller.BaseController;
-import com.casic.missiles.core.page.PageFactory;
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.DeviceDetailDTO;
-import com.casic.missiles.modular.system.entity.Device;
-import com.casic.missiles.modular.system.service.IDeviceExtService;
-import com.casic.missiles.modular.system.service.IDeviceService;
-import io.swagger.annotations.*;
-import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.RequestMapping;
 
 import org.springframework.stereotype.Controller;
 
-import java.time.LocalDateTime;
-import java.util.Date;
-import java.util.List;
-
-import static com.casic.missiles.model.response.ResponseData.DEFAULT_SUCCESS_MESSAGE;
-
 /**
  * <p>
- *  前端控制器
+ * 设备记录表 前端控制器
  * </p>
  *
  * @author zyj
- * @since 2023-04-14
+ * @since 2023-05-25
  */
-@Api(tags = "设备管理接口")
-@RequiredArgsConstructor
 @Controller
-@RequestMapping("/device")
-public class DeviceController extends BaseController {
-    private final IDeviceService deviceService;
-    private final IDeviceExtService deviceExtService;
-
-    @ApiOperation("设备分页列表")
-    @ApiImplicitParams({
-        @ApiImplicitParam(name = "deviceType", value = "设备类型",dataType = "String", paramType = "query"),
-        @ApiImplicitParam(name = "deviceCode", value = "设备编号",dataType = "String", paramType = "query"),
-        @ApiImplicitParam(name = "status", value = "设备状态",dataType = "String", paramType = "query"),
-        @ApiImplicitParam(name = "projectId", value = "作业ID（如果传此参数，列表中返回该作业使用的设备）",dataType = "Long", paramType = "query", example = "0")
-    })
-    @ApiResponses({
-        @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = DeviceDetailDTO.class),
-    })
-    @GetMapping("listPage")
-    @ResponseBody
-    public Object listPage(String deviceType, String deviceCode, String status,Long projectId){
-        Page<DeviceDetailDTO> page = PageFactory.defaultPage();
-        QueryWrapper<DeviceDetailDTO> queryWrapper = new QueryWrapper<>();
-        if(StrUtil.isNotEmpty(deviceType)){
-            queryWrapper.eq("DEVICE_TYPE",deviceType);
-        }
-        if(StrUtil.isNotEmpty(deviceCode)){
-            queryWrapper.like("DEVICE_CODE",deviceCode);
-        }
-        page = deviceService.listPage(page,queryWrapper,status,projectId);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-    @ApiOperation("新增设备")
-    @PostMapping("add")
-    @ResponseBody
-    public Object add(@RequestBody DeviceDetailDTO deviceDetailDTO){
-        deviceService.saveDevice(deviceDetailDTO);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("编辑设备")
-    @PostMapping("update")
-    @ResponseBody
-    public Object update(@RequestBody DeviceDetailDTO deviceDetailDTO){
-        deviceService.updateDevice(deviceDetailDTO);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("删除设备")
-    @PostMapping("delete")
-    @ResponseBody
-    public Object delete(@ApiParam("设备id列表")@RequestBody List<Long> deviceIds){
-        deviceService.deleteDevices(deviceIds);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("设置甲烷阈值")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "gasIp", value = "安全树甲烷设备IP",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "gasPort", value = "安全树甲烷端口",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "threshold", value = "甲烷阈值",dataType = "String", paramType = "query")
-    })
-    @PostMapping("setThreshold")
-    @ResponseBody
-    public Object setThreshold(String gasIp,String gasPort,String threshold){
-        deviceExtService.setGasThreshold(gasIp, gasPort, threshold);
-        return ResponseData.success();
-    }
-
-
-    @ApiOperation("查询甲烷阈值")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "gasIp", value = "安全树甲烷设备IP",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "gasPort", value = "安全树甲烷端口",dataType = "String", paramType = "query")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = "{\"code\": 200,\"data\": \"100\",\"message\": \"请求成功\",\"success\": true}",response = String.class),
-    })
-    @GetMapping("getThreshold")
-    @ResponseBody
-    public Object getThreshold(String gasIp,String gasPort){
-        String data = deviceExtService.getGasThreshold(gasIp, gasPort);
-        return ResponseData.success(data);
-    }
-
+@RequestMapping("/system/device")
+public class DeviceController {
 
 }
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/OverviewController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/OverviewController.java
deleted file mode 100644
index 7570504..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/OverviewController.java
+++ /dev/null
@@ -1,70 +0,0 @@
-package com.casic.missiles.modular.system.controller;
-
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.AlarmTypeCountDTO;
-import com.casic.missiles.modular.system.dto.DeviceLocationDTO;
-import com.casic.missiles.modular.system.dto.WorkerLocationDTO;
-import com.casic.missiles.modular.system.service.IBusAlarmService;
-import com.casic.missiles.modular.system.service.IProjectDeviceService;
-import com.casic.missiles.modular.system.service.IProjectWorkerService;
-import io.swagger.annotations.*;
-import lombok.RequiredArgsConstructor;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.ResponseBody;
-
-import static com.casic.missiles.model.response.ResponseData.DEFAULT_SUCCESS_MESSAGE;
-import static com.casic.missiles.modular.system.consts.AlarmConst.ALARM_STATUS_ON;
-
-@Api(tags = "首页看板接口")
-@Controller
-@RequestMapping("overview")
-@RequiredArgsConstructor
-public class OverviewController {
-
-    private final IBusAlarmService alarmService;
-    private final IProjectDeviceService projectDeviceService;
-
-    private final IProjectWorkerService projectWorkerService;
-
-
-    @ApiOperation("报警统计接口")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "projectId", value = "作业ID",dataType = "Long", paramType = "query", example = "0")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = AlarmTypeCountDTO.class),
-    })
-    @GetMapping("/alarmCount")
-    @ResponseBody
-    public Object alarmCount(Long projectId){
-        return ResponseData.success(alarmService.alarmCount(projectId,ALARM_STATUS_ON));
-    }
-
-    @ApiOperation("设备列表接口")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "projectId", value = "作业ID",dataType = "Long", paramType = "query", example = "0")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = DeviceLocationDTO.class),
-    })
-    @GetMapping("/deviceList")
-    @ResponseBody
-    public Object deviceList(Long projectId){
-        return ResponseData.success(projectDeviceService.selectDeviceLocationList(projectId));
-    }
-
-    @ApiOperation("人员列表接口")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "projectId", value = "作业ID",dataType = "Long", paramType = "query", example = "0")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = WorkerLocationDTO.class),
-    })
-    @GetMapping("/workerList")
-    @ResponseBody
-    public Object workerList(Long projectId){
-        return ResponseData.success(projectWorkerService.selectWorkerLocationDTO(projectId));
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/WorkSiteInfoController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/WorkSiteInfoController.java
deleted file mode 100644
index af36d69..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/WorkSiteInfoController.java
+++ /dev/null
@@ -1,130 +0,0 @@
-package com.casic.missiles.modular.system.controller;
-
-
-import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.core.base.controller.BaseController;
-import com.casic.missiles.core.page.PageFactory;
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.WorkSiteDetailDTO;
-import com.casic.missiles.modular.system.entity.WorkSiteInfo;
-import com.casic.missiles.modular.system.service.IWorkSiteInfoService;
-import io.swagger.annotations.*;
-import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.*;
-
-import org.springframework.stereotype.Controller;
-
-import java.util.List;
-
-import static com.casic.missiles.model.response.ResponseData.DEFAULT_SUCCESS_MESSAGE;
-
-/**
- * <p>
- * 作业现场表 前端控制器
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@Controller
-@RequestMapping("/site")
-@Api(tags = "作业现场管理")
-@RequiredArgsConstructor
-public class WorkSiteInfoController extends BaseController {
-
-
-    private final IWorkSiteInfoService workSiteInfoService;
-
-    @ApiOperation("新增作业现场")
-    @PostMapping("add")
-    @ResponseBody
-    public Object addWorkSite(@RequestBody WorkSiteDetailDTO workSiteDetailDTO){
-        workSiteInfoService.addWorkSiteInfo(workSiteDetailDTO);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("编辑作业现场")
-    @PostMapping("update")
-    @ResponseBody
-    public Object updateWorkSite(@RequestBody WorkSiteDetailDTO workSiteDetailDTO){
-        workSiteInfoService.updateWorkSiteInfo(workSiteDetailDTO);
-        return ResponseData.success();
-    }
-
-
-    @ApiOperation("删除作业现场")
-    @PostMapping("delete")
-    @ResponseBody
-    public Object delete(@ApiParam("作业现场id列表")@RequestBody List<Long> projectIds){
-        workSiteInfoService.deleteProjects(projectIds);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("查询作业现场详情")
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = WorkSiteDetailDTO.class),
-    })
-    @GetMapping("detail")
-    @ResponseBody
-    public Object delete(@ApiParam(value = "作业现场id", example = "0")@RequestParam Long projectId){
-        WorkSiteDetailDTO detailDTO = workSiteInfoService.getWorkSiteDetail(projectId);
-        return ResponseData.success(detailDTO);
-    }
-
-    @ApiOperation("分页列表查询")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "workTitle",value = "作业名称", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "workRoad",value = "所属道路", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "workPersonName",value = "责任人姓名", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "startDate",value = "注册开始日期", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "endDate",value = "注册结束日期", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "projectState",value = "当前状态（字典值）", dataType = "String", paramType = "query")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = WorkSiteInfo.class),
-    })
-    @GetMapping("listPage")
-    @ResponseBody
-    public Object listPage(String workTitle,String workRoad,String workPersonName,String projectState,String startDate,String endDate){
-        Page<WorkSiteInfo> page = PageFactory.defaultPage();
-        QueryWrapper<WorkSiteInfo> queryWrapper = new QueryWrapper<>();
-        if(StrUtil.isNotEmpty(workTitle)){
-            queryWrapper.like("WORK_TITLE",workTitle);
-        }
-        if(StrUtil.isNotEmpty(workRoad)){
-            queryWrapper.like("WORK_ROAD",workRoad);
-        }
-        if(StrUtil.isNotEmpty(workPersonName)){
-            queryWrapper.like("WORKER_NAME",workPersonName);
-        }
-        if(StrUtil.isNotEmpty(projectState)){
-            queryWrapper.eq("PROJECT_STATE",projectState);
-        }
-        if(StrUtil.isNotEmpty(startDate)){
-            queryWrapper.ge("br_work_site_info.CREATE_TIME",startDate + " 00:00:00");
-        }
-        if(StrUtil.isNotEmpty(endDate)){
-            queryWrapper.le("br_work_site_info.CREATE_TIME",endDate + " 23:59:59");
-        }
-        page = workSiteInfoService.selectListPage(page,queryWrapper);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-    @ApiOperation("开始作业")
-    @PostMapping("start")
-    @ResponseBody
-    public Object start(@ApiParam(value = "作业现场id",example = "0")@RequestParam Long projectId){
-        workSiteInfoService.start(projectId);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("完成作业")
-    @PostMapping("finish")
-    @ResponseBody
-    public Object finish(@ApiParam(value = "作业现场id", example = "0")@RequestParam Long projectId){
-        workSiteInfoService.finish(projectId);
-        return ResponseData.success();
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/WorkerController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/WorkerController.java
deleted file mode 100644
index 796f94c..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/WorkerController.java
+++ /dev/null
@@ -1,136 +0,0 @@
-package com.casic.missiles.modular.system.controller;
-
-
-import cn.hutool.core.util.ObjectUtil;
-import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.core.base.controller.BaseController;
-import com.casic.missiles.core.page.PageFactory;
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.DeviceDetailDTO;
-import com.casic.missiles.modular.system.entity.Device;
-import com.casic.missiles.modular.system.entity.Worker;
-import com.casic.missiles.modular.system.service.IWorkerService;
-import io.swagger.annotations.*;
-import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.*;
-
-import org.springframework.stereotype.Controller;
-
-import java.util.Date;
-import java.util.List;
-
-import static com.casic.missiles.model.response.ResponseData.DEFAULT_SUCCESS_MESSAGE;
-
-/**
- * <p>
- *  前端控制器
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@Controller
-@RequestMapping("/worker")
-@RequiredArgsConstructor
-@Api(tags = "人员管理接口")
-public class WorkerController extends BaseController {
-
-    private final IWorkerService workerService;
-
-    @ApiOperation("分页列表查询")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "name",value = "姓名", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "deptId",value = "所属部门", dataType = "Long", paramType = "query", example = "0"),
-            @ApiImplicitParam(name = "status",value = "当前状态（字典值）", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "startDate",value = "注册开始日期", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "endDate",value = "注册结束日期", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "workerType",value = "人员类型（字典值）", dataType = "String", paramType = "query")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = Worker.class),
-    })
-    @GetMapping("listPage")
-    @ResponseBody
-    public Object listPage(String name,Long deptId, String status,String startDate,String endDate,String workerType){
-        Page<Worker> page = PageFactory.defaultPage();
-        QueryWrapper<Worker> queryWrapper = new QueryWrapper<>();
-        if(StrUtil.isNotEmpty(name)){
-            queryWrapper.like("WORKER_NAME",name);
-        }
-        if(ObjectUtil.isNotEmpty(deptId)){
-            queryWrapper.eq("DEPT_ID",deptId);
-        }
-        if(StrUtil.isNotEmpty(workerType)){
-            queryWrapper.eq("WORKER_TYPE",workerType);
-        }
-        if(StrUtil.isNotEmpty(startDate)){
-            queryWrapper.ge("CREATE_TIME",startDate + " 00:00:00");
-        }
-        if(StrUtil.isNotEmpty(endDate)){
-            queryWrapper.le("CREATE_TIME",endDate + " 23:59:59");
-        }
-        if(StrUtil.isNotEmpty(status)){
-            queryWrapper.eq("`STATUS`",status);
-        }
-        page = workerService.selectListPage(page,queryWrapper);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-    @ApiOperation("新增人员")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "worker", value = "人员信息", dataType = "Worker", paramType = "body", required = true),
-            @ApiImplicitParam(name = "projectId", value = "项目ID(入场申请需要)", dataType = "Long", paramType = "query", example = "0")
-    })
-    @PostMapping("add")
-    @ResponseBody
-    public Object add(@ApiParam("worker")@RequestBody Worker worker,
-                      @RequestParam(required = false) Long projectId){
-        workerService.addWorker(worker,projectId);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("编辑人员")
-    @PostMapping("update")
-    @ResponseBody
-    public Object update(@RequestBody Worker worker){
-        workerService.updateById(worker);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("删除人员")
-    @PostMapping("delete")
-    @ResponseBody
-    public Object delete(@ApiParam("人员id列表")@RequestBody List<Long> workIds){
-        workerService.removeByIds(workIds);
-        return ResponseData.success();
-    }
-
-
-    @ApiOperation(value = "获取人脸图片",notes = "返回人脸图片url")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "cameraIp",value = "摄像头IP", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "cameraPort",value = "摄像头端口号", dataType = "String", paramType = "query"),
-    })
-    @GetMapping("/face/register")
-    @ResponseBody
-    public Object faceRegister(String cameraIp,String cameraPort){
-        return ResponseData.success(workerService.faceRegister(cameraIp, cameraPort));
-    }
-
-
-    @ApiOperation(value = "查询临时入场人员列表")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "projectId", value = "项目ID",required = true,dataType = "Long", paramType = "query", example = "0")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = Worker.class),
-    })
-    @GetMapping("/projectTempWorker")
-    @ResponseBody
-    public Object projectTempWorker(Long projectId){
-        return ResponseData.success(workerService.projectTempWorker(projectId));
-    }
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/AlarmTypeCountDTO.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/AlarmTypeCountDTO.java
deleted file mode 100644
index 1a165a1..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/AlarmTypeCountDTO.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.casic.missiles.modular.system.dto;
-
-import io.swagger.annotations.ApiModel;
-import lombok.Data;
-
-@ApiModel(value = "AlarmTypeCountDTO",description = "报警类型统计（首页）")
-@Data
-public class AlarmTypeCountDTO {
-
-    private String alarmType;
-    private String alarmTypeName;
-    private Integer alarmCount;
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/AlarmUpload.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/AlarmUpload.java
deleted file mode 100644
index 73d7799..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/AlarmUpload.java
+++ /dev/null
@@ -1,46 +0,0 @@
-package com.casic.missiles.modular.system.dto;
-
-import cn.hutool.core.util.StrUtil;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-@ApiModel(value = "AlarmUpload",description = "报警上传")
-@Data
-public class AlarmUpload {
-
-    @ApiModelProperty(value = "摄像头ip")
-    private String cameraIp;
-
-    @ApiModelProperty(value = "摄像头端口")
-    private String cameraPort;
-    @ApiModelProperty(value = "安全树甲烷设备ip")
-    private String gasIp;
-    @ApiModelProperty(value = "安全树甲烷设备端口")
-    private String gasPort;
-    @ApiModelProperty(value = "报警值")
-    private String alarmValue;
-    @ApiModelProperty(value = "报警时间")
-    private String alarmTime;
-    @ApiModelProperty(value = "报警类型")
-    private String alarmType;
-    @ApiModelProperty(value = "报警图片")
-    private String alarmImage;
-    @ApiModelProperty(value = "报警内容")
-    private String alarmContent;
-
-    @Override
-    public String toString() {
-        return "AlarmUpload{" +
-                "cameraIp='" + cameraIp + '\'' +
-                ", cameraPort='" + cameraPort + '\'' +
-                ", gasIp='" + gasIp + '\'' +
-                ", gasPort='" + gasPort + '\'' +
-                ", alarmValue='" + alarmValue + '\'' +
-                ", alarmTime='" + alarmTime + '\'' +
-                ", alarmType='" + alarmType + '\'' +
-                ", alarmImage='" + (StrUtil.isNotEmpty(alarmImage) ? alarmImage.substring(0,50) : "null") + '\'' +
-                ", alarmContent='" + alarmContent + '\'' +
-                '}';
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/DeviceDetailDTO.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/DeviceDetailDTO.java
deleted file mode 100644
index ea518d9..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/DeviceDetailDTO.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package com.casic.missiles.modular.system.dto;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.casic.missiles.modular.system.entity.Device;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-@ApiModel("DeviceDetailDTO")
-@Data
-public class DeviceDetailDTO extends Device {
-
-    @ApiModelProperty(value = "摄像头编号")
-    private String cameraCode;
-
-    @ApiModelProperty(value = "摄像头IP")
-    private String cameraIp;
-
-    @ApiModelProperty(value = "摄像头端口")
-    private String cameraPort;
-
-    @ApiModelProperty(value = "激甲编号")
-    private String gasCode;
-
-    @ApiModelProperty(value = "激甲IP")
-    private String gasIp;
-
-    @ApiModelProperty(value = "激甲端口")
-    private String gasPort;
-
-    @ApiModelProperty(value = "智能帽衬编号")
-    private String hatLiningCode;
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/WorkSiteDetailDTO.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/WorkSiteDetailDTO.java
deleted file mode 100644
index 29378ff..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/WorkSiteDetailDTO.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package com.casic.missiles.modular.system.dto;
-
-import com.casic.missiles.modular.system.entity.ProjectDevice;
-import com.casic.missiles.modular.system.entity.ProjectWorker;
-import com.casic.missiles.modular.system.entity.WorkSiteInfo;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.util.List;
-
-@Data
-@ApiModel("WorkSiteDetailDTO")
-public class WorkSiteDetailDTO extends WorkSiteInfo {
-
-    @ApiModelProperty(value = "安全树列表",dataType = "ProjectDevice")
-    private List<ProjectDevice> deviceList;
-
-    @ApiModelProperty(value = "人员列表",dataType = "ProjectWorker")
-    private List<ProjectWorker> workerList;
-
-
-
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/WorkerLocationDTO.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/WorkerLocationDTO.java
deleted file mode 100644
index 6fd7b24..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/WorkerLocationDTO.java
+++ /dev/null
@@ -1,68 +0,0 @@
-package com.casic.missiles.modular.system.dto;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-@ApiModel(value = "WorkerLocationDTO",description = "人员位置列表（首页）")
-@Data
-public class WorkerLocationDTO {
-
-    @ApiModelProperty("人员ID")
-    private Long workerId;
-
-    @ApiModelProperty("人员姓名")
-    private String workerName;
-
-    @ApiModelProperty("安全帽编号")
-    private String hatCode;
-
-    @ApiModelProperty("安全帽ID")
-    private Long hatId;
-
-    @ApiModelProperty("背心编号")
-    private String vastCode;
-
-    @ApiModelProperty("手环编号")
-    private String braceletCode;
-
-    @ApiModelProperty("位置")
-    private String location;
-
-    @ApiModelProperty("时间")
-    private String time;
-
-    @ApiModelProperty("经度")
-    private String lng;
-
-    @ApiModelProperty("纬度")
-    private String lat;
-
-    @ApiModelProperty("心率")
-    private String heartRate;
-
-    @ApiModelProperty("血氧")
-    private String bloodOxygen;
-
-    @ApiModelProperty("一氧化碳")
-    private String co;
-
-    @ApiModelProperty("甲烷")
-    private String gas;
-
-    @ApiModelProperty("硫化氢")
-    private String h2s;
-
-    @ApiModelProperty("氧气")
-    private String o2;
-
-    @ApiModelProperty("信号")
-    private String signal;
-
-    @ApiModelProperty("电量")
-    private String cell;
-
-    @ApiModelProperty("是否报警")
-    private boolean alarmFlag;
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Alarm.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Alarm.java
new file mode 100644
index 0000000..4d2b7ef
--- /dev/null
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Alarm.java
@@ -0,0 +1,103 @@
+package com.casic.missiles.modular.system.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import java.util.Date;
+
+/**
+ * <p>
+ * 报警记录表
+ * </p>
+ *
+ * @author zyj
+ * @since 2023-05-25
+ */
+@Data
+@TableName("bus_alarm")
+public class Alarm implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    @TableId(value = "ID",type = IdType.ASSIGN_ID)
+    private Long id;
+
+    /**
+     * 设备ID
+     */
+    @TableField("DEVICE_ID")
+    private Long deviceId;
+
+    /**
+     * 报警类型
+     */
+    @TableField("ALARM_TYPE")
+    private String alarmType;
+
+    /**
+     * 报警时间
+     */
+    @TableField("ALARM_TIME")
+    private Date alarmTime;
+
+    /**
+     * 报警状态
+     */
+    @TableField("ALARM_STATUS")
+    private String alarmStatus;
+
+    /**
+     * 报警位置
+     */
+    @TableField("ALARM_LOCATION")
+    private String alarmLocation;
+
+    /**
+     * 报警图片
+     */
+    @TableField("ALARM_IMAGE")
+    private String alarmImage;
+
+    /**
+     * 视频通道号
+     */
+    @TableField("CHANNEL_NO")
+    private Integer channelNo;
+
+    /**
+     * 报警内容
+     */
+    @TableField("ALARM_CONTENT")
+    private String alarmContent;
+
+    /**
+     * 消警时间
+     */
+    @TableField("CANCEL_TIME")
+    private Date cancelTime;
+
+
+    @Override
+    public String toString() {
+        return "Alarm{" +
+            "id=" + id +
+            ", deviceId=" + deviceId +
+            ", alarmType=" + alarmType +
+            ", alarmTime=" + alarmTime +
+            ", alarmStatus=" + alarmStatus +
+            ", alarmLocation=" + alarmLocation +
+            ", alarmImage=" + alarmImage +
+            ", channelNo=" + channelNo +
+            ", alarmContent=" + alarmContent +
+            ", cancelTime=" + cancelTime +
+        "}";
+    }
+}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusAlarm.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusAlarm.java
deleted file mode 100644
index efb4a23..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusAlarm.java
+++ /dev/null
@@ -1,159 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.alibaba.fastjson.annotation.JSONField;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.time.LocalDateTime;
-import java.util.Date;
-
-/**
- * <p>
- * 报警记录表
- * </p>
- *
- * @author zyj
- * @since 2023-05-16
- */
-@Data
-@ApiModel("Alarm")
-@TableName("br_bus_alarm")
-public class BusAlarm implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 项目ID
-     */
-    @ApiModelProperty(value = "项目ID")
-    @TableField("PROJECT_ID")
-    private Long projectId;
-
-    /**
-     * 设备ID
-     */
-    @ApiModelProperty(value = "设备ID")
-    @TableField("DEVICE_ID")
-    private Long deviceId;
-
-    /**
-     * 报警类型
-     */
-    @ApiModelProperty(value = "报警类型")
-    @TableField("ALARM_TYPE")
-    private String alarmType;
-
-    /**
-     * 报警状态
-     */
-    @ApiModelProperty(value = "报警状态")
-    @TableField("ALARM_STATUS")
-    private String alarmStatus;
-
-    /**
-     * 报警值
-     */
-    @ApiModelProperty(value = "报警值")
-    @TableField("ALARM_VALUE")
-    private String alarmValue;
-
-    /**
-     * 报警图片
-     */
-    @ApiModelProperty(value = "报警图片")
-    @TableField("ALARM_IMAGE")
-    private String alarmImage;
-
-    /**
-     * 报警内容
-     */
-    @ApiModelProperty(value = "报警内容")
-    @TableField("ALARM_CONTENT")
-    private String alarmContent;
-
-    /**
-     * 报警时间
-     */
-    @ApiModelProperty(value = "报警时间")
-    @TableField("ALARM_TIME")
-    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
-    private Date alarmTime;
-
-    /**
-     * 消警时间
-     */
-    @ApiModelProperty(value = "消警时间")
-    @TableField("CANCEL_TIME")
-    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
-    private Date cancelTime;
-
-    /**
-     * 报警位置经度
-     */
-    @ApiModelProperty(value = "报警位置经度")
-    @TableField("ALARM_LNG")
-    private String alarmLng;
-
-    /**
-     * 报警位置纬度
-     */
-    @ApiModelProperty(value = "报警位置纬度")
-    @TableField("ALARM_LAT")
-    private String alarmLat;
-
-    @ApiModelProperty("报警类型名称")
-    @TableField(exist = false)
-    private String alarmStatusName;
-    @ApiModelProperty("报警类型名称")
-    @TableField(exist = false)
-    private String alarmTypeName;
-    @ApiModelProperty("作业名称")
-    @TableField(exist = false)
-    private String workTitle;
-    @ApiModelProperty("所属道路")
-    @TableField(exist = false)
-    private String workRoad;
-    @ApiModelProperty("作业状态")
-    @TableField(exist = false)
-    private String projectState;
-    @ApiModelProperty("作业状态名称")
-    @TableField(exist = false)
-    private String projectStateName;
-    @ApiModelProperty("负责人姓名")
-    @TableField(exist = false)
-    private String workPersonName;
-    @ApiModelProperty("负责人联系方式")
-    @TableField(exist = false)
-    private String workPersonPhoneNumber;
-
-
-    @Override
-    public String toString() {
-        return "BusAlarm{" +
-                "id=" + id +
-                ", projectId=" + projectId +
-                ", deviceId=" + deviceId +
-                ", alarmType=" + alarmType +
-                ", alarmValue=" + alarmValue +
-                ", alarmStatus=" + alarmStatus +
-                ", alarmImage=" + alarmImage +
-                ", alarmContent=" + alarmContent +
-                ", alarmTime=" + alarmTime +
-                ", cancelTime=" + cancelTime +
-                ", alarmLng=" + alarmLng +
-                ", alarmLat=" + alarmLat +
-                "}";
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusEvent.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusEvent.java
deleted file mode 100644
index a0b7543..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusEvent.java
+++ /dev/null
@@ -1,100 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.time.LocalDateTime;
-import java.util.Date;
-import java.util.List;
-
-/**
- * <p>
- * 事件表
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@TableName("br_bus_event")
-@Data
-@ApiModel("BusEvent")
-public class BusEvent implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @ApiModelProperty("事件ID")
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 事件标题
-     */
-    @ApiModelProperty("事件名称")
-    @TableField("EVENT_TITLE")
-    private String eventTitle;
-
-    /**
-     * 上报人员
-     */
-    @ApiModelProperty("上报人员")
-    @TableField("UPLOAD_NAME")
-    private String uploadName;
-
-    /**
-     * 联系方式
-     */
-    @ApiModelProperty("联系方式")
-    @TableField("PHONE_NUMBER")
-    private String phoneNumber;
-
-    /**
-     * 事件描述
-     */
-    @ApiModelProperty("事件描述")
-    @TableField("EVENT_DESCRIPTION")
-    private String eventDescription;
-
-    @ApiModelProperty("经度")
-    @TableField("LNG")
-    private String lng;
-
-    @ApiModelProperty("纬度")
-    @TableField("LAT")
-    private String lat;
-
-    /**
-     * 事件上传时间
-     */
-    @ApiModelProperty("事件上传时间")
-    @TableField("CREATE_TIME")
-    private Date createTime;
-
-    @ApiModelProperty("事件照片")
-    @TableField(exist = false)
-    private List<BusEventImage> imageList;
-
-
-
-    @Override
-    public String toString() {
-        return "BusEvent{" +
-            "id=" + id +
-            ", eventTitle=" + eventTitle +
-            ", uploadName=" + uploadName +
-            ", phoneNumber=" + phoneNumber +
-            ", eventDescription=" + eventDescription +
-            ", lng=" + lng +
-            ", lat=" + lat +
-            ", createTime=" + createTime +
-        "}";
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusEventImage.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusEventImage.java
deleted file mode 100644
index 1e75245..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusEventImage.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-
-/**
- * <p>
- * 事件图片表
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@TableName("br_bus_event_image")
-@Data
-@ApiModel("BusEventImage")
-public class BusEventImage implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 事件ID
-     */
-    @TableField("EVENT_ID")
-    private Long eventId;
-
-    /**
-     * 报警图片
-     */
-    @TableField("IMAGE")
-    @ApiModelProperty("图片url")
-    private String image;
-
-}

diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/AlarmController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/AlarmController.java
new file mode 100644
index 0000000..1795cf1
--- /dev/null
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/AlarmController.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.modular.system.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.stereotype.Controller;
+
+/**
+ * <p>
+ * 报警记录表 前端控制器
+ * </p>
+ *
+ * @author zyj
+ * @since 2023-05-25
+ */
+@Controller
+@RequestMapping("/system/alarm")
+public class AlarmController {
+
+}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusAlarmController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusAlarmController.java
deleted file mode 100644
index 1f82ebb..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusAlarmController.java
+++ /dev/null
@@ -1,102 +0,0 @@
-package com.casic.missiles.modular.system.controller;
-
-
-import cn.hutool.core.util.ObjectUtil;
-import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.core.base.controller.BaseController;
-import com.casic.missiles.core.page.PageFactory;
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.AlarmUpload;
-import com.casic.missiles.modular.system.dto.DeviceDetailDTO;
-import com.casic.missiles.modular.system.entity.BusAlarm;
-import com.casic.missiles.modular.system.service.IBusAlarmService;
-import io.swagger.annotations.*;
-import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.*;
-
-import org.springframework.stereotype.Controller;
-
-import static com.casic.missiles.model.response.ResponseData.DEFAULT_SUCCESS_MESSAGE;
-import static com.casic.missiles.modular.system.consts.AlarmConst.ALARM_STATUS_MANUAL_CANCEL;
-
-/**
- * <p>
- * 报警记录表 前端控制器
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@Api(tags = "报警管理接口")
-@Controller
-@RequestMapping("/alarm")
-@RequiredArgsConstructor
-public class BusAlarmController extends BaseController {
-
-    private final IBusAlarmService alarmService;
-
-    @ApiOperation("报警上报接口")
-    @PostMapping("/upload")
-    @ResponseBody
-    public Object upload(@RequestBody AlarmUpload alarmUpload){
-        alarmService.alarmUpload(alarmUpload);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("报警列表分页查询")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "workTitle", value = "作业名称",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "projectId", value = "作业ID",dataType = "Long", paramType = "query",example = "0"),
-            @ApiImplicitParam(name = "alarmStatus", value = "报警状态",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "projectState", value = "作业状态",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "alarmType", value = "报警类型",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "alarmStartTime", value = "报警开始时间",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "alarmEndTime", value = "报警结束时间",dataType = "String", paramType = "query")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = BusAlarm.class),
-    })
-    @GetMapping("/listPage")
-    @ResponseBody
-    public Object listPage(String workTitle,Long projectId,String alarmStatus,String projectState,String alarmType,String alarmStartTime,String alarmEndTime){
-        Page<BusAlarm> page = PageFactory.defaultPage();
-        QueryWrapper<BusAlarm> queryWrapper = new QueryWrapper<>();
-        if(StrUtil.isNotEmpty(workTitle)){
-            queryWrapper.like("p.WORK_TITLE",workTitle);
-        }
-        if(ObjectUtil.isNotEmpty(projectId)){
-            queryWrapper.eq("alarm.PROJECT_ID",projectId);
-        }
-        if(StrUtil.isNotEmpty(alarmStatus)){
-            queryWrapper.eq("alarm.ALARM_STATUS",alarmStatus);
-        }
-        if(StrUtil.isNotEmpty(projectState)){
-            queryWrapper.eq("p.PROJECT_STATE",projectState);
-        }
-        if(StrUtil.isNotEmpty(alarmType)){
-            queryWrapper.eq("alarm.ALARM_TYPE",alarmType);
-        }
-        if(StrUtil.isNotEmpty(alarmStartTime)){
-            queryWrapper.ge("alarm.ALARM_TIME",alarmStartTime);
-        }
-        if(StrUtil.isNotEmpty(alarmEndTime)){
-            queryWrapper.le("alarm.ALARM_TIME",alarmEndTime);
-        }
-        page = alarmService.listPage(page,queryWrapper);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-    @ApiOperation("消警")
-    @PostMapping("/cancel")
-    @ResponseBody
-    public Object cancel(@RequestParam("alarmId") Long alarmId){
-        UpdateWrapper<BusAlarm> updateWrapper = new UpdateWrapper<>();
-        updateWrapper.eq("ID",alarmId);
-        updateWrapper.set("ALARM_STATUS",ALARM_STATUS_MANUAL_CANCEL);
-        alarmService.update(updateWrapper);
-        return ResponseData.success();
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusEventController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusEventController.java
deleted file mode 100644
index dde5aad..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusEventController.java
+++ /dev/null
@@ -1,41 +0,0 @@
-package com.casic.missiles.modular.system.controller;
-
-
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.entity.BusEvent;
-import com.casic.missiles.modular.system.service.IBusEventService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.ResponseBody;
-
-/**
- * <p>
- * 事件表 前端控制器
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@Controller
-@RequestMapping("/event")
-@Api(tags = "事件上报")
-@RequiredArgsConstructor
-public class BusEventController {
-
-    private final IBusEventService eventService;
-
-    @ApiOperation("事件上报")
-    @PostMapping("add")
-    @ResponseBody
-    public Object add(@RequestBody BusEvent busEvent){
-        eventService.saveBusEvent(busEvent);
-        return ResponseData.success();
-    }
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
index 03abc5f..aa50d78 100644
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
@@ -1,121 +1,20 @@
 package com.casic.missiles.modular.system.controller;
 
 
-import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.core.base.controller.BaseController;
-import com.casic.missiles.core.page.PageFactory;
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.DeviceDetailDTO;
-import com.casic.missiles.modular.system.entity.Device;
-import com.casic.missiles.modular.system.service.IDeviceExtService;
-import com.casic.missiles.modular.system.service.IDeviceService;
-import io.swagger.annotations.*;
-import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.RequestMapping;
 
 import org.springframework.stereotype.Controller;
 
-import java.time.LocalDateTime;
-import java.util.Date;
-import java.util.List;
-
-import static com.casic.missiles.model.response.ResponseData.DEFAULT_SUCCESS_MESSAGE;
-
 /**
  * <p>
- *  前端控制器
+ * 设备记录表 前端控制器
  * </p>
  *
  * @author zyj
- * @since 2023-04-14
+ * @since 2023-05-25
  */
-@Api(tags = "设备管理接口")
-@RequiredArgsConstructor
 @Controller
-@RequestMapping("/device")
-public class DeviceController extends BaseController {
-    private final IDeviceService deviceService;
-    private final IDeviceExtService deviceExtService;
-
-    @ApiOperation("设备分页列表")
-    @ApiImplicitParams({
-        @ApiImplicitParam(name = "deviceType", value = "设备类型",dataType = "String", paramType = "query"),
-        @ApiImplicitParam(name = "deviceCode", value = "设备编号",dataType = "String", paramType = "query"),
-        @ApiImplicitParam(name = "status", value = "设备状态",dataType = "String", paramType = "query"),
-        @ApiImplicitParam(name = "projectId", value = "作业ID（如果传此参数，列表中返回该作业使用的设备）",dataType = "Long", paramType = "query", example = "0")
-    })
-    @ApiResponses({
-        @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = DeviceDetailDTO.class),
-    })
-    @GetMapping("listPage")
-    @ResponseBody
-    public Object listPage(String deviceType, String deviceCode, String status,Long projectId){
-        Page<DeviceDetailDTO> page = PageFactory.defaultPage();
-        QueryWrapper<DeviceDetailDTO> queryWrapper = new QueryWrapper<>();
-        if(StrUtil.isNotEmpty(deviceType)){
-            queryWrapper.eq("DEVICE_TYPE",deviceType);
-        }
-        if(StrUtil.isNotEmpty(deviceCode)){
-            queryWrapper.like("DEVICE_CODE",deviceCode);
-        }
-        page = deviceService.listPage(page,queryWrapper,status,projectId);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-    @ApiOperation("新增设备")
-    @PostMapping("add")
-    @ResponseBody
-    public Object add(@RequestBody DeviceDetailDTO deviceDetailDTO){
-        deviceService.saveDevice(deviceDetailDTO);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("编辑设备")
-    @PostMapping("update")
-    @ResponseBody
-    public Object update(@RequestBody DeviceDetailDTO deviceDetailDTO){
-        deviceService.updateDevice(deviceDetailDTO);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("删除设备")
-    @PostMapping("delete")
-    @ResponseBody
-    public Object delete(@ApiParam("设备id列表")@RequestBody List<Long> deviceIds){
-        deviceService.deleteDevices(deviceIds);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("设置甲烷阈值")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "gasIp", value = "安全树甲烷设备IP",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "gasPort", value = "安全树甲烷端口",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "threshold", value = "甲烷阈值",dataType = "String", paramType = "query")
-    })
-    @PostMapping("setThreshold")
-    @ResponseBody
-    public Object setThreshold(String gasIp,String gasPort,String threshold){
-        deviceExtService.setGasThreshold(gasIp, gasPort, threshold);
-        return ResponseData.success();
-    }
-
-
-    @ApiOperation("查询甲烷阈值")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "gasIp", value = "安全树甲烷设备IP",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "gasPort", value = "安全树甲烷端口",dataType = "String", paramType = "query")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = "{\"code\": 200,\"data\": \"100\",\"message\": \"请求成功\",\"success\": true}",response = String.class),
-    })
-    @GetMapping("getThreshold")
-    @ResponseBody
-    public Object getThreshold(String gasIp,String gasPort){
-        String data = deviceExtService.getGasThreshold(gasIp, gasPort);
-        return ResponseData.success(data);
-    }
-
+@RequestMapping("/system/device")
+public class DeviceController {
 
 }
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/OverviewController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/OverviewController.java
deleted file mode 100644
index 7570504..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/OverviewController.java
+++ /dev/null
@@ -1,70 +0,0 @@
-package com.casic.missiles.modular.system.controller;
-
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.AlarmTypeCountDTO;
-import com.casic.missiles.modular.system.dto.DeviceLocationDTO;
-import com.casic.missiles.modular.system.dto.WorkerLocationDTO;
-import com.casic.missiles.modular.system.service.IBusAlarmService;
-import com.casic.missiles.modular.system.service.IProjectDeviceService;
-import com.casic.missiles.modular.system.service.IProjectWorkerService;
-import io.swagger.annotations.*;
-import lombok.RequiredArgsConstructor;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.ResponseBody;
-
-import static com.casic.missiles.model.response.ResponseData.DEFAULT_SUCCESS_MESSAGE;
-import static com.casic.missiles.modular.system.consts.AlarmConst.ALARM_STATUS_ON;
-
-@Api(tags = "首页看板接口")
-@Controller
-@RequestMapping("overview")
-@RequiredArgsConstructor
-public class OverviewController {
-
-    private final IBusAlarmService alarmService;
-    private final IProjectDeviceService projectDeviceService;
-
-    private final IProjectWorkerService projectWorkerService;
-
-
-    @ApiOperation("报警统计接口")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "projectId", value = "作业ID",dataType = "Long", paramType = "query", example = "0")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = AlarmTypeCountDTO.class),
-    })
-    @GetMapping("/alarmCount")
-    @ResponseBody
-    public Object alarmCount(Long projectId){
-        return ResponseData.success(alarmService.alarmCount(projectId,ALARM_STATUS_ON));
-    }
-
-    @ApiOperation("设备列表接口")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "projectId", value = "作业ID",dataType = "Long", paramType = "query", example = "0")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = DeviceLocationDTO.class),
-    })
-    @GetMapping("/deviceList")
-    @ResponseBody
-    public Object deviceList(Long projectId){
-        return ResponseData.success(projectDeviceService.selectDeviceLocationList(projectId));
-    }
-
-    @ApiOperation("人员列表接口")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "projectId", value = "作业ID",dataType = "Long", paramType = "query", example = "0")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = WorkerLocationDTO.class),
-    })
-    @GetMapping("/workerList")
-    @ResponseBody
-    public Object workerList(Long projectId){
-        return ResponseData.success(projectWorkerService.selectWorkerLocationDTO(projectId));
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/WorkSiteInfoController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/WorkSiteInfoController.java
deleted file mode 100644
index af36d69..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/WorkSiteInfoController.java
+++ /dev/null
@@ -1,130 +0,0 @@
-package com.casic.missiles.modular.system.controller;
-
-
-import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.core.base.controller.BaseController;
-import com.casic.missiles.core.page.PageFactory;
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.WorkSiteDetailDTO;
-import com.casic.missiles.modular.system.entity.WorkSiteInfo;
-import com.casic.missiles.modular.system.service.IWorkSiteInfoService;
-import io.swagger.annotations.*;
-import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.*;
-
-import org.springframework.stereotype.Controller;
-
-import java.util.List;
-
-import static com.casic.missiles.model.response.ResponseData.DEFAULT_SUCCESS_MESSAGE;
-
-/**
- * <p>
- * 作业现场表 前端控制器
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@Controller
-@RequestMapping("/site")
-@Api(tags = "作业现场管理")
-@RequiredArgsConstructor
-public class WorkSiteInfoController extends BaseController {
-
-
-    private final IWorkSiteInfoService workSiteInfoService;
-
-    @ApiOperation("新增作业现场")
-    @PostMapping("add")
-    @ResponseBody
-    public Object addWorkSite(@RequestBody WorkSiteDetailDTO workSiteDetailDTO){
-        workSiteInfoService.addWorkSiteInfo(workSiteDetailDTO);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("编辑作业现场")
-    @PostMapping("update")
-    @ResponseBody
-    public Object updateWorkSite(@RequestBody WorkSiteDetailDTO workSiteDetailDTO){
-        workSiteInfoService.updateWorkSiteInfo(workSiteDetailDTO);
-        return ResponseData.success();
-    }
-
-
-    @ApiOperation("删除作业现场")
-    @PostMapping("delete")
-    @ResponseBody
-    public Object delete(@ApiParam("作业现场id列表")@RequestBody List<Long> projectIds){
-        workSiteInfoService.deleteProjects(projectIds);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("查询作业现场详情")
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = WorkSiteDetailDTO.class),
-    })
-    @GetMapping("detail")
-    @ResponseBody
-    public Object delete(@ApiParam(value = "作业现场id", example = "0")@RequestParam Long projectId){
-        WorkSiteDetailDTO detailDTO = workSiteInfoService.getWorkSiteDetail(projectId);
-        return ResponseData.success(detailDTO);
-    }
-
-    @ApiOperation("分页列表查询")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "workTitle",value = "作业名称", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "workRoad",value = "所属道路", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "workPersonName",value = "责任人姓名", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "startDate",value = "注册开始日期", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "endDate",value = "注册结束日期", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "projectState",value = "当前状态（字典值）", dataType = "String", paramType = "query")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = WorkSiteInfo.class),
-    })
-    @GetMapping("listPage")
-    @ResponseBody
-    public Object listPage(String workTitle,String workRoad,String workPersonName,String projectState,String startDate,String endDate){
-        Page<WorkSiteInfo> page = PageFactory.defaultPage();
-        QueryWrapper<WorkSiteInfo> queryWrapper = new QueryWrapper<>();
-        if(StrUtil.isNotEmpty(workTitle)){
-            queryWrapper.like("WORK_TITLE",workTitle);
-        }
-        if(StrUtil.isNotEmpty(workRoad)){
-            queryWrapper.like("WORK_ROAD",workRoad);
-        }
-        if(StrUtil.isNotEmpty(workPersonName)){
-            queryWrapper.like("WORKER_NAME",workPersonName);
-        }
-        if(StrUtil.isNotEmpty(projectState)){
-            queryWrapper.eq("PROJECT_STATE",projectState);
-        }
-        if(StrUtil.isNotEmpty(startDate)){
-            queryWrapper.ge("br_work_site_info.CREATE_TIME",startDate + " 00:00:00");
-        }
-        if(StrUtil.isNotEmpty(endDate)){
-            queryWrapper.le("br_work_site_info.CREATE_TIME",endDate + " 23:59:59");
-        }
-        page = workSiteInfoService.selectListPage(page,queryWrapper);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-    @ApiOperation("开始作业")
-    @PostMapping("start")
-    @ResponseBody
-    public Object start(@ApiParam(value = "作业现场id",example = "0")@RequestParam Long projectId){
-        workSiteInfoService.start(projectId);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("完成作业")
-    @PostMapping("finish")
-    @ResponseBody
-    public Object finish(@ApiParam(value = "作业现场id", example = "0")@RequestParam Long projectId){
-        workSiteInfoService.finish(projectId);
-        return ResponseData.success();
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/WorkerController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/WorkerController.java
deleted file mode 100644
index 796f94c..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/WorkerController.java
+++ /dev/null
@@ -1,136 +0,0 @@
-package com.casic.missiles.modular.system.controller;
-
-
-import cn.hutool.core.util.ObjectUtil;
-import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.core.base.controller.BaseController;
-import com.casic.missiles.core.page.PageFactory;
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.DeviceDetailDTO;
-import com.casic.missiles.modular.system.entity.Device;
-import com.casic.missiles.modular.system.entity.Worker;
-import com.casic.missiles.modular.system.service.IWorkerService;
-import io.swagger.annotations.*;
-import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.*;
-
-import org.springframework.stereotype.Controller;
-
-import java.util.Date;
-import java.util.List;
-
-import static com.casic.missiles.model.response.ResponseData.DEFAULT_SUCCESS_MESSAGE;
-
-/**
- * <p>
- *  前端控制器
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@Controller
-@RequestMapping("/worker")
-@RequiredArgsConstructor
-@Api(tags = "人员管理接口")
-public class WorkerController extends BaseController {
-
-    private final IWorkerService workerService;
-
-    @ApiOperation("分页列表查询")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "name",value = "姓名", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "deptId",value = "所属部门", dataType = "Long", paramType = "query", example = "0"),
-            @ApiImplicitParam(name = "status",value = "当前状态（字典值）", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "startDate",value = "注册开始日期", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "endDate",value = "注册结束日期", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "workerType",value = "人员类型（字典值）", dataType = "String", paramType = "query")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = Worker.class),
-    })
-    @GetMapping("listPage")
-    @ResponseBody
-    public Object listPage(String name,Long deptId, String status,String startDate,String endDate,String workerType){
-        Page<Worker> page = PageFactory.defaultPage();
-        QueryWrapper<Worker> queryWrapper = new QueryWrapper<>();
-        if(StrUtil.isNotEmpty(name)){
-            queryWrapper.like("WORKER_NAME",name);
-        }
-        if(ObjectUtil.isNotEmpty(deptId)){
-            queryWrapper.eq("DEPT_ID",deptId);
-        }
-        if(StrUtil.isNotEmpty(workerType)){
-            queryWrapper.eq("WORKER_TYPE",workerType);
-        }
-        if(StrUtil.isNotEmpty(startDate)){
-            queryWrapper.ge("CREATE_TIME",startDate + " 00:00:00");
-        }
-        if(StrUtil.isNotEmpty(endDate)){
-            queryWrapper.le("CREATE_TIME",endDate + " 23:59:59");
-        }
-        if(StrUtil.isNotEmpty(status)){
-            queryWrapper.eq("`STATUS`",status);
-        }
-        page = workerService.selectListPage(page,queryWrapper);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-    @ApiOperation("新增人员")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "worker", value = "人员信息", dataType = "Worker", paramType = "body", required = true),
-            @ApiImplicitParam(name = "projectId", value = "项目ID(入场申请需要)", dataType = "Long", paramType = "query", example = "0")
-    })
-    @PostMapping("add")
-    @ResponseBody
-    public Object add(@ApiParam("worker")@RequestBody Worker worker,
-                      @RequestParam(required = false) Long projectId){
-        workerService.addWorker(worker,projectId);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("编辑人员")
-    @PostMapping("update")
-    @ResponseBody
-    public Object update(@RequestBody Worker worker){
-        workerService.updateById(worker);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("删除人员")
-    @PostMapping("delete")
-    @ResponseBody
-    public Object delete(@ApiParam("人员id列表")@RequestBody List<Long> workIds){
-        workerService.removeByIds(workIds);
-        return ResponseData.success();
-    }
-
-
-    @ApiOperation(value = "获取人脸图片",notes = "返回人脸图片url")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "cameraIp",value = "摄像头IP", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "cameraPort",value = "摄像头端口号", dataType = "String", paramType = "query"),
-    })
-    @GetMapping("/face/register")
-    @ResponseBody
-    public Object faceRegister(String cameraIp,String cameraPort){
-        return ResponseData.success(workerService.faceRegister(cameraIp, cameraPort));
-    }
-
-
-    @ApiOperation(value = "查询临时入场人员列表")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "projectId", value = "项目ID",required = true,dataType = "Long", paramType = "query", example = "0")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = Worker.class),
-    })
-    @GetMapping("/projectTempWorker")
-    @ResponseBody
-    public Object projectTempWorker(Long projectId){
-        return ResponseData.success(workerService.projectTempWorker(projectId));
-    }
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/AlarmTypeCountDTO.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/AlarmTypeCountDTO.java
deleted file mode 100644
index 1a165a1..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/AlarmTypeCountDTO.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.casic.missiles.modular.system.dto;
-
-import io.swagger.annotations.ApiModel;
-import lombok.Data;
-
-@ApiModel(value = "AlarmTypeCountDTO",description = "报警类型统计（首页）")
-@Data
-public class AlarmTypeCountDTO {
-
-    private String alarmType;
-    private String alarmTypeName;
-    private Integer alarmCount;
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/AlarmUpload.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/AlarmUpload.java
deleted file mode 100644
index 73d7799..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/AlarmUpload.java
+++ /dev/null
@@ -1,46 +0,0 @@
-package com.casic.missiles.modular.system.dto;
-
-import cn.hutool.core.util.StrUtil;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-@ApiModel(value = "AlarmUpload",description = "报警上传")
-@Data
-public class AlarmUpload {
-
-    @ApiModelProperty(value = "摄像头ip")
-    private String cameraIp;
-
-    @ApiModelProperty(value = "摄像头端口")
-    private String cameraPort;
-    @ApiModelProperty(value = "安全树甲烷设备ip")
-    private String gasIp;
-    @ApiModelProperty(value = "安全树甲烷设备端口")
-    private String gasPort;
-    @ApiModelProperty(value = "报警值")
-    private String alarmValue;
-    @ApiModelProperty(value = "报警时间")
-    private String alarmTime;
-    @ApiModelProperty(value = "报警类型")
-    private String alarmType;
-    @ApiModelProperty(value = "报警图片")
-    private String alarmImage;
-    @ApiModelProperty(value = "报警内容")
-    private String alarmContent;
-
-    @Override
-    public String toString() {
-        return "AlarmUpload{" +
-                "cameraIp='" + cameraIp + '\'' +
-                ", cameraPort='" + cameraPort + '\'' +
-                ", gasIp='" + gasIp + '\'' +
-                ", gasPort='" + gasPort + '\'' +
-                ", alarmValue='" + alarmValue + '\'' +
-                ", alarmTime='" + alarmTime + '\'' +
-                ", alarmType='" + alarmType + '\'' +
-                ", alarmImage='" + (StrUtil.isNotEmpty(alarmImage) ? alarmImage.substring(0,50) : "null") + '\'' +
-                ", alarmContent='" + alarmContent + '\'' +
-                '}';
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/DeviceDetailDTO.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/DeviceDetailDTO.java
deleted file mode 100644
index ea518d9..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/DeviceDetailDTO.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package com.casic.missiles.modular.system.dto;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.casic.missiles.modular.system.entity.Device;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-@ApiModel("DeviceDetailDTO")
-@Data
-public class DeviceDetailDTO extends Device {
-
-    @ApiModelProperty(value = "摄像头编号")
-    private String cameraCode;
-
-    @ApiModelProperty(value = "摄像头IP")
-    private String cameraIp;
-
-    @ApiModelProperty(value = "摄像头端口")
-    private String cameraPort;
-
-    @ApiModelProperty(value = "激甲编号")
-    private String gasCode;
-
-    @ApiModelProperty(value = "激甲IP")
-    private String gasIp;
-
-    @ApiModelProperty(value = "激甲端口")
-    private String gasPort;
-
-    @ApiModelProperty(value = "智能帽衬编号")
-    private String hatLiningCode;
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/WorkSiteDetailDTO.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/WorkSiteDetailDTO.java
deleted file mode 100644
index 29378ff..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/WorkSiteDetailDTO.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package com.casic.missiles.modular.system.dto;
-
-import com.casic.missiles.modular.system.entity.ProjectDevice;
-import com.casic.missiles.modular.system.entity.ProjectWorker;
-import com.casic.missiles.modular.system.entity.WorkSiteInfo;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.util.List;
-
-@Data
-@ApiModel("WorkSiteDetailDTO")
-public class WorkSiteDetailDTO extends WorkSiteInfo {
-
-    @ApiModelProperty(value = "安全树列表",dataType = "ProjectDevice")
-    private List<ProjectDevice> deviceList;
-
-    @ApiModelProperty(value = "人员列表",dataType = "ProjectWorker")
-    private List<ProjectWorker> workerList;
-
-
-
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/WorkerLocationDTO.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/WorkerLocationDTO.java
deleted file mode 100644
index 6fd7b24..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/WorkerLocationDTO.java
+++ /dev/null
@@ -1,68 +0,0 @@
-package com.casic.missiles.modular.system.dto;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-@ApiModel(value = "WorkerLocationDTO",description = "人员位置列表（首页）")
-@Data
-public class WorkerLocationDTO {
-
-    @ApiModelProperty("人员ID")
-    private Long workerId;
-
-    @ApiModelProperty("人员姓名")
-    private String workerName;
-
-    @ApiModelProperty("安全帽编号")
-    private String hatCode;
-
-    @ApiModelProperty("安全帽ID")
-    private Long hatId;
-
-    @ApiModelProperty("背心编号")
-    private String vastCode;
-
-    @ApiModelProperty("手环编号")
-    private String braceletCode;
-
-    @ApiModelProperty("位置")
-    private String location;
-
-    @ApiModelProperty("时间")
-    private String time;
-
-    @ApiModelProperty("经度")
-    private String lng;
-
-    @ApiModelProperty("纬度")
-    private String lat;
-
-    @ApiModelProperty("心率")
-    private String heartRate;
-
-    @ApiModelProperty("血氧")
-    private String bloodOxygen;
-
-    @ApiModelProperty("一氧化碳")
-    private String co;
-
-    @ApiModelProperty("甲烷")
-    private String gas;
-
-    @ApiModelProperty("硫化氢")
-    private String h2s;
-
-    @ApiModelProperty("氧气")
-    private String o2;
-
-    @ApiModelProperty("信号")
-    private String signal;
-
-    @ApiModelProperty("电量")
-    private String cell;
-
-    @ApiModelProperty("是否报警")
-    private boolean alarmFlag;
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Alarm.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Alarm.java
new file mode 100644
index 0000000..4d2b7ef
--- /dev/null
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Alarm.java
@@ -0,0 +1,103 @@
+package com.casic.missiles.modular.system.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import java.util.Date;
+
+/**
+ * <p>
+ * 报警记录表
+ * </p>
+ *
+ * @author zyj
+ * @since 2023-05-25
+ */
+@Data
+@TableName("bus_alarm")
+public class Alarm implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    @TableId(value = "ID",type = IdType.ASSIGN_ID)
+    private Long id;
+
+    /**
+     * 设备ID
+     */
+    @TableField("DEVICE_ID")
+    private Long deviceId;
+
+    /**
+     * 报警类型
+     */
+    @TableField("ALARM_TYPE")
+    private String alarmType;
+
+    /**
+     * 报警时间
+     */
+    @TableField("ALARM_TIME")
+    private Date alarmTime;
+
+    /**
+     * 报警状态
+     */
+    @TableField("ALARM_STATUS")
+    private String alarmStatus;
+
+    /**
+     * 报警位置
+     */
+    @TableField("ALARM_LOCATION")
+    private String alarmLocation;
+
+    /**
+     * 报警图片
+     */
+    @TableField("ALARM_IMAGE")
+    private String alarmImage;
+
+    /**
+     * 视频通道号
+     */
+    @TableField("CHANNEL_NO")
+    private Integer channelNo;
+
+    /**
+     * 报警内容
+     */
+    @TableField("ALARM_CONTENT")
+    private String alarmContent;
+
+    /**
+     * 消警时间
+     */
+    @TableField("CANCEL_TIME")
+    private Date cancelTime;
+
+
+    @Override
+    public String toString() {
+        return "Alarm{" +
+            "id=" + id +
+            ", deviceId=" + deviceId +
+            ", alarmType=" + alarmType +
+            ", alarmTime=" + alarmTime +
+            ", alarmStatus=" + alarmStatus +
+            ", alarmLocation=" + alarmLocation +
+            ", alarmImage=" + alarmImage +
+            ", channelNo=" + channelNo +
+            ", alarmContent=" + alarmContent +
+            ", cancelTime=" + cancelTime +
+        "}";
+    }
+}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusAlarm.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusAlarm.java
deleted file mode 100644
index efb4a23..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusAlarm.java
+++ /dev/null
@@ -1,159 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.alibaba.fastjson.annotation.JSONField;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.time.LocalDateTime;
-import java.util.Date;
-
-/**
- * <p>
- * 报警记录表
- * </p>
- *
- * @author zyj
- * @since 2023-05-16
- */
-@Data
-@ApiModel("Alarm")
-@TableName("br_bus_alarm")
-public class BusAlarm implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 项目ID
-     */
-    @ApiModelProperty(value = "项目ID")
-    @TableField("PROJECT_ID")
-    private Long projectId;
-
-    /**
-     * 设备ID
-     */
-    @ApiModelProperty(value = "设备ID")
-    @TableField("DEVICE_ID")
-    private Long deviceId;
-
-    /**
-     * 报警类型
-     */
-    @ApiModelProperty(value = "报警类型")
-    @TableField("ALARM_TYPE")
-    private String alarmType;
-
-    /**
-     * 报警状态
-     */
-    @ApiModelProperty(value = "报警状态")
-    @TableField("ALARM_STATUS")
-    private String alarmStatus;
-
-    /**
-     * 报警值
-     */
-    @ApiModelProperty(value = "报警值")
-    @TableField("ALARM_VALUE")
-    private String alarmValue;
-
-    /**
-     * 报警图片
-     */
-    @ApiModelProperty(value = "报警图片")
-    @TableField("ALARM_IMAGE")
-    private String alarmImage;
-
-    /**
-     * 报警内容
-     */
-    @ApiModelProperty(value = "报警内容")
-    @TableField("ALARM_CONTENT")
-    private String alarmContent;
-
-    /**
-     * 报警时间
-     */
-    @ApiModelProperty(value = "报警时间")
-    @TableField("ALARM_TIME")
-    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
-    private Date alarmTime;
-
-    /**
-     * 消警时间
-     */
-    @ApiModelProperty(value = "消警时间")
-    @TableField("CANCEL_TIME")
-    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
-    private Date cancelTime;
-
-    /**
-     * 报警位置经度
-     */
-    @ApiModelProperty(value = "报警位置经度")
-    @TableField("ALARM_LNG")
-    private String alarmLng;
-
-    /**
-     * 报警位置纬度
-     */
-    @ApiModelProperty(value = "报警位置纬度")
-    @TableField("ALARM_LAT")
-    private String alarmLat;
-
-    @ApiModelProperty("报警类型名称")
-    @TableField(exist = false)
-    private String alarmStatusName;
-    @ApiModelProperty("报警类型名称")
-    @TableField(exist = false)
-    private String alarmTypeName;
-    @ApiModelProperty("作业名称")
-    @TableField(exist = false)
-    private String workTitle;
-    @ApiModelProperty("所属道路")
-    @TableField(exist = false)
-    private String workRoad;
-    @ApiModelProperty("作业状态")
-    @TableField(exist = false)
-    private String projectState;
-    @ApiModelProperty("作业状态名称")
-    @TableField(exist = false)
-    private String projectStateName;
-    @ApiModelProperty("负责人姓名")
-    @TableField(exist = false)
-    private String workPersonName;
-    @ApiModelProperty("负责人联系方式")
-    @TableField(exist = false)
-    private String workPersonPhoneNumber;
-
-
-    @Override
-    public String toString() {
-        return "BusAlarm{" +
-                "id=" + id +
-                ", projectId=" + projectId +
-                ", deviceId=" + deviceId +
-                ", alarmType=" + alarmType +
-                ", alarmValue=" + alarmValue +
-                ", alarmStatus=" + alarmStatus +
-                ", alarmImage=" + alarmImage +
-                ", alarmContent=" + alarmContent +
-                ", alarmTime=" + alarmTime +
-                ", cancelTime=" + cancelTime +
-                ", alarmLng=" + alarmLng +
-                ", alarmLat=" + alarmLat +
-                "}";
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusEvent.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusEvent.java
deleted file mode 100644
index a0b7543..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusEvent.java
+++ /dev/null
@@ -1,100 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.time.LocalDateTime;
-import java.util.Date;
-import java.util.List;
-
-/**
- * <p>
- * 事件表
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@TableName("br_bus_event")
-@Data
-@ApiModel("BusEvent")
-public class BusEvent implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @ApiModelProperty("事件ID")
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 事件标题
-     */
-    @ApiModelProperty("事件名称")
-    @TableField("EVENT_TITLE")
-    private String eventTitle;
-
-    /**
-     * 上报人员
-     */
-    @ApiModelProperty("上报人员")
-    @TableField("UPLOAD_NAME")
-    private String uploadName;
-
-    /**
-     * 联系方式
-     */
-    @ApiModelProperty("联系方式")
-    @TableField("PHONE_NUMBER")
-    private String phoneNumber;
-
-    /**
-     * 事件描述
-     */
-    @ApiModelProperty("事件描述")
-    @TableField("EVENT_DESCRIPTION")
-    private String eventDescription;
-
-    @ApiModelProperty("经度")
-    @TableField("LNG")
-    private String lng;
-
-    @ApiModelProperty("纬度")
-    @TableField("LAT")
-    private String lat;
-
-    /**
-     * 事件上传时间
-     */
-    @ApiModelProperty("事件上传时间")
-    @TableField("CREATE_TIME")
-    private Date createTime;
-
-    @ApiModelProperty("事件照片")
-    @TableField(exist = false)
-    private List<BusEventImage> imageList;
-
-
-
-    @Override
-    public String toString() {
-        return "BusEvent{" +
-            "id=" + id +
-            ", eventTitle=" + eventTitle +
-            ", uploadName=" + uploadName +
-            ", phoneNumber=" + phoneNumber +
-            ", eventDescription=" + eventDescription +
-            ", lng=" + lng +
-            ", lat=" + lat +
-            ", createTime=" + createTime +
-        "}";
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusEventImage.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusEventImage.java
deleted file mode 100644
index 1e75245..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusEventImage.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-
-/**
- * <p>
- * 事件图片表
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@TableName("br_bus_event_image")
-@Data
-@ApiModel("BusEventImage")
-public class BusEventImage implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 事件ID
-     */
-    @TableField("EVENT_ID")
-    private Long eventId;
-
-    /**
-     * 报警图片
-     */
-    @TableField("IMAGE")
-    @ApiModelProperty("图片url")
-    private String image;
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Device.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Device.java
index df89c70..ea7db5f 100644
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Device.java
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Device.java
@@ -1,30 +1,23 @@
 package com.casic.missiles.modular.system.entity;
 
-import com.alibaba.fastjson.annotation.JSONField;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.casic.missiles.core.base.json.DateDeserializer;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
-import java.util.Date;
 
 /**
  * <p>
- * 
+ * 设备记录表
  * </p>
  *
  * @author zyj
- * @since 2023-04-14
+ * @since 2023-05-25
  */
-@ApiModel("Device")
-@TableName("br_device")
 @Data
+@TableName("bus_device")
 public class Device implements Serializable {
 
     private static final long serialVersionUID = 1L;
@@ -32,82 +25,86 @@
     /**
      * 主键
      */
-    @ApiModelProperty(value = "设备ID")
     @TableId(value = "ID",type = IdType.ASSIGN_ID)
     private Long id;
 
     /**
-     * 设备编号
+     * 设备名称
      */
-    @ApiModelProperty(value = "设备编号")
-    @TableField("DEVICE_CODE")
-    private String deviceCode;
+    @TableField("DEVICE_NAME")
+    private String deviceName;
 
     /**
-     * 设备类型
+     * IP
      */
-    @ApiModelProperty(value = "设备类型")
-    @TableField("DEVICE_TYPE")
-    private String deviceType;
+    @TableField("IP")
+    private String ip;
 
     /**
-     * 设备批次
+     * 端口
      */
-    @ApiModelProperty(value = "设备批次")
-    @TableField("DEVICE_BATCH")
-    private String deviceBatch;
+    @TableField("PORT")
+    private String port;
 
     /**
-     * 厂家
+     * 用户名
      */
-    @ApiModelProperty(value = "厂家")
-    @TableField("MANUFACTURER")
-    private String manufacturer;
+    @TableField("USER_NAME")
+    private String userName;
 
     /**
-     * 是否供电
+     * 密码
      */
-    @ApiModelProperty(value = "是否供电")
-    @TableField("IS_POWER_SUPPLY")
-    private String isPowerSupply;
+    @TableField("PASSWORD")
+    private String password;
 
     /**
-     * 创建时间
+     * 连接类型
      */
-    @ApiModelProperty(value = "创建时间",dataType = "Date")
-    @TableField("CREATE_TIME")
-    private Date createTime;
+    @TableField("CONNECT_TYPE")
+    private String connectType;
 
-    @ApiModelProperty(value = "设备类型名称")
-    @TableField(exist = false)
-    private String deviceTypeName;
+    /**
+     * 位置
+     */
+    @TableField("LOCATION")
 
-    @ApiModelProperty(value = "是否供电名称")
-    @TableField(exist = false)
-    private String isPowerSupplyName;
+    private String location;
 
-    @ApiModelProperty(value = "注册时间",dataType = "String")
-    @TableField(exist = false)
-    private String registerTime;
+    /**
+     * 设备状态
+     */
+    @TableField("STATUS")
 
-    @ApiModelProperty(value = "当前状态")
-    @TableField(exist = false)
     private String status;
 
-    @ApiModelProperty(value = "当前状态名称")
-    @TableField(exist = false)
-    private String statusName;
+    /**
+     * 报警分组
+     */
+    @TableField("ALARM_GROUP")
+
+    private Long alarmGroup;
+
+    /**
+     * 视频通道数(预留)
+     */
+    @TableField("CHANNEL_NUM")
+    private Integer channelNum;
 
     @Override
     public String toString() {
         return "Device{" +
             "id=" + id +
-            ", deviceCode=" + deviceCode +
-            ", deviceType=" + deviceType +
-            ", deviceBatch=" + deviceBatch +
-            ", manufacturer=" + manufacturer +
-            ", isPowerSupply=" + isPowerSupply +
-            ", createTime=" + createTime +
+            ", deviceName=" + deviceName +
+            ", ip=" + ip +
+            ", port=" + port +
+            ", userName=" + userName +
+            ", password=" + password +
+            ", connectType=" + connectType +
+            ", location=" + location +
+            ", status=" + status +
+            ", alarmGroup=" + alarmGroup +
+            ", channelNum=" + channelNum +
         "}";
     }
 }

diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/AlarmController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/AlarmController.java
new file mode 100644
index 0000000..1795cf1
--- /dev/null
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/AlarmController.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.modular.system.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.stereotype.Controller;
+
+/**
+ * <p>
+ * 报警记录表 前端控制器
+ * </p>
+ *
+ * @author zyj
+ * @since 2023-05-25
+ */
+@Controller
+@RequestMapping("/system/alarm")
+public class AlarmController {
+
+}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusAlarmController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusAlarmController.java
deleted file mode 100644
index 1f82ebb..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusAlarmController.java
+++ /dev/null
@@ -1,102 +0,0 @@
-package com.casic.missiles.modular.system.controller;
-
-
-import cn.hutool.core.util.ObjectUtil;
-import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.core.base.controller.BaseController;
-import com.casic.missiles.core.page.PageFactory;
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.AlarmUpload;
-import com.casic.missiles.modular.system.dto.DeviceDetailDTO;
-import com.casic.missiles.modular.system.entity.BusAlarm;
-import com.casic.missiles.modular.system.service.IBusAlarmService;
-import io.swagger.annotations.*;
-import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.*;
-
-import org.springframework.stereotype.Controller;
-
-import static com.casic.missiles.model.response.ResponseData.DEFAULT_SUCCESS_MESSAGE;
-import static com.casic.missiles.modular.system.consts.AlarmConst.ALARM_STATUS_MANUAL_CANCEL;
-
-/**
- * <p>
- * 报警记录表 前端控制器
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@Api(tags = "报警管理接口")
-@Controller
-@RequestMapping("/alarm")
-@RequiredArgsConstructor
-public class BusAlarmController extends BaseController {
-
-    private final IBusAlarmService alarmService;
-
-    @ApiOperation("报警上报接口")
-    @PostMapping("/upload")
-    @ResponseBody
-    public Object upload(@RequestBody AlarmUpload alarmUpload){
-        alarmService.alarmUpload(alarmUpload);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("报警列表分页查询")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "workTitle", value = "作业名称",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "projectId", value = "作业ID",dataType = "Long", paramType = "query",example = "0"),
-            @ApiImplicitParam(name = "alarmStatus", value = "报警状态",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "projectState", value = "作业状态",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "alarmType", value = "报警类型",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "alarmStartTime", value = "报警开始时间",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "alarmEndTime", value = "报警结束时间",dataType = "String", paramType = "query")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = BusAlarm.class),
-    })
-    @GetMapping("/listPage")
-    @ResponseBody
-    public Object listPage(String workTitle,Long projectId,String alarmStatus,String projectState,String alarmType,String alarmStartTime,String alarmEndTime){
-        Page<BusAlarm> page = PageFactory.defaultPage();
-        QueryWrapper<BusAlarm> queryWrapper = new QueryWrapper<>();
-        if(StrUtil.isNotEmpty(workTitle)){
-            queryWrapper.like("p.WORK_TITLE",workTitle);
-        }
-        if(ObjectUtil.isNotEmpty(projectId)){
-            queryWrapper.eq("alarm.PROJECT_ID",projectId);
-        }
-        if(StrUtil.isNotEmpty(alarmStatus)){
-            queryWrapper.eq("alarm.ALARM_STATUS",alarmStatus);
-        }
-        if(StrUtil.isNotEmpty(projectState)){
-            queryWrapper.eq("p.PROJECT_STATE",projectState);
-        }
-        if(StrUtil.isNotEmpty(alarmType)){
-            queryWrapper.eq("alarm.ALARM_TYPE",alarmType);
-        }
-        if(StrUtil.isNotEmpty(alarmStartTime)){
-            queryWrapper.ge("alarm.ALARM_TIME",alarmStartTime);
-        }
-        if(StrUtil.isNotEmpty(alarmEndTime)){
-            queryWrapper.le("alarm.ALARM_TIME",alarmEndTime);
-        }
-        page = alarmService.listPage(page,queryWrapper);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-    @ApiOperation("消警")
-    @PostMapping("/cancel")
-    @ResponseBody
-    public Object cancel(@RequestParam("alarmId") Long alarmId){
-        UpdateWrapper<BusAlarm> updateWrapper = new UpdateWrapper<>();
-        updateWrapper.eq("ID",alarmId);
-        updateWrapper.set("ALARM_STATUS",ALARM_STATUS_MANUAL_CANCEL);
-        alarmService.update(updateWrapper);
-        return ResponseData.success();
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusEventController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusEventController.java
deleted file mode 100644
index dde5aad..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusEventController.java
+++ /dev/null
@@ -1,41 +0,0 @@
-package com.casic.missiles.modular.system.controller;
-
-
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.entity.BusEvent;
-import com.casic.missiles.modular.system.service.IBusEventService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.ResponseBody;
-
-/**
- * <p>
- * 事件表 前端控制器
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@Controller
-@RequestMapping("/event")
-@Api(tags = "事件上报")
-@RequiredArgsConstructor
-public class BusEventController {
-
-    private final IBusEventService eventService;
-
-    @ApiOperation("事件上报")
-    @PostMapping("add")
-    @ResponseBody
-    public Object add(@RequestBody BusEvent busEvent){
-        eventService.saveBusEvent(busEvent);
-        return ResponseData.success();
-    }
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
index 03abc5f..aa50d78 100644
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
@@ -1,121 +1,20 @@
 package com.casic.missiles.modular.system.controller;
 
 
-import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.core.base.controller.BaseController;
-import com.casic.missiles.core.page.PageFactory;
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.DeviceDetailDTO;
-import com.casic.missiles.modular.system.entity.Device;
-import com.casic.missiles.modular.system.service.IDeviceExtService;
-import com.casic.missiles.modular.system.service.IDeviceService;
-import io.swagger.annotations.*;
-import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.RequestMapping;
 
 import org.springframework.stereotype.Controller;
 
-import java.time.LocalDateTime;
-import java.util.Date;
-import java.util.List;
-
-import static com.casic.missiles.model.response.ResponseData.DEFAULT_SUCCESS_MESSAGE;
-
 /**
  * <p>
- *  前端控制器
+ * 设备记录表 前端控制器
  * </p>
  *
  * @author zyj
- * @since 2023-04-14
+ * @since 2023-05-25
  */
-@Api(tags = "设备管理接口")
-@RequiredArgsConstructor
 @Controller
-@RequestMapping("/device")
-public class DeviceController extends BaseController {
-    private final IDeviceService deviceService;
-    private final IDeviceExtService deviceExtService;
-
-    @ApiOperation("设备分页列表")
-    @ApiImplicitParams({
-        @ApiImplicitParam(name = "deviceType", value = "设备类型",dataType = "String", paramType = "query"),
-        @ApiImplicitParam(name = "deviceCode", value = "设备编号",dataType = "String", paramType = "query"),
-        @ApiImplicitParam(name = "status", value = "设备状态",dataType = "String", paramType = "query"),
-        @ApiImplicitParam(name = "projectId", value = "作业ID（如果传此参数，列表中返回该作业使用的设备）",dataType = "Long", paramType = "query", example = "0")
-    })
-    @ApiResponses({
-        @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = DeviceDetailDTO.class),
-    })
-    @GetMapping("listPage")
-    @ResponseBody
-    public Object listPage(String deviceType, String deviceCode, String status,Long projectId){
-        Page<DeviceDetailDTO> page = PageFactory.defaultPage();
-        QueryWrapper<DeviceDetailDTO> queryWrapper = new QueryWrapper<>();
-        if(StrUtil.isNotEmpty(deviceType)){
-            queryWrapper.eq("DEVICE_TYPE",deviceType);
-        }
-        if(StrUtil.isNotEmpty(deviceCode)){
-            queryWrapper.like("DEVICE_CODE",deviceCode);
-        }
-        page = deviceService.listPage(page,queryWrapper,status,projectId);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-    @ApiOperation("新增设备")
-    @PostMapping("add")
-    @ResponseBody
-    public Object add(@RequestBody DeviceDetailDTO deviceDetailDTO){
-        deviceService.saveDevice(deviceDetailDTO);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("编辑设备")
-    @PostMapping("update")
-    @ResponseBody
-    public Object update(@RequestBody DeviceDetailDTO deviceDetailDTO){
-        deviceService.updateDevice(deviceDetailDTO);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("删除设备")
-    @PostMapping("delete")
-    @ResponseBody
-    public Object delete(@ApiParam("设备id列表")@RequestBody List<Long> deviceIds){
-        deviceService.deleteDevices(deviceIds);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("设置甲烷阈值")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "gasIp", value = "安全树甲烷设备IP",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "gasPort", value = "安全树甲烷端口",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "threshold", value = "甲烷阈值",dataType = "String", paramType = "query")
-    })
-    @PostMapping("setThreshold")
-    @ResponseBody
-    public Object setThreshold(String gasIp,String gasPort,String threshold){
-        deviceExtService.setGasThreshold(gasIp, gasPort, threshold);
-        return ResponseData.success();
-    }
-
-
-    @ApiOperation("查询甲烷阈值")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "gasIp", value = "安全树甲烷设备IP",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "gasPort", value = "安全树甲烷端口",dataType = "String", paramType = "query")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = "{\"code\": 200,\"data\": \"100\",\"message\": \"请求成功\",\"success\": true}",response = String.class),
-    })
-    @GetMapping("getThreshold")
-    @ResponseBody
-    public Object getThreshold(String gasIp,String gasPort){
-        String data = deviceExtService.getGasThreshold(gasIp, gasPort);
-        return ResponseData.success(data);
-    }
-
+@RequestMapping("/system/device")
+public class DeviceController {
 
 }
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/OverviewController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/OverviewController.java
deleted file mode 100644
index 7570504..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/OverviewController.java
+++ /dev/null
@@ -1,70 +0,0 @@
-package com.casic.missiles.modular.system.controller;
-
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.AlarmTypeCountDTO;
-import com.casic.missiles.modular.system.dto.DeviceLocationDTO;
-import com.casic.missiles.modular.system.dto.WorkerLocationDTO;
-import com.casic.missiles.modular.system.service.IBusAlarmService;
-import com.casic.missiles.modular.system.service.IProjectDeviceService;
-import com.casic.missiles.modular.system.service.IProjectWorkerService;
-import io.swagger.annotations.*;
-import lombok.RequiredArgsConstructor;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.ResponseBody;
-
-import static com.casic.missiles.model.response.ResponseData.DEFAULT_SUCCESS_MESSAGE;
-import static com.casic.missiles.modular.system.consts.AlarmConst.ALARM_STATUS_ON;
-
-@Api(tags = "首页看板接口")
-@Controller
-@RequestMapping("overview")
-@RequiredArgsConstructor
-public class OverviewController {
-
-    private final IBusAlarmService alarmService;
-    private final IProjectDeviceService projectDeviceService;
-
-    private final IProjectWorkerService projectWorkerService;
-
-
-    @ApiOperation("报警统计接口")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "projectId", value = "作业ID",dataType = "Long", paramType = "query", example = "0")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = AlarmTypeCountDTO.class),
-    })
-    @GetMapping("/alarmCount")
-    @ResponseBody
-    public Object alarmCount(Long projectId){
-        return ResponseData.success(alarmService.alarmCount(projectId,ALARM_STATUS_ON));
-    }
-
-    @ApiOperation("设备列表接口")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "projectId", value = "作业ID",dataType = "Long", paramType = "query", example = "0")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = DeviceLocationDTO.class),
-    })
-    @GetMapping("/deviceList")
-    @ResponseBody
-    public Object deviceList(Long projectId){
-        return ResponseData.success(projectDeviceService.selectDeviceLocationList(projectId));
-    }
-
-    @ApiOperation("人员列表接口")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "projectId", value = "作业ID",dataType = "Long", paramType = "query", example = "0")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = WorkerLocationDTO.class),
-    })
-    @GetMapping("/workerList")
-    @ResponseBody
-    public Object workerList(Long projectId){
-        return ResponseData.success(projectWorkerService.selectWorkerLocationDTO(projectId));
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/WorkSiteInfoController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/WorkSiteInfoController.java
deleted file mode 100644
index af36d69..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/WorkSiteInfoController.java
+++ /dev/null
@@ -1,130 +0,0 @@
-package com.casic.missiles.modular.system.controller;
-
-
-import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.core.base.controller.BaseController;
-import com.casic.missiles.core.page.PageFactory;
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.WorkSiteDetailDTO;
-import com.casic.missiles.modular.system.entity.WorkSiteInfo;
-import com.casic.missiles.modular.system.service.IWorkSiteInfoService;
-import io.swagger.annotations.*;
-import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.*;
-
-import org.springframework.stereotype.Controller;
-
-import java.util.List;
-
-import static com.casic.missiles.model.response.ResponseData.DEFAULT_SUCCESS_MESSAGE;
-
-/**
- * <p>
- * 作业现场表 前端控制器
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@Controller
-@RequestMapping("/site")
-@Api(tags = "作业现场管理")
-@RequiredArgsConstructor
-public class WorkSiteInfoController extends BaseController {
-
-
-    private final IWorkSiteInfoService workSiteInfoService;
-
-    @ApiOperation("新增作业现场")
-    @PostMapping("add")
-    @ResponseBody
-    public Object addWorkSite(@RequestBody WorkSiteDetailDTO workSiteDetailDTO){
-        workSiteInfoService.addWorkSiteInfo(workSiteDetailDTO);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("编辑作业现场")
-    @PostMapping("update")
-    @ResponseBody
-    public Object updateWorkSite(@RequestBody WorkSiteDetailDTO workSiteDetailDTO){
-        workSiteInfoService.updateWorkSiteInfo(workSiteDetailDTO);
-        return ResponseData.success();
-    }
-
-
-    @ApiOperation("删除作业现场")
-    @PostMapping("delete")
-    @ResponseBody
-    public Object delete(@ApiParam("作业现场id列表")@RequestBody List<Long> projectIds){
-        workSiteInfoService.deleteProjects(projectIds);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("查询作业现场详情")
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = WorkSiteDetailDTO.class),
-    })
-    @GetMapping("detail")
-    @ResponseBody
-    public Object delete(@ApiParam(value = "作业现场id", example = "0")@RequestParam Long projectId){
-        WorkSiteDetailDTO detailDTO = workSiteInfoService.getWorkSiteDetail(projectId);
-        return ResponseData.success(detailDTO);
-    }
-
-    @ApiOperation("分页列表查询")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "workTitle",value = "作业名称", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "workRoad",value = "所属道路", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "workPersonName",value = "责任人姓名", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "startDate",value = "注册开始日期", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "endDate",value = "注册结束日期", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "projectState",value = "当前状态（字典值）", dataType = "String", paramType = "query")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = WorkSiteInfo.class),
-    })
-    @GetMapping("listPage")
-    @ResponseBody
-    public Object listPage(String workTitle,String workRoad,String workPersonName,String projectState,String startDate,String endDate){
-        Page<WorkSiteInfo> page = PageFactory.defaultPage();
-        QueryWrapper<WorkSiteInfo> queryWrapper = new QueryWrapper<>();
-        if(StrUtil.isNotEmpty(workTitle)){
-            queryWrapper.like("WORK_TITLE",workTitle);
-        }
-        if(StrUtil.isNotEmpty(workRoad)){
-            queryWrapper.like("WORK_ROAD",workRoad);
-        }
-        if(StrUtil.isNotEmpty(workPersonName)){
-            queryWrapper.like("WORKER_NAME",workPersonName);
-        }
-        if(StrUtil.isNotEmpty(projectState)){
-            queryWrapper.eq("PROJECT_STATE",projectState);
-        }
-        if(StrUtil.isNotEmpty(startDate)){
-            queryWrapper.ge("br_work_site_info.CREATE_TIME",startDate + " 00:00:00");
-        }
-        if(StrUtil.isNotEmpty(endDate)){
-            queryWrapper.le("br_work_site_info.CREATE_TIME",endDate + " 23:59:59");
-        }
-        page = workSiteInfoService.selectListPage(page,queryWrapper);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-    @ApiOperation("开始作业")
-    @PostMapping("start")
-    @ResponseBody
-    public Object start(@ApiParam(value = "作业现场id",example = "0")@RequestParam Long projectId){
-        workSiteInfoService.start(projectId);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("完成作业")
-    @PostMapping("finish")
-    @ResponseBody
-    public Object finish(@ApiParam(value = "作业现场id", example = "0")@RequestParam Long projectId){
-        workSiteInfoService.finish(projectId);
-        return ResponseData.success();
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/WorkerController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/WorkerController.java
deleted file mode 100644
index 796f94c..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/WorkerController.java
+++ /dev/null
@@ -1,136 +0,0 @@
-package com.casic.missiles.modular.system.controller;
-
-
-import cn.hutool.core.util.ObjectUtil;
-import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.core.base.controller.BaseController;
-import com.casic.missiles.core.page.PageFactory;
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.DeviceDetailDTO;
-import com.casic.missiles.modular.system.entity.Device;
-import com.casic.missiles.modular.system.entity.Worker;
-import com.casic.missiles.modular.system.service.IWorkerService;
-import io.swagger.annotations.*;
-import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.*;
-
-import org.springframework.stereotype.Controller;
-
-import java.util.Date;
-import java.util.List;
-
-import static com.casic.missiles.model.response.ResponseData.DEFAULT_SUCCESS_MESSAGE;
-
-/**
- * <p>
- *  前端控制器
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@Controller
-@RequestMapping("/worker")
-@RequiredArgsConstructor
-@Api(tags = "人员管理接口")
-public class WorkerController extends BaseController {
-
-    private final IWorkerService workerService;
-
-    @ApiOperation("分页列表查询")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "name",value = "姓名", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "deptId",value = "所属部门", dataType = "Long", paramType = "query", example = "0"),
-            @ApiImplicitParam(name = "status",value = "当前状态（字典值）", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "startDate",value = "注册开始日期", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "endDate",value = "注册结束日期", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "workerType",value = "人员类型（字典值）", dataType = "String", paramType = "query")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = Worker.class),
-    })
-    @GetMapping("listPage")
-    @ResponseBody
-    public Object listPage(String name,Long deptId, String status,String startDate,String endDate,String workerType){
-        Page<Worker> page = PageFactory.defaultPage();
-        QueryWrapper<Worker> queryWrapper = new QueryWrapper<>();
-        if(StrUtil.isNotEmpty(name)){
-            queryWrapper.like("WORKER_NAME",name);
-        }
-        if(ObjectUtil.isNotEmpty(deptId)){
-            queryWrapper.eq("DEPT_ID",deptId);
-        }
-        if(StrUtil.isNotEmpty(workerType)){
-            queryWrapper.eq("WORKER_TYPE",workerType);
-        }
-        if(StrUtil.isNotEmpty(startDate)){
-            queryWrapper.ge("CREATE_TIME",startDate + " 00:00:00");
-        }
-        if(StrUtil.isNotEmpty(endDate)){
-            queryWrapper.le("CREATE_TIME",endDate + " 23:59:59");
-        }
-        if(StrUtil.isNotEmpty(status)){
-            queryWrapper.eq("`STATUS`",status);
-        }
-        page = workerService.selectListPage(page,queryWrapper);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-    @ApiOperation("新增人员")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "worker", value = "人员信息", dataType = "Worker", paramType = "body", required = true),
-            @ApiImplicitParam(name = "projectId", value = "项目ID(入场申请需要)", dataType = "Long", paramType = "query", example = "0")
-    })
-    @PostMapping("add")
-    @ResponseBody
-    public Object add(@ApiParam("worker")@RequestBody Worker worker,
-                      @RequestParam(required = false) Long projectId){
-        workerService.addWorker(worker,projectId);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("编辑人员")
-    @PostMapping("update")
-    @ResponseBody
-    public Object update(@RequestBody Worker worker){
-        workerService.updateById(worker);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("删除人员")
-    @PostMapping("delete")
-    @ResponseBody
-    public Object delete(@ApiParam("人员id列表")@RequestBody List<Long> workIds){
-        workerService.removeByIds(workIds);
-        return ResponseData.success();
-    }
-
-
-    @ApiOperation(value = "获取人脸图片",notes = "返回人脸图片url")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "cameraIp",value = "摄像头IP", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "cameraPort",value = "摄像头端口号", dataType = "String", paramType = "query"),
-    })
-    @GetMapping("/face/register")
-    @ResponseBody
-    public Object faceRegister(String cameraIp,String cameraPort){
-        return ResponseData.success(workerService.faceRegister(cameraIp, cameraPort));
-    }
-
-
-    @ApiOperation(value = "查询临时入场人员列表")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "projectId", value = "项目ID",required = true,dataType = "Long", paramType = "query", example = "0")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = Worker.class),
-    })
-    @GetMapping("/projectTempWorker")
-    @ResponseBody
-    public Object projectTempWorker(Long projectId){
-        return ResponseData.success(workerService.projectTempWorker(projectId));
-    }
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/AlarmTypeCountDTO.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/AlarmTypeCountDTO.java
deleted file mode 100644
index 1a165a1..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/AlarmTypeCountDTO.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.casic.missiles.modular.system.dto;
-
-import io.swagger.annotations.ApiModel;
-import lombok.Data;
-
-@ApiModel(value = "AlarmTypeCountDTO",description = "报警类型统计（首页）")
-@Data
-public class AlarmTypeCountDTO {
-
-    private String alarmType;
-    private String alarmTypeName;
-    private Integer alarmCount;
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/AlarmUpload.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/AlarmUpload.java
deleted file mode 100644
index 73d7799..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/AlarmUpload.java
+++ /dev/null
@@ -1,46 +0,0 @@
-package com.casic.missiles.modular.system.dto;
-
-import cn.hutool.core.util.StrUtil;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-@ApiModel(value = "AlarmUpload",description = "报警上传")
-@Data
-public class AlarmUpload {
-
-    @ApiModelProperty(value = "摄像头ip")
-    private String cameraIp;
-
-    @ApiModelProperty(value = "摄像头端口")
-    private String cameraPort;
-    @ApiModelProperty(value = "安全树甲烷设备ip")
-    private String gasIp;
-    @ApiModelProperty(value = "安全树甲烷设备端口")
-    private String gasPort;
-    @ApiModelProperty(value = "报警值")
-    private String alarmValue;
-    @ApiModelProperty(value = "报警时间")
-    private String alarmTime;
-    @ApiModelProperty(value = "报警类型")
-    private String alarmType;
-    @ApiModelProperty(value = "报警图片")
-    private String alarmImage;
-    @ApiModelProperty(value = "报警内容")
-    private String alarmContent;
-
-    @Override
-    public String toString() {
-        return "AlarmUpload{" +
-                "cameraIp='" + cameraIp + '\'' +
-                ", cameraPort='" + cameraPort + '\'' +
-                ", gasIp='" + gasIp + '\'' +
-                ", gasPort='" + gasPort + '\'' +
-                ", alarmValue='" + alarmValue + '\'' +
-                ", alarmTime='" + alarmTime + '\'' +
-                ", alarmType='" + alarmType + '\'' +
-                ", alarmImage='" + (StrUtil.isNotEmpty(alarmImage) ? alarmImage.substring(0,50) : "null") + '\'' +
-                ", alarmContent='" + alarmContent + '\'' +
-                '}';
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/DeviceDetailDTO.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/DeviceDetailDTO.java
deleted file mode 100644
index ea518d9..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/DeviceDetailDTO.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package com.casic.missiles.modular.system.dto;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.casic.missiles.modular.system.entity.Device;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-@ApiModel("DeviceDetailDTO")
-@Data
-public class DeviceDetailDTO extends Device {
-
-    @ApiModelProperty(value = "摄像头编号")
-    private String cameraCode;
-
-    @ApiModelProperty(value = "摄像头IP")
-    private String cameraIp;
-
-    @ApiModelProperty(value = "摄像头端口")
-    private String cameraPort;
-
-    @ApiModelProperty(value = "激甲编号")
-    private String gasCode;
-
-    @ApiModelProperty(value = "激甲IP")
-    private String gasIp;
-
-    @ApiModelProperty(value = "激甲端口")
-    private String gasPort;
-
-    @ApiModelProperty(value = "智能帽衬编号")
-    private String hatLiningCode;
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/WorkSiteDetailDTO.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/WorkSiteDetailDTO.java
deleted file mode 100644
index 29378ff..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/WorkSiteDetailDTO.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package com.casic.missiles.modular.system.dto;
-
-import com.casic.missiles.modular.system.entity.ProjectDevice;
-import com.casic.missiles.modular.system.entity.ProjectWorker;
-import com.casic.missiles.modular.system.entity.WorkSiteInfo;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.util.List;
-
-@Data
-@ApiModel("WorkSiteDetailDTO")
-public class WorkSiteDetailDTO extends WorkSiteInfo {
-
-    @ApiModelProperty(value = "安全树列表",dataType = "ProjectDevice")
-    private List<ProjectDevice> deviceList;
-
-    @ApiModelProperty(value = "人员列表",dataType = "ProjectWorker")
-    private List<ProjectWorker> workerList;
-
-
-
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/WorkerLocationDTO.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/WorkerLocationDTO.java
deleted file mode 100644
index 6fd7b24..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/WorkerLocationDTO.java
+++ /dev/null
@@ -1,68 +0,0 @@
-package com.casic.missiles.modular.system.dto;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-@ApiModel(value = "WorkerLocationDTO",description = "人员位置列表（首页）")
-@Data
-public class WorkerLocationDTO {
-
-    @ApiModelProperty("人员ID")
-    private Long workerId;
-
-    @ApiModelProperty("人员姓名")
-    private String workerName;
-
-    @ApiModelProperty("安全帽编号")
-    private String hatCode;
-
-    @ApiModelProperty("安全帽ID")
-    private Long hatId;
-
-    @ApiModelProperty("背心编号")
-    private String vastCode;
-
-    @ApiModelProperty("手环编号")
-    private String braceletCode;
-
-    @ApiModelProperty("位置")
-    private String location;
-
-    @ApiModelProperty("时间")
-    private String time;
-
-    @ApiModelProperty("经度")
-    private String lng;
-
-    @ApiModelProperty("纬度")
-    private String lat;
-
-    @ApiModelProperty("心率")
-    private String heartRate;
-
-    @ApiModelProperty("血氧")
-    private String bloodOxygen;
-
-    @ApiModelProperty("一氧化碳")
-    private String co;
-
-    @ApiModelProperty("甲烷")
-    private String gas;
-
-    @ApiModelProperty("硫化氢")
-    private String h2s;
-
-    @ApiModelProperty("氧气")
-    private String o2;
-
-    @ApiModelProperty("信号")
-    private String signal;
-
-    @ApiModelProperty("电量")
-    private String cell;
-
-    @ApiModelProperty("是否报警")
-    private boolean alarmFlag;
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Alarm.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Alarm.java
new file mode 100644
index 0000000..4d2b7ef
--- /dev/null
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Alarm.java
@@ -0,0 +1,103 @@
+package com.casic.missiles.modular.system.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import java.util.Date;
+
+/**
+ * <p>
+ * 报警记录表
+ * </p>
+ *
+ * @author zyj
+ * @since 2023-05-25
+ */
+@Data
+@TableName("bus_alarm")
+public class Alarm implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    @TableId(value = "ID",type = IdType.ASSIGN_ID)
+    private Long id;
+
+    /**
+     * 设备ID
+     */
+    @TableField("DEVICE_ID")
+    private Long deviceId;
+
+    /**
+     * 报警类型
+     */
+    @TableField("ALARM_TYPE")
+    private String alarmType;
+
+    /**
+     * 报警时间
+     */
+    @TableField("ALARM_TIME")
+    private Date alarmTime;
+
+    /**
+     * 报警状态
+     */
+    @TableField("ALARM_STATUS")
+    private String alarmStatus;
+
+    /**
+     * 报警位置
+     */
+    @TableField("ALARM_LOCATION")
+    private String alarmLocation;
+
+    /**
+     * 报警图片
+     */
+    @TableField("ALARM_IMAGE")
+    private String alarmImage;
+
+    /**
+     * 视频通道号
+     */
+    @TableField("CHANNEL_NO")
+    private Integer channelNo;
+
+    /**
+     * 报警内容
+     */
+    @TableField("ALARM_CONTENT")
+    private String alarmContent;
+
+    /**
+     * 消警时间
+     */
+    @TableField("CANCEL_TIME")
+    private Date cancelTime;
+
+
+    @Override
+    public String toString() {
+        return "Alarm{" +
+            "id=" + id +
+            ", deviceId=" + deviceId +
+            ", alarmType=" + alarmType +
+            ", alarmTime=" + alarmTime +
+            ", alarmStatus=" + alarmStatus +
+            ", alarmLocation=" + alarmLocation +
+            ", alarmImage=" + alarmImage +
+            ", channelNo=" + channelNo +
+            ", alarmContent=" + alarmContent +
+            ", cancelTime=" + cancelTime +
+        "}";
+    }
+}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusAlarm.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusAlarm.java
deleted file mode 100644
index efb4a23..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusAlarm.java
+++ /dev/null
@@ -1,159 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.alibaba.fastjson.annotation.JSONField;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.time.LocalDateTime;
-import java.util.Date;
-
-/**
- * <p>
- * 报警记录表
- * </p>
- *
- * @author zyj
- * @since 2023-05-16
- */
-@Data
-@ApiModel("Alarm")
-@TableName("br_bus_alarm")
-public class BusAlarm implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 项目ID
-     */
-    @ApiModelProperty(value = "项目ID")
-    @TableField("PROJECT_ID")
-    private Long projectId;
-
-    /**
-     * 设备ID
-     */
-    @ApiModelProperty(value = "设备ID")
-    @TableField("DEVICE_ID")
-    private Long deviceId;
-
-    /**
-     * 报警类型
-     */
-    @ApiModelProperty(value = "报警类型")
-    @TableField("ALARM_TYPE")
-    private String alarmType;
-
-    /**
-     * 报警状态
-     */
-    @ApiModelProperty(value = "报警状态")
-    @TableField("ALARM_STATUS")
-    private String alarmStatus;
-
-    /**
-     * 报警值
-     */
-    @ApiModelProperty(value = "报警值")
-    @TableField("ALARM_VALUE")
-    private String alarmValue;
-
-    /**
-     * 报警图片
-     */
-    @ApiModelProperty(value = "报警图片")
-    @TableField("ALARM_IMAGE")
-    private String alarmImage;
-
-    /**
-     * 报警内容
-     */
-    @ApiModelProperty(value = "报警内容")
-    @TableField("ALARM_CONTENT")
-    private String alarmContent;
-
-    /**
-     * 报警时间
-     */
-    @ApiModelProperty(value = "报警时间")
-    @TableField("ALARM_TIME")
-    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
-    private Date alarmTime;
-
-    /**
-     * 消警时间
-     */
-    @ApiModelProperty(value = "消警时间")
-    @TableField("CANCEL_TIME")
-    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
-    private Date cancelTime;
-
-    /**
-     * 报警位置经度
-     */
-    @ApiModelProperty(value = "报警位置经度")
-    @TableField("ALARM_LNG")
-    private String alarmLng;
-
-    /**
-     * 报警位置纬度
-     */
-    @ApiModelProperty(value = "报警位置纬度")
-    @TableField("ALARM_LAT")
-    private String alarmLat;
-
-    @ApiModelProperty("报警类型名称")
-    @TableField(exist = false)
-    private String alarmStatusName;
-    @ApiModelProperty("报警类型名称")
-    @TableField(exist = false)
-    private String alarmTypeName;
-    @ApiModelProperty("作业名称")
-    @TableField(exist = false)
-    private String workTitle;
-    @ApiModelProperty("所属道路")
-    @TableField(exist = false)
-    private String workRoad;
-    @ApiModelProperty("作业状态")
-    @TableField(exist = false)
-    private String projectState;
-    @ApiModelProperty("作业状态名称")
-    @TableField(exist = false)
-    private String projectStateName;
-    @ApiModelProperty("负责人姓名")
-    @TableField(exist = false)
-    private String workPersonName;
-    @ApiModelProperty("负责人联系方式")
-    @TableField(exist = false)
-    private String workPersonPhoneNumber;
-
-
-    @Override
-    public String toString() {
-        return "BusAlarm{" +
-                "id=" + id +
-                ", projectId=" + projectId +
-                ", deviceId=" + deviceId +
-                ", alarmType=" + alarmType +
-                ", alarmValue=" + alarmValue +
-                ", alarmStatus=" + alarmStatus +
-                ", alarmImage=" + alarmImage +
-                ", alarmContent=" + alarmContent +
-                ", alarmTime=" + alarmTime +
-                ", cancelTime=" + cancelTime +
-                ", alarmLng=" + alarmLng +
-                ", alarmLat=" + alarmLat +
-                "}";
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusEvent.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusEvent.java
deleted file mode 100644
index a0b7543..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusEvent.java
+++ /dev/null
@@ -1,100 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.time.LocalDateTime;
-import java.util.Date;
-import java.util.List;
-
-/**
- * <p>
- * 事件表
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@TableName("br_bus_event")
-@Data
-@ApiModel("BusEvent")
-public class BusEvent implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @ApiModelProperty("事件ID")
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 事件标题
-     */
-    @ApiModelProperty("事件名称")
-    @TableField("EVENT_TITLE")
-    private String eventTitle;
-
-    /**
-     * 上报人员
-     */
-    @ApiModelProperty("上报人员")
-    @TableField("UPLOAD_NAME")
-    private String uploadName;
-
-    /**
-     * 联系方式
-     */
-    @ApiModelProperty("联系方式")
-    @TableField("PHONE_NUMBER")
-    private String phoneNumber;
-
-    /**
-     * 事件描述
-     */
-    @ApiModelProperty("事件描述")
-    @TableField("EVENT_DESCRIPTION")
-    private String eventDescription;
-
-    @ApiModelProperty("经度")
-    @TableField("LNG")
-    private String lng;
-
-    @ApiModelProperty("纬度")
-    @TableField("LAT")
-    private String lat;
-
-    /**
-     * 事件上传时间
-     */
-    @ApiModelProperty("事件上传时间")
-    @TableField("CREATE_TIME")
-    private Date createTime;
-
-    @ApiModelProperty("事件照片")
-    @TableField(exist = false)
-    private List<BusEventImage> imageList;
-
-
-
-    @Override
-    public String toString() {
-        return "BusEvent{" +
-            "id=" + id +
-            ", eventTitle=" + eventTitle +
-            ", uploadName=" + uploadName +
-            ", phoneNumber=" + phoneNumber +
-            ", eventDescription=" + eventDescription +
-            ", lng=" + lng +
-            ", lat=" + lat +
-            ", createTime=" + createTime +
-        "}";
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusEventImage.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusEventImage.java
deleted file mode 100644
index 1e75245..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusEventImage.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-
-/**
- * <p>
- * 事件图片表
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@TableName("br_bus_event_image")
-@Data
-@ApiModel("BusEventImage")
-public class BusEventImage implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 事件ID
-     */
-    @TableField("EVENT_ID")
-    private Long eventId;
-
-    /**
-     * 报警图片
-     */
-    @TableField("IMAGE")
-    @ApiModelProperty("图片url")
-    private String image;
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Device.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Device.java
index df89c70..ea7db5f 100644
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Device.java
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Device.java
@@ -1,30 +1,23 @@
 package com.casic.missiles.modular.system.entity;
 
-import com.alibaba.fastjson.annotation.JSONField;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.casic.missiles.core.base.json.DateDeserializer;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
-import java.util.Date;
 
 /**
  * <p>
- * 
+ * 设备记录表
  * </p>
  *
  * @author zyj
- * @since 2023-04-14
+ * @since 2023-05-25
  */
-@ApiModel("Device")
-@TableName("br_device")
 @Data
+@TableName("bus_device")
 public class Device implements Serializable {
 
     private static final long serialVersionUID = 1L;
@@ -32,82 +25,86 @@
     /**
      * 主键
      */
-    @ApiModelProperty(value = "设备ID")
     @TableId(value = "ID",type = IdType.ASSIGN_ID)
     private Long id;
 
     /**
-     * 设备编号
+     * 设备名称
      */
-    @ApiModelProperty(value = "设备编号")
-    @TableField("DEVICE_CODE")
-    private String deviceCode;
+    @TableField("DEVICE_NAME")
+    private String deviceName;
 
     /**
-     * 设备类型
+     * IP
      */
-    @ApiModelProperty(value = "设备类型")
-    @TableField("DEVICE_TYPE")
-    private String deviceType;
+    @TableField("IP")
+    private String ip;
 
     /**
-     * 设备批次
+     * 端口
      */
-    @ApiModelProperty(value = "设备批次")
-    @TableField("DEVICE_BATCH")
-    private String deviceBatch;
+    @TableField("PORT")
+    private String port;
 
     /**
-     * 厂家
+     * 用户名
      */
-    @ApiModelProperty(value = "厂家")
-    @TableField("MANUFACTURER")
-    private String manufacturer;
+    @TableField("USER_NAME")
+    private String userName;
 
     /**
-     * 是否供电
+     * 密码
      */
-    @ApiModelProperty(value = "是否供电")
-    @TableField("IS_POWER_SUPPLY")
-    private String isPowerSupply;
+    @TableField("PASSWORD")
+    private String password;
 
     /**
-     * 创建时间
+     * 连接类型
      */
-    @ApiModelProperty(value = "创建时间",dataType = "Date")
-    @TableField("CREATE_TIME")
-    private Date createTime;
+    @TableField("CONNECT_TYPE")
+    private String connectType;
 
-    @ApiModelProperty(value = "设备类型名称")
-    @TableField(exist = false)
-    private String deviceTypeName;
+    /**
+     * 位置
+     */
+    @TableField("LOCATION")
 
-    @ApiModelProperty(value = "是否供电名称")
-    @TableField(exist = false)
-    private String isPowerSupplyName;
+    private String location;
 
-    @ApiModelProperty(value = "注册时间",dataType = "String")
-    @TableField(exist = false)
-    private String registerTime;
+    /**
+     * 设备状态
+     */
+    @TableField("STATUS")
 
-    @ApiModelProperty(value = "当前状态")
-    @TableField(exist = false)
     private String status;
 
-    @ApiModelProperty(value = "当前状态名称")
-    @TableField(exist = false)
-    private String statusName;
+    /**
+     * 报警分组
+     */
+    @TableField("ALARM_GROUP")
+
+    private Long alarmGroup;
+
+    /**
+     * 视频通道数(预留)
+     */
+    @TableField("CHANNEL_NUM")
+    private Integer channelNum;
 
     @Override
     public String toString() {
         return "Device{" +
             "id=" + id +
-            ", deviceCode=" + deviceCode +
-            ", deviceType=" + deviceType +
-            ", deviceBatch=" + deviceBatch +
-            ", manufacturer=" + manufacturer +
-            ", isPowerSupply=" + isPowerSupply +
-            ", createTime=" + createTime +
+            ", deviceName=" + deviceName +
+            ", ip=" + ip +
+            ", port=" + port +
+            ", userName=" + userName +
+            ", password=" + password +
+            ", connectType=" + connectType +
+            ", location=" + location +
+            ", status=" + status +
+            ", alarmGroup=" + alarmGroup +
+            ", channelNum=" + channelNum +
         "}";
     }
 }
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/DeviceExt.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/DeviceExt.java
deleted file mode 100644
index 5ee7015..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/DeviceExt.java
+++ /dev/null
@@ -1,99 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-
-/**
- * <p>
- * 设备扩展信息表（安全树）
- * </p>
- *
- * @author zyj
- * @since 2023-04-27
- */
-@Data
-@TableName("br_device_ext")
-public class DeviceExt implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 设备ID
-     */
-    @TableField("DEVICE_ID")
-    private Long deviceId;
-
-    /**
-     * 摄像头编号
-     */
-    @TableField("CAMERA_CODE")
-    private String cameraCode;
-
-    /**
-     * 摄像头IP
-     */
-    @TableField("CAMERA_IP")
-    private String cameraIp;
-
-    /**
-     * 摄像头端口
-     */
-    @TableField("CAMERA_PORT")
-    private String cameraPort;
-
-    /**
-     * 激甲编号
-     */
-    @TableField("GAS_CODE")
-    private String gasCode;
-
-    /**
-     * 激甲IP
-     */
-    @TableField("GAS_IP")
-    private String gasIp;
-
-    /**
-     * 激甲端口
-     */
-    @TableField("GAS_PORT")
-    private String gasPort;
-
-    /**
-     * 甲烷报警阈值
-     */
-    @TableField("GAS_THRESHOLD")
-    private String gasThreshold;
-
-    @TableField(value = "HAT_LINING_CODE")
-    private String hatLiningCode;
-
-
-    @Override
-    public String toString() {
-        return "DeviceExt{" +
-            "id=" + id +
-            ", deviceId=" + deviceId +
-            ", cameraCode=" + cameraCode +
-            ", cameraIp=" + cameraIp +
-            ", cameraPort=" + cameraPort +
-            ", gasCode=" + gasCode +
-            ", gasIp=" + gasIp +
-            ", gasPort=" + gasPort +
-            ", gasThreshold=" + gasThreshold +
-            ", hatLiningCode=" + hatLiningCode +
-        "}";
-    }
-}

diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/AlarmController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/AlarmController.java
new file mode 100644
index 0000000..1795cf1
--- /dev/null
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/AlarmController.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.modular.system.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.stereotype.Controller;
+
+/**
+ * <p>
+ * 报警记录表 前端控制器
+ * </p>
+ *
+ * @author zyj
+ * @since 2023-05-25
+ */
+@Controller
+@RequestMapping("/system/alarm")
+public class AlarmController {
+
+}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusAlarmController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusAlarmController.java
deleted file mode 100644
index 1f82ebb..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusAlarmController.java
+++ /dev/null
@@ -1,102 +0,0 @@
-package com.casic.missiles.modular.system.controller;
-
-
-import cn.hutool.core.util.ObjectUtil;
-import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.core.base.controller.BaseController;
-import com.casic.missiles.core.page.PageFactory;
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.AlarmUpload;
-import com.casic.missiles.modular.system.dto.DeviceDetailDTO;
-import com.casic.missiles.modular.system.entity.BusAlarm;
-import com.casic.missiles.modular.system.service.IBusAlarmService;
-import io.swagger.annotations.*;
-import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.*;
-
-import org.springframework.stereotype.Controller;
-
-import static com.casic.missiles.model.response.ResponseData.DEFAULT_SUCCESS_MESSAGE;
-import static com.casic.missiles.modular.system.consts.AlarmConst.ALARM_STATUS_MANUAL_CANCEL;
-
-/**
- * <p>
- * 报警记录表 前端控制器
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@Api(tags = "报警管理接口")
-@Controller
-@RequestMapping("/alarm")
-@RequiredArgsConstructor
-public class BusAlarmController extends BaseController {
-
-    private final IBusAlarmService alarmService;
-
-    @ApiOperation("报警上报接口")
-    @PostMapping("/upload")
-    @ResponseBody
-    public Object upload(@RequestBody AlarmUpload alarmUpload){
-        alarmService.alarmUpload(alarmUpload);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("报警列表分页查询")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "workTitle", value = "作业名称",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "projectId", value = "作业ID",dataType = "Long", paramType = "query",example = "0"),
-            @ApiImplicitParam(name = "alarmStatus", value = "报警状态",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "projectState", value = "作业状态",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "alarmType", value = "报警类型",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "alarmStartTime", value = "报警开始时间",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "alarmEndTime", value = "报警结束时间",dataType = "String", paramType = "query")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = BusAlarm.class),
-    })
-    @GetMapping("/listPage")
-    @ResponseBody
-    public Object listPage(String workTitle,Long projectId,String alarmStatus,String projectState,String alarmType,String alarmStartTime,String alarmEndTime){
-        Page<BusAlarm> page = PageFactory.defaultPage();
-        QueryWrapper<BusAlarm> queryWrapper = new QueryWrapper<>();
-        if(StrUtil.isNotEmpty(workTitle)){
-            queryWrapper.like("p.WORK_TITLE",workTitle);
-        }
-        if(ObjectUtil.isNotEmpty(projectId)){
-            queryWrapper.eq("alarm.PROJECT_ID",projectId);
-        }
-        if(StrUtil.isNotEmpty(alarmStatus)){
-            queryWrapper.eq("alarm.ALARM_STATUS",alarmStatus);
-        }
-        if(StrUtil.isNotEmpty(projectState)){
-            queryWrapper.eq("p.PROJECT_STATE",projectState);
-        }
-        if(StrUtil.isNotEmpty(alarmType)){
-            queryWrapper.eq("alarm.ALARM_TYPE",alarmType);
-        }
-        if(StrUtil.isNotEmpty(alarmStartTime)){
-            queryWrapper.ge("alarm.ALARM_TIME",alarmStartTime);
-        }
-        if(StrUtil.isNotEmpty(alarmEndTime)){
-            queryWrapper.le("alarm.ALARM_TIME",alarmEndTime);
-        }
-        page = alarmService.listPage(page,queryWrapper);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-    @ApiOperation("消警")
-    @PostMapping("/cancel")
-    @ResponseBody
-    public Object cancel(@RequestParam("alarmId") Long alarmId){
-        UpdateWrapper<BusAlarm> updateWrapper = new UpdateWrapper<>();
-        updateWrapper.eq("ID",alarmId);
-        updateWrapper.set("ALARM_STATUS",ALARM_STATUS_MANUAL_CANCEL);
-        alarmService.update(updateWrapper);
-        return ResponseData.success();
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusEventController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusEventController.java
deleted file mode 100644
index dde5aad..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusEventController.java
+++ /dev/null
@@ -1,41 +0,0 @@
-package com.casic.missiles.modular.system.controller;
-
-
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.entity.BusEvent;
-import com.casic.missiles.modular.system.service.IBusEventService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.ResponseBody;
-
-/**
- * <p>
- * 事件表 前端控制器
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@Controller
-@RequestMapping("/event")
-@Api(tags = "事件上报")
-@RequiredArgsConstructor
-public class BusEventController {
-
-    private final IBusEventService eventService;
-
-    @ApiOperation("事件上报")
-    @PostMapping("add")
-    @ResponseBody
-    public Object add(@RequestBody BusEvent busEvent){
-        eventService.saveBusEvent(busEvent);
-        return ResponseData.success();
-    }
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
index 03abc5f..aa50d78 100644
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
@@ -1,121 +1,20 @@
 package com.casic.missiles.modular.system.controller;
 
 
-import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.core.base.controller.BaseController;
-import com.casic.missiles.core.page.PageFactory;
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.DeviceDetailDTO;
-import com.casic.missiles.modular.system.entity.Device;
-import com.casic.missiles.modular.system.service.IDeviceExtService;
-import com.casic.missiles.modular.system.service.IDeviceService;
-import io.swagger.annotations.*;
-import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.RequestMapping;
 
 import org.springframework.stereotype.Controller;
 
-import java.time.LocalDateTime;
-import java.util.Date;
-import java.util.List;
-
-import static com.casic.missiles.model.response.ResponseData.DEFAULT_SUCCESS_MESSAGE;
-
 /**
  * <p>
- *  前端控制器
+ * 设备记录表 前端控制器
  * </p>
  *
  * @author zyj
- * @since 2023-04-14
+ * @since 2023-05-25
  */
-@Api(tags = "设备管理接口")
-@RequiredArgsConstructor
 @Controller
-@RequestMapping("/device")
-public class DeviceController extends BaseController {
-    private final IDeviceService deviceService;
-    private final IDeviceExtService deviceExtService;
-
-    @ApiOperation("设备分页列表")
-    @ApiImplicitParams({
-        @ApiImplicitParam(name = "deviceType", value = "设备类型",dataType = "String", paramType = "query"),
-        @ApiImplicitParam(name = "deviceCode", value = "设备编号",dataType = "String", paramType = "query"),
-        @ApiImplicitParam(name = "status", value = "设备状态",dataType = "String", paramType = "query"),
-        @ApiImplicitParam(name = "projectId", value = "作业ID（如果传此参数，列表中返回该作业使用的设备）",dataType = "Long", paramType = "query", example = "0")
-    })
-    @ApiResponses({
-        @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = DeviceDetailDTO.class),
-    })
-    @GetMapping("listPage")
-    @ResponseBody
-    public Object listPage(String deviceType, String deviceCode, String status,Long projectId){
-        Page<DeviceDetailDTO> page = PageFactory.defaultPage();
-        QueryWrapper<DeviceDetailDTO> queryWrapper = new QueryWrapper<>();
-        if(StrUtil.isNotEmpty(deviceType)){
-            queryWrapper.eq("DEVICE_TYPE",deviceType);
-        }
-        if(StrUtil.isNotEmpty(deviceCode)){
-            queryWrapper.like("DEVICE_CODE",deviceCode);
-        }
-        page = deviceService.listPage(page,queryWrapper,status,projectId);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-    @ApiOperation("新增设备")
-    @PostMapping("add")
-    @ResponseBody
-    public Object add(@RequestBody DeviceDetailDTO deviceDetailDTO){
-        deviceService.saveDevice(deviceDetailDTO);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("编辑设备")
-    @PostMapping("update")
-    @ResponseBody
-    public Object update(@RequestBody DeviceDetailDTO deviceDetailDTO){
-        deviceService.updateDevice(deviceDetailDTO);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("删除设备")
-    @PostMapping("delete")
-    @ResponseBody
-    public Object delete(@ApiParam("设备id列表")@RequestBody List<Long> deviceIds){
-        deviceService.deleteDevices(deviceIds);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("设置甲烷阈值")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "gasIp", value = "安全树甲烷设备IP",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "gasPort", value = "安全树甲烷端口",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "threshold", value = "甲烷阈值",dataType = "String", paramType = "query")
-    })
-    @PostMapping("setThreshold")
-    @ResponseBody
-    public Object setThreshold(String gasIp,String gasPort,String threshold){
-        deviceExtService.setGasThreshold(gasIp, gasPort, threshold);
-        return ResponseData.success();
-    }
-
-
-    @ApiOperation("查询甲烷阈值")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "gasIp", value = "安全树甲烷设备IP",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "gasPort", value = "安全树甲烷端口",dataType = "String", paramType = "query")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = "{\"code\": 200,\"data\": \"100\",\"message\": \"请求成功\",\"success\": true}",response = String.class),
-    })
-    @GetMapping("getThreshold")
-    @ResponseBody
-    public Object getThreshold(String gasIp,String gasPort){
-        String data = deviceExtService.getGasThreshold(gasIp, gasPort);
-        return ResponseData.success(data);
-    }
-
+@RequestMapping("/system/device")
+public class DeviceController {
 
 }
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/OverviewController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/OverviewController.java
deleted file mode 100644
index 7570504..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/OverviewController.java
+++ /dev/null
@@ -1,70 +0,0 @@
-package com.casic.missiles.modular.system.controller;
-
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.AlarmTypeCountDTO;
-import com.casic.missiles.modular.system.dto.DeviceLocationDTO;
-import com.casic.missiles.modular.system.dto.WorkerLocationDTO;
-import com.casic.missiles.modular.system.service.IBusAlarmService;
-import com.casic.missiles.modular.system.service.IProjectDeviceService;
-import com.casic.missiles.modular.system.service.IProjectWorkerService;
-import io.swagger.annotations.*;
-import lombok.RequiredArgsConstructor;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.ResponseBody;
-
-import static com.casic.missiles.model.response.ResponseData.DEFAULT_SUCCESS_MESSAGE;
-import static com.casic.missiles.modular.system.consts.AlarmConst.ALARM_STATUS_ON;
-
-@Api(tags = "首页看板接口")
-@Controller
-@RequestMapping("overview")
-@RequiredArgsConstructor
-public class OverviewController {
-
-    private final IBusAlarmService alarmService;
-    private final IProjectDeviceService projectDeviceService;
-
-    private final IProjectWorkerService projectWorkerService;
-
-
-    @ApiOperation("报警统计接口")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "projectId", value = "作业ID",dataType = "Long", paramType = "query", example = "0")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = AlarmTypeCountDTO.class),
-    })
-    @GetMapping("/alarmCount")
-    @ResponseBody
-    public Object alarmCount(Long projectId){
-        return ResponseData.success(alarmService.alarmCount(projectId,ALARM_STATUS_ON));
-    }
-
-    @ApiOperation("设备列表接口")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "projectId", value = "作业ID",dataType = "Long", paramType = "query", example = "0")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = DeviceLocationDTO.class),
-    })
-    @GetMapping("/deviceList")
-    @ResponseBody
-    public Object deviceList(Long projectId){
-        return ResponseData.success(projectDeviceService.selectDeviceLocationList(projectId));
-    }
-
-    @ApiOperation("人员列表接口")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "projectId", value = "作业ID",dataType = "Long", paramType = "query", example = "0")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = WorkerLocationDTO.class),
-    })
-    @GetMapping("/workerList")
-    @ResponseBody
-    public Object workerList(Long projectId){
-        return ResponseData.success(projectWorkerService.selectWorkerLocationDTO(projectId));
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/WorkSiteInfoController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/WorkSiteInfoController.java
deleted file mode 100644
index af36d69..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/WorkSiteInfoController.java
+++ /dev/null
@@ -1,130 +0,0 @@
-package com.casic.missiles.modular.system.controller;
-
-
-import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.core.base.controller.BaseController;
-import com.casic.missiles.core.page.PageFactory;
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.WorkSiteDetailDTO;
-import com.casic.missiles.modular.system.entity.WorkSiteInfo;
-import com.casic.missiles.modular.system.service.IWorkSiteInfoService;
-import io.swagger.annotations.*;
-import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.*;
-
-import org.springframework.stereotype.Controller;
-
-import java.util.List;
-
-import static com.casic.missiles.model.response.ResponseData.DEFAULT_SUCCESS_MESSAGE;
-
-/**
- * <p>
- * 作业现场表 前端控制器
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@Controller
-@RequestMapping("/site")
-@Api(tags = "作业现场管理")
-@RequiredArgsConstructor
-public class WorkSiteInfoController extends BaseController {
-
-
-    private final IWorkSiteInfoService workSiteInfoService;
-
-    @ApiOperation("新增作业现场")
-    @PostMapping("add")
-    @ResponseBody
-    public Object addWorkSite(@RequestBody WorkSiteDetailDTO workSiteDetailDTO){
-        workSiteInfoService.addWorkSiteInfo(workSiteDetailDTO);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("编辑作业现场")
-    @PostMapping("update")
-    @ResponseBody
-    public Object updateWorkSite(@RequestBody WorkSiteDetailDTO workSiteDetailDTO){
-        workSiteInfoService.updateWorkSiteInfo(workSiteDetailDTO);
-        return ResponseData.success();
-    }
-
-
-    @ApiOperation("删除作业现场")
-    @PostMapping("delete")
-    @ResponseBody
-    public Object delete(@ApiParam("作业现场id列表")@RequestBody List<Long> projectIds){
-        workSiteInfoService.deleteProjects(projectIds);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("查询作业现场详情")
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = WorkSiteDetailDTO.class),
-    })
-    @GetMapping("detail")
-    @ResponseBody
-    public Object delete(@ApiParam(value = "作业现场id", example = "0")@RequestParam Long projectId){
-        WorkSiteDetailDTO detailDTO = workSiteInfoService.getWorkSiteDetail(projectId);
-        return ResponseData.success(detailDTO);
-    }
-
-    @ApiOperation("分页列表查询")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "workTitle",value = "作业名称", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "workRoad",value = "所属道路", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "workPersonName",value = "责任人姓名", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "startDate",value = "注册开始日期", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "endDate",value = "注册结束日期", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "projectState",value = "当前状态（字典值）", dataType = "String", paramType = "query")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = WorkSiteInfo.class),
-    })
-    @GetMapping("listPage")
-    @ResponseBody
-    public Object listPage(String workTitle,String workRoad,String workPersonName,String projectState,String startDate,String endDate){
-        Page<WorkSiteInfo> page = PageFactory.defaultPage();
-        QueryWrapper<WorkSiteInfo> queryWrapper = new QueryWrapper<>();
-        if(StrUtil.isNotEmpty(workTitle)){
-            queryWrapper.like("WORK_TITLE",workTitle);
-        }
-        if(StrUtil.isNotEmpty(workRoad)){
-            queryWrapper.like("WORK_ROAD",workRoad);
-        }
-        if(StrUtil.isNotEmpty(workPersonName)){
-            queryWrapper.like("WORKER_NAME",workPersonName);
-        }
-        if(StrUtil.isNotEmpty(projectState)){
-            queryWrapper.eq("PROJECT_STATE",projectState);
-        }
-        if(StrUtil.isNotEmpty(startDate)){
-            queryWrapper.ge("br_work_site_info.CREATE_TIME",startDate + " 00:00:00");
-        }
-        if(StrUtil.isNotEmpty(endDate)){
-            queryWrapper.le("br_work_site_info.CREATE_TIME",endDate + " 23:59:59");
-        }
-        page = workSiteInfoService.selectListPage(page,queryWrapper);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-    @ApiOperation("开始作业")
-    @PostMapping("start")
-    @ResponseBody
-    public Object start(@ApiParam(value = "作业现场id",example = "0")@RequestParam Long projectId){
-        workSiteInfoService.start(projectId);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("完成作业")
-    @PostMapping("finish")
-    @ResponseBody
-    public Object finish(@ApiParam(value = "作业现场id", example = "0")@RequestParam Long projectId){
-        workSiteInfoService.finish(projectId);
-        return ResponseData.success();
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/WorkerController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/WorkerController.java
deleted file mode 100644
index 796f94c..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/WorkerController.java
+++ /dev/null
@@ -1,136 +0,0 @@
-package com.casic.missiles.modular.system.controller;
-
-
-import cn.hutool.core.util.ObjectUtil;
-import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.core.base.controller.BaseController;
-import com.casic.missiles.core.page.PageFactory;
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.DeviceDetailDTO;
-import com.casic.missiles.modular.system.entity.Device;
-import com.casic.missiles.modular.system.entity.Worker;
-import com.casic.missiles.modular.system.service.IWorkerService;
-import io.swagger.annotations.*;
-import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.*;
-
-import org.springframework.stereotype.Controller;
-
-import java.util.Date;
-import java.util.List;
-
-import static com.casic.missiles.model.response.ResponseData.DEFAULT_SUCCESS_MESSAGE;
-
-/**
- * <p>
- *  前端控制器
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@Controller
-@RequestMapping("/worker")
-@RequiredArgsConstructor
-@Api(tags = "人员管理接口")
-public class WorkerController extends BaseController {
-
-    private final IWorkerService workerService;
-
-    @ApiOperation("分页列表查询")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "name",value = "姓名", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "deptId",value = "所属部门", dataType = "Long", paramType = "query", example = "0"),
-            @ApiImplicitParam(name = "status",value = "当前状态（字典值）", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "startDate",value = "注册开始日期", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "endDate",value = "注册结束日期", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "workerType",value = "人员类型（字典值）", dataType = "String", paramType = "query")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = Worker.class),
-    })
-    @GetMapping("listPage")
-    @ResponseBody
-    public Object listPage(String name,Long deptId, String status,String startDate,String endDate,String workerType){
-        Page<Worker> page = PageFactory.defaultPage();
-        QueryWrapper<Worker> queryWrapper = new QueryWrapper<>();
-        if(StrUtil.isNotEmpty(name)){
-            queryWrapper.like("WORKER_NAME",name);
-        }
-        if(ObjectUtil.isNotEmpty(deptId)){
-            queryWrapper.eq("DEPT_ID",deptId);
-        }
-        if(StrUtil.isNotEmpty(workerType)){
-            queryWrapper.eq("WORKER_TYPE",workerType);
-        }
-        if(StrUtil.isNotEmpty(startDate)){
-            queryWrapper.ge("CREATE_TIME",startDate + " 00:00:00");
-        }
-        if(StrUtil.isNotEmpty(endDate)){
-            queryWrapper.le("CREATE_TIME",endDate + " 23:59:59");
-        }
-        if(StrUtil.isNotEmpty(status)){
-            queryWrapper.eq("`STATUS`",status);
-        }
-        page = workerService.selectListPage(page,queryWrapper);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-    @ApiOperation("新增人员")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "worker", value = "人员信息", dataType = "Worker", paramType = "body", required = true),
-            @ApiImplicitParam(name = "projectId", value = "项目ID(入场申请需要)", dataType = "Long", paramType = "query", example = "0")
-    })
-    @PostMapping("add")
-    @ResponseBody
-    public Object add(@ApiParam("worker")@RequestBody Worker worker,
-                      @RequestParam(required = false) Long projectId){
-        workerService.addWorker(worker,projectId);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("编辑人员")
-    @PostMapping("update")
-    @ResponseBody
-    public Object update(@RequestBody Worker worker){
-        workerService.updateById(worker);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("删除人员")
-    @PostMapping("delete")
-    @ResponseBody
-    public Object delete(@ApiParam("人员id列表")@RequestBody List<Long> workIds){
-        workerService.removeByIds(workIds);
-        return ResponseData.success();
-    }
-
-
-    @ApiOperation(value = "获取人脸图片",notes = "返回人脸图片url")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "cameraIp",value = "摄像头IP", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "cameraPort",value = "摄像头端口号", dataType = "String", paramType = "query"),
-    })
-    @GetMapping("/face/register")
-    @ResponseBody
-    public Object faceRegister(String cameraIp,String cameraPort){
-        return ResponseData.success(workerService.faceRegister(cameraIp, cameraPort));
-    }
-
-
-    @ApiOperation(value = "查询临时入场人员列表")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "projectId", value = "项目ID",required = true,dataType = "Long", paramType = "query", example = "0")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = Worker.class),
-    })
-    @GetMapping("/projectTempWorker")
-    @ResponseBody
-    public Object projectTempWorker(Long projectId){
-        return ResponseData.success(workerService.projectTempWorker(projectId));
-    }
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/AlarmTypeCountDTO.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/AlarmTypeCountDTO.java
deleted file mode 100644
index 1a165a1..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/AlarmTypeCountDTO.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.casic.missiles.modular.system.dto;
-
-import io.swagger.annotations.ApiModel;
-import lombok.Data;
-
-@ApiModel(value = "AlarmTypeCountDTO",description = "报警类型统计（首页）")
-@Data
-public class AlarmTypeCountDTO {
-
-    private String alarmType;
-    private String alarmTypeName;
-    private Integer alarmCount;
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/AlarmUpload.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/AlarmUpload.java
deleted file mode 100644
index 73d7799..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/AlarmUpload.java
+++ /dev/null
@@ -1,46 +0,0 @@
-package com.casic.missiles.modular.system.dto;
-
-import cn.hutool.core.util.StrUtil;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-@ApiModel(value = "AlarmUpload",description = "报警上传")
-@Data
-public class AlarmUpload {
-
-    @ApiModelProperty(value = "摄像头ip")
-    private String cameraIp;
-
-    @ApiModelProperty(value = "摄像头端口")
-    private String cameraPort;
-    @ApiModelProperty(value = "安全树甲烷设备ip")
-    private String gasIp;
-    @ApiModelProperty(value = "安全树甲烷设备端口")
-    private String gasPort;
-    @ApiModelProperty(value = "报警值")
-    private String alarmValue;
-    @ApiModelProperty(value = "报警时间")
-    private String alarmTime;
-    @ApiModelProperty(value = "报警类型")
-    private String alarmType;
-    @ApiModelProperty(value = "报警图片")
-    private String alarmImage;
-    @ApiModelProperty(value = "报警内容")
-    private String alarmContent;
-
-    @Override
-    public String toString() {
-        return "AlarmUpload{" +
-                "cameraIp='" + cameraIp + '\'' +
-                ", cameraPort='" + cameraPort + '\'' +
-                ", gasIp='" + gasIp + '\'' +
-                ", gasPort='" + gasPort + '\'' +
-                ", alarmValue='" + alarmValue + '\'' +
-                ", alarmTime='" + alarmTime + '\'' +
-                ", alarmType='" + alarmType + '\'' +
-                ", alarmImage='" + (StrUtil.isNotEmpty(alarmImage) ? alarmImage.substring(0,50) : "null") + '\'' +
-                ", alarmContent='" + alarmContent + '\'' +
-                '}';
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/DeviceDetailDTO.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/DeviceDetailDTO.java
deleted file mode 100644
index ea518d9..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/DeviceDetailDTO.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package com.casic.missiles.modular.system.dto;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.casic.missiles.modular.system.entity.Device;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-@ApiModel("DeviceDetailDTO")
-@Data
-public class DeviceDetailDTO extends Device {
-
-    @ApiModelProperty(value = "摄像头编号")
-    private String cameraCode;
-
-    @ApiModelProperty(value = "摄像头IP")
-    private String cameraIp;
-
-    @ApiModelProperty(value = "摄像头端口")
-    private String cameraPort;
-
-    @ApiModelProperty(value = "激甲编号")
-    private String gasCode;
-
-    @ApiModelProperty(value = "激甲IP")
-    private String gasIp;
-
-    @ApiModelProperty(value = "激甲端口")
-    private String gasPort;
-
-    @ApiModelProperty(value = "智能帽衬编号")
-    private String hatLiningCode;
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/WorkSiteDetailDTO.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/WorkSiteDetailDTO.java
deleted file mode 100644
index 29378ff..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/WorkSiteDetailDTO.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package com.casic.missiles.modular.system.dto;
-
-import com.casic.missiles.modular.system.entity.ProjectDevice;
-import com.casic.missiles.modular.system.entity.ProjectWorker;
-import com.casic.missiles.modular.system.entity.WorkSiteInfo;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.util.List;
-
-@Data
-@ApiModel("WorkSiteDetailDTO")
-public class WorkSiteDetailDTO extends WorkSiteInfo {
-
-    @ApiModelProperty(value = "安全树列表",dataType = "ProjectDevice")
-    private List<ProjectDevice> deviceList;
-
-    @ApiModelProperty(value = "人员列表",dataType = "ProjectWorker")
-    private List<ProjectWorker> workerList;
-
-
-
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/WorkerLocationDTO.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/WorkerLocationDTO.java
deleted file mode 100644
index 6fd7b24..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/WorkerLocationDTO.java
+++ /dev/null
@@ -1,68 +0,0 @@
-package com.casic.missiles.modular.system.dto;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-@ApiModel(value = "WorkerLocationDTO",description = "人员位置列表（首页）")
-@Data
-public class WorkerLocationDTO {
-
-    @ApiModelProperty("人员ID")
-    private Long workerId;
-
-    @ApiModelProperty("人员姓名")
-    private String workerName;
-
-    @ApiModelProperty("安全帽编号")
-    private String hatCode;
-
-    @ApiModelProperty("安全帽ID")
-    private Long hatId;
-
-    @ApiModelProperty("背心编号")
-    private String vastCode;
-
-    @ApiModelProperty("手环编号")
-    private String braceletCode;
-
-    @ApiModelProperty("位置")
-    private String location;
-
-    @ApiModelProperty("时间")
-    private String time;
-
-    @ApiModelProperty("经度")
-    private String lng;
-
-    @ApiModelProperty("纬度")
-    private String lat;
-
-    @ApiModelProperty("心率")
-    private String heartRate;
-
-    @ApiModelProperty("血氧")
-    private String bloodOxygen;
-
-    @ApiModelProperty("一氧化碳")
-    private String co;
-
-    @ApiModelProperty("甲烷")
-    private String gas;
-
-    @ApiModelProperty("硫化氢")
-    private String h2s;
-
-    @ApiModelProperty("氧气")
-    private String o2;
-
-    @ApiModelProperty("信号")
-    private String signal;
-
-    @ApiModelProperty("电量")
-    private String cell;
-
-    @ApiModelProperty("是否报警")
-    private boolean alarmFlag;
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Alarm.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Alarm.java
new file mode 100644
index 0000000..4d2b7ef
--- /dev/null
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Alarm.java
@@ -0,0 +1,103 @@
+package com.casic.missiles.modular.system.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import java.util.Date;
+
+/**
+ * <p>
+ * 报警记录表
+ * </p>
+ *
+ * @author zyj
+ * @since 2023-05-25
+ */
+@Data
+@TableName("bus_alarm")
+public class Alarm implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    @TableId(value = "ID",type = IdType.ASSIGN_ID)
+    private Long id;
+
+    /**
+     * 设备ID
+     */
+    @TableField("DEVICE_ID")
+    private Long deviceId;
+
+    /**
+     * 报警类型
+     */
+    @TableField("ALARM_TYPE")
+    private String alarmType;
+
+    /**
+     * 报警时间
+     */
+    @TableField("ALARM_TIME")
+    private Date alarmTime;
+
+    /**
+     * 报警状态
+     */
+    @TableField("ALARM_STATUS")
+    private String alarmStatus;
+
+    /**
+     * 报警位置
+     */
+    @TableField("ALARM_LOCATION")
+    private String alarmLocation;
+
+    /**
+     * 报警图片
+     */
+    @TableField("ALARM_IMAGE")
+    private String alarmImage;
+
+    /**
+     * 视频通道号
+     */
+    @TableField("CHANNEL_NO")
+    private Integer channelNo;
+
+    /**
+     * 报警内容
+     */
+    @TableField("ALARM_CONTENT")
+    private String alarmContent;
+
+    /**
+     * 消警时间
+     */
+    @TableField("CANCEL_TIME")
+    private Date cancelTime;
+
+
+    @Override
+    public String toString() {
+        return "Alarm{" +
+            "id=" + id +
+            ", deviceId=" + deviceId +
+            ", alarmType=" + alarmType +
+            ", alarmTime=" + alarmTime +
+            ", alarmStatus=" + alarmStatus +
+            ", alarmLocation=" + alarmLocation +
+            ", alarmImage=" + alarmImage +
+            ", channelNo=" + channelNo +
+            ", alarmContent=" + alarmContent +
+            ", cancelTime=" + cancelTime +
+        "}";
+    }
+}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusAlarm.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusAlarm.java
deleted file mode 100644
index efb4a23..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusAlarm.java
+++ /dev/null
@@ -1,159 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.alibaba.fastjson.annotation.JSONField;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.time.LocalDateTime;
-import java.util.Date;
-
-/**
- * <p>
- * 报警记录表
- * </p>
- *
- * @author zyj
- * @since 2023-05-16
- */
-@Data
-@ApiModel("Alarm")
-@TableName("br_bus_alarm")
-public class BusAlarm implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 项目ID
-     */
-    @ApiModelProperty(value = "项目ID")
-    @TableField("PROJECT_ID")
-    private Long projectId;
-
-    /**
-     * 设备ID
-     */
-    @ApiModelProperty(value = "设备ID")
-    @TableField("DEVICE_ID")
-    private Long deviceId;
-
-    /**
-     * 报警类型
-     */
-    @ApiModelProperty(value = "报警类型")
-    @TableField("ALARM_TYPE")
-    private String alarmType;
-
-    /**
-     * 报警状态
-     */
-    @ApiModelProperty(value = "报警状态")
-    @TableField("ALARM_STATUS")
-    private String alarmStatus;
-
-    /**
-     * 报警值
-     */
-    @ApiModelProperty(value = "报警值")
-    @TableField("ALARM_VALUE")
-    private String alarmValue;
-
-    /**
-     * 报警图片
-     */
-    @ApiModelProperty(value = "报警图片")
-    @TableField("ALARM_IMAGE")
-    private String alarmImage;
-
-    /**
-     * 报警内容
-     */
-    @ApiModelProperty(value = "报警内容")
-    @TableField("ALARM_CONTENT")
-    private String alarmContent;
-
-    /**
-     * 报警时间
-     */
-    @ApiModelProperty(value = "报警时间")
-    @TableField("ALARM_TIME")
-    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
-    private Date alarmTime;
-
-    /**
-     * 消警时间
-     */
-    @ApiModelProperty(value = "消警时间")
-    @TableField("CANCEL_TIME")
-    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
-    private Date cancelTime;
-
-    /**
-     * 报警位置经度
-     */
-    @ApiModelProperty(value = "报警位置经度")
-    @TableField("ALARM_LNG")
-    private String alarmLng;
-
-    /**
-     * 报警位置纬度
-     */
-    @ApiModelProperty(value = "报警位置纬度")
-    @TableField("ALARM_LAT")
-    private String alarmLat;
-
-    @ApiModelProperty("报警类型名称")
-    @TableField(exist = false)
-    private String alarmStatusName;
-    @ApiModelProperty("报警类型名称")
-    @TableField(exist = false)
-    private String alarmTypeName;
-    @ApiModelProperty("作业名称")
-    @TableField(exist = false)
-    private String workTitle;
-    @ApiModelProperty("所属道路")
-    @TableField(exist = false)
-    private String workRoad;
-    @ApiModelProperty("作业状态")
-    @TableField(exist = false)
-    private String projectState;
-    @ApiModelProperty("作业状态名称")
-    @TableField(exist = false)
-    private String projectStateName;
-    @ApiModelProperty("负责人姓名")
-    @TableField(exist = false)
-    private String workPersonName;
-    @ApiModelProperty("负责人联系方式")
-    @TableField(exist = false)
-    private String workPersonPhoneNumber;
-
-
-    @Override
-    public String toString() {
-        return "BusAlarm{" +
-                "id=" + id +
-                ", projectId=" + projectId +
-                ", deviceId=" + deviceId +
-                ", alarmType=" + alarmType +
-                ", alarmValue=" + alarmValue +
-                ", alarmStatus=" + alarmStatus +
-                ", alarmImage=" + alarmImage +
-                ", alarmContent=" + alarmContent +
-                ", alarmTime=" + alarmTime +
-                ", cancelTime=" + cancelTime +
-                ", alarmLng=" + alarmLng +
-                ", alarmLat=" + alarmLat +
-                "}";
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusEvent.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusEvent.java
deleted file mode 100644
index a0b7543..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusEvent.java
+++ /dev/null
@@ -1,100 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.time.LocalDateTime;
-import java.util.Date;
-import java.util.List;
-
-/**
- * <p>
- * 事件表
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@TableName("br_bus_event")
-@Data
-@ApiModel("BusEvent")
-public class BusEvent implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @ApiModelProperty("事件ID")
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 事件标题
-     */
-    @ApiModelProperty("事件名称")
-    @TableField("EVENT_TITLE")
-    private String eventTitle;
-
-    /**
-     * 上报人员
-     */
-    @ApiModelProperty("上报人员")
-    @TableField("UPLOAD_NAME")
-    private String uploadName;
-
-    /**
-     * 联系方式
-     */
-    @ApiModelProperty("联系方式")
-    @TableField("PHONE_NUMBER")
-    private String phoneNumber;
-
-    /**
-     * 事件描述
-     */
-    @ApiModelProperty("事件描述")
-    @TableField("EVENT_DESCRIPTION")
-    private String eventDescription;
-
-    @ApiModelProperty("经度")
-    @TableField("LNG")
-    private String lng;
-
-    @ApiModelProperty("纬度")
-    @TableField("LAT")
-    private String lat;
-
-    /**
-     * 事件上传时间
-     */
-    @ApiModelProperty("事件上传时间")
-    @TableField("CREATE_TIME")
-    private Date createTime;
-
-    @ApiModelProperty("事件照片")
-    @TableField(exist = false)
-    private List<BusEventImage> imageList;
-
-
-
-    @Override
-    public String toString() {
-        return "BusEvent{" +
-            "id=" + id +
-            ", eventTitle=" + eventTitle +
-            ", uploadName=" + uploadName +
-            ", phoneNumber=" + phoneNumber +
-            ", eventDescription=" + eventDescription +
-            ", lng=" + lng +
-            ", lat=" + lat +
-            ", createTime=" + createTime +
-        "}";
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusEventImage.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusEventImage.java
deleted file mode 100644
index 1e75245..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusEventImage.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-
-/**
- * <p>
- * 事件图片表
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@TableName("br_bus_event_image")
-@Data
-@ApiModel("BusEventImage")
-public class BusEventImage implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 事件ID
-     */
-    @TableField("EVENT_ID")
-    private Long eventId;
-
-    /**
-     * 报警图片
-     */
-    @TableField("IMAGE")
-    @ApiModelProperty("图片url")
-    private String image;
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Device.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Device.java
index df89c70..ea7db5f 100644
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Device.java
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Device.java
@@ -1,30 +1,23 @@
 package com.casic.missiles.modular.system.entity;
 
-import com.alibaba.fastjson.annotation.JSONField;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.casic.missiles.core.base.json.DateDeserializer;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
-import java.util.Date;
 
 /**
  * <p>
- * 
+ * 设备记录表
  * </p>
  *
  * @author zyj
- * @since 2023-04-14
+ * @since 2023-05-25
  */
-@ApiModel("Device")
-@TableName("br_device")
 @Data
+@TableName("bus_device")
 public class Device implements Serializable {
 
     private static final long serialVersionUID = 1L;
@@ -32,82 +25,86 @@
     /**
      * 主键
      */
-    @ApiModelProperty(value = "设备ID")
     @TableId(value = "ID",type = IdType.ASSIGN_ID)
     private Long id;
 
     /**
-     * 设备编号
+     * 设备名称
      */
-    @ApiModelProperty(value = "设备编号")
-    @TableField("DEVICE_CODE")
-    private String deviceCode;
+    @TableField("DEVICE_NAME")
+    private String deviceName;
 
     /**
-     * 设备类型
+     * IP
      */
-    @ApiModelProperty(value = "设备类型")
-    @TableField("DEVICE_TYPE")
-    private String deviceType;
+    @TableField("IP")
+    private String ip;
 
     /**
-     * 设备批次
+     * 端口
      */
-    @ApiModelProperty(value = "设备批次")
-    @TableField("DEVICE_BATCH")
-    private String deviceBatch;
+    @TableField("PORT")
+    private String port;
 
     /**
-     * 厂家
+     * 用户名
      */
-    @ApiModelProperty(value = "厂家")
-    @TableField("MANUFACTURER")
-    private String manufacturer;
+    @TableField("USER_NAME")
+    private String userName;
 
     /**
-     * 是否供电
+     * 密码
      */
-    @ApiModelProperty(value = "是否供电")
-    @TableField("IS_POWER_SUPPLY")
-    private String isPowerSupply;
+    @TableField("PASSWORD")
+    private String password;
 
     /**
-     * 创建时间
+     * 连接类型
      */
-    @ApiModelProperty(value = "创建时间",dataType = "Date")
-    @TableField("CREATE_TIME")
-    private Date createTime;
+    @TableField("CONNECT_TYPE")
+    private String connectType;
 
-    @ApiModelProperty(value = "设备类型名称")
-    @TableField(exist = false)
-    private String deviceTypeName;
+    /**
+     * 位置
+     */
+    @TableField("LOCATION")
 
-    @ApiModelProperty(value = "是否供电名称")
-    @TableField(exist = false)
-    private String isPowerSupplyName;
+    private String location;
 
-    @ApiModelProperty(value = "注册时间",dataType = "String")
-    @TableField(exist = false)
-    private String registerTime;
+    /**
+     * 设备状态
+     */
+    @TableField("STATUS")
 
-    @ApiModelProperty(value = "当前状态")
-    @TableField(exist = false)
     private String status;
 
-    @ApiModelProperty(value = "当前状态名称")
-    @TableField(exist = false)
-    private String statusName;
+    /**
+     * 报警分组
+     */
+    @TableField("ALARM_GROUP")
+
+    private Long alarmGroup;
+
+    /**
+     * 视频通道数(预留)
+     */
+    @TableField("CHANNEL_NUM")
+    private Integer channelNum;
 
     @Override
     public String toString() {
         return "Device{" +
             "id=" + id +
-            ", deviceCode=" + deviceCode +
-            ", deviceType=" + deviceType +
-            ", deviceBatch=" + deviceBatch +
-            ", manufacturer=" + manufacturer +
-            ", isPowerSupply=" + isPowerSupply +
-            ", createTime=" + createTime +
+            ", deviceName=" + deviceName +
+            ", ip=" + ip +
+            ", port=" + port +
+            ", userName=" + userName +
+            ", password=" + password +
+            ", connectType=" + connectType +
+            ", location=" + location +
+            ", status=" + status +
+            ", alarmGroup=" + alarmGroup +
+            ", channelNum=" + channelNum +
         "}";
     }
 }
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/DeviceExt.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/DeviceExt.java
deleted file mode 100644
index 5ee7015..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/DeviceExt.java
+++ /dev/null
@@ -1,99 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-
-/**
- * <p>
- * 设备扩展信息表（安全树）
- * </p>
- *
- * @author zyj
- * @since 2023-04-27
- */
-@Data
-@TableName("br_device_ext")
-public class DeviceExt implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 设备ID
-     */
-    @TableField("DEVICE_ID")
-    private Long deviceId;
-
-    /**
-     * 摄像头编号
-     */
-    @TableField("CAMERA_CODE")
-    private String cameraCode;
-
-    /**
-     * 摄像头IP
-     */
-    @TableField("CAMERA_IP")
-    private String cameraIp;
-
-    /**
-     * 摄像头端口
-     */
-    @TableField("CAMERA_PORT")
-    private String cameraPort;
-
-    /**
-     * 激甲编号
-     */
-    @TableField("GAS_CODE")
-    private String gasCode;
-
-    /**
-     * 激甲IP
-     */
-    @TableField("GAS_IP")
-    private String gasIp;
-
-    /**
-     * 激甲端口
-     */
-    @TableField("GAS_PORT")
-    private String gasPort;
-
-    /**
-     * 甲烷报警阈值
-     */
-    @TableField("GAS_THRESHOLD")
-    private String gasThreshold;
-
-    @TableField(value = "HAT_LINING_CODE")
-    private String hatLiningCode;
-
-
-    @Override
-    public String toString() {
-        return "DeviceExt{" +
-            "id=" + id +
-            ", deviceId=" + deviceId +
-            ", cameraCode=" + cameraCode +
-            ", cameraIp=" + cameraIp +
-            ", cameraPort=" + cameraPort +
-            ", gasCode=" + gasCode +
-            ", gasIp=" + gasIp +
-            ", gasPort=" + gasPort +
-            ", gasThreshold=" + gasThreshold +
-            ", hatLiningCode=" + hatLiningCode +
-        "}";
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/ProjectDevice.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/ProjectDevice.java
deleted file mode 100644
index c4f3472..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/ProjectDevice.java
+++ /dev/null
@@ -1,62 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-
-/**
- * <p>
- * 
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@Data
-@ApiModel("ProjectDevice")
-@TableName("br_project_device")
-public class ProjectDevice implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 作业现场ID
-     */
-    @TableField("PROJECT_ID")
-    private Long projectId;
-
-    /**
-     * 设备ID
-     */
-    @TableField("DEVICE_ID")
-    @ApiModelProperty("设备ID（新增编辑时传）")
-    private Long deviceId;
-
-    /**
-     * 设备编号
-     */
-    @TableField(exist = false)
-    @ApiModelProperty("设备编号（详情中展示，新增编辑不用传）")
-    private String deviceCode;
-
-    @Override
-    public String toString() {
-        return "ProjectDevice{" +
-            "id=" + id +
-            ", projectId=" + projectId +
-            ", deviceId=" + deviceId +
-        "}";
-    }
-}

diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/AlarmController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/AlarmController.java
new file mode 100644
index 0000000..1795cf1
--- /dev/null
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/AlarmController.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.modular.system.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.stereotype.Controller;
+
+/**
+ * <p>
+ * 报警记录表 前端控制器
+ * </p>
+ *
+ * @author zyj
+ * @since 2023-05-25
+ */
+@Controller
+@RequestMapping("/system/alarm")
+public class AlarmController {
+
+}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusAlarmController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusAlarmController.java
deleted file mode 100644
index 1f82ebb..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusAlarmController.java
+++ /dev/null
@@ -1,102 +0,0 @@
-package com.casic.missiles.modular.system.controller;
-
-
-import cn.hutool.core.util.ObjectUtil;
-import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.core.base.controller.BaseController;
-import com.casic.missiles.core.page.PageFactory;
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.AlarmUpload;
-import com.casic.missiles.modular.system.dto.DeviceDetailDTO;
-import com.casic.missiles.modular.system.entity.BusAlarm;
-import com.casic.missiles.modular.system.service.IBusAlarmService;
-import io.swagger.annotations.*;
-import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.*;
-
-import org.springframework.stereotype.Controller;
-
-import static com.casic.missiles.model.response.ResponseData.DEFAULT_SUCCESS_MESSAGE;
-import static com.casic.missiles.modular.system.consts.AlarmConst.ALARM_STATUS_MANUAL_CANCEL;
-
-/**
- * <p>
- * 报警记录表 前端控制器
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@Api(tags = "报警管理接口")
-@Controller
-@RequestMapping("/alarm")
-@RequiredArgsConstructor
-public class BusAlarmController extends BaseController {
-
-    private final IBusAlarmService alarmService;
-
-    @ApiOperation("报警上报接口")
-    @PostMapping("/upload")
-    @ResponseBody
-    public Object upload(@RequestBody AlarmUpload alarmUpload){
-        alarmService.alarmUpload(alarmUpload);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("报警列表分页查询")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "workTitle", value = "作业名称",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "projectId", value = "作业ID",dataType = "Long", paramType = "query",example = "0"),
-            @ApiImplicitParam(name = "alarmStatus", value = "报警状态",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "projectState", value = "作业状态",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "alarmType", value = "报警类型",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "alarmStartTime", value = "报警开始时间",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "alarmEndTime", value = "报警结束时间",dataType = "String", paramType = "query")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = BusAlarm.class),
-    })
-    @GetMapping("/listPage")
-    @ResponseBody
-    public Object listPage(String workTitle,Long projectId,String alarmStatus,String projectState,String alarmType,String alarmStartTime,String alarmEndTime){
-        Page<BusAlarm> page = PageFactory.defaultPage();
-        QueryWrapper<BusAlarm> queryWrapper = new QueryWrapper<>();
-        if(StrUtil.isNotEmpty(workTitle)){
-            queryWrapper.like("p.WORK_TITLE",workTitle);
-        }
-        if(ObjectUtil.isNotEmpty(projectId)){
-            queryWrapper.eq("alarm.PROJECT_ID",projectId);
-        }
-        if(StrUtil.isNotEmpty(alarmStatus)){
-            queryWrapper.eq("alarm.ALARM_STATUS",alarmStatus);
-        }
-        if(StrUtil.isNotEmpty(projectState)){
-            queryWrapper.eq("p.PROJECT_STATE",projectState);
-        }
-        if(StrUtil.isNotEmpty(alarmType)){
-            queryWrapper.eq("alarm.ALARM_TYPE",alarmType);
-        }
-        if(StrUtil.isNotEmpty(alarmStartTime)){
-            queryWrapper.ge("alarm.ALARM_TIME",alarmStartTime);
-        }
-        if(StrUtil.isNotEmpty(alarmEndTime)){
-            queryWrapper.le("alarm.ALARM_TIME",alarmEndTime);
-        }
-        page = alarmService.listPage(page,queryWrapper);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-    @ApiOperation("消警")
-    @PostMapping("/cancel")
-    @ResponseBody
-    public Object cancel(@RequestParam("alarmId") Long alarmId){
-        UpdateWrapper<BusAlarm> updateWrapper = new UpdateWrapper<>();
-        updateWrapper.eq("ID",alarmId);
-        updateWrapper.set("ALARM_STATUS",ALARM_STATUS_MANUAL_CANCEL);
-        alarmService.update(updateWrapper);
-        return ResponseData.success();
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusEventController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusEventController.java
deleted file mode 100644
index dde5aad..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusEventController.java
+++ /dev/null
@@ -1,41 +0,0 @@
-package com.casic.missiles.modular.system.controller;
-
-
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.entity.BusEvent;
-import com.casic.missiles.modular.system.service.IBusEventService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.ResponseBody;
-
-/**
- * <p>
- * 事件表 前端控制器
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@Controller
-@RequestMapping("/event")
-@Api(tags = "事件上报")
-@RequiredArgsConstructor
-public class BusEventController {
-
-    private final IBusEventService eventService;
-
-    @ApiOperation("事件上报")
-    @PostMapping("add")
-    @ResponseBody
-    public Object add(@RequestBody BusEvent busEvent){
-        eventService.saveBusEvent(busEvent);
-        return ResponseData.success();
-    }
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
index 03abc5f..aa50d78 100644
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
@@ -1,121 +1,20 @@
 package com.casic.missiles.modular.system.controller;
 
 
-import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.core.base.controller.BaseController;
-import com.casic.missiles.core.page.PageFactory;
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.DeviceDetailDTO;
-import com.casic.missiles.modular.system.entity.Device;
-import com.casic.missiles.modular.system.service.IDeviceExtService;
-import com.casic.missiles.modular.system.service.IDeviceService;
-import io.swagger.annotations.*;
-import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.RequestMapping;
 
 import org.springframework.stereotype.Controller;
 
-import java.time.LocalDateTime;
-import java.util.Date;
-import java.util.List;
-
-import static com.casic.missiles.model.response.ResponseData.DEFAULT_SUCCESS_MESSAGE;
-
 /**
  * <p>
- *  前端控制器
+ * 设备记录表 前端控制器
  * </p>
  *
  * @author zyj
- * @since 2023-04-14
+ * @since 2023-05-25
  */
-@Api(tags = "设备管理接口")
-@RequiredArgsConstructor
 @Controller
-@RequestMapping("/device")
-public class DeviceController extends BaseController {
-    private final IDeviceService deviceService;
-    private final IDeviceExtService deviceExtService;
-
-    @ApiOperation("设备分页列表")
-    @ApiImplicitParams({
-        @ApiImplicitParam(name = "deviceType", value = "设备类型",dataType = "String", paramType = "query"),
-        @ApiImplicitParam(name = "deviceCode", value = "设备编号",dataType = "String", paramType = "query"),
-        @ApiImplicitParam(name = "status", value = "设备状态",dataType = "String", paramType = "query"),
-        @ApiImplicitParam(name = "projectId", value = "作业ID（如果传此参数，列表中返回该作业使用的设备）",dataType = "Long", paramType = "query", example = "0")
-    })
-    @ApiResponses({
-        @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = DeviceDetailDTO.class),
-    })
-    @GetMapping("listPage")
-    @ResponseBody
-    public Object listPage(String deviceType, String deviceCode, String status,Long projectId){
-        Page<DeviceDetailDTO> page = PageFactory.defaultPage();
-        QueryWrapper<DeviceDetailDTO> queryWrapper = new QueryWrapper<>();
-        if(StrUtil.isNotEmpty(deviceType)){
-            queryWrapper.eq("DEVICE_TYPE",deviceType);
-        }
-        if(StrUtil.isNotEmpty(deviceCode)){
-            queryWrapper.like("DEVICE_CODE",deviceCode);
-        }
-        page = deviceService.listPage(page,queryWrapper,status,projectId);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-    @ApiOperation("新增设备")
-    @PostMapping("add")
-    @ResponseBody
-    public Object add(@RequestBody DeviceDetailDTO deviceDetailDTO){
-        deviceService.saveDevice(deviceDetailDTO);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("编辑设备")
-    @PostMapping("update")
-    @ResponseBody
-    public Object update(@RequestBody DeviceDetailDTO deviceDetailDTO){
-        deviceService.updateDevice(deviceDetailDTO);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("删除设备")
-    @PostMapping("delete")
-    @ResponseBody
-    public Object delete(@ApiParam("设备id列表")@RequestBody List<Long> deviceIds){
-        deviceService.deleteDevices(deviceIds);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("设置甲烷阈值")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "gasIp", value = "安全树甲烷设备IP",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "gasPort", value = "安全树甲烷端口",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "threshold", value = "甲烷阈值",dataType = "String", paramType = "query")
-    })
-    @PostMapping("setThreshold")
-    @ResponseBody
-    public Object setThreshold(String gasIp,String gasPort,String threshold){
-        deviceExtService.setGasThreshold(gasIp, gasPort, threshold);
-        return ResponseData.success();
-    }
-
-
-    @ApiOperation("查询甲烷阈值")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "gasIp", value = "安全树甲烷设备IP",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "gasPort", value = "安全树甲烷端口",dataType = "String", paramType = "query")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = "{\"code\": 200,\"data\": \"100\",\"message\": \"请求成功\",\"success\": true}",response = String.class),
-    })
-    @GetMapping("getThreshold")
-    @ResponseBody
-    public Object getThreshold(String gasIp,String gasPort){
-        String data = deviceExtService.getGasThreshold(gasIp, gasPort);
-        return ResponseData.success(data);
-    }
-
+@RequestMapping("/system/device")
+public class DeviceController {
 
 }
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/OverviewController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/OverviewController.java
deleted file mode 100644
index 7570504..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/OverviewController.java
+++ /dev/null
@@ -1,70 +0,0 @@
-package com.casic.missiles.modular.system.controller;
-
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.AlarmTypeCountDTO;
-import com.casic.missiles.modular.system.dto.DeviceLocationDTO;
-import com.casic.missiles.modular.system.dto.WorkerLocationDTO;
-import com.casic.missiles.modular.system.service.IBusAlarmService;
-import com.casic.missiles.modular.system.service.IProjectDeviceService;
-import com.casic.missiles.modular.system.service.IProjectWorkerService;
-import io.swagger.annotations.*;
-import lombok.RequiredArgsConstructor;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.ResponseBody;
-
-import static com.casic.missiles.model.response.ResponseData.DEFAULT_SUCCESS_MESSAGE;
-import static com.casic.missiles.modular.system.consts.AlarmConst.ALARM_STATUS_ON;
-
-@Api(tags = "首页看板接口")
-@Controller
-@RequestMapping("overview")
-@RequiredArgsConstructor
-public class OverviewController {
-
-    private final IBusAlarmService alarmService;
-    private final IProjectDeviceService projectDeviceService;
-
-    private final IProjectWorkerService projectWorkerService;
-
-
-    @ApiOperation("报警统计接口")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "projectId", value = "作业ID",dataType = "Long", paramType = "query", example = "0")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = AlarmTypeCountDTO.class),
-    })
-    @GetMapping("/alarmCount")
-    @ResponseBody
-    public Object alarmCount(Long projectId){
-        return ResponseData.success(alarmService.alarmCount(projectId,ALARM_STATUS_ON));
-    }
-
-    @ApiOperation("设备列表接口")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "projectId", value = "作业ID",dataType = "Long", paramType = "query", example = "0")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = DeviceLocationDTO.class),
-    })
-    @GetMapping("/deviceList")
-    @ResponseBody
-    public Object deviceList(Long projectId){
-        return ResponseData.success(projectDeviceService.selectDeviceLocationList(projectId));
-    }
-
-    @ApiOperation("人员列表接口")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "projectId", value = "作业ID",dataType = "Long", paramType = "query", example = "0")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = WorkerLocationDTO.class),
-    })
-    @GetMapping("/workerList")
-    @ResponseBody
-    public Object workerList(Long projectId){
-        return ResponseData.success(projectWorkerService.selectWorkerLocationDTO(projectId));
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/WorkSiteInfoController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/WorkSiteInfoController.java
deleted file mode 100644
index af36d69..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/WorkSiteInfoController.java
+++ /dev/null
@@ -1,130 +0,0 @@
-package com.casic.missiles.modular.system.controller;
-
-
-import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.core.base.controller.BaseController;
-import com.casic.missiles.core.page.PageFactory;
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.WorkSiteDetailDTO;
-import com.casic.missiles.modular.system.entity.WorkSiteInfo;
-import com.casic.missiles.modular.system.service.IWorkSiteInfoService;
-import io.swagger.annotations.*;
-import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.*;
-
-import org.springframework.stereotype.Controller;
-
-import java.util.List;
-
-import static com.casic.missiles.model.response.ResponseData.DEFAULT_SUCCESS_MESSAGE;
-
-/**
- * <p>
- * 作业现场表 前端控制器
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@Controller
-@RequestMapping("/site")
-@Api(tags = "作业现场管理")
-@RequiredArgsConstructor
-public class WorkSiteInfoController extends BaseController {
-
-
-    private final IWorkSiteInfoService workSiteInfoService;
-
-    @ApiOperation("新增作业现场")
-    @PostMapping("add")
-    @ResponseBody
-    public Object addWorkSite(@RequestBody WorkSiteDetailDTO workSiteDetailDTO){
-        workSiteInfoService.addWorkSiteInfo(workSiteDetailDTO);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("编辑作业现场")
-    @PostMapping("update")
-    @ResponseBody
-    public Object updateWorkSite(@RequestBody WorkSiteDetailDTO workSiteDetailDTO){
-        workSiteInfoService.updateWorkSiteInfo(workSiteDetailDTO);
-        return ResponseData.success();
-    }
-
-
-    @ApiOperation("删除作业现场")
-    @PostMapping("delete")
-    @ResponseBody
-    public Object delete(@ApiParam("作业现场id列表")@RequestBody List<Long> projectIds){
-        workSiteInfoService.deleteProjects(projectIds);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("查询作业现场详情")
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = WorkSiteDetailDTO.class),
-    })
-    @GetMapping("detail")
-    @ResponseBody
-    public Object delete(@ApiParam(value = "作业现场id", example = "0")@RequestParam Long projectId){
-        WorkSiteDetailDTO detailDTO = workSiteInfoService.getWorkSiteDetail(projectId);
-        return ResponseData.success(detailDTO);
-    }
-
-    @ApiOperation("分页列表查询")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "workTitle",value = "作业名称", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "workRoad",value = "所属道路", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "workPersonName",value = "责任人姓名", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "startDate",value = "注册开始日期", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "endDate",value = "注册结束日期", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "projectState",value = "当前状态（字典值）", dataType = "String", paramType = "query")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = WorkSiteInfo.class),
-    })
-    @GetMapping("listPage")
-    @ResponseBody
-    public Object listPage(String workTitle,String workRoad,String workPersonName,String projectState,String startDate,String endDate){
-        Page<WorkSiteInfo> page = PageFactory.defaultPage();
-        QueryWrapper<WorkSiteInfo> queryWrapper = new QueryWrapper<>();
-        if(StrUtil.isNotEmpty(workTitle)){
-            queryWrapper.like("WORK_TITLE",workTitle);
-        }
-        if(StrUtil.isNotEmpty(workRoad)){
-            queryWrapper.like("WORK_ROAD",workRoad);
-        }
-        if(StrUtil.isNotEmpty(workPersonName)){
-            queryWrapper.like("WORKER_NAME",workPersonName);
-        }
-        if(StrUtil.isNotEmpty(projectState)){
-            queryWrapper.eq("PROJECT_STATE",projectState);
-        }
-        if(StrUtil.isNotEmpty(startDate)){
-            queryWrapper.ge("br_work_site_info.CREATE_TIME",startDate + " 00:00:00");
-        }
-        if(StrUtil.isNotEmpty(endDate)){
-            queryWrapper.le("br_work_site_info.CREATE_TIME",endDate + " 23:59:59");
-        }
-        page = workSiteInfoService.selectListPage(page,queryWrapper);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-    @ApiOperation("开始作业")
-    @PostMapping("start")
-    @ResponseBody
-    public Object start(@ApiParam(value = "作业现场id",example = "0")@RequestParam Long projectId){
-        workSiteInfoService.start(projectId);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("完成作业")
-    @PostMapping("finish")
-    @ResponseBody
-    public Object finish(@ApiParam(value = "作业现场id", example = "0")@RequestParam Long projectId){
-        workSiteInfoService.finish(projectId);
-        return ResponseData.success();
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/WorkerController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/WorkerController.java
deleted file mode 100644
index 796f94c..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/WorkerController.java
+++ /dev/null
@@ -1,136 +0,0 @@
-package com.casic.missiles.modular.system.controller;
-
-
-import cn.hutool.core.util.ObjectUtil;
-import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.core.base.controller.BaseController;
-import com.casic.missiles.core.page.PageFactory;
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.DeviceDetailDTO;
-import com.casic.missiles.modular.system.entity.Device;
-import com.casic.missiles.modular.system.entity.Worker;
-import com.casic.missiles.modular.system.service.IWorkerService;
-import io.swagger.annotations.*;
-import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.*;
-
-import org.springframework.stereotype.Controller;
-
-import java.util.Date;
-import java.util.List;
-
-import static com.casic.missiles.model.response.ResponseData.DEFAULT_SUCCESS_MESSAGE;
-
-/**
- * <p>
- *  前端控制器
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@Controller
-@RequestMapping("/worker")
-@RequiredArgsConstructor
-@Api(tags = "人员管理接口")
-public class WorkerController extends BaseController {
-
-    private final IWorkerService workerService;
-
-    @ApiOperation("分页列表查询")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "name",value = "姓名", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "deptId",value = "所属部门", dataType = "Long", paramType = "query", example = "0"),
-            @ApiImplicitParam(name = "status",value = "当前状态（字典值）", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "startDate",value = "注册开始日期", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "endDate",value = "注册结束日期", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "workerType",value = "人员类型（字典值）", dataType = "String", paramType = "query")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = Worker.class),
-    })
-    @GetMapping("listPage")
-    @ResponseBody
-    public Object listPage(String name,Long deptId, String status,String startDate,String endDate,String workerType){
-        Page<Worker> page = PageFactory.defaultPage();
-        QueryWrapper<Worker> queryWrapper = new QueryWrapper<>();
-        if(StrUtil.isNotEmpty(name)){
-            queryWrapper.like("WORKER_NAME",name);
-        }
-        if(ObjectUtil.isNotEmpty(deptId)){
-            queryWrapper.eq("DEPT_ID",deptId);
-        }
-        if(StrUtil.isNotEmpty(workerType)){
-            queryWrapper.eq("WORKER_TYPE",workerType);
-        }
-        if(StrUtil.isNotEmpty(startDate)){
-            queryWrapper.ge("CREATE_TIME",startDate + " 00:00:00");
-        }
-        if(StrUtil.isNotEmpty(endDate)){
-            queryWrapper.le("CREATE_TIME",endDate + " 23:59:59");
-        }
-        if(StrUtil.isNotEmpty(status)){
-            queryWrapper.eq("`STATUS`",status);
-        }
-        page = workerService.selectListPage(page,queryWrapper);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-    @ApiOperation("新增人员")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "worker", value = "人员信息", dataType = "Worker", paramType = "body", required = true),
-            @ApiImplicitParam(name = "projectId", value = "项目ID(入场申请需要)", dataType = "Long", paramType = "query", example = "0")
-    })
-    @PostMapping("add")
-    @ResponseBody
-    public Object add(@ApiParam("worker")@RequestBody Worker worker,
-                      @RequestParam(required = false) Long projectId){
-        workerService.addWorker(worker,projectId);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("编辑人员")
-    @PostMapping("update")
-    @ResponseBody
-    public Object update(@RequestBody Worker worker){
-        workerService.updateById(worker);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("删除人员")
-    @PostMapping("delete")
-    @ResponseBody
-    public Object delete(@ApiParam("人员id列表")@RequestBody List<Long> workIds){
-        workerService.removeByIds(workIds);
-        return ResponseData.success();
-    }
-
-
-    @ApiOperation(value = "获取人脸图片",notes = "返回人脸图片url")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "cameraIp",value = "摄像头IP", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "cameraPort",value = "摄像头端口号", dataType = "String", paramType = "query"),
-    })
-    @GetMapping("/face/register")
-    @ResponseBody
-    public Object faceRegister(String cameraIp,String cameraPort){
-        return ResponseData.success(workerService.faceRegister(cameraIp, cameraPort));
-    }
-
-
-    @ApiOperation(value = "查询临时入场人员列表")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "projectId", value = "项目ID",required = true,dataType = "Long", paramType = "query", example = "0")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = Worker.class),
-    })
-    @GetMapping("/projectTempWorker")
-    @ResponseBody
-    public Object projectTempWorker(Long projectId){
-        return ResponseData.success(workerService.projectTempWorker(projectId));
-    }
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/AlarmTypeCountDTO.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/AlarmTypeCountDTO.java
deleted file mode 100644
index 1a165a1..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/AlarmTypeCountDTO.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.casic.missiles.modular.system.dto;
-
-import io.swagger.annotations.ApiModel;
-import lombok.Data;
-
-@ApiModel(value = "AlarmTypeCountDTO",description = "报警类型统计（首页）")
-@Data
-public class AlarmTypeCountDTO {
-
-    private String alarmType;
-    private String alarmTypeName;
-    private Integer alarmCount;
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/AlarmUpload.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/AlarmUpload.java
deleted file mode 100644
index 73d7799..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/AlarmUpload.java
+++ /dev/null
@@ -1,46 +0,0 @@
-package com.casic.missiles.modular.system.dto;
-
-import cn.hutool.core.util.StrUtil;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-@ApiModel(value = "AlarmUpload",description = "报警上传")
-@Data
-public class AlarmUpload {
-
-    @ApiModelProperty(value = "摄像头ip")
-    private String cameraIp;
-
-    @ApiModelProperty(value = "摄像头端口")
-    private String cameraPort;
-    @ApiModelProperty(value = "安全树甲烷设备ip")
-    private String gasIp;
-    @ApiModelProperty(value = "安全树甲烷设备端口")
-    private String gasPort;
-    @ApiModelProperty(value = "报警值")
-    private String alarmValue;
-    @ApiModelProperty(value = "报警时间")
-    private String alarmTime;
-    @ApiModelProperty(value = "报警类型")
-    private String alarmType;
-    @ApiModelProperty(value = "报警图片")
-    private String alarmImage;
-    @ApiModelProperty(value = "报警内容")
-    private String alarmContent;
-
-    @Override
-    public String toString() {
-        return "AlarmUpload{" +
-                "cameraIp='" + cameraIp + '\'' +
-                ", cameraPort='" + cameraPort + '\'' +
-                ", gasIp='" + gasIp + '\'' +
-                ", gasPort='" + gasPort + '\'' +
-                ", alarmValue='" + alarmValue + '\'' +
-                ", alarmTime='" + alarmTime + '\'' +
-                ", alarmType='" + alarmType + '\'' +
-                ", alarmImage='" + (StrUtil.isNotEmpty(alarmImage) ? alarmImage.substring(0,50) : "null") + '\'' +
-                ", alarmContent='" + alarmContent + '\'' +
-                '}';
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/DeviceDetailDTO.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/DeviceDetailDTO.java
deleted file mode 100644
index ea518d9..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/DeviceDetailDTO.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package com.casic.missiles.modular.system.dto;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.casic.missiles.modular.system.entity.Device;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-@ApiModel("DeviceDetailDTO")
-@Data
-public class DeviceDetailDTO extends Device {
-
-    @ApiModelProperty(value = "摄像头编号")
-    private String cameraCode;
-
-    @ApiModelProperty(value = "摄像头IP")
-    private String cameraIp;
-
-    @ApiModelProperty(value = "摄像头端口")
-    private String cameraPort;
-
-    @ApiModelProperty(value = "激甲编号")
-    private String gasCode;
-
-    @ApiModelProperty(value = "激甲IP")
-    private String gasIp;
-
-    @ApiModelProperty(value = "激甲端口")
-    private String gasPort;
-
-    @ApiModelProperty(value = "智能帽衬编号")
-    private String hatLiningCode;
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/WorkSiteDetailDTO.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/WorkSiteDetailDTO.java
deleted file mode 100644
index 29378ff..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/WorkSiteDetailDTO.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package com.casic.missiles.modular.system.dto;
-
-import com.casic.missiles.modular.system.entity.ProjectDevice;
-import com.casic.missiles.modular.system.entity.ProjectWorker;
-import com.casic.missiles.modular.system.entity.WorkSiteInfo;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.util.List;
-
-@Data
-@ApiModel("WorkSiteDetailDTO")
-public class WorkSiteDetailDTO extends WorkSiteInfo {
-
-    @ApiModelProperty(value = "安全树列表",dataType = "ProjectDevice")
-    private List<ProjectDevice> deviceList;
-
-    @ApiModelProperty(value = "人员列表",dataType = "ProjectWorker")
-    private List<ProjectWorker> workerList;
-
-
-
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/WorkerLocationDTO.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/WorkerLocationDTO.java
deleted file mode 100644
index 6fd7b24..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/WorkerLocationDTO.java
+++ /dev/null
@@ -1,68 +0,0 @@
-package com.casic.missiles.modular.system.dto;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-@ApiModel(value = "WorkerLocationDTO",description = "人员位置列表（首页）")
-@Data
-public class WorkerLocationDTO {
-
-    @ApiModelProperty("人员ID")
-    private Long workerId;
-
-    @ApiModelProperty("人员姓名")
-    private String workerName;
-
-    @ApiModelProperty("安全帽编号")
-    private String hatCode;
-
-    @ApiModelProperty("安全帽ID")
-    private Long hatId;
-
-    @ApiModelProperty("背心编号")
-    private String vastCode;
-
-    @ApiModelProperty("手环编号")
-    private String braceletCode;
-
-    @ApiModelProperty("位置")
-    private String location;
-
-    @ApiModelProperty("时间")
-    private String time;
-
-    @ApiModelProperty("经度")
-    private String lng;
-
-    @ApiModelProperty("纬度")
-    private String lat;
-
-    @ApiModelProperty("心率")
-    private String heartRate;
-
-    @ApiModelProperty("血氧")
-    private String bloodOxygen;
-
-    @ApiModelProperty("一氧化碳")
-    private String co;
-
-    @ApiModelProperty("甲烷")
-    private String gas;
-
-    @ApiModelProperty("硫化氢")
-    private String h2s;
-
-    @ApiModelProperty("氧气")
-    private String o2;
-
-    @ApiModelProperty("信号")
-    private String signal;
-
-    @ApiModelProperty("电量")
-    private String cell;
-
-    @ApiModelProperty("是否报警")
-    private boolean alarmFlag;
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Alarm.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Alarm.java
new file mode 100644
index 0000000..4d2b7ef
--- /dev/null
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Alarm.java
@@ -0,0 +1,103 @@
+package com.casic.missiles.modular.system.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import java.util.Date;
+
+/**
+ * <p>
+ * 报警记录表
+ * </p>
+ *
+ * @author zyj
+ * @since 2023-05-25
+ */
+@Data
+@TableName("bus_alarm")
+public class Alarm implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    @TableId(value = "ID",type = IdType.ASSIGN_ID)
+    private Long id;
+
+    /**
+     * 设备ID
+     */
+    @TableField("DEVICE_ID")
+    private Long deviceId;
+
+    /**
+     * 报警类型
+     */
+    @TableField("ALARM_TYPE")
+    private String alarmType;
+
+    /**
+     * 报警时间
+     */
+    @TableField("ALARM_TIME")
+    private Date alarmTime;
+
+    /**
+     * 报警状态
+     */
+    @TableField("ALARM_STATUS")
+    private String alarmStatus;
+
+    /**
+     * 报警位置
+     */
+    @TableField("ALARM_LOCATION")
+    private String alarmLocation;
+
+    /**
+     * 报警图片
+     */
+    @TableField("ALARM_IMAGE")
+    private String alarmImage;
+
+    /**
+     * 视频通道号
+     */
+    @TableField("CHANNEL_NO")
+    private Integer channelNo;
+
+    /**
+     * 报警内容
+     */
+    @TableField("ALARM_CONTENT")
+    private String alarmContent;
+
+    /**
+     * 消警时间
+     */
+    @TableField("CANCEL_TIME")
+    private Date cancelTime;
+
+
+    @Override
+    public String toString() {
+        return "Alarm{" +
+            "id=" + id +
+            ", deviceId=" + deviceId +
+            ", alarmType=" + alarmType +
+            ", alarmTime=" + alarmTime +
+            ", alarmStatus=" + alarmStatus +
+            ", alarmLocation=" + alarmLocation +
+            ", alarmImage=" + alarmImage +
+            ", channelNo=" + channelNo +
+            ", alarmContent=" + alarmContent +
+            ", cancelTime=" + cancelTime +
+        "}";
+    }
+}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusAlarm.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusAlarm.java
deleted file mode 100644
index efb4a23..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusAlarm.java
+++ /dev/null
@@ -1,159 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.alibaba.fastjson.annotation.JSONField;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.time.LocalDateTime;
-import java.util.Date;
-
-/**
- * <p>
- * 报警记录表
- * </p>
- *
- * @author zyj
- * @since 2023-05-16
- */
-@Data
-@ApiModel("Alarm")
-@TableName("br_bus_alarm")
-public class BusAlarm implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 项目ID
-     */
-    @ApiModelProperty(value = "项目ID")
-    @TableField("PROJECT_ID")
-    private Long projectId;
-
-    /**
-     * 设备ID
-     */
-    @ApiModelProperty(value = "设备ID")
-    @TableField("DEVICE_ID")
-    private Long deviceId;
-
-    /**
-     * 报警类型
-     */
-    @ApiModelProperty(value = "报警类型")
-    @TableField("ALARM_TYPE")
-    private String alarmType;
-
-    /**
-     * 报警状态
-     */
-    @ApiModelProperty(value = "报警状态")
-    @TableField("ALARM_STATUS")
-    private String alarmStatus;
-
-    /**
-     * 报警值
-     */
-    @ApiModelProperty(value = "报警值")
-    @TableField("ALARM_VALUE")
-    private String alarmValue;
-
-    /**
-     * 报警图片
-     */
-    @ApiModelProperty(value = "报警图片")
-    @TableField("ALARM_IMAGE")
-    private String alarmImage;
-
-    /**
-     * 报警内容
-     */
-    @ApiModelProperty(value = "报警内容")
-    @TableField("ALARM_CONTENT")
-    private String alarmContent;
-
-    /**
-     * 报警时间
-     */
-    @ApiModelProperty(value = "报警时间")
-    @TableField("ALARM_TIME")
-    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
-    private Date alarmTime;
-
-    /**
-     * 消警时间
-     */
-    @ApiModelProperty(value = "消警时间")
-    @TableField("CANCEL_TIME")
-    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
-    private Date cancelTime;
-
-    /**
-     * 报警位置经度
-     */
-    @ApiModelProperty(value = "报警位置经度")
-    @TableField("ALARM_LNG")
-    private String alarmLng;
-
-    /**
-     * 报警位置纬度
-     */
-    @ApiModelProperty(value = "报警位置纬度")
-    @TableField("ALARM_LAT")
-    private String alarmLat;
-
-    @ApiModelProperty("报警类型名称")
-    @TableField(exist = false)
-    private String alarmStatusName;
-    @ApiModelProperty("报警类型名称")
-    @TableField(exist = false)
-    private String alarmTypeName;
-    @ApiModelProperty("作业名称")
-    @TableField(exist = false)
-    private String workTitle;
-    @ApiModelProperty("所属道路")
-    @TableField(exist = false)
-    private String workRoad;
-    @ApiModelProperty("作业状态")
-    @TableField(exist = false)
-    private String projectState;
-    @ApiModelProperty("作业状态名称")
-    @TableField(exist = false)
-    private String projectStateName;
-    @ApiModelProperty("负责人姓名")
-    @TableField(exist = false)
-    private String workPersonName;
-    @ApiModelProperty("负责人联系方式")
-    @TableField(exist = false)
-    private String workPersonPhoneNumber;
-
-
-    @Override
-    public String toString() {
-        return "BusAlarm{" +
-                "id=" + id +
-                ", projectId=" + projectId +
-                ", deviceId=" + deviceId +
-                ", alarmType=" + alarmType +
-                ", alarmValue=" + alarmValue +
-                ", alarmStatus=" + alarmStatus +
-                ", alarmImage=" + alarmImage +
-                ", alarmContent=" + alarmContent +
-                ", alarmTime=" + alarmTime +
-                ", cancelTime=" + cancelTime +
-                ", alarmLng=" + alarmLng +
-                ", alarmLat=" + alarmLat +
-                "}";
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusEvent.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusEvent.java
deleted file mode 100644
index a0b7543..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusEvent.java
+++ /dev/null
@@ -1,100 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.time.LocalDateTime;
-import java.util.Date;
-import java.util.List;
-
-/**
- * <p>
- * 事件表
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@TableName("br_bus_event")
-@Data
-@ApiModel("BusEvent")
-public class BusEvent implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @ApiModelProperty("事件ID")
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 事件标题
-     */
-    @ApiModelProperty("事件名称")
-    @TableField("EVENT_TITLE")
-    private String eventTitle;
-
-    /**
-     * 上报人员
-     */
-    @ApiModelProperty("上报人员")
-    @TableField("UPLOAD_NAME")
-    private String uploadName;
-
-    /**
-     * 联系方式
-     */
-    @ApiModelProperty("联系方式")
-    @TableField("PHONE_NUMBER")
-    private String phoneNumber;
-
-    /**
-     * 事件描述
-     */
-    @ApiModelProperty("事件描述")
-    @TableField("EVENT_DESCRIPTION")
-    private String eventDescription;
-
-    @ApiModelProperty("经度")
-    @TableField("LNG")
-    private String lng;
-
-    @ApiModelProperty("纬度")
-    @TableField("LAT")
-    private String lat;
-
-    /**
-     * 事件上传时间
-     */
-    @ApiModelProperty("事件上传时间")
-    @TableField("CREATE_TIME")
-    private Date createTime;
-
-    @ApiModelProperty("事件照片")
-    @TableField(exist = false)
-    private List<BusEventImage> imageList;
-
-
-
-    @Override
-    public String toString() {
-        return "BusEvent{" +
-            "id=" + id +
-            ", eventTitle=" + eventTitle +
-            ", uploadName=" + uploadName +
-            ", phoneNumber=" + phoneNumber +
-            ", eventDescription=" + eventDescription +
-            ", lng=" + lng +
-            ", lat=" + lat +
-            ", createTime=" + createTime +
-        "}";
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusEventImage.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusEventImage.java
deleted file mode 100644
index 1e75245..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusEventImage.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-
-/**
- * <p>
- * 事件图片表
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@TableName("br_bus_event_image")
-@Data
-@ApiModel("BusEventImage")
-public class BusEventImage implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 事件ID
-     */
-    @TableField("EVENT_ID")
-    private Long eventId;
-
-    /**
-     * 报警图片
-     */
-    @TableField("IMAGE")
-    @ApiModelProperty("图片url")
-    private String image;
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Device.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Device.java
index df89c70..ea7db5f 100644
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Device.java
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Device.java
@@ -1,30 +1,23 @@
 package com.casic.missiles.modular.system.entity;
 
-import com.alibaba.fastjson.annotation.JSONField;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.casic.missiles.core.base.json.DateDeserializer;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
-import java.util.Date;
 
 /**
  * <p>
- * 
+ * 设备记录表
  * </p>
  *
  * @author zyj
- * @since 2023-04-14
+ * @since 2023-05-25
  */
-@ApiModel("Device")
-@TableName("br_device")
 @Data
+@TableName("bus_device")
 public class Device implements Serializable {
 
     private static final long serialVersionUID = 1L;
@@ -32,82 +25,86 @@
     /**
      * 主键
      */
-    @ApiModelProperty(value = "设备ID")
     @TableId(value = "ID",type = IdType.ASSIGN_ID)
     private Long id;
 
     /**
-     * 设备编号
+     * 设备名称
      */
-    @ApiModelProperty(value = "设备编号")
-    @TableField("DEVICE_CODE")
-    private String deviceCode;
+    @TableField("DEVICE_NAME")
+    private String deviceName;
 
     /**
-     * 设备类型
+     * IP
      */
-    @ApiModelProperty(value = "设备类型")
-    @TableField("DEVICE_TYPE")
-    private String deviceType;
+    @TableField("IP")
+    private String ip;
 
     /**
-     * 设备批次
+     * 端口
      */
-    @ApiModelProperty(value = "设备批次")
-    @TableField("DEVICE_BATCH")
-    private String deviceBatch;
+    @TableField("PORT")
+    private String port;
 
     /**
-     * 厂家
+     * 用户名
      */
-    @ApiModelProperty(value = "厂家")
-    @TableField("MANUFACTURER")
-    private String manufacturer;
+    @TableField("USER_NAME")
+    private String userName;
 
     /**
-     * 是否供电
+     * 密码
      */
-    @ApiModelProperty(value = "是否供电")
-    @TableField("IS_POWER_SUPPLY")
-    private String isPowerSupply;
+    @TableField("PASSWORD")
+    private String password;
 
     /**
-     * 创建时间
+     * 连接类型
      */
-    @ApiModelProperty(value = "创建时间",dataType = "Date")
-    @TableField("CREATE_TIME")
-    private Date createTime;
+    @TableField("CONNECT_TYPE")
+    private String connectType;
 
-    @ApiModelProperty(value = "设备类型名称")
-    @TableField(exist = false)
-    private String deviceTypeName;
+    /**
+     * 位置
+     */
+    @TableField("LOCATION")
 
-    @ApiModelProperty(value = "是否供电名称")
-    @TableField(exist = false)
-    private String isPowerSupplyName;
+    private String location;
 
-    @ApiModelProperty(value = "注册时间",dataType = "String")
-    @TableField(exist = false)
-    private String registerTime;
+    /**
+     * 设备状态
+     */
+    @TableField("STATUS")
 
-    @ApiModelProperty(value = "当前状态")
-    @TableField(exist = false)
     private String status;
 
-    @ApiModelProperty(value = "当前状态名称")
-    @TableField(exist = false)
-    private String statusName;
+    /**
+     * 报警分组
+     */
+    @TableField("ALARM_GROUP")
+
+    private Long alarmGroup;
+
+    /**
+     * 视频通道数(预留)
+     */
+    @TableField("CHANNEL_NUM")
+    private Integer channelNum;
 
     @Override
     public String toString() {
         return "Device{" +
             "id=" + id +
-            ", deviceCode=" + deviceCode +
-            ", deviceType=" + deviceType +
-            ", deviceBatch=" + deviceBatch +
-            ", manufacturer=" + manufacturer +
-            ", isPowerSupply=" + isPowerSupply +
-            ", createTime=" + createTime +
+            ", deviceName=" + deviceName +
+            ", ip=" + ip +
+            ", port=" + port +
+            ", userName=" + userName +
+            ", password=" + password +
+            ", connectType=" + connectType +
+            ", location=" + location +
+            ", status=" + status +
+            ", alarmGroup=" + alarmGroup +
+            ", channelNum=" + channelNum +
         "}";
     }
 }
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/DeviceExt.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/DeviceExt.java
deleted file mode 100644
index 5ee7015..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/DeviceExt.java
+++ /dev/null
@@ -1,99 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-
-/**
- * <p>
- * 设备扩展信息表（安全树）
- * </p>
- *
- * @author zyj
- * @since 2023-04-27
- */
-@Data
-@TableName("br_device_ext")
-public class DeviceExt implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 设备ID
-     */
-    @TableField("DEVICE_ID")
-    private Long deviceId;
-
-    /**
-     * 摄像头编号
-     */
-    @TableField("CAMERA_CODE")
-    private String cameraCode;
-
-    /**
-     * 摄像头IP
-     */
-    @TableField("CAMERA_IP")
-    private String cameraIp;
-
-    /**
-     * 摄像头端口
-     */
-    @TableField("CAMERA_PORT")
-    private String cameraPort;
-
-    /**
-     * 激甲编号
-     */
-    @TableField("GAS_CODE")
-    private String gasCode;
-
-    /**
-     * 激甲IP
-     */
-    @TableField("GAS_IP")
-    private String gasIp;
-
-    /**
-     * 激甲端口
-     */
-    @TableField("GAS_PORT")
-    private String gasPort;
-
-    /**
-     * 甲烷报警阈值
-     */
-    @TableField("GAS_THRESHOLD")
-    private String gasThreshold;
-
-    @TableField(value = "HAT_LINING_CODE")
-    private String hatLiningCode;
-
-
-    @Override
-    public String toString() {
-        return "DeviceExt{" +
-            "id=" + id +
-            ", deviceId=" + deviceId +
-            ", cameraCode=" + cameraCode +
-            ", cameraIp=" + cameraIp +
-            ", cameraPort=" + cameraPort +
-            ", gasCode=" + gasCode +
-            ", gasIp=" + gasIp +
-            ", gasPort=" + gasPort +
-            ", gasThreshold=" + gasThreshold +
-            ", hatLiningCode=" + hatLiningCode +
-        "}";
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/ProjectDevice.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/ProjectDevice.java
deleted file mode 100644
index c4f3472..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/ProjectDevice.java
+++ /dev/null
@@ -1,62 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-
-/**
- * <p>
- * 
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@Data
-@ApiModel("ProjectDevice")
-@TableName("br_project_device")
-public class ProjectDevice implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 作业现场ID
-     */
-    @TableField("PROJECT_ID")
-    private Long projectId;
-
-    /**
-     * 设备ID
-     */
-    @TableField("DEVICE_ID")
-    @ApiModelProperty("设备ID（新增编辑时传）")
-    private Long deviceId;
-
-    /**
-     * 设备编号
-     */
-    @TableField(exist = false)
-    @ApiModelProperty("设备编号（详情中展示，新增编辑不用传）")
-    private String deviceCode;
-
-    @Override
-    public String toString() {
-        return "ProjectDevice{" +
-            "id=" + id +
-            ", projectId=" + projectId +
-            ", deviceId=" + deviceId +
-        "}";
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/ProjectWorker.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/ProjectWorker.java
deleted file mode 100644
index 10b23c4..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/ProjectWorker.java
+++ /dev/null
@@ -1,104 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import java.io.Serializable;
-
-/**
- * <p>
- * 
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@ApiModel("ProjectWorker")
-@TableName("br_project_worker")
-@Data
-@NoArgsConstructor
-@AllArgsConstructor
-public class ProjectWorker implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 作业现场ID
-     */
-    @TableField("PROJECT_ID")
-    private Long projectId;
-
-    /**
-     * 人员ID
-     */
-    @ApiModelProperty("人员ID")
-    @TableField("WORKER_ID")
-    private Long workerId;
-
-    /**
-     * 安全帽编号
-     */
-    @ApiModelProperty("安全帽编号")
-    @TableField("HAT_CODE")
-    private String hatCode;
-
-    /**
-     * 背心编号
-     */
-    @ApiModelProperty("背心编号")
-    @TableField("VAST_CODE")
-    private String vastCode;
-
-    /**
-     * 手环编号
-     */
-    @ApiModelProperty("手环编号")
-    @TableField("BRACELET_CODE")
-    private String braceletCode;
-
-    @ApiModelProperty("人员姓名（详情中展示，新增编辑不用传）")
-    @TableField(exist = false)
-    private String workerName;
-
-    @ApiModelProperty("人员部门ID（详情中展示，新增编辑不用传）")
-    @TableField(exist = false)
-    private String workerDeptId;
-
-    @ApiModelProperty("人员部门名称（详情中展示，新增编辑不用传）")
-    @TableField(exist = false)
-    private String workerDeptName;
-
-    @ApiModelProperty("人员联系方式（详情中展示，新增编辑不用传）")
-    @TableField(exist = false)
-    private String workerPhoneNumber;
-
-    public ProjectWorker(Long projectId, Long workerId) {
-        this.projectId = projectId;
-        this.workerId = workerId;
-    }
-
-    @Override
-    public String toString() {
-        return "ProjectWorker{" +
-            "id=" + id +
-            ", projectId=" + projectId +
-            ", workerId=" + workerId +
-            ", hatCode=" + hatCode +
-            ", vastCode=" + vastCode +
-            ", braceletCode=" + braceletCode +
-        "}";
-    }
-}

diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/AlarmController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/AlarmController.java
new file mode 100644
index 0000000..1795cf1
--- /dev/null
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/AlarmController.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.modular.system.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.stereotype.Controller;
+
+/**
+ * <p>
+ * 报警记录表 前端控制器
+ * </p>
+ *
+ * @author zyj
+ * @since 2023-05-25
+ */
+@Controller
+@RequestMapping("/system/alarm")
+public class AlarmController {
+
+}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusAlarmController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusAlarmController.java
deleted file mode 100644
index 1f82ebb..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusAlarmController.java
+++ /dev/null
@@ -1,102 +0,0 @@
-package com.casic.missiles.modular.system.controller;
-
-
-import cn.hutool.core.util.ObjectUtil;
-import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.core.base.controller.BaseController;
-import com.casic.missiles.core.page.PageFactory;
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.AlarmUpload;
-import com.casic.missiles.modular.system.dto.DeviceDetailDTO;
-import com.casic.missiles.modular.system.entity.BusAlarm;
-import com.casic.missiles.modular.system.service.IBusAlarmService;
-import io.swagger.annotations.*;
-import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.*;
-
-import org.springframework.stereotype.Controller;
-
-import static com.casic.missiles.model.response.ResponseData.DEFAULT_SUCCESS_MESSAGE;
-import static com.casic.missiles.modular.system.consts.AlarmConst.ALARM_STATUS_MANUAL_CANCEL;
-
-/**
- * <p>
- * 报警记录表 前端控制器
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@Api(tags = "报警管理接口")
-@Controller
-@RequestMapping("/alarm")
-@RequiredArgsConstructor
-public class BusAlarmController extends BaseController {
-
-    private final IBusAlarmService alarmService;
-
-    @ApiOperation("报警上报接口")
-    @PostMapping("/upload")
-    @ResponseBody
-    public Object upload(@RequestBody AlarmUpload alarmUpload){
-        alarmService.alarmUpload(alarmUpload);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("报警列表分页查询")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "workTitle", value = "作业名称",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "projectId", value = "作业ID",dataType = "Long", paramType = "query",example = "0"),
-            @ApiImplicitParam(name = "alarmStatus", value = "报警状态",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "projectState", value = "作业状态",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "alarmType", value = "报警类型",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "alarmStartTime", value = "报警开始时间",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "alarmEndTime", value = "报警结束时间",dataType = "String", paramType = "query")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = BusAlarm.class),
-    })
-    @GetMapping("/listPage")
-    @ResponseBody
-    public Object listPage(String workTitle,Long projectId,String alarmStatus,String projectState,String alarmType,String alarmStartTime,String alarmEndTime){
-        Page<BusAlarm> page = PageFactory.defaultPage();
-        QueryWrapper<BusAlarm> queryWrapper = new QueryWrapper<>();
-        if(StrUtil.isNotEmpty(workTitle)){
-            queryWrapper.like("p.WORK_TITLE",workTitle);
-        }
-        if(ObjectUtil.isNotEmpty(projectId)){
-            queryWrapper.eq("alarm.PROJECT_ID",projectId);
-        }
-        if(StrUtil.isNotEmpty(alarmStatus)){
-            queryWrapper.eq("alarm.ALARM_STATUS",alarmStatus);
-        }
-        if(StrUtil.isNotEmpty(projectState)){
-            queryWrapper.eq("p.PROJECT_STATE",projectState);
-        }
-        if(StrUtil.isNotEmpty(alarmType)){
-            queryWrapper.eq("alarm.ALARM_TYPE",alarmType);
-        }
-        if(StrUtil.isNotEmpty(alarmStartTime)){
-            queryWrapper.ge("alarm.ALARM_TIME",alarmStartTime);
-        }
-        if(StrUtil.isNotEmpty(alarmEndTime)){
-            queryWrapper.le("alarm.ALARM_TIME",alarmEndTime);
-        }
-        page = alarmService.listPage(page,queryWrapper);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-    @ApiOperation("消警")
-    @PostMapping("/cancel")
-    @ResponseBody
-    public Object cancel(@RequestParam("alarmId") Long alarmId){
-        UpdateWrapper<BusAlarm> updateWrapper = new UpdateWrapper<>();
-        updateWrapper.eq("ID",alarmId);
-        updateWrapper.set("ALARM_STATUS",ALARM_STATUS_MANUAL_CANCEL);
-        alarmService.update(updateWrapper);
-        return ResponseData.success();
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusEventController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusEventController.java
deleted file mode 100644
index dde5aad..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusEventController.java
+++ /dev/null
@@ -1,41 +0,0 @@
-package com.casic.missiles.modular.system.controller;
-
-
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.entity.BusEvent;
-import com.casic.missiles.modular.system.service.IBusEventService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.ResponseBody;
-
-/**
- * <p>
- * 事件表 前端控制器
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@Controller
-@RequestMapping("/event")
-@Api(tags = "事件上报")
-@RequiredArgsConstructor
-public class BusEventController {
-
-    private final IBusEventService eventService;
-
-    @ApiOperation("事件上报")
-    @PostMapping("add")
-    @ResponseBody
-    public Object add(@RequestBody BusEvent busEvent){
-        eventService.saveBusEvent(busEvent);
-        return ResponseData.success();
-    }
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
index 03abc5f..aa50d78 100644
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
@@ -1,121 +1,20 @@
 package com.casic.missiles.modular.system.controller;
 
 
-import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.core.base.controller.BaseController;
-import com.casic.missiles.core.page.PageFactory;
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.DeviceDetailDTO;
-import com.casic.missiles.modular.system.entity.Device;
-import com.casic.missiles.modular.system.service.IDeviceExtService;
-import com.casic.missiles.modular.system.service.IDeviceService;
-import io.swagger.annotations.*;
-import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.RequestMapping;
 
 import org.springframework.stereotype.Controller;
 
-import java.time.LocalDateTime;
-import java.util.Date;
-import java.util.List;
-
-import static com.casic.missiles.model.response.ResponseData.DEFAULT_SUCCESS_MESSAGE;
-
 /**
  * <p>
- *  前端控制器
+ * 设备记录表 前端控制器
  * </p>
  *
  * @author zyj
- * @since 2023-04-14
+ * @since 2023-05-25
  */
-@Api(tags = "设备管理接口")
-@RequiredArgsConstructor
 @Controller
-@RequestMapping("/device")
-public class DeviceController extends BaseController {
-    private final IDeviceService deviceService;
-    private final IDeviceExtService deviceExtService;
-
-    @ApiOperation("设备分页列表")
-    @ApiImplicitParams({
-        @ApiImplicitParam(name = "deviceType", value = "设备类型",dataType = "String", paramType = "query"),
-        @ApiImplicitParam(name = "deviceCode", value = "设备编号",dataType = "String", paramType = "query"),
-        @ApiImplicitParam(name = "status", value = "设备状态",dataType = "String", paramType = "query"),
-        @ApiImplicitParam(name = "projectId", value = "作业ID（如果传此参数，列表中返回该作业使用的设备）",dataType = "Long", paramType = "query", example = "0")
-    })
-    @ApiResponses({
-        @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = DeviceDetailDTO.class),
-    })
-    @GetMapping("listPage")
-    @ResponseBody
-    public Object listPage(String deviceType, String deviceCode, String status,Long projectId){
-        Page<DeviceDetailDTO> page = PageFactory.defaultPage();
-        QueryWrapper<DeviceDetailDTO> queryWrapper = new QueryWrapper<>();
-        if(StrUtil.isNotEmpty(deviceType)){
-            queryWrapper.eq("DEVICE_TYPE",deviceType);
-        }
-        if(StrUtil.isNotEmpty(deviceCode)){
-            queryWrapper.like("DEVICE_CODE",deviceCode);
-        }
-        page = deviceService.listPage(page,queryWrapper,status,projectId);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-    @ApiOperation("新增设备")
-    @PostMapping("add")
-    @ResponseBody
-    public Object add(@RequestBody DeviceDetailDTO deviceDetailDTO){
-        deviceService.saveDevice(deviceDetailDTO);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("编辑设备")
-    @PostMapping("update")
-    @ResponseBody
-    public Object update(@RequestBody DeviceDetailDTO deviceDetailDTO){
-        deviceService.updateDevice(deviceDetailDTO);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("删除设备")
-    @PostMapping("delete")
-    @ResponseBody
-    public Object delete(@ApiParam("设备id列表")@RequestBody List<Long> deviceIds){
-        deviceService.deleteDevices(deviceIds);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("设置甲烷阈值")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "gasIp", value = "安全树甲烷设备IP",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "gasPort", value = "安全树甲烷端口",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "threshold", value = "甲烷阈值",dataType = "String", paramType = "query")
-    })
-    @PostMapping("setThreshold")
-    @ResponseBody
-    public Object setThreshold(String gasIp,String gasPort,String threshold){
-        deviceExtService.setGasThreshold(gasIp, gasPort, threshold);
-        return ResponseData.success();
-    }
-
-
-    @ApiOperation("查询甲烷阈值")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "gasIp", value = "安全树甲烷设备IP",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "gasPort", value = "安全树甲烷端口",dataType = "String", paramType = "query")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = "{\"code\": 200,\"data\": \"100\",\"message\": \"请求成功\",\"success\": true}",response = String.class),
-    })
-    @GetMapping("getThreshold")
-    @ResponseBody
-    public Object getThreshold(String gasIp,String gasPort){
-        String data = deviceExtService.getGasThreshold(gasIp, gasPort);
-        return ResponseData.success(data);
-    }
-
+@RequestMapping("/system/device")
+public class DeviceController {
 
 }
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/OverviewController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/OverviewController.java
deleted file mode 100644
index 7570504..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/OverviewController.java
+++ /dev/null
@@ -1,70 +0,0 @@
-package com.casic.missiles.modular.system.controller;
-
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.AlarmTypeCountDTO;
-import com.casic.missiles.modular.system.dto.DeviceLocationDTO;
-import com.casic.missiles.modular.system.dto.WorkerLocationDTO;
-import com.casic.missiles.modular.system.service.IBusAlarmService;
-import com.casic.missiles.modular.system.service.IProjectDeviceService;
-import com.casic.missiles.modular.system.service.IProjectWorkerService;
-import io.swagger.annotations.*;
-import lombok.RequiredArgsConstructor;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.ResponseBody;
-
-import static com.casic.missiles.model.response.ResponseData.DEFAULT_SUCCESS_MESSAGE;
-import static com.casic.missiles.modular.system.consts.AlarmConst.ALARM_STATUS_ON;
-
-@Api(tags = "首页看板接口")
-@Controller
-@RequestMapping("overview")
-@RequiredArgsConstructor
-public class OverviewController {
-
-    private final IBusAlarmService alarmService;
-    private final IProjectDeviceService projectDeviceService;
-
-    private final IProjectWorkerService projectWorkerService;
-
-
-    @ApiOperation("报警统计接口")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "projectId", value = "作业ID",dataType = "Long", paramType = "query", example = "0")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = AlarmTypeCountDTO.class),
-    })
-    @GetMapping("/alarmCount")
-    @ResponseBody
-    public Object alarmCount(Long projectId){
-        return ResponseData.success(alarmService.alarmCount(projectId,ALARM_STATUS_ON));
-    }
-
-    @ApiOperation("设备列表接口")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "projectId", value = "作业ID",dataType = "Long", paramType = "query", example = "0")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = DeviceLocationDTO.class),
-    })
-    @GetMapping("/deviceList")
-    @ResponseBody
-    public Object deviceList(Long projectId){
-        return ResponseData.success(projectDeviceService.selectDeviceLocationList(projectId));
-    }
-
-    @ApiOperation("人员列表接口")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "projectId", value = "作业ID",dataType = "Long", paramType = "query", example = "0")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = WorkerLocationDTO.class),
-    })
-    @GetMapping("/workerList")
-    @ResponseBody
-    public Object workerList(Long projectId){
-        return ResponseData.success(projectWorkerService.selectWorkerLocationDTO(projectId));
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/WorkSiteInfoController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/WorkSiteInfoController.java
deleted file mode 100644
index af36d69..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/WorkSiteInfoController.java
+++ /dev/null
@@ -1,130 +0,0 @@
-package com.casic.missiles.modular.system.controller;
-
-
-import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.core.base.controller.BaseController;
-import com.casic.missiles.core.page.PageFactory;
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.WorkSiteDetailDTO;
-import com.casic.missiles.modular.system.entity.WorkSiteInfo;
-import com.casic.missiles.modular.system.service.IWorkSiteInfoService;
-import io.swagger.annotations.*;
-import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.*;
-
-import org.springframework.stereotype.Controller;
-
-import java.util.List;
-
-import static com.casic.missiles.model.response.ResponseData.DEFAULT_SUCCESS_MESSAGE;
-
-/**
- * <p>
- * 作业现场表 前端控制器
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@Controller
-@RequestMapping("/site")
-@Api(tags = "作业现场管理")
-@RequiredArgsConstructor
-public class WorkSiteInfoController extends BaseController {
-
-
-    private final IWorkSiteInfoService workSiteInfoService;
-
-    @ApiOperation("新增作业现场")
-    @PostMapping("add")
-    @ResponseBody
-    public Object addWorkSite(@RequestBody WorkSiteDetailDTO workSiteDetailDTO){
-        workSiteInfoService.addWorkSiteInfo(workSiteDetailDTO);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("编辑作业现场")
-    @PostMapping("update")
-    @ResponseBody
-    public Object updateWorkSite(@RequestBody WorkSiteDetailDTO workSiteDetailDTO){
-        workSiteInfoService.updateWorkSiteInfo(workSiteDetailDTO);
-        return ResponseData.success();
-    }
-
-
-    @ApiOperation("删除作业现场")
-    @PostMapping("delete")
-    @ResponseBody
-    public Object delete(@ApiParam("作业现场id列表")@RequestBody List<Long> projectIds){
-        workSiteInfoService.deleteProjects(projectIds);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("查询作业现场详情")
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = WorkSiteDetailDTO.class),
-    })
-    @GetMapping("detail")
-    @ResponseBody
-    public Object delete(@ApiParam(value = "作业现场id", example = "0")@RequestParam Long projectId){
-        WorkSiteDetailDTO detailDTO = workSiteInfoService.getWorkSiteDetail(projectId);
-        return ResponseData.success(detailDTO);
-    }
-
-    @ApiOperation("分页列表查询")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "workTitle",value = "作业名称", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "workRoad",value = "所属道路", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "workPersonName",value = "责任人姓名", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "startDate",value = "注册开始日期", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "endDate",value = "注册结束日期", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "projectState",value = "当前状态（字典值）", dataType = "String", paramType = "query")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = WorkSiteInfo.class),
-    })
-    @GetMapping("listPage")
-    @ResponseBody
-    public Object listPage(String workTitle,String workRoad,String workPersonName,String projectState,String startDate,String endDate){
-        Page<WorkSiteInfo> page = PageFactory.defaultPage();
-        QueryWrapper<WorkSiteInfo> queryWrapper = new QueryWrapper<>();
-        if(StrUtil.isNotEmpty(workTitle)){
-            queryWrapper.like("WORK_TITLE",workTitle);
-        }
-        if(StrUtil.isNotEmpty(workRoad)){
-            queryWrapper.like("WORK_ROAD",workRoad);
-        }
-        if(StrUtil.isNotEmpty(workPersonName)){
-            queryWrapper.like("WORKER_NAME",workPersonName);
-        }
-        if(StrUtil.isNotEmpty(projectState)){
-            queryWrapper.eq("PROJECT_STATE",projectState);
-        }
-        if(StrUtil.isNotEmpty(startDate)){
-            queryWrapper.ge("br_work_site_info.CREATE_TIME",startDate + " 00:00:00");
-        }
-        if(StrUtil.isNotEmpty(endDate)){
-            queryWrapper.le("br_work_site_info.CREATE_TIME",endDate + " 23:59:59");
-        }
-        page = workSiteInfoService.selectListPage(page,queryWrapper);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-    @ApiOperation("开始作业")
-    @PostMapping("start")
-    @ResponseBody
-    public Object start(@ApiParam(value = "作业现场id",example = "0")@RequestParam Long projectId){
-        workSiteInfoService.start(projectId);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("完成作业")
-    @PostMapping("finish")
-    @ResponseBody
-    public Object finish(@ApiParam(value = "作业现场id", example = "0")@RequestParam Long projectId){
-        workSiteInfoService.finish(projectId);
-        return ResponseData.success();
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/WorkerController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/WorkerController.java
deleted file mode 100644
index 796f94c..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/WorkerController.java
+++ /dev/null
@@ -1,136 +0,0 @@
-package com.casic.missiles.modular.system.controller;
-
-
-import cn.hutool.core.util.ObjectUtil;
-import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.core.base.controller.BaseController;
-import com.casic.missiles.core.page.PageFactory;
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.DeviceDetailDTO;
-import com.casic.missiles.modular.system.entity.Device;
-import com.casic.missiles.modular.system.entity.Worker;
-import com.casic.missiles.modular.system.service.IWorkerService;
-import io.swagger.annotations.*;
-import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.*;
-
-import org.springframework.stereotype.Controller;
-
-import java.util.Date;
-import java.util.List;
-
-import static com.casic.missiles.model.response.ResponseData.DEFAULT_SUCCESS_MESSAGE;
-
-/**
- * <p>
- *  前端控制器
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@Controller
-@RequestMapping("/worker")
-@RequiredArgsConstructor
-@Api(tags = "人员管理接口")
-public class WorkerController extends BaseController {
-
-    private final IWorkerService workerService;
-
-    @ApiOperation("分页列表查询")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "name",value = "姓名", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "deptId",value = "所属部门", dataType = "Long", paramType = "query", example = "0"),
-            @ApiImplicitParam(name = "status",value = "当前状态（字典值）", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "startDate",value = "注册开始日期", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "endDate",value = "注册结束日期", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "workerType",value = "人员类型（字典值）", dataType = "String", paramType = "query")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = Worker.class),
-    })
-    @GetMapping("listPage")
-    @ResponseBody
-    public Object listPage(String name,Long deptId, String status,String startDate,String endDate,String workerType){
-        Page<Worker> page = PageFactory.defaultPage();
-        QueryWrapper<Worker> queryWrapper = new QueryWrapper<>();
-        if(StrUtil.isNotEmpty(name)){
-            queryWrapper.like("WORKER_NAME",name);
-        }
-        if(ObjectUtil.isNotEmpty(deptId)){
-            queryWrapper.eq("DEPT_ID",deptId);
-        }
-        if(StrUtil.isNotEmpty(workerType)){
-            queryWrapper.eq("WORKER_TYPE",workerType);
-        }
-        if(StrUtil.isNotEmpty(startDate)){
-            queryWrapper.ge("CREATE_TIME",startDate + " 00:00:00");
-        }
-        if(StrUtil.isNotEmpty(endDate)){
-            queryWrapper.le("CREATE_TIME",endDate + " 23:59:59");
-        }
-        if(StrUtil.isNotEmpty(status)){
-            queryWrapper.eq("`STATUS`",status);
-        }
-        page = workerService.selectListPage(page,queryWrapper);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-    @ApiOperation("新增人员")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "worker", value = "人员信息", dataType = "Worker", paramType = "body", required = true),
-            @ApiImplicitParam(name = "projectId", value = "项目ID(入场申请需要)", dataType = "Long", paramType = "query", example = "0")
-    })
-    @PostMapping("add")
-    @ResponseBody
-    public Object add(@ApiParam("worker")@RequestBody Worker worker,
-                      @RequestParam(required = false) Long projectId){
-        workerService.addWorker(worker,projectId);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("编辑人员")
-    @PostMapping("update")
-    @ResponseBody
-    public Object update(@RequestBody Worker worker){
-        workerService.updateById(worker);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("删除人员")
-    @PostMapping("delete")
-    @ResponseBody
-    public Object delete(@ApiParam("人员id列表")@RequestBody List<Long> workIds){
-        workerService.removeByIds(workIds);
-        return ResponseData.success();
-    }
-
-
-    @ApiOperation(value = "获取人脸图片",notes = "返回人脸图片url")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "cameraIp",value = "摄像头IP", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "cameraPort",value = "摄像头端口号", dataType = "String", paramType = "query"),
-    })
-    @GetMapping("/face/register")
-    @ResponseBody
-    public Object faceRegister(String cameraIp,String cameraPort){
-        return ResponseData.success(workerService.faceRegister(cameraIp, cameraPort));
-    }
-
-
-    @ApiOperation(value = "查询临时入场人员列表")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "projectId", value = "项目ID",required = true,dataType = "Long", paramType = "query", example = "0")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = Worker.class),
-    })
-    @GetMapping("/projectTempWorker")
-    @ResponseBody
-    public Object projectTempWorker(Long projectId){
-        return ResponseData.success(workerService.projectTempWorker(projectId));
-    }
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/AlarmTypeCountDTO.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/AlarmTypeCountDTO.java
deleted file mode 100644
index 1a165a1..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/AlarmTypeCountDTO.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.casic.missiles.modular.system.dto;
-
-import io.swagger.annotations.ApiModel;
-import lombok.Data;
-
-@ApiModel(value = "AlarmTypeCountDTO",description = "报警类型统计（首页）")
-@Data
-public class AlarmTypeCountDTO {
-
-    private String alarmType;
-    private String alarmTypeName;
-    private Integer alarmCount;
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/AlarmUpload.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/AlarmUpload.java
deleted file mode 100644
index 73d7799..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/AlarmUpload.java
+++ /dev/null
@@ -1,46 +0,0 @@
-package com.casic.missiles.modular.system.dto;
-
-import cn.hutool.core.util.StrUtil;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-@ApiModel(value = "AlarmUpload",description = "报警上传")
-@Data
-public class AlarmUpload {
-
-    @ApiModelProperty(value = "摄像头ip")
-    private String cameraIp;
-
-    @ApiModelProperty(value = "摄像头端口")
-    private String cameraPort;
-    @ApiModelProperty(value = "安全树甲烷设备ip")
-    private String gasIp;
-    @ApiModelProperty(value = "安全树甲烷设备端口")
-    private String gasPort;
-    @ApiModelProperty(value = "报警值")
-    private String alarmValue;
-    @ApiModelProperty(value = "报警时间")
-    private String alarmTime;
-    @ApiModelProperty(value = "报警类型")
-    private String alarmType;
-    @ApiModelProperty(value = "报警图片")
-    private String alarmImage;
-    @ApiModelProperty(value = "报警内容")
-    private String alarmContent;
-
-    @Override
-    public String toString() {
-        return "AlarmUpload{" +
-                "cameraIp='" + cameraIp + '\'' +
-                ", cameraPort='" + cameraPort + '\'' +
-                ", gasIp='" + gasIp + '\'' +
-                ", gasPort='" + gasPort + '\'' +
-                ", alarmValue='" + alarmValue + '\'' +
-                ", alarmTime='" + alarmTime + '\'' +
-                ", alarmType='" + alarmType + '\'' +
-                ", alarmImage='" + (StrUtil.isNotEmpty(alarmImage) ? alarmImage.substring(0,50) : "null") + '\'' +
-                ", alarmContent='" + alarmContent + '\'' +
-                '}';
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/DeviceDetailDTO.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/DeviceDetailDTO.java
deleted file mode 100644
index ea518d9..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/DeviceDetailDTO.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package com.casic.missiles.modular.system.dto;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.casic.missiles.modular.system.entity.Device;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-@ApiModel("DeviceDetailDTO")
-@Data
-public class DeviceDetailDTO extends Device {
-
-    @ApiModelProperty(value = "摄像头编号")
-    private String cameraCode;
-
-    @ApiModelProperty(value = "摄像头IP")
-    private String cameraIp;
-
-    @ApiModelProperty(value = "摄像头端口")
-    private String cameraPort;
-
-    @ApiModelProperty(value = "激甲编号")
-    private String gasCode;
-
-    @ApiModelProperty(value = "激甲IP")
-    private String gasIp;
-
-    @ApiModelProperty(value = "激甲端口")
-    private String gasPort;
-
-    @ApiModelProperty(value = "智能帽衬编号")
-    private String hatLiningCode;
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/WorkSiteDetailDTO.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/WorkSiteDetailDTO.java
deleted file mode 100644
index 29378ff..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/WorkSiteDetailDTO.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package com.casic.missiles.modular.system.dto;
-
-import com.casic.missiles.modular.system.entity.ProjectDevice;
-import com.casic.missiles.modular.system.entity.ProjectWorker;
-import com.casic.missiles.modular.system.entity.WorkSiteInfo;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.util.List;
-
-@Data
-@ApiModel("WorkSiteDetailDTO")
-public class WorkSiteDetailDTO extends WorkSiteInfo {
-
-    @ApiModelProperty(value = "安全树列表",dataType = "ProjectDevice")
-    private List<ProjectDevice> deviceList;
-
-    @ApiModelProperty(value = "人员列表",dataType = "ProjectWorker")
-    private List<ProjectWorker> workerList;
-
-
-
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/WorkerLocationDTO.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/WorkerLocationDTO.java
deleted file mode 100644
index 6fd7b24..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/WorkerLocationDTO.java
+++ /dev/null
@@ -1,68 +0,0 @@
-package com.casic.missiles.modular.system.dto;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-@ApiModel(value = "WorkerLocationDTO",description = "人员位置列表（首页）")
-@Data
-public class WorkerLocationDTO {
-
-    @ApiModelProperty("人员ID")
-    private Long workerId;
-
-    @ApiModelProperty("人员姓名")
-    private String workerName;
-
-    @ApiModelProperty("安全帽编号")
-    private String hatCode;
-
-    @ApiModelProperty("安全帽ID")
-    private Long hatId;
-
-    @ApiModelProperty("背心编号")
-    private String vastCode;
-
-    @ApiModelProperty("手环编号")
-    private String braceletCode;
-
-    @ApiModelProperty("位置")
-    private String location;
-
-    @ApiModelProperty("时间")
-    private String time;
-
-    @ApiModelProperty("经度")
-    private String lng;
-
-    @ApiModelProperty("纬度")
-    private String lat;
-
-    @ApiModelProperty("心率")
-    private String heartRate;
-
-    @ApiModelProperty("血氧")
-    private String bloodOxygen;
-
-    @ApiModelProperty("一氧化碳")
-    private String co;
-
-    @ApiModelProperty("甲烷")
-    private String gas;
-
-    @ApiModelProperty("硫化氢")
-    private String h2s;
-
-    @ApiModelProperty("氧气")
-    private String o2;
-
-    @ApiModelProperty("信号")
-    private String signal;
-
-    @ApiModelProperty("电量")
-    private String cell;
-
-    @ApiModelProperty("是否报警")
-    private boolean alarmFlag;
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Alarm.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Alarm.java
new file mode 100644
index 0000000..4d2b7ef
--- /dev/null
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Alarm.java
@@ -0,0 +1,103 @@
+package com.casic.missiles.modular.system.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import java.util.Date;
+
+/**
+ * <p>
+ * 报警记录表
+ * </p>
+ *
+ * @author zyj
+ * @since 2023-05-25
+ */
+@Data
+@TableName("bus_alarm")
+public class Alarm implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    @TableId(value = "ID",type = IdType.ASSIGN_ID)
+    private Long id;
+
+    /**
+     * 设备ID
+     */
+    @TableField("DEVICE_ID")
+    private Long deviceId;
+
+    /**
+     * 报警类型
+     */
+    @TableField("ALARM_TYPE")
+    private String alarmType;
+
+    /**
+     * 报警时间
+     */
+    @TableField("ALARM_TIME")
+    private Date alarmTime;
+
+    /**
+     * 报警状态
+     */
+    @TableField("ALARM_STATUS")
+    private String alarmStatus;
+
+    /**
+     * 报警位置
+     */
+    @TableField("ALARM_LOCATION")
+    private String alarmLocation;
+
+    /**
+     * 报警图片
+     */
+    @TableField("ALARM_IMAGE")
+    private String alarmImage;
+
+    /**
+     * 视频通道号
+     */
+    @TableField("CHANNEL_NO")
+    private Integer channelNo;
+
+    /**
+     * 报警内容
+     */
+    @TableField("ALARM_CONTENT")
+    private String alarmContent;
+
+    /**
+     * 消警时间
+     */
+    @TableField("CANCEL_TIME")
+    private Date cancelTime;
+
+
+    @Override
+    public String toString() {
+        return "Alarm{" +
+            "id=" + id +
+            ", deviceId=" + deviceId +
+            ", alarmType=" + alarmType +
+            ", alarmTime=" + alarmTime +
+            ", alarmStatus=" + alarmStatus +
+            ", alarmLocation=" + alarmLocation +
+            ", alarmImage=" + alarmImage +
+            ", channelNo=" + channelNo +
+            ", alarmContent=" + alarmContent +
+            ", cancelTime=" + cancelTime +
+        "}";
+    }
+}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusAlarm.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusAlarm.java
deleted file mode 100644
index efb4a23..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusAlarm.java
+++ /dev/null
@@ -1,159 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.alibaba.fastjson.annotation.JSONField;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.time.LocalDateTime;
-import java.util.Date;
-
-/**
- * <p>
- * 报警记录表
- * </p>
- *
- * @author zyj
- * @since 2023-05-16
- */
-@Data
-@ApiModel("Alarm")
-@TableName("br_bus_alarm")
-public class BusAlarm implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 项目ID
-     */
-    @ApiModelProperty(value = "项目ID")
-    @TableField("PROJECT_ID")
-    private Long projectId;
-
-    /**
-     * 设备ID
-     */
-    @ApiModelProperty(value = "设备ID")
-    @TableField("DEVICE_ID")
-    private Long deviceId;
-
-    /**
-     * 报警类型
-     */
-    @ApiModelProperty(value = "报警类型")
-    @TableField("ALARM_TYPE")
-    private String alarmType;
-
-    /**
-     * 报警状态
-     */
-    @ApiModelProperty(value = "报警状态")
-    @TableField("ALARM_STATUS")
-    private String alarmStatus;
-
-    /**
-     * 报警值
-     */
-    @ApiModelProperty(value = "报警值")
-    @TableField("ALARM_VALUE")
-    private String alarmValue;
-
-    /**
-     * 报警图片
-     */
-    @ApiModelProperty(value = "报警图片")
-    @TableField("ALARM_IMAGE")
-    private String alarmImage;
-
-    /**
-     * 报警内容
-     */
-    @ApiModelProperty(value = "报警内容")
-    @TableField("ALARM_CONTENT")
-    private String alarmContent;
-
-    /**
-     * 报警时间
-     */
-    @ApiModelProperty(value = "报警时间")
-    @TableField("ALARM_TIME")
-    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
-    private Date alarmTime;
-
-    /**
-     * 消警时间
-     */
-    @ApiModelProperty(value = "消警时间")
-    @TableField("CANCEL_TIME")
-    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
-    private Date cancelTime;
-
-    /**
-     * 报警位置经度
-     */
-    @ApiModelProperty(value = "报警位置经度")
-    @TableField("ALARM_LNG")
-    private String alarmLng;
-
-    /**
-     * 报警位置纬度
-     */
-    @ApiModelProperty(value = "报警位置纬度")
-    @TableField("ALARM_LAT")
-    private String alarmLat;
-
-    @ApiModelProperty("报警类型名称")
-    @TableField(exist = false)
-    private String alarmStatusName;
-    @ApiModelProperty("报警类型名称")
-    @TableField(exist = false)
-    private String alarmTypeName;
-    @ApiModelProperty("作业名称")
-    @TableField(exist = false)
-    private String workTitle;
-    @ApiModelProperty("所属道路")
-    @TableField(exist = false)
-    private String workRoad;
-    @ApiModelProperty("作业状态")
-    @TableField(exist = false)
-    private String projectState;
-    @ApiModelProperty("作业状态名称")
-    @TableField(exist = false)
-    private String projectStateName;
-    @ApiModelProperty("负责人姓名")
-    @TableField(exist = false)
-    private String workPersonName;
-    @ApiModelProperty("负责人联系方式")
-    @TableField(exist = false)
-    private String workPersonPhoneNumber;
-
-
-    @Override
-    public String toString() {
-        return "BusAlarm{" +
-                "id=" + id +
-                ", projectId=" + projectId +
-                ", deviceId=" + deviceId +
-                ", alarmType=" + alarmType +
-                ", alarmValue=" + alarmValue +
-                ", alarmStatus=" + alarmStatus +
-                ", alarmImage=" + alarmImage +
-                ", alarmContent=" + alarmContent +
-                ", alarmTime=" + alarmTime +
-                ", cancelTime=" + cancelTime +
-                ", alarmLng=" + alarmLng +
-                ", alarmLat=" + alarmLat +
-                "}";
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusEvent.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusEvent.java
deleted file mode 100644
index a0b7543..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusEvent.java
+++ /dev/null
@@ -1,100 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.time.LocalDateTime;
-import java.util.Date;
-import java.util.List;
-
-/**
- * <p>
- * 事件表
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@TableName("br_bus_event")
-@Data
-@ApiModel("BusEvent")
-public class BusEvent implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @ApiModelProperty("事件ID")
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 事件标题
-     */
-    @ApiModelProperty("事件名称")
-    @TableField("EVENT_TITLE")
-    private String eventTitle;
-
-    /**
-     * 上报人员
-     */
-    @ApiModelProperty("上报人员")
-    @TableField("UPLOAD_NAME")
-    private String uploadName;
-
-    /**
-     * 联系方式
-     */
-    @ApiModelProperty("联系方式")
-    @TableField("PHONE_NUMBER")
-    private String phoneNumber;
-
-    /**
-     * 事件描述
-     */
-    @ApiModelProperty("事件描述")
-    @TableField("EVENT_DESCRIPTION")
-    private String eventDescription;
-
-    @ApiModelProperty("经度")
-    @TableField("LNG")
-    private String lng;
-
-    @ApiModelProperty("纬度")
-    @TableField("LAT")
-    private String lat;
-
-    /**
-     * 事件上传时间
-     */
-    @ApiModelProperty("事件上传时间")
-    @TableField("CREATE_TIME")
-    private Date createTime;
-
-    @ApiModelProperty("事件照片")
-    @TableField(exist = false)
-    private List<BusEventImage> imageList;
-
-
-
-    @Override
-    public String toString() {
-        return "BusEvent{" +
-            "id=" + id +
-            ", eventTitle=" + eventTitle +
-            ", uploadName=" + uploadName +
-            ", phoneNumber=" + phoneNumber +
-            ", eventDescription=" + eventDescription +
-            ", lng=" + lng +
-            ", lat=" + lat +
-            ", createTime=" + createTime +
-        "}";
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusEventImage.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusEventImage.java
deleted file mode 100644
index 1e75245..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusEventImage.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-
-/**
- * <p>
- * 事件图片表
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@TableName("br_bus_event_image")
-@Data
-@ApiModel("BusEventImage")
-public class BusEventImage implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 事件ID
-     */
-    @TableField("EVENT_ID")
-    private Long eventId;
-
-    /**
-     * 报警图片
-     */
-    @TableField("IMAGE")
-    @ApiModelProperty("图片url")
-    private String image;
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Device.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Device.java
index df89c70..ea7db5f 100644
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Device.java
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Device.java
@@ -1,30 +1,23 @@
 package com.casic.missiles.modular.system.entity;
 
-import com.alibaba.fastjson.annotation.JSONField;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.casic.missiles.core.base.json.DateDeserializer;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
-import java.util.Date;
 
 /**
  * <p>
- * 
+ * 设备记录表
  * </p>
  *
  * @author zyj
- * @since 2023-04-14
+ * @since 2023-05-25
  */
-@ApiModel("Device")
-@TableName("br_device")
 @Data
+@TableName("bus_device")
 public class Device implements Serializable {
 
     private static final long serialVersionUID = 1L;
@@ -32,82 +25,86 @@
     /**
      * 主键
      */
-    @ApiModelProperty(value = "设备ID")
     @TableId(value = "ID",type = IdType.ASSIGN_ID)
     private Long id;
 
     /**
-     * 设备编号
+     * 设备名称
      */
-    @ApiModelProperty(value = "设备编号")
-    @TableField("DEVICE_CODE")
-    private String deviceCode;
+    @TableField("DEVICE_NAME")
+    private String deviceName;
 
     /**
-     * 设备类型
+     * IP
      */
-    @ApiModelProperty(value = "设备类型")
-    @TableField("DEVICE_TYPE")
-    private String deviceType;
+    @TableField("IP")
+    private String ip;
 
     /**
-     * 设备批次
+     * 端口
      */
-    @ApiModelProperty(value = "设备批次")
-    @TableField("DEVICE_BATCH")
-    private String deviceBatch;
+    @TableField("PORT")
+    private String port;
 
     /**
-     * 厂家
+     * 用户名
      */
-    @ApiModelProperty(value = "厂家")
-    @TableField("MANUFACTURER")
-    private String manufacturer;
+    @TableField("USER_NAME")
+    private String userName;
 
     /**
-     * 是否供电
+     * 密码
      */
-    @ApiModelProperty(value = "是否供电")
-    @TableField("IS_POWER_SUPPLY")
-    private String isPowerSupply;
+    @TableField("PASSWORD")
+    private String password;
 
     /**
-     * 创建时间
+     * 连接类型
      */
-    @ApiModelProperty(value = "创建时间",dataType = "Date")
-    @TableField("CREATE_TIME")
-    private Date createTime;
+    @TableField("CONNECT_TYPE")
+    private String connectType;
 
-    @ApiModelProperty(value = "设备类型名称")
-    @TableField(exist = false)
-    private String deviceTypeName;
+    /**
+     * 位置
+     */
+    @TableField("LOCATION")
 
-    @ApiModelProperty(value = "是否供电名称")
-    @TableField(exist = false)
-    private String isPowerSupplyName;
+    private String location;
 
-    @ApiModelProperty(value = "注册时间",dataType = "String")
-    @TableField(exist = false)
-    private String registerTime;
+    /**
+     * 设备状态
+     */
+    @TableField("STATUS")
 
-    @ApiModelProperty(value = "当前状态")
-    @TableField(exist = false)
     private String status;
 
-    @ApiModelProperty(value = "当前状态名称")
-    @TableField(exist = false)
-    private String statusName;
+    /**
+     * 报警分组
+     */
+    @TableField("ALARM_GROUP")
+
+    private Long alarmGroup;
+
+    /**
+     * 视频通道数(预留)
+     */
+    @TableField("CHANNEL_NUM")
+    private Integer channelNum;
 
     @Override
     public String toString() {
         return "Device{" +
             "id=" + id +
-            ", deviceCode=" + deviceCode +
-            ", deviceType=" + deviceType +
-            ", deviceBatch=" + deviceBatch +
-            ", manufacturer=" + manufacturer +
-            ", isPowerSupply=" + isPowerSupply +
-            ", createTime=" + createTime +
+            ", deviceName=" + deviceName +
+            ", ip=" + ip +
+            ", port=" + port +
+            ", userName=" + userName +
+            ", password=" + password +
+            ", connectType=" + connectType +
+            ", location=" + location +
+            ", status=" + status +
+            ", alarmGroup=" + alarmGroup +
+            ", channelNum=" + channelNum +
         "}";
     }
 }
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/DeviceExt.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/DeviceExt.java
deleted file mode 100644
index 5ee7015..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/DeviceExt.java
+++ /dev/null
@@ -1,99 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-
-/**
- * <p>
- * 设备扩展信息表（安全树）
- * </p>
- *
- * @author zyj
- * @since 2023-04-27
- */
-@Data
-@TableName("br_device_ext")
-public class DeviceExt implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 设备ID
-     */
-    @TableField("DEVICE_ID")
-    private Long deviceId;
-
-    /**
-     * 摄像头编号
-     */
-    @TableField("CAMERA_CODE")
-    private String cameraCode;
-
-    /**
-     * 摄像头IP
-     */
-    @TableField("CAMERA_IP")
-    private String cameraIp;
-
-    /**
-     * 摄像头端口
-     */
-    @TableField("CAMERA_PORT")
-    private String cameraPort;
-
-    /**
-     * 激甲编号
-     */
-    @TableField("GAS_CODE")
-    private String gasCode;
-
-    /**
-     * 激甲IP
-     */
-    @TableField("GAS_IP")
-    private String gasIp;
-
-    /**
-     * 激甲端口
-     */
-    @TableField("GAS_PORT")
-    private String gasPort;
-
-    /**
-     * 甲烷报警阈值
-     */
-    @TableField("GAS_THRESHOLD")
-    private String gasThreshold;
-
-    @TableField(value = "HAT_LINING_CODE")
-    private String hatLiningCode;
-
-
-    @Override
-    public String toString() {
-        return "DeviceExt{" +
-            "id=" + id +
-            ", deviceId=" + deviceId +
-            ", cameraCode=" + cameraCode +
-            ", cameraIp=" + cameraIp +
-            ", cameraPort=" + cameraPort +
-            ", gasCode=" + gasCode +
-            ", gasIp=" + gasIp +
-            ", gasPort=" + gasPort +
-            ", gasThreshold=" + gasThreshold +
-            ", hatLiningCode=" + hatLiningCode +
-        "}";
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/ProjectDevice.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/ProjectDevice.java
deleted file mode 100644
index c4f3472..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/ProjectDevice.java
+++ /dev/null
@@ -1,62 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-
-/**
- * <p>
- * 
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@Data
-@ApiModel("ProjectDevice")
-@TableName("br_project_device")
-public class ProjectDevice implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 作业现场ID
-     */
-    @TableField("PROJECT_ID")
-    private Long projectId;
-
-    /**
-     * 设备ID
-     */
-    @TableField("DEVICE_ID")
-    @ApiModelProperty("设备ID（新增编辑时传）")
-    private Long deviceId;
-
-    /**
-     * 设备编号
-     */
-    @TableField(exist = false)
-    @ApiModelProperty("设备编号（详情中展示，新增编辑不用传）")
-    private String deviceCode;
-
-    @Override
-    public String toString() {
-        return "ProjectDevice{" +
-            "id=" + id +
-            ", projectId=" + projectId +
-            ", deviceId=" + deviceId +
-        "}";
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/ProjectWorker.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/ProjectWorker.java
deleted file mode 100644
index 10b23c4..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/ProjectWorker.java
+++ /dev/null
@@ -1,104 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import java.io.Serializable;
-
-/**
- * <p>
- * 
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@ApiModel("ProjectWorker")
-@TableName("br_project_worker")
-@Data
-@NoArgsConstructor
-@AllArgsConstructor
-public class ProjectWorker implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 作业现场ID
-     */
-    @TableField("PROJECT_ID")
-    private Long projectId;
-
-    /**
-     * 人员ID
-     */
-    @ApiModelProperty("人员ID")
-    @TableField("WORKER_ID")
-    private Long workerId;
-
-    /**
-     * 安全帽编号
-     */
-    @ApiModelProperty("安全帽编号")
-    @TableField("HAT_CODE")
-    private String hatCode;
-
-    /**
-     * 背心编号
-     */
-    @ApiModelProperty("背心编号")
-    @TableField("VAST_CODE")
-    private String vastCode;
-
-    /**
-     * 手环编号
-     */
-    @ApiModelProperty("手环编号")
-    @TableField("BRACELET_CODE")
-    private String braceletCode;
-
-    @ApiModelProperty("人员姓名（详情中展示，新增编辑不用传）")
-    @TableField(exist = false)
-    private String workerName;
-
-    @ApiModelProperty("人员部门ID（详情中展示，新增编辑不用传）")
-    @TableField(exist = false)
-    private String workerDeptId;
-
-    @ApiModelProperty("人员部门名称（详情中展示，新增编辑不用传）")
-    @TableField(exist = false)
-    private String workerDeptName;
-
-    @ApiModelProperty("人员联系方式（详情中展示，新增编辑不用传）")
-    @TableField(exist = false)
-    private String workerPhoneNumber;
-
-    public ProjectWorker(Long projectId, Long workerId) {
-        this.projectId = projectId;
-        this.workerId = workerId;
-    }
-
-    @Override
-    public String toString() {
-        return "ProjectWorker{" +
-            "id=" + id +
-            ", projectId=" + projectId +
-            ", workerId=" + workerId +
-            ", hatCode=" + hatCode +
-            ", vastCode=" + vastCode +
-            ", braceletCode=" + braceletCode +
-        "}";
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/WorkSiteInfo.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/WorkSiteInfo.java
deleted file mode 100644
index fa6f41d..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/WorkSiteInfo.java
+++ /dev/null
@@ -1,130 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.alibaba.fastjson.annotation.JSONField;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.time.LocalDateTime;
-import java.util.Date;
-
-/**
- * <p>
- * 作业现场表
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@ApiModel("WorkSiteInfo")
-@TableName("br_work_site_info")
-@Data
-public class WorkSiteInfo implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @ApiModelProperty("作业现场ID")
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 作业名称
-     */
-    @ApiModelProperty("作业名称")
-    @TableField("WORK_TITLE")
-    private String workTitle;
-
-    /**
-     * 责任人
-     */
-    @ApiModelProperty("责任人（人员ID）")
-    @TableField("WORK_PERSON")
-    private Long workPerson;
-
-    /**
-     * 作业描述
-     */
-    @ApiModelProperty("作业描述")
-    @TableField("WORK_SITE_DESC")
-    private String workSiteDesc;
-
-    /**
-     * 作业状态
-     */
-    @ApiModelProperty("作业状态")
-    @TableField("PROJECT_STATE")
-    private String projectState;
-
-    /**
-     * 所属道路
-     */
-    @ApiModelProperty("所属道路")
-    @TableField("WORK_ROAD")
-    private String workRoad;
-
-    @TableField("IMAGE_URL")
-    private String imageUrl;
-
-    @TableField("CREATE_TIME")
-    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
-    private Date createTime;
-    @TableField("UPDATE_TIME")
-    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
-    private Date updateTime;
-
-    @ApiModelProperty("开始时间")
-    @TableField("START_TIME")
-    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
-    private Date startTime;
-
-    @ApiModelProperty("结束时间")
-    @TableField("FINISH_TIME")
-    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
-    private Date finishTime;
-
-    @ApiModelProperty("负责人姓名（详情中使用，新增编辑不用传）")
-    @TableField(exist = false)
-    private String workPersonName;
-
-    @ApiModelProperty("负责人联系方式（详情中使用，新增编辑不用传）")
-    @TableField(exist = false)
-    private String workPersonPhoneNumber;
-
-    @ApiModelProperty("负责人所属部门ID（详情中使用，新增编辑不用传）")
-    @TableField(exist = false)
-    private Long workPersonDeptId;
-
-    @ApiModelProperty("负责人所属部门名称（详情中使用，新增编辑不用传）")
-    @TableField(exist = false)
-    private String workPersonDeptName;
-
-    @ApiModelProperty(value = "注册时间",dataType = "String")
-    @TableField(exist = false)
-    private String registerTime;
-
-    @ApiModelProperty("作业状态名称")
-    @TableField(exist = false)
-    private String projectStateName;
-
-    @Override
-    public String toString() {
-        return "WorkSiteInfo{" +
-            "id=" + id +
-            ", workTitle=" + workTitle +
-            ", workPerson=" + workPerson +
-            ", workSiteDesc=" + workSiteDesc +
-            ", projectState=" + projectState +
-            ", imageUrl=" + imageUrl +
-            ", updateTime=" + updateTime +
-            ", workRoad=" + workRoad +
-        "}";
-    }
-}

diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/AlarmController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/AlarmController.java
new file mode 100644
index 0000000..1795cf1
--- /dev/null
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/AlarmController.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.modular.system.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.stereotype.Controller;
+
+/**
+ * <p>
+ * 报警记录表 前端控制器
+ * </p>
+ *
+ * @author zyj
+ * @since 2023-05-25
+ */
+@Controller
+@RequestMapping("/system/alarm")
+public class AlarmController {
+
+}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusAlarmController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusAlarmController.java
deleted file mode 100644
index 1f82ebb..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusAlarmController.java
+++ /dev/null
@@ -1,102 +0,0 @@
-package com.casic.missiles.modular.system.controller;
-
-
-import cn.hutool.core.util.ObjectUtil;
-import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.core.base.controller.BaseController;
-import com.casic.missiles.core.page.PageFactory;
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.AlarmUpload;
-import com.casic.missiles.modular.system.dto.DeviceDetailDTO;
-import com.casic.missiles.modular.system.entity.BusAlarm;
-import com.casic.missiles.modular.system.service.IBusAlarmService;
-import io.swagger.annotations.*;
-import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.*;
-
-import org.springframework.stereotype.Controller;
-
-import static com.casic.missiles.model.response.ResponseData.DEFAULT_SUCCESS_MESSAGE;
-import static com.casic.missiles.modular.system.consts.AlarmConst.ALARM_STATUS_MANUAL_CANCEL;
-
-/**
- * <p>
- * 报警记录表 前端控制器
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@Api(tags = "报警管理接口")
-@Controller
-@RequestMapping("/alarm")
-@RequiredArgsConstructor
-public class BusAlarmController extends BaseController {
-
-    private final IBusAlarmService alarmService;
-
-    @ApiOperation("报警上报接口")
-    @PostMapping("/upload")
-    @ResponseBody
-    public Object upload(@RequestBody AlarmUpload alarmUpload){
-        alarmService.alarmUpload(alarmUpload);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("报警列表分页查询")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "workTitle", value = "作业名称",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "projectId", value = "作业ID",dataType = "Long", paramType = "query",example = "0"),
-            @ApiImplicitParam(name = "alarmStatus", value = "报警状态",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "projectState", value = "作业状态",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "alarmType", value = "报警类型",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "alarmStartTime", value = "报警开始时间",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "alarmEndTime", value = "报警结束时间",dataType = "String", paramType = "query")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = BusAlarm.class),
-    })
-    @GetMapping("/listPage")
-    @ResponseBody
-    public Object listPage(String workTitle,Long projectId,String alarmStatus,String projectState,String alarmType,String alarmStartTime,String alarmEndTime){
-        Page<BusAlarm> page = PageFactory.defaultPage();
-        QueryWrapper<BusAlarm> queryWrapper = new QueryWrapper<>();
-        if(StrUtil.isNotEmpty(workTitle)){
-            queryWrapper.like("p.WORK_TITLE",workTitle);
-        }
-        if(ObjectUtil.isNotEmpty(projectId)){
-            queryWrapper.eq("alarm.PROJECT_ID",projectId);
-        }
-        if(StrUtil.isNotEmpty(alarmStatus)){
-            queryWrapper.eq("alarm.ALARM_STATUS",alarmStatus);
-        }
-        if(StrUtil.isNotEmpty(projectState)){
-            queryWrapper.eq("p.PROJECT_STATE",projectState);
-        }
-        if(StrUtil.isNotEmpty(alarmType)){
-            queryWrapper.eq("alarm.ALARM_TYPE",alarmType);
-        }
-        if(StrUtil.isNotEmpty(alarmStartTime)){
-            queryWrapper.ge("alarm.ALARM_TIME",alarmStartTime);
-        }
-        if(StrUtil.isNotEmpty(alarmEndTime)){
-            queryWrapper.le("alarm.ALARM_TIME",alarmEndTime);
-        }
-        page = alarmService.listPage(page,queryWrapper);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-    @ApiOperation("消警")
-    @PostMapping("/cancel")
-    @ResponseBody
-    public Object cancel(@RequestParam("alarmId") Long alarmId){
-        UpdateWrapper<BusAlarm> updateWrapper = new UpdateWrapper<>();
-        updateWrapper.eq("ID",alarmId);
-        updateWrapper.set("ALARM_STATUS",ALARM_STATUS_MANUAL_CANCEL);
-        alarmService.update(updateWrapper);
-        return ResponseData.success();
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusEventController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusEventController.java
deleted file mode 100644
index dde5aad..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusEventController.java
+++ /dev/null
@@ -1,41 +0,0 @@
-package com.casic.missiles.modular.system.controller;
-
-
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.entity.BusEvent;
-import com.casic.missiles.modular.system.service.IBusEventService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.ResponseBody;
-
-/**
- * <p>
- * 事件表 前端控制器
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@Controller
-@RequestMapping("/event")
-@Api(tags = "事件上报")
-@RequiredArgsConstructor
-public class BusEventController {
-
-    private final IBusEventService eventService;
-
-    @ApiOperation("事件上报")
-    @PostMapping("add")
-    @ResponseBody
-    public Object add(@RequestBody BusEvent busEvent){
-        eventService.saveBusEvent(busEvent);
-        return ResponseData.success();
-    }
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
index 03abc5f..aa50d78 100644
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
@@ -1,121 +1,20 @@
 package com.casic.missiles.modular.system.controller;
 
 
-import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.core.base.controller.BaseController;
-import com.casic.missiles.core.page.PageFactory;
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.DeviceDetailDTO;
-import com.casic.missiles.modular.system.entity.Device;
-import com.casic.missiles.modular.system.service.IDeviceExtService;
-import com.casic.missiles.modular.system.service.IDeviceService;
-import io.swagger.annotations.*;
-import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.RequestMapping;
 
 import org.springframework.stereotype.Controller;
 
-import java.time.LocalDateTime;
-import java.util.Date;
-import java.util.List;
-
-import static com.casic.missiles.model.response.ResponseData.DEFAULT_SUCCESS_MESSAGE;
-
 /**
  * <p>
- *  前端控制器
+ * 设备记录表 前端控制器
  * </p>
  *
  * @author zyj
- * @since 2023-04-14
+ * @since 2023-05-25
  */
-@Api(tags = "设备管理接口")
-@RequiredArgsConstructor
 @Controller
-@RequestMapping("/device")
-public class DeviceController extends BaseController {
-    private final IDeviceService deviceService;
-    private final IDeviceExtService deviceExtService;
-
-    @ApiOperation("设备分页列表")
-    @ApiImplicitParams({
-        @ApiImplicitParam(name = "deviceType", value = "设备类型",dataType = "String", paramType = "query"),
-        @ApiImplicitParam(name = "deviceCode", value = "设备编号",dataType = "String", paramType = "query"),
-        @ApiImplicitParam(name = "status", value = "设备状态",dataType = "String", paramType = "query"),
-        @ApiImplicitParam(name = "projectId", value = "作业ID（如果传此参数，列表中返回该作业使用的设备）",dataType = "Long", paramType = "query", example = "0")
-    })
-    @ApiResponses({
-        @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = DeviceDetailDTO.class),
-    })
-    @GetMapping("listPage")
-    @ResponseBody
-    public Object listPage(String deviceType, String deviceCode, String status,Long projectId){
-        Page<DeviceDetailDTO> page = PageFactory.defaultPage();
-        QueryWrapper<DeviceDetailDTO> queryWrapper = new QueryWrapper<>();
-        if(StrUtil.isNotEmpty(deviceType)){
-            queryWrapper.eq("DEVICE_TYPE",deviceType);
-        }
-        if(StrUtil.isNotEmpty(deviceCode)){
-            queryWrapper.like("DEVICE_CODE",deviceCode);
-        }
-        page = deviceService.listPage(page,queryWrapper,status,projectId);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-    @ApiOperation("新增设备")
-    @PostMapping("add")
-    @ResponseBody
-    public Object add(@RequestBody DeviceDetailDTO deviceDetailDTO){
-        deviceService.saveDevice(deviceDetailDTO);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("编辑设备")
-    @PostMapping("update")
-    @ResponseBody
-    public Object update(@RequestBody DeviceDetailDTO deviceDetailDTO){
-        deviceService.updateDevice(deviceDetailDTO);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("删除设备")
-    @PostMapping("delete")
-    @ResponseBody
-    public Object delete(@ApiParam("设备id列表")@RequestBody List<Long> deviceIds){
-        deviceService.deleteDevices(deviceIds);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("设置甲烷阈值")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "gasIp", value = "安全树甲烷设备IP",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "gasPort", value = "安全树甲烷端口",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "threshold", value = "甲烷阈值",dataType = "String", paramType = "query")
-    })
-    @PostMapping("setThreshold")
-    @ResponseBody
-    public Object setThreshold(String gasIp,String gasPort,String threshold){
-        deviceExtService.setGasThreshold(gasIp, gasPort, threshold);
-        return ResponseData.success();
-    }
-
-
-    @ApiOperation("查询甲烷阈值")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "gasIp", value = "安全树甲烷设备IP",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "gasPort", value = "安全树甲烷端口",dataType = "String", paramType = "query")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = "{\"code\": 200,\"data\": \"100\",\"message\": \"请求成功\",\"success\": true}",response = String.class),
-    })
-    @GetMapping("getThreshold")
-    @ResponseBody
-    public Object getThreshold(String gasIp,String gasPort){
-        String data = deviceExtService.getGasThreshold(gasIp, gasPort);
-        return ResponseData.success(data);
-    }
-
+@RequestMapping("/system/device")
+public class DeviceController {
 
 }
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/OverviewController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/OverviewController.java
deleted file mode 100644
index 7570504..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/OverviewController.java
+++ /dev/null
@@ -1,70 +0,0 @@
-package com.casic.missiles.modular.system.controller;
-
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.AlarmTypeCountDTO;
-import com.casic.missiles.modular.system.dto.DeviceLocationDTO;
-import com.casic.missiles.modular.system.dto.WorkerLocationDTO;
-import com.casic.missiles.modular.system.service.IBusAlarmService;
-import com.casic.missiles.modular.system.service.IProjectDeviceService;
-import com.casic.missiles.modular.system.service.IProjectWorkerService;
-import io.swagger.annotations.*;
-import lombok.RequiredArgsConstructor;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.ResponseBody;
-
-import static com.casic.missiles.model.response.ResponseData.DEFAULT_SUCCESS_MESSAGE;
-import static com.casic.missiles.modular.system.consts.AlarmConst.ALARM_STATUS_ON;
-
-@Api(tags = "首页看板接口")
-@Controller
-@RequestMapping("overview")
-@RequiredArgsConstructor
-public class OverviewController {
-
-    private final IBusAlarmService alarmService;
-    private final IProjectDeviceService projectDeviceService;
-
-    private final IProjectWorkerService projectWorkerService;
-
-
-    @ApiOperation("报警统计接口")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "projectId", value = "作业ID",dataType = "Long", paramType = "query", example = "0")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = AlarmTypeCountDTO.class),
-    })
-    @GetMapping("/alarmCount")
-    @ResponseBody
-    public Object alarmCount(Long projectId){
-        return ResponseData.success(alarmService.alarmCount(projectId,ALARM_STATUS_ON));
-    }
-
-    @ApiOperation("设备列表接口")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "projectId", value = "作业ID",dataType = "Long", paramType = "query", example = "0")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = DeviceLocationDTO.class),
-    })
-    @GetMapping("/deviceList")
-    @ResponseBody
-    public Object deviceList(Long projectId){
-        return ResponseData.success(projectDeviceService.selectDeviceLocationList(projectId));
-    }
-
-    @ApiOperation("人员列表接口")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "projectId", value = "作业ID",dataType = "Long", paramType = "query", example = "0")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = WorkerLocationDTO.class),
-    })
-    @GetMapping("/workerList")
-    @ResponseBody
-    public Object workerList(Long projectId){
-        return ResponseData.success(projectWorkerService.selectWorkerLocationDTO(projectId));
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/WorkSiteInfoController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/WorkSiteInfoController.java
deleted file mode 100644
index af36d69..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/WorkSiteInfoController.java
+++ /dev/null
@@ -1,130 +0,0 @@
-package com.casic.missiles.modular.system.controller;
-
-
-import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.core.base.controller.BaseController;
-import com.casic.missiles.core.page.PageFactory;
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.WorkSiteDetailDTO;
-import com.casic.missiles.modular.system.entity.WorkSiteInfo;
-import com.casic.missiles.modular.system.service.IWorkSiteInfoService;
-import io.swagger.annotations.*;
-import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.*;
-
-import org.springframework.stereotype.Controller;
-
-import java.util.List;
-
-import static com.casic.missiles.model.response.ResponseData.DEFAULT_SUCCESS_MESSAGE;
-
-/**
- * <p>
- * 作业现场表 前端控制器
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@Controller
-@RequestMapping("/site")
-@Api(tags = "作业现场管理")
-@RequiredArgsConstructor
-public class WorkSiteInfoController extends BaseController {
-
-
-    private final IWorkSiteInfoService workSiteInfoService;
-
-    @ApiOperation("新增作业现场")
-    @PostMapping("add")
-    @ResponseBody
-    public Object addWorkSite(@RequestBody WorkSiteDetailDTO workSiteDetailDTO){
-        workSiteInfoService.addWorkSiteInfo(workSiteDetailDTO);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("编辑作业现场")
-    @PostMapping("update")
-    @ResponseBody
-    public Object updateWorkSite(@RequestBody WorkSiteDetailDTO workSiteDetailDTO){
-        workSiteInfoService.updateWorkSiteInfo(workSiteDetailDTO);
-        return ResponseData.success();
-    }
-
-
-    @ApiOperation("删除作业现场")
-    @PostMapping("delete")
-    @ResponseBody
-    public Object delete(@ApiParam("作业现场id列表")@RequestBody List<Long> projectIds){
-        workSiteInfoService.deleteProjects(projectIds);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("查询作业现场详情")
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = WorkSiteDetailDTO.class),
-    })
-    @GetMapping("detail")
-    @ResponseBody
-    public Object delete(@ApiParam(value = "作业现场id", example = "0")@RequestParam Long projectId){
-        WorkSiteDetailDTO detailDTO = workSiteInfoService.getWorkSiteDetail(projectId);
-        return ResponseData.success(detailDTO);
-    }
-
-    @ApiOperation("分页列表查询")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "workTitle",value = "作业名称", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "workRoad",value = "所属道路", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "workPersonName",value = "责任人姓名", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "startDate",value = "注册开始日期", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "endDate",value = "注册结束日期", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "projectState",value = "当前状态（字典值）", dataType = "String", paramType = "query")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = WorkSiteInfo.class),
-    })
-    @GetMapping("listPage")
-    @ResponseBody
-    public Object listPage(String workTitle,String workRoad,String workPersonName,String projectState,String startDate,String endDate){
-        Page<WorkSiteInfo> page = PageFactory.defaultPage();
-        QueryWrapper<WorkSiteInfo> queryWrapper = new QueryWrapper<>();
-        if(StrUtil.isNotEmpty(workTitle)){
-            queryWrapper.like("WORK_TITLE",workTitle);
-        }
-        if(StrUtil.isNotEmpty(workRoad)){
-            queryWrapper.like("WORK_ROAD",workRoad);
-        }
-        if(StrUtil.isNotEmpty(workPersonName)){
-            queryWrapper.like("WORKER_NAME",workPersonName);
-        }
-        if(StrUtil.isNotEmpty(projectState)){
-            queryWrapper.eq("PROJECT_STATE",projectState);
-        }
-        if(StrUtil.isNotEmpty(startDate)){
-            queryWrapper.ge("br_work_site_info.CREATE_TIME",startDate + " 00:00:00");
-        }
-        if(StrUtil.isNotEmpty(endDate)){
-            queryWrapper.le("br_work_site_info.CREATE_TIME",endDate + " 23:59:59");
-        }
-        page = workSiteInfoService.selectListPage(page,queryWrapper);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-    @ApiOperation("开始作业")
-    @PostMapping("start")
-    @ResponseBody
-    public Object start(@ApiParam(value = "作业现场id",example = "0")@RequestParam Long projectId){
-        workSiteInfoService.start(projectId);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("完成作业")
-    @PostMapping("finish")
-    @ResponseBody
-    public Object finish(@ApiParam(value = "作业现场id", example = "0")@RequestParam Long projectId){
-        workSiteInfoService.finish(projectId);
-        return ResponseData.success();
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/WorkerController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/WorkerController.java
deleted file mode 100644
index 796f94c..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/WorkerController.java
+++ /dev/null
@@ -1,136 +0,0 @@
-package com.casic.missiles.modular.system.controller;
-
-
-import cn.hutool.core.util.ObjectUtil;
-import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.core.base.controller.BaseController;
-import com.casic.missiles.core.page.PageFactory;
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.DeviceDetailDTO;
-import com.casic.missiles.modular.system.entity.Device;
-import com.casic.missiles.modular.system.entity.Worker;
-import com.casic.missiles.modular.system.service.IWorkerService;
-import io.swagger.annotations.*;
-import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.*;
-
-import org.springframework.stereotype.Controller;
-
-import java.util.Date;
-import java.util.List;
-
-import static com.casic.missiles.model.response.ResponseData.DEFAULT_SUCCESS_MESSAGE;
-
-/**
- * <p>
- *  前端控制器
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@Controller
-@RequestMapping("/worker")
-@RequiredArgsConstructor
-@Api(tags = "人员管理接口")
-public class WorkerController extends BaseController {
-
-    private final IWorkerService workerService;
-
-    @ApiOperation("分页列表查询")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "name",value = "姓名", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "deptId",value = "所属部门", dataType = "Long", paramType = "query", example = "0"),
-            @ApiImplicitParam(name = "status",value = "当前状态（字典值）", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "startDate",value = "注册开始日期", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "endDate",value = "注册结束日期", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "workerType",value = "人员类型（字典值）", dataType = "String", paramType = "query")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = Worker.class),
-    })
-    @GetMapping("listPage")
-    @ResponseBody
-    public Object listPage(String name,Long deptId, String status,String startDate,String endDate,String workerType){
-        Page<Worker> page = PageFactory.defaultPage();
-        QueryWrapper<Worker> queryWrapper = new QueryWrapper<>();
-        if(StrUtil.isNotEmpty(name)){
-            queryWrapper.like("WORKER_NAME",name);
-        }
-        if(ObjectUtil.isNotEmpty(deptId)){
-            queryWrapper.eq("DEPT_ID",deptId);
-        }
-        if(StrUtil.isNotEmpty(workerType)){
-            queryWrapper.eq("WORKER_TYPE",workerType);
-        }
-        if(StrUtil.isNotEmpty(startDate)){
-            queryWrapper.ge("CREATE_TIME",startDate + " 00:00:00");
-        }
-        if(StrUtil.isNotEmpty(endDate)){
-            queryWrapper.le("CREATE_TIME",endDate + " 23:59:59");
-        }
-        if(StrUtil.isNotEmpty(status)){
-            queryWrapper.eq("`STATUS`",status);
-        }
-        page = workerService.selectListPage(page,queryWrapper);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-    @ApiOperation("新增人员")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "worker", value = "人员信息", dataType = "Worker", paramType = "body", required = true),
-            @ApiImplicitParam(name = "projectId", value = "项目ID(入场申请需要)", dataType = "Long", paramType = "query", example = "0")
-    })
-    @PostMapping("add")
-    @ResponseBody
-    public Object add(@ApiParam("worker")@RequestBody Worker worker,
-                      @RequestParam(required = false) Long projectId){
-        workerService.addWorker(worker,projectId);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("编辑人员")
-    @PostMapping("update")
-    @ResponseBody
-    public Object update(@RequestBody Worker worker){
-        workerService.updateById(worker);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("删除人员")
-    @PostMapping("delete")
-    @ResponseBody
-    public Object delete(@ApiParam("人员id列表")@RequestBody List<Long> workIds){
-        workerService.removeByIds(workIds);
-        return ResponseData.success();
-    }
-
-
-    @ApiOperation(value = "获取人脸图片",notes = "返回人脸图片url")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "cameraIp",value = "摄像头IP", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "cameraPort",value = "摄像头端口号", dataType = "String", paramType = "query"),
-    })
-    @GetMapping("/face/register")
-    @ResponseBody
-    public Object faceRegister(String cameraIp,String cameraPort){
-        return ResponseData.success(workerService.faceRegister(cameraIp, cameraPort));
-    }
-
-
-    @ApiOperation(value = "查询临时入场人员列表")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "projectId", value = "项目ID",required = true,dataType = "Long", paramType = "query", example = "0")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = Worker.class),
-    })
-    @GetMapping("/projectTempWorker")
-    @ResponseBody
-    public Object projectTempWorker(Long projectId){
-        return ResponseData.success(workerService.projectTempWorker(projectId));
-    }
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/AlarmTypeCountDTO.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/AlarmTypeCountDTO.java
deleted file mode 100644
index 1a165a1..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/AlarmTypeCountDTO.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.casic.missiles.modular.system.dto;
-
-import io.swagger.annotations.ApiModel;
-import lombok.Data;
-
-@ApiModel(value = "AlarmTypeCountDTO",description = "报警类型统计（首页）")
-@Data
-public class AlarmTypeCountDTO {
-
-    private String alarmType;
-    private String alarmTypeName;
-    private Integer alarmCount;
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/AlarmUpload.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/AlarmUpload.java
deleted file mode 100644
index 73d7799..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/AlarmUpload.java
+++ /dev/null
@@ -1,46 +0,0 @@
-package com.casic.missiles.modular.system.dto;
-
-import cn.hutool.core.util.StrUtil;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-@ApiModel(value = "AlarmUpload",description = "报警上传")
-@Data
-public class AlarmUpload {
-
-    @ApiModelProperty(value = "摄像头ip")
-    private String cameraIp;
-
-    @ApiModelProperty(value = "摄像头端口")
-    private String cameraPort;
-    @ApiModelProperty(value = "安全树甲烷设备ip")
-    private String gasIp;
-    @ApiModelProperty(value = "安全树甲烷设备端口")
-    private String gasPort;
-    @ApiModelProperty(value = "报警值")
-    private String alarmValue;
-    @ApiModelProperty(value = "报警时间")
-    private String alarmTime;
-    @ApiModelProperty(value = "报警类型")
-    private String alarmType;
-    @ApiModelProperty(value = "报警图片")
-    private String alarmImage;
-    @ApiModelProperty(value = "报警内容")
-    private String alarmContent;
-
-    @Override
-    public String toString() {
-        return "AlarmUpload{" +
-                "cameraIp='" + cameraIp + '\'' +
-                ", cameraPort='" + cameraPort + '\'' +
-                ", gasIp='" + gasIp + '\'' +
-                ", gasPort='" + gasPort + '\'' +
-                ", alarmValue='" + alarmValue + '\'' +
-                ", alarmTime='" + alarmTime + '\'' +
-                ", alarmType='" + alarmType + '\'' +
-                ", alarmImage='" + (StrUtil.isNotEmpty(alarmImage) ? alarmImage.substring(0,50) : "null") + '\'' +
-                ", alarmContent='" + alarmContent + '\'' +
-                '}';
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/DeviceDetailDTO.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/DeviceDetailDTO.java
deleted file mode 100644
index ea518d9..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/DeviceDetailDTO.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package com.casic.missiles.modular.system.dto;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.casic.missiles.modular.system.entity.Device;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-@ApiModel("DeviceDetailDTO")
-@Data
-public class DeviceDetailDTO extends Device {
-
-    @ApiModelProperty(value = "摄像头编号")
-    private String cameraCode;
-
-    @ApiModelProperty(value = "摄像头IP")
-    private String cameraIp;
-
-    @ApiModelProperty(value = "摄像头端口")
-    private String cameraPort;
-
-    @ApiModelProperty(value = "激甲编号")
-    private String gasCode;
-
-    @ApiModelProperty(value = "激甲IP")
-    private String gasIp;
-
-    @ApiModelProperty(value = "激甲端口")
-    private String gasPort;
-
-    @ApiModelProperty(value = "智能帽衬编号")
-    private String hatLiningCode;
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/WorkSiteDetailDTO.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/WorkSiteDetailDTO.java
deleted file mode 100644
index 29378ff..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/WorkSiteDetailDTO.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package com.casic.missiles.modular.system.dto;
-
-import com.casic.missiles.modular.system.entity.ProjectDevice;
-import com.casic.missiles.modular.system.entity.ProjectWorker;
-import com.casic.missiles.modular.system.entity.WorkSiteInfo;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.util.List;
-
-@Data
-@ApiModel("WorkSiteDetailDTO")
-public class WorkSiteDetailDTO extends WorkSiteInfo {
-
-    @ApiModelProperty(value = "安全树列表",dataType = "ProjectDevice")
-    private List<ProjectDevice> deviceList;
-
-    @ApiModelProperty(value = "人员列表",dataType = "ProjectWorker")
-    private List<ProjectWorker> workerList;
-
-
-
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/WorkerLocationDTO.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/WorkerLocationDTO.java
deleted file mode 100644
index 6fd7b24..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/WorkerLocationDTO.java
+++ /dev/null
@@ -1,68 +0,0 @@
-package com.casic.missiles.modular.system.dto;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-@ApiModel(value = "WorkerLocationDTO",description = "人员位置列表（首页）")
-@Data
-public class WorkerLocationDTO {
-
-    @ApiModelProperty("人员ID")
-    private Long workerId;
-
-    @ApiModelProperty("人员姓名")
-    private String workerName;
-
-    @ApiModelProperty("安全帽编号")
-    private String hatCode;
-
-    @ApiModelProperty("安全帽ID")
-    private Long hatId;
-
-    @ApiModelProperty("背心编号")
-    private String vastCode;
-
-    @ApiModelProperty("手环编号")
-    private String braceletCode;
-
-    @ApiModelProperty("位置")
-    private String location;
-
-    @ApiModelProperty("时间")
-    private String time;
-
-    @ApiModelProperty("经度")
-    private String lng;
-
-    @ApiModelProperty("纬度")
-    private String lat;
-
-    @ApiModelProperty("心率")
-    private String heartRate;
-
-    @ApiModelProperty("血氧")
-    private String bloodOxygen;
-
-    @ApiModelProperty("一氧化碳")
-    private String co;
-
-    @ApiModelProperty("甲烷")
-    private String gas;
-
-    @ApiModelProperty("硫化氢")
-    private String h2s;
-
-    @ApiModelProperty("氧气")
-    private String o2;
-
-    @ApiModelProperty("信号")
-    private String signal;
-
-    @ApiModelProperty("电量")
-    private String cell;
-
-    @ApiModelProperty("是否报警")
-    private boolean alarmFlag;
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Alarm.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Alarm.java
new file mode 100644
index 0000000..4d2b7ef
--- /dev/null
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Alarm.java
@@ -0,0 +1,103 @@
+package com.casic.missiles.modular.system.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import java.util.Date;
+
+/**
+ * <p>
+ * 报警记录表
+ * </p>
+ *
+ * @author zyj
+ * @since 2023-05-25
+ */
+@Data
+@TableName("bus_alarm")
+public class Alarm implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    @TableId(value = "ID",type = IdType.ASSIGN_ID)
+    private Long id;
+
+    /**
+     * 设备ID
+     */
+    @TableField("DEVICE_ID")
+    private Long deviceId;
+
+    /**
+     * 报警类型
+     */
+    @TableField("ALARM_TYPE")
+    private String alarmType;
+
+    /**
+     * 报警时间
+     */
+    @TableField("ALARM_TIME")
+    private Date alarmTime;
+
+    /**
+     * 报警状态
+     */
+    @TableField("ALARM_STATUS")
+    private String alarmStatus;
+
+    /**
+     * 报警位置
+     */
+    @TableField("ALARM_LOCATION")
+    private String alarmLocation;
+
+    /**
+     * 报警图片
+     */
+    @TableField("ALARM_IMAGE")
+    private String alarmImage;
+
+    /**
+     * 视频通道号
+     */
+    @TableField("CHANNEL_NO")
+    private Integer channelNo;
+
+    /**
+     * 报警内容
+     */
+    @TableField("ALARM_CONTENT")
+    private String alarmContent;
+
+    /**
+     * 消警时间
+     */
+    @TableField("CANCEL_TIME")
+    private Date cancelTime;
+
+
+    @Override
+    public String toString() {
+        return "Alarm{" +
+            "id=" + id +
+            ", deviceId=" + deviceId +
+            ", alarmType=" + alarmType +
+            ", alarmTime=" + alarmTime +
+            ", alarmStatus=" + alarmStatus +
+            ", alarmLocation=" + alarmLocation +
+            ", alarmImage=" + alarmImage +
+            ", channelNo=" + channelNo +
+            ", alarmContent=" + alarmContent +
+            ", cancelTime=" + cancelTime +
+        "}";
+    }
+}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusAlarm.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusAlarm.java
deleted file mode 100644
index efb4a23..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusAlarm.java
+++ /dev/null
@@ -1,159 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.alibaba.fastjson.annotation.JSONField;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.time.LocalDateTime;
-import java.util.Date;
-
-/**
- * <p>
- * 报警记录表
- * </p>
- *
- * @author zyj
- * @since 2023-05-16
- */
-@Data
-@ApiModel("Alarm")
-@TableName("br_bus_alarm")
-public class BusAlarm implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 项目ID
-     */
-    @ApiModelProperty(value = "项目ID")
-    @TableField("PROJECT_ID")
-    private Long projectId;
-
-    /**
-     * 设备ID
-     */
-    @ApiModelProperty(value = "设备ID")
-    @TableField("DEVICE_ID")
-    private Long deviceId;
-
-    /**
-     * 报警类型
-     */
-    @ApiModelProperty(value = "报警类型")
-    @TableField("ALARM_TYPE")
-    private String alarmType;
-
-    /**
-     * 报警状态
-     */
-    @ApiModelProperty(value = "报警状态")
-    @TableField("ALARM_STATUS")
-    private String alarmStatus;
-
-    /**
-     * 报警值
-     */
-    @ApiModelProperty(value = "报警值")
-    @TableField("ALARM_VALUE")
-    private String alarmValue;
-
-    /**
-     * 报警图片
-     */
-    @ApiModelProperty(value = "报警图片")
-    @TableField("ALARM_IMAGE")
-    private String alarmImage;
-
-    /**
-     * 报警内容
-     */
-    @ApiModelProperty(value = "报警内容")
-    @TableField("ALARM_CONTENT")
-    private String alarmContent;
-
-    /**
-     * 报警时间
-     */
-    @ApiModelProperty(value = "报警时间")
-    @TableField("ALARM_TIME")
-    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
-    private Date alarmTime;
-
-    /**
-     * 消警时间
-     */
-    @ApiModelProperty(value = "消警时间")
-    @TableField("CANCEL_TIME")
-    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
-    private Date cancelTime;
-
-    /**
-     * 报警位置经度
-     */
-    @ApiModelProperty(value = "报警位置经度")
-    @TableField("ALARM_LNG")
-    private String alarmLng;
-
-    /**
-     * 报警位置纬度
-     */
-    @ApiModelProperty(value = "报警位置纬度")
-    @TableField("ALARM_LAT")
-    private String alarmLat;
-
-    @ApiModelProperty("报警类型名称")
-    @TableField(exist = false)
-    private String alarmStatusName;
-    @ApiModelProperty("报警类型名称")
-    @TableField(exist = false)
-    private String alarmTypeName;
-    @ApiModelProperty("作业名称")
-    @TableField(exist = false)
-    private String workTitle;
-    @ApiModelProperty("所属道路")
-    @TableField(exist = false)
-    private String workRoad;
-    @ApiModelProperty("作业状态")
-    @TableField(exist = false)
-    private String projectState;
-    @ApiModelProperty("作业状态名称")
-    @TableField(exist = false)
-    private String projectStateName;
-    @ApiModelProperty("负责人姓名")
-    @TableField(exist = false)
-    private String workPersonName;
-    @ApiModelProperty("负责人联系方式")
-    @TableField(exist = false)
-    private String workPersonPhoneNumber;
-
-
-    @Override
-    public String toString() {
-        return "BusAlarm{" +
-                "id=" + id +
-                ", projectId=" + projectId +
-                ", deviceId=" + deviceId +
-                ", alarmType=" + alarmType +
-                ", alarmValue=" + alarmValue +
-                ", alarmStatus=" + alarmStatus +
-                ", alarmImage=" + alarmImage +
-                ", alarmContent=" + alarmContent +
-                ", alarmTime=" + alarmTime +
-                ", cancelTime=" + cancelTime +
-                ", alarmLng=" + alarmLng +
-                ", alarmLat=" + alarmLat +
-                "}";
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusEvent.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusEvent.java
deleted file mode 100644
index a0b7543..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusEvent.java
+++ /dev/null
@@ -1,100 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.time.LocalDateTime;
-import java.util.Date;
-import java.util.List;
-
-/**
- * <p>
- * 事件表
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@TableName("br_bus_event")
-@Data
-@ApiModel("BusEvent")
-public class BusEvent implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @ApiModelProperty("事件ID")
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 事件标题
-     */
-    @ApiModelProperty("事件名称")
-    @TableField("EVENT_TITLE")
-    private String eventTitle;
-
-    /**
-     * 上报人员
-     */
-    @ApiModelProperty("上报人员")
-    @TableField("UPLOAD_NAME")
-    private String uploadName;
-
-    /**
-     * 联系方式
-     */
-    @ApiModelProperty("联系方式")
-    @TableField("PHONE_NUMBER")
-    private String phoneNumber;
-
-    /**
-     * 事件描述
-     */
-    @ApiModelProperty("事件描述")
-    @TableField("EVENT_DESCRIPTION")
-    private String eventDescription;
-
-    @ApiModelProperty("经度")
-    @TableField("LNG")
-    private String lng;
-
-    @ApiModelProperty("纬度")
-    @TableField("LAT")
-    private String lat;
-
-    /**
-     * 事件上传时间
-     */
-    @ApiModelProperty("事件上传时间")
-    @TableField("CREATE_TIME")
-    private Date createTime;
-
-    @ApiModelProperty("事件照片")
-    @TableField(exist = false)
-    private List<BusEventImage> imageList;
-
-
-
-    @Override
-    public String toString() {
-        return "BusEvent{" +
-            "id=" + id +
-            ", eventTitle=" + eventTitle +
-            ", uploadName=" + uploadName +
-            ", phoneNumber=" + phoneNumber +
-            ", eventDescription=" + eventDescription +
-            ", lng=" + lng +
-            ", lat=" + lat +
-            ", createTime=" + createTime +
-        "}";
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusEventImage.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusEventImage.java
deleted file mode 100644
index 1e75245..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusEventImage.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-
-/**
- * <p>
- * 事件图片表
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@TableName("br_bus_event_image")
-@Data
-@ApiModel("BusEventImage")
-public class BusEventImage implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 事件ID
-     */
-    @TableField("EVENT_ID")
-    private Long eventId;
-
-    /**
-     * 报警图片
-     */
-    @TableField("IMAGE")
-    @ApiModelProperty("图片url")
-    private String image;
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Device.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Device.java
index df89c70..ea7db5f 100644
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Device.java
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Device.java
@@ -1,30 +1,23 @@
 package com.casic.missiles.modular.system.entity;
 
-import com.alibaba.fastjson.annotation.JSONField;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.casic.missiles.core.base.json.DateDeserializer;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
-import java.util.Date;
 
 /**
  * <p>
- * 
+ * 设备记录表
  * </p>
  *
  * @author zyj
- * @since 2023-04-14
+ * @since 2023-05-25
  */
-@ApiModel("Device")
-@TableName("br_device")
 @Data
+@TableName("bus_device")
 public class Device implements Serializable {
 
     private static final long serialVersionUID = 1L;
@@ -32,82 +25,86 @@
     /**
      * 主键
      */
-    @ApiModelProperty(value = "设备ID")
     @TableId(value = "ID",type = IdType.ASSIGN_ID)
     private Long id;
 
     /**
-     * 设备编号
+     * 设备名称
      */
-    @ApiModelProperty(value = "设备编号")
-    @TableField("DEVICE_CODE")
-    private String deviceCode;
+    @TableField("DEVICE_NAME")
+    private String deviceName;
 
     /**
-     * 设备类型
+     * IP
      */
-    @ApiModelProperty(value = "设备类型")
-    @TableField("DEVICE_TYPE")
-    private String deviceType;
+    @TableField("IP")
+    private String ip;
 
     /**
-     * 设备批次
+     * 端口
      */
-    @ApiModelProperty(value = "设备批次")
-    @TableField("DEVICE_BATCH")
-    private String deviceBatch;
+    @TableField("PORT")
+    private String port;
 
     /**
-     * 厂家
+     * 用户名
      */
-    @ApiModelProperty(value = "厂家")
-    @TableField("MANUFACTURER")
-    private String manufacturer;
+    @TableField("USER_NAME")
+    private String userName;
 
     /**
-     * 是否供电
+     * 密码
      */
-    @ApiModelProperty(value = "是否供电")
-    @TableField("IS_POWER_SUPPLY")
-    private String isPowerSupply;
+    @TableField("PASSWORD")
+    private String password;
 
     /**
-     * 创建时间
+     * 连接类型
      */
-    @ApiModelProperty(value = "创建时间",dataType = "Date")
-    @TableField("CREATE_TIME")
-    private Date createTime;
+    @TableField("CONNECT_TYPE")
+    private String connectType;
 
-    @ApiModelProperty(value = "设备类型名称")
-    @TableField(exist = false)
-    private String deviceTypeName;
+    /**
+     * 位置
+     */
+    @TableField("LOCATION")
 
-    @ApiModelProperty(value = "是否供电名称")
-    @TableField(exist = false)
-    private String isPowerSupplyName;
+    private String location;
 
-    @ApiModelProperty(value = "注册时间",dataType = "String")
-    @TableField(exist = false)
-    private String registerTime;
+    /**
+     * 设备状态
+     */
+    @TableField("STATUS")
 
-    @ApiModelProperty(value = "当前状态")
-    @TableField(exist = false)
     private String status;
 
-    @ApiModelProperty(value = "当前状态名称")
-    @TableField(exist = false)
-    private String statusName;
+    /**
+     * 报警分组
+     */
+    @TableField("ALARM_GROUP")
+
+    private Long alarmGroup;
+
+    /**
+     * 视频通道数(预留)
+     */
+    @TableField("CHANNEL_NUM")
+    private Integer channelNum;
 
     @Override
     public String toString() {
         return "Device{" +
             "id=" + id +
-            ", deviceCode=" + deviceCode +
-            ", deviceType=" + deviceType +
-            ", deviceBatch=" + deviceBatch +
-            ", manufacturer=" + manufacturer +
-            ", isPowerSupply=" + isPowerSupply +
-            ", createTime=" + createTime +
+            ", deviceName=" + deviceName +
+            ", ip=" + ip +
+            ", port=" + port +
+            ", userName=" + userName +
+            ", password=" + password +
+            ", connectType=" + connectType +
+            ", location=" + location +
+            ", status=" + status +
+            ", alarmGroup=" + alarmGroup +
+            ", channelNum=" + channelNum +
         "}";
     }
 }
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/DeviceExt.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/DeviceExt.java
deleted file mode 100644
index 5ee7015..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/DeviceExt.java
+++ /dev/null
@@ -1,99 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-
-/**
- * <p>
- * 设备扩展信息表（安全树）
- * </p>
- *
- * @author zyj
- * @since 2023-04-27
- */
-@Data
-@TableName("br_device_ext")
-public class DeviceExt implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 设备ID
-     */
-    @TableField("DEVICE_ID")
-    private Long deviceId;
-
-    /**
-     * 摄像头编号
-     */
-    @TableField("CAMERA_CODE")
-    private String cameraCode;
-
-    /**
-     * 摄像头IP
-     */
-    @TableField("CAMERA_IP")
-    private String cameraIp;
-
-    /**
-     * 摄像头端口
-     */
-    @TableField("CAMERA_PORT")
-    private String cameraPort;
-
-    /**
-     * 激甲编号
-     */
-    @TableField("GAS_CODE")
-    private String gasCode;
-
-    /**
-     * 激甲IP
-     */
-    @TableField("GAS_IP")
-    private String gasIp;
-
-    /**
-     * 激甲端口
-     */
-    @TableField("GAS_PORT")
-    private String gasPort;
-
-    /**
-     * 甲烷报警阈值
-     */
-    @TableField("GAS_THRESHOLD")
-    private String gasThreshold;
-
-    @TableField(value = "HAT_LINING_CODE")
-    private String hatLiningCode;
-
-
-    @Override
-    public String toString() {
-        return "DeviceExt{" +
-            "id=" + id +
-            ", deviceId=" + deviceId +
-            ", cameraCode=" + cameraCode +
-            ", cameraIp=" + cameraIp +
-            ", cameraPort=" + cameraPort +
-            ", gasCode=" + gasCode +
-            ", gasIp=" + gasIp +
-            ", gasPort=" + gasPort +
-            ", gasThreshold=" + gasThreshold +
-            ", hatLiningCode=" + hatLiningCode +
-        "}";
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/ProjectDevice.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/ProjectDevice.java
deleted file mode 100644
index c4f3472..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/ProjectDevice.java
+++ /dev/null
@@ -1,62 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-
-/**
- * <p>
- * 
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@Data
-@ApiModel("ProjectDevice")
-@TableName("br_project_device")
-public class ProjectDevice implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 作业现场ID
-     */
-    @TableField("PROJECT_ID")
-    private Long projectId;
-
-    /**
-     * 设备ID
-     */
-    @TableField("DEVICE_ID")
-    @ApiModelProperty("设备ID（新增编辑时传）")
-    private Long deviceId;
-
-    /**
-     * 设备编号
-     */
-    @TableField(exist = false)
-    @ApiModelProperty("设备编号（详情中展示，新增编辑不用传）")
-    private String deviceCode;
-
-    @Override
-    public String toString() {
-        return "ProjectDevice{" +
-            "id=" + id +
-            ", projectId=" + projectId +
-            ", deviceId=" + deviceId +
-        "}";
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/ProjectWorker.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/ProjectWorker.java
deleted file mode 100644
index 10b23c4..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/ProjectWorker.java
+++ /dev/null
@@ -1,104 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import java.io.Serializable;
-
-/**
- * <p>
- * 
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@ApiModel("ProjectWorker")
-@TableName("br_project_worker")
-@Data
-@NoArgsConstructor
-@AllArgsConstructor
-public class ProjectWorker implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 作业现场ID
-     */
-    @TableField("PROJECT_ID")
-    private Long projectId;
-
-    /**
-     * 人员ID
-     */
-    @ApiModelProperty("人员ID")
-    @TableField("WORKER_ID")
-    private Long workerId;
-
-    /**
-     * 安全帽编号
-     */
-    @ApiModelProperty("安全帽编号")
-    @TableField("HAT_CODE")
-    private String hatCode;
-
-    /**
-     * 背心编号
-     */
-    @ApiModelProperty("背心编号")
-    @TableField("VAST_CODE")
-    private String vastCode;
-
-    /**
-     * 手环编号
-     */
-    @ApiModelProperty("手环编号")
-    @TableField("BRACELET_CODE")
-    private String braceletCode;
-
-    @ApiModelProperty("人员姓名（详情中展示，新增编辑不用传）")
-    @TableField(exist = false)
-    private String workerName;
-
-    @ApiModelProperty("人员部门ID（详情中展示，新增编辑不用传）")
-    @TableField(exist = false)
-    private String workerDeptId;
-
-    @ApiModelProperty("人员部门名称（详情中展示，新增编辑不用传）")
-    @TableField(exist = false)
-    private String workerDeptName;
-
-    @ApiModelProperty("人员联系方式（详情中展示，新增编辑不用传）")
-    @TableField(exist = false)
-    private String workerPhoneNumber;
-
-    public ProjectWorker(Long projectId, Long workerId) {
-        this.projectId = projectId;
-        this.workerId = workerId;
-    }
-
-    @Override
-    public String toString() {
-        return "ProjectWorker{" +
-            "id=" + id +
-            ", projectId=" + projectId +
-            ", workerId=" + workerId +
-            ", hatCode=" + hatCode +
-            ", vastCode=" + vastCode +
-            ", braceletCode=" + braceletCode +
-        "}";
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/WorkSiteInfo.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/WorkSiteInfo.java
deleted file mode 100644
index fa6f41d..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/WorkSiteInfo.java
+++ /dev/null
@@ -1,130 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.alibaba.fastjson.annotation.JSONField;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.time.LocalDateTime;
-import java.util.Date;
-
-/**
- * <p>
- * 作业现场表
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@ApiModel("WorkSiteInfo")
-@TableName("br_work_site_info")
-@Data
-public class WorkSiteInfo implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @ApiModelProperty("作业现场ID")
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 作业名称
-     */
-    @ApiModelProperty("作业名称")
-    @TableField("WORK_TITLE")
-    private String workTitle;
-
-    /**
-     * 责任人
-     */
-    @ApiModelProperty("责任人（人员ID）")
-    @TableField("WORK_PERSON")
-    private Long workPerson;
-
-    /**
-     * 作业描述
-     */
-    @ApiModelProperty("作业描述")
-    @TableField("WORK_SITE_DESC")
-    private String workSiteDesc;
-
-    /**
-     * 作业状态
-     */
-    @ApiModelProperty("作业状态")
-    @TableField("PROJECT_STATE")
-    private String projectState;
-
-    /**
-     * 所属道路
-     */
-    @ApiModelProperty("所属道路")
-    @TableField("WORK_ROAD")
-    private String workRoad;
-
-    @TableField("IMAGE_URL")
-    private String imageUrl;
-
-    @TableField("CREATE_TIME")
-    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
-    private Date createTime;
-    @TableField("UPDATE_TIME")
-    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
-    private Date updateTime;
-
-    @ApiModelProperty("开始时间")
-    @TableField("START_TIME")
-    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
-    private Date startTime;
-
-    @ApiModelProperty("结束时间")
-    @TableField("FINISH_TIME")
-    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
-    private Date finishTime;
-
-    @ApiModelProperty("负责人姓名（详情中使用，新增编辑不用传）")
-    @TableField(exist = false)
-    private String workPersonName;
-
-    @ApiModelProperty("负责人联系方式（详情中使用，新增编辑不用传）")
-    @TableField(exist = false)
-    private String workPersonPhoneNumber;
-
-    @ApiModelProperty("负责人所属部门ID（详情中使用，新增编辑不用传）")
-    @TableField(exist = false)
-    private Long workPersonDeptId;
-
-    @ApiModelProperty("负责人所属部门名称（详情中使用，新增编辑不用传）")
-    @TableField(exist = false)
-    private String workPersonDeptName;
-
-    @ApiModelProperty(value = "注册时间",dataType = "String")
-    @TableField(exist = false)
-    private String registerTime;
-
-    @ApiModelProperty("作业状态名称")
-    @TableField(exist = false)
-    private String projectStateName;
-
-    @Override
-    public String toString() {
-        return "WorkSiteInfo{" +
-            "id=" + id +
-            ", workTitle=" + workTitle +
-            ", workPerson=" + workPerson +
-            ", workSiteDesc=" + workSiteDesc +
-            ", projectState=" + projectState +
-            ", imageUrl=" + imageUrl +
-            ", updateTime=" + updateTime +
-            ", workRoad=" + workRoad +
-        "}";
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Worker.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Worker.java
deleted file mode 100644
index 28a4daa..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Worker.java
+++ /dev/null
@@ -1,147 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.time.LocalDateTime;
-import java.util.Date;
-
-/**
- * <p>
- * 
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@ApiModel("Worker")
-@TableName("br_worker")
-@Data
-public class Worker implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @ApiModelProperty(value = "人员ID")
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 姓名
-     */
-    @ApiModelProperty(value = "姓名")
-    @TableField("WORKER_NAME")
-    private String workerName;
-
-    /**
-     * 性别
-     */
-    @ApiModelProperty(value = "性别")
-    @TableField("GENDER")
-    private String gender;
-
-    /**
-     * 所属部门
-     */
-    @ApiModelProperty(value = "所属部门(人员管理)")
-    @TableField("DEPT_ID")
-    private Long deptId;
-
-    /**
-     * 所属单位
-     */
-    @ApiModelProperty(value = "所属单位(入场申请中使用)")
-    @TableField("OWNER_SHIP")
-    private String ownerShip;
-
-    /**
-     * 联系方式
-     */
-    @ApiModelProperty(value = "联系方式")
-    @TableField("PHONE_NUMBER")
-    private String phoneNumber;
-
-    /**
-     * 证件号
-     */
-    @ApiModelProperty(value = "证件号")
-    @TableField("ID_CARD_NUMBER")
-    private String idCardNumber;
-
-    /**
-     * 入场原因
-     */
-    @ApiModelProperty(value = "入场原因（入场申请中使用）")
-    @TableField("ENTER_REASON")
-    private String enterReason;
-
-    /**
-     * 入场人脸照片
-     */
-    @ApiModelProperty(value = "人脸照片（照片路径）")
-    @TableField("WORKER_AVATAR")
-    private String workerAvatar;
-
-    /**
-     * 申请入场时间
-     */
-    @ApiModelProperty(value = "注册时间/申请入场时间")
-    @TableField("CREATE_TIME")
-    private Date createTime;
-
-    /**
-     * 人员类型
-     */
-    @ApiModelProperty(value = "人员类型（区分人员管理和入场申请）")
-    @TableField("WORKER_TYPE")
-    private String workerType;
-
-    @ApiModelProperty(value = "性别名称")
-    @TableField(exist = false)
-    private String genderName;
-
-    @ApiModelProperty(value = "部门名称")
-    @TableField(exist = false)
-    private String deptName;
-
-    @ApiModelProperty(value = "注册时间",dataType = "String")
-    @TableField(exist = false)
-    private String registerTime;
-
-    @ApiModelProperty(value = "当前状态")
-    @TableField(exist = false)
-    private String status;
-
-    @ApiModelProperty(value = "当前状态名称")
-    @TableField(exist = false)
-    private String statusName;
-
-    @ApiModelProperty(value = "是否注册(0未注册；1已注册)",allowableValues = "0,1")
-    @TableField(exist = false)
-    private String isRegister;
-
-    @Override
-    public String toString() {
-        return "Worker{" +
-            "id=" + id +
-            ", workerName=" + workerName +
-            ", gender=" + gender +
-            ", deptId=" + deptId +
-            ", ownerShip=" + ownerShip +
-            ", phoneNumber=" + phoneNumber +
-            ", idCardNumber=" + idCardNumber +
-            ", enterReason=" + enterReason +
-            ", workerAvatar=" + workerAvatar +
-            ", createTime=" + createTime +
-            ", workerType=" + workerType +
-        "}";
-    }
-}

diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/AlarmController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/AlarmController.java
new file mode 100644
index 0000000..1795cf1
--- /dev/null
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/AlarmController.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.modular.system.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.stereotype.Controller;
+
+/**
+ * <p>
+ * 报警记录表 前端控制器
+ * </p>
+ *
+ * @author zyj
+ * @since 2023-05-25
+ */
+@Controller
+@RequestMapping("/system/alarm")
+public class AlarmController {
+
+}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusAlarmController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusAlarmController.java
deleted file mode 100644
index 1f82ebb..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusAlarmController.java
+++ /dev/null
@@ -1,102 +0,0 @@
-package com.casic.missiles.modular.system.controller;
-
-
-import cn.hutool.core.util.ObjectUtil;
-import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.core.base.controller.BaseController;
-import com.casic.missiles.core.page.PageFactory;
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.AlarmUpload;
-import com.casic.missiles.modular.system.dto.DeviceDetailDTO;
-import com.casic.missiles.modular.system.entity.BusAlarm;
-import com.casic.missiles.modular.system.service.IBusAlarmService;
-import io.swagger.annotations.*;
-import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.*;
-
-import org.springframework.stereotype.Controller;
-
-import static com.casic.missiles.model.response.ResponseData.DEFAULT_SUCCESS_MESSAGE;
-import static com.casic.missiles.modular.system.consts.AlarmConst.ALARM_STATUS_MANUAL_CANCEL;
-
-/**
- * <p>
- * 报警记录表 前端控制器
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@Api(tags = "报警管理接口")
-@Controller
-@RequestMapping("/alarm")
-@RequiredArgsConstructor
-public class BusAlarmController extends BaseController {
-
-    private final IBusAlarmService alarmService;
-
-    @ApiOperation("报警上报接口")
-    @PostMapping("/upload")
-    @ResponseBody
-    public Object upload(@RequestBody AlarmUpload alarmUpload){
-        alarmService.alarmUpload(alarmUpload);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("报警列表分页查询")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "workTitle", value = "作业名称",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "projectId", value = "作业ID",dataType = "Long", paramType = "query",example = "0"),
-            @ApiImplicitParam(name = "alarmStatus", value = "报警状态",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "projectState", value = "作业状态",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "alarmType", value = "报警类型",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "alarmStartTime", value = "报警开始时间",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "alarmEndTime", value = "报警结束时间",dataType = "String", paramType = "query")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = BusAlarm.class),
-    })
-    @GetMapping("/listPage")
-    @ResponseBody
-    public Object listPage(String workTitle,Long projectId,String alarmStatus,String projectState,String alarmType,String alarmStartTime,String alarmEndTime){
-        Page<BusAlarm> page = PageFactory.defaultPage();
-        QueryWrapper<BusAlarm> queryWrapper = new QueryWrapper<>();
-        if(StrUtil.isNotEmpty(workTitle)){
-            queryWrapper.like("p.WORK_TITLE",workTitle);
-        }
-        if(ObjectUtil.isNotEmpty(projectId)){
-            queryWrapper.eq("alarm.PROJECT_ID",projectId);
-        }
-        if(StrUtil.isNotEmpty(alarmStatus)){
-            queryWrapper.eq("alarm.ALARM_STATUS",alarmStatus);
-        }
-        if(StrUtil.isNotEmpty(projectState)){
-            queryWrapper.eq("p.PROJECT_STATE",projectState);
-        }
-        if(StrUtil.isNotEmpty(alarmType)){
-            queryWrapper.eq("alarm.ALARM_TYPE",alarmType);
-        }
-        if(StrUtil.isNotEmpty(alarmStartTime)){
-            queryWrapper.ge("alarm.ALARM_TIME",alarmStartTime);
-        }
-        if(StrUtil.isNotEmpty(alarmEndTime)){
-            queryWrapper.le("alarm.ALARM_TIME",alarmEndTime);
-        }
-        page = alarmService.listPage(page,queryWrapper);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-    @ApiOperation("消警")
-    @PostMapping("/cancel")
-    @ResponseBody
-    public Object cancel(@RequestParam("alarmId") Long alarmId){
-        UpdateWrapper<BusAlarm> updateWrapper = new UpdateWrapper<>();
-        updateWrapper.eq("ID",alarmId);
-        updateWrapper.set("ALARM_STATUS",ALARM_STATUS_MANUAL_CANCEL);
-        alarmService.update(updateWrapper);
-        return ResponseData.success();
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusEventController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusEventController.java
deleted file mode 100644
index dde5aad..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusEventController.java
+++ /dev/null
@@ -1,41 +0,0 @@
-package com.casic.missiles.modular.system.controller;
-
-
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.entity.BusEvent;
-import com.casic.missiles.modular.system.service.IBusEventService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.ResponseBody;
-
-/**
- * <p>
- * 事件表 前端控制器
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@Controller
-@RequestMapping("/event")
-@Api(tags = "事件上报")
-@RequiredArgsConstructor
-public class BusEventController {
-
-    private final IBusEventService eventService;
-
-    @ApiOperation("事件上报")
-    @PostMapping("add")
-    @ResponseBody
-    public Object add(@RequestBody BusEvent busEvent){
-        eventService.saveBusEvent(busEvent);
-        return ResponseData.success();
-    }
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
index 03abc5f..aa50d78 100644
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
@@ -1,121 +1,20 @@
 package com.casic.missiles.modular.system.controller;
 
 
-import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.core.base.controller.BaseController;
-import com.casic.missiles.core.page.PageFactory;
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.DeviceDetailDTO;
-import com.casic.missiles.modular.system.entity.Device;
-import com.casic.missiles.modular.system.service.IDeviceExtService;
-import com.casic.missiles.modular.system.service.IDeviceService;
-import io.swagger.annotations.*;
-import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.RequestMapping;
 
 import org.springframework.stereotype.Controller;
 
-import java.time.LocalDateTime;
-import java.util.Date;
-import java.util.List;
-
-import static com.casic.missiles.model.response.ResponseData.DEFAULT_SUCCESS_MESSAGE;
-
 /**
  * <p>
- *  前端控制器
+ * 设备记录表 前端控制器
  * </p>
  *
  * @author zyj
- * @since 2023-04-14
+ * @since 2023-05-25
  */
-@Api(tags = "设备管理接口")
-@RequiredArgsConstructor
 @Controller
-@RequestMapping("/device")
-public class DeviceController extends BaseController {
-    private final IDeviceService deviceService;
-    private final IDeviceExtService deviceExtService;
-
-    @ApiOperation("设备分页列表")
-    @ApiImplicitParams({
-        @ApiImplicitParam(name = "deviceType", value = "设备类型",dataType = "String", paramType = "query"),
-        @ApiImplicitParam(name = "deviceCode", value = "设备编号",dataType = "String", paramType = "query"),
-        @ApiImplicitParam(name = "status", value = "设备状态",dataType = "String", paramType = "query"),
-        @ApiImplicitParam(name = "projectId", value = "作业ID（如果传此参数，列表中返回该作业使用的设备）",dataType = "Long", paramType = "query", example = "0")
-    })
-    @ApiResponses({
-        @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = DeviceDetailDTO.class),
-    })
-    @GetMapping("listPage")
-    @ResponseBody
-    public Object listPage(String deviceType, String deviceCode, String status,Long projectId){
-        Page<DeviceDetailDTO> page = PageFactory.defaultPage();
-        QueryWrapper<DeviceDetailDTO> queryWrapper = new QueryWrapper<>();
-        if(StrUtil.isNotEmpty(deviceType)){
-            queryWrapper.eq("DEVICE_TYPE",deviceType);
-        }
-        if(StrUtil.isNotEmpty(deviceCode)){
-            queryWrapper.like("DEVICE_CODE",deviceCode);
-        }
-        page = deviceService.listPage(page,queryWrapper,status,projectId);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-    @ApiOperation("新增设备")
-    @PostMapping("add")
-    @ResponseBody
-    public Object add(@RequestBody DeviceDetailDTO deviceDetailDTO){
-        deviceService.saveDevice(deviceDetailDTO);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("编辑设备")
-    @PostMapping("update")
-    @ResponseBody
-    public Object update(@RequestBody DeviceDetailDTO deviceDetailDTO){
-        deviceService.updateDevice(deviceDetailDTO);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("删除设备")
-    @PostMapping("delete")
-    @ResponseBody
-    public Object delete(@ApiParam("设备id列表")@RequestBody List<Long> deviceIds){
-        deviceService.deleteDevices(deviceIds);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("设置甲烷阈值")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "gasIp", value = "安全树甲烷设备IP",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "gasPort", value = "安全树甲烷端口",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "threshold", value = "甲烷阈值",dataType = "String", paramType = "query")
-    })
-    @PostMapping("setThreshold")
-    @ResponseBody
-    public Object setThreshold(String gasIp,String gasPort,String threshold){
-        deviceExtService.setGasThreshold(gasIp, gasPort, threshold);
-        return ResponseData.success();
-    }
-
-
-    @ApiOperation("查询甲烷阈值")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "gasIp", value = "安全树甲烷设备IP",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "gasPort", value = "安全树甲烷端口",dataType = "String", paramType = "query")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = "{\"code\": 200,\"data\": \"100\",\"message\": \"请求成功\",\"success\": true}",response = String.class),
-    })
-    @GetMapping("getThreshold")
-    @ResponseBody
-    public Object getThreshold(String gasIp,String gasPort){
-        String data = deviceExtService.getGasThreshold(gasIp, gasPort);
-        return ResponseData.success(data);
-    }
-
+@RequestMapping("/system/device")
+public class DeviceController {
 
 }
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/OverviewController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/OverviewController.java
deleted file mode 100644
index 7570504..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/OverviewController.java
+++ /dev/null
@@ -1,70 +0,0 @@
-package com.casic.missiles.modular.system.controller;
-
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.AlarmTypeCountDTO;
-import com.casic.missiles.modular.system.dto.DeviceLocationDTO;
-import com.casic.missiles.modular.system.dto.WorkerLocationDTO;
-import com.casic.missiles.modular.system.service.IBusAlarmService;
-import com.casic.missiles.modular.system.service.IProjectDeviceService;
-import com.casic.missiles.modular.system.service.IProjectWorkerService;
-import io.swagger.annotations.*;
-import lombok.RequiredArgsConstructor;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.ResponseBody;
-
-import static com.casic.missiles.model.response.ResponseData.DEFAULT_SUCCESS_MESSAGE;
-import static com.casic.missiles.modular.system.consts.AlarmConst.ALARM_STATUS_ON;
-
-@Api(tags = "首页看板接口")
-@Controller
-@RequestMapping("overview")
-@RequiredArgsConstructor
-public class OverviewController {
-
-    private final IBusAlarmService alarmService;
-    private final IProjectDeviceService projectDeviceService;
-
-    private final IProjectWorkerService projectWorkerService;
-
-
-    @ApiOperation("报警统计接口")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "projectId", value = "作业ID",dataType = "Long", paramType = "query", example = "0")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = AlarmTypeCountDTO.class),
-    })
-    @GetMapping("/alarmCount")
-    @ResponseBody
-    public Object alarmCount(Long projectId){
-        return ResponseData.success(alarmService.alarmCount(projectId,ALARM_STATUS_ON));
-    }
-
-    @ApiOperation("设备列表接口")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "projectId", value = "作业ID",dataType = "Long", paramType = "query", example = "0")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = DeviceLocationDTO.class),
-    })
-    @GetMapping("/deviceList")
-    @ResponseBody
-    public Object deviceList(Long projectId){
-        return ResponseData.success(projectDeviceService.selectDeviceLocationList(projectId));
-    }
-
-    @ApiOperation("人员列表接口")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "projectId", value = "作业ID",dataType = "Long", paramType = "query", example = "0")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = WorkerLocationDTO.class),
-    })
-    @GetMapping("/workerList")
-    @ResponseBody
-    public Object workerList(Long projectId){
-        return ResponseData.success(projectWorkerService.selectWorkerLocationDTO(projectId));
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/WorkSiteInfoController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/WorkSiteInfoController.java
deleted file mode 100644
index af36d69..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/WorkSiteInfoController.java
+++ /dev/null
@@ -1,130 +0,0 @@
-package com.casic.missiles.modular.system.controller;
-
-
-import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.core.base.controller.BaseController;
-import com.casic.missiles.core.page.PageFactory;
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.WorkSiteDetailDTO;
-import com.casic.missiles.modular.system.entity.WorkSiteInfo;
-import com.casic.missiles.modular.system.service.IWorkSiteInfoService;
-import io.swagger.annotations.*;
-import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.*;
-
-import org.springframework.stereotype.Controller;
-
-import java.util.List;
-
-import static com.casic.missiles.model.response.ResponseData.DEFAULT_SUCCESS_MESSAGE;
-
-/**
- * <p>
- * 作业现场表 前端控制器
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@Controller
-@RequestMapping("/site")
-@Api(tags = "作业现场管理")
-@RequiredArgsConstructor
-public class WorkSiteInfoController extends BaseController {
-
-
-    private final IWorkSiteInfoService workSiteInfoService;
-
-    @ApiOperation("新增作业现场")
-    @PostMapping("add")
-    @ResponseBody
-    public Object addWorkSite(@RequestBody WorkSiteDetailDTO workSiteDetailDTO){
-        workSiteInfoService.addWorkSiteInfo(workSiteDetailDTO);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("编辑作业现场")
-    @PostMapping("update")
-    @ResponseBody
-    public Object updateWorkSite(@RequestBody WorkSiteDetailDTO workSiteDetailDTO){
-        workSiteInfoService.updateWorkSiteInfo(workSiteDetailDTO);
-        return ResponseData.success();
-    }
-
-
-    @ApiOperation("删除作业现场")
-    @PostMapping("delete")
-    @ResponseBody
-    public Object delete(@ApiParam("作业现场id列表")@RequestBody List<Long> projectIds){
-        workSiteInfoService.deleteProjects(projectIds);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("查询作业现场详情")
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = WorkSiteDetailDTO.class),
-    })
-    @GetMapping("detail")
-    @ResponseBody
-    public Object delete(@ApiParam(value = "作业现场id", example = "0")@RequestParam Long projectId){
-        WorkSiteDetailDTO detailDTO = workSiteInfoService.getWorkSiteDetail(projectId);
-        return ResponseData.success(detailDTO);
-    }
-
-    @ApiOperation("分页列表查询")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "workTitle",value = "作业名称", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "workRoad",value = "所属道路", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "workPersonName",value = "责任人姓名", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "startDate",value = "注册开始日期", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "endDate",value = "注册结束日期", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "projectState",value = "当前状态（字典值）", dataType = "String", paramType = "query")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = WorkSiteInfo.class),
-    })
-    @GetMapping("listPage")
-    @ResponseBody
-    public Object listPage(String workTitle,String workRoad,String workPersonName,String projectState,String startDate,String endDate){
-        Page<WorkSiteInfo> page = PageFactory.defaultPage();
-        QueryWrapper<WorkSiteInfo> queryWrapper = new QueryWrapper<>();
-        if(StrUtil.isNotEmpty(workTitle)){
-            queryWrapper.like("WORK_TITLE",workTitle);
-        }
-        if(StrUtil.isNotEmpty(workRoad)){
-            queryWrapper.like("WORK_ROAD",workRoad);
-        }
-        if(StrUtil.isNotEmpty(workPersonName)){
-            queryWrapper.like("WORKER_NAME",workPersonName);
-        }
-        if(StrUtil.isNotEmpty(projectState)){
-            queryWrapper.eq("PROJECT_STATE",projectState);
-        }
-        if(StrUtil.isNotEmpty(startDate)){
-            queryWrapper.ge("br_work_site_info.CREATE_TIME",startDate + " 00:00:00");
-        }
-        if(StrUtil.isNotEmpty(endDate)){
-            queryWrapper.le("br_work_site_info.CREATE_TIME",endDate + " 23:59:59");
-        }
-        page = workSiteInfoService.selectListPage(page,queryWrapper);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-    @ApiOperation("开始作业")
-    @PostMapping("start")
-    @ResponseBody
-    public Object start(@ApiParam(value = "作业现场id",example = "0")@RequestParam Long projectId){
-        workSiteInfoService.start(projectId);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("完成作业")
-    @PostMapping("finish")
-    @ResponseBody
-    public Object finish(@ApiParam(value = "作业现场id", example = "0")@RequestParam Long projectId){
-        workSiteInfoService.finish(projectId);
-        return ResponseData.success();
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/WorkerController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/WorkerController.java
deleted file mode 100644
index 796f94c..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/WorkerController.java
+++ /dev/null
@@ -1,136 +0,0 @@
-package com.casic.missiles.modular.system.controller;
-
-
-import cn.hutool.core.util.ObjectUtil;
-import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.core.base.controller.BaseController;
-import com.casic.missiles.core.page.PageFactory;
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.DeviceDetailDTO;
-import com.casic.missiles.modular.system.entity.Device;
-import com.casic.missiles.modular.system.entity.Worker;
-import com.casic.missiles.modular.system.service.IWorkerService;
-import io.swagger.annotations.*;
-import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.*;
-
-import org.springframework.stereotype.Controller;
-
-import java.util.Date;
-import java.util.List;
-
-import static com.casic.missiles.model.response.ResponseData.DEFAULT_SUCCESS_MESSAGE;
-
-/**
- * <p>
- *  前端控制器
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@Controller
-@RequestMapping("/worker")
-@RequiredArgsConstructor
-@Api(tags = "人员管理接口")
-public class WorkerController extends BaseController {
-
-    private final IWorkerService workerService;
-
-    @ApiOperation("分页列表查询")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "name",value = "姓名", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "deptId",value = "所属部门", dataType = "Long", paramType = "query", example = "0"),
-            @ApiImplicitParam(name = "status",value = "当前状态（字典值）", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "startDate",value = "注册开始日期", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "endDate",value = "注册结束日期", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "workerType",value = "人员类型（字典值）", dataType = "String", paramType = "query")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = Worker.class),
-    })
-    @GetMapping("listPage")
-    @ResponseBody
-    public Object listPage(String name,Long deptId, String status,String startDate,String endDate,String workerType){
-        Page<Worker> page = PageFactory.defaultPage();
-        QueryWrapper<Worker> queryWrapper = new QueryWrapper<>();
-        if(StrUtil.isNotEmpty(name)){
-            queryWrapper.like("WORKER_NAME",name);
-        }
-        if(ObjectUtil.isNotEmpty(deptId)){
-            queryWrapper.eq("DEPT_ID",deptId);
-        }
-        if(StrUtil.isNotEmpty(workerType)){
-            queryWrapper.eq("WORKER_TYPE",workerType);
-        }
-        if(StrUtil.isNotEmpty(startDate)){
-            queryWrapper.ge("CREATE_TIME",startDate + " 00:00:00");
-        }
-        if(StrUtil.isNotEmpty(endDate)){
-            queryWrapper.le("CREATE_TIME",endDate + " 23:59:59");
-        }
-        if(StrUtil.isNotEmpty(status)){
-            queryWrapper.eq("`STATUS`",status);
-        }
-        page = workerService.selectListPage(page,queryWrapper);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-    @ApiOperation("新增人员")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "worker", value = "人员信息", dataType = "Worker", paramType = "body", required = true),
-            @ApiImplicitParam(name = "projectId", value = "项目ID(入场申请需要)", dataType = "Long", paramType = "query", example = "0")
-    })
-    @PostMapping("add")
-    @ResponseBody
-    public Object add(@ApiParam("worker")@RequestBody Worker worker,
-                      @RequestParam(required = false) Long projectId){
-        workerService.addWorker(worker,projectId);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("编辑人员")
-    @PostMapping("update")
-    @ResponseBody
-    public Object update(@RequestBody Worker worker){
-        workerService.updateById(worker);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("删除人员")
-    @PostMapping("delete")
-    @ResponseBody
-    public Object delete(@ApiParam("人员id列表")@RequestBody List<Long> workIds){
-        workerService.removeByIds(workIds);
-        return ResponseData.success();
-    }
-
-
-    @ApiOperation(value = "获取人脸图片",notes = "返回人脸图片url")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "cameraIp",value = "摄像头IP", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "cameraPort",value = "摄像头端口号", dataType = "String", paramType = "query"),
-    })
-    @GetMapping("/face/register")
-    @ResponseBody
-    public Object faceRegister(String cameraIp,String cameraPort){
-        return ResponseData.success(workerService.faceRegister(cameraIp, cameraPort));
-    }
-
-
-    @ApiOperation(value = "查询临时入场人员列表")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "projectId", value = "项目ID",required = true,dataType = "Long", paramType = "query", example = "0")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = Worker.class),
-    })
-    @GetMapping("/projectTempWorker")
-    @ResponseBody
-    public Object projectTempWorker(Long projectId){
-        return ResponseData.success(workerService.projectTempWorker(projectId));
-    }
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/AlarmTypeCountDTO.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/AlarmTypeCountDTO.java
deleted file mode 100644
index 1a165a1..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/AlarmTypeCountDTO.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.casic.missiles.modular.system.dto;
-
-import io.swagger.annotations.ApiModel;
-import lombok.Data;
-
-@ApiModel(value = "AlarmTypeCountDTO",description = "报警类型统计（首页）")
-@Data
-public class AlarmTypeCountDTO {
-
-    private String alarmType;
-    private String alarmTypeName;
-    private Integer alarmCount;
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/AlarmUpload.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/AlarmUpload.java
deleted file mode 100644
index 73d7799..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/AlarmUpload.java
+++ /dev/null
@@ -1,46 +0,0 @@
-package com.casic.missiles.modular.system.dto;
-
-import cn.hutool.core.util.StrUtil;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-@ApiModel(value = "AlarmUpload",description = "报警上传")
-@Data
-public class AlarmUpload {
-
-    @ApiModelProperty(value = "摄像头ip")
-    private String cameraIp;
-
-    @ApiModelProperty(value = "摄像头端口")
-    private String cameraPort;
-    @ApiModelProperty(value = "安全树甲烷设备ip")
-    private String gasIp;
-    @ApiModelProperty(value = "安全树甲烷设备端口")
-    private String gasPort;
-    @ApiModelProperty(value = "报警值")
-    private String alarmValue;
-    @ApiModelProperty(value = "报警时间")
-    private String alarmTime;
-    @ApiModelProperty(value = "报警类型")
-    private String alarmType;
-    @ApiModelProperty(value = "报警图片")
-    private String alarmImage;
-    @ApiModelProperty(value = "报警内容")
-    private String alarmContent;
-
-    @Override
-    public String toString() {
-        return "AlarmUpload{" +
-                "cameraIp='" + cameraIp + '\'' +
-                ", cameraPort='" + cameraPort + '\'' +
-                ", gasIp='" + gasIp + '\'' +
-                ", gasPort='" + gasPort + '\'' +
-                ", alarmValue='" + alarmValue + '\'' +
-                ", alarmTime='" + alarmTime + '\'' +
-                ", alarmType='" + alarmType + '\'' +
-                ", alarmImage='" + (StrUtil.isNotEmpty(alarmImage) ? alarmImage.substring(0,50) : "null") + '\'' +
-                ", alarmContent='" + alarmContent + '\'' +
-                '}';
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/DeviceDetailDTO.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/DeviceDetailDTO.java
deleted file mode 100644
index ea518d9..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/DeviceDetailDTO.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package com.casic.missiles.modular.system.dto;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.casic.missiles.modular.system.entity.Device;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-@ApiModel("DeviceDetailDTO")
-@Data
-public class DeviceDetailDTO extends Device {
-
-    @ApiModelProperty(value = "摄像头编号")
-    private String cameraCode;
-
-    @ApiModelProperty(value = "摄像头IP")
-    private String cameraIp;
-
-    @ApiModelProperty(value = "摄像头端口")
-    private String cameraPort;
-
-    @ApiModelProperty(value = "激甲编号")
-    private String gasCode;
-
-    @ApiModelProperty(value = "激甲IP")
-    private String gasIp;
-
-    @ApiModelProperty(value = "激甲端口")
-    private String gasPort;
-
-    @ApiModelProperty(value = "智能帽衬编号")
-    private String hatLiningCode;
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/WorkSiteDetailDTO.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/WorkSiteDetailDTO.java
deleted file mode 100644
index 29378ff..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/WorkSiteDetailDTO.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package com.casic.missiles.modular.system.dto;
-
-import com.casic.missiles.modular.system.entity.ProjectDevice;
-import com.casic.missiles.modular.system.entity.ProjectWorker;
-import com.casic.missiles.modular.system.entity.WorkSiteInfo;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.util.List;
-
-@Data
-@ApiModel("WorkSiteDetailDTO")
-public class WorkSiteDetailDTO extends WorkSiteInfo {
-
-    @ApiModelProperty(value = "安全树列表",dataType = "ProjectDevice")
-    private List<ProjectDevice> deviceList;
-
-    @ApiModelProperty(value = "人员列表",dataType = "ProjectWorker")
-    private List<ProjectWorker> workerList;
-
-
-
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/WorkerLocationDTO.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/WorkerLocationDTO.java
deleted file mode 100644
index 6fd7b24..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/WorkerLocationDTO.java
+++ /dev/null
@@ -1,68 +0,0 @@
-package com.casic.missiles.modular.system.dto;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-@ApiModel(value = "WorkerLocationDTO",description = "人员位置列表（首页）")
-@Data
-public class WorkerLocationDTO {
-
-    @ApiModelProperty("人员ID")
-    private Long workerId;
-
-    @ApiModelProperty("人员姓名")
-    private String workerName;
-
-    @ApiModelProperty("安全帽编号")
-    private String hatCode;
-
-    @ApiModelProperty("安全帽ID")
-    private Long hatId;
-
-    @ApiModelProperty("背心编号")
-    private String vastCode;
-
-    @ApiModelProperty("手环编号")
-    private String braceletCode;
-
-    @ApiModelProperty("位置")
-    private String location;
-
-    @ApiModelProperty("时间")
-    private String time;
-
-    @ApiModelProperty("经度")
-    private String lng;
-
-    @ApiModelProperty("纬度")
-    private String lat;
-
-    @ApiModelProperty("心率")
-    private String heartRate;
-
-    @ApiModelProperty("血氧")
-    private String bloodOxygen;
-
-    @ApiModelProperty("一氧化碳")
-    private String co;
-
-    @ApiModelProperty("甲烷")
-    private String gas;
-
-    @ApiModelProperty("硫化氢")
-    private String h2s;
-
-    @ApiModelProperty("氧气")
-    private String o2;
-
-    @ApiModelProperty("信号")
-    private String signal;
-
-    @ApiModelProperty("电量")
-    private String cell;
-
-    @ApiModelProperty("是否报警")
-    private boolean alarmFlag;
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Alarm.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Alarm.java
new file mode 100644
index 0000000..4d2b7ef
--- /dev/null
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Alarm.java
@@ -0,0 +1,103 @@
+package com.casic.missiles.modular.system.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import java.util.Date;
+
+/**
+ * <p>
+ * 报警记录表
+ * </p>
+ *
+ * @author zyj
+ * @since 2023-05-25
+ */
+@Data
+@TableName("bus_alarm")
+public class Alarm implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    @TableId(value = "ID",type = IdType.ASSIGN_ID)
+    private Long id;
+
+    /**
+     * 设备ID
+     */
+    @TableField("DEVICE_ID")
+    private Long deviceId;
+
+    /**
+     * 报警类型
+     */
+    @TableField("ALARM_TYPE")
+    private String alarmType;
+
+    /**
+     * 报警时间
+     */
+    @TableField("ALARM_TIME")
+    private Date alarmTime;
+
+    /**
+     * 报警状态
+     */
+    @TableField("ALARM_STATUS")
+    private String alarmStatus;
+
+    /**
+     * 报警位置
+     */
+    @TableField("ALARM_LOCATION")
+    private String alarmLocation;
+
+    /**
+     * 报警图片
+     */
+    @TableField("ALARM_IMAGE")
+    private String alarmImage;
+
+    /**
+     * 视频通道号
+     */
+    @TableField("CHANNEL_NO")
+    private Integer channelNo;
+
+    /**
+     * 报警内容
+     */
+    @TableField("ALARM_CONTENT")
+    private String alarmContent;
+
+    /**
+     * 消警时间
+     */
+    @TableField("CANCEL_TIME")
+    private Date cancelTime;
+
+
+    @Override
+    public String toString() {
+        return "Alarm{" +
+            "id=" + id +
+            ", deviceId=" + deviceId +
+            ", alarmType=" + alarmType +
+            ", alarmTime=" + alarmTime +
+            ", alarmStatus=" + alarmStatus +
+            ", alarmLocation=" + alarmLocation +
+            ", alarmImage=" + alarmImage +
+            ", channelNo=" + channelNo +
+            ", alarmContent=" + alarmContent +
+            ", cancelTime=" + cancelTime +
+        "}";
+    }
+}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusAlarm.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusAlarm.java
deleted file mode 100644
index efb4a23..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusAlarm.java
+++ /dev/null
@@ -1,159 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.alibaba.fastjson.annotation.JSONField;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.time.LocalDateTime;
-import java.util.Date;
-
-/**
- * <p>
- * 报警记录表
- * </p>
- *
- * @author zyj
- * @since 2023-05-16
- */
-@Data
-@ApiModel("Alarm")
-@TableName("br_bus_alarm")
-public class BusAlarm implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 项目ID
-     */
-    @ApiModelProperty(value = "项目ID")
-    @TableField("PROJECT_ID")
-    private Long projectId;
-
-    /**
-     * 设备ID
-     */
-    @ApiModelProperty(value = "设备ID")
-    @TableField("DEVICE_ID")
-    private Long deviceId;
-
-    /**
-     * 报警类型
-     */
-    @ApiModelProperty(value = "报警类型")
-    @TableField("ALARM_TYPE")
-    private String alarmType;
-
-    /**
-     * 报警状态
-     */
-    @ApiModelProperty(value = "报警状态")
-    @TableField("ALARM_STATUS")
-    private String alarmStatus;
-
-    /**
-     * 报警值
-     */
-    @ApiModelProperty(value = "报警值")
-    @TableField("ALARM_VALUE")
-    private String alarmValue;
-
-    /**
-     * 报警图片
-     */
-    @ApiModelProperty(value = "报警图片")
-    @TableField("ALARM_IMAGE")
-    private String alarmImage;
-
-    /**
-     * 报警内容
-     */
-    @ApiModelProperty(value = "报警内容")
-    @TableField("ALARM_CONTENT")
-    private String alarmContent;
-
-    /**
-     * 报警时间
-     */
-    @ApiModelProperty(value = "报警时间")
-    @TableField("ALARM_TIME")
-    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
-    private Date alarmTime;
-
-    /**
-     * 消警时间
-     */
-    @ApiModelProperty(value = "消警时间")
-    @TableField("CANCEL_TIME")
-    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
-    private Date cancelTime;
-
-    /**
-     * 报警位置经度
-     */
-    @ApiModelProperty(value = "报警位置经度")
-    @TableField("ALARM_LNG")
-    private String alarmLng;
-
-    /**
-     * 报警位置纬度
-     */
-    @ApiModelProperty(value = "报警位置纬度")
-    @TableField("ALARM_LAT")
-    private String alarmLat;
-
-    @ApiModelProperty("报警类型名称")
-    @TableField(exist = false)
-    private String alarmStatusName;
-    @ApiModelProperty("报警类型名称")
-    @TableField(exist = false)
-    private String alarmTypeName;
-    @ApiModelProperty("作业名称")
-    @TableField(exist = false)
-    private String workTitle;
-    @ApiModelProperty("所属道路")
-    @TableField(exist = false)
-    private String workRoad;
-    @ApiModelProperty("作业状态")
-    @TableField(exist = false)
-    private String projectState;
-    @ApiModelProperty("作业状态名称")
-    @TableField(exist = false)
-    private String projectStateName;
-    @ApiModelProperty("负责人姓名")
-    @TableField(exist = false)
-    private String workPersonName;
-    @ApiModelProperty("负责人联系方式")
-    @TableField(exist = false)
-    private String workPersonPhoneNumber;
-
-
-    @Override
-    public String toString() {
-        return "BusAlarm{" +
-                "id=" + id +
-                ", projectId=" + projectId +
-                ", deviceId=" + deviceId +
-                ", alarmType=" + alarmType +
-                ", alarmValue=" + alarmValue +
-                ", alarmStatus=" + alarmStatus +
-                ", alarmImage=" + alarmImage +
-                ", alarmContent=" + alarmContent +
-                ", alarmTime=" + alarmTime +
-                ", cancelTime=" + cancelTime +
-                ", alarmLng=" + alarmLng +
-                ", alarmLat=" + alarmLat +
-                "}";
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusEvent.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusEvent.java
deleted file mode 100644
index a0b7543..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusEvent.java
+++ /dev/null
@@ -1,100 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.time.LocalDateTime;
-import java.util.Date;
-import java.util.List;
-
-/**
- * <p>
- * 事件表
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@TableName("br_bus_event")
-@Data
-@ApiModel("BusEvent")
-public class BusEvent implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @ApiModelProperty("事件ID")
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 事件标题
-     */
-    @ApiModelProperty("事件名称")
-    @TableField("EVENT_TITLE")
-    private String eventTitle;
-
-    /**
-     * 上报人员
-     */
-    @ApiModelProperty("上报人员")
-    @TableField("UPLOAD_NAME")
-    private String uploadName;
-
-    /**
-     * 联系方式
-     */
-    @ApiModelProperty("联系方式")
-    @TableField("PHONE_NUMBER")
-    private String phoneNumber;
-
-    /**
-     * 事件描述
-     */
-    @ApiModelProperty("事件描述")
-    @TableField("EVENT_DESCRIPTION")
-    private String eventDescription;
-
-    @ApiModelProperty("经度")
-    @TableField("LNG")
-    private String lng;
-
-    @ApiModelProperty("纬度")
-    @TableField("LAT")
-    private String lat;
-
-    /**
-     * 事件上传时间
-     */
-    @ApiModelProperty("事件上传时间")
-    @TableField("CREATE_TIME")
-    private Date createTime;
-
-    @ApiModelProperty("事件照片")
-    @TableField(exist = false)
-    private List<BusEventImage> imageList;
-
-
-
-    @Override
-    public String toString() {
-        return "BusEvent{" +
-            "id=" + id +
-            ", eventTitle=" + eventTitle +
-            ", uploadName=" + uploadName +
-            ", phoneNumber=" + phoneNumber +
-            ", eventDescription=" + eventDescription +
-            ", lng=" + lng +
-            ", lat=" + lat +
-            ", createTime=" + createTime +
-        "}";
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusEventImage.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusEventImage.java
deleted file mode 100644
index 1e75245..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusEventImage.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-
-/**
- * <p>
- * 事件图片表
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@TableName("br_bus_event_image")
-@Data
-@ApiModel("BusEventImage")
-public class BusEventImage implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 事件ID
-     */
-    @TableField("EVENT_ID")
-    private Long eventId;
-
-    /**
-     * 报警图片
-     */
-    @TableField("IMAGE")
-    @ApiModelProperty("图片url")
-    private String image;
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Device.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Device.java
index df89c70..ea7db5f 100644
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Device.java
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Device.java
@@ -1,30 +1,23 @@
 package com.casic.missiles.modular.system.entity;
 
-import com.alibaba.fastjson.annotation.JSONField;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.casic.missiles.core.base.json.DateDeserializer;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
-import java.util.Date;
 
 /**
  * <p>
- * 
+ * 设备记录表
  * </p>
  *
  * @author zyj
- * @since 2023-04-14
+ * @since 2023-05-25
  */
-@ApiModel("Device")
-@TableName("br_device")
 @Data
+@TableName("bus_device")
 public class Device implements Serializable {
 
     private static final long serialVersionUID = 1L;
@@ -32,82 +25,86 @@
     /**
      * 主键
      */
-    @ApiModelProperty(value = "设备ID")
     @TableId(value = "ID",type = IdType.ASSIGN_ID)
     private Long id;
 
     /**
-     * 设备编号
+     * 设备名称
      */
-    @ApiModelProperty(value = "设备编号")
-    @TableField("DEVICE_CODE")
-    private String deviceCode;
+    @TableField("DEVICE_NAME")
+    private String deviceName;
 
     /**
-     * 设备类型
+     * IP
      */
-    @ApiModelProperty(value = "设备类型")
-    @TableField("DEVICE_TYPE")
-    private String deviceType;
+    @TableField("IP")
+    private String ip;
 
     /**
-     * 设备批次
+     * 端口
      */
-    @ApiModelProperty(value = "设备批次")
-    @TableField("DEVICE_BATCH")
-    private String deviceBatch;
+    @TableField("PORT")
+    private String port;
 
     /**
-     * 厂家
+     * 用户名
      */
-    @ApiModelProperty(value = "厂家")
-    @TableField("MANUFACTURER")
-    private String manufacturer;
+    @TableField("USER_NAME")
+    private String userName;
 
     /**
-     * 是否供电
+     * 密码
      */
-    @ApiModelProperty(value = "是否供电")
-    @TableField("IS_POWER_SUPPLY")
-    private String isPowerSupply;
+    @TableField("PASSWORD")
+    private String password;
 
     /**
-     * 创建时间
+     * 连接类型
      */
-    @ApiModelProperty(value = "创建时间",dataType = "Date")
-    @TableField("CREATE_TIME")
-    private Date createTime;
+    @TableField("CONNECT_TYPE")
+    private String connectType;
 
-    @ApiModelProperty(value = "设备类型名称")
-    @TableField(exist = false)
-    private String deviceTypeName;
+    /**
+     * 位置
+     */
+    @TableField("LOCATION")
 
-    @ApiModelProperty(value = "是否供电名称")
-    @TableField(exist = false)
-    private String isPowerSupplyName;
+    private String location;
 
-    @ApiModelProperty(value = "注册时间",dataType = "String")
-    @TableField(exist = false)
-    private String registerTime;
+    /**
+     * 设备状态
+     */
+    @TableField("STATUS")
 
-    @ApiModelProperty(value = "当前状态")
-    @TableField(exist = false)
     private String status;
 
-    @ApiModelProperty(value = "当前状态名称")
-    @TableField(exist = false)
-    private String statusName;
+    /**
+     * 报警分组
+     */
+    @TableField("ALARM_GROUP")
+
+    private Long alarmGroup;
+
+    /**
+     * 视频通道数(预留)
+     */
+    @TableField("CHANNEL_NUM")
+    private Integer channelNum;
 
     @Override
     public String toString() {
         return "Device{" +
             "id=" + id +
-            ", deviceCode=" + deviceCode +
-            ", deviceType=" + deviceType +
-            ", deviceBatch=" + deviceBatch +
-            ", manufacturer=" + manufacturer +
-            ", isPowerSupply=" + isPowerSupply +
-            ", createTime=" + createTime +
+            ", deviceName=" + deviceName +
+            ", ip=" + ip +
+            ", port=" + port +
+            ", userName=" + userName +
+            ", password=" + password +
+            ", connectType=" + connectType +
+            ", location=" + location +
+            ", status=" + status +
+            ", alarmGroup=" + alarmGroup +
+            ", channelNum=" + channelNum +
         "}";
     }
 }
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/DeviceExt.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/DeviceExt.java
deleted file mode 100644
index 5ee7015..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/DeviceExt.java
+++ /dev/null
@@ -1,99 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-
-/**
- * <p>
- * 设备扩展信息表（安全树）
- * </p>
- *
- * @author zyj
- * @since 2023-04-27
- */
-@Data
-@TableName("br_device_ext")
-public class DeviceExt implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 设备ID
-     */
-    @TableField("DEVICE_ID")
-    private Long deviceId;
-
-    /**
-     * 摄像头编号
-     */
-    @TableField("CAMERA_CODE")
-    private String cameraCode;
-
-    /**
-     * 摄像头IP
-     */
-    @TableField("CAMERA_IP")
-    private String cameraIp;
-
-    /**
-     * 摄像头端口
-     */
-    @TableField("CAMERA_PORT")
-    private String cameraPort;
-
-    /**
-     * 激甲编号
-     */
-    @TableField("GAS_CODE")
-    private String gasCode;
-
-    /**
-     * 激甲IP
-     */
-    @TableField("GAS_IP")
-    private String gasIp;
-
-    /**
-     * 激甲端口
-     */
-    @TableField("GAS_PORT")
-    private String gasPort;
-
-    /**
-     * 甲烷报警阈值
-     */
-    @TableField("GAS_THRESHOLD")
-    private String gasThreshold;
-
-    @TableField(value = "HAT_LINING_CODE")
-    private String hatLiningCode;
-
-
-    @Override
-    public String toString() {
-        return "DeviceExt{" +
-            "id=" + id +
-            ", deviceId=" + deviceId +
-            ", cameraCode=" + cameraCode +
-            ", cameraIp=" + cameraIp +
-            ", cameraPort=" + cameraPort +
-            ", gasCode=" + gasCode +
-            ", gasIp=" + gasIp +
-            ", gasPort=" + gasPort +
-            ", gasThreshold=" + gasThreshold +
-            ", hatLiningCode=" + hatLiningCode +
-        "}";
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/ProjectDevice.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/ProjectDevice.java
deleted file mode 100644
index c4f3472..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/ProjectDevice.java
+++ /dev/null
@@ -1,62 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-
-/**
- * <p>
- * 
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@Data
-@ApiModel("ProjectDevice")
-@TableName("br_project_device")
-public class ProjectDevice implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 作业现场ID
-     */
-    @TableField("PROJECT_ID")
-    private Long projectId;
-
-    /**
-     * 设备ID
-     */
-    @TableField("DEVICE_ID")
-    @ApiModelProperty("设备ID（新增编辑时传）")
-    private Long deviceId;
-
-    /**
-     * 设备编号
-     */
-    @TableField(exist = false)
-    @ApiModelProperty("设备编号（详情中展示，新增编辑不用传）")
-    private String deviceCode;
-
-    @Override
-    public String toString() {
-        return "ProjectDevice{" +
-            "id=" + id +
-            ", projectId=" + projectId +
-            ", deviceId=" + deviceId +
-        "}";
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/ProjectWorker.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/ProjectWorker.java
deleted file mode 100644
index 10b23c4..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/ProjectWorker.java
+++ /dev/null
@@ -1,104 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import java.io.Serializable;
-
-/**
- * <p>
- * 
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@ApiModel("ProjectWorker")
-@TableName("br_project_worker")
-@Data
-@NoArgsConstructor
-@AllArgsConstructor
-public class ProjectWorker implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 作业现场ID
-     */
-    @TableField("PROJECT_ID")
-    private Long projectId;
-
-    /**
-     * 人员ID
-     */
-    @ApiModelProperty("人员ID")
-    @TableField("WORKER_ID")
-    private Long workerId;
-
-    /**
-     * 安全帽编号
-     */
-    @ApiModelProperty("安全帽编号")
-    @TableField("HAT_CODE")
-    private String hatCode;
-
-    /**
-     * 背心编号
-     */
-    @ApiModelProperty("背心编号")
-    @TableField("VAST_CODE")
-    private String vastCode;
-
-    /**
-     * 手环编号
-     */
-    @ApiModelProperty("手环编号")
-    @TableField("BRACELET_CODE")
-    private String braceletCode;
-
-    @ApiModelProperty("人员姓名（详情中展示，新增编辑不用传）")
-    @TableField(exist = false)
-    private String workerName;
-
-    @ApiModelProperty("人员部门ID（详情中展示，新增编辑不用传）")
-    @TableField(exist = false)
-    private String workerDeptId;
-
-    @ApiModelProperty("人员部门名称（详情中展示，新增编辑不用传）")
-    @TableField(exist = false)
-    private String workerDeptName;
-
-    @ApiModelProperty("人员联系方式（详情中展示，新增编辑不用传）")
-    @TableField(exist = false)
-    private String workerPhoneNumber;
-
-    public ProjectWorker(Long projectId, Long workerId) {
-        this.projectId = projectId;
-        this.workerId = workerId;
-    }
-
-    @Override
-    public String toString() {
-        return "ProjectWorker{" +
-            "id=" + id +
-            ", projectId=" + projectId +
-            ", workerId=" + workerId +
-            ", hatCode=" + hatCode +
-            ", vastCode=" + vastCode +
-            ", braceletCode=" + braceletCode +
-        "}";
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/WorkSiteInfo.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/WorkSiteInfo.java
deleted file mode 100644
index fa6f41d..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/WorkSiteInfo.java
+++ /dev/null
@@ -1,130 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.alibaba.fastjson.annotation.JSONField;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.time.LocalDateTime;
-import java.util.Date;
-
-/**
- * <p>
- * 作业现场表
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@ApiModel("WorkSiteInfo")
-@TableName("br_work_site_info")
-@Data
-public class WorkSiteInfo implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @ApiModelProperty("作业现场ID")
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 作业名称
-     */
-    @ApiModelProperty("作业名称")
-    @TableField("WORK_TITLE")
-    private String workTitle;
-
-    /**
-     * 责任人
-     */
-    @ApiModelProperty("责任人（人员ID）")
-    @TableField("WORK_PERSON")
-    private Long workPerson;
-
-    /**
-     * 作业描述
-     */
-    @ApiModelProperty("作业描述")
-    @TableField("WORK_SITE_DESC")
-    private String workSiteDesc;
-
-    /**
-     * 作业状态
-     */
-    @ApiModelProperty("作业状态")
-    @TableField("PROJECT_STATE")
-    private String projectState;
-
-    /**
-     * 所属道路
-     */
-    @ApiModelProperty("所属道路")
-    @TableField("WORK_ROAD")
-    private String workRoad;
-
-    @TableField("IMAGE_URL")
-    private String imageUrl;
-
-    @TableField("CREATE_TIME")
-    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
-    private Date createTime;
-    @TableField("UPDATE_TIME")
-    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
-    private Date updateTime;
-
-    @ApiModelProperty("开始时间")
-    @TableField("START_TIME")
-    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
-    private Date startTime;
-
-    @ApiModelProperty("结束时间")
-    @TableField("FINISH_TIME")
-    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
-    private Date finishTime;
-
-    @ApiModelProperty("负责人姓名（详情中使用，新增编辑不用传）")
-    @TableField(exist = false)
-    private String workPersonName;
-
-    @ApiModelProperty("负责人联系方式（详情中使用，新增编辑不用传）")
-    @TableField(exist = false)
-    private String workPersonPhoneNumber;
-
-    @ApiModelProperty("负责人所属部门ID（详情中使用，新增编辑不用传）")
-    @TableField(exist = false)
-    private Long workPersonDeptId;
-
-    @ApiModelProperty("负责人所属部门名称（详情中使用，新增编辑不用传）")
-    @TableField(exist = false)
-    private String workPersonDeptName;
-
-    @ApiModelProperty(value = "注册时间",dataType = "String")
-    @TableField(exist = false)
-    private String registerTime;
-
-    @ApiModelProperty("作业状态名称")
-    @TableField(exist = false)
-    private String projectStateName;
-
-    @Override
-    public String toString() {
-        return "WorkSiteInfo{" +
-            "id=" + id +
-            ", workTitle=" + workTitle +
-            ", workPerson=" + workPerson +
-            ", workSiteDesc=" + workSiteDesc +
-            ", projectState=" + projectState +
-            ", imageUrl=" + imageUrl +
-            ", updateTime=" + updateTime +
-            ", workRoad=" + workRoad +
-        "}";
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Worker.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Worker.java
deleted file mode 100644
index 28a4daa..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Worker.java
+++ /dev/null
@@ -1,147 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.time.LocalDateTime;
-import java.util.Date;
-
-/**
- * <p>
- * 
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@ApiModel("Worker")
-@TableName("br_worker")
-@Data
-public class Worker implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @ApiModelProperty(value = "人员ID")
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 姓名
-     */
-    @ApiModelProperty(value = "姓名")
-    @TableField("WORKER_NAME")
-    private String workerName;
-
-    /**
-     * 性别
-     */
-    @ApiModelProperty(value = "性别")
-    @TableField("GENDER")
-    private String gender;
-
-    /**
-     * 所属部门
-     */
-    @ApiModelProperty(value = "所属部门(人员管理)")
-    @TableField("DEPT_ID")
-    private Long deptId;
-
-    /**
-     * 所属单位
-     */
-    @ApiModelProperty(value = "所属单位(入场申请中使用)")
-    @TableField("OWNER_SHIP")
-    private String ownerShip;
-
-    /**
-     * 联系方式
-     */
-    @ApiModelProperty(value = "联系方式")
-    @TableField("PHONE_NUMBER")
-    private String phoneNumber;
-
-    /**
-     * 证件号
-     */
-    @ApiModelProperty(value = "证件号")
-    @TableField("ID_CARD_NUMBER")
-    private String idCardNumber;
-
-    /**
-     * 入场原因
-     */
-    @ApiModelProperty(value = "入场原因（入场申请中使用）")
-    @TableField("ENTER_REASON")
-    private String enterReason;
-
-    /**
-     * 入场人脸照片
-     */
-    @ApiModelProperty(value = "人脸照片（照片路径）")
-    @TableField("WORKER_AVATAR")
-    private String workerAvatar;
-
-    /**
-     * 申请入场时间
-     */
-    @ApiModelProperty(value = "注册时间/申请入场时间")
-    @TableField("CREATE_TIME")
-    private Date createTime;
-
-    /**
-     * 人员类型
-     */
-    @ApiModelProperty(value = "人员类型（区分人员管理和入场申请）")
-    @TableField("WORKER_TYPE")
-    private String workerType;
-
-    @ApiModelProperty(value = "性别名称")
-    @TableField(exist = false)
-    private String genderName;
-
-    @ApiModelProperty(value = "部门名称")
-    @TableField(exist = false)
-    private String deptName;
-
-    @ApiModelProperty(value = "注册时间",dataType = "String")
-    @TableField(exist = false)
-    private String registerTime;
-
-    @ApiModelProperty(value = "当前状态")
-    @TableField(exist = false)
-    private String status;
-
-    @ApiModelProperty(value = "当前状态名称")
-    @TableField(exist = false)
-    private String statusName;
-
-    @ApiModelProperty(value = "是否注册(0未注册；1已注册)",allowableValues = "0,1")
-    @TableField(exist = false)
-    private String isRegister;
-
-    @Override
-    public String toString() {
-        return "Worker{" +
-            "id=" + id +
-            ", workerName=" + workerName +
-            ", gender=" + gender +
-            ", deptId=" + deptId +
-            ", ownerShip=" + ownerShip +
-            ", phoneNumber=" + phoneNumber +
-            ", idCardNumber=" + idCardNumber +
-            ", enterReason=" + enterReason +
-            ", workerAvatar=" + workerAvatar +
-            ", createTime=" + createTime +
-            ", workerType=" + workerType +
-        "}";
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/AlarmMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/AlarmMapper.java
new file mode 100644
index 0000000..ea4c8be
--- /dev/null
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/AlarmMapper.java
@@ -0,0 +1,16 @@
+package com.casic.missiles.modular.system.mapper;
+
+import com.casic.missiles.modular.system.entity.Alarm;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 报警记录表 Mapper 接口
+ * </p>
+ *
+ * @author zyj
+ * @since 2023-05-25
+ */
+public interface AlarmMapper extends BaseMapper<Alarm> {
+
+}

diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/AlarmController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/AlarmController.java
new file mode 100644
index 0000000..1795cf1
--- /dev/null
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/AlarmController.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.modular.system.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.stereotype.Controller;
+
+/**
+ * <p>
+ * 报警记录表 前端控制器
+ * </p>
+ *
+ * @author zyj
+ * @since 2023-05-25
+ */
+@Controller
+@RequestMapping("/system/alarm")
+public class AlarmController {
+
+}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusAlarmController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusAlarmController.java
deleted file mode 100644
index 1f82ebb..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusAlarmController.java
+++ /dev/null
@@ -1,102 +0,0 @@
-package com.casic.missiles.modular.system.controller;
-
-
-import cn.hutool.core.util.ObjectUtil;
-import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.core.base.controller.BaseController;
-import com.casic.missiles.core.page.PageFactory;
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.AlarmUpload;
-import com.casic.missiles.modular.system.dto.DeviceDetailDTO;
-import com.casic.missiles.modular.system.entity.BusAlarm;
-import com.casic.missiles.modular.system.service.IBusAlarmService;
-import io.swagger.annotations.*;
-import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.*;
-
-import org.springframework.stereotype.Controller;
-
-import static com.casic.missiles.model.response.ResponseData.DEFAULT_SUCCESS_MESSAGE;
-import static com.casic.missiles.modular.system.consts.AlarmConst.ALARM_STATUS_MANUAL_CANCEL;
-
-/**
- * <p>
- * 报警记录表 前端控制器
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@Api(tags = "报警管理接口")
-@Controller
-@RequestMapping("/alarm")
-@RequiredArgsConstructor
-public class BusAlarmController extends BaseController {
-
-    private final IBusAlarmService alarmService;
-
-    @ApiOperation("报警上报接口")
-    @PostMapping("/upload")
-    @ResponseBody
-    public Object upload(@RequestBody AlarmUpload alarmUpload){
-        alarmService.alarmUpload(alarmUpload);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("报警列表分页查询")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "workTitle", value = "作业名称",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "projectId", value = "作业ID",dataType = "Long", paramType = "query",example = "0"),
-            @ApiImplicitParam(name = "alarmStatus", value = "报警状态",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "projectState", value = "作业状态",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "alarmType", value = "报警类型",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "alarmStartTime", value = "报警开始时间",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "alarmEndTime", value = "报警结束时间",dataType = "String", paramType = "query")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = BusAlarm.class),
-    })
-    @GetMapping("/listPage")
-    @ResponseBody
-    public Object listPage(String workTitle,Long projectId,String alarmStatus,String projectState,String alarmType,String alarmStartTime,String alarmEndTime){
-        Page<BusAlarm> page = PageFactory.defaultPage();
-        QueryWrapper<BusAlarm> queryWrapper = new QueryWrapper<>();
-        if(StrUtil.isNotEmpty(workTitle)){
-            queryWrapper.like("p.WORK_TITLE",workTitle);
-        }
-        if(ObjectUtil.isNotEmpty(projectId)){
-            queryWrapper.eq("alarm.PROJECT_ID",projectId);
-        }
-        if(StrUtil.isNotEmpty(alarmStatus)){
-            queryWrapper.eq("alarm.ALARM_STATUS",alarmStatus);
-        }
-        if(StrUtil.isNotEmpty(projectState)){
-            queryWrapper.eq("p.PROJECT_STATE",projectState);
-        }
-        if(StrUtil.isNotEmpty(alarmType)){
-            queryWrapper.eq("alarm.ALARM_TYPE",alarmType);
-        }
-        if(StrUtil.isNotEmpty(alarmStartTime)){
-            queryWrapper.ge("alarm.ALARM_TIME",alarmStartTime);
-        }
-        if(StrUtil.isNotEmpty(alarmEndTime)){
-            queryWrapper.le("alarm.ALARM_TIME",alarmEndTime);
-        }
-        page = alarmService.listPage(page,queryWrapper);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-    @ApiOperation("消警")
-    @PostMapping("/cancel")
-    @ResponseBody
-    public Object cancel(@RequestParam("alarmId") Long alarmId){
-        UpdateWrapper<BusAlarm> updateWrapper = new UpdateWrapper<>();
-        updateWrapper.eq("ID",alarmId);
-        updateWrapper.set("ALARM_STATUS",ALARM_STATUS_MANUAL_CANCEL);
-        alarmService.update(updateWrapper);
-        return ResponseData.success();
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusEventController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusEventController.java
deleted file mode 100644
index dde5aad..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusEventController.java
+++ /dev/null
@@ -1,41 +0,0 @@
-package com.casic.missiles.modular.system.controller;
-
-
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.entity.BusEvent;
-import com.casic.missiles.modular.system.service.IBusEventService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.ResponseBody;
-
-/**
- * <p>
- * 事件表 前端控制器
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@Controller
-@RequestMapping("/event")
-@Api(tags = "事件上报")
-@RequiredArgsConstructor
-public class BusEventController {
-
-    private final IBusEventService eventService;
-
-    @ApiOperation("事件上报")
-    @PostMapping("add")
-    @ResponseBody
-    public Object add(@RequestBody BusEvent busEvent){
-        eventService.saveBusEvent(busEvent);
-        return ResponseData.success();
-    }
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
index 03abc5f..aa50d78 100644
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
@@ -1,121 +1,20 @@
 package com.casic.missiles.modular.system.controller;
 
 
-import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.core.base.controller.BaseController;
-import com.casic.missiles.core.page.PageFactory;
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.DeviceDetailDTO;
-import com.casic.missiles.modular.system.entity.Device;
-import com.casic.missiles.modular.system.service.IDeviceExtService;
-import com.casic.missiles.modular.system.service.IDeviceService;
-import io.swagger.annotations.*;
-import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.RequestMapping;
 
 import org.springframework.stereotype.Controller;
 
-import java.time.LocalDateTime;
-import java.util.Date;
-import java.util.List;
-
-import static com.casic.missiles.model.response.ResponseData.DEFAULT_SUCCESS_MESSAGE;
-
 /**
  * <p>
- *  前端控制器
+ * 设备记录表 前端控制器
  * </p>
  *
  * @author zyj
- * @since 2023-04-14
+ * @since 2023-05-25
  */
-@Api(tags = "设备管理接口")
-@RequiredArgsConstructor
 @Controller
-@RequestMapping("/device")
-public class DeviceController extends BaseController {
-    private final IDeviceService deviceService;
-    private final IDeviceExtService deviceExtService;
-
-    @ApiOperation("设备分页列表")
-    @ApiImplicitParams({
-        @ApiImplicitParam(name = "deviceType", value = "设备类型",dataType = "String", paramType = "query"),
-        @ApiImplicitParam(name = "deviceCode", value = "设备编号",dataType = "String", paramType = "query"),
-        @ApiImplicitParam(name = "status", value = "设备状态",dataType = "String", paramType = "query"),
-        @ApiImplicitParam(name = "projectId", value = "作业ID（如果传此参数，列表中返回该作业使用的设备）",dataType = "Long", paramType = "query", example = "0")
-    })
-    @ApiResponses({
-        @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = DeviceDetailDTO.class),
-    })
-    @GetMapping("listPage")
-    @ResponseBody
-    public Object listPage(String deviceType, String deviceCode, String status,Long projectId){
-        Page<DeviceDetailDTO> page = PageFactory.defaultPage();
-        QueryWrapper<DeviceDetailDTO> queryWrapper = new QueryWrapper<>();
-        if(StrUtil.isNotEmpty(deviceType)){
-            queryWrapper.eq("DEVICE_TYPE",deviceType);
-        }
-        if(StrUtil.isNotEmpty(deviceCode)){
-            queryWrapper.like("DEVICE_CODE",deviceCode);
-        }
-        page = deviceService.listPage(page,queryWrapper,status,projectId);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-    @ApiOperation("新增设备")
-    @PostMapping("add")
-    @ResponseBody
-    public Object add(@RequestBody DeviceDetailDTO deviceDetailDTO){
-        deviceService.saveDevice(deviceDetailDTO);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("编辑设备")
-    @PostMapping("update")
-    @ResponseBody
-    public Object update(@RequestBody DeviceDetailDTO deviceDetailDTO){
-        deviceService.updateDevice(deviceDetailDTO);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("删除设备")
-    @PostMapping("delete")
-    @ResponseBody
-    public Object delete(@ApiParam("设备id列表")@RequestBody List<Long> deviceIds){
-        deviceService.deleteDevices(deviceIds);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("设置甲烷阈值")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "gasIp", value = "安全树甲烷设备IP",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "gasPort", value = "安全树甲烷端口",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "threshold", value = "甲烷阈值",dataType = "String", paramType = "query")
-    })
-    @PostMapping("setThreshold")
-    @ResponseBody
-    public Object setThreshold(String gasIp,String gasPort,String threshold){
-        deviceExtService.setGasThreshold(gasIp, gasPort, threshold);
-        return ResponseData.success();
-    }
-
-
-    @ApiOperation("查询甲烷阈值")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "gasIp", value = "安全树甲烷设备IP",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "gasPort", value = "安全树甲烷端口",dataType = "String", paramType = "query")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = "{\"code\": 200,\"data\": \"100\",\"message\": \"请求成功\",\"success\": true}",response = String.class),
-    })
-    @GetMapping("getThreshold")
-    @ResponseBody
-    public Object getThreshold(String gasIp,String gasPort){
-        String data = deviceExtService.getGasThreshold(gasIp, gasPort);
-        return ResponseData.success(data);
-    }
-
+@RequestMapping("/system/device")
+public class DeviceController {
 
 }
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/OverviewController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/OverviewController.java
deleted file mode 100644
index 7570504..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/OverviewController.java
+++ /dev/null
@@ -1,70 +0,0 @@
-package com.casic.missiles.modular.system.controller;
-
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.AlarmTypeCountDTO;
-import com.casic.missiles.modular.system.dto.DeviceLocationDTO;
-import com.casic.missiles.modular.system.dto.WorkerLocationDTO;
-import com.casic.missiles.modular.system.service.IBusAlarmService;
-import com.casic.missiles.modular.system.service.IProjectDeviceService;
-import com.casic.missiles.modular.system.service.IProjectWorkerService;
-import io.swagger.annotations.*;
-import lombok.RequiredArgsConstructor;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.ResponseBody;
-
-import static com.casic.missiles.model.response.ResponseData.DEFAULT_SUCCESS_MESSAGE;
-import static com.casic.missiles.modular.system.consts.AlarmConst.ALARM_STATUS_ON;
-
-@Api(tags = "首页看板接口")
-@Controller
-@RequestMapping("overview")
-@RequiredArgsConstructor
-public class OverviewController {
-
-    private final IBusAlarmService alarmService;
-    private final IProjectDeviceService projectDeviceService;
-
-    private final IProjectWorkerService projectWorkerService;
-
-
-    @ApiOperation("报警统计接口")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "projectId", value = "作业ID",dataType = "Long", paramType = "query", example = "0")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = AlarmTypeCountDTO.class),
-    })
-    @GetMapping("/alarmCount")
-    @ResponseBody
-    public Object alarmCount(Long projectId){
-        return ResponseData.success(alarmService.alarmCount(projectId,ALARM_STATUS_ON));
-    }
-
-    @ApiOperation("设备列表接口")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "projectId", value = "作业ID",dataType = "Long", paramType = "query", example = "0")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = DeviceLocationDTO.class),
-    })
-    @GetMapping("/deviceList")
-    @ResponseBody
-    public Object deviceList(Long projectId){
-        return ResponseData.success(projectDeviceService.selectDeviceLocationList(projectId));
-    }
-
-    @ApiOperation("人员列表接口")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "projectId", value = "作业ID",dataType = "Long", paramType = "query", example = "0")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = WorkerLocationDTO.class),
-    })
-    @GetMapping("/workerList")
-    @ResponseBody
-    public Object workerList(Long projectId){
-        return ResponseData.success(projectWorkerService.selectWorkerLocationDTO(projectId));
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/WorkSiteInfoController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/WorkSiteInfoController.java
deleted file mode 100644
index af36d69..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/WorkSiteInfoController.java
+++ /dev/null
@@ -1,130 +0,0 @@
-package com.casic.missiles.modular.system.controller;
-
-
-import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.core.base.controller.BaseController;
-import com.casic.missiles.core.page.PageFactory;
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.WorkSiteDetailDTO;
-import com.casic.missiles.modular.system.entity.WorkSiteInfo;
-import com.casic.missiles.modular.system.service.IWorkSiteInfoService;
-import io.swagger.annotations.*;
-import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.*;
-
-import org.springframework.stereotype.Controller;
-
-import java.util.List;
-
-import static com.casic.missiles.model.response.ResponseData.DEFAULT_SUCCESS_MESSAGE;
-
-/**
- * <p>
- * 作业现场表 前端控制器
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@Controller
-@RequestMapping("/site")
-@Api(tags = "作业现场管理")
-@RequiredArgsConstructor
-public class WorkSiteInfoController extends BaseController {
-
-
-    private final IWorkSiteInfoService workSiteInfoService;
-
-    @ApiOperation("新增作业现场")
-    @PostMapping("add")
-    @ResponseBody
-    public Object addWorkSite(@RequestBody WorkSiteDetailDTO workSiteDetailDTO){
-        workSiteInfoService.addWorkSiteInfo(workSiteDetailDTO);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("编辑作业现场")
-    @PostMapping("update")
-    @ResponseBody
-    public Object updateWorkSite(@RequestBody WorkSiteDetailDTO workSiteDetailDTO){
-        workSiteInfoService.updateWorkSiteInfo(workSiteDetailDTO);
-        return ResponseData.success();
-    }
-
-
-    @ApiOperation("删除作业现场")
-    @PostMapping("delete")
-    @ResponseBody
-    public Object delete(@ApiParam("作业现场id列表")@RequestBody List<Long> projectIds){
-        workSiteInfoService.deleteProjects(projectIds);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("查询作业现场详情")
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = WorkSiteDetailDTO.class),
-    })
-    @GetMapping("detail")
-    @ResponseBody
-    public Object delete(@ApiParam(value = "作业现场id", example = "0")@RequestParam Long projectId){
-        WorkSiteDetailDTO detailDTO = workSiteInfoService.getWorkSiteDetail(projectId);
-        return ResponseData.success(detailDTO);
-    }
-
-    @ApiOperation("分页列表查询")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "workTitle",value = "作业名称", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "workRoad",value = "所属道路", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "workPersonName",value = "责任人姓名", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "startDate",value = "注册开始日期", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "endDate",value = "注册结束日期", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "projectState",value = "当前状态（字典值）", dataType = "String", paramType = "query")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = WorkSiteInfo.class),
-    })
-    @GetMapping("listPage")
-    @ResponseBody
-    public Object listPage(String workTitle,String workRoad,String workPersonName,String projectState,String startDate,String endDate){
-        Page<WorkSiteInfo> page = PageFactory.defaultPage();
-        QueryWrapper<WorkSiteInfo> queryWrapper = new QueryWrapper<>();
-        if(StrUtil.isNotEmpty(workTitle)){
-            queryWrapper.like("WORK_TITLE",workTitle);
-        }
-        if(StrUtil.isNotEmpty(workRoad)){
-            queryWrapper.like("WORK_ROAD",workRoad);
-        }
-        if(StrUtil.isNotEmpty(workPersonName)){
-            queryWrapper.like("WORKER_NAME",workPersonName);
-        }
-        if(StrUtil.isNotEmpty(projectState)){
-            queryWrapper.eq("PROJECT_STATE",projectState);
-        }
-        if(StrUtil.isNotEmpty(startDate)){
-            queryWrapper.ge("br_work_site_info.CREATE_TIME",startDate + " 00:00:00");
-        }
-        if(StrUtil.isNotEmpty(endDate)){
-            queryWrapper.le("br_work_site_info.CREATE_TIME",endDate + " 23:59:59");
-        }
-        page = workSiteInfoService.selectListPage(page,queryWrapper);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-    @ApiOperation("开始作业")
-    @PostMapping("start")
-    @ResponseBody
-    public Object start(@ApiParam(value = "作业现场id",example = "0")@RequestParam Long projectId){
-        workSiteInfoService.start(projectId);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("完成作业")
-    @PostMapping("finish")
-    @ResponseBody
-    public Object finish(@ApiParam(value = "作业现场id", example = "0")@RequestParam Long projectId){
-        workSiteInfoService.finish(projectId);
-        return ResponseData.success();
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/WorkerController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/WorkerController.java
deleted file mode 100644
index 796f94c..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/WorkerController.java
+++ /dev/null
@@ -1,136 +0,0 @@
-package com.casic.missiles.modular.system.controller;
-
-
-import cn.hutool.core.util.ObjectUtil;
-import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.core.base.controller.BaseController;
-import com.casic.missiles.core.page.PageFactory;
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.DeviceDetailDTO;
-import com.casic.missiles.modular.system.entity.Device;
-import com.casic.missiles.modular.system.entity.Worker;
-import com.casic.missiles.modular.system.service.IWorkerService;
-import io.swagger.annotations.*;
-import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.*;
-
-import org.springframework.stereotype.Controller;
-
-import java.util.Date;
-import java.util.List;
-
-import static com.casic.missiles.model.response.ResponseData.DEFAULT_SUCCESS_MESSAGE;
-
-/**
- * <p>
- *  前端控制器
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@Controller
-@RequestMapping("/worker")
-@RequiredArgsConstructor
-@Api(tags = "人员管理接口")
-public class WorkerController extends BaseController {
-
-    private final IWorkerService workerService;
-
-    @ApiOperation("分页列表查询")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "name",value = "姓名", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "deptId",value = "所属部门", dataType = "Long", paramType = "query", example = "0"),
-            @ApiImplicitParam(name = "status",value = "当前状态（字典值）", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "startDate",value = "注册开始日期", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "endDate",value = "注册结束日期", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "workerType",value = "人员类型（字典值）", dataType = "String", paramType = "query")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = Worker.class),
-    })
-    @GetMapping("listPage")
-    @ResponseBody
-    public Object listPage(String name,Long deptId, String status,String startDate,String endDate,String workerType){
-        Page<Worker> page = PageFactory.defaultPage();
-        QueryWrapper<Worker> queryWrapper = new QueryWrapper<>();
-        if(StrUtil.isNotEmpty(name)){
-            queryWrapper.like("WORKER_NAME",name);
-        }
-        if(ObjectUtil.isNotEmpty(deptId)){
-            queryWrapper.eq("DEPT_ID",deptId);
-        }
-        if(StrUtil.isNotEmpty(workerType)){
-            queryWrapper.eq("WORKER_TYPE",workerType);
-        }
-        if(StrUtil.isNotEmpty(startDate)){
-            queryWrapper.ge("CREATE_TIME",startDate + " 00:00:00");
-        }
-        if(StrUtil.isNotEmpty(endDate)){
-            queryWrapper.le("CREATE_TIME",endDate + " 23:59:59");
-        }
-        if(StrUtil.isNotEmpty(status)){
-            queryWrapper.eq("`STATUS`",status);
-        }
-        page = workerService.selectListPage(page,queryWrapper);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-    @ApiOperation("新增人员")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "worker", value = "人员信息", dataType = "Worker", paramType = "body", required = true),
-            @ApiImplicitParam(name = "projectId", value = "项目ID(入场申请需要)", dataType = "Long", paramType = "query", example = "0")
-    })
-    @PostMapping("add")
-    @ResponseBody
-    public Object add(@ApiParam("worker")@RequestBody Worker worker,
-                      @RequestParam(required = false) Long projectId){
-        workerService.addWorker(worker,projectId);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("编辑人员")
-    @PostMapping("update")
-    @ResponseBody
-    public Object update(@RequestBody Worker worker){
-        workerService.updateById(worker);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("删除人员")
-    @PostMapping("delete")
-    @ResponseBody
-    public Object delete(@ApiParam("人员id列表")@RequestBody List<Long> workIds){
-        workerService.removeByIds(workIds);
-        return ResponseData.success();
-    }
-
-
-    @ApiOperation(value = "获取人脸图片",notes = "返回人脸图片url")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "cameraIp",value = "摄像头IP", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "cameraPort",value = "摄像头端口号", dataType = "String", paramType = "query"),
-    })
-    @GetMapping("/face/register")
-    @ResponseBody
-    public Object faceRegister(String cameraIp,String cameraPort){
-        return ResponseData.success(workerService.faceRegister(cameraIp, cameraPort));
-    }
-
-
-    @ApiOperation(value = "查询临时入场人员列表")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "projectId", value = "项目ID",required = true,dataType = "Long", paramType = "query", example = "0")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = Worker.class),
-    })
-    @GetMapping("/projectTempWorker")
-    @ResponseBody
-    public Object projectTempWorker(Long projectId){
-        return ResponseData.success(workerService.projectTempWorker(projectId));
-    }
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/AlarmTypeCountDTO.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/AlarmTypeCountDTO.java
deleted file mode 100644
index 1a165a1..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/AlarmTypeCountDTO.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.casic.missiles.modular.system.dto;
-
-import io.swagger.annotations.ApiModel;
-import lombok.Data;
-
-@ApiModel(value = "AlarmTypeCountDTO",description = "报警类型统计（首页）")
-@Data
-public class AlarmTypeCountDTO {
-
-    private String alarmType;
-    private String alarmTypeName;
-    private Integer alarmCount;
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/AlarmUpload.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/AlarmUpload.java
deleted file mode 100644
index 73d7799..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/AlarmUpload.java
+++ /dev/null
@@ -1,46 +0,0 @@
-package com.casic.missiles.modular.system.dto;
-
-import cn.hutool.core.util.StrUtil;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-@ApiModel(value = "AlarmUpload",description = "报警上传")
-@Data
-public class AlarmUpload {
-
-    @ApiModelProperty(value = "摄像头ip")
-    private String cameraIp;
-
-    @ApiModelProperty(value = "摄像头端口")
-    private String cameraPort;
-    @ApiModelProperty(value = "安全树甲烷设备ip")
-    private String gasIp;
-    @ApiModelProperty(value = "安全树甲烷设备端口")
-    private String gasPort;
-    @ApiModelProperty(value = "报警值")
-    private String alarmValue;
-    @ApiModelProperty(value = "报警时间")
-    private String alarmTime;
-    @ApiModelProperty(value = "报警类型")
-    private String alarmType;
-    @ApiModelProperty(value = "报警图片")
-    private String alarmImage;
-    @ApiModelProperty(value = "报警内容")
-    private String alarmContent;
-
-    @Override
-    public String toString() {
-        return "AlarmUpload{" +
-                "cameraIp='" + cameraIp + '\'' +
-                ", cameraPort='" + cameraPort + '\'' +
-                ", gasIp='" + gasIp + '\'' +
-                ", gasPort='" + gasPort + '\'' +
-                ", alarmValue='" + alarmValue + '\'' +
-                ", alarmTime='" + alarmTime + '\'' +
-                ", alarmType='" + alarmType + '\'' +
-                ", alarmImage='" + (StrUtil.isNotEmpty(alarmImage) ? alarmImage.substring(0,50) : "null") + '\'' +
-                ", alarmContent='" + alarmContent + '\'' +
-                '}';
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/DeviceDetailDTO.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/DeviceDetailDTO.java
deleted file mode 100644
index ea518d9..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/DeviceDetailDTO.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package com.casic.missiles.modular.system.dto;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.casic.missiles.modular.system.entity.Device;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-@ApiModel("DeviceDetailDTO")
-@Data
-public class DeviceDetailDTO extends Device {
-
-    @ApiModelProperty(value = "摄像头编号")
-    private String cameraCode;
-
-    @ApiModelProperty(value = "摄像头IP")
-    private String cameraIp;
-
-    @ApiModelProperty(value = "摄像头端口")
-    private String cameraPort;
-
-    @ApiModelProperty(value = "激甲编号")
-    private String gasCode;
-
-    @ApiModelProperty(value = "激甲IP")
-    private String gasIp;
-
-    @ApiModelProperty(value = "激甲端口")
-    private String gasPort;
-
-    @ApiModelProperty(value = "智能帽衬编号")
-    private String hatLiningCode;
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/WorkSiteDetailDTO.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/WorkSiteDetailDTO.java
deleted file mode 100644
index 29378ff..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/WorkSiteDetailDTO.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package com.casic.missiles.modular.system.dto;
-
-import com.casic.missiles.modular.system.entity.ProjectDevice;
-import com.casic.missiles.modular.system.entity.ProjectWorker;
-import com.casic.missiles.modular.system.entity.WorkSiteInfo;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.util.List;
-
-@Data
-@ApiModel("WorkSiteDetailDTO")
-public class WorkSiteDetailDTO extends WorkSiteInfo {
-
-    @ApiModelProperty(value = "安全树列表",dataType = "ProjectDevice")
-    private List<ProjectDevice> deviceList;
-
-    @ApiModelProperty(value = "人员列表",dataType = "ProjectWorker")
-    private List<ProjectWorker> workerList;
-
-
-
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/WorkerLocationDTO.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/WorkerLocationDTO.java
deleted file mode 100644
index 6fd7b24..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/WorkerLocationDTO.java
+++ /dev/null
@@ -1,68 +0,0 @@
-package com.casic.missiles.modular.system.dto;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-@ApiModel(value = "WorkerLocationDTO",description = "人员位置列表（首页）")
-@Data
-public class WorkerLocationDTO {
-
-    @ApiModelProperty("人员ID")
-    private Long workerId;
-
-    @ApiModelProperty("人员姓名")
-    private String workerName;
-
-    @ApiModelProperty("安全帽编号")
-    private String hatCode;
-
-    @ApiModelProperty("安全帽ID")
-    private Long hatId;
-
-    @ApiModelProperty("背心编号")
-    private String vastCode;
-
-    @ApiModelProperty("手环编号")
-    private String braceletCode;
-
-    @ApiModelProperty("位置")
-    private String location;
-
-    @ApiModelProperty("时间")
-    private String time;
-
-    @ApiModelProperty("经度")
-    private String lng;
-
-    @ApiModelProperty("纬度")
-    private String lat;
-
-    @ApiModelProperty("心率")
-    private String heartRate;
-
-    @ApiModelProperty("血氧")
-    private String bloodOxygen;
-
-    @ApiModelProperty("一氧化碳")
-    private String co;
-
-    @ApiModelProperty("甲烷")
-    private String gas;
-
-    @ApiModelProperty("硫化氢")
-    private String h2s;
-
-    @ApiModelProperty("氧气")
-    private String o2;
-
-    @ApiModelProperty("信号")
-    private String signal;
-
-    @ApiModelProperty("电量")
-    private String cell;
-
-    @ApiModelProperty("是否报警")
-    private boolean alarmFlag;
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Alarm.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Alarm.java
new file mode 100644
index 0000000..4d2b7ef
--- /dev/null
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Alarm.java
@@ -0,0 +1,103 @@
+package com.casic.missiles.modular.system.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import java.util.Date;
+
+/**
+ * <p>
+ * 报警记录表
+ * </p>
+ *
+ * @author zyj
+ * @since 2023-05-25
+ */
+@Data
+@TableName("bus_alarm")
+public class Alarm implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    @TableId(value = "ID",type = IdType.ASSIGN_ID)
+    private Long id;
+
+    /**
+     * 设备ID
+     */
+    @TableField("DEVICE_ID")
+    private Long deviceId;
+
+    /**
+     * 报警类型
+     */
+    @TableField("ALARM_TYPE")
+    private String alarmType;
+
+    /**
+     * 报警时间
+     */
+    @TableField("ALARM_TIME")
+    private Date alarmTime;
+
+    /**
+     * 报警状态
+     */
+    @TableField("ALARM_STATUS")
+    private String alarmStatus;
+
+    /**
+     * 报警位置
+     */
+    @TableField("ALARM_LOCATION")
+    private String alarmLocation;
+
+    /**
+     * 报警图片
+     */
+    @TableField("ALARM_IMAGE")
+    private String alarmImage;
+
+    /**
+     * 视频通道号
+     */
+    @TableField("CHANNEL_NO")
+    private Integer channelNo;
+
+    /**
+     * 报警内容
+     */
+    @TableField("ALARM_CONTENT")
+    private String alarmContent;
+
+    /**
+     * 消警时间
+     */
+    @TableField("CANCEL_TIME")
+    private Date cancelTime;
+
+
+    @Override
+    public String toString() {
+        return "Alarm{" +
+            "id=" + id +
+            ", deviceId=" + deviceId +
+            ", alarmType=" + alarmType +
+            ", alarmTime=" + alarmTime +
+            ", alarmStatus=" + alarmStatus +
+            ", alarmLocation=" + alarmLocation +
+            ", alarmImage=" + alarmImage +
+            ", channelNo=" + channelNo +
+            ", alarmContent=" + alarmContent +
+            ", cancelTime=" + cancelTime +
+        "}";
+    }
+}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusAlarm.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusAlarm.java
deleted file mode 100644
index efb4a23..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusAlarm.java
+++ /dev/null
@@ -1,159 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.alibaba.fastjson.annotation.JSONField;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.time.LocalDateTime;
-import java.util.Date;
-
-/**
- * <p>
- * 报警记录表
- * </p>
- *
- * @author zyj
- * @since 2023-05-16
- */
-@Data
-@ApiModel("Alarm")
-@TableName("br_bus_alarm")
-public class BusAlarm implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 项目ID
-     */
-    @ApiModelProperty(value = "项目ID")
-    @TableField("PROJECT_ID")
-    private Long projectId;
-
-    /**
-     * 设备ID
-     */
-    @ApiModelProperty(value = "设备ID")
-    @TableField("DEVICE_ID")
-    private Long deviceId;
-
-    /**
-     * 报警类型
-     */
-    @ApiModelProperty(value = "报警类型")
-    @TableField("ALARM_TYPE")
-    private String alarmType;
-
-    /**
-     * 报警状态
-     */
-    @ApiModelProperty(value = "报警状态")
-    @TableField("ALARM_STATUS")
-    private String alarmStatus;
-
-    /**
-     * 报警值
-     */
-    @ApiModelProperty(value = "报警值")
-    @TableField("ALARM_VALUE")
-    private String alarmValue;
-
-    /**
-     * 报警图片
-     */
-    @ApiModelProperty(value = "报警图片")
-    @TableField("ALARM_IMAGE")
-    private String alarmImage;
-
-    /**
-     * 报警内容
-     */
-    @ApiModelProperty(value = "报警内容")
-    @TableField("ALARM_CONTENT")
-    private String alarmContent;
-
-    /**
-     * 报警时间
-     */
-    @ApiModelProperty(value = "报警时间")
-    @TableField("ALARM_TIME")
-    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
-    private Date alarmTime;
-
-    /**
-     * 消警时间
-     */
-    @ApiModelProperty(value = "消警时间")
-    @TableField("CANCEL_TIME")
-    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
-    private Date cancelTime;
-
-    /**
-     * 报警位置经度
-     */
-    @ApiModelProperty(value = "报警位置经度")
-    @TableField("ALARM_LNG")
-    private String alarmLng;
-
-    /**
-     * 报警位置纬度
-     */
-    @ApiModelProperty(value = "报警位置纬度")
-    @TableField("ALARM_LAT")
-    private String alarmLat;
-
-    @ApiModelProperty("报警类型名称")
-    @TableField(exist = false)
-    private String alarmStatusName;
-    @ApiModelProperty("报警类型名称")
-    @TableField(exist = false)
-    private String alarmTypeName;
-    @ApiModelProperty("作业名称")
-    @TableField(exist = false)
-    private String workTitle;
-    @ApiModelProperty("所属道路")
-    @TableField(exist = false)
-    private String workRoad;
-    @ApiModelProperty("作业状态")
-    @TableField(exist = false)
-    private String projectState;
-    @ApiModelProperty("作业状态名称")
-    @TableField(exist = false)
-    private String projectStateName;
-    @ApiModelProperty("负责人姓名")
-    @TableField(exist = false)
-    private String workPersonName;
-    @ApiModelProperty("负责人联系方式")
-    @TableField(exist = false)
-    private String workPersonPhoneNumber;
-
-
-    @Override
-    public String toString() {
-        return "BusAlarm{" +
-                "id=" + id +
-                ", projectId=" + projectId +
-                ", deviceId=" + deviceId +
-                ", alarmType=" + alarmType +
-                ", alarmValue=" + alarmValue +
-                ", alarmStatus=" + alarmStatus +
-                ", alarmImage=" + alarmImage +
-                ", alarmContent=" + alarmContent +
-                ", alarmTime=" + alarmTime +
-                ", cancelTime=" + cancelTime +
-                ", alarmLng=" + alarmLng +
-                ", alarmLat=" + alarmLat +
-                "}";
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusEvent.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusEvent.java
deleted file mode 100644
index a0b7543..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusEvent.java
+++ /dev/null
@@ -1,100 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.time.LocalDateTime;
-import java.util.Date;
-import java.util.List;
-
-/**
- * <p>
- * 事件表
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@TableName("br_bus_event")
-@Data
-@ApiModel("BusEvent")
-public class BusEvent implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @ApiModelProperty("事件ID")
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 事件标题
-     */
-    @ApiModelProperty("事件名称")
-    @TableField("EVENT_TITLE")
-    private String eventTitle;
-
-    /**
-     * 上报人员
-     */
-    @ApiModelProperty("上报人员")
-    @TableField("UPLOAD_NAME")
-    private String uploadName;
-
-    /**
-     * 联系方式
-     */
-    @ApiModelProperty("联系方式")
-    @TableField("PHONE_NUMBER")
-    private String phoneNumber;
-
-    /**
-     * 事件描述
-     */
-    @ApiModelProperty("事件描述")
-    @TableField("EVENT_DESCRIPTION")
-    private String eventDescription;
-
-    @ApiModelProperty("经度")
-    @TableField("LNG")
-    private String lng;
-
-    @ApiModelProperty("纬度")
-    @TableField("LAT")
-    private String lat;
-
-    /**
-     * 事件上传时间
-     */
-    @ApiModelProperty("事件上传时间")
-    @TableField("CREATE_TIME")
-    private Date createTime;
-
-    @ApiModelProperty("事件照片")
-    @TableField(exist = false)
-    private List<BusEventImage> imageList;
-
-
-
-    @Override
-    public String toString() {
-        return "BusEvent{" +
-            "id=" + id +
-            ", eventTitle=" + eventTitle +
-            ", uploadName=" + uploadName +
-            ", phoneNumber=" + phoneNumber +
-            ", eventDescription=" + eventDescription +
-            ", lng=" + lng +
-            ", lat=" + lat +
-            ", createTime=" + createTime +
-        "}";
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusEventImage.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusEventImage.java
deleted file mode 100644
index 1e75245..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusEventImage.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-
-/**
- * <p>
- * 事件图片表
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@TableName("br_bus_event_image")
-@Data
-@ApiModel("BusEventImage")
-public class BusEventImage implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 事件ID
-     */
-    @TableField("EVENT_ID")
-    private Long eventId;
-
-    /**
-     * 报警图片
-     */
-    @TableField("IMAGE")
-    @ApiModelProperty("图片url")
-    private String image;
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Device.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Device.java
index df89c70..ea7db5f 100644
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Device.java
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Device.java
@@ -1,30 +1,23 @@
 package com.casic.missiles.modular.system.entity;
 
-import com.alibaba.fastjson.annotation.JSONField;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.casic.missiles.core.base.json.DateDeserializer;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
-import java.util.Date;
 
 /**
  * <p>
- * 
+ * 设备记录表
  * </p>
  *
  * @author zyj
- * @since 2023-04-14
+ * @since 2023-05-25
  */
-@ApiModel("Device")
-@TableName("br_device")
 @Data
+@TableName("bus_device")
 public class Device implements Serializable {
 
     private static final long serialVersionUID = 1L;
@@ -32,82 +25,86 @@
     /**
      * 主键
      */
-    @ApiModelProperty(value = "设备ID")
     @TableId(value = "ID",type = IdType.ASSIGN_ID)
     private Long id;
 
     /**
-     * 设备编号
+     * 设备名称
      */
-    @ApiModelProperty(value = "设备编号")
-    @TableField("DEVICE_CODE")
-    private String deviceCode;
+    @TableField("DEVICE_NAME")
+    private String deviceName;
 
     /**
-     * 设备类型
+     * IP
      */
-    @ApiModelProperty(value = "设备类型")
-    @TableField("DEVICE_TYPE")
-    private String deviceType;
+    @TableField("IP")
+    private String ip;
 
     /**
-     * 设备批次
+     * 端口
      */
-    @ApiModelProperty(value = "设备批次")
-    @TableField("DEVICE_BATCH")
-    private String deviceBatch;
+    @TableField("PORT")
+    private String port;
 
     /**
-     * 厂家
+     * 用户名
      */
-    @ApiModelProperty(value = "厂家")
-    @TableField("MANUFACTURER")
-    private String manufacturer;
+    @TableField("USER_NAME")
+    private String userName;
 
     /**
-     * 是否供电
+     * 密码
      */
-    @ApiModelProperty(value = "是否供电")
-    @TableField("IS_POWER_SUPPLY")
-    private String isPowerSupply;
+    @TableField("PASSWORD")
+    private String password;
 
     /**
-     * 创建时间
+     * 连接类型
      */
-    @ApiModelProperty(value = "创建时间",dataType = "Date")
-    @TableField("CREATE_TIME")
-    private Date createTime;
+    @TableField("CONNECT_TYPE")
+    private String connectType;
 
-    @ApiModelProperty(value = "设备类型名称")
-    @TableField(exist = false)
-    private String deviceTypeName;
+    /**
+     * 位置
+     */
+    @TableField("LOCATION")
 
-    @ApiModelProperty(value = "是否供电名称")
-    @TableField(exist = false)
-    private String isPowerSupplyName;
+    private String location;
 
-    @ApiModelProperty(value = "注册时间",dataType = "String")
-    @TableField(exist = false)
-    private String registerTime;
+    /**
+     * 设备状态
+     */
+    @TableField("STATUS")
 
-    @ApiModelProperty(value = "当前状态")
-    @TableField(exist = false)
     private String status;
 
-    @ApiModelProperty(value = "当前状态名称")
-    @TableField(exist = false)
-    private String statusName;
+    /**
+     * 报警分组
+     */
+    @TableField("ALARM_GROUP")
+
+    private Long alarmGroup;
+
+    /**
+     * 视频通道数(预留)
+     */
+    @TableField("CHANNEL_NUM")
+    private Integer channelNum;
 
     @Override
     public String toString() {
         return "Device{" +
             "id=" + id +
-            ", deviceCode=" + deviceCode +
-            ", deviceType=" + deviceType +
-            ", deviceBatch=" + deviceBatch +
-            ", manufacturer=" + manufacturer +
-            ", isPowerSupply=" + isPowerSupply +
-            ", createTime=" + createTime +
+            ", deviceName=" + deviceName +
+            ", ip=" + ip +
+            ", port=" + port +
+            ", userName=" + userName +
+            ", password=" + password +
+            ", connectType=" + connectType +
+            ", location=" + location +
+            ", status=" + status +
+            ", alarmGroup=" + alarmGroup +
+            ", channelNum=" + channelNum +
         "}";
     }
 }
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/DeviceExt.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/DeviceExt.java
deleted file mode 100644
index 5ee7015..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/DeviceExt.java
+++ /dev/null
@@ -1,99 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-
-/**
- * <p>
- * 设备扩展信息表（安全树）
- * </p>
- *
- * @author zyj
- * @since 2023-04-27
- */
-@Data
-@TableName("br_device_ext")
-public class DeviceExt implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 设备ID
-     */
-    @TableField("DEVICE_ID")
-    private Long deviceId;
-
-    /**
-     * 摄像头编号
-     */
-    @TableField("CAMERA_CODE")
-    private String cameraCode;
-
-    /**
-     * 摄像头IP
-     */
-    @TableField("CAMERA_IP")
-    private String cameraIp;
-
-    /**
-     * 摄像头端口
-     */
-    @TableField("CAMERA_PORT")
-    private String cameraPort;
-
-    /**
-     * 激甲编号
-     */
-    @TableField("GAS_CODE")
-    private String gasCode;
-
-    /**
-     * 激甲IP
-     */
-    @TableField("GAS_IP")
-    private String gasIp;
-
-    /**
-     * 激甲端口
-     */
-    @TableField("GAS_PORT")
-    private String gasPort;
-
-    /**
-     * 甲烷报警阈值
-     */
-    @TableField("GAS_THRESHOLD")
-    private String gasThreshold;
-
-    @TableField(value = "HAT_LINING_CODE")
-    private String hatLiningCode;
-
-
-    @Override
-    public String toString() {
-        return "DeviceExt{" +
-            "id=" + id +
-            ", deviceId=" + deviceId +
-            ", cameraCode=" + cameraCode +
-            ", cameraIp=" + cameraIp +
-            ", cameraPort=" + cameraPort +
-            ", gasCode=" + gasCode +
-            ", gasIp=" + gasIp +
-            ", gasPort=" + gasPort +
-            ", gasThreshold=" + gasThreshold +
-            ", hatLiningCode=" + hatLiningCode +
-        "}";
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/ProjectDevice.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/ProjectDevice.java
deleted file mode 100644
index c4f3472..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/ProjectDevice.java
+++ /dev/null
@@ -1,62 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-
-/**
- * <p>
- * 
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@Data
-@ApiModel("ProjectDevice")
-@TableName("br_project_device")
-public class ProjectDevice implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 作业现场ID
-     */
-    @TableField("PROJECT_ID")
-    private Long projectId;
-
-    /**
-     * 设备ID
-     */
-    @TableField("DEVICE_ID")
-    @ApiModelProperty("设备ID（新增编辑时传）")
-    private Long deviceId;
-
-    /**
-     * 设备编号
-     */
-    @TableField(exist = false)
-    @ApiModelProperty("设备编号（详情中展示，新增编辑不用传）")
-    private String deviceCode;
-
-    @Override
-    public String toString() {
-        return "ProjectDevice{" +
-            "id=" + id +
-            ", projectId=" + projectId +
-            ", deviceId=" + deviceId +
-        "}";
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/ProjectWorker.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/ProjectWorker.java
deleted file mode 100644
index 10b23c4..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/ProjectWorker.java
+++ /dev/null
@@ -1,104 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import java.io.Serializable;
-
-/**
- * <p>
- * 
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@ApiModel("ProjectWorker")
-@TableName("br_project_worker")
-@Data
-@NoArgsConstructor
-@AllArgsConstructor
-public class ProjectWorker implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 作业现场ID
-     */
-    @TableField("PROJECT_ID")
-    private Long projectId;
-
-    /**
-     * 人员ID
-     */
-    @ApiModelProperty("人员ID")
-    @TableField("WORKER_ID")
-    private Long workerId;
-
-    /**
-     * 安全帽编号
-     */
-    @ApiModelProperty("安全帽编号")
-    @TableField("HAT_CODE")
-    private String hatCode;
-
-    /**
-     * 背心编号
-     */
-    @ApiModelProperty("背心编号")
-    @TableField("VAST_CODE")
-    private String vastCode;
-
-    /**
-     * 手环编号
-     */
-    @ApiModelProperty("手环编号")
-    @TableField("BRACELET_CODE")
-    private String braceletCode;
-
-    @ApiModelProperty("人员姓名（详情中展示，新增编辑不用传）")
-    @TableField(exist = false)
-    private String workerName;
-
-    @ApiModelProperty("人员部门ID（详情中展示，新增编辑不用传）")
-    @TableField(exist = false)
-    private String workerDeptId;
-
-    @ApiModelProperty("人员部门名称（详情中展示，新增编辑不用传）")
-    @TableField(exist = false)
-    private String workerDeptName;
-
-    @ApiModelProperty("人员联系方式（详情中展示，新增编辑不用传）")
-    @TableField(exist = false)
-    private String workerPhoneNumber;
-
-    public ProjectWorker(Long projectId, Long workerId) {
-        this.projectId = projectId;
-        this.workerId = workerId;
-    }
-
-    @Override
-    public String toString() {
-        return "ProjectWorker{" +
-            "id=" + id +
-            ", projectId=" + projectId +
-            ", workerId=" + workerId +
-            ", hatCode=" + hatCode +
-            ", vastCode=" + vastCode +
-            ", braceletCode=" + braceletCode +
-        "}";
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/WorkSiteInfo.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/WorkSiteInfo.java
deleted file mode 100644
index fa6f41d..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/WorkSiteInfo.java
+++ /dev/null
@@ -1,130 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.alibaba.fastjson.annotation.JSONField;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.time.LocalDateTime;
-import java.util.Date;
-
-/**
- * <p>
- * 作业现场表
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@ApiModel("WorkSiteInfo")
-@TableName("br_work_site_info")
-@Data
-public class WorkSiteInfo implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @ApiModelProperty("作业现场ID")
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 作业名称
-     */
-    @ApiModelProperty("作业名称")
-    @TableField("WORK_TITLE")
-    private String workTitle;
-
-    /**
-     * 责任人
-     */
-    @ApiModelProperty("责任人（人员ID）")
-    @TableField("WORK_PERSON")
-    private Long workPerson;
-
-    /**
-     * 作业描述
-     */
-    @ApiModelProperty("作业描述")
-    @TableField("WORK_SITE_DESC")
-    private String workSiteDesc;
-
-    /**
-     * 作业状态
-     */
-    @ApiModelProperty("作业状态")
-    @TableField("PROJECT_STATE")
-    private String projectState;
-
-    /**
-     * 所属道路
-     */
-    @ApiModelProperty("所属道路")
-    @TableField("WORK_ROAD")
-    private String workRoad;
-
-    @TableField("IMAGE_URL")
-    private String imageUrl;
-
-    @TableField("CREATE_TIME")
-    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
-    private Date createTime;
-    @TableField("UPDATE_TIME")
-    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
-    private Date updateTime;
-
-    @ApiModelProperty("开始时间")
-    @TableField("START_TIME")
-    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
-    private Date startTime;
-
-    @ApiModelProperty("结束时间")
-    @TableField("FINISH_TIME")
-    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
-    private Date finishTime;
-
-    @ApiModelProperty("负责人姓名（详情中使用，新增编辑不用传）")
-    @TableField(exist = false)
-    private String workPersonName;
-
-    @ApiModelProperty("负责人联系方式（详情中使用，新增编辑不用传）")
-    @TableField(exist = false)
-    private String workPersonPhoneNumber;
-
-    @ApiModelProperty("负责人所属部门ID（详情中使用，新增编辑不用传）")
-    @TableField(exist = false)
-    private Long workPersonDeptId;
-
-    @ApiModelProperty("负责人所属部门名称（详情中使用，新增编辑不用传）")
-    @TableField(exist = false)
-    private String workPersonDeptName;
-
-    @ApiModelProperty(value = "注册时间",dataType = "String")
-    @TableField(exist = false)
-    private String registerTime;
-
-    @ApiModelProperty("作业状态名称")
-    @TableField(exist = false)
-    private String projectStateName;
-
-    @Override
-    public String toString() {
-        return "WorkSiteInfo{" +
-            "id=" + id +
-            ", workTitle=" + workTitle +
-            ", workPerson=" + workPerson +
-            ", workSiteDesc=" + workSiteDesc +
-            ", projectState=" + projectState +
-            ", imageUrl=" + imageUrl +
-            ", updateTime=" + updateTime +
-            ", workRoad=" + workRoad +
-        "}";
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Worker.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Worker.java
deleted file mode 100644
index 28a4daa..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Worker.java
+++ /dev/null
@@ -1,147 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.time.LocalDateTime;
-import java.util.Date;
-
-/**
- * <p>
- * 
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@ApiModel("Worker")
-@TableName("br_worker")
-@Data
-public class Worker implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @ApiModelProperty(value = "人员ID")
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 姓名
-     */
-    @ApiModelProperty(value = "姓名")
-    @TableField("WORKER_NAME")
-    private String workerName;
-
-    /**
-     * 性别
-     */
-    @ApiModelProperty(value = "性别")
-    @TableField("GENDER")
-    private String gender;
-
-    /**
-     * 所属部门
-     */
-    @ApiModelProperty(value = "所属部门(人员管理)")
-    @TableField("DEPT_ID")
-    private Long deptId;
-
-    /**
-     * 所属单位
-     */
-    @ApiModelProperty(value = "所属单位(入场申请中使用)")
-    @TableField("OWNER_SHIP")
-    private String ownerShip;
-
-    /**
-     * 联系方式
-     */
-    @ApiModelProperty(value = "联系方式")
-    @TableField("PHONE_NUMBER")
-    private String phoneNumber;
-
-    /**
-     * 证件号
-     */
-    @ApiModelProperty(value = "证件号")
-    @TableField("ID_CARD_NUMBER")
-    private String idCardNumber;
-
-    /**
-     * 入场原因
-     */
-    @ApiModelProperty(value = "入场原因（入场申请中使用）")
-    @TableField("ENTER_REASON")
-    private String enterReason;
-
-    /**
-     * 入场人脸照片
-     */
-    @ApiModelProperty(value = "人脸照片（照片路径）")
-    @TableField("WORKER_AVATAR")
-    private String workerAvatar;
-
-    /**
-     * 申请入场时间
-     */
-    @ApiModelProperty(value = "注册时间/申请入场时间")
-    @TableField("CREATE_TIME")
-    private Date createTime;
-
-    /**
-     * 人员类型
-     */
-    @ApiModelProperty(value = "人员类型（区分人员管理和入场申请）")
-    @TableField("WORKER_TYPE")
-    private String workerType;
-
-    @ApiModelProperty(value = "性别名称")
-    @TableField(exist = false)
-    private String genderName;
-
-    @ApiModelProperty(value = "部门名称")
-    @TableField(exist = false)
-    private String deptName;
-
-    @ApiModelProperty(value = "注册时间",dataType = "String")
-    @TableField(exist = false)
-    private String registerTime;
-
-    @ApiModelProperty(value = "当前状态")
-    @TableField(exist = false)
-    private String status;
-
-    @ApiModelProperty(value = "当前状态名称")
-    @TableField(exist = false)
-    private String statusName;
-
-    @ApiModelProperty(value = "是否注册(0未注册；1已注册)",allowableValues = "0,1")
-    @TableField(exist = false)
-    private String isRegister;
-
-    @Override
-    public String toString() {
-        return "Worker{" +
-            "id=" + id +
-            ", workerName=" + workerName +
-            ", gender=" + gender +
-            ", deptId=" + deptId +
-            ", ownerShip=" + ownerShip +
-            ", phoneNumber=" + phoneNumber +
-            ", idCardNumber=" + idCardNumber +
-            ", enterReason=" + enterReason +
-            ", workerAvatar=" + workerAvatar +
-            ", createTime=" + createTime +
-            ", workerType=" + workerType +
-        "}";
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/AlarmMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/AlarmMapper.java
new file mode 100644
index 0000000..ea4c8be
--- /dev/null
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/AlarmMapper.java
@@ -0,0 +1,16 @@
+package com.casic.missiles.modular.system.mapper;
+
+import com.casic.missiles.modular.system.entity.Alarm;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 报警记录表 Mapper 接口
+ * </p>
+ *
+ * @author zyj
+ * @since 2023-05-25
+ */
+public interface AlarmMapper extends BaseMapper<Alarm> {
+
+}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/BusAlarmMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/BusAlarmMapper.java
deleted file mode 100644
index 9801742..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/BusAlarmMapper.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package com.casic.missiles.modular.system.mapper;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.modular.system.dto.AlarmTypeCountDTO;
-import com.casic.missiles.modular.system.entity.BusAlarm;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * <p>
- * 报警记录表 Mapper 接口
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface BusAlarmMapper extends BaseMapper<BusAlarm> {
-
-    Page<BusAlarm> listPage(Page<BusAlarm> page,@Param("ew")  QueryWrapper<BusAlarm> queryWrapper);
-
-    void cancelAlarm(@Param("deviceId")Long deviceId,@Param("alarmType") String alarmType);
-
-    List<AlarmTypeCountDTO> alarmCount(@Param("projectId")Long projectId, @Param("alarmStatus")String alarmStatus);
-}

diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/AlarmController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/AlarmController.java
new file mode 100644
index 0000000..1795cf1
--- /dev/null
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/AlarmController.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.modular.system.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.stereotype.Controller;
+
+/**
+ * <p>
+ * 报警记录表 前端控制器
+ * </p>
+ *
+ * @author zyj
+ * @since 2023-05-25
+ */
+@Controller
+@RequestMapping("/system/alarm")
+public class AlarmController {
+
+}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusAlarmController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusAlarmController.java
deleted file mode 100644
index 1f82ebb..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusAlarmController.java
+++ /dev/null
@@ -1,102 +0,0 @@
-package com.casic.missiles.modular.system.controller;
-
-
-import cn.hutool.core.util.ObjectUtil;
-import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.core.base.controller.BaseController;
-import com.casic.missiles.core.page.PageFactory;
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.AlarmUpload;
-import com.casic.missiles.modular.system.dto.DeviceDetailDTO;
-import com.casic.missiles.modular.system.entity.BusAlarm;
-import com.casic.missiles.modular.system.service.IBusAlarmService;
-import io.swagger.annotations.*;
-import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.*;
-
-import org.springframework.stereotype.Controller;
-
-import static com.casic.missiles.model.response.ResponseData.DEFAULT_SUCCESS_MESSAGE;
-import static com.casic.missiles.modular.system.consts.AlarmConst.ALARM_STATUS_MANUAL_CANCEL;
-
-/**
- * <p>
- * 报警记录表 前端控制器
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@Api(tags = "报警管理接口")
-@Controller
-@RequestMapping("/alarm")
-@RequiredArgsConstructor
-public class BusAlarmController extends BaseController {
-
-    private final IBusAlarmService alarmService;
-
-    @ApiOperation("报警上报接口")
-    @PostMapping("/upload")
-    @ResponseBody
-    public Object upload(@RequestBody AlarmUpload alarmUpload){
-        alarmService.alarmUpload(alarmUpload);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("报警列表分页查询")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "workTitle", value = "作业名称",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "projectId", value = "作业ID",dataType = "Long", paramType = "query",example = "0"),
-            @ApiImplicitParam(name = "alarmStatus", value = "报警状态",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "projectState", value = "作业状态",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "alarmType", value = "报警类型",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "alarmStartTime", value = "报警开始时间",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "alarmEndTime", value = "报警结束时间",dataType = "String", paramType = "query")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = BusAlarm.class),
-    })
-    @GetMapping("/listPage")
-    @ResponseBody
-    public Object listPage(String workTitle,Long projectId,String alarmStatus,String projectState,String alarmType,String alarmStartTime,String alarmEndTime){
-        Page<BusAlarm> page = PageFactory.defaultPage();
-        QueryWrapper<BusAlarm> queryWrapper = new QueryWrapper<>();
-        if(StrUtil.isNotEmpty(workTitle)){
-            queryWrapper.like("p.WORK_TITLE",workTitle);
-        }
-        if(ObjectUtil.isNotEmpty(projectId)){
-            queryWrapper.eq("alarm.PROJECT_ID",projectId);
-        }
-        if(StrUtil.isNotEmpty(alarmStatus)){
-            queryWrapper.eq("alarm.ALARM_STATUS",alarmStatus);
-        }
-        if(StrUtil.isNotEmpty(projectState)){
-            queryWrapper.eq("p.PROJECT_STATE",projectState);
-        }
-        if(StrUtil.isNotEmpty(alarmType)){
-            queryWrapper.eq("alarm.ALARM_TYPE",alarmType);
-        }
-        if(StrUtil.isNotEmpty(alarmStartTime)){
-            queryWrapper.ge("alarm.ALARM_TIME",alarmStartTime);
-        }
-        if(StrUtil.isNotEmpty(alarmEndTime)){
-            queryWrapper.le("alarm.ALARM_TIME",alarmEndTime);
-        }
-        page = alarmService.listPage(page,queryWrapper);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-    @ApiOperation("消警")
-    @PostMapping("/cancel")
-    @ResponseBody
-    public Object cancel(@RequestParam("alarmId") Long alarmId){
-        UpdateWrapper<BusAlarm> updateWrapper = new UpdateWrapper<>();
-        updateWrapper.eq("ID",alarmId);
-        updateWrapper.set("ALARM_STATUS",ALARM_STATUS_MANUAL_CANCEL);
-        alarmService.update(updateWrapper);
-        return ResponseData.success();
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusEventController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusEventController.java
deleted file mode 100644
index dde5aad..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusEventController.java
+++ /dev/null
@@ -1,41 +0,0 @@
-package com.casic.missiles.modular.system.controller;
-
-
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.entity.BusEvent;
-import com.casic.missiles.modular.system.service.IBusEventService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.ResponseBody;
-
-/**
- * <p>
- * 事件表 前端控制器
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@Controller
-@RequestMapping("/event")
-@Api(tags = "事件上报")
-@RequiredArgsConstructor
-public class BusEventController {
-
-    private final IBusEventService eventService;
-
-    @ApiOperation("事件上报")
-    @PostMapping("add")
-    @ResponseBody
-    public Object add(@RequestBody BusEvent busEvent){
-        eventService.saveBusEvent(busEvent);
-        return ResponseData.success();
-    }
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
index 03abc5f..aa50d78 100644
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
@@ -1,121 +1,20 @@
 package com.casic.missiles.modular.system.controller;
 
 
-import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.core.base.controller.BaseController;
-import com.casic.missiles.core.page.PageFactory;
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.DeviceDetailDTO;
-import com.casic.missiles.modular.system.entity.Device;
-import com.casic.missiles.modular.system.service.IDeviceExtService;
-import com.casic.missiles.modular.system.service.IDeviceService;
-import io.swagger.annotations.*;
-import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.RequestMapping;
 
 import org.springframework.stereotype.Controller;
 
-import java.time.LocalDateTime;
-import java.util.Date;
-import java.util.List;
-
-import static com.casic.missiles.model.response.ResponseData.DEFAULT_SUCCESS_MESSAGE;
-
 /**
  * <p>
- *  前端控制器
+ * 设备记录表 前端控制器
  * </p>
  *
  * @author zyj
- * @since 2023-04-14
+ * @since 2023-05-25
  */
-@Api(tags = "设备管理接口")
-@RequiredArgsConstructor
 @Controller
-@RequestMapping("/device")
-public class DeviceController extends BaseController {
-    private final IDeviceService deviceService;
-    private final IDeviceExtService deviceExtService;
-
-    @ApiOperation("设备分页列表")
-    @ApiImplicitParams({
-        @ApiImplicitParam(name = "deviceType", value = "设备类型",dataType = "String", paramType = "query"),
-        @ApiImplicitParam(name = "deviceCode", value = "设备编号",dataType = "String", paramType = "query"),
-        @ApiImplicitParam(name = "status", value = "设备状态",dataType = "String", paramType = "query"),
-        @ApiImplicitParam(name = "projectId", value = "作业ID（如果传此参数，列表中返回该作业使用的设备）",dataType = "Long", paramType = "query", example = "0")
-    })
-    @ApiResponses({
-        @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = DeviceDetailDTO.class),
-    })
-    @GetMapping("listPage")
-    @ResponseBody
-    public Object listPage(String deviceType, String deviceCode, String status,Long projectId){
-        Page<DeviceDetailDTO> page = PageFactory.defaultPage();
-        QueryWrapper<DeviceDetailDTO> queryWrapper = new QueryWrapper<>();
-        if(StrUtil.isNotEmpty(deviceType)){
-            queryWrapper.eq("DEVICE_TYPE",deviceType);
-        }
-        if(StrUtil.isNotEmpty(deviceCode)){
-            queryWrapper.like("DEVICE_CODE",deviceCode);
-        }
-        page = deviceService.listPage(page,queryWrapper,status,projectId);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-    @ApiOperation("新增设备")
-    @PostMapping("add")
-    @ResponseBody
-    public Object add(@RequestBody DeviceDetailDTO deviceDetailDTO){
-        deviceService.saveDevice(deviceDetailDTO);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("编辑设备")
-    @PostMapping("update")
-    @ResponseBody
-    public Object update(@RequestBody DeviceDetailDTO deviceDetailDTO){
-        deviceService.updateDevice(deviceDetailDTO);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("删除设备")
-    @PostMapping("delete")
-    @ResponseBody
-    public Object delete(@ApiParam("设备id列表")@RequestBody List<Long> deviceIds){
-        deviceService.deleteDevices(deviceIds);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("设置甲烷阈值")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "gasIp", value = "安全树甲烷设备IP",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "gasPort", value = "安全树甲烷端口",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "threshold", value = "甲烷阈值",dataType = "String", paramType = "query")
-    })
-    @PostMapping("setThreshold")
-    @ResponseBody
-    public Object setThreshold(String gasIp,String gasPort,String threshold){
-        deviceExtService.setGasThreshold(gasIp, gasPort, threshold);
-        return ResponseData.success();
-    }
-
-
-    @ApiOperation("查询甲烷阈值")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "gasIp", value = "安全树甲烷设备IP",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "gasPort", value = "安全树甲烷端口",dataType = "String", paramType = "query")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = "{\"code\": 200,\"data\": \"100\",\"message\": \"请求成功\",\"success\": true}",response = String.class),
-    })
-    @GetMapping("getThreshold")
-    @ResponseBody
-    public Object getThreshold(String gasIp,String gasPort){
-        String data = deviceExtService.getGasThreshold(gasIp, gasPort);
-        return ResponseData.success(data);
-    }
-
+@RequestMapping("/system/device")
+public class DeviceController {
 
 }
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/OverviewController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/OverviewController.java
deleted file mode 100644
index 7570504..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/OverviewController.java
+++ /dev/null
@@ -1,70 +0,0 @@
-package com.casic.missiles.modular.system.controller;
-
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.AlarmTypeCountDTO;
-import com.casic.missiles.modular.system.dto.DeviceLocationDTO;
-import com.casic.missiles.modular.system.dto.WorkerLocationDTO;
-import com.casic.missiles.modular.system.service.IBusAlarmService;
-import com.casic.missiles.modular.system.service.IProjectDeviceService;
-import com.casic.missiles.modular.system.service.IProjectWorkerService;
-import io.swagger.annotations.*;
-import lombok.RequiredArgsConstructor;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.ResponseBody;
-
-import static com.casic.missiles.model.response.ResponseData.DEFAULT_SUCCESS_MESSAGE;
-import static com.casic.missiles.modular.system.consts.AlarmConst.ALARM_STATUS_ON;
-
-@Api(tags = "首页看板接口")
-@Controller
-@RequestMapping("overview")
-@RequiredArgsConstructor
-public class OverviewController {
-
-    private final IBusAlarmService alarmService;
-    private final IProjectDeviceService projectDeviceService;
-
-    private final IProjectWorkerService projectWorkerService;
-
-
-    @ApiOperation("报警统计接口")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "projectId", value = "作业ID",dataType = "Long", paramType = "query", example = "0")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = AlarmTypeCountDTO.class),
-    })
-    @GetMapping("/alarmCount")
-    @ResponseBody
-    public Object alarmCount(Long projectId){
-        return ResponseData.success(alarmService.alarmCount(projectId,ALARM_STATUS_ON));
-    }
-
-    @ApiOperation("设备列表接口")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "projectId", value = "作业ID",dataType = "Long", paramType = "query", example = "0")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = DeviceLocationDTO.class),
-    })
-    @GetMapping("/deviceList")
-    @ResponseBody
-    public Object deviceList(Long projectId){
-        return ResponseData.success(projectDeviceService.selectDeviceLocationList(projectId));
-    }
-
-    @ApiOperation("人员列表接口")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "projectId", value = "作业ID",dataType = "Long", paramType = "query", example = "0")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = WorkerLocationDTO.class),
-    })
-    @GetMapping("/workerList")
-    @ResponseBody
-    public Object workerList(Long projectId){
-        return ResponseData.success(projectWorkerService.selectWorkerLocationDTO(projectId));
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/WorkSiteInfoController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/WorkSiteInfoController.java
deleted file mode 100644
index af36d69..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/WorkSiteInfoController.java
+++ /dev/null
@@ -1,130 +0,0 @@
-package com.casic.missiles.modular.system.controller;
-
-
-import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.core.base.controller.BaseController;
-import com.casic.missiles.core.page.PageFactory;
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.WorkSiteDetailDTO;
-import com.casic.missiles.modular.system.entity.WorkSiteInfo;
-import com.casic.missiles.modular.system.service.IWorkSiteInfoService;
-import io.swagger.annotations.*;
-import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.*;
-
-import org.springframework.stereotype.Controller;
-
-import java.util.List;
-
-import static com.casic.missiles.model.response.ResponseData.DEFAULT_SUCCESS_MESSAGE;
-
-/**
- * <p>
- * 作业现场表 前端控制器
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@Controller
-@RequestMapping("/site")
-@Api(tags = "作业现场管理")
-@RequiredArgsConstructor
-public class WorkSiteInfoController extends BaseController {
-
-
-    private final IWorkSiteInfoService workSiteInfoService;
-
-    @ApiOperation("新增作业现场")
-    @PostMapping("add")
-    @ResponseBody
-    public Object addWorkSite(@RequestBody WorkSiteDetailDTO workSiteDetailDTO){
-        workSiteInfoService.addWorkSiteInfo(workSiteDetailDTO);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("编辑作业现场")
-    @PostMapping("update")
-    @ResponseBody
-    public Object updateWorkSite(@RequestBody WorkSiteDetailDTO workSiteDetailDTO){
-        workSiteInfoService.updateWorkSiteInfo(workSiteDetailDTO);
-        return ResponseData.success();
-    }
-
-
-    @ApiOperation("删除作业现场")
-    @PostMapping("delete")
-    @ResponseBody
-    public Object delete(@ApiParam("作业现场id列表")@RequestBody List<Long> projectIds){
-        workSiteInfoService.deleteProjects(projectIds);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("查询作业现场详情")
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = WorkSiteDetailDTO.class),
-    })
-    @GetMapping("detail")
-    @ResponseBody
-    public Object delete(@ApiParam(value = "作业现场id", example = "0")@RequestParam Long projectId){
-        WorkSiteDetailDTO detailDTO = workSiteInfoService.getWorkSiteDetail(projectId);
-        return ResponseData.success(detailDTO);
-    }
-
-    @ApiOperation("分页列表查询")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "workTitle",value = "作业名称", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "workRoad",value = "所属道路", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "workPersonName",value = "责任人姓名", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "startDate",value = "注册开始日期", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "endDate",value = "注册结束日期", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "projectState",value = "当前状态（字典值）", dataType = "String", paramType = "query")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = WorkSiteInfo.class),
-    })
-    @GetMapping("listPage")
-    @ResponseBody
-    public Object listPage(String workTitle,String workRoad,String workPersonName,String projectState,String startDate,String endDate){
-        Page<WorkSiteInfo> page = PageFactory.defaultPage();
-        QueryWrapper<WorkSiteInfo> queryWrapper = new QueryWrapper<>();
-        if(StrUtil.isNotEmpty(workTitle)){
-            queryWrapper.like("WORK_TITLE",workTitle);
-        }
-        if(StrUtil.isNotEmpty(workRoad)){
-            queryWrapper.like("WORK_ROAD",workRoad);
-        }
-        if(StrUtil.isNotEmpty(workPersonName)){
-            queryWrapper.like("WORKER_NAME",workPersonName);
-        }
-        if(StrUtil.isNotEmpty(projectState)){
-            queryWrapper.eq("PROJECT_STATE",projectState);
-        }
-        if(StrUtil.isNotEmpty(startDate)){
-            queryWrapper.ge("br_work_site_info.CREATE_TIME",startDate + " 00:00:00");
-        }
-        if(StrUtil.isNotEmpty(endDate)){
-            queryWrapper.le("br_work_site_info.CREATE_TIME",endDate + " 23:59:59");
-        }
-        page = workSiteInfoService.selectListPage(page,queryWrapper);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-    @ApiOperation("开始作业")
-    @PostMapping("start")
-    @ResponseBody
-    public Object start(@ApiParam(value = "作业现场id",example = "0")@RequestParam Long projectId){
-        workSiteInfoService.start(projectId);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("完成作业")
-    @PostMapping("finish")
-    @ResponseBody
-    public Object finish(@ApiParam(value = "作业现场id", example = "0")@RequestParam Long projectId){
-        workSiteInfoService.finish(projectId);
-        return ResponseData.success();
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/WorkerController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/WorkerController.java
deleted file mode 100644
index 796f94c..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/WorkerController.java
+++ /dev/null
@@ -1,136 +0,0 @@
-package com.casic.missiles.modular.system.controller;
-
-
-import cn.hutool.core.util.ObjectUtil;
-import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.core.base.controller.BaseController;
-import com.casic.missiles.core.page.PageFactory;
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.DeviceDetailDTO;
-import com.casic.missiles.modular.system.entity.Device;
-import com.casic.missiles.modular.system.entity.Worker;
-import com.casic.missiles.modular.system.service.IWorkerService;
-import io.swagger.annotations.*;
-import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.*;
-
-import org.springframework.stereotype.Controller;
-
-import java.util.Date;
-import java.util.List;
-
-import static com.casic.missiles.model.response.ResponseData.DEFAULT_SUCCESS_MESSAGE;
-
-/**
- * <p>
- *  前端控制器
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@Controller
-@RequestMapping("/worker")
-@RequiredArgsConstructor
-@Api(tags = "人员管理接口")
-public class WorkerController extends BaseController {
-
-    private final IWorkerService workerService;
-
-    @ApiOperation("分页列表查询")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "name",value = "姓名", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "deptId",value = "所属部门", dataType = "Long", paramType = "query", example = "0"),
-            @ApiImplicitParam(name = "status",value = "当前状态（字典值）", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "startDate",value = "注册开始日期", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "endDate",value = "注册结束日期", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "workerType",value = "人员类型（字典值）", dataType = "String", paramType = "query")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = Worker.class),
-    })
-    @GetMapping("listPage")
-    @ResponseBody
-    public Object listPage(String name,Long deptId, String status,String startDate,String endDate,String workerType){
-        Page<Worker> page = PageFactory.defaultPage();
-        QueryWrapper<Worker> queryWrapper = new QueryWrapper<>();
-        if(StrUtil.isNotEmpty(name)){
-            queryWrapper.like("WORKER_NAME",name);
-        }
-        if(ObjectUtil.isNotEmpty(deptId)){
-            queryWrapper.eq("DEPT_ID",deptId);
-        }
-        if(StrUtil.isNotEmpty(workerType)){
-            queryWrapper.eq("WORKER_TYPE",workerType);
-        }
-        if(StrUtil.isNotEmpty(startDate)){
-            queryWrapper.ge("CREATE_TIME",startDate + " 00:00:00");
-        }
-        if(StrUtil.isNotEmpty(endDate)){
-            queryWrapper.le("CREATE_TIME",endDate + " 23:59:59");
-        }
-        if(StrUtil.isNotEmpty(status)){
-            queryWrapper.eq("`STATUS`",status);
-        }
-        page = workerService.selectListPage(page,queryWrapper);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-    @ApiOperation("新增人员")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "worker", value = "人员信息", dataType = "Worker", paramType = "body", required = true),
-            @ApiImplicitParam(name = "projectId", value = "项目ID(入场申请需要)", dataType = "Long", paramType = "query", example = "0")
-    })
-    @PostMapping("add")
-    @ResponseBody
-    public Object add(@ApiParam("worker")@RequestBody Worker worker,
-                      @RequestParam(required = false) Long projectId){
-        workerService.addWorker(worker,projectId);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("编辑人员")
-    @PostMapping("update")
-    @ResponseBody
-    public Object update(@RequestBody Worker worker){
-        workerService.updateById(worker);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("删除人员")
-    @PostMapping("delete")
-    @ResponseBody
-    public Object delete(@ApiParam("人员id列表")@RequestBody List<Long> workIds){
-        workerService.removeByIds(workIds);
-        return ResponseData.success();
-    }
-
-
-    @ApiOperation(value = "获取人脸图片",notes = "返回人脸图片url")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "cameraIp",value = "摄像头IP", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "cameraPort",value = "摄像头端口号", dataType = "String", paramType = "query"),
-    })
-    @GetMapping("/face/register")
-    @ResponseBody
-    public Object faceRegister(String cameraIp,String cameraPort){
-        return ResponseData.success(workerService.faceRegister(cameraIp, cameraPort));
-    }
-
-
-    @ApiOperation(value = "查询临时入场人员列表")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "projectId", value = "项目ID",required = true,dataType = "Long", paramType = "query", example = "0")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = Worker.class),
-    })
-    @GetMapping("/projectTempWorker")
-    @ResponseBody
-    public Object projectTempWorker(Long projectId){
-        return ResponseData.success(workerService.projectTempWorker(projectId));
-    }
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/AlarmTypeCountDTO.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/AlarmTypeCountDTO.java
deleted file mode 100644
index 1a165a1..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/AlarmTypeCountDTO.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.casic.missiles.modular.system.dto;
-
-import io.swagger.annotations.ApiModel;
-import lombok.Data;
-
-@ApiModel(value = "AlarmTypeCountDTO",description = "报警类型统计（首页）")
-@Data
-public class AlarmTypeCountDTO {
-
-    private String alarmType;
-    private String alarmTypeName;
-    private Integer alarmCount;
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/AlarmUpload.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/AlarmUpload.java
deleted file mode 100644
index 73d7799..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/AlarmUpload.java
+++ /dev/null
@@ -1,46 +0,0 @@
-package com.casic.missiles.modular.system.dto;
-
-import cn.hutool.core.util.StrUtil;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-@ApiModel(value = "AlarmUpload",description = "报警上传")
-@Data
-public class AlarmUpload {
-
-    @ApiModelProperty(value = "摄像头ip")
-    private String cameraIp;
-
-    @ApiModelProperty(value = "摄像头端口")
-    private String cameraPort;
-    @ApiModelProperty(value = "安全树甲烷设备ip")
-    private String gasIp;
-    @ApiModelProperty(value = "安全树甲烷设备端口")
-    private String gasPort;
-    @ApiModelProperty(value = "报警值")
-    private String alarmValue;
-    @ApiModelProperty(value = "报警时间")
-    private String alarmTime;
-    @ApiModelProperty(value = "报警类型")
-    private String alarmType;
-    @ApiModelProperty(value = "报警图片")
-    private String alarmImage;
-    @ApiModelProperty(value = "报警内容")
-    private String alarmContent;
-
-    @Override
-    public String toString() {
-        return "AlarmUpload{" +
-                "cameraIp='" + cameraIp + '\'' +
-                ", cameraPort='" + cameraPort + '\'' +
-                ", gasIp='" + gasIp + '\'' +
-                ", gasPort='" + gasPort + '\'' +
-                ", alarmValue='" + alarmValue + '\'' +
-                ", alarmTime='" + alarmTime + '\'' +
-                ", alarmType='" + alarmType + '\'' +
-                ", alarmImage='" + (StrUtil.isNotEmpty(alarmImage) ? alarmImage.substring(0,50) : "null") + '\'' +
-                ", alarmContent='" + alarmContent + '\'' +
-                '}';
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/DeviceDetailDTO.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/DeviceDetailDTO.java
deleted file mode 100644
index ea518d9..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/DeviceDetailDTO.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package com.casic.missiles.modular.system.dto;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.casic.missiles.modular.system.entity.Device;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-@ApiModel("DeviceDetailDTO")
-@Data
-public class DeviceDetailDTO extends Device {
-
-    @ApiModelProperty(value = "摄像头编号")
-    private String cameraCode;
-
-    @ApiModelProperty(value = "摄像头IP")
-    private String cameraIp;
-
-    @ApiModelProperty(value = "摄像头端口")
-    private String cameraPort;
-
-    @ApiModelProperty(value = "激甲编号")
-    private String gasCode;
-
-    @ApiModelProperty(value = "激甲IP")
-    private String gasIp;
-
-    @ApiModelProperty(value = "激甲端口")
-    private String gasPort;
-
-    @ApiModelProperty(value = "智能帽衬编号")
-    private String hatLiningCode;
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/WorkSiteDetailDTO.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/WorkSiteDetailDTO.java
deleted file mode 100644
index 29378ff..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/WorkSiteDetailDTO.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package com.casic.missiles.modular.system.dto;
-
-import com.casic.missiles.modular.system.entity.ProjectDevice;
-import com.casic.missiles.modular.system.entity.ProjectWorker;
-import com.casic.missiles.modular.system.entity.WorkSiteInfo;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.util.List;
-
-@Data
-@ApiModel("WorkSiteDetailDTO")
-public class WorkSiteDetailDTO extends WorkSiteInfo {
-
-    @ApiModelProperty(value = "安全树列表",dataType = "ProjectDevice")
-    private List<ProjectDevice> deviceList;
-
-    @ApiModelProperty(value = "人员列表",dataType = "ProjectWorker")
-    private List<ProjectWorker> workerList;
-
-
-
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/WorkerLocationDTO.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/WorkerLocationDTO.java
deleted file mode 100644
index 6fd7b24..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/WorkerLocationDTO.java
+++ /dev/null
@@ -1,68 +0,0 @@
-package com.casic.missiles.modular.system.dto;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-@ApiModel(value = "WorkerLocationDTO",description = "人员位置列表（首页）")
-@Data
-public class WorkerLocationDTO {
-
-    @ApiModelProperty("人员ID")
-    private Long workerId;
-
-    @ApiModelProperty("人员姓名")
-    private String workerName;
-
-    @ApiModelProperty("安全帽编号")
-    private String hatCode;
-
-    @ApiModelProperty("安全帽ID")
-    private Long hatId;
-
-    @ApiModelProperty("背心编号")
-    private String vastCode;
-
-    @ApiModelProperty("手环编号")
-    private String braceletCode;
-
-    @ApiModelProperty("位置")
-    private String location;
-
-    @ApiModelProperty("时间")
-    private String time;
-
-    @ApiModelProperty("经度")
-    private String lng;
-
-    @ApiModelProperty("纬度")
-    private String lat;
-
-    @ApiModelProperty("心率")
-    private String heartRate;
-
-    @ApiModelProperty("血氧")
-    private String bloodOxygen;
-
-    @ApiModelProperty("一氧化碳")
-    private String co;
-
-    @ApiModelProperty("甲烷")
-    private String gas;
-
-    @ApiModelProperty("硫化氢")
-    private String h2s;
-
-    @ApiModelProperty("氧气")
-    private String o2;
-
-    @ApiModelProperty("信号")
-    private String signal;
-
-    @ApiModelProperty("电量")
-    private String cell;
-
-    @ApiModelProperty("是否报警")
-    private boolean alarmFlag;
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Alarm.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Alarm.java
new file mode 100644
index 0000000..4d2b7ef
--- /dev/null
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Alarm.java
@@ -0,0 +1,103 @@
+package com.casic.missiles.modular.system.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import java.util.Date;
+
+/**
+ * <p>
+ * 报警记录表
+ * </p>
+ *
+ * @author zyj
+ * @since 2023-05-25
+ */
+@Data
+@TableName("bus_alarm")
+public class Alarm implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    @TableId(value = "ID",type = IdType.ASSIGN_ID)
+    private Long id;
+
+    /**
+     * 设备ID
+     */
+    @TableField("DEVICE_ID")
+    private Long deviceId;
+
+    /**
+     * 报警类型
+     */
+    @TableField("ALARM_TYPE")
+    private String alarmType;
+
+    /**
+     * 报警时间
+     */
+    @TableField("ALARM_TIME")
+    private Date alarmTime;
+
+    /**
+     * 报警状态
+     */
+    @TableField("ALARM_STATUS")
+    private String alarmStatus;
+
+    /**
+     * 报警位置
+     */
+    @TableField("ALARM_LOCATION")
+    private String alarmLocation;
+
+    /**
+     * 报警图片
+     */
+    @TableField("ALARM_IMAGE")
+    private String alarmImage;
+
+    /**
+     * 视频通道号
+     */
+    @TableField("CHANNEL_NO")
+    private Integer channelNo;
+
+    /**
+     * 报警内容
+     */
+    @TableField("ALARM_CONTENT")
+    private String alarmContent;
+
+    /**
+     * 消警时间
+     */
+    @TableField("CANCEL_TIME")
+    private Date cancelTime;
+
+
+    @Override
+    public String toString() {
+        return "Alarm{" +
+            "id=" + id +
+            ", deviceId=" + deviceId +
+            ", alarmType=" + alarmType +
+            ", alarmTime=" + alarmTime +
+            ", alarmStatus=" + alarmStatus +
+            ", alarmLocation=" + alarmLocation +
+            ", alarmImage=" + alarmImage +
+            ", channelNo=" + channelNo +
+            ", alarmContent=" + alarmContent +
+            ", cancelTime=" + cancelTime +
+        "}";
+    }
+}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusAlarm.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusAlarm.java
deleted file mode 100644
index efb4a23..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusAlarm.java
+++ /dev/null
@@ -1,159 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.alibaba.fastjson.annotation.JSONField;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.time.LocalDateTime;
-import java.util.Date;
-
-/**
- * <p>
- * 报警记录表
- * </p>
- *
- * @author zyj
- * @since 2023-05-16
- */
-@Data
-@ApiModel("Alarm")
-@TableName("br_bus_alarm")
-public class BusAlarm implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 项目ID
-     */
-    @ApiModelProperty(value = "项目ID")
-    @TableField("PROJECT_ID")
-    private Long projectId;
-
-    /**
-     * 设备ID
-     */
-    @ApiModelProperty(value = "设备ID")
-    @TableField("DEVICE_ID")
-    private Long deviceId;
-
-    /**
-     * 报警类型
-     */
-    @ApiModelProperty(value = "报警类型")
-    @TableField("ALARM_TYPE")
-    private String alarmType;
-
-    /**
-     * 报警状态
-     */
-    @ApiModelProperty(value = "报警状态")
-    @TableField("ALARM_STATUS")
-    private String alarmStatus;
-
-    /**
-     * 报警值
-     */
-    @ApiModelProperty(value = "报警值")
-    @TableField("ALARM_VALUE")
-    private String alarmValue;
-
-    /**
-     * 报警图片
-     */
-    @ApiModelProperty(value = "报警图片")
-    @TableField("ALARM_IMAGE")
-    private String alarmImage;
-
-    /**
-     * 报警内容
-     */
-    @ApiModelProperty(value = "报警内容")
-    @TableField("ALARM_CONTENT")
-    private String alarmContent;
-
-    /**
-     * 报警时间
-     */
-    @ApiModelProperty(value = "报警时间")
-    @TableField("ALARM_TIME")
-    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
-    private Date alarmTime;
-
-    /**
-     * 消警时间
-     */
-    @ApiModelProperty(value = "消警时间")
-    @TableField("CANCEL_TIME")
-    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
-    private Date cancelTime;
-
-    /**
-     * 报警位置经度
-     */
-    @ApiModelProperty(value = "报警位置经度")
-    @TableField("ALARM_LNG")
-    private String alarmLng;
-
-    /**
-     * 报警位置纬度
-     */
-    @ApiModelProperty(value = "报警位置纬度")
-    @TableField("ALARM_LAT")
-    private String alarmLat;
-
-    @ApiModelProperty("报警类型名称")
-    @TableField(exist = false)
-    private String alarmStatusName;
-    @ApiModelProperty("报警类型名称")
-    @TableField(exist = false)
-    private String alarmTypeName;
-    @ApiModelProperty("作业名称")
-    @TableField(exist = false)
-    private String workTitle;
-    @ApiModelProperty("所属道路")
-    @TableField(exist = false)
-    private String workRoad;
-    @ApiModelProperty("作业状态")
-    @TableField(exist = false)
-    private String projectState;
-    @ApiModelProperty("作业状态名称")
-    @TableField(exist = false)
-    private String projectStateName;
-    @ApiModelProperty("负责人姓名")
-    @TableField(exist = false)
-    private String workPersonName;
-    @ApiModelProperty("负责人联系方式")
-    @TableField(exist = false)
-    private String workPersonPhoneNumber;
-
-
-    @Override
-    public String toString() {
-        return "BusAlarm{" +
-                "id=" + id +
-                ", projectId=" + projectId +
-                ", deviceId=" + deviceId +
-                ", alarmType=" + alarmType +
-                ", alarmValue=" + alarmValue +
-                ", alarmStatus=" + alarmStatus +
-                ", alarmImage=" + alarmImage +
-                ", alarmContent=" + alarmContent +
-                ", alarmTime=" + alarmTime +
-                ", cancelTime=" + cancelTime +
-                ", alarmLng=" + alarmLng +
-                ", alarmLat=" + alarmLat +
-                "}";
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusEvent.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusEvent.java
deleted file mode 100644
index a0b7543..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusEvent.java
+++ /dev/null
@@ -1,100 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.time.LocalDateTime;
-import java.util.Date;
-import java.util.List;
-
-/**
- * <p>
- * 事件表
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@TableName("br_bus_event")
-@Data
-@ApiModel("BusEvent")
-public class BusEvent implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @ApiModelProperty("事件ID")
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 事件标题
-     */
-    @ApiModelProperty("事件名称")
-    @TableField("EVENT_TITLE")
-    private String eventTitle;
-
-    /**
-     * 上报人员
-     */
-    @ApiModelProperty("上报人员")
-    @TableField("UPLOAD_NAME")
-    private String uploadName;
-
-    /**
-     * 联系方式
-     */
-    @ApiModelProperty("联系方式")
-    @TableField("PHONE_NUMBER")
-    private String phoneNumber;
-
-    /**
-     * 事件描述
-     */
-    @ApiModelProperty("事件描述")
-    @TableField("EVENT_DESCRIPTION")
-    private String eventDescription;
-
-    @ApiModelProperty("经度")
-    @TableField("LNG")
-    private String lng;
-
-    @ApiModelProperty("纬度")
-    @TableField("LAT")
-    private String lat;
-
-    /**
-     * 事件上传时间
-     */
-    @ApiModelProperty("事件上传时间")
-    @TableField("CREATE_TIME")
-    private Date createTime;
-
-    @ApiModelProperty("事件照片")
-    @TableField(exist = false)
-    private List<BusEventImage> imageList;
-
-
-
-    @Override
-    public String toString() {
-        return "BusEvent{" +
-            "id=" + id +
-            ", eventTitle=" + eventTitle +
-            ", uploadName=" + uploadName +
-            ", phoneNumber=" + phoneNumber +
-            ", eventDescription=" + eventDescription +
-            ", lng=" + lng +
-            ", lat=" + lat +
-            ", createTime=" + createTime +
-        "}";
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusEventImage.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusEventImage.java
deleted file mode 100644
index 1e75245..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusEventImage.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-
-/**
- * <p>
- * 事件图片表
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@TableName("br_bus_event_image")
-@Data
-@ApiModel("BusEventImage")
-public class BusEventImage implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 事件ID
-     */
-    @TableField("EVENT_ID")
-    private Long eventId;
-
-    /**
-     * 报警图片
-     */
-    @TableField("IMAGE")
-    @ApiModelProperty("图片url")
-    private String image;
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Device.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Device.java
index df89c70..ea7db5f 100644
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Device.java
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Device.java
@@ -1,30 +1,23 @@
 package com.casic.missiles.modular.system.entity;
 
-import com.alibaba.fastjson.annotation.JSONField;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.casic.missiles.core.base.json.DateDeserializer;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
-import java.util.Date;
 
 /**
  * <p>
- * 
+ * 设备记录表
  * </p>
  *
  * @author zyj
- * @since 2023-04-14
+ * @since 2023-05-25
  */
-@ApiModel("Device")
-@TableName("br_device")
 @Data
+@TableName("bus_device")
 public class Device implements Serializable {
 
     private static final long serialVersionUID = 1L;
@@ -32,82 +25,86 @@
     /**
      * 主键
      */
-    @ApiModelProperty(value = "设备ID")
     @TableId(value = "ID",type = IdType.ASSIGN_ID)
     private Long id;
 
     /**
-     * 设备编号
+     * 设备名称
      */
-    @ApiModelProperty(value = "设备编号")
-    @TableField("DEVICE_CODE")
-    private String deviceCode;
+    @TableField("DEVICE_NAME")
+    private String deviceName;
 
     /**
-     * 设备类型
+     * IP
      */
-    @ApiModelProperty(value = "设备类型")
-    @TableField("DEVICE_TYPE")
-    private String deviceType;
+    @TableField("IP")
+    private String ip;
 
     /**
-     * 设备批次
+     * 端口
      */
-    @ApiModelProperty(value = "设备批次")
-    @TableField("DEVICE_BATCH")
-    private String deviceBatch;
+    @TableField("PORT")
+    private String port;
 
     /**
-     * 厂家
+     * 用户名
      */
-    @ApiModelProperty(value = "厂家")
-    @TableField("MANUFACTURER")
-    private String manufacturer;
+    @TableField("USER_NAME")
+    private String userName;
 
     /**
-     * 是否供电
+     * 密码
      */
-    @ApiModelProperty(value = "是否供电")
-    @TableField("IS_POWER_SUPPLY")
-    private String isPowerSupply;
+    @TableField("PASSWORD")
+    private String password;
 
     /**
-     * 创建时间
+     * 连接类型
      */
-    @ApiModelProperty(value = "创建时间",dataType = "Date")
-    @TableField("CREATE_TIME")
-    private Date createTime;
+    @TableField("CONNECT_TYPE")
+    private String connectType;
 
-    @ApiModelProperty(value = "设备类型名称")
-    @TableField(exist = false)
-    private String deviceTypeName;
+    /**
+     * 位置
+     */
+    @TableField("LOCATION")
 
-    @ApiModelProperty(value = "是否供电名称")
-    @TableField(exist = false)
-    private String isPowerSupplyName;
+    private String location;
 
-    @ApiModelProperty(value = "注册时间",dataType = "String")
-    @TableField(exist = false)
-    private String registerTime;
+    /**
+     * 设备状态
+     */
+    @TableField("STATUS")
 
-    @ApiModelProperty(value = "当前状态")
-    @TableField(exist = false)
     private String status;
 
-    @ApiModelProperty(value = "当前状态名称")
-    @TableField(exist = false)
-    private String statusName;
+    /**
+     * 报警分组
+     */
+    @TableField("ALARM_GROUP")
+
+    private Long alarmGroup;
+
+    /**
+     * 视频通道数(预留)
+     */
+    @TableField("CHANNEL_NUM")
+    private Integer channelNum;
 
     @Override
     public String toString() {
         return "Device{" +
             "id=" + id +
-            ", deviceCode=" + deviceCode +
-            ", deviceType=" + deviceType +
-            ", deviceBatch=" + deviceBatch +
-            ", manufacturer=" + manufacturer +
-            ", isPowerSupply=" + isPowerSupply +
-            ", createTime=" + createTime +
+            ", deviceName=" + deviceName +
+            ", ip=" + ip +
+            ", port=" + port +
+            ", userName=" + userName +
+            ", password=" + password +
+            ", connectType=" + connectType +
+            ", location=" + location +
+            ", status=" + status +
+            ", alarmGroup=" + alarmGroup +
+            ", channelNum=" + channelNum +
         "}";
     }
 }
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/DeviceExt.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/DeviceExt.java
deleted file mode 100644
index 5ee7015..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/DeviceExt.java
+++ /dev/null
@@ -1,99 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-
-/**
- * <p>
- * 设备扩展信息表（安全树）
- * </p>
- *
- * @author zyj
- * @since 2023-04-27
- */
-@Data
-@TableName("br_device_ext")
-public class DeviceExt implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 设备ID
-     */
-    @TableField("DEVICE_ID")
-    private Long deviceId;
-
-    /**
-     * 摄像头编号
-     */
-    @TableField("CAMERA_CODE")
-    private String cameraCode;
-
-    /**
-     * 摄像头IP
-     */
-    @TableField("CAMERA_IP")
-    private String cameraIp;
-
-    /**
-     * 摄像头端口
-     */
-    @TableField("CAMERA_PORT")
-    private String cameraPort;
-
-    /**
-     * 激甲编号
-     */
-    @TableField("GAS_CODE")
-    private String gasCode;
-
-    /**
-     * 激甲IP
-     */
-    @TableField("GAS_IP")
-    private String gasIp;
-
-    /**
-     * 激甲端口
-     */
-    @TableField("GAS_PORT")
-    private String gasPort;
-
-    /**
-     * 甲烷报警阈值
-     */
-    @TableField("GAS_THRESHOLD")
-    private String gasThreshold;
-
-    @TableField(value = "HAT_LINING_CODE")
-    private String hatLiningCode;
-
-
-    @Override
-    public String toString() {
-        return "DeviceExt{" +
-            "id=" + id +
-            ", deviceId=" + deviceId +
-            ", cameraCode=" + cameraCode +
-            ", cameraIp=" + cameraIp +
-            ", cameraPort=" + cameraPort +
-            ", gasCode=" + gasCode +
-            ", gasIp=" + gasIp +
-            ", gasPort=" + gasPort +
-            ", gasThreshold=" + gasThreshold +
-            ", hatLiningCode=" + hatLiningCode +
-        "}";
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/ProjectDevice.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/ProjectDevice.java
deleted file mode 100644
index c4f3472..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/ProjectDevice.java
+++ /dev/null
@@ -1,62 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-
-/**
- * <p>
- * 
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@Data
-@ApiModel("ProjectDevice")
-@TableName("br_project_device")
-public class ProjectDevice implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 作业现场ID
-     */
-    @TableField("PROJECT_ID")
-    private Long projectId;
-
-    /**
-     * 设备ID
-     */
-    @TableField("DEVICE_ID")
-    @ApiModelProperty("设备ID（新增编辑时传）")
-    private Long deviceId;
-
-    /**
-     * 设备编号
-     */
-    @TableField(exist = false)
-    @ApiModelProperty("设备编号（详情中展示，新增编辑不用传）")
-    private String deviceCode;
-
-    @Override
-    public String toString() {
-        return "ProjectDevice{" +
-            "id=" + id +
-            ", projectId=" + projectId +
-            ", deviceId=" + deviceId +
-        "}";
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/ProjectWorker.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/ProjectWorker.java
deleted file mode 100644
index 10b23c4..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/ProjectWorker.java
+++ /dev/null
@@ -1,104 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import java.io.Serializable;
-
-/**
- * <p>
- * 
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@ApiModel("ProjectWorker")
-@TableName("br_project_worker")
-@Data
-@NoArgsConstructor
-@AllArgsConstructor
-public class ProjectWorker implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 作业现场ID
-     */
-    @TableField("PROJECT_ID")
-    private Long projectId;
-
-    /**
-     * 人员ID
-     */
-    @ApiModelProperty("人员ID")
-    @TableField("WORKER_ID")
-    private Long workerId;
-
-    /**
-     * 安全帽编号
-     */
-    @ApiModelProperty("安全帽编号")
-    @TableField("HAT_CODE")
-    private String hatCode;
-
-    /**
-     * 背心编号
-     */
-    @ApiModelProperty("背心编号")
-    @TableField("VAST_CODE")
-    private String vastCode;
-
-    /**
-     * 手环编号
-     */
-    @ApiModelProperty("手环编号")
-    @TableField("BRACELET_CODE")
-    private String braceletCode;
-
-    @ApiModelProperty("人员姓名（详情中展示，新增编辑不用传）")
-    @TableField(exist = false)
-    private String workerName;
-
-    @ApiModelProperty("人员部门ID（详情中展示，新增编辑不用传）")
-    @TableField(exist = false)
-    private String workerDeptId;
-
-    @ApiModelProperty("人员部门名称（详情中展示，新增编辑不用传）")
-    @TableField(exist = false)
-    private String workerDeptName;
-
-    @ApiModelProperty("人员联系方式（详情中展示，新增编辑不用传）")
-    @TableField(exist = false)
-    private String workerPhoneNumber;
-
-    public ProjectWorker(Long projectId, Long workerId) {
-        this.projectId = projectId;
-        this.workerId = workerId;
-    }
-
-    @Override
-    public String toString() {
-        return "ProjectWorker{" +
-            "id=" + id +
-            ", projectId=" + projectId +
-            ", workerId=" + workerId +
-            ", hatCode=" + hatCode +
-            ", vastCode=" + vastCode +
-            ", braceletCode=" + braceletCode +
-        "}";
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/WorkSiteInfo.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/WorkSiteInfo.java
deleted file mode 100644
index fa6f41d..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/WorkSiteInfo.java
+++ /dev/null
@@ -1,130 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.alibaba.fastjson.annotation.JSONField;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.time.LocalDateTime;
-import java.util.Date;
-
-/**
- * <p>
- * 作业现场表
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@ApiModel("WorkSiteInfo")
-@TableName("br_work_site_info")
-@Data
-public class WorkSiteInfo implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @ApiModelProperty("作业现场ID")
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 作业名称
-     */
-    @ApiModelProperty("作业名称")
-    @TableField("WORK_TITLE")
-    private String workTitle;
-
-    /**
-     * 责任人
-     */
-    @ApiModelProperty("责任人（人员ID）")
-    @TableField("WORK_PERSON")
-    private Long workPerson;
-
-    /**
-     * 作业描述
-     */
-    @ApiModelProperty("作业描述")
-    @TableField("WORK_SITE_DESC")
-    private String workSiteDesc;
-
-    /**
-     * 作业状态
-     */
-    @ApiModelProperty("作业状态")
-    @TableField("PROJECT_STATE")
-    private String projectState;
-
-    /**
-     * 所属道路
-     */
-    @ApiModelProperty("所属道路")
-    @TableField("WORK_ROAD")
-    private String workRoad;
-
-    @TableField("IMAGE_URL")
-    private String imageUrl;
-
-    @TableField("CREATE_TIME")
-    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
-    private Date createTime;
-    @TableField("UPDATE_TIME")
-    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
-    private Date updateTime;
-
-    @ApiModelProperty("开始时间")
-    @TableField("START_TIME")
-    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
-    private Date startTime;
-
-    @ApiModelProperty("结束时间")
-    @TableField("FINISH_TIME")
-    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
-    private Date finishTime;
-
-    @ApiModelProperty("负责人姓名（详情中使用，新增编辑不用传）")
-    @TableField(exist = false)
-    private String workPersonName;
-
-    @ApiModelProperty("负责人联系方式（详情中使用，新增编辑不用传）")
-    @TableField(exist = false)
-    private String workPersonPhoneNumber;
-
-    @ApiModelProperty("负责人所属部门ID（详情中使用，新增编辑不用传）")
-    @TableField(exist = false)
-    private Long workPersonDeptId;
-
-    @ApiModelProperty("负责人所属部门名称（详情中使用，新增编辑不用传）")
-    @TableField(exist = false)
-    private String workPersonDeptName;
-
-    @ApiModelProperty(value = "注册时间",dataType = "String")
-    @TableField(exist = false)
-    private String registerTime;
-
-    @ApiModelProperty("作业状态名称")
-    @TableField(exist = false)
-    private String projectStateName;
-
-    @Override
-    public String toString() {
-        return "WorkSiteInfo{" +
-            "id=" + id +
-            ", workTitle=" + workTitle +
-            ", workPerson=" + workPerson +
-            ", workSiteDesc=" + workSiteDesc +
-            ", projectState=" + projectState +
-            ", imageUrl=" + imageUrl +
-            ", updateTime=" + updateTime +
-            ", workRoad=" + workRoad +
-        "}";
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Worker.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Worker.java
deleted file mode 100644
index 28a4daa..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Worker.java
+++ /dev/null
@@ -1,147 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.time.LocalDateTime;
-import java.util.Date;
-
-/**
- * <p>
- * 
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@ApiModel("Worker")
-@TableName("br_worker")
-@Data
-public class Worker implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @ApiModelProperty(value = "人员ID")
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 姓名
-     */
-    @ApiModelProperty(value = "姓名")
-    @TableField("WORKER_NAME")
-    private String workerName;
-
-    /**
-     * 性别
-     */
-    @ApiModelProperty(value = "性别")
-    @TableField("GENDER")
-    private String gender;
-
-    /**
-     * 所属部门
-     */
-    @ApiModelProperty(value = "所属部门(人员管理)")
-    @TableField("DEPT_ID")
-    private Long deptId;
-
-    /**
-     * 所属单位
-     */
-    @ApiModelProperty(value = "所属单位(入场申请中使用)")
-    @TableField("OWNER_SHIP")
-    private String ownerShip;
-
-    /**
-     * 联系方式
-     */
-    @ApiModelProperty(value = "联系方式")
-    @TableField("PHONE_NUMBER")
-    private String phoneNumber;
-
-    /**
-     * 证件号
-     */
-    @ApiModelProperty(value = "证件号")
-    @TableField("ID_CARD_NUMBER")
-    private String idCardNumber;
-
-    /**
-     * 入场原因
-     */
-    @ApiModelProperty(value = "入场原因（入场申请中使用）")
-    @TableField("ENTER_REASON")
-    private String enterReason;
-
-    /**
-     * 入场人脸照片
-     */
-    @ApiModelProperty(value = "人脸照片（照片路径）")
-    @TableField("WORKER_AVATAR")
-    private String workerAvatar;
-
-    /**
-     * 申请入场时间
-     */
-    @ApiModelProperty(value = "注册时间/申请入场时间")
-    @TableField("CREATE_TIME")
-    private Date createTime;
-
-    /**
-     * 人员类型
-     */
-    @ApiModelProperty(value = "人员类型（区分人员管理和入场申请）")
-    @TableField("WORKER_TYPE")
-    private String workerType;
-
-    @ApiModelProperty(value = "性别名称")
-    @TableField(exist = false)
-    private String genderName;
-
-    @ApiModelProperty(value = "部门名称")
-    @TableField(exist = false)
-    private String deptName;
-
-    @ApiModelProperty(value = "注册时间",dataType = "String")
-    @TableField(exist = false)
-    private String registerTime;
-
-    @ApiModelProperty(value = "当前状态")
-    @TableField(exist = false)
-    private String status;
-
-    @ApiModelProperty(value = "当前状态名称")
-    @TableField(exist = false)
-    private String statusName;
-
-    @ApiModelProperty(value = "是否注册(0未注册；1已注册)",allowableValues = "0,1")
-    @TableField(exist = false)
-    private String isRegister;
-
-    @Override
-    public String toString() {
-        return "Worker{" +
-            "id=" + id +
-            ", workerName=" + workerName +
-            ", gender=" + gender +
-            ", deptId=" + deptId +
-            ", ownerShip=" + ownerShip +
-            ", phoneNumber=" + phoneNumber +
-            ", idCardNumber=" + idCardNumber +
-            ", enterReason=" + enterReason +
-            ", workerAvatar=" + workerAvatar +
-            ", createTime=" + createTime +
-            ", workerType=" + workerType +
-        "}";
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/AlarmMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/AlarmMapper.java
new file mode 100644
index 0000000..ea4c8be
--- /dev/null
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/AlarmMapper.java
@@ -0,0 +1,16 @@
+package com.casic.missiles.modular.system.mapper;
+
+import com.casic.missiles.modular.system.entity.Alarm;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 报警记录表 Mapper 接口
+ * </p>
+ *
+ * @author zyj
+ * @since 2023-05-25
+ */
+public interface AlarmMapper extends BaseMapper<Alarm> {
+
+}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/BusAlarmMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/BusAlarmMapper.java
deleted file mode 100644
index 9801742..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/BusAlarmMapper.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package com.casic.missiles.modular.system.mapper;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.modular.system.dto.AlarmTypeCountDTO;
-import com.casic.missiles.modular.system.entity.BusAlarm;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * <p>
- * 报警记录表 Mapper 接口
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface BusAlarmMapper extends BaseMapper<BusAlarm> {
-
-    Page<BusAlarm> listPage(Page<BusAlarm> page,@Param("ew")  QueryWrapper<BusAlarm> queryWrapper);
-
-    void cancelAlarm(@Param("deviceId")Long deviceId,@Param("alarmType") String alarmType);
-
-    List<AlarmTypeCountDTO> alarmCount(@Param("projectId")Long projectId, @Param("alarmStatus")String alarmStatus);
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/BusEventImageMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/BusEventImageMapper.java
deleted file mode 100644
index 9590b7d..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/BusEventImageMapper.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.casic.missiles.modular.system.mapper;
-
-import com.casic.missiles.modular.system.entity.BusEventImage;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * <p>
- * 事件图片表 Mapper 接口
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface BusEventImageMapper extends BaseMapper<BusEventImage> {
-
-}

diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/AlarmController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/AlarmController.java
new file mode 100644
index 0000000..1795cf1
--- /dev/null
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/AlarmController.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.modular.system.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.stereotype.Controller;
+
+/**
+ * <p>
+ * 报警记录表 前端控制器
+ * </p>
+ *
+ * @author zyj
+ * @since 2023-05-25
+ */
+@Controller
+@RequestMapping("/system/alarm")
+public class AlarmController {
+
+}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusAlarmController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusAlarmController.java
deleted file mode 100644
index 1f82ebb..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusAlarmController.java
+++ /dev/null
@@ -1,102 +0,0 @@
-package com.casic.missiles.modular.system.controller;
-
-
-import cn.hutool.core.util.ObjectUtil;
-import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.core.base.controller.BaseController;
-import com.casic.missiles.core.page.PageFactory;
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.AlarmUpload;
-import com.casic.missiles.modular.system.dto.DeviceDetailDTO;
-import com.casic.missiles.modular.system.entity.BusAlarm;
-import com.casic.missiles.modular.system.service.IBusAlarmService;
-import io.swagger.annotations.*;
-import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.*;
-
-import org.springframework.stereotype.Controller;
-
-import static com.casic.missiles.model.response.ResponseData.DEFAULT_SUCCESS_MESSAGE;
-import static com.casic.missiles.modular.system.consts.AlarmConst.ALARM_STATUS_MANUAL_CANCEL;
-
-/**
- * <p>
- * 报警记录表 前端控制器
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@Api(tags = "报警管理接口")
-@Controller
-@RequestMapping("/alarm")
-@RequiredArgsConstructor
-public class BusAlarmController extends BaseController {
-
-    private final IBusAlarmService alarmService;
-
-    @ApiOperation("报警上报接口")
-    @PostMapping("/upload")
-    @ResponseBody
-    public Object upload(@RequestBody AlarmUpload alarmUpload){
-        alarmService.alarmUpload(alarmUpload);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("报警列表分页查询")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "workTitle", value = "作业名称",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "projectId", value = "作业ID",dataType = "Long", paramType = "query",example = "0"),
-            @ApiImplicitParam(name = "alarmStatus", value = "报警状态",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "projectState", value = "作业状态",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "alarmType", value = "报警类型",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "alarmStartTime", value = "报警开始时间",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "alarmEndTime", value = "报警结束时间",dataType = "String", paramType = "query")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = BusAlarm.class),
-    })
-    @GetMapping("/listPage")
-    @ResponseBody
-    public Object listPage(String workTitle,Long projectId,String alarmStatus,String projectState,String alarmType,String alarmStartTime,String alarmEndTime){
-        Page<BusAlarm> page = PageFactory.defaultPage();
-        QueryWrapper<BusAlarm> queryWrapper = new QueryWrapper<>();
-        if(StrUtil.isNotEmpty(workTitle)){
-            queryWrapper.like("p.WORK_TITLE",workTitle);
-        }
-        if(ObjectUtil.isNotEmpty(projectId)){
-            queryWrapper.eq("alarm.PROJECT_ID",projectId);
-        }
-        if(StrUtil.isNotEmpty(alarmStatus)){
-            queryWrapper.eq("alarm.ALARM_STATUS",alarmStatus);
-        }
-        if(StrUtil.isNotEmpty(projectState)){
-            queryWrapper.eq("p.PROJECT_STATE",projectState);
-        }
-        if(StrUtil.isNotEmpty(alarmType)){
-            queryWrapper.eq("alarm.ALARM_TYPE",alarmType);
-        }
-        if(StrUtil.isNotEmpty(alarmStartTime)){
-            queryWrapper.ge("alarm.ALARM_TIME",alarmStartTime);
-        }
-        if(StrUtil.isNotEmpty(alarmEndTime)){
-            queryWrapper.le("alarm.ALARM_TIME",alarmEndTime);
-        }
-        page = alarmService.listPage(page,queryWrapper);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-    @ApiOperation("消警")
-    @PostMapping("/cancel")
-    @ResponseBody
-    public Object cancel(@RequestParam("alarmId") Long alarmId){
-        UpdateWrapper<BusAlarm> updateWrapper = new UpdateWrapper<>();
-        updateWrapper.eq("ID",alarmId);
-        updateWrapper.set("ALARM_STATUS",ALARM_STATUS_MANUAL_CANCEL);
-        alarmService.update(updateWrapper);
-        return ResponseData.success();
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusEventController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusEventController.java
deleted file mode 100644
index dde5aad..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusEventController.java
+++ /dev/null
@@ -1,41 +0,0 @@
-package com.casic.missiles.modular.system.controller;
-
-
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.entity.BusEvent;
-import com.casic.missiles.modular.system.service.IBusEventService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.ResponseBody;
-
-/**
- * <p>
- * 事件表 前端控制器
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@Controller
-@RequestMapping("/event")
-@Api(tags = "事件上报")
-@RequiredArgsConstructor
-public class BusEventController {
-
-    private final IBusEventService eventService;
-
-    @ApiOperation("事件上报")
-    @PostMapping("add")
-    @ResponseBody
-    public Object add(@RequestBody BusEvent busEvent){
-        eventService.saveBusEvent(busEvent);
-        return ResponseData.success();
-    }
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
index 03abc5f..aa50d78 100644
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
@@ -1,121 +1,20 @@
 package com.casic.missiles.modular.system.controller;
 
 
-import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.core.base.controller.BaseController;
-import com.casic.missiles.core.page.PageFactory;
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.DeviceDetailDTO;
-import com.casic.missiles.modular.system.entity.Device;
-import com.casic.missiles.modular.system.service.IDeviceExtService;
-import com.casic.missiles.modular.system.service.IDeviceService;
-import io.swagger.annotations.*;
-import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.RequestMapping;
 
 import org.springframework.stereotype.Controller;
 
-import java.time.LocalDateTime;
-import java.util.Date;
-import java.util.List;
-
-import static com.casic.missiles.model.response.ResponseData.DEFAULT_SUCCESS_MESSAGE;
-
 /**
  * <p>
- *  前端控制器
+ * 设备记录表 前端控制器
  * </p>
  *
  * @author zyj
- * @since 2023-04-14
+ * @since 2023-05-25
  */
-@Api(tags = "设备管理接口")
-@RequiredArgsConstructor
 @Controller
-@RequestMapping("/device")
-public class DeviceController extends BaseController {
-    private final IDeviceService deviceService;
-    private final IDeviceExtService deviceExtService;
-
-    @ApiOperation("设备分页列表")
-    @ApiImplicitParams({
-        @ApiImplicitParam(name = "deviceType", value = "设备类型",dataType = "String", paramType = "query"),
-        @ApiImplicitParam(name = "deviceCode", value = "设备编号",dataType = "String", paramType = "query"),
-        @ApiImplicitParam(name = "status", value = "设备状态",dataType = "String", paramType = "query"),
-        @ApiImplicitParam(name = "projectId", value = "作业ID（如果传此参数，列表中返回该作业使用的设备）",dataType = "Long", paramType = "query", example = "0")
-    })
-    @ApiResponses({
-        @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = DeviceDetailDTO.class),
-    })
-    @GetMapping("listPage")
-    @ResponseBody
-    public Object listPage(String deviceType, String deviceCode, String status,Long projectId){
-        Page<DeviceDetailDTO> page = PageFactory.defaultPage();
-        QueryWrapper<DeviceDetailDTO> queryWrapper = new QueryWrapper<>();
-        if(StrUtil.isNotEmpty(deviceType)){
-            queryWrapper.eq("DEVICE_TYPE",deviceType);
-        }
-        if(StrUtil.isNotEmpty(deviceCode)){
-            queryWrapper.like("DEVICE_CODE",deviceCode);
-        }
-        page = deviceService.listPage(page,queryWrapper,status,projectId);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-    @ApiOperation("新增设备")
-    @PostMapping("add")
-    @ResponseBody
-    public Object add(@RequestBody DeviceDetailDTO deviceDetailDTO){
-        deviceService.saveDevice(deviceDetailDTO);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("编辑设备")
-    @PostMapping("update")
-    @ResponseBody
-    public Object update(@RequestBody DeviceDetailDTO deviceDetailDTO){
-        deviceService.updateDevice(deviceDetailDTO);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("删除设备")
-    @PostMapping("delete")
-    @ResponseBody
-    public Object delete(@ApiParam("设备id列表")@RequestBody List<Long> deviceIds){
-        deviceService.deleteDevices(deviceIds);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("设置甲烷阈值")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "gasIp", value = "安全树甲烷设备IP",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "gasPort", value = "安全树甲烷端口",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "threshold", value = "甲烷阈值",dataType = "String", paramType = "query")
-    })
-    @PostMapping("setThreshold")
-    @ResponseBody
-    public Object setThreshold(String gasIp,String gasPort,String threshold){
-        deviceExtService.setGasThreshold(gasIp, gasPort, threshold);
-        return ResponseData.success();
-    }
-
-
-    @ApiOperation("查询甲烷阈值")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "gasIp", value = "安全树甲烷设备IP",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "gasPort", value = "安全树甲烷端口",dataType = "String", paramType = "query")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = "{\"code\": 200,\"data\": \"100\",\"message\": \"请求成功\",\"success\": true}",response = String.class),
-    })
-    @GetMapping("getThreshold")
-    @ResponseBody
-    public Object getThreshold(String gasIp,String gasPort){
-        String data = deviceExtService.getGasThreshold(gasIp, gasPort);
-        return ResponseData.success(data);
-    }
-
+@RequestMapping("/system/device")
+public class DeviceController {
 
 }
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/OverviewController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/OverviewController.java
deleted file mode 100644
index 7570504..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/OverviewController.java
+++ /dev/null
@@ -1,70 +0,0 @@
-package com.casic.missiles.modular.system.controller;
-
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.AlarmTypeCountDTO;
-import com.casic.missiles.modular.system.dto.DeviceLocationDTO;
-import com.casic.missiles.modular.system.dto.WorkerLocationDTO;
-import com.casic.missiles.modular.system.service.IBusAlarmService;
-import com.casic.missiles.modular.system.service.IProjectDeviceService;
-import com.casic.missiles.modular.system.service.IProjectWorkerService;
-import io.swagger.annotations.*;
-import lombok.RequiredArgsConstructor;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.ResponseBody;
-
-import static com.casic.missiles.model.response.ResponseData.DEFAULT_SUCCESS_MESSAGE;
-import static com.casic.missiles.modular.system.consts.AlarmConst.ALARM_STATUS_ON;
-
-@Api(tags = "首页看板接口")
-@Controller
-@RequestMapping("overview")
-@RequiredArgsConstructor
-public class OverviewController {
-
-    private final IBusAlarmService alarmService;
-    private final IProjectDeviceService projectDeviceService;
-
-    private final IProjectWorkerService projectWorkerService;
-
-
-    @ApiOperation("报警统计接口")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "projectId", value = "作业ID",dataType = "Long", paramType = "query", example = "0")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = AlarmTypeCountDTO.class),
-    })
-    @GetMapping("/alarmCount")
-    @ResponseBody
-    public Object alarmCount(Long projectId){
-        return ResponseData.success(alarmService.alarmCount(projectId,ALARM_STATUS_ON));
-    }
-
-    @ApiOperation("设备列表接口")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "projectId", value = "作业ID",dataType = "Long", paramType = "query", example = "0")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = DeviceLocationDTO.class),
-    })
-    @GetMapping("/deviceList")
-    @ResponseBody
-    public Object deviceList(Long projectId){
-        return ResponseData.success(projectDeviceService.selectDeviceLocationList(projectId));
-    }
-
-    @ApiOperation("人员列表接口")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "projectId", value = "作业ID",dataType = "Long", paramType = "query", example = "0")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = WorkerLocationDTO.class),
-    })
-    @GetMapping("/workerList")
-    @ResponseBody
-    public Object workerList(Long projectId){
-        return ResponseData.success(projectWorkerService.selectWorkerLocationDTO(projectId));
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/WorkSiteInfoController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/WorkSiteInfoController.java
deleted file mode 100644
index af36d69..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/WorkSiteInfoController.java
+++ /dev/null
@@ -1,130 +0,0 @@
-package com.casic.missiles.modular.system.controller;
-
-
-import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.core.base.controller.BaseController;
-import com.casic.missiles.core.page.PageFactory;
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.WorkSiteDetailDTO;
-import com.casic.missiles.modular.system.entity.WorkSiteInfo;
-import com.casic.missiles.modular.system.service.IWorkSiteInfoService;
-import io.swagger.annotations.*;
-import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.*;
-
-import org.springframework.stereotype.Controller;
-
-import java.util.List;
-
-import static com.casic.missiles.model.response.ResponseData.DEFAULT_SUCCESS_MESSAGE;
-
-/**
- * <p>
- * 作业现场表 前端控制器
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@Controller
-@RequestMapping("/site")
-@Api(tags = "作业现场管理")
-@RequiredArgsConstructor
-public class WorkSiteInfoController extends BaseController {
-
-
-    private final IWorkSiteInfoService workSiteInfoService;
-
-    @ApiOperation("新增作业现场")
-    @PostMapping("add")
-    @ResponseBody
-    public Object addWorkSite(@RequestBody WorkSiteDetailDTO workSiteDetailDTO){
-        workSiteInfoService.addWorkSiteInfo(workSiteDetailDTO);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("编辑作业现场")
-    @PostMapping("update")
-    @ResponseBody
-    public Object updateWorkSite(@RequestBody WorkSiteDetailDTO workSiteDetailDTO){
-        workSiteInfoService.updateWorkSiteInfo(workSiteDetailDTO);
-        return ResponseData.success();
-    }
-
-
-    @ApiOperation("删除作业现场")
-    @PostMapping("delete")
-    @ResponseBody
-    public Object delete(@ApiParam("作业现场id列表")@RequestBody List<Long> projectIds){
-        workSiteInfoService.deleteProjects(projectIds);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("查询作业现场详情")
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = WorkSiteDetailDTO.class),
-    })
-    @GetMapping("detail")
-    @ResponseBody
-    public Object delete(@ApiParam(value = "作业现场id", example = "0")@RequestParam Long projectId){
-        WorkSiteDetailDTO detailDTO = workSiteInfoService.getWorkSiteDetail(projectId);
-        return ResponseData.success(detailDTO);
-    }
-
-    @ApiOperation("分页列表查询")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "workTitle",value = "作业名称", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "workRoad",value = "所属道路", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "workPersonName",value = "责任人姓名", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "startDate",value = "注册开始日期", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "endDate",value = "注册结束日期", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "projectState",value = "当前状态（字典值）", dataType = "String", paramType = "query")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = WorkSiteInfo.class),
-    })
-    @GetMapping("listPage")
-    @ResponseBody
-    public Object listPage(String workTitle,String workRoad,String workPersonName,String projectState,String startDate,String endDate){
-        Page<WorkSiteInfo> page = PageFactory.defaultPage();
-        QueryWrapper<WorkSiteInfo> queryWrapper = new QueryWrapper<>();
-        if(StrUtil.isNotEmpty(workTitle)){
-            queryWrapper.like("WORK_TITLE",workTitle);
-        }
-        if(StrUtil.isNotEmpty(workRoad)){
-            queryWrapper.like("WORK_ROAD",workRoad);
-        }
-        if(StrUtil.isNotEmpty(workPersonName)){
-            queryWrapper.like("WORKER_NAME",workPersonName);
-        }
-        if(StrUtil.isNotEmpty(projectState)){
-            queryWrapper.eq("PROJECT_STATE",projectState);
-        }
-        if(StrUtil.isNotEmpty(startDate)){
-            queryWrapper.ge("br_work_site_info.CREATE_TIME",startDate + " 00:00:00");
-        }
-        if(StrUtil.isNotEmpty(endDate)){
-            queryWrapper.le("br_work_site_info.CREATE_TIME",endDate + " 23:59:59");
-        }
-        page = workSiteInfoService.selectListPage(page,queryWrapper);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-    @ApiOperation("开始作业")
-    @PostMapping("start")
-    @ResponseBody
-    public Object start(@ApiParam(value = "作业现场id",example = "0")@RequestParam Long projectId){
-        workSiteInfoService.start(projectId);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("完成作业")
-    @PostMapping("finish")
-    @ResponseBody
-    public Object finish(@ApiParam(value = "作业现场id", example = "0")@RequestParam Long projectId){
-        workSiteInfoService.finish(projectId);
-        return ResponseData.success();
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/WorkerController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/WorkerController.java
deleted file mode 100644
index 796f94c..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/WorkerController.java
+++ /dev/null
@@ -1,136 +0,0 @@
-package com.casic.missiles.modular.system.controller;
-
-
-import cn.hutool.core.util.ObjectUtil;
-import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.core.base.controller.BaseController;
-import com.casic.missiles.core.page.PageFactory;
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.DeviceDetailDTO;
-import com.casic.missiles.modular.system.entity.Device;
-import com.casic.missiles.modular.system.entity.Worker;
-import com.casic.missiles.modular.system.service.IWorkerService;
-import io.swagger.annotations.*;
-import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.*;
-
-import org.springframework.stereotype.Controller;
-
-import java.util.Date;
-import java.util.List;
-
-import static com.casic.missiles.model.response.ResponseData.DEFAULT_SUCCESS_MESSAGE;
-
-/**
- * <p>
- *  前端控制器
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@Controller
-@RequestMapping("/worker")
-@RequiredArgsConstructor
-@Api(tags = "人员管理接口")
-public class WorkerController extends BaseController {
-
-    private final IWorkerService workerService;
-
-    @ApiOperation("分页列表查询")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "name",value = "姓名", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "deptId",value = "所属部门", dataType = "Long", paramType = "query", example = "0"),
-            @ApiImplicitParam(name = "status",value = "当前状态（字典值）", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "startDate",value = "注册开始日期", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "endDate",value = "注册结束日期", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "workerType",value = "人员类型（字典值）", dataType = "String", paramType = "query")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = Worker.class),
-    })
-    @GetMapping("listPage")
-    @ResponseBody
-    public Object listPage(String name,Long deptId, String status,String startDate,String endDate,String workerType){
-        Page<Worker> page = PageFactory.defaultPage();
-        QueryWrapper<Worker> queryWrapper = new QueryWrapper<>();
-        if(StrUtil.isNotEmpty(name)){
-            queryWrapper.like("WORKER_NAME",name);
-        }
-        if(ObjectUtil.isNotEmpty(deptId)){
-            queryWrapper.eq("DEPT_ID",deptId);
-        }
-        if(StrUtil.isNotEmpty(workerType)){
-            queryWrapper.eq("WORKER_TYPE",workerType);
-        }
-        if(StrUtil.isNotEmpty(startDate)){
-            queryWrapper.ge("CREATE_TIME",startDate + " 00:00:00");
-        }
-        if(StrUtil.isNotEmpty(endDate)){
-            queryWrapper.le("CREATE_TIME",endDate + " 23:59:59");
-        }
-        if(StrUtil.isNotEmpty(status)){
-            queryWrapper.eq("`STATUS`",status);
-        }
-        page = workerService.selectListPage(page,queryWrapper);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-    @ApiOperation("新增人员")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "worker", value = "人员信息", dataType = "Worker", paramType = "body", required = true),
-            @ApiImplicitParam(name = "projectId", value = "项目ID(入场申请需要)", dataType = "Long", paramType = "query", example = "0")
-    })
-    @PostMapping("add")
-    @ResponseBody
-    public Object add(@ApiParam("worker")@RequestBody Worker worker,
-                      @RequestParam(required = false) Long projectId){
-        workerService.addWorker(worker,projectId);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("编辑人员")
-    @PostMapping("update")
-    @ResponseBody
-    public Object update(@RequestBody Worker worker){
-        workerService.updateById(worker);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("删除人员")
-    @PostMapping("delete")
-    @ResponseBody
-    public Object delete(@ApiParam("人员id列表")@RequestBody List<Long> workIds){
-        workerService.removeByIds(workIds);
-        return ResponseData.success();
-    }
-
-
-    @ApiOperation(value = "获取人脸图片",notes = "返回人脸图片url")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "cameraIp",value = "摄像头IP", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "cameraPort",value = "摄像头端口号", dataType = "String", paramType = "query"),
-    })
-    @GetMapping("/face/register")
-    @ResponseBody
-    public Object faceRegister(String cameraIp,String cameraPort){
-        return ResponseData.success(workerService.faceRegister(cameraIp, cameraPort));
-    }
-
-
-    @ApiOperation(value = "查询临时入场人员列表")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "projectId", value = "项目ID",required = true,dataType = "Long", paramType = "query", example = "0")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = Worker.class),
-    })
-    @GetMapping("/projectTempWorker")
-    @ResponseBody
-    public Object projectTempWorker(Long projectId){
-        return ResponseData.success(workerService.projectTempWorker(projectId));
-    }
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/AlarmTypeCountDTO.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/AlarmTypeCountDTO.java
deleted file mode 100644
index 1a165a1..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/AlarmTypeCountDTO.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.casic.missiles.modular.system.dto;
-
-import io.swagger.annotations.ApiModel;
-import lombok.Data;
-
-@ApiModel(value = "AlarmTypeCountDTO",description = "报警类型统计（首页）")
-@Data
-public class AlarmTypeCountDTO {
-
-    private String alarmType;
-    private String alarmTypeName;
-    private Integer alarmCount;
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/AlarmUpload.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/AlarmUpload.java
deleted file mode 100644
index 73d7799..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/AlarmUpload.java
+++ /dev/null
@@ -1,46 +0,0 @@
-package com.casic.missiles.modular.system.dto;
-
-import cn.hutool.core.util.StrUtil;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-@ApiModel(value = "AlarmUpload",description = "报警上传")
-@Data
-public class AlarmUpload {
-
-    @ApiModelProperty(value = "摄像头ip")
-    private String cameraIp;
-
-    @ApiModelProperty(value = "摄像头端口")
-    private String cameraPort;
-    @ApiModelProperty(value = "安全树甲烷设备ip")
-    private String gasIp;
-    @ApiModelProperty(value = "安全树甲烷设备端口")
-    private String gasPort;
-    @ApiModelProperty(value = "报警值")
-    private String alarmValue;
-    @ApiModelProperty(value = "报警时间")
-    private String alarmTime;
-    @ApiModelProperty(value = "报警类型")
-    private String alarmType;
-    @ApiModelProperty(value = "报警图片")
-    private String alarmImage;
-    @ApiModelProperty(value = "报警内容")
-    private String alarmContent;
-
-    @Override
-    public String toString() {
-        return "AlarmUpload{" +
-                "cameraIp='" + cameraIp + '\'' +
-                ", cameraPort='" + cameraPort + '\'' +
-                ", gasIp='" + gasIp + '\'' +
-                ", gasPort='" + gasPort + '\'' +
-                ", alarmValue='" + alarmValue + '\'' +
-                ", alarmTime='" + alarmTime + '\'' +
-                ", alarmType='" + alarmType + '\'' +
-                ", alarmImage='" + (StrUtil.isNotEmpty(alarmImage) ? alarmImage.substring(0,50) : "null") + '\'' +
-                ", alarmContent='" + alarmContent + '\'' +
-                '}';
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/DeviceDetailDTO.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/DeviceDetailDTO.java
deleted file mode 100644
index ea518d9..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/DeviceDetailDTO.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package com.casic.missiles.modular.system.dto;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.casic.missiles.modular.system.entity.Device;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-@ApiModel("DeviceDetailDTO")
-@Data
-public class DeviceDetailDTO extends Device {
-
-    @ApiModelProperty(value = "摄像头编号")
-    private String cameraCode;
-
-    @ApiModelProperty(value = "摄像头IP")
-    private String cameraIp;
-
-    @ApiModelProperty(value = "摄像头端口")
-    private String cameraPort;
-
-    @ApiModelProperty(value = "激甲编号")
-    private String gasCode;
-
-    @ApiModelProperty(value = "激甲IP")
-    private String gasIp;
-
-    @ApiModelProperty(value = "激甲端口")
-    private String gasPort;
-
-    @ApiModelProperty(value = "智能帽衬编号")
-    private String hatLiningCode;
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/WorkSiteDetailDTO.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/WorkSiteDetailDTO.java
deleted file mode 100644
index 29378ff..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/WorkSiteDetailDTO.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package com.casic.missiles.modular.system.dto;
-
-import com.casic.missiles.modular.system.entity.ProjectDevice;
-import com.casic.missiles.modular.system.entity.ProjectWorker;
-import com.casic.missiles.modular.system.entity.WorkSiteInfo;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.util.List;
-
-@Data
-@ApiModel("WorkSiteDetailDTO")
-public class WorkSiteDetailDTO extends WorkSiteInfo {
-
-    @ApiModelProperty(value = "安全树列表",dataType = "ProjectDevice")
-    private List<ProjectDevice> deviceList;
-
-    @ApiModelProperty(value = "人员列表",dataType = "ProjectWorker")
-    private List<ProjectWorker> workerList;
-
-
-
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/WorkerLocationDTO.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/WorkerLocationDTO.java
deleted file mode 100644
index 6fd7b24..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/WorkerLocationDTO.java
+++ /dev/null
@@ -1,68 +0,0 @@
-package com.casic.missiles.modular.system.dto;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-@ApiModel(value = "WorkerLocationDTO",description = "人员位置列表（首页）")
-@Data
-public class WorkerLocationDTO {
-
-    @ApiModelProperty("人员ID")
-    private Long workerId;
-
-    @ApiModelProperty("人员姓名")
-    private String workerName;
-
-    @ApiModelProperty("安全帽编号")
-    private String hatCode;
-
-    @ApiModelProperty("安全帽ID")
-    private Long hatId;
-
-    @ApiModelProperty("背心编号")
-    private String vastCode;
-
-    @ApiModelProperty("手环编号")
-    private String braceletCode;
-
-    @ApiModelProperty("位置")
-    private String location;
-
-    @ApiModelProperty("时间")
-    private String time;
-
-    @ApiModelProperty("经度")
-    private String lng;
-
-    @ApiModelProperty("纬度")
-    private String lat;
-
-    @ApiModelProperty("心率")
-    private String heartRate;
-
-    @ApiModelProperty("血氧")
-    private String bloodOxygen;
-
-    @ApiModelProperty("一氧化碳")
-    private String co;
-
-    @ApiModelProperty("甲烷")
-    private String gas;
-
-    @ApiModelProperty("硫化氢")
-    private String h2s;
-
-    @ApiModelProperty("氧气")
-    private String o2;
-
-    @ApiModelProperty("信号")
-    private String signal;
-
-    @ApiModelProperty("电量")
-    private String cell;
-
-    @ApiModelProperty("是否报警")
-    private boolean alarmFlag;
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Alarm.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Alarm.java
new file mode 100644
index 0000000..4d2b7ef
--- /dev/null
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Alarm.java
@@ -0,0 +1,103 @@
+package com.casic.missiles.modular.system.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import java.util.Date;
+
+/**
+ * <p>
+ * 报警记录表
+ * </p>
+ *
+ * @author zyj
+ * @since 2023-05-25
+ */
+@Data
+@TableName("bus_alarm")
+public class Alarm implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    @TableId(value = "ID",type = IdType.ASSIGN_ID)
+    private Long id;
+
+    /**
+     * 设备ID
+     */
+    @TableField("DEVICE_ID")
+    private Long deviceId;
+
+    /**
+     * 报警类型
+     */
+    @TableField("ALARM_TYPE")
+    private String alarmType;
+
+    /**
+     * 报警时间
+     */
+    @TableField("ALARM_TIME")
+    private Date alarmTime;
+
+    /**
+     * 报警状态
+     */
+    @TableField("ALARM_STATUS")
+    private String alarmStatus;
+
+    /**
+     * 报警位置
+     */
+    @TableField("ALARM_LOCATION")
+    private String alarmLocation;
+
+    /**
+     * 报警图片
+     */
+    @TableField("ALARM_IMAGE")
+    private String alarmImage;
+
+    /**
+     * 视频通道号
+     */
+    @TableField("CHANNEL_NO")
+    private Integer channelNo;
+
+    /**
+     * 报警内容
+     */
+    @TableField("ALARM_CONTENT")
+    private String alarmContent;
+
+    /**
+     * 消警时间
+     */
+    @TableField("CANCEL_TIME")
+    private Date cancelTime;
+
+
+    @Override
+    public String toString() {
+        return "Alarm{" +
+            "id=" + id +
+            ", deviceId=" + deviceId +
+            ", alarmType=" + alarmType +
+            ", alarmTime=" + alarmTime +
+            ", alarmStatus=" + alarmStatus +
+            ", alarmLocation=" + alarmLocation +
+            ", alarmImage=" + alarmImage +
+            ", channelNo=" + channelNo +
+            ", alarmContent=" + alarmContent +
+            ", cancelTime=" + cancelTime +
+        "}";
+    }
+}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusAlarm.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusAlarm.java
deleted file mode 100644
index efb4a23..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusAlarm.java
+++ /dev/null
@@ -1,159 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.alibaba.fastjson.annotation.JSONField;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.time.LocalDateTime;
-import java.util.Date;
-
-/**
- * <p>
- * 报警记录表
- * </p>
- *
- * @author zyj
- * @since 2023-05-16
- */
-@Data
-@ApiModel("Alarm")
-@TableName("br_bus_alarm")
-public class BusAlarm implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 项目ID
-     */
-    @ApiModelProperty(value = "项目ID")
-    @TableField("PROJECT_ID")
-    private Long projectId;
-
-    /**
-     * 设备ID
-     */
-    @ApiModelProperty(value = "设备ID")
-    @TableField("DEVICE_ID")
-    private Long deviceId;
-
-    /**
-     * 报警类型
-     */
-    @ApiModelProperty(value = "报警类型")
-    @TableField("ALARM_TYPE")
-    private String alarmType;
-
-    /**
-     * 报警状态
-     */
-    @ApiModelProperty(value = "报警状态")
-    @TableField("ALARM_STATUS")
-    private String alarmStatus;
-
-    /**
-     * 报警值
-     */
-    @ApiModelProperty(value = "报警值")
-    @TableField("ALARM_VALUE")
-    private String alarmValue;
-
-    /**
-     * 报警图片
-     */
-    @ApiModelProperty(value = "报警图片")
-    @TableField("ALARM_IMAGE")
-    private String alarmImage;
-
-    /**
-     * 报警内容
-     */
-    @ApiModelProperty(value = "报警内容")
-    @TableField("ALARM_CONTENT")
-    private String alarmContent;
-
-    /**
-     * 报警时间
-     */
-    @ApiModelProperty(value = "报警时间")
-    @TableField("ALARM_TIME")
-    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
-    private Date alarmTime;
-
-    /**
-     * 消警时间
-     */
-    @ApiModelProperty(value = "消警时间")
-    @TableField("CANCEL_TIME")
-    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
-    private Date cancelTime;
-
-    /**
-     * 报警位置经度
-     */
-    @ApiModelProperty(value = "报警位置经度")
-    @TableField("ALARM_LNG")
-    private String alarmLng;
-
-    /**
-     * 报警位置纬度
-     */
-    @ApiModelProperty(value = "报警位置纬度")
-    @TableField("ALARM_LAT")
-    private String alarmLat;
-
-    @ApiModelProperty("报警类型名称")
-    @TableField(exist = false)
-    private String alarmStatusName;
-    @ApiModelProperty("报警类型名称")
-    @TableField(exist = false)
-    private String alarmTypeName;
-    @ApiModelProperty("作业名称")
-    @TableField(exist = false)
-    private String workTitle;
-    @ApiModelProperty("所属道路")
-    @TableField(exist = false)
-    private String workRoad;
-    @ApiModelProperty("作业状态")
-    @TableField(exist = false)
-    private String projectState;
-    @ApiModelProperty("作业状态名称")
-    @TableField(exist = false)
-    private String projectStateName;
-    @ApiModelProperty("负责人姓名")
-    @TableField(exist = false)
-    private String workPersonName;
-    @ApiModelProperty("负责人联系方式")
-    @TableField(exist = false)
-    private String workPersonPhoneNumber;
-
-
-    @Override
-    public String toString() {
-        return "BusAlarm{" +
-                "id=" + id +
-                ", projectId=" + projectId +
-                ", deviceId=" + deviceId +
-                ", alarmType=" + alarmType +
-                ", alarmValue=" + alarmValue +
-                ", alarmStatus=" + alarmStatus +
-                ", alarmImage=" + alarmImage +
-                ", alarmContent=" + alarmContent +
-                ", alarmTime=" + alarmTime +
-                ", cancelTime=" + cancelTime +
-                ", alarmLng=" + alarmLng +
-                ", alarmLat=" + alarmLat +
-                "}";
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusEvent.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusEvent.java
deleted file mode 100644
index a0b7543..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusEvent.java
+++ /dev/null
@@ -1,100 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.time.LocalDateTime;
-import java.util.Date;
-import java.util.List;
-
-/**
- * <p>
- * 事件表
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@TableName("br_bus_event")
-@Data
-@ApiModel("BusEvent")
-public class BusEvent implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @ApiModelProperty("事件ID")
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 事件标题
-     */
-    @ApiModelProperty("事件名称")
-    @TableField("EVENT_TITLE")
-    private String eventTitle;
-
-    /**
-     * 上报人员
-     */
-    @ApiModelProperty("上报人员")
-    @TableField("UPLOAD_NAME")
-    private String uploadName;
-
-    /**
-     * 联系方式
-     */
-    @ApiModelProperty("联系方式")
-    @TableField("PHONE_NUMBER")
-    private String phoneNumber;
-
-    /**
-     * 事件描述
-     */
-    @ApiModelProperty("事件描述")
-    @TableField("EVENT_DESCRIPTION")
-    private String eventDescription;
-
-    @ApiModelProperty("经度")
-    @TableField("LNG")
-    private String lng;
-
-    @ApiModelProperty("纬度")
-    @TableField("LAT")
-    private String lat;
-
-    /**
-     * 事件上传时间
-     */
-    @ApiModelProperty("事件上传时间")
-    @TableField("CREATE_TIME")
-    private Date createTime;
-
-    @ApiModelProperty("事件照片")
-    @TableField(exist = false)
-    private List<BusEventImage> imageList;
-
-
-
-    @Override
-    public String toString() {
-        return "BusEvent{" +
-            "id=" + id +
-            ", eventTitle=" + eventTitle +
-            ", uploadName=" + uploadName +
-            ", phoneNumber=" + phoneNumber +
-            ", eventDescription=" + eventDescription +
-            ", lng=" + lng +
-            ", lat=" + lat +
-            ", createTime=" + createTime +
-        "}";
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusEventImage.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusEventImage.java
deleted file mode 100644
index 1e75245..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusEventImage.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-
-/**
- * <p>
- * 事件图片表
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@TableName("br_bus_event_image")
-@Data
-@ApiModel("BusEventImage")
-public class BusEventImage implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 事件ID
-     */
-    @TableField("EVENT_ID")
-    private Long eventId;
-
-    /**
-     * 报警图片
-     */
-    @TableField("IMAGE")
-    @ApiModelProperty("图片url")
-    private String image;
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Device.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Device.java
index df89c70..ea7db5f 100644
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Device.java
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Device.java
@@ -1,30 +1,23 @@
 package com.casic.missiles.modular.system.entity;
 
-import com.alibaba.fastjson.annotation.JSONField;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.casic.missiles.core.base.json.DateDeserializer;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
-import java.util.Date;
 
 /**
  * <p>
- * 
+ * 设备记录表
  * </p>
  *
  * @author zyj
- * @since 2023-04-14
+ * @since 2023-05-25
  */
-@ApiModel("Device")
-@TableName("br_device")
 @Data
+@TableName("bus_device")
 public class Device implements Serializable {
 
     private static final long serialVersionUID = 1L;
@@ -32,82 +25,86 @@
     /**
      * 主键
      */
-    @ApiModelProperty(value = "设备ID")
     @TableId(value = "ID",type = IdType.ASSIGN_ID)
     private Long id;
 
     /**
-     * 设备编号
+     * 设备名称
      */
-    @ApiModelProperty(value = "设备编号")
-    @TableField("DEVICE_CODE")
-    private String deviceCode;
+    @TableField("DEVICE_NAME")
+    private String deviceName;
 
     /**
-     * 设备类型
+     * IP
      */
-    @ApiModelProperty(value = "设备类型")
-    @TableField("DEVICE_TYPE")
-    private String deviceType;
+    @TableField("IP")
+    private String ip;
 
     /**
-     * 设备批次
+     * 端口
      */
-    @ApiModelProperty(value = "设备批次")
-    @TableField("DEVICE_BATCH")
-    private String deviceBatch;
+    @TableField("PORT")
+    private String port;
 
     /**
-     * 厂家
+     * 用户名
      */
-    @ApiModelProperty(value = "厂家")
-    @TableField("MANUFACTURER")
-    private String manufacturer;
+    @TableField("USER_NAME")
+    private String userName;
 
     /**
-     * 是否供电
+     * 密码
      */
-    @ApiModelProperty(value = "是否供电")
-    @TableField("IS_POWER_SUPPLY")
-    private String isPowerSupply;
+    @TableField("PASSWORD")
+    private String password;
 
     /**
-     * 创建时间
+     * 连接类型
      */
-    @ApiModelProperty(value = "创建时间",dataType = "Date")
-    @TableField("CREATE_TIME")
-    private Date createTime;
+    @TableField("CONNECT_TYPE")
+    private String connectType;
 
-    @ApiModelProperty(value = "设备类型名称")
-    @TableField(exist = false)
-    private String deviceTypeName;
+    /**
+     * 位置
+     */
+    @TableField("LOCATION")
 
-    @ApiModelProperty(value = "是否供电名称")
-    @TableField(exist = false)
-    private String isPowerSupplyName;
+    private String location;
 
-    @ApiModelProperty(value = "注册时间",dataType = "String")
-    @TableField(exist = false)
-    private String registerTime;
+    /**
+     * 设备状态
+     */
+    @TableField("STATUS")
 
-    @ApiModelProperty(value = "当前状态")
-    @TableField(exist = false)
     private String status;
 
-    @ApiModelProperty(value = "当前状态名称")
-    @TableField(exist = false)
-    private String statusName;
+    /**
+     * 报警分组
+     */
+    @TableField("ALARM_GROUP")
+
+    private Long alarmGroup;
+
+    /**
+     * 视频通道数(预留)
+     */
+    @TableField("CHANNEL_NUM")
+    private Integer channelNum;
 
     @Override
     public String toString() {
         return "Device{" +
             "id=" + id +
-            ", deviceCode=" + deviceCode +
-            ", deviceType=" + deviceType +
-            ", deviceBatch=" + deviceBatch +
-            ", manufacturer=" + manufacturer +
-            ", isPowerSupply=" + isPowerSupply +
-            ", createTime=" + createTime +
+            ", deviceName=" + deviceName +
+            ", ip=" + ip +
+            ", port=" + port +
+            ", userName=" + userName +
+            ", password=" + password +
+            ", connectType=" + connectType +
+            ", location=" + location +
+            ", status=" + status +
+            ", alarmGroup=" + alarmGroup +
+            ", channelNum=" + channelNum +
         "}";
     }
 }
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/DeviceExt.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/DeviceExt.java
deleted file mode 100644
index 5ee7015..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/DeviceExt.java
+++ /dev/null
@@ -1,99 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-
-/**
- * <p>
- * 设备扩展信息表（安全树）
- * </p>
- *
- * @author zyj
- * @since 2023-04-27
- */
-@Data
-@TableName("br_device_ext")
-public class DeviceExt implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 设备ID
-     */
-    @TableField("DEVICE_ID")
-    private Long deviceId;
-
-    /**
-     * 摄像头编号
-     */
-    @TableField("CAMERA_CODE")
-    private String cameraCode;
-
-    /**
-     * 摄像头IP
-     */
-    @TableField("CAMERA_IP")
-    private String cameraIp;
-
-    /**
-     * 摄像头端口
-     */
-    @TableField("CAMERA_PORT")
-    private String cameraPort;
-
-    /**
-     * 激甲编号
-     */
-    @TableField("GAS_CODE")
-    private String gasCode;
-
-    /**
-     * 激甲IP
-     */
-    @TableField("GAS_IP")
-    private String gasIp;
-
-    /**
-     * 激甲端口
-     */
-    @TableField("GAS_PORT")
-    private String gasPort;
-
-    /**
-     * 甲烷报警阈值
-     */
-    @TableField("GAS_THRESHOLD")
-    private String gasThreshold;
-
-    @TableField(value = "HAT_LINING_CODE")
-    private String hatLiningCode;
-
-
-    @Override
-    public String toString() {
-        return "DeviceExt{" +
-            "id=" + id +
-            ", deviceId=" + deviceId +
-            ", cameraCode=" + cameraCode +
-            ", cameraIp=" + cameraIp +
-            ", cameraPort=" + cameraPort +
-            ", gasCode=" + gasCode +
-            ", gasIp=" + gasIp +
-            ", gasPort=" + gasPort +
-            ", gasThreshold=" + gasThreshold +
-            ", hatLiningCode=" + hatLiningCode +
-        "}";
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/ProjectDevice.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/ProjectDevice.java
deleted file mode 100644
index c4f3472..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/ProjectDevice.java
+++ /dev/null
@@ -1,62 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-
-/**
- * <p>
- * 
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@Data
-@ApiModel("ProjectDevice")
-@TableName("br_project_device")
-public class ProjectDevice implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 作业现场ID
-     */
-    @TableField("PROJECT_ID")
-    private Long projectId;
-
-    /**
-     * 设备ID
-     */
-    @TableField("DEVICE_ID")
-    @ApiModelProperty("设备ID（新增编辑时传）")
-    private Long deviceId;
-
-    /**
-     * 设备编号
-     */
-    @TableField(exist = false)
-    @ApiModelProperty("设备编号（详情中展示，新增编辑不用传）")
-    private String deviceCode;
-
-    @Override
-    public String toString() {
-        return "ProjectDevice{" +
-            "id=" + id +
-            ", projectId=" + projectId +
-            ", deviceId=" + deviceId +
-        "}";
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/ProjectWorker.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/ProjectWorker.java
deleted file mode 100644
index 10b23c4..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/ProjectWorker.java
+++ /dev/null
@@ -1,104 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import java.io.Serializable;
-
-/**
- * <p>
- * 
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@ApiModel("ProjectWorker")
-@TableName("br_project_worker")
-@Data
-@NoArgsConstructor
-@AllArgsConstructor
-public class ProjectWorker implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 作业现场ID
-     */
-    @TableField("PROJECT_ID")
-    private Long projectId;
-
-    /**
-     * 人员ID
-     */
-    @ApiModelProperty("人员ID")
-    @TableField("WORKER_ID")
-    private Long workerId;
-
-    /**
-     * 安全帽编号
-     */
-    @ApiModelProperty("安全帽编号")
-    @TableField("HAT_CODE")
-    private String hatCode;
-
-    /**
-     * 背心编号
-     */
-    @ApiModelProperty("背心编号")
-    @TableField("VAST_CODE")
-    private String vastCode;
-
-    /**
-     * 手环编号
-     */
-    @ApiModelProperty("手环编号")
-    @TableField("BRACELET_CODE")
-    private String braceletCode;
-
-    @ApiModelProperty("人员姓名（详情中展示，新增编辑不用传）")
-    @TableField(exist = false)
-    private String workerName;
-
-    @ApiModelProperty("人员部门ID（详情中展示，新增编辑不用传）")
-    @TableField(exist = false)
-    private String workerDeptId;
-
-    @ApiModelProperty("人员部门名称（详情中展示，新增编辑不用传）")
-    @TableField(exist = false)
-    private String workerDeptName;
-
-    @ApiModelProperty("人员联系方式（详情中展示，新增编辑不用传）")
-    @TableField(exist = false)
-    private String workerPhoneNumber;
-
-    public ProjectWorker(Long projectId, Long workerId) {
-        this.projectId = projectId;
-        this.workerId = workerId;
-    }
-
-    @Override
-    public String toString() {
-        return "ProjectWorker{" +
-            "id=" + id +
-            ", projectId=" + projectId +
-            ", workerId=" + workerId +
-            ", hatCode=" + hatCode +
-            ", vastCode=" + vastCode +
-            ", braceletCode=" + braceletCode +
-        "}";
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/WorkSiteInfo.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/WorkSiteInfo.java
deleted file mode 100644
index fa6f41d..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/WorkSiteInfo.java
+++ /dev/null
@@ -1,130 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.alibaba.fastjson.annotation.JSONField;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.time.LocalDateTime;
-import java.util.Date;
-
-/**
- * <p>
- * 作业现场表
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@ApiModel("WorkSiteInfo")
-@TableName("br_work_site_info")
-@Data
-public class WorkSiteInfo implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @ApiModelProperty("作业现场ID")
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 作业名称
-     */
-    @ApiModelProperty("作业名称")
-    @TableField("WORK_TITLE")
-    private String workTitle;
-
-    /**
-     * 责任人
-     */
-    @ApiModelProperty("责任人（人员ID）")
-    @TableField("WORK_PERSON")
-    private Long workPerson;
-
-    /**
-     * 作业描述
-     */
-    @ApiModelProperty("作业描述")
-    @TableField("WORK_SITE_DESC")
-    private String workSiteDesc;
-
-    /**
-     * 作业状态
-     */
-    @ApiModelProperty("作业状态")
-    @TableField("PROJECT_STATE")
-    private String projectState;
-
-    /**
-     * 所属道路
-     */
-    @ApiModelProperty("所属道路")
-    @TableField("WORK_ROAD")
-    private String workRoad;
-
-    @TableField("IMAGE_URL")
-    private String imageUrl;
-
-    @TableField("CREATE_TIME")
-    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
-    private Date createTime;
-    @TableField("UPDATE_TIME")
-    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
-    private Date updateTime;
-
-    @ApiModelProperty("开始时间")
-    @TableField("START_TIME")
-    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
-    private Date startTime;
-
-    @ApiModelProperty("结束时间")
-    @TableField("FINISH_TIME")
-    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
-    private Date finishTime;
-
-    @ApiModelProperty("负责人姓名（详情中使用，新增编辑不用传）")
-    @TableField(exist = false)
-    private String workPersonName;
-
-    @ApiModelProperty("负责人联系方式（详情中使用，新增编辑不用传）")
-    @TableField(exist = false)
-    private String workPersonPhoneNumber;
-
-    @ApiModelProperty("负责人所属部门ID（详情中使用，新增编辑不用传）")
-    @TableField(exist = false)
-    private Long workPersonDeptId;
-
-    @ApiModelProperty("负责人所属部门名称（详情中使用，新增编辑不用传）")
-    @TableField(exist = false)
-    private String workPersonDeptName;
-
-    @ApiModelProperty(value = "注册时间",dataType = "String")
-    @TableField(exist = false)
-    private String registerTime;
-
-    @ApiModelProperty("作业状态名称")
-    @TableField(exist = false)
-    private String projectStateName;
-
-    @Override
-    public String toString() {
-        return "WorkSiteInfo{" +
-            "id=" + id +
-            ", workTitle=" + workTitle +
-            ", workPerson=" + workPerson +
-            ", workSiteDesc=" + workSiteDesc +
-            ", projectState=" + projectState +
-            ", imageUrl=" + imageUrl +
-            ", updateTime=" + updateTime +
-            ", workRoad=" + workRoad +
-        "}";
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Worker.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Worker.java
deleted file mode 100644
index 28a4daa..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Worker.java
+++ /dev/null
@@ -1,147 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.time.LocalDateTime;
-import java.util.Date;
-
-/**
- * <p>
- * 
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@ApiModel("Worker")
-@TableName("br_worker")
-@Data
-public class Worker implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @ApiModelProperty(value = "人员ID")
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 姓名
-     */
-    @ApiModelProperty(value = "姓名")
-    @TableField("WORKER_NAME")
-    private String workerName;
-
-    /**
-     * 性别
-     */
-    @ApiModelProperty(value = "性别")
-    @TableField("GENDER")
-    private String gender;
-
-    /**
-     * 所属部门
-     */
-    @ApiModelProperty(value = "所属部门(人员管理)")
-    @TableField("DEPT_ID")
-    private Long deptId;
-
-    /**
-     * 所属单位
-     */
-    @ApiModelProperty(value = "所属单位(入场申请中使用)")
-    @TableField("OWNER_SHIP")
-    private String ownerShip;
-
-    /**
-     * 联系方式
-     */
-    @ApiModelProperty(value = "联系方式")
-    @TableField("PHONE_NUMBER")
-    private String phoneNumber;
-
-    /**
-     * 证件号
-     */
-    @ApiModelProperty(value = "证件号")
-    @TableField("ID_CARD_NUMBER")
-    private String idCardNumber;
-
-    /**
-     * 入场原因
-     */
-    @ApiModelProperty(value = "入场原因（入场申请中使用）")
-    @TableField("ENTER_REASON")
-    private String enterReason;
-
-    /**
-     * 入场人脸照片
-     */
-    @ApiModelProperty(value = "人脸照片（照片路径）")
-    @TableField("WORKER_AVATAR")
-    private String workerAvatar;
-
-    /**
-     * 申请入场时间
-     */
-    @ApiModelProperty(value = "注册时间/申请入场时间")
-    @TableField("CREATE_TIME")
-    private Date createTime;
-
-    /**
-     * 人员类型
-     */
-    @ApiModelProperty(value = "人员类型（区分人员管理和入场申请）")
-    @TableField("WORKER_TYPE")
-    private String workerType;
-
-    @ApiModelProperty(value = "性别名称")
-    @TableField(exist = false)
-    private String genderName;
-
-    @ApiModelProperty(value = "部门名称")
-    @TableField(exist = false)
-    private String deptName;
-
-    @ApiModelProperty(value = "注册时间",dataType = "String")
-    @TableField(exist = false)
-    private String registerTime;
-
-    @ApiModelProperty(value = "当前状态")
-    @TableField(exist = false)
-    private String status;
-
-    @ApiModelProperty(value = "当前状态名称")
-    @TableField(exist = false)
-    private String statusName;
-
-    @ApiModelProperty(value = "是否注册(0未注册；1已注册)",allowableValues = "0,1")
-    @TableField(exist = false)
-    private String isRegister;
-
-    @Override
-    public String toString() {
-        return "Worker{" +
-            "id=" + id +
-            ", workerName=" + workerName +
-            ", gender=" + gender +
-            ", deptId=" + deptId +
-            ", ownerShip=" + ownerShip +
-            ", phoneNumber=" + phoneNumber +
-            ", idCardNumber=" + idCardNumber +
-            ", enterReason=" + enterReason +
-            ", workerAvatar=" + workerAvatar +
-            ", createTime=" + createTime +
-            ", workerType=" + workerType +
-        "}";
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/AlarmMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/AlarmMapper.java
new file mode 100644
index 0000000..ea4c8be
--- /dev/null
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/AlarmMapper.java
@@ -0,0 +1,16 @@
+package com.casic.missiles.modular.system.mapper;
+
+import com.casic.missiles.modular.system.entity.Alarm;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 报警记录表 Mapper 接口
+ * </p>
+ *
+ * @author zyj
+ * @since 2023-05-25
+ */
+public interface AlarmMapper extends BaseMapper<Alarm> {
+
+}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/BusAlarmMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/BusAlarmMapper.java
deleted file mode 100644
index 9801742..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/BusAlarmMapper.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package com.casic.missiles.modular.system.mapper;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.modular.system.dto.AlarmTypeCountDTO;
-import com.casic.missiles.modular.system.entity.BusAlarm;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * <p>
- * 报警记录表 Mapper 接口
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface BusAlarmMapper extends BaseMapper<BusAlarm> {
-
-    Page<BusAlarm> listPage(Page<BusAlarm> page,@Param("ew")  QueryWrapper<BusAlarm> queryWrapper);
-
-    void cancelAlarm(@Param("deviceId")Long deviceId,@Param("alarmType") String alarmType);
-
-    List<AlarmTypeCountDTO> alarmCount(@Param("projectId")Long projectId, @Param("alarmStatus")String alarmStatus);
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/BusEventImageMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/BusEventImageMapper.java
deleted file mode 100644
index 9590b7d..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/BusEventImageMapper.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.casic.missiles.modular.system.mapper;
-
-import com.casic.missiles.modular.system.entity.BusEventImage;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * <p>
- * 事件图片表 Mapper 接口
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface BusEventImageMapper extends BaseMapper<BusEventImage> {
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/BusEventMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/BusEventMapper.java
deleted file mode 100644
index 3c85edf..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/BusEventMapper.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.casic.missiles.modular.system.mapper;
-
-import com.casic.missiles.modular.system.entity.BusEvent;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * <p>
- * 事件表 Mapper 接口
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface BusEventMapper extends BaseMapper<BusEvent> {
-
-}

diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/AlarmController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/AlarmController.java
new file mode 100644
index 0000000..1795cf1
--- /dev/null
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/AlarmController.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.modular.system.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.stereotype.Controller;
+
+/**
+ * <p>
+ * 报警记录表 前端控制器
+ * </p>
+ *
+ * @author zyj
+ * @since 2023-05-25
+ */
+@Controller
+@RequestMapping("/system/alarm")
+public class AlarmController {
+
+}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusAlarmController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusAlarmController.java
deleted file mode 100644
index 1f82ebb..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusAlarmController.java
+++ /dev/null
@@ -1,102 +0,0 @@
-package com.casic.missiles.modular.system.controller;
-
-
-import cn.hutool.core.util.ObjectUtil;
-import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.core.base.controller.BaseController;
-import com.casic.missiles.core.page.PageFactory;
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.AlarmUpload;
-import com.casic.missiles.modular.system.dto.DeviceDetailDTO;
-import com.casic.missiles.modular.system.entity.BusAlarm;
-import com.casic.missiles.modular.system.service.IBusAlarmService;
-import io.swagger.annotations.*;
-import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.*;
-
-import org.springframework.stereotype.Controller;
-
-import static com.casic.missiles.model.response.ResponseData.DEFAULT_SUCCESS_MESSAGE;
-import static com.casic.missiles.modular.system.consts.AlarmConst.ALARM_STATUS_MANUAL_CANCEL;
-
-/**
- * <p>
- * 报警记录表 前端控制器
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@Api(tags = "报警管理接口")
-@Controller
-@RequestMapping("/alarm")
-@RequiredArgsConstructor
-public class BusAlarmController extends BaseController {
-
-    private final IBusAlarmService alarmService;
-
-    @ApiOperation("报警上报接口")
-    @PostMapping("/upload")
-    @ResponseBody
-    public Object upload(@RequestBody AlarmUpload alarmUpload){
-        alarmService.alarmUpload(alarmUpload);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("报警列表分页查询")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "workTitle", value = "作业名称",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "projectId", value = "作业ID",dataType = "Long", paramType = "query",example = "0"),
-            @ApiImplicitParam(name = "alarmStatus", value = "报警状态",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "projectState", value = "作业状态",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "alarmType", value = "报警类型",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "alarmStartTime", value = "报警开始时间",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "alarmEndTime", value = "报警结束时间",dataType = "String", paramType = "query")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = BusAlarm.class),
-    })
-    @GetMapping("/listPage")
-    @ResponseBody
-    public Object listPage(String workTitle,Long projectId,String alarmStatus,String projectState,String alarmType,String alarmStartTime,String alarmEndTime){
-        Page<BusAlarm> page = PageFactory.defaultPage();
-        QueryWrapper<BusAlarm> queryWrapper = new QueryWrapper<>();
-        if(StrUtil.isNotEmpty(workTitle)){
-            queryWrapper.like("p.WORK_TITLE",workTitle);
-        }
-        if(ObjectUtil.isNotEmpty(projectId)){
-            queryWrapper.eq("alarm.PROJECT_ID",projectId);
-        }
-        if(StrUtil.isNotEmpty(alarmStatus)){
-            queryWrapper.eq("alarm.ALARM_STATUS",alarmStatus);
-        }
-        if(StrUtil.isNotEmpty(projectState)){
-            queryWrapper.eq("p.PROJECT_STATE",projectState);
-        }
-        if(StrUtil.isNotEmpty(alarmType)){
-            queryWrapper.eq("alarm.ALARM_TYPE",alarmType);
-        }
-        if(StrUtil.isNotEmpty(alarmStartTime)){
-            queryWrapper.ge("alarm.ALARM_TIME",alarmStartTime);
-        }
-        if(StrUtil.isNotEmpty(alarmEndTime)){
-            queryWrapper.le("alarm.ALARM_TIME",alarmEndTime);
-        }
-        page = alarmService.listPage(page,queryWrapper);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-    @ApiOperation("消警")
-    @PostMapping("/cancel")
-    @ResponseBody
-    public Object cancel(@RequestParam("alarmId") Long alarmId){
-        UpdateWrapper<BusAlarm> updateWrapper = new UpdateWrapper<>();
-        updateWrapper.eq("ID",alarmId);
-        updateWrapper.set("ALARM_STATUS",ALARM_STATUS_MANUAL_CANCEL);
-        alarmService.update(updateWrapper);
-        return ResponseData.success();
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusEventController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusEventController.java
deleted file mode 100644
index dde5aad..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusEventController.java
+++ /dev/null
@@ -1,41 +0,0 @@
-package com.casic.missiles.modular.system.controller;
-
-
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.entity.BusEvent;
-import com.casic.missiles.modular.system.service.IBusEventService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.ResponseBody;
-
-/**
- * <p>
- * 事件表 前端控制器
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@Controller
-@RequestMapping("/event")
-@Api(tags = "事件上报")
-@RequiredArgsConstructor
-public class BusEventController {
-
-    private final IBusEventService eventService;
-
-    @ApiOperation("事件上报")
-    @PostMapping("add")
-    @ResponseBody
-    public Object add(@RequestBody BusEvent busEvent){
-        eventService.saveBusEvent(busEvent);
-        return ResponseData.success();
-    }
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
index 03abc5f..aa50d78 100644
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
@@ -1,121 +1,20 @@
 package com.casic.missiles.modular.system.controller;
 
 
-import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.core.base.controller.BaseController;
-import com.casic.missiles.core.page.PageFactory;
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.DeviceDetailDTO;
-import com.casic.missiles.modular.system.entity.Device;
-import com.casic.missiles.modular.system.service.IDeviceExtService;
-import com.casic.missiles.modular.system.service.IDeviceService;
-import io.swagger.annotations.*;
-import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.RequestMapping;
 
 import org.springframework.stereotype.Controller;
 
-import java.time.LocalDateTime;
-import java.util.Date;
-import java.util.List;
-
-import static com.casic.missiles.model.response.ResponseData.DEFAULT_SUCCESS_MESSAGE;
-
 /**
  * <p>
- *  前端控制器
+ * 设备记录表 前端控制器
  * </p>
  *
  * @author zyj
- * @since 2023-04-14
+ * @since 2023-05-25
  */
-@Api(tags = "设备管理接口")
-@RequiredArgsConstructor
 @Controller
-@RequestMapping("/device")
-public class DeviceController extends BaseController {
-    private final IDeviceService deviceService;
-    private final IDeviceExtService deviceExtService;
-
-    @ApiOperation("设备分页列表")
-    @ApiImplicitParams({
-        @ApiImplicitParam(name = "deviceType", value = "设备类型",dataType = "String", paramType = "query"),
-        @ApiImplicitParam(name = "deviceCode", value = "设备编号",dataType = "String", paramType = "query"),
-        @ApiImplicitParam(name = "status", value = "设备状态",dataType = "String", paramType = "query"),
-        @ApiImplicitParam(name = "projectId", value = "作业ID（如果传此参数，列表中返回该作业使用的设备）",dataType = "Long", paramType = "query", example = "0")
-    })
-    @ApiResponses({
-        @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = DeviceDetailDTO.class),
-    })
-    @GetMapping("listPage")
-    @ResponseBody
-    public Object listPage(String deviceType, String deviceCode, String status,Long projectId){
-        Page<DeviceDetailDTO> page = PageFactory.defaultPage();
-        QueryWrapper<DeviceDetailDTO> queryWrapper = new QueryWrapper<>();
-        if(StrUtil.isNotEmpty(deviceType)){
-            queryWrapper.eq("DEVICE_TYPE",deviceType);
-        }
-        if(StrUtil.isNotEmpty(deviceCode)){
-            queryWrapper.like("DEVICE_CODE",deviceCode);
-        }
-        page = deviceService.listPage(page,queryWrapper,status,projectId);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-    @ApiOperation("新增设备")
-    @PostMapping("add")
-    @ResponseBody
-    public Object add(@RequestBody DeviceDetailDTO deviceDetailDTO){
-        deviceService.saveDevice(deviceDetailDTO);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("编辑设备")
-    @PostMapping("update")
-    @ResponseBody
-    public Object update(@RequestBody DeviceDetailDTO deviceDetailDTO){
-        deviceService.updateDevice(deviceDetailDTO);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("删除设备")
-    @PostMapping("delete")
-    @ResponseBody
-    public Object delete(@ApiParam("设备id列表")@RequestBody List<Long> deviceIds){
-        deviceService.deleteDevices(deviceIds);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("设置甲烷阈值")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "gasIp", value = "安全树甲烷设备IP",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "gasPort", value = "安全树甲烷端口",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "threshold", value = "甲烷阈值",dataType = "String", paramType = "query")
-    })
-    @PostMapping("setThreshold")
-    @ResponseBody
-    public Object setThreshold(String gasIp,String gasPort,String threshold){
-        deviceExtService.setGasThreshold(gasIp, gasPort, threshold);
-        return ResponseData.success();
-    }
-
-
-    @ApiOperation("查询甲烷阈值")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "gasIp", value = "安全树甲烷设备IP",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "gasPort", value = "安全树甲烷端口",dataType = "String", paramType = "query")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = "{\"code\": 200,\"data\": \"100\",\"message\": \"请求成功\",\"success\": true}",response = String.class),
-    })
-    @GetMapping("getThreshold")
-    @ResponseBody
-    public Object getThreshold(String gasIp,String gasPort){
-        String data = deviceExtService.getGasThreshold(gasIp, gasPort);
-        return ResponseData.success(data);
-    }
-
+@RequestMapping("/system/device")
+public class DeviceController {
 
 }
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/OverviewController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/OverviewController.java
deleted file mode 100644
index 7570504..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/OverviewController.java
+++ /dev/null
@@ -1,70 +0,0 @@
-package com.casic.missiles.modular.system.controller;
-
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.AlarmTypeCountDTO;
-import com.casic.missiles.modular.system.dto.DeviceLocationDTO;
-import com.casic.missiles.modular.system.dto.WorkerLocationDTO;
-import com.casic.missiles.modular.system.service.IBusAlarmService;
-import com.casic.missiles.modular.system.service.IProjectDeviceService;
-import com.casic.missiles.modular.system.service.IProjectWorkerService;
-import io.swagger.annotations.*;
-import lombok.RequiredArgsConstructor;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.ResponseBody;
-
-import static com.casic.missiles.model.response.ResponseData.DEFAULT_SUCCESS_MESSAGE;
-import static com.casic.missiles.modular.system.consts.AlarmConst.ALARM_STATUS_ON;
-
-@Api(tags = "首页看板接口")
-@Controller
-@RequestMapping("overview")
-@RequiredArgsConstructor
-public class OverviewController {
-
-    private final IBusAlarmService alarmService;
-    private final IProjectDeviceService projectDeviceService;
-
-    private final IProjectWorkerService projectWorkerService;
-
-
-    @ApiOperation("报警统计接口")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "projectId", value = "作业ID",dataType = "Long", paramType = "query", example = "0")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = AlarmTypeCountDTO.class),
-    })
-    @GetMapping("/alarmCount")
-    @ResponseBody
-    public Object alarmCount(Long projectId){
-        return ResponseData.success(alarmService.alarmCount(projectId,ALARM_STATUS_ON));
-    }
-
-    @ApiOperation("设备列表接口")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "projectId", value = "作业ID",dataType = "Long", paramType = "query", example = "0")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = DeviceLocationDTO.class),
-    })
-    @GetMapping("/deviceList")
-    @ResponseBody
-    public Object deviceList(Long projectId){
-        return ResponseData.success(projectDeviceService.selectDeviceLocationList(projectId));
-    }
-
-    @ApiOperation("人员列表接口")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "projectId", value = "作业ID",dataType = "Long", paramType = "query", example = "0")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = WorkerLocationDTO.class),
-    })
-    @GetMapping("/workerList")
-    @ResponseBody
-    public Object workerList(Long projectId){
-        return ResponseData.success(projectWorkerService.selectWorkerLocationDTO(projectId));
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/WorkSiteInfoController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/WorkSiteInfoController.java
deleted file mode 100644
index af36d69..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/WorkSiteInfoController.java
+++ /dev/null
@@ -1,130 +0,0 @@
-package com.casic.missiles.modular.system.controller;
-
-
-import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.core.base.controller.BaseController;
-import com.casic.missiles.core.page.PageFactory;
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.WorkSiteDetailDTO;
-import com.casic.missiles.modular.system.entity.WorkSiteInfo;
-import com.casic.missiles.modular.system.service.IWorkSiteInfoService;
-import io.swagger.annotations.*;
-import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.*;
-
-import org.springframework.stereotype.Controller;
-
-import java.util.List;
-
-import static com.casic.missiles.model.response.ResponseData.DEFAULT_SUCCESS_MESSAGE;
-
-/**
- * <p>
- * 作业现场表 前端控制器
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@Controller
-@RequestMapping("/site")
-@Api(tags = "作业现场管理")
-@RequiredArgsConstructor
-public class WorkSiteInfoController extends BaseController {
-
-
-    private final IWorkSiteInfoService workSiteInfoService;
-
-    @ApiOperation("新增作业现场")
-    @PostMapping("add")
-    @ResponseBody
-    public Object addWorkSite(@RequestBody WorkSiteDetailDTO workSiteDetailDTO){
-        workSiteInfoService.addWorkSiteInfo(workSiteDetailDTO);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("编辑作业现场")
-    @PostMapping("update")
-    @ResponseBody
-    public Object updateWorkSite(@RequestBody WorkSiteDetailDTO workSiteDetailDTO){
-        workSiteInfoService.updateWorkSiteInfo(workSiteDetailDTO);
-        return ResponseData.success();
-    }
-
-
-    @ApiOperation("删除作业现场")
-    @PostMapping("delete")
-    @ResponseBody
-    public Object delete(@ApiParam("作业现场id列表")@RequestBody List<Long> projectIds){
-        workSiteInfoService.deleteProjects(projectIds);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("查询作业现场详情")
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = WorkSiteDetailDTO.class),
-    })
-    @GetMapping("detail")
-    @ResponseBody
-    public Object delete(@ApiParam(value = "作业现场id", example = "0")@RequestParam Long projectId){
-        WorkSiteDetailDTO detailDTO = workSiteInfoService.getWorkSiteDetail(projectId);
-        return ResponseData.success(detailDTO);
-    }
-
-    @ApiOperation("分页列表查询")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "workTitle",value = "作业名称", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "workRoad",value = "所属道路", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "workPersonName",value = "责任人姓名", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "startDate",value = "注册开始日期", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "endDate",value = "注册结束日期", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "projectState",value = "当前状态（字典值）", dataType = "String", paramType = "query")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = WorkSiteInfo.class),
-    })
-    @GetMapping("listPage")
-    @ResponseBody
-    public Object listPage(String workTitle,String workRoad,String workPersonName,String projectState,String startDate,String endDate){
-        Page<WorkSiteInfo> page = PageFactory.defaultPage();
-        QueryWrapper<WorkSiteInfo> queryWrapper = new QueryWrapper<>();
-        if(StrUtil.isNotEmpty(workTitle)){
-            queryWrapper.like("WORK_TITLE",workTitle);
-        }
-        if(StrUtil.isNotEmpty(workRoad)){
-            queryWrapper.like("WORK_ROAD",workRoad);
-        }
-        if(StrUtil.isNotEmpty(workPersonName)){
-            queryWrapper.like("WORKER_NAME",workPersonName);
-        }
-        if(StrUtil.isNotEmpty(projectState)){
-            queryWrapper.eq("PROJECT_STATE",projectState);
-        }
-        if(StrUtil.isNotEmpty(startDate)){
-            queryWrapper.ge("br_work_site_info.CREATE_TIME",startDate + " 00:00:00");
-        }
-        if(StrUtil.isNotEmpty(endDate)){
-            queryWrapper.le("br_work_site_info.CREATE_TIME",endDate + " 23:59:59");
-        }
-        page = workSiteInfoService.selectListPage(page,queryWrapper);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-    @ApiOperation("开始作业")
-    @PostMapping("start")
-    @ResponseBody
-    public Object start(@ApiParam(value = "作业现场id",example = "0")@RequestParam Long projectId){
-        workSiteInfoService.start(projectId);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("完成作业")
-    @PostMapping("finish")
-    @ResponseBody
-    public Object finish(@ApiParam(value = "作业现场id", example = "0")@RequestParam Long projectId){
-        workSiteInfoService.finish(projectId);
-        return ResponseData.success();
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/WorkerController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/WorkerController.java
deleted file mode 100644
index 796f94c..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/WorkerController.java
+++ /dev/null
@@ -1,136 +0,0 @@
-package com.casic.missiles.modular.system.controller;
-
-
-import cn.hutool.core.util.ObjectUtil;
-import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.core.base.controller.BaseController;
-import com.casic.missiles.core.page.PageFactory;
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.DeviceDetailDTO;
-import com.casic.missiles.modular.system.entity.Device;
-import com.casic.missiles.modular.system.entity.Worker;
-import com.casic.missiles.modular.system.service.IWorkerService;
-import io.swagger.annotations.*;
-import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.*;
-
-import org.springframework.stereotype.Controller;
-
-import java.util.Date;
-import java.util.List;
-
-import static com.casic.missiles.model.response.ResponseData.DEFAULT_SUCCESS_MESSAGE;
-
-/**
- * <p>
- *  前端控制器
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@Controller
-@RequestMapping("/worker")
-@RequiredArgsConstructor
-@Api(tags = "人员管理接口")
-public class WorkerController extends BaseController {
-
-    private final IWorkerService workerService;
-
-    @ApiOperation("分页列表查询")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "name",value = "姓名", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "deptId",value = "所属部门", dataType = "Long", paramType = "query", example = "0"),
-            @ApiImplicitParam(name = "status",value = "当前状态（字典值）", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "startDate",value = "注册开始日期", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "endDate",value = "注册结束日期", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "workerType",value = "人员类型（字典值）", dataType = "String", paramType = "query")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = Worker.class),
-    })
-    @GetMapping("listPage")
-    @ResponseBody
-    public Object listPage(String name,Long deptId, String status,String startDate,String endDate,String workerType){
-        Page<Worker> page = PageFactory.defaultPage();
-        QueryWrapper<Worker> queryWrapper = new QueryWrapper<>();
-        if(StrUtil.isNotEmpty(name)){
-            queryWrapper.like("WORKER_NAME",name);
-        }
-        if(ObjectUtil.isNotEmpty(deptId)){
-            queryWrapper.eq("DEPT_ID",deptId);
-        }
-        if(StrUtil.isNotEmpty(workerType)){
-            queryWrapper.eq("WORKER_TYPE",workerType);
-        }
-        if(StrUtil.isNotEmpty(startDate)){
-            queryWrapper.ge("CREATE_TIME",startDate + " 00:00:00");
-        }
-        if(StrUtil.isNotEmpty(endDate)){
-            queryWrapper.le("CREATE_TIME",endDate + " 23:59:59");
-        }
-        if(StrUtil.isNotEmpty(status)){
-            queryWrapper.eq("`STATUS`",status);
-        }
-        page = workerService.selectListPage(page,queryWrapper);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-    @ApiOperation("新增人员")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "worker", value = "人员信息", dataType = "Worker", paramType = "body", required = true),
-            @ApiImplicitParam(name = "projectId", value = "项目ID(入场申请需要)", dataType = "Long", paramType = "query", example = "0")
-    })
-    @PostMapping("add")
-    @ResponseBody
-    public Object add(@ApiParam("worker")@RequestBody Worker worker,
-                      @RequestParam(required = false) Long projectId){
-        workerService.addWorker(worker,projectId);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("编辑人员")
-    @PostMapping("update")
-    @ResponseBody
-    public Object update(@RequestBody Worker worker){
-        workerService.updateById(worker);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("删除人员")
-    @PostMapping("delete")
-    @ResponseBody
-    public Object delete(@ApiParam("人员id列表")@RequestBody List<Long> workIds){
-        workerService.removeByIds(workIds);
-        return ResponseData.success();
-    }
-
-
-    @ApiOperation(value = "获取人脸图片",notes = "返回人脸图片url")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "cameraIp",value = "摄像头IP", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "cameraPort",value = "摄像头端口号", dataType = "String", paramType = "query"),
-    })
-    @GetMapping("/face/register")
-    @ResponseBody
-    public Object faceRegister(String cameraIp,String cameraPort){
-        return ResponseData.success(workerService.faceRegister(cameraIp, cameraPort));
-    }
-
-
-    @ApiOperation(value = "查询临时入场人员列表")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "projectId", value = "项目ID",required = true,dataType = "Long", paramType = "query", example = "0")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = Worker.class),
-    })
-    @GetMapping("/projectTempWorker")
-    @ResponseBody
-    public Object projectTempWorker(Long projectId){
-        return ResponseData.success(workerService.projectTempWorker(projectId));
-    }
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/AlarmTypeCountDTO.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/AlarmTypeCountDTO.java
deleted file mode 100644
index 1a165a1..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/AlarmTypeCountDTO.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.casic.missiles.modular.system.dto;
-
-import io.swagger.annotations.ApiModel;
-import lombok.Data;
-
-@ApiModel(value = "AlarmTypeCountDTO",description = "报警类型统计（首页）")
-@Data
-public class AlarmTypeCountDTO {
-
-    private String alarmType;
-    private String alarmTypeName;
-    private Integer alarmCount;
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/AlarmUpload.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/AlarmUpload.java
deleted file mode 100644
index 73d7799..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/AlarmUpload.java
+++ /dev/null
@@ -1,46 +0,0 @@
-package com.casic.missiles.modular.system.dto;
-
-import cn.hutool.core.util.StrUtil;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-@ApiModel(value = "AlarmUpload",description = "报警上传")
-@Data
-public class AlarmUpload {
-
-    @ApiModelProperty(value = "摄像头ip")
-    private String cameraIp;
-
-    @ApiModelProperty(value = "摄像头端口")
-    private String cameraPort;
-    @ApiModelProperty(value = "安全树甲烷设备ip")
-    private String gasIp;
-    @ApiModelProperty(value = "安全树甲烷设备端口")
-    private String gasPort;
-    @ApiModelProperty(value = "报警值")
-    private String alarmValue;
-    @ApiModelProperty(value = "报警时间")
-    private String alarmTime;
-    @ApiModelProperty(value = "报警类型")
-    private String alarmType;
-    @ApiModelProperty(value = "报警图片")
-    private String alarmImage;
-    @ApiModelProperty(value = "报警内容")
-    private String alarmContent;
-
-    @Override
-    public String toString() {
-        return "AlarmUpload{" +
-                "cameraIp='" + cameraIp + '\'' +
-                ", cameraPort='" + cameraPort + '\'' +
-                ", gasIp='" + gasIp + '\'' +
-                ", gasPort='" + gasPort + '\'' +
-                ", alarmValue='" + alarmValue + '\'' +
-                ", alarmTime='" + alarmTime + '\'' +
-                ", alarmType='" + alarmType + '\'' +
-                ", alarmImage='" + (StrUtil.isNotEmpty(alarmImage) ? alarmImage.substring(0,50) : "null") + '\'' +
-                ", alarmContent='" + alarmContent + '\'' +
-                '}';
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/DeviceDetailDTO.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/DeviceDetailDTO.java
deleted file mode 100644
index ea518d9..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/DeviceDetailDTO.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package com.casic.missiles.modular.system.dto;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.casic.missiles.modular.system.entity.Device;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-@ApiModel("DeviceDetailDTO")
-@Data
-public class DeviceDetailDTO extends Device {
-
-    @ApiModelProperty(value = "摄像头编号")
-    private String cameraCode;
-
-    @ApiModelProperty(value = "摄像头IP")
-    private String cameraIp;
-
-    @ApiModelProperty(value = "摄像头端口")
-    private String cameraPort;
-
-    @ApiModelProperty(value = "激甲编号")
-    private String gasCode;
-
-    @ApiModelProperty(value = "激甲IP")
-    private String gasIp;
-
-    @ApiModelProperty(value = "激甲端口")
-    private String gasPort;
-
-    @ApiModelProperty(value = "智能帽衬编号")
-    private String hatLiningCode;
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/WorkSiteDetailDTO.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/WorkSiteDetailDTO.java
deleted file mode 100644
index 29378ff..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/WorkSiteDetailDTO.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package com.casic.missiles.modular.system.dto;
-
-import com.casic.missiles.modular.system.entity.ProjectDevice;
-import com.casic.missiles.modular.system.entity.ProjectWorker;
-import com.casic.missiles.modular.system.entity.WorkSiteInfo;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.util.List;
-
-@Data
-@ApiModel("WorkSiteDetailDTO")
-public class WorkSiteDetailDTO extends WorkSiteInfo {
-
-    @ApiModelProperty(value = "安全树列表",dataType = "ProjectDevice")
-    private List<ProjectDevice> deviceList;
-
-    @ApiModelProperty(value = "人员列表",dataType = "ProjectWorker")
-    private List<ProjectWorker> workerList;
-
-
-
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/WorkerLocationDTO.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/WorkerLocationDTO.java
deleted file mode 100644
index 6fd7b24..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/WorkerLocationDTO.java
+++ /dev/null
@@ -1,68 +0,0 @@
-package com.casic.missiles.modular.system.dto;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-@ApiModel(value = "WorkerLocationDTO",description = "人员位置列表（首页）")
-@Data
-public class WorkerLocationDTO {
-
-    @ApiModelProperty("人员ID")
-    private Long workerId;
-
-    @ApiModelProperty("人员姓名")
-    private String workerName;
-
-    @ApiModelProperty("安全帽编号")
-    private String hatCode;
-
-    @ApiModelProperty("安全帽ID")
-    private Long hatId;
-
-    @ApiModelProperty("背心编号")
-    private String vastCode;
-
-    @ApiModelProperty("手环编号")
-    private String braceletCode;
-
-    @ApiModelProperty("位置")
-    private String location;
-
-    @ApiModelProperty("时间")
-    private String time;
-
-    @ApiModelProperty("经度")
-    private String lng;
-
-    @ApiModelProperty("纬度")
-    private String lat;
-
-    @ApiModelProperty("心率")
-    private String heartRate;
-
-    @ApiModelProperty("血氧")
-    private String bloodOxygen;
-
-    @ApiModelProperty("一氧化碳")
-    private String co;
-
-    @ApiModelProperty("甲烷")
-    private String gas;
-
-    @ApiModelProperty("硫化氢")
-    private String h2s;
-
-    @ApiModelProperty("氧气")
-    private String o2;
-
-    @ApiModelProperty("信号")
-    private String signal;
-
-    @ApiModelProperty("电量")
-    private String cell;
-
-    @ApiModelProperty("是否报警")
-    private boolean alarmFlag;
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Alarm.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Alarm.java
new file mode 100644
index 0000000..4d2b7ef
--- /dev/null
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Alarm.java
@@ -0,0 +1,103 @@
+package com.casic.missiles.modular.system.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import java.util.Date;
+
+/**
+ * <p>
+ * 报警记录表
+ * </p>
+ *
+ * @author zyj
+ * @since 2023-05-25
+ */
+@Data
+@TableName("bus_alarm")
+public class Alarm implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    @TableId(value = "ID",type = IdType.ASSIGN_ID)
+    private Long id;
+
+    /**
+     * 设备ID
+     */
+    @TableField("DEVICE_ID")
+    private Long deviceId;
+
+    /**
+     * 报警类型
+     */
+    @TableField("ALARM_TYPE")
+    private String alarmType;
+
+    /**
+     * 报警时间
+     */
+    @TableField("ALARM_TIME")
+    private Date alarmTime;
+
+    /**
+     * 报警状态
+     */
+    @TableField("ALARM_STATUS")
+    private String alarmStatus;
+
+    /**
+     * 报警位置
+     */
+    @TableField("ALARM_LOCATION")
+    private String alarmLocation;
+
+    /**
+     * 报警图片
+     */
+    @TableField("ALARM_IMAGE")
+    private String alarmImage;
+
+    /**
+     * 视频通道号
+     */
+    @TableField("CHANNEL_NO")
+    private Integer channelNo;
+
+    /**
+     * 报警内容
+     */
+    @TableField("ALARM_CONTENT")
+    private String alarmContent;
+
+    /**
+     * 消警时间
+     */
+    @TableField("CANCEL_TIME")
+    private Date cancelTime;
+
+
+    @Override
+    public String toString() {
+        return "Alarm{" +
+            "id=" + id +
+            ", deviceId=" + deviceId +
+            ", alarmType=" + alarmType +
+            ", alarmTime=" + alarmTime +
+            ", alarmStatus=" + alarmStatus +
+            ", alarmLocation=" + alarmLocation +
+            ", alarmImage=" + alarmImage +
+            ", channelNo=" + channelNo +
+            ", alarmContent=" + alarmContent +
+            ", cancelTime=" + cancelTime +
+        "}";
+    }
+}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusAlarm.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusAlarm.java
deleted file mode 100644
index efb4a23..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusAlarm.java
+++ /dev/null
@@ -1,159 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.alibaba.fastjson.annotation.JSONField;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.time.LocalDateTime;
-import java.util.Date;
-
-/**
- * <p>
- * 报警记录表
- * </p>
- *
- * @author zyj
- * @since 2023-05-16
- */
-@Data
-@ApiModel("Alarm")
-@TableName("br_bus_alarm")
-public class BusAlarm implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 项目ID
-     */
-    @ApiModelProperty(value = "项目ID")
-    @TableField("PROJECT_ID")
-    private Long projectId;
-
-    /**
-     * 设备ID
-     */
-    @ApiModelProperty(value = "设备ID")
-    @TableField("DEVICE_ID")
-    private Long deviceId;
-
-    /**
-     * 报警类型
-     */
-    @ApiModelProperty(value = "报警类型")
-    @TableField("ALARM_TYPE")
-    private String alarmType;
-
-    /**
-     * 报警状态
-     */
-    @ApiModelProperty(value = "报警状态")
-    @TableField("ALARM_STATUS")
-    private String alarmStatus;
-
-    /**
-     * 报警值
-     */
-    @ApiModelProperty(value = "报警值")
-    @TableField("ALARM_VALUE")
-    private String alarmValue;
-
-    /**
-     * 报警图片
-     */
-    @ApiModelProperty(value = "报警图片")
-    @TableField("ALARM_IMAGE")
-    private String alarmImage;
-
-    /**
-     * 报警内容
-     */
-    @ApiModelProperty(value = "报警内容")
-    @TableField("ALARM_CONTENT")
-    private String alarmContent;
-
-    /**
-     * 报警时间
-     */
-    @ApiModelProperty(value = "报警时间")
-    @TableField("ALARM_TIME")
-    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
-    private Date alarmTime;
-
-    /**
-     * 消警时间
-     */
-    @ApiModelProperty(value = "消警时间")
-    @TableField("CANCEL_TIME")
-    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
-    private Date cancelTime;
-
-    /**
-     * 报警位置经度
-     */
-    @ApiModelProperty(value = "报警位置经度")
-    @TableField("ALARM_LNG")
-    private String alarmLng;
-
-    /**
-     * 报警位置纬度
-     */
-    @ApiModelProperty(value = "报警位置纬度")
-    @TableField("ALARM_LAT")
-    private String alarmLat;
-
-    @ApiModelProperty("报警类型名称")
-    @TableField(exist = false)
-    private String alarmStatusName;
-    @ApiModelProperty("报警类型名称")
-    @TableField(exist = false)
-    private String alarmTypeName;
-    @ApiModelProperty("作业名称")
-    @TableField(exist = false)
-    private String workTitle;
-    @ApiModelProperty("所属道路")
-    @TableField(exist = false)
-    private String workRoad;
-    @ApiModelProperty("作业状态")
-    @TableField(exist = false)
-    private String projectState;
-    @ApiModelProperty("作业状态名称")
-    @TableField(exist = false)
-    private String projectStateName;
-    @ApiModelProperty("负责人姓名")
-    @TableField(exist = false)
-    private String workPersonName;
-    @ApiModelProperty("负责人联系方式")
-    @TableField(exist = false)
-    private String workPersonPhoneNumber;
-
-
-    @Override
-    public String toString() {
-        return "BusAlarm{" +
-                "id=" + id +
-                ", projectId=" + projectId +
-                ", deviceId=" + deviceId +
-                ", alarmType=" + alarmType +
-                ", alarmValue=" + alarmValue +
-                ", alarmStatus=" + alarmStatus +
-                ", alarmImage=" + alarmImage +
-                ", alarmContent=" + alarmContent +
-                ", alarmTime=" + alarmTime +
-                ", cancelTime=" + cancelTime +
-                ", alarmLng=" + alarmLng +
-                ", alarmLat=" + alarmLat +
-                "}";
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusEvent.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusEvent.java
deleted file mode 100644
index a0b7543..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusEvent.java
+++ /dev/null
@@ -1,100 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.time.LocalDateTime;
-import java.util.Date;
-import java.util.List;
-
-/**
- * <p>
- * 事件表
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@TableName("br_bus_event")
-@Data
-@ApiModel("BusEvent")
-public class BusEvent implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @ApiModelProperty("事件ID")
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 事件标题
-     */
-    @ApiModelProperty("事件名称")
-    @TableField("EVENT_TITLE")
-    private String eventTitle;
-
-    /**
-     * 上报人员
-     */
-    @ApiModelProperty("上报人员")
-    @TableField("UPLOAD_NAME")
-    private String uploadName;
-
-    /**
-     * 联系方式
-     */
-    @ApiModelProperty("联系方式")
-    @TableField("PHONE_NUMBER")
-    private String phoneNumber;
-
-    /**
-     * 事件描述
-     */
-    @ApiModelProperty("事件描述")
-    @TableField("EVENT_DESCRIPTION")
-    private String eventDescription;
-
-    @ApiModelProperty("经度")
-    @TableField("LNG")
-    private String lng;
-
-    @ApiModelProperty("纬度")
-    @TableField("LAT")
-    private String lat;
-
-    /**
-     * 事件上传时间
-     */
-    @ApiModelProperty("事件上传时间")
-    @TableField("CREATE_TIME")
-    private Date createTime;
-
-    @ApiModelProperty("事件照片")
-    @TableField(exist = false)
-    private List<BusEventImage> imageList;
-
-
-
-    @Override
-    public String toString() {
-        return "BusEvent{" +
-            "id=" + id +
-            ", eventTitle=" + eventTitle +
-            ", uploadName=" + uploadName +
-            ", phoneNumber=" + phoneNumber +
-            ", eventDescription=" + eventDescription +
-            ", lng=" + lng +
-            ", lat=" + lat +
-            ", createTime=" + createTime +
-        "}";
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusEventImage.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusEventImage.java
deleted file mode 100644
index 1e75245..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusEventImage.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-
-/**
- * <p>
- * 事件图片表
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@TableName("br_bus_event_image")
-@Data
-@ApiModel("BusEventImage")
-public class BusEventImage implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 事件ID
-     */
-    @TableField("EVENT_ID")
-    private Long eventId;
-
-    /**
-     * 报警图片
-     */
-    @TableField("IMAGE")
-    @ApiModelProperty("图片url")
-    private String image;
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Device.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Device.java
index df89c70..ea7db5f 100644
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Device.java
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Device.java
@@ -1,30 +1,23 @@
 package com.casic.missiles.modular.system.entity;
 
-import com.alibaba.fastjson.annotation.JSONField;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.casic.missiles.core.base.json.DateDeserializer;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
-import java.util.Date;
 
 /**
  * <p>
- * 
+ * 设备记录表
  * </p>
  *
  * @author zyj
- * @since 2023-04-14
+ * @since 2023-05-25
  */
-@ApiModel("Device")
-@TableName("br_device")
 @Data
+@TableName("bus_device")
 public class Device implements Serializable {
 
     private static final long serialVersionUID = 1L;
@@ -32,82 +25,86 @@
     /**
      * 主键
      */
-    @ApiModelProperty(value = "设备ID")
     @TableId(value = "ID",type = IdType.ASSIGN_ID)
     private Long id;
 
     /**
-     * 设备编号
+     * 设备名称
      */
-    @ApiModelProperty(value = "设备编号")
-    @TableField("DEVICE_CODE")
-    private String deviceCode;
+    @TableField("DEVICE_NAME")
+    private String deviceName;
 
     /**
-     * 设备类型
+     * IP
      */
-    @ApiModelProperty(value = "设备类型")
-    @TableField("DEVICE_TYPE")
-    private String deviceType;
+    @TableField("IP")
+    private String ip;
 
     /**
-     * 设备批次
+     * 端口
      */
-    @ApiModelProperty(value = "设备批次")
-    @TableField("DEVICE_BATCH")
-    private String deviceBatch;
+    @TableField("PORT")
+    private String port;
 
     /**
-     * 厂家
+     * 用户名
      */
-    @ApiModelProperty(value = "厂家")
-    @TableField("MANUFACTURER")
-    private String manufacturer;
+    @TableField("USER_NAME")
+    private String userName;
 
     /**
-     * 是否供电
+     * 密码
      */
-    @ApiModelProperty(value = "是否供电")
-    @TableField("IS_POWER_SUPPLY")
-    private String isPowerSupply;
+    @TableField("PASSWORD")
+    private String password;
 
     /**
-     * 创建时间
+     * 连接类型
      */
-    @ApiModelProperty(value = "创建时间",dataType = "Date")
-    @TableField("CREATE_TIME")
-    private Date createTime;
+    @TableField("CONNECT_TYPE")
+    private String connectType;
 
-    @ApiModelProperty(value = "设备类型名称")
-    @TableField(exist = false)
-    private String deviceTypeName;
+    /**
+     * 位置
+     */
+    @TableField("LOCATION")
 
-    @ApiModelProperty(value = "是否供电名称")
-    @TableField(exist = false)
-    private String isPowerSupplyName;
+    private String location;
 
-    @ApiModelProperty(value = "注册时间",dataType = "String")
-    @TableField(exist = false)
-    private String registerTime;
+    /**
+     * 设备状态
+     */
+    @TableField("STATUS")
 
-    @ApiModelProperty(value = "当前状态")
-    @TableField(exist = false)
     private String status;
 
-    @ApiModelProperty(value = "当前状态名称")
-    @TableField(exist = false)
-    private String statusName;
+    /**
+     * 报警分组
+     */
+    @TableField("ALARM_GROUP")
+
+    private Long alarmGroup;
+
+    /**
+     * 视频通道数(预留)
+     */
+    @TableField("CHANNEL_NUM")
+    private Integer channelNum;
 
     @Override
     public String toString() {
         return "Device{" +
             "id=" + id +
-            ", deviceCode=" + deviceCode +
-            ", deviceType=" + deviceType +
-            ", deviceBatch=" + deviceBatch +
-            ", manufacturer=" + manufacturer +
-            ", isPowerSupply=" + isPowerSupply +
-            ", createTime=" + createTime +
+            ", deviceName=" + deviceName +
+            ", ip=" + ip +
+            ", port=" + port +
+            ", userName=" + userName +
+            ", password=" + password +
+            ", connectType=" + connectType +
+            ", location=" + location +
+            ", status=" + status +
+            ", alarmGroup=" + alarmGroup +
+            ", channelNum=" + channelNum +
         "}";
     }
 }
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/DeviceExt.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/DeviceExt.java
deleted file mode 100644
index 5ee7015..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/DeviceExt.java
+++ /dev/null
@@ -1,99 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-
-/**
- * <p>
- * 设备扩展信息表（安全树）
- * </p>
- *
- * @author zyj
- * @since 2023-04-27
- */
-@Data
-@TableName("br_device_ext")
-public class DeviceExt implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 设备ID
-     */
-    @TableField("DEVICE_ID")
-    private Long deviceId;
-
-    /**
-     * 摄像头编号
-     */
-    @TableField("CAMERA_CODE")
-    private String cameraCode;
-
-    /**
-     * 摄像头IP
-     */
-    @TableField("CAMERA_IP")
-    private String cameraIp;
-
-    /**
-     * 摄像头端口
-     */
-    @TableField("CAMERA_PORT")
-    private String cameraPort;
-
-    /**
-     * 激甲编号
-     */
-    @TableField("GAS_CODE")
-    private String gasCode;
-
-    /**
-     * 激甲IP
-     */
-    @TableField("GAS_IP")
-    private String gasIp;
-
-    /**
-     * 激甲端口
-     */
-    @TableField("GAS_PORT")
-    private String gasPort;
-
-    /**
-     * 甲烷报警阈值
-     */
-    @TableField("GAS_THRESHOLD")
-    private String gasThreshold;
-
-    @TableField(value = "HAT_LINING_CODE")
-    private String hatLiningCode;
-
-
-    @Override
-    public String toString() {
-        return "DeviceExt{" +
-            "id=" + id +
-            ", deviceId=" + deviceId +
-            ", cameraCode=" + cameraCode +
-            ", cameraIp=" + cameraIp +
-            ", cameraPort=" + cameraPort +
-            ", gasCode=" + gasCode +
-            ", gasIp=" + gasIp +
-            ", gasPort=" + gasPort +
-            ", gasThreshold=" + gasThreshold +
-            ", hatLiningCode=" + hatLiningCode +
-        "}";
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/ProjectDevice.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/ProjectDevice.java
deleted file mode 100644
index c4f3472..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/ProjectDevice.java
+++ /dev/null
@@ -1,62 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-
-/**
- * <p>
- * 
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@Data
-@ApiModel("ProjectDevice")
-@TableName("br_project_device")
-public class ProjectDevice implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 作业现场ID
-     */
-    @TableField("PROJECT_ID")
-    private Long projectId;
-
-    /**
-     * 设备ID
-     */
-    @TableField("DEVICE_ID")
-    @ApiModelProperty("设备ID（新增编辑时传）")
-    private Long deviceId;
-
-    /**
-     * 设备编号
-     */
-    @TableField(exist = false)
-    @ApiModelProperty("设备编号（详情中展示，新增编辑不用传）")
-    private String deviceCode;
-
-    @Override
-    public String toString() {
-        return "ProjectDevice{" +
-            "id=" + id +
-            ", projectId=" + projectId +
-            ", deviceId=" + deviceId +
-        "}";
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/ProjectWorker.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/ProjectWorker.java
deleted file mode 100644
index 10b23c4..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/ProjectWorker.java
+++ /dev/null
@@ -1,104 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import java.io.Serializable;
-
-/**
- * <p>
- * 
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@ApiModel("ProjectWorker")
-@TableName("br_project_worker")
-@Data
-@NoArgsConstructor
-@AllArgsConstructor
-public class ProjectWorker implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 作业现场ID
-     */
-    @TableField("PROJECT_ID")
-    private Long projectId;
-
-    /**
-     * 人员ID
-     */
-    @ApiModelProperty("人员ID")
-    @TableField("WORKER_ID")
-    private Long workerId;
-
-    /**
-     * 安全帽编号
-     */
-    @ApiModelProperty("安全帽编号")
-    @TableField("HAT_CODE")
-    private String hatCode;
-
-    /**
-     * 背心编号
-     */
-    @ApiModelProperty("背心编号")
-    @TableField("VAST_CODE")
-    private String vastCode;
-
-    /**
-     * 手环编号
-     */
-    @ApiModelProperty("手环编号")
-    @TableField("BRACELET_CODE")
-    private String braceletCode;
-
-    @ApiModelProperty("人员姓名（详情中展示，新增编辑不用传）")
-    @TableField(exist = false)
-    private String workerName;
-
-    @ApiModelProperty("人员部门ID（详情中展示，新增编辑不用传）")
-    @TableField(exist = false)
-    private String workerDeptId;
-
-    @ApiModelProperty("人员部门名称（详情中展示，新增编辑不用传）")
-    @TableField(exist = false)
-    private String workerDeptName;
-
-    @ApiModelProperty("人员联系方式（详情中展示，新增编辑不用传）")
-    @TableField(exist = false)
-    private String workerPhoneNumber;
-
-    public ProjectWorker(Long projectId, Long workerId) {
-        this.projectId = projectId;
-        this.workerId = workerId;
-    }
-
-    @Override
-    public String toString() {
-        return "ProjectWorker{" +
-            "id=" + id +
-            ", projectId=" + projectId +
-            ", workerId=" + workerId +
-            ", hatCode=" + hatCode +
-            ", vastCode=" + vastCode +
-            ", braceletCode=" + braceletCode +
-        "}";
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/WorkSiteInfo.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/WorkSiteInfo.java
deleted file mode 100644
index fa6f41d..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/WorkSiteInfo.java
+++ /dev/null
@@ -1,130 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.alibaba.fastjson.annotation.JSONField;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.time.LocalDateTime;
-import java.util.Date;
-
-/**
- * <p>
- * 作业现场表
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@ApiModel("WorkSiteInfo")
-@TableName("br_work_site_info")
-@Data
-public class WorkSiteInfo implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @ApiModelProperty("作业现场ID")
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 作业名称
-     */
-    @ApiModelProperty("作业名称")
-    @TableField("WORK_TITLE")
-    private String workTitle;
-
-    /**
-     * 责任人
-     */
-    @ApiModelProperty("责任人（人员ID）")
-    @TableField("WORK_PERSON")
-    private Long workPerson;
-
-    /**
-     * 作业描述
-     */
-    @ApiModelProperty("作业描述")
-    @TableField("WORK_SITE_DESC")
-    private String workSiteDesc;
-
-    /**
-     * 作业状态
-     */
-    @ApiModelProperty("作业状态")
-    @TableField("PROJECT_STATE")
-    private String projectState;
-
-    /**
-     * 所属道路
-     */
-    @ApiModelProperty("所属道路")
-    @TableField("WORK_ROAD")
-    private String workRoad;
-
-    @TableField("IMAGE_URL")
-    private String imageUrl;
-
-    @TableField("CREATE_TIME")
-    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
-    private Date createTime;
-    @TableField("UPDATE_TIME")
-    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
-    private Date updateTime;
-
-    @ApiModelProperty("开始时间")
-    @TableField("START_TIME")
-    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
-    private Date startTime;
-
-    @ApiModelProperty("结束时间")
-    @TableField("FINISH_TIME")
-    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
-    private Date finishTime;
-
-    @ApiModelProperty("负责人姓名（详情中使用，新增编辑不用传）")
-    @TableField(exist = false)
-    private String workPersonName;
-
-    @ApiModelProperty("负责人联系方式（详情中使用，新增编辑不用传）")
-    @TableField(exist = false)
-    private String workPersonPhoneNumber;
-
-    @ApiModelProperty("负责人所属部门ID（详情中使用，新增编辑不用传）")
-    @TableField(exist = false)
-    private Long workPersonDeptId;
-
-    @ApiModelProperty("负责人所属部门名称（详情中使用，新增编辑不用传）")
-    @TableField(exist = false)
-    private String workPersonDeptName;
-
-    @ApiModelProperty(value = "注册时间",dataType = "String")
-    @TableField(exist = false)
-    private String registerTime;
-
-    @ApiModelProperty("作业状态名称")
-    @TableField(exist = false)
-    private String projectStateName;
-
-    @Override
-    public String toString() {
-        return "WorkSiteInfo{" +
-            "id=" + id +
-            ", workTitle=" + workTitle +
-            ", workPerson=" + workPerson +
-            ", workSiteDesc=" + workSiteDesc +
-            ", projectState=" + projectState +
-            ", imageUrl=" + imageUrl +
-            ", updateTime=" + updateTime +
-            ", workRoad=" + workRoad +
-        "}";
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Worker.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Worker.java
deleted file mode 100644
index 28a4daa..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Worker.java
+++ /dev/null
@@ -1,147 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.time.LocalDateTime;
-import java.util.Date;
-
-/**
- * <p>
- * 
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@ApiModel("Worker")
-@TableName("br_worker")
-@Data
-public class Worker implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @ApiModelProperty(value = "人员ID")
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 姓名
-     */
-    @ApiModelProperty(value = "姓名")
-    @TableField("WORKER_NAME")
-    private String workerName;
-
-    /**
-     * 性别
-     */
-    @ApiModelProperty(value = "性别")
-    @TableField("GENDER")
-    private String gender;
-
-    /**
-     * 所属部门
-     */
-    @ApiModelProperty(value = "所属部门(人员管理)")
-    @TableField("DEPT_ID")
-    private Long deptId;
-
-    /**
-     * 所属单位
-     */
-    @ApiModelProperty(value = "所属单位(入场申请中使用)")
-    @TableField("OWNER_SHIP")
-    private String ownerShip;
-
-    /**
-     * 联系方式
-     */
-    @ApiModelProperty(value = "联系方式")
-    @TableField("PHONE_NUMBER")
-    private String phoneNumber;
-
-    /**
-     * 证件号
-     */
-    @ApiModelProperty(value = "证件号")
-    @TableField("ID_CARD_NUMBER")
-    private String idCardNumber;
-
-    /**
-     * 入场原因
-     */
-    @ApiModelProperty(value = "入场原因（入场申请中使用）")
-    @TableField("ENTER_REASON")
-    private String enterReason;
-
-    /**
-     * 入场人脸照片
-     */
-    @ApiModelProperty(value = "人脸照片（照片路径）")
-    @TableField("WORKER_AVATAR")
-    private String workerAvatar;
-
-    /**
-     * 申请入场时间
-     */
-    @ApiModelProperty(value = "注册时间/申请入场时间")
-    @TableField("CREATE_TIME")
-    private Date createTime;
-
-    /**
-     * 人员类型
-     */
-    @ApiModelProperty(value = "人员类型（区分人员管理和入场申请）")
-    @TableField("WORKER_TYPE")
-    private String workerType;
-
-    @ApiModelProperty(value = "性别名称")
-    @TableField(exist = false)
-    private String genderName;
-
-    @ApiModelProperty(value = "部门名称")
-    @TableField(exist = false)
-    private String deptName;
-
-    @ApiModelProperty(value = "注册时间",dataType = "String")
-    @TableField(exist = false)
-    private String registerTime;
-
-    @ApiModelProperty(value = "当前状态")
-    @TableField(exist = false)
-    private String status;
-
-    @ApiModelProperty(value = "当前状态名称")
-    @TableField(exist = false)
-    private String statusName;
-
-    @ApiModelProperty(value = "是否注册(0未注册；1已注册)",allowableValues = "0,1")
-    @TableField(exist = false)
-    private String isRegister;
-
-    @Override
-    public String toString() {
-        return "Worker{" +
-            "id=" + id +
-            ", workerName=" + workerName +
-            ", gender=" + gender +
-            ", deptId=" + deptId +
-            ", ownerShip=" + ownerShip +
-            ", phoneNumber=" + phoneNumber +
-            ", idCardNumber=" + idCardNumber +
-            ", enterReason=" + enterReason +
-            ", workerAvatar=" + workerAvatar +
-            ", createTime=" + createTime +
-            ", workerType=" + workerType +
-        "}";
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/AlarmMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/AlarmMapper.java
new file mode 100644
index 0000000..ea4c8be
--- /dev/null
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/AlarmMapper.java
@@ -0,0 +1,16 @@
+package com.casic.missiles.modular.system.mapper;
+
+import com.casic.missiles.modular.system.entity.Alarm;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 报警记录表 Mapper 接口
+ * </p>
+ *
+ * @author zyj
+ * @since 2023-05-25
+ */
+public interface AlarmMapper extends BaseMapper<Alarm> {
+
+}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/BusAlarmMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/BusAlarmMapper.java
deleted file mode 100644
index 9801742..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/BusAlarmMapper.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package com.casic.missiles.modular.system.mapper;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.modular.system.dto.AlarmTypeCountDTO;
-import com.casic.missiles.modular.system.entity.BusAlarm;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * <p>
- * 报警记录表 Mapper 接口
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface BusAlarmMapper extends BaseMapper<BusAlarm> {
-
-    Page<BusAlarm> listPage(Page<BusAlarm> page,@Param("ew")  QueryWrapper<BusAlarm> queryWrapper);
-
-    void cancelAlarm(@Param("deviceId")Long deviceId,@Param("alarmType") String alarmType);
-
-    List<AlarmTypeCountDTO> alarmCount(@Param("projectId")Long projectId, @Param("alarmStatus")String alarmStatus);
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/BusEventImageMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/BusEventImageMapper.java
deleted file mode 100644
index 9590b7d..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/BusEventImageMapper.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.casic.missiles.modular.system.mapper;
-
-import com.casic.missiles.modular.system.entity.BusEventImage;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * <p>
- * 事件图片表 Mapper 接口
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface BusEventImageMapper extends BaseMapper<BusEventImage> {
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/BusEventMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/BusEventMapper.java
deleted file mode 100644
index 3c85edf..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/BusEventMapper.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.casic.missiles.modular.system.mapper;
-
-import com.casic.missiles.modular.system.entity.BusEvent;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * <p>
- * 事件表 Mapper 接口
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface BusEventMapper extends BaseMapper<BusEvent> {
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/DeviceExtMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/DeviceExtMapper.java
deleted file mode 100644
index 4ca9212..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/DeviceExtMapper.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.casic.missiles.modular.system.mapper;
-
-import com.casic.missiles.modular.system.entity.DeviceExt;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * <p>
- * 设备扩展信息表（安全树） Mapper 接口
- * </p>
- *
- * @author zyj
- * @since 2023-04-27
- */
-public interface DeviceExtMapper extends BaseMapper<DeviceExt> {
-
-}

diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/AlarmController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/AlarmController.java
new file mode 100644
index 0000000..1795cf1
--- /dev/null
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/AlarmController.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.modular.system.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.stereotype.Controller;
+
+/**
+ * <p>
+ * 报警记录表 前端控制器
+ * </p>
+ *
+ * @author zyj
+ * @since 2023-05-25
+ */
+@Controller
+@RequestMapping("/system/alarm")
+public class AlarmController {
+
+}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusAlarmController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusAlarmController.java
deleted file mode 100644
index 1f82ebb..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusAlarmController.java
+++ /dev/null
@@ -1,102 +0,0 @@
-package com.casic.missiles.modular.system.controller;
-
-
-import cn.hutool.core.util.ObjectUtil;
-import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.core.base.controller.BaseController;
-import com.casic.missiles.core.page.PageFactory;
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.AlarmUpload;
-import com.casic.missiles.modular.system.dto.DeviceDetailDTO;
-import com.casic.missiles.modular.system.entity.BusAlarm;
-import com.casic.missiles.modular.system.service.IBusAlarmService;
-import io.swagger.annotations.*;
-import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.*;
-
-import org.springframework.stereotype.Controller;
-
-import static com.casic.missiles.model.response.ResponseData.DEFAULT_SUCCESS_MESSAGE;
-import static com.casic.missiles.modular.system.consts.AlarmConst.ALARM_STATUS_MANUAL_CANCEL;
-
-/**
- * <p>
- * 报警记录表 前端控制器
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@Api(tags = "报警管理接口")
-@Controller
-@RequestMapping("/alarm")
-@RequiredArgsConstructor
-public class BusAlarmController extends BaseController {
-
-    private final IBusAlarmService alarmService;
-
-    @ApiOperation("报警上报接口")
-    @PostMapping("/upload")
-    @ResponseBody
-    public Object upload(@RequestBody AlarmUpload alarmUpload){
-        alarmService.alarmUpload(alarmUpload);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("报警列表分页查询")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "workTitle", value = "作业名称",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "projectId", value = "作业ID",dataType = "Long", paramType = "query",example = "0"),
-            @ApiImplicitParam(name = "alarmStatus", value = "报警状态",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "projectState", value = "作业状态",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "alarmType", value = "报警类型",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "alarmStartTime", value = "报警开始时间",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "alarmEndTime", value = "报警结束时间",dataType = "String", paramType = "query")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = BusAlarm.class),
-    })
-    @GetMapping("/listPage")
-    @ResponseBody
-    public Object listPage(String workTitle,Long projectId,String alarmStatus,String projectState,String alarmType,String alarmStartTime,String alarmEndTime){
-        Page<BusAlarm> page = PageFactory.defaultPage();
-        QueryWrapper<BusAlarm> queryWrapper = new QueryWrapper<>();
-        if(StrUtil.isNotEmpty(workTitle)){
-            queryWrapper.like("p.WORK_TITLE",workTitle);
-        }
-        if(ObjectUtil.isNotEmpty(projectId)){
-            queryWrapper.eq("alarm.PROJECT_ID",projectId);
-        }
-        if(StrUtil.isNotEmpty(alarmStatus)){
-            queryWrapper.eq("alarm.ALARM_STATUS",alarmStatus);
-        }
-        if(StrUtil.isNotEmpty(projectState)){
-            queryWrapper.eq("p.PROJECT_STATE",projectState);
-        }
-        if(StrUtil.isNotEmpty(alarmType)){
-            queryWrapper.eq("alarm.ALARM_TYPE",alarmType);
-        }
-        if(StrUtil.isNotEmpty(alarmStartTime)){
-            queryWrapper.ge("alarm.ALARM_TIME",alarmStartTime);
-        }
-        if(StrUtil.isNotEmpty(alarmEndTime)){
-            queryWrapper.le("alarm.ALARM_TIME",alarmEndTime);
-        }
-        page = alarmService.listPage(page,queryWrapper);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-    @ApiOperation("消警")
-    @PostMapping("/cancel")
-    @ResponseBody
-    public Object cancel(@RequestParam("alarmId") Long alarmId){
-        UpdateWrapper<BusAlarm> updateWrapper = new UpdateWrapper<>();
-        updateWrapper.eq("ID",alarmId);
-        updateWrapper.set("ALARM_STATUS",ALARM_STATUS_MANUAL_CANCEL);
-        alarmService.update(updateWrapper);
-        return ResponseData.success();
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusEventController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusEventController.java
deleted file mode 100644
index dde5aad..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusEventController.java
+++ /dev/null
@@ -1,41 +0,0 @@
-package com.casic.missiles.modular.system.controller;
-
-
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.entity.BusEvent;
-import com.casic.missiles.modular.system.service.IBusEventService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.ResponseBody;
-
-/**
- * <p>
- * 事件表 前端控制器
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@Controller
-@RequestMapping("/event")
-@Api(tags = "事件上报")
-@RequiredArgsConstructor
-public class BusEventController {
-
-    private final IBusEventService eventService;
-
-    @ApiOperation("事件上报")
-    @PostMapping("add")
-    @ResponseBody
-    public Object add(@RequestBody BusEvent busEvent){
-        eventService.saveBusEvent(busEvent);
-        return ResponseData.success();
-    }
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
index 03abc5f..aa50d78 100644
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
@@ -1,121 +1,20 @@
 package com.casic.missiles.modular.system.controller;
 
 
-import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.core.base.controller.BaseController;
-import com.casic.missiles.core.page.PageFactory;
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.DeviceDetailDTO;
-import com.casic.missiles.modular.system.entity.Device;
-import com.casic.missiles.modular.system.service.IDeviceExtService;
-import com.casic.missiles.modular.system.service.IDeviceService;
-import io.swagger.annotations.*;
-import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.RequestMapping;
 
 import org.springframework.stereotype.Controller;
 
-import java.time.LocalDateTime;
-import java.util.Date;
-import java.util.List;
-
-import static com.casic.missiles.model.response.ResponseData.DEFAULT_SUCCESS_MESSAGE;
-
 /**
  * <p>
- *  前端控制器
+ * 设备记录表 前端控制器
  * </p>
  *
  * @author zyj
- * @since 2023-04-14
+ * @since 2023-05-25
  */
-@Api(tags = "设备管理接口")
-@RequiredArgsConstructor
 @Controller
-@RequestMapping("/device")
-public class DeviceController extends BaseController {
-    private final IDeviceService deviceService;
-    private final IDeviceExtService deviceExtService;
-
-    @ApiOperation("设备分页列表")
-    @ApiImplicitParams({
-        @ApiImplicitParam(name = "deviceType", value = "设备类型",dataType = "String", paramType = "query"),
-        @ApiImplicitParam(name = "deviceCode", value = "设备编号",dataType = "String", paramType = "query"),
-        @ApiImplicitParam(name = "status", value = "设备状态",dataType = "String", paramType = "query"),
-        @ApiImplicitParam(name = "projectId", value = "作业ID（如果传此参数，列表中返回该作业使用的设备）",dataType = "Long", paramType = "query", example = "0")
-    })
-    @ApiResponses({
-        @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = DeviceDetailDTO.class),
-    })
-    @GetMapping("listPage")
-    @ResponseBody
-    public Object listPage(String deviceType, String deviceCode, String status,Long projectId){
-        Page<DeviceDetailDTO> page = PageFactory.defaultPage();
-        QueryWrapper<DeviceDetailDTO> queryWrapper = new QueryWrapper<>();
-        if(StrUtil.isNotEmpty(deviceType)){
-            queryWrapper.eq("DEVICE_TYPE",deviceType);
-        }
-        if(StrUtil.isNotEmpty(deviceCode)){
-            queryWrapper.like("DEVICE_CODE",deviceCode);
-        }
-        page = deviceService.listPage(page,queryWrapper,status,projectId);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-    @ApiOperation("新增设备")
-    @PostMapping("add")
-    @ResponseBody
-    public Object add(@RequestBody DeviceDetailDTO deviceDetailDTO){
-        deviceService.saveDevice(deviceDetailDTO);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("编辑设备")
-    @PostMapping("update")
-    @ResponseBody
-    public Object update(@RequestBody DeviceDetailDTO deviceDetailDTO){
-        deviceService.updateDevice(deviceDetailDTO);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("删除设备")
-    @PostMapping("delete")
-    @ResponseBody
-    public Object delete(@ApiParam("设备id列表")@RequestBody List<Long> deviceIds){
-        deviceService.deleteDevices(deviceIds);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("设置甲烷阈值")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "gasIp", value = "安全树甲烷设备IP",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "gasPort", value = "安全树甲烷端口",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "threshold", value = "甲烷阈值",dataType = "String", paramType = "query")
-    })
-    @PostMapping("setThreshold")
-    @ResponseBody
-    public Object setThreshold(String gasIp,String gasPort,String threshold){
-        deviceExtService.setGasThreshold(gasIp, gasPort, threshold);
-        return ResponseData.success();
-    }
-
-
-    @ApiOperation("查询甲烷阈值")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "gasIp", value = "安全树甲烷设备IP",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "gasPort", value = "安全树甲烷端口",dataType = "String", paramType = "query")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = "{\"code\": 200,\"data\": \"100\",\"message\": \"请求成功\",\"success\": true}",response = String.class),
-    })
-    @GetMapping("getThreshold")
-    @ResponseBody
-    public Object getThreshold(String gasIp,String gasPort){
-        String data = deviceExtService.getGasThreshold(gasIp, gasPort);
-        return ResponseData.success(data);
-    }
-
+@RequestMapping("/system/device")
+public class DeviceController {
 
 }
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/OverviewController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/OverviewController.java
deleted file mode 100644
index 7570504..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/OverviewController.java
+++ /dev/null
@@ -1,70 +0,0 @@
-package com.casic.missiles.modular.system.controller;
-
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.AlarmTypeCountDTO;
-import com.casic.missiles.modular.system.dto.DeviceLocationDTO;
-import com.casic.missiles.modular.system.dto.WorkerLocationDTO;
-import com.casic.missiles.modular.system.service.IBusAlarmService;
-import com.casic.missiles.modular.system.service.IProjectDeviceService;
-import com.casic.missiles.modular.system.service.IProjectWorkerService;
-import io.swagger.annotations.*;
-import lombok.RequiredArgsConstructor;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.ResponseBody;
-
-import static com.casic.missiles.model.response.ResponseData.DEFAULT_SUCCESS_MESSAGE;
-import static com.casic.missiles.modular.system.consts.AlarmConst.ALARM_STATUS_ON;
-
-@Api(tags = "首页看板接口")
-@Controller
-@RequestMapping("overview")
-@RequiredArgsConstructor
-public class OverviewController {
-
-    private final IBusAlarmService alarmService;
-    private final IProjectDeviceService projectDeviceService;
-
-    private final IProjectWorkerService projectWorkerService;
-
-
-    @ApiOperation("报警统计接口")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "projectId", value = "作业ID",dataType = "Long", paramType = "query", example = "0")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = AlarmTypeCountDTO.class),
-    })
-    @GetMapping("/alarmCount")
-    @ResponseBody
-    public Object alarmCount(Long projectId){
-        return ResponseData.success(alarmService.alarmCount(projectId,ALARM_STATUS_ON));
-    }
-
-    @ApiOperation("设备列表接口")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "projectId", value = "作业ID",dataType = "Long", paramType = "query", example = "0")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = DeviceLocationDTO.class),
-    })
-    @GetMapping("/deviceList")
-    @ResponseBody
-    public Object deviceList(Long projectId){
-        return ResponseData.success(projectDeviceService.selectDeviceLocationList(projectId));
-    }
-
-    @ApiOperation("人员列表接口")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "projectId", value = "作业ID",dataType = "Long", paramType = "query", example = "0")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = WorkerLocationDTO.class),
-    })
-    @GetMapping("/workerList")
-    @ResponseBody
-    public Object workerList(Long projectId){
-        return ResponseData.success(projectWorkerService.selectWorkerLocationDTO(projectId));
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/WorkSiteInfoController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/WorkSiteInfoController.java
deleted file mode 100644
index af36d69..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/WorkSiteInfoController.java
+++ /dev/null
@@ -1,130 +0,0 @@
-package com.casic.missiles.modular.system.controller;
-
-
-import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.core.base.controller.BaseController;
-import com.casic.missiles.core.page.PageFactory;
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.WorkSiteDetailDTO;
-import com.casic.missiles.modular.system.entity.WorkSiteInfo;
-import com.casic.missiles.modular.system.service.IWorkSiteInfoService;
-import io.swagger.annotations.*;
-import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.*;
-
-import org.springframework.stereotype.Controller;
-
-import java.util.List;
-
-import static com.casic.missiles.model.response.ResponseData.DEFAULT_SUCCESS_MESSAGE;
-
-/**
- * <p>
- * 作业现场表 前端控制器
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@Controller
-@RequestMapping("/site")
-@Api(tags = "作业现场管理")
-@RequiredArgsConstructor
-public class WorkSiteInfoController extends BaseController {
-
-
-    private final IWorkSiteInfoService workSiteInfoService;
-
-    @ApiOperation("新增作业现场")
-    @PostMapping("add")
-    @ResponseBody
-    public Object addWorkSite(@RequestBody WorkSiteDetailDTO workSiteDetailDTO){
-        workSiteInfoService.addWorkSiteInfo(workSiteDetailDTO);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("编辑作业现场")
-    @PostMapping("update")
-    @ResponseBody
-    public Object updateWorkSite(@RequestBody WorkSiteDetailDTO workSiteDetailDTO){
-        workSiteInfoService.updateWorkSiteInfo(workSiteDetailDTO);
-        return ResponseData.success();
-    }
-
-
-    @ApiOperation("删除作业现场")
-    @PostMapping("delete")
-    @ResponseBody
-    public Object delete(@ApiParam("作业现场id列表")@RequestBody List<Long> projectIds){
-        workSiteInfoService.deleteProjects(projectIds);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("查询作业现场详情")
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = WorkSiteDetailDTO.class),
-    })
-    @GetMapping("detail")
-    @ResponseBody
-    public Object delete(@ApiParam(value = "作业现场id", example = "0")@RequestParam Long projectId){
-        WorkSiteDetailDTO detailDTO = workSiteInfoService.getWorkSiteDetail(projectId);
-        return ResponseData.success(detailDTO);
-    }
-
-    @ApiOperation("分页列表查询")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "workTitle",value = "作业名称", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "workRoad",value = "所属道路", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "workPersonName",value = "责任人姓名", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "startDate",value = "注册开始日期", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "endDate",value = "注册结束日期", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "projectState",value = "当前状态（字典值）", dataType = "String", paramType = "query")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = WorkSiteInfo.class),
-    })
-    @GetMapping("listPage")
-    @ResponseBody
-    public Object listPage(String workTitle,String workRoad,String workPersonName,String projectState,String startDate,String endDate){
-        Page<WorkSiteInfo> page = PageFactory.defaultPage();
-        QueryWrapper<WorkSiteInfo> queryWrapper = new QueryWrapper<>();
-        if(StrUtil.isNotEmpty(workTitle)){
-            queryWrapper.like("WORK_TITLE",workTitle);
-        }
-        if(StrUtil.isNotEmpty(workRoad)){
-            queryWrapper.like("WORK_ROAD",workRoad);
-        }
-        if(StrUtil.isNotEmpty(workPersonName)){
-            queryWrapper.like("WORKER_NAME",workPersonName);
-        }
-        if(StrUtil.isNotEmpty(projectState)){
-            queryWrapper.eq("PROJECT_STATE",projectState);
-        }
-        if(StrUtil.isNotEmpty(startDate)){
-            queryWrapper.ge("br_work_site_info.CREATE_TIME",startDate + " 00:00:00");
-        }
-        if(StrUtil.isNotEmpty(endDate)){
-            queryWrapper.le("br_work_site_info.CREATE_TIME",endDate + " 23:59:59");
-        }
-        page = workSiteInfoService.selectListPage(page,queryWrapper);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-    @ApiOperation("开始作业")
-    @PostMapping("start")
-    @ResponseBody
-    public Object start(@ApiParam(value = "作业现场id",example = "0")@RequestParam Long projectId){
-        workSiteInfoService.start(projectId);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("完成作业")
-    @PostMapping("finish")
-    @ResponseBody
-    public Object finish(@ApiParam(value = "作业现场id", example = "0")@RequestParam Long projectId){
-        workSiteInfoService.finish(projectId);
-        return ResponseData.success();
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/WorkerController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/WorkerController.java
deleted file mode 100644
index 796f94c..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/WorkerController.java
+++ /dev/null
@@ -1,136 +0,0 @@
-package com.casic.missiles.modular.system.controller;
-
-
-import cn.hutool.core.util.ObjectUtil;
-import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.core.base.controller.BaseController;
-import com.casic.missiles.core.page.PageFactory;
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.DeviceDetailDTO;
-import com.casic.missiles.modular.system.entity.Device;
-import com.casic.missiles.modular.system.entity.Worker;
-import com.casic.missiles.modular.system.service.IWorkerService;
-import io.swagger.annotations.*;
-import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.*;
-
-import org.springframework.stereotype.Controller;
-
-import java.util.Date;
-import java.util.List;
-
-import static com.casic.missiles.model.response.ResponseData.DEFAULT_SUCCESS_MESSAGE;
-
-/**
- * <p>
- *  前端控制器
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@Controller
-@RequestMapping("/worker")
-@RequiredArgsConstructor
-@Api(tags = "人员管理接口")
-public class WorkerController extends BaseController {
-
-    private final IWorkerService workerService;
-
-    @ApiOperation("分页列表查询")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "name",value = "姓名", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "deptId",value = "所属部门", dataType = "Long", paramType = "query", example = "0"),
-            @ApiImplicitParam(name = "status",value = "当前状态（字典值）", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "startDate",value = "注册开始日期", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "endDate",value = "注册结束日期", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "workerType",value = "人员类型（字典值）", dataType = "String", paramType = "query")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = Worker.class),
-    })
-    @GetMapping("listPage")
-    @ResponseBody
-    public Object listPage(String name,Long deptId, String status,String startDate,String endDate,String workerType){
-        Page<Worker> page = PageFactory.defaultPage();
-        QueryWrapper<Worker> queryWrapper = new QueryWrapper<>();
-        if(StrUtil.isNotEmpty(name)){
-            queryWrapper.like("WORKER_NAME",name);
-        }
-        if(ObjectUtil.isNotEmpty(deptId)){
-            queryWrapper.eq("DEPT_ID",deptId);
-        }
-        if(StrUtil.isNotEmpty(workerType)){
-            queryWrapper.eq("WORKER_TYPE",workerType);
-        }
-        if(StrUtil.isNotEmpty(startDate)){
-            queryWrapper.ge("CREATE_TIME",startDate + " 00:00:00");
-        }
-        if(StrUtil.isNotEmpty(endDate)){
-            queryWrapper.le("CREATE_TIME",endDate + " 23:59:59");
-        }
-        if(StrUtil.isNotEmpty(status)){
-            queryWrapper.eq("`STATUS`",status);
-        }
-        page = workerService.selectListPage(page,queryWrapper);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-    @ApiOperation("新增人员")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "worker", value = "人员信息", dataType = "Worker", paramType = "body", required = true),
-            @ApiImplicitParam(name = "projectId", value = "项目ID(入场申请需要)", dataType = "Long", paramType = "query", example = "0")
-    })
-    @PostMapping("add")
-    @ResponseBody
-    public Object add(@ApiParam("worker")@RequestBody Worker worker,
-                      @RequestParam(required = false) Long projectId){
-        workerService.addWorker(worker,projectId);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("编辑人员")
-    @PostMapping("update")
-    @ResponseBody
-    public Object update(@RequestBody Worker worker){
-        workerService.updateById(worker);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("删除人员")
-    @PostMapping("delete")
-    @ResponseBody
-    public Object delete(@ApiParam("人员id列表")@RequestBody List<Long> workIds){
-        workerService.removeByIds(workIds);
-        return ResponseData.success();
-    }
-
-
-    @ApiOperation(value = "获取人脸图片",notes = "返回人脸图片url")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "cameraIp",value = "摄像头IP", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "cameraPort",value = "摄像头端口号", dataType = "String", paramType = "query"),
-    })
-    @GetMapping("/face/register")
-    @ResponseBody
-    public Object faceRegister(String cameraIp,String cameraPort){
-        return ResponseData.success(workerService.faceRegister(cameraIp, cameraPort));
-    }
-
-
-    @ApiOperation(value = "查询临时入场人员列表")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "projectId", value = "项目ID",required = true,dataType = "Long", paramType = "query", example = "0")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = Worker.class),
-    })
-    @GetMapping("/projectTempWorker")
-    @ResponseBody
-    public Object projectTempWorker(Long projectId){
-        return ResponseData.success(workerService.projectTempWorker(projectId));
-    }
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/AlarmTypeCountDTO.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/AlarmTypeCountDTO.java
deleted file mode 100644
index 1a165a1..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/AlarmTypeCountDTO.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.casic.missiles.modular.system.dto;
-
-import io.swagger.annotations.ApiModel;
-import lombok.Data;
-
-@ApiModel(value = "AlarmTypeCountDTO",description = "报警类型统计（首页）")
-@Data
-public class AlarmTypeCountDTO {
-
-    private String alarmType;
-    private String alarmTypeName;
-    private Integer alarmCount;
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/AlarmUpload.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/AlarmUpload.java
deleted file mode 100644
index 73d7799..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/AlarmUpload.java
+++ /dev/null
@@ -1,46 +0,0 @@
-package com.casic.missiles.modular.system.dto;
-
-import cn.hutool.core.util.StrUtil;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-@ApiModel(value = "AlarmUpload",description = "报警上传")
-@Data
-public class AlarmUpload {
-
-    @ApiModelProperty(value = "摄像头ip")
-    private String cameraIp;
-
-    @ApiModelProperty(value = "摄像头端口")
-    private String cameraPort;
-    @ApiModelProperty(value = "安全树甲烷设备ip")
-    private String gasIp;
-    @ApiModelProperty(value = "安全树甲烷设备端口")
-    private String gasPort;
-    @ApiModelProperty(value = "报警值")
-    private String alarmValue;
-    @ApiModelProperty(value = "报警时间")
-    private String alarmTime;
-    @ApiModelProperty(value = "报警类型")
-    private String alarmType;
-    @ApiModelProperty(value = "报警图片")
-    private String alarmImage;
-    @ApiModelProperty(value = "报警内容")
-    private String alarmContent;
-
-    @Override
-    public String toString() {
-        return "AlarmUpload{" +
-                "cameraIp='" + cameraIp + '\'' +
-                ", cameraPort='" + cameraPort + '\'' +
-                ", gasIp='" + gasIp + '\'' +
-                ", gasPort='" + gasPort + '\'' +
-                ", alarmValue='" + alarmValue + '\'' +
-                ", alarmTime='" + alarmTime + '\'' +
-                ", alarmType='" + alarmType + '\'' +
-                ", alarmImage='" + (StrUtil.isNotEmpty(alarmImage) ? alarmImage.substring(0,50) : "null") + '\'' +
-                ", alarmContent='" + alarmContent + '\'' +
-                '}';
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/DeviceDetailDTO.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/DeviceDetailDTO.java
deleted file mode 100644
index ea518d9..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/DeviceDetailDTO.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package com.casic.missiles.modular.system.dto;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.casic.missiles.modular.system.entity.Device;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-@ApiModel("DeviceDetailDTO")
-@Data
-public class DeviceDetailDTO extends Device {
-
-    @ApiModelProperty(value = "摄像头编号")
-    private String cameraCode;
-
-    @ApiModelProperty(value = "摄像头IP")
-    private String cameraIp;
-
-    @ApiModelProperty(value = "摄像头端口")
-    private String cameraPort;
-
-    @ApiModelProperty(value = "激甲编号")
-    private String gasCode;
-
-    @ApiModelProperty(value = "激甲IP")
-    private String gasIp;
-
-    @ApiModelProperty(value = "激甲端口")
-    private String gasPort;
-
-    @ApiModelProperty(value = "智能帽衬编号")
-    private String hatLiningCode;
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/WorkSiteDetailDTO.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/WorkSiteDetailDTO.java
deleted file mode 100644
index 29378ff..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/WorkSiteDetailDTO.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package com.casic.missiles.modular.system.dto;
-
-import com.casic.missiles.modular.system.entity.ProjectDevice;
-import com.casic.missiles.modular.system.entity.ProjectWorker;
-import com.casic.missiles.modular.system.entity.WorkSiteInfo;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.util.List;
-
-@Data
-@ApiModel("WorkSiteDetailDTO")
-public class WorkSiteDetailDTO extends WorkSiteInfo {
-
-    @ApiModelProperty(value = "安全树列表",dataType = "ProjectDevice")
-    private List<ProjectDevice> deviceList;
-
-    @ApiModelProperty(value = "人员列表",dataType = "ProjectWorker")
-    private List<ProjectWorker> workerList;
-
-
-
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/WorkerLocationDTO.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/WorkerLocationDTO.java
deleted file mode 100644
index 6fd7b24..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/WorkerLocationDTO.java
+++ /dev/null
@@ -1,68 +0,0 @@
-package com.casic.missiles.modular.system.dto;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-@ApiModel(value = "WorkerLocationDTO",description = "人员位置列表（首页）")
-@Data
-public class WorkerLocationDTO {
-
-    @ApiModelProperty("人员ID")
-    private Long workerId;
-
-    @ApiModelProperty("人员姓名")
-    private String workerName;
-
-    @ApiModelProperty("安全帽编号")
-    private String hatCode;
-
-    @ApiModelProperty("安全帽ID")
-    private Long hatId;
-
-    @ApiModelProperty("背心编号")
-    private String vastCode;
-
-    @ApiModelProperty("手环编号")
-    private String braceletCode;
-
-    @ApiModelProperty("位置")
-    private String location;
-
-    @ApiModelProperty("时间")
-    private String time;
-
-    @ApiModelProperty("经度")
-    private String lng;
-
-    @ApiModelProperty("纬度")
-    private String lat;
-
-    @ApiModelProperty("心率")
-    private String heartRate;
-
-    @ApiModelProperty("血氧")
-    private String bloodOxygen;
-
-    @ApiModelProperty("一氧化碳")
-    private String co;
-
-    @ApiModelProperty("甲烷")
-    private String gas;
-
-    @ApiModelProperty("硫化氢")
-    private String h2s;
-
-    @ApiModelProperty("氧气")
-    private String o2;
-
-    @ApiModelProperty("信号")
-    private String signal;
-
-    @ApiModelProperty("电量")
-    private String cell;
-
-    @ApiModelProperty("是否报警")
-    private boolean alarmFlag;
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Alarm.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Alarm.java
new file mode 100644
index 0000000..4d2b7ef
--- /dev/null
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Alarm.java
@@ -0,0 +1,103 @@
+package com.casic.missiles.modular.system.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import java.util.Date;
+
+/**
+ * <p>
+ * 报警记录表
+ * </p>
+ *
+ * @author zyj
+ * @since 2023-05-25
+ */
+@Data
+@TableName("bus_alarm")
+public class Alarm implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    @TableId(value = "ID",type = IdType.ASSIGN_ID)
+    private Long id;
+
+    /**
+     * 设备ID
+     */
+    @TableField("DEVICE_ID")
+    private Long deviceId;
+
+    /**
+     * 报警类型
+     */
+    @TableField("ALARM_TYPE")
+    private String alarmType;
+
+    /**
+     * 报警时间
+     */
+    @TableField("ALARM_TIME")
+    private Date alarmTime;
+
+    /**
+     * 报警状态
+     */
+    @TableField("ALARM_STATUS")
+    private String alarmStatus;
+
+    /**
+     * 报警位置
+     */
+    @TableField("ALARM_LOCATION")
+    private String alarmLocation;
+
+    /**
+     * 报警图片
+     */
+    @TableField("ALARM_IMAGE")
+    private String alarmImage;
+
+    /**
+     * 视频通道号
+     */
+    @TableField("CHANNEL_NO")
+    private Integer channelNo;
+
+    /**
+     * 报警内容
+     */
+    @TableField("ALARM_CONTENT")
+    private String alarmContent;
+
+    /**
+     * 消警时间
+     */
+    @TableField("CANCEL_TIME")
+    private Date cancelTime;
+
+
+    @Override
+    public String toString() {
+        return "Alarm{" +
+            "id=" + id +
+            ", deviceId=" + deviceId +
+            ", alarmType=" + alarmType +
+            ", alarmTime=" + alarmTime +
+            ", alarmStatus=" + alarmStatus +
+            ", alarmLocation=" + alarmLocation +
+            ", alarmImage=" + alarmImage +
+            ", channelNo=" + channelNo +
+            ", alarmContent=" + alarmContent +
+            ", cancelTime=" + cancelTime +
+        "}";
+    }
+}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusAlarm.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusAlarm.java
deleted file mode 100644
index efb4a23..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusAlarm.java
+++ /dev/null
@@ -1,159 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.alibaba.fastjson.annotation.JSONField;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.time.LocalDateTime;
-import java.util.Date;
-
-/**
- * <p>
- * 报警记录表
- * </p>
- *
- * @author zyj
- * @since 2023-05-16
- */
-@Data
-@ApiModel("Alarm")
-@TableName("br_bus_alarm")
-public class BusAlarm implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 项目ID
-     */
-    @ApiModelProperty(value = "项目ID")
-    @TableField("PROJECT_ID")
-    private Long projectId;
-
-    /**
-     * 设备ID
-     */
-    @ApiModelProperty(value = "设备ID")
-    @TableField("DEVICE_ID")
-    private Long deviceId;
-
-    /**
-     * 报警类型
-     */
-    @ApiModelProperty(value = "报警类型")
-    @TableField("ALARM_TYPE")
-    private String alarmType;
-
-    /**
-     * 报警状态
-     */
-    @ApiModelProperty(value = "报警状态")
-    @TableField("ALARM_STATUS")
-    private String alarmStatus;
-
-    /**
-     * 报警值
-     */
-    @ApiModelProperty(value = "报警值")
-    @TableField("ALARM_VALUE")
-    private String alarmValue;
-
-    /**
-     * 报警图片
-     */
-    @ApiModelProperty(value = "报警图片")
-    @TableField("ALARM_IMAGE")
-    private String alarmImage;
-
-    /**
-     * 报警内容
-     */
-    @ApiModelProperty(value = "报警内容")
-    @TableField("ALARM_CONTENT")
-    private String alarmContent;
-
-    /**
-     * 报警时间
-     */
-    @ApiModelProperty(value = "报警时间")
-    @TableField("ALARM_TIME")
-    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
-    private Date alarmTime;
-
-    /**
-     * 消警时间
-     */
-    @ApiModelProperty(value = "消警时间")
-    @TableField("CANCEL_TIME")
-    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
-    private Date cancelTime;
-
-    /**
-     * 报警位置经度
-     */
-    @ApiModelProperty(value = "报警位置经度")
-    @TableField("ALARM_LNG")
-    private String alarmLng;
-
-    /**
-     * 报警位置纬度
-     */
-    @ApiModelProperty(value = "报警位置纬度")
-    @TableField("ALARM_LAT")
-    private String alarmLat;
-
-    @ApiModelProperty("报警类型名称")
-    @TableField(exist = false)
-    private String alarmStatusName;
-    @ApiModelProperty("报警类型名称")
-    @TableField(exist = false)
-    private String alarmTypeName;
-    @ApiModelProperty("作业名称")
-    @TableField(exist = false)
-    private String workTitle;
-    @ApiModelProperty("所属道路")
-    @TableField(exist = false)
-    private String workRoad;
-    @ApiModelProperty("作业状态")
-    @TableField(exist = false)
-    private String projectState;
-    @ApiModelProperty("作业状态名称")
-    @TableField(exist = false)
-    private String projectStateName;
-    @ApiModelProperty("负责人姓名")
-    @TableField(exist = false)
-    private String workPersonName;
-    @ApiModelProperty("负责人联系方式")
-    @TableField(exist = false)
-    private String workPersonPhoneNumber;
-
-
-    @Override
-    public String toString() {
-        return "BusAlarm{" +
-                "id=" + id +
-                ", projectId=" + projectId +
-                ", deviceId=" + deviceId +
-                ", alarmType=" + alarmType +
-                ", alarmValue=" + alarmValue +
-                ", alarmStatus=" + alarmStatus +
-                ", alarmImage=" + alarmImage +
-                ", alarmContent=" + alarmContent +
-                ", alarmTime=" + alarmTime +
-                ", cancelTime=" + cancelTime +
-                ", alarmLng=" + alarmLng +
-                ", alarmLat=" + alarmLat +
-                "}";
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusEvent.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusEvent.java
deleted file mode 100644
index a0b7543..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusEvent.java
+++ /dev/null
@@ -1,100 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.time.LocalDateTime;
-import java.util.Date;
-import java.util.List;
-
-/**
- * <p>
- * 事件表
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@TableName("br_bus_event")
-@Data
-@ApiModel("BusEvent")
-public class BusEvent implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @ApiModelProperty("事件ID")
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 事件标题
-     */
-    @ApiModelProperty("事件名称")
-    @TableField("EVENT_TITLE")
-    private String eventTitle;
-
-    /**
-     * 上报人员
-     */
-    @ApiModelProperty("上报人员")
-    @TableField("UPLOAD_NAME")
-    private String uploadName;
-
-    /**
-     * 联系方式
-     */
-    @ApiModelProperty("联系方式")
-    @TableField("PHONE_NUMBER")
-    private String phoneNumber;
-
-    /**
-     * 事件描述
-     */
-    @ApiModelProperty("事件描述")
-    @TableField("EVENT_DESCRIPTION")
-    private String eventDescription;
-
-    @ApiModelProperty("经度")
-    @TableField("LNG")
-    private String lng;
-
-    @ApiModelProperty("纬度")
-    @TableField("LAT")
-    private String lat;
-
-    /**
-     * 事件上传时间
-     */
-    @ApiModelProperty("事件上传时间")
-    @TableField("CREATE_TIME")
-    private Date createTime;
-
-    @ApiModelProperty("事件照片")
-    @TableField(exist = false)
-    private List<BusEventImage> imageList;
-
-
-
-    @Override
-    public String toString() {
-        return "BusEvent{" +
-            "id=" + id +
-            ", eventTitle=" + eventTitle +
-            ", uploadName=" + uploadName +
-            ", phoneNumber=" + phoneNumber +
-            ", eventDescription=" + eventDescription +
-            ", lng=" + lng +
-            ", lat=" + lat +
-            ", createTime=" + createTime +
-        "}";
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusEventImage.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusEventImage.java
deleted file mode 100644
index 1e75245..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusEventImage.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-
-/**
- * <p>
- * 事件图片表
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@TableName("br_bus_event_image")
-@Data
-@ApiModel("BusEventImage")
-public class BusEventImage implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 事件ID
-     */
-    @TableField("EVENT_ID")
-    private Long eventId;
-
-    /**
-     * 报警图片
-     */
-    @TableField("IMAGE")
-    @ApiModelProperty("图片url")
-    private String image;
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Device.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Device.java
index df89c70..ea7db5f 100644
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Device.java
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Device.java
@@ -1,30 +1,23 @@
 package com.casic.missiles.modular.system.entity;
 
-import com.alibaba.fastjson.annotation.JSONField;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.casic.missiles.core.base.json.DateDeserializer;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
-import java.util.Date;
 
 /**
  * <p>
- * 
+ * 设备记录表
  * </p>
  *
  * @author zyj
- * @since 2023-04-14
+ * @since 2023-05-25
  */
-@ApiModel("Device")
-@TableName("br_device")
 @Data
+@TableName("bus_device")
 public class Device implements Serializable {
 
     private static final long serialVersionUID = 1L;
@@ -32,82 +25,86 @@
     /**
      * 主键
      */
-    @ApiModelProperty(value = "设备ID")
     @TableId(value = "ID",type = IdType.ASSIGN_ID)
     private Long id;
 
     /**
-     * 设备编号
+     * 设备名称
      */
-    @ApiModelProperty(value = "设备编号")
-    @TableField("DEVICE_CODE")
-    private String deviceCode;
+    @TableField("DEVICE_NAME")
+    private String deviceName;
 
     /**
-     * 设备类型
+     * IP
      */
-    @ApiModelProperty(value = "设备类型")
-    @TableField("DEVICE_TYPE")
-    private String deviceType;
+    @TableField("IP")
+    private String ip;
 
     /**
-     * 设备批次
+     * 端口
      */
-    @ApiModelProperty(value = "设备批次")
-    @TableField("DEVICE_BATCH")
-    private String deviceBatch;
+    @TableField("PORT")
+    private String port;
 
     /**
-     * 厂家
+     * 用户名
      */
-    @ApiModelProperty(value = "厂家")
-    @TableField("MANUFACTURER")
-    private String manufacturer;
+    @TableField("USER_NAME")
+    private String userName;
 
     /**
-     * 是否供电
+     * 密码
      */
-    @ApiModelProperty(value = "是否供电")
-    @TableField("IS_POWER_SUPPLY")
-    private String isPowerSupply;
+    @TableField("PASSWORD")
+    private String password;
 
     /**
-     * 创建时间
+     * 连接类型
      */
-    @ApiModelProperty(value = "创建时间",dataType = "Date")
-    @TableField("CREATE_TIME")
-    private Date createTime;
+    @TableField("CONNECT_TYPE")
+    private String connectType;
 
-    @ApiModelProperty(value = "设备类型名称")
-    @TableField(exist = false)
-    private String deviceTypeName;
+    /**
+     * 位置
+     */
+    @TableField("LOCATION")
 
-    @ApiModelProperty(value = "是否供电名称")
-    @TableField(exist = false)
-    private String isPowerSupplyName;
+    private String location;
 
-    @ApiModelProperty(value = "注册时间",dataType = "String")
-    @TableField(exist = false)
-    private String registerTime;
+    /**
+     * 设备状态
+     */
+    @TableField("STATUS")
 
-    @ApiModelProperty(value = "当前状态")
-    @TableField(exist = false)
     private String status;
 
-    @ApiModelProperty(value = "当前状态名称")
-    @TableField(exist = false)
-    private String statusName;
+    /**
+     * 报警分组
+     */
+    @TableField("ALARM_GROUP")
+
+    private Long alarmGroup;
+
+    /**
+     * 视频通道数(预留)
+     */
+    @TableField("CHANNEL_NUM")
+    private Integer channelNum;
 
     @Override
     public String toString() {
         return "Device{" +
             "id=" + id +
-            ", deviceCode=" + deviceCode +
-            ", deviceType=" + deviceType +
-            ", deviceBatch=" + deviceBatch +
-            ", manufacturer=" + manufacturer +
-            ", isPowerSupply=" + isPowerSupply +
-            ", createTime=" + createTime +
+            ", deviceName=" + deviceName +
+            ", ip=" + ip +
+            ", port=" + port +
+            ", userName=" + userName +
+            ", password=" + password +
+            ", connectType=" + connectType +
+            ", location=" + location +
+            ", status=" + status +
+            ", alarmGroup=" + alarmGroup +
+            ", channelNum=" + channelNum +
         "}";
     }
 }
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/DeviceExt.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/DeviceExt.java
deleted file mode 100644
index 5ee7015..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/DeviceExt.java
+++ /dev/null
@@ -1,99 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-
-/**
- * <p>
- * 设备扩展信息表（安全树）
- * </p>
- *
- * @author zyj
- * @since 2023-04-27
- */
-@Data
-@TableName("br_device_ext")
-public class DeviceExt implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 设备ID
-     */
-    @TableField("DEVICE_ID")
-    private Long deviceId;
-
-    /**
-     * 摄像头编号
-     */
-    @TableField("CAMERA_CODE")
-    private String cameraCode;
-
-    /**
-     * 摄像头IP
-     */
-    @TableField("CAMERA_IP")
-    private String cameraIp;
-
-    /**
-     * 摄像头端口
-     */
-    @TableField("CAMERA_PORT")
-    private String cameraPort;
-
-    /**
-     * 激甲编号
-     */
-    @TableField("GAS_CODE")
-    private String gasCode;
-
-    /**
-     * 激甲IP
-     */
-    @TableField("GAS_IP")
-    private String gasIp;
-
-    /**
-     * 激甲端口
-     */
-    @TableField("GAS_PORT")
-    private String gasPort;
-
-    /**
-     * 甲烷报警阈值
-     */
-    @TableField("GAS_THRESHOLD")
-    private String gasThreshold;
-
-    @TableField(value = "HAT_LINING_CODE")
-    private String hatLiningCode;
-
-
-    @Override
-    public String toString() {
-        return "DeviceExt{" +
-            "id=" + id +
-            ", deviceId=" + deviceId +
-            ", cameraCode=" + cameraCode +
-            ", cameraIp=" + cameraIp +
-            ", cameraPort=" + cameraPort +
-            ", gasCode=" + gasCode +
-            ", gasIp=" + gasIp +
-            ", gasPort=" + gasPort +
-            ", gasThreshold=" + gasThreshold +
-            ", hatLiningCode=" + hatLiningCode +
-        "}";
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/ProjectDevice.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/ProjectDevice.java
deleted file mode 100644
index c4f3472..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/ProjectDevice.java
+++ /dev/null
@@ -1,62 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-
-/**
- * <p>
- * 
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@Data
-@ApiModel("ProjectDevice")
-@TableName("br_project_device")
-public class ProjectDevice implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 作业现场ID
-     */
-    @TableField("PROJECT_ID")
-    private Long projectId;
-
-    /**
-     * 设备ID
-     */
-    @TableField("DEVICE_ID")
-    @ApiModelProperty("设备ID（新增编辑时传）")
-    private Long deviceId;
-
-    /**
-     * 设备编号
-     */
-    @TableField(exist = false)
-    @ApiModelProperty("设备编号（详情中展示，新增编辑不用传）")
-    private String deviceCode;
-
-    @Override
-    public String toString() {
-        return "ProjectDevice{" +
-            "id=" + id +
-            ", projectId=" + projectId +
-            ", deviceId=" + deviceId +
-        "}";
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/ProjectWorker.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/ProjectWorker.java
deleted file mode 100644
index 10b23c4..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/ProjectWorker.java
+++ /dev/null
@@ -1,104 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import java.io.Serializable;
-
-/**
- * <p>
- * 
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@ApiModel("ProjectWorker")
-@TableName("br_project_worker")
-@Data
-@NoArgsConstructor
-@AllArgsConstructor
-public class ProjectWorker implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 作业现场ID
-     */
-    @TableField("PROJECT_ID")
-    private Long projectId;
-
-    /**
-     * 人员ID
-     */
-    @ApiModelProperty("人员ID")
-    @TableField("WORKER_ID")
-    private Long workerId;
-
-    /**
-     * 安全帽编号
-     */
-    @ApiModelProperty("安全帽编号")
-    @TableField("HAT_CODE")
-    private String hatCode;
-
-    /**
-     * 背心编号
-     */
-    @ApiModelProperty("背心编号")
-    @TableField("VAST_CODE")
-    private String vastCode;
-
-    /**
-     * 手环编号
-     */
-    @ApiModelProperty("手环编号")
-    @TableField("BRACELET_CODE")
-    private String braceletCode;
-
-    @ApiModelProperty("人员姓名（详情中展示，新增编辑不用传）")
-    @TableField(exist = false)
-    private String workerName;
-
-    @ApiModelProperty("人员部门ID（详情中展示，新增编辑不用传）")
-    @TableField(exist = false)
-    private String workerDeptId;
-
-    @ApiModelProperty("人员部门名称（详情中展示，新增编辑不用传）")
-    @TableField(exist = false)
-    private String workerDeptName;
-
-    @ApiModelProperty("人员联系方式（详情中展示，新增编辑不用传）")
-    @TableField(exist = false)
-    private String workerPhoneNumber;
-
-    public ProjectWorker(Long projectId, Long workerId) {
-        this.projectId = projectId;
-        this.workerId = workerId;
-    }
-
-    @Override
-    public String toString() {
-        return "ProjectWorker{" +
-            "id=" + id +
-            ", projectId=" + projectId +
-            ", workerId=" + workerId +
-            ", hatCode=" + hatCode +
-            ", vastCode=" + vastCode +
-            ", braceletCode=" + braceletCode +
-        "}";
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/WorkSiteInfo.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/WorkSiteInfo.java
deleted file mode 100644
index fa6f41d..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/WorkSiteInfo.java
+++ /dev/null
@@ -1,130 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.alibaba.fastjson.annotation.JSONField;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.time.LocalDateTime;
-import java.util.Date;
-
-/**
- * <p>
- * 作业现场表
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@ApiModel("WorkSiteInfo")
-@TableName("br_work_site_info")
-@Data
-public class WorkSiteInfo implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @ApiModelProperty("作业现场ID")
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 作业名称
-     */
-    @ApiModelProperty("作业名称")
-    @TableField("WORK_TITLE")
-    private String workTitle;
-
-    /**
-     * 责任人
-     */
-    @ApiModelProperty("责任人（人员ID）")
-    @TableField("WORK_PERSON")
-    private Long workPerson;
-
-    /**
-     * 作业描述
-     */
-    @ApiModelProperty("作业描述")
-    @TableField("WORK_SITE_DESC")
-    private String workSiteDesc;
-
-    /**
-     * 作业状态
-     */
-    @ApiModelProperty("作业状态")
-    @TableField("PROJECT_STATE")
-    private String projectState;
-
-    /**
-     * 所属道路
-     */
-    @ApiModelProperty("所属道路")
-    @TableField("WORK_ROAD")
-    private String workRoad;
-
-    @TableField("IMAGE_URL")
-    private String imageUrl;
-
-    @TableField("CREATE_TIME")
-    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
-    private Date createTime;
-    @TableField("UPDATE_TIME")
-    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
-    private Date updateTime;
-
-    @ApiModelProperty("开始时间")
-    @TableField("START_TIME")
-    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
-    private Date startTime;
-
-    @ApiModelProperty("结束时间")
-    @TableField("FINISH_TIME")
-    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
-    private Date finishTime;
-
-    @ApiModelProperty("负责人姓名（详情中使用，新增编辑不用传）")
-    @TableField(exist = false)
-    private String workPersonName;
-
-    @ApiModelProperty("负责人联系方式（详情中使用，新增编辑不用传）")
-    @TableField(exist = false)
-    private String workPersonPhoneNumber;
-
-    @ApiModelProperty("负责人所属部门ID（详情中使用，新增编辑不用传）")
-    @TableField(exist = false)
-    private Long workPersonDeptId;
-
-    @ApiModelProperty("负责人所属部门名称（详情中使用，新增编辑不用传）")
-    @TableField(exist = false)
-    private String workPersonDeptName;
-
-    @ApiModelProperty(value = "注册时间",dataType = "String")
-    @TableField(exist = false)
-    private String registerTime;
-
-    @ApiModelProperty("作业状态名称")
-    @TableField(exist = false)
-    private String projectStateName;
-
-    @Override
-    public String toString() {
-        return "WorkSiteInfo{" +
-            "id=" + id +
-            ", workTitle=" + workTitle +
-            ", workPerson=" + workPerson +
-            ", workSiteDesc=" + workSiteDesc +
-            ", projectState=" + projectState +
-            ", imageUrl=" + imageUrl +
-            ", updateTime=" + updateTime +
-            ", workRoad=" + workRoad +
-        "}";
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Worker.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Worker.java
deleted file mode 100644
index 28a4daa..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Worker.java
+++ /dev/null
@@ -1,147 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.time.LocalDateTime;
-import java.util.Date;
-
-/**
- * <p>
- * 
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@ApiModel("Worker")
-@TableName("br_worker")
-@Data
-public class Worker implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @ApiModelProperty(value = "人员ID")
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 姓名
-     */
-    @ApiModelProperty(value = "姓名")
-    @TableField("WORKER_NAME")
-    private String workerName;
-
-    /**
-     * 性别
-     */
-    @ApiModelProperty(value = "性别")
-    @TableField("GENDER")
-    private String gender;
-
-    /**
-     * 所属部门
-     */
-    @ApiModelProperty(value = "所属部门(人员管理)")
-    @TableField("DEPT_ID")
-    private Long deptId;
-
-    /**
-     * 所属单位
-     */
-    @ApiModelProperty(value = "所属单位(入场申请中使用)")
-    @TableField("OWNER_SHIP")
-    private String ownerShip;
-
-    /**
-     * 联系方式
-     */
-    @ApiModelProperty(value = "联系方式")
-    @TableField("PHONE_NUMBER")
-    private String phoneNumber;
-
-    /**
-     * 证件号
-     */
-    @ApiModelProperty(value = "证件号")
-    @TableField("ID_CARD_NUMBER")
-    private String idCardNumber;
-
-    /**
-     * 入场原因
-     */
-    @ApiModelProperty(value = "入场原因（入场申请中使用）")
-    @TableField("ENTER_REASON")
-    private String enterReason;
-
-    /**
-     * 入场人脸照片
-     */
-    @ApiModelProperty(value = "人脸照片（照片路径）")
-    @TableField("WORKER_AVATAR")
-    private String workerAvatar;
-
-    /**
-     * 申请入场时间
-     */
-    @ApiModelProperty(value = "注册时间/申请入场时间")
-    @TableField("CREATE_TIME")
-    private Date createTime;
-
-    /**
-     * 人员类型
-     */
-    @ApiModelProperty(value = "人员类型（区分人员管理和入场申请）")
-    @TableField("WORKER_TYPE")
-    private String workerType;
-
-    @ApiModelProperty(value = "性别名称")
-    @TableField(exist = false)
-    private String genderName;
-
-    @ApiModelProperty(value = "部门名称")
-    @TableField(exist = false)
-    private String deptName;
-
-    @ApiModelProperty(value = "注册时间",dataType = "String")
-    @TableField(exist = false)
-    private String registerTime;
-
-    @ApiModelProperty(value = "当前状态")
-    @TableField(exist = false)
-    private String status;
-
-    @ApiModelProperty(value = "当前状态名称")
-    @TableField(exist = false)
-    private String statusName;
-
-    @ApiModelProperty(value = "是否注册(0未注册；1已注册)",allowableValues = "0,1")
-    @TableField(exist = false)
-    private String isRegister;
-
-    @Override
-    public String toString() {
-        return "Worker{" +
-            "id=" + id +
-            ", workerName=" + workerName +
-            ", gender=" + gender +
-            ", deptId=" + deptId +
-            ", ownerShip=" + ownerShip +
-            ", phoneNumber=" + phoneNumber +
-            ", idCardNumber=" + idCardNumber +
-            ", enterReason=" + enterReason +
-            ", workerAvatar=" + workerAvatar +
-            ", createTime=" + createTime +
-            ", workerType=" + workerType +
-        "}";
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/AlarmMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/AlarmMapper.java
new file mode 100644
index 0000000..ea4c8be
--- /dev/null
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/AlarmMapper.java
@@ -0,0 +1,16 @@
+package com.casic.missiles.modular.system.mapper;
+
+import com.casic.missiles.modular.system.entity.Alarm;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 报警记录表 Mapper 接口
+ * </p>
+ *
+ * @author zyj
+ * @since 2023-05-25
+ */
+public interface AlarmMapper extends BaseMapper<Alarm> {
+
+}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/BusAlarmMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/BusAlarmMapper.java
deleted file mode 100644
index 9801742..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/BusAlarmMapper.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package com.casic.missiles.modular.system.mapper;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.modular.system.dto.AlarmTypeCountDTO;
-import com.casic.missiles.modular.system.entity.BusAlarm;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * <p>
- * 报警记录表 Mapper 接口
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface BusAlarmMapper extends BaseMapper<BusAlarm> {
-
-    Page<BusAlarm> listPage(Page<BusAlarm> page,@Param("ew")  QueryWrapper<BusAlarm> queryWrapper);
-
-    void cancelAlarm(@Param("deviceId")Long deviceId,@Param("alarmType") String alarmType);
-
-    List<AlarmTypeCountDTO> alarmCount(@Param("projectId")Long projectId, @Param("alarmStatus")String alarmStatus);
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/BusEventImageMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/BusEventImageMapper.java
deleted file mode 100644
index 9590b7d..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/BusEventImageMapper.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.casic.missiles.modular.system.mapper;
-
-import com.casic.missiles.modular.system.entity.BusEventImage;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * <p>
- * 事件图片表 Mapper 接口
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface BusEventImageMapper extends BaseMapper<BusEventImage> {
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/BusEventMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/BusEventMapper.java
deleted file mode 100644
index 3c85edf..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/BusEventMapper.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.casic.missiles.modular.system.mapper;
-
-import com.casic.missiles.modular.system.entity.BusEvent;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * <p>
- * 事件表 Mapper 接口
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface BusEventMapper extends BaseMapper<BusEvent> {
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/DeviceExtMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/DeviceExtMapper.java
deleted file mode 100644
index 4ca9212..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/DeviceExtMapper.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.casic.missiles.modular.system.mapper;
-
-import com.casic.missiles.modular.system.entity.DeviceExt;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * <p>
- * 设备扩展信息表（安全树） Mapper 接口
- * </p>
- *
- * @author zyj
- * @since 2023-04-27
- */
-public interface DeviceExtMapper extends BaseMapper<DeviceExt> {
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/DeviceMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/DeviceMapper.java
index 444c0c5..3d0bb02 100644
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/DeviceMapper.java
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/DeviceMapper.java
@@ -1,30 +1,16 @@
 package com.casic.missiles.modular.system.mapper;
 
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.modular.system.dto.DeviceDetailDTO;
-import com.casic.missiles.modular.system.dto.HelmetInfoDTO;
 import com.casic.missiles.modular.system.entity.Device;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
 
 /**
  * <p>
- *  Mapper 接口
+ * 设备记录表 Mapper 接口
  * </p>
  *
  * @author zyj
- * @since 2023-04-14
+ * @since 2023-05-25
  */
-@Mapper
 public interface DeviceMapper extends BaseMapper<Device> {
 
-    Page<DeviceDetailDTO> listDetailPage(Page<DeviceDetailDTO> page,@Param("ew") QueryWrapper<DeviceDetailDTO> ew);
-
-     List<Long> selectProjectDevice(@Param("projectId") Long projectId);
-
-    List<HelmetInfoDTO> selectHelmetList(@Param("deviceType")String deviceType);
 }

diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/AlarmController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/AlarmController.java
new file mode 100644
index 0000000..1795cf1
--- /dev/null
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/AlarmController.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.modular.system.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.stereotype.Controller;
+
+/**
+ * <p>
+ * 报警记录表 前端控制器
+ * </p>
+ *
+ * @author zyj
+ * @since 2023-05-25
+ */
+@Controller
+@RequestMapping("/system/alarm")
+public class AlarmController {
+
+}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusAlarmController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusAlarmController.java
deleted file mode 100644
index 1f82ebb..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusAlarmController.java
+++ /dev/null
@@ -1,102 +0,0 @@
-package com.casic.missiles.modular.system.controller;
-
-
-import cn.hutool.core.util.ObjectUtil;
-import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.core.base.controller.BaseController;
-import com.casic.missiles.core.page.PageFactory;
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.AlarmUpload;
-import com.casic.missiles.modular.system.dto.DeviceDetailDTO;
-import com.casic.missiles.modular.system.entity.BusAlarm;
-import com.casic.missiles.modular.system.service.IBusAlarmService;
-import io.swagger.annotations.*;
-import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.*;
-
-import org.springframework.stereotype.Controller;
-
-import static com.casic.missiles.model.response.ResponseData.DEFAULT_SUCCESS_MESSAGE;
-import static com.casic.missiles.modular.system.consts.AlarmConst.ALARM_STATUS_MANUAL_CANCEL;
-
-/**
- * <p>
- * 报警记录表 前端控制器
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@Api(tags = "报警管理接口")
-@Controller
-@RequestMapping("/alarm")
-@RequiredArgsConstructor
-public class BusAlarmController extends BaseController {
-
-    private final IBusAlarmService alarmService;
-
-    @ApiOperation("报警上报接口")
-    @PostMapping("/upload")
-    @ResponseBody
-    public Object upload(@RequestBody AlarmUpload alarmUpload){
-        alarmService.alarmUpload(alarmUpload);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("报警列表分页查询")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "workTitle", value = "作业名称",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "projectId", value = "作业ID",dataType = "Long", paramType = "query",example = "0"),
-            @ApiImplicitParam(name = "alarmStatus", value = "报警状态",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "projectState", value = "作业状态",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "alarmType", value = "报警类型",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "alarmStartTime", value = "报警开始时间",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "alarmEndTime", value = "报警结束时间",dataType = "String", paramType = "query")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = BusAlarm.class),
-    })
-    @GetMapping("/listPage")
-    @ResponseBody
-    public Object listPage(String workTitle,Long projectId,String alarmStatus,String projectState,String alarmType,String alarmStartTime,String alarmEndTime){
-        Page<BusAlarm> page = PageFactory.defaultPage();
-        QueryWrapper<BusAlarm> queryWrapper = new QueryWrapper<>();
-        if(StrUtil.isNotEmpty(workTitle)){
-            queryWrapper.like("p.WORK_TITLE",workTitle);
-        }
-        if(ObjectUtil.isNotEmpty(projectId)){
-            queryWrapper.eq("alarm.PROJECT_ID",projectId);
-        }
-        if(StrUtil.isNotEmpty(alarmStatus)){
-            queryWrapper.eq("alarm.ALARM_STATUS",alarmStatus);
-        }
-        if(StrUtil.isNotEmpty(projectState)){
-            queryWrapper.eq("p.PROJECT_STATE",projectState);
-        }
-        if(StrUtil.isNotEmpty(alarmType)){
-            queryWrapper.eq("alarm.ALARM_TYPE",alarmType);
-        }
-        if(StrUtil.isNotEmpty(alarmStartTime)){
-            queryWrapper.ge("alarm.ALARM_TIME",alarmStartTime);
-        }
-        if(StrUtil.isNotEmpty(alarmEndTime)){
-            queryWrapper.le("alarm.ALARM_TIME",alarmEndTime);
-        }
-        page = alarmService.listPage(page,queryWrapper);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-    @ApiOperation("消警")
-    @PostMapping("/cancel")
-    @ResponseBody
-    public Object cancel(@RequestParam("alarmId") Long alarmId){
-        UpdateWrapper<BusAlarm> updateWrapper = new UpdateWrapper<>();
-        updateWrapper.eq("ID",alarmId);
-        updateWrapper.set("ALARM_STATUS",ALARM_STATUS_MANUAL_CANCEL);
-        alarmService.update(updateWrapper);
-        return ResponseData.success();
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusEventController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusEventController.java
deleted file mode 100644
index dde5aad..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusEventController.java
+++ /dev/null
@@ -1,41 +0,0 @@
-package com.casic.missiles.modular.system.controller;
-
-
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.entity.BusEvent;
-import com.casic.missiles.modular.system.service.IBusEventService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.ResponseBody;
-
-/**
- * <p>
- * 事件表 前端控制器
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@Controller
-@RequestMapping("/event")
-@Api(tags = "事件上报")
-@RequiredArgsConstructor
-public class BusEventController {
-
-    private final IBusEventService eventService;
-
-    @ApiOperation("事件上报")
-    @PostMapping("add")
-    @ResponseBody
-    public Object add(@RequestBody BusEvent busEvent){
-        eventService.saveBusEvent(busEvent);
-        return ResponseData.success();
-    }
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
index 03abc5f..aa50d78 100644
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
@@ -1,121 +1,20 @@
 package com.casic.missiles.modular.system.controller;
 
 
-import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.core.base.controller.BaseController;
-import com.casic.missiles.core.page.PageFactory;
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.DeviceDetailDTO;
-import com.casic.missiles.modular.system.entity.Device;
-import com.casic.missiles.modular.system.service.IDeviceExtService;
-import com.casic.missiles.modular.system.service.IDeviceService;
-import io.swagger.annotations.*;
-import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.RequestMapping;
 
 import org.springframework.stereotype.Controller;
 
-import java.time.LocalDateTime;
-import java.util.Date;
-import java.util.List;
-
-import static com.casic.missiles.model.response.ResponseData.DEFAULT_SUCCESS_MESSAGE;
-
 /**
  * <p>
- *  前端控制器
+ * 设备记录表 前端控制器
  * </p>
  *
  * @author zyj
- * @since 2023-04-14
+ * @since 2023-05-25
  */
-@Api(tags = "设备管理接口")
-@RequiredArgsConstructor
 @Controller
-@RequestMapping("/device")
-public class DeviceController extends BaseController {
-    private final IDeviceService deviceService;
-    private final IDeviceExtService deviceExtService;
-
-    @ApiOperation("设备分页列表")
-    @ApiImplicitParams({
-        @ApiImplicitParam(name = "deviceType", value = "设备类型",dataType = "String", paramType = "query"),
-        @ApiImplicitParam(name = "deviceCode", value = "设备编号",dataType = "String", paramType = "query"),
-        @ApiImplicitParam(name = "status", value = "设备状态",dataType = "String", paramType = "query"),
-        @ApiImplicitParam(name = "projectId", value = "作业ID（如果传此参数，列表中返回该作业使用的设备）",dataType = "Long", paramType = "query", example = "0")
-    })
-    @ApiResponses({
-        @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = DeviceDetailDTO.class),
-    })
-    @GetMapping("listPage")
-    @ResponseBody
-    public Object listPage(String deviceType, String deviceCode, String status,Long projectId){
-        Page<DeviceDetailDTO> page = PageFactory.defaultPage();
-        QueryWrapper<DeviceDetailDTO> queryWrapper = new QueryWrapper<>();
-        if(StrUtil.isNotEmpty(deviceType)){
-            queryWrapper.eq("DEVICE_TYPE",deviceType);
-        }
-        if(StrUtil.isNotEmpty(deviceCode)){
-            queryWrapper.like("DEVICE_CODE",deviceCode);
-        }
-        page = deviceService.listPage(page,queryWrapper,status,projectId);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-    @ApiOperation("新增设备")
-    @PostMapping("add")
-    @ResponseBody
-    public Object add(@RequestBody DeviceDetailDTO deviceDetailDTO){
-        deviceService.saveDevice(deviceDetailDTO);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("编辑设备")
-    @PostMapping("update")
-    @ResponseBody
-    public Object update(@RequestBody DeviceDetailDTO deviceDetailDTO){
-        deviceService.updateDevice(deviceDetailDTO);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("删除设备")
-    @PostMapping("delete")
-    @ResponseBody
-    public Object delete(@ApiParam("设备id列表")@RequestBody List<Long> deviceIds){
-        deviceService.deleteDevices(deviceIds);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("设置甲烷阈值")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "gasIp", value = "安全树甲烷设备IP",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "gasPort", value = "安全树甲烷端口",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "threshold", value = "甲烷阈值",dataType = "String", paramType = "query")
-    })
-    @PostMapping("setThreshold")
-    @ResponseBody
-    public Object setThreshold(String gasIp,String gasPort,String threshold){
-        deviceExtService.setGasThreshold(gasIp, gasPort, threshold);
-        return ResponseData.success();
-    }
-
-
-    @ApiOperation("查询甲烷阈值")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "gasIp", value = "安全树甲烷设备IP",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "gasPort", value = "安全树甲烷端口",dataType = "String", paramType = "query")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = "{\"code\": 200,\"data\": \"100\",\"message\": \"请求成功\",\"success\": true}",response = String.class),
-    })
-    @GetMapping("getThreshold")
-    @ResponseBody
-    public Object getThreshold(String gasIp,String gasPort){
-        String data = deviceExtService.getGasThreshold(gasIp, gasPort);
-        return ResponseData.success(data);
-    }
-
+@RequestMapping("/system/device")
+public class DeviceController {
 
 }
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/OverviewController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/OverviewController.java
deleted file mode 100644
index 7570504..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/OverviewController.java
+++ /dev/null
@@ -1,70 +0,0 @@
-package com.casic.missiles.modular.system.controller;
-
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.AlarmTypeCountDTO;
-import com.casic.missiles.modular.system.dto.DeviceLocationDTO;
-import com.casic.missiles.modular.system.dto.WorkerLocationDTO;
-import com.casic.missiles.modular.system.service.IBusAlarmService;
-import com.casic.missiles.modular.system.service.IProjectDeviceService;
-import com.casic.missiles.modular.system.service.IProjectWorkerService;
-import io.swagger.annotations.*;
-import lombok.RequiredArgsConstructor;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.ResponseBody;
-
-import static com.casic.missiles.model.response.ResponseData.DEFAULT_SUCCESS_MESSAGE;
-import static com.casic.missiles.modular.system.consts.AlarmConst.ALARM_STATUS_ON;
-
-@Api(tags = "首页看板接口")
-@Controller
-@RequestMapping("overview")
-@RequiredArgsConstructor
-public class OverviewController {
-
-    private final IBusAlarmService alarmService;
-    private final IProjectDeviceService projectDeviceService;
-
-    private final IProjectWorkerService projectWorkerService;
-
-
-    @ApiOperation("报警统计接口")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "projectId", value = "作业ID",dataType = "Long", paramType = "query", example = "0")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = AlarmTypeCountDTO.class),
-    })
-    @GetMapping("/alarmCount")
-    @ResponseBody
-    public Object alarmCount(Long projectId){
-        return ResponseData.success(alarmService.alarmCount(projectId,ALARM_STATUS_ON));
-    }
-
-    @ApiOperation("设备列表接口")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "projectId", value = "作业ID",dataType = "Long", paramType = "query", example = "0")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = DeviceLocationDTO.class),
-    })
-    @GetMapping("/deviceList")
-    @ResponseBody
-    public Object deviceList(Long projectId){
-        return ResponseData.success(projectDeviceService.selectDeviceLocationList(projectId));
-    }
-
-    @ApiOperation("人员列表接口")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "projectId", value = "作业ID",dataType = "Long", paramType = "query", example = "0")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = WorkerLocationDTO.class),
-    })
-    @GetMapping("/workerList")
-    @ResponseBody
-    public Object workerList(Long projectId){
-        return ResponseData.success(projectWorkerService.selectWorkerLocationDTO(projectId));
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/WorkSiteInfoController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/WorkSiteInfoController.java
deleted file mode 100644
index af36d69..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/WorkSiteInfoController.java
+++ /dev/null
@@ -1,130 +0,0 @@
-package com.casic.missiles.modular.system.controller;
-
-
-import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.core.base.controller.BaseController;
-import com.casic.missiles.core.page.PageFactory;
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.WorkSiteDetailDTO;
-import com.casic.missiles.modular.system.entity.WorkSiteInfo;
-import com.casic.missiles.modular.system.service.IWorkSiteInfoService;
-import io.swagger.annotations.*;
-import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.*;
-
-import org.springframework.stereotype.Controller;
-
-import java.util.List;
-
-import static com.casic.missiles.model.response.ResponseData.DEFAULT_SUCCESS_MESSAGE;
-
-/**
- * <p>
- * 作业现场表 前端控制器
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@Controller
-@RequestMapping("/site")
-@Api(tags = "作业现场管理")
-@RequiredArgsConstructor
-public class WorkSiteInfoController extends BaseController {
-
-
-    private final IWorkSiteInfoService workSiteInfoService;
-
-    @ApiOperation("新增作业现场")
-    @PostMapping("add")
-    @ResponseBody
-    public Object addWorkSite(@RequestBody WorkSiteDetailDTO workSiteDetailDTO){
-        workSiteInfoService.addWorkSiteInfo(workSiteDetailDTO);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("编辑作业现场")
-    @PostMapping("update")
-    @ResponseBody
-    public Object updateWorkSite(@RequestBody WorkSiteDetailDTO workSiteDetailDTO){
-        workSiteInfoService.updateWorkSiteInfo(workSiteDetailDTO);
-        return ResponseData.success();
-    }
-
-
-    @ApiOperation("删除作业现场")
-    @PostMapping("delete")
-    @ResponseBody
-    public Object delete(@ApiParam("作业现场id列表")@RequestBody List<Long> projectIds){
-        workSiteInfoService.deleteProjects(projectIds);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("查询作业现场详情")
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = WorkSiteDetailDTO.class),
-    })
-    @GetMapping("detail")
-    @ResponseBody
-    public Object delete(@ApiParam(value = "作业现场id", example = "0")@RequestParam Long projectId){
-        WorkSiteDetailDTO detailDTO = workSiteInfoService.getWorkSiteDetail(projectId);
-        return ResponseData.success(detailDTO);
-    }
-
-    @ApiOperation("分页列表查询")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "workTitle",value = "作业名称", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "workRoad",value = "所属道路", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "workPersonName",value = "责任人姓名", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "startDate",value = "注册开始日期", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "endDate",value = "注册结束日期", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "projectState",value = "当前状态（字典值）", dataType = "String", paramType = "query")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = WorkSiteInfo.class),
-    })
-    @GetMapping("listPage")
-    @ResponseBody
-    public Object listPage(String workTitle,String workRoad,String workPersonName,String projectState,String startDate,String endDate){
-        Page<WorkSiteInfo> page = PageFactory.defaultPage();
-        QueryWrapper<WorkSiteInfo> queryWrapper = new QueryWrapper<>();
-        if(StrUtil.isNotEmpty(workTitle)){
-            queryWrapper.like("WORK_TITLE",workTitle);
-        }
-        if(StrUtil.isNotEmpty(workRoad)){
-            queryWrapper.like("WORK_ROAD",workRoad);
-        }
-        if(StrUtil.isNotEmpty(workPersonName)){
-            queryWrapper.like("WORKER_NAME",workPersonName);
-        }
-        if(StrUtil.isNotEmpty(projectState)){
-            queryWrapper.eq("PROJECT_STATE",projectState);
-        }
-        if(StrUtil.isNotEmpty(startDate)){
-            queryWrapper.ge("br_work_site_info.CREATE_TIME",startDate + " 00:00:00");
-        }
-        if(StrUtil.isNotEmpty(endDate)){
-            queryWrapper.le("br_work_site_info.CREATE_TIME",endDate + " 23:59:59");
-        }
-        page = workSiteInfoService.selectListPage(page,queryWrapper);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-    @ApiOperation("开始作业")
-    @PostMapping("start")
-    @ResponseBody
-    public Object start(@ApiParam(value = "作业现场id",example = "0")@RequestParam Long projectId){
-        workSiteInfoService.start(projectId);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("完成作业")
-    @PostMapping("finish")
-    @ResponseBody
-    public Object finish(@ApiParam(value = "作业现场id", example = "0")@RequestParam Long projectId){
-        workSiteInfoService.finish(projectId);
-        return ResponseData.success();
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/WorkerController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/WorkerController.java
deleted file mode 100644
index 796f94c..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/WorkerController.java
+++ /dev/null
@@ -1,136 +0,0 @@
-package com.casic.missiles.modular.system.controller;
-
-
-import cn.hutool.core.util.ObjectUtil;
-import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.core.base.controller.BaseController;
-import com.casic.missiles.core.page.PageFactory;
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.DeviceDetailDTO;
-import com.casic.missiles.modular.system.entity.Device;
-import com.casic.missiles.modular.system.entity.Worker;
-import com.casic.missiles.modular.system.service.IWorkerService;
-import io.swagger.annotations.*;
-import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.*;
-
-import org.springframework.stereotype.Controller;
-
-import java.util.Date;
-import java.util.List;
-
-import static com.casic.missiles.model.response.ResponseData.DEFAULT_SUCCESS_MESSAGE;
-
-/**
- * <p>
- *  前端控制器
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@Controller
-@RequestMapping("/worker")
-@RequiredArgsConstructor
-@Api(tags = "人员管理接口")
-public class WorkerController extends BaseController {
-
-    private final IWorkerService workerService;
-
-    @ApiOperation("分页列表查询")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "name",value = "姓名", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "deptId",value = "所属部门", dataType = "Long", paramType = "query", example = "0"),
-            @ApiImplicitParam(name = "status",value = "当前状态（字典值）", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "startDate",value = "注册开始日期", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "endDate",value = "注册结束日期", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "workerType",value = "人员类型（字典值）", dataType = "String", paramType = "query")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = Worker.class),
-    })
-    @GetMapping("listPage")
-    @ResponseBody
-    public Object listPage(String name,Long deptId, String status,String startDate,String endDate,String workerType){
-        Page<Worker> page = PageFactory.defaultPage();
-        QueryWrapper<Worker> queryWrapper = new QueryWrapper<>();
-        if(StrUtil.isNotEmpty(name)){
-            queryWrapper.like("WORKER_NAME",name);
-        }
-        if(ObjectUtil.isNotEmpty(deptId)){
-            queryWrapper.eq("DEPT_ID",deptId);
-        }
-        if(StrUtil.isNotEmpty(workerType)){
-            queryWrapper.eq("WORKER_TYPE",workerType);
-        }
-        if(StrUtil.isNotEmpty(startDate)){
-            queryWrapper.ge("CREATE_TIME",startDate + " 00:00:00");
-        }
-        if(StrUtil.isNotEmpty(endDate)){
-            queryWrapper.le("CREATE_TIME",endDate + " 23:59:59");
-        }
-        if(StrUtil.isNotEmpty(status)){
-            queryWrapper.eq("`STATUS`",status);
-        }
-        page = workerService.selectListPage(page,queryWrapper);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-    @ApiOperation("新增人员")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "worker", value = "人员信息", dataType = "Worker", paramType = "body", required = true),
-            @ApiImplicitParam(name = "projectId", value = "项目ID(入场申请需要)", dataType = "Long", paramType = "query", example = "0")
-    })
-    @PostMapping("add")
-    @ResponseBody
-    public Object add(@ApiParam("worker")@RequestBody Worker worker,
-                      @RequestParam(required = false) Long projectId){
-        workerService.addWorker(worker,projectId);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("编辑人员")
-    @PostMapping("update")
-    @ResponseBody
-    public Object update(@RequestBody Worker worker){
-        workerService.updateById(worker);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("删除人员")
-    @PostMapping("delete")
-    @ResponseBody
-    public Object delete(@ApiParam("人员id列表")@RequestBody List<Long> workIds){
-        workerService.removeByIds(workIds);
-        return ResponseData.success();
-    }
-
-
-    @ApiOperation(value = "获取人脸图片",notes = "返回人脸图片url")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "cameraIp",value = "摄像头IP", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "cameraPort",value = "摄像头端口号", dataType = "String", paramType = "query"),
-    })
-    @GetMapping("/face/register")
-    @ResponseBody
-    public Object faceRegister(String cameraIp,String cameraPort){
-        return ResponseData.success(workerService.faceRegister(cameraIp, cameraPort));
-    }
-
-
-    @ApiOperation(value = "查询临时入场人员列表")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "projectId", value = "项目ID",required = true,dataType = "Long", paramType = "query", example = "0")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = Worker.class),
-    })
-    @GetMapping("/projectTempWorker")
-    @ResponseBody
-    public Object projectTempWorker(Long projectId){
-        return ResponseData.success(workerService.projectTempWorker(projectId));
-    }
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/AlarmTypeCountDTO.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/AlarmTypeCountDTO.java
deleted file mode 100644
index 1a165a1..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/AlarmTypeCountDTO.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.casic.missiles.modular.system.dto;
-
-import io.swagger.annotations.ApiModel;
-import lombok.Data;
-
-@ApiModel(value = "AlarmTypeCountDTO",description = "报警类型统计（首页）")
-@Data
-public class AlarmTypeCountDTO {
-
-    private String alarmType;
-    private String alarmTypeName;
-    private Integer alarmCount;
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/AlarmUpload.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/AlarmUpload.java
deleted file mode 100644
index 73d7799..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/AlarmUpload.java
+++ /dev/null
@@ -1,46 +0,0 @@
-package com.casic.missiles.modular.system.dto;
-
-import cn.hutool.core.util.StrUtil;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-@ApiModel(value = "AlarmUpload",description = "报警上传")
-@Data
-public class AlarmUpload {
-
-    @ApiModelProperty(value = "摄像头ip")
-    private String cameraIp;
-
-    @ApiModelProperty(value = "摄像头端口")
-    private String cameraPort;
-    @ApiModelProperty(value = "安全树甲烷设备ip")
-    private String gasIp;
-    @ApiModelProperty(value = "安全树甲烷设备端口")
-    private String gasPort;
-    @ApiModelProperty(value = "报警值")
-    private String alarmValue;
-    @ApiModelProperty(value = "报警时间")
-    private String alarmTime;
-    @ApiModelProperty(value = "报警类型")
-    private String alarmType;
-    @ApiModelProperty(value = "报警图片")
-    private String alarmImage;
-    @ApiModelProperty(value = "报警内容")
-    private String alarmContent;
-
-    @Override
-    public String toString() {
-        return "AlarmUpload{" +
-                "cameraIp='" + cameraIp + '\'' +
-                ", cameraPort='" + cameraPort + '\'' +
-                ", gasIp='" + gasIp + '\'' +
-                ", gasPort='" + gasPort + '\'' +
-                ", alarmValue='" + alarmValue + '\'' +
-                ", alarmTime='" + alarmTime + '\'' +
-                ", alarmType='" + alarmType + '\'' +
-                ", alarmImage='" + (StrUtil.isNotEmpty(alarmImage) ? alarmImage.substring(0,50) : "null") + '\'' +
-                ", alarmContent='" + alarmContent + '\'' +
-                '}';
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/DeviceDetailDTO.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/DeviceDetailDTO.java
deleted file mode 100644
index ea518d9..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/DeviceDetailDTO.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package com.casic.missiles.modular.system.dto;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.casic.missiles.modular.system.entity.Device;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-@ApiModel("DeviceDetailDTO")
-@Data
-public class DeviceDetailDTO extends Device {
-
-    @ApiModelProperty(value = "摄像头编号")
-    private String cameraCode;
-
-    @ApiModelProperty(value = "摄像头IP")
-    private String cameraIp;
-
-    @ApiModelProperty(value = "摄像头端口")
-    private String cameraPort;
-
-    @ApiModelProperty(value = "激甲编号")
-    private String gasCode;
-
-    @ApiModelProperty(value = "激甲IP")
-    private String gasIp;
-
-    @ApiModelProperty(value = "激甲端口")
-    private String gasPort;
-
-    @ApiModelProperty(value = "智能帽衬编号")
-    private String hatLiningCode;
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/WorkSiteDetailDTO.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/WorkSiteDetailDTO.java
deleted file mode 100644
index 29378ff..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/WorkSiteDetailDTO.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package com.casic.missiles.modular.system.dto;
-
-import com.casic.missiles.modular.system.entity.ProjectDevice;
-import com.casic.missiles.modular.system.entity.ProjectWorker;
-import com.casic.missiles.modular.system.entity.WorkSiteInfo;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.util.List;
-
-@Data
-@ApiModel("WorkSiteDetailDTO")
-public class WorkSiteDetailDTO extends WorkSiteInfo {
-
-    @ApiModelProperty(value = "安全树列表",dataType = "ProjectDevice")
-    private List<ProjectDevice> deviceList;
-
-    @ApiModelProperty(value = "人员列表",dataType = "ProjectWorker")
-    private List<ProjectWorker> workerList;
-
-
-
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/WorkerLocationDTO.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/WorkerLocationDTO.java
deleted file mode 100644
index 6fd7b24..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/WorkerLocationDTO.java
+++ /dev/null
@@ -1,68 +0,0 @@
-package com.casic.missiles.modular.system.dto;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-@ApiModel(value = "WorkerLocationDTO",description = "人员位置列表（首页）")
-@Data
-public class WorkerLocationDTO {
-
-    @ApiModelProperty("人员ID")
-    private Long workerId;
-
-    @ApiModelProperty("人员姓名")
-    private String workerName;
-
-    @ApiModelProperty("安全帽编号")
-    private String hatCode;
-
-    @ApiModelProperty("安全帽ID")
-    private Long hatId;
-
-    @ApiModelProperty("背心编号")
-    private String vastCode;
-
-    @ApiModelProperty("手环编号")
-    private String braceletCode;
-
-    @ApiModelProperty("位置")
-    private String location;
-
-    @ApiModelProperty("时间")
-    private String time;
-
-    @ApiModelProperty("经度")
-    private String lng;
-
-    @ApiModelProperty("纬度")
-    private String lat;
-
-    @ApiModelProperty("心率")
-    private String heartRate;
-
-    @ApiModelProperty("血氧")
-    private String bloodOxygen;
-
-    @ApiModelProperty("一氧化碳")
-    private String co;
-
-    @ApiModelProperty("甲烷")
-    private String gas;
-
-    @ApiModelProperty("硫化氢")
-    private String h2s;
-
-    @ApiModelProperty("氧气")
-    private String o2;
-
-    @ApiModelProperty("信号")
-    private String signal;
-
-    @ApiModelProperty("电量")
-    private String cell;
-
-    @ApiModelProperty("是否报警")
-    private boolean alarmFlag;
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Alarm.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Alarm.java
new file mode 100644
index 0000000..4d2b7ef
--- /dev/null
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Alarm.java
@@ -0,0 +1,103 @@
+package com.casic.missiles.modular.system.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import java.util.Date;
+
+/**
+ * <p>
+ * 报警记录表
+ * </p>
+ *
+ * @author zyj
+ * @since 2023-05-25
+ */
+@Data
+@TableName("bus_alarm")
+public class Alarm implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    @TableId(value = "ID",type = IdType.ASSIGN_ID)
+    private Long id;
+
+    /**
+     * 设备ID
+     */
+    @TableField("DEVICE_ID")
+    private Long deviceId;
+
+    /**
+     * 报警类型
+     */
+    @TableField("ALARM_TYPE")
+    private String alarmType;
+
+    /**
+     * 报警时间
+     */
+    @TableField("ALARM_TIME")
+    private Date alarmTime;
+
+    /**
+     * 报警状态
+     */
+    @TableField("ALARM_STATUS")
+    private String alarmStatus;
+
+    /**
+     * 报警位置
+     */
+    @TableField("ALARM_LOCATION")
+    private String alarmLocation;
+
+    /**
+     * 报警图片
+     */
+    @TableField("ALARM_IMAGE")
+    private String alarmImage;
+
+    /**
+     * 视频通道号
+     */
+    @TableField("CHANNEL_NO")
+    private Integer channelNo;
+
+    /**
+     * 报警内容
+     */
+    @TableField("ALARM_CONTENT")
+    private String alarmContent;
+
+    /**
+     * 消警时间
+     */
+    @TableField("CANCEL_TIME")
+    private Date cancelTime;
+
+
+    @Override
+    public String toString() {
+        return "Alarm{" +
+            "id=" + id +
+            ", deviceId=" + deviceId +
+            ", alarmType=" + alarmType +
+            ", alarmTime=" + alarmTime +
+            ", alarmStatus=" + alarmStatus +
+            ", alarmLocation=" + alarmLocation +
+            ", alarmImage=" + alarmImage +
+            ", channelNo=" + channelNo +
+            ", alarmContent=" + alarmContent +
+            ", cancelTime=" + cancelTime +
+        "}";
+    }
+}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusAlarm.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusAlarm.java
deleted file mode 100644
index efb4a23..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusAlarm.java
+++ /dev/null
@@ -1,159 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.alibaba.fastjson.annotation.JSONField;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.time.LocalDateTime;
-import java.util.Date;
-
-/**
- * <p>
- * 报警记录表
- * </p>
- *
- * @author zyj
- * @since 2023-05-16
- */
-@Data
-@ApiModel("Alarm")
-@TableName("br_bus_alarm")
-public class BusAlarm implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 项目ID
-     */
-    @ApiModelProperty(value = "项目ID")
-    @TableField("PROJECT_ID")
-    private Long projectId;
-
-    /**
-     * 设备ID
-     */
-    @ApiModelProperty(value = "设备ID")
-    @TableField("DEVICE_ID")
-    private Long deviceId;
-
-    /**
-     * 报警类型
-     */
-    @ApiModelProperty(value = "报警类型")
-    @TableField("ALARM_TYPE")
-    private String alarmType;
-
-    /**
-     * 报警状态
-     */
-    @ApiModelProperty(value = "报警状态")
-    @TableField("ALARM_STATUS")
-    private String alarmStatus;
-
-    /**
-     * 报警值
-     */
-    @ApiModelProperty(value = "报警值")
-    @TableField("ALARM_VALUE")
-    private String alarmValue;
-
-    /**
-     * 报警图片
-     */
-    @ApiModelProperty(value = "报警图片")
-    @TableField("ALARM_IMAGE")
-    private String alarmImage;
-
-    /**
-     * 报警内容
-     */
-    @ApiModelProperty(value = "报警内容")
-    @TableField("ALARM_CONTENT")
-    private String alarmContent;
-
-    /**
-     * 报警时间
-     */
-    @ApiModelProperty(value = "报警时间")
-    @TableField("ALARM_TIME")
-    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
-    private Date alarmTime;
-
-    /**
-     * 消警时间
-     */
-    @ApiModelProperty(value = "消警时间")
-    @TableField("CANCEL_TIME")
-    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
-    private Date cancelTime;
-
-    /**
-     * 报警位置经度
-     */
-    @ApiModelProperty(value = "报警位置经度")
-    @TableField("ALARM_LNG")
-    private String alarmLng;
-
-    /**
-     * 报警位置纬度
-     */
-    @ApiModelProperty(value = "报警位置纬度")
-    @TableField("ALARM_LAT")
-    private String alarmLat;
-
-    @ApiModelProperty("报警类型名称")
-    @TableField(exist = false)
-    private String alarmStatusName;
-    @ApiModelProperty("报警类型名称")
-    @TableField(exist = false)
-    private String alarmTypeName;
-    @ApiModelProperty("作业名称")
-    @TableField(exist = false)
-    private String workTitle;
-    @ApiModelProperty("所属道路")
-    @TableField(exist = false)
-    private String workRoad;
-    @ApiModelProperty("作业状态")
-    @TableField(exist = false)
-    private String projectState;
-    @ApiModelProperty("作业状态名称")
-    @TableField(exist = false)
-    private String projectStateName;
-    @ApiModelProperty("负责人姓名")
-    @TableField(exist = false)
-    private String workPersonName;
-    @ApiModelProperty("负责人联系方式")
-    @TableField(exist = false)
-    private String workPersonPhoneNumber;
-
-
-    @Override
-    public String toString() {
-        return "BusAlarm{" +
-                "id=" + id +
-                ", projectId=" + projectId +
-                ", deviceId=" + deviceId +
-                ", alarmType=" + alarmType +
-                ", alarmValue=" + alarmValue +
-                ", alarmStatus=" + alarmStatus +
-                ", alarmImage=" + alarmImage +
-                ", alarmContent=" + alarmContent +
-                ", alarmTime=" + alarmTime +
-                ", cancelTime=" + cancelTime +
-                ", alarmLng=" + alarmLng +
-                ", alarmLat=" + alarmLat +
-                "}";
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusEvent.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusEvent.java
deleted file mode 100644
index a0b7543..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusEvent.java
+++ /dev/null
@@ -1,100 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.time.LocalDateTime;
-import java.util.Date;
-import java.util.List;
-
-/**
- * <p>
- * 事件表
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@TableName("br_bus_event")
-@Data
-@ApiModel("BusEvent")
-public class BusEvent implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @ApiModelProperty("事件ID")
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 事件标题
-     */
-    @ApiModelProperty("事件名称")
-    @TableField("EVENT_TITLE")
-    private String eventTitle;
-
-    /**
-     * 上报人员
-     */
-    @ApiModelProperty("上报人员")
-    @TableField("UPLOAD_NAME")
-    private String uploadName;
-
-    /**
-     * 联系方式
-     */
-    @ApiModelProperty("联系方式")
-    @TableField("PHONE_NUMBER")
-    private String phoneNumber;
-
-    /**
-     * 事件描述
-     */
-    @ApiModelProperty("事件描述")
-    @TableField("EVENT_DESCRIPTION")
-    private String eventDescription;
-
-    @ApiModelProperty("经度")
-    @TableField("LNG")
-    private String lng;
-
-    @ApiModelProperty("纬度")
-    @TableField("LAT")
-    private String lat;
-
-    /**
-     * 事件上传时间
-     */
-    @ApiModelProperty("事件上传时间")
-    @TableField("CREATE_TIME")
-    private Date createTime;
-
-    @ApiModelProperty("事件照片")
-    @TableField(exist = false)
-    private List<BusEventImage> imageList;
-
-
-
-    @Override
-    public String toString() {
-        return "BusEvent{" +
-            "id=" + id +
-            ", eventTitle=" + eventTitle +
-            ", uploadName=" + uploadName +
-            ", phoneNumber=" + phoneNumber +
-            ", eventDescription=" + eventDescription +
-            ", lng=" + lng +
-            ", lat=" + lat +
-            ", createTime=" + createTime +
-        "}";
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusEventImage.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusEventImage.java
deleted file mode 100644
index 1e75245..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusEventImage.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-
-/**
- * <p>
- * 事件图片表
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@TableName("br_bus_event_image")
-@Data
-@ApiModel("BusEventImage")
-public class BusEventImage implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 事件ID
-     */
-    @TableField("EVENT_ID")
-    private Long eventId;
-
-    /**
-     * 报警图片
-     */
-    @TableField("IMAGE")
-    @ApiModelProperty("图片url")
-    private String image;
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Device.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Device.java
index df89c70..ea7db5f 100644
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Device.java
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Device.java
@@ -1,30 +1,23 @@
 package com.casic.missiles.modular.system.entity;
 
-import com.alibaba.fastjson.annotation.JSONField;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.casic.missiles.core.base.json.DateDeserializer;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
-import java.util.Date;
 
 /**
  * <p>
- * 
+ * 设备记录表
  * </p>
  *
  * @author zyj
- * @since 2023-04-14
+ * @since 2023-05-25
  */
-@ApiModel("Device")
-@TableName("br_device")
 @Data
+@TableName("bus_device")
 public class Device implements Serializable {
 
     private static final long serialVersionUID = 1L;
@@ -32,82 +25,86 @@
     /**
      * 主键
      */
-    @ApiModelProperty(value = "设备ID")
     @TableId(value = "ID",type = IdType.ASSIGN_ID)
     private Long id;
 
     /**
-     * 设备编号
+     * 设备名称
      */
-    @ApiModelProperty(value = "设备编号")
-    @TableField("DEVICE_CODE")
-    private String deviceCode;
+    @TableField("DEVICE_NAME")
+    private String deviceName;
 
     /**
-     * 设备类型
+     * IP
      */
-    @ApiModelProperty(value = "设备类型")
-    @TableField("DEVICE_TYPE")
-    private String deviceType;
+    @TableField("IP")
+    private String ip;
 
     /**
-     * 设备批次
+     * 端口
      */
-    @ApiModelProperty(value = "设备批次")
-    @TableField("DEVICE_BATCH")
-    private String deviceBatch;
+    @TableField("PORT")
+    private String port;
 
     /**
-     * 厂家
+     * 用户名
      */
-    @ApiModelProperty(value = "厂家")
-    @TableField("MANUFACTURER")
-    private String manufacturer;
+    @TableField("USER_NAME")
+    private String userName;
 
     /**
-     * 是否供电
+     * 密码
      */
-    @ApiModelProperty(value = "是否供电")
-    @TableField("IS_POWER_SUPPLY")
-    private String isPowerSupply;
+    @TableField("PASSWORD")
+    private String password;
 
     /**
-     * 创建时间
+     * 连接类型
      */
-    @ApiModelProperty(value = "创建时间",dataType = "Date")
-    @TableField("CREATE_TIME")
-    private Date createTime;
+    @TableField("CONNECT_TYPE")
+    private String connectType;
 
-    @ApiModelProperty(value = "设备类型名称")
-    @TableField(exist = false)
-    private String deviceTypeName;
+    /**
+     * 位置
+     */
+    @TableField("LOCATION")
 
-    @ApiModelProperty(value = "是否供电名称")
-    @TableField(exist = false)
-    private String isPowerSupplyName;
+    private String location;
 
-    @ApiModelProperty(value = "注册时间",dataType = "String")
-    @TableField(exist = false)
-    private String registerTime;
+    /**
+     * 设备状态
+     */
+    @TableField("STATUS")
 
-    @ApiModelProperty(value = "当前状态")
-    @TableField(exist = false)
     private String status;
 
-    @ApiModelProperty(value = "当前状态名称")
-    @TableField(exist = false)
-    private String statusName;
+    /**
+     * 报警分组
+     */
+    @TableField("ALARM_GROUP")
+
+    private Long alarmGroup;
+
+    /**
+     * 视频通道数(预留)
+     */
+    @TableField("CHANNEL_NUM")
+    private Integer channelNum;
 
     @Override
     public String toString() {
         return "Device{" +
             "id=" + id +
-            ", deviceCode=" + deviceCode +
-            ", deviceType=" + deviceType +
-            ", deviceBatch=" + deviceBatch +
-            ", manufacturer=" + manufacturer +
-            ", isPowerSupply=" + isPowerSupply +
-            ", createTime=" + createTime +
+            ", deviceName=" + deviceName +
+            ", ip=" + ip +
+            ", port=" + port +
+            ", userName=" + userName +
+            ", password=" + password +
+            ", connectType=" + connectType +
+            ", location=" + location +
+            ", status=" + status +
+            ", alarmGroup=" + alarmGroup +
+            ", channelNum=" + channelNum +
         "}";
     }
 }
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/DeviceExt.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/DeviceExt.java
deleted file mode 100644
index 5ee7015..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/DeviceExt.java
+++ /dev/null
@@ -1,99 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-
-/**
- * <p>
- * 设备扩展信息表（安全树）
- * </p>
- *
- * @author zyj
- * @since 2023-04-27
- */
-@Data
-@TableName("br_device_ext")
-public class DeviceExt implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 设备ID
-     */
-    @TableField("DEVICE_ID")
-    private Long deviceId;
-
-    /**
-     * 摄像头编号
-     */
-    @TableField("CAMERA_CODE")
-    private String cameraCode;
-
-    /**
-     * 摄像头IP
-     */
-    @TableField("CAMERA_IP")
-    private String cameraIp;
-
-    /**
-     * 摄像头端口
-     */
-    @TableField("CAMERA_PORT")
-    private String cameraPort;
-
-    /**
-     * 激甲编号
-     */
-    @TableField("GAS_CODE")
-    private String gasCode;
-
-    /**
-     * 激甲IP
-     */
-    @TableField("GAS_IP")
-    private String gasIp;
-
-    /**
-     * 激甲端口
-     */
-    @TableField("GAS_PORT")
-    private String gasPort;
-
-    /**
-     * 甲烷报警阈值
-     */
-    @TableField("GAS_THRESHOLD")
-    private String gasThreshold;
-
-    @TableField(value = "HAT_LINING_CODE")
-    private String hatLiningCode;
-
-
-    @Override
-    public String toString() {
-        return "DeviceExt{" +
-            "id=" + id +
-            ", deviceId=" + deviceId +
-            ", cameraCode=" + cameraCode +
-            ", cameraIp=" + cameraIp +
-            ", cameraPort=" + cameraPort +
-            ", gasCode=" + gasCode +
-            ", gasIp=" + gasIp +
-            ", gasPort=" + gasPort +
-            ", gasThreshold=" + gasThreshold +
-            ", hatLiningCode=" + hatLiningCode +
-        "}";
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/ProjectDevice.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/ProjectDevice.java
deleted file mode 100644
index c4f3472..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/ProjectDevice.java
+++ /dev/null
@@ -1,62 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-
-/**
- * <p>
- * 
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@Data
-@ApiModel("ProjectDevice")
-@TableName("br_project_device")
-public class ProjectDevice implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 作业现场ID
-     */
-    @TableField("PROJECT_ID")
-    private Long projectId;
-
-    /**
-     * 设备ID
-     */
-    @TableField("DEVICE_ID")
-    @ApiModelProperty("设备ID（新增编辑时传）")
-    private Long deviceId;
-
-    /**
-     * 设备编号
-     */
-    @TableField(exist = false)
-    @ApiModelProperty("设备编号（详情中展示，新增编辑不用传）")
-    private String deviceCode;
-
-    @Override
-    public String toString() {
-        return "ProjectDevice{" +
-            "id=" + id +
-            ", projectId=" + projectId +
-            ", deviceId=" + deviceId +
-        "}";
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/ProjectWorker.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/ProjectWorker.java
deleted file mode 100644
index 10b23c4..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/ProjectWorker.java
+++ /dev/null
@@ -1,104 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import java.io.Serializable;
-
-/**
- * <p>
- * 
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@ApiModel("ProjectWorker")
-@TableName("br_project_worker")
-@Data
-@NoArgsConstructor
-@AllArgsConstructor
-public class ProjectWorker implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 作业现场ID
-     */
-    @TableField("PROJECT_ID")
-    private Long projectId;
-
-    /**
-     * 人员ID
-     */
-    @ApiModelProperty("人员ID")
-    @TableField("WORKER_ID")
-    private Long workerId;
-
-    /**
-     * 安全帽编号
-     */
-    @ApiModelProperty("安全帽编号")
-    @TableField("HAT_CODE")
-    private String hatCode;
-
-    /**
-     * 背心编号
-     */
-    @ApiModelProperty("背心编号")
-    @TableField("VAST_CODE")
-    private String vastCode;
-
-    /**
-     * 手环编号
-     */
-    @ApiModelProperty("手环编号")
-    @TableField("BRACELET_CODE")
-    private String braceletCode;
-
-    @ApiModelProperty("人员姓名（详情中展示，新增编辑不用传）")
-    @TableField(exist = false)
-    private String workerName;
-
-    @ApiModelProperty("人员部门ID（详情中展示，新增编辑不用传）")
-    @TableField(exist = false)
-    private String workerDeptId;
-
-    @ApiModelProperty("人员部门名称（详情中展示，新增编辑不用传）")
-    @TableField(exist = false)
-    private String workerDeptName;
-
-    @ApiModelProperty("人员联系方式（详情中展示，新增编辑不用传）")
-    @TableField(exist = false)
-    private String workerPhoneNumber;
-
-    public ProjectWorker(Long projectId, Long workerId) {
-        this.projectId = projectId;
-        this.workerId = workerId;
-    }
-
-    @Override
-    public String toString() {
-        return "ProjectWorker{" +
-            "id=" + id +
-            ", projectId=" + projectId +
-            ", workerId=" + workerId +
-            ", hatCode=" + hatCode +
-            ", vastCode=" + vastCode +
-            ", braceletCode=" + braceletCode +
-        "}";
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/WorkSiteInfo.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/WorkSiteInfo.java
deleted file mode 100644
index fa6f41d..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/WorkSiteInfo.java
+++ /dev/null
@@ -1,130 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.alibaba.fastjson.annotation.JSONField;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.time.LocalDateTime;
-import java.util.Date;
-
-/**
- * <p>
- * 作业现场表
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@ApiModel("WorkSiteInfo")
-@TableName("br_work_site_info")
-@Data
-public class WorkSiteInfo implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @ApiModelProperty("作业现场ID")
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 作业名称
-     */
-    @ApiModelProperty("作业名称")
-    @TableField("WORK_TITLE")
-    private String workTitle;
-
-    /**
-     * 责任人
-     */
-    @ApiModelProperty("责任人（人员ID）")
-    @TableField("WORK_PERSON")
-    private Long workPerson;
-
-    /**
-     * 作业描述
-     */
-    @ApiModelProperty("作业描述")
-    @TableField("WORK_SITE_DESC")
-    private String workSiteDesc;
-
-    /**
-     * 作业状态
-     */
-    @ApiModelProperty("作业状态")
-    @TableField("PROJECT_STATE")
-    private String projectState;
-
-    /**
-     * 所属道路
-     */
-    @ApiModelProperty("所属道路")
-    @TableField("WORK_ROAD")
-    private String workRoad;
-
-    @TableField("IMAGE_URL")
-    private String imageUrl;
-
-    @TableField("CREATE_TIME")
-    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
-    private Date createTime;
-    @TableField("UPDATE_TIME")
-    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
-    private Date updateTime;
-
-    @ApiModelProperty("开始时间")
-    @TableField("START_TIME")
-    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
-    private Date startTime;
-
-    @ApiModelProperty("结束时间")
-    @TableField("FINISH_TIME")
-    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
-    private Date finishTime;
-
-    @ApiModelProperty("负责人姓名（详情中使用，新增编辑不用传）")
-    @TableField(exist = false)
-    private String workPersonName;
-
-    @ApiModelProperty("负责人联系方式（详情中使用，新增编辑不用传）")
-    @TableField(exist = false)
-    private String workPersonPhoneNumber;
-
-    @ApiModelProperty("负责人所属部门ID（详情中使用，新增编辑不用传）")
-    @TableField(exist = false)
-    private Long workPersonDeptId;
-
-    @ApiModelProperty("负责人所属部门名称（详情中使用，新增编辑不用传）")
-    @TableField(exist = false)
-    private String workPersonDeptName;
-
-    @ApiModelProperty(value = "注册时间",dataType = "String")
-    @TableField(exist = false)
-    private String registerTime;
-
-    @ApiModelProperty("作业状态名称")
-    @TableField(exist = false)
-    private String projectStateName;
-
-    @Override
-    public String toString() {
-        return "WorkSiteInfo{" +
-            "id=" + id +
-            ", workTitle=" + workTitle +
-            ", workPerson=" + workPerson +
-            ", workSiteDesc=" + workSiteDesc +
-            ", projectState=" + projectState +
-            ", imageUrl=" + imageUrl +
-            ", updateTime=" + updateTime +
-            ", workRoad=" + workRoad +
-        "}";
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Worker.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Worker.java
deleted file mode 100644
index 28a4daa..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Worker.java
+++ /dev/null
@@ -1,147 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.time.LocalDateTime;
-import java.util.Date;
-
-/**
- * <p>
- * 
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@ApiModel("Worker")
-@TableName("br_worker")
-@Data
-public class Worker implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @ApiModelProperty(value = "人员ID")
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 姓名
-     */
-    @ApiModelProperty(value = "姓名")
-    @TableField("WORKER_NAME")
-    private String workerName;
-
-    /**
-     * 性别
-     */
-    @ApiModelProperty(value = "性别")
-    @TableField("GENDER")
-    private String gender;
-
-    /**
-     * 所属部门
-     */
-    @ApiModelProperty(value = "所属部门(人员管理)")
-    @TableField("DEPT_ID")
-    private Long deptId;
-
-    /**
-     * 所属单位
-     */
-    @ApiModelProperty(value = "所属单位(入场申请中使用)")
-    @TableField("OWNER_SHIP")
-    private String ownerShip;
-
-    /**
-     * 联系方式
-     */
-    @ApiModelProperty(value = "联系方式")
-    @TableField("PHONE_NUMBER")
-    private String phoneNumber;
-
-    /**
-     * 证件号
-     */
-    @ApiModelProperty(value = "证件号")
-    @TableField("ID_CARD_NUMBER")
-    private String idCardNumber;
-
-    /**
-     * 入场原因
-     */
-    @ApiModelProperty(value = "入场原因（入场申请中使用）")
-    @TableField("ENTER_REASON")
-    private String enterReason;
-
-    /**
-     * 入场人脸照片
-     */
-    @ApiModelProperty(value = "人脸照片（照片路径）")
-    @TableField("WORKER_AVATAR")
-    private String workerAvatar;
-
-    /**
-     * 申请入场时间
-     */
-    @ApiModelProperty(value = "注册时间/申请入场时间")
-    @TableField("CREATE_TIME")
-    private Date createTime;
-
-    /**
-     * 人员类型
-     */
-    @ApiModelProperty(value = "人员类型（区分人员管理和入场申请）")
-    @TableField("WORKER_TYPE")
-    private String workerType;
-
-    @ApiModelProperty(value = "性别名称")
-    @TableField(exist = false)
-    private String genderName;
-
-    @ApiModelProperty(value = "部门名称")
-    @TableField(exist = false)
-    private String deptName;
-
-    @ApiModelProperty(value = "注册时间",dataType = "String")
-    @TableField(exist = false)
-    private String registerTime;
-
-    @ApiModelProperty(value = "当前状态")
-    @TableField(exist = false)
-    private String status;
-
-    @ApiModelProperty(value = "当前状态名称")
-    @TableField(exist = false)
-    private String statusName;
-
-    @ApiModelProperty(value = "是否注册(0未注册；1已注册)",allowableValues = "0,1")
-    @TableField(exist = false)
-    private String isRegister;
-
-    @Override
-    public String toString() {
-        return "Worker{" +
-            "id=" + id +
-            ", workerName=" + workerName +
-            ", gender=" + gender +
-            ", deptId=" + deptId +
-            ", ownerShip=" + ownerShip +
-            ", phoneNumber=" + phoneNumber +
-            ", idCardNumber=" + idCardNumber +
-            ", enterReason=" + enterReason +
-            ", workerAvatar=" + workerAvatar +
-            ", createTime=" + createTime +
-            ", workerType=" + workerType +
-        "}";
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/AlarmMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/AlarmMapper.java
new file mode 100644
index 0000000..ea4c8be
--- /dev/null
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/AlarmMapper.java
@@ -0,0 +1,16 @@
+package com.casic.missiles.modular.system.mapper;
+
+import com.casic.missiles.modular.system.entity.Alarm;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 报警记录表 Mapper 接口
+ * </p>
+ *
+ * @author zyj
+ * @since 2023-05-25
+ */
+public interface AlarmMapper extends BaseMapper<Alarm> {
+
+}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/BusAlarmMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/BusAlarmMapper.java
deleted file mode 100644
index 9801742..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/BusAlarmMapper.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package com.casic.missiles.modular.system.mapper;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.modular.system.dto.AlarmTypeCountDTO;
-import com.casic.missiles.modular.system.entity.BusAlarm;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * <p>
- * 报警记录表 Mapper 接口
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface BusAlarmMapper extends BaseMapper<BusAlarm> {
-
-    Page<BusAlarm> listPage(Page<BusAlarm> page,@Param("ew")  QueryWrapper<BusAlarm> queryWrapper);
-
-    void cancelAlarm(@Param("deviceId")Long deviceId,@Param("alarmType") String alarmType);
-
-    List<AlarmTypeCountDTO> alarmCount(@Param("projectId")Long projectId, @Param("alarmStatus")String alarmStatus);
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/BusEventImageMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/BusEventImageMapper.java
deleted file mode 100644
index 9590b7d..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/BusEventImageMapper.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.casic.missiles.modular.system.mapper;
-
-import com.casic.missiles.modular.system.entity.BusEventImage;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * <p>
- * 事件图片表 Mapper 接口
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface BusEventImageMapper extends BaseMapper<BusEventImage> {
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/BusEventMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/BusEventMapper.java
deleted file mode 100644
index 3c85edf..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/BusEventMapper.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.casic.missiles.modular.system.mapper;
-
-import com.casic.missiles.modular.system.entity.BusEvent;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * <p>
- * 事件表 Mapper 接口
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface BusEventMapper extends BaseMapper<BusEvent> {
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/DeviceExtMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/DeviceExtMapper.java
deleted file mode 100644
index 4ca9212..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/DeviceExtMapper.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.casic.missiles.modular.system.mapper;
-
-import com.casic.missiles.modular.system.entity.DeviceExt;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * <p>
- * 设备扩展信息表（安全树） Mapper 接口
- * </p>
- *
- * @author zyj
- * @since 2023-04-27
- */
-public interface DeviceExtMapper extends BaseMapper<DeviceExt> {
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/DeviceMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/DeviceMapper.java
index 444c0c5..3d0bb02 100644
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/DeviceMapper.java
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/DeviceMapper.java
@@ -1,30 +1,16 @@
 package com.casic.missiles.modular.system.mapper;
 
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.modular.system.dto.DeviceDetailDTO;
-import com.casic.missiles.modular.system.dto.HelmetInfoDTO;
 import com.casic.missiles.modular.system.entity.Device;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
 
 /**
  * <p>
- *  Mapper 接口
+ * 设备记录表 Mapper 接口
  * </p>
  *
  * @author zyj
- * @since 2023-04-14
+ * @since 2023-05-25
  */
-@Mapper
 public interface DeviceMapper extends BaseMapper<Device> {
 
-    Page<DeviceDetailDTO> listDetailPage(Page<DeviceDetailDTO> page,@Param("ew") QueryWrapper<DeviceDetailDTO> ew);
-
-     List<Long> selectProjectDevice(@Param("projectId") Long projectId);
-
-    List<HelmetInfoDTO> selectHelmetList(@Param("deviceType")String deviceType);
 }
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/ProjectDeviceMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/ProjectDeviceMapper.java
deleted file mode 100644
index 1d0c14e..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/ProjectDeviceMapper.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package com.casic.missiles.modular.system.mapper;
-
-import com.casic.missiles.modular.system.dto.DeviceLocationDTO;
-import com.casic.missiles.modular.system.entity.ProjectDevice;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * <p>
- *  Mapper 接口
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface ProjectDeviceMapper extends BaseMapper<ProjectDevice> {
-     List<ProjectDevice> selectDetailByProjectId(@Param("projectId") Long projectId);
-
-     List<DeviceLocationDTO> selectDeviceLocationList(@Param("projectId") Long projectId);
-
-}

diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/AlarmController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/AlarmController.java
new file mode 100644
index 0000000..1795cf1
--- /dev/null
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/AlarmController.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.modular.system.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.stereotype.Controller;
+
+/**
+ * <p>
+ * 报警记录表 前端控制器
+ * </p>
+ *
+ * @author zyj
+ * @since 2023-05-25
+ */
+@Controller
+@RequestMapping("/system/alarm")
+public class AlarmController {
+
+}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusAlarmController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusAlarmController.java
deleted file mode 100644
index 1f82ebb..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusAlarmController.java
+++ /dev/null
@@ -1,102 +0,0 @@
-package com.casic.missiles.modular.system.controller;
-
-
-import cn.hutool.core.util.ObjectUtil;
-import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.core.base.controller.BaseController;
-import com.casic.missiles.core.page.PageFactory;
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.AlarmUpload;
-import com.casic.missiles.modular.system.dto.DeviceDetailDTO;
-import com.casic.missiles.modular.system.entity.BusAlarm;
-import com.casic.missiles.modular.system.service.IBusAlarmService;
-import io.swagger.annotations.*;
-import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.*;
-
-import org.springframework.stereotype.Controller;
-
-import static com.casic.missiles.model.response.ResponseData.DEFAULT_SUCCESS_MESSAGE;
-import static com.casic.missiles.modular.system.consts.AlarmConst.ALARM_STATUS_MANUAL_CANCEL;
-
-/**
- * <p>
- * 报警记录表 前端控制器
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@Api(tags = "报警管理接口")
-@Controller
-@RequestMapping("/alarm")
-@RequiredArgsConstructor
-public class BusAlarmController extends BaseController {
-
-    private final IBusAlarmService alarmService;
-
-    @ApiOperation("报警上报接口")
-    @PostMapping("/upload")
-    @ResponseBody
-    public Object upload(@RequestBody AlarmUpload alarmUpload){
-        alarmService.alarmUpload(alarmUpload);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("报警列表分页查询")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "workTitle", value = "作业名称",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "projectId", value = "作业ID",dataType = "Long", paramType = "query",example = "0"),
-            @ApiImplicitParam(name = "alarmStatus", value = "报警状态",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "projectState", value = "作业状态",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "alarmType", value = "报警类型",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "alarmStartTime", value = "报警开始时间",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "alarmEndTime", value = "报警结束时间",dataType = "String", paramType = "query")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = BusAlarm.class),
-    })
-    @GetMapping("/listPage")
-    @ResponseBody
-    public Object listPage(String workTitle,Long projectId,String alarmStatus,String projectState,String alarmType,String alarmStartTime,String alarmEndTime){
-        Page<BusAlarm> page = PageFactory.defaultPage();
-        QueryWrapper<BusAlarm> queryWrapper = new QueryWrapper<>();
-        if(StrUtil.isNotEmpty(workTitle)){
-            queryWrapper.like("p.WORK_TITLE",workTitle);
-        }
-        if(ObjectUtil.isNotEmpty(projectId)){
-            queryWrapper.eq("alarm.PROJECT_ID",projectId);
-        }
-        if(StrUtil.isNotEmpty(alarmStatus)){
-            queryWrapper.eq("alarm.ALARM_STATUS",alarmStatus);
-        }
-        if(StrUtil.isNotEmpty(projectState)){
-            queryWrapper.eq("p.PROJECT_STATE",projectState);
-        }
-        if(StrUtil.isNotEmpty(alarmType)){
-            queryWrapper.eq("alarm.ALARM_TYPE",alarmType);
-        }
-        if(StrUtil.isNotEmpty(alarmStartTime)){
-            queryWrapper.ge("alarm.ALARM_TIME",alarmStartTime);
-        }
-        if(StrUtil.isNotEmpty(alarmEndTime)){
-            queryWrapper.le("alarm.ALARM_TIME",alarmEndTime);
-        }
-        page = alarmService.listPage(page,queryWrapper);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-    @ApiOperation("消警")
-    @PostMapping("/cancel")
-    @ResponseBody
-    public Object cancel(@RequestParam("alarmId") Long alarmId){
-        UpdateWrapper<BusAlarm> updateWrapper = new UpdateWrapper<>();
-        updateWrapper.eq("ID",alarmId);
-        updateWrapper.set("ALARM_STATUS",ALARM_STATUS_MANUAL_CANCEL);
-        alarmService.update(updateWrapper);
-        return ResponseData.success();
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusEventController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusEventController.java
deleted file mode 100644
index dde5aad..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusEventController.java
+++ /dev/null
@@ -1,41 +0,0 @@
-package com.casic.missiles.modular.system.controller;
-
-
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.entity.BusEvent;
-import com.casic.missiles.modular.system.service.IBusEventService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.ResponseBody;
-
-/**
- * <p>
- * 事件表 前端控制器
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@Controller
-@RequestMapping("/event")
-@Api(tags = "事件上报")
-@RequiredArgsConstructor
-public class BusEventController {
-
-    private final IBusEventService eventService;
-
-    @ApiOperation("事件上报")
-    @PostMapping("add")
-    @ResponseBody
-    public Object add(@RequestBody BusEvent busEvent){
-        eventService.saveBusEvent(busEvent);
-        return ResponseData.success();
-    }
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
index 03abc5f..aa50d78 100644
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
@@ -1,121 +1,20 @@
 package com.casic.missiles.modular.system.controller;
 
 
-import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.core.base.controller.BaseController;
-import com.casic.missiles.core.page.PageFactory;
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.DeviceDetailDTO;
-import com.casic.missiles.modular.system.entity.Device;
-import com.casic.missiles.modular.system.service.IDeviceExtService;
-import com.casic.missiles.modular.system.service.IDeviceService;
-import io.swagger.annotations.*;
-import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.RequestMapping;
 
 import org.springframework.stereotype.Controller;
 
-import java.time.LocalDateTime;
-import java.util.Date;
-import java.util.List;
-
-import static com.casic.missiles.model.response.ResponseData.DEFAULT_SUCCESS_MESSAGE;
-
 /**
  * <p>
- *  前端控制器
+ * 设备记录表 前端控制器
  * </p>
  *
  * @author zyj
- * @since 2023-04-14
+ * @since 2023-05-25
  */
-@Api(tags = "设备管理接口")
-@RequiredArgsConstructor
 @Controller
-@RequestMapping("/device")
-public class DeviceController extends BaseController {
-    private final IDeviceService deviceService;
-    private final IDeviceExtService deviceExtService;
-
-    @ApiOperation("设备分页列表")
-    @ApiImplicitParams({
-        @ApiImplicitParam(name = "deviceType", value = "设备类型",dataType = "String", paramType = "query"),
-        @ApiImplicitParam(name = "deviceCode", value = "设备编号",dataType = "String", paramType = "query"),
-        @ApiImplicitParam(name = "status", value = "设备状态",dataType = "String", paramType = "query"),
-        @ApiImplicitParam(name = "projectId", value = "作业ID（如果传此参数，列表中返回该作业使用的设备）",dataType = "Long", paramType = "query", example = "0")
-    })
-    @ApiResponses({
-        @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = DeviceDetailDTO.class),
-    })
-    @GetMapping("listPage")
-    @ResponseBody
-    public Object listPage(String deviceType, String deviceCode, String status,Long projectId){
-        Page<DeviceDetailDTO> page = PageFactory.defaultPage();
-        QueryWrapper<DeviceDetailDTO> queryWrapper = new QueryWrapper<>();
-        if(StrUtil.isNotEmpty(deviceType)){
-            queryWrapper.eq("DEVICE_TYPE",deviceType);
-        }
-        if(StrUtil.isNotEmpty(deviceCode)){
-            queryWrapper.like("DEVICE_CODE",deviceCode);
-        }
-        page = deviceService.listPage(page,queryWrapper,status,projectId);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-    @ApiOperation("新增设备")
-    @PostMapping("add")
-    @ResponseBody
-    public Object add(@RequestBody DeviceDetailDTO deviceDetailDTO){
-        deviceService.saveDevice(deviceDetailDTO);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("编辑设备")
-    @PostMapping("update")
-    @ResponseBody
-    public Object update(@RequestBody DeviceDetailDTO deviceDetailDTO){
-        deviceService.updateDevice(deviceDetailDTO);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("删除设备")
-    @PostMapping("delete")
-    @ResponseBody
-    public Object delete(@ApiParam("设备id列表")@RequestBody List<Long> deviceIds){
-        deviceService.deleteDevices(deviceIds);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("设置甲烷阈值")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "gasIp", value = "安全树甲烷设备IP",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "gasPort", value = "安全树甲烷端口",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "threshold", value = "甲烷阈值",dataType = "String", paramType = "query")
-    })
-    @PostMapping("setThreshold")
-    @ResponseBody
-    public Object setThreshold(String gasIp,String gasPort,String threshold){
-        deviceExtService.setGasThreshold(gasIp, gasPort, threshold);
-        return ResponseData.success();
-    }
-
-
-    @ApiOperation("查询甲烷阈值")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "gasIp", value = "安全树甲烷设备IP",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "gasPort", value = "安全树甲烷端口",dataType = "String", paramType = "query")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = "{\"code\": 200,\"data\": \"100\",\"message\": \"请求成功\",\"success\": true}",response = String.class),
-    })
-    @GetMapping("getThreshold")
-    @ResponseBody
-    public Object getThreshold(String gasIp,String gasPort){
-        String data = deviceExtService.getGasThreshold(gasIp, gasPort);
-        return ResponseData.success(data);
-    }
-
+@RequestMapping("/system/device")
+public class DeviceController {
 
 }
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/OverviewController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/OverviewController.java
deleted file mode 100644
index 7570504..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/OverviewController.java
+++ /dev/null
@@ -1,70 +0,0 @@
-package com.casic.missiles.modular.system.controller;
-
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.AlarmTypeCountDTO;
-import com.casic.missiles.modular.system.dto.DeviceLocationDTO;
-import com.casic.missiles.modular.system.dto.WorkerLocationDTO;
-import com.casic.missiles.modular.system.service.IBusAlarmService;
-import com.casic.missiles.modular.system.service.IProjectDeviceService;
-import com.casic.missiles.modular.system.service.IProjectWorkerService;
-import io.swagger.annotations.*;
-import lombok.RequiredArgsConstructor;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.ResponseBody;
-
-import static com.casic.missiles.model.response.ResponseData.DEFAULT_SUCCESS_MESSAGE;
-import static com.casic.missiles.modular.system.consts.AlarmConst.ALARM_STATUS_ON;
-
-@Api(tags = "首页看板接口")
-@Controller
-@RequestMapping("overview")
-@RequiredArgsConstructor
-public class OverviewController {
-
-    private final IBusAlarmService alarmService;
-    private final IProjectDeviceService projectDeviceService;
-
-    private final IProjectWorkerService projectWorkerService;
-
-
-    @ApiOperation("报警统计接口")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "projectId", value = "作业ID",dataType = "Long", paramType = "query", example = "0")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = AlarmTypeCountDTO.class),
-    })
-    @GetMapping("/alarmCount")
-    @ResponseBody
-    public Object alarmCount(Long projectId){
-        return ResponseData.success(alarmService.alarmCount(projectId,ALARM_STATUS_ON));
-    }
-
-    @ApiOperation("设备列表接口")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "projectId", value = "作业ID",dataType = "Long", paramType = "query", example = "0")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = DeviceLocationDTO.class),
-    })
-    @GetMapping("/deviceList")
-    @ResponseBody
-    public Object deviceList(Long projectId){
-        return ResponseData.success(projectDeviceService.selectDeviceLocationList(projectId));
-    }
-
-    @ApiOperation("人员列表接口")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "projectId", value = "作业ID",dataType = "Long", paramType = "query", example = "0")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = WorkerLocationDTO.class),
-    })
-    @GetMapping("/workerList")
-    @ResponseBody
-    public Object workerList(Long projectId){
-        return ResponseData.success(projectWorkerService.selectWorkerLocationDTO(projectId));
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/WorkSiteInfoController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/WorkSiteInfoController.java
deleted file mode 100644
index af36d69..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/WorkSiteInfoController.java
+++ /dev/null
@@ -1,130 +0,0 @@
-package com.casic.missiles.modular.system.controller;
-
-
-import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.core.base.controller.BaseController;
-import com.casic.missiles.core.page.PageFactory;
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.WorkSiteDetailDTO;
-import com.casic.missiles.modular.system.entity.WorkSiteInfo;
-import com.casic.missiles.modular.system.service.IWorkSiteInfoService;
-import io.swagger.annotations.*;
-import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.*;
-
-import org.springframework.stereotype.Controller;
-
-import java.util.List;
-
-import static com.casic.missiles.model.response.ResponseData.DEFAULT_SUCCESS_MESSAGE;
-
-/**
- * <p>
- * 作业现场表 前端控制器
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@Controller
-@RequestMapping("/site")
-@Api(tags = "作业现场管理")
-@RequiredArgsConstructor
-public class WorkSiteInfoController extends BaseController {
-
-
-    private final IWorkSiteInfoService workSiteInfoService;
-
-    @ApiOperation("新增作业现场")
-    @PostMapping("add")
-    @ResponseBody
-    public Object addWorkSite(@RequestBody WorkSiteDetailDTO workSiteDetailDTO){
-        workSiteInfoService.addWorkSiteInfo(workSiteDetailDTO);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("编辑作业现场")
-    @PostMapping("update")
-    @ResponseBody
-    public Object updateWorkSite(@RequestBody WorkSiteDetailDTO workSiteDetailDTO){
-        workSiteInfoService.updateWorkSiteInfo(workSiteDetailDTO);
-        return ResponseData.success();
-    }
-
-
-    @ApiOperation("删除作业现场")
-    @PostMapping("delete")
-    @ResponseBody
-    public Object delete(@ApiParam("作业现场id列表")@RequestBody List<Long> projectIds){
-        workSiteInfoService.deleteProjects(projectIds);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("查询作业现场详情")
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = WorkSiteDetailDTO.class),
-    })
-    @GetMapping("detail")
-    @ResponseBody
-    public Object delete(@ApiParam(value = "作业现场id", example = "0")@RequestParam Long projectId){
-        WorkSiteDetailDTO detailDTO = workSiteInfoService.getWorkSiteDetail(projectId);
-        return ResponseData.success(detailDTO);
-    }
-
-    @ApiOperation("分页列表查询")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "workTitle",value = "作业名称", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "workRoad",value = "所属道路", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "workPersonName",value = "责任人姓名", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "startDate",value = "注册开始日期", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "endDate",value = "注册结束日期", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "projectState",value = "当前状态（字典值）", dataType = "String", paramType = "query")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = WorkSiteInfo.class),
-    })
-    @GetMapping("listPage")
-    @ResponseBody
-    public Object listPage(String workTitle,String workRoad,String workPersonName,String projectState,String startDate,String endDate){
-        Page<WorkSiteInfo> page = PageFactory.defaultPage();
-        QueryWrapper<WorkSiteInfo> queryWrapper = new QueryWrapper<>();
-        if(StrUtil.isNotEmpty(workTitle)){
-            queryWrapper.like("WORK_TITLE",workTitle);
-        }
-        if(StrUtil.isNotEmpty(workRoad)){
-            queryWrapper.like("WORK_ROAD",workRoad);
-        }
-        if(StrUtil.isNotEmpty(workPersonName)){
-            queryWrapper.like("WORKER_NAME",workPersonName);
-        }
-        if(StrUtil.isNotEmpty(projectState)){
-            queryWrapper.eq("PROJECT_STATE",projectState);
-        }
-        if(StrUtil.isNotEmpty(startDate)){
-            queryWrapper.ge("br_work_site_info.CREATE_TIME",startDate + " 00:00:00");
-        }
-        if(StrUtil.isNotEmpty(endDate)){
-            queryWrapper.le("br_work_site_info.CREATE_TIME",endDate + " 23:59:59");
-        }
-        page = workSiteInfoService.selectListPage(page,queryWrapper);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-    @ApiOperation("开始作业")
-    @PostMapping("start")
-    @ResponseBody
-    public Object start(@ApiParam(value = "作业现场id",example = "0")@RequestParam Long projectId){
-        workSiteInfoService.start(projectId);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("完成作业")
-    @PostMapping("finish")
-    @ResponseBody
-    public Object finish(@ApiParam(value = "作业现场id", example = "0")@RequestParam Long projectId){
-        workSiteInfoService.finish(projectId);
-        return ResponseData.success();
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/WorkerController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/WorkerController.java
deleted file mode 100644
index 796f94c..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/WorkerController.java
+++ /dev/null
@@ -1,136 +0,0 @@
-package com.casic.missiles.modular.system.controller;
-
-
-import cn.hutool.core.util.ObjectUtil;
-import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.core.base.controller.BaseController;
-import com.casic.missiles.core.page.PageFactory;
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.DeviceDetailDTO;
-import com.casic.missiles.modular.system.entity.Device;
-import com.casic.missiles.modular.system.entity.Worker;
-import com.casic.missiles.modular.system.service.IWorkerService;
-import io.swagger.annotations.*;
-import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.*;
-
-import org.springframework.stereotype.Controller;
-
-import java.util.Date;
-import java.util.List;
-
-import static com.casic.missiles.model.response.ResponseData.DEFAULT_SUCCESS_MESSAGE;
-
-/**
- * <p>
- *  前端控制器
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@Controller
-@RequestMapping("/worker")
-@RequiredArgsConstructor
-@Api(tags = "人员管理接口")
-public class WorkerController extends BaseController {
-
-    private final IWorkerService workerService;
-
-    @ApiOperation("分页列表查询")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "name",value = "姓名", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "deptId",value = "所属部门", dataType = "Long", paramType = "query", example = "0"),
-            @ApiImplicitParam(name = "status",value = "当前状态（字典值）", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "startDate",value = "注册开始日期", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "endDate",value = "注册结束日期", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "workerType",value = "人员类型（字典值）", dataType = "String", paramType = "query")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = Worker.class),
-    })
-    @GetMapping("listPage")
-    @ResponseBody
-    public Object listPage(String name,Long deptId, String status,String startDate,String endDate,String workerType){
-        Page<Worker> page = PageFactory.defaultPage();
-        QueryWrapper<Worker> queryWrapper = new QueryWrapper<>();
-        if(StrUtil.isNotEmpty(name)){
-            queryWrapper.like("WORKER_NAME",name);
-        }
-        if(ObjectUtil.isNotEmpty(deptId)){
-            queryWrapper.eq("DEPT_ID",deptId);
-        }
-        if(StrUtil.isNotEmpty(workerType)){
-            queryWrapper.eq("WORKER_TYPE",workerType);
-        }
-        if(StrUtil.isNotEmpty(startDate)){
-            queryWrapper.ge("CREATE_TIME",startDate + " 00:00:00");
-        }
-        if(StrUtil.isNotEmpty(endDate)){
-            queryWrapper.le("CREATE_TIME",endDate + " 23:59:59");
-        }
-        if(StrUtil.isNotEmpty(status)){
-            queryWrapper.eq("`STATUS`",status);
-        }
-        page = workerService.selectListPage(page,queryWrapper);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-    @ApiOperation("新增人员")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "worker", value = "人员信息", dataType = "Worker", paramType = "body", required = true),
-            @ApiImplicitParam(name = "projectId", value = "项目ID(入场申请需要)", dataType = "Long", paramType = "query", example = "0")
-    })
-    @PostMapping("add")
-    @ResponseBody
-    public Object add(@ApiParam("worker")@RequestBody Worker worker,
-                      @RequestParam(required = false) Long projectId){
-        workerService.addWorker(worker,projectId);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("编辑人员")
-    @PostMapping("update")
-    @ResponseBody
-    public Object update(@RequestBody Worker worker){
-        workerService.updateById(worker);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("删除人员")
-    @PostMapping("delete")
-    @ResponseBody
-    public Object delete(@ApiParam("人员id列表")@RequestBody List<Long> workIds){
-        workerService.removeByIds(workIds);
-        return ResponseData.success();
-    }
-
-
-    @ApiOperation(value = "获取人脸图片",notes = "返回人脸图片url")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "cameraIp",value = "摄像头IP", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "cameraPort",value = "摄像头端口号", dataType = "String", paramType = "query"),
-    })
-    @GetMapping("/face/register")
-    @ResponseBody
-    public Object faceRegister(String cameraIp,String cameraPort){
-        return ResponseData.success(workerService.faceRegister(cameraIp, cameraPort));
-    }
-
-
-    @ApiOperation(value = "查询临时入场人员列表")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "projectId", value = "项目ID",required = true,dataType = "Long", paramType = "query", example = "0")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = Worker.class),
-    })
-    @GetMapping("/projectTempWorker")
-    @ResponseBody
-    public Object projectTempWorker(Long projectId){
-        return ResponseData.success(workerService.projectTempWorker(projectId));
-    }
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/AlarmTypeCountDTO.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/AlarmTypeCountDTO.java
deleted file mode 100644
index 1a165a1..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/AlarmTypeCountDTO.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.casic.missiles.modular.system.dto;
-
-import io.swagger.annotations.ApiModel;
-import lombok.Data;
-
-@ApiModel(value = "AlarmTypeCountDTO",description = "报警类型统计（首页）")
-@Data
-public class AlarmTypeCountDTO {
-
-    private String alarmType;
-    private String alarmTypeName;
-    private Integer alarmCount;
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/AlarmUpload.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/AlarmUpload.java
deleted file mode 100644
index 73d7799..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/AlarmUpload.java
+++ /dev/null
@@ -1,46 +0,0 @@
-package com.casic.missiles.modular.system.dto;
-
-import cn.hutool.core.util.StrUtil;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-@ApiModel(value = "AlarmUpload",description = "报警上传")
-@Data
-public class AlarmUpload {
-
-    @ApiModelProperty(value = "摄像头ip")
-    private String cameraIp;
-
-    @ApiModelProperty(value = "摄像头端口")
-    private String cameraPort;
-    @ApiModelProperty(value = "安全树甲烷设备ip")
-    private String gasIp;
-    @ApiModelProperty(value = "安全树甲烷设备端口")
-    private String gasPort;
-    @ApiModelProperty(value = "报警值")
-    private String alarmValue;
-    @ApiModelProperty(value = "报警时间")
-    private String alarmTime;
-    @ApiModelProperty(value = "报警类型")
-    private String alarmType;
-    @ApiModelProperty(value = "报警图片")
-    private String alarmImage;
-    @ApiModelProperty(value = "报警内容")
-    private String alarmContent;
-
-    @Override
-    public String toString() {
-        return "AlarmUpload{" +
-                "cameraIp='" + cameraIp + '\'' +
-                ", cameraPort='" + cameraPort + '\'' +
-                ", gasIp='" + gasIp + '\'' +
-                ", gasPort='" + gasPort + '\'' +
-                ", alarmValue='" + alarmValue + '\'' +
-                ", alarmTime='" + alarmTime + '\'' +
-                ", alarmType='" + alarmType + '\'' +
-                ", alarmImage='" + (StrUtil.isNotEmpty(alarmImage) ? alarmImage.substring(0,50) : "null") + '\'' +
-                ", alarmContent='" + alarmContent + '\'' +
-                '}';
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/DeviceDetailDTO.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/DeviceDetailDTO.java
deleted file mode 100644
index ea518d9..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/DeviceDetailDTO.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package com.casic.missiles.modular.system.dto;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.casic.missiles.modular.system.entity.Device;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-@ApiModel("DeviceDetailDTO")
-@Data
-public class DeviceDetailDTO extends Device {
-
-    @ApiModelProperty(value = "摄像头编号")
-    private String cameraCode;
-
-    @ApiModelProperty(value = "摄像头IP")
-    private String cameraIp;
-
-    @ApiModelProperty(value = "摄像头端口")
-    private String cameraPort;
-
-    @ApiModelProperty(value = "激甲编号")
-    private String gasCode;
-
-    @ApiModelProperty(value = "激甲IP")
-    private String gasIp;
-
-    @ApiModelProperty(value = "激甲端口")
-    private String gasPort;
-
-    @ApiModelProperty(value = "智能帽衬编号")
-    private String hatLiningCode;
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/WorkSiteDetailDTO.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/WorkSiteDetailDTO.java
deleted file mode 100644
index 29378ff..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/WorkSiteDetailDTO.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package com.casic.missiles.modular.system.dto;
-
-import com.casic.missiles.modular.system.entity.ProjectDevice;
-import com.casic.missiles.modular.system.entity.ProjectWorker;
-import com.casic.missiles.modular.system.entity.WorkSiteInfo;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.util.List;
-
-@Data
-@ApiModel("WorkSiteDetailDTO")
-public class WorkSiteDetailDTO extends WorkSiteInfo {
-
-    @ApiModelProperty(value = "安全树列表",dataType = "ProjectDevice")
-    private List<ProjectDevice> deviceList;
-
-    @ApiModelProperty(value = "人员列表",dataType = "ProjectWorker")
-    private List<ProjectWorker> workerList;
-
-
-
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/WorkerLocationDTO.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/WorkerLocationDTO.java
deleted file mode 100644
index 6fd7b24..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/WorkerLocationDTO.java
+++ /dev/null
@@ -1,68 +0,0 @@
-package com.casic.missiles.modular.system.dto;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-@ApiModel(value = "WorkerLocationDTO",description = "人员位置列表（首页）")
-@Data
-public class WorkerLocationDTO {
-
-    @ApiModelProperty("人员ID")
-    private Long workerId;
-
-    @ApiModelProperty("人员姓名")
-    private String workerName;
-
-    @ApiModelProperty("安全帽编号")
-    private String hatCode;
-
-    @ApiModelProperty("安全帽ID")
-    private Long hatId;
-
-    @ApiModelProperty("背心编号")
-    private String vastCode;
-
-    @ApiModelProperty("手环编号")
-    private String braceletCode;
-
-    @ApiModelProperty("位置")
-    private String location;
-
-    @ApiModelProperty("时间")
-    private String time;
-
-    @ApiModelProperty("经度")
-    private String lng;
-
-    @ApiModelProperty("纬度")
-    private String lat;
-
-    @ApiModelProperty("心率")
-    private String heartRate;
-
-    @ApiModelProperty("血氧")
-    private String bloodOxygen;
-
-    @ApiModelProperty("一氧化碳")
-    private String co;
-
-    @ApiModelProperty("甲烷")
-    private String gas;
-
-    @ApiModelProperty("硫化氢")
-    private String h2s;
-
-    @ApiModelProperty("氧气")
-    private String o2;
-
-    @ApiModelProperty("信号")
-    private String signal;
-
-    @ApiModelProperty("电量")
-    private String cell;
-
-    @ApiModelProperty("是否报警")
-    private boolean alarmFlag;
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Alarm.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Alarm.java
new file mode 100644
index 0000000..4d2b7ef
--- /dev/null
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Alarm.java
@@ -0,0 +1,103 @@
+package com.casic.missiles.modular.system.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import java.util.Date;
+
+/**
+ * <p>
+ * 报警记录表
+ * </p>
+ *
+ * @author zyj
+ * @since 2023-05-25
+ */
+@Data
+@TableName("bus_alarm")
+public class Alarm implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    @TableId(value = "ID",type = IdType.ASSIGN_ID)
+    private Long id;
+
+    /**
+     * 设备ID
+     */
+    @TableField("DEVICE_ID")
+    private Long deviceId;
+
+    /**
+     * 报警类型
+     */
+    @TableField("ALARM_TYPE")
+    private String alarmType;
+
+    /**
+     * 报警时间
+     */
+    @TableField("ALARM_TIME")
+    private Date alarmTime;
+
+    /**
+     * 报警状态
+     */
+    @TableField("ALARM_STATUS")
+    private String alarmStatus;
+
+    /**
+     * 报警位置
+     */
+    @TableField("ALARM_LOCATION")
+    private String alarmLocation;
+
+    /**
+     * 报警图片
+     */
+    @TableField("ALARM_IMAGE")
+    private String alarmImage;
+
+    /**
+     * 视频通道号
+     */
+    @TableField("CHANNEL_NO")
+    private Integer channelNo;
+
+    /**
+     * 报警内容
+     */
+    @TableField("ALARM_CONTENT")
+    private String alarmContent;
+
+    /**
+     * 消警时间
+     */
+    @TableField("CANCEL_TIME")
+    private Date cancelTime;
+
+
+    @Override
+    public String toString() {
+        return "Alarm{" +
+            "id=" + id +
+            ", deviceId=" + deviceId +
+            ", alarmType=" + alarmType +
+            ", alarmTime=" + alarmTime +
+            ", alarmStatus=" + alarmStatus +
+            ", alarmLocation=" + alarmLocation +
+            ", alarmImage=" + alarmImage +
+            ", channelNo=" + channelNo +
+            ", alarmContent=" + alarmContent +
+            ", cancelTime=" + cancelTime +
+        "}";
+    }
+}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusAlarm.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusAlarm.java
deleted file mode 100644
index efb4a23..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusAlarm.java
+++ /dev/null
@@ -1,159 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.alibaba.fastjson.annotation.JSONField;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.time.LocalDateTime;
-import java.util.Date;
-
-/**
- * <p>
- * 报警记录表
- * </p>
- *
- * @author zyj
- * @since 2023-05-16
- */
-@Data
-@ApiModel("Alarm")
-@TableName("br_bus_alarm")
-public class BusAlarm implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 项目ID
-     */
-    @ApiModelProperty(value = "项目ID")
-    @TableField("PROJECT_ID")
-    private Long projectId;
-
-    /**
-     * 设备ID
-     */
-    @ApiModelProperty(value = "设备ID")
-    @TableField("DEVICE_ID")
-    private Long deviceId;
-
-    /**
-     * 报警类型
-     */
-    @ApiModelProperty(value = "报警类型")
-    @TableField("ALARM_TYPE")
-    private String alarmType;
-
-    /**
-     * 报警状态
-     */
-    @ApiModelProperty(value = "报警状态")
-    @TableField("ALARM_STATUS")
-    private String alarmStatus;
-
-    /**
-     * 报警值
-     */
-    @ApiModelProperty(value = "报警值")
-    @TableField("ALARM_VALUE")
-    private String alarmValue;
-
-    /**
-     * 报警图片
-     */
-    @ApiModelProperty(value = "报警图片")
-    @TableField("ALARM_IMAGE")
-    private String alarmImage;
-
-    /**
-     * 报警内容
-     */
-    @ApiModelProperty(value = "报警内容")
-    @TableField("ALARM_CONTENT")
-    private String alarmContent;
-
-    /**
-     * 报警时间
-     */
-    @ApiModelProperty(value = "报警时间")
-    @TableField("ALARM_TIME")
-    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
-    private Date alarmTime;
-
-    /**
-     * 消警时间
-     */
-    @ApiModelProperty(value = "消警时间")
-    @TableField("CANCEL_TIME")
-    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
-    private Date cancelTime;
-
-    /**
-     * 报警位置经度
-     */
-    @ApiModelProperty(value = "报警位置经度")
-    @TableField("ALARM_LNG")
-    private String alarmLng;
-
-    /**
-     * 报警位置纬度
-     */
-    @ApiModelProperty(value = "报警位置纬度")
-    @TableField("ALARM_LAT")
-    private String alarmLat;
-
-    @ApiModelProperty("报警类型名称")
-    @TableField(exist = false)
-    private String alarmStatusName;
-    @ApiModelProperty("报警类型名称")
-    @TableField(exist = false)
-    private String alarmTypeName;
-    @ApiModelProperty("作业名称")
-    @TableField(exist = false)
-    private String workTitle;
-    @ApiModelProperty("所属道路")
-    @TableField(exist = false)
-    private String workRoad;
-    @ApiModelProperty("作业状态")
-    @TableField(exist = false)
-    private String projectState;
-    @ApiModelProperty("作业状态名称")
-    @TableField(exist = false)
-    private String projectStateName;
-    @ApiModelProperty("负责人姓名")
-    @TableField(exist = false)
-    private String workPersonName;
-    @ApiModelProperty("负责人联系方式")
-    @TableField(exist = false)
-    private String workPersonPhoneNumber;
-
-
-    @Override
-    public String toString() {
-        return "BusAlarm{" +
-                "id=" + id +
-                ", projectId=" + projectId +
-                ", deviceId=" + deviceId +
-                ", alarmType=" + alarmType +
-                ", alarmValue=" + alarmValue +
-                ", alarmStatus=" + alarmStatus +
-                ", alarmImage=" + alarmImage +
-                ", alarmContent=" + alarmContent +
-                ", alarmTime=" + alarmTime +
-                ", cancelTime=" + cancelTime +
-                ", alarmLng=" + alarmLng +
-                ", alarmLat=" + alarmLat +
-                "}";
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusEvent.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusEvent.java
deleted file mode 100644
index a0b7543..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusEvent.java
+++ /dev/null
@@ -1,100 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.time.LocalDateTime;
-import java.util.Date;
-import java.util.List;
-
-/**
- * <p>
- * 事件表
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@TableName("br_bus_event")
-@Data
-@ApiModel("BusEvent")
-public class BusEvent implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @ApiModelProperty("事件ID")
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 事件标题
-     */
-    @ApiModelProperty("事件名称")
-    @TableField("EVENT_TITLE")
-    private String eventTitle;
-
-    /**
-     * 上报人员
-     */
-    @ApiModelProperty("上报人员")
-    @TableField("UPLOAD_NAME")
-    private String uploadName;
-
-    /**
-     * 联系方式
-     */
-    @ApiModelProperty("联系方式")
-    @TableField("PHONE_NUMBER")
-    private String phoneNumber;
-
-    /**
-     * 事件描述
-     */
-    @ApiModelProperty("事件描述")
-    @TableField("EVENT_DESCRIPTION")
-    private String eventDescription;
-
-    @ApiModelProperty("经度")
-    @TableField("LNG")
-    private String lng;
-
-    @ApiModelProperty("纬度")
-    @TableField("LAT")
-    private String lat;
-
-    /**
-     * 事件上传时间
-     */
-    @ApiModelProperty("事件上传时间")
-    @TableField("CREATE_TIME")
-    private Date createTime;
-
-    @ApiModelProperty("事件照片")
-    @TableField(exist = false)
-    private List<BusEventImage> imageList;
-
-
-
-    @Override
-    public String toString() {
-        return "BusEvent{" +
-            "id=" + id +
-            ", eventTitle=" + eventTitle +
-            ", uploadName=" + uploadName +
-            ", phoneNumber=" + phoneNumber +
-            ", eventDescription=" + eventDescription +
-            ", lng=" + lng +
-            ", lat=" + lat +
-            ", createTime=" + createTime +
-        "}";
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusEventImage.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusEventImage.java
deleted file mode 100644
index 1e75245..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusEventImage.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-
-/**
- * <p>
- * 事件图片表
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@TableName("br_bus_event_image")
-@Data
-@ApiModel("BusEventImage")
-public class BusEventImage implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 事件ID
-     */
-    @TableField("EVENT_ID")
-    private Long eventId;
-
-    /**
-     * 报警图片
-     */
-    @TableField("IMAGE")
-    @ApiModelProperty("图片url")
-    private String image;
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Device.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Device.java
index df89c70..ea7db5f 100644
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Device.java
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Device.java
@@ -1,30 +1,23 @@
 package com.casic.missiles.modular.system.entity;
 
-import com.alibaba.fastjson.annotation.JSONField;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.casic.missiles.core.base.json.DateDeserializer;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
-import java.util.Date;
 
 /**
  * <p>
- * 
+ * 设备记录表
  * </p>
  *
  * @author zyj
- * @since 2023-04-14
+ * @since 2023-05-25
  */
-@ApiModel("Device")
-@TableName("br_device")
 @Data
+@TableName("bus_device")
 public class Device implements Serializable {
 
     private static final long serialVersionUID = 1L;
@@ -32,82 +25,86 @@
     /**
      * 主键
      */
-    @ApiModelProperty(value = "设备ID")
     @TableId(value = "ID",type = IdType.ASSIGN_ID)
     private Long id;
 
     /**
-     * 设备编号
+     * 设备名称
      */
-    @ApiModelProperty(value = "设备编号")
-    @TableField("DEVICE_CODE")
-    private String deviceCode;
+    @TableField("DEVICE_NAME")
+    private String deviceName;
 
     /**
-     * 设备类型
+     * IP
      */
-    @ApiModelProperty(value = "设备类型")
-    @TableField("DEVICE_TYPE")
-    private String deviceType;
+    @TableField("IP")
+    private String ip;
 
     /**
-     * 设备批次
+     * 端口
      */
-    @ApiModelProperty(value = "设备批次")
-    @TableField("DEVICE_BATCH")
-    private String deviceBatch;
+    @TableField("PORT")
+    private String port;
 
     /**
-     * 厂家
+     * 用户名
      */
-    @ApiModelProperty(value = "厂家")
-    @TableField("MANUFACTURER")
-    private String manufacturer;
+    @TableField("USER_NAME")
+    private String userName;
 
     /**
-     * 是否供电
+     * 密码
      */
-    @ApiModelProperty(value = "是否供电")
-    @TableField("IS_POWER_SUPPLY")
-    private String isPowerSupply;
+    @TableField("PASSWORD")
+    private String password;
 
     /**
-     * 创建时间
+     * 连接类型
      */
-    @ApiModelProperty(value = "创建时间",dataType = "Date")
-    @TableField("CREATE_TIME")
-    private Date createTime;
+    @TableField("CONNECT_TYPE")
+    private String connectType;
 
-    @ApiModelProperty(value = "设备类型名称")
-    @TableField(exist = false)
-    private String deviceTypeName;
+    /**
+     * 位置
+     */
+    @TableField("LOCATION")
 
-    @ApiModelProperty(value = "是否供电名称")
-    @TableField(exist = false)
-    private String isPowerSupplyName;
+    private String location;
 
-    @ApiModelProperty(value = "注册时间",dataType = "String")
-    @TableField(exist = false)
-    private String registerTime;
+    /**
+     * 设备状态
+     */
+    @TableField("STATUS")
 
-    @ApiModelProperty(value = "当前状态")
-    @TableField(exist = false)
     private String status;
 
-    @ApiModelProperty(value = "当前状态名称")
-    @TableField(exist = false)
-    private String statusName;
+    /**
+     * 报警分组
+     */
+    @TableField("ALARM_GROUP")
+
+    private Long alarmGroup;
+
+    /**
+     * 视频通道数(预留)
+     */
+    @TableField("CHANNEL_NUM")
+    private Integer channelNum;
 
     @Override
     public String toString() {
         return "Device{" +
             "id=" + id +
-            ", deviceCode=" + deviceCode +
-            ", deviceType=" + deviceType +
-            ", deviceBatch=" + deviceBatch +
-            ", manufacturer=" + manufacturer +
-            ", isPowerSupply=" + isPowerSupply +
-            ", createTime=" + createTime +
+            ", deviceName=" + deviceName +
+            ", ip=" + ip +
+            ", port=" + port +
+            ", userName=" + userName +
+            ", password=" + password +
+            ", connectType=" + connectType +
+            ", location=" + location +
+            ", status=" + status +
+            ", alarmGroup=" + alarmGroup +
+            ", channelNum=" + channelNum +
         "}";
     }
 }
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/DeviceExt.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/DeviceExt.java
deleted file mode 100644
index 5ee7015..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/DeviceExt.java
+++ /dev/null
@@ -1,99 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-
-/**
- * <p>
- * 设备扩展信息表（安全树）
- * </p>
- *
- * @author zyj
- * @since 2023-04-27
- */
-@Data
-@TableName("br_device_ext")
-public class DeviceExt implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 设备ID
-     */
-    @TableField("DEVICE_ID")
-    private Long deviceId;
-
-    /**
-     * 摄像头编号
-     */
-    @TableField("CAMERA_CODE")
-    private String cameraCode;
-
-    /**
-     * 摄像头IP
-     */
-    @TableField("CAMERA_IP")
-    private String cameraIp;
-
-    /**
-     * 摄像头端口
-     */
-    @TableField("CAMERA_PORT")
-    private String cameraPort;
-
-    /**
-     * 激甲编号
-     */
-    @TableField("GAS_CODE")
-    private String gasCode;
-
-    /**
-     * 激甲IP
-     */
-    @TableField("GAS_IP")
-    private String gasIp;
-
-    /**
-     * 激甲端口
-     */
-    @TableField("GAS_PORT")
-    private String gasPort;
-
-    /**
-     * 甲烷报警阈值
-     */
-    @TableField("GAS_THRESHOLD")
-    private String gasThreshold;
-
-    @TableField(value = "HAT_LINING_CODE")
-    private String hatLiningCode;
-
-
-    @Override
-    public String toString() {
-        return "DeviceExt{" +
-            "id=" + id +
-            ", deviceId=" + deviceId +
-            ", cameraCode=" + cameraCode +
-            ", cameraIp=" + cameraIp +
-            ", cameraPort=" + cameraPort +
-            ", gasCode=" + gasCode +
-            ", gasIp=" + gasIp +
-            ", gasPort=" + gasPort +
-            ", gasThreshold=" + gasThreshold +
-            ", hatLiningCode=" + hatLiningCode +
-        "}";
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/ProjectDevice.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/ProjectDevice.java
deleted file mode 100644
index c4f3472..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/ProjectDevice.java
+++ /dev/null
@@ -1,62 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-
-/**
- * <p>
- * 
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@Data
-@ApiModel("ProjectDevice")
-@TableName("br_project_device")
-public class ProjectDevice implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 作业现场ID
-     */
-    @TableField("PROJECT_ID")
-    private Long projectId;
-
-    /**
-     * 设备ID
-     */
-    @TableField("DEVICE_ID")
-    @ApiModelProperty("设备ID（新增编辑时传）")
-    private Long deviceId;
-
-    /**
-     * 设备编号
-     */
-    @TableField(exist = false)
-    @ApiModelProperty("设备编号（详情中展示，新增编辑不用传）")
-    private String deviceCode;
-
-    @Override
-    public String toString() {
-        return "ProjectDevice{" +
-            "id=" + id +
-            ", projectId=" + projectId +
-            ", deviceId=" + deviceId +
-        "}";
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/ProjectWorker.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/ProjectWorker.java
deleted file mode 100644
index 10b23c4..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/ProjectWorker.java
+++ /dev/null
@@ -1,104 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import java.io.Serializable;
-
-/**
- * <p>
- * 
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@ApiModel("ProjectWorker")
-@TableName("br_project_worker")
-@Data
-@NoArgsConstructor
-@AllArgsConstructor
-public class ProjectWorker implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 作业现场ID
-     */
-    @TableField("PROJECT_ID")
-    private Long projectId;
-
-    /**
-     * 人员ID
-     */
-    @ApiModelProperty("人员ID")
-    @TableField("WORKER_ID")
-    private Long workerId;
-
-    /**
-     * 安全帽编号
-     */
-    @ApiModelProperty("安全帽编号")
-    @TableField("HAT_CODE")
-    private String hatCode;
-
-    /**
-     * 背心编号
-     */
-    @ApiModelProperty("背心编号")
-    @TableField("VAST_CODE")
-    private String vastCode;
-
-    /**
-     * 手环编号
-     */
-    @ApiModelProperty("手环编号")
-    @TableField("BRACELET_CODE")
-    private String braceletCode;
-
-    @ApiModelProperty("人员姓名（详情中展示，新增编辑不用传）")
-    @TableField(exist = false)
-    private String workerName;
-
-    @ApiModelProperty("人员部门ID（详情中展示，新增编辑不用传）")
-    @TableField(exist = false)
-    private String workerDeptId;
-
-    @ApiModelProperty("人员部门名称（详情中展示，新增编辑不用传）")
-    @TableField(exist = false)
-    private String workerDeptName;
-
-    @ApiModelProperty("人员联系方式（详情中展示，新增编辑不用传）")
-    @TableField(exist = false)
-    private String workerPhoneNumber;
-
-    public ProjectWorker(Long projectId, Long workerId) {
-        this.projectId = projectId;
-        this.workerId = workerId;
-    }
-
-    @Override
-    public String toString() {
-        return "ProjectWorker{" +
-            "id=" + id +
-            ", projectId=" + projectId +
-            ", workerId=" + workerId +
-            ", hatCode=" + hatCode +
-            ", vastCode=" + vastCode +
-            ", braceletCode=" + braceletCode +
-        "}";
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/WorkSiteInfo.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/WorkSiteInfo.java
deleted file mode 100644
index fa6f41d..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/WorkSiteInfo.java
+++ /dev/null
@@ -1,130 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.alibaba.fastjson.annotation.JSONField;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.time.LocalDateTime;
-import java.util.Date;
-
-/**
- * <p>
- * 作业现场表
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@ApiModel("WorkSiteInfo")
-@TableName("br_work_site_info")
-@Data
-public class WorkSiteInfo implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @ApiModelProperty("作业现场ID")
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 作业名称
-     */
-    @ApiModelProperty("作业名称")
-    @TableField("WORK_TITLE")
-    private String workTitle;
-
-    /**
-     * 责任人
-     */
-    @ApiModelProperty("责任人（人员ID）")
-    @TableField("WORK_PERSON")
-    private Long workPerson;
-
-    /**
-     * 作业描述
-     */
-    @ApiModelProperty("作业描述")
-    @TableField("WORK_SITE_DESC")
-    private String workSiteDesc;
-
-    /**
-     * 作业状态
-     */
-    @ApiModelProperty("作业状态")
-    @TableField("PROJECT_STATE")
-    private String projectState;
-
-    /**
-     * 所属道路
-     */
-    @ApiModelProperty("所属道路")
-    @TableField("WORK_ROAD")
-    private String workRoad;
-
-    @TableField("IMAGE_URL")
-    private String imageUrl;
-
-    @TableField("CREATE_TIME")
-    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
-    private Date createTime;
-    @TableField("UPDATE_TIME")
-    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
-    private Date updateTime;
-
-    @ApiModelProperty("开始时间")
-    @TableField("START_TIME")
-    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
-    private Date startTime;
-
-    @ApiModelProperty("结束时间")
-    @TableField("FINISH_TIME")
-    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
-    private Date finishTime;
-
-    @ApiModelProperty("负责人姓名（详情中使用，新增编辑不用传）")
-    @TableField(exist = false)
-    private String workPersonName;
-
-    @ApiModelProperty("负责人联系方式（详情中使用，新增编辑不用传）")
-    @TableField(exist = false)
-    private String workPersonPhoneNumber;
-
-    @ApiModelProperty("负责人所属部门ID（详情中使用，新增编辑不用传）")
-    @TableField(exist = false)
-    private Long workPersonDeptId;
-
-    @ApiModelProperty("负责人所属部门名称（详情中使用，新增编辑不用传）")
-    @TableField(exist = false)
-    private String workPersonDeptName;
-
-    @ApiModelProperty(value = "注册时间",dataType = "String")
-    @TableField(exist = false)
-    private String registerTime;
-
-    @ApiModelProperty("作业状态名称")
-    @TableField(exist = false)
-    private String projectStateName;
-
-    @Override
-    public String toString() {
-        return "WorkSiteInfo{" +
-            "id=" + id +
-            ", workTitle=" + workTitle +
-            ", workPerson=" + workPerson +
-            ", workSiteDesc=" + workSiteDesc +
-            ", projectState=" + projectState +
-            ", imageUrl=" + imageUrl +
-            ", updateTime=" + updateTime +
-            ", workRoad=" + workRoad +
-        "}";
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Worker.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Worker.java
deleted file mode 100644
index 28a4daa..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Worker.java
+++ /dev/null
@@ -1,147 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.time.LocalDateTime;
-import java.util.Date;
-
-/**
- * <p>
- * 
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@ApiModel("Worker")
-@TableName("br_worker")
-@Data
-public class Worker implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @ApiModelProperty(value = "人员ID")
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 姓名
-     */
-    @ApiModelProperty(value = "姓名")
-    @TableField("WORKER_NAME")
-    private String workerName;
-
-    /**
-     * 性别
-     */
-    @ApiModelProperty(value = "性别")
-    @TableField("GENDER")
-    private String gender;
-
-    /**
-     * 所属部门
-     */
-    @ApiModelProperty(value = "所属部门(人员管理)")
-    @TableField("DEPT_ID")
-    private Long deptId;
-
-    /**
-     * 所属单位
-     */
-    @ApiModelProperty(value = "所属单位(入场申请中使用)")
-    @TableField("OWNER_SHIP")
-    private String ownerShip;
-
-    /**
-     * 联系方式
-     */
-    @ApiModelProperty(value = "联系方式")
-    @TableField("PHONE_NUMBER")
-    private String phoneNumber;
-
-    /**
-     * 证件号
-     */
-    @ApiModelProperty(value = "证件号")
-    @TableField("ID_CARD_NUMBER")
-    private String idCardNumber;
-
-    /**
-     * 入场原因
-     */
-    @ApiModelProperty(value = "入场原因（入场申请中使用）")
-    @TableField("ENTER_REASON")
-    private String enterReason;
-
-    /**
-     * 入场人脸照片
-     */
-    @ApiModelProperty(value = "人脸照片（照片路径）")
-    @TableField("WORKER_AVATAR")
-    private String workerAvatar;
-
-    /**
-     * 申请入场时间
-     */
-    @ApiModelProperty(value = "注册时间/申请入场时间")
-    @TableField("CREATE_TIME")
-    private Date createTime;
-
-    /**
-     * 人员类型
-     */
-    @ApiModelProperty(value = "人员类型（区分人员管理和入场申请）")
-    @TableField("WORKER_TYPE")
-    private String workerType;
-
-    @ApiModelProperty(value = "性别名称")
-    @TableField(exist = false)
-    private String genderName;
-
-    @ApiModelProperty(value = "部门名称")
-    @TableField(exist = false)
-    private String deptName;
-
-    @ApiModelProperty(value = "注册时间",dataType = "String")
-    @TableField(exist = false)
-    private String registerTime;
-
-    @ApiModelProperty(value = "当前状态")
-    @TableField(exist = false)
-    private String status;
-
-    @ApiModelProperty(value = "当前状态名称")
-    @TableField(exist = false)
-    private String statusName;
-
-    @ApiModelProperty(value = "是否注册(0未注册；1已注册)",allowableValues = "0,1")
-    @TableField(exist = false)
-    private String isRegister;
-
-    @Override
-    public String toString() {
-        return "Worker{" +
-            "id=" + id +
-            ", workerName=" + workerName +
-            ", gender=" + gender +
-            ", deptId=" + deptId +
-            ", ownerShip=" + ownerShip +
-            ", phoneNumber=" + phoneNumber +
-            ", idCardNumber=" + idCardNumber +
-            ", enterReason=" + enterReason +
-            ", workerAvatar=" + workerAvatar +
-            ", createTime=" + createTime +
-            ", workerType=" + workerType +
-        "}";
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/AlarmMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/AlarmMapper.java
new file mode 100644
index 0000000..ea4c8be
--- /dev/null
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/AlarmMapper.java
@@ -0,0 +1,16 @@
+package com.casic.missiles.modular.system.mapper;
+
+import com.casic.missiles.modular.system.entity.Alarm;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 报警记录表 Mapper 接口
+ * </p>
+ *
+ * @author zyj
+ * @since 2023-05-25
+ */
+public interface AlarmMapper extends BaseMapper<Alarm> {
+
+}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/BusAlarmMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/BusAlarmMapper.java
deleted file mode 100644
index 9801742..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/BusAlarmMapper.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package com.casic.missiles.modular.system.mapper;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.modular.system.dto.AlarmTypeCountDTO;
-import com.casic.missiles.modular.system.entity.BusAlarm;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * <p>
- * 报警记录表 Mapper 接口
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface BusAlarmMapper extends BaseMapper<BusAlarm> {
-
-    Page<BusAlarm> listPage(Page<BusAlarm> page,@Param("ew")  QueryWrapper<BusAlarm> queryWrapper);
-
-    void cancelAlarm(@Param("deviceId")Long deviceId,@Param("alarmType") String alarmType);
-
-    List<AlarmTypeCountDTO> alarmCount(@Param("projectId")Long projectId, @Param("alarmStatus")String alarmStatus);
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/BusEventImageMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/BusEventImageMapper.java
deleted file mode 100644
index 9590b7d..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/BusEventImageMapper.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.casic.missiles.modular.system.mapper;
-
-import com.casic.missiles.modular.system.entity.BusEventImage;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * <p>
- * 事件图片表 Mapper 接口
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface BusEventImageMapper extends BaseMapper<BusEventImage> {
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/BusEventMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/BusEventMapper.java
deleted file mode 100644
index 3c85edf..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/BusEventMapper.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.casic.missiles.modular.system.mapper;
-
-import com.casic.missiles.modular.system.entity.BusEvent;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * <p>
- * 事件表 Mapper 接口
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface BusEventMapper extends BaseMapper<BusEvent> {
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/DeviceExtMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/DeviceExtMapper.java
deleted file mode 100644
index 4ca9212..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/DeviceExtMapper.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.casic.missiles.modular.system.mapper;
-
-import com.casic.missiles.modular.system.entity.DeviceExt;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * <p>
- * 设备扩展信息表（安全树） Mapper 接口
- * </p>
- *
- * @author zyj
- * @since 2023-04-27
- */
-public interface DeviceExtMapper extends BaseMapper<DeviceExt> {
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/DeviceMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/DeviceMapper.java
index 444c0c5..3d0bb02 100644
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/DeviceMapper.java
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/DeviceMapper.java
@@ -1,30 +1,16 @@
 package com.casic.missiles.modular.system.mapper;
 
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.modular.system.dto.DeviceDetailDTO;
-import com.casic.missiles.modular.system.dto.HelmetInfoDTO;
 import com.casic.missiles.modular.system.entity.Device;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
 
 /**
  * <p>
- *  Mapper 接口
+ * 设备记录表 Mapper 接口
  * </p>
  *
  * @author zyj
- * @since 2023-04-14
+ * @since 2023-05-25
  */
-@Mapper
 public interface DeviceMapper extends BaseMapper<Device> {
 
-    Page<DeviceDetailDTO> listDetailPage(Page<DeviceDetailDTO> page,@Param("ew") QueryWrapper<DeviceDetailDTO> ew);
-
-     List<Long> selectProjectDevice(@Param("projectId") Long projectId);
-
-    List<HelmetInfoDTO> selectHelmetList(@Param("deviceType")String deviceType);
 }
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/ProjectDeviceMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/ProjectDeviceMapper.java
deleted file mode 100644
index 1d0c14e..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/ProjectDeviceMapper.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package com.casic.missiles.modular.system.mapper;
-
-import com.casic.missiles.modular.system.dto.DeviceLocationDTO;
-import com.casic.missiles.modular.system.entity.ProjectDevice;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * <p>
- *  Mapper 接口
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface ProjectDeviceMapper extends BaseMapper<ProjectDevice> {
-     List<ProjectDevice> selectDetailByProjectId(@Param("projectId") Long projectId);
-
-     List<DeviceLocationDTO> selectDeviceLocationList(@Param("projectId") Long projectId);
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/ProjectWorkerMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/ProjectWorkerMapper.java
deleted file mode 100644
index 58583d1..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/ProjectWorkerMapper.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package com.casic.missiles.modular.system.mapper;
-
-import com.casic.missiles.modular.system.dto.WorkerLocationDTO;
-import com.casic.missiles.modular.system.entity.ProjectWorker;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * <p>
- *  Mapper 接口
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface ProjectWorkerMapper extends BaseMapper<ProjectWorker> {
-
-    List<ProjectWorker> selectDetailByProjectId(@Param("projectId") Long projectId,
-                                                @Param("workerType")String workerType);
-
-    List<WorkerLocationDTO> selectWorkerLocationList(@Param("projectId") Long projectId,
-                                                     @Param("workerType")String workerType);
-
-}

diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/AlarmController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/AlarmController.java
new file mode 100644
index 0000000..1795cf1
--- /dev/null
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/AlarmController.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.modular.system.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.stereotype.Controller;
+
+/**
+ * <p>
+ * 报警记录表 前端控制器
+ * </p>
+ *
+ * @author zyj
+ * @since 2023-05-25
+ */
+@Controller
+@RequestMapping("/system/alarm")
+public class AlarmController {
+
+}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusAlarmController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusAlarmController.java
deleted file mode 100644
index 1f82ebb..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusAlarmController.java
+++ /dev/null
@@ -1,102 +0,0 @@
-package com.casic.missiles.modular.system.controller;
-
-
-import cn.hutool.core.util.ObjectUtil;
-import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.core.base.controller.BaseController;
-import com.casic.missiles.core.page.PageFactory;
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.AlarmUpload;
-import com.casic.missiles.modular.system.dto.DeviceDetailDTO;
-import com.casic.missiles.modular.system.entity.BusAlarm;
-import com.casic.missiles.modular.system.service.IBusAlarmService;
-import io.swagger.annotations.*;
-import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.*;
-
-import org.springframework.stereotype.Controller;
-
-import static com.casic.missiles.model.response.ResponseData.DEFAULT_SUCCESS_MESSAGE;
-import static com.casic.missiles.modular.system.consts.AlarmConst.ALARM_STATUS_MANUAL_CANCEL;
-
-/**
- * <p>
- * 报警记录表 前端控制器
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@Api(tags = "报警管理接口")
-@Controller
-@RequestMapping("/alarm")
-@RequiredArgsConstructor
-public class BusAlarmController extends BaseController {
-
-    private final IBusAlarmService alarmService;
-
-    @ApiOperation("报警上报接口")
-    @PostMapping("/upload")
-    @ResponseBody
-    public Object upload(@RequestBody AlarmUpload alarmUpload){
-        alarmService.alarmUpload(alarmUpload);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("报警列表分页查询")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "workTitle", value = "作业名称",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "projectId", value = "作业ID",dataType = "Long", paramType = "query",example = "0"),
-            @ApiImplicitParam(name = "alarmStatus", value = "报警状态",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "projectState", value = "作业状态",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "alarmType", value = "报警类型",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "alarmStartTime", value = "报警开始时间",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "alarmEndTime", value = "报警结束时间",dataType = "String", paramType = "query")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = BusAlarm.class),
-    })
-    @GetMapping("/listPage")
-    @ResponseBody
-    public Object listPage(String workTitle,Long projectId,String alarmStatus,String projectState,String alarmType,String alarmStartTime,String alarmEndTime){
-        Page<BusAlarm> page = PageFactory.defaultPage();
-        QueryWrapper<BusAlarm> queryWrapper = new QueryWrapper<>();
-        if(StrUtil.isNotEmpty(workTitle)){
-            queryWrapper.like("p.WORK_TITLE",workTitle);
-        }
-        if(ObjectUtil.isNotEmpty(projectId)){
-            queryWrapper.eq("alarm.PROJECT_ID",projectId);
-        }
-        if(StrUtil.isNotEmpty(alarmStatus)){
-            queryWrapper.eq("alarm.ALARM_STATUS",alarmStatus);
-        }
-        if(StrUtil.isNotEmpty(projectState)){
-            queryWrapper.eq("p.PROJECT_STATE",projectState);
-        }
-        if(StrUtil.isNotEmpty(alarmType)){
-            queryWrapper.eq("alarm.ALARM_TYPE",alarmType);
-        }
-        if(StrUtil.isNotEmpty(alarmStartTime)){
-            queryWrapper.ge("alarm.ALARM_TIME",alarmStartTime);
-        }
-        if(StrUtil.isNotEmpty(alarmEndTime)){
-            queryWrapper.le("alarm.ALARM_TIME",alarmEndTime);
-        }
-        page = alarmService.listPage(page,queryWrapper);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-    @ApiOperation("消警")
-    @PostMapping("/cancel")
-    @ResponseBody
-    public Object cancel(@RequestParam("alarmId") Long alarmId){
-        UpdateWrapper<BusAlarm> updateWrapper = new UpdateWrapper<>();
-        updateWrapper.eq("ID",alarmId);
-        updateWrapper.set("ALARM_STATUS",ALARM_STATUS_MANUAL_CANCEL);
-        alarmService.update(updateWrapper);
-        return ResponseData.success();
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusEventController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusEventController.java
deleted file mode 100644
index dde5aad..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusEventController.java
+++ /dev/null
@@ -1,41 +0,0 @@
-package com.casic.missiles.modular.system.controller;
-
-
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.entity.BusEvent;
-import com.casic.missiles.modular.system.service.IBusEventService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.ResponseBody;
-
-/**
- * <p>
- * 事件表 前端控制器
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@Controller
-@RequestMapping("/event")
-@Api(tags = "事件上报")
-@RequiredArgsConstructor
-public class BusEventController {
-
-    private final IBusEventService eventService;
-
-    @ApiOperation("事件上报")
-    @PostMapping("add")
-    @ResponseBody
-    public Object add(@RequestBody BusEvent busEvent){
-        eventService.saveBusEvent(busEvent);
-        return ResponseData.success();
-    }
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
index 03abc5f..aa50d78 100644
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
@@ -1,121 +1,20 @@
 package com.casic.missiles.modular.system.controller;
 
 
-import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.core.base.controller.BaseController;
-import com.casic.missiles.core.page.PageFactory;
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.DeviceDetailDTO;
-import com.casic.missiles.modular.system.entity.Device;
-import com.casic.missiles.modular.system.service.IDeviceExtService;
-import com.casic.missiles.modular.system.service.IDeviceService;
-import io.swagger.annotations.*;
-import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.RequestMapping;
 
 import org.springframework.stereotype.Controller;
 
-import java.time.LocalDateTime;
-import java.util.Date;
-import java.util.List;
-
-import static com.casic.missiles.model.response.ResponseData.DEFAULT_SUCCESS_MESSAGE;
-
 /**
  * <p>
- *  前端控制器
+ * 设备记录表 前端控制器
  * </p>
  *
  * @author zyj
- * @since 2023-04-14
+ * @since 2023-05-25
  */
-@Api(tags = "设备管理接口")
-@RequiredArgsConstructor
 @Controller
-@RequestMapping("/device")
-public class DeviceController extends BaseController {
-    private final IDeviceService deviceService;
-    private final IDeviceExtService deviceExtService;
-
-    @ApiOperation("设备分页列表")
-    @ApiImplicitParams({
-        @ApiImplicitParam(name = "deviceType", value = "设备类型",dataType = "String", paramType = "query"),
-        @ApiImplicitParam(name = "deviceCode", value = "设备编号",dataType = "String", paramType = "query"),
-        @ApiImplicitParam(name = "status", value = "设备状态",dataType = "String", paramType = "query"),
-        @ApiImplicitParam(name = "projectId", value = "作业ID（如果传此参数，列表中返回该作业使用的设备）",dataType = "Long", paramType = "query", example = "0")
-    })
-    @ApiResponses({
-        @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = DeviceDetailDTO.class),
-    })
-    @GetMapping("listPage")
-    @ResponseBody
-    public Object listPage(String deviceType, String deviceCode, String status,Long projectId){
-        Page<DeviceDetailDTO> page = PageFactory.defaultPage();
-        QueryWrapper<DeviceDetailDTO> queryWrapper = new QueryWrapper<>();
-        if(StrUtil.isNotEmpty(deviceType)){
-            queryWrapper.eq("DEVICE_TYPE",deviceType);
-        }
-        if(StrUtil.isNotEmpty(deviceCode)){
-            queryWrapper.like("DEVICE_CODE",deviceCode);
-        }
-        page = deviceService.listPage(page,queryWrapper,status,projectId);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-    @ApiOperation("新增设备")
-    @PostMapping("add")
-    @ResponseBody
-    public Object add(@RequestBody DeviceDetailDTO deviceDetailDTO){
-        deviceService.saveDevice(deviceDetailDTO);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("编辑设备")
-    @PostMapping("update")
-    @ResponseBody
-    public Object update(@RequestBody DeviceDetailDTO deviceDetailDTO){
-        deviceService.updateDevice(deviceDetailDTO);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("删除设备")
-    @PostMapping("delete")
-    @ResponseBody
-    public Object delete(@ApiParam("设备id列表")@RequestBody List<Long> deviceIds){
-        deviceService.deleteDevices(deviceIds);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("设置甲烷阈值")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "gasIp", value = "安全树甲烷设备IP",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "gasPort", value = "安全树甲烷端口",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "threshold", value = "甲烷阈值",dataType = "String", paramType = "query")
-    })
-    @PostMapping("setThreshold")
-    @ResponseBody
-    public Object setThreshold(String gasIp,String gasPort,String threshold){
-        deviceExtService.setGasThreshold(gasIp, gasPort, threshold);
-        return ResponseData.success();
-    }
-
-
-    @ApiOperation("查询甲烷阈值")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "gasIp", value = "安全树甲烷设备IP",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "gasPort", value = "安全树甲烷端口",dataType = "String", paramType = "query")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = "{\"code\": 200,\"data\": \"100\",\"message\": \"请求成功\",\"success\": true}",response = String.class),
-    })
-    @GetMapping("getThreshold")
-    @ResponseBody
-    public Object getThreshold(String gasIp,String gasPort){
-        String data = deviceExtService.getGasThreshold(gasIp, gasPort);
-        return ResponseData.success(data);
-    }
-
+@RequestMapping("/system/device")
+public class DeviceController {
 
 }
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/OverviewController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/OverviewController.java
deleted file mode 100644
index 7570504..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/OverviewController.java
+++ /dev/null
@@ -1,70 +0,0 @@
-package com.casic.missiles.modular.system.controller;
-
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.AlarmTypeCountDTO;
-import com.casic.missiles.modular.system.dto.DeviceLocationDTO;
-import com.casic.missiles.modular.system.dto.WorkerLocationDTO;
-import com.casic.missiles.modular.system.service.IBusAlarmService;
-import com.casic.missiles.modular.system.service.IProjectDeviceService;
-import com.casic.missiles.modular.system.service.IProjectWorkerService;
-import io.swagger.annotations.*;
-import lombok.RequiredArgsConstructor;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.ResponseBody;
-
-import static com.casic.missiles.model.response.ResponseData.DEFAULT_SUCCESS_MESSAGE;
-import static com.casic.missiles.modular.system.consts.AlarmConst.ALARM_STATUS_ON;
-
-@Api(tags = "首页看板接口")
-@Controller
-@RequestMapping("overview")
-@RequiredArgsConstructor
-public class OverviewController {
-
-    private final IBusAlarmService alarmService;
-    private final IProjectDeviceService projectDeviceService;
-
-    private final IProjectWorkerService projectWorkerService;
-
-
-    @ApiOperation("报警统计接口")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "projectId", value = "作业ID",dataType = "Long", paramType = "query", example = "0")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = AlarmTypeCountDTO.class),
-    })
-    @GetMapping("/alarmCount")
-    @ResponseBody
-    public Object alarmCount(Long projectId){
-        return ResponseData.success(alarmService.alarmCount(projectId,ALARM_STATUS_ON));
-    }
-
-    @ApiOperation("设备列表接口")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "projectId", value = "作业ID",dataType = "Long", paramType = "query", example = "0")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = DeviceLocationDTO.class),
-    })
-    @GetMapping("/deviceList")
-    @ResponseBody
-    public Object deviceList(Long projectId){
-        return ResponseData.success(projectDeviceService.selectDeviceLocationList(projectId));
-    }
-
-    @ApiOperation("人员列表接口")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "projectId", value = "作业ID",dataType = "Long", paramType = "query", example = "0")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = WorkerLocationDTO.class),
-    })
-    @GetMapping("/workerList")
-    @ResponseBody
-    public Object workerList(Long projectId){
-        return ResponseData.success(projectWorkerService.selectWorkerLocationDTO(projectId));
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/WorkSiteInfoController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/WorkSiteInfoController.java
deleted file mode 100644
index af36d69..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/WorkSiteInfoController.java
+++ /dev/null
@@ -1,130 +0,0 @@
-package com.casic.missiles.modular.system.controller;
-
-
-import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.core.base.controller.BaseController;
-import com.casic.missiles.core.page.PageFactory;
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.WorkSiteDetailDTO;
-import com.casic.missiles.modular.system.entity.WorkSiteInfo;
-import com.casic.missiles.modular.system.service.IWorkSiteInfoService;
-import io.swagger.annotations.*;
-import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.*;
-
-import org.springframework.stereotype.Controller;
-
-import java.util.List;
-
-import static com.casic.missiles.model.response.ResponseData.DEFAULT_SUCCESS_MESSAGE;
-
-/**
- * <p>
- * 作业现场表 前端控制器
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@Controller
-@RequestMapping("/site")
-@Api(tags = "作业现场管理")
-@RequiredArgsConstructor
-public class WorkSiteInfoController extends BaseController {
-
-
-    private final IWorkSiteInfoService workSiteInfoService;
-
-    @ApiOperation("新增作业现场")
-    @PostMapping("add")
-    @ResponseBody
-    public Object addWorkSite(@RequestBody WorkSiteDetailDTO workSiteDetailDTO){
-        workSiteInfoService.addWorkSiteInfo(workSiteDetailDTO);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("编辑作业现场")
-    @PostMapping("update")
-    @ResponseBody
-    public Object updateWorkSite(@RequestBody WorkSiteDetailDTO workSiteDetailDTO){
-        workSiteInfoService.updateWorkSiteInfo(workSiteDetailDTO);
-        return ResponseData.success();
-    }
-
-
-    @ApiOperation("删除作业现场")
-    @PostMapping("delete")
-    @ResponseBody
-    public Object delete(@ApiParam("作业现场id列表")@RequestBody List<Long> projectIds){
-        workSiteInfoService.deleteProjects(projectIds);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("查询作业现场详情")
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = WorkSiteDetailDTO.class),
-    })
-    @GetMapping("detail")
-    @ResponseBody
-    public Object delete(@ApiParam(value = "作业现场id", example = "0")@RequestParam Long projectId){
-        WorkSiteDetailDTO detailDTO = workSiteInfoService.getWorkSiteDetail(projectId);
-        return ResponseData.success(detailDTO);
-    }
-
-    @ApiOperation("分页列表查询")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "workTitle",value = "作业名称", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "workRoad",value = "所属道路", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "workPersonName",value = "责任人姓名", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "startDate",value = "注册开始日期", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "endDate",value = "注册结束日期", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "projectState",value = "当前状态（字典值）", dataType = "String", paramType = "query")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = WorkSiteInfo.class),
-    })
-    @GetMapping("listPage")
-    @ResponseBody
-    public Object listPage(String workTitle,String workRoad,String workPersonName,String projectState,String startDate,String endDate){
-        Page<WorkSiteInfo> page = PageFactory.defaultPage();
-        QueryWrapper<WorkSiteInfo> queryWrapper = new QueryWrapper<>();
-        if(StrUtil.isNotEmpty(workTitle)){
-            queryWrapper.like("WORK_TITLE",workTitle);
-        }
-        if(StrUtil.isNotEmpty(workRoad)){
-            queryWrapper.like("WORK_ROAD",workRoad);
-        }
-        if(StrUtil.isNotEmpty(workPersonName)){
-            queryWrapper.like("WORKER_NAME",workPersonName);
-        }
-        if(StrUtil.isNotEmpty(projectState)){
-            queryWrapper.eq("PROJECT_STATE",projectState);
-        }
-        if(StrUtil.isNotEmpty(startDate)){
-            queryWrapper.ge("br_work_site_info.CREATE_TIME",startDate + " 00:00:00");
-        }
-        if(StrUtil.isNotEmpty(endDate)){
-            queryWrapper.le("br_work_site_info.CREATE_TIME",endDate + " 23:59:59");
-        }
-        page = workSiteInfoService.selectListPage(page,queryWrapper);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-    @ApiOperation("开始作业")
-    @PostMapping("start")
-    @ResponseBody
-    public Object start(@ApiParam(value = "作业现场id",example = "0")@RequestParam Long projectId){
-        workSiteInfoService.start(projectId);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("完成作业")
-    @PostMapping("finish")
-    @ResponseBody
-    public Object finish(@ApiParam(value = "作业现场id", example = "0")@RequestParam Long projectId){
-        workSiteInfoService.finish(projectId);
-        return ResponseData.success();
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/WorkerController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/WorkerController.java
deleted file mode 100644
index 796f94c..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/WorkerController.java
+++ /dev/null
@@ -1,136 +0,0 @@
-package com.casic.missiles.modular.system.controller;
-
-
-import cn.hutool.core.util.ObjectUtil;
-import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.core.base.controller.BaseController;
-import com.casic.missiles.core.page.PageFactory;
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.DeviceDetailDTO;
-import com.casic.missiles.modular.system.entity.Device;
-import com.casic.missiles.modular.system.entity.Worker;
-import com.casic.missiles.modular.system.service.IWorkerService;
-import io.swagger.annotations.*;
-import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.*;
-
-import org.springframework.stereotype.Controller;
-
-import java.util.Date;
-import java.util.List;
-
-import static com.casic.missiles.model.response.ResponseData.DEFAULT_SUCCESS_MESSAGE;
-
-/**
- * <p>
- *  前端控制器
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@Controller
-@RequestMapping("/worker")
-@RequiredArgsConstructor
-@Api(tags = "人员管理接口")
-public class WorkerController extends BaseController {
-
-    private final IWorkerService workerService;
-
-    @ApiOperation("分页列表查询")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "name",value = "姓名", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "deptId",value = "所属部门", dataType = "Long", paramType = "query", example = "0"),
-            @ApiImplicitParam(name = "status",value = "当前状态（字典值）", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "startDate",value = "注册开始日期", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "endDate",value = "注册结束日期", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "workerType",value = "人员类型（字典值）", dataType = "String", paramType = "query")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = Worker.class),
-    })
-    @GetMapping("listPage")
-    @ResponseBody
-    public Object listPage(String name,Long deptId, String status,String startDate,String endDate,String workerType){
-        Page<Worker> page = PageFactory.defaultPage();
-        QueryWrapper<Worker> queryWrapper = new QueryWrapper<>();
-        if(StrUtil.isNotEmpty(name)){
-            queryWrapper.like("WORKER_NAME",name);
-        }
-        if(ObjectUtil.isNotEmpty(deptId)){
-            queryWrapper.eq("DEPT_ID",deptId);
-        }
-        if(StrUtil.isNotEmpty(workerType)){
-            queryWrapper.eq("WORKER_TYPE",workerType);
-        }
-        if(StrUtil.isNotEmpty(startDate)){
-            queryWrapper.ge("CREATE_TIME",startDate + " 00:00:00");
-        }
-        if(StrUtil.isNotEmpty(endDate)){
-            queryWrapper.le("CREATE_TIME",endDate + " 23:59:59");
-        }
-        if(StrUtil.isNotEmpty(status)){
-            queryWrapper.eq("`STATUS`",status);
-        }
-        page = workerService.selectListPage(page,queryWrapper);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-    @ApiOperation("新增人员")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "worker", value = "人员信息", dataType = "Worker", paramType = "body", required = true),
-            @ApiImplicitParam(name = "projectId", value = "项目ID(入场申请需要)", dataType = "Long", paramType = "query", example = "0")
-    })
-    @PostMapping("add")
-    @ResponseBody
-    public Object add(@ApiParam("worker")@RequestBody Worker worker,
-                      @RequestParam(required = false) Long projectId){
-        workerService.addWorker(worker,projectId);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("编辑人员")
-    @PostMapping("update")
-    @ResponseBody
-    public Object update(@RequestBody Worker worker){
-        workerService.updateById(worker);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("删除人员")
-    @PostMapping("delete")
-    @ResponseBody
-    public Object delete(@ApiParam("人员id列表")@RequestBody List<Long> workIds){
-        workerService.removeByIds(workIds);
-        return ResponseData.success();
-    }
-
-
-    @ApiOperation(value = "获取人脸图片",notes = "返回人脸图片url")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "cameraIp",value = "摄像头IP", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "cameraPort",value = "摄像头端口号", dataType = "String", paramType = "query"),
-    })
-    @GetMapping("/face/register")
-    @ResponseBody
-    public Object faceRegister(String cameraIp,String cameraPort){
-        return ResponseData.success(workerService.faceRegister(cameraIp, cameraPort));
-    }
-
-
-    @ApiOperation(value = "查询临时入场人员列表")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "projectId", value = "项目ID",required = true,dataType = "Long", paramType = "query", example = "0")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = Worker.class),
-    })
-    @GetMapping("/projectTempWorker")
-    @ResponseBody
-    public Object projectTempWorker(Long projectId){
-        return ResponseData.success(workerService.projectTempWorker(projectId));
-    }
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/AlarmTypeCountDTO.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/AlarmTypeCountDTO.java
deleted file mode 100644
index 1a165a1..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/AlarmTypeCountDTO.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.casic.missiles.modular.system.dto;
-
-import io.swagger.annotations.ApiModel;
-import lombok.Data;
-
-@ApiModel(value = "AlarmTypeCountDTO",description = "报警类型统计（首页）")
-@Data
-public class AlarmTypeCountDTO {
-
-    private String alarmType;
-    private String alarmTypeName;
-    private Integer alarmCount;
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/AlarmUpload.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/AlarmUpload.java
deleted file mode 100644
index 73d7799..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/AlarmUpload.java
+++ /dev/null
@@ -1,46 +0,0 @@
-package com.casic.missiles.modular.system.dto;
-
-import cn.hutool.core.util.StrUtil;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-@ApiModel(value = "AlarmUpload",description = "报警上传")
-@Data
-public class AlarmUpload {
-
-    @ApiModelProperty(value = "摄像头ip")
-    private String cameraIp;
-
-    @ApiModelProperty(value = "摄像头端口")
-    private String cameraPort;
-    @ApiModelProperty(value = "安全树甲烷设备ip")
-    private String gasIp;
-    @ApiModelProperty(value = "安全树甲烷设备端口")
-    private String gasPort;
-    @ApiModelProperty(value = "报警值")
-    private String alarmValue;
-    @ApiModelProperty(value = "报警时间")
-    private String alarmTime;
-    @ApiModelProperty(value = "报警类型")
-    private String alarmType;
-    @ApiModelProperty(value = "报警图片")
-    private String alarmImage;
-    @ApiModelProperty(value = "报警内容")
-    private String alarmContent;
-
-    @Override
-    public String toString() {
-        return "AlarmUpload{" +
-                "cameraIp='" + cameraIp + '\'' +
-                ", cameraPort='" + cameraPort + '\'' +
-                ", gasIp='" + gasIp + '\'' +
-                ", gasPort='" + gasPort + '\'' +
-                ", alarmValue='" + alarmValue + '\'' +
-                ", alarmTime='" + alarmTime + '\'' +
-                ", alarmType='" + alarmType + '\'' +
-                ", alarmImage='" + (StrUtil.isNotEmpty(alarmImage) ? alarmImage.substring(0,50) : "null") + '\'' +
-                ", alarmContent='" + alarmContent + '\'' +
-                '}';
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/DeviceDetailDTO.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/DeviceDetailDTO.java
deleted file mode 100644
index ea518d9..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/DeviceDetailDTO.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package com.casic.missiles.modular.system.dto;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.casic.missiles.modular.system.entity.Device;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-@ApiModel("DeviceDetailDTO")
-@Data
-public class DeviceDetailDTO extends Device {
-
-    @ApiModelProperty(value = "摄像头编号")
-    private String cameraCode;
-
-    @ApiModelProperty(value = "摄像头IP")
-    private String cameraIp;
-
-    @ApiModelProperty(value = "摄像头端口")
-    private String cameraPort;
-
-    @ApiModelProperty(value = "激甲编号")
-    private String gasCode;
-
-    @ApiModelProperty(value = "激甲IP")
-    private String gasIp;
-
-    @ApiModelProperty(value = "激甲端口")
-    private String gasPort;
-
-    @ApiModelProperty(value = "智能帽衬编号")
-    private String hatLiningCode;
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/WorkSiteDetailDTO.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/WorkSiteDetailDTO.java
deleted file mode 100644
index 29378ff..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/WorkSiteDetailDTO.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package com.casic.missiles.modular.system.dto;
-
-import com.casic.missiles.modular.system.entity.ProjectDevice;
-import com.casic.missiles.modular.system.entity.ProjectWorker;
-import com.casic.missiles.modular.system.entity.WorkSiteInfo;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.util.List;
-
-@Data
-@ApiModel("WorkSiteDetailDTO")
-public class WorkSiteDetailDTO extends WorkSiteInfo {
-
-    @ApiModelProperty(value = "安全树列表",dataType = "ProjectDevice")
-    private List<ProjectDevice> deviceList;
-
-    @ApiModelProperty(value = "人员列表",dataType = "ProjectWorker")
-    private List<ProjectWorker> workerList;
-
-
-
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/WorkerLocationDTO.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/WorkerLocationDTO.java
deleted file mode 100644
index 6fd7b24..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/WorkerLocationDTO.java
+++ /dev/null
@@ -1,68 +0,0 @@
-package com.casic.missiles.modular.system.dto;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-@ApiModel(value = "WorkerLocationDTO",description = "人员位置列表（首页）")
-@Data
-public class WorkerLocationDTO {
-
-    @ApiModelProperty("人员ID")
-    private Long workerId;
-
-    @ApiModelProperty("人员姓名")
-    private String workerName;
-
-    @ApiModelProperty("安全帽编号")
-    private String hatCode;
-
-    @ApiModelProperty("安全帽ID")
-    private Long hatId;
-
-    @ApiModelProperty("背心编号")
-    private String vastCode;
-
-    @ApiModelProperty("手环编号")
-    private String braceletCode;
-
-    @ApiModelProperty("位置")
-    private String location;
-
-    @ApiModelProperty("时间")
-    private String time;
-
-    @ApiModelProperty("经度")
-    private String lng;
-
-    @ApiModelProperty("纬度")
-    private String lat;
-
-    @ApiModelProperty("心率")
-    private String heartRate;
-
-    @ApiModelProperty("血氧")
-    private String bloodOxygen;
-
-    @ApiModelProperty("一氧化碳")
-    private String co;
-
-    @ApiModelProperty("甲烷")
-    private String gas;
-
-    @ApiModelProperty("硫化氢")
-    private String h2s;
-
-    @ApiModelProperty("氧气")
-    private String o2;
-
-    @ApiModelProperty("信号")
-    private String signal;
-
-    @ApiModelProperty("电量")
-    private String cell;
-
-    @ApiModelProperty("是否报警")
-    private boolean alarmFlag;
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Alarm.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Alarm.java
new file mode 100644
index 0000000..4d2b7ef
--- /dev/null
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Alarm.java
@@ -0,0 +1,103 @@
+package com.casic.missiles.modular.system.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import java.util.Date;
+
+/**
+ * <p>
+ * 报警记录表
+ * </p>
+ *
+ * @author zyj
+ * @since 2023-05-25
+ */
+@Data
+@TableName("bus_alarm")
+public class Alarm implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    @TableId(value = "ID",type = IdType.ASSIGN_ID)
+    private Long id;
+
+    /**
+     * 设备ID
+     */
+    @TableField("DEVICE_ID")
+    private Long deviceId;
+
+    /**
+     * 报警类型
+     */
+    @TableField("ALARM_TYPE")
+    private String alarmType;
+
+    /**
+     * 报警时间
+     */
+    @TableField("ALARM_TIME")
+    private Date alarmTime;
+
+    /**
+     * 报警状态
+     */
+    @TableField("ALARM_STATUS")
+    private String alarmStatus;
+
+    /**
+     * 报警位置
+     */
+    @TableField("ALARM_LOCATION")
+    private String alarmLocation;
+
+    /**
+     * 报警图片
+     */
+    @TableField("ALARM_IMAGE")
+    private String alarmImage;
+
+    /**
+     * 视频通道号
+     */
+    @TableField("CHANNEL_NO")
+    private Integer channelNo;
+
+    /**
+     * 报警内容
+     */
+    @TableField("ALARM_CONTENT")
+    private String alarmContent;
+
+    /**
+     * 消警时间
+     */
+    @TableField("CANCEL_TIME")
+    private Date cancelTime;
+
+
+    @Override
+    public String toString() {
+        return "Alarm{" +
+            "id=" + id +
+            ", deviceId=" + deviceId +
+            ", alarmType=" + alarmType +
+            ", alarmTime=" + alarmTime +
+            ", alarmStatus=" + alarmStatus +
+            ", alarmLocation=" + alarmLocation +
+            ", alarmImage=" + alarmImage +
+            ", channelNo=" + channelNo +
+            ", alarmContent=" + alarmContent +
+            ", cancelTime=" + cancelTime +
+        "}";
+    }
+}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusAlarm.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusAlarm.java
deleted file mode 100644
index efb4a23..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusAlarm.java
+++ /dev/null
@@ -1,159 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.alibaba.fastjson.annotation.JSONField;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.time.LocalDateTime;
-import java.util.Date;
-
-/**
- * <p>
- * 报警记录表
- * </p>
- *
- * @author zyj
- * @since 2023-05-16
- */
-@Data
-@ApiModel("Alarm")
-@TableName("br_bus_alarm")
-public class BusAlarm implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 项目ID
-     */
-    @ApiModelProperty(value = "项目ID")
-    @TableField("PROJECT_ID")
-    private Long projectId;
-
-    /**
-     * 设备ID
-     */
-    @ApiModelProperty(value = "设备ID")
-    @TableField("DEVICE_ID")
-    private Long deviceId;
-
-    /**
-     * 报警类型
-     */
-    @ApiModelProperty(value = "报警类型")
-    @TableField("ALARM_TYPE")
-    private String alarmType;
-
-    /**
-     * 报警状态
-     */
-    @ApiModelProperty(value = "报警状态")
-    @TableField("ALARM_STATUS")
-    private String alarmStatus;
-
-    /**
-     * 报警值
-     */
-    @ApiModelProperty(value = "报警值")
-    @TableField("ALARM_VALUE")
-    private String alarmValue;
-
-    /**
-     * 报警图片
-     */
-    @ApiModelProperty(value = "报警图片")
-    @TableField("ALARM_IMAGE")
-    private String alarmImage;
-
-    /**
-     * 报警内容
-     */
-    @ApiModelProperty(value = "报警内容")
-    @TableField("ALARM_CONTENT")
-    private String alarmContent;
-
-    /**
-     * 报警时间
-     */
-    @ApiModelProperty(value = "报警时间")
-    @TableField("ALARM_TIME")
-    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
-    private Date alarmTime;
-
-    /**
-     * 消警时间
-     */
-    @ApiModelProperty(value = "消警时间")
-    @TableField("CANCEL_TIME")
-    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
-    private Date cancelTime;
-
-    /**
-     * 报警位置经度
-     */
-    @ApiModelProperty(value = "报警位置经度")
-    @TableField("ALARM_LNG")
-    private String alarmLng;
-
-    /**
-     * 报警位置纬度
-     */
-    @ApiModelProperty(value = "报警位置纬度")
-    @TableField("ALARM_LAT")
-    private String alarmLat;
-
-    @ApiModelProperty("报警类型名称")
-    @TableField(exist = false)
-    private String alarmStatusName;
-    @ApiModelProperty("报警类型名称")
-    @TableField(exist = false)
-    private String alarmTypeName;
-    @ApiModelProperty("作业名称")
-    @TableField(exist = false)
-    private String workTitle;
-    @ApiModelProperty("所属道路")
-    @TableField(exist = false)
-    private String workRoad;
-    @ApiModelProperty("作业状态")
-    @TableField(exist = false)
-    private String projectState;
-    @ApiModelProperty("作业状态名称")
-    @TableField(exist = false)
-    private String projectStateName;
-    @ApiModelProperty("负责人姓名")
-    @TableField(exist = false)
-    private String workPersonName;
-    @ApiModelProperty("负责人联系方式")
-    @TableField(exist = false)
-    private String workPersonPhoneNumber;
-
-
-    @Override
-    public String toString() {
-        return "BusAlarm{" +
-                "id=" + id +
-                ", projectId=" + projectId +
-                ", deviceId=" + deviceId +
-                ", alarmType=" + alarmType +
-                ", alarmValue=" + alarmValue +
-                ", alarmStatus=" + alarmStatus +
-                ", alarmImage=" + alarmImage +
-                ", alarmContent=" + alarmContent +
-                ", alarmTime=" + alarmTime +
-                ", cancelTime=" + cancelTime +
-                ", alarmLng=" + alarmLng +
-                ", alarmLat=" + alarmLat +
-                "}";
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusEvent.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusEvent.java
deleted file mode 100644
index a0b7543..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusEvent.java
+++ /dev/null
@@ -1,100 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.time.LocalDateTime;
-import java.util.Date;
-import java.util.List;
-
-/**
- * <p>
- * 事件表
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@TableName("br_bus_event")
-@Data
-@ApiModel("BusEvent")
-public class BusEvent implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @ApiModelProperty("事件ID")
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 事件标题
-     */
-    @ApiModelProperty("事件名称")
-    @TableField("EVENT_TITLE")
-    private String eventTitle;
-
-    /**
-     * 上报人员
-     */
-    @ApiModelProperty("上报人员")
-    @TableField("UPLOAD_NAME")
-    private String uploadName;
-
-    /**
-     * 联系方式
-     */
-    @ApiModelProperty("联系方式")
-    @TableField("PHONE_NUMBER")
-    private String phoneNumber;
-
-    /**
-     * 事件描述
-     */
-    @ApiModelProperty("事件描述")
-    @TableField("EVENT_DESCRIPTION")
-    private String eventDescription;
-
-    @ApiModelProperty("经度")
-    @TableField("LNG")
-    private String lng;
-
-    @ApiModelProperty("纬度")
-    @TableField("LAT")
-    private String lat;
-
-    /**
-     * 事件上传时间
-     */
-    @ApiModelProperty("事件上传时间")
-    @TableField("CREATE_TIME")
-    private Date createTime;
-
-    @ApiModelProperty("事件照片")
-    @TableField(exist = false)
-    private List<BusEventImage> imageList;
-
-
-
-    @Override
-    public String toString() {
-        return "BusEvent{" +
-            "id=" + id +
-            ", eventTitle=" + eventTitle +
-            ", uploadName=" + uploadName +
-            ", phoneNumber=" + phoneNumber +
-            ", eventDescription=" + eventDescription +
-            ", lng=" + lng +
-            ", lat=" + lat +
-            ", createTime=" + createTime +
-        "}";
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusEventImage.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusEventImage.java
deleted file mode 100644
index 1e75245..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusEventImage.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-
-/**
- * <p>
- * 事件图片表
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@TableName("br_bus_event_image")
-@Data
-@ApiModel("BusEventImage")
-public class BusEventImage implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 事件ID
-     */
-    @TableField("EVENT_ID")
-    private Long eventId;
-
-    /**
-     * 报警图片
-     */
-    @TableField("IMAGE")
-    @ApiModelProperty("图片url")
-    private String image;
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Device.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Device.java
index df89c70..ea7db5f 100644
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Device.java
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Device.java
@@ -1,30 +1,23 @@
 package com.casic.missiles.modular.system.entity;
 
-import com.alibaba.fastjson.annotation.JSONField;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.casic.missiles.core.base.json.DateDeserializer;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
-import java.util.Date;
 
 /**
  * <p>
- * 
+ * 设备记录表
  * </p>
  *
  * @author zyj
- * @since 2023-04-14
+ * @since 2023-05-25
  */
-@ApiModel("Device")
-@TableName("br_device")
 @Data
+@TableName("bus_device")
 public class Device implements Serializable {
 
     private static final long serialVersionUID = 1L;
@@ -32,82 +25,86 @@
     /**
      * 主键
      */
-    @ApiModelProperty(value = "设备ID")
     @TableId(value = "ID",type = IdType.ASSIGN_ID)
     private Long id;
 
     /**
-     * 设备编号
+     * 设备名称
      */
-    @ApiModelProperty(value = "设备编号")
-    @TableField("DEVICE_CODE")
-    private String deviceCode;
+    @TableField("DEVICE_NAME")
+    private String deviceName;
 
     /**
-     * 设备类型
+     * IP
      */
-    @ApiModelProperty(value = "设备类型")
-    @TableField("DEVICE_TYPE")
-    private String deviceType;
+    @TableField("IP")
+    private String ip;
 
     /**
-     * 设备批次
+     * 端口
      */
-    @ApiModelProperty(value = "设备批次")
-    @TableField("DEVICE_BATCH")
-    private String deviceBatch;
+    @TableField("PORT")
+    private String port;
 
     /**
-     * 厂家
+     * 用户名
      */
-    @ApiModelProperty(value = "厂家")
-    @TableField("MANUFACTURER")
-    private String manufacturer;
+    @TableField("USER_NAME")
+    private String userName;
 
     /**
-     * 是否供电
+     * 密码
      */
-    @ApiModelProperty(value = "是否供电")
-    @TableField("IS_POWER_SUPPLY")
-    private String isPowerSupply;
+    @TableField("PASSWORD")
+    private String password;
 
     /**
-     * 创建时间
+     * 连接类型
      */
-    @ApiModelProperty(value = "创建时间",dataType = "Date")
-    @TableField("CREATE_TIME")
-    private Date createTime;
+    @TableField("CONNECT_TYPE")
+    private String connectType;
 
-    @ApiModelProperty(value = "设备类型名称")
-    @TableField(exist = false)
-    private String deviceTypeName;
+    /**
+     * 位置
+     */
+    @TableField("LOCATION")
 
-    @ApiModelProperty(value = "是否供电名称")
-    @TableField(exist = false)
-    private String isPowerSupplyName;
+    private String location;
 
-    @ApiModelProperty(value = "注册时间",dataType = "String")
-    @TableField(exist = false)
-    private String registerTime;
+    /**
+     * 设备状态
+     */
+    @TableField("STATUS")
 
-    @ApiModelProperty(value = "当前状态")
-    @TableField(exist = false)
     private String status;
 
-    @ApiModelProperty(value = "当前状态名称")
-    @TableField(exist = false)
-    private String statusName;
+    /**
+     * 报警分组
+     */
+    @TableField("ALARM_GROUP")
+
+    private Long alarmGroup;
+
+    /**
+     * 视频通道数(预留)
+     */
+    @TableField("CHANNEL_NUM")
+    private Integer channelNum;
 
     @Override
     public String toString() {
         return "Device{" +
             "id=" + id +
-            ", deviceCode=" + deviceCode +
-            ", deviceType=" + deviceType +
-            ", deviceBatch=" + deviceBatch +
-            ", manufacturer=" + manufacturer +
-            ", isPowerSupply=" + isPowerSupply +
-            ", createTime=" + createTime +
+            ", deviceName=" + deviceName +
+            ", ip=" + ip +
+            ", port=" + port +
+            ", userName=" + userName +
+            ", password=" + password +
+            ", connectType=" + connectType +
+            ", location=" + location +
+            ", status=" + status +
+            ", alarmGroup=" + alarmGroup +
+            ", channelNum=" + channelNum +
         "}";
     }
 }
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/DeviceExt.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/DeviceExt.java
deleted file mode 100644
index 5ee7015..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/DeviceExt.java
+++ /dev/null
@@ -1,99 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-
-/**
- * <p>
- * 设备扩展信息表（安全树）
- * </p>
- *
- * @author zyj
- * @since 2023-04-27
- */
-@Data
-@TableName("br_device_ext")
-public class DeviceExt implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 设备ID
-     */
-    @TableField("DEVICE_ID")
-    private Long deviceId;
-
-    /**
-     * 摄像头编号
-     */
-    @TableField("CAMERA_CODE")
-    private String cameraCode;
-
-    /**
-     * 摄像头IP
-     */
-    @TableField("CAMERA_IP")
-    private String cameraIp;
-
-    /**
-     * 摄像头端口
-     */
-    @TableField("CAMERA_PORT")
-    private String cameraPort;
-
-    /**
-     * 激甲编号
-     */
-    @TableField("GAS_CODE")
-    private String gasCode;
-
-    /**
-     * 激甲IP
-     */
-    @TableField("GAS_IP")
-    private String gasIp;
-
-    /**
-     * 激甲端口
-     */
-    @TableField("GAS_PORT")
-    private String gasPort;
-
-    /**
-     * 甲烷报警阈值
-     */
-    @TableField("GAS_THRESHOLD")
-    private String gasThreshold;
-
-    @TableField(value = "HAT_LINING_CODE")
-    private String hatLiningCode;
-
-
-    @Override
-    public String toString() {
-        return "DeviceExt{" +
-            "id=" + id +
-            ", deviceId=" + deviceId +
-            ", cameraCode=" + cameraCode +
-            ", cameraIp=" + cameraIp +
-            ", cameraPort=" + cameraPort +
-            ", gasCode=" + gasCode +
-            ", gasIp=" + gasIp +
-            ", gasPort=" + gasPort +
-            ", gasThreshold=" + gasThreshold +
-            ", hatLiningCode=" + hatLiningCode +
-        "}";
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/ProjectDevice.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/ProjectDevice.java
deleted file mode 100644
index c4f3472..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/ProjectDevice.java
+++ /dev/null
@@ -1,62 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-
-/**
- * <p>
- * 
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@Data
-@ApiModel("ProjectDevice")
-@TableName("br_project_device")
-public class ProjectDevice implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 作业现场ID
-     */
-    @TableField("PROJECT_ID")
-    private Long projectId;
-
-    /**
-     * 设备ID
-     */
-    @TableField("DEVICE_ID")
-    @ApiModelProperty("设备ID（新增编辑时传）")
-    private Long deviceId;
-
-    /**
-     * 设备编号
-     */
-    @TableField(exist = false)
-    @ApiModelProperty("设备编号（详情中展示，新增编辑不用传）")
-    private String deviceCode;
-
-    @Override
-    public String toString() {
-        return "ProjectDevice{" +
-            "id=" + id +
-            ", projectId=" + projectId +
-            ", deviceId=" + deviceId +
-        "}";
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/ProjectWorker.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/ProjectWorker.java
deleted file mode 100644
index 10b23c4..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/ProjectWorker.java
+++ /dev/null
@@ -1,104 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import java.io.Serializable;
-
-/**
- * <p>
- * 
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@ApiModel("ProjectWorker")
-@TableName("br_project_worker")
-@Data
-@NoArgsConstructor
-@AllArgsConstructor
-public class ProjectWorker implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 作业现场ID
-     */
-    @TableField("PROJECT_ID")
-    private Long projectId;
-
-    /**
-     * 人员ID
-     */
-    @ApiModelProperty("人员ID")
-    @TableField("WORKER_ID")
-    private Long workerId;
-
-    /**
-     * 安全帽编号
-     */
-    @ApiModelProperty("安全帽编号")
-    @TableField("HAT_CODE")
-    private String hatCode;
-
-    /**
-     * 背心编号
-     */
-    @ApiModelProperty("背心编号")
-    @TableField("VAST_CODE")
-    private String vastCode;
-
-    /**
-     * 手环编号
-     */
-    @ApiModelProperty("手环编号")
-    @TableField("BRACELET_CODE")
-    private String braceletCode;
-
-    @ApiModelProperty("人员姓名（详情中展示，新增编辑不用传）")
-    @TableField(exist = false)
-    private String workerName;
-
-    @ApiModelProperty("人员部门ID（详情中展示，新增编辑不用传）")
-    @TableField(exist = false)
-    private String workerDeptId;
-
-    @ApiModelProperty("人员部门名称（详情中展示，新增编辑不用传）")
-    @TableField(exist = false)
-    private String workerDeptName;
-
-    @ApiModelProperty("人员联系方式（详情中展示，新增编辑不用传）")
-    @TableField(exist = false)
-    private String workerPhoneNumber;
-
-    public ProjectWorker(Long projectId, Long workerId) {
-        this.projectId = projectId;
-        this.workerId = workerId;
-    }
-
-    @Override
-    public String toString() {
-        return "ProjectWorker{" +
-            "id=" + id +
-            ", projectId=" + projectId +
-            ", workerId=" + workerId +
-            ", hatCode=" + hatCode +
-            ", vastCode=" + vastCode +
-            ", braceletCode=" + braceletCode +
-        "}";
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/WorkSiteInfo.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/WorkSiteInfo.java
deleted file mode 100644
index fa6f41d..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/WorkSiteInfo.java
+++ /dev/null
@@ -1,130 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.alibaba.fastjson.annotation.JSONField;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.time.LocalDateTime;
-import java.util.Date;
-
-/**
- * <p>
- * 作业现场表
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@ApiModel("WorkSiteInfo")
-@TableName("br_work_site_info")
-@Data
-public class WorkSiteInfo implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @ApiModelProperty("作业现场ID")
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 作业名称
-     */
-    @ApiModelProperty("作业名称")
-    @TableField("WORK_TITLE")
-    private String workTitle;
-
-    /**
-     * 责任人
-     */
-    @ApiModelProperty("责任人（人员ID）")
-    @TableField("WORK_PERSON")
-    private Long workPerson;
-
-    /**
-     * 作业描述
-     */
-    @ApiModelProperty("作业描述")
-    @TableField("WORK_SITE_DESC")
-    private String workSiteDesc;
-
-    /**
-     * 作业状态
-     */
-    @ApiModelProperty("作业状态")
-    @TableField("PROJECT_STATE")
-    private String projectState;
-
-    /**
-     * 所属道路
-     */
-    @ApiModelProperty("所属道路")
-    @TableField("WORK_ROAD")
-    private String workRoad;
-
-    @TableField("IMAGE_URL")
-    private String imageUrl;
-
-    @TableField("CREATE_TIME")
-    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
-    private Date createTime;
-    @TableField("UPDATE_TIME")
-    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
-    private Date updateTime;
-
-    @ApiModelProperty("开始时间")
-    @TableField("START_TIME")
-    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
-    private Date startTime;
-
-    @ApiModelProperty("结束时间")
-    @TableField("FINISH_TIME")
-    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
-    private Date finishTime;
-
-    @ApiModelProperty("负责人姓名（详情中使用，新增编辑不用传）")
-    @TableField(exist = false)
-    private String workPersonName;
-
-    @ApiModelProperty("负责人联系方式（详情中使用，新增编辑不用传）")
-    @TableField(exist = false)
-    private String workPersonPhoneNumber;
-
-    @ApiModelProperty("负责人所属部门ID（详情中使用，新增编辑不用传）")
-    @TableField(exist = false)
-    private Long workPersonDeptId;
-
-    @ApiModelProperty("负责人所属部门名称（详情中使用，新增编辑不用传）")
-    @TableField(exist = false)
-    private String workPersonDeptName;
-
-    @ApiModelProperty(value = "注册时间",dataType = "String")
-    @TableField(exist = false)
-    private String registerTime;
-
-    @ApiModelProperty("作业状态名称")
-    @TableField(exist = false)
-    private String projectStateName;
-
-    @Override
-    public String toString() {
-        return "WorkSiteInfo{" +
-            "id=" + id +
-            ", workTitle=" + workTitle +
-            ", workPerson=" + workPerson +
-            ", workSiteDesc=" + workSiteDesc +
-            ", projectState=" + projectState +
-            ", imageUrl=" + imageUrl +
-            ", updateTime=" + updateTime +
-            ", workRoad=" + workRoad +
-        "}";
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Worker.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Worker.java
deleted file mode 100644
index 28a4daa..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Worker.java
+++ /dev/null
@@ -1,147 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.time.LocalDateTime;
-import java.util.Date;
-
-/**
- * <p>
- * 
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@ApiModel("Worker")
-@TableName("br_worker")
-@Data
-public class Worker implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @ApiModelProperty(value = "人员ID")
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 姓名
-     */
-    @ApiModelProperty(value = "姓名")
-    @TableField("WORKER_NAME")
-    private String workerName;
-
-    /**
-     * 性别
-     */
-    @ApiModelProperty(value = "性别")
-    @TableField("GENDER")
-    private String gender;
-
-    /**
-     * 所属部门
-     */
-    @ApiModelProperty(value = "所属部门(人员管理)")
-    @TableField("DEPT_ID")
-    private Long deptId;
-
-    /**
-     * 所属单位
-     */
-    @ApiModelProperty(value = "所属单位(入场申请中使用)")
-    @TableField("OWNER_SHIP")
-    private String ownerShip;
-
-    /**
-     * 联系方式
-     */
-    @ApiModelProperty(value = "联系方式")
-    @TableField("PHONE_NUMBER")
-    private String phoneNumber;
-
-    /**
-     * 证件号
-     */
-    @ApiModelProperty(value = "证件号")
-    @TableField("ID_CARD_NUMBER")
-    private String idCardNumber;
-
-    /**
-     * 入场原因
-     */
-    @ApiModelProperty(value = "入场原因（入场申请中使用）")
-    @TableField("ENTER_REASON")
-    private String enterReason;
-
-    /**
-     * 入场人脸照片
-     */
-    @ApiModelProperty(value = "人脸照片（照片路径）")
-    @TableField("WORKER_AVATAR")
-    private String workerAvatar;
-
-    /**
-     * 申请入场时间
-     */
-    @ApiModelProperty(value = "注册时间/申请入场时间")
-    @TableField("CREATE_TIME")
-    private Date createTime;
-
-    /**
-     * 人员类型
-     */
-    @ApiModelProperty(value = "人员类型（区分人员管理和入场申请）")
-    @TableField("WORKER_TYPE")
-    private String workerType;
-
-    @ApiModelProperty(value = "性别名称")
-    @TableField(exist = false)
-    private String genderName;
-
-    @ApiModelProperty(value = "部门名称")
-    @TableField(exist = false)
-    private String deptName;
-
-    @ApiModelProperty(value = "注册时间",dataType = "String")
-    @TableField(exist = false)
-    private String registerTime;
-
-    @ApiModelProperty(value = "当前状态")
-    @TableField(exist = false)
-    private String status;
-
-    @ApiModelProperty(value = "当前状态名称")
-    @TableField(exist = false)
-    private String statusName;
-
-    @ApiModelProperty(value = "是否注册(0未注册；1已注册)",allowableValues = "0,1")
-    @TableField(exist = false)
-    private String isRegister;
-
-    @Override
-    public String toString() {
-        return "Worker{" +
-            "id=" + id +
-            ", workerName=" + workerName +
-            ", gender=" + gender +
-            ", deptId=" + deptId +
-            ", ownerShip=" + ownerShip +
-            ", phoneNumber=" + phoneNumber +
-            ", idCardNumber=" + idCardNumber +
-            ", enterReason=" + enterReason +
-            ", workerAvatar=" + workerAvatar +
-            ", createTime=" + createTime +
-            ", workerType=" + workerType +
-        "}";
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/AlarmMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/AlarmMapper.java
new file mode 100644
index 0000000..ea4c8be
--- /dev/null
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/AlarmMapper.java
@@ -0,0 +1,16 @@
+package com.casic.missiles.modular.system.mapper;
+
+import com.casic.missiles.modular.system.entity.Alarm;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 报警记录表 Mapper 接口
+ * </p>
+ *
+ * @author zyj
+ * @since 2023-05-25
+ */
+public interface AlarmMapper extends BaseMapper<Alarm> {
+
+}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/BusAlarmMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/BusAlarmMapper.java
deleted file mode 100644
index 9801742..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/BusAlarmMapper.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package com.casic.missiles.modular.system.mapper;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.modular.system.dto.AlarmTypeCountDTO;
-import com.casic.missiles.modular.system.entity.BusAlarm;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * <p>
- * 报警记录表 Mapper 接口
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface BusAlarmMapper extends BaseMapper<BusAlarm> {
-
-    Page<BusAlarm> listPage(Page<BusAlarm> page,@Param("ew")  QueryWrapper<BusAlarm> queryWrapper);
-
-    void cancelAlarm(@Param("deviceId")Long deviceId,@Param("alarmType") String alarmType);
-
-    List<AlarmTypeCountDTO> alarmCount(@Param("projectId")Long projectId, @Param("alarmStatus")String alarmStatus);
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/BusEventImageMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/BusEventImageMapper.java
deleted file mode 100644
index 9590b7d..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/BusEventImageMapper.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.casic.missiles.modular.system.mapper;
-
-import com.casic.missiles.modular.system.entity.BusEventImage;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * <p>
- * 事件图片表 Mapper 接口
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface BusEventImageMapper extends BaseMapper<BusEventImage> {
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/BusEventMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/BusEventMapper.java
deleted file mode 100644
index 3c85edf..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/BusEventMapper.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.casic.missiles.modular.system.mapper;
-
-import com.casic.missiles.modular.system.entity.BusEvent;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * <p>
- * 事件表 Mapper 接口
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface BusEventMapper extends BaseMapper<BusEvent> {
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/DeviceExtMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/DeviceExtMapper.java
deleted file mode 100644
index 4ca9212..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/DeviceExtMapper.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.casic.missiles.modular.system.mapper;
-
-import com.casic.missiles.modular.system.entity.DeviceExt;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * <p>
- * 设备扩展信息表（安全树） Mapper 接口
- * </p>
- *
- * @author zyj
- * @since 2023-04-27
- */
-public interface DeviceExtMapper extends BaseMapper<DeviceExt> {
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/DeviceMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/DeviceMapper.java
index 444c0c5..3d0bb02 100644
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/DeviceMapper.java
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/DeviceMapper.java
@@ -1,30 +1,16 @@
 package com.casic.missiles.modular.system.mapper;
 
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.modular.system.dto.DeviceDetailDTO;
-import com.casic.missiles.modular.system.dto.HelmetInfoDTO;
 import com.casic.missiles.modular.system.entity.Device;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
 
 /**
  * <p>
- *  Mapper 接口
+ * 设备记录表 Mapper 接口
  * </p>
  *
  * @author zyj
- * @since 2023-04-14
+ * @since 2023-05-25
  */
-@Mapper
 public interface DeviceMapper extends BaseMapper<Device> {
 
-    Page<DeviceDetailDTO> listDetailPage(Page<DeviceDetailDTO> page,@Param("ew") QueryWrapper<DeviceDetailDTO> ew);
-
-     List<Long> selectProjectDevice(@Param("projectId") Long projectId);
-
-    List<HelmetInfoDTO> selectHelmetList(@Param("deviceType")String deviceType);
 }
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/ProjectDeviceMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/ProjectDeviceMapper.java
deleted file mode 100644
index 1d0c14e..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/ProjectDeviceMapper.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package com.casic.missiles.modular.system.mapper;
-
-import com.casic.missiles.modular.system.dto.DeviceLocationDTO;
-import com.casic.missiles.modular.system.entity.ProjectDevice;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * <p>
- *  Mapper 接口
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface ProjectDeviceMapper extends BaseMapper<ProjectDevice> {
-     List<ProjectDevice> selectDetailByProjectId(@Param("projectId") Long projectId);
-
-     List<DeviceLocationDTO> selectDeviceLocationList(@Param("projectId") Long projectId);
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/ProjectWorkerMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/ProjectWorkerMapper.java
deleted file mode 100644
index 58583d1..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/ProjectWorkerMapper.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package com.casic.missiles.modular.system.mapper;
-
-import com.casic.missiles.modular.system.dto.WorkerLocationDTO;
-import com.casic.missiles.modular.system.entity.ProjectWorker;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * <p>
- *  Mapper 接口
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface ProjectWorkerMapper extends BaseMapper<ProjectWorker> {
-
-    List<ProjectWorker> selectDetailByProjectId(@Param("projectId") Long projectId,
-                                                @Param("workerType")String workerType);
-
-    List<WorkerLocationDTO> selectWorkerLocationList(@Param("projectId") Long projectId,
-                                                     @Param("workerType")String workerType);
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/WorkSiteInfoMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/WorkSiteInfoMapper.java
deleted file mode 100644
index a4934d2..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/WorkSiteInfoMapper.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.casic.missiles.modular.system.mapper;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.modular.system.entity.WorkSiteInfo;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Param;
-
-/**
- * <p>
- * 作业现场表 Mapper 接口
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface WorkSiteInfoMapper extends BaseMapper<WorkSiteInfo> {
-
-    Page<WorkSiteInfo> selectListPage(Page<WorkSiteInfo> page,@Param("ew") QueryWrapper<WorkSiteInfo> ew);
-}

diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/AlarmController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/AlarmController.java
new file mode 100644
index 0000000..1795cf1
--- /dev/null
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/AlarmController.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.modular.system.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.stereotype.Controller;
+
+/**
+ * <p>
+ * 报警记录表 前端控制器
+ * </p>
+ *
+ * @author zyj
+ * @since 2023-05-25
+ */
+@Controller
+@RequestMapping("/system/alarm")
+public class AlarmController {
+
+}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusAlarmController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusAlarmController.java
deleted file mode 100644
index 1f82ebb..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusAlarmController.java
+++ /dev/null
@@ -1,102 +0,0 @@
-package com.casic.missiles.modular.system.controller;
-
-
-import cn.hutool.core.util.ObjectUtil;
-import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.core.base.controller.BaseController;
-import com.casic.missiles.core.page.PageFactory;
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.AlarmUpload;
-import com.casic.missiles.modular.system.dto.DeviceDetailDTO;
-import com.casic.missiles.modular.system.entity.BusAlarm;
-import com.casic.missiles.modular.system.service.IBusAlarmService;
-import io.swagger.annotations.*;
-import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.*;
-
-import org.springframework.stereotype.Controller;
-
-import static com.casic.missiles.model.response.ResponseData.DEFAULT_SUCCESS_MESSAGE;
-import static com.casic.missiles.modular.system.consts.AlarmConst.ALARM_STATUS_MANUAL_CANCEL;
-
-/**
- * <p>
- * 报警记录表 前端控制器
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@Api(tags = "报警管理接口")
-@Controller
-@RequestMapping("/alarm")
-@RequiredArgsConstructor
-public class BusAlarmController extends BaseController {
-
-    private final IBusAlarmService alarmService;
-
-    @ApiOperation("报警上报接口")
-    @PostMapping("/upload")
-    @ResponseBody
-    public Object upload(@RequestBody AlarmUpload alarmUpload){
-        alarmService.alarmUpload(alarmUpload);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("报警列表分页查询")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "workTitle", value = "作业名称",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "projectId", value = "作业ID",dataType = "Long", paramType = "query",example = "0"),
-            @ApiImplicitParam(name = "alarmStatus", value = "报警状态",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "projectState", value = "作业状态",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "alarmType", value = "报警类型",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "alarmStartTime", value = "报警开始时间",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "alarmEndTime", value = "报警结束时间",dataType = "String", paramType = "query")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = BusAlarm.class),
-    })
-    @GetMapping("/listPage")
-    @ResponseBody
-    public Object listPage(String workTitle,Long projectId,String alarmStatus,String projectState,String alarmType,String alarmStartTime,String alarmEndTime){
-        Page<BusAlarm> page = PageFactory.defaultPage();
-        QueryWrapper<BusAlarm> queryWrapper = new QueryWrapper<>();
-        if(StrUtil.isNotEmpty(workTitle)){
-            queryWrapper.like("p.WORK_TITLE",workTitle);
-        }
-        if(ObjectUtil.isNotEmpty(projectId)){
-            queryWrapper.eq("alarm.PROJECT_ID",projectId);
-        }
-        if(StrUtil.isNotEmpty(alarmStatus)){
-            queryWrapper.eq("alarm.ALARM_STATUS",alarmStatus);
-        }
-        if(StrUtil.isNotEmpty(projectState)){
-            queryWrapper.eq("p.PROJECT_STATE",projectState);
-        }
-        if(StrUtil.isNotEmpty(alarmType)){
-            queryWrapper.eq("alarm.ALARM_TYPE",alarmType);
-        }
-        if(StrUtil.isNotEmpty(alarmStartTime)){
-            queryWrapper.ge("alarm.ALARM_TIME",alarmStartTime);
-        }
-        if(StrUtil.isNotEmpty(alarmEndTime)){
-            queryWrapper.le("alarm.ALARM_TIME",alarmEndTime);
-        }
-        page = alarmService.listPage(page,queryWrapper);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-    @ApiOperation("消警")
-    @PostMapping("/cancel")
-    @ResponseBody
-    public Object cancel(@RequestParam("alarmId") Long alarmId){
-        UpdateWrapper<BusAlarm> updateWrapper = new UpdateWrapper<>();
-        updateWrapper.eq("ID",alarmId);
-        updateWrapper.set("ALARM_STATUS",ALARM_STATUS_MANUAL_CANCEL);
-        alarmService.update(updateWrapper);
-        return ResponseData.success();
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusEventController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusEventController.java
deleted file mode 100644
index dde5aad..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusEventController.java
+++ /dev/null
@@ -1,41 +0,0 @@
-package com.casic.missiles.modular.system.controller;
-
-
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.entity.BusEvent;
-import com.casic.missiles.modular.system.service.IBusEventService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.ResponseBody;
-
-/**
- * <p>
- * 事件表 前端控制器
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@Controller
-@RequestMapping("/event")
-@Api(tags = "事件上报")
-@RequiredArgsConstructor
-public class BusEventController {
-
-    private final IBusEventService eventService;
-
-    @ApiOperation("事件上报")
-    @PostMapping("add")
-    @ResponseBody
-    public Object add(@RequestBody BusEvent busEvent){
-        eventService.saveBusEvent(busEvent);
-        return ResponseData.success();
-    }
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
index 03abc5f..aa50d78 100644
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
@@ -1,121 +1,20 @@
 package com.casic.missiles.modular.system.controller;
 
 
-import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.core.base.controller.BaseController;
-import com.casic.missiles.core.page.PageFactory;
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.DeviceDetailDTO;
-import com.casic.missiles.modular.system.entity.Device;
-import com.casic.missiles.modular.system.service.IDeviceExtService;
-import com.casic.missiles.modular.system.service.IDeviceService;
-import io.swagger.annotations.*;
-import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.RequestMapping;
 
 import org.springframework.stereotype.Controller;
 
-import java.time.LocalDateTime;
-import java.util.Date;
-import java.util.List;
-
-import static com.casic.missiles.model.response.ResponseData.DEFAULT_SUCCESS_MESSAGE;
-
 /**
  * <p>
- *  前端控制器
+ * 设备记录表 前端控制器
  * </p>
  *
  * @author zyj
- * @since 2023-04-14
+ * @since 2023-05-25
  */
-@Api(tags = "设备管理接口")
-@RequiredArgsConstructor
 @Controller
-@RequestMapping("/device")
-public class DeviceController extends BaseController {
-    private final IDeviceService deviceService;
-    private final IDeviceExtService deviceExtService;
-
-    @ApiOperation("设备分页列表")
-    @ApiImplicitParams({
-        @ApiImplicitParam(name = "deviceType", value = "设备类型",dataType = "String", paramType = "query"),
-        @ApiImplicitParam(name = "deviceCode", value = "设备编号",dataType = "String", paramType = "query"),
-        @ApiImplicitParam(name = "status", value = "设备状态",dataType = "String", paramType = "query"),
-        @ApiImplicitParam(name = "projectId", value = "作业ID（如果传此参数，列表中返回该作业使用的设备）",dataType = "Long", paramType = "query", example = "0")
-    })
-    @ApiResponses({
-        @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = DeviceDetailDTO.class),
-    })
-    @GetMapping("listPage")
-    @ResponseBody
-    public Object listPage(String deviceType, String deviceCode, String status,Long projectId){
-        Page<DeviceDetailDTO> page = PageFactory.defaultPage();
-        QueryWrapper<DeviceDetailDTO> queryWrapper = new QueryWrapper<>();
-        if(StrUtil.isNotEmpty(deviceType)){
-            queryWrapper.eq("DEVICE_TYPE",deviceType);
-        }
-        if(StrUtil.isNotEmpty(deviceCode)){
-            queryWrapper.like("DEVICE_CODE",deviceCode);
-        }
-        page = deviceService.listPage(page,queryWrapper,status,projectId);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-    @ApiOperation("新增设备")
-    @PostMapping("add")
-    @ResponseBody
-    public Object add(@RequestBody DeviceDetailDTO deviceDetailDTO){
-        deviceService.saveDevice(deviceDetailDTO);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("编辑设备")
-    @PostMapping("update")
-    @ResponseBody
-    public Object update(@RequestBody DeviceDetailDTO deviceDetailDTO){
-        deviceService.updateDevice(deviceDetailDTO);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("删除设备")
-    @PostMapping("delete")
-    @ResponseBody
-    public Object delete(@ApiParam("设备id列表")@RequestBody List<Long> deviceIds){
-        deviceService.deleteDevices(deviceIds);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("设置甲烷阈值")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "gasIp", value = "安全树甲烷设备IP",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "gasPort", value = "安全树甲烷端口",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "threshold", value = "甲烷阈值",dataType = "String", paramType = "query")
-    })
-    @PostMapping("setThreshold")
-    @ResponseBody
-    public Object setThreshold(String gasIp,String gasPort,String threshold){
-        deviceExtService.setGasThreshold(gasIp, gasPort, threshold);
-        return ResponseData.success();
-    }
-
-
-    @ApiOperation("查询甲烷阈值")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "gasIp", value = "安全树甲烷设备IP",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "gasPort", value = "安全树甲烷端口",dataType = "String", paramType = "query")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = "{\"code\": 200,\"data\": \"100\",\"message\": \"请求成功\",\"success\": true}",response = String.class),
-    })
-    @GetMapping("getThreshold")
-    @ResponseBody
-    public Object getThreshold(String gasIp,String gasPort){
-        String data = deviceExtService.getGasThreshold(gasIp, gasPort);
-        return ResponseData.success(data);
-    }
-
+@RequestMapping("/system/device")
+public class DeviceController {
 
 }
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/OverviewController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/OverviewController.java
deleted file mode 100644
index 7570504..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/OverviewController.java
+++ /dev/null
@@ -1,70 +0,0 @@
-package com.casic.missiles.modular.system.controller;
-
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.AlarmTypeCountDTO;
-import com.casic.missiles.modular.system.dto.DeviceLocationDTO;
-import com.casic.missiles.modular.system.dto.WorkerLocationDTO;
-import com.casic.missiles.modular.system.service.IBusAlarmService;
-import com.casic.missiles.modular.system.service.IProjectDeviceService;
-import com.casic.missiles.modular.system.service.IProjectWorkerService;
-import io.swagger.annotations.*;
-import lombok.RequiredArgsConstructor;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.ResponseBody;
-
-import static com.casic.missiles.model.response.ResponseData.DEFAULT_SUCCESS_MESSAGE;
-import static com.casic.missiles.modular.system.consts.AlarmConst.ALARM_STATUS_ON;
-
-@Api(tags = "首页看板接口")
-@Controller
-@RequestMapping("overview")
-@RequiredArgsConstructor
-public class OverviewController {
-
-    private final IBusAlarmService alarmService;
-    private final IProjectDeviceService projectDeviceService;
-
-    private final IProjectWorkerService projectWorkerService;
-
-
-    @ApiOperation("报警统计接口")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "projectId", value = "作业ID",dataType = "Long", paramType = "query", example = "0")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = AlarmTypeCountDTO.class),
-    })
-    @GetMapping("/alarmCount")
-    @ResponseBody
-    public Object alarmCount(Long projectId){
-        return ResponseData.success(alarmService.alarmCount(projectId,ALARM_STATUS_ON));
-    }
-
-    @ApiOperation("设备列表接口")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "projectId", value = "作业ID",dataType = "Long", paramType = "query", example = "0")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = DeviceLocationDTO.class),
-    })
-    @GetMapping("/deviceList")
-    @ResponseBody
-    public Object deviceList(Long projectId){
-        return ResponseData.success(projectDeviceService.selectDeviceLocationList(projectId));
-    }
-
-    @ApiOperation("人员列表接口")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "projectId", value = "作业ID",dataType = "Long", paramType = "query", example = "0")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = WorkerLocationDTO.class),
-    })
-    @GetMapping("/workerList")
-    @ResponseBody
-    public Object workerList(Long projectId){
-        return ResponseData.success(projectWorkerService.selectWorkerLocationDTO(projectId));
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/WorkSiteInfoController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/WorkSiteInfoController.java
deleted file mode 100644
index af36d69..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/WorkSiteInfoController.java
+++ /dev/null
@@ -1,130 +0,0 @@
-package com.casic.missiles.modular.system.controller;
-
-
-import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.core.base.controller.BaseController;
-import com.casic.missiles.core.page.PageFactory;
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.WorkSiteDetailDTO;
-import com.casic.missiles.modular.system.entity.WorkSiteInfo;
-import com.casic.missiles.modular.system.service.IWorkSiteInfoService;
-import io.swagger.annotations.*;
-import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.*;
-
-import org.springframework.stereotype.Controller;
-
-import java.util.List;
-
-import static com.casic.missiles.model.response.ResponseData.DEFAULT_SUCCESS_MESSAGE;
-
-/**
- * <p>
- * 作业现场表 前端控制器
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@Controller
-@RequestMapping("/site")
-@Api(tags = "作业现场管理")
-@RequiredArgsConstructor
-public class WorkSiteInfoController extends BaseController {
-
-
-    private final IWorkSiteInfoService workSiteInfoService;
-
-    @ApiOperation("新增作业现场")
-    @PostMapping("add")
-    @ResponseBody
-    public Object addWorkSite(@RequestBody WorkSiteDetailDTO workSiteDetailDTO){
-        workSiteInfoService.addWorkSiteInfo(workSiteDetailDTO);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("编辑作业现场")
-    @PostMapping("update")
-    @ResponseBody
-    public Object updateWorkSite(@RequestBody WorkSiteDetailDTO workSiteDetailDTO){
-        workSiteInfoService.updateWorkSiteInfo(workSiteDetailDTO);
-        return ResponseData.success();
-    }
-
-
-    @ApiOperation("删除作业现场")
-    @PostMapping("delete")
-    @ResponseBody
-    public Object delete(@ApiParam("作业现场id列表")@RequestBody List<Long> projectIds){
-        workSiteInfoService.deleteProjects(projectIds);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("查询作业现场详情")
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = WorkSiteDetailDTO.class),
-    })
-    @GetMapping("detail")
-    @ResponseBody
-    public Object delete(@ApiParam(value = "作业现场id", example = "0")@RequestParam Long projectId){
-        WorkSiteDetailDTO detailDTO = workSiteInfoService.getWorkSiteDetail(projectId);
-        return ResponseData.success(detailDTO);
-    }
-
-    @ApiOperation("分页列表查询")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "workTitle",value = "作业名称", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "workRoad",value = "所属道路", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "workPersonName",value = "责任人姓名", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "startDate",value = "注册开始日期", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "endDate",value = "注册结束日期", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "projectState",value = "当前状态（字典值）", dataType = "String", paramType = "query")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = WorkSiteInfo.class),
-    })
-    @GetMapping("listPage")
-    @ResponseBody
-    public Object listPage(String workTitle,String workRoad,String workPersonName,String projectState,String startDate,String endDate){
-        Page<WorkSiteInfo> page = PageFactory.defaultPage();
-        QueryWrapper<WorkSiteInfo> queryWrapper = new QueryWrapper<>();
-        if(StrUtil.isNotEmpty(workTitle)){
-            queryWrapper.like("WORK_TITLE",workTitle);
-        }
-        if(StrUtil.isNotEmpty(workRoad)){
-            queryWrapper.like("WORK_ROAD",workRoad);
-        }
-        if(StrUtil.isNotEmpty(workPersonName)){
-            queryWrapper.like("WORKER_NAME",workPersonName);
-        }
-        if(StrUtil.isNotEmpty(projectState)){
-            queryWrapper.eq("PROJECT_STATE",projectState);
-        }
-        if(StrUtil.isNotEmpty(startDate)){
-            queryWrapper.ge("br_work_site_info.CREATE_TIME",startDate + " 00:00:00");
-        }
-        if(StrUtil.isNotEmpty(endDate)){
-            queryWrapper.le("br_work_site_info.CREATE_TIME",endDate + " 23:59:59");
-        }
-        page = workSiteInfoService.selectListPage(page,queryWrapper);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-    @ApiOperation("开始作业")
-    @PostMapping("start")
-    @ResponseBody
-    public Object start(@ApiParam(value = "作业现场id",example = "0")@RequestParam Long projectId){
-        workSiteInfoService.start(projectId);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("完成作业")
-    @PostMapping("finish")
-    @ResponseBody
-    public Object finish(@ApiParam(value = "作业现场id", example = "0")@RequestParam Long projectId){
-        workSiteInfoService.finish(projectId);
-        return ResponseData.success();
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/WorkerController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/WorkerController.java
deleted file mode 100644
index 796f94c..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/WorkerController.java
+++ /dev/null
@@ -1,136 +0,0 @@
-package com.casic.missiles.modular.system.controller;
-
-
-import cn.hutool.core.util.ObjectUtil;
-import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.core.base.controller.BaseController;
-import com.casic.missiles.core.page.PageFactory;
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.DeviceDetailDTO;
-import com.casic.missiles.modular.system.entity.Device;
-import com.casic.missiles.modular.system.entity.Worker;
-import com.casic.missiles.modular.system.service.IWorkerService;
-import io.swagger.annotations.*;
-import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.*;
-
-import org.springframework.stereotype.Controller;
-
-import java.util.Date;
-import java.util.List;
-
-import static com.casic.missiles.model.response.ResponseData.DEFAULT_SUCCESS_MESSAGE;
-
-/**
- * <p>
- *  前端控制器
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@Controller
-@RequestMapping("/worker")
-@RequiredArgsConstructor
-@Api(tags = "人员管理接口")
-public class WorkerController extends BaseController {
-
-    private final IWorkerService workerService;
-
-    @ApiOperation("分页列表查询")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "name",value = "姓名", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "deptId",value = "所属部门", dataType = "Long", paramType = "query", example = "0"),
-            @ApiImplicitParam(name = "status",value = "当前状态（字典值）", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "startDate",value = "注册开始日期", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "endDate",value = "注册结束日期", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "workerType",value = "人员类型（字典值）", dataType = "String", paramType = "query")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = Worker.class),
-    })
-    @GetMapping("listPage")
-    @ResponseBody
-    public Object listPage(String name,Long deptId, String status,String startDate,String endDate,String workerType){
-        Page<Worker> page = PageFactory.defaultPage();
-        QueryWrapper<Worker> queryWrapper = new QueryWrapper<>();
-        if(StrUtil.isNotEmpty(name)){
-            queryWrapper.like("WORKER_NAME",name);
-        }
-        if(ObjectUtil.isNotEmpty(deptId)){
-            queryWrapper.eq("DEPT_ID",deptId);
-        }
-        if(StrUtil.isNotEmpty(workerType)){
-            queryWrapper.eq("WORKER_TYPE",workerType);
-        }
-        if(StrUtil.isNotEmpty(startDate)){
-            queryWrapper.ge("CREATE_TIME",startDate + " 00:00:00");
-        }
-        if(StrUtil.isNotEmpty(endDate)){
-            queryWrapper.le("CREATE_TIME",endDate + " 23:59:59");
-        }
-        if(StrUtil.isNotEmpty(status)){
-            queryWrapper.eq("`STATUS`",status);
-        }
-        page = workerService.selectListPage(page,queryWrapper);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-    @ApiOperation("新增人员")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "worker", value = "人员信息", dataType = "Worker", paramType = "body", required = true),
-            @ApiImplicitParam(name = "projectId", value = "项目ID(入场申请需要)", dataType = "Long", paramType = "query", example = "0")
-    })
-    @PostMapping("add")
-    @ResponseBody
-    public Object add(@ApiParam("worker")@RequestBody Worker worker,
-                      @RequestParam(required = false) Long projectId){
-        workerService.addWorker(worker,projectId);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("编辑人员")
-    @PostMapping("update")
-    @ResponseBody
-    public Object update(@RequestBody Worker worker){
-        workerService.updateById(worker);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("删除人员")
-    @PostMapping("delete")
-    @ResponseBody
-    public Object delete(@ApiParam("人员id列表")@RequestBody List<Long> workIds){
-        workerService.removeByIds(workIds);
-        return ResponseData.success();
-    }
-
-
-    @ApiOperation(value = "获取人脸图片",notes = "返回人脸图片url")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "cameraIp",value = "摄像头IP", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "cameraPort",value = "摄像头端口号", dataType = "String", paramType = "query"),
-    })
-    @GetMapping("/face/register")
-    @ResponseBody
-    public Object faceRegister(String cameraIp,String cameraPort){
-        return ResponseData.success(workerService.faceRegister(cameraIp, cameraPort));
-    }
-
-
-    @ApiOperation(value = "查询临时入场人员列表")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "projectId", value = "项目ID",required = true,dataType = "Long", paramType = "query", example = "0")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = Worker.class),
-    })
-    @GetMapping("/projectTempWorker")
-    @ResponseBody
-    public Object projectTempWorker(Long projectId){
-        return ResponseData.success(workerService.projectTempWorker(projectId));
-    }
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/AlarmTypeCountDTO.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/AlarmTypeCountDTO.java
deleted file mode 100644
index 1a165a1..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/AlarmTypeCountDTO.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.casic.missiles.modular.system.dto;
-
-import io.swagger.annotations.ApiModel;
-import lombok.Data;
-
-@ApiModel(value = "AlarmTypeCountDTO",description = "报警类型统计（首页）")
-@Data
-public class AlarmTypeCountDTO {
-
-    private String alarmType;
-    private String alarmTypeName;
-    private Integer alarmCount;
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/AlarmUpload.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/AlarmUpload.java
deleted file mode 100644
index 73d7799..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/AlarmUpload.java
+++ /dev/null
@@ -1,46 +0,0 @@
-package com.casic.missiles.modular.system.dto;
-
-import cn.hutool.core.util.StrUtil;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-@ApiModel(value = "AlarmUpload",description = "报警上传")
-@Data
-public class AlarmUpload {
-
-    @ApiModelProperty(value = "摄像头ip")
-    private String cameraIp;
-
-    @ApiModelProperty(value = "摄像头端口")
-    private String cameraPort;
-    @ApiModelProperty(value = "安全树甲烷设备ip")
-    private String gasIp;
-    @ApiModelProperty(value = "安全树甲烷设备端口")
-    private String gasPort;
-    @ApiModelProperty(value = "报警值")
-    private String alarmValue;
-    @ApiModelProperty(value = "报警时间")
-    private String alarmTime;
-    @ApiModelProperty(value = "报警类型")
-    private String alarmType;
-    @ApiModelProperty(value = "报警图片")
-    private String alarmImage;
-    @ApiModelProperty(value = "报警内容")
-    private String alarmContent;
-
-    @Override
-    public String toString() {
-        return "AlarmUpload{" +
-                "cameraIp='" + cameraIp + '\'' +
-                ", cameraPort='" + cameraPort + '\'' +
-                ", gasIp='" + gasIp + '\'' +
-                ", gasPort='" + gasPort + '\'' +
-                ", alarmValue='" + alarmValue + '\'' +
-                ", alarmTime='" + alarmTime + '\'' +
-                ", alarmType='" + alarmType + '\'' +
-                ", alarmImage='" + (StrUtil.isNotEmpty(alarmImage) ? alarmImage.substring(0,50) : "null") + '\'' +
-                ", alarmContent='" + alarmContent + '\'' +
-                '}';
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/DeviceDetailDTO.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/DeviceDetailDTO.java
deleted file mode 100644
index ea518d9..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/DeviceDetailDTO.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package com.casic.missiles.modular.system.dto;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.casic.missiles.modular.system.entity.Device;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-@ApiModel("DeviceDetailDTO")
-@Data
-public class DeviceDetailDTO extends Device {
-
-    @ApiModelProperty(value = "摄像头编号")
-    private String cameraCode;
-
-    @ApiModelProperty(value = "摄像头IP")
-    private String cameraIp;
-
-    @ApiModelProperty(value = "摄像头端口")
-    private String cameraPort;
-
-    @ApiModelProperty(value = "激甲编号")
-    private String gasCode;
-
-    @ApiModelProperty(value = "激甲IP")
-    private String gasIp;
-
-    @ApiModelProperty(value = "激甲端口")
-    private String gasPort;
-
-    @ApiModelProperty(value = "智能帽衬编号")
-    private String hatLiningCode;
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/WorkSiteDetailDTO.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/WorkSiteDetailDTO.java
deleted file mode 100644
index 29378ff..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/WorkSiteDetailDTO.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package com.casic.missiles.modular.system.dto;
-
-import com.casic.missiles.modular.system.entity.ProjectDevice;
-import com.casic.missiles.modular.system.entity.ProjectWorker;
-import com.casic.missiles.modular.system.entity.WorkSiteInfo;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.util.List;
-
-@Data
-@ApiModel("WorkSiteDetailDTO")
-public class WorkSiteDetailDTO extends WorkSiteInfo {
-
-    @ApiModelProperty(value = "安全树列表",dataType = "ProjectDevice")
-    private List<ProjectDevice> deviceList;
-
-    @ApiModelProperty(value = "人员列表",dataType = "ProjectWorker")
-    private List<ProjectWorker> workerList;
-
-
-
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/WorkerLocationDTO.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/WorkerLocationDTO.java
deleted file mode 100644
index 6fd7b24..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/WorkerLocationDTO.java
+++ /dev/null
@@ -1,68 +0,0 @@
-package com.casic.missiles.modular.system.dto;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-@ApiModel(value = "WorkerLocationDTO",description = "人员位置列表（首页）")
-@Data
-public class WorkerLocationDTO {
-
-    @ApiModelProperty("人员ID")
-    private Long workerId;
-
-    @ApiModelProperty("人员姓名")
-    private String workerName;
-
-    @ApiModelProperty("安全帽编号")
-    private String hatCode;
-
-    @ApiModelProperty("安全帽ID")
-    private Long hatId;
-
-    @ApiModelProperty("背心编号")
-    private String vastCode;
-
-    @ApiModelProperty("手环编号")
-    private String braceletCode;
-
-    @ApiModelProperty("位置")
-    private String location;
-
-    @ApiModelProperty("时间")
-    private String time;
-
-    @ApiModelProperty("经度")
-    private String lng;
-
-    @ApiModelProperty("纬度")
-    private String lat;
-
-    @ApiModelProperty("心率")
-    private String heartRate;
-
-    @ApiModelProperty("血氧")
-    private String bloodOxygen;
-
-    @ApiModelProperty("一氧化碳")
-    private String co;
-
-    @ApiModelProperty("甲烷")
-    private String gas;
-
-    @ApiModelProperty("硫化氢")
-    private String h2s;
-
-    @ApiModelProperty("氧气")
-    private String o2;
-
-    @ApiModelProperty("信号")
-    private String signal;
-
-    @ApiModelProperty("电量")
-    private String cell;
-
-    @ApiModelProperty("是否报警")
-    private boolean alarmFlag;
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Alarm.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Alarm.java
new file mode 100644
index 0000000..4d2b7ef
--- /dev/null
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Alarm.java
@@ -0,0 +1,103 @@
+package com.casic.missiles.modular.system.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import java.util.Date;
+
+/**
+ * <p>
+ * 报警记录表
+ * </p>
+ *
+ * @author zyj
+ * @since 2023-05-25
+ */
+@Data
+@TableName("bus_alarm")
+public class Alarm implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    @TableId(value = "ID",type = IdType.ASSIGN_ID)
+    private Long id;
+
+    /**
+     * 设备ID
+     */
+    @TableField("DEVICE_ID")
+    private Long deviceId;
+
+    /**
+     * 报警类型
+     */
+    @TableField("ALARM_TYPE")
+    private String alarmType;
+
+    /**
+     * 报警时间
+     */
+    @TableField("ALARM_TIME")
+    private Date alarmTime;
+
+    /**
+     * 报警状态
+     */
+    @TableField("ALARM_STATUS")
+    private String alarmStatus;
+
+    /**
+     * 报警位置
+     */
+    @TableField("ALARM_LOCATION")
+    private String alarmLocation;
+
+    /**
+     * 报警图片
+     */
+    @TableField("ALARM_IMAGE")
+    private String alarmImage;
+
+    /**
+     * 视频通道号
+     */
+    @TableField("CHANNEL_NO")
+    private Integer channelNo;
+
+    /**
+     * 报警内容
+     */
+    @TableField("ALARM_CONTENT")
+    private String alarmContent;
+
+    /**
+     * 消警时间
+     */
+    @TableField("CANCEL_TIME")
+    private Date cancelTime;
+
+
+    @Override
+    public String toString() {
+        return "Alarm{" +
+            "id=" + id +
+            ", deviceId=" + deviceId +
+            ", alarmType=" + alarmType +
+            ", alarmTime=" + alarmTime +
+            ", alarmStatus=" + alarmStatus +
+            ", alarmLocation=" + alarmLocation +
+            ", alarmImage=" + alarmImage +
+            ", channelNo=" + channelNo +
+            ", alarmContent=" + alarmContent +
+            ", cancelTime=" + cancelTime +
+        "}";
+    }
+}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusAlarm.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusAlarm.java
deleted file mode 100644
index efb4a23..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusAlarm.java
+++ /dev/null
@@ -1,159 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.alibaba.fastjson.annotation.JSONField;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.time.LocalDateTime;
-import java.util.Date;
-
-/**
- * <p>
- * 报警记录表
- * </p>
- *
- * @author zyj
- * @since 2023-05-16
- */
-@Data
-@ApiModel("Alarm")
-@TableName("br_bus_alarm")
-public class BusAlarm implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 项目ID
-     */
-    @ApiModelProperty(value = "项目ID")
-    @TableField("PROJECT_ID")
-    private Long projectId;
-
-    /**
-     * 设备ID
-     */
-    @ApiModelProperty(value = "设备ID")
-    @TableField("DEVICE_ID")
-    private Long deviceId;
-
-    /**
-     * 报警类型
-     */
-    @ApiModelProperty(value = "报警类型")
-    @TableField("ALARM_TYPE")
-    private String alarmType;
-
-    /**
-     * 报警状态
-     */
-    @ApiModelProperty(value = "报警状态")
-    @TableField("ALARM_STATUS")
-    private String alarmStatus;
-
-    /**
-     * 报警值
-     */
-    @ApiModelProperty(value = "报警值")
-    @TableField("ALARM_VALUE")
-    private String alarmValue;
-
-    /**
-     * 报警图片
-     */
-    @ApiModelProperty(value = "报警图片")
-    @TableField("ALARM_IMAGE")
-    private String alarmImage;
-
-    /**
-     * 报警内容
-     */
-    @ApiModelProperty(value = "报警内容")
-    @TableField("ALARM_CONTENT")
-    private String alarmContent;
-
-    /**
-     * 报警时间
-     */
-    @ApiModelProperty(value = "报警时间")
-    @TableField("ALARM_TIME")
-    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
-    private Date alarmTime;
-
-    /**
-     * 消警时间
-     */
-    @ApiModelProperty(value = "消警时间")
-    @TableField("CANCEL_TIME")
-    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
-    private Date cancelTime;
-
-    /**
-     * 报警位置经度
-     */
-    @ApiModelProperty(value = "报警位置经度")
-    @TableField("ALARM_LNG")
-    private String alarmLng;
-
-    /**
-     * 报警位置纬度
-     */
-    @ApiModelProperty(value = "报警位置纬度")
-    @TableField("ALARM_LAT")
-    private String alarmLat;
-
-    @ApiModelProperty("报警类型名称")
-    @TableField(exist = false)
-    private String alarmStatusName;
-    @ApiModelProperty("报警类型名称")
-    @TableField(exist = false)
-    private String alarmTypeName;
-    @ApiModelProperty("作业名称")
-    @TableField(exist = false)
-    private String workTitle;
-    @ApiModelProperty("所属道路")
-    @TableField(exist = false)
-    private String workRoad;
-    @ApiModelProperty("作业状态")
-    @TableField(exist = false)
-    private String projectState;
-    @ApiModelProperty("作业状态名称")
-    @TableField(exist = false)
-    private String projectStateName;
-    @ApiModelProperty("负责人姓名")
-    @TableField(exist = false)
-    private String workPersonName;
-    @ApiModelProperty("负责人联系方式")
-    @TableField(exist = false)
-    private String workPersonPhoneNumber;
-
-
-    @Override
-    public String toString() {
-        return "BusAlarm{" +
-                "id=" + id +
-                ", projectId=" + projectId +
-                ", deviceId=" + deviceId +
-                ", alarmType=" + alarmType +
-                ", alarmValue=" + alarmValue +
-                ", alarmStatus=" + alarmStatus +
-                ", alarmImage=" + alarmImage +
-                ", alarmContent=" + alarmContent +
-                ", alarmTime=" + alarmTime +
-                ", cancelTime=" + cancelTime +
-                ", alarmLng=" + alarmLng +
-                ", alarmLat=" + alarmLat +
-                "}";
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusEvent.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusEvent.java
deleted file mode 100644
index a0b7543..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusEvent.java
+++ /dev/null
@@ -1,100 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.time.LocalDateTime;
-import java.util.Date;
-import java.util.List;
-
-/**
- * <p>
- * 事件表
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@TableName("br_bus_event")
-@Data
-@ApiModel("BusEvent")
-public class BusEvent implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @ApiModelProperty("事件ID")
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 事件标题
-     */
-    @ApiModelProperty("事件名称")
-    @TableField("EVENT_TITLE")
-    private String eventTitle;
-
-    /**
-     * 上报人员
-     */
-    @ApiModelProperty("上报人员")
-    @TableField("UPLOAD_NAME")
-    private String uploadName;
-
-    /**
-     * 联系方式
-     */
-    @ApiModelProperty("联系方式")
-    @TableField("PHONE_NUMBER")
-    private String phoneNumber;
-
-    /**
-     * 事件描述
-     */
-    @ApiModelProperty("事件描述")
-    @TableField("EVENT_DESCRIPTION")
-    private String eventDescription;
-
-    @ApiModelProperty("经度")
-    @TableField("LNG")
-    private String lng;
-
-    @ApiModelProperty("纬度")
-    @TableField("LAT")
-    private String lat;
-
-    /**
-     * 事件上传时间
-     */
-    @ApiModelProperty("事件上传时间")
-    @TableField("CREATE_TIME")
-    private Date createTime;
-
-    @ApiModelProperty("事件照片")
-    @TableField(exist = false)
-    private List<BusEventImage> imageList;
-
-
-
-    @Override
-    public String toString() {
-        return "BusEvent{" +
-            "id=" + id +
-            ", eventTitle=" + eventTitle +
-            ", uploadName=" + uploadName +
-            ", phoneNumber=" + phoneNumber +
-            ", eventDescription=" + eventDescription +
-            ", lng=" + lng +
-            ", lat=" + lat +
-            ", createTime=" + createTime +
-        "}";
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusEventImage.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusEventImage.java
deleted file mode 100644
index 1e75245..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusEventImage.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-
-/**
- * <p>
- * 事件图片表
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@TableName("br_bus_event_image")
-@Data
-@ApiModel("BusEventImage")
-public class BusEventImage implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 事件ID
-     */
-    @TableField("EVENT_ID")
-    private Long eventId;
-
-    /**
-     * 报警图片
-     */
-    @TableField("IMAGE")
-    @ApiModelProperty("图片url")
-    private String image;
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Device.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Device.java
index df89c70..ea7db5f 100644
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Device.java
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Device.java
@@ -1,30 +1,23 @@
 package com.casic.missiles.modular.system.entity;
 
-import com.alibaba.fastjson.annotation.JSONField;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.casic.missiles.core.base.json.DateDeserializer;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
-import java.util.Date;
 
 /**
  * <p>
- * 
+ * 设备记录表
  * </p>
  *
  * @author zyj
- * @since 2023-04-14
+ * @since 2023-05-25
  */
-@ApiModel("Device")
-@TableName("br_device")
 @Data
+@TableName("bus_device")
 public class Device implements Serializable {
 
     private static final long serialVersionUID = 1L;
@@ -32,82 +25,86 @@
     /**
      * 主键
      */
-    @ApiModelProperty(value = "设备ID")
     @TableId(value = "ID",type = IdType.ASSIGN_ID)
     private Long id;
 
     /**
-     * 设备编号
+     * 设备名称
      */
-    @ApiModelProperty(value = "设备编号")
-    @TableField("DEVICE_CODE")
-    private String deviceCode;
+    @TableField("DEVICE_NAME")
+    private String deviceName;
 
     /**
-     * 设备类型
+     * IP
      */
-    @ApiModelProperty(value = "设备类型")
-    @TableField("DEVICE_TYPE")
-    private String deviceType;
+    @TableField("IP")
+    private String ip;
 
     /**
-     * 设备批次
+     * 端口
      */
-    @ApiModelProperty(value = "设备批次")
-    @TableField("DEVICE_BATCH")
-    private String deviceBatch;
+    @TableField("PORT")
+    private String port;
 
     /**
-     * 厂家
+     * 用户名
      */
-    @ApiModelProperty(value = "厂家")
-    @TableField("MANUFACTURER")
-    private String manufacturer;
+    @TableField("USER_NAME")
+    private String userName;
 
     /**
-     * 是否供电
+     * 密码
      */
-    @ApiModelProperty(value = "是否供电")
-    @TableField("IS_POWER_SUPPLY")
-    private String isPowerSupply;
+    @TableField("PASSWORD")
+    private String password;
 
     /**
-     * 创建时间
+     * 连接类型
      */
-    @ApiModelProperty(value = "创建时间",dataType = "Date")
-    @TableField("CREATE_TIME")
-    private Date createTime;
+    @TableField("CONNECT_TYPE")
+    private String connectType;
 
-    @ApiModelProperty(value = "设备类型名称")
-    @TableField(exist = false)
-    private String deviceTypeName;
+    /**
+     * 位置
+     */
+    @TableField("LOCATION")
 
-    @ApiModelProperty(value = "是否供电名称")
-    @TableField(exist = false)
-    private String isPowerSupplyName;
+    private String location;
 
-    @ApiModelProperty(value = "注册时间",dataType = "String")
-    @TableField(exist = false)
-    private String registerTime;
+    /**
+     * 设备状态
+     */
+    @TableField("STATUS")
 
-    @ApiModelProperty(value = "当前状态")
-    @TableField(exist = false)
     private String status;
 
-    @ApiModelProperty(value = "当前状态名称")
-    @TableField(exist = false)
-    private String statusName;
+    /**
+     * 报警分组
+     */
+    @TableField("ALARM_GROUP")
+
+    private Long alarmGroup;
+
+    /**
+     * 视频通道数(预留)
+     */
+    @TableField("CHANNEL_NUM")
+    private Integer channelNum;
 
     @Override
     public String toString() {
         return "Device{" +
             "id=" + id +
-            ", deviceCode=" + deviceCode +
-            ", deviceType=" + deviceType +
-            ", deviceBatch=" + deviceBatch +
-            ", manufacturer=" + manufacturer +
-            ", isPowerSupply=" + isPowerSupply +
-            ", createTime=" + createTime +
+            ", deviceName=" + deviceName +
+            ", ip=" + ip +
+            ", port=" + port +
+            ", userName=" + userName +
+            ", password=" + password +
+            ", connectType=" + connectType +
+            ", location=" + location +
+            ", status=" + status +
+            ", alarmGroup=" + alarmGroup +
+            ", channelNum=" + channelNum +
         "}";
     }
 }
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/DeviceExt.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/DeviceExt.java
deleted file mode 100644
index 5ee7015..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/DeviceExt.java
+++ /dev/null
@@ -1,99 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-
-/**
- * <p>
- * 设备扩展信息表（安全树）
- * </p>
- *
- * @author zyj
- * @since 2023-04-27
- */
-@Data
-@TableName("br_device_ext")
-public class DeviceExt implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 设备ID
-     */
-    @TableField("DEVICE_ID")
-    private Long deviceId;
-
-    /**
-     * 摄像头编号
-     */
-    @TableField("CAMERA_CODE")
-    private String cameraCode;
-
-    /**
-     * 摄像头IP
-     */
-    @TableField("CAMERA_IP")
-    private String cameraIp;
-
-    /**
-     * 摄像头端口
-     */
-    @TableField("CAMERA_PORT")
-    private String cameraPort;
-
-    /**
-     * 激甲编号
-     */
-    @TableField("GAS_CODE")
-    private String gasCode;
-
-    /**
-     * 激甲IP
-     */
-    @TableField("GAS_IP")
-    private String gasIp;
-
-    /**
-     * 激甲端口
-     */
-    @TableField("GAS_PORT")
-    private String gasPort;
-
-    /**
-     * 甲烷报警阈值
-     */
-    @TableField("GAS_THRESHOLD")
-    private String gasThreshold;
-
-    @TableField(value = "HAT_LINING_CODE")
-    private String hatLiningCode;
-
-
-    @Override
-    public String toString() {
-        return "DeviceExt{" +
-            "id=" + id +
-            ", deviceId=" + deviceId +
-            ", cameraCode=" + cameraCode +
-            ", cameraIp=" + cameraIp +
-            ", cameraPort=" + cameraPort +
-            ", gasCode=" + gasCode +
-            ", gasIp=" + gasIp +
-            ", gasPort=" + gasPort +
-            ", gasThreshold=" + gasThreshold +
-            ", hatLiningCode=" + hatLiningCode +
-        "}";
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/ProjectDevice.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/ProjectDevice.java
deleted file mode 100644
index c4f3472..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/ProjectDevice.java
+++ /dev/null
@@ -1,62 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-
-/**
- * <p>
- * 
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@Data
-@ApiModel("ProjectDevice")
-@TableName("br_project_device")
-public class ProjectDevice implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 作业现场ID
-     */
-    @TableField("PROJECT_ID")
-    private Long projectId;
-
-    /**
-     * 设备ID
-     */
-    @TableField("DEVICE_ID")
-    @ApiModelProperty("设备ID（新增编辑时传）")
-    private Long deviceId;
-
-    /**
-     * 设备编号
-     */
-    @TableField(exist = false)
-    @ApiModelProperty("设备编号（详情中展示，新增编辑不用传）")
-    private String deviceCode;
-
-    @Override
-    public String toString() {
-        return "ProjectDevice{" +
-            "id=" + id +
-            ", projectId=" + projectId +
-            ", deviceId=" + deviceId +
-        "}";
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/ProjectWorker.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/ProjectWorker.java
deleted file mode 100644
index 10b23c4..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/ProjectWorker.java
+++ /dev/null
@@ -1,104 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import java.io.Serializable;
-
-/**
- * <p>
- * 
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@ApiModel("ProjectWorker")
-@TableName("br_project_worker")
-@Data
-@NoArgsConstructor
-@AllArgsConstructor
-public class ProjectWorker implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 作业现场ID
-     */
-    @TableField("PROJECT_ID")
-    private Long projectId;
-
-    /**
-     * 人员ID
-     */
-    @ApiModelProperty("人员ID")
-    @TableField("WORKER_ID")
-    private Long workerId;
-
-    /**
-     * 安全帽编号
-     */
-    @ApiModelProperty("安全帽编号")
-    @TableField("HAT_CODE")
-    private String hatCode;
-
-    /**
-     * 背心编号
-     */
-    @ApiModelProperty("背心编号")
-    @TableField("VAST_CODE")
-    private String vastCode;
-
-    /**
-     * 手环编号
-     */
-    @ApiModelProperty("手环编号")
-    @TableField("BRACELET_CODE")
-    private String braceletCode;
-
-    @ApiModelProperty("人员姓名（详情中展示，新增编辑不用传）")
-    @TableField(exist = false)
-    private String workerName;
-
-    @ApiModelProperty("人员部门ID（详情中展示，新增编辑不用传）")
-    @TableField(exist = false)
-    private String workerDeptId;
-
-    @ApiModelProperty("人员部门名称（详情中展示，新增编辑不用传）")
-    @TableField(exist = false)
-    private String workerDeptName;
-
-    @ApiModelProperty("人员联系方式（详情中展示，新增编辑不用传）")
-    @TableField(exist = false)
-    private String workerPhoneNumber;
-
-    public ProjectWorker(Long projectId, Long workerId) {
-        this.projectId = projectId;
-        this.workerId = workerId;
-    }
-
-    @Override
-    public String toString() {
-        return "ProjectWorker{" +
-            "id=" + id +
-            ", projectId=" + projectId +
-            ", workerId=" + workerId +
-            ", hatCode=" + hatCode +
-            ", vastCode=" + vastCode +
-            ", braceletCode=" + braceletCode +
-        "}";
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/WorkSiteInfo.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/WorkSiteInfo.java
deleted file mode 100644
index fa6f41d..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/WorkSiteInfo.java
+++ /dev/null
@@ -1,130 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.alibaba.fastjson.annotation.JSONField;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.time.LocalDateTime;
-import java.util.Date;
-
-/**
- * <p>
- * 作业现场表
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@ApiModel("WorkSiteInfo")
-@TableName("br_work_site_info")
-@Data
-public class WorkSiteInfo implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @ApiModelProperty("作业现场ID")
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 作业名称
-     */
-    @ApiModelProperty("作业名称")
-    @TableField("WORK_TITLE")
-    private String workTitle;
-
-    /**
-     * 责任人
-     */
-    @ApiModelProperty("责任人（人员ID）")
-    @TableField("WORK_PERSON")
-    private Long workPerson;
-
-    /**
-     * 作业描述
-     */
-    @ApiModelProperty("作业描述")
-    @TableField("WORK_SITE_DESC")
-    private String workSiteDesc;
-
-    /**
-     * 作业状态
-     */
-    @ApiModelProperty("作业状态")
-    @TableField("PROJECT_STATE")
-    private String projectState;
-
-    /**
-     * 所属道路
-     */
-    @ApiModelProperty("所属道路")
-    @TableField("WORK_ROAD")
-    private String workRoad;
-
-    @TableField("IMAGE_URL")
-    private String imageUrl;
-
-    @TableField("CREATE_TIME")
-    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
-    private Date createTime;
-    @TableField("UPDATE_TIME")
-    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
-    private Date updateTime;
-
-    @ApiModelProperty("开始时间")
-    @TableField("START_TIME")
-    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
-    private Date startTime;
-
-    @ApiModelProperty("结束时间")
-    @TableField("FINISH_TIME")
-    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
-    private Date finishTime;
-
-    @ApiModelProperty("负责人姓名（详情中使用，新增编辑不用传）")
-    @TableField(exist = false)
-    private String workPersonName;
-
-    @ApiModelProperty("负责人联系方式（详情中使用，新增编辑不用传）")
-    @TableField(exist = false)
-    private String workPersonPhoneNumber;
-
-    @ApiModelProperty("负责人所属部门ID（详情中使用，新增编辑不用传）")
-    @TableField(exist = false)
-    private Long workPersonDeptId;
-
-    @ApiModelProperty("负责人所属部门名称（详情中使用，新增编辑不用传）")
-    @TableField(exist = false)
-    private String workPersonDeptName;
-
-    @ApiModelProperty(value = "注册时间",dataType = "String")
-    @TableField(exist = false)
-    private String registerTime;
-
-    @ApiModelProperty("作业状态名称")
-    @TableField(exist = false)
-    private String projectStateName;
-
-    @Override
-    public String toString() {
-        return "WorkSiteInfo{" +
-            "id=" + id +
-            ", workTitle=" + workTitle +
-            ", workPerson=" + workPerson +
-            ", workSiteDesc=" + workSiteDesc +
-            ", projectState=" + projectState +
-            ", imageUrl=" + imageUrl +
-            ", updateTime=" + updateTime +
-            ", workRoad=" + workRoad +
-        "}";
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Worker.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Worker.java
deleted file mode 100644
index 28a4daa..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Worker.java
+++ /dev/null
@@ -1,147 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.time.LocalDateTime;
-import java.util.Date;
-
-/**
- * <p>
- * 
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@ApiModel("Worker")
-@TableName("br_worker")
-@Data
-public class Worker implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @ApiModelProperty(value = "人员ID")
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 姓名
-     */
-    @ApiModelProperty(value = "姓名")
-    @TableField("WORKER_NAME")
-    private String workerName;
-
-    /**
-     * 性别
-     */
-    @ApiModelProperty(value = "性别")
-    @TableField("GENDER")
-    private String gender;
-
-    /**
-     * 所属部门
-     */
-    @ApiModelProperty(value = "所属部门(人员管理)")
-    @TableField("DEPT_ID")
-    private Long deptId;
-
-    /**
-     * 所属单位
-     */
-    @ApiModelProperty(value = "所属单位(入场申请中使用)")
-    @TableField("OWNER_SHIP")
-    private String ownerShip;
-
-    /**
-     * 联系方式
-     */
-    @ApiModelProperty(value = "联系方式")
-    @TableField("PHONE_NUMBER")
-    private String phoneNumber;
-
-    /**
-     * 证件号
-     */
-    @ApiModelProperty(value = "证件号")
-    @TableField("ID_CARD_NUMBER")
-    private String idCardNumber;
-
-    /**
-     * 入场原因
-     */
-    @ApiModelProperty(value = "入场原因（入场申请中使用）")
-    @TableField("ENTER_REASON")
-    private String enterReason;
-
-    /**
-     * 入场人脸照片
-     */
-    @ApiModelProperty(value = "人脸照片（照片路径）")
-    @TableField("WORKER_AVATAR")
-    private String workerAvatar;
-
-    /**
-     * 申请入场时间
-     */
-    @ApiModelProperty(value = "注册时间/申请入场时间")
-    @TableField("CREATE_TIME")
-    private Date createTime;
-
-    /**
-     * 人员类型
-     */
-    @ApiModelProperty(value = "人员类型（区分人员管理和入场申请）")
-    @TableField("WORKER_TYPE")
-    private String workerType;
-
-    @ApiModelProperty(value = "性别名称")
-    @TableField(exist = false)
-    private String genderName;
-
-    @ApiModelProperty(value = "部门名称")
-    @TableField(exist = false)
-    private String deptName;
-
-    @ApiModelProperty(value = "注册时间",dataType = "String")
-    @TableField(exist = false)
-    private String registerTime;
-
-    @ApiModelProperty(value = "当前状态")
-    @TableField(exist = false)
-    private String status;
-
-    @ApiModelProperty(value = "当前状态名称")
-    @TableField(exist = false)
-    private String statusName;
-
-    @ApiModelProperty(value = "是否注册(0未注册；1已注册)",allowableValues = "0,1")
-    @TableField(exist = false)
-    private String isRegister;
-
-    @Override
-    public String toString() {
-        return "Worker{" +
-            "id=" + id +
-            ", workerName=" + workerName +
-            ", gender=" + gender +
-            ", deptId=" + deptId +
-            ", ownerShip=" + ownerShip +
-            ", phoneNumber=" + phoneNumber +
-            ", idCardNumber=" + idCardNumber +
-            ", enterReason=" + enterReason +
-            ", workerAvatar=" + workerAvatar +
-            ", createTime=" + createTime +
-            ", workerType=" + workerType +
-        "}";
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/AlarmMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/AlarmMapper.java
new file mode 100644
index 0000000..ea4c8be
--- /dev/null
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/AlarmMapper.java
@@ -0,0 +1,16 @@
+package com.casic.missiles.modular.system.mapper;
+
+import com.casic.missiles.modular.system.entity.Alarm;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 报警记录表 Mapper 接口
+ * </p>
+ *
+ * @author zyj
+ * @since 2023-05-25
+ */
+public interface AlarmMapper extends BaseMapper<Alarm> {
+
+}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/BusAlarmMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/BusAlarmMapper.java
deleted file mode 100644
index 9801742..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/BusAlarmMapper.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package com.casic.missiles.modular.system.mapper;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.modular.system.dto.AlarmTypeCountDTO;
-import com.casic.missiles.modular.system.entity.BusAlarm;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * <p>
- * 报警记录表 Mapper 接口
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface BusAlarmMapper extends BaseMapper<BusAlarm> {
-
-    Page<BusAlarm> listPage(Page<BusAlarm> page,@Param("ew")  QueryWrapper<BusAlarm> queryWrapper);
-
-    void cancelAlarm(@Param("deviceId")Long deviceId,@Param("alarmType") String alarmType);
-
-    List<AlarmTypeCountDTO> alarmCount(@Param("projectId")Long projectId, @Param("alarmStatus")String alarmStatus);
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/BusEventImageMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/BusEventImageMapper.java
deleted file mode 100644
index 9590b7d..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/BusEventImageMapper.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.casic.missiles.modular.system.mapper;
-
-import com.casic.missiles.modular.system.entity.BusEventImage;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * <p>
- * 事件图片表 Mapper 接口
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface BusEventImageMapper extends BaseMapper<BusEventImage> {
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/BusEventMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/BusEventMapper.java
deleted file mode 100644
index 3c85edf..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/BusEventMapper.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.casic.missiles.modular.system.mapper;
-
-import com.casic.missiles.modular.system.entity.BusEvent;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * <p>
- * 事件表 Mapper 接口
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface BusEventMapper extends BaseMapper<BusEvent> {
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/DeviceExtMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/DeviceExtMapper.java
deleted file mode 100644
index 4ca9212..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/DeviceExtMapper.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.casic.missiles.modular.system.mapper;
-
-import com.casic.missiles.modular.system.entity.DeviceExt;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * <p>
- * 设备扩展信息表（安全树） Mapper 接口
- * </p>
- *
- * @author zyj
- * @since 2023-04-27
- */
-public interface DeviceExtMapper extends BaseMapper<DeviceExt> {
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/DeviceMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/DeviceMapper.java
index 444c0c5..3d0bb02 100644
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/DeviceMapper.java
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/DeviceMapper.java
@@ -1,30 +1,16 @@
 package com.casic.missiles.modular.system.mapper;
 
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.modular.system.dto.DeviceDetailDTO;
-import com.casic.missiles.modular.system.dto.HelmetInfoDTO;
 import com.casic.missiles.modular.system.entity.Device;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
 
 /**
  * <p>
- *  Mapper 接口
+ * 设备记录表 Mapper 接口
  * </p>
  *
  * @author zyj
- * @since 2023-04-14
+ * @since 2023-05-25
  */
-@Mapper
 public interface DeviceMapper extends BaseMapper<Device> {
 
-    Page<DeviceDetailDTO> listDetailPage(Page<DeviceDetailDTO> page,@Param("ew") QueryWrapper<DeviceDetailDTO> ew);
-
-     List<Long> selectProjectDevice(@Param("projectId") Long projectId);
-
-    List<HelmetInfoDTO> selectHelmetList(@Param("deviceType")String deviceType);
 }
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/ProjectDeviceMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/ProjectDeviceMapper.java
deleted file mode 100644
index 1d0c14e..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/ProjectDeviceMapper.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package com.casic.missiles.modular.system.mapper;
-
-import com.casic.missiles.modular.system.dto.DeviceLocationDTO;
-import com.casic.missiles.modular.system.entity.ProjectDevice;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * <p>
- *  Mapper 接口
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface ProjectDeviceMapper extends BaseMapper<ProjectDevice> {
-     List<ProjectDevice> selectDetailByProjectId(@Param("projectId") Long projectId);
-
-     List<DeviceLocationDTO> selectDeviceLocationList(@Param("projectId") Long projectId);
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/ProjectWorkerMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/ProjectWorkerMapper.java
deleted file mode 100644
index 58583d1..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/ProjectWorkerMapper.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package com.casic.missiles.modular.system.mapper;
-
-import com.casic.missiles.modular.system.dto.WorkerLocationDTO;
-import com.casic.missiles.modular.system.entity.ProjectWorker;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * <p>
- *  Mapper 接口
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface ProjectWorkerMapper extends BaseMapper<ProjectWorker> {
-
-    List<ProjectWorker> selectDetailByProjectId(@Param("projectId") Long projectId,
-                                                @Param("workerType")String workerType);
-
-    List<WorkerLocationDTO> selectWorkerLocationList(@Param("projectId") Long projectId,
-                                                     @Param("workerType")String workerType);
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/WorkSiteInfoMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/WorkSiteInfoMapper.java
deleted file mode 100644
index a4934d2..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/WorkSiteInfoMapper.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.casic.missiles.modular.system.mapper;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.modular.system.entity.WorkSiteInfo;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Param;
-
-/**
- * <p>
- * 作业现场表 Mapper 接口
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface WorkSiteInfoMapper extends BaseMapper<WorkSiteInfo> {
-
-    Page<WorkSiteInfo> selectListPage(Page<WorkSiteInfo> page,@Param("ew") QueryWrapper<WorkSiteInfo> ew);
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/WorkerMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/WorkerMapper.java
deleted file mode 100644
index 258fb12..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/WorkerMapper.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package com.casic.missiles.modular.system.mapper;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.modular.system.dto.DeviceDetailDTO;
-import com.casic.missiles.modular.system.entity.Worker;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * <p>
- *  Mapper 接口
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface WorkerMapper extends BaseMapper<Worker> {
-
-
-    Page<Worker> selectListPage(Page<Worker> page, @Param("ew") QueryWrapper<Worker> ew);
-
-    List<String> selectWorkerAvatars(@Param("projectId")Long projectId);
-
-
-}

diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/AlarmController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/AlarmController.java
new file mode 100644
index 0000000..1795cf1
--- /dev/null
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/AlarmController.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.modular.system.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.stereotype.Controller;
+
+/**
+ * <p>
+ * 报警记录表 前端控制器
+ * </p>
+ *
+ * @author zyj
+ * @since 2023-05-25
+ */
+@Controller
+@RequestMapping("/system/alarm")
+public class AlarmController {
+
+}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusAlarmController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusAlarmController.java
deleted file mode 100644
index 1f82ebb..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusAlarmController.java
+++ /dev/null
@@ -1,102 +0,0 @@
-package com.casic.missiles.modular.system.controller;
-
-
-import cn.hutool.core.util.ObjectUtil;
-import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.core.base.controller.BaseController;
-import com.casic.missiles.core.page.PageFactory;
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.AlarmUpload;
-import com.casic.missiles.modular.system.dto.DeviceDetailDTO;
-import com.casic.missiles.modular.system.entity.BusAlarm;
-import com.casic.missiles.modular.system.service.IBusAlarmService;
-import io.swagger.annotations.*;
-import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.*;
-
-import org.springframework.stereotype.Controller;
-
-import static com.casic.missiles.model.response.ResponseData.DEFAULT_SUCCESS_MESSAGE;
-import static com.casic.missiles.modular.system.consts.AlarmConst.ALARM_STATUS_MANUAL_CANCEL;
-
-/**
- * <p>
- * 报警记录表 前端控制器
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@Api(tags = "报警管理接口")
-@Controller
-@RequestMapping("/alarm")
-@RequiredArgsConstructor
-public class BusAlarmController extends BaseController {
-
-    private final IBusAlarmService alarmService;
-
-    @ApiOperation("报警上报接口")
-    @PostMapping("/upload")
-    @ResponseBody
-    public Object upload(@RequestBody AlarmUpload alarmUpload){
-        alarmService.alarmUpload(alarmUpload);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("报警列表分页查询")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "workTitle", value = "作业名称",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "projectId", value = "作业ID",dataType = "Long", paramType = "query",example = "0"),
-            @ApiImplicitParam(name = "alarmStatus", value = "报警状态",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "projectState", value = "作业状态",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "alarmType", value = "报警类型",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "alarmStartTime", value = "报警开始时间",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "alarmEndTime", value = "报警结束时间",dataType = "String", paramType = "query")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = BusAlarm.class),
-    })
-    @GetMapping("/listPage")
-    @ResponseBody
-    public Object listPage(String workTitle,Long projectId,String alarmStatus,String projectState,String alarmType,String alarmStartTime,String alarmEndTime){
-        Page<BusAlarm> page = PageFactory.defaultPage();
-        QueryWrapper<BusAlarm> queryWrapper = new QueryWrapper<>();
-        if(StrUtil.isNotEmpty(workTitle)){
-            queryWrapper.like("p.WORK_TITLE",workTitle);
-        }
-        if(ObjectUtil.isNotEmpty(projectId)){
-            queryWrapper.eq("alarm.PROJECT_ID",projectId);
-        }
-        if(StrUtil.isNotEmpty(alarmStatus)){
-            queryWrapper.eq("alarm.ALARM_STATUS",alarmStatus);
-        }
-        if(StrUtil.isNotEmpty(projectState)){
-            queryWrapper.eq("p.PROJECT_STATE",projectState);
-        }
-        if(StrUtil.isNotEmpty(alarmType)){
-            queryWrapper.eq("alarm.ALARM_TYPE",alarmType);
-        }
-        if(StrUtil.isNotEmpty(alarmStartTime)){
-            queryWrapper.ge("alarm.ALARM_TIME",alarmStartTime);
-        }
-        if(StrUtil.isNotEmpty(alarmEndTime)){
-            queryWrapper.le("alarm.ALARM_TIME",alarmEndTime);
-        }
-        page = alarmService.listPage(page,queryWrapper);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-    @ApiOperation("消警")
-    @PostMapping("/cancel")
-    @ResponseBody
-    public Object cancel(@RequestParam("alarmId") Long alarmId){
-        UpdateWrapper<BusAlarm> updateWrapper = new UpdateWrapper<>();
-        updateWrapper.eq("ID",alarmId);
-        updateWrapper.set("ALARM_STATUS",ALARM_STATUS_MANUAL_CANCEL);
-        alarmService.update(updateWrapper);
-        return ResponseData.success();
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusEventController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusEventController.java
deleted file mode 100644
index dde5aad..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusEventController.java
+++ /dev/null
@@ -1,41 +0,0 @@
-package com.casic.missiles.modular.system.controller;
-
-
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.entity.BusEvent;
-import com.casic.missiles.modular.system.service.IBusEventService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.ResponseBody;
-
-/**
- * <p>
- * 事件表 前端控制器
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@Controller
-@RequestMapping("/event")
-@Api(tags = "事件上报")
-@RequiredArgsConstructor
-public class BusEventController {
-
-    private final IBusEventService eventService;
-
-    @ApiOperation("事件上报")
-    @PostMapping("add")
-    @ResponseBody
-    public Object add(@RequestBody BusEvent busEvent){
-        eventService.saveBusEvent(busEvent);
-        return ResponseData.success();
-    }
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
index 03abc5f..aa50d78 100644
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
@@ -1,121 +1,20 @@
 package com.casic.missiles.modular.system.controller;
 
 
-import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.core.base.controller.BaseController;
-import com.casic.missiles.core.page.PageFactory;
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.DeviceDetailDTO;
-import com.casic.missiles.modular.system.entity.Device;
-import com.casic.missiles.modular.system.service.IDeviceExtService;
-import com.casic.missiles.modular.system.service.IDeviceService;
-import io.swagger.annotations.*;
-import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.RequestMapping;
 
 import org.springframework.stereotype.Controller;
 
-import java.time.LocalDateTime;
-import java.util.Date;
-import java.util.List;
-
-import static com.casic.missiles.model.response.ResponseData.DEFAULT_SUCCESS_MESSAGE;
-
 /**
  * <p>
- *  前端控制器
+ * 设备记录表 前端控制器
  * </p>
  *
  * @author zyj
- * @since 2023-04-14
+ * @since 2023-05-25
  */
-@Api(tags = "设备管理接口")
-@RequiredArgsConstructor
 @Controller
-@RequestMapping("/device")
-public class DeviceController extends BaseController {
-    private final IDeviceService deviceService;
-    private final IDeviceExtService deviceExtService;
-
-    @ApiOperation("设备分页列表")
-    @ApiImplicitParams({
-        @ApiImplicitParam(name = "deviceType", value = "设备类型",dataType = "String", paramType = "query"),
-        @ApiImplicitParam(name = "deviceCode", value = "设备编号",dataType = "String", paramType = "query"),
-        @ApiImplicitParam(name = "status", value = "设备状态",dataType = "String", paramType = "query"),
-        @ApiImplicitParam(name = "projectId", value = "作业ID（如果传此参数，列表中返回该作业使用的设备）",dataType = "Long", paramType = "query", example = "0")
-    })
-    @ApiResponses({
-        @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = DeviceDetailDTO.class),
-    })
-    @GetMapping("listPage")
-    @ResponseBody
-    public Object listPage(String deviceType, String deviceCode, String status,Long projectId){
-        Page<DeviceDetailDTO> page = PageFactory.defaultPage();
-        QueryWrapper<DeviceDetailDTO> queryWrapper = new QueryWrapper<>();
-        if(StrUtil.isNotEmpty(deviceType)){
-            queryWrapper.eq("DEVICE_TYPE",deviceType);
-        }
-        if(StrUtil.isNotEmpty(deviceCode)){
-            queryWrapper.like("DEVICE_CODE",deviceCode);
-        }
-        page = deviceService.listPage(page,queryWrapper,status,projectId);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-    @ApiOperation("新增设备")
-    @PostMapping("add")
-    @ResponseBody
-    public Object add(@RequestBody DeviceDetailDTO deviceDetailDTO){
-        deviceService.saveDevice(deviceDetailDTO);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("编辑设备")
-    @PostMapping("update")
-    @ResponseBody
-    public Object update(@RequestBody DeviceDetailDTO deviceDetailDTO){
-        deviceService.updateDevice(deviceDetailDTO);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("删除设备")
-    @PostMapping("delete")
-    @ResponseBody
-    public Object delete(@ApiParam("设备id列表")@RequestBody List<Long> deviceIds){
-        deviceService.deleteDevices(deviceIds);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("设置甲烷阈值")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "gasIp", value = "安全树甲烷设备IP",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "gasPort", value = "安全树甲烷端口",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "threshold", value = "甲烷阈值",dataType = "String", paramType = "query")
-    })
-    @PostMapping("setThreshold")
-    @ResponseBody
-    public Object setThreshold(String gasIp,String gasPort,String threshold){
-        deviceExtService.setGasThreshold(gasIp, gasPort, threshold);
-        return ResponseData.success();
-    }
-
-
-    @ApiOperation("查询甲烷阈值")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "gasIp", value = "安全树甲烷设备IP",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "gasPort", value = "安全树甲烷端口",dataType = "String", paramType = "query")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = "{\"code\": 200,\"data\": \"100\",\"message\": \"请求成功\",\"success\": true}",response = String.class),
-    })
-    @GetMapping("getThreshold")
-    @ResponseBody
-    public Object getThreshold(String gasIp,String gasPort){
-        String data = deviceExtService.getGasThreshold(gasIp, gasPort);
-        return ResponseData.success(data);
-    }
-
+@RequestMapping("/system/device")
+public class DeviceController {
 
 }
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/OverviewController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/OverviewController.java
deleted file mode 100644
index 7570504..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/OverviewController.java
+++ /dev/null
@@ -1,70 +0,0 @@
-package com.casic.missiles.modular.system.controller;
-
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.AlarmTypeCountDTO;
-import com.casic.missiles.modular.system.dto.DeviceLocationDTO;
-import com.casic.missiles.modular.system.dto.WorkerLocationDTO;
-import com.casic.missiles.modular.system.service.IBusAlarmService;
-import com.casic.missiles.modular.system.service.IProjectDeviceService;
-import com.casic.missiles.modular.system.service.IProjectWorkerService;
-import io.swagger.annotations.*;
-import lombok.RequiredArgsConstructor;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.ResponseBody;
-
-import static com.casic.missiles.model.response.ResponseData.DEFAULT_SUCCESS_MESSAGE;
-import static com.casic.missiles.modular.system.consts.AlarmConst.ALARM_STATUS_ON;
-
-@Api(tags = "首页看板接口")
-@Controller
-@RequestMapping("overview")
-@RequiredArgsConstructor
-public class OverviewController {
-
-    private final IBusAlarmService alarmService;
-    private final IProjectDeviceService projectDeviceService;
-
-    private final IProjectWorkerService projectWorkerService;
-
-
-    @ApiOperation("报警统计接口")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "projectId", value = "作业ID",dataType = "Long", paramType = "query", example = "0")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = AlarmTypeCountDTO.class),
-    })
-    @GetMapping("/alarmCount")
-    @ResponseBody
-    public Object alarmCount(Long projectId){
-        return ResponseData.success(alarmService.alarmCount(projectId,ALARM_STATUS_ON));
-    }
-
-    @ApiOperation("设备列表接口")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "projectId", value = "作业ID",dataType = "Long", paramType = "query", example = "0")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = DeviceLocationDTO.class),
-    })
-    @GetMapping("/deviceList")
-    @ResponseBody
-    public Object deviceList(Long projectId){
-        return ResponseData.success(projectDeviceService.selectDeviceLocationList(projectId));
-    }
-
-    @ApiOperation("人员列表接口")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "projectId", value = "作业ID",dataType = "Long", paramType = "query", example = "0")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = WorkerLocationDTO.class),
-    })
-    @GetMapping("/workerList")
-    @ResponseBody
-    public Object workerList(Long projectId){
-        return ResponseData.success(projectWorkerService.selectWorkerLocationDTO(projectId));
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/WorkSiteInfoController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/WorkSiteInfoController.java
deleted file mode 100644
index af36d69..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/WorkSiteInfoController.java
+++ /dev/null
@@ -1,130 +0,0 @@
-package com.casic.missiles.modular.system.controller;
-
-
-import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.core.base.controller.BaseController;
-import com.casic.missiles.core.page.PageFactory;
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.WorkSiteDetailDTO;
-import com.casic.missiles.modular.system.entity.WorkSiteInfo;
-import com.casic.missiles.modular.system.service.IWorkSiteInfoService;
-import io.swagger.annotations.*;
-import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.*;
-
-import org.springframework.stereotype.Controller;
-
-import java.util.List;
-
-import static com.casic.missiles.model.response.ResponseData.DEFAULT_SUCCESS_MESSAGE;
-
-/**
- * <p>
- * 作业现场表 前端控制器
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@Controller
-@RequestMapping("/site")
-@Api(tags = "作业现场管理")
-@RequiredArgsConstructor
-public class WorkSiteInfoController extends BaseController {
-
-
-    private final IWorkSiteInfoService workSiteInfoService;
-
-    @ApiOperation("新增作业现场")
-    @PostMapping("add")
-    @ResponseBody
-    public Object addWorkSite(@RequestBody WorkSiteDetailDTO workSiteDetailDTO){
-        workSiteInfoService.addWorkSiteInfo(workSiteDetailDTO);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("编辑作业现场")
-    @PostMapping("update")
-    @ResponseBody
-    public Object updateWorkSite(@RequestBody WorkSiteDetailDTO workSiteDetailDTO){
-        workSiteInfoService.updateWorkSiteInfo(workSiteDetailDTO);
-        return ResponseData.success();
-    }
-
-
-    @ApiOperation("删除作业现场")
-    @PostMapping("delete")
-    @ResponseBody
-    public Object delete(@ApiParam("作业现场id列表")@RequestBody List<Long> projectIds){
-        workSiteInfoService.deleteProjects(projectIds);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("查询作业现场详情")
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = WorkSiteDetailDTO.class),
-    })
-    @GetMapping("detail")
-    @ResponseBody
-    public Object delete(@ApiParam(value = "作业现场id", example = "0")@RequestParam Long projectId){
-        WorkSiteDetailDTO detailDTO = workSiteInfoService.getWorkSiteDetail(projectId);
-        return ResponseData.success(detailDTO);
-    }
-
-    @ApiOperation("分页列表查询")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "workTitle",value = "作业名称", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "workRoad",value = "所属道路", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "workPersonName",value = "责任人姓名", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "startDate",value = "注册开始日期", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "endDate",value = "注册结束日期", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "projectState",value = "当前状态（字典值）", dataType = "String", paramType = "query")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = WorkSiteInfo.class),
-    })
-    @GetMapping("listPage")
-    @ResponseBody
-    public Object listPage(String workTitle,String workRoad,String workPersonName,String projectState,String startDate,String endDate){
-        Page<WorkSiteInfo> page = PageFactory.defaultPage();
-        QueryWrapper<WorkSiteInfo> queryWrapper = new QueryWrapper<>();
-        if(StrUtil.isNotEmpty(workTitle)){
-            queryWrapper.like("WORK_TITLE",workTitle);
-        }
-        if(StrUtil.isNotEmpty(workRoad)){
-            queryWrapper.like("WORK_ROAD",workRoad);
-        }
-        if(StrUtil.isNotEmpty(workPersonName)){
-            queryWrapper.like("WORKER_NAME",workPersonName);
-        }
-        if(StrUtil.isNotEmpty(projectState)){
-            queryWrapper.eq("PROJECT_STATE",projectState);
-        }
-        if(StrUtil.isNotEmpty(startDate)){
-            queryWrapper.ge("br_work_site_info.CREATE_TIME",startDate + " 00:00:00");
-        }
-        if(StrUtil.isNotEmpty(endDate)){
-            queryWrapper.le("br_work_site_info.CREATE_TIME",endDate + " 23:59:59");
-        }
-        page = workSiteInfoService.selectListPage(page,queryWrapper);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-    @ApiOperation("开始作业")
-    @PostMapping("start")
-    @ResponseBody
-    public Object start(@ApiParam(value = "作业现场id",example = "0")@RequestParam Long projectId){
-        workSiteInfoService.start(projectId);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("完成作业")
-    @PostMapping("finish")
-    @ResponseBody
-    public Object finish(@ApiParam(value = "作业现场id", example = "0")@RequestParam Long projectId){
-        workSiteInfoService.finish(projectId);
-        return ResponseData.success();
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/WorkerController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/WorkerController.java
deleted file mode 100644
index 796f94c..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/WorkerController.java
+++ /dev/null
@@ -1,136 +0,0 @@
-package com.casic.missiles.modular.system.controller;
-
-
-import cn.hutool.core.util.ObjectUtil;
-import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.core.base.controller.BaseController;
-import com.casic.missiles.core.page.PageFactory;
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.DeviceDetailDTO;
-import com.casic.missiles.modular.system.entity.Device;
-import com.casic.missiles.modular.system.entity.Worker;
-import com.casic.missiles.modular.system.service.IWorkerService;
-import io.swagger.annotations.*;
-import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.*;
-
-import org.springframework.stereotype.Controller;
-
-import java.util.Date;
-import java.util.List;
-
-import static com.casic.missiles.model.response.ResponseData.DEFAULT_SUCCESS_MESSAGE;
-
-/**
- * <p>
- *  前端控制器
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@Controller
-@RequestMapping("/worker")
-@RequiredArgsConstructor
-@Api(tags = "人员管理接口")
-public class WorkerController extends BaseController {
-
-    private final IWorkerService workerService;
-
-    @ApiOperation("分页列表查询")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "name",value = "姓名", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "deptId",value = "所属部门", dataType = "Long", paramType = "query", example = "0"),
-            @ApiImplicitParam(name = "status",value = "当前状态（字典值）", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "startDate",value = "注册开始日期", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "endDate",value = "注册结束日期", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "workerType",value = "人员类型（字典值）", dataType = "String", paramType = "query")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = Worker.class),
-    })
-    @GetMapping("listPage")
-    @ResponseBody
-    public Object listPage(String name,Long deptId, String status,String startDate,String endDate,String workerType){
-        Page<Worker> page = PageFactory.defaultPage();
-        QueryWrapper<Worker> queryWrapper = new QueryWrapper<>();
-        if(StrUtil.isNotEmpty(name)){
-            queryWrapper.like("WORKER_NAME",name);
-        }
-        if(ObjectUtil.isNotEmpty(deptId)){
-            queryWrapper.eq("DEPT_ID",deptId);
-        }
-        if(StrUtil.isNotEmpty(workerType)){
-            queryWrapper.eq("WORKER_TYPE",workerType);
-        }
-        if(StrUtil.isNotEmpty(startDate)){
-            queryWrapper.ge("CREATE_TIME",startDate + " 00:00:00");
-        }
-        if(StrUtil.isNotEmpty(endDate)){
-            queryWrapper.le("CREATE_TIME",endDate + " 23:59:59");
-        }
-        if(StrUtil.isNotEmpty(status)){
-            queryWrapper.eq("`STATUS`",status);
-        }
-        page = workerService.selectListPage(page,queryWrapper);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-    @ApiOperation("新增人员")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "worker", value = "人员信息", dataType = "Worker", paramType = "body", required = true),
-            @ApiImplicitParam(name = "projectId", value = "项目ID(入场申请需要)", dataType = "Long", paramType = "query", example = "0")
-    })
-    @PostMapping("add")
-    @ResponseBody
-    public Object add(@ApiParam("worker")@RequestBody Worker worker,
-                      @RequestParam(required = false) Long projectId){
-        workerService.addWorker(worker,projectId);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("编辑人员")
-    @PostMapping("update")
-    @ResponseBody
-    public Object update(@RequestBody Worker worker){
-        workerService.updateById(worker);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("删除人员")
-    @PostMapping("delete")
-    @ResponseBody
-    public Object delete(@ApiParam("人员id列表")@RequestBody List<Long> workIds){
-        workerService.removeByIds(workIds);
-        return ResponseData.success();
-    }
-
-
-    @ApiOperation(value = "获取人脸图片",notes = "返回人脸图片url")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "cameraIp",value = "摄像头IP", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "cameraPort",value = "摄像头端口号", dataType = "String", paramType = "query"),
-    })
-    @GetMapping("/face/register")
-    @ResponseBody
-    public Object faceRegister(String cameraIp,String cameraPort){
-        return ResponseData.success(workerService.faceRegister(cameraIp, cameraPort));
-    }
-
-
-    @ApiOperation(value = "查询临时入场人员列表")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "projectId", value = "项目ID",required = true,dataType = "Long", paramType = "query", example = "0")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = Worker.class),
-    })
-    @GetMapping("/projectTempWorker")
-    @ResponseBody
-    public Object projectTempWorker(Long projectId){
-        return ResponseData.success(workerService.projectTempWorker(projectId));
-    }
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/AlarmTypeCountDTO.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/AlarmTypeCountDTO.java
deleted file mode 100644
index 1a165a1..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/AlarmTypeCountDTO.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.casic.missiles.modular.system.dto;
-
-import io.swagger.annotations.ApiModel;
-import lombok.Data;
-
-@ApiModel(value = "AlarmTypeCountDTO",description = "报警类型统计（首页）")
-@Data
-public class AlarmTypeCountDTO {
-
-    private String alarmType;
-    private String alarmTypeName;
-    private Integer alarmCount;
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/AlarmUpload.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/AlarmUpload.java
deleted file mode 100644
index 73d7799..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/AlarmUpload.java
+++ /dev/null
@@ -1,46 +0,0 @@
-package com.casic.missiles.modular.system.dto;
-
-import cn.hutool.core.util.StrUtil;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-@ApiModel(value = "AlarmUpload",description = "报警上传")
-@Data
-public class AlarmUpload {
-
-    @ApiModelProperty(value = "摄像头ip")
-    private String cameraIp;
-
-    @ApiModelProperty(value = "摄像头端口")
-    private String cameraPort;
-    @ApiModelProperty(value = "安全树甲烷设备ip")
-    private String gasIp;
-    @ApiModelProperty(value = "安全树甲烷设备端口")
-    private String gasPort;
-    @ApiModelProperty(value = "报警值")
-    private String alarmValue;
-    @ApiModelProperty(value = "报警时间")
-    private String alarmTime;
-    @ApiModelProperty(value = "报警类型")
-    private String alarmType;
-    @ApiModelProperty(value = "报警图片")
-    private String alarmImage;
-    @ApiModelProperty(value = "报警内容")
-    private String alarmContent;
-
-    @Override
-    public String toString() {
-        return "AlarmUpload{" +
-                "cameraIp='" + cameraIp + '\'' +
-                ", cameraPort='" + cameraPort + '\'' +
-                ", gasIp='" + gasIp + '\'' +
-                ", gasPort='" + gasPort + '\'' +
-                ", alarmValue='" + alarmValue + '\'' +
-                ", alarmTime='" + alarmTime + '\'' +
-                ", alarmType='" + alarmType + '\'' +
-                ", alarmImage='" + (StrUtil.isNotEmpty(alarmImage) ? alarmImage.substring(0,50) : "null") + '\'' +
-                ", alarmContent='" + alarmContent + '\'' +
-                '}';
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/DeviceDetailDTO.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/DeviceDetailDTO.java
deleted file mode 100644
index ea518d9..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/DeviceDetailDTO.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package com.casic.missiles.modular.system.dto;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.casic.missiles.modular.system.entity.Device;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-@ApiModel("DeviceDetailDTO")
-@Data
-public class DeviceDetailDTO extends Device {
-
-    @ApiModelProperty(value = "摄像头编号")
-    private String cameraCode;
-
-    @ApiModelProperty(value = "摄像头IP")
-    private String cameraIp;
-
-    @ApiModelProperty(value = "摄像头端口")
-    private String cameraPort;
-
-    @ApiModelProperty(value = "激甲编号")
-    private String gasCode;
-
-    @ApiModelProperty(value = "激甲IP")
-    private String gasIp;
-
-    @ApiModelProperty(value = "激甲端口")
-    private String gasPort;
-
-    @ApiModelProperty(value = "智能帽衬编号")
-    private String hatLiningCode;
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/WorkSiteDetailDTO.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/WorkSiteDetailDTO.java
deleted file mode 100644
index 29378ff..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/WorkSiteDetailDTO.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package com.casic.missiles.modular.system.dto;
-
-import com.casic.missiles.modular.system.entity.ProjectDevice;
-import com.casic.missiles.modular.system.entity.ProjectWorker;
-import com.casic.missiles.modular.system.entity.WorkSiteInfo;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.util.List;
-
-@Data
-@ApiModel("WorkSiteDetailDTO")
-public class WorkSiteDetailDTO extends WorkSiteInfo {
-
-    @ApiModelProperty(value = "安全树列表",dataType = "ProjectDevice")
-    private List<ProjectDevice> deviceList;
-
-    @ApiModelProperty(value = "人员列表",dataType = "ProjectWorker")
-    private List<ProjectWorker> workerList;
-
-
-
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/WorkerLocationDTO.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/WorkerLocationDTO.java
deleted file mode 100644
index 6fd7b24..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/WorkerLocationDTO.java
+++ /dev/null
@@ -1,68 +0,0 @@
-package com.casic.missiles.modular.system.dto;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-@ApiModel(value = "WorkerLocationDTO",description = "人员位置列表（首页）")
-@Data
-public class WorkerLocationDTO {
-
-    @ApiModelProperty("人员ID")
-    private Long workerId;
-
-    @ApiModelProperty("人员姓名")
-    private String workerName;
-
-    @ApiModelProperty("安全帽编号")
-    private String hatCode;
-
-    @ApiModelProperty("安全帽ID")
-    private Long hatId;
-
-    @ApiModelProperty("背心编号")
-    private String vastCode;
-
-    @ApiModelProperty("手环编号")
-    private String braceletCode;
-
-    @ApiModelProperty("位置")
-    private String location;
-
-    @ApiModelProperty("时间")
-    private String time;
-
-    @ApiModelProperty("经度")
-    private String lng;
-
-    @ApiModelProperty("纬度")
-    private String lat;
-
-    @ApiModelProperty("心率")
-    private String heartRate;
-
-    @ApiModelProperty("血氧")
-    private String bloodOxygen;
-
-    @ApiModelProperty("一氧化碳")
-    private String co;
-
-    @ApiModelProperty("甲烷")
-    private String gas;
-
-    @ApiModelProperty("硫化氢")
-    private String h2s;
-
-    @ApiModelProperty("氧气")
-    private String o2;
-
-    @ApiModelProperty("信号")
-    private String signal;
-
-    @ApiModelProperty("电量")
-    private String cell;
-
-    @ApiModelProperty("是否报警")
-    private boolean alarmFlag;
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Alarm.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Alarm.java
new file mode 100644
index 0000000..4d2b7ef
--- /dev/null
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Alarm.java
@@ -0,0 +1,103 @@
+package com.casic.missiles.modular.system.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import java.util.Date;
+
+/**
+ * <p>
+ * 报警记录表
+ * </p>
+ *
+ * @author zyj
+ * @since 2023-05-25
+ */
+@Data
+@TableName("bus_alarm")
+public class Alarm implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    @TableId(value = "ID",type = IdType.ASSIGN_ID)
+    private Long id;
+
+    /**
+     * 设备ID
+     */
+    @TableField("DEVICE_ID")
+    private Long deviceId;
+
+    /**
+     * 报警类型
+     */
+    @TableField("ALARM_TYPE")
+    private String alarmType;
+
+    /**
+     * 报警时间
+     */
+    @TableField("ALARM_TIME")
+    private Date alarmTime;
+
+    /**
+     * 报警状态
+     */
+    @TableField("ALARM_STATUS")
+    private String alarmStatus;
+
+    /**
+     * 报警位置
+     */
+    @TableField("ALARM_LOCATION")
+    private String alarmLocation;
+
+    /**
+     * 报警图片
+     */
+    @TableField("ALARM_IMAGE")
+    private String alarmImage;
+
+    /**
+     * 视频通道号
+     */
+    @TableField("CHANNEL_NO")
+    private Integer channelNo;
+
+    /**
+     * 报警内容
+     */
+    @TableField("ALARM_CONTENT")
+    private String alarmContent;
+
+    /**
+     * 消警时间
+     */
+    @TableField("CANCEL_TIME")
+    private Date cancelTime;
+
+
+    @Override
+    public String toString() {
+        return "Alarm{" +
+            "id=" + id +
+            ", deviceId=" + deviceId +
+            ", alarmType=" + alarmType +
+            ", alarmTime=" + alarmTime +
+            ", alarmStatus=" + alarmStatus +
+            ", alarmLocation=" + alarmLocation +
+            ", alarmImage=" + alarmImage +
+            ", channelNo=" + channelNo +
+            ", alarmContent=" + alarmContent +
+            ", cancelTime=" + cancelTime +
+        "}";
+    }
+}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusAlarm.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusAlarm.java
deleted file mode 100644
index efb4a23..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusAlarm.java
+++ /dev/null
@@ -1,159 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.alibaba.fastjson.annotation.JSONField;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.time.LocalDateTime;
-import java.util.Date;
-
-/**
- * <p>
- * 报警记录表
- * </p>
- *
- * @author zyj
- * @since 2023-05-16
- */
-@Data
-@ApiModel("Alarm")
-@TableName("br_bus_alarm")
-public class BusAlarm implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 项目ID
-     */
-    @ApiModelProperty(value = "项目ID")
-    @TableField("PROJECT_ID")
-    private Long projectId;
-
-    /**
-     * 设备ID
-     */
-    @ApiModelProperty(value = "设备ID")
-    @TableField("DEVICE_ID")
-    private Long deviceId;
-
-    /**
-     * 报警类型
-     */
-    @ApiModelProperty(value = "报警类型")
-    @TableField("ALARM_TYPE")
-    private String alarmType;
-
-    /**
-     * 报警状态
-     */
-    @ApiModelProperty(value = "报警状态")
-    @TableField("ALARM_STATUS")
-    private String alarmStatus;
-
-    /**
-     * 报警值
-     */
-    @ApiModelProperty(value = "报警值")
-    @TableField("ALARM_VALUE")
-    private String alarmValue;
-
-    /**
-     * 报警图片
-     */
-    @ApiModelProperty(value = "报警图片")
-    @TableField("ALARM_IMAGE")
-    private String alarmImage;
-
-    /**
-     * 报警内容
-     */
-    @ApiModelProperty(value = "报警内容")
-    @TableField("ALARM_CONTENT")
-    private String alarmContent;
-
-    /**
-     * 报警时间
-     */
-    @ApiModelProperty(value = "报警时间")
-    @TableField("ALARM_TIME")
-    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
-    private Date alarmTime;
-
-    /**
-     * 消警时间
-     */
-    @ApiModelProperty(value = "消警时间")
-    @TableField("CANCEL_TIME")
-    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
-    private Date cancelTime;
-
-    /**
-     * 报警位置经度
-     */
-    @ApiModelProperty(value = "报警位置经度")
-    @TableField("ALARM_LNG")
-    private String alarmLng;
-
-    /**
-     * 报警位置纬度
-     */
-    @ApiModelProperty(value = "报警位置纬度")
-    @TableField("ALARM_LAT")
-    private String alarmLat;
-
-    @ApiModelProperty("报警类型名称")
-    @TableField(exist = false)
-    private String alarmStatusName;
-    @ApiModelProperty("报警类型名称")
-    @TableField(exist = false)
-    private String alarmTypeName;
-    @ApiModelProperty("作业名称")
-    @TableField(exist = false)
-    private String workTitle;
-    @ApiModelProperty("所属道路")
-    @TableField(exist = false)
-    private String workRoad;
-    @ApiModelProperty("作业状态")
-    @TableField(exist = false)
-    private String projectState;
-    @ApiModelProperty("作业状态名称")
-    @TableField(exist = false)
-    private String projectStateName;
-    @ApiModelProperty("负责人姓名")
-    @TableField(exist = false)
-    private String workPersonName;
-    @ApiModelProperty("负责人联系方式")
-    @TableField(exist = false)
-    private String workPersonPhoneNumber;
-
-
-    @Override
-    public String toString() {
-        return "BusAlarm{" +
-                "id=" + id +
-                ", projectId=" + projectId +
-                ", deviceId=" + deviceId +
-                ", alarmType=" + alarmType +
-                ", alarmValue=" + alarmValue +
-                ", alarmStatus=" + alarmStatus +
-                ", alarmImage=" + alarmImage +
-                ", alarmContent=" + alarmContent +
-                ", alarmTime=" + alarmTime +
-                ", cancelTime=" + cancelTime +
-                ", alarmLng=" + alarmLng +
-                ", alarmLat=" + alarmLat +
-                "}";
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusEvent.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusEvent.java
deleted file mode 100644
index a0b7543..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusEvent.java
+++ /dev/null
@@ -1,100 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.time.LocalDateTime;
-import java.util.Date;
-import java.util.List;
-
-/**
- * <p>
- * 事件表
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@TableName("br_bus_event")
-@Data
-@ApiModel("BusEvent")
-public class BusEvent implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @ApiModelProperty("事件ID")
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 事件标题
-     */
-    @ApiModelProperty("事件名称")
-    @TableField("EVENT_TITLE")
-    private String eventTitle;
-
-    /**
-     * 上报人员
-     */
-    @ApiModelProperty("上报人员")
-    @TableField("UPLOAD_NAME")
-    private String uploadName;
-
-    /**
-     * 联系方式
-     */
-    @ApiModelProperty("联系方式")
-    @TableField("PHONE_NUMBER")
-    private String phoneNumber;
-
-    /**
-     * 事件描述
-     */
-    @ApiModelProperty("事件描述")
-    @TableField("EVENT_DESCRIPTION")
-    private String eventDescription;
-
-    @ApiModelProperty("经度")
-    @TableField("LNG")
-    private String lng;
-
-    @ApiModelProperty("纬度")
-    @TableField("LAT")
-    private String lat;
-
-    /**
-     * 事件上传时间
-     */
-    @ApiModelProperty("事件上传时间")
-    @TableField("CREATE_TIME")
-    private Date createTime;
-
-    @ApiModelProperty("事件照片")
-    @TableField(exist = false)
-    private List<BusEventImage> imageList;
-
-
-
-    @Override
-    public String toString() {
-        return "BusEvent{" +
-            "id=" + id +
-            ", eventTitle=" + eventTitle +
-            ", uploadName=" + uploadName +
-            ", phoneNumber=" + phoneNumber +
-            ", eventDescription=" + eventDescription +
-            ", lng=" + lng +
-            ", lat=" + lat +
-            ", createTime=" + createTime +
-        "}";
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusEventImage.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusEventImage.java
deleted file mode 100644
index 1e75245..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusEventImage.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-
-/**
- * <p>
- * 事件图片表
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@TableName("br_bus_event_image")
-@Data
-@ApiModel("BusEventImage")
-public class BusEventImage implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 事件ID
-     */
-    @TableField("EVENT_ID")
-    private Long eventId;
-
-    /**
-     * 报警图片
-     */
-    @TableField("IMAGE")
-    @ApiModelProperty("图片url")
-    private String image;
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Device.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Device.java
index df89c70..ea7db5f 100644
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Device.java
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Device.java
@@ -1,30 +1,23 @@
 package com.casic.missiles.modular.system.entity;
 
-import com.alibaba.fastjson.annotation.JSONField;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.casic.missiles.core.base.json.DateDeserializer;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
-import java.util.Date;
 
 /**
  * <p>
- * 
+ * 设备记录表
  * </p>
  *
  * @author zyj
- * @since 2023-04-14
+ * @since 2023-05-25
  */
-@ApiModel("Device")
-@TableName("br_device")
 @Data
+@TableName("bus_device")
 public class Device implements Serializable {
 
     private static final long serialVersionUID = 1L;
@@ -32,82 +25,86 @@
     /**
      * 主键
      */
-    @ApiModelProperty(value = "设备ID")
     @TableId(value = "ID",type = IdType.ASSIGN_ID)
     private Long id;
 
     /**
-     * 设备编号
+     * 设备名称
      */
-    @ApiModelProperty(value = "设备编号")
-    @TableField("DEVICE_CODE")
-    private String deviceCode;
+    @TableField("DEVICE_NAME")
+    private String deviceName;
 
     /**
-     * 设备类型
+     * IP
      */
-    @ApiModelProperty(value = "设备类型")
-    @TableField("DEVICE_TYPE")
-    private String deviceType;
+    @TableField("IP")
+    private String ip;
 
     /**
-     * 设备批次
+     * 端口
      */
-    @ApiModelProperty(value = "设备批次")
-    @TableField("DEVICE_BATCH")
-    private String deviceBatch;
+    @TableField("PORT")
+    private String port;
 
     /**
-     * 厂家
+     * 用户名
      */
-    @ApiModelProperty(value = "厂家")
-    @TableField("MANUFACTURER")
-    private String manufacturer;
+    @TableField("USER_NAME")
+    private String userName;
 
     /**
-     * 是否供电
+     * 密码
      */
-    @ApiModelProperty(value = "是否供电")
-    @TableField("IS_POWER_SUPPLY")
-    private String isPowerSupply;
+    @TableField("PASSWORD")
+    private String password;
 
     /**
-     * 创建时间
+     * 连接类型
      */
-    @ApiModelProperty(value = "创建时间",dataType = "Date")
-    @TableField("CREATE_TIME")
-    private Date createTime;
+    @TableField("CONNECT_TYPE")
+    private String connectType;
 
-    @ApiModelProperty(value = "设备类型名称")
-    @TableField(exist = false)
-    private String deviceTypeName;
+    /**
+     * 位置
+     */
+    @TableField("LOCATION")
 
-    @ApiModelProperty(value = "是否供电名称")
-    @TableField(exist = false)
-    private String isPowerSupplyName;
+    private String location;
 
-    @ApiModelProperty(value = "注册时间",dataType = "String")
-    @TableField(exist = false)
-    private String registerTime;
+    /**
+     * 设备状态
+     */
+    @TableField("STATUS")
 
-    @ApiModelProperty(value = "当前状态")
-    @TableField(exist = false)
     private String status;
 
-    @ApiModelProperty(value = "当前状态名称")
-    @TableField(exist = false)
-    private String statusName;
+    /**
+     * 报警分组
+     */
+    @TableField("ALARM_GROUP")
+
+    private Long alarmGroup;
+
+    /**
+     * 视频通道数(预留)
+     */
+    @TableField("CHANNEL_NUM")
+    private Integer channelNum;
 
     @Override
     public String toString() {
         return "Device{" +
             "id=" + id +
-            ", deviceCode=" + deviceCode +
-            ", deviceType=" + deviceType +
-            ", deviceBatch=" + deviceBatch +
-            ", manufacturer=" + manufacturer +
-            ", isPowerSupply=" + isPowerSupply +
-            ", createTime=" + createTime +
+            ", deviceName=" + deviceName +
+            ", ip=" + ip +
+            ", port=" + port +
+            ", userName=" + userName +
+            ", password=" + password +
+            ", connectType=" + connectType +
+            ", location=" + location +
+            ", status=" + status +
+            ", alarmGroup=" + alarmGroup +
+            ", channelNum=" + channelNum +
         "}";
     }
 }
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/DeviceExt.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/DeviceExt.java
deleted file mode 100644
index 5ee7015..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/DeviceExt.java
+++ /dev/null
@@ -1,99 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-
-/**
- * <p>
- * 设备扩展信息表（安全树）
- * </p>
- *
- * @author zyj
- * @since 2023-04-27
- */
-@Data
-@TableName("br_device_ext")
-public class DeviceExt implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 设备ID
-     */
-    @TableField("DEVICE_ID")
-    private Long deviceId;
-
-    /**
-     * 摄像头编号
-     */
-    @TableField("CAMERA_CODE")
-    private String cameraCode;
-
-    /**
-     * 摄像头IP
-     */
-    @TableField("CAMERA_IP")
-    private String cameraIp;
-
-    /**
-     * 摄像头端口
-     */
-    @TableField("CAMERA_PORT")
-    private String cameraPort;
-
-    /**
-     * 激甲编号
-     */
-    @TableField("GAS_CODE")
-    private String gasCode;
-
-    /**
-     * 激甲IP
-     */
-    @TableField("GAS_IP")
-    private String gasIp;
-
-    /**
-     * 激甲端口
-     */
-    @TableField("GAS_PORT")
-    private String gasPort;
-
-    /**
-     * 甲烷报警阈值
-     */
-    @TableField("GAS_THRESHOLD")
-    private String gasThreshold;
-
-    @TableField(value = "HAT_LINING_CODE")
-    private String hatLiningCode;
-
-
-    @Override
-    public String toString() {
-        return "DeviceExt{" +
-            "id=" + id +
-            ", deviceId=" + deviceId +
-            ", cameraCode=" + cameraCode +
-            ", cameraIp=" + cameraIp +
-            ", cameraPort=" + cameraPort +
-            ", gasCode=" + gasCode +
-            ", gasIp=" + gasIp +
-            ", gasPort=" + gasPort +
-            ", gasThreshold=" + gasThreshold +
-            ", hatLiningCode=" + hatLiningCode +
-        "}";
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/ProjectDevice.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/ProjectDevice.java
deleted file mode 100644
index c4f3472..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/ProjectDevice.java
+++ /dev/null
@@ -1,62 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-
-/**
- * <p>
- * 
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@Data
-@ApiModel("ProjectDevice")
-@TableName("br_project_device")
-public class ProjectDevice implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 作业现场ID
-     */
-    @TableField("PROJECT_ID")
-    private Long projectId;
-
-    /**
-     * 设备ID
-     */
-    @TableField("DEVICE_ID")
-    @ApiModelProperty("设备ID（新增编辑时传）")
-    private Long deviceId;
-
-    /**
-     * 设备编号
-     */
-    @TableField(exist = false)
-    @ApiModelProperty("设备编号（详情中展示，新增编辑不用传）")
-    private String deviceCode;
-
-    @Override
-    public String toString() {
-        return "ProjectDevice{" +
-            "id=" + id +
-            ", projectId=" + projectId +
-            ", deviceId=" + deviceId +
-        "}";
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/ProjectWorker.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/ProjectWorker.java
deleted file mode 100644
index 10b23c4..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/ProjectWorker.java
+++ /dev/null
@@ -1,104 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import java.io.Serializable;
-
-/**
- * <p>
- * 
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@ApiModel("ProjectWorker")
-@TableName("br_project_worker")
-@Data
-@NoArgsConstructor
-@AllArgsConstructor
-public class ProjectWorker implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 作业现场ID
-     */
-    @TableField("PROJECT_ID")
-    private Long projectId;
-
-    /**
-     * 人员ID
-     */
-    @ApiModelProperty("人员ID")
-    @TableField("WORKER_ID")
-    private Long workerId;
-
-    /**
-     * 安全帽编号
-     */
-    @ApiModelProperty("安全帽编号")
-    @TableField("HAT_CODE")
-    private String hatCode;
-
-    /**
-     * 背心编号
-     */
-    @ApiModelProperty("背心编号")
-    @TableField("VAST_CODE")
-    private String vastCode;
-
-    /**
-     * 手环编号
-     */
-    @ApiModelProperty("手环编号")
-    @TableField("BRACELET_CODE")
-    private String braceletCode;
-
-    @ApiModelProperty("人员姓名（详情中展示，新增编辑不用传）")
-    @TableField(exist = false)
-    private String workerName;
-
-    @ApiModelProperty("人员部门ID（详情中展示，新增编辑不用传）")
-    @TableField(exist = false)
-    private String workerDeptId;
-
-    @ApiModelProperty("人员部门名称（详情中展示，新增编辑不用传）")
-    @TableField(exist = false)
-    private String workerDeptName;
-
-    @ApiModelProperty("人员联系方式（详情中展示，新增编辑不用传）")
-    @TableField(exist = false)
-    private String workerPhoneNumber;
-
-    public ProjectWorker(Long projectId, Long workerId) {
-        this.projectId = projectId;
-        this.workerId = workerId;
-    }
-
-    @Override
-    public String toString() {
-        return "ProjectWorker{" +
-            "id=" + id +
-            ", projectId=" + projectId +
-            ", workerId=" + workerId +
-            ", hatCode=" + hatCode +
-            ", vastCode=" + vastCode +
-            ", braceletCode=" + braceletCode +
-        "}";
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/WorkSiteInfo.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/WorkSiteInfo.java
deleted file mode 100644
index fa6f41d..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/WorkSiteInfo.java
+++ /dev/null
@@ -1,130 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.alibaba.fastjson.annotation.JSONField;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.time.LocalDateTime;
-import java.util.Date;
-
-/**
- * <p>
- * 作业现场表
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@ApiModel("WorkSiteInfo")
-@TableName("br_work_site_info")
-@Data
-public class WorkSiteInfo implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @ApiModelProperty("作业现场ID")
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 作业名称
-     */
-    @ApiModelProperty("作业名称")
-    @TableField("WORK_TITLE")
-    private String workTitle;
-
-    /**
-     * 责任人
-     */
-    @ApiModelProperty("责任人（人员ID）")
-    @TableField("WORK_PERSON")
-    private Long workPerson;
-
-    /**
-     * 作业描述
-     */
-    @ApiModelProperty("作业描述")
-    @TableField("WORK_SITE_DESC")
-    private String workSiteDesc;
-
-    /**
-     * 作业状态
-     */
-    @ApiModelProperty("作业状态")
-    @TableField("PROJECT_STATE")
-    private String projectState;
-
-    /**
-     * 所属道路
-     */
-    @ApiModelProperty("所属道路")
-    @TableField("WORK_ROAD")
-    private String workRoad;
-
-    @TableField("IMAGE_URL")
-    private String imageUrl;
-
-    @TableField("CREATE_TIME")
-    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
-    private Date createTime;
-    @TableField("UPDATE_TIME")
-    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
-    private Date updateTime;
-
-    @ApiModelProperty("开始时间")
-    @TableField("START_TIME")
-    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
-    private Date startTime;
-
-    @ApiModelProperty("结束时间")
-    @TableField("FINISH_TIME")
-    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
-    private Date finishTime;
-
-    @ApiModelProperty("负责人姓名（详情中使用，新增编辑不用传）")
-    @TableField(exist = false)
-    private String workPersonName;
-
-    @ApiModelProperty("负责人联系方式（详情中使用，新增编辑不用传）")
-    @TableField(exist = false)
-    private String workPersonPhoneNumber;
-
-    @ApiModelProperty("负责人所属部门ID（详情中使用，新增编辑不用传）")
-    @TableField(exist = false)
-    private Long workPersonDeptId;
-
-    @ApiModelProperty("负责人所属部门名称（详情中使用，新增编辑不用传）")
-    @TableField(exist = false)
-    private String workPersonDeptName;
-
-    @ApiModelProperty(value = "注册时间",dataType = "String")
-    @TableField(exist = false)
-    private String registerTime;
-
-    @ApiModelProperty("作业状态名称")
-    @TableField(exist = false)
-    private String projectStateName;
-
-    @Override
-    public String toString() {
-        return "WorkSiteInfo{" +
-            "id=" + id +
-            ", workTitle=" + workTitle +
-            ", workPerson=" + workPerson +
-            ", workSiteDesc=" + workSiteDesc +
-            ", projectState=" + projectState +
-            ", imageUrl=" + imageUrl +
-            ", updateTime=" + updateTime +
-            ", workRoad=" + workRoad +
-        "}";
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Worker.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Worker.java
deleted file mode 100644
index 28a4daa..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Worker.java
+++ /dev/null
@@ -1,147 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.time.LocalDateTime;
-import java.util.Date;
-
-/**
- * <p>
- * 
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@ApiModel("Worker")
-@TableName("br_worker")
-@Data
-public class Worker implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @ApiModelProperty(value = "人员ID")
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 姓名
-     */
-    @ApiModelProperty(value = "姓名")
-    @TableField("WORKER_NAME")
-    private String workerName;
-
-    /**
-     * 性别
-     */
-    @ApiModelProperty(value = "性别")
-    @TableField("GENDER")
-    private String gender;
-
-    /**
-     * 所属部门
-     */
-    @ApiModelProperty(value = "所属部门(人员管理)")
-    @TableField("DEPT_ID")
-    private Long deptId;
-
-    /**
-     * 所属单位
-     */
-    @ApiModelProperty(value = "所属单位(入场申请中使用)")
-    @TableField("OWNER_SHIP")
-    private String ownerShip;
-
-    /**
-     * 联系方式
-     */
-    @ApiModelProperty(value = "联系方式")
-    @TableField("PHONE_NUMBER")
-    private String phoneNumber;
-
-    /**
-     * 证件号
-     */
-    @ApiModelProperty(value = "证件号")
-    @TableField("ID_CARD_NUMBER")
-    private String idCardNumber;
-
-    /**
-     * 入场原因
-     */
-    @ApiModelProperty(value = "入场原因（入场申请中使用）")
-    @TableField("ENTER_REASON")
-    private String enterReason;
-
-    /**
-     * 入场人脸照片
-     */
-    @ApiModelProperty(value = "人脸照片（照片路径）")
-    @TableField("WORKER_AVATAR")
-    private String workerAvatar;
-
-    /**
-     * 申请入场时间
-     */
-    @ApiModelProperty(value = "注册时间/申请入场时间")
-    @TableField("CREATE_TIME")
-    private Date createTime;
-
-    /**
-     * 人员类型
-     */
-    @ApiModelProperty(value = "人员类型（区分人员管理和入场申请）")
-    @TableField("WORKER_TYPE")
-    private String workerType;
-
-    @ApiModelProperty(value = "性别名称")
-    @TableField(exist = false)
-    private String genderName;
-
-    @ApiModelProperty(value = "部门名称")
-    @TableField(exist = false)
-    private String deptName;
-
-    @ApiModelProperty(value = "注册时间",dataType = "String")
-    @TableField(exist = false)
-    private String registerTime;
-
-    @ApiModelProperty(value = "当前状态")
-    @TableField(exist = false)
-    private String status;
-
-    @ApiModelProperty(value = "当前状态名称")
-    @TableField(exist = false)
-    private String statusName;
-
-    @ApiModelProperty(value = "是否注册(0未注册；1已注册)",allowableValues = "0,1")
-    @TableField(exist = false)
-    private String isRegister;
-
-    @Override
-    public String toString() {
-        return "Worker{" +
-            "id=" + id +
-            ", workerName=" + workerName +
-            ", gender=" + gender +
-            ", deptId=" + deptId +
-            ", ownerShip=" + ownerShip +
-            ", phoneNumber=" + phoneNumber +
-            ", idCardNumber=" + idCardNumber +
-            ", enterReason=" + enterReason +
-            ", workerAvatar=" + workerAvatar +
-            ", createTime=" + createTime +
-            ", workerType=" + workerType +
-        "}";
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/AlarmMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/AlarmMapper.java
new file mode 100644
index 0000000..ea4c8be
--- /dev/null
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/AlarmMapper.java
@@ -0,0 +1,16 @@
+package com.casic.missiles.modular.system.mapper;
+
+import com.casic.missiles.modular.system.entity.Alarm;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 报警记录表 Mapper 接口
+ * </p>
+ *
+ * @author zyj
+ * @since 2023-05-25
+ */
+public interface AlarmMapper extends BaseMapper<Alarm> {
+
+}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/BusAlarmMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/BusAlarmMapper.java
deleted file mode 100644
index 9801742..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/BusAlarmMapper.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package com.casic.missiles.modular.system.mapper;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.modular.system.dto.AlarmTypeCountDTO;
-import com.casic.missiles.modular.system.entity.BusAlarm;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * <p>
- * 报警记录表 Mapper 接口
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface BusAlarmMapper extends BaseMapper<BusAlarm> {
-
-    Page<BusAlarm> listPage(Page<BusAlarm> page,@Param("ew")  QueryWrapper<BusAlarm> queryWrapper);
-
-    void cancelAlarm(@Param("deviceId")Long deviceId,@Param("alarmType") String alarmType);
-
-    List<AlarmTypeCountDTO> alarmCount(@Param("projectId")Long projectId, @Param("alarmStatus")String alarmStatus);
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/BusEventImageMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/BusEventImageMapper.java
deleted file mode 100644
index 9590b7d..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/BusEventImageMapper.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.casic.missiles.modular.system.mapper;
-
-import com.casic.missiles.modular.system.entity.BusEventImage;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * <p>
- * 事件图片表 Mapper 接口
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface BusEventImageMapper extends BaseMapper<BusEventImage> {
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/BusEventMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/BusEventMapper.java
deleted file mode 100644
index 3c85edf..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/BusEventMapper.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.casic.missiles.modular.system.mapper;
-
-import com.casic.missiles.modular.system.entity.BusEvent;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * <p>
- * 事件表 Mapper 接口
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface BusEventMapper extends BaseMapper<BusEvent> {
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/DeviceExtMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/DeviceExtMapper.java
deleted file mode 100644
index 4ca9212..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/DeviceExtMapper.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.casic.missiles.modular.system.mapper;
-
-import com.casic.missiles.modular.system.entity.DeviceExt;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * <p>
- * 设备扩展信息表（安全树） Mapper 接口
- * </p>
- *
- * @author zyj
- * @since 2023-04-27
- */
-public interface DeviceExtMapper extends BaseMapper<DeviceExt> {
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/DeviceMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/DeviceMapper.java
index 444c0c5..3d0bb02 100644
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/DeviceMapper.java
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/DeviceMapper.java
@@ -1,30 +1,16 @@
 package com.casic.missiles.modular.system.mapper;
 
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.modular.system.dto.DeviceDetailDTO;
-import com.casic.missiles.modular.system.dto.HelmetInfoDTO;
 import com.casic.missiles.modular.system.entity.Device;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
 
 /**
  * <p>
- *  Mapper 接口
+ * 设备记录表 Mapper 接口
  * </p>
  *
  * @author zyj
- * @since 2023-04-14
+ * @since 2023-05-25
  */
-@Mapper
 public interface DeviceMapper extends BaseMapper<Device> {
 
-    Page<DeviceDetailDTO> listDetailPage(Page<DeviceDetailDTO> page,@Param("ew") QueryWrapper<DeviceDetailDTO> ew);
-
-     List<Long> selectProjectDevice(@Param("projectId") Long projectId);
-
-    List<HelmetInfoDTO> selectHelmetList(@Param("deviceType")String deviceType);
 }
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/ProjectDeviceMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/ProjectDeviceMapper.java
deleted file mode 100644
index 1d0c14e..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/ProjectDeviceMapper.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package com.casic.missiles.modular.system.mapper;
-
-import com.casic.missiles.modular.system.dto.DeviceLocationDTO;
-import com.casic.missiles.modular.system.entity.ProjectDevice;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * <p>
- *  Mapper 接口
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface ProjectDeviceMapper extends BaseMapper<ProjectDevice> {
-     List<ProjectDevice> selectDetailByProjectId(@Param("projectId") Long projectId);
-
-     List<DeviceLocationDTO> selectDeviceLocationList(@Param("projectId") Long projectId);
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/ProjectWorkerMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/ProjectWorkerMapper.java
deleted file mode 100644
index 58583d1..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/ProjectWorkerMapper.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package com.casic.missiles.modular.system.mapper;
-
-import com.casic.missiles.modular.system.dto.WorkerLocationDTO;
-import com.casic.missiles.modular.system.entity.ProjectWorker;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * <p>
- *  Mapper 接口
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface ProjectWorkerMapper extends BaseMapper<ProjectWorker> {
-
-    List<ProjectWorker> selectDetailByProjectId(@Param("projectId") Long projectId,
-                                                @Param("workerType")String workerType);
-
-    List<WorkerLocationDTO> selectWorkerLocationList(@Param("projectId") Long projectId,
-                                                     @Param("workerType")String workerType);
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/WorkSiteInfoMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/WorkSiteInfoMapper.java
deleted file mode 100644
index a4934d2..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/WorkSiteInfoMapper.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.casic.missiles.modular.system.mapper;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.modular.system.entity.WorkSiteInfo;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Param;
-
-/**
- * <p>
- * 作业现场表 Mapper 接口
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface WorkSiteInfoMapper extends BaseMapper<WorkSiteInfo> {
-
-    Page<WorkSiteInfo> selectListPage(Page<WorkSiteInfo> page,@Param("ew") QueryWrapper<WorkSiteInfo> ew);
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/WorkerMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/WorkerMapper.java
deleted file mode 100644
index 258fb12..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/WorkerMapper.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package com.casic.missiles.modular.system.mapper;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.modular.system.dto.DeviceDetailDTO;
-import com.casic.missiles.modular.system.entity.Worker;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * <p>
- *  Mapper 接口
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface WorkerMapper extends BaseMapper<Worker> {
-
-
-    Page<Worker> selectListPage(Page<Worker> page, @Param("ew") QueryWrapper<Worker> ew);
-
-    List<String> selectWorkerAvatars(@Param("projectId")Long projectId);
-
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/AlarmMapper.xml b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/AlarmMapper.xml
new file mode 100644
index 0000000..25cb4ab
--- /dev/null
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/AlarmMapper.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.modular.system.mapper.AlarmMapper">
+
+</mapper>

diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/AlarmController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/AlarmController.java
new file mode 100644
index 0000000..1795cf1
--- /dev/null
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/AlarmController.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.modular.system.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.stereotype.Controller;
+
+/**
+ * <p>
+ * 报警记录表 前端控制器
+ * </p>
+ *
+ * @author zyj
+ * @since 2023-05-25
+ */
+@Controller
+@RequestMapping("/system/alarm")
+public class AlarmController {
+
+}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusAlarmController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusAlarmController.java
deleted file mode 100644
index 1f82ebb..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusAlarmController.java
+++ /dev/null
@@ -1,102 +0,0 @@
-package com.casic.missiles.modular.system.controller;
-
-
-import cn.hutool.core.util.ObjectUtil;
-import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.core.base.controller.BaseController;
-import com.casic.missiles.core.page.PageFactory;
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.AlarmUpload;
-import com.casic.missiles.modular.system.dto.DeviceDetailDTO;
-import com.casic.missiles.modular.system.entity.BusAlarm;
-import com.casic.missiles.modular.system.service.IBusAlarmService;
-import io.swagger.annotations.*;
-import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.*;
-
-import org.springframework.stereotype.Controller;
-
-import static com.casic.missiles.model.response.ResponseData.DEFAULT_SUCCESS_MESSAGE;
-import static com.casic.missiles.modular.system.consts.AlarmConst.ALARM_STATUS_MANUAL_CANCEL;
-
-/**
- * <p>
- * 报警记录表 前端控制器
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@Api(tags = "报警管理接口")
-@Controller
-@RequestMapping("/alarm")
-@RequiredArgsConstructor
-public class BusAlarmController extends BaseController {
-
-    private final IBusAlarmService alarmService;
-
-    @ApiOperation("报警上报接口")
-    @PostMapping("/upload")
-    @ResponseBody
-    public Object upload(@RequestBody AlarmUpload alarmUpload){
-        alarmService.alarmUpload(alarmUpload);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("报警列表分页查询")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "workTitle", value = "作业名称",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "projectId", value = "作业ID",dataType = "Long", paramType = "query",example = "0"),
-            @ApiImplicitParam(name = "alarmStatus", value = "报警状态",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "projectState", value = "作业状态",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "alarmType", value = "报警类型",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "alarmStartTime", value = "报警开始时间",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "alarmEndTime", value = "报警结束时间",dataType = "String", paramType = "query")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = BusAlarm.class),
-    })
-    @GetMapping("/listPage")
-    @ResponseBody
-    public Object listPage(String workTitle,Long projectId,String alarmStatus,String projectState,String alarmType,String alarmStartTime,String alarmEndTime){
-        Page<BusAlarm> page = PageFactory.defaultPage();
-        QueryWrapper<BusAlarm> queryWrapper = new QueryWrapper<>();
-        if(StrUtil.isNotEmpty(workTitle)){
-            queryWrapper.like("p.WORK_TITLE",workTitle);
-        }
-        if(ObjectUtil.isNotEmpty(projectId)){
-            queryWrapper.eq("alarm.PROJECT_ID",projectId);
-        }
-        if(StrUtil.isNotEmpty(alarmStatus)){
-            queryWrapper.eq("alarm.ALARM_STATUS",alarmStatus);
-        }
-        if(StrUtil.isNotEmpty(projectState)){
-            queryWrapper.eq("p.PROJECT_STATE",projectState);
-        }
-        if(StrUtil.isNotEmpty(alarmType)){
-            queryWrapper.eq("alarm.ALARM_TYPE",alarmType);
-        }
-        if(StrUtil.isNotEmpty(alarmStartTime)){
-            queryWrapper.ge("alarm.ALARM_TIME",alarmStartTime);
-        }
-        if(StrUtil.isNotEmpty(alarmEndTime)){
-            queryWrapper.le("alarm.ALARM_TIME",alarmEndTime);
-        }
-        page = alarmService.listPage(page,queryWrapper);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-    @ApiOperation("消警")
-    @PostMapping("/cancel")
-    @ResponseBody
-    public Object cancel(@RequestParam("alarmId") Long alarmId){
-        UpdateWrapper<BusAlarm> updateWrapper = new UpdateWrapper<>();
-        updateWrapper.eq("ID",alarmId);
-        updateWrapper.set("ALARM_STATUS",ALARM_STATUS_MANUAL_CANCEL);
-        alarmService.update(updateWrapper);
-        return ResponseData.success();
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusEventController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusEventController.java
deleted file mode 100644
index dde5aad..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusEventController.java
+++ /dev/null
@@ -1,41 +0,0 @@
-package com.casic.missiles.modular.system.controller;
-
-
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.entity.BusEvent;
-import com.casic.missiles.modular.system.service.IBusEventService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.ResponseBody;
-
-/**
- * <p>
- * 事件表 前端控制器
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@Controller
-@RequestMapping("/event")
-@Api(tags = "事件上报")
-@RequiredArgsConstructor
-public class BusEventController {
-
-    private final IBusEventService eventService;
-
-    @ApiOperation("事件上报")
-    @PostMapping("add")
-    @ResponseBody
-    public Object add(@RequestBody BusEvent busEvent){
-        eventService.saveBusEvent(busEvent);
-        return ResponseData.success();
-    }
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
index 03abc5f..aa50d78 100644
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
@@ -1,121 +1,20 @@
 package com.casic.missiles.modular.system.controller;
 
 
-import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.core.base.controller.BaseController;
-import com.casic.missiles.core.page.PageFactory;
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.DeviceDetailDTO;
-import com.casic.missiles.modular.system.entity.Device;
-import com.casic.missiles.modular.system.service.IDeviceExtService;
-import com.casic.missiles.modular.system.service.IDeviceService;
-import io.swagger.annotations.*;
-import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.RequestMapping;
 
 import org.springframework.stereotype.Controller;
 
-import java.time.LocalDateTime;
-import java.util.Date;
-import java.util.List;
-
-import static com.casic.missiles.model.response.ResponseData.DEFAULT_SUCCESS_MESSAGE;
-
 /**
  * <p>
- *  前端控制器
+ * 设备记录表 前端控制器
  * </p>
  *
  * @author zyj
- * @since 2023-04-14
+ * @since 2023-05-25
  */
-@Api(tags = "设备管理接口")
-@RequiredArgsConstructor
 @Controller
-@RequestMapping("/device")
-public class DeviceController extends BaseController {
-    private final IDeviceService deviceService;
-    private final IDeviceExtService deviceExtService;
-
-    @ApiOperation("设备分页列表")
-    @ApiImplicitParams({
-        @ApiImplicitParam(name = "deviceType", value = "设备类型",dataType = "String", paramType = "query"),
-        @ApiImplicitParam(name = "deviceCode", value = "设备编号",dataType = "String", paramType = "query"),
-        @ApiImplicitParam(name = "status", value = "设备状态",dataType = "String", paramType = "query"),
-        @ApiImplicitParam(name = "projectId", value = "作业ID（如果传此参数，列表中返回该作业使用的设备）",dataType = "Long", paramType = "query", example = "0")
-    })
-    @ApiResponses({
-        @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = DeviceDetailDTO.class),
-    })
-    @GetMapping("listPage")
-    @ResponseBody
-    public Object listPage(String deviceType, String deviceCode, String status,Long projectId){
-        Page<DeviceDetailDTO> page = PageFactory.defaultPage();
-        QueryWrapper<DeviceDetailDTO> queryWrapper = new QueryWrapper<>();
-        if(StrUtil.isNotEmpty(deviceType)){
-            queryWrapper.eq("DEVICE_TYPE",deviceType);
-        }
-        if(StrUtil.isNotEmpty(deviceCode)){
-            queryWrapper.like("DEVICE_CODE",deviceCode);
-        }
-        page = deviceService.listPage(page,queryWrapper,status,projectId);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-    @ApiOperation("新增设备")
-    @PostMapping("add")
-    @ResponseBody
-    public Object add(@RequestBody DeviceDetailDTO deviceDetailDTO){
-        deviceService.saveDevice(deviceDetailDTO);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("编辑设备")
-    @PostMapping("update")
-    @ResponseBody
-    public Object update(@RequestBody DeviceDetailDTO deviceDetailDTO){
-        deviceService.updateDevice(deviceDetailDTO);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("删除设备")
-    @PostMapping("delete")
-    @ResponseBody
-    public Object delete(@ApiParam("设备id列表")@RequestBody List<Long> deviceIds){
-        deviceService.deleteDevices(deviceIds);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("设置甲烷阈值")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "gasIp", value = "安全树甲烷设备IP",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "gasPort", value = "安全树甲烷端口",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "threshold", value = "甲烷阈值",dataType = "String", paramType = "query")
-    })
-    @PostMapping("setThreshold")
-    @ResponseBody
-    public Object setThreshold(String gasIp,String gasPort,String threshold){
-        deviceExtService.setGasThreshold(gasIp, gasPort, threshold);
-        return ResponseData.success();
-    }
-
-
-    @ApiOperation("查询甲烷阈值")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "gasIp", value = "安全树甲烷设备IP",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "gasPort", value = "安全树甲烷端口",dataType = "String", paramType = "query")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = "{\"code\": 200,\"data\": \"100\",\"message\": \"请求成功\",\"success\": true}",response = String.class),
-    })
-    @GetMapping("getThreshold")
-    @ResponseBody
-    public Object getThreshold(String gasIp,String gasPort){
-        String data = deviceExtService.getGasThreshold(gasIp, gasPort);
-        return ResponseData.success(data);
-    }
-
+@RequestMapping("/system/device")
+public class DeviceController {
 
 }
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/OverviewController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/OverviewController.java
deleted file mode 100644
index 7570504..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/OverviewController.java
+++ /dev/null
@@ -1,70 +0,0 @@
-package com.casic.missiles.modular.system.controller;
-
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.AlarmTypeCountDTO;
-import com.casic.missiles.modular.system.dto.DeviceLocationDTO;
-import com.casic.missiles.modular.system.dto.WorkerLocationDTO;
-import com.casic.missiles.modular.system.service.IBusAlarmService;
-import com.casic.missiles.modular.system.service.IProjectDeviceService;
-import com.casic.missiles.modular.system.service.IProjectWorkerService;
-import io.swagger.annotations.*;
-import lombok.RequiredArgsConstructor;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.ResponseBody;
-
-import static com.casic.missiles.model.response.ResponseData.DEFAULT_SUCCESS_MESSAGE;
-import static com.casic.missiles.modular.system.consts.AlarmConst.ALARM_STATUS_ON;
-
-@Api(tags = "首页看板接口")
-@Controller
-@RequestMapping("overview")
-@RequiredArgsConstructor
-public class OverviewController {
-
-    private final IBusAlarmService alarmService;
-    private final IProjectDeviceService projectDeviceService;
-
-    private final IProjectWorkerService projectWorkerService;
-
-
-    @ApiOperation("报警统计接口")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "projectId", value = "作业ID",dataType = "Long", paramType = "query", example = "0")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = AlarmTypeCountDTO.class),
-    })
-    @GetMapping("/alarmCount")
-    @ResponseBody
-    public Object alarmCount(Long projectId){
-        return ResponseData.success(alarmService.alarmCount(projectId,ALARM_STATUS_ON));
-    }
-
-    @ApiOperation("设备列表接口")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "projectId", value = "作业ID",dataType = "Long", paramType = "query", example = "0")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = DeviceLocationDTO.class),
-    })
-    @GetMapping("/deviceList")
-    @ResponseBody
-    public Object deviceList(Long projectId){
-        return ResponseData.success(projectDeviceService.selectDeviceLocationList(projectId));
-    }
-
-    @ApiOperation("人员列表接口")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "projectId", value = "作业ID",dataType = "Long", paramType = "query", example = "0")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = WorkerLocationDTO.class),
-    })
-    @GetMapping("/workerList")
-    @ResponseBody
-    public Object workerList(Long projectId){
-        return ResponseData.success(projectWorkerService.selectWorkerLocationDTO(projectId));
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/WorkSiteInfoController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/WorkSiteInfoController.java
deleted file mode 100644
index af36d69..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/WorkSiteInfoController.java
+++ /dev/null
@@ -1,130 +0,0 @@
-package com.casic.missiles.modular.system.controller;
-
-
-import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.core.base.controller.BaseController;
-import com.casic.missiles.core.page.PageFactory;
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.WorkSiteDetailDTO;
-import com.casic.missiles.modular.system.entity.WorkSiteInfo;
-import com.casic.missiles.modular.system.service.IWorkSiteInfoService;
-import io.swagger.annotations.*;
-import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.*;
-
-import org.springframework.stereotype.Controller;
-
-import java.util.List;
-
-import static com.casic.missiles.model.response.ResponseData.DEFAULT_SUCCESS_MESSAGE;
-
-/**
- * <p>
- * 作业现场表 前端控制器
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@Controller
-@RequestMapping("/site")
-@Api(tags = "作业现场管理")
-@RequiredArgsConstructor
-public class WorkSiteInfoController extends BaseController {
-
-
-    private final IWorkSiteInfoService workSiteInfoService;
-
-    @ApiOperation("新增作业现场")
-    @PostMapping("add")
-    @ResponseBody
-    public Object addWorkSite(@RequestBody WorkSiteDetailDTO workSiteDetailDTO){
-        workSiteInfoService.addWorkSiteInfo(workSiteDetailDTO);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("编辑作业现场")
-    @PostMapping("update")
-    @ResponseBody
-    public Object updateWorkSite(@RequestBody WorkSiteDetailDTO workSiteDetailDTO){
-        workSiteInfoService.updateWorkSiteInfo(workSiteDetailDTO);
-        return ResponseData.success();
-    }
-
-
-    @ApiOperation("删除作业现场")
-    @PostMapping("delete")
-    @ResponseBody
-    public Object delete(@ApiParam("作业现场id列表")@RequestBody List<Long> projectIds){
-        workSiteInfoService.deleteProjects(projectIds);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("查询作业现场详情")
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = WorkSiteDetailDTO.class),
-    })
-    @GetMapping("detail")
-    @ResponseBody
-    public Object delete(@ApiParam(value = "作业现场id", example = "0")@RequestParam Long projectId){
-        WorkSiteDetailDTO detailDTO = workSiteInfoService.getWorkSiteDetail(projectId);
-        return ResponseData.success(detailDTO);
-    }
-
-    @ApiOperation("分页列表查询")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "workTitle",value = "作业名称", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "workRoad",value = "所属道路", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "workPersonName",value = "责任人姓名", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "startDate",value = "注册开始日期", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "endDate",value = "注册结束日期", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "projectState",value = "当前状态（字典值）", dataType = "String", paramType = "query")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = WorkSiteInfo.class),
-    })
-    @GetMapping("listPage")
-    @ResponseBody
-    public Object listPage(String workTitle,String workRoad,String workPersonName,String projectState,String startDate,String endDate){
-        Page<WorkSiteInfo> page = PageFactory.defaultPage();
-        QueryWrapper<WorkSiteInfo> queryWrapper = new QueryWrapper<>();
-        if(StrUtil.isNotEmpty(workTitle)){
-            queryWrapper.like("WORK_TITLE",workTitle);
-        }
-        if(StrUtil.isNotEmpty(workRoad)){
-            queryWrapper.like("WORK_ROAD",workRoad);
-        }
-        if(StrUtil.isNotEmpty(workPersonName)){
-            queryWrapper.like("WORKER_NAME",workPersonName);
-        }
-        if(StrUtil.isNotEmpty(projectState)){
-            queryWrapper.eq("PROJECT_STATE",projectState);
-        }
-        if(StrUtil.isNotEmpty(startDate)){
-            queryWrapper.ge("br_work_site_info.CREATE_TIME",startDate + " 00:00:00");
-        }
-        if(StrUtil.isNotEmpty(endDate)){
-            queryWrapper.le("br_work_site_info.CREATE_TIME",endDate + " 23:59:59");
-        }
-        page = workSiteInfoService.selectListPage(page,queryWrapper);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-    @ApiOperation("开始作业")
-    @PostMapping("start")
-    @ResponseBody
-    public Object start(@ApiParam(value = "作业现场id",example = "0")@RequestParam Long projectId){
-        workSiteInfoService.start(projectId);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("完成作业")
-    @PostMapping("finish")
-    @ResponseBody
-    public Object finish(@ApiParam(value = "作业现场id", example = "0")@RequestParam Long projectId){
-        workSiteInfoService.finish(projectId);
-        return ResponseData.success();
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/WorkerController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/WorkerController.java
deleted file mode 100644
index 796f94c..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/WorkerController.java
+++ /dev/null
@@ -1,136 +0,0 @@
-package com.casic.missiles.modular.system.controller;
-
-
-import cn.hutool.core.util.ObjectUtil;
-import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.core.base.controller.BaseController;
-import com.casic.missiles.core.page.PageFactory;
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.DeviceDetailDTO;
-import com.casic.missiles.modular.system.entity.Device;
-import com.casic.missiles.modular.system.entity.Worker;
-import com.casic.missiles.modular.system.service.IWorkerService;
-import io.swagger.annotations.*;
-import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.*;
-
-import org.springframework.stereotype.Controller;
-
-import java.util.Date;
-import java.util.List;
-
-import static com.casic.missiles.model.response.ResponseData.DEFAULT_SUCCESS_MESSAGE;
-
-/**
- * <p>
- *  前端控制器
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@Controller
-@RequestMapping("/worker")
-@RequiredArgsConstructor
-@Api(tags = "人员管理接口")
-public class WorkerController extends BaseController {
-
-    private final IWorkerService workerService;
-
-    @ApiOperation("分页列表查询")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "name",value = "姓名", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "deptId",value = "所属部门", dataType = "Long", paramType = "query", example = "0"),
-            @ApiImplicitParam(name = "status",value = "当前状态（字典值）", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "startDate",value = "注册开始日期", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "endDate",value = "注册结束日期", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "workerType",value = "人员类型（字典值）", dataType = "String", paramType = "query")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = Worker.class),
-    })
-    @GetMapping("listPage")
-    @ResponseBody
-    public Object listPage(String name,Long deptId, String status,String startDate,String endDate,String workerType){
-        Page<Worker> page = PageFactory.defaultPage();
-        QueryWrapper<Worker> queryWrapper = new QueryWrapper<>();
-        if(StrUtil.isNotEmpty(name)){
-            queryWrapper.like("WORKER_NAME",name);
-        }
-        if(ObjectUtil.isNotEmpty(deptId)){
-            queryWrapper.eq("DEPT_ID",deptId);
-        }
-        if(StrUtil.isNotEmpty(workerType)){
-            queryWrapper.eq("WORKER_TYPE",workerType);
-        }
-        if(StrUtil.isNotEmpty(startDate)){
-            queryWrapper.ge("CREATE_TIME",startDate + " 00:00:00");
-        }
-        if(StrUtil.isNotEmpty(endDate)){
-            queryWrapper.le("CREATE_TIME",endDate + " 23:59:59");
-        }
-        if(StrUtil.isNotEmpty(status)){
-            queryWrapper.eq("`STATUS`",status);
-        }
-        page = workerService.selectListPage(page,queryWrapper);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-    @ApiOperation("新增人员")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "worker", value = "人员信息", dataType = "Worker", paramType = "body", required = true),
-            @ApiImplicitParam(name = "projectId", value = "项目ID(入场申请需要)", dataType = "Long", paramType = "query", example = "0")
-    })
-    @PostMapping("add")
-    @ResponseBody
-    public Object add(@ApiParam("worker")@RequestBody Worker worker,
-                      @RequestParam(required = false) Long projectId){
-        workerService.addWorker(worker,projectId);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("编辑人员")
-    @PostMapping("update")
-    @ResponseBody
-    public Object update(@RequestBody Worker worker){
-        workerService.updateById(worker);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("删除人员")
-    @PostMapping("delete")
-    @ResponseBody
-    public Object delete(@ApiParam("人员id列表")@RequestBody List<Long> workIds){
-        workerService.removeByIds(workIds);
-        return ResponseData.success();
-    }
-
-
-    @ApiOperation(value = "获取人脸图片",notes = "返回人脸图片url")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "cameraIp",value = "摄像头IP", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "cameraPort",value = "摄像头端口号", dataType = "String", paramType = "query"),
-    })
-    @GetMapping("/face/register")
-    @ResponseBody
-    public Object faceRegister(String cameraIp,String cameraPort){
-        return ResponseData.success(workerService.faceRegister(cameraIp, cameraPort));
-    }
-
-
-    @ApiOperation(value = "查询临时入场人员列表")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "projectId", value = "项目ID",required = true,dataType = "Long", paramType = "query", example = "0")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = Worker.class),
-    })
-    @GetMapping("/projectTempWorker")
-    @ResponseBody
-    public Object projectTempWorker(Long projectId){
-        return ResponseData.success(workerService.projectTempWorker(projectId));
-    }
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/AlarmTypeCountDTO.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/AlarmTypeCountDTO.java
deleted file mode 100644
index 1a165a1..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/AlarmTypeCountDTO.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.casic.missiles.modular.system.dto;
-
-import io.swagger.annotations.ApiModel;
-import lombok.Data;
-
-@ApiModel(value = "AlarmTypeCountDTO",description = "报警类型统计（首页）")
-@Data
-public class AlarmTypeCountDTO {
-
-    private String alarmType;
-    private String alarmTypeName;
-    private Integer alarmCount;
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/AlarmUpload.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/AlarmUpload.java
deleted file mode 100644
index 73d7799..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/AlarmUpload.java
+++ /dev/null
@@ -1,46 +0,0 @@
-package com.casic.missiles.modular.system.dto;
-
-import cn.hutool.core.util.StrUtil;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-@ApiModel(value = "AlarmUpload",description = "报警上传")
-@Data
-public class AlarmUpload {
-
-    @ApiModelProperty(value = "摄像头ip")
-    private String cameraIp;
-
-    @ApiModelProperty(value = "摄像头端口")
-    private String cameraPort;
-    @ApiModelProperty(value = "安全树甲烷设备ip")
-    private String gasIp;
-    @ApiModelProperty(value = "安全树甲烷设备端口")
-    private String gasPort;
-    @ApiModelProperty(value = "报警值")
-    private String alarmValue;
-    @ApiModelProperty(value = "报警时间")
-    private String alarmTime;
-    @ApiModelProperty(value = "报警类型")
-    private String alarmType;
-    @ApiModelProperty(value = "报警图片")
-    private String alarmImage;
-    @ApiModelProperty(value = "报警内容")
-    private String alarmContent;
-
-    @Override
-    public String toString() {
-        return "AlarmUpload{" +
-                "cameraIp='" + cameraIp + '\'' +
-                ", cameraPort='" + cameraPort + '\'' +
-                ", gasIp='" + gasIp + '\'' +
-                ", gasPort='" + gasPort + '\'' +
-                ", alarmValue='" + alarmValue + '\'' +
-                ", alarmTime='" + alarmTime + '\'' +
-                ", alarmType='" + alarmType + '\'' +
-                ", alarmImage='" + (StrUtil.isNotEmpty(alarmImage) ? alarmImage.substring(0,50) : "null") + '\'' +
-                ", alarmContent='" + alarmContent + '\'' +
-                '}';
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/DeviceDetailDTO.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/DeviceDetailDTO.java
deleted file mode 100644
index ea518d9..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/DeviceDetailDTO.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package com.casic.missiles.modular.system.dto;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.casic.missiles.modular.system.entity.Device;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-@ApiModel("DeviceDetailDTO")
-@Data
-public class DeviceDetailDTO extends Device {
-
-    @ApiModelProperty(value = "摄像头编号")
-    private String cameraCode;
-
-    @ApiModelProperty(value = "摄像头IP")
-    private String cameraIp;
-
-    @ApiModelProperty(value = "摄像头端口")
-    private String cameraPort;
-
-    @ApiModelProperty(value = "激甲编号")
-    private String gasCode;
-
-    @ApiModelProperty(value = "激甲IP")
-    private String gasIp;
-
-    @ApiModelProperty(value = "激甲端口")
-    private String gasPort;
-
-    @ApiModelProperty(value = "智能帽衬编号")
-    private String hatLiningCode;
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/WorkSiteDetailDTO.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/WorkSiteDetailDTO.java
deleted file mode 100644
index 29378ff..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/WorkSiteDetailDTO.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package com.casic.missiles.modular.system.dto;
-
-import com.casic.missiles.modular.system.entity.ProjectDevice;
-import com.casic.missiles.modular.system.entity.ProjectWorker;
-import com.casic.missiles.modular.system.entity.WorkSiteInfo;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.util.List;
-
-@Data
-@ApiModel("WorkSiteDetailDTO")
-public class WorkSiteDetailDTO extends WorkSiteInfo {
-
-    @ApiModelProperty(value = "安全树列表",dataType = "ProjectDevice")
-    private List<ProjectDevice> deviceList;
-
-    @ApiModelProperty(value = "人员列表",dataType = "ProjectWorker")
-    private List<ProjectWorker> workerList;
-
-
-
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/WorkerLocationDTO.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/WorkerLocationDTO.java
deleted file mode 100644
index 6fd7b24..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/WorkerLocationDTO.java
+++ /dev/null
@@ -1,68 +0,0 @@
-package com.casic.missiles.modular.system.dto;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-@ApiModel(value = "WorkerLocationDTO",description = "人员位置列表（首页）")
-@Data
-public class WorkerLocationDTO {
-
-    @ApiModelProperty("人员ID")
-    private Long workerId;
-
-    @ApiModelProperty("人员姓名")
-    private String workerName;
-
-    @ApiModelProperty("安全帽编号")
-    private String hatCode;
-
-    @ApiModelProperty("安全帽ID")
-    private Long hatId;
-
-    @ApiModelProperty("背心编号")
-    private String vastCode;
-
-    @ApiModelProperty("手环编号")
-    private String braceletCode;
-
-    @ApiModelProperty("位置")
-    private String location;
-
-    @ApiModelProperty("时间")
-    private String time;
-
-    @ApiModelProperty("经度")
-    private String lng;
-
-    @ApiModelProperty("纬度")
-    private String lat;
-
-    @ApiModelProperty("心率")
-    private String heartRate;
-
-    @ApiModelProperty("血氧")
-    private String bloodOxygen;
-
-    @ApiModelProperty("一氧化碳")
-    private String co;
-
-    @ApiModelProperty("甲烷")
-    private String gas;
-
-    @ApiModelProperty("硫化氢")
-    private String h2s;
-
-    @ApiModelProperty("氧气")
-    private String o2;
-
-    @ApiModelProperty("信号")
-    private String signal;
-
-    @ApiModelProperty("电量")
-    private String cell;
-
-    @ApiModelProperty("是否报警")
-    private boolean alarmFlag;
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Alarm.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Alarm.java
new file mode 100644
index 0000000..4d2b7ef
--- /dev/null
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Alarm.java
@@ -0,0 +1,103 @@
+package com.casic.missiles.modular.system.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import java.util.Date;
+
+/**
+ * <p>
+ * 报警记录表
+ * </p>
+ *
+ * @author zyj
+ * @since 2023-05-25
+ */
+@Data
+@TableName("bus_alarm")
+public class Alarm implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    @TableId(value = "ID",type = IdType.ASSIGN_ID)
+    private Long id;
+
+    /**
+     * 设备ID
+     */
+    @TableField("DEVICE_ID")
+    private Long deviceId;
+
+    /**
+     * 报警类型
+     */
+    @TableField("ALARM_TYPE")
+    private String alarmType;
+
+    /**
+     * 报警时间
+     */
+    @TableField("ALARM_TIME")
+    private Date alarmTime;
+
+    /**
+     * 报警状态
+     */
+    @TableField("ALARM_STATUS")
+    private String alarmStatus;
+
+    /**
+     * 报警位置
+     */
+    @TableField("ALARM_LOCATION")
+    private String alarmLocation;
+
+    /**
+     * 报警图片
+     */
+    @TableField("ALARM_IMAGE")
+    private String alarmImage;
+
+    /**
+     * 视频通道号
+     */
+    @TableField("CHANNEL_NO")
+    private Integer channelNo;
+
+    /**
+     * 报警内容
+     */
+    @TableField("ALARM_CONTENT")
+    private String alarmContent;
+
+    /**
+     * 消警时间
+     */
+    @TableField("CANCEL_TIME")
+    private Date cancelTime;
+
+
+    @Override
+    public String toString() {
+        return "Alarm{" +
+            "id=" + id +
+            ", deviceId=" + deviceId +
+            ", alarmType=" + alarmType +
+            ", alarmTime=" + alarmTime +
+            ", alarmStatus=" + alarmStatus +
+            ", alarmLocation=" + alarmLocation +
+            ", alarmImage=" + alarmImage +
+            ", channelNo=" + channelNo +
+            ", alarmContent=" + alarmContent +
+            ", cancelTime=" + cancelTime +
+        "}";
+    }
+}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusAlarm.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusAlarm.java
deleted file mode 100644
index efb4a23..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusAlarm.java
+++ /dev/null
@@ -1,159 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.alibaba.fastjson.annotation.JSONField;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.time.LocalDateTime;
-import java.util.Date;
-
-/**
- * <p>
- * 报警记录表
- * </p>
- *
- * @author zyj
- * @since 2023-05-16
- */
-@Data
-@ApiModel("Alarm")
-@TableName("br_bus_alarm")
-public class BusAlarm implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 项目ID
-     */
-    @ApiModelProperty(value = "项目ID")
-    @TableField("PROJECT_ID")
-    private Long projectId;
-
-    /**
-     * 设备ID
-     */
-    @ApiModelProperty(value = "设备ID")
-    @TableField("DEVICE_ID")
-    private Long deviceId;
-
-    /**
-     * 报警类型
-     */
-    @ApiModelProperty(value = "报警类型")
-    @TableField("ALARM_TYPE")
-    private String alarmType;
-
-    /**
-     * 报警状态
-     */
-    @ApiModelProperty(value = "报警状态")
-    @TableField("ALARM_STATUS")
-    private String alarmStatus;
-
-    /**
-     * 报警值
-     */
-    @ApiModelProperty(value = "报警值")
-    @TableField("ALARM_VALUE")
-    private String alarmValue;
-
-    /**
-     * 报警图片
-     */
-    @ApiModelProperty(value = "报警图片")
-    @TableField("ALARM_IMAGE")
-    private String alarmImage;
-
-    /**
-     * 报警内容
-     */
-    @ApiModelProperty(value = "报警内容")
-    @TableField("ALARM_CONTENT")
-    private String alarmContent;
-
-    /**
-     * 报警时间
-     */
-    @ApiModelProperty(value = "报警时间")
-    @TableField("ALARM_TIME")
-    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
-    private Date alarmTime;
-
-    /**
-     * 消警时间
-     */
-    @ApiModelProperty(value = "消警时间")
-    @TableField("CANCEL_TIME")
-    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
-    private Date cancelTime;
-
-    /**
-     * 报警位置经度
-     */
-    @ApiModelProperty(value = "报警位置经度")
-    @TableField("ALARM_LNG")
-    private String alarmLng;
-
-    /**
-     * 报警位置纬度
-     */
-    @ApiModelProperty(value = "报警位置纬度")
-    @TableField("ALARM_LAT")
-    private String alarmLat;
-
-    @ApiModelProperty("报警类型名称")
-    @TableField(exist = false)
-    private String alarmStatusName;
-    @ApiModelProperty("报警类型名称")
-    @TableField(exist = false)
-    private String alarmTypeName;
-    @ApiModelProperty("作业名称")
-    @TableField(exist = false)
-    private String workTitle;
-    @ApiModelProperty("所属道路")
-    @TableField(exist = false)
-    private String workRoad;
-    @ApiModelProperty("作业状态")
-    @TableField(exist = false)
-    private String projectState;
-    @ApiModelProperty("作业状态名称")
-    @TableField(exist = false)
-    private String projectStateName;
-    @ApiModelProperty("负责人姓名")
-    @TableField(exist = false)
-    private String workPersonName;
-    @ApiModelProperty("负责人联系方式")
-    @TableField(exist = false)
-    private String workPersonPhoneNumber;
-
-
-    @Override
-    public String toString() {
-        return "BusAlarm{" +
-                "id=" + id +
-                ", projectId=" + projectId +
-                ", deviceId=" + deviceId +
-                ", alarmType=" + alarmType +
-                ", alarmValue=" + alarmValue +
-                ", alarmStatus=" + alarmStatus +
-                ", alarmImage=" + alarmImage +
-                ", alarmContent=" + alarmContent +
-                ", alarmTime=" + alarmTime +
-                ", cancelTime=" + cancelTime +
-                ", alarmLng=" + alarmLng +
-                ", alarmLat=" + alarmLat +
-                "}";
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusEvent.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusEvent.java
deleted file mode 100644
index a0b7543..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusEvent.java
+++ /dev/null
@@ -1,100 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.time.LocalDateTime;
-import java.util.Date;
-import java.util.List;
-
-/**
- * <p>
- * 事件表
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@TableName("br_bus_event")
-@Data
-@ApiModel("BusEvent")
-public class BusEvent implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @ApiModelProperty("事件ID")
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 事件标题
-     */
-    @ApiModelProperty("事件名称")
-    @TableField("EVENT_TITLE")
-    private String eventTitle;
-
-    /**
-     * 上报人员
-     */
-    @ApiModelProperty("上报人员")
-    @TableField("UPLOAD_NAME")
-    private String uploadName;
-
-    /**
-     * 联系方式
-     */
-    @ApiModelProperty("联系方式")
-    @TableField("PHONE_NUMBER")
-    private String phoneNumber;
-
-    /**
-     * 事件描述
-     */
-    @ApiModelProperty("事件描述")
-    @TableField("EVENT_DESCRIPTION")
-    private String eventDescription;
-
-    @ApiModelProperty("经度")
-    @TableField("LNG")
-    private String lng;
-
-    @ApiModelProperty("纬度")
-    @TableField("LAT")
-    private String lat;
-
-    /**
-     * 事件上传时间
-     */
-    @ApiModelProperty("事件上传时间")
-    @TableField("CREATE_TIME")
-    private Date createTime;
-
-    @ApiModelProperty("事件照片")
-    @TableField(exist = false)
-    private List<BusEventImage> imageList;
-
-
-
-    @Override
-    public String toString() {
-        return "BusEvent{" +
-            "id=" + id +
-            ", eventTitle=" + eventTitle +
-            ", uploadName=" + uploadName +
-            ", phoneNumber=" + phoneNumber +
-            ", eventDescription=" + eventDescription +
-            ", lng=" + lng +
-            ", lat=" + lat +
-            ", createTime=" + createTime +
-        "}";
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusEventImage.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusEventImage.java
deleted file mode 100644
index 1e75245..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusEventImage.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-
-/**
- * <p>
- * 事件图片表
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@TableName("br_bus_event_image")
-@Data
-@ApiModel("BusEventImage")
-public class BusEventImage implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 事件ID
-     */
-    @TableField("EVENT_ID")
-    private Long eventId;
-
-    /**
-     * 报警图片
-     */
-    @TableField("IMAGE")
-    @ApiModelProperty("图片url")
-    private String image;
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Device.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Device.java
index df89c70..ea7db5f 100644
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Device.java
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Device.java
@@ -1,30 +1,23 @@
 package com.casic.missiles.modular.system.entity;
 
-import com.alibaba.fastjson.annotation.JSONField;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.casic.missiles.core.base.json.DateDeserializer;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
-import java.util.Date;
 
 /**
  * <p>
- * 
+ * 设备记录表
  * </p>
  *
  * @author zyj
- * @since 2023-04-14
+ * @since 2023-05-25
  */
-@ApiModel("Device")
-@TableName("br_device")
 @Data
+@TableName("bus_device")
 public class Device implements Serializable {
 
     private static final long serialVersionUID = 1L;
@@ -32,82 +25,86 @@
     /**
      * 主键
      */
-    @ApiModelProperty(value = "设备ID")
     @TableId(value = "ID",type = IdType.ASSIGN_ID)
     private Long id;
 
     /**
-     * 设备编号
+     * 设备名称
      */
-    @ApiModelProperty(value = "设备编号")
-    @TableField("DEVICE_CODE")
-    private String deviceCode;
+    @TableField("DEVICE_NAME")
+    private String deviceName;
 
     /**
-     * 设备类型
+     * IP
      */
-    @ApiModelProperty(value = "设备类型")
-    @TableField("DEVICE_TYPE")
-    private String deviceType;
+    @TableField("IP")
+    private String ip;
 
     /**
-     * 设备批次
+     * 端口
      */
-    @ApiModelProperty(value = "设备批次")
-    @TableField("DEVICE_BATCH")
-    private String deviceBatch;
+    @TableField("PORT")
+    private String port;
 
     /**
-     * 厂家
+     * 用户名
      */
-    @ApiModelProperty(value = "厂家")
-    @TableField("MANUFACTURER")
-    private String manufacturer;
+    @TableField("USER_NAME")
+    private String userName;
 
     /**
-     * 是否供电
+     * 密码
      */
-    @ApiModelProperty(value = "是否供电")
-    @TableField("IS_POWER_SUPPLY")
-    private String isPowerSupply;
+    @TableField("PASSWORD")
+    private String password;
 
     /**
-     * 创建时间
+     * 连接类型
      */
-    @ApiModelProperty(value = "创建时间",dataType = "Date")
-    @TableField("CREATE_TIME")
-    private Date createTime;
+    @TableField("CONNECT_TYPE")
+    private String connectType;
 
-    @ApiModelProperty(value = "设备类型名称")
-    @TableField(exist = false)
-    private String deviceTypeName;
+    /**
+     * 位置
+     */
+    @TableField("LOCATION")
 
-    @ApiModelProperty(value = "是否供电名称")
-    @TableField(exist = false)
-    private String isPowerSupplyName;
+    private String location;
 
-    @ApiModelProperty(value = "注册时间",dataType = "String")
-    @TableField(exist = false)
-    private String registerTime;
+    /**
+     * 设备状态
+     */
+    @TableField("STATUS")
 
-    @ApiModelProperty(value = "当前状态")
-    @TableField(exist = false)
     private String status;
 
-    @ApiModelProperty(value = "当前状态名称")
-    @TableField(exist = false)
-    private String statusName;
+    /**
+     * 报警分组
+     */
+    @TableField("ALARM_GROUP")
+
+    private Long alarmGroup;
+
+    /**
+     * 视频通道数(预留)
+     */
+    @TableField("CHANNEL_NUM")
+    private Integer channelNum;
 
     @Override
     public String toString() {
         return "Device{" +
             "id=" + id +
-            ", deviceCode=" + deviceCode +
-            ", deviceType=" + deviceType +
-            ", deviceBatch=" + deviceBatch +
-            ", manufacturer=" + manufacturer +
-            ", isPowerSupply=" + isPowerSupply +
-            ", createTime=" + createTime +
+            ", deviceName=" + deviceName +
+            ", ip=" + ip +
+            ", port=" + port +
+            ", userName=" + userName +
+            ", password=" + password +
+            ", connectType=" + connectType +
+            ", location=" + location +
+            ", status=" + status +
+            ", alarmGroup=" + alarmGroup +
+            ", channelNum=" + channelNum +
         "}";
     }
 }
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/DeviceExt.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/DeviceExt.java
deleted file mode 100644
index 5ee7015..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/DeviceExt.java
+++ /dev/null
@@ -1,99 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-
-/**
- * <p>
- * 设备扩展信息表（安全树）
- * </p>
- *
- * @author zyj
- * @since 2023-04-27
- */
-@Data
-@TableName("br_device_ext")
-public class DeviceExt implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 设备ID
-     */
-    @TableField("DEVICE_ID")
-    private Long deviceId;
-
-    /**
-     * 摄像头编号
-     */
-    @TableField("CAMERA_CODE")
-    private String cameraCode;
-
-    /**
-     * 摄像头IP
-     */
-    @TableField("CAMERA_IP")
-    private String cameraIp;
-
-    /**
-     * 摄像头端口
-     */
-    @TableField("CAMERA_PORT")
-    private String cameraPort;
-
-    /**
-     * 激甲编号
-     */
-    @TableField("GAS_CODE")
-    private String gasCode;
-
-    /**
-     * 激甲IP
-     */
-    @TableField("GAS_IP")
-    private String gasIp;
-
-    /**
-     * 激甲端口
-     */
-    @TableField("GAS_PORT")
-    private String gasPort;
-
-    /**
-     * 甲烷报警阈值
-     */
-    @TableField("GAS_THRESHOLD")
-    private String gasThreshold;
-
-    @TableField(value = "HAT_LINING_CODE")
-    private String hatLiningCode;
-
-
-    @Override
-    public String toString() {
-        return "DeviceExt{" +
-            "id=" + id +
-            ", deviceId=" + deviceId +
-            ", cameraCode=" + cameraCode +
-            ", cameraIp=" + cameraIp +
-            ", cameraPort=" + cameraPort +
-            ", gasCode=" + gasCode +
-            ", gasIp=" + gasIp +
-            ", gasPort=" + gasPort +
-            ", gasThreshold=" + gasThreshold +
-            ", hatLiningCode=" + hatLiningCode +
-        "}";
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/ProjectDevice.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/ProjectDevice.java
deleted file mode 100644
index c4f3472..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/ProjectDevice.java
+++ /dev/null
@@ -1,62 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-
-/**
- * <p>
- * 
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@Data
-@ApiModel("ProjectDevice")
-@TableName("br_project_device")
-public class ProjectDevice implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 作业现场ID
-     */
-    @TableField("PROJECT_ID")
-    private Long projectId;
-
-    /**
-     * 设备ID
-     */
-    @TableField("DEVICE_ID")
-    @ApiModelProperty("设备ID（新增编辑时传）")
-    private Long deviceId;
-
-    /**
-     * 设备编号
-     */
-    @TableField(exist = false)
-    @ApiModelProperty("设备编号（详情中展示，新增编辑不用传）")
-    private String deviceCode;
-
-    @Override
-    public String toString() {
-        return "ProjectDevice{" +
-            "id=" + id +
-            ", projectId=" + projectId +
-            ", deviceId=" + deviceId +
-        "}";
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/ProjectWorker.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/ProjectWorker.java
deleted file mode 100644
index 10b23c4..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/ProjectWorker.java
+++ /dev/null
@@ -1,104 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import java.io.Serializable;
-
-/**
- * <p>
- * 
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@ApiModel("ProjectWorker")
-@TableName("br_project_worker")
-@Data
-@NoArgsConstructor
-@AllArgsConstructor
-public class ProjectWorker implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 作业现场ID
-     */
-    @TableField("PROJECT_ID")
-    private Long projectId;
-
-    /**
-     * 人员ID
-     */
-    @ApiModelProperty("人员ID")
-    @TableField("WORKER_ID")
-    private Long workerId;
-
-    /**
-     * 安全帽编号
-     */
-    @ApiModelProperty("安全帽编号")
-    @TableField("HAT_CODE")
-    private String hatCode;
-
-    /**
-     * 背心编号
-     */
-    @ApiModelProperty("背心编号")
-    @TableField("VAST_CODE")
-    private String vastCode;
-
-    /**
-     * 手环编号
-     */
-    @ApiModelProperty("手环编号")
-    @TableField("BRACELET_CODE")
-    private String braceletCode;
-
-    @ApiModelProperty("人员姓名（详情中展示，新增编辑不用传）")
-    @TableField(exist = false)
-    private String workerName;
-
-    @ApiModelProperty("人员部门ID（详情中展示，新增编辑不用传）")
-    @TableField(exist = false)
-    private String workerDeptId;
-
-    @ApiModelProperty("人员部门名称（详情中展示，新增编辑不用传）")
-    @TableField(exist = false)
-    private String workerDeptName;
-
-    @ApiModelProperty("人员联系方式（详情中展示，新增编辑不用传）")
-    @TableField(exist = false)
-    private String workerPhoneNumber;
-
-    public ProjectWorker(Long projectId, Long workerId) {
-        this.projectId = projectId;
-        this.workerId = workerId;
-    }
-
-    @Override
-    public String toString() {
-        return "ProjectWorker{" +
-            "id=" + id +
-            ", projectId=" + projectId +
-            ", workerId=" + workerId +
-            ", hatCode=" + hatCode +
-            ", vastCode=" + vastCode +
-            ", braceletCode=" + braceletCode +
-        "}";
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/WorkSiteInfo.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/WorkSiteInfo.java
deleted file mode 100644
index fa6f41d..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/WorkSiteInfo.java
+++ /dev/null
@@ -1,130 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.alibaba.fastjson.annotation.JSONField;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.time.LocalDateTime;
-import java.util.Date;
-
-/**
- * <p>
- * 作业现场表
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@ApiModel("WorkSiteInfo")
-@TableName("br_work_site_info")
-@Data
-public class WorkSiteInfo implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @ApiModelProperty("作业现场ID")
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 作业名称
-     */
-    @ApiModelProperty("作业名称")
-    @TableField("WORK_TITLE")
-    private String workTitle;
-
-    /**
-     * 责任人
-     */
-    @ApiModelProperty("责任人（人员ID）")
-    @TableField("WORK_PERSON")
-    private Long workPerson;
-
-    /**
-     * 作业描述
-     */
-    @ApiModelProperty("作业描述")
-    @TableField("WORK_SITE_DESC")
-    private String workSiteDesc;
-
-    /**
-     * 作业状态
-     */
-    @ApiModelProperty("作业状态")
-    @TableField("PROJECT_STATE")
-    private String projectState;
-
-    /**
-     * 所属道路
-     */
-    @ApiModelProperty("所属道路")
-    @TableField("WORK_ROAD")
-    private String workRoad;
-
-    @TableField("IMAGE_URL")
-    private String imageUrl;
-
-    @TableField("CREATE_TIME")
-    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
-    private Date createTime;
-    @TableField("UPDATE_TIME")
-    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
-    private Date updateTime;
-
-    @ApiModelProperty("开始时间")
-    @TableField("START_TIME")
-    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
-    private Date startTime;
-
-    @ApiModelProperty("结束时间")
-    @TableField("FINISH_TIME")
-    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
-    private Date finishTime;
-
-    @ApiModelProperty("负责人姓名（详情中使用，新增编辑不用传）")
-    @TableField(exist = false)
-    private String workPersonName;
-
-    @ApiModelProperty("负责人联系方式（详情中使用，新增编辑不用传）")
-    @TableField(exist = false)
-    private String workPersonPhoneNumber;
-
-    @ApiModelProperty("负责人所属部门ID（详情中使用，新增编辑不用传）")
-    @TableField(exist = false)
-    private Long workPersonDeptId;
-
-    @ApiModelProperty("负责人所属部门名称（详情中使用，新增编辑不用传）")
-    @TableField(exist = false)
-    private String workPersonDeptName;
-
-    @ApiModelProperty(value = "注册时间",dataType = "String")
-    @TableField(exist = false)
-    private String registerTime;
-
-    @ApiModelProperty("作业状态名称")
-    @TableField(exist = false)
-    private String projectStateName;
-
-    @Override
-    public String toString() {
-        return "WorkSiteInfo{" +
-            "id=" + id +
-            ", workTitle=" + workTitle +
-            ", workPerson=" + workPerson +
-            ", workSiteDesc=" + workSiteDesc +
-            ", projectState=" + projectState +
-            ", imageUrl=" + imageUrl +
-            ", updateTime=" + updateTime +
-            ", workRoad=" + workRoad +
-        "}";
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Worker.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Worker.java
deleted file mode 100644
index 28a4daa..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Worker.java
+++ /dev/null
@@ -1,147 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.time.LocalDateTime;
-import java.util.Date;
-
-/**
- * <p>
- * 
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@ApiModel("Worker")
-@TableName("br_worker")
-@Data
-public class Worker implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @ApiModelProperty(value = "人员ID")
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 姓名
-     */
-    @ApiModelProperty(value = "姓名")
-    @TableField("WORKER_NAME")
-    private String workerName;
-
-    /**
-     * 性别
-     */
-    @ApiModelProperty(value = "性别")
-    @TableField("GENDER")
-    private String gender;
-
-    /**
-     * 所属部门
-     */
-    @ApiModelProperty(value = "所属部门(人员管理)")
-    @TableField("DEPT_ID")
-    private Long deptId;
-
-    /**
-     * 所属单位
-     */
-    @ApiModelProperty(value = "所属单位(入场申请中使用)")
-    @TableField("OWNER_SHIP")
-    private String ownerShip;
-
-    /**
-     * 联系方式
-     */
-    @ApiModelProperty(value = "联系方式")
-    @TableField("PHONE_NUMBER")
-    private String phoneNumber;
-
-    /**
-     * 证件号
-     */
-    @ApiModelProperty(value = "证件号")
-    @TableField("ID_CARD_NUMBER")
-    private String idCardNumber;
-
-    /**
-     * 入场原因
-     */
-    @ApiModelProperty(value = "入场原因（入场申请中使用）")
-    @TableField("ENTER_REASON")
-    private String enterReason;
-
-    /**
-     * 入场人脸照片
-     */
-    @ApiModelProperty(value = "人脸照片（照片路径）")
-    @TableField("WORKER_AVATAR")
-    private String workerAvatar;
-
-    /**
-     * 申请入场时间
-     */
-    @ApiModelProperty(value = "注册时间/申请入场时间")
-    @TableField("CREATE_TIME")
-    private Date createTime;
-
-    /**
-     * 人员类型
-     */
-    @ApiModelProperty(value = "人员类型（区分人员管理和入场申请）")
-    @TableField("WORKER_TYPE")
-    private String workerType;
-
-    @ApiModelProperty(value = "性别名称")
-    @TableField(exist = false)
-    private String genderName;
-
-    @ApiModelProperty(value = "部门名称")
-    @TableField(exist = false)
-    private String deptName;
-
-    @ApiModelProperty(value = "注册时间",dataType = "String")
-    @TableField(exist = false)
-    private String registerTime;
-
-    @ApiModelProperty(value = "当前状态")
-    @TableField(exist = false)
-    private String status;
-
-    @ApiModelProperty(value = "当前状态名称")
-    @TableField(exist = false)
-    private String statusName;
-
-    @ApiModelProperty(value = "是否注册(0未注册；1已注册)",allowableValues = "0,1")
-    @TableField(exist = false)
-    private String isRegister;
-
-    @Override
-    public String toString() {
-        return "Worker{" +
-            "id=" + id +
-            ", workerName=" + workerName +
-            ", gender=" + gender +
-            ", deptId=" + deptId +
-            ", ownerShip=" + ownerShip +
-            ", phoneNumber=" + phoneNumber +
-            ", idCardNumber=" + idCardNumber +
-            ", enterReason=" + enterReason +
-            ", workerAvatar=" + workerAvatar +
-            ", createTime=" + createTime +
-            ", workerType=" + workerType +
-        "}";
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/AlarmMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/AlarmMapper.java
new file mode 100644
index 0000000..ea4c8be
--- /dev/null
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/AlarmMapper.java
@@ -0,0 +1,16 @@
+package com.casic.missiles.modular.system.mapper;
+
+import com.casic.missiles.modular.system.entity.Alarm;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 报警记录表 Mapper 接口
+ * </p>
+ *
+ * @author zyj
+ * @since 2023-05-25
+ */
+public interface AlarmMapper extends BaseMapper<Alarm> {
+
+}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/BusAlarmMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/BusAlarmMapper.java
deleted file mode 100644
index 9801742..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/BusAlarmMapper.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package com.casic.missiles.modular.system.mapper;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.modular.system.dto.AlarmTypeCountDTO;
-import com.casic.missiles.modular.system.entity.BusAlarm;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * <p>
- * 报警记录表 Mapper 接口
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface BusAlarmMapper extends BaseMapper<BusAlarm> {
-
-    Page<BusAlarm> listPage(Page<BusAlarm> page,@Param("ew")  QueryWrapper<BusAlarm> queryWrapper);
-
-    void cancelAlarm(@Param("deviceId")Long deviceId,@Param("alarmType") String alarmType);
-
-    List<AlarmTypeCountDTO> alarmCount(@Param("projectId")Long projectId, @Param("alarmStatus")String alarmStatus);
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/BusEventImageMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/BusEventImageMapper.java
deleted file mode 100644
index 9590b7d..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/BusEventImageMapper.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.casic.missiles.modular.system.mapper;
-
-import com.casic.missiles.modular.system.entity.BusEventImage;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * <p>
- * 事件图片表 Mapper 接口
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface BusEventImageMapper extends BaseMapper<BusEventImage> {
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/BusEventMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/BusEventMapper.java
deleted file mode 100644
index 3c85edf..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/BusEventMapper.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.casic.missiles.modular.system.mapper;
-
-import com.casic.missiles.modular.system.entity.BusEvent;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * <p>
- * 事件表 Mapper 接口
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface BusEventMapper extends BaseMapper<BusEvent> {
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/DeviceExtMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/DeviceExtMapper.java
deleted file mode 100644
index 4ca9212..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/DeviceExtMapper.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.casic.missiles.modular.system.mapper;
-
-import com.casic.missiles.modular.system.entity.DeviceExt;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * <p>
- * 设备扩展信息表（安全树） Mapper 接口
- * </p>
- *
- * @author zyj
- * @since 2023-04-27
- */
-public interface DeviceExtMapper extends BaseMapper<DeviceExt> {
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/DeviceMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/DeviceMapper.java
index 444c0c5..3d0bb02 100644
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/DeviceMapper.java
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/DeviceMapper.java
@@ -1,30 +1,16 @@
 package com.casic.missiles.modular.system.mapper;
 
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.modular.system.dto.DeviceDetailDTO;
-import com.casic.missiles.modular.system.dto.HelmetInfoDTO;
 import com.casic.missiles.modular.system.entity.Device;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
 
 /**
  * <p>
- *  Mapper 接口
+ * 设备记录表 Mapper 接口
  * </p>
  *
  * @author zyj
- * @since 2023-04-14
+ * @since 2023-05-25
  */
-@Mapper
 public interface DeviceMapper extends BaseMapper<Device> {
 
-    Page<DeviceDetailDTO> listDetailPage(Page<DeviceDetailDTO> page,@Param("ew") QueryWrapper<DeviceDetailDTO> ew);
-
-     List<Long> selectProjectDevice(@Param("projectId") Long projectId);
-
-    List<HelmetInfoDTO> selectHelmetList(@Param("deviceType")String deviceType);
 }
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/ProjectDeviceMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/ProjectDeviceMapper.java
deleted file mode 100644
index 1d0c14e..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/ProjectDeviceMapper.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package com.casic.missiles.modular.system.mapper;
-
-import com.casic.missiles.modular.system.dto.DeviceLocationDTO;
-import com.casic.missiles.modular.system.entity.ProjectDevice;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * <p>
- *  Mapper 接口
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface ProjectDeviceMapper extends BaseMapper<ProjectDevice> {
-     List<ProjectDevice> selectDetailByProjectId(@Param("projectId") Long projectId);
-
-     List<DeviceLocationDTO> selectDeviceLocationList(@Param("projectId") Long projectId);
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/ProjectWorkerMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/ProjectWorkerMapper.java
deleted file mode 100644
index 58583d1..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/ProjectWorkerMapper.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package com.casic.missiles.modular.system.mapper;
-
-import com.casic.missiles.modular.system.dto.WorkerLocationDTO;
-import com.casic.missiles.modular.system.entity.ProjectWorker;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * <p>
- *  Mapper 接口
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface ProjectWorkerMapper extends BaseMapper<ProjectWorker> {
-
-    List<ProjectWorker> selectDetailByProjectId(@Param("projectId") Long projectId,
-                                                @Param("workerType")String workerType);
-
-    List<WorkerLocationDTO> selectWorkerLocationList(@Param("projectId") Long projectId,
-                                                     @Param("workerType")String workerType);
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/WorkSiteInfoMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/WorkSiteInfoMapper.java
deleted file mode 100644
index a4934d2..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/WorkSiteInfoMapper.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.casic.missiles.modular.system.mapper;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.modular.system.entity.WorkSiteInfo;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Param;
-
-/**
- * <p>
- * 作业现场表 Mapper 接口
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface WorkSiteInfoMapper extends BaseMapper<WorkSiteInfo> {
-
-    Page<WorkSiteInfo> selectListPage(Page<WorkSiteInfo> page,@Param("ew") QueryWrapper<WorkSiteInfo> ew);
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/WorkerMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/WorkerMapper.java
deleted file mode 100644
index 258fb12..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/WorkerMapper.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package com.casic.missiles.modular.system.mapper;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.modular.system.dto.DeviceDetailDTO;
-import com.casic.missiles.modular.system.entity.Worker;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * <p>
- *  Mapper 接口
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface WorkerMapper extends BaseMapper<Worker> {
-
-
-    Page<Worker> selectListPage(Page<Worker> page, @Param("ew") QueryWrapper<Worker> ew);
-
-    List<String> selectWorkerAvatars(@Param("projectId")Long projectId);
-
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/AlarmMapper.xml b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/AlarmMapper.xml
new file mode 100644
index 0000000..25cb4ab
--- /dev/null
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/AlarmMapper.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.modular.system.mapper.AlarmMapper">
+
+</mapper>
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/BusAlarmMapper.xml b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/BusAlarmMapper.xml
deleted file mode 100644
index 595088a..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/BusAlarmMapper.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.casic.missiles.modular.system.mapper.BusAlarmMapper">
-
-    <select id="listPage" resultType="com.casic.missiles.modular.system.entity.BusAlarm">
-        SELECT
-            alarm.ID as id,
-            alarm.DEVICE_ID as deviceId,
-            alarm.PROJECT_ID as projectId,
-            alarm.ALARM_TYPE as alarmType,
-            alarm.ALARM_VALUE as alarmValue,
-            alarm.ALARM_STATUS as alarmStatus,
-            alarm.ALARM_IMAGE AS alarmImage,
-            alarm.ALARM_CONTENT as alarmContent,
-            alarm.ALARM_TIME as alarmTime,
-            alarm.CANCEL_TIME as cancelTime,
-            alarm.ALARM_LNG as alarmLng,
-            alarm.ALARM_LAT as alarmLat,
-            p.WORK_TITLE as workTitle,
-            p.WORK_ROAD as workRoad,
-            p.PROJECT_STATE as projectState,
-            w.WORKER_NAME as workPersonName,
-            w.PHONE_NUMBER as workPersonPhoneNumber
-        FROM
-            `br_bus_alarm` alarm
-                LEFT JOIN br_work_site_info p on alarm.PROJECT_ID = p.ID
-                LEFT JOIN br_worker w on p.WORK_PERSON = w.ID
-        <where>
-            <if test="ew != null">
-                ${ew.sqlSegment}
-            </if>
-        </where>
-    </select>
-
-    <select id="cancelAlarm">
-        update br_bus_alarm
-        set ALARM_STATUS = '1'
-        where DEVICE_ID = #{deviceId}
-          and ALARM_TYPE = #{alarmType}
-          and ALARM_STATUS = '0'
-    </select>
-
-    <select id="alarmCount" resultType="com.casic.missiles.modular.system.dto.AlarmTypeCountDTO">
-        SELECT
-            ALARM_TYPE as alarmType,
-            count(*) as alarmCount
-        from br_bus_alarm
-        <where>
-            <if test="projectId != null and projectId !=''">
-                and PROJECT_ID = #{projectId}
-            </if>
-            <if test="alarmStatus != null and alarmStatus !=''">
-                and ALARM_STATUS = #{alarmStatus}
-            </if>
-        </where>
-        group by ALARM_TYPE
-    </select>
-</mapper>

diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/AlarmController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/AlarmController.java
new file mode 100644
index 0000000..1795cf1
--- /dev/null
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/AlarmController.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.modular.system.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.stereotype.Controller;
+
+/**
+ * <p>
+ * 报警记录表 前端控制器
+ * </p>
+ *
+ * @author zyj
+ * @since 2023-05-25
+ */
+@Controller
+@RequestMapping("/system/alarm")
+public class AlarmController {
+
+}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusAlarmController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusAlarmController.java
deleted file mode 100644
index 1f82ebb..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusAlarmController.java
+++ /dev/null
@@ -1,102 +0,0 @@
-package com.casic.missiles.modular.system.controller;
-
-
-import cn.hutool.core.util.ObjectUtil;
-import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.core.base.controller.BaseController;
-import com.casic.missiles.core.page.PageFactory;
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.AlarmUpload;
-import com.casic.missiles.modular.system.dto.DeviceDetailDTO;
-import com.casic.missiles.modular.system.entity.BusAlarm;
-import com.casic.missiles.modular.system.service.IBusAlarmService;
-import io.swagger.annotations.*;
-import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.*;
-
-import org.springframework.stereotype.Controller;
-
-import static com.casic.missiles.model.response.ResponseData.DEFAULT_SUCCESS_MESSAGE;
-import static com.casic.missiles.modular.system.consts.AlarmConst.ALARM_STATUS_MANUAL_CANCEL;
-
-/**
- * <p>
- * 报警记录表 前端控制器
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@Api(tags = "报警管理接口")
-@Controller
-@RequestMapping("/alarm")
-@RequiredArgsConstructor
-public class BusAlarmController extends BaseController {
-
-    private final IBusAlarmService alarmService;
-
-    @ApiOperation("报警上报接口")
-    @PostMapping("/upload")
-    @ResponseBody
-    public Object upload(@RequestBody AlarmUpload alarmUpload){
-        alarmService.alarmUpload(alarmUpload);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("报警列表分页查询")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "workTitle", value = "作业名称",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "projectId", value = "作业ID",dataType = "Long", paramType = "query",example = "0"),
-            @ApiImplicitParam(name = "alarmStatus", value = "报警状态",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "projectState", value = "作业状态",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "alarmType", value = "报警类型",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "alarmStartTime", value = "报警开始时间",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "alarmEndTime", value = "报警结束时间",dataType = "String", paramType = "query")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = BusAlarm.class),
-    })
-    @GetMapping("/listPage")
-    @ResponseBody
-    public Object listPage(String workTitle,Long projectId,String alarmStatus,String projectState,String alarmType,String alarmStartTime,String alarmEndTime){
-        Page<BusAlarm> page = PageFactory.defaultPage();
-        QueryWrapper<BusAlarm> queryWrapper = new QueryWrapper<>();
-        if(StrUtil.isNotEmpty(workTitle)){
-            queryWrapper.like("p.WORK_TITLE",workTitle);
-        }
-        if(ObjectUtil.isNotEmpty(projectId)){
-            queryWrapper.eq("alarm.PROJECT_ID",projectId);
-        }
-        if(StrUtil.isNotEmpty(alarmStatus)){
-            queryWrapper.eq("alarm.ALARM_STATUS",alarmStatus);
-        }
-        if(StrUtil.isNotEmpty(projectState)){
-            queryWrapper.eq("p.PROJECT_STATE",projectState);
-        }
-        if(StrUtil.isNotEmpty(alarmType)){
-            queryWrapper.eq("alarm.ALARM_TYPE",alarmType);
-        }
-        if(StrUtil.isNotEmpty(alarmStartTime)){
-            queryWrapper.ge("alarm.ALARM_TIME",alarmStartTime);
-        }
-        if(StrUtil.isNotEmpty(alarmEndTime)){
-            queryWrapper.le("alarm.ALARM_TIME",alarmEndTime);
-        }
-        page = alarmService.listPage(page,queryWrapper);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-    @ApiOperation("消警")
-    @PostMapping("/cancel")
-    @ResponseBody
-    public Object cancel(@RequestParam("alarmId") Long alarmId){
-        UpdateWrapper<BusAlarm> updateWrapper = new UpdateWrapper<>();
-        updateWrapper.eq("ID",alarmId);
-        updateWrapper.set("ALARM_STATUS",ALARM_STATUS_MANUAL_CANCEL);
-        alarmService.update(updateWrapper);
-        return ResponseData.success();
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusEventController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusEventController.java
deleted file mode 100644
index dde5aad..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusEventController.java
+++ /dev/null
@@ -1,41 +0,0 @@
-package com.casic.missiles.modular.system.controller;
-
-
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.entity.BusEvent;
-import com.casic.missiles.modular.system.service.IBusEventService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.ResponseBody;
-
-/**
- * <p>
- * 事件表 前端控制器
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@Controller
-@RequestMapping("/event")
-@Api(tags = "事件上报")
-@RequiredArgsConstructor
-public class BusEventController {
-
-    private final IBusEventService eventService;
-
-    @ApiOperation("事件上报")
-    @PostMapping("add")
-    @ResponseBody
-    public Object add(@RequestBody BusEvent busEvent){
-        eventService.saveBusEvent(busEvent);
-        return ResponseData.success();
-    }
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
index 03abc5f..aa50d78 100644
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
@@ -1,121 +1,20 @@
 package com.casic.missiles.modular.system.controller;
 
 
-import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.core.base.controller.BaseController;
-import com.casic.missiles.core.page.PageFactory;
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.DeviceDetailDTO;
-import com.casic.missiles.modular.system.entity.Device;
-import com.casic.missiles.modular.system.service.IDeviceExtService;
-import com.casic.missiles.modular.system.service.IDeviceService;
-import io.swagger.annotations.*;
-import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.RequestMapping;
 
 import org.springframework.stereotype.Controller;
 
-import java.time.LocalDateTime;
-import java.util.Date;
-import java.util.List;
-
-import static com.casic.missiles.model.response.ResponseData.DEFAULT_SUCCESS_MESSAGE;
-
 /**
  * <p>
- *  前端控制器
+ * 设备记录表 前端控制器
  * </p>
  *
  * @author zyj
- * @since 2023-04-14
+ * @since 2023-05-25
  */
-@Api(tags = "设备管理接口")
-@RequiredArgsConstructor
 @Controller
-@RequestMapping("/device")
-public class DeviceController extends BaseController {
-    private final IDeviceService deviceService;
-    private final IDeviceExtService deviceExtService;
-
-    @ApiOperation("设备分页列表")
-    @ApiImplicitParams({
-        @ApiImplicitParam(name = "deviceType", value = "设备类型",dataType = "String", paramType = "query"),
-        @ApiImplicitParam(name = "deviceCode", value = "设备编号",dataType = "String", paramType = "query"),
-        @ApiImplicitParam(name = "status", value = "设备状态",dataType = "String", paramType = "query"),
-        @ApiImplicitParam(name = "projectId", value = "作业ID（如果传此参数，列表中返回该作业使用的设备）",dataType = "Long", paramType = "query", example = "0")
-    })
-    @ApiResponses({
-        @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = DeviceDetailDTO.class),
-    })
-    @GetMapping("listPage")
-    @ResponseBody
-    public Object listPage(String deviceType, String deviceCode, String status,Long projectId){
-        Page<DeviceDetailDTO> page = PageFactory.defaultPage();
-        QueryWrapper<DeviceDetailDTO> queryWrapper = new QueryWrapper<>();
-        if(StrUtil.isNotEmpty(deviceType)){
-            queryWrapper.eq("DEVICE_TYPE",deviceType);
-        }
-        if(StrUtil.isNotEmpty(deviceCode)){
-            queryWrapper.like("DEVICE_CODE",deviceCode);
-        }
-        page = deviceService.listPage(page,queryWrapper,status,projectId);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-    @ApiOperation("新增设备")
-    @PostMapping("add")
-    @ResponseBody
-    public Object add(@RequestBody DeviceDetailDTO deviceDetailDTO){
-        deviceService.saveDevice(deviceDetailDTO);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("编辑设备")
-    @PostMapping("update")
-    @ResponseBody
-    public Object update(@RequestBody DeviceDetailDTO deviceDetailDTO){
-        deviceService.updateDevice(deviceDetailDTO);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("删除设备")
-    @PostMapping("delete")
-    @ResponseBody
-    public Object delete(@ApiParam("设备id列表")@RequestBody List<Long> deviceIds){
-        deviceService.deleteDevices(deviceIds);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("设置甲烷阈值")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "gasIp", value = "安全树甲烷设备IP",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "gasPort", value = "安全树甲烷端口",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "threshold", value = "甲烷阈值",dataType = "String", paramType = "query")
-    })
-    @PostMapping("setThreshold")
-    @ResponseBody
-    public Object setThreshold(String gasIp,String gasPort,String threshold){
-        deviceExtService.setGasThreshold(gasIp, gasPort, threshold);
-        return ResponseData.success();
-    }
-
-
-    @ApiOperation("查询甲烷阈值")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "gasIp", value = "安全树甲烷设备IP",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "gasPort", value = "安全树甲烷端口",dataType = "String", paramType = "query")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = "{\"code\": 200,\"data\": \"100\",\"message\": \"请求成功\",\"success\": true}",response = String.class),
-    })
-    @GetMapping("getThreshold")
-    @ResponseBody
-    public Object getThreshold(String gasIp,String gasPort){
-        String data = deviceExtService.getGasThreshold(gasIp, gasPort);
-        return ResponseData.success(data);
-    }
-
+@RequestMapping("/system/device")
+public class DeviceController {
 
 }
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/OverviewController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/OverviewController.java
deleted file mode 100644
index 7570504..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/OverviewController.java
+++ /dev/null
@@ -1,70 +0,0 @@
-package com.casic.missiles.modular.system.controller;
-
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.AlarmTypeCountDTO;
-import com.casic.missiles.modular.system.dto.DeviceLocationDTO;
-import com.casic.missiles.modular.system.dto.WorkerLocationDTO;
-import com.casic.missiles.modular.system.service.IBusAlarmService;
-import com.casic.missiles.modular.system.service.IProjectDeviceService;
-import com.casic.missiles.modular.system.service.IProjectWorkerService;
-import io.swagger.annotations.*;
-import lombok.RequiredArgsConstructor;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.ResponseBody;
-
-import static com.casic.missiles.model.response.ResponseData.DEFAULT_SUCCESS_MESSAGE;
-import static com.casic.missiles.modular.system.consts.AlarmConst.ALARM_STATUS_ON;
-
-@Api(tags = "首页看板接口")
-@Controller
-@RequestMapping("overview")
-@RequiredArgsConstructor
-public class OverviewController {
-
-    private final IBusAlarmService alarmService;
-    private final IProjectDeviceService projectDeviceService;
-
-    private final IProjectWorkerService projectWorkerService;
-
-
-    @ApiOperation("报警统计接口")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "projectId", value = "作业ID",dataType = "Long", paramType = "query", example = "0")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = AlarmTypeCountDTO.class),
-    })
-    @GetMapping("/alarmCount")
-    @ResponseBody
-    public Object alarmCount(Long projectId){
-        return ResponseData.success(alarmService.alarmCount(projectId,ALARM_STATUS_ON));
-    }
-
-    @ApiOperation("设备列表接口")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "projectId", value = "作业ID",dataType = "Long", paramType = "query", example = "0")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = DeviceLocationDTO.class),
-    })
-    @GetMapping("/deviceList")
-    @ResponseBody
-    public Object deviceList(Long projectId){
-        return ResponseData.success(projectDeviceService.selectDeviceLocationList(projectId));
-    }
-
-    @ApiOperation("人员列表接口")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "projectId", value = "作业ID",dataType = "Long", paramType = "query", example = "0")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = WorkerLocationDTO.class),
-    })
-    @GetMapping("/workerList")
-    @ResponseBody
-    public Object workerList(Long projectId){
-        return ResponseData.success(projectWorkerService.selectWorkerLocationDTO(projectId));
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/WorkSiteInfoController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/WorkSiteInfoController.java
deleted file mode 100644
index af36d69..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/WorkSiteInfoController.java
+++ /dev/null
@@ -1,130 +0,0 @@
-package com.casic.missiles.modular.system.controller;
-
-
-import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.core.base.controller.BaseController;
-import com.casic.missiles.core.page.PageFactory;
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.WorkSiteDetailDTO;
-import com.casic.missiles.modular.system.entity.WorkSiteInfo;
-import com.casic.missiles.modular.system.service.IWorkSiteInfoService;
-import io.swagger.annotations.*;
-import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.*;
-
-import org.springframework.stereotype.Controller;
-
-import java.util.List;
-
-import static com.casic.missiles.model.response.ResponseData.DEFAULT_SUCCESS_MESSAGE;
-
-/**
- * <p>
- * 作业现场表 前端控制器
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@Controller
-@RequestMapping("/site")
-@Api(tags = "作业现场管理")
-@RequiredArgsConstructor
-public class WorkSiteInfoController extends BaseController {
-
-
-    private final IWorkSiteInfoService workSiteInfoService;
-
-    @ApiOperation("新增作业现场")
-    @PostMapping("add")
-    @ResponseBody
-    public Object addWorkSite(@RequestBody WorkSiteDetailDTO workSiteDetailDTO){
-        workSiteInfoService.addWorkSiteInfo(workSiteDetailDTO);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("编辑作业现场")
-    @PostMapping("update")
-    @ResponseBody
-    public Object updateWorkSite(@RequestBody WorkSiteDetailDTO workSiteDetailDTO){
-        workSiteInfoService.updateWorkSiteInfo(workSiteDetailDTO);
-        return ResponseData.success();
-    }
-
-
-    @ApiOperation("删除作业现场")
-    @PostMapping("delete")
-    @ResponseBody
-    public Object delete(@ApiParam("作业现场id列表")@RequestBody List<Long> projectIds){
-        workSiteInfoService.deleteProjects(projectIds);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("查询作业现场详情")
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = WorkSiteDetailDTO.class),
-    })
-    @GetMapping("detail")
-    @ResponseBody
-    public Object delete(@ApiParam(value = "作业现场id", example = "0")@RequestParam Long projectId){
-        WorkSiteDetailDTO detailDTO = workSiteInfoService.getWorkSiteDetail(projectId);
-        return ResponseData.success(detailDTO);
-    }
-
-    @ApiOperation("分页列表查询")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "workTitle",value = "作业名称", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "workRoad",value = "所属道路", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "workPersonName",value = "责任人姓名", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "startDate",value = "注册开始日期", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "endDate",value = "注册结束日期", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "projectState",value = "当前状态（字典值）", dataType = "String", paramType = "query")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = WorkSiteInfo.class),
-    })
-    @GetMapping("listPage")
-    @ResponseBody
-    public Object listPage(String workTitle,String workRoad,String workPersonName,String projectState,String startDate,String endDate){
-        Page<WorkSiteInfo> page = PageFactory.defaultPage();
-        QueryWrapper<WorkSiteInfo> queryWrapper = new QueryWrapper<>();
-        if(StrUtil.isNotEmpty(workTitle)){
-            queryWrapper.like("WORK_TITLE",workTitle);
-        }
-        if(StrUtil.isNotEmpty(workRoad)){
-            queryWrapper.like("WORK_ROAD",workRoad);
-        }
-        if(StrUtil.isNotEmpty(workPersonName)){
-            queryWrapper.like("WORKER_NAME",workPersonName);
-        }
-        if(StrUtil.isNotEmpty(projectState)){
-            queryWrapper.eq("PROJECT_STATE",projectState);
-        }
-        if(StrUtil.isNotEmpty(startDate)){
-            queryWrapper.ge("br_work_site_info.CREATE_TIME",startDate + " 00:00:00");
-        }
-        if(StrUtil.isNotEmpty(endDate)){
-            queryWrapper.le("br_work_site_info.CREATE_TIME",endDate + " 23:59:59");
-        }
-        page = workSiteInfoService.selectListPage(page,queryWrapper);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-    @ApiOperation("开始作业")
-    @PostMapping("start")
-    @ResponseBody
-    public Object start(@ApiParam(value = "作业现场id",example = "0")@RequestParam Long projectId){
-        workSiteInfoService.start(projectId);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("完成作业")
-    @PostMapping("finish")
-    @ResponseBody
-    public Object finish(@ApiParam(value = "作业现场id", example = "0")@RequestParam Long projectId){
-        workSiteInfoService.finish(projectId);
-        return ResponseData.success();
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/WorkerController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/WorkerController.java
deleted file mode 100644
index 796f94c..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/WorkerController.java
+++ /dev/null
@@ -1,136 +0,0 @@
-package com.casic.missiles.modular.system.controller;
-
-
-import cn.hutool.core.util.ObjectUtil;
-import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.core.base.controller.BaseController;
-import com.casic.missiles.core.page.PageFactory;
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.DeviceDetailDTO;
-import com.casic.missiles.modular.system.entity.Device;
-import com.casic.missiles.modular.system.entity.Worker;
-import com.casic.missiles.modular.system.service.IWorkerService;
-import io.swagger.annotations.*;
-import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.*;
-
-import org.springframework.stereotype.Controller;
-
-import java.util.Date;
-import java.util.List;
-
-import static com.casic.missiles.model.response.ResponseData.DEFAULT_SUCCESS_MESSAGE;
-
-/**
- * <p>
- *  前端控制器
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@Controller
-@RequestMapping("/worker")
-@RequiredArgsConstructor
-@Api(tags = "人员管理接口")
-public class WorkerController extends BaseController {
-
-    private final IWorkerService workerService;
-
-    @ApiOperation("分页列表查询")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "name",value = "姓名", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "deptId",value = "所属部门", dataType = "Long", paramType = "query", example = "0"),
-            @ApiImplicitParam(name = "status",value = "当前状态（字典值）", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "startDate",value = "注册开始日期", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "endDate",value = "注册结束日期", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "workerType",value = "人员类型（字典值）", dataType = "String", paramType = "query")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = Worker.class),
-    })
-    @GetMapping("listPage")
-    @ResponseBody
-    public Object listPage(String name,Long deptId, String status,String startDate,String endDate,String workerType){
-        Page<Worker> page = PageFactory.defaultPage();
-        QueryWrapper<Worker> queryWrapper = new QueryWrapper<>();
-        if(StrUtil.isNotEmpty(name)){
-            queryWrapper.like("WORKER_NAME",name);
-        }
-        if(ObjectUtil.isNotEmpty(deptId)){
-            queryWrapper.eq("DEPT_ID",deptId);
-        }
-        if(StrUtil.isNotEmpty(workerType)){
-            queryWrapper.eq("WORKER_TYPE",workerType);
-        }
-        if(StrUtil.isNotEmpty(startDate)){
-            queryWrapper.ge("CREATE_TIME",startDate + " 00:00:00");
-        }
-        if(StrUtil.isNotEmpty(endDate)){
-            queryWrapper.le("CREATE_TIME",endDate + " 23:59:59");
-        }
-        if(StrUtil.isNotEmpty(status)){
-            queryWrapper.eq("`STATUS`",status);
-        }
-        page = workerService.selectListPage(page,queryWrapper);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-    @ApiOperation("新增人员")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "worker", value = "人员信息", dataType = "Worker", paramType = "body", required = true),
-            @ApiImplicitParam(name = "projectId", value = "项目ID(入场申请需要)", dataType = "Long", paramType = "query", example = "0")
-    })
-    @PostMapping("add")
-    @ResponseBody
-    public Object add(@ApiParam("worker")@RequestBody Worker worker,
-                      @RequestParam(required = false) Long projectId){
-        workerService.addWorker(worker,projectId);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("编辑人员")
-    @PostMapping("update")
-    @ResponseBody
-    public Object update(@RequestBody Worker worker){
-        workerService.updateById(worker);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("删除人员")
-    @PostMapping("delete")
-    @ResponseBody
-    public Object delete(@ApiParam("人员id列表")@RequestBody List<Long> workIds){
-        workerService.removeByIds(workIds);
-        return ResponseData.success();
-    }
-
-
-    @ApiOperation(value = "获取人脸图片",notes = "返回人脸图片url")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "cameraIp",value = "摄像头IP", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "cameraPort",value = "摄像头端口号", dataType = "String", paramType = "query"),
-    })
-    @GetMapping("/face/register")
-    @ResponseBody
-    public Object faceRegister(String cameraIp,String cameraPort){
-        return ResponseData.success(workerService.faceRegister(cameraIp, cameraPort));
-    }
-
-
-    @ApiOperation(value = "查询临时入场人员列表")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "projectId", value = "项目ID",required = true,dataType = "Long", paramType = "query", example = "0")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = Worker.class),
-    })
-    @GetMapping("/projectTempWorker")
-    @ResponseBody
-    public Object projectTempWorker(Long projectId){
-        return ResponseData.success(workerService.projectTempWorker(projectId));
-    }
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/AlarmTypeCountDTO.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/AlarmTypeCountDTO.java
deleted file mode 100644
index 1a165a1..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/AlarmTypeCountDTO.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.casic.missiles.modular.system.dto;
-
-import io.swagger.annotations.ApiModel;
-import lombok.Data;
-
-@ApiModel(value = "AlarmTypeCountDTO",description = "报警类型统计（首页）")
-@Data
-public class AlarmTypeCountDTO {
-
-    private String alarmType;
-    private String alarmTypeName;
-    private Integer alarmCount;
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/AlarmUpload.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/AlarmUpload.java
deleted file mode 100644
index 73d7799..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/AlarmUpload.java
+++ /dev/null
@@ -1,46 +0,0 @@
-package com.casic.missiles.modular.system.dto;
-
-import cn.hutool.core.util.StrUtil;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-@ApiModel(value = "AlarmUpload",description = "报警上传")
-@Data
-public class AlarmUpload {
-
-    @ApiModelProperty(value = "摄像头ip")
-    private String cameraIp;
-
-    @ApiModelProperty(value = "摄像头端口")
-    private String cameraPort;
-    @ApiModelProperty(value = "安全树甲烷设备ip")
-    private String gasIp;
-    @ApiModelProperty(value = "安全树甲烷设备端口")
-    private String gasPort;
-    @ApiModelProperty(value = "报警值")
-    private String alarmValue;
-    @ApiModelProperty(value = "报警时间")
-    private String alarmTime;
-    @ApiModelProperty(value = "报警类型")
-    private String alarmType;
-    @ApiModelProperty(value = "报警图片")
-    private String alarmImage;
-    @ApiModelProperty(value = "报警内容")
-    private String alarmContent;
-
-    @Override
-    public String toString() {
-        return "AlarmUpload{" +
-                "cameraIp='" + cameraIp + '\'' +
-                ", cameraPort='" + cameraPort + '\'' +
-                ", gasIp='" + gasIp + '\'' +
-                ", gasPort='" + gasPort + '\'' +
-                ", alarmValue='" + alarmValue + '\'' +
-                ", alarmTime='" + alarmTime + '\'' +
-                ", alarmType='" + alarmType + '\'' +
-                ", alarmImage='" + (StrUtil.isNotEmpty(alarmImage) ? alarmImage.substring(0,50) : "null") + '\'' +
-                ", alarmContent='" + alarmContent + '\'' +
-                '}';
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/DeviceDetailDTO.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/DeviceDetailDTO.java
deleted file mode 100644
index ea518d9..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/DeviceDetailDTO.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package com.casic.missiles.modular.system.dto;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.casic.missiles.modular.system.entity.Device;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-@ApiModel("DeviceDetailDTO")
-@Data
-public class DeviceDetailDTO extends Device {
-
-    @ApiModelProperty(value = "摄像头编号")
-    private String cameraCode;
-
-    @ApiModelProperty(value = "摄像头IP")
-    private String cameraIp;
-
-    @ApiModelProperty(value = "摄像头端口")
-    private String cameraPort;
-
-    @ApiModelProperty(value = "激甲编号")
-    private String gasCode;
-
-    @ApiModelProperty(value = "激甲IP")
-    private String gasIp;
-
-    @ApiModelProperty(value = "激甲端口")
-    private String gasPort;
-
-    @ApiModelProperty(value = "智能帽衬编号")
-    private String hatLiningCode;
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/WorkSiteDetailDTO.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/WorkSiteDetailDTO.java
deleted file mode 100644
index 29378ff..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/WorkSiteDetailDTO.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package com.casic.missiles.modular.system.dto;
-
-import com.casic.missiles.modular.system.entity.ProjectDevice;
-import com.casic.missiles.modular.system.entity.ProjectWorker;
-import com.casic.missiles.modular.system.entity.WorkSiteInfo;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.util.List;
-
-@Data
-@ApiModel("WorkSiteDetailDTO")
-public class WorkSiteDetailDTO extends WorkSiteInfo {
-
-    @ApiModelProperty(value = "安全树列表",dataType = "ProjectDevice")
-    private List<ProjectDevice> deviceList;
-
-    @ApiModelProperty(value = "人员列表",dataType = "ProjectWorker")
-    private List<ProjectWorker> workerList;
-
-
-
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/WorkerLocationDTO.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/WorkerLocationDTO.java
deleted file mode 100644
index 6fd7b24..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/WorkerLocationDTO.java
+++ /dev/null
@@ -1,68 +0,0 @@
-package com.casic.missiles.modular.system.dto;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-@ApiModel(value = "WorkerLocationDTO",description = "人员位置列表（首页）")
-@Data
-public class WorkerLocationDTO {
-
-    @ApiModelProperty("人员ID")
-    private Long workerId;
-
-    @ApiModelProperty("人员姓名")
-    private String workerName;
-
-    @ApiModelProperty("安全帽编号")
-    private String hatCode;
-
-    @ApiModelProperty("安全帽ID")
-    private Long hatId;
-
-    @ApiModelProperty("背心编号")
-    private String vastCode;
-
-    @ApiModelProperty("手环编号")
-    private String braceletCode;
-
-    @ApiModelProperty("位置")
-    private String location;
-
-    @ApiModelProperty("时间")
-    private String time;
-
-    @ApiModelProperty("经度")
-    private String lng;
-
-    @ApiModelProperty("纬度")
-    private String lat;
-
-    @ApiModelProperty("心率")
-    private String heartRate;
-
-    @ApiModelProperty("血氧")
-    private String bloodOxygen;
-
-    @ApiModelProperty("一氧化碳")
-    private String co;
-
-    @ApiModelProperty("甲烷")
-    private String gas;
-
-    @ApiModelProperty("硫化氢")
-    private String h2s;
-
-    @ApiModelProperty("氧气")
-    private String o2;
-
-    @ApiModelProperty("信号")
-    private String signal;
-
-    @ApiModelProperty("电量")
-    private String cell;
-
-    @ApiModelProperty("是否报警")
-    private boolean alarmFlag;
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Alarm.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Alarm.java
new file mode 100644
index 0000000..4d2b7ef
--- /dev/null
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Alarm.java
@@ -0,0 +1,103 @@
+package com.casic.missiles.modular.system.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import java.util.Date;
+
+/**
+ * <p>
+ * 报警记录表
+ * </p>
+ *
+ * @author zyj
+ * @since 2023-05-25
+ */
+@Data
+@TableName("bus_alarm")
+public class Alarm implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    @TableId(value = "ID",type = IdType.ASSIGN_ID)
+    private Long id;
+
+    /**
+     * 设备ID
+     */
+    @TableField("DEVICE_ID")
+    private Long deviceId;
+
+    /**
+     * 报警类型
+     */
+    @TableField("ALARM_TYPE")
+    private String alarmType;
+
+    /**
+     * 报警时间
+     */
+    @TableField("ALARM_TIME")
+    private Date alarmTime;
+
+    /**
+     * 报警状态
+     */
+    @TableField("ALARM_STATUS")
+    private String alarmStatus;
+
+    /**
+     * 报警位置
+     */
+    @TableField("ALARM_LOCATION")
+    private String alarmLocation;
+
+    /**
+     * 报警图片
+     */
+    @TableField("ALARM_IMAGE")
+    private String alarmImage;
+
+    /**
+     * 视频通道号
+     */
+    @TableField("CHANNEL_NO")
+    private Integer channelNo;
+
+    /**
+     * 报警内容
+     */
+    @TableField("ALARM_CONTENT")
+    private String alarmContent;
+
+    /**
+     * 消警时间
+     */
+    @TableField("CANCEL_TIME")
+    private Date cancelTime;
+
+
+    @Override
+    public String toString() {
+        return "Alarm{" +
+            "id=" + id +
+            ", deviceId=" + deviceId +
+            ", alarmType=" + alarmType +
+            ", alarmTime=" + alarmTime +
+            ", alarmStatus=" + alarmStatus +
+            ", alarmLocation=" + alarmLocation +
+            ", alarmImage=" + alarmImage +
+            ", channelNo=" + channelNo +
+            ", alarmContent=" + alarmContent +
+            ", cancelTime=" + cancelTime +
+        "}";
+    }
+}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusAlarm.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusAlarm.java
deleted file mode 100644
index efb4a23..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusAlarm.java
+++ /dev/null
@@ -1,159 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.alibaba.fastjson.annotation.JSONField;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.time.LocalDateTime;
-import java.util.Date;
-
-/**
- * <p>
- * 报警记录表
- * </p>
- *
- * @author zyj
- * @since 2023-05-16
- */
-@Data
-@ApiModel("Alarm")
-@TableName("br_bus_alarm")
-public class BusAlarm implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 项目ID
-     */
-    @ApiModelProperty(value = "项目ID")
-    @TableField("PROJECT_ID")
-    private Long projectId;
-
-    /**
-     * 设备ID
-     */
-    @ApiModelProperty(value = "设备ID")
-    @TableField("DEVICE_ID")
-    private Long deviceId;
-
-    /**
-     * 报警类型
-     */
-    @ApiModelProperty(value = "报警类型")
-    @TableField("ALARM_TYPE")
-    private String alarmType;
-
-    /**
-     * 报警状态
-     */
-    @ApiModelProperty(value = "报警状态")
-    @TableField("ALARM_STATUS")
-    private String alarmStatus;
-
-    /**
-     * 报警值
-     */
-    @ApiModelProperty(value = "报警值")
-    @TableField("ALARM_VALUE")
-    private String alarmValue;
-
-    /**
-     * 报警图片
-     */
-    @ApiModelProperty(value = "报警图片")
-    @TableField("ALARM_IMAGE")
-    private String alarmImage;
-
-    /**
-     * 报警内容
-     */
-    @ApiModelProperty(value = "报警内容")
-    @TableField("ALARM_CONTENT")
-    private String alarmContent;
-
-    /**
-     * 报警时间
-     */
-    @ApiModelProperty(value = "报警时间")
-    @TableField("ALARM_TIME")
-    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
-    private Date alarmTime;
-
-    /**
-     * 消警时间
-     */
-    @ApiModelProperty(value = "消警时间")
-    @TableField("CANCEL_TIME")
-    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
-    private Date cancelTime;
-
-    /**
-     * 报警位置经度
-     */
-    @ApiModelProperty(value = "报警位置经度")
-    @TableField("ALARM_LNG")
-    private String alarmLng;
-
-    /**
-     * 报警位置纬度
-     */
-    @ApiModelProperty(value = "报警位置纬度")
-    @TableField("ALARM_LAT")
-    private String alarmLat;
-
-    @ApiModelProperty("报警类型名称")
-    @TableField(exist = false)
-    private String alarmStatusName;
-    @ApiModelProperty("报警类型名称")
-    @TableField(exist = false)
-    private String alarmTypeName;
-    @ApiModelProperty("作业名称")
-    @TableField(exist = false)
-    private String workTitle;
-    @ApiModelProperty("所属道路")
-    @TableField(exist = false)
-    private String workRoad;
-    @ApiModelProperty("作业状态")
-    @TableField(exist = false)
-    private String projectState;
-    @ApiModelProperty("作业状态名称")
-    @TableField(exist = false)
-    private String projectStateName;
-    @ApiModelProperty("负责人姓名")
-    @TableField(exist = false)
-    private String workPersonName;
-    @ApiModelProperty("负责人联系方式")
-    @TableField(exist = false)
-    private String workPersonPhoneNumber;
-
-
-    @Override
-    public String toString() {
-        return "BusAlarm{" +
-                "id=" + id +
-                ", projectId=" + projectId +
-                ", deviceId=" + deviceId +
-                ", alarmType=" + alarmType +
-                ", alarmValue=" + alarmValue +
-                ", alarmStatus=" + alarmStatus +
-                ", alarmImage=" + alarmImage +
-                ", alarmContent=" + alarmContent +
-                ", alarmTime=" + alarmTime +
-                ", cancelTime=" + cancelTime +
-                ", alarmLng=" + alarmLng +
-                ", alarmLat=" + alarmLat +
-                "}";
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusEvent.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusEvent.java
deleted file mode 100644
index a0b7543..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusEvent.java
+++ /dev/null
@@ -1,100 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.time.LocalDateTime;
-import java.util.Date;
-import java.util.List;
-
-/**
- * <p>
- * 事件表
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@TableName("br_bus_event")
-@Data
-@ApiModel("BusEvent")
-public class BusEvent implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @ApiModelProperty("事件ID")
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 事件标题
-     */
-    @ApiModelProperty("事件名称")
-    @TableField("EVENT_TITLE")
-    private String eventTitle;
-
-    /**
-     * 上报人员
-     */
-    @ApiModelProperty("上报人员")
-    @TableField("UPLOAD_NAME")
-    private String uploadName;
-
-    /**
-     * 联系方式
-     */
-    @ApiModelProperty("联系方式")
-    @TableField("PHONE_NUMBER")
-    private String phoneNumber;
-
-    /**
-     * 事件描述
-     */
-    @ApiModelProperty("事件描述")
-    @TableField("EVENT_DESCRIPTION")
-    private String eventDescription;
-
-    @ApiModelProperty("经度")
-    @TableField("LNG")
-    private String lng;
-
-    @ApiModelProperty("纬度")
-    @TableField("LAT")
-    private String lat;
-
-    /**
-     * 事件上传时间
-     */
-    @ApiModelProperty("事件上传时间")
-    @TableField("CREATE_TIME")
-    private Date createTime;
-
-    @ApiModelProperty("事件照片")
-    @TableField(exist = false)
-    private List<BusEventImage> imageList;
-
-
-
-    @Override
-    public String toString() {
-        return "BusEvent{" +
-            "id=" + id +
-            ", eventTitle=" + eventTitle +
-            ", uploadName=" + uploadName +
-            ", phoneNumber=" + phoneNumber +
-            ", eventDescription=" + eventDescription +
-            ", lng=" + lng +
-            ", lat=" + lat +
-            ", createTime=" + createTime +
-        "}";
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusEventImage.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusEventImage.java
deleted file mode 100644
index 1e75245..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusEventImage.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-
-/**
- * <p>
- * 事件图片表
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@TableName("br_bus_event_image")
-@Data
-@ApiModel("BusEventImage")
-public class BusEventImage implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 事件ID
-     */
-    @TableField("EVENT_ID")
-    private Long eventId;
-
-    /**
-     * 报警图片
-     */
-    @TableField("IMAGE")
-    @ApiModelProperty("图片url")
-    private String image;
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Device.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Device.java
index df89c70..ea7db5f 100644
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Device.java
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Device.java
@@ -1,30 +1,23 @@
 package com.casic.missiles.modular.system.entity;
 
-import com.alibaba.fastjson.annotation.JSONField;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.casic.missiles.core.base.json.DateDeserializer;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
-import java.util.Date;
 
 /**
  * <p>
- * 
+ * 设备记录表
  * </p>
  *
  * @author zyj
- * @since 2023-04-14
+ * @since 2023-05-25
  */
-@ApiModel("Device")
-@TableName("br_device")
 @Data
+@TableName("bus_device")
 public class Device implements Serializable {
 
     private static final long serialVersionUID = 1L;
@@ -32,82 +25,86 @@
     /**
      * 主键
      */
-    @ApiModelProperty(value = "设备ID")
     @TableId(value = "ID",type = IdType.ASSIGN_ID)
     private Long id;
 
     /**
-     * 设备编号
+     * 设备名称
      */
-    @ApiModelProperty(value = "设备编号")
-    @TableField("DEVICE_CODE")
-    private String deviceCode;
+    @TableField("DEVICE_NAME")
+    private String deviceName;
 
     /**
-     * 设备类型
+     * IP
      */
-    @ApiModelProperty(value = "设备类型")
-    @TableField("DEVICE_TYPE")
-    private String deviceType;
+    @TableField("IP")
+    private String ip;
 
     /**
-     * 设备批次
+     * 端口
      */
-    @ApiModelProperty(value = "设备批次")
-    @TableField("DEVICE_BATCH")
-    private String deviceBatch;
+    @TableField("PORT")
+    private String port;
 
     /**
-     * 厂家
+     * 用户名
      */
-    @ApiModelProperty(value = "厂家")
-    @TableField("MANUFACTURER")
-    private String manufacturer;
+    @TableField("USER_NAME")
+    private String userName;
 
     /**
-     * 是否供电
+     * 密码
      */
-    @ApiModelProperty(value = "是否供电")
-    @TableField("IS_POWER_SUPPLY")
-    private String isPowerSupply;
+    @TableField("PASSWORD")
+    private String password;
 
     /**
-     * 创建时间
+     * 连接类型
      */
-    @ApiModelProperty(value = "创建时间",dataType = "Date")
-    @TableField("CREATE_TIME")
-    private Date createTime;
+    @TableField("CONNECT_TYPE")
+    private String connectType;
 
-    @ApiModelProperty(value = "设备类型名称")
-    @TableField(exist = false)
-    private String deviceTypeName;
+    /**
+     * 位置
+     */
+    @TableField("LOCATION")
 
-    @ApiModelProperty(value = "是否供电名称")
-    @TableField(exist = false)
-    private String isPowerSupplyName;
+    private String location;
 
-    @ApiModelProperty(value = "注册时间",dataType = "String")
-    @TableField(exist = false)
-    private String registerTime;
+    /**
+     * 设备状态
+     */
+    @TableField("STATUS")
 
-    @ApiModelProperty(value = "当前状态")
-    @TableField(exist = false)
     private String status;
 
-    @ApiModelProperty(value = "当前状态名称")
-    @TableField(exist = false)
-    private String statusName;
+    /**
+     * 报警分组
+     */
+    @TableField("ALARM_GROUP")
+
+    private Long alarmGroup;
+
+    /**
+     * 视频通道数(预留)
+     */
+    @TableField("CHANNEL_NUM")
+    private Integer channelNum;
 
     @Override
     public String toString() {
         return "Device{" +
             "id=" + id +
-            ", deviceCode=" + deviceCode +
-            ", deviceType=" + deviceType +
-            ", deviceBatch=" + deviceBatch +
-            ", manufacturer=" + manufacturer +
-            ", isPowerSupply=" + isPowerSupply +
-            ", createTime=" + createTime +
+            ", deviceName=" + deviceName +
+            ", ip=" + ip +
+            ", port=" + port +
+            ", userName=" + userName +
+            ", password=" + password +
+            ", connectType=" + connectType +
+            ", location=" + location +
+            ", status=" + status +
+            ", alarmGroup=" + alarmGroup +
+            ", channelNum=" + channelNum +
         "}";
     }
 }
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/DeviceExt.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/DeviceExt.java
deleted file mode 100644
index 5ee7015..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/DeviceExt.java
+++ /dev/null
@@ -1,99 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-
-/**
- * <p>
- * 设备扩展信息表（安全树）
- * </p>
- *
- * @author zyj
- * @since 2023-04-27
- */
-@Data
-@TableName("br_device_ext")
-public class DeviceExt implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 设备ID
-     */
-    @TableField("DEVICE_ID")
-    private Long deviceId;
-
-    /**
-     * 摄像头编号
-     */
-    @TableField("CAMERA_CODE")
-    private String cameraCode;
-
-    /**
-     * 摄像头IP
-     */
-    @TableField("CAMERA_IP")
-    private String cameraIp;
-
-    /**
-     * 摄像头端口
-     */
-    @TableField("CAMERA_PORT")
-    private String cameraPort;
-
-    /**
-     * 激甲编号
-     */
-    @TableField("GAS_CODE")
-    private String gasCode;
-
-    /**
-     * 激甲IP
-     */
-    @TableField("GAS_IP")
-    private String gasIp;
-
-    /**
-     * 激甲端口
-     */
-    @TableField("GAS_PORT")
-    private String gasPort;
-
-    /**
-     * 甲烷报警阈值
-     */
-    @TableField("GAS_THRESHOLD")
-    private String gasThreshold;
-
-    @TableField(value = "HAT_LINING_CODE")
-    private String hatLiningCode;
-
-
-    @Override
-    public String toString() {
-        return "DeviceExt{" +
-            "id=" + id +
-            ", deviceId=" + deviceId +
-            ", cameraCode=" + cameraCode +
-            ", cameraIp=" + cameraIp +
-            ", cameraPort=" + cameraPort +
-            ", gasCode=" + gasCode +
-            ", gasIp=" + gasIp +
-            ", gasPort=" + gasPort +
-            ", gasThreshold=" + gasThreshold +
-            ", hatLiningCode=" + hatLiningCode +
-        "}";
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/ProjectDevice.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/ProjectDevice.java
deleted file mode 100644
index c4f3472..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/ProjectDevice.java
+++ /dev/null
@@ -1,62 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-
-/**
- * <p>
- * 
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@Data
-@ApiModel("ProjectDevice")
-@TableName("br_project_device")
-public class ProjectDevice implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 作业现场ID
-     */
-    @TableField("PROJECT_ID")
-    private Long projectId;
-
-    /**
-     * 设备ID
-     */
-    @TableField("DEVICE_ID")
-    @ApiModelProperty("设备ID（新增编辑时传）")
-    private Long deviceId;
-
-    /**
-     * 设备编号
-     */
-    @TableField(exist = false)
-    @ApiModelProperty("设备编号（详情中展示，新增编辑不用传）")
-    private String deviceCode;
-
-    @Override
-    public String toString() {
-        return "ProjectDevice{" +
-            "id=" + id +
-            ", projectId=" + projectId +
-            ", deviceId=" + deviceId +
-        "}";
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/ProjectWorker.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/ProjectWorker.java
deleted file mode 100644
index 10b23c4..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/ProjectWorker.java
+++ /dev/null
@@ -1,104 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import java.io.Serializable;
-
-/**
- * <p>
- * 
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@ApiModel("ProjectWorker")
-@TableName("br_project_worker")
-@Data
-@NoArgsConstructor
-@AllArgsConstructor
-public class ProjectWorker implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 作业现场ID
-     */
-    @TableField("PROJECT_ID")
-    private Long projectId;
-
-    /**
-     * 人员ID
-     */
-    @ApiModelProperty("人员ID")
-    @TableField("WORKER_ID")
-    private Long workerId;
-
-    /**
-     * 安全帽编号
-     */
-    @ApiModelProperty("安全帽编号")
-    @TableField("HAT_CODE")
-    private String hatCode;
-
-    /**
-     * 背心编号
-     */
-    @ApiModelProperty("背心编号")
-    @TableField("VAST_CODE")
-    private String vastCode;
-
-    /**
-     * 手环编号
-     */
-    @ApiModelProperty("手环编号")
-    @TableField("BRACELET_CODE")
-    private String braceletCode;
-
-    @ApiModelProperty("人员姓名（详情中展示，新增编辑不用传）")
-    @TableField(exist = false)
-    private String workerName;
-
-    @ApiModelProperty("人员部门ID（详情中展示，新增编辑不用传）")
-    @TableField(exist = false)
-    private String workerDeptId;
-
-    @ApiModelProperty("人员部门名称（详情中展示，新增编辑不用传）")
-    @TableField(exist = false)
-    private String workerDeptName;
-
-    @ApiModelProperty("人员联系方式（详情中展示，新增编辑不用传）")
-    @TableField(exist = false)
-    private String workerPhoneNumber;
-
-    public ProjectWorker(Long projectId, Long workerId) {
-        this.projectId = projectId;
-        this.workerId = workerId;
-    }
-
-    @Override
-    public String toString() {
-        return "ProjectWorker{" +
-            "id=" + id +
-            ", projectId=" + projectId +
-            ", workerId=" + workerId +
-            ", hatCode=" + hatCode +
-            ", vastCode=" + vastCode +
-            ", braceletCode=" + braceletCode +
-        "}";
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/WorkSiteInfo.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/WorkSiteInfo.java
deleted file mode 100644
index fa6f41d..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/WorkSiteInfo.java
+++ /dev/null
@@ -1,130 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.alibaba.fastjson.annotation.JSONField;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.time.LocalDateTime;
-import java.util.Date;
-
-/**
- * <p>
- * 作业现场表
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@ApiModel("WorkSiteInfo")
-@TableName("br_work_site_info")
-@Data
-public class WorkSiteInfo implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @ApiModelProperty("作业现场ID")
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 作业名称
-     */
-    @ApiModelProperty("作业名称")
-    @TableField("WORK_TITLE")
-    private String workTitle;
-
-    /**
-     * 责任人
-     */
-    @ApiModelProperty("责任人（人员ID）")
-    @TableField("WORK_PERSON")
-    private Long workPerson;
-
-    /**
-     * 作业描述
-     */
-    @ApiModelProperty("作业描述")
-    @TableField("WORK_SITE_DESC")
-    private String workSiteDesc;
-
-    /**
-     * 作业状态
-     */
-    @ApiModelProperty("作业状态")
-    @TableField("PROJECT_STATE")
-    private String projectState;
-
-    /**
-     * 所属道路
-     */
-    @ApiModelProperty("所属道路")
-    @TableField("WORK_ROAD")
-    private String workRoad;
-
-    @TableField("IMAGE_URL")
-    private String imageUrl;
-
-    @TableField("CREATE_TIME")
-    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
-    private Date createTime;
-    @TableField("UPDATE_TIME")
-    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
-    private Date updateTime;
-
-    @ApiModelProperty("开始时间")
-    @TableField("START_TIME")
-    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
-    private Date startTime;
-
-    @ApiModelProperty("结束时间")
-    @TableField("FINISH_TIME")
-    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
-    private Date finishTime;
-
-    @ApiModelProperty("负责人姓名（详情中使用，新增编辑不用传）")
-    @TableField(exist = false)
-    private String workPersonName;
-
-    @ApiModelProperty("负责人联系方式（详情中使用，新增编辑不用传）")
-    @TableField(exist = false)
-    private String workPersonPhoneNumber;
-
-    @ApiModelProperty("负责人所属部门ID（详情中使用，新增编辑不用传）")
-    @TableField(exist = false)
-    private Long workPersonDeptId;
-
-    @ApiModelProperty("负责人所属部门名称（详情中使用，新增编辑不用传）")
-    @TableField(exist = false)
-    private String workPersonDeptName;
-
-    @ApiModelProperty(value = "注册时间",dataType = "String")
-    @TableField(exist = false)
-    private String registerTime;
-
-    @ApiModelProperty("作业状态名称")
-    @TableField(exist = false)
-    private String projectStateName;
-
-    @Override
-    public String toString() {
-        return "WorkSiteInfo{" +
-            "id=" + id +
-            ", workTitle=" + workTitle +
-            ", workPerson=" + workPerson +
-            ", workSiteDesc=" + workSiteDesc +
-            ", projectState=" + projectState +
-            ", imageUrl=" + imageUrl +
-            ", updateTime=" + updateTime +
-            ", workRoad=" + workRoad +
-        "}";
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Worker.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Worker.java
deleted file mode 100644
index 28a4daa..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Worker.java
+++ /dev/null
@@ -1,147 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.time.LocalDateTime;
-import java.util.Date;
-
-/**
- * <p>
- * 
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@ApiModel("Worker")
-@TableName("br_worker")
-@Data
-public class Worker implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @ApiModelProperty(value = "人员ID")
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 姓名
-     */
-    @ApiModelProperty(value = "姓名")
-    @TableField("WORKER_NAME")
-    private String workerName;
-
-    /**
-     * 性别
-     */
-    @ApiModelProperty(value = "性别")
-    @TableField("GENDER")
-    private String gender;
-
-    /**
-     * 所属部门
-     */
-    @ApiModelProperty(value = "所属部门(人员管理)")
-    @TableField("DEPT_ID")
-    private Long deptId;
-
-    /**
-     * 所属单位
-     */
-    @ApiModelProperty(value = "所属单位(入场申请中使用)")
-    @TableField("OWNER_SHIP")
-    private String ownerShip;
-
-    /**
-     * 联系方式
-     */
-    @ApiModelProperty(value = "联系方式")
-    @TableField("PHONE_NUMBER")
-    private String phoneNumber;
-
-    /**
-     * 证件号
-     */
-    @ApiModelProperty(value = "证件号")
-    @TableField("ID_CARD_NUMBER")
-    private String idCardNumber;
-
-    /**
-     * 入场原因
-     */
-    @ApiModelProperty(value = "入场原因（入场申请中使用）")
-    @TableField("ENTER_REASON")
-    private String enterReason;
-
-    /**
-     * 入场人脸照片
-     */
-    @ApiModelProperty(value = "人脸照片（照片路径）")
-    @TableField("WORKER_AVATAR")
-    private String workerAvatar;
-
-    /**
-     * 申请入场时间
-     */
-    @ApiModelProperty(value = "注册时间/申请入场时间")
-    @TableField("CREATE_TIME")
-    private Date createTime;
-
-    /**
-     * 人员类型
-     */
-    @ApiModelProperty(value = "人员类型（区分人员管理和入场申请）")
-    @TableField("WORKER_TYPE")
-    private String workerType;
-
-    @ApiModelProperty(value = "性别名称")
-    @TableField(exist = false)
-    private String genderName;
-
-    @ApiModelProperty(value = "部门名称")
-    @TableField(exist = false)
-    private String deptName;
-
-    @ApiModelProperty(value = "注册时间",dataType = "String")
-    @TableField(exist = false)
-    private String registerTime;
-
-    @ApiModelProperty(value = "当前状态")
-    @TableField(exist = false)
-    private String status;
-
-    @ApiModelProperty(value = "当前状态名称")
-    @TableField(exist = false)
-    private String statusName;
-
-    @ApiModelProperty(value = "是否注册(0未注册；1已注册)",allowableValues = "0,1")
-    @TableField(exist = false)
-    private String isRegister;
-
-    @Override
-    public String toString() {
-        return "Worker{" +
-            "id=" + id +
-            ", workerName=" + workerName +
-            ", gender=" + gender +
-            ", deptId=" + deptId +
-            ", ownerShip=" + ownerShip +
-            ", phoneNumber=" + phoneNumber +
-            ", idCardNumber=" + idCardNumber +
-            ", enterReason=" + enterReason +
-            ", workerAvatar=" + workerAvatar +
-            ", createTime=" + createTime +
-            ", workerType=" + workerType +
-        "}";
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/AlarmMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/AlarmMapper.java
new file mode 100644
index 0000000..ea4c8be
--- /dev/null
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/AlarmMapper.java
@@ -0,0 +1,16 @@
+package com.casic.missiles.modular.system.mapper;
+
+import com.casic.missiles.modular.system.entity.Alarm;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 报警记录表 Mapper 接口
+ * </p>
+ *
+ * @author zyj
+ * @since 2023-05-25
+ */
+public interface AlarmMapper extends BaseMapper<Alarm> {
+
+}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/BusAlarmMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/BusAlarmMapper.java
deleted file mode 100644
index 9801742..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/BusAlarmMapper.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package com.casic.missiles.modular.system.mapper;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.modular.system.dto.AlarmTypeCountDTO;
-import com.casic.missiles.modular.system.entity.BusAlarm;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * <p>
- * 报警记录表 Mapper 接口
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface BusAlarmMapper extends BaseMapper<BusAlarm> {
-
-    Page<BusAlarm> listPage(Page<BusAlarm> page,@Param("ew")  QueryWrapper<BusAlarm> queryWrapper);
-
-    void cancelAlarm(@Param("deviceId")Long deviceId,@Param("alarmType") String alarmType);
-
-    List<AlarmTypeCountDTO> alarmCount(@Param("projectId")Long projectId, @Param("alarmStatus")String alarmStatus);
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/BusEventImageMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/BusEventImageMapper.java
deleted file mode 100644
index 9590b7d..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/BusEventImageMapper.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.casic.missiles.modular.system.mapper;
-
-import com.casic.missiles.modular.system.entity.BusEventImage;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * <p>
- * 事件图片表 Mapper 接口
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface BusEventImageMapper extends BaseMapper<BusEventImage> {
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/BusEventMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/BusEventMapper.java
deleted file mode 100644
index 3c85edf..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/BusEventMapper.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.casic.missiles.modular.system.mapper;
-
-import com.casic.missiles.modular.system.entity.BusEvent;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * <p>
- * 事件表 Mapper 接口
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface BusEventMapper extends BaseMapper<BusEvent> {
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/DeviceExtMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/DeviceExtMapper.java
deleted file mode 100644
index 4ca9212..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/DeviceExtMapper.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.casic.missiles.modular.system.mapper;
-
-import com.casic.missiles.modular.system.entity.DeviceExt;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * <p>
- * 设备扩展信息表（安全树） Mapper 接口
- * </p>
- *
- * @author zyj
- * @since 2023-04-27
- */
-public interface DeviceExtMapper extends BaseMapper<DeviceExt> {
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/DeviceMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/DeviceMapper.java
index 444c0c5..3d0bb02 100644
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/DeviceMapper.java
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/DeviceMapper.java
@@ -1,30 +1,16 @@
 package com.casic.missiles.modular.system.mapper;
 
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.modular.system.dto.DeviceDetailDTO;
-import com.casic.missiles.modular.system.dto.HelmetInfoDTO;
 import com.casic.missiles.modular.system.entity.Device;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
 
 /**
  * <p>
- *  Mapper 接口
+ * 设备记录表 Mapper 接口
  * </p>
  *
  * @author zyj
- * @since 2023-04-14
+ * @since 2023-05-25
  */
-@Mapper
 public interface DeviceMapper extends BaseMapper<Device> {
 
-    Page<DeviceDetailDTO> listDetailPage(Page<DeviceDetailDTO> page,@Param("ew") QueryWrapper<DeviceDetailDTO> ew);
-
-     List<Long> selectProjectDevice(@Param("projectId") Long projectId);
-
-    List<HelmetInfoDTO> selectHelmetList(@Param("deviceType")String deviceType);
 }
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/ProjectDeviceMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/ProjectDeviceMapper.java
deleted file mode 100644
index 1d0c14e..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/ProjectDeviceMapper.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package com.casic.missiles.modular.system.mapper;
-
-import com.casic.missiles.modular.system.dto.DeviceLocationDTO;
-import com.casic.missiles.modular.system.entity.ProjectDevice;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * <p>
- *  Mapper 接口
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface ProjectDeviceMapper extends BaseMapper<ProjectDevice> {
-     List<ProjectDevice> selectDetailByProjectId(@Param("projectId") Long projectId);
-
-     List<DeviceLocationDTO> selectDeviceLocationList(@Param("projectId") Long projectId);
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/ProjectWorkerMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/ProjectWorkerMapper.java
deleted file mode 100644
index 58583d1..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/ProjectWorkerMapper.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package com.casic.missiles.modular.system.mapper;
-
-import com.casic.missiles.modular.system.dto.WorkerLocationDTO;
-import com.casic.missiles.modular.system.entity.ProjectWorker;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * <p>
- *  Mapper 接口
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface ProjectWorkerMapper extends BaseMapper<ProjectWorker> {
-
-    List<ProjectWorker> selectDetailByProjectId(@Param("projectId") Long projectId,
-                                                @Param("workerType")String workerType);
-
-    List<WorkerLocationDTO> selectWorkerLocationList(@Param("projectId") Long projectId,
-                                                     @Param("workerType")String workerType);
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/WorkSiteInfoMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/WorkSiteInfoMapper.java
deleted file mode 100644
index a4934d2..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/WorkSiteInfoMapper.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.casic.missiles.modular.system.mapper;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.modular.system.entity.WorkSiteInfo;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Param;
-
-/**
- * <p>
- * 作业现场表 Mapper 接口
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface WorkSiteInfoMapper extends BaseMapper<WorkSiteInfo> {
-
-    Page<WorkSiteInfo> selectListPage(Page<WorkSiteInfo> page,@Param("ew") QueryWrapper<WorkSiteInfo> ew);
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/WorkerMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/WorkerMapper.java
deleted file mode 100644
index 258fb12..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/WorkerMapper.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package com.casic.missiles.modular.system.mapper;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.modular.system.dto.DeviceDetailDTO;
-import com.casic.missiles.modular.system.entity.Worker;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * <p>
- *  Mapper 接口
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface WorkerMapper extends BaseMapper<Worker> {
-
-
-    Page<Worker> selectListPage(Page<Worker> page, @Param("ew") QueryWrapper<Worker> ew);
-
-    List<String> selectWorkerAvatars(@Param("projectId")Long projectId);
-
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/AlarmMapper.xml b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/AlarmMapper.xml
new file mode 100644
index 0000000..25cb4ab
--- /dev/null
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/AlarmMapper.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.modular.system.mapper.AlarmMapper">
+
+</mapper>
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/BusAlarmMapper.xml b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/BusAlarmMapper.xml
deleted file mode 100644
index 595088a..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/BusAlarmMapper.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.casic.missiles.modular.system.mapper.BusAlarmMapper">
-
-    <select id="listPage" resultType="com.casic.missiles.modular.system.entity.BusAlarm">
-        SELECT
-            alarm.ID as id,
-            alarm.DEVICE_ID as deviceId,
-            alarm.PROJECT_ID as projectId,
-            alarm.ALARM_TYPE as alarmType,
-            alarm.ALARM_VALUE as alarmValue,
-            alarm.ALARM_STATUS as alarmStatus,
-            alarm.ALARM_IMAGE AS alarmImage,
-            alarm.ALARM_CONTENT as alarmContent,
-            alarm.ALARM_TIME as alarmTime,
-            alarm.CANCEL_TIME as cancelTime,
-            alarm.ALARM_LNG as alarmLng,
-            alarm.ALARM_LAT as alarmLat,
-            p.WORK_TITLE as workTitle,
-            p.WORK_ROAD as workRoad,
-            p.PROJECT_STATE as projectState,
-            w.WORKER_NAME as workPersonName,
-            w.PHONE_NUMBER as workPersonPhoneNumber
-        FROM
-            `br_bus_alarm` alarm
-                LEFT JOIN br_work_site_info p on alarm.PROJECT_ID = p.ID
-                LEFT JOIN br_worker w on p.WORK_PERSON = w.ID
-        <where>
-            <if test="ew != null">
-                ${ew.sqlSegment}
-            </if>
-        </where>
-    </select>
-
-    <select id="cancelAlarm">
-        update br_bus_alarm
-        set ALARM_STATUS = '1'
-        where DEVICE_ID = #{deviceId}
-          and ALARM_TYPE = #{alarmType}
-          and ALARM_STATUS = '0'
-    </select>
-
-    <select id="alarmCount" resultType="com.casic.missiles.modular.system.dto.AlarmTypeCountDTO">
-        SELECT
-            ALARM_TYPE as alarmType,
-            count(*) as alarmCount
-        from br_bus_alarm
-        <where>
-            <if test="projectId != null and projectId !=''">
-                and PROJECT_ID = #{projectId}
-            </if>
-            <if test="alarmStatus != null and alarmStatus !=''">
-                and ALARM_STATUS = #{alarmStatus}
-            </if>
-        </where>
-        group by ALARM_TYPE
-    </select>
-</mapper>
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/BusEventImageMapper.xml b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/BusEventImageMapper.xml
deleted file mode 100644
index fbc3db3..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/BusEventImageMapper.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.casic.missiles.modular.system.mapper.BusEventImageMapper">
-
-</mapper>

diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/AlarmController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/AlarmController.java
new file mode 100644
index 0000000..1795cf1
--- /dev/null
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/AlarmController.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.modular.system.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.stereotype.Controller;
+
+/**
+ * <p>
+ * 报警记录表 前端控制器
+ * </p>
+ *
+ * @author zyj
+ * @since 2023-05-25
+ */
+@Controller
+@RequestMapping("/system/alarm")
+public class AlarmController {
+
+}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusAlarmController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusAlarmController.java
deleted file mode 100644
index 1f82ebb..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusAlarmController.java
+++ /dev/null
@@ -1,102 +0,0 @@
-package com.casic.missiles.modular.system.controller;
-
-
-import cn.hutool.core.util.ObjectUtil;
-import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.core.base.controller.BaseController;
-import com.casic.missiles.core.page.PageFactory;
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.AlarmUpload;
-import com.casic.missiles.modular.system.dto.DeviceDetailDTO;
-import com.casic.missiles.modular.system.entity.BusAlarm;
-import com.casic.missiles.modular.system.service.IBusAlarmService;
-import io.swagger.annotations.*;
-import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.*;
-
-import org.springframework.stereotype.Controller;
-
-import static com.casic.missiles.model.response.ResponseData.DEFAULT_SUCCESS_MESSAGE;
-import static com.casic.missiles.modular.system.consts.AlarmConst.ALARM_STATUS_MANUAL_CANCEL;
-
-/**
- * <p>
- * 报警记录表 前端控制器
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@Api(tags = "报警管理接口")
-@Controller
-@RequestMapping("/alarm")
-@RequiredArgsConstructor
-public class BusAlarmController extends BaseController {
-
-    private final IBusAlarmService alarmService;
-
-    @ApiOperation("报警上报接口")
-    @PostMapping("/upload")
-    @ResponseBody
-    public Object upload(@RequestBody AlarmUpload alarmUpload){
-        alarmService.alarmUpload(alarmUpload);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("报警列表分页查询")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "workTitle", value = "作业名称",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "projectId", value = "作业ID",dataType = "Long", paramType = "query",example = "0"),
-            @ApiImplicitParam(name = "alarmStatus", value = "报警状态",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "projectState", value = "作业状态",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "alarmType", value = "报警类型",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "alarmStartTime", value = "报警开始时间",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "alarmEndTime", value = "报警结束时间",dataType = "String", paramType = "query")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = BusAlarm.class),
-    })
-    @GetMapping("/listPage")
-    @ResponseBody
-    public Object listPage(String workTitle,Long projectId,String alarmStatus,String projectState,String alarmType,String alarmStartTime,String alarmEndTime){
-        Page<BusAlarm> page = PageFactory.defaultPage();
-        QueryWrapper<BusAlarm> queryWrapper = new QueryWrapper<>();
-        if(StrUtil.isNotEmpty(workTitle)){
-            queryWrapper.like("p.WORK_TITLE",workTitle);
-        }
-        if(ObjectUtil.isNotEmpty(projectId)){
-            queryWrapper.eq("alarm.PROJECT_ID",projectId);
-        }
-        if(StrUtil.isNotEmpty(alarmStatus)){
-            queryWrapper.eq("alarm.ALARM_STATUS",alarmStatus);
-        }
-        if(StrUtil.isNotEmpty(projectState)){
-            queryWrapper.eq("p.PROJECT_STATE",projectState);
-        }
-        if(StrUtil.isNotEmpty(alarmType)){
-            queryWrapper.eq("alarm.ALARM_TYPE",alarmType);
-        }
-        if(StrUtil.isNotEmpty(alarmStartTime)){
-            queryWrapper.ge("alarm.ALARM_TIME",alarmStartTime);
-        }
-        if(StrUtil.isNotEmpty(alarmEndTime)){
-            queryWrapper.le("alarm.ALARM_TIME",alarmEndTime);
-        }
-        page = alarmService.listPage(page,queryWrapper);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-    @ApiOperation("消警")
-    @PostMapping("/cancel")
-    @ResponseBody
-    public Object cancel(@RequestParam("alarmId") Long alarmId){
-        UpdateWrapper<BusAlarm> updateWrapper = new UpdateWrapper<>();
-        updateWrapper.eq("ID",alarmId);
-        updateWrapper.set("ALARM_STATUS",ALARM_STATUS_MANUAL_CANCEL);
-        alarmService.update(updateWrapper);
-        return ResponseData.success();
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusEventController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusEventController.java
deleted file mode 100644
index dde5aad..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusEventController.java
+++ /dev/null
@@ -1,41 +0,0 @@
-package com.casic.missiles.modular.system.controller;
-
-
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.entity.BusEvent;
-import com.casic.missiles.modular.system.service.IBusEventService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.ResponseBody;
-
-/**
- * <p>
- * 事件表 前端控制器
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@Controller
-@RequestMapping("/event")
-@Api(tags = "事件上报")
-@RequiredArgsConstructor
-public class BusEventController {
-
-    private final IBusEventService eventService;
-
-    @ApiOperation("事件上报")
-    @PostMapping("add")
-    @ResponseBody
-    public Object add(@RequestBody BusEvent busEvent){
-        eventService.saveBusEvent(busEvent);
-        return ResponseData.success();
-    }
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
index 03abc5f..aa50d78 100644
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
@@ -1,121 +1,20 @@
 package com.casic.missiles.modular.system.controller;
 
 
-import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.core.base.controller.BaseController;
-import com.casic.missiles.core.page.PageFactory;
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.DeviceDetailDTO;
-import com.casic.missiles.modular.system.entity.Device;
-import com.casic.missiles.modular.system.service.IDeviceExtService;
-import com.casic.missiles.modular.system.service.IDeviceService;
-import io.swagger.annotations.*;
-import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.RequestMapping;
 
 import org.springframework.stereotype.Controller;
 
-import java.time.LocalDateTime;
-import java.util.Date;
-import java.util.List;
-
-import static com.casic.missiles.model.response.ResponseData.DEFAULT_SUCCESS_MESSAGE;
-
 /**
  * <p>
- *  前端控制器
+ * 设备记录表 前端控制器
  * </p>
  *
  * @author zyj
- * @since 2023-04-14
+ * @since 2023-05-25
  */
-@Api(tags = "设备管理接口")
-@RequiredArgsConstructor
 @Controller
-@RequestMapping("/device")
-public class DeviceController extends BaseController {
-    private final IDeviceService deviceService;
-    private final IDeviceExtService deviceExtService;
-
-    @ApiOperation("设备分页列表")
-    @ApiImplicitParams({
-        @ApiImplicitParam(name = "deviceType", value = "设备类型",dataType = "String", paramType = "query"),
-        @ApiImplicitParam(name = "deviceCode", value = "设备编号",dataType = "String", paramType = "query"),
-        @ApiImplicitParam(name = "status", value = "设备状态",dataType = "String", paramType = "query"),
-        @ApiImplicitParam(name = "projectId", value = "作业ID（如果传此参数，列表中返回该作业使用的设备）",dataType = "Long", paramType = "query", example = "0")
-    })
-    @ApiResponses({
-        @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = DeviceDetailDTO.class),
-    })
-    @GetMapping("listPage")
-    @ResponseBody
-    public Object listPage(String deviceType, String deviceCode, String status,Long projectId){
-        Page<DeviceDetailDTO> page = PageFactory.defaultPage();
-        QueryWrapper<DeviceDetailDTO> queryWrapper = new QueryWrapper<>();
-        if(StrUtil.isNotEmpty(deviceType)){
-            queryWrapper.eq("DEVICE_TYPE",deviceType);
-        }
-        if(StrUtil.isNotEmpty(deviceCode)){
-            queryWrapper.like("DEVICE_CODE",deviceCode);
-        }
-        page = deviceService.listPage(page,queryWrapper,status,projectId);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-    @ApiOperation("新增设备")
-    @PostMapping("add")
-    @ResponseBody
-    public Object add(@RequestBody DeviceDetailDTO deviceDetailDTO){
-        deviceService.saveDevice(deviceDetailDTO);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("编辑设备")
-    @PostMapping("update")
-    @ResponseBody
-    public Object update(@RequestBody DeviceDetailDTO deviceDetailDTO){
-        deviceService.updateDevice(deviceDetailDTO);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("删除设备")
-    @PostMapping("delete")
-    @ResponseBody
-    public Object delete(@ApiParam("设备id列表")@RequestBody List<Long> deviceIds){
-        deviceService.deleteDevices(deviceIds);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("设置甲烷阈值")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "gasIp", value = "安全树甲烷设备IP",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "gasPort", value = "安全树甲烷端口",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "threshold", value = "甲烷阈值",dataType = "String", paramType = "query")
-    })
-    @PostMapping("setThreshold")
-    @ResponseBody
-    public Object setThreshold(String gasIp,String gasPort,String threshold){
-        deviceExtService.setGasThreshold(gasIp, gasPort, threshold);
-        return ResponseData.success();
-    }
-
-
-    @ApiOperation("查询甲烷阈值")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "gasIp", value = "安全树甲烷设备IP",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "gasPort", value = "安全树甲烷端口",dataType = "String", paramType = "query")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = "{\"code\": 200,\"data\": \"100\",\"message\": \"请求成功\",\"success\": true}",response = String.class),
-    })
-    @GetMapping("getThreshold")
-    @ResponseBody
-    public Object getThreshold(String gasIp,String gasPort){
-        String data = deviceExtService.getGasThreshold(gasIp, gasPort);
-        return ResponseData.success(data);
-    }
-
+@RequestMapping("/system/device")
+public class DeviceController {
 
 }
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/OverviewController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/OverviewController.java
deleted file mode 100644
index 7570504..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/OverviewController.java
+++ /dev/null
@@ -1,70 +0,0 @@
-package com.casic.missiles.modular.system.controller;
-
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.AlarmTypeCountDTO;
-import com.casic.missiles.modular.system.dto.DeviceLocationDTO;
-import com.casic.missiles.modular.system.dto.WorkerLocationDTO;
-import com.casic.missiles.modular.system.service.IBusAlarmService;
-import com.casic.missiles.modular.system.service.IProjectDeviceService;
-import com.casic.missiles.modular.system.service.IProjectWorkerService;
-import io.swagger.annotations.*;
-import lombok.RequiredArgsConstructor;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.ResponseBody;
-
-import static com.casic.missiles.model.response.ResponseData.DEFAULT_SUCCESS_MESSAGE;
-import static com.casic.missiles.modular.system.consts.AlarmConst.ALARM_STATUS_ON;
-
-@Api(tags = "首页看板接口")
-@Controller
-@RequestMapping("overview")
-@RequiredArgsConstructor
-public class OverviewController {
-
-    private final IBusAlarmService alarmService;
-    private final IProjectDeviceService projectDeviceService;
-
-    private final IProjectWorkerService projectWorkerService;
-
-
-    @ApiOperation("报警统计接口")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "projectId", value = "作业ID",dataType = "Long", paramType = "query", example = "0")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = AlarmTypeCountDTO.class),
-    })
-    @GetMapping("/alarmCount")
-    @ResponseBody
-    public Object alarmCount(Long projectId){
-        return ResponseData.success(alarmService.alarmCount(projectId,ALARM_STATUS_ON));
-    }
-
-    @ApiOperation("设备列表接口")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "projectId", value = "作业ID",dataType = "Long", paramType = "query", example = "0")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = DeviceLocationDTO.class),
-    })
-    @GetMapping("/deviceList")
-    @ResponseBody
-    public Object deviceList(Long projectId){
-        return ResponseData.success(projectDeviceService.selectDeviceLocationList(projectId));
-    }
-
-    @ApiOperation("人员列表接口")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "projectId", value = "作业ID",dataType = "Long", paramType = "query", example = "0")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = WorkerLocationDTO.class),
-    })
-    @GetMapping("/workerList")
-    @ResponseBody
-    public Object workerList(Long projectId){
-        return ResponseData.success(projectWorkerService.selectWorkerLocationDTO(projectId));
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/WorkSiteInfoController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/WorkSiteInfoController.java
deleted file mode 100644
index af36d69..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/WorkSiteInfoController.java
+++ /dev/null
@@ -1,130 +0,0 @@
-package com.casic.missiles.modular.system.controller;
-
-
-import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.core.base.controller.BaseController;
-import com.casic.missiles.core.page.PageFactory;
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.WorkSiteDetailDTO;
-import com.casic.missiles.modular.system.entity.WorkSiteInfo;
-import com.casic.missiles.modular.system.service.IWorkSiteInfoService;
-import io.swagger.annotations.*;
-import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.*;
-
-import org.springframework.stereotype.Controller;
-
-import java.util.List;
-
-import static com.casic.missiles.model.response.ResponseData.DEFAULT_SUCCESS_MESSAGE;
-
-/**
- * <p>
- * 作业现场表 前端控制器
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@Controller
-@RequestMapping("/site")
-@Api(tags = "作业现场管理")
-@RequiredArgsConstructor
-public class WorkSiteInfoController extends BaseController {
-
-
-    private final IWorkSiteInfoService workSiteInfoService;
-
-    @ApiOperation("新增作业现场")
-    @PostMapping("add")
-    @ResponseBody
-    public Object addWorkSite(@RequestBody WorkSiteDetailDTO workSiteDetailDTO){
-        workSiteInfoService.addWorkSiteInfo(workSiteDetailDTO);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("编辑作业现场")
-    @PostMapping("update")
-    @ResponseBody
-    public Object updateWorkSite(@RequestBody WorkSiteDetailDTO workSiteDetailDTO){
-        workSiteInfoService.updateWorkSiteInfo(workSiteDetailDTO);
-        return ResponseData.success();
-    }
-
-
-    @ApiOperation("删除作业现场")
-    @PostMapping("delete")
-    @ResponseBody
-    public Object delete(@ApiParam("作业现场id列表")@RequestBody List<Long> projectIds){
-        workSiteInfoService.deleteProjects(projectIds);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("查询作业现场详情")
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = WorkSiteDetailDTO.class),
-    })
-    @GetMapping("detail")
-    @ResponseBody
-    public Object delete(@ApiParam(value = "作业现场id", example = "0")@RequestParam Long projectId){
-        WorkSiteDetailDTO detailDTO = workSiteInfoService.getWorkSiteDetail(projectId);
-        return ResponseData.success(detailDTO);
-    }
-
-    @ApiOperation("分页列表查询")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "workTitle",value = "作业名称", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "workRoad",value = "所属道路", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "workPersonName",value = "责任人姓名", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "startDate",value = "注册开始日期", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "endDate",value = "注册结束日期", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "projectState",value = "当前状态（字典值）", dataType = "String", paramType = "query")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = WorkSiteInfo.class),
-    })
-    @GetMapping("listPage")
-    @ResponseBody
-    public Object listPage(String workTitle,String workRoad,String workPersonName,String projectState,String startDate,String endDate){
-        Page<WorkSiteInfo> page = PageFactory.defaultPage();
-        QueryWrapper<WorkSiteInfo> queryWrapper = new QueryWrapper<>();
-        if(StrUtil.isNotEmpty(workTitle)){
-            queryWrapper.like("WORK_TITLE",workTitle);
-        }
-        if(StrUtil.isNotEmpty(workRoad)){
-            queryWrapper.like("WORK_ROAD",workRoad);
-        }
-        if(StrUtil.isNotEmpty(workPersonName)){
-            queryWrapper.like("WORKER_NAME",workPersonName);
-        }
-        if(StrUtil.isNotEmpty(projectState)){
-            queryWrapper.eq("PROJECT_STATE",projectState);
-        }
-        if(StrUtil.isNotEmpty(startDate)){
-            queryWrapper.ge("br_work_site_info.CREATE_TIME",startDate + " 00:00:00");
-        }
-        if(StrUtil.isNotEmpty(endDate)){
-            queryWrapper.le("br_work_site_info.CREATE_TIME",endDate + " 23:59:59");
-        }
-        page = workSiteInfoService.selectListPage(page,queryWrapper);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-    @ApiOperation("开始作业")
-    @PostMapping("start")
-    @ResponseBody
-    public Object start(@ApiParam(value = "作业现场id",example = "0")@RequestParam Long projectId){
-        workSiteInfoService.start(projectId);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("完成作业")
-    @PostMapping("finish")
-    @ResponseBody
-    public Object finish(@ApiParam(value = "作业现场id", example = "0")@RequestParam Long projectId){
-        workSiteInfoService.finish(projectId);
-        return ResponseData.success();
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/WorkerController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/WorkerController.java
deleted file mode 100644
index 796f94c..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/WorkerController.java
+++ /dev/null
@@ -1,136 +0,0 @@
-package com.casic.missiles.modular.system.controller;
-
-
-import cn.hutool.core.util.ObjectUtil;
-import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.core.base.controller.BaseController;
-import com.casic.missiles.core.page.PageFactory;
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.DeviceDetailDTO;
-import com.casic.missiles.modular.system.entity.Device;
-import com.casic.missiles.modular.system.entity.Worker;
-import com.casic.missiles.modular.system.service.IWorkerService;
-import io.swagger.annotations.*;
-import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.*;
-
-import org.springframework.stereotype.Controller;
-
-import java.util.Date;
-import java.util.List;
-
-import static com.casic.missiles.model.response.ResponseData.DEFAULT_SUCCESS_MESSAGE;
-
-/**
- * <p>
- *  前端控制器
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@Controller
-@RequestMapping("/worker")
-@RequiredArgsConstructor
-@Api(tags = "人员管理接口")
-public class WorkerController extends BaseController {
-
-    private final IWorkerService workerService;
-
-    @ApiOperation("分页列表查询")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "name",value = "姓名", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "deptId",value = "所属部门", dataType = "Long", paramType = "query", example = "0"),
-            @ApiImplicitParam(name = "status",value = "当前状态（字典值）", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "startDate",value = "注册开始日期", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "endDate",value = "注册结束日期", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "workerType",value = "人员类型（字典值）", dataType = "String", paramType = "query")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = Worker.class),
-    })
-    @GetMapping("listPage")
-    @ResponseBody
-    public Object listPage(String name,Long deptId, String status,String startDate,String endDate,String workerType){
-        Page<Worker> page = PageFactory.defaultPage();
-        QueryWrapper<Worker> queryWrapper = new QueryWrapper<>();
-        if(StrUtil.isNotEmpty(name)){
-            queryWrapper.like("WORKER_NAME",name);
-        }
-        if(ObjectUtil.isNotEmpty(deptId)){
-            queryWrapper.eq("DEPT_ID",deptId);
-        }
-        if(StrUtil.isNotEmpty(workerType)){
-            queryWrapper.eq("WORKER_TYPE",workerType);
-        }
-        if(StrUtil.isNotEmpty(startDate)){
-            queryWrapper.ge("CREATE_TIME",startDate + " 00:00:00");
-        }
-        if(StrUtil.isNotEmpty(endDate)){
-            queryWrapper.le("CREATE_TIME",endDate + " 23:59:59");
-        }
-        if(StrUtil.isNotEmpty(status)){
-            queryWrapper.eq("`STATUS`",status);
-        }
-        page = workerService.selectListPage(page,queryWrapper);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-    @ApiOperation("新增人员")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "worker", value = "人员信息", dataType = "Worker", paramType = "body", required = true),
-            @ApiImplicitParam(name = "projectId", value = "项目ID(入场申请需要)", dataType = "Long", paramType = "query", example = "0")
-    })
-    @PostMapping("add")
-    @ResponseBody
-    public Object add(@ApiParam("worker")@RequestBody Worker worker,
-                      @RequestParam(required = false) Long projectId){
-        workerService.addWorker(worker,projectId);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("编辑人员")
-    @PostMapping("update")
-    @ResponseBody
-    public Object update(@RequestBody Worker worker){
-        workerService.updateById(worker);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("删除人员")
-    @PostMapping("delete")
-    @ResponseBody
-    public Object delete(@ApiParam("人员id列表")@RequestBody List<Long> workIds){
-        workerService.removeByIds(workIds);
-        return ResponseData.success();
-    }
-
-
-    @ApiOperation(value = "获取人脸图片",notes = "返回人脸图片url")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "cameraIp",value = "摄像头IP", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "cameraPort",value = "摄像头端口号", dataType = "String", paramType = "query"),
-    })
-    @GetMapping("/face/register")
-    @ResponseBody
-    public Object faceRegister(String cameraIp,String cameraPort){
-        return ResponseData.success(workerService.faceRegister(cameraIp, cameraPort));
-    }
-
-
-    @ApiOperation(value = "查询临时入场人员列表")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "projectId", value = "项目ID",required = true,dataType = "Long", paramType = "query", example = "0")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = Worker.class),
-    })
-    @GetMapping("/projectTempWorker")
-    @ResponseBody
-    public Object projectTempWorker(Long projectId){
-        return ResponseData.success(workerService.projectTempWorker(projectId));
-    }
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/AlarmTypeCountDTO.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/AlarmTypeCountDTO.java
deleted file mode 100644
index 1a165a1..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/AlarmTypeCountDTO.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.casic.missiles.modular.system.dto;
-
-import io.swagger.annotations.ApiModel;
-import lombok.Data;
-
-@ApiModel(value = "AlarmTypeCountDTO",description = "报警类型统计（首页）")
-@Data
-public class AlarmTypeCountDTO {
-
-    private String alarmType;
-    private String alarmTypeName;
-    private Integer alarmCount;
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/AlarmUpload.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/AlarmUpload.java
deleted file mode 100644
index 73d7799..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/AlarmUpload.java
+++ /dev/null
@@ -1,46 +0,0 @@
-package com.casic.missiles.modular.system.dto;
-
-import cn.hutool.core.util.StrUtil;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-@ApiModel(value = "AlarmUpload",description = "报警上传")
-@Data
-public class AlarmUpload {
-
-    @ApiModelProperty(value = "摄像头ip")
-    private String cameraIp;
-
-    @ApiModelProperty(value = "摄像头端口")
-    private String cameraPort;
-    @ApiModelProperty(value = "安全树甲烷设备ip")
-    private String gasIp;
-    @ApiModelProperty(value = "安全树甲烷设备端口")
-    private String gasPort;
-    @ApiModelProperty(value = "报警值")
-    private String alarmValue;
-    @ApiModelProperty(value = "报警时间")
-    private String alarmTime;
-    @ApiModelProperty(value = "报警类型")
-    private String alarmType;
-    @ApiModelProperty(value = "报警图片")
-    private String alarmImage;
-    @ApiModelProperty(value = "报警内容")
-    private String alarmContent;
-
-    @Override
-    public String toString() {
-        return "AlarmUpload{" +
-                "cameraIp='" + cameraIp + '\'' +
-                ", cameraPort='" + cameraPort + '\'' +
-                ", gasIp='" + gasIp + '\'' +
-                ", gasPort='" + gasPort + '\'' +
-                ", alarmValue='" + alarmValue + '\'' +
-                ", alarmTime='" + alarmTime + '\'' +
-                ", alarmType='" + alarmType + '\'' +
-                ", alarmImage='" + (StrUtil.isNotEmpty(alarmImage) ? alarmImage.substring(0,50) : "null") + '\'' +
-                ", alarmContent='" + alarmContent + '\'' +
-                '}';
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/DeviceDetailDTO.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/DeviceDetailDTO.java
deleted file mode 100644
index ea518d9..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/DeviceDetailDTO.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package com.casic.missiles.modular.system.dto;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.casic.missiles.modular.system.entity.Device;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-@ApiModel("DeviceDetailDTO")
-@Data
-public class DeviceDetailDTO extends Device {
-
-    @ApiModelProperty(value = "摄像头编号")
-    private String cameraCode;
-
-    @ApiModelProperty(value = "摄像头IP")
-    private String cameraIp;
-
-    @ApiModelProperty(value = "摄像头端口")
-    private String cameraPort;
-
-    @ApiModelProperty(value = "激甲编号")
-    private String gasCode;
-
-    @ApiModelProperty(value = "激甲IP")
-    private String gasIp;
-
-    @ApiModelProperty(value = "激甲端口")
-    private String gasPort;
-
-    @ApiModelProperty(value = "智能帽衬编号")
-    private String hatLiningCode;
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/WorkSiteDetailDTO.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/WorkSiteDetailDTO.java
deleted file mode 100644
index 29378ff..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/WorkSiteDetailDTO.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package com.casic.missiles.modular.system.dto;
-
-import com.casic.missiles.modular.system.entity.ProjectDevice;
-import com.casic.missiles.modular.system.entity.ProjectWorker;
-import com.casic.missiles.modular.system.entity.WorkSiteInfo;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.util.List;
-
-@Data
-@ApiModel("WorkSiteDetailDTO")
-public class WorkSiteDetailDTO extends WorkSiteInfo {
-
-    @ApiModelProperty(value = "安全树列表",dataType = "ProjectDevice")
-    private List<ProjectDevice> deviceList;
-
-    @ApiModelProperty(value = "人员列表",dataType = "ProjectWorker")
-    private List<ProjectWorker> workerList;
-
-
-
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/WorkerLocationDTO.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/WorkerLocationDTO.java
deleted file mode 100644
index 6fd7b24..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/WorkerLocationDTO.java
+++ /dev/null
@@ -1,68 +0,0 @@
-package com.casic.missiles.modular.system.dto;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-@ApiModel(value = "WorkerLocationDTO",description = "人员位置列表（首页）")
-@Data
-public class WorkerLocationDTO {
-
-    @ApiModelProperty("人员ID")
-    private Long workerId;
-
-    @ApiModelProperty("人员姓名")
-    private String workerName;
-
-    @ApiModelProperty("安全帽编号")
-    private String hatCode;
-
-    @ApiModelProperty("安全帽ID")
-    private Long hatId;
-
-    @ApiModelProperty("背心编号")
-    private String vastCode;
-
-    @ApiModelProperty("手环编号")
-    private String braceletCode;
-
-    @ApiModelProperty("位置")
-    private String location;
-
-    @ApiModelProperty("时间")
-    private String time;
-
-    @ApiModelProperty("经度")
-    private String lng;
-
-    @ApiModelProperty("纬度")
-    private String lat;
-
-    @ApiModelProperty("心率")
-    private String heartRate;
-
-    @ApiModelProperty("血氧")
-    private String bloodOxygen;
-
-    @ApiModelProperty("一氧化碳")
-    private String co;
-
-    @ApiModelProperty("甲烷")
-    private String gas;
-
-    @ApiModelProperty("硫化氢")
-    private String h2s;
-
-    @ApiModelProperty("氧气")
-    private String o2;
-
-    @ApiModelProperty("信号")
-    private String signal;
-
-    @ApiModelProperty("电量")
-    private String cell;
-
-    @ApiModelProperty("是否报警")
-    private boolean alarmFlag;
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Alarm.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Alarm.java
new file mode 100644
index 0000000..4d2b7ef
--- /dev/null
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Alarm.java
@@ -0,0 +1,103 @@
+package com.casic.missiles.modular.system.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import java.util.Date;
+
+/**
+ * <p>
+ * 报警记录表
+ * </p>
+ *
+ * @author zyj
+ * @since 2023-05-25
+ */
+@Data
+@TableName("bus_alarm")
+public class Alarm implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    @TableId(value = "ID",type = IdType.ASSIGN_ID)
+    private Long id;
+
+    /**
+     * 设备ID
+     */
+    @TableField("DEVICE_ID")
+    private Long deviceId;
+
+    /**
+     * 报警类型
+     */
+    @TableField("ALARM_TYPE")
+    private String alarmType;
+
+    /**
+     * 报警时间
+     */
+    @TableField("ALARM_TIME")
+    private Date alarmTime;
+
+    /**
+     * 报警状态
+     */
+    @TableField("ALARM_STATUS")
+    private String alarmStatus;
+
+    /**
+     * 报警位置
+     */
+    @TableField("ALARM_LOCATION")
+    private String alarmLocation;
+
+    /**
+     * 报警图片
+     */
+    @TableField("ALARM_IMAGE")
+    private String alarmImage;
+
+    /**
+     * 视频通道号
+     */
+    @TableField("CHANNEL_NO")
+    private Integer channelNo;
+
+    /**
+     * 报警内容
+     */
+    @TableField("ALARM_CONTENT")
+    private String alarmContent;
+
+    /**
+     * 消警时间
+     */
+    @TableField("CANCEL_TIME")
+    private Date cancelTime;
+
+
+    @Override
+    public String toString() {
+        return "Alarm{" +
+            "id=" + id +
+            ", deviceId=" + deviceId +
+            ", alarmType=" + alarmType +
+            ", alarmTime=" + alarmTime +
+            ", alarmStatus=" + alarmStatus +
+            ", alarmLocation=" + alarmLocation +
+            ", alarmImage=" + alarmImage +
+            ", channelNo=" + channelNo +
+            ", alarmContent=" + alarmContent +
+            ", cancelTime=" + cancelTime +
+        "}";
+    }
+}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusAlarm.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusAlarm.java
deleted file mode 100644
index efb4a23..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusAlarm.java
+++ /dev/null
@@ -1,159 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.alibaba.fastjson.annotation.JSONField;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.time.LocalDateTime;
-import java.util.Date;
-
-/**
- * <p>
- * 报警记录表
- * </p>
- *
- * @author zyj
- * @since 2023-05-16
- */
-@Data
-@ApiModel("Alarm")
-@TableName("br_bus_alarm")
-public class BusAlarm implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 项目ID
-     */
-    @ApiModelProperty(value = "项目ID")
-    @TableField("PROJECT_ID")
-    private Long projectId;
-
-    /**
-     * 设备ID
-     */
-    @ApiModelProperty(value = "设备ID")
-    @TableField("DEVICE_ID")
-    private Long deviceId;
-
-    /**
-     * 报警类型
-     */
-    @ApiModelProperty(value = "报警类型")
-    @TableField("ALARM_TYPE")
-    private String alarmType;
-
-    /**
-     * 报警状态
-     */
-    @ApiModelProperty(value = "报警状态")
-    @TableField("ALARM_STATUS")
-    private String alarmStatus;
-
-    /**
-     * 报警值
-     */
-    @ApiModelProperty(value = "报警值")
-    @TableField("ALARM_VALUE")
-    private String alarmValue;
-
-    /**
-     * 报警图片
-     */
-    @ApiModelProperty(value = "报警图片")
-    @TableField("ALARM_IMAGE")
-    private String alarmImage;
-
-    /**
-     * 报警内容
-     */
-    @ApiModelProperty(value = "报警内容")
-    @TableField("ALARM_CONTENT")
-    private String alarmContent;
-
-    /**
-     * 报警时间
-     */
-    @ApiModelProperty(value = "报警时间")
-    @TableField("ALARM_TIME")
-    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
-    private Date alarmTime;
-
-    /**
-     * 消警时间
-     */
-    @ApiModelProperty(value = "消警时间")
-    @TableField("CANCEL_TIME")
-    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
-    private Date cancelTime;
-
-    /**
-     * 报警位置经度
-     */
-    @ApiModelProperty(value = "报警位置经度")
-    @TableField("ALARM_LNG")
-    private String alarmLng;
-
-    /**
-     * 报警位置纬度
-     */
-    @ApiModelProperty(value = "报警位置纬度")
-    @TableField("ALARM_LAT")
-    private String alarmLat;
-
-    @ApiModelProperty("报警类型名称")
-    @TableField(exist = false)
-    private String alarmStatusName;
-    @ApiModelProperty("报警类型名称")
-    @TableField(exist = false)
-    private String alarmTypeName;
-    @ApiModelProperty("作业名称")
-    @TableField(exist = false)
-    private String workTitle;
-    @ApiModelProperty("所属道路")
-    @TableField(exist = false)
-    private String workRoad;
-    @ApiModelProperty("作业状态")
-    @TableField(exist = false)
-    private String projectState;
-    @ApiModelProperty("作业状态名称")
-    @TableField(exist = false)
-    private String projectStateName;
-    @ApiModelProperty("负责人姓名")
-    @TableField(exist = false)
-    private String workPersonName;
-    @ApiModelProperty("负责人联系方式")
-    @TableField(exist = false)
-    private String workPersonPhoneNumber;
-
-
-    @Override
-    public String toString() {
-        return "BusAlarm{" +
-                "id=" + id +
-                ", projectId=" + projectId +
-                ", deviceId=" + deviceId +
-                ", alarmType=" + alarmType +
-                ", alarmValue=" + alarmValue +
-                ", alarmStatus=" + alarmStatus +
-                ", alarmImage=" + alarmImage +
-                ", alarmContent=" + alarmContent +
-                ", alarmTime=" + alarmTime +
-                ", cancelTime=" + cancelTime +
-                ", alarmLng=" + alarmLng +
-                ", alarmLat=" + alarmLat +
-                "}";
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusEvent.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusEvent.java
deleted file mode 100644
index a0b7543..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusEvent.java
+++ /dev/null
@@ -1,100 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.time.LocalDateTime;
-import java.util.Date;
-import java.util.List;
-
-/**
- * <p>
- * 事件表
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@TableName("br_bus_event")
-@Data
-@ApiModel("BusEvent")
-public class BusEvent implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @ApiModelProperty("事件ID")
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 事件标题
-     */
-    @ApiModelProperty("事件名称")
-    @TableField("EVENT_TITLE")
-    private String eventTitle;
-
-    /**
-     * 上报人员
-     */
-    @ApiModelProperty("上报人员")
-    @TableField("UPLOAD_NAME")
-    private String uploadName;
-
-    /**
-     * 联系方式
-     */
-    @ApiModelProperty("联系方式")
-    @TableField("PHONE_NUMBER")
-    private String phoneNumber;
-
-    /**
-     * 事件描述
-     */
-    @ApiModelProperty("事件描述")
-    @TableField("EVENT_DESCRIPTION")
-    private String eventDescription;
-
-    @ApiModelProperty("经度")
-    @TableField("LNG")
-    private String lng;
-
-    @ApiModelProperty("纬度")
-    @TableField("LAT")
-    private String lat;
-
-    /**
-     * 事件上传时间
-     */
-    @ApiModelProperty("事件上传时间")
-    @TableField("CREATE_TIME")
-    private Date createTime;
-
-    @ApiModelProperty("事件照片")
-    @TableField(exist = false)
-    private List<BusEventImage> imageList;
-
-
-
-    @Override
-    public String toString() {
-        return "BusEvent{" +
-            "id=" + id +
-            ", eventTitle=" + eventTitle +
-            ", uploadName=" + uploadName +
-            ", phoneNumber=" + phoneNumber +
-            ", eventDescription=" + eventDescription +
-            ", lng=" + lng +
-            ", lat=" + lat +
-            ", createTime=" + createTime +
-        "}";
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusEventImage.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusEventImage.java
deleted file mode 100644
index 1e75245..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusEventImage.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-
-/**
- * <p>
- * 事件图片表
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@TableName("br_bus_event_image")
-@Data
-@ApiModel("BusEventImage")
-public class BusEventImage implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 事件ID
-     */
-    @TableField("EVENT_ID")
-    private Long eventId;
-
-    /**
-     * 报警图片
-     */
-    @TableField("IMAGE")
-    @ApiModelProperty("图片url")
-    private String image;
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Device.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Device.java
index df89c70..ea7db5f 100644
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Device.java
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Device.java
@@ -1,30 +1,23 @@
 package com.casic.missiles.modular.system.entity;
 
-import com.alibaba.fastjson.annotation.JSONField;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.casic.missiles.core.base.json.DateDeserializer;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
-import java.util.Date;
 
 /**
  * <p>
- * 
+ * 设备记录表
  * </p>
  *
  * @author zyj
- * @since 2023-04-14
+ * @since 2023-05-25
  */
-@ApiModel("Device")
-@TableName("br_device")
 @Data
+@TableName("bus_device")
 public class Device implements Serializable {
 
     private static final long serialVersionUID = 1L;
@@ -32,82 +25,86 @@
     /**
      * 主键
      */
-    @ApiModelProperty(value = "设备ID")
     @TableId(value = "ID",type = IdType.ASSIGN_ID)
     private Long id;
 
     /**
-     * 设备编号
+     * 设备名称
      */
-    @ApiModelProperty(value = "设备编号")
-    @TableField("DEVICE_CODE")
-    private String deviceCode;
+    @TableField("DEVICE_NAME")
+    private String deviceName;
 
     /**
-     * 设备类型
+     * IP
      */
-    @ApiModelProperty(value = "设备类型")
-    @TableField("DEVICE_TYPE")
-    private String deviceType;
+    @TableField("IP")
+    private String ip;
 
     /**
-     * 设备批次
+     * 端口
      */
-    @ApiModelProperty(value = "设备批次")
-    @TableField("DEVICE_BATCH")
-    private String deviceBatch;
+    @TableField("PORT")
+    private String port;
 
     /**
-     * 厂家
+     * 用户名
      */
-    @ApiModelProperty(value = "厂家")
-    @TableField("MANUFACTURER")
-    private String manufacturer;
+    @TableField("USER_NAME")
+    private String userName;
 
     /**
-     * 是否供电
+     * 密码
      */
-    @ApiModelProperty(value = "是否供电")
-    @TableField("IS_POWER_SUPPLY")
-    private String isPowerSupply;
+    @TableField("PASSWORD")
+    private String password;
 
     /**
-     * 创建时间
+     * 连接类型
      */
-    @ApiModelProperty(value = "创建时间",dataType = "Date")
-    @TableField("CREATE_TIME")
-    private Date createTime;
+    @TableField("CONNECT_TYPE")
+    private String connectType;
 
-    @ApiModelProperty(value = "设备类型名称")
-    @TableField(exist = false)
-    private String deviceTypeName;
+    /**
+     * 位置
+     */
+    @TableField("LOCATION")
 
-    @ApiModelProperty(value = "是否供电名称")
-    @TableField(exist = false)
-    private String isPowerSupplyName;
+    private String location;
 
-    @ApiModelProperty(value = "注册时间",dataType = "String")
-    @TableField(exist = false)
-    private String registerTime;
+    /**
+     * 设备状态
+     */
+    @TableField("STATUS")
 
-    @ApiModelProperty(value = "当前状态")
-    @TableField(exist = false)
     private String status;
 
-    @ApiModelProperty(value = "当前状态名称")
-    @TableField(exist = false)
-    private String statusName;
+    /**
+     * 报警分组
+     */
+    @TableField("ALARM_GROUP")
+
+    private Long alarmGroup;
+
+    /**
+     * 视频通道数(预留)
+     */
+    @TableField("CHANNEL_NUM")
+    private Integer channelNum;
 
     @Override
     public String toString() {
         return "Device{" +
             "id=" + id +
-            ", deviceCode=" + deviceCode +
-            ", deviceType=" + deviceType +
-            ", deviceBatch=" + deviceBatch +
-            ", manufacturer=" + manufacturer +
-            ", isPowerSupply=" + isPowerSupply +
-            ", createTime=" + createTime +
+            ", deviceName=" + deviceName +
+            ", ip=" + ip +
+            ", port=" + port +
+            ", userName=" + userName +
+            ", password=" + password +
+            ", connectType=" + connectType +
+            ", location=" + location +
+            ", status=" + status +
+            ", alarmGroup=" + alarmGroup +
+            ", channelNum=" + channelNum +
         "}";
     }
 }
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/DeviceExt.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/DeviceExt.java
deleted file mode 100644
index 5ee7015..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/DeviceExt.java
+++ /dev/null
@@ -1,99 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-
-/**
- * <p>
- * 设备扩展信息表（安全树）
- * </p>
- *
- * @author zyj
- * @since 2023-04-27
- */
-@Data
-@TableName("br_device_ext")
-public class DeviceExt implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 设备ID
-     */
-    @TableField("DEVICE_ID")
-    private Long deviceId;
-
-    /**
-     * 摄像头编号
-     */
-    @TableField("CAMERA_CODE")
-    private String cameraCode;
-
-    /**
-     * 摄像头IP
-     */
-    @TableField("CAMERA_IP")
-    private String cameraIp;
-
-    /**
-     * 摄像头端口
-     */
-    @TableField("CAMERA_PORT")
-    private String cameraPort;
-
-    /**
-     * 激甲编号
-     */
-    @TableField("GAS_CODE")
-    private String gasCode;
-
-    /**
-     * 激甲IP
-     */
-    @TableField("GAS_IP")
-    private String gasIp;
-
-    /**
-     * 激甲端口
-     */
-    @TableField("GAS_PORT")
-    private String gasPort;
-
-    /**
-     * 甲烷报警阈值
-     */
-    @TableField("GAS_THRESHOLD")
-    private String gasThreshold;
-
-    @TableField(value = "HAT_LINING_CODE")
-    private String hatLiningCode;
-
-
-    @Override
-    public String toString() {
-        return "DeviceExt{" +
-            "id=" + id +
-            ", deviceId=" + deviceId +
-            ", cameraCode=" + cameraCode +
-            ", cameraIp=" + cameraIp +
-            ", cameraPort=" + cameraPort +
-            ", gasCode=" + gasCode +
-            ", gasIp=" + gasIp +
-            ", gasPort=" + gasPort +
-            ", gasThreshold=" + gasThreshold +
-            ", hatLiningCode=" + hatLiningCode +
-        "}";
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/ProjectDevice.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/ProjectDevice.java
deleted file mode 100644
index c4f3472..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/ProjectDevice.java
+++ /dev/null
@@ -1,62 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-
-/**
- * <p>
- * 
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@Data
-@ApiModel("ProjectDevice")
-@TableName("br_project_device")
-public class ProjectDevice implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 作业现场ID
-     */
-    @TableField("PROJECT_ID")
-    private Long projectId;
-
-    /**
-     * 设备ID
-     */
-    @TableField("DEVICE_ID")
-    @ApiModelProperty("设备ID（新增编辑时传）")
-    private Long deviceId;
-
-    /**
-     * 设备编号
-     */
-    @TableField(exist = false)
-    @ApiModelProperty("设备编号（详情中展示，新增编辑不用传）")
-    private String deviceCode;
-
-    @Override
-    public String toString() {
-        return "ProjectDevice{" +
-            "id=" + id +
-            ", projectId=" + projectId +
-            ", deviceId=" + deviceId +
-        "}";
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/ProjectWorker.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/ProjectWorker.java
deleted file mode 100644
index 10b23c4..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/ProjectWorker.java
+++ /dev/null
@@ -1,104 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import java.io.Serializable;
-
-/**
- * <p>
- * 
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@ApiModel("ProjectWorker")
-@TableName("br_project_worker")
-@Data
-@NoArgsConstructor
-@AllArgsConstructor
-public class ProjectWorker implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 作业现场ID
-     */
-    @TableField("PROJECT_ID")
-    private Long projectId;
-
-    /**
-     * 人员ID
-     */
-    @ApiModelProperty("人员ID")
-    @TableField("WORKER_ID")
-    private Long workerId;
-
-    /**
-     * 安全帽编号
-     */
-    @ApiModelProperty("安全帽编号")
-    @TableField("HAT_CODE")
-    private String hatCode;
-
-    /**
-     * 背心编号
-     */
-    @ApiModelProperty("背心编号")
-    @TableField("VAST_CODE")
-    private String vastCode;
-
-    /**
-     * 手环编号
-     */
-    @ApiModelProperty("手环编号")
-    @TableField("BRACELET_CODE")
-    private String braceletCode;
-
-    @ApiModelProperty("人员姓名（详情中展示，新增编辑不用传）")
-    @TableField(exist = false)
-    private String workerName;
-
-    @ApiModelProperty("人员部门ID（详情中展示，新增编辑不用传）")
-    @TableField(exist = false)
-    private String workerDeptId;
-
-    @ApiModelProperty("人员部门名称（详情中展示，新增编辑不用传）")
-    @TableField(exist = false)
-    private String workerDeptName;
-
-    @ApiModelProperty("人员联系方式（详情中展示，新增编辑不用传）")
-    @TableField(exist = false)
-    private String workerPhoneNumber;
-
-    public ProjectWorker(Long projectId, Long workerId) {
-        this.projectId = projectId;
-        this.workerId = workerId;
-    }
-
-    @Override
-    public String toString() {
-        return "ProjectWorker{" +
-            "id=" + id +
-            ", projectId=" + projectId +
-            ", workerId=" + workerId +
-            ", hatCode=" + hatCode +
-            ", vastCode=" + vastCode +
-            ", braceletCode=" + braceletCode +
-        "}";
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/WorkSiteInfo.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/WorkSiteInfo.java
deleted file mode 100644
index fa6f41d..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/WorkSiteInfo.java
+++ /dev/null
@@ -1,130 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.alibaba.fastjson.annotation.JSONField;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.time.LocalDateTime;
-import java.util.Date;
-
-/**
- * <p>
- * 作业现场表
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@ApiModel("WorkSiteInfo")
-@TableName("br_work_site_info")
-@Data
-public class WorkSiteInfo implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @ApiModelProperty("作业现场ID")
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 作业名称
-     */
-    @ApiModelProperty("作业名称")
-    @TableField("WORK_TITLE")
-    private String workTitle;
-
-    /**
-     * 责任人
-     */
-    @ApiModelProperty("责任人（人员ID）")
-    @TableField("WORK_PERSON")
-    private Long workPerson;
-
-    /**
-     * 作业描述
-     */
-    @ApiModelProperty("作业描述")
-    @TableField("WORK_SITE_DESC")
-    private String workSiteDesc;
-
-    /**
-     * 作业状态
-     */
-    @ApiModelProperty("作业状态")
-    @TableField("PROJECT_STATE")
-    private String projectState;
-
-    /**
-     * 所属道路
-     */
-    @ApiModelProperty("所属道路")
-    @TableField("WORK_ROAD")
-    private String workRoad;
-
-    @TableField("IMAGE_URL")
-    private String imageUrl;
-
-    @TableField("CREATE_TIME")
-    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
-    private Date createTime;
-    @TableField("UPDATE_TIME")
-    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
-    private Date updateTime;
-
-    @ApiModelProperty("开始时间")
-    @TableField("START_TIME")
-    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
-    private Date startTime;
-
-    @ApiModelProperty("结束时间")
-    @TableField("FINISH_TIME")
-    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
-    private Date finishTime;
-
-    @ApiModelProperty("负责人姓名（详情中使用，新增编辑不用传）")
-    @TableField(exist = false)
-    private String workPersonName;
-
-    @ApiModelProperty("负责人联系方式（详情中使用，新增编辑不用传）")
-    @TableField(exist = false)
-    private String workPersonPhoneNumber;
-
-    @ApiModelProperty("负责人所属部门ID（详情中使用，新增编辑不用传）")
-    @TableField(exist = false)
-    private Long workPersonDeptId;
-
-    @ApiModelProperty("负责人所属部门名称（详情中使用，新增编辑不用传）")
-    @TableField(exist = false)
-    private String workPersonDeptName;
-
-    @ApiModelProperty(value = "注册时间",dataType = "String")
-    @TableField(exist = false)
-    private String registerTime;
-
-    @ApiModelProperty("作业状态名称")
-    @TableField(exist = false)
-    private String projectStateName;
-
-    @Override
-    public String toString() {
-        return "WorkSiteInfo{" +
-            "id=" + id +
-            ", workTitle=" + workTitle +
-            ", workPerson=" + workPerson +
-            ", workSiteDesc=" + workSiteDesc +
-            ", projectState=" + projectState +
-            ", imageUrl=" + imageUrl +
-            ", updateTime=" + updateTime +
-            ", workRoad=" + workRoad +
-        "}";
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Worker.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Worker.java
deleted file mode 100644
index 28a4daa..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Worker.java
+++ /dev/null
@@ -1,147 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.time.LocalDateTime;
-import java.util.Date;
-
-/**
- * <p>
- * 
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@ApiModel("Worker")
-@TableName("br_worker")
-@Data
-public class Worker implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @ApiModelProperty(value = "人员ID")
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 姓名
-     */
-    @ApiModelProperty(value = "姓名")
-    @TableField("WORKER_NAME")
-    private String workerName;
-
-    /**
-     * 性别
-     */
-    @ApiModelProperty(value = "性别")
-    @TableField("GENDER")
-    private String gender;
-
-    /**
-     * 所属部门
-     */
-    @ApiModelProperty(value = "所属部门(人员管理)")
-    @TableField("DEPT_ID")
-    private Long deptId;
-
-    /**
-     * 所属单位
-     */
-    @ApiModelProperty(value = "所属单位(入场申请中使用)")
-    @TableField("OWNER_SHIP")
-    private String ownerShip;
-
-    /**
-     * 联系方式
-     */
-    @ApiModelProperty(value = "联系方式")
-    @TableField("PHONE_NUMBER")
-    private String phoneNumber;
-
-    /**
-     * 证件号
-     */
-    @ApiModelProperty(value = "证件号")
-    @TableField("ID_CARD_NUMBER")
-    private String idCardNumber;
-
-    /**
-     * 入场原因
-     */
-    @ApiModelProperty(value = "入场原因（入场申请中使用）")
-    @TableField("ENTER_REASON")
-    private String enterReason;
-
-    /**
-     * 入场人脸照片
-     */
-    @ApiModelProperty(value = "人脸照片（照片路径）")
-    @TableField("WORKER_AVATAR")
-    private String workerAvatar;
-
-    /**
-     * 申请入场时间
-     */
-    @ApiModelProperty(value = "注册时间/申请入场时间")
-    @TableField("CREATE_TIME")
-    private Date createTime;
-
-    /**
-     * 人员类型
-     */
-    @ApiModelProperty(value = "人员类型（区分人员管理和入场申请）")
-    @TableField("WORKER_TYPE")
-    private String workerType;
-
-    @ApiModelProperty(value = "性别名称")
-    @TableField(exist = false)
-    private String genderName;
-
-    @ApiModelProperty(value = "部门名称")
-    @TableField(exist = false)
-    private String deptName;
-
-    @ApiModelProperty(value = "注册时间",dataType = "String")
-    @TableField(exist = false)
-    private String registerTime;
-
-    @ApiModelProperty(value = "当前状态")
-    @TableField(exist = false)
-    private String status;
-
-    @ApiModelProperty(value = "当前状态名称")
-    @TableField(exist = false)
-    private String statusName;
-
-    @ApiModelProperty(value = "是否注册(0未注册；1已注册)",allowableValues = "0,1")
-    @TableField(exist = false)
-    private String isRegister;
-
-    @Override
-    public String toString() {
-        return "Worker{" +
-            "id=" + id +
-            ", workerName=" + workerName +
-            ", gender=" + gender +
-            ", deptId=" + deptId +
-            ", ownerShip=" + ownerShip +
-            ", phoneNumber=" + phoneNumber +
-            ", idCardNumber=" + idCardNumber +
-            ", enterReason=" + enterReason +
-            ", workerAvatar=" + workerAvatar +
-            ", createTime=" + createTime +
-            ", workerType=" + workerType +
-        "}";
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/AlarmMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/AlarmMapper.java
new file mode 100644
index 0000000..ea4c8be
--- /dev/null
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/AlarmMapper.java
@@ -0,0 +1,16 @@
+package com.casic.missiles.modular.system.mapper;
+
+import com.casic.missiles.modular.system.entity.Alarm;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 报警记录表 Mapper 接口
+ * </p>
+ *
+ * @author zyj
+ * @since 2023-05-25
+ */
+public interface AlarmMapper extends BaseMapper<Alarm> {
+
+}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/BusAlarmMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/BusAlarmMapper.java
deleted file mode 100644
index 9801742..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/BusAlarmMapper.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package com.casic.missiles.modular.system.mapper;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.modular.system.dto.AlarmTypeCountDTO;
-import com.casic.missiles.modular.system.entity.BusAlarm;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * <p>
- * 报警记录表 Mapper 接口
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface BusAlarmMapper extends BaseMapper<BusAlarm> {
-
-    Page<BusAlarm> listPage(Page<BusAlarm> page,@Param("ew")  QueryWrapper<BusAlarm> queryWrapper);
-
-    void cancelAlarm(@Param("deviceId")Long deviceId,@Param("alarmType") String alarmType);
-
-    List<AlarmTypeCountDTO> alarmCount(@Param("projectId")Long projectId, @Param("alarmStatus")String alarmStatus);
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/BusEventImageMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/BusEventImageMapper.java
deleted file mode 100644
index 9590b7d..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/BusEventImageMapper.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.casic.missiles.modular.system.mapper;
-
-import com.casic.missiles.modular.system.entity.BusEventImage;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * <p>
- * 事件图片表 Mapper 接口
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface BusEventImageMapper extends BaseMapper<BusEventImage> {
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/BusEventMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/BusEventMapper.java
deleted file mode 100644
index 3c85edf..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/BusEventMapper.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.casic.missiles.modular.system.mapper;
-
-import com.casic.missiles.modular.system.entity.BusEvent;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * <p>
- * 事件表 Mapper 接口
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface BusEventMapper extends BaseMapper<BusEvent> {
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/DeviceExtMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/DeviceExtMapper.java
deleted file mode 100644
index 4ca9212..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/DeviceExtMapper.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.casic.missiles.modular.system.mapper;
-
-import com.casic.missiles.modular.system.entity.DeviceExt;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * <p>
- * 设备扩展信息表（安全树） Mapper 接口
- * </p>
- *
- * @author zyj
- * @since 2023-04-27
- */
-public interface DeviceExtMapper extends BaseMapper<DeviceExt> {
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/DeviceMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/DeviceMapper.java
index 444c0c5..3d0bb02 100644
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/DeviceMapper.java
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/DeviceMapper.java
@@ -1,30 +1,16 @@
 package com.casic.missiles.modular.system.mapper;
 
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.modular.system.dto.DeviceDetailDTO;
-import com.casic.missiles.modular.system.dto.HelmetInfoDTO;
 import com.casic.missiles.modular.system.entity.Device;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
 
 /**
  * <p>
- *  Mapper 接口
+ * 设备记录表 Mapper 接口
  * </p>
  *
  * @author zyj
- * @since 2023-04-14
+ * @since 2023-05-25
  */
-@Mapper
 public interface DeviceMapper extends BaseMapper<Device> {
 
-    Page<DeviceDetailDTO> listDetailPage(Page<DeviceDetailDTO> page,@Param("ew") QueryWrapper<DeviceDetailDTO> ew);
-
-     List<Long> selectProjectDevice(@Param("projectId") Long projectId);
-
-    List<HelmetInfoDTO> selectHelmetList(@Param("deviceType")String deviceType);
 }
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/ProjectDeviceMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/ProjectDeviceMapper.java
deleted file mode 100644
index 1d0c14e..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/ProjectDeviceMapper.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package com.casic.missiles.modular.system.mapper;
-
-import com.casic.missiles.modular.system.dto.DeviceLocationDTO;
-import com.casic.missiles.modular.system.entity.ProjectDevice;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * <p>
- *  Mapper 接口
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface ProjectDeviceMapper extends BaseMapper<ProjectDevice> {
-     List<ProjectDevice> selectDetailByProjectId(@Param("projectId") Long projectId);
-
-     List<DeviceLocationDTO> selectDeviceLocationList(@Param("projectId") Long projectId);
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/ProjectWorkerMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/ProjectWorkerMapper.java
deleted file mode 100644
index 58583d1..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/ProjectWorkerMapper.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package com.casic.missiles.modular.system.mapper;
-
-import com.casic.missiles.modular.system.dto.WorkerLocationDTO;
-import com.casic.missiles.modular.system.entity.ProjectWorker;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * <p>
- *  Mapper 接口
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface ProjectWorkerMapper extends BaseMapper<ProjectWorker> {
-
-    List<ProjectWorker> selectDetailByProjectId(@Param("projectId") Long projectId,
-                                                @Param("workerType")String workerType);
-
-    List<WorkerLocationDTO> selectWorkerLocationList(@Param("projectId") Long projectId,
-                                                     @Param("workerType")String workerType);
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/WorkSiteInfoMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/WorkSiteInfoMapper.java
deleted file mode 100644
index a4934d2..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/WorkSiteInfoMapper.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.casic.missiles.modular.system.mapper;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.modular.system.entity.WorkSiteInfo;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Param;
-
-/**
- * <p>
- * 作业现场表 Mapper 接口
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface WorkSiteInfoMapper extends BaseMapper<WorkSiteInfo> {
-
-    Page<WorkSiteInfo> selectListPage(Page<WorkSiteInfo> page,@Param("ew") QueryWrapper<WorkSiteInfo> ew);
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/WorkerMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/WorkerMapper.java
deleted file mode 100644
index 258fb12..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/WorkerMapper.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package com.casic.missiles.modular.system.mapper;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.modular.system.dto.DeviceDetailDTO;
-import com.casic.missiles.modular.system.entity.Worker;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * <p>
- *  Mapper 接口
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface WorkerMapper extends BaseMapper<Worker> {
-
-
-    Page<Worker> selectListPage(Page<Worker> page, @Param("ew") QueryWrapper<Worker> ew);
-
-    List<String> selectWorkerAvatars(@Param("projectId")Long projectId);
-
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/AlarmMapper.xml b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/AlarmMapper.xml
new file mode 100644
index 0000000..25cb4ab
--- /dev/null
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/AlarmMapper.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.modular.system.mapper.AlarmMapper">
+
+</mapper>
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/BusAlarmMapper.xml b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/BusAlarmMapper.xml
deleted file mode 100644
index 595088a..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/BusAlarmMapper.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.casic.missiles.modular.system.mapper.BusAlarmMapper">
-
-    <select id="listPage" resultType="com.casic.missiles.modular.system.entity.BusAlarm">
-        SELECT
-            alarm.ID as id,
-            alarm.DEVICE_ID as deviceId,
-            alarm.PROJECT_ID as projectId,
-            alarm.ALARM_TYPE as alarmType,
-            alarm.ALARM_VALUE as alarmValue,
-            alarm.ALARM_STATUS as alarmStatus,
-            alarm.ALARM_IMAGE AS alarmImage,
-            alarm.ALARM_CONTENT as alarmContent,
-            alarm.ALARM_TIME as alarmTime,
-            alarm.CANCEL_TIME as cancelTime,
-            alarm.ALARM_LNG as alarmLng,
-            alarm.ALARM_LAT as alarmLat,
-            p.WORK_TITLE as workTitle,
-            p.WORK_ROAD as workRoad,
-            p.PROJECT_STATE as projectState,
-            w.WORKER_NAME as workPersonName,
-            w.PHONE_NUMBER as workPersonPhoneNumber
-        FROM
-            `br_bus_alarm` alarm
-                LEFT JOIN br_work_site_info p on alarm.PROJECT_ID = p.ID
-                LEFT JOIN br_worker w on p.WORK_PERSON = w.ID
-        <where>
-            <if test="ew != null">
-                ${ew.sqlSegment}
-            </if>
-        </where>
-    </select>
-
-    <select id="cancelAlarm">
-        update br_bus_alarm
-        set ALARM_STATUS = '1'
-        where DEVICE_ID = #{deviceId}
-          and ALARM_TYPE = #{alarmType}
-          and ALARM_STATUS = '0'
-    </select>
-
-    <select id="alarmCount" resultType="com.casic.missiles.modular.system.dto.AlarmTypeCountDTO">
-        SELECT
-            ALARM_TYPE as alarmType,
-            count(*) as alarmCount
-        from br_bus_alarm
-        <where>
-            <if test="projectId != null and projectId !=''">
-                and PROJECT_ID = #{projectId}
-            </if>
-            <if test="alarmStatus != null and alarmStatus !=''">
-                and ALARM_STATUS = #{alarmStatus}
-            </if>
-        </where>
-        group by ALARM_TYPE
-    </select>
-</mapper>
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/BusEventImageMapper.xml b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/BusEventImageMapper.xml
deleted file mode 100644
index fbc3db3..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/BusEventImageMapper.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.casic.missiles.modular.system.mapper.BusEventImageMapper">
-
-</mapper>
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/BusEventMapper.xml b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/BusEventMapper.xml
deleted file mode 100644
index 627d573..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/BusEventMapper.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.casic.missiles.modular.system.mapper.BusEventMapper">
-
-</mapper>

diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/AlarmController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/AlarmController.java
new file mode 100644
index 0000000..1795cf1
--- /dev/null
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/AlarmController.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.modular.system.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.stereotype.Controller;
+
+/**
+ * <p>
+ * 报警记录表 前端控制器
+ * </p>
+ *
+ * @author zyj
+ * @since 2023-05-25
+ */
+@Controller
+@RequestMapping("/system/alarm")
+public class AlarmController {
+
+}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusAlarmController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusAlarmController.java
deleted file mode 100644
index 1f82ebb..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusAlarmController.java
+++ /dev/null
@@ -1,102 +0,0 @@
-package com.casic.missiles.modular.system.controller;
-
-
-import cn.hutool.core.util.ObjectUtil;
-import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.core.base.controller.BaseController;
-import com.casic.missiles.core.page.PageFactory;
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.AlarmUpload;
-import com.casic.missiles.modular.system.dto.DeviceDetailDTO;
-import com.casic.missiles.modular.system.entity.BusAlarm;
-import com.casic.missiles.modular.system.service.IBusAlarmService;
-import io.swagger.annotations.*;
-import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.*;
-
-import org.springframework.stereotype.Controller;
-
-import static com.casic.missiles.model.response.ResponseData.DEFAULT_SUCCESS_MESSAGE;
-import static com.casic.missiles.modular.system.consts.AlarmConst.ALARM_STATUS_MANUAL_CANCEL;
-
-/**
- * <p>
- * 报警记录表 前端控制器
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@Api(tags = "报警管理接口")
-@Controller
-@RequestMapping("/alarm")
-@RequiredArgsConstructor
-public class BusAlarmController extends BaseController {
-
-    private final IBusAlarmService alarmService;
-
-    @ApiOperation("报警上报接口")
-    @PostMapping("/upload")
-    @ResponseBody
-    public Object upload(@RequestBody AlarmUpload alarmUpload){
-        alarmService.alarmUpload(alarmUpload);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("报警列表分页查询")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "workTitle", value = "作业名称",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "projectId", value = "作业ID",dataType = "Long", paramType = "query",example = "0"),
-            @ApiImplicitParam(name = "alarmStatus", value = "报警状态",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "projectState", value = "作业状态",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "alarmType", value = "报警类型",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "alarmStartTime", value = "报警开始时间",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "alarmEndTime", value = "报警结束时间",dataType = "String", paramType = "query")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = BusAlarm.class),
-    })
-    @GetMapping("/listPage")
-    @ResponseBody
-    public Object listPage(String workTitle,Long projectId,String alarmStatus,String projectState,String alarmType,String alarmStartTime,String alarmEndTime){
-        Page<BusAlarm> page = PageFactory.defaultPage();
-        QueryWrapper<BusAlarm> queryWrapper = new QueryWrapper<>();
-        if(StrUtil.isNotEmpty(workTitle)){
-            queryWrapper.like("p.WORK_TITLE",workTitle);
-        }
-        if(ObjectUtil.isNotEmpty(projectId)){
-            queryWrapper.eq("alarm.PROJECT_ID",projectId);
-        }
-        if(StrUtil.isNotEmpty(alarmStatus)){
-            queryWrapper.eq("alarm.ALARM_STATUS",alarmStatus);
-        }
-        if(StrUtil.isNotEmpty(projectState)){
-            queryWrapper.eq("p.PROJECT_STATE",projectState);
-        }
-        if(StrUtil.isNotEmpty(alarmType)){
-            queryWrapper.eq("alarm.ALARM_TYPE",alarmType);
-        }
-        if(StrUtil.isNotEmpty(alarmStartTime)){
-            queryWrapper.ge("alarm.ALARM_TIME",alarmStartTime);
-        }
-        if(StrUtil.isNotEmpty(alarmEndTime)){
-            queryWrapper.le("alarm.ALARM_TIME",alarmEndTime);
-        }
-        page = alarmService.listPage(page,queryWrapper);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-    @ApiOperation("消警")
-    @PostMapping("/cancel")
-    @ResponseBody
-    public Object cancel(@RequestParam("alarmId") Long alarmId){
-        UpdateWrapper<BusAlarm> updateWrapper = new UpdateWrapper<>();
-        updateWrapper.eq("ID",alarmId);
-        updateWrapper.set("ALARM_STATUS",ALARM_STATUS_MANUAL_CANCEL);
-        alarmService.update(updateWrapper);
-        return ResponseData.success();
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusEventController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusEventController.java
deleted file mode 100644
index dde5aad..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusEventController.java
+++ /dev/null
@@ -1,41 +0,0 @@
-package com.casic.missiles.modular.system.controller;
-
-
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.entity.BusEvent;
-import com.casic.missiles.modular.system.service.IBusEventService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.ResponseBody;
-
-/**
- * <p>
- * 事件表 前端控制器
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@Controller
-@RequestMapping("/event")
-@Api(tags = "事件上报")
-@RequiredArgsConstructor
-public class BusEventController {
-
-    private final IBusEventService eventService;
-
-    @ApiOperation("事件上报")
-    @PostMapping("add")
-    @ResponseBody
-    public Object add(@RequestBody BusEvent busEvent){
-        eventService.saveBusEvent(busEvent);
-        return ResponseData.success();
-    }
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
index 03abc5f..aa50d78 100644
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
@@ -1,121 +1,20 @@
 package com.casic.missiles.modular.system.controller;
 
 
-import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.core.base.controller.BaseController;
-import com.casic.missiles.core.page.PageFactory;
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.DeviceDetailDTO;
-import com.casic.missiles.modular.system.entity.Device;
-import com.casic.missiles.modular.system.service.IDeviceExtService;
-import com.casic.missiles.modular.system.service.IDeviceService;
-import io.swagger.annotations.*;
-import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.RequestMapping;
 
 import org.springframework.stereotype.Controller;
 
-import java.time.LocalDateTime;
-import java.util.Date;
-import java.util.List;
-
-import static com.casic.missiles.model.response.ResponseData.DEFAULT_SUCCESS_MESSAGE;
-
 /**
  * <p>
- *  前端控制器
+ * 设备记录表 前端控制器
  * </p>
  *
  * @author zyj
- * @since 2023-04-14
+ * @since 2023-05-25
  */
-@Api(tags = "设备管理接口")
-@RequiredArgsConstructor
 @Controller
-@RequestMapping("/device")
-public class DeviceController extends BaseController {
-    private final IDeviceService deviceService;
-    private final IDeviceExtService deviceExtService;
-
-    @ApiOperation("设备分页列表")
-    @ApiImplicitParams({
-        @ApiImplicitParam(name = "deviceType", value = "设备类型",dataType = "String", paramType = "query"),
-        @ApiImplicitParam(name = "deviceCode", value = "设备编号",dataType = "String", paramType = "query"),
-        @ApiImplicitParam(name = "status", value = "设备状态",dataType = "String", paramType = "query"),
-        @ApiImplicitParam(name = "projectId", value = "作业ID（如果传此参数，列表中返回该作业使用的设备）",dataType = "Long", paramType = "query", example = "0")
-    })
-    @ApiResponses({
-        @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = DeviceDetailDTO.class),
-    })
-    @GetMapping("listPage")
-    @ResponseBody
-    public Object listPage(String deviceType, String deviceCode, String status,Long projectId){
-        Page<DeviceDetailDTO> page = PageFactory.defaultPage();
-        QueryWrapper<DeviceDetailDTO> queryWrapper = new QueryWrapper<>();
-        if(StrUtil.isNotEmpty(deviceType)){
-            queryWrapper.eq("DEVICE_TYPE",deviceType);
-        }
-        if(StrUtil.isNotEmpty(deviceCode)){
-            queryWrapper.like("DEVICE_CODE",deviceCode);
-        }
-        page = deviceService.listPage(page,queryWrapper,status,projectId);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-    @ApiOperation("新增设备")
-    @PostMapping("add")
-    @ResponseBody
-    public Object add(@RequestBody DeviceDetailDTO deviceDetailDTO){
-        deviceService.saveDevice(deviceDetailDTO);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("编辑设备")
-    @PostMapping("update")
-    @ResponseBody
-    public Object update(@RequestBody DeviceDetailDTO deviceDetailDTO){
-        deviceService.updateDevice(deviceDetailDTO);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("删除设备")
-    @PostMapping("delete")
-    @ResponseBody
-    public Object delete(@ApiParam("设备id列表")@RequestBody List<Long> deviceIds){
-        deviceService.deleteDevices(deviceIds);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("设置甲烷阈值")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "gasIp", value = "安全树甲烷设备IP",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "gasPort", value = "安全树甲烷端口",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "threshold", value = "甲烷阈值",dataType = "String", paramType = "query")
-    })
-    @PostMapping("setThreshold")
-    @ResponseBody
-    public Object setThreshold(String gasIp,String gasPort,String threshold){
-        deviceExtService.setGasThreshold(gasIp, gasPort, threshold);
-        return ResponseData.success();
-    }
-
-
-    @ApiOperation("查询甲烷阈值")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "gasIp", value = "安全树甲烷设备IP",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "gasPort", value = "安全树甲烷端口",dataType = "String", paramType = "query")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = "{\"code\": 200,\"data\": \"100\",\"message\": \"请求成功\",\"success\": true}",response = String.class),
-    })
-    @GetMapping("getThreshold")
-    @ResponseBody
-    public Object getThreshold(String gasIp,String gasPort){
-        String data = deviceExtService.getGasThreshold(gasIp, gasPort);
-        return ResponseData.success(data);
-    }
-
+@RequestMapping("/system/device")
+public class DeviceController {
 
 }
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/OverviewController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/OverviewController.java
deleted file mode 100644
index 7570504..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/OverviewController.java
+++ /dev/null
@@ -1,70 +0,0 @@
-package com.casic.missiles.modular.system.controller;
-
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.AlarmTypeCountDTO;
-import com.casic.missiles.modular.system.dto.DeviceLocationDTO;
-import com.casic.missiles.modular.system.dto.WorkerLocationDTO;
-import com.casic.missiles.modular.system.service.IBusAlarmService;
-import com.casic.missiles.modular.system.service.IProjectDeviceService;
-import com.casic.missiles.modular.system.service.IProjectWorkerService;
-import io.swagger.annotations.*;
-import lombok.RequiredArgsConstructor;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.ResponseBody;
-
-import static com.casic.missiles.model.response.ResponseData.DEFAULT_SUCCESS_MESSAGE;
-import static com.casic.missiles.modular.system.consts.AlarmConst.ALARM_STATUS_ON;
-
-@Api(tags = "首页看板接口")
-@Controller
-@RequestMapping("overview")
-@RequiredArgsConstructor
-public class OverviewController {
-
-    private final IBusAlarmService alarmService;
-    private final IProjectDeviceService projectDeviceService;
-
-    private final IProjectWorkerService projectWorkerService;
-
-
-    @ApiOperation("报警统计接口")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "projectId", value = "作业ID",dataType = "Long", paramType = "query", example = "0")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = AlarmTypeCountDTO.class),
-    })
-    @GetMapping("/alarmCount")
-    @ResponseBody
-    public Object alarmCount(Long projectId){
-        return ResponseData.success(alarmService.alarmCount(projectId,ALARM_STATUS_ON));
-    }
-
-    @ApiOperation("设备列表接口")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "projectId", value = "作业ID",dataType = "Long", paramType = "query", example = "0")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = DeviceLocationDTO.class),
-    })
-    @GetMapping("/deviceList")
-    @ResponseBody
-    public Object deviceList(Long projectId){
-        return ResponseData.success(projectDeviceService.selectDeviceLocationList(projectId));
-    }
-
-    @ApiOperation("人员列表接口")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "projectId", value = "作业ID",dataType = "Long", paramType = "query", example = "0")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = WorkerLocationDTO.class),
-    })
-    @GetMapping("/workerList")
-    @ResponseBody
-    public Object workerList(Long projectId){
-        return ResponseData.success(projectWorkerService.selectWorkerLocationDTO(projectId));
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/WorkSiteInfoController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/WorkSiteInfoController.java
deleted file mode 100644
index af36d69..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/WorkSiteInfoController.java
+++ /dev/null
@@ -1,130 +0,0 @@
-package com.casic.missiles.modular.system.controller;
-
-
-import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.core.base.controller.BaseController;
-import com.casic.missiles.core.page.PageFactory;
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.WorkSiteDetailDTO;
-import com.casic.missiles.modular.system.entity.WorkSiteInfo;
-import com.casic.missiles.modular.system.service.IWorkSiteInfoService;
-import io.swagger.annotations.*;
-import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.*;
-
-import org.springframework.stereotype.Controller;
-
-import java.util.List;
-
-import static com.casic.missiles.model.response.ResponseData.DEFAULT_SUCCESS_MESSAGE;
-
-/**
- * <p>
- * 作业现场表 前端控制器
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@Controller
-@RequestMapping("/site")
-@Api(tags = "作业现场管理")
-@RequiredArgsConstructor
-public class WorkSiteInfoController extends BaseController {
-
-
-    private final IWorkSiteInfoService workSiteInfoService;
-
-    @ApiOperation("新增作业现场")
-    @PostMapping("add")
-    @ResponseBody
-    public Object addWorkSite(@RequestBody WorkSiteDetailDTO workSiteDetailDTO){
-        workSiteInfoService.addWorkSiteInfo(workSiteDetailDTO);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("编辑作业现场")
-    @PostMapping("update")
-    @ResponseBody
-    public Object updateWorkSite(@RequestBody WorkSiteDetailDTO workSiteDetailDTO){
-        workSiteInfoService.updateWorkSiteInfo(workSiteDetailDTO);
-        return ResponseData.success();
-    }
-
-
-    @ApiOperation("删除作业现场")
-    @PostMapping("delete")
-    @ResponseBody
-    public Object delete(@ApiParam("作业现场id列表")@RequestBody List<Long> projectIds){
-        workSiteInfoService.deleteProjects(projectIds);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("查询作业现场详情")
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = WorkSiteDetailDTO.class),
-    })
-    @GetMapping("detail")
-    @ResponseBody
-    public Object delete(@ApiParam(value = "作业现场id", example = "0")@RequestParam Long projectId){
-        WorkSiteDetailDTO detailDTO = workSiteInfoService.getWorkSiteDetail(projectId);
-        return ResponseData.success(detailDTO);
-    }
-
-    @ApiOperation("分页列表查询")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "workTitle",value = "作业名称", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "workRoad",value = "所属道路", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "workPersonName",value = "责任人姓名", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "startDate",value = "注册开始日期", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "endDate",value = "注册结束日期", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "projectState",value = "当前状态（字典值）", dataType = "String", paramType = "query")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = WorkSiteInfo.class),
-    })
-    @GetMapping("listPage")
-    @ResponseBody
-    public Object listPage(String workTitle,String workRoad,String workPersonName,String projectState,String startDate,String endDate){
-        Page<WorkSiteInfo> page = PageFactory.defaultPage();
-        QueryWrapper<WorkSiteInfo> queryWrapper = new QueryWrapper<>();
-        if(StrUtil.isNotEmpty(workTitle)){
-            queryWrapper.like("WORK_TITLE",workTitle);
-        }
-        if(StrUtil.isNotEmpty(workRoad)){
-            queryWrapper.like("WORK_ROAD",workRoad);
-        }
-        if(StrUtil.isNotEmpty(workPersonName)){
-            queryWrapper.like("WORKER_NAME",workPersonName);
-        }
-        if(StrUtil.isNotEmpty(projectState)){
-            queryWrapper.eq("PROJECT_STATE",projectState);
-        }
-        if(StrUtil.isNotEmpty(startDate)){
-            queryWrapper.ge("br_work_site_info.CREATE_TIME",startDate + " 00:00:00");
-        }
-        if(StrUtil.isNotEmpty(endDate)){
-            queryWrapper.le("br_work_site_info.CREATE_TIME",endDate + " 23:59:59");
-        }
-        page = workSiteInfoService.selectListPage(page,queryWrapper);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-    @ApiOperation("开始作业")
-    @PostMapping("start")
-    @ResponseBody
-    public Object start(@ApiParam(value = "作业现场id",example = "0")@RequestParam Long projectId){
-        workSiteInfoService.start(projectId);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("完成作业")
-    @PostMapping("finish")
-    @ResponseBody
-    public Object finish(@ApiParam(value = "作业现场id", example = "0")@RequestParam Long projectId){
-        workSiteInfoService.finish(projectId);
-        return ResponseData.success();
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/WorkerController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/WorkerController.java
deleted file mode 100644
index 796f94c..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/WorkerController.java
+++ /dev/null
@@ -1,136 +0,0 @@
-package com.casic.missiles.modular.system.controller;
-
-
-import cn.hutool.core.util.ObjectUtil;
-import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.core.base.controller.BaseController;
-import com.casic.missiles.core.page.PageFactory;
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.DeviceDetailDTO;
-import com.casic.missiles.modular.system.entity.Device;
-import com.casic.missiles.modular.system.entity.Worker;
-import com.casic.missiles.modular.system.service.IWorkerService;
-import io.swagger.annotations.*;
-import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.*;
-
-import org.springframework.stereotype.Controller;
-
-import java.util.Date;
-import java.util.List;
-
-import static com.casic.missiles.model.response.ResponseData.DEFAULT_SUCCESS_MESSAGE;
-
-/**
- * <p>
- *  前端控制器
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@Controller
-@RequestMapping("/worker")
-@RequiredArgsConstructor
-@Api(tags = "人员管理接口")
-public class WorkerController extends BaseController {
-
-    private final IWorkerService workerService;
-
-    @ApiOperation("分页列表查询")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "name",value = "姓名", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "deptId",value = "所属部门", dataType = "Long", paramType = "query", example = "0"),
-            @ApiImplicitParam(name = "status",value = "当前状态（字典值）", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "startDate",value = "注册开始日期", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "endDate",value = "注册结束日期", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "workerType",value = "人员类型（字典值）", dataType = "String", paramType = "query")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = Worker.class),
-    })
-    @GetMapping("listPage")
-    @ResponseBody
-    public Object listPage(String name,Long deptId, String status,String startDate,String endDate,String workerType){
-        Page<Worker> page = PageFactory.defaultPage();
-        QueryWrapper<Worker> queryWrapper = new QueryWrapper<>();
-        if(StrUtil.isNotEmpty(name)){
-            queryWrapper.like("WORKER_NAME",name);
-        }
-        if(ObjectUtil.isNotEmpty(deptId)){
-            queryWrapper.eq("DEPT_ID",deptId);
-        }
-        if(StrUtil.isNotEmpty(workerType)){
-            queryWrapper.eq("WORKER_TYPE",workerType);
-        }
-        if(StrUtil.isNotEmpty(startDate)){
-            queryWrapper.ge("CREATE_TIME",startDate + " 00:00:00");
-        }
-        if(StrUtil.isNotEmpty(endDate)){
-            queryWrapper.le("CREATE_TIME",endDate + " 23:59:59");
-        }
-        if(StrUtil.isNotEmpty(status)){
-            queryWrapper.eq("`STATUS`",status);
-        }
-        page = workerService.selectListPage(page,queryWrapper);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-    @ApiOperation("新增人员")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "worker", value = "人员信息", dataType = "Worker", paramType = "body", required = true),
-            @ApiImplicitParam(name = "projectId", value = "项目ID(入场申请需要)", dataType = "Long", paramType = "query", example = "0")
-    })
-    @PostMapping("add")
-    @ResponseBody
-    public Object add(@ApiParam("worker")@RequestBody Worker worker,
-                      @RequestParam(required = false) Long projectId){
-        workerService.addWorker(worker,projectId);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("编辑人员")
-    @PostMapping("update")
-    @ResponseBody
-    public Object update(@RequestBody Worker worker){
-        workerService.updateById(worker);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("删除人员")
-    @PostMapping("delete")
-    @ResponseBody
-    public Object delete(@ApiParam("人员id列表")@RequestBody List<Long> workIds){
-        workerService.removeByIds(workIds);
-        return ResponseData.success();
-    }
-
-
-    @ApiOperation(value = "获取人脸图片",notes = "返回人脸图片url")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "cameraIp",value = "摄像头IP", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "cameraPort",value = "摄像头端口号", dataType = "String", paramType = "query"),
-    })
-    @GetMapping("/face/register")
-    @ResponseBody
-    public Object faceRegister(String cameraIp,String cameraPort){
-        return ResponseData.success(workerService.faceRegister(cameraIp, cameraPort));
-    }
-
-
-    @ApiOperation(value = "查询临时入场人员列表")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "projectId", value = "项目ID",required = true,dataType = "Long", paramType = "query", example = "0")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = Worker.class),
-    })
-    @GetMapping("/projectTempWorker")
-    @ResponseBody
-    public Object projectTempWorker(Long projectId){
-        return ResponseData.success(workerService.projectTempWorker(projectId));
-    }
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/AlarmTypeCountDTO.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/AlarmTypeCountDTO.java
deleted file mode 100644
index 1a165a1..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/AlarmTypeCountDTO.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.casic.missiles.modular.system.dto;
-
-import io.swagger.annotations.ApiModel;
-import lombok.Data;
-
-@ApiModel(value = "AlarmTypeCountDTO",description = "报警类型统计（首页）")
-@Data
-public class AlarmTypeCountDTO {
-
-    private String alarmType;
-    private String alarmTypeName;
-    private Integer alarmCount;
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/AlarmUpload.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/AlarmUpload.java
deleted file mode 100644
index 73d7799..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/AlarmUpload.java
+++ /dev/null
@@ -1,46 +0,0 @@
-package com.casic.missiles.modular.system.dto;
-
-import cn.hutool.core.util.StrUtil;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-@ApiModel(value = "AlarmUpload",description = "报警上传")
-@Data
-public class AlarmUpload {
-
-    @ApiModelProperty(value = "摄像头ip")
-    private String cameraIp;
-
-    @ApiModelProperty(value = "摄像头端口")
-    private String cameraPort;
-    @ApiModelProperty(value = "安全树甲烷设备ip")
-    private String gasIp;
-    @ApiModelProperty(value = "安全树甲烷设备端口")
-    private String gasPort;
-    @ApiModelProperty(value = "报警值")
-    private String alarmValue;
-    @ApiModelProperty(value = "报警时间")
-    private String alarmTime;
-    @ApiModelProperty(value = "报警类型")
-    private String alarmType;
-    @ApiModelProperty(value = "报警图片")
-    private String alarmImage;
-    @ApiModelProperty(value = "报警内容")
-    private String alarmContent;
-
-    @Override
-    public String toString() {
-        return "AlarmUpload{" +
-                "cameraIp='" + cameraIp + '\'' +
-                ", cameraPort='" + cameraPort + '\'' +
-                ", gasIp='" + gasIp + '\'' +
-                ", gasPort='" + gasPort + '\'' +
-                ", alarmValue='" + alarmValue + '\'' +
-                ", alarmTime='" + alarmTime + '\'' +
-                ", alarmType='" + alarmType + '\'' +
-                ", alarmImage='" + (StrUtil.isNotEmpty(alarmImage) ? alarmImage.substring(0,50) : "null") + '\'' +
-                ", alarmContent='" + alarmContent + '\'' +
-                '}';
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/DeviceDetailDTO.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/DeviceDetailDTO.java
deleted file mode 100644
index ea518d9..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/DeviceDetailDTO.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package com.casic.missiles.modular.system.dto;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.casic.missiles.modular.system.entity.Device;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-@ApiModel("DeviceDetailDTO")
-@Data
-public class DeviceDetailDTO extends Device {
-
-    @ApiModelProperty(value = "摄像头编号")
-    private String cameraCode;
-
-    @ApiModelProperty(value = "摄像头IP")
-    private String cameraIp;
-
-    @ApiModelProperty(value = "摄像头端口")
-    private String cameraPort;
-
-    @ApiModelProperty(value = "激甲编号")
-    private String gasCode;
-
-    @ApiModelProperty(value = "激甲IP")
-    private String gasIp;
-
-    @ApiModelProperty(value = "激甲端口")
-    private String gasPort;
-
-    @ApiModelProperty(value = "智能帽衬编号")
-    private String hatLiningCode;
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/WorkSiteDetailDTO.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/WorkSiteDetailDTO.java
deleted file mode 100644
index 29378ff..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/WorkSiteDetailDTO.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package com.casic.missiles.modular.system.dto;
-
-import com.casic.missiles.modular.system.entity.ProjectDevice;
-import com.casic.missiles.modular.system.entity.ProjectWorker;
-import com.casic.missiles.modular.system.entity.WorkSiteInfo;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.util.List;
-
-@Data
-@ApiModel("WorkSiteDetailDTO")
-public class WorkSiteDetailDTO extends WorkSiteInfo {
-
-    @ApiModelProperty(value = "安全树列表",dataType = "ProjectDevice")
-    private List<ProjectDevice> deviceList;
-
-    @ApiModelProperty(value = "人员列表",dataType = "ProjectWorker")
-    private List<ProjectWorker> workerList;
-
-
-
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/WorkerLocationDTO.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/WorkerLocationDTO.java
deleted file mode 100644
index 6fd7b24..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/WorkerLocationDTO.java
+++ /dev/null
@@ -1,68 +0,0 @@
-package com.casic.missiles.modular.system.dto;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-@ApiModel(value = "WorkerLocationDTO",description = "人员位置列表（首页）")
-@Data
-public class WorkerLocationDTO {
-
-    @ApiModelProperty("人员ID")
-    private Long workerId;
-
-    @ApiModelProperty("人员姓名")
-    private String workerName;
-
-    @ApiModelProperty("安全帽编号")
-    private String hatCode;
-
-    @ApiModelProperty("安全帽ID")
-    private Long hatId;
-
-    @ApiModelProperty("背心编号")
-    private String vastCode;
-
-    @ApiModelProperty("手环编号")
-    private String braceletCode;
-
-    @ApiModelProperty("位置")
-    private String location;
-
-    @ApiModelProperty("时间")
-    private String time;
-
-    @ApiModelProperty("经度")
-    private String lng;
-
-    @ApiModelProperty("纬度")
-    private String lat;
-
-    @ApiModelProperty("心率")
-    private String heartRate;
-
-    @ApiModelProperty("血氧")
-    private String bloodOxygen;
-
-    @ApiModelProperty("一氧化碳")
-    private String co;
-
-    @ApiModelProperty("甲烷")
-    private String gas;
-
-    @ApiModelProperty("硫化氢")
-    private String h2s;
-
-    @ApiModelProperty("氧气")
-    private String o2;
-
-    @ApiModelProperty("信号")
-    private String signal;
-
-    @ApiModelProperty("电量")
-    private String cell;
-
-    @ApiModelProperty("是否报警")
-    private boolean alarmFlag;
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Alarm.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Alarm.java
new file mode 100644
index 0000000..4d2b7ef
--- /dev/null
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Alarm.java
@@ -0,0 +1,103 @@
+package com.casic.missiles.modular.system.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import java.util.Date;
+
+/**
+ * <p>
+ * 报警记录表
+ * </p>
+ *
+ * @author zyj
+ * @since 2023-05-25
+ */
+@Data
+@TableName("bus_alarm")
+public class Alarm implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    @TableId(value = "ID",type = IdType.ASSIGN_ID)
+    private Long id;
+
+    /**
+     * 设备ID
+     */
+    @TableField("DEVICE_ID")
+    private Long deviceId;
+
+    /**
+     * 报警类型
+     */
+    @TableField("ALARM_TYPE")
+    private String alarmType;
+
+    /**
+     * 报警时间
+     */
+    @TableField("ALARM_TIME")
+    private Date alarmTime;
+
+    /**
+     * 报警状态
+     */
+    @TableField("ALARM_STATUS")
+    private String alarmStatus;
+
+    /**
+     * 报警位置
+     */
+    @TableField("ALARM_LOCATION")
+    private String alarmLocation;
+
+    /**
+     * 报警图片
+     */
+    @TableField("ALARM_IMAGE")
+    private String alarmImage;
+
+    /**
+     * 视频通道号
+     */
+    @TableField("CHANNEL_NO")
+    private Integer channelNo;
+
+    /**
+     * 报警内容
+     */
+    @TableField("ALARM_CONTENT")
+    private String alarmContent;
+
+    /**
+     * 消警时间
+     */
+    @TableField("CANCEL_TIME")
+    private Date cancelTime;
+
+
+    @Override
+    public String toString() {
+        return "Alarm{" +
+            "id=" + id +
+            ", deviceId=" + deviceId +
+            ", alarmType=" + alarmType +
+            ", alarmTime=" + alarmTime +
+            ", alarmStatus=" + alarmStatus +
+            ", alarmLocation=" + alarmLocation +
+            ", alarmImage=" + alarmImage +
+            ", channelNo=" + channelNo +
+            ", alarmContent=" + alarmContent +
+            ", cancelTime=" + cancelTime +
+        "}";
+    }
+}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusAlarm.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusAlarm.java
deleted file mode 100644
index efb4a23..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusAlarm.java
+++ /dev/null
@@ -1,159 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.alibaba.fastjson.annotation.JSONField;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.time.LocalDateTime;
-import java.util.Date;
-
-/**
- * <p>
- * 报警记录表
- * </p>
- *
- * @author zyj
- * @since 2023-05-16
- */
-@Data
-@ApiModel("Alarm")
-@TableName("br_bus_alarm")
-public class BusAlarm implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 项目ID
-     */
-    @ApiModelProperty(value = "项目ID")
-    @TableField("PROJECT_ID")
-    private Long projectId;
-
-    /**
-     * 设备ID
-     */
-    @ApiModelProperty(value = "设备ID")
-    @TableField("DEVICE_ID")
-    private Long deviceId;
-
-    /**
-     * 报警类型
-     */
-    @ApiModelProperty(value = "报警类型")
-    @TableField("ALARM_TYPE")
-    private String alarmType;
-
-    /**
-     * 报警状态
-     */
-    @ApiModelProperty(value = "报警状态")
-    @TableField("ALARM_STATUS")
-    private String alarmStatus;
-
-    /**
-     * 报警值
-     */
-    @ApiModelProperty(value = "报警值")
-    @TableField("ALARM_VALUE")
-    private String alarmValue;
-
-    /**
-     * 报警图片
-     */
-    @ApiModelProperty(value = "报警图片")
-    @TableField("ALARM_IMAGE")
-    private String alarmImage;
-
-    /**
-     * 报警内容
-     */
-    @ApiModelProperty(value = "报警内容")
-    @TableField("ALARM_CONTENT")
-    private String alarmContent;
-
-    /**
-     * 报警时间
-     */
-    @ApiModelProperty(value = "报警时间")
-    @TableField("ALARM_TIME")
-    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
-    private Date alarmTime;
-
-    /**
-     * 消警时间
-     */
-    @ApiModelProperty(value = "消警时间")
-    @TableField("CANCEL_TIME")
-    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
-    private Date cancelTime;
-
-    /**
-     * 报警位置经度
-     */
-    @ApiModelProperty(value = "报警位置经度")
-    @TableField("ALARM_LNG")
-    private String alarmLng;
-
-    /**
-     * 报警位置纬度
-     */
-    @ApiModelProperty(value = "报警位置纬度")
-    @TableField("ALARM_LAT")
-    private String alarmLat;
-
-    @ApiModelProperty("报警类型名称")
-    @TableField(exist = false)
-    private String alarmStatusName;
-    @ApiModelProperty("报警类型名称")
-    @TableField(exist = false)
-    private String alarmTypeName;
-    @ApiModelProperty("作业名称")
-    @TableField(exist = false)
-    private String workTitle;
-    @ApiModelProperty("所属道路")
-    @TableField(exist = false)
-    private String workRoad;
-    @ApiModelProperty("作业状态")
-    @TableField(exist = false)
-    private String projectState;
-    @ApiModelProperty("作业状态名称")
-    @TableField(exist = false)
-    private String projectStateName;
-    @ApiModelProperty("负责人姓名")
-    @TableField(exist = false)
-    private String workPersonName;
-    @ApiModelProperty("负责人联系方式")
-    @TableField(exist = false)
-    private String workPersonPhoneNumber;
-
-
-    @Override
-    public String toString() {
-        return "BusAlarm{" +
-                "id=" + id +
-                ", projectId=" + projectId +
-                ", deviceId=" + deviceId +
-                ", alarmType=" + alarmType +
-                ", alarmValue=" + alarmValue +
-                ", alarmStatus=" + alarmStatus +
-                ", alarmImage=" + alarmImage +
-                ", alarmContent=" + alarmContent +
-                ", alarmTime=" + alarmTime +
-                ", cancelTime=" + cancelTime +
-                ", alarmLng=" + alarmLng +
-                ", alarmLat=" + alarmLat +
-                "}";
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusEvent.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusEvent.java
deleted file mode 100644
index a0b7543..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusEvent.java
+++ /dev/null
@@ -1,100 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.time.LocalDateTime;
-import java.util.Date;
-import java.util.List;
-
-/**
- * <p>
- * 事件表
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@TableName("br_bus_event")
-@Data
-@ApiModel("BusEvent")
-public class BusEvent implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @ApiModelProperty("事件ID")
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 事件标题
-     */
-    @ApiModelProperty("事件名称")
-    @TableField("EVENT_TITLE")
-    private String eventTitle;
-
-    /**
-     * 上报人员
-     */
-    @ApiModelProperty("上报人员")
-    @TableField("UPLOAD_NAME")
-    private String uploadName;
-
-    /**
-     * 联系方式
-     */
-    @ApiModelProperty("联系方式")
-    @TableField("PHONE_NUMBER")
-    private String phoneNumber;
-
-    /**
-     * 事件描述
-     */
-    @ApiModelProperty("事件描述")
-    @TableField("EVENT_DESCRIPTION")
-    private String eventDescription;
-
-    @ApiModelProperty("经度")
-    @TableField("LNG")
-    private String lng;
-
-    @ApiModelProperty("纬度")
-    @TableField("LAT")
-    private String lat;
-
-    /**
-     * 事件上传时间
-     */
-    @ApiModelProperty("事件上传时间")
-    @TableField("CREATE_TIME")
-    private Date createTime;
-
-    @ApiModelProperty("事件照片")
-    @TableField(exist = false)
-    private List<BusEventImage> imageList;
-
-
-
-    @Override
-    public String toString() {
-        return "BusEvent{" +
-            "id=" + id +
-            ", eventTitle=" + eventTitle +
-            ", uploadName=" + uploadName +
-            ", phoneNumber=" + phoneNumber +
-            ", eventDescription=" + eventDescription +
-            ", lng=" + lng +
-            ", lat=" + lat +
-            ", createTime=" + createTime +
-        "}";
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusEventImage.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusEventImage.java
deleted file mode 100644
index 1e75245..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusEventImage.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-
-/**
- * <p>
- * 事件图片表
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@TableName("br_bus_event_image")
-@Data
-@ApiModel("BusEventImage")
-public class BusEventImage implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 事件ID
-     */
-    @TableField("EVENT_ID")
-    private Long eventId;
-
-    /**
-     * 报警图片
-     */
-    @TableField("IMAGE")
-    @ApiModelProperty("图片url")
-    private String image;
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Device.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Device.java
index df89c70..ea7db5f 100644
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Device.java
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Device.java
@@ -1,30 +1,23 @@
 package com.casic.missiles.modular.system.entity;
 
-import com.alibaba.fastjson.annotation.JSONField;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.casic.missiles.core.base.json.DateDeserializer;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
-import java.util.Date;
 
 /**
  * <p>
- * 
+ * 设备记录表
  * </p>
  *
  * @author zyj
- * @since 2023-04-14
+ * @since 2023-05-25
  */
-@ApiModel("Device")
-@TableName("br_device")
 @Data
+@TableName("bus_device")
 public class Device implements Serializable {
 
     private static final long serialVersionUID = 1L;
@@ -32,82 +25,86 @@
     /**
      * 主键
      */
-    @ApiModelProperty(value = "设备ID")
     @TableId(value = "ID",type = IdType.ASSIGN_ID)
     private Long id;
 
     /**
-     * 设备编号
+     * 设备名称
      */
-    @ApiModelProperty(value = "设备编号")
-    @TableField("DEVICE_CODE")
-    private String deviceCode;
+    @TableField("DEVICE_NAME")
+    private String deviceName;
 
     /**
-     * 设备类型
+     * IP
      */
-    @ApiModelProperty(value = "设备类型")
-    @TableField("DEVICE_TYPE")
-    private String deviceType;
+    @TableField("IP")
+    private String ip;
 
     /**
-     * 设备批次
+     * 端口
      */
-    @ApiModelProperty(value = "设备批次")
-    @TableField("DEVICE_BATCH")
-    private String deviceBatch;
+    @TableField("PORT")
+    private String port;
 
     /**
-     * 厂家
+     * 用户名
      */
-    @ApiModelProperty(value = "厂家")
-    @TableField("MANUFACTURER")
-    private String manufacturer;
+    @TableField("USER_NAME")
+    private String userName;
 
     /**
-     * 是否供电
+     * 密码
      */
-    @ApiModelProperty(value = "是否供电")
-    @TableField("IS_POWER_SUPPLY")
-    private String isPowerSupply;
+    @TableField("PASSWORD")
+    private String password;
 
     /**
-     * 创建时间
+     * 连接类型
      */
-    @ApiModelProperty(value = "创建时间",dataType = "Date")
-    @TableField("CREATE_TIME")
-    private Date createTime;
+    @TableField("CONNECT_TYPE")
+    private String connectType;
 
-    @ApiModelProperty(value = "设备类型名称")
-    @TableField(exist = false)
-    private String deviceTypeName;
+    /**
+     * 位置
+     */
+    @TableField("LOCATION")
 
-    @ApiModelProperty(value = "是否供电名称")
-    @TableField(exist = false)
-    private String isPowerSupplyName;
+    private String location;
 
-    @ApiModelProperty(value = "注册时间",dataType = "String")
-    @TableField(exist = false)
-    private String registerTime;
+    /**
+     * 设备状态
+     */
+    @TableField("STATUS")
 
-    @ApiModelProperty(value = "当前状态")
-    @TableField(exist = false)
     private String status;
 
-    @ApiModelProperty(value = "当前状态名称")
-    @TableField(exist = false)
-    private String statusName;
+    /**
+     * 报警分组
+     */
+    @TableField("ALARM_GROUP")
+
+    private Long alarmGroup;
+
+    /**
+     * 视频通道数(预留)
+     */
+    @TableField("CHANNEL_NUM")
+    private Integer channelNum;
 
     @Override
     public String toString() {
         return "Device{" +
             "id=" + id +
-            ", deviceCode=" + deviceCode +
-            ", deviceType=" + deviceType +
-            ", deviceBatch=" + deviceBatch +
-            ", manufacturer=" + manufacturer +
-            ", isPowerSupply=" + isPowerSupply +
-            ", createTime=" + createTime +
+            ", deviceName=" + deviceName +
+            ", ip=" + ip +
+            ", port=" + port +
+            ", userName=" + userName +
+            ", password=" + password +
+            ", connectType=" + connectType +
+            ", location=" + location +
+            ", status=" + status +
+            ", alarmGroup=" + alarmGroup +
+            ", channelNum=" + channelNum +
         "}";
     }
 }
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/DeviceExt.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/DeviceExt.java
deleted file mode 100644
index 5ee7015..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/DeviceExt.java
+++ /dev/null
@@ -1,99 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-
-/**
- * <p>
- * 设备扩展信息表（安全树）
- * </p>
- *
- * @author zyj
- * @since 2023-04-27
- */
-@Data
-@TableName("br_device_ext")
-public class DeviceExt implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 设备ID
-     */
-    @TableField("DEVICE_ID")
-    private Long deviceId;
-
-    /**
-     * 摄像头编号
-     */
-    @TableField("CAMERA_CODE")
-    private String cameraCode;
-
-    /**
-     * 摄像头IP
-     */
-    @TableField("CAMERA_IP")
-    private String cameraIp;
-
-    /**
-     * 摄像头端口
-     */
-    @TableField("CAMERA_PORT")
-    private String cameraPort;
-
-    /**
-     * 激甲编号
-     */
-    @TableField("GAS_CODE")
-    private String gasCode;
-
-    /**
-     * 激甲IP
-     */
-    @TableField("GAS_IP")
-    private String gasIp;
-
-    /**
-     * 激甲端口
-     */
-    @TableField("GAS_PORT")
-    private String gasPort;
-
-    /**
-     * 甲烷报警阈值
-     */
-    @TableField("GAS_THRESHOLD")
-    private String gasThreshold;
-
-    @TableField(value = "HAT_LINING_CODE")
-    private String hatLiningCode;
-
-
-    @Override
-    public String toString() {
-        return "DeviceExt{" +
-            "id=" + id +
-            ", deviceId=" + deviceId +
-            ", cameraCode=" + cameraCode +
-            ", cameraIp=" + cameraIp +
-            ", cameraPort=" + cameraPort +
-            ", gasCode=" + gasCode +
-            ", gasIp=" + gasIp +
-            ", gasPort=" + gasPort +
-            ", gasThreshold=" + gasThreshold +
-            ", hatLiningCode=" + hatLiningCode +
-        "}";
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/ProjectDevice.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/ProjectDevice.java
deleted file mode 100644
index c4f3472..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/ProjectDevice.java
+++ /dev/null
@@ -1,62 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-
-/**
- * <p>
- * 
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@Data
-@ApiModel("ProjectDevice")
-@TableName("br_project_device")
-public class ProjectDevice implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 作业现场ID
-     */
-    @TableField("PROJECT_ID")
-    private Long projectId;
-
-    /**
-     * 设备ID
-     */
-    @TableField("DEVICE_ID")
-    @ApiModelProperty("设备ID（新增编辑时传）")
-    private Long deviceId;
-
-    /**
-     * 设备编号
-     */
-    @TableField(exist = false)
-    @ApiModelProperty("设备编号（详情中展示，新增编辑不用传）")
-    private String deviceCode;
-
-    @Override
-    public String toString() {
-        return "ProjectDevice{" +
-            "id=" + id +
-            ", projectId=" + projectId +
-            ", deviceId=" + deviceId +
-        "}";
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/ProjectWorker.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/ProjectWorker.java
deleted file mode 100644
index 10b23c4..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/ProjectWorker.java
+++ /dev/null
@@ -1,104 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import java.io.Serializable;
-
-/**
- * <p>
- * 
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@ApiModel("ProjectWorker")
-@TableName("br_project_worker")
-@Data
-@NoArgsConstructor
-@AllArgsConstructor
-public class ProjectWorker implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 作业现场ID
-     */
-    @TableField("PROJECT_ID")
-    private Long projectId;
-
-    /**
-     * 人员ID
-     */
-    @ApiModelProperty("人员ID")
-    @TableField("WORKER_ID")
-    private Long workerId;
-
-    /**
-     * 安全帽编号
-     */
-    @ApiModelProperty("安全帽编号")
-    @TableField("HAT_CODE")
-    private String hatCode;
-
-    /**
-     * 背心编号
-     */
-    @ApiModelProperty("背心编号")
-    @TableField("VAST_CODE")
-    private String vastCode;
-
-    /**
-     * 手环编号
-     */
-    @ApiModelProperty("手环编号")
-    @TableField("BRACELET_CODE")
-    private String braceletCode;
-
-    @ApiModelProperty("人员姓名（详情中展示，新增编辑不用传）")
-    @TableField(exist = false)
-    private String workerName;
-
-    @ApiModelProperty("人员部门ID（详情中展示，新增编辑不用传）")
-    @TableField(exist = false)
-    private String workerDeptId;
-
-    @ApiModelProperty("人员部门名称（详情中展示，新增编辑不用传）")
-    @TableField(exist = false)
-    private String workerDeptName;
-
-    @ApiModelProperty("人员联系方式（详情中展示，新增编辑不用传）")
-    @TableField(exist = false)
-    private String workerPhoneNumber;
-
-    public ProjectWorker(Long projectId, Long workerId) {
-        this.projectId = projectId;
-        this.workerId = workerId;
-    }
-
-    @Override
-    public String toString() {
-        return "ProjectWorker{" +
-            "id=" + id +
-            ", projectId=" + projectId +
-            ", workerId=" + workerId +
-            ", hatCode=" + hatCode +
-            ", vastCode=" + vastCode +
-            ", braceletCode=" + braceletCode +
-        "}";
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/WorkSiteInfo.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/WorkSiteInfo.java
deleted file mode 100644
index fa6f41d..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/WorkSiteInfo.java
+++ /dev/null
@@ -1,130 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.alibaba.fastjson.annotation.JSONField;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.time.LocalDateTime;
-import java.util.Date;
-
-/**
- * <p>
- * 作业现场表
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@ApiModel("WorkSiteInfo")
-@TableName("br_work_site_info")
-@Data
-public class WorkSiteInfo implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @ApiModelProperty("作业现场ID")
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 作业名称
-     */
-    @ApiModelProperty("作业名称")
-    @TableField("WORK_TITLE")
-    private String workTitle;
-
-    /**
-     * 责任人
-     */
-    @ApiModelProperty("责任人（人员ID）")
-    @TableField("WORK_PERSON")
-    private Long workPerson;
-
-    /**
-     * 作业描述
-     */
-    @ApiModelProperty("作业描述")
-    @TableField("WORK_SITE_DESC")
-    private String workSiteDesc;
-
-    /**
-     * 作业状态
-     */
-    @ApiModelProperty("作业状态")
-    @TableField("PROJECT_STATE")
-    private String projectState;
-
-    /**
-     * 所属道路
-     */
-    @ApiModelProperty("所属道路")
-    @TableField("WORK_ROAD")
-    private String workRoad;
-
-    @TableField("IMAGE_URL")
-    private String imageUrl;
-
-    @TableField("CREATE_TIME")
-    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
-    private Date createTime;
-    @TableField("UPDATE_TIME")
-    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
-    private Date updateTime;
-
-    @ApiModelProperty("开始时间")
-    @TableField("START_TIME")
-    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
-    private Date startTime;
-
-    @ApiModelProperty("结束时间")
-    @TableField("FINISH_TIME")
-    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
-    private Date finishTime;
-
-    @ApiModelProperty("负责人姓名（详情中使用，新增编辑不用传）")
-    @TableField(exist = false)
-    private String workPersonName;
-
-    @ApiModelProperty("负责人联系方式（详情中使用，新增编辑不用传）")
-    @TableField(exist = false)
-    private String workPersonPhoneNumber;
-
-    @ApiModelProperty("负责人所属部门ID（详情中使用，新增编辑不用传）")
-    @TableField(exist = false)
-    private Long workPersonDeptId;
-
-    @ApiModelProperty("负责人所属部门名称（详情中使用，新增编辑不用传）")
-    @TableField(exist = false)
-    private String workPersonDeptName;
-
-    @ApiModelProperty(value = "注册时间",dataType = "String")
-    @TableField(exist = false)
-    private String registerTime;
-
-    @ApiModelProperty("作业状态名称")
-    @TableField(exist = false)
-    private String projectStateName;
-
-    @Override
-    public String toString() {
-        return "WorkSiteInfo{" +
-            "id=" + id +
-            ", workTitle=" + workTitle +
-            ", workPerson=" + workPerson +
-            ", workSiteDesc=" + workSiteDesc +
-            ", projectState=" + projectState +
-            ", imageUrl=" + imageUrl +
-            ", updateTime=" + updateTime +
-            ", workRoad=" + workRoad +
-        "}";
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Worker.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Worker.java
deleted file mode 100644
index 28a4daa..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Worker.java
+++ /dev/null
@@ -1,147 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.time.LocalDateTime;
-import java.util.Date;
-
-/**
- * <p>
- * 
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@ApiModel("Worker")
-@TableName("br_worker")
-@Data
-public class Worker implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @ApiModelProperty(value = "人员ID")
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 姓名
-     */
-    @ApiModelProperty(value = "姓名")
-    @TableField("WORKER_NAME")
-    private String workerName;
-
-    /**
-     * 性别
-     */
-    @ApiModelProperty(value = "性别")
-    @TableField("GENDER")
-    private String gender;
-
-    /**
-     * 所属部门
-     */
-    @ApiModelProperty(value = "所属部门(人员管理)")
-    @TableField("DEPT_ID")
-    private Long deptId;
-
-    /**
-     * 所属单位
-     */
-    @ApiModelProperty(value = "所属单位(入场申请中使用)")
-    @TableField("OWNER_SHIP")
-    private String ownerShip;
-
-    /**
-     * 联系方式
-     */
-    @ApiModelProperty(value = "联系方式")
-    @TableField("PHONE_NUMBER")
-    private String phoneNumber;
-
-    /**
-     * 证件号
-     */
-    @ApiModelProperty(value = "证件号")
-    @TableField("ID_CARD_NUMBER")
-    private String idCardNumber;
-
-    /**
-     * 入场原因
-     */
-    @ApiModelProperty(value = "入场原因（入场申请中使用）")
-    @TableField("ENTER_REASON")
-    private String enterReason;
-
-    /**
-     * 入场人脸照片
-     */
-    @ApiModelProperty(value = "人脸照片（照片路径）")
-    @TableField("WORKER_AVATAR")
-    private String workerAvatar;
-
-    /**
-     * 申请入场时间
-     */
-    @ApiModelProperty(value = "注册时间/申请入场时间")
-    @TableField("CREATE_TIME")
-    private Date createTime;
-
-    /**
-     * 人员类型
-     */
-    @ApiModelProperty(value = "人员类型（区分人员管理和入场申请）")
-    @TableField("WORKER_TYPE")
-    private String workerType;
-
-    @ApiModelProperty(value = "性别名称")
-    @TableField(exist = false)
-    private String genderName;
-
-    @ApiModelProperty(value = "部门名称")
-    @TableField(exist = false)
-    private String deptName;
-
-    @ApiModelProperty(value = "注册时间",dataType = "String")
-    @TableField(exist = false)
-    private String registerTime;
-
-    @ApiModelProperty(value = "当前状态")
-    @TableField(exist = false)
-    private String status;
-
-    @ApiModelProperty(value = "当前状态名称")
-    @TableField(exist = false)
-    private String statusName;
-
-    @ApiModelProperty(value = "是否注册(0未注册；1已注册)",allowableValues = "0,1")
-    @TableField(exist = false)
-    private String isRegister;
-
-    @Override
-    public String toString() {
-        return "Worker{" +
-            "id=" + id +
-            ", workerName=" + workerName +
-            ", gender=" + gender +
-            ", deptId=" + deptId +
-            ", ownerShip=" + ownerShip +
-            ", phoneNumber=" + phoneNumber +
-            ", idCardNumber=" + idCardNumber +
-            ", enterReason=" + enterReason +
-            ", workerAvatar=" + workerAvatar +
-            ", createTime=" + createTime +
-            ", workerType=" + workerType +
-        "}";
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/AlarmMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/AlarmMapper.java
new file mode 100644
index 0000000..ea4c8be
--- /dev/null
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/AlarmMapper.java
@@ -0,0 +1,16 @@
+package com.casic.missiles.modular.system.mapper;
+
+import com.casic.missiles.modular.system.entity.Alarm;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 报警记录表 Mapper 接口
+ * </p>
+ *
+ * @author zyj
+ * @since 2023-05-25
+ */
+public interface AlarmMapper extends BaseMapper<Alarm> {
+
+}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/BusAlarmMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/BusAlarmMapper.java
deleted file mode 100644
index 9801742..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/BusAlarmMapper.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package com.casic.missiles.modular.system.mapper;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.modular.system.dto.AlarmTypeCountDTO;
-import com.casic.missiles.modular.system.entity.BusAlarm;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * <p>
- * 报警记录表 Mapper 接口
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface BusAlarmMapper extends BaseMapper<BusAlarm> {
-
-    Page<BusAlarm> listPage(Page<BusAlarm> page,@Param("ew")  QueryWrapper<BusAlarm> queryWrapper);
-
-    void cancelAlarm(@Param("deviceId")Long deviceId,@Param("alarmType") String alarmType);
-
-    List<AlarmTypeCountDTO> alarmCount(@Param("projectId")Long projectId, @Param("alarmStatus")String alarmStatus);
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/BusEventImageMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/BusEventImageMapper.java
deleted file mode 100644
index 9590b7d..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/BusEventImageMapper.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.casic.missiles.modular.system.mapper;
-
-import com.casic.missiles.modular.system.entity.BusEventImage;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * <p>
- * 事件图片表 Mapper 接口
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface BusEventImageMapper extends BaseMapper<BusEventImage> {
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/BusEventMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/BusEventMapper.java
deleted file mode 100644
index 3c85edf..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/BusEventMapper.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.casic.missiles.modular.system.mapper;
-
-import com.casic.missiles.modular.system.entity.BusEvent;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * <p>
- * 事件表 Mapper 接口
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface BusEventMapper extends BaseMapper<BusEvent> {
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/DeviceExtMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/DeviceExtMapper.java
deleted file mode 100644
index 4ca9212..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/DeviceExtMapper.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.casic.missiles.modular.system.mapper;
-
-import com.casic.missiles.modular.system.entity.DeviceExt;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * <p>
- * 设备扩展信息表（安全树） Mapper 接口
- * </p>
- *
- * @author zyj
- * @since 2023-04-27
- */
-public interface DeviceExtMapper extends BaseMapper<DeviceExt> {
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/DeviceMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/DeviceMapper.java
index 444c0c5..3d0bb02 100644
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/DeviceMapper.java
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/DeviceMapper.java
@@ -1,30 +1,16 @@
 package com.casic.missiles.modular.system.mapper;
 
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.modular.system.dto.DeviceDetailDTO;
-import com.casic.missiles.modular.system.dto.HelmetInfoDTO;
 import com.casic.missiles.modular.system.entity.Device;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
 
 /**
  * <p>
- *  Mapper 接口
+ * 设备记录表 Mapper 接口
  * </p>
  *
  * @author zyj
- * @since 2023-04-14
+ * @since 2023-05-25
  */
-@Mapper
 public interface DeviceMapper extends BaseMapper<Device> {
 
-    Page<DeviceDetailDTO> listDetailPage(Page<DeviceDetailDTO> page,@Param("ew") QueryWrapper<DeviceDetailDTO> ew);
-
-     List<Long> selectProjectDevice(@Param("projectId") Long projectId);
-
-    List<HelmetInfoDTO> selectHelmetList(@Param("deviceType")String deviceType);
 }
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/ProjectDeviceMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/ProjectDeviceMapper.java
deleted file mode 100644
index 1d0c14e..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/ProjectDeviceMapper.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package com.casic.missiles.modular.system.mapper;
-
-import com.casic.missiles.modular.system.dto.DeviceLocationDTO;
-import com.casic.missiles.modular.system.entity.ProjectDevice;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * <p>
- *  Mapper 接口
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface ProjectDeviceMapper extends BaseMapper<ProjectDevice> {
-     List<ProjectDevice> selectDetailByProjectId(@Param("projectId") Long projectId);
-
-     List<DeviceLocationDTO> selectDeviceLocationList(@Param("projectId") Long projectId);
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/ProjectWorkerMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/ProjectWorkerMapper.java
deleted file mode 100644
index 58583d1..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/ProjectWorkerMapper.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package com.casic.missiles.modular.system.mapper;
-
-import com.casic.missiles.modular.system.dto.WorkerLocationDTO;
-import com.casic.missiles.modular.system.entity.ProjectWorker;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * <p>
- *  Mapper 接口
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface ProjectWorkerMapper extends BaseMapper<ProjectWorker> {
-
-    List<ProjectWorker> selectDetailByProjectId(@Param("projectId") Long projectId,
-                                                @Param("workerType")String workerType);
-
-    List<WorkerLocationDTO> selectWorkerLocationList(@Param("projectId") Long projectId,
-                                                     @Param("workerType")String workerType);
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/WorkSiteInfoMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/WorkSiteInfoMapper.java
deleted file mode 100644
index a4934d2..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/WorkSiteInfoMapper.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.casic.missiles.modular.system.mapper;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.modular.system.entity.WorkSiteInfo;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Param;
-
-/**
- * <p>
- * 作业现场表 Mapper 接口
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface WorkSiteInfoMapper extends BaseMapper<WorkSiteInfo> {
-
-    Page<WorkSiteInfo> selectListPage(Page<WorkSiteInfo> page,@Param("ew") QueryWrapper<WorkSiteInfo> ew);
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/WorkerMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/WorkerMapper.java
deleted file mode 100644
index 258fb12..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/WorkerMapper.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package com.casic.missiles.modular.system.mapper;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.modular.system.dto.DeviceDetailDTO;
-import com.casic.missiles.modular.system.entity.Worker;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * <p>
- *  Mapper 接口
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface WorkerMapper extends BaseMapper<Worker> {
-
-
-    Page<Worker> selectListPage(Page<Worker> page, @Param("ew") QueryWrapper<Worker> ew);
-
-    List<String> selectWorkerAvatars(@Param("projectId")Long projectId);
-
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/AlarmMapper.xml b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/AlarmMapper.xml
new file mode 100644
index 0000000..25cb4ab
--- /dev/null
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/AlarmMapper.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.modular.system.mapper.AlarmMapper">
+
+</mapper>
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/BusAlarmMapper.xml b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/BusAlarmMapper.xml
deleted file mode 100644
index 595088a..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/BusAlarmMapper.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.casic.missiles.modular.system.mapper.BusAlarmMapper">
-
-    <select id="listPage" resultType="com.casic.missiles.modular.system.entity.BusAlarm">
-        SELECT
-            alarm.ID as id,
-            alarm.DEVICE_ID as deviceId,
-            alarm.PROJECT_ID as projectId,
-            alarm.ALARM_TYPE as alarmType,
-            alarm.ALARM_VALUE as alarmValue,
-            alarm.ALARM_STATUS as alarmStatus,
-            alarm.ALARM_IMAGE AS alarmImage,
-            alarm.ALARM_CONTENT as alarmContent,
-            alarm.ALARM_TIME as alarmTime,
-            alarm.CANCEL_TIME as cancelTime,
-            alarm.ALARM_LNG as alarmLng,
-            alarm.ALARM_LAT as alarmLat,
-            p.WORK_TITLE as workTitle,
-            p.WORK_ROAD as workRoad,
-            p.PROJECT_STATE as projectState,
-            w.WORKER_NAME as workPersonName,
-            w.PHONE_NUMBER as workPersonPhoneNumber
-        FROM
-            `br_bus_alarm` alarm
-                LEFT JOIN br_work_site_info p on alarm.PROJECT_ID = p.ID
-                LEFT JOIN br_worker w on p.WORK_PERSON = w.ID
-        <where>
-            <if test="ew != null">
-                ${ew.sqlSegment}
-            </if>
-        </where>
-    </select>
-
-    <select id="cancelAlarm">
-        update br_bus_alarm
-        set ALARM_STATUS = '1'
-        where DEVICE_ID = #{deviceId}
-          and ALARM_TYPE = #{alarmType}
-          and ALARM_STATUS = '0'
-    </select>
-
-    <select id="alarmCount" resultType="com.casic.missiles.modular.system.dto.AlarmTypeCountDTO">
-        SELECT
-            ALARM_TYPE as alarmType,
-            count(*) as alarmCount
-        from br_bus_alarm
-        <where>
-            <if test="projectId != null and projectId !=''">
-                and PROJECT_ID = #{projectId}
-            </if>
-            <if test="alarmStatus != null and alarmStatus !=''">
-                and ALARM_STATUS = #{alarmStatus}
-            </if>
-        </where>
-        group by ALARM_TYPE
-    </select>
-</mapper>
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/BusEventImageMapper.xml b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/BusEventImageMapper.xml
deleted file mode 100644
index fbc3db3..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/BusEventImageMapper.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.casic.missiles.modular.system.mapper.BusEventImageMapper">
-
-</mapper>
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/BusEventMapper.xml b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/BusEventMapper.xml
deleted file mode 100644
index 627d573..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/BusEventMapper.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.casic.missiles.modular.system.mapper.BusEventMapper">
-
-</mapper>
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/DeviceExtMapper.xml b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/DeviceExtMapper.xml
deleted file mode 100644
index 5321d1c..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/DeviceExtMapper.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.casic.missiles.modular.system.mapper.DeviceExtMapper">
-
-</mapper>

diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/AlarmController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/AlarmController.java
new file mode 100644
index 0000000..1795cf1
--- /dev/null
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/AlarmController.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.modular.system.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.stereotype.Controller;
+
+/**
+ * <p>
+ * 报警记录表 前端控制器
+ * </p>
+ *
+ * @author zyj
+ * @since 2023-05-25
+ */
+@Controller
+@RequestMapping("/system/alarm")
+public class AlarmController {
+
+}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusAlarmController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusAlarmController.java
deleted file mode 100644
index 1f82ebb..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusAlarmController.java
+++ /dev/null
@@ -1,102 +0,0 @@
-package com.casic.missiles.modular.system.controller;
-
-
-import cn.hutool.core.util.ObjectUtil;
-import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.core.base.controller.BaseController;
-import com.casic.missiles.core.page.PageFactory;
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.AlarmUpload;
-import com.casic.missiles.modular.system.dto.DeviceDetailDTO;
-import com.casic.missiles.modular.system.entity.BusAlarm;
-import com.casic.missiles.modular.system.service.IBusAlarmService;
-import io.swagger.annotations.*;
-import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.*;
-
-import org.springframework.stereotype.Controller;
-
-import static com.casic.missiles.model.response.ResponseData.DEFAULT_SUCCESS_MESSAGE;
-import static com.casic.missiles.modular.system.consts.AlarmConst.ALARM_STATUS_MANUAL_CANCEL;
-
-/**
- * <p>
- * 报警记录表 前端控制器
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@Api(tags = "报警管理接口")
-@Controller
-@RequestMapping("/alarm")
-@RequiredArgsConstructor
-public class BusAlarmController extends BaseController {
-
-    private final IBusAlarmService alarmService;
-
-    @ApiOperation("报警上报接口")
-    @PostMapping("/upload")
-    @ResponseBody
-    public Object upload(@RequestBody AlarmUpload alarmUpload){
-        alarmService.alarmUpload(alarmUpload);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("报警列表分页查询")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "workTitle", value = "作业名称",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "projectId", value = "作业ID",dataType = "Long", paramType = "query",example = "0"),
-            @ApiImplicitParam(name = "alarmStatus", value = "报警状态",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "projectState", value = "作业状态",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "alarmType", value = "报警类型",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "alarmStartTime", value = "报警开始时间",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "alarmEndTime", value = "报警结束时间",dataType = "String", paramType = "query")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = BusAlarm.class),
-    })
-    @GetMapping("/listPage")
-    @ResponseBody
-    public Object listPage(String workTitle,Long projectId,String alarmStatus,String projectState,String alarmType,String alarmStartTime,String alarmEndTime){
-        Page<BusAlarm> page = PageFactory.defaultPage();
-        QueryWrapper<BusAlarm> queryWrapper = new QueryWrapper<>();
-        if(StrUtil.isNotEmpty(workTitle)){
-            queryWrapper.like("p.WORK_TITLE",workTitle);
-        }
-        if(ObjectUtil.isNotEmpty(projectId)){
-            queryWrapper.eq("alarm.PROJECT_ID",projectId);
-        }
-        if(StrUtil.isNotEmpty(alarmStatus)){
-            queryWrapper.eq("alarm.ALARM_STATUS",alarmStatus);
-        }
-        if(StrUtil.isNotEmpty(projectState)){
-            queryWrapper.eq("p.PROJECT_STATE",projectState);
-        }
-        if(StrUtil.isNotEmpty(alarmType)){
-            queryWrapper.eq("alarm.ALARM_TYPE",alarmType);
-        }
-        if(StrUtil.isNotEmpty(alarmStartTime)){
-            queryWrapper.ge("alarm.ALARM_TIME",alarmStartTime);
-        }
-        if(StrUtil.isNotEmpty(alarmEndTime)){
-            queryWrapper.le("alarm.ALARM_TIME",alarmEndTime);
-        }
-        page = alarmService.listPage(page,queryWrapper);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-    @ApiOperation("消警")
-    @PostMapping("/cancel")
-    @ResponseBody
-    public Object cancel(@RequestParam("alarmId") Long alarmId){
-        UpdateWrapper<BusAlarm> updateWrapper = new UpdateWrapper<>();
-        updateWrapper.eq("ID",alarmId);
-        updateWrapper.set("ALARM_STATUS",ALARM_STATUS_MANUAL_CANCEL);
-        alarmService.update(updateWrapper);
-        return ResponseData.success();
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusEventController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusEventController.java
deleted file mode 100644
index dde5aad..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusEventController.java
+++ /dev/null
@@ -1,41 +0,0 @@
-package com.casic.missiles.modular.system.controller;
-
-
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.entity.BusEvent;
-import com.casic.missiles.modular.system.service.IBusEventService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.ResponseBody;
-
-/**
- * <p>
- * 事件表 前端控制器
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@Controller
-@RequestMapping("/event")
-@Api(tags = "事件上报")
-@RequiredArgsConstructor
-public class BusEventController {
-
-    private final IBusEventService eventService;
-
-    @ApiOperation("事件上报")
-    @PostMapping("add")
-    @ResponseBody
-    public Object add(@RequestBody BusEvent busEvent){
-        eventService.saveBusEvent(busEvent);
-        return ResponseData.success();
-    }
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
index 03abc5f..aa50d78 100644
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
@@ -1,121 +1,20 @@
 package com.casic.missiles.modular.system.controller;
 
 
-import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.core.base.controller.BaseController;
-import com.casic.missiles.core.page.PageFactory;
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.DeviceDetailDTO;
-import com.casic.missiles.modular.system.entity.Device;
-import com.casic.missiles.modular.system.service.IDeviceExtService;
-import com.casic.missiles.modular.system.service.IDeviceService;
-import io.swagger.annotations.*;
-import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.RequestMapping;
 
 import org.springframework.stereotype.Controller;
 
-import java.time.LocalDateTime;
-import java.util.Date;
-import java.util.List;
-
-import static com.casic.missiles.model.response.ResponseData.DEFAULT_SUCCESS_MESSAGE;
-
 /**
  * <p>
- *  前端控制器
+ * 设备记录表 前端控制器
  * </p>
  *
  * @author zyj
- * @since 2023-04-14
+ * @since 2023-05-25
  */
-@Api(tags = "设备管理接口")
-@RequiredArgsConstructor
 @Controller
-@RequestMapping("/device")
-public class DeviceController extends BaseController {
-    private final IDeviceService deviceService;
-    private final IDeviceExtService deviceExtService;
-
-    @ApiOperation("设备分页列表")
-    @ApiImplicitParams({
-        @ApiImplicitParam(name = "deviceType", value = "设备类型",dataType = "String", paramType = "query"),
-        @ApiImplicitParam(name = "deviceCode", value = "设备编号",dataType = "String", paramType = "query"),
-        @ApiImplicitParam(name = "status", value = "设备状态",dataType = "String", paramType = "query"),
-        @ApiImplicitParam(name = "projectId", value = "作业ID（如果传此参数，列表中返回该作业使用的设备）",dataType = "Long", paramType = "query", example = "0")
-    })
-    @ApiResponses({
-        @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = DeviceDetailDTO.class),
-    })
-    @GetMapping("listPage")
-    @ResponseBody
-    public Object listPage(String deviceType, String deviceCode, String status,Long projectId){
-        Page<DeviceDetailDTO> page = PageFactory.defaultPage();
-        QueryWrapper<DeviceDetailDTO> queryWrapper = new QueryWrapper<>();
-        if(StrUtil.isNotEmpty(deviceType)){
-            queryWrapper.eq("DEVICE_TYPE",deviceType);
-        }
-        if(StrUtil.isNotEmpty(deviceCode)){
-            queryWrapper.like("DEVICE_CODE",deviceCode);
-        }
-        page = deviceService.listPage(page,queryWrapper,status,projectId);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-    @ApiOperation("新增设备")
-    @PostMapping("add")
-    @ResponseBody
-    public Object add(@RequestBody DeviceDetailDTO deviceDetailDTO){
-        deviceService.saveDevice(deviceDetailDTO);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("编辑设备")
-    @PostMapping("update")
-    @ResponseBody
-    public Object update(@RequestBody DeviceDetailDTO deviceDetailDTO){
-        deviceService.updateDevice(deviceDetailDTO);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("删除设备")
-    @PostMapping("delete")
-    @ResponseBody
-    public Object delete(@ApiParam("设备id列表")@RequestBody List<Long> deviceIds){
-        deviceService.deleteDevices(deviceIds);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("设置甲烷阈值")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "gasIp", value = "安全树甲烷设备IP",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "gasPort", value = "安全树甲烷端口",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "threshold", value = "甲烷阈值",dataType = "String", paramType = "query")
-    })
-    @PostMapping("setThreshold")
-    @ResponseBody
-    public Object setThreshold(String gasIp,String gasPort,String threshold){
-        deviceExtService.setGasThreshold(gasIp, gasPort, threshold);
-        return ResponseData.success();
-    }
-
-
-    @ApiOperation("查询甲烷阈值")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "gasIp", value = "安全树甲烷设备IP",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "gasPort", value = "安全树甲烷端口",dataType = "String", paramType = "query")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = "{\"code\": 200,\"data\": \"100\",\"message\": \"请求成功\",\"success\": true}",response = String.class),
-    })
-    @GetMapping("getThreshold")
-    @ResponseBody
-    public Object getThreshold(String gasIp,String gasPort){
-        String data = deviceExtService.getGasThreshold(gasIp, gasPort);
-        return ResponseData.success(data);
-    }
-
+@RequestMapping("/system/device")
+public class DeviceController {
 
 }
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/OverviewController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/OverviewController.java
deleted file mode 100644
index 7570504..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/OverviewController.java
+++ /dev/null
@@ -1,70 +0,0 @@
-package com.casic.missiles.modular.system.controller;
-
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.AlarmTypeCountDTO;
-import com.casic.missiles.modular.system.dto.DeviceLocationDTO;
-import com.casic.missiles.modular.system.dto.WorkerLocationDTO;
-import com.casic.missiles.modular.system.service.IBusAlarmService;
-import com.casic.missiles.modular.system.service.IProjectDeviceService;
-import com.casic.missiles.modular.system.service.IProjectWorkerService;
-import io.swagger.annotations.*;
-import lombok.RequiredArgsConstructor;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.ResponseBody;
-
-import static com.casic.missiles.model.response.ResponseData.DEFAULT_SUCCESS_MESSAGE;
-import static com.casic.missiles.modular.system.consts.AlarmConst.ALARM_STATUS_ON;
-
-@Api(tags = "首页看板接口")
-@Controller
-@RequestMapping("overview")
-@RequiredArgsConstructor
-public class OverviewController {
-
-    private final IBusAlarmService alarmService;
-    private final IProjectDeviceService projectDeviceService;
-
-    private final IProjectWorkerService projectWorkerService;
-
-
-    @ApiOperation("报警统计接口")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "projectId", value = "作业ID",dataType = "Long", paramType = "query", example = "0")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = AlarmTypeCountDTO.class),
-    })
-    @GetMapping("/alarmCount")
-    @ResponseBody
-    public Object alarmCount(Long projectId){
-        return ResponseData.success(alarmService.alarmCount(projectId,ALARM_STATUS_ON));
-    }
-
-    @ApiOperation("设备列表接口")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "projectId", value = "作业ID",dataType = "Long", paramType = "query", example = "0")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = DeviceLocationDTO.class),
-    })
-    @GetMapping("/deviceList")
-    @ResponseBody
-    public Object deviceList(Long projectId){
-        return ResponseData.success(projectDeviceService.selectDeviceLocationList(projectId));
-    }
-
-    @ApiOperation("人员列表接口")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "projectId", value = "作业ID",dataType = "Long", paramType = "query", example = "0")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = WorkerLocationDTO.class),
-    })
-    @GetMapping("/workerList")
-    @ResponseBody
-    public Object workerList(Long projectId){
-        return ResponseData.success(projectWorkerService.selectWorkerLocationDTO(projectId));
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/WorkSiteInfoController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/WorkSiteInfoController.java
deleted file mode 100644
index af36d69..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/WorkSiteInfoController.java
+++ /dev/null
@@ -1,130 +0,0 @@
-package com.casic.missiles.modular.system.controller;
-
-
-import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.core.base.controller.BaseController;
-import com.casic.missiles.core.page.PageFactory;
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.WorkSiteDetailDTO;
-import com.casic.missiles.modular.system.entity.WorkSiteInfo;
-import com.casic.missiles.modular.system.service.IWorkSiteInfoService;
-import io.swagger.annotations.*;
-import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.*;
-
-import org.springframework.stereotype.Controller;
-
-import java.util.List;
-
-import static com.casic.missiles.model.response.ResponseData.DEFAULT_SUCCESS_MESSAGE;
-
-/**
- * <p>
- * 作业现场表 前端控制器
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@Controller
-@RequestMapping("/site")
-@Api(tags = "作业现场管理")
-@RequiredArgsConstructor
-public class WorkSiteInfoController extends BaseController {
-
-
-    private final IWorkSiteInfoService workSiteInfoService;
-
-    @ApiOperation("新增作业现场")
-    @PostMapping("add")
-    @ResponseBody
-    public Object addWorkSite(@RequestBody WorkSiteDetailDTO workSiteDetailDTO){
-        workSiteInfoService.addWorkSiteInfo(workSiteDetailDTO);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("编辑作业现场")
-    @PostMapping("update")
-    @ResponseBody
-    public Object updateWorkSite(@RequestBody WorkSiteDetailDTO workSiteDetailDTO){
-        workSiteInfoService.updateWorkSiteInfo(workSiteDetailDTO);
-        return ResponseData.success();
-    }
-
-
-    @ApiOperation("删除作业现场")
-    @PostMapping("delete")
-    @ResponseBody
-    public Object delete(@ApiParam("作业现场id列表")@RequestBody List<Long> projectIds){
-        workSiteInfoService.deleteProjects(projectIds);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("查询作业现场详情")
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = WorkSiteDetailDTO.class),
-    })
-    @GetMapping("detail")
-    @ResponseBody
-    public Object delete(@ApiParam(value = "作业现场id", example = "0")@RequestParam Long projectId){
-        WorkSiteDetailDTO detailDTO = workSiteInfoService.getWorkSiteDetail(projectId);
-        return ResponseData.success(detailDTO);
-    }
-
-    @ApiOperation("分页列表查询")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "workTitle",value = "作业名称", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "workRoad",value = "所属道路", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "workPersonName",value = "责任人姓名", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "startDate",value = "注册开始日期", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "endDate",value = "注册结束日期", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "projectState",value = "当前状态（字典值）", dataType = "String", paramType = "query")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = WorkSiteInfo.class),
-    })
-    @GetMapping("listPage")
-    @ResponseBody
-    public Object listPage(String workTitle,String workRoad,String workPersonName,String projectState,String startDate,String endDate){
-        Page<WorkSiteInfo> page = PageFactory.defaultPage();
-        QueryWrapper<WorkSiteInfo> queryWrapper = new QueryWrapper<>();
-        if(StrUtil.isNotEmpty(workTitle)){
-            queryWrapper.like("WORK_TITLE",workTitle);
-        }
-        if(StrUtil.isNotEmpty(workRoad)){
-            queryWrapper.like("WORK_ROAD",workRoad);
-        }
-        if(StrUtil.isNotEmpty(workPersonName)){
-            queryWrapper.like("WORKER_NAME",workPersonName);
-        }
-        if(StrUtil.isNotEmpty(projectState)){
-            queryWrapper.eq("PROJECT_STATE",projectState);
-        }
-        if(StrUtil.isNotEmpty(startDate)){
-            queryWrapper.ge("br_work_site_info.CREATE_TIME",startDate + " 00:00:00");
-        }
-        if(StrUtil.isNotEmpty(endDate)){
-            queryWrapper.le("br_work_site_info.CREATE_TIME",endDate + " 23:59:59");
-        }
-        page = workSiteInfoService.selectListPage(page,queryWrapper);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-    @ApiOperation("开始作业")
-    @PostMapping("start")
-    @ResponseBody
-    public Object start(@ApiParam(value = "作业现场id",example = "0")@RequestParam Long projectId){
-        workSiteInfoService.start(projectId);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("完成作业")
-    @PostMapping("finish")
-    @ResponseBody
-    public Object finish(@ApiParam(value = "作业现场id", example = "0")@RequestParam Long projectId){
-        workSiteInfoService.finish(projectId);
-        return ResponseData.success();
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/WorkerController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/WorkerController.java
deleted file mode 100644
index 796f94c..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/WorkerController.java
+++ /dev/null
@@ -1,136 +0,0 @@
-package com.casic.missiles.modular.system.controller;
-
-
-import cn.hutool.core.util.ObjectUtil;
-import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.core.base.controller.BaseController;
-import com.casic.missiles.core.page.PageFactory;
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.DeviceDetailDTO;
-import com.casic.missiles.modular.system.entity.Device;
-import com.casic.missiles.modular.system.entity.Worker;
-import com.casic.missiles.modular.system.service.IWorkerService;
-import io.swagger.annotations.*;
-import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.*;
-
-import org.springframework.stereotype.Controller;
-
-import java.util.Date;
-import java.util.List;
-
-import static com.casic.missiles.model.response.ResponseData.DEFAULT_SUCCESS_MESSAGE;
-
-/**
- * <p>
- *  前端控制器
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@Controller
-@RequestMapping("/worker")
-@RequiredArgsConstructor
-@Api(tags = "人员管理接口")
-public class WorkerController extends BaseController {
-
-    private final IWorkerService workerService;
-
-    @ApiOperation("分页列表查询")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "name",value = "姓名", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "deptId",value = "所属部门", dataType = "Long", paramType = "query", example = "0"),
-            @ApiImplicitParam(name = "status",value = "当前状态（字典值）", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "startDate",value = "注册开始日期", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "endDate",value = "注册结束日期", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "workerType",value = "人员类型（字典值）", dataType = "String", paramType = "query")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = Worker.class),
-    })
-    @GetMapping("listPage")
-    @ResponseBody
-    public Object listPage(String name,Long deptId, String status,String startDate,String endDate,String workerType){
-        Page<Worker> page = PageFactory.defaultPage();
-        QueryWrapper<Worker> queryWrapper = new QueryWrapper<>();
-        if(StrUtil.isNotEmpty(name)){
-            queryWrapper.like("WORKER_NAME",name);
-        }
-        if(ObjectUtil.isNotEmpty(deptId)){
-            queryWrapper.eq("DEPT_ID",deptId);
-        }
-        if(StrUtil.isNotEmpty(workerType)){
-            queryWrapper.eq("WORKER_TYPE",workerType);
-        }
-        if(StrUtil.isNotEmpty(startDate)){
-            queryWrapper.ge("CREATE_TIME",startDate + " 00:00:00");
-        }
-        if(StrUtil.isNotEmpty(endDate)){
-            queryWrapper.le("CREATE_TIME",endDate + " 23:59:59");
-        }
-        if(StrUtil.isNotEmpty(status)){
-            queryWrapper.eq("`STATUS`",status);
-        }
-        page = workerService.selectListPage(page,queryWrapper);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-    @ApiOperation("新增人员")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "worker", value = "人员信息", dataType = "Worker", paramType = "body", required = true),
-            @ApiImplicitParam(name = "projectId", value = "项目ID(入场申请需要)", dataType = "Long", paramType = "query", example = "0")
-    })
-    @PostMapping("add")
-    @ResponseBody
-    public Object add(@ApiParam("worker")@RequestBody Worker worker,
-                      @RequestParam(required = false) Long projectId){
-        workerService.addWorker(worker,projectId);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("编辑人员")
-    @PostMapping("update")
-    @ResponseBody
-    public Object update(@RequestBody Worker worker){
-        workerService.updateById(worker);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("删除人员")
-    @PostMapping("delete")
-    @ResponseBody
-    public Object delete(@ApiParam("人员id列表")@RequestBody List<Long> workIds){
-        workerService.removeByIds(workIds);
-        return ResponseData.success();
-    }
-
-
-    @ApiOperation(value = "获取人脸图片",notes = "返回人脸图片url")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "cameraIp",value = "摄像头IP", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "cameraPort",value = "摄像头端口号", dataType = "String", paramType = "query"),
-    })
-    @GetMapping("/face/register")
-    @ResponseBody
-    public Object faceRegister(String cameraIp,String cameraPort){
-        return ResponseData.success(workerService.faceRegister(cameraIp, cameraPort));
-    }
-
-
-    @ApiOperation(value = "查询临时入场人员列表")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "projectId", value = "项目ID",required = true,dataType = "Long", paramType = "query", example = "0")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = Worker.class),
-    })
-    @GetMapping("/projectTempWorker")
-    @ResponseBody
-    public Object projectTempWorker(Long projectId){
-        return ResponseData.success(workerService.projectTempWorker(projectId));
-    }
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/AlarmTypeCountDTO.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/AlarmTypeCountDTO.java
deleted file mode 100644
index 1a165a1..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/AlarmTypeCountDTO.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.casic.missiles.modular.system.dto;
-
-import io.swagger.annotations.ApiModel;
-import lombok.Data;
-
-@ApiModel(value = "AlarmTypeCountDTO",description = "报警类型统计（首页）")
-@Data
-public class AlarmTypeCountDTO {
-
-    private String alarmType;
-    private String alarmTypeName;
-    private Integer alarmCount;
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/AlarmUpload.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/AlarmUpload.java
deleted file mode 100644
index 73d7799..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/AlarmUpload.java
+++ /dev/null
@@ -1,46 +0,0 @@
-package com.casic.missiles.modular.system.dto;
-
-import cn.hutool.core.util.StrUtil;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-@ApiModel(value = "AlarmUpload",description = "报警上传")
-@Data
-public class AlarmUpload {
-
-    @ApiModelProperty(value = "摄像头ip")
-    private String cameraIp;
-
-    @ApiModelProperty(value = "摄像头端口")
-    private String cameraPort;
-    @ApiModelProperty(value = "安全树甲烷设备ip")
-    private String gasIp;
-    @ApiModelProperty(value = "安全树甲烷设备端口")
-    private String gasPort;
-    @ApiModelProperty(value = "报警值")
-    private String alarmValue;
-    @ApiModelProperty(value = "报警时间")
-    private String alarmTime;
-    @ApiModelProperty(value = "报警类型")
-    private String alarmType;
-    @ApiModelProperty(value = "报警图片")
-    private String alarmImage;
-    @ApiModelProperty(value = "报警内容")
-    private String alarmContent;
-
-    @Override
-    public String toString() {
-        return "AlarmUpload{" +
-                "cameraIp='" + cameraIp + '\'' +
-                ", cameraPort='" + cameraPort + '\'' +
-                ", gasIp='" + gasIp + '\'' +
-                ", gasPort='" + gasPort + '\'' +
-                ", alarmValue='" + alarmValue + '\'' +
-                ", alarmTime='" + alarmTime + '\'' +
-                ", alarmType='" + alarmType + '\'' +
-                ", alarmImage='" + (StrUtil.isNotEmpty(alarmImage) ? alarmImage.substring(0,50) : "null") + '\'' +
-                ", alarmContent='" + alarmContent + '\'' +
-                '}';
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/DeviceDetailDTO.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/DeviceDetailDTO.java
deleted file mode 100644
index ea518d9..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/DeviceDetailDTO.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package com.casic.missiles.modular.system.dto;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.casic.missiles.modular.system.entity.Device;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-@ApiModel("DeviceDetailDTO")
-@Data
-public class DeviceDetailDTO extends Device {
-
-    @ApiModelProperty(value = "摄像头编号")
-    private String cameraCode;
-
-    @ApiModelProperty(value = "摄像头IP")
-    private String cameraIp;
-
-    @ApiModelProperty(value = "摄像头端口")
-    private String cameraPort;
-
-    @ApiModelProperty(value = "激甲编号")
-    private String gasCode;
-
-    @ApiModelProperty(value = "激甲IP")
-    private String gasIp;
-
-    @ApiModelProperty(value = "激甲端口")
-    private String gasPort;
-
-    @ApiModelProperty(value = "智能帽衬编号")
-    private String hatLiningCode;
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/WorkSiteDetailDTO.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/WorkSiteDetailDTO.java
deleted file mode 100644
index 29378ff..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/WorkSiteDetailDTO.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package com.casic.missiles.modular.system.dto;
-
-import com.casic.missiles.modular.system.entity.ProjectDevice;
-import com.casic.missiles.modular.system.entity.ProjectWorker;
-import com.casic.missiles.modular.system.entity.WorkSiteInfo;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.util.List;
-
-@Data
-@ApiModel("WorkSiteDetailDTO")
-public class WorkSiteDetailDTO extends WorkSiteInfo {
-
-    @ApiModelProperty(value = "安全树列表",dataType = "ProjectDevice")
-    private List<ProjectDevice> deviceList;
-
-    @ApiModelProperty(value = "人员列表",dataType = "ProjectWorker")
-    private List<ProjectWorker> workerList;
-
-
-
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/WorkerLocationDTO.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/WorkerLocationDTO.java
deleted file mode 100644
index 6fd7b24..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/WorkerLocationDTO.java
+++ /dev/null
@@ -1,68 +0,0 @@
-package com.casic.missiles.modular.system.dto;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-@ApiModel(value = "WorkerLocationDTO",description = "人员位置列表（首页）")
-@Data
-public class WorkerLocationDTO {
-
-    @ApiModelProperty("人员ID")
-    private Long workerId;
-
-    @ApiModelProperty("人员姓名")
-    private String workerName;
-
-    @ApiModelProperty("安全帽编号")
-    private String hatCode;
-
-    @ApiModelProperty("安全帽ID")
-    private Long hatId;
-
-    @ApiModelProperty("背心编号")
-    private String vastCode;
-
-    @ApiModelProperty("手环编号")
-    private String braceletCode;
-
-    @ApiModelProperty("位置")
-    private String location;
-
-    @ApiModelProperty("时间")
-    private String time;
-
-    @ApiModelProperty("经度")
-    private String lng;
-
-    @ApiModelProperty("纬度")
-    private String lat;
-
-    @ApiModelProperty("心率")
-    private String heartRate;
-
-    @ApiModelProperty("血氧")
-    private String bloodOxygen;
-
-    @ApiModelProperty("一氧化碳")
-    private String co;
-
-    @ApiModelProperty("甲烷")
-    private String gas;
-
-    @ApiModelProperty("硫化氢")
-    private String h2s;
-
-    @ApiModelProperty("氧气")
-    private String o2;
-
-    @ApiModelProperty("信号")
-    private String signal;
-
-    @ApiModelProperty("电量")
-    private String cell;
-
-    @ApiModelProperty("是否报警")
-    private boolean alarmFlag;
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Alarm.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Alarm.java
new file mode 100644
index 0000000..4d2b7ef
--- /dev/null
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Alarm.java
@@ -0,0 +1,103 @@
+package com.casic.missiles.modular.system.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import java.util.Date;
+
+/**
+ * <p>
+ * 报警记录表
+ * </p>
+ *
+ * @author zyj
+ * @since 2023-05-25
+ */
+@Data
+@TableName("bus_alarm")
+public class Alarm implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    @TableId(value = "ID",type = IdType.ASSIGN_ID)
+    private Long id;
+
+    /**
+     * 设备ID
+     */
+    @TableField("DEVICE_ID")
+    private Long deviceId;
+
+    /**
+     * 报警类型
+     */
+    @TableField("ALARM_TYPE")
+    private String alarmType;
+
+    /**
+     * 报警时间
+     */
+    @TableField("ALARM_TIME")
+    private Date alarmTime;
+
+    /**
+     * 报警状态
+     */
+    @TableField("ALARM_STATUS")
+    private String alarmStatus;
+
+    /**
+     * 报警位置
+     */
+    @TableField("ALARM_LOCATION")
+    private String alarmLocation;
+
+    /**
+     * 报警图片
+     */
+    @TableField("ALARM_IMAGE")
+    private String alarmImage;
+
+    /**
+     * 视频通道号
+     */
+    @TableField("CHANNEL_NO")
+    private Integer channelNo;
+
+    /**
+     * 报警内容
+     */
+    @TableField("ALARM_CONTENT")
+    private String alarmContent;
+
+    /**
+     * 消警时间
+     */
+    @TableField("CANCEL_TIME")
+    private Date cancelTime;
+
+
+    @Override
+    public String toString() {
+        return "Alarm{" +
+            "id=" + id +
+            ", deviceId=" + deviceId +
+            ", alarmType=" + alarmType +
+            ", alarmTime=" + alarmTime +
+            ", alarmStatus=" + alarmStatus +
+            ", alarmLocation=" + alarmLocation +
+            ", alarmImage=" + alarmImage +
+            ", channelNo=" + channelNo +
+            ", alarmContent=" + alarmContent +
+            ", cancelTime=" + cancelTime +
+        "}";
+    }
+}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusAlarm.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusAlarm.java
deleted file mode 100644
index efb4a23..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusAlarm.java
+++ /dev/null
@@ -1,159 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.alibaba.fastjson.annotation.JSONField;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.time.LocalDateTime;
-import java.util.Date;
-
-/**
- * <p>
- * 报警记录表
- * </p>
- *
- * @author zyj
- * @since 2023-05-16
- */
-@Data
-@ApiModel("Alarm")
-@TableName("br_bus_alarm")
-public class BusAlarm implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 项目ID
-     */
-    @ApiModelProperty(value = "项目ID")
-    @TableField("PROJECT_ID")
-    private Long projectId;
-
-    /**
-     * 设备ID
-     */
-    @ApiModelProperty(value = "设备ID")
-    @TableField("DEVICE_ID")
-    private Long deviceId;
-
-    /**
-     * 报警类型
-     */
-    @ApiModelProperty(value = "报警类型")
-    @TableField("ALARM_TYPE")
-    private String alarmType;
-
-    /**
-     * 报警状态
-     */
-    @ApiModelProperty(value = "报警状态")
-    @TableField("ALARM_STATUS")
-    private String alarmStatus;
-
-    /**
-     * 报警值
-     */
-    @ApiModelProperty(value = "报警值")
-    @TableField("ALARM_VALUE")
-    private String alarmValue;
-
-    /**
-     * 报警图片
-     */
-    @ApiModelProperty(value = "报警图片")
-    @TableField("ALARM_IMAGE")
-    private String alarmImage;
-
-    /**
-     * 报警内容
-     */
-    @ApiModelProperty(value = "报警内容")
-    @TableField("ALARM_CONTENT")
-    private String alarmContent;
-
-    /**
-     * 报警时间
-     */
-    @ApiModelProperty(value = "报警时间")
-    @TableField("ALARM_TIME")
-    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
-    private Date alarmTime;
-
-    /**
-     * 消警时间
-     */
-    @ApiModelProperty(value = "消警时间")
-    @TableField("CANCEL_TIME")
-    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
-    private Date cancelTime;
-
-    /**
-     * 报警位置经度
-     */
-    @ApiModelProperty(value = "报警位置经度")
-    @TableField("ALARM_LNG")
-    private String alarmLng;
-
-    /**
-     * 报警位置纬度
-     */
-    @ApiModelProperty(value = "报警位置纬度")
-    @TableField("ALARM_LAT")
-    private String alarmLat;
-
-    @ApiModelProperty("报警类型名称")
-    @TableField(exist = false)
-    private String alarmStatusName;
-    @ApiModelProperty("报警类型名称")
-    @TableField(exist = false)
-    private String alarmTypeName;
-    @ApiModelProperty("作业名称")
-    @TableField(exist = false)
-    private String workTitle;
-    @ApiModelProperty("所属道路")
-    @TableField(exist = false)
-    private String workRoad;
-    @ApiModelProperty("作业状态")
-    @TableField(exist = false)
-    private String projectState;
-    @ApiModelProperty("作业状态名称")
-    @TableField(exist = false)
-    private String projectStateName;
-    @ApiModelProperty("负责人姓名")
-    @TableField(exist = false)
-    private String workPersonName;
-    @ApiModelProperty("负责人联系方式")
-    @TableField(exist = false)
-    private String workPersonPhoneNumber;
-
-
-    @Override
-    public String toString() {
-        return "BusAlarm{" +
-                "id=" + id +
-                ", projectId=" + projectId +
-                ", deviceId=" + deviceId +
-                ", alarmType=" + alarmType +
-                ", alarmValue=" + alarmValue +
-                ", alarmStatus=" + alarmStatus +
-                ", alarmImage=" + alarmImage +
-                ", alarmContent=" + alarmContent +
-                ", alarmTime=" + alarmTime +
-                ", cancelTime=" + cancelTime +
-                ", alarmLng=" + alarmLng +
-                ", alarmLat=" + alarmLat +
-                "}";
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusEvent.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusEvent.java
deleted file mode 100644
index a0b7543..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusEvent.java
+++ /dev/null
@@ -1,100 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.time.LocalDateTime;
-import java.util.Date;
-import java.util.List;
-
-/**
- * <p>
- * 事件表
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@TableName("br_bus_event")
-@Data
-@ApiModel("BusEvent")
-public class BusEvent implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @ApiModelProperty("事件ID")
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 事件标题
-     */
-    @ApiModelProperty("事件名称")
-    @TableField("EVENT_TITLE")
-    private String eventTitle;
-
-    /**
-     * 上报人员
-     */
-    @ApiModelProperty("上报人员")
-    @TableField("UPLOAD_NAME")
-    private String uploadName;
-
-    /**
-     * 联系方式
-     */
-    @ApiModelProperty("联系方式")
-    @TableField("PHONE_NUMBER")
-    private String phoneNumber;
-
-    /**
-     * 事件描述
-     */
-    @ApiModelProperty("事件描述")
-    @TableField("EVENT_DESCRIPTION")
-    private String eventDescription;
-
-    @ApiModelProperty("经度")
-    @TableField("LNG")
-    private String lng;
-
-    @ApiModelProperty("纬度")
-    @TableField("LAT")
-    private String lat;
-
-    /**
-     * 事件上传时间
-     */
-    @ApiModelProperty("事件上传时间")
-    @TableField("CREATE_TIME")
-    private Date createTime;
-
-    @ApiModelProperty("事件照片")
-    @TableField(exist = false)
-    private List<BusEventImage> imageList;
-
-
-
-    @Override
-    public String toString() {
-        return "BusEvent{" +
-            "id=" + id +
-            ", eventTitle=" + eventTitle +
-            ", uploadName=" + uploadName +
-            ", phoneNumber=" + phoneNumber +
-            ", eventDescription=" + eventDescription +
-            ", lng=" + lng +
-            ", lat=" + lat +
-            ", createTime=" + createTime +
-        "}";
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusEventImage.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusEventImage.java
deleted file mode 100644
index 1e75245..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusEventImage.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-
-/**
- * <p>
- * 事件图片表
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@TableName("br_bus_event_image")
-@Data
-@ApiModel("BusEventImage")
-public class BusEventImage implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 事件ID
-     */
-    @TableField("EVENT_ID")
-    private Long eventId;
-
-    /**
-     * 报警图片
-     */
-    @TableField("IMAGE")
-    @ApiModelProperty("图片url")
-    private String image;
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Device.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Device.java
index df89c70..ea7db5f 100644
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Device.java
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Device.java
@@ -1,30 +1,23 @@
 package com.casic.missiles.modular.system.entity;
 
-import com.alibaba.fastjson.annotation.JSONField;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.casic.missiles.core.base.json.DateDeserializer;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
-import java.util.Date;
 
 /**
  * <p>
- * 
+ * 设备记录表
  * </p>
  *
  * @author zyj
- * @since 2023-04-14
+ * @since 2023-05-25
  */
-@ApiModel("Device")
-@TableName("br_device")
 @Data
+@TableName("bus_device")
 public class Device implements Serializable {
 
     private static final long serialVersionUID = 1L;
@@ -32,82 +25,86 @@
     /**
      * 主键
      */
-    @ApiModelProperty(value = "设备ID")
     @TableId(value = "ID",type = IdType.ASSIGN_ID)
     private Long id;
 
     /**
-     * 设备编号
+     * 设备名称
      */
-    @ApiModelProperty(value = "设备编号")
-    @TableField("DEVICE_CODE")
-    private String deviceCode;
+    @TableField("DEVICE_NAME")
+    private String deviceName;
 
     /**
-     * 设备类型
+     * IP
      */
-    @ApiModelProperty(value = "设备类型")
-    @TableField("DEVICE_TYPE")
-    private String deviceType;
+    @TableField("IP")
+    private String ip;
 
     /**
-     * 设备批次
+     * 端口
      */
-    @ApiModelProperty(value = "设备批次")
-    @TableField("DEVICE_BATCH")
-    private String deviceBatch;
+    @TableField("PORT")
+    private String port;
 
     /**
-     * 厂家
+     * 用户名
      */
-    @ApiModelProperty(value = "厂家")
-    @TableField("MANUFACTURER")
-    private String manufacturer;
+    @TableField("USER_NAME")
+    private String userName;
 
     /**
-     * 是否供电
+     * 密码
      */
-    @ApiModelProperty(value = "是否供电")
-    @TableField("IS_POWER_SUPPLY")
-    private String isPowerSupply;
+    @TableField("PASSWORD")
+    private String password;
 
     /**
-     * 创建时间
+     * 连接类型
      */
-    @ApiModelProperty(value = "创建时间",dataType = "Date")
-    @TableField("CREATE_TIME")
-    private Date createTime;
+    @TableField("CONNECT_TYPE")
+    private String connectType;
 
-    @ApiModelProperty(value = "设备类型名称")
-    @TableField(exist = false)
-    private String deviceTypeName;
+    /**
+     * 位置
+     */
+    @TableField("LOCATION")
 
-    @ApiModelProperty(value = "是否供电名称")
-    @TableField(exist = false)
-    private String isPowerSupplyName;
+    private String location;
 
-    @ApiModelProperty(value = "注册时间",dataType = "String")
-    @TableField(exist = false)
-    private String registerTime;
+    /**
+     * 设备状态
+     */
+    @TableField("STATUS")
 
-    @ApiModelProperty(value = "当前状态")
-    @TableField(exist = false)
     private String status;
 
-    @ApiModelProperty(value = "当前状态名称")
-    @TableField(exist = false)
-    private String statusName;
+    /**
+     * 报警分组
+     */
+    @TableField("ALARM_GROUP")
+
+    private Long alarmGroup;
+
+    /**
+     * 视频通道数(预留)
+     */
+    @TableField("CHANNEL_NUM")
+    private Integer channelNum;
 
     @Override
     public String toString() {
         return "Device{" +
             "id=" + id +
-            ", deviceCode=" + deviceCode +
-            ", deviceType=" + deviceType +
-            ", deviceBatch=" + deviceBatch +
-            ", manufacturer=" + manufacturer +
-            ", isPowerSupply=" + isPowerSupply +
-            ", createTime=" + createTime +
+            ", deviceName=" + deviceName +
+            ", ip=" + ip +
+            ", port=" + port +
+            ", userName=" + userName +
+            ", password=" + password +
+            ", connectType=" + connectType +
+            ", location=" + location +
+            ", status=" + status +
+            ", alarmGroup=" + alarmGroup +
+            ", channelNum=" + channelNum +
         "}";
     }
 }
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/DeviceExt.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/DeviceExt.java
deleted file mode 100644
index 5ee7015..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/DeviceExt.java
+++ /dev/null
@@ -1,99 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-
-/**
- * <p>
- * 设备扩展信息表（安全树）
- * </p>
- *
- * @author zyj
- * @since 2023-04-27
- */
-@Data
-@TableName("br_device_ext")
-public class DeviceExt implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 设备ID
-     */
-    @TableField("DEVICE_ID")
-    private Long deviceId;
-
-    /**
-     * 摄像头编号
-     */
-    @TableField("CAMERA_CODE")
-    private String cameraCode;
-
-    /**
-     * 摄像头IP
-     */
-    @TableField("CAMERA_IP")
-    private String cameraIp;
-
-    /**
-     * 摄像头端口
-     */
-    @TableField("CAMERA_PORT")
-    private String cameraPort;
-
-    /**
-     * 激甲编号
-     */
-    @TableField("GAS_CODE")
-    private String gasCode;
-
-    /**
-     * 激甲IP
-     */
-    @TableField("GAS_IP")
-    private String gasIp;
-
-    /**
-     * 激甲端口
-     */
-    @TableField("GAS_PORT")
-    private String gasPort;
-
-    /**
-     * 甲烷报警阈值
-     */
-    @TableField("GAS_THRESHOLD")
-    private String gasThreshold;
-
-    @TableField(value = "HAT_LINING_CODE")
-    private String hatLiningCode;
-
-
-    @Override
-    public String toString() {
-        return "DeviceExt{" +
-            "id=" + id +
-            ", deviceId=" + deviceId +
-            ", cameraCode=" + cameraCode +
-            ", cameraIp=" + cameraIp +
-            ", cameraPort=" + cameraPort +
-            ", gasCode=" + gasCode +
-            ", gasIp=" + gasIp +
-            ", gasPort=" + gasPort +
-            ", gasThreshold=" + gasThreshold +
-            ", hatLiningCode=" + hatLiningCode +
-        "}";
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/ProjectDevice.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/ProjectDevice.java
deleted file mode 100644
index c4f3472..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/ProjectDevice.java
+++ /dev/null
@@ -1,62 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-
-/**
- * <p>
- * 
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@Data
-@ApiModel("ProjectDevice")
-@TableName("br_project_device")
-public class ProjectDevice implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 作业现场ID
-     */
-    @TableField("PROJECT_ID")
-    private Long projectId;
-
-    /**
-     * 设备ID
-     */
-    @TableField("DEVICE_ID")
-    @ApiModelProperty("设备ID（新增编辑时传）")
-    private Long deviceId;
-
-    /**
-     * 设备编号
-     */
-    @TableField(exist = false)
-    @ApiModelProperty("设备编号（详情中展示，新增编辑不用传）")
-    private String deviceCode;
-
-    @Override
-    public String toString() {
-        return "ProjectDevice{" +
-            "id=" + id +
-            ", projectId=" + projectId +
-            ", deviceId=" + deviceId +
-        "}";
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/ProjectWorker.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/ProjectWorker.java
deleted file mode 100644
index 10b23c4..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/ProjectWorker.java
+++ /dev/null
@@ -1,104 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import java.io.Serializable;
-
-/**
- * <p>
- * 
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@ApiModel("ProjectWorker")
-@TableName("br_project_worker")
-@Data
-@NoArgsConstructor
-@AllArgsConstructor
-public class ProjectWorker implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 作业现场ID
-     */
-    @TableField("PROJECT_ID")
-    private Long projectId;
-
-    /**
-     * 人员ID
-     */
-    @ApiModelProperty("人员ID")
-    @TableField("WORKER_ID")
-    private Long workerId;
-
-    /**
-     * 安全帽编号
-     */
-    @ApiModelProperty("安全帽编号")
-    @TableField("HAT_CODE")
-    private String hatCode;
-
-    /**
-     * 背心编号
-     */
-    @ApiModelProperty("背心编号")
-    @TableField("VAST_CODE")
-    private String vastCode;
-
-    /**
-     * 手环编号
-     */
-    @ApiModelProperty("手环编号")
-    @TableField("BRACELET_CODE")
-    private String braceletCode;
-
-    @ApiModelProperty("人员姓名（详情中展示，新增编辑不用传）")
-    @TableField(exist = false)
-    private String workerName;
-
-    @ApiModelProperty("人员部门ID（详情中展示，新增编辑不用传）")
-    @TableField(exist = false)
-    private String workerDeptId;
-
-    @ApiModelProperty("人员部门名称（详情中展示，新增编辑不用传）")
-    @TableField(exist = false)
-    private String workerDeptName;
-
-    @ApiModelProperty("人员联系方式（详情中展示，新增编辑不用传）")
-    @TableField(exist = false)
-    private String workerPhoneNumber;
-
-    public ProjectWorker(Long projectId, Long workerId) {
-        this.projectId = projectId;
-        this.workerId = workerId;
-    }
-
-    @Override
-    public String toString() {
-        return "ProjectWorker{" +
-            "id=" + id +
-            ", projectId=" + projectId +
-            ", workerId=" + workerId +
-            ", hatCode=" + hatCode +
-            ", vastCode=" + vastCode +
-            ", braceletCode=" + braceletCode +
-        "}";
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/WorkSiteInfo.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/WorkSiteInfo.java
deleted file mode 100644
index fa6f41d..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/WorkSiteInfo.java
+++ /dev/null
@@ -1,130 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.alibaba.fastjson.annotation.JSONField;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.time.LocalDateTime;
-import java.util.Date;
-
-/**
- * <p>
- * 作业现场表
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@ApiModel("WorkSiteInfo")
-@TableName("br_work_site_info")
-@Data
-public class WorkSiteInfo implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @ApiModelProperty("作业现场ID")
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 作业名称
-     */
-    @ApiModelProperty("作业名称")
-    @TableField("WORK_TITLE")
-    private String workTitle;
-
-    /**
-     * 责任人
-     */
-    @ApiModelProperty("责任人（人员ID）")
-    @TableField("WORK_PERSON")
-    private Long workPerson;
-
-    /**
-     * 作业描述
-     */
-    @ApiModelProperty("作业描述")
-    @TableField("WORK_SITE_DESC")
-    private String workSiteDesc;
-
-    /**
-     * 作业状态
-     */
-    @ApiModelProperty("作业状态")
-    @TableField("PROJECT_STATE")
-    private String projectState;
-
-    /**
-     * 所属道路
-     */
-    @ApiModelProperty("所属道路")
-    @TableField("WORK_ROAD")
-    private String workRoad;
-
-    @TableField("IMAGE_URL")
-    private String imageUrl;
-
-    @TableField("CREATE_TIME")
-    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
-    private Date createTime;
-    @TableField("UPDATE_TIME")
-    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
-    private Date updateTime;
-
-    @ApiModelProperty("开始时间")
-    @TableField("START_TIME")
-    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
-    private Date startTime;
-
-    @ApiModelProperty("结束时间")
-    @TableField("FINISH_TIME")
-    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
-    private Date finishTime;
-
-    @ApiModelProperty("负责人姓名（详情中使用，新增编辑不用传）")
-    @TableField(exist = false)
-    private String workPersonName;
-
-    @ApiModelProperty("负责人联系方式（详情中使用，新增编辑不用传）")
-    @TableField(exist = false)
-    private String workPersonPhoneNumber;
-
-    @ApiModelProperty("负责人所属部门ID（详情中使用，新增编辑不用传）")
-    @TableField(exist = false)
-    private Long workPersonDeptId;
-
-    @ApiModelProperty("负责人所属部门名称（详情中使用，新增编辑不用传）")
-    @TableField(exist = false)
-    private String workPersonDeptName;
-
-    @ApiModelProperty(value = "注册时间",dataType = "String")
-    @TableField(exist = false)
-    private String registerTime;
-
-    @ApiModelProperty("作业状态名称")
-    @TableField(exist = false)
-    private String projectStateName;
-
-    @Override
-    public String toString() {
-        return "WorkSiteInfo{" +
-            "id=" + id +
-            ", workTitle=" + workTitle +
-            ", workPerson=" + workPerson +
-            ", workSiteDesc=" + workSiteDesc +
-            ", projectState=" + projectState +
-            ", imageUrl=" + imageUrl +
-            ", updateTime=" + updateTime +
-            ", workRoad=" + workRoad +
-        "}";
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Worker.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Worker.java
deleted file mode 100644
index 28a4daa..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Worker.java
+++ /dev/null
@@ -1,147 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.time.LocalDateTime;
-import java.util.Date;
-
-/**
- * <p>
- * 
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@ApiModel("Worker")
-@TableName("br_worker")
-@Data
-public class Worker implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @ApiModelProperty(value = "人员ID")
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 姓名
-     */
-    @ApiModelProperty(value = "姓名")
-    @TableField("WORKER_NAME")
-    private String workerName;
-
-    /**
-     * 性别
-     */
-    @ApiModelProperty(value = "性别")
-    @TableField("GENDER")
-    private String gender;
-
-    /**
-     * 所属部门
-     */
-    @ApiModelProperty(value = "所属部门(人员管理)")
-    @TableField("DEPT_ID")
-    private Long deptId;
-
-    /**
-     * 所属单位
-     */
-    @ApiModelProperty(value = "所属单位(入场申请中使用)")
-    @TableField("OWNER_SHIP")
-    private String ownerShip;
-
-    /**
-     * 联系方式
-     */
-    @ApiModelProperty(value = "联系方式")
-    @TableField("PHONE_NUMBER")
-    private String phoneNumber;
-
-    /**
-     * 证件号
-     */
-    @ApiModelProperty(value = "证件号")
-    @TableField("ID_CARD_NUMBER")
-    private String idCardNumber;
-
-    /**
-     * 入场原因
-     */
-    @ApiModelProperty(value = "入场原因（入场申请中使用）")
-    @TableField("ENTER_REASON")
-    private String enterReason;
-
-    /**
-     * 入场人脸照片
-     */
-    @ApiModelProperty(value = "人脸照片（照片路径）")
-    @TableField("WORKER_AVATAR")
-    private String workerAvatar;
-
-    /**
-     * 申请入场时间
-     */
-    @ApiModelProperty(value = "注册时间/申请入场时间")
-    @TableField("CREATE_TIME")
-    private Date createTime;
-
-    /**
-     * 人员类型
-     */
-    @ApiModelProperty(value = "人员类型（区分人员管理和入场申请）")
-    @TableField("WORKER_TYPE")
-    private String workerType;
-
-    @ApiModelProperty(value = "性别名称")
-    @TableField(exist = false)
-    private String genderName;
-
-    @ApiModelProperty(value = "部门名称")
-    @TableField(exist = false)
-    private String deptName;
-
-    @ApiModelProperty(value = "注册时间",dataType = "String")
-    @TableField(exist = false)
-    private String registerTime;
-
-    @ApiModelProperty(value = "当前状态")
-    @TableField(exist = false)
-    private String status;
-
-    @ApiModelProperty(value = "当前状态名称")
-    @TableField(exist = false)
-    private String statusName;
-
-    @ApiModelProperty(value = "是否注册(0未注册；1已注册)",allowableValues = "0,1")
-    @TableField(exist = false)
-    private String isRegister;
-
-    @Override
-    public String toString() {
-        return "Worker{" +
-            "id=" + id +
-            ", workerName=" + workerName +
-            ", gender=" + gender +
-            ", deptId=" + deptId +
-            ", ownerShip=" + ownerShip +
-            ", phoneNumber=" + phoneNumber +
-            ", idCardNumber=" + idCardNumber +
-            ", enterReason=" + enterReason +
-            ", workerAvatar=" + workerAvatar +
-            ", createTime=" + createTime +
-            ", workerType=" + workerType +
-        "}";
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/AlarmMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/AlarmMapper.java
new file mode 100644
index 0000000..ea4c8be
--- /dev/null
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/AlarmMapper.java
@@ -0,0 +1,16 @@
+package com.casic.missiles.modular.system.mapper;
+
+import com.casic.missiles.modular.system.entity.Alarm;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 报警记录表 Mapper 接口
+ * </p>
+ *
+ * @author zyj
+ * @since 2023-05-25
+ */
+public interface AlarmMapper extends BaseMapper<Alarm> {
+
+}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/BusAlarmMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/BusAlarmMapper.java
deleted file mode 100644
index 9801742..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/BusAlarmMapper.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package com.casic.missiles.modular.system.mapper;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.modular.system.dto.AlarmTypeCountDTO;
-import com.casic.missiles.modular.system.entity.BusAlarm;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * <p>
- * 报警记录表 Mapper 接口
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface BusAlarmMapper extends BaseMapper<BusAlarm> {
-
-    Page<BusAlarm> listPage(Page<BusAlarm> page,@Param("ew")  QueryWrapper<BusAlarm> queryWrapper);
-
-    void cancelAlarm(@Param("deviceId")Long deviceId,@Param("alarmType") String alarmType);
-
-    List<AlarmTypeCountDTO> alarmCount(@Param("projectId")Long projectId, @Param("alarmStatus")String alarmStatus);
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/BusEventImageMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/BusEventImageMapper.java
deleted file mode 100644
index 9590b7d..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/BusEventImageMapper.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.casic.missiles.modular.system.mapper;
-
-import com.casic.missiles.modular.system.entity.BusEventImage;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * <p>
- * 事件图片表 Mapper 接口
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface BusEventImageMapper extends BaseMapper<BusEventImage> {
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/BusEventMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/BusEventMapper.java
deleted file mode 100644
index 3c85edf..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/BusEventMapper.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.casic.missiles.modular.system.mapper;
-
-import com.casic.missiles.modular.system.entity.BusEvent;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * <p>
- * 事件表 Mapper 接口
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface BusEventMapper extends BaseMapper<BusEvent> {
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/DeviceExtMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/DeviceExtMapper.java
deleted file mode 100644
index 4ca9212..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/DeviceExtMapper.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.casic.missiles.modular.system.mapper;
-
-import com.casic.missiles.modular.system.entity.DeviceExt;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * <p>
- * 设备扩展信息表（安全树） Mapper 接口
- * </p>
- *
- * @author zyj
- * @since 2023-04-27
- */
-public interface DeviceExtMapper extends BaseMapper<DeviceExt> {
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/DeviceMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/DeviceMapper.java
index 444c0c5..3d0bb02 100644
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/DeviceMapper.java
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/DeviceMapper.java
@@ -1,30 +1,16 @@
 package com.casic.missiles.modular.system.mapper;
 
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.modular.system.dto.DeviceDetailDTO;
-import com.casic.missiles.modular.system.dto.HelmetInfoDTO;
 import com.casic.missiles.modular.system.entity.Device;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
 
 /**
  * <p>
- *  Mapper 接口
+ * 设备记录表 Mapper 接口
  * </p>
  *
  * @author zyj
- * @since 2023-04-14
+ * @since 2023-05-25
  */
-@Mapper
 public interface DeviceMapper extends BaseMapper<Device> {
 
-    Page<DeviceDetailDTO> listDetailPage(Page<DeviceDetailDTO> page,@Param("ew") QueryWrapper<DeviceDetailDTO> ew);
-
-     List<Long> selectProjectDevice(@Param("projectId") Long projectId);
-
-    List<HelmetInfoDTO> selectHelmetList(@Param("deviceType")String deviceType);
 }
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/ProjectDeviceMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/ProjectDeviceMapper.java
deleted file mode 100644
index 1d0c14e..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/ProjectDeviceMapper.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package com.casic.missiles.modular.system.mapper;
-
-import com.casic.missiles.modular.system.dto.DeviceLocationDTO;
-import com.casic.missiles.modular.system.entity.ProjectDevice;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * <p>
- *  Mapper 接口
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface ProjectDeviceMapper extends BaseMapper<ProjectDevice> {
-     List<ProjectDevice> selectDetailByProjectId(@Param("projectId") Long projectId);
-
-     List<DeviceLocationDTO> selectDeviceLocationList(@Param("projectId") Long projectId);
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/ProjectWorkerMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/ProjectWorkerMapper.java
deleted file mode 100644
index 58583d1..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/ProjectWorkerMapper.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package com.casic.missiles.modular.system.mapper;
-
-import com.casic.missiles.modular.system.dto.WorkerLocationDTO;
-import com.casic.missiles.modular.system.entity.ProjectWorker;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * <p>
- *  Mapper 接口
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface ProjectWorkerMapper extends BaseMapper<ProjectWorker> {
-
-    List<ProjectWorker> selectDetailByProjectId(@Param("projectId") Long projectId,
-                                                @Param("workerType")String workerType);
-
-    List<WorkerLocationDTO> selectWorkerLocationList(@Param("projectId") Long projectId,
-                                                     @Param("workerType")String workerType);
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/WorkSiteInfoMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/WorkSiteInfoMapper.java
deleted file mode 100644
index a4934d2..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/WorkSiteInfoMapper.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.casic.missiles.modular.system.mapper;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.modular.system.entity.WorkSiteInfo;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Param;
-
-/**
- * <p>
- * 作业现场表 Mapper 接口
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface WorkSiteInfoMapper extends BaseMapper<WorkSiteInfo> {
-
-    Page<WorkSiteInfo> selectListPage(Page<WorkSiteInfo> page,@Param("ew") QueryWrapper<WorkSiteInfo> ew);
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/WorkerMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/WorkerMapper.java
deleted file mode 100644
index 258fb12..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/WorkerMapper.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package com.casic.missiles.modular.system.mapper;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.modular.system.dto.DeviceDetailDTO;
-import com.casic.missiles.modular.system.entity.Worker;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * <p>
- *  Mapper 接口
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface WorkerMapper extends BaseMapper<Worker> {
-
-
-    Page<Worker> selectListPage(Page<Worker> page, @Param("ew") QueryWrapper<Worker> ew);
-
-    List<String> selectWorkerAvatars(@Param("projectId")Long projectId);
-
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/AlarmMapper.xml b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/AlarmMapper.xml
new file mode 100644
index 0000000..25cb4ab
--- /dev/null
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/AlarmMapper.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.modular.system.mapper.AlarmMapper">
+
+</mapper>
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/BusAlarmMapper.xml b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/BusAlarmMapper.xml
deleted file mode 100644
index 595088a..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/BusAlarmMapper.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.casic.missiles.modular.system.mapper.BusAlarmMapper">
-
-    <select id="listPage" resultType="com.casic.missiles.modular.system.entity.BusAlarm">
-        SELECT
-            alarm.ID as id,
-            alarm.DEVICE_ID as deviceId,
-            alarm.PROJECT_ID as projectId,
-            alarm.ALARM_TYPE as alarmType,
-            alarm.ALARM_VALUE as alarmValue,
-            alarm.ALARM_STATUS as alarmStatus,
-            alarm.ALARM_IMAGE AS alarmImage,
-            alarm.ALARM_CONTENT as alarmContent,
-            alarm.ALARM_TIME as alarmTime,
-            alarm.CANCEL_TIME as cancelTime,
-            alarm.ALARM_LNG as alarmLng,
-            alarm.ALARM_LAT as alarmLat,
-            p.WORK_TITLE as workTitle,
-            p.WORK_ROAD as workRoad,
-            p.PROJECT_STATE as projectState,
-            w.WORKER_NAME as workPersonName,
-            w.PHONE_NUMBER as workPersonPhoneNumber
-        FROM
-            `br_bus_alarm` alarm
-                LEFT JOIN br_work_site_info p on alarm.PROJECT_ID = p.ID
-                LEFT JOIN br_worker w on p.WORK_PERSON = w.ID
-        <where>
-            <if test="ew != null">
-                ${ew.sqlSegment}
-            </if>
-        </where>
-    </select>
-
-    <select id="cancelAlarm">
-        update br_bus_alarm
-        set ALARM_STATUS = '1'
-        where DEVICE_ID = #{deviceId}
-          and ALARM_TYPE = #{alarmType}
-          and ALARM_STATUS = '0'
-    </select>
-
-    <select id="alarmCount" resultType="com.casic.missiles.modular.system.dto.AlarmTypeCountDTO">
-        SELECT
-            ALARM_TYPE as alarmType,
-            count(*) as alarmCount
-        from br_bus_alarm
-        <where>
-            <if test="projectId != null and projectId !=''">
-                and PROJECT_ID = #{projectId}
-            </if>
-            <if test="alarmStatus != null and alarmStatus !=''">
-                and ALARM_STATUS = #{alarmStatus}
-            </if>
-        </where>
-        group by ALARM_TYPE
-    </select>
-</mapper>
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/BusEventImageMapper.xml b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/BusEventImageMapper.xml
deleted file mode 100644
index fbc3db3..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/BusEventImageMapper.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.casic.missiles.modular.system.mapper.BusEventImageMapper">
-
-</mapper>
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/BusEventMapper.xml b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/BusEventMapper.xml
deleted file mode 100644
index 627d573..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/BusEventMapper.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.casic.missiles.modular.system.mapper.BusEventMapper">
-
-</mapper>
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/DeviceExtMapper.xml b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/DeviceExtMapper.xml
deleted file mode 100644
index 5321d1c..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/DeviceExtMapper.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.casic.missiles.modular.system.mapper.DeviceExtMapper">
-
-</mapper>
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/DeviceMapper.xml b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/DeviceMapper.xml
index 94262e1..88e7d01 100644
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/DeviceMapper.xml
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/DeviceMapper.xml
@@ -2,96 +2,4 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.casic.missiles.modular.system.mapper.DeviceMapper">
 
-    <select id="listDetailPage" resultType="com.casic.missiles.modular.system.dto.DeviceDetailDTO">
-        select
-        br_device.ID as id,
-        DEVICE_CODE as deviceCode,
-        DEVICE_TYPE as deviceType,
-        DEVICE_BATCH as deviceBatch,
-        MANUFACTURER as manufacturer,
-        IS_POWER_SUPPLY as isPowerSupply,
-        CREATE_TIME as createTime,
-        CAMERA_CODE as cameraCode,
-        CAMERA_IP as cameraIp,
-        CAMERA_PORT as cameraPort,
-        GAS_CODE as gasCode,
-        GAS_IP as gasIp,
-        GAS_PORT as gasPort,
-        HAT_LINING_CODE as hatLiningCode
-        from br_device
-        left join br_device_ext ext on ext.DEVICE_ID = br_device.ID
-        <where>
-            <if test="ew != null">
-                ${ew.sqlSegment}
-            </if>
-        </where>
-    </select>
-
-    <select id="selectProjectDevice" resultType="java.lang.Long">
-        with device_info as (
-            (SELECT
-            d.DEVICE_ID as DEVICE_ID,
-            d.PROJECT_ID as PROJECT_ID,
-            p.PROJECT_STATE as PROJECT_STATE
-            from br_project_device d
-            LEFT JOIN br_work_site_info p on p.ID = d.PROJECT_ID)
-
-            UNION ALL
-
-            (SELECT
-            d1.ID as DEVICE_ID,
-            w1.ID as PROJECT_ID,
-            w1.PROJECT_STATE as PROJECT_STATE
-            FROM br_project_worker pw1
-            LEFT JOIN br_device d1 on pw1.BRACELET_CODE = d1.DEVICE_CODE
-            LEFT JOIN br_work_site_info w1 on pw1.PROJECT_ID = w1.ID)
-
-            UNION ALL
-
-            (SELECT
-            d1.ID as DEVICE_ID,
-            w1.ID as PROJECT_ID,
-            w1.PROJECT_STATE as PROJECT_STATE
-            FROM br_project_worker pw1
-            LEFT JOIN br_device d1 on pw1.HAT_CODE = d1.DEVICE_CODE
-            LEFT JOIN br_work_site_info w1 on pw1.PROJECT_ID = w1.ID)
-
-
-            UNION ALL
-
-            (SELECT
-            d1.ID as DEVICE_ID,
-            w1.ID as PROJECT_ID,
-            w1.PROJECT_STATE as PROJECT_STATE
-            FROM br_project_worker pw1
-            LEFT JOIN br_device d1 on pw1.VAST_CODE = d1.DEVICE_CODE
-            LEFT JOIN br_work_site_info w1 on pw1.PROJECT_ID = w1.ID))
-
-        select DISTINCT DEVICE_ID from device_info
-        <where>
-            DEVICE_ID is not null
-            <choose>
-                <when test="projectId != null and projectId !=''">
-                    and PROJECT_ID = #{projectId}
-                </when>
-                <otherwise>
-                    AND PROJECT_STATE != '3'
-                </otherwise>
-            </choose>
-        </where>
-    </select>
-
-    <select id="selectHelmetList" resultType="com.casic.missiles.modular.system.dto.HelmetInfoDTO">
-        SELECT
-            a.ID AS deviceId,
-            a.DEVICE_CODE AS hatCode,
-            b.HAT_LINING_CODE AS hatLiningCode
-        FROM
-            br_device a
-                LEFT JOIN br_device_ext b ON a.ID = b.DEVICE_ID
-        WHERE
-            a.DEVICE_TYPE = #{deviceType}
-          AND a.DEVICE_CODE IS NOT NULL
-          AND b.HAT_LINING_CODE IS NOT NULL
-    </select>
 </mapper>

diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/AlarmController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/AlarmController.java
new file mode 100644
index 0000000..1795cf1
--- /dev/null
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/AlarmController.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.modular.system.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.stereotype.Controller;
+
+/**
+ * <p>
+ * 报警记录表 前端控制器
+ * </p>
+ *
+ * @author zyj
+ * @since 2023-05-25
+ */
+@Controller
+@RequestMapping("/system/alarm")
+public class AlarmController {
+
+}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusAlarmController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusAlarmController.java
deleted file mode 100644
index 1f82ebb..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusAlarmController.java
+++ /dev/null
@@ -1,102 +0,0 @@
-package com.casic.missiles.modular.system.controller;
-
-
-import cn.hutool.core.util.ObjectUtil;
-import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.core.base.controller.BaseController;
-import com.casic.missiles.core.page.PageFactory;
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.AlarmUpload;
-import com.casic.missiles.modular.system.dto.DeviceDetailDTO;
-import com.casic.missiles.modular.system.entity.BusAlarm;
-import com.casic.missiles.modular.system.service.IBusAlarmService;
-import io.swagger.annotations.*;
-import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.*;
-
-import org.springframework.stereotype.Controller;
-
-import static com.casic.missiles.model.response.ResponseData.DEFAULT_SUCCESS_MESSAGE;
-import static com.casic.missiles.modular.system.consts.AlarmConst.ALARM_STATUS_MANUAL_CANCEL;
-
-/**
- * <p>
- * 报警记录表 前端控制器
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@Api(tags = "报警管理接口")
-@Controller
-@RequestMapping("/alarm")
-@RequiredArgsConstructor
-public class BusAlarmController extends BaseController {
-
-    private final IBusAlarmService alarmService;
-
-    @ApiOperation("报警上报接口")
-    @PostMapping("/upload")
-    @ResponseBody
-    public Object upload(@RequestBody AlarmUpload alarmUpload){
-        alarmService.alarmUpload(alarmUpload);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("报警列表分页查询")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "workTitle", value = "作业名称",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "projectId", value = "作业ID",dataType = "Long", paramType = "query",example = "0"),
-            @ApiImplicitParam(name = "alarmStatus", value = "报警状态",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "projectState", value = "作业状态",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "alarmType", value = "报警类型",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "alarmStartTime", value = "报警开始时间",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "alarmEndTime", value = "报警结束时间",dataType = "String", paramType = "query")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = BusAlarm.class),
-    })
-    @GetMapping("/listPage")
-    @ResponseBody
-    public Object listPage(String workTitle,Long projectId,String alarmStatus,String projectState,String alarmType,String alarmStartTime,String alarmEndTime){
-        Page<BusAlarm> page = PageFactory.defaultPage();
-        QueryWrapper<BusAlarm> queryWrapper = new QueryWrapper<>();
-        if(StrUtil.isNotEmpty(workTitle)){
-            queryWrapper.like("p.WORK_TITLE",workTitle);
-        }
-        if(ObjectUtil.isNotEmpty(projectId)){
-            queryWrapper.eq("alarm.PROJECT_ID",projectId);
-        }
-        if(StrUtil.isNotEmpty(alarmStatus)){
-            queryWrapper.eq("alarm.ALARM_STATUS",alarmStatus);
-        }
-        if(StrUtil.isNotEmpty(projectState)){
-            queryWrapper.eq("p.PROJECT_STATE",projectState);
-        }
-        if(StrUtil.isNotEmpty(alarmType)){
-            queryWrapper.eq("alarm.ALARM_TYPE",alarmType);
-        }
-        if(StrUtil.isNotEmpty(alarmStartTime)){
-            queryWrapper.ge("alarm.ALARM_TIME",alarmStartTime);
-        }
-        if(StrUtil.isNotEmpty(alarmEndTime)){
-            queryWrapper.le("alarm.ALARM_TIME",alarmEndTime);
-        }
-        page = alarmService.listPage(page,queryWrapper);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-    @ApiOperation("消警")
-    @PostMapping("/cancel")
-    @ResponseBody
-    public Object cancel(@RequestParam("alarmId") Long alarmId){
-        UpdateWrapper<BusAlarm> updateWrapper = new UpdateWrapper<>();
-        updateWrapper.eq("ID",alarmId);
-        updateWrapper.set("ALARM_STATUS",ALARM_STATUS_MANUAL_CANCEL);
-        alarmService.update(updateWrapper);
-        return ResponseData.success();
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusEventController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusEventController.java
deleted file mode 100644
index dde5aad..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusEventController.java
+++ /dev/null
@@ -1,41 +0,0 @@
-package com.casic.missiles.modular.system.controller;
-
-
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.entity.BusEvent;
-import com.casic.missiles.modular.system.service.IBusEventService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.ResponseBody;
-
-/**
- * <p>
- * 事件表 前端控制器
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@Controller
-@RequestMapping("/event")
-@Api(tags = "事件上报")
-@RequiredArgsConstructor
-public class BusEventController {
-
-    private final IBusEventService eventService;
-
-    @ApiOperation("事件上报")
-    @PostMapping("add")
-    @ResponseBody
-    public Object add(@RequestBody BusEvent busEvent){
-        eventService.saveBusEvent(busEvent);
-        return ResponseData.success();
-    }
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
index 03abc5f..aa50d78 100644
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
@@ -1,121 +1,20 @@
 package com.casic.missiles.modular.system.controller;
 
 
-import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.core.base.controller.BaseController;
-import com.casic.missiles.core.page.PageFactory;
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.DeviceDetailDTO;
-import com.casic.missiles.modular.system.entity.Device;
-import com.casic.missiles.modular.system.service.IDeviceExtService;
-import com.casic.missiles.modular.system.service.IDeviceService;
-import io.swagger.annotations.*;
-import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.RequestMapping;
 
 import org.springframework.stereotype.Controller;
 
-import java.time.LocalDateTime;
-import java.util.Date;
-import java.util.List;
-
-import static com.casic.missiles.model.response.ResponseData.DEFAULT_SUCCESS_MESSAGE;
-
 /**
  * <p>
- *  前端控制器
+ * 设备记录表 前端控制器
  * </p>
  *
  * @author zyj
- * @since 2023-04-14
+ * @since 2023-05-25
  */
-@Api(tags = "设备管理接口")
-@RequiredArgsConstructor
 @Controller
-@RequestMapping("/device")
-public class DeviceController extends BaseController {
-    private final IDeviceService deviceService;
-    private final IDeviceExtService deviceExtService;
-
-    @ApiOperation("设备分页列表")
-    @ApiImplicitParams({
-        @ApiImplicitParam(name = "deviceType", value = "设备类型",dataType = "String", paramType = "query"),
-        @ApiImplicitParam(name = "deviceCode", value = "设备编号",dataType = "String", paramType = "query"),
-        @ApiImplicitParam(name = "status", value = "设备状态",dataType = "String", paramType = "query"),
-        @ApiImplicitParam(name = "projectId", value = "作业ID（如果传此参数，列表中返回该作业使用的设备）",dataType = "Long", paramType = "query", example = "0")
-    })
-    @ApiResponses({
-        @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = DeviceDetailDTO.class),
-    })
-    @GetMapping("listPage")
-    @ResponseBody
-    public Object listPage(String deviceType, String deviceCode, String status,Long projectId){
-        Page<DeviceDetailDTO> page = PageFactory.defaultPage();
-        QueryWrapper<DeviceDetailDTO> queryWrapper = new QueryWrapper<>();
-        if(StrUtil.isNotEmpty(deviceType)){
-            queryWrapper.eq("DEVICE_TYPE",deviceType);
-        }
-        if(StrUtil.isNotEmpty(deviceCode)){
-            queryWrapper.like("DEVICE_CODE",deviceCode);
-        }
-        page = deviceService.listPage(page,queryWrapper,status,projectId);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-    @ApiOperation("新增设备")
-    @PostMapping("add")
-    @ResponseBody
-    public Object add(@RequestBody DeviceDetailDTO deviceDetailDTO){
-        deviceService.saveDevice(deviceDetailDTO);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("编辑设备")
-    @PostMapping("update")
-    @ResponseBody
-    public Object update(@RequestBody DeviceDetailDTO deviceDetailDTO){
-        deviceService.updateDevice(deviceDetailDTO);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("删除设备")
-    @PostMapping("delete")
-    @ResponseBody
-    public Object delete(@ApiParam("设备id列表")@RequestBody List<Long> deviceIds){
-        deviceService.deleteDevices(deviceIds);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("设置甲烷阈值")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "gasIp", value = "安全树甲烷设备IP",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "gasPort", value = "安全树甲烷端口",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "threshold", value = "甲烷阈值",dataType = "String", paramType = "query")
-    })
-    @PostMapping("setThreshold")
-    @ResponseBody
-    public Object setThreshold(String gasIp,String gasPort,String threshold){
-        deviceExtService.setGasThreshold(gasIp, gasPort, threshold);
-        return ResponseData.success();
-    }
-
-
-    @ApiOperation("查询甲烷阈值")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "gasIp", value = "安全树甲烷设备IP",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "gasPort", value = "安全树甲烷端口",dataType = "String", paramType = "query")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = "{\"code\": 200,\"data\": \"100\",\"message\": \"请求成功\",\"success\": true}",response = String.class),
-    })
-    @GetMapping("getThreshold")
-    @ResponseBody
-    public Object getThreshold(String gasIp,String gasPort){
-        String data = deviceExtService.getGasThreshold(gasIp, gasPort);
-        return ResponseData.success(data);
-    }
-
+@RequestMapping("/system/device")
+public class DeviceController {
 
 }
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/OverviewController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/OverviewController.java
deleted file mode 100644
index 7570504..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/OverviewController.java
+++ /dev/null
@@ -1,70 +0,0 @@
-package com.casic.missiles.modular.system.controller;
-
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.AlarmTypeCountDTO;
-import com.casic.missiles.modular.system.dto.DeviceLocationDTO;
-import com.casic.missiles.modular.system.dto.WorkerLocationDTO;
-import com.casic.missiles.modular.system.service.IBusAlarmService;
-import com.casic.missiles.modular.system.service.IProjectDeviceService;
-import com.casic.missiles.modular.system.service.IProjectWorkerService;
-import io.swagger.annotations.*;
-import lombok.RequiredArgsConstructor;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.ResponseBody;
-
-import static com.casic.missiles.model.response.ResponseData.DEFAULT_SUCCESS_MESSAGE;
-import static com.casic.missiles.modular.system.consts.AlarmConst.ALARM_STATUS_ON;
-
-@Api(tags = "首页看板接口")
-@Controller
-@RequestMapping("overview")
-@RequiredArgsConstructor
-public class OverviewController {
-
-    private final IBusAlarmService alarmService;
-    private final IProjectDeviceService projectDeviceService;
-
-    private final IProjectWorkerService projectWorkerService;
-
-
-    @ApiOperation("报警统计接口")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "projectId", value = "作业ID",dataType = "Long", paramType = "query", example = "0")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = AlarmTypeCountDTO.class),
-    })
-    @GetMapping("/alarmCount")
-    @ResponseBody
-    public Object alarmCount(Long projectId){
-        return ResponseData.success(alarmService.alarmCount(projectId,ALARM_STATUS_ON));
-    }
-
-    @ApiOperation("设备列表接口")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "projectId", value = "作业ID",dataType = "Long", paramType = "query", example = "0")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = DeviceLocationDTO.class),
-    })
-    @GetMapping("/deviceList")
-    @ResponseBody
-    public Object deviceList(Long projectId){
-        return ResponseData.success(projectDeviceService.selectDeviceLocationList(projectId));
-    }
-
-    @ApiOperation("人员列表接口")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "projectId", value = "作业ID",dataType = "Long", paramType = "query", example = "0")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = WorkerLocationDTO.class),
-    })
-    @GetMapping("/workerList")
-    @ResponseBody
-    public Object workerList(Long projectId){
-        return ResponseData.success(projectWorkerService.selectWorkerLocationDTO(projectId));
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/WorkSiteInfoController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/WorkSiteInfoController.java
deleted file mode 100644
index af36d69..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/WorkSiteInfoController.java
+++ /dev/null
@@ -1,130 +0,0 @@
-package com.casic.missiles.modular.system.controller;
-
-
-import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.core.base.controller.BaseController;
-import com.casic.missiles.core.page.PageFactory;
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.WorkSiteDetailDTO;
-import com.casic.missiles.modular.system.entity.WorkSiteInfo;
-import com.casic.missiles.modular.system.service.IWorkSiteInfoService;
-import io.swagger.annotations.*;
-import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.*;
-
-import org.springframework.stereotype.Controller;
-
-import java.util.List;
-
-import static com.casic.missiles.model.response.ResponseData.DEFAULT_SUCCESS_MESSAGE;
-
-/**
- * <p>
- * 作业现场表 前端控制器
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@Controller
-@RequestMapping("/site")
-@Api(tags = "作业现场管理")
-@RequiredArgsConstructor
-public class WorkSiteInfoController extends BaseController {
-
-
-    private final IWorkSiteInfoService workSiteInfoService;
-
-    @ApiOperation("新增作业现场")
-    @PostMapping("add")
-    @ResponseBody
-    public Object addWorkSite(@RequestBody WorkSiteDetailDTO workSiteDetailDTO){
-        workSiteInfoService.addWorkSiteInfo(workSiteDetailDTO);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("编辑作业现场")
-    @PostMapping("update")
-    @ResponseBody
-    public Object updateWorkSite(@RequestBody WorkSiteDetailDTO workSiteDetailDTO){
-        workSiteInfoService.updateWorkSiteInfo(workSiteDetailDTO);
-        return ResponseData.success();
-    }
-
-
-    @ApiOperation("删除作业现场")
-    @PostMapping("delete")
-    @ResponseBody
-    public Object delete(@ApiParam("作业现场id列表")@RequestBody List<Long> projectIds){
-        workSiteInfoService.deleteProjects(projectIds);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("查询作业现场详情")
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = WorkSiteDetailDTO.class),
-    })
-    @GetMapping("detail")
-    @ResponseBody
-    public Object delete(@ApiParam(value = "作业现场id", example = "0")@RequestParam Long projectId){
-        WorkSiteDetailDTO detailDTO = workSiteInfoService.getWorkSiteDetail(projectId);
-        return ResponseData.success(detailDTO);
-    }
-
-    @ApiOperation("分页列表查询")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "workTitle",value = "作业名称", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "workRoad",value = "所属道路", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "workPersonName",value = "责任人姓名", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "startDate",value = "注册开始日期", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "endDate",value = "注册结束日期", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "projectState",value = "当前状态（字典值）", dataType = "String", paramType = "query")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = WorkSiteInfo.class),
-    })
-    @GetMapping("listPage")
-    @ResponseBody
-    public Object listPage(String workTitle,String workRoad,String workPersonName,String projectState,String startDate,String endDate){
-        Page<WorkSiteInfo> page = PageFactory.defaultPage();
-        QueryWrapper<WorkSiteInfo> queryWrapper = new QueryWrapper<>();
-        if(StrUtil.isNotEmpty(workTitle)){
-            queryWrapper.like("WORK_TITLE",workTitle);
-        }
-        if(StrUtil.isNotEmpty(workRoad)){
-            queryWrapper.like("WORK_ROAD",workRoad);
-        }
-        if(StrUtil.isNotEmpty(workPersonName)){
-            queryWrapper.like("WORKER_NAME",workPersonName);
-        }
-        if(StrUtil.isNotEmpty(projectState)){
-            queryWrapper.eq("PROJECT_STATE",projectState);
-        }
-        if(StrUtil.isNotEmpty(startDate)){
-            queryWrapper.ge("br_work_site_info.CREATE_TIME",startDate + " 00:00:00");
-        }
-        if(StrUtil.isNotEmpty(endDate)){
-            queryWrapper.le("br_work_site_info.CREATE_TIME",endDate + " 23:59:59");
-        }
-        page = workSiteInfoService.selectListPage(page,queryWrapper);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-    @ApiOperation("开始作业")
-    @PostMapping("start")
-    @ResponseBody
-    public Object start(@ApiParam(value = "作业现场id",example = "0")@RequestParam Long projectId){
-        workSiteInfoService.start(projectId);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("完成作业")
-    @PostMapping("finish")
-    @ResponseBody
-    public Object finish(@ApiParam(value = "作业现场id", example = "0")@RequestParam Long projectId){
-        workSiteInfoService.finish(projectId);
-        return ResponseData.success();
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/WorkerController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/WorkerController.java
deleted file mode 100644
index 796f94c..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/WorkerController.java
+++ /dev/null
@@ -1,136 +0,0 @@
-package com.casic.missiles.modular.system.controller;
-
-
-import cn.hutool.core.util.ObjectUtil;
-import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.core.base.controller.BaseController;
-import com.casic.missiles.core.page.PageFactory;
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.DeviceDetailDTO;
-import com.casic.missiles.modular.system.entity.Device;
-import com.casic.missiles.modular.system.entity.Worker;
-import com.casic.missiles.modular.system.service.IWorkerService;
-import io.swagger.annotations.*;
-import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.*;
-
-import org.springframework.stereotype.Controller;
-
-import java.util.Date;
-import java.util.List;
-
-import static com.casic.missiles.model.response.ResponseData.DEFAULT_SUCCESS_MESSAGE;
-
-/**
- * <p>
- *  前端控制器
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@Controller
-@RequestMapping("/worker")
-@RequiredArgsConstructor
-@Api(tags = "人员管理接口")
-public class WorkerController extends BaseController {
-
-    private final IWorkerService workerService;
-
-    @ApiOperation("分页列表查询")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "name",value = "姓名", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "deptId",value = "所属部门", dataType = "Long", paramType = "query", example = "0"),
-            @ApiImplicitParam(name = "status",value = "当前状态（字典值）", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "startDate",value = "注册开始日期", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "endDate",value = "注册结束日期", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "workerType",value = "人员类型（字典值）", dataType = "String", paramType = "query")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = Worker.class),
-    })
-    @GetMapping("listPage")
-    @ResponseBody
-    public Object listPage(String name,Long deptId, String status,String startDate,String endDate,String workerType){
-        Page<Worker> page = PageFactory.defaultPage();
-        QueryWrapper<Worker> queryWrapper = new QueryWrapper<>();
-        if(StrUtil.isNotEmpty(name)){
-            queryWrapper.like("WORKER_NAME",name);
-        }
-        if(ObjectUtil.isNotEmpty(deptId)){
-            queryWrapper.eq("DEPT_ID",deptId);
-        }
-        if(StrUtil.isNotEmpty(workerType)){
-            queryWrapper.eq("WORKER_TYPE",workerType);
-        }
-        if(StrUtil.isNotEmpty(startDate)){
-            queryWrapper.ge("CREATE_TIME",startDate + " 00:00:00");
-        }
-        if(StrUtil.isNotEmpty(endDate)){
-            queryWrapper.le("CREATE_TIME",endDate + " 23:59:59");
-        }
-        if(StrUtil.isNotEmpty(status)){
-            queryWrapper.eq("`STATUS`",status);
-        }
-        page = workerService.selectListPage(page,queryWrapper);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-    @ApiOperation("新增人员")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "worker", value = "人员信息", dataType = "Worker", paramType = "body", required = true),
-            @ApiImplicitParam(name = "projectId", value = "项目ID(入场申请需要)", dataType = "Long", paramType = "query", example = "0")
-    })
-    @PostMapping("add")
-    @ResponseBody
-    public Object add(@ApiParam("worker")@RequestBody Worker worker,
-                      @RequestParam(required = false) Long projectId){
-        workerService.addWorker(worker,projectId);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("编辑人员")
-    @PostMapping("update")
-    @ResponseBody
-    public Object update(@RequestBody Worker worker){
-        workerService.updateById(worker);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("删除人员")
-    @PostMapping("delete")
-    @ResponseBody
-    public Object delete(@ApiParam("人员id列表")@RequestBody List<Long> workIds){
-        workerService.removeByIds(workIds);
-        return ResponseData.success();
-    }
-
-
-    @ApiOperation(value = "获取人脸图片",notes = "返回人脸图片url")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "cameraIp",value = "摄像头IP", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "cameraPort",value = "摄像头端口号", dataType = "String", paramType = "query"),
-    })
-    @GetMapping("/face/register")
-    @ResponseBody
-    public Object faceRegister(String cameraIp,String cameraPort){
-        return ResponseData.success(workerService.faceRegister(cameraIp, cameraPort));
-    }
-
-
-    @ApiOperation(value = "查询临时入场人员列表")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "projectId", value = "项目ID",required = true,dataType = "Long", paramType = "query", example = "0")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = Worker.class),
-    })
-    @GetMapping("/projectTempWorker")
-    @ResponseBody
-    public Object projectTempWorker(Long projectId){
-        return ResponseData.success(workerService.projectTempWorker(projectId));
-    }
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/AlarmTypeCountDTO.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/AlarmTypeCountDTO.java
deleted file mode 100644
index 1a165a1..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/AlarmTypeCountDTO.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.casic.missiles.modular.system.dto;
-
-import io.swagger.annotations.ApiModel;
-import lombok.Data;
-
-@ApiModel(value = "AlarmTypeCountDTO",description = "报警类型统计（首页）")
-@Data
-public class AlarmTypeCountDTO {
-
-    private String alarmType;
-    private String alarmTypeName;
-    private Integer alarmCount;
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/AlarmUpload.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/AlarmUpload.java
deleted file mode 100644
index 73d7799..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/AlarmUpload.java
+++ /dev/null
@@ -1,46 +0,0 @@
-package com.casic.missiles.modular.system.dto;
-
-import cn.hutool.core.util.StrUtil;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-@ApiModel(value = "AlarmUpload",description = "报警上传")
-@Data
-public class AlarmUpload {
-
-    @ApiModelProperty(value = "摄像头ip")
-    private String cameraIp;
-
-    @ApiModelProperty(value = "摄像头端口")
-    private String cameraPort;
-    @ApiModelProperty(value = "安全树甲烷设备ip")
-    private String gasIp;
-    @ApiModelProperty(value = "安全树甲烷设备端口")
-    private String gasPort;
-    @ApiModelProperty(value = "报警值")
-    private String alarmValue;
-    @ApiModelProperty(value = "报警时间")
-    private String alarmTime;
-    @ApiModelProperty(value = "报警类型")
-    private String alarmType;
-    @ApiModelProperty(value = "报警图片")
-    private String alarmImage;
-    @ApiModelProperty(value = "报警内容")
-    private String alarmContent;
-
-    @Override
-    public String toString() {
-        return "AlarmUpload{" +
-                "cameraIp='" + cameraIp + '\'' +
-                ", cameraPort='" + cameraPort + '\'' +
-                ", gasIp='" + gasIp + '\'' +
-                ", gasPort='" + gasPort + '\'' +
-                ", alarmValue='" + alarmValue + '\'' +
-                ", alarmTime='" + alarmTime + '\'' +
-                ", alarmType='" + alarmType + '\'' +
-                ", alarmImage='" + (StrUtil.isNotEmpty(alarmImage) ? alarmImage.substring(0,50) : "null") + '\'' +
-                ", alarmContent='" + alarmContent + '\'' +
-                '}';
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/DeviceDetailDTO.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/DeviceDetailDTO.java
deleted file mode 100644
index ea518d9..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/DeviceDetailDTO.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package com.casic.missiles.modular.system.dto;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.casic.missiles.modular.system.entity.Device;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-@ApiModel("DeviceDetailDTO")
-@Data
-public class DeviceDetailDTO extends Device {
-
-    @ApiModelProperty(value = "摄像头编号")
-    private String cameraCode;
-
-    @ApiModelProperty(value = "摄像头IP")
-    private String cameraIp;
-
-    @ApiModelProperty(value = "摄像头端口")
-    private String cameraPort;
-
-    @ApiModelProperty(value = "激甲编号")
-    private String gasCode;
-
-    @ApiModelProperty(value = "激甲IP")
-    private String gasIp;
-
-    @ApiModelProperty(value = "激甲端口")
-    private String gasPort;
-
-    @ApiModelProperty(value = "智能帽衬编号")
-    private String hatLiningCode;
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/WorkSiteDetailDTO.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/WorkSiteDetailDTO.java
deleted file mode 100644
index 29378ff..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/WorkSiteDetailDTO.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package com.casic.missiles.modular.system.dto;
-
-import com.casic.missiles.modular.system.entity.ProjectDevice;
-import com.casic.missiles.modular.system.entity.ProjectWorker;
-import com.casic.missiles.modular.system.entity.WorkSiteInfo;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.util.List;
-
-@Data
-@ApiModel("WorkSiteDetailDTO")
-public class WorkSiteDetailDTO extends WorkSiteInfo {
-
-    @ApiModelProperty(value = "安全树列表",dataType = "ProjectDevice")
-    private List<ProjectDevice> deviceList;
-
-    @ApiModelProperty(value = "人员列表",dataType = "ProjectWorker")
-    private List<ProjectWorker> workerList;
-
-
-
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/WorkerLocationDTO.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/WorkerLocationDTO.java
deleted file mode 100644
index 6fd7b24..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/WorkerLocationDTO.java
+++ /dev/null
@@ -1,68 +0,0 @@
-package com.casic.missiles.modular.system.dto;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-@ApiModel(value = "WorkerLocationDTO",description = "人员位置列表（首页）")
-@Data
-public class WorkerLocationDTO {
-
-    @ApiModelProperty("人员ID")
-    private Long workerId;
-
-    @ApiModelProperty("人员姓名")
-    private String workerName;
-
-    @ApiModelProperty("安全帽编号")
-    private String hatCode;
-
-    @ApiModelProperty("安全帽ID")
-    private Long hatId;
-
-    @ApiModelProperty("背心编号")
-    private String vastCode;
-
-    @ApiModelProperty("手环编号")
-    private String braceletCode;
-
-    @ApiModelProperty("位置")
-    private String location;
-
-    @ApiModelProperty("时间")
-    private String time;
-
-    @ApiModelProperty("经度")
-    private String lng;
-
-    @ApiModelProperty("纬度")
-    private String lat;
-
-    @ApiModelProperty("心率")
-    private String heartRate;
-
-    @ApiModelProperty("血氧")
-    private String bloodOxygen;
-
-    @ApiModelProperty("一氧化碳")
-    private String co;
-
-    @ApiModelProperty("甲烷")
-    private String gas;
-
-    @ApiModelProperty("硫化氢")
-    private String h2s;
-
-    @ApiModelProperty("氧气")
-    private String o2;
-
-    @ApiModelProperty("信号")
-    private String signal;
-
-    @ApiModelProperty("电量")
-    private String cell;
-
-    @ApiModelProperty("是否报警")
-    private boolean alarmFlag;
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Alarm.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Alarm.java
new file mode 100644
index 0000000..4d2b7ef
--- /dev/null
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Alarm.java
@@ -0,0 +1,103 @@
+package com.casic.missiles.modular.system.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import java.util.Date;
+
+/**
+ * <p>
+ * 报警记录表
+ * </p>
+ *
+ * @author zyj
+ * @since 2023-05-25
+ */
+@Data
+@TableName("bus_alarm")
+public class Alarm implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    @TableId(value = "ID",type = IdType.ASSIGN_ID)
+    private Long id;
+
+    /**
+     * 设备ID
+     */
+    @TableField("DEVICE_ID")
+    private Long deviceId;
+
+    /**
+     * 报警类型
+     */
+    @TableField("ALARM_TYPE")
+    private String alarmType;
+
+    /**
+     * 报警时间
+     */
+    @TableField("ALARM_TIME")
+    private Date alarmTime;
+
+    /**
+     * 报警状态
+     */
+    @TableField("ALARM_STATUS")
+    private String alarmStatus;
+
+    /**
+     * 报警位置
+     */
+    @TableField("ALARM_LOCATION")
+    private String alarmLocation;
+
+    /**
+     * 报警图片
+     */
+    @TableField("ALARM_IMAGE")
+    private String alarmImage;
+
+    /**
+     * 视频通道号
+     */
+    @TableField("CHANNEL_NO")
+    private Integer channelNo;
+
+    /**
+     * 报警内容
+     */
+    @TableField("ALARM_CONTENT")
+    private String alarmContent;
+
+    /**
+     * 消警时间
+     */
+    @TableField("CANCEL_TIME")
+    private Date cancelTime;
+
+
+    @Override
+    public String toString() {
+        return "Alarm{" +
+            "id=" + id +
+            ", deviceId=" + deviceId +
+            ", alarmType=" + alarmType +
+            ", alarmTime=" + alarmTime +
+            ", alarmStatus=" + alarmStatus +
+            ", alarmLocation=" + alarmLocation +
+            ", alarmImage=" + alarmImage +
+            ", channelNo=" + channelNo +
+            ", alarmContent=" + alarmContent +
+            ", cancelTime=" + cancelTime +
+        "}";
+    }
+}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusAlarm.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusAlarm.java
deleted file mode 100644
index efb4a23..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusAlarm.java
+++ /dev/null
@@ -1,159 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.alibaba.fastjson.annotation.JSONField;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.time.LocalDateTime;
-import java.util.Date;
-
-/**
- * <p>
- * 报警记录表
- * </p>
- *
- * @author zyj
- * @since 2023-05-16
- */
-@Data
-@ApiModel("Alarm")
-@TableName("br_bus_alarm")
-public class BusAlarm implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 项目ID
-     */
-    @ApiModelProperty(value = "项目ID")
-    @TableField("PROJECT_ID")
-    private Long projectId;
-
-    /**
-     * 设备ID
-     */
-    @ApiModelProperty(value = "设备ID")
-    @TableField("DEVICE_ID")
-    private Long deviceId;
-
-    /**
-     * 报警类型
-     */
-    @ApiModelProperty(value = "报警类型")
-    @TableField("ALARM_TYPE")
-    private String alarmType;
-
-    /**
-     * 报警状态
-     */
-    @ApiModelProperty(value = "报警状态")
-    @TableField("ALARM_STATUS")
-    private String alarmStatus;
-
-    /**
-     * 报警值
-     */
-    @ApiModelProperty(value = "报警值")
-    @TableField("ALARM_VALUE")
-    private String alarmValue;
-
-    /**
-     * 报警图片
-     */
-    @ApiModelProperty(value = "报警图片")
-    @TableField("ALARM_IMAGE")
-    private String alarmImage;
-
-    /**
-     * 报警内容
-     */
-    @ApiModelProperty(value = "报警内容")
-    @TableField("ALARM_CONTENT")
-    private String alarmContent;
-
-    /**
-     * 报警时间
-     */
-    @ApiModelProperty(value = "报警时间")
-    @TableField("ALARM_TIME")
-    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
-    private Date alarmTime;
-
-    /**
-     * 消警时间
-     */
-    @ApiModelProperty(value = "消警时间")
-    @TableField("CANCEL_TIME")
-    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
-    private Date cancelTime;
-
-    /**
-     * 报警位置经度
-     */
-    @ApiModelProperty(value = "报警位置经度")
-    @TableField("ALARM_LNG")
-    private String alarmLng;
-
-    /**
-     * 报警位置纬度
-     */
-    @ApiModelProperty(value = "报警位置纬度")
-    @TableField("ALARM_LAT")
-    private String alarmLat;
-
-    @ApiModelProperty("报警类型名称")
-    @TableField(exist = false)
-    private String alarmStatusName;
-    @ApiModelProperty("报警类型名称")
-    @TableField(exist = false)
-    private String alarmTypeName;
-    @ApiModelProperty("作业名称")
-    @TableField(exist = false)
-    private String workTitle;
-    @ApiModelProperty("所属道路")
-    @TableField(exist = false)
-    private String workRoad;
-    @ApiModelProperty("作业状态")
-    @TableField(exist = false)
-    private String projectState;
-    @ApiModelProperty("作业状态名称")
-    @TableField(exist = false)
-    private String projectStateName;
-    @ApiModelProperty("负责人姓名")
-    @TableField(exist = false)
-    private String workPersonName;
-    @ApiModelProperty("负责人联系方式")
-    @TableField(exist = false)
-    private String workPersonPhoneNumber;
-
-
-    @Override
-    public String toString() {
-        return "BusAlarm{" +
-                "id=" + id +
-                ", projectId=" + projectId +
-                ", deviceId=" + deviceId +
-                ", alarmType=" + alarmType +
-                ", alarmValue=" + alarmValue +
-                ", alarmStatus=" + alarmStatus +
-                ", alarmImage=" + alarmImage +
-                ", alarmContent=" + alarmContent +
-                ", alarmTime=" + alarmTime +
-                ", cancelTime=" + cancelTime +
-                ", alarmLng=" + alarmLng +
-                ", alarmLat=" + alarmLat +
-                "}";
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusEvent.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusEvent.java
deleted file mode 100644
index a0b7543..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusEvent.java
+++ /dev/null
@@ -1,100 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.time.LocalDateTime;
-import java.util.Date;
-import java.util.List;
-
-/**
- * <p>
- * 事件表
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@TableName("br_bus_event")
-@Data
-@ApiModel("BusEvent")
-public class BusEvent implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @ApiModelProperty("事件ID")
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 事件标题
-     */
-    @ApiModelProperty("事件名称")
-    @TableField("EVENT_TITLE")
-    private String eventTitle;
-
-    /**
-     * 上报人员
-     */
-    @ApiModelProperty("上报人员")
-    @TableField("UPLOAD_NAME")
-    private String uploadName;
-
-    /**
-     * 联系方式
-     */
-    @ApiModelProperty("联系方式")
-    @TableField("PHONE_NUMBER")
-    private String phoneNumber;
-
-    /**
-     * 事件描述
-     */
-    @ApiModelProperty("事件描述")
-    @TableField("EVENT_DESCRIPTION")
-    private String eventDescription;
-
-    @ApiModelProperty("经度")
-    @TableField("LNG")
-    private String lng;
-
-    @ApiModelProperty("纬度")
-    @TableField("LAT")
-    private String lat;
-
-    /**
-     * 事件上传时间
-     */
-    @ApiModelProperty("事件上传时间")
-    @TableField("CREATE_TIME")
-    private Date createTime;
-
-    @ApiModelProperty("事件照片")
-    @TableField(exist = false)
-    private List<BusEventImage> imageList;
-
-
-
-    @Override
-    public String toString() {
-        return "BusEvent{" +
-            "id=" + id +
-            ", eventTitle=" + eventTitle +
-            ", uploadName=" + uploadName +
-            ", phoneNumber=" + phoneNumber +
-            ", eventDescription=" + eventDescription +
-            ", lng=" + lng +
-            ", lat=" + lat +
-            ", createTime=" + createTime +
-        "}";
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusEventImage.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusEventImage.java
deleted file mode 100644
index 1e75245..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusEventImage.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-
-/**
- * <p>
- * 事件图片表
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@TableName("br_bus_event_image")
-@Data
-@ApiModel("BusEventImage")
-public class BusEventImage implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 事件ID
-     */
-    @TableField("EVENT_ID")
-    private Long eventId;
-
-    /**
-     * 报警图片
-     */
-    @TableField("IMAGE")
-    @ApiModelProperty("图片url")
-    private String image;
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Device.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Device.java
index df89c70..ea7db5f 100644
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Device.java
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Device.java
@@ -1,30 +1,23 @@
 package com.casic.missiles.modular.system.entity;
 
-import com.alibaba.fastjson.annotation.JSONField;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.casic.missiles.core.base.json.DateDeserializer;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
-import java.util.Date;
 
 /**
  * <p>
- * 
+ * 设备记录表
  * </p>
  *
  * @author zyj
- * @since 2023-04-14
+ * @since 2023-05-25
  */
-@ApiModel("Device")
-@TableName("br_device")
 @Data
+@TableName("bus_device")
 public class Device implements Serializable {
 
     private static final long serialVersionUID = 1L;
@@ -32,82 +25,86 @@
     /**
      * 主键
      */
-    @ApiModelProperty(value = "设备ID")
     @TableId(value = "ID",type = IdType.ASSIGN_ID)
     private Long id;
 
     /**
-     * 设备编号
+     * 设备名称
      */
-    @ApiModelProperty(value = "设备编号")
-    @TableField("DEVICE_CODE")
-    private String deviceCode;
+    @TableField("DEVICE_NAME")
+    private String deviceName;
 
     /**
-     * 设备类型
+     * IP
      */
-    @ApiModelProperty(value = "设备类型")
-    @TableField("DEVICE_TYPE")
-    private String deviceType;
+    @TableField("IP")
+    private String ip;
 
     /**
-     * 设备批次
+     * 端口
      */
-    @ApiModelProperty(value = "设备批次")
-    @TableField("DEVICE_BATCH")
-    private String deviceBatch;
+    @TableField("PORT")
+    private String port;
 
     /**
-     * 厂家
+     * 用户名
      */
-    @ApiModelProperty(value = "厂家")
-    @TableField("MANUFACTURER")
-    private String manufacturer;
+    @TableField("USER_NAME")
+    private String userName;
 
     /**
-     * 是否供电
+     * 密码
      */
-    @ApiModelProperty(value = "是否供电")
-    @TableField("IS_POWER_SUPPLY")
-    private String isPowerSupply;
+    @TableField("PASSWORD")
+    private String password;
 
     /**
-     * 创建时间
+     * 连接类型
      */
-    @ApiModelProperty(value = "创建时间",dataType = "Date")
-    @TableField("CREATE_TIME")
-    private Date createTime;
+    @TableField("CONNECT_TYPE")
+    private String connectType;
 
-    @ApiModelProperty(value = "设备类型名称")
-    @TableField(exist = false)
-    private String deviceTypeName;
+    /**
+     * 位置
+     */
+    @TableField("LOCATION")
 
-    @ApiModelProperty(value = "是否供电名称")
-    @TableField(exist = false)
-    private String isPowerSupplyName;
+    private String location;
 
-    @ApiModelProperty(value = "注册时间",dataType = "String")
-    @TableField(exist = false)
-    private String registerTime;
+    /**
+     * 设备状态
+     */
+    @TableField("STATUS")
 
-    @ApiModelProperty(value = "当前状态")
-    @TableField(exist = false)
     private String status;
 
-    @ApiModelProperty(value = "当前状态名称")
-    @TableField(exist = false)
-    private String statusName;
+    /**
+     * 报警分组
+     */
+    @TableField("ALARM_GROUP")
+
+    private Long alarmGroup;
+
+    /**
+     * 视频通道数(预留)
+     */
+    @TableField("CHANNEL_NUM")
+    private Integer channelNum;
 
     @Override
     public String toString() {
         return "Device{" +
             "id=" + id +
-            ", deviceCode=" + deviceCode +
-            ", deviceType=" + deviceType +
-            ", deviceBatch=" + deviceBatch +
-            ", manufacturer=" + manufacturer +
-            ", isPowerSupply=" + isPowerSupply +
-            ", createTime=" + createTime +
+            ", deviceName=" + deviceName +
+            ", ip=" + ip +
+            ", port=" + port +
+            ", userName=" + userName +
+            ", password=" + password +
+            ", connectType=" + connectType +
+            ", location=" + location +
+            ", status=" + status +
+            ", alarmGroup=" + alarmGroup +
+            ", channelNum=" + channelNum +
         "}";
     }
 }
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/DeviceExt.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/DeviceExt.java
deleted file mode 100644
index 5ee7015..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/DeviceExt.java
+++ /dev/null
@@ -1,99 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-
-/**
- * <p>
- * 设备扩展信息表（安全树）
- * </p>
- *
- * @author zyj
- * @since 2023-04-27
- */
-@Data
-@TableName("br_device_ext")
-public class DeviceExt implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 设备ID
-     */
-    @TableField("DEVICE_ID")
-    private Long deviceId;
-
-    /**
-     * 摄像头编号
-     */
-    @TableField("CAMERA_CODE")
-    private String cameraCode;
-
-    /**
-     * 摄像头IP
-     */
-    @TableField("CAMERA_IP")
-    private String cameraIp;
-
-    /**
-     * 摄像头端口
-     */
-    @TableField("CAMERA_PORT")
-    private String cameraPort;
-
-    /**
-     * 激甲编号
-     */
-    @TableField("GAS_CODE")
-    private String gasCode;
-
-    /**
-     * 激甲IP
-     */
-    @TableField("GAS_IP")
-    private String gasIp;
-
-    /**
-     * 激甲端口
-     */
-    @TableField("GAS_PORT")
-    private String gasPort;
-
-    /**
-     * 甲烷报警阈值
-     */
-    @TableField("GAS_THRESHOLD")
-    private String gasThreshold;
-
-    @TableField(value = "HAT_LINING_CODE")
-    private String hatLiningCode;
-
-
-    @Override
-    public String toString() {
-        return "DeviceExt{" +
-            "id=" + id +
-            ", deviceId=" + deviceId +
-            ", cameraCode=" + cameraCode +
-            ", cameraIp=" + cameraIp +
-            ", cameraPort=" + cameraPort +
-            ", gasCode=" + gasCode +
-            ", gasIp=" + gasIp +
-            ", gasPort=" + gasPort +
-            ", gasThreshold=" + gasThreshold +
-            ", hatLiningCode=" + hatLiningCode +
-        "}";
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/ProjectDevice.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/ProjectDevice.java
deleted file mode 100644
index c4f3472..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/ProjectDevice.java
+++ /dev/null
@@ -1,62 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-
-/**
- * <p>
- * 
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@Data
-@ApiModel("ProjectDevice")
-@TableName("br_project_device")
-public class ProjectDevice implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 作业现场ID
-     */
-    @TableField("PROJECT_ID")
-    private Long projectId;
-
-    /**
-     * 设备ID
-     */
-    @TableField("DEVICE_ID")
-    @ApiModelProperty("设备ID（新增编辑时传）")
-    private Long deviceId;
-
-    /**
-     * 设备编号
-     */
-    @TableField(exist = false)
-    @ApiModelProperty("设备编号（详情中展示，新增编辑不用传）")
-    private String deviceCode;
-
-    @Override
-    public String toString() {
-        return "ProjectDevice{" +
-            "id=" + id +
-            ", projectId=" + projectId +
-            ", deviceId=" + deviceId +
-        "}";
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/ProjectWorker.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/ProjectWorker.java
deleted file mode 100644
index 10b23c4..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/ProjectWorker.java
+++ /dev/null
@@ -1,104 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import java.io.Serializable;
-
-/**
- * <p>
- * 
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@ApiModel("ProjectWorker")
-@TableName("br_project_worker")
-@Data
-@NoArgsConstructor
-@AllArgsConstructor
-public class ProjectWorker implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 作业现场ID
-     */
-    @TableField("PROJECT_ID")
-    private Long projectId;
-
-    /**
-     * 人员ID
-     */
-    @ApiModelProperty("人员ID")
-    @TableField("WORKER_ID")
-    private Long workerId;
-
-    /**
-     * 安全帽编号
-     */
-    @ApiModelProperty("安全帽编号")
-    @TableField("HAT_CODE")
-    private String hatCode;
-
-    /**
-     * 背心编号
-     */
-    @ApiModelProperty("背心编号")
-    @TableField("VAST_CODE")
-    private String vastCode;
-
-    /**
-     * 手环编号
-     */
-    @ApiModelProperty("手环编号")
-    @TableField("BRACELET_CODE")
-    private String braceletCode;
-
-    @ApiModelProperty("人员姓名（详情中展示，新增编辑不用传）")
-    @TableField(exist = false)
-    private String workerName;
-
-    @ApiModelProperty("人员部门ID（详情中展示，新增编辑不用传）")
-    @TableField(exist = false)
-    private String workerDeptId;
-
-    @ApiModelProperty("人员部门名称（详情中展示，新增编辑不用传）")
-    @TableField(exist = false)
-    private String workerDeptName;
-
-    @ApiModelProperty("人员联系方式（详情中展示，新增编辑不用传）")
-    @TableField(exist = false)
-    private String workerPhoneNumber;
-
-    public ProjectWorker(Long projectId, Long workerId) {
-        this.projectId = projectId;
-        this.workerId = workerId;
-    }
-
-    @Override
-    public String toString() {
-        return "ProjectWorker{" +
-            "id=" + id +
-            ", projectId=" + projectId +
-            ", workerId=" + workerId +
-            ", hatCode=" + hatCode +
-            ", vastCode=" + vastCode +
-            ", braceletCode=" + braceletCode +
-        "}";
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/WorkSiteInfo.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/WorkSiteInfo.java
deleted file mode 100644
index fa6f41d..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/WorkSiteInfo.java
+++ /dev/null
@@ -1,130 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.alibaba.fastjson.annotation.JSONField;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.time.LocalDateTime;
-import java.util.Date;
-
-/**
- * <p>
- * 作业现场表
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@ApiModel("WorkSiteInfo")
-@TableName("br_work_site_info")
-@Data
-public class WorkSiteInfo implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @ApiModelProperty("作业现场ID")
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 作业名称
-     */
-    @ApiModelProperty("作业名称")
-    @TableField("WORK_TITLE")
-    private String workTitle;
-
-    /**
-     * 责任人
-     */
-    @ApiModelProperty("责任人（人员ID）")
-    @TableField("WORK_PERSON")
-    private Long workPerson;
-
-    /**
-     * 作业描述
-     */
-    @ApiModelProperty("作业描述")
-    @TableField("WORK_SITE_DESC")
-    private String workSiteDesc;
-
-    /**
-     * 作业状态
-     */
-    @ApiModelProperty("作业状态")
-    @TableField("PROJECT_STATE")
-    private String projectState;
-
-    /**
-     * 所属道路
-     */
-    @ApiModelProperty("所属道路")
-    @TableField("WORK_ROAD")
-    private String workRoad;
-
-    @TableField("IMAGE_URL")
-    private String imageUrl;
-
-    @TableField("CREATE_TIME")
-    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
-    private Date createTime;
-    @TableField("UPDATE_TIME")
-    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
-    private Date updateTime;
-
-    @ApiModelProperty("开始时间")
-    @TableField("START_TIME")
-    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
-    private Date startTime;
-
-    @ApiModelProperty("结束时间")
-    @TableField("FINISH_TIME")
-    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
-    private Date finishTime;
-
-    @ApiModelProperty("负责人姓名（详情中使用，新增编辑不用传）")
-    @TableField(exist = false)
-    private String workPersonName;
-
-    @ApiModelProperty("负责人联系方式（详情中使用，新增编辑不用传）")
-    @TableField(exist = false)
-    private String workPersonPhoneNumber;
-
-    @ApiModelProperty("负责人所属部门ID（详情中使用，新增编辑不用传）")
-    @TableField(exist = false)
-    private Long workPersonDeptId;
-
-    @ApiModelProperty("负责人所属部门名称（详情中使用，新增编辑不用传）")
-    @TableField(exist = false)
-    private String workPersonDeptName;
-
-    @ApiModelProperty(value = "注册时间",dataType = "String")
-    @TableField(exist = false)
-    private String registerTime;
-
-    @ApiModelProperty("作业状态名称")
-    @TableField(exist = false)
-    private String projectStateName;
-
-    @Override
-    public String toString() {
-        return "WorkSiteInfo{" +
-            "id=" + id +
-            ", workTitle=" + workTitle +
-            ", workPerson=" + workPerson +
-            ", workSiteDesc=" + workSiteDesc +
-            ", projectState=" + projectState +
-            ", imageUrl=" + imageUrl +
-            ", updateTime=" + updateTime +
-            ", workRoad=" + workRoad +
-        "}";
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Worker.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Worker.java
deleted file mode 100644
index 28a4daa..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Worker.java
+++ /dev/null
@@ -1,147 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.time.LocalDateTime;
-import java.util.Date;
-
-/**
- * <p>
- * 
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@ApiModel("Worker")
-@TableName("br_worker")
-@Data
-public class Worker implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @ApiModelProperty(value = "人员ID")
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 姓名
-     */
-    @ApiModelProperty(value = "姓名")
-    @TableField("WORKER_NAME")
-    private String workerName;
-
-    /**
-     * 性别
-     */
-    @ApiModelProperty(value = "性别")
-    @TableField("GENDER")
-    private String gender;
-
-    /**
-     * 所属部门
-     */
-    @ApiModelProperty(value = "所属部门(人员管理)")
-    @TableField("DEPT_ID")
-    private Long deptId;
-
-    /**
-     * 所属单位
-     */
-    @ApiModelProperty(value = "所属单位(入场申请中使用)")
-    @TableField("OWNER_SHIP")
-    private String ownerShip;
-
-    /**
-     * 联系方式
-     */
-    @ApiModelProperty(value = "联系方式")
-    @TableField("PHONE_NUMBER")
-    private String phoneNumber;
-
-    /**
-     * 证件号
-     */
-    @ApiModelProperty(value = "证件号")
-    @TableField("ID_CARD_NUMBER")
-    private String idCardNumber;
-
-    /**
-     * 入场原因
-     */
-    @ApiModelProperty(value = "入场原因（入场申请中使用）")
-    @TableField("ENTER_REASON")
-    private String enterReason;
-
-    /**
-     * 入场人脸照片
-     */
-    @ApiModelProperty(value = "人脸照片（照片路径）")
-    @TableField("WORKER_AVATAR")
-    private String workerAvatar;
-
-    /**
-     * 申请入场时间
-     */
-    @ApiModelProperty(value = "注册时间/申请入场时间")
-    @TableField("CREATE_TIME")
-    private Date createTime;
-
-    /**
-     * 人员类型
-     */
-    @ApiModelProperty(value = "人员类型（区分人员管理和入场申请）")
-    @TableField("WORKER_TYPE")
-    private String workerType;
-
-    @ApiModelProperty(value = "性别名称")
-    @TableField(exist = false)
-    private String genderName;
-
-    @ApiModelProperty(value = "部门名称")
-    @TableField(exist = false)
-    private String deptName;
-
-    @ApiModelProperty(value = "注册时间",dataType = "String")
-    @TableField(exist = false)
-    private String registerTime;
-
-    @ApiModelProperty(value = "当前状态")
-    @TableField(exist = false)
-    private String status;
-
-    @ApiModelProperty(value = "当前状态名称")
-    @TableField(exist = false)
-    private String statusName;
-
-    @ApiModelProperty(value = "是否注册(0未注册；1已注册)",allowableValues = "0,1")
-    @TableField(exist = false)
-    private String isRegister;
-
-    @Override
-    public String toString() {
-        return "Worker{" +
-            "id=" + id +
-            ", workerName=" + workerName +
-            ", gender=" + gender +
-            ", deptId=" + deptId +
-            ", ownerShip=" + ownerShip +
-            ", phoneNumber=" + phoneNumber +
-            ", idCardNumber=" + idCardNumber +
-            ", enterReason=" + enterReason +
-            ", workerAvatar=" + workerAvatar +
-            ", createTime=" + createTime +
-            ", workerType=" + workerType +
-        "}";
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/AlarmMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/AlarmMapper.java
new file mode 100644
index 0000000..ea4c8be
--- /dev/null
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/AlarmMapper.java
@@ -0,0 +1,16 @@
+package com.casic.missiles.modular.system.mapper;
+
+import com.casic.missiles.modular.system.entity.Alarm;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 报警记录表 Mapper 接口
+ * </p>
+ *
+ * @author zyj
+ * @since 2023-05-25
+ */
+public interface AlarmMapper extends BaseMapper<Alarm> {
+
+}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/BusAlarmMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/BusAlarmMapper.java
deleted file mode 100644
index 9801742..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/BusAlarmMapper.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package com.casic.missiles.modular.system.mapper;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.modular.system.dto.AlarmTypeCountDTO;
-import com.casic.missiles.modular.system.entity.BusAlarm;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * <p>
- * 报警记录表 Mapper 接口
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface BusAlarmMapper extends BaseMapper<BusAlarm> {
-
-    Page<BusAlarm> listPage(Page<BusAlarm> page,@Param("ew")  QueryWrapper<BusAlarm> queryWrapper);
-
-    void cancelAlarm(@Param("deviceId")Long deviceId,@Param("alarmType") String alarmType);
-
-    List<AlarmTypeCountDTO> alarmCount(@Param("projectId")Long projectId, @Param("alarmStatus")String alarmStatus);
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/BusEventImageMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/BusEventImageMapper.java
deleted file mode 100644
index 9590b7d..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/BusEventImageMapper.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.casic.missiles.modular.system.mapper;
-
-import com.casic.missiles.modular.system.entity.BusEventImage;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * <p>
- * 事件图片表 Mapper 接口
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface BusEventImageMapper extends BaseMapper<BusEventImage> {
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/BusEventMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/BusEventMapper.java
deleted file mode 100644
index 3c85edf..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/BusEventMapper.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.casic.missiles.modular.system.mapper;
-
-import com.casic.missiles.modular.system.entity.BusEvent;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * <p>
- * 事件表 Mapper 接口
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface BusEventMapper extends BaseMapper<BusEvent> {
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/DeviceExtMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/DeviceExtMapper.java
deleted file mode 100644
index 4ca9212..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/DeviceExtMapper.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.casic.missiles.modular.system.mapper;
-
-import com.casic.missiles.modular.system.entity.DeviceExt;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * <p>
- * 设备扩展信息表（安全树） Mapper 接口
- * </p>
- *
- * @author zyj
- * @since 2023-04-27
- */
-public interface DeviceExtMapper extends BaseMapper<DeviceExt> {
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/DeviceMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/DeviceMapper.java
index 444c0c5..3d0bb02 100644
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/DeviceMapper.java
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/DeviceMapper.java
@@ -1,30 +1,16 @@
 package com.casic.missiles.modular.system.mapper;
 
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.modular.system.dto.DeviceDetailDTO;
-import com.casic.missiles.modular.system.dto.HelmetInfoDTO;
 import com.casic.missiles.modular.system.entity.Device;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
 
 /**
  * <p>
- *  Mapper 接口
+ * 设备记录表 Mapper 接口
  * </p>
  *
  * @author zyj
- * @since 2023-04-14
+ * @since 2023-05-25
  */
-@Mapper
 public interface DeviceMapper extends BaseMapper<Device> {
 
-    Page<DeviceDetailDTO> listDetailPage(Page<DeviceDetailDTO> page,@Param("ew") QueryWrapper<DeviceDetailDTO> ew);
-
-     List<Long> selectProjectDevice(@Param("projectId") Long projectId);
-
-    List<HelmetInfoDTO> selectHelmetList(@Param("deviceType")String deviceType);
 }
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/ProjectDeviceMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/ProjectDeviceMapper.java
deleted file mode 100644
index 1d0c14e..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/ProjectDeviceMapper.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package com.casic.missiles.modular.system.mapper;
-
-import com.casic.missiles.modular.system.dto.DeviceLocationDTO;
-import com.casic.missiles.modular.system.entity.ProjectDevice;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * <p>
- *  Mapper 接口
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface ProjectDeviceMapper extends BaseMapper<ProjectDevice> {
-     List<ProjectDevice> selectDetailByProjectId(@Param("projectId") Long projectId);
-
-     List<DeviceLocationDTO> selectDeviceLocationList(@Param("projectId") Long projectId);
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/ProjectWorkerMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/ProjectWorkerMapper.java
deleted file mode 100644
index 58583d1..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/ProjectWorkerMapper.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package com.casic.missiles.modular.system.mapper;
-
-import com.casic.missiles.modular.system.dto.WorkerLocationDTO;
-import com.casic.missiles.modular.system.entity.ProjectWorker;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * <p>
- *  Mapper 接口
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface ProjectWorkerMapper extends BaseMapper<ProjectWorker> {
-
-    List<ProjectWorker> selectDetailByProjectId(@Param("projectId") Long projectId,
-                                                @Param("workerType")String workerType);
-
-    List<WorkerLocationDTO> selectWorkerLocationList(@Param("projectId") Long projectId,
-                                                     @Param("workerType")String workerType);
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/WorkSiteInfoMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/WorkSiteInfoMapper.java
deleted file mode 100644
index a4934d2..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/WorkSiteInfoMapper.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.casic.missiles.modular.system.mapper;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.modular.system.entity.WorkSiteInfo;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Param;
-
-/**
- * <p>
- * 作业现场表 Mapper 接口
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface WorkSiteInfoMapper extends BaseMapper<WorkSiteInfo> {
-
-    Page<WorkSiteInfo> selectListPage(Page<WorkSiteInfo> page,@Param("ew") QueryWrapper<WorkSiteInfo> ew);
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/WorkerMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/WorkerMapper.java
deleted file mode 100644
index 258fb12..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/WorkerMapper.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package com.casic.missiles.modular.system.mapper;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.modular.system.dto.DeviceDetailDTO;
-import com.casic.missiles.modular.system.entity.Worker;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * <p>
- *  Mapper 接口
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface WorkerMapper extends BaseMapper<Worker> {
-
-
-    Page<Worker> selectListPage(Page<Worker> page, @Param("ew") QueryWrapper<Worker> ew);
-
-    List<String> selectWorkerAvatars(@Param("projectId")Long projectId);
-
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/AlarmMapper.xml b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/AlarmMapper.xml
new file mode 100644
index 0000000..25cb4ab
--- /dev/null
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/AlarmMapper.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.modular.system.mapper.AlarmMapper">
+
+</mapper>
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/BusAlarmMapper.xml b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/BusAlarmMapper.xml
deleted file mode 100644
index 595088a..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/BusAlarmMapper.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.casic.missiles.modular.system.mapper.BusAlarmMapper">
-
-    <select id="listPage" resultType="com.casic.missiles.modular.system.entity.BusAlarm">
-        SELECT
-            alarm.ID as id,
-            alarm.DEVICE_ID as deviceId,
-            alarm.PROJECT_ID as projectId,
-            alarm.ALARM_TYPE as alarmType,
-            alarm.ALARM_VALUE as alarmValue,
-            alarm.ALARM_STATUS as alarmStatus,
-            alarm.ALARM_IMAGE AS alarmImage,
-            alarm.ALARM_CONTENT as alarmContent,
-            alarm.ALARM_TIME as alarmTime,
-            alarm.CANCEL_TIME as cancelTime,
-            alarm.ALARM_LNG as alarmLng,
-            alarm.ALARM_LAT as alarmLat,
-            p.WORK_TITLE as workTitle,
-            p.WORK_ROAD as workRoad,
-            p.PROJECT_STATE as projectState,
-            w.WORKER_NAME as workPersonName,
-            w.PHONE_NUMBER as workPersonPhoneNumber
-        FROM
-            `br_bus_alarm` alarm
-                LEFT JOIN br_work_site_info p on alarm.PROJECT_ID = p.ID
-                LEFT JOIN br_worker w on p.WORK_PERSON = w.ID
-        <where>
-            <if test="ew != null">
-                ${ew.sqlSegment}
-            </if>
-        </where>
-    </select>
-
-    <select id="cancelAlarm">
-        update br_bus_alarm
-        set ALARM_STATUS = '1'
-        where DEVICE_ID = #{deviceId}
-          and ALARM_TYPE = #{alarmType}
-          and ALARM_STATUS = '0'
-    </select>
-
-    <select id="alarmCount" resultType="com.casic.missiles.modular.system.dto.AlarmTypeCountDTO">
-        SELECT
-            ALARM_TYPE as alarmType,
-            count(*) as alarmCount
-        from br_bus_alarm
-        <where>
-            <if test="projectId != null and projectId !=''">
-                and PROJECT_ID = #{projectId}
-            </if>
-            <if test="alarmStatus != null and alarmStatus !=''">
-                and ALARM_STATUS = #{alarmStatus}
-            </if>
-        </where>
-        group by ALARM_TYPE
-    </select>
-</mapper>
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/BusEventImageMapper.xml b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/BusEventImageMapper.xml
deleted file mode 100644
index fbc3db3..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/BusEventImageMapper.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.casic.missiles.modular.system.mapper.BusEventImageMapper">
-
-</mapper>
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/BusEventMapper.xml b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/BusEventMapper.xml
deleted file mode 100644
index 627d573..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/BusEventMapper.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.casic.missiles.modular.system.mapper.BusEventMapper">
-
-</mapper>
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/DeviceExtMapper.xml b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/DeviceExtMapper.xml
deleted file mode 100644
index 5321d1c..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/DeviceExtMapper.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.casic.missiles.modular.system.mapper.DeviceExtMapper">
-
-</mapper>
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/DeviceMapper.xml b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/DeviceMapper.xml
index 94262e1..88e7d01 100644
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/DeviceMapper.xml
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/DeviceMapper.xml
@@ -2,96 +2,4 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.casic.missiles.modular.system.mapper.DeviceMapper">
 
-    <select id="listDetailPage" resultType="com.casic.missiles.modular.system.dto.DeviceDetailDTO">
-        select
-        br_device.ID as id,
-        DEVICE_CODE as deviceCode,
-        DEVICE_TYPE as deviceType,
-        DEVICE_BATCH as deviceBatch,
-        MANUFACTURER as manufacturer,
-        IS_POWER_SUPPLY as isPowerSupply,
-        CREATE_TIME as createTime,
-        CAMERA_CODE as cameraCode,
-        CAMERA_IP as cameraIp,
-        CAMERA_PORT as cameraPort,
-        GAS_CODE as gasCode,
-        GAS_IP as gasIp,
-        GAS_PORT as gasPort,
-        HAT_LINING_CODE as hatLiningCode
-        from br_device
-        left join br_device_ext ext on ext.DEVICE_ID = br_device.ID
-        <where>
-            <if test="ew != null">
-                ${ew.sqlSegment}
-            </if>
-        </where>
-    </select>
-
-    <select id="selectProjectDevice" resultType="java.lang.Long">
-        with device_info as (
-            (SELECT
-            d.DEVICE_ID as DEVICE_ID,
-            d.PROJECT_ID as PROJECT_ID,
-            p.PROJECT_STATE as PROJECT_STATE
-            from br_project_device d
-            LEFT JOIN br_work_site_info p on p.ID = d.PROJECT_ID)
-
-            UNION ALL
-
-            (SELECT
-            d1.ID as DEVICE_ID,
-            w1.ID as PROJECT_ID,
-            w1.PROJECT_STATE as PROJECT_STATE
-            FROM br_project_worker pw1
-            LEFT JOIN br_device d1 on pw1.BRACELET_CODE = d1.DEVICE_CODE
-            LEFT JOIN br_work_site_info w1 on pw1.PROJECT_ID = w1.ID)
-
-            UNION ALL
-
-            (SELECT
-            d1.ID as DEVICE_ID,
-            w1.ID as PROJECT_ID,
-            w1.PROJECT_STATE as PROJECT_STATE
-            FROM br_project_worker pw1
-            LEFT JOIN br_device d1 on pw1.HAT_CODE = d1.DEVICE_CODE
-            LEFT JOIN br_work_site_info w1 on pw1.PROJECT_ID = w1.ID)
-
-
-            UNION ALL
-
-            (SELECT
-            d1.ID as DEVICE_ID,
-            w1.ID as PROJECT_ID,
-            w1.PROJECT_STATE as PROJECT_STATE
-            FROM br_project_worker pw1
-            LEFT JOIN br_device d1 on pw1.VAST_CODE = d1.DEVICE_CODE
-            LEFT JOIN br_work_site_info w1 on pw1.PROJECT_ID = w1.ID))
-
-        select DISTINCT DEVICE_ID from device_info
-        <where>
-            DEVICE_ID is not null
-            <choose>
-                <when test="projectId != null and projectId !=''">
-                    and PROJECT_ID = #{projectId}
-                </when>
-                <otherwise>
-                    AND PROJECT_STATE != '3'
-                </otherwise>
-            </choose>
-        </where>
-    </select>
-
-    <select id="selectHelmetList" resultType="com.casic.missiles.modular.system.dto.HelmetInfoDTO">
-        SELECT
-            a.ID AS deviceId,
-            a.DEVICE_CODE AS hatCode,
-            b.HAT_LINING_CODE AS hatLiningCode
-        FROM
-            br_device a
-                LEFT JOIN br_device_ext b ON a.ID = b.DEVICE_ID
-        WHERE
-            a.DEVICE_TYPE = #{deviceType}
-          AND a.DEVICE_CODE IS NOT NULL
-          AND b.HAT_LINING_CODE IS NOT NULL
-    </select>
 </mapper>
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/ProjectDeviceMapper.xml b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/ProjectDeviceMapper.xml
deleted file mode 100644
index c6d1c24..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/ProjectDeviceMapper.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.casic.missiles.modular.system.mapper.ProjectDeviceMapper">
-
-    <select id="selectDetailByProjectId" resultType="com.casic.missiles.modular.system.entity.ProjectDevice">
-        SELECT
-            pd.ID as id,
-            pd.PROJECT_ID as projectId,
-            pd.DEVICE_ID as deviceId,
-            d.DEVICE_CODE as deviceCode
-        from br_project_device pd
-        LEFT JOIN br_device d on pd.DEVICE_ID = d.ID
-        <where>
-            pd.PROJECT_ID = #{projectId}
-        </where>
-    </select>
-
-    <select id="selectDeviceLocationList" resultType="com.casic.missiles.modular.system.dto.DeviceLocationDTO">
-        SELECT
-        d.ID as deviceId,
-        d.DEVICE_TYPE as deviceType,
-        d.DEVICE_CODE as deviceCode,
-        if(EXISTS(select ID from br_bus_alarm WHERE DEVICE_ID = d.ID and ALARM_STATUS = '0'),true,false) as alarmFlag
-        FROM br_project_device pd, br_device d
-        where pd.DEVICE_ID = d.ID
-        and pd.PROJECT_ID = #{projectId}
-    </select>
-
-</mapper>

diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/AlarmController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/AlarmController.java
new file mode 100644
index 0000000..1795cf1
--- /dev/null
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/AlarmController.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.modular.system.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.stereotype.Controller;
+
+/**
+ * <p>
+ * 报警记录表 前端控制器
+ * </p>
+ *
+ * @author zyj
+ * @since 2023-05-25
+ */
+@Controller
+@RequestMapping("/system/alarm")
+public class AlarmController {
+
+}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusAlarmController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusAlarmController.java
deleted file mode 100644
index 1f82ebb..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusAlarmController.java
+++ /dev/null
@@ -1,102 +0,0 @@
-package com.casic.missiles.modular.system.controller;
-
-
-import cn.hutool.core.util.ObjectUtil;
-import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.core.base.controller.BaseController;
-import com.casic.missiles.core.page.PageFactory;
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.AlarmUpload;
-import com.casic.missiles.modular.system.dto.DeviceDetailDTO;
-import com.casic.missiles.modular.system.entity.BusAlarm;
-import com.casic.missiles.modular.system.service.IBusAlarmService;
-import io.swagger.annotations.*;
-import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.*;
-
-import org.springframework.stereotype.Controller;
-
-import static com.casic.missiles.model.response.ResponseData.DEFAULT_SUCCESS_MESSAGE;
-import static com.casic.missiles.modular.system.consts.AlarmConst.ALARM_STATUS_MANUAL_CANCEL;
-
-/**
- * <p>
- * 报警记录表 前端控制器
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@Api(tags = "报警管理接口")
-@Controller
-@RequestMapping("/alarm")
-@RequiredArgsConstructor
-public class BusAlarmController extends BaseController {
-
-    private final IBusAlarmService alarmService;
-
-    @ApiOperation("报警上报接口")
-    @PostMapping("/upload")
-    @ResponseBody
-    public Object upload(@RequestBody AlarmUpload alarmUpload){
-        alarmService.alarmUpload(alarmUpload);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("报警列表分页查询")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "workTitle", value = "作业名称",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "projectId", value = "作业ID",dataType = "Long", paramType = "query",example = "0"),
-            @ApiImplicitParam(name = "alarmStatus", value = "报警状态",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "projectState", value = "作业状态",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "alarmType", value = "报警类型",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "alarmStartTime", value = "报警开始时间",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "alarmEndTime", value = "报警结束时间",dataType = "String", paramType = "query")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = BusAlarm.class),
-    })
-    @GetMapping("/listPage")
-    @ResponseBody
-    public Object listPage(String workTitle,Long projectId,String alarmStatus,String projectState,String alarmType,String alarmStartTime,String alarmEndTime){
-        Page<BusAlarm> page = PageFactory.defaultPage();
-        QueryWrapper<BusAlarm> queryWrapper = new QueryWrapper<>();
-        if(StrUtil.isNotEmpty(workTitle)){
-            queryWrapper.like("p.WORK_TITLE",workTitle);
-        }
-        if(ObjectUtil.isNotEmpty(projectId)){
-            queryWrapper.eq("alarm.PROJECT_ID",projectId);
-        }
-        if(StrUtil.isNotEmpty(alarmStatus)){
-            queryWrapper.eq("alarm.ALARM_STATUS",alarmStatus);
-        }
-        if(StrUtil.isNotEmpty(projectState)){
-            queryWrapper.eq("p.PROJECT_STATE",projectState);
-        }
-        if(StrUtil.isNotEmpty(alarmType)){
-            queryWrapper.eq("alarm.ALARM_TYPE",alarmType);
-        }
-        if(StrUtil.isNotEmpty(alarmStartTime)){
-            queryWrapper.ge("alarm.ALARM_TIME",alarmStartTime);
-        }
-        if(StrUtil.isNotEmpty(alarmEndTime)){
-            queryWrapper.le("alarm.ALARM_TIME",alarmEndTime);
-        }
-        page = alarmService.listPage(page,queryWrapper);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-    @ApiOperation("消警")
-    @PostMapping("/cancel")
-    @ResponseBody
-    public Object cancel(@RequestParam("alarmId") Long alarmId){
-        UpdateWrapper<BusAlarm> updateWrapper = new UpdateWrapper<>();
-        updateWrapper.eq("ID",alarmId);
-        updateWrapper.set("ALARM_STATUS",ALARM_STATUS_MANUAL_CANCEL);
-        alarmService.update(updateWrapper);
-        return ResponseData.success();
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusEventController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusEventController.java
deleted file mode 100644
index dde5aad..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusEventController.java
+++ /dev/null
@@ -1,41 +0,0 @@
-package com.casic.missiles.modular.system.controller;
-
-
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.entity.BusEvent;
-import com.casic.missiles.modular.system.service.IBusEventService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.ResponseBody;
-
-/**
- * <p>
- * 事件表 前端控制器
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@Controller
-@RequestMapping("/event")
-@Api(tags = "事件上报")
-@RequiredArgsConstructor
-public class BusEventController {
-
-    private final IBusEventService eventService;
-
-    @ApiOperation("事件上报")
-    @PostMapping("add")
-    @ResponseBody
-    public Object add(@RequestBody BusEvent busEvent){
-        eventService.saveBusEvent(busEvent);
-        return ResponseData.success();
-    }
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
index 03abc5f..aa50d78 100644
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
@@ -1,121 +1,20 @@
 package com.casic.missiles.modular.system.controller;
 
 
-import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.core.base.controller.BaseController;
-import com.casic.missiles.core.page.PageFactory;
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.DeviceDetailDTO;
-import com.casic.missiles.modular.system.entity.Device;
-import com.casic.missiles.modular.system.service.IDeviceExtService;
-import com.casic.missiles.modular.system.service.IDeviceService;
-import io.swagger.annotations.*;
-import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.RequestMapping;
 
 import org.springframework.stereotype.Controller;
 
-import java.time.LocalDateTime;
-import java.util.Date;
-import java.util.List;
-
-import static com.casic.missiles.model.response.ResponseData.DEFAULT_SUCCESS_MESSAGE;
-
 /**
  * <p>
- *  前端控制器
+ * 设备记录表 前端控制器
  * </p>
  *
  * @author zyj
- * @since 2023-04-14
+ * @since 2023-05-25
  */
-@Api(tags = "设备管理接口")
-@RequiredArgsConstructor
 @Controller
-@RequestMapping("/device")
-public class DeviceController extends BaseController {
-    private final IDeviceService deviceService;
-    private final IDeviceExtService deviceExtService;
-
-    @ApiOperation("设备分页列表")
-    @ApiImplicitParams({
-        @ApiImplicitParam(name = "deviceType", value = "设备类型",dataType = "String", paramType = "query"),
-        @ApiImplicitParam(name = "deviceCode", value = "设备编号",dataType = "String", paramType = "query"),
-        @ApiImplicitParam(name = "status", value = "设备状态",dataType = "String", paramType = "query"),
-        @ApiImplicitParam(name = "projectId", value = "作业ID（如果传此参数，列表中返回该作业使用的设备）",dataType = "Long", paramType = "query", example = "0")
-    })
-    @ApiResponses({
-        @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = DeviceDetailDTO.class),
-    })
-    @GetMapping("listPage")
-    @ResponseBody
-    public Object listPage(String deviceType, String deviceCode, String status,Long projectId){
-        Page<DeviceDetailDTO> page = PageFactory.defaultPage();
-        QueryWrapper<DeviceDetailDTO> queryWrapper = new QueryWrapper<>();
-        if(StrUtil.isNotEmpty(deviceType)){
-            queryWrapper.eq("DEVICE_TYPE",deviceType);
-        }
-        if(StrUtil.isNotEmpty(deviceCode)){
-            queryWrapper.like("DEVICE_CODE",deviceCode);
-        }
-        page = deviceService.listPage(page,queryWrapper,status,projectId);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-    @ApiOperation("新增设备")
-    @PostMapping("add")
-    @ResponseBody
-    public Object add(@RequestBody DeviceDetailDTO deviceDetailDTO){
-        deviceService.saveDevice(deviceDetailDTO);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("编辑设备")
-    @PostMapping("update")
-    @ResponseBody
-    public Object update(@RequestBody DeviceDetailDTO deviceDetailDTO){
-        deviceService.updateDevice(deviceDetailDTO);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("删除设备")
-    @PostMapping("delete")
-    @ResponseBody
-    public Object delete(@ApiParam("设备id列表")@RequestBody List<Long> deviceIds){
-        deviceService.deleteDevices(deviceIds);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("设置甲烷阈值")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "gasIp", value = "安全树甲烷设备IP",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "gasPort", value = "安全树甲烷端口",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "threshold", value = "甲烷阈值",dataType = "String", paramType = "query")
-    })
-    @PostMapping("setThreshold")
-    @ResponseBody
-    public Object setThreshold(String gasIp,String gasPort,String threshold){
-        deviceExtService.setGasThreshold(gasIp, gasPort, threshold);
-        return ResponseData.success();
-    }
-
-
-    @ApiOperation("查询甲烷阈值")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "gasIp", value = "安全树甲烷设备IP",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "gasPort", value = "安全树甲烷端口",dataType = "String", paramType = "query")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = "{\"code\": 200,\"data\": \"100\",\"message\": \"请求成功\",\"success\": true}",response = String.class),
-    })
-    @GetMapping("getThreshold")
-    @ResponseBody
-    public Object getThreshold(String gasIp,String gasPort){
-        String data = deviceExtService.getGasThreshold(gasIp, gasPort);
-        return ResponseData.success(data);
-    }
-
+@RequestMapping("/system/device")
+public class DeviceController {
 
 }
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/OverviewController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/OverviewController.java
deleted file mode 100644
index 7570504..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/OverviewController.java
+++ /dev/null
@@ -1,70 +0,0 @@
-package com.casic.missiles.modular.system.controller;
-
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.AlarmTypeCountDTO;
-import com.casic.missiles.modular.system.dto.DeviceLocationDTO;
-import com.casic.missiles.modular.system.dto.WorkerLocationDTO;
-import com.casic.missiles.modular.system.service.IBusAlarmService;
-import com.casic.missiles.modular.system.service.IProjectDeviceService;
-import com.casic.missiles.modular.system.service.IProjectWorkerService;
-import io.swagger.annotations.*;
-import lombok.RequiredArgsConstructor;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.ResponseBody;
-
-import static com.casic.missiles.model.response.ResponseData.DEFAULT_SUCCESS_MESSAGE;
-import static com.casic.missiles.modular.system.consts.AlarmConst.ALARM_STATUS_ON;
-
-@Api(tags = "首页看板接口")
-@Controller
-@RequestMapping("overview")
-@RequiredArgsConstructor
-public class OverviewController {
-
-    private final IBusAlarmService alarmService;
-    private final IProjectDeviceService projectDeviceService;
-
-    private final IProjectWorkerService projectWorkerService;
-
-
-    @ApiOperation("报警统计接口")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "projectId", value = "作业ID",dataType = "Long", paramType = "query", example = "0")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = AlarmTypeCountDTO.class),
-    })
-    @GetMapping("/alarmCount")
-    @ResponseBody
-    public Object alarmCount(Long projectId){
-        return ResponseData.success(alarmService.alarmCount(projectId,ALARM_STATUS_ON));
-    }
-
-    @ApiOperation("设备列表接口")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "projectId", value = "作业ID",dataType = "Long", paramType = "query", example = "0")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = DeviceLocationDTO.class),
-    })
-    @GetMapping("/deviceList")
-    @ResponseBody
-    public Object deviceList(Long projectId){
-        return ResponseData.success(projectDeviceService.selectDeviceLocationList(projectId));
-    }
-
-    @ApiOperation("人员列表接口")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "projectId", value = "作业ID",dataType = "Long", paramType = "query", example = "0")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = WorkerLocationDTO.class),
-    })
-    @GetMapping("/workerList")
-    @ResponseBody
-    public Object workerList(Long projectId){
-        return ResponseData.success(projectWorkerService.selectWorkerLocationDTO(projectId));
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/WorkSiteInfoController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/WorkSiteInfoController.java
deleted file mode 100644
index af36d69..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/WorkSiteInfoController.java
+++ /dev/null
@@ -1,130 +0,0 @@
-package com.casic.missiles.modular.system.controller;
-
-
-import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.core.base.controller.BaseController;
-import com.casic.missiles.core.page.PageFactory;
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.WorkSiteDetailDTO;
-import com.casic.missiles.modular.system.entity.WorkSiteInfo;
-import com.casic.missiles.modular.system.service.IWorkSiteInfoService;
-import io.swagger.annotations.*;
-import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.*;
-
-import org.springframework.stereotype.Controller;
-
-import java.util.List;
-
-import static com.casic.missiles.model.response.ResponseData.DEFAULT_SUCCESS_MESSAGE;
-
-/**
- * <p>
- * 作业现场表 前端控制器
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@Controller
-@RequestMapping("/site")
-@Api(tags = "作业现场管理")
-@RequiredArgsConstructor
-public class WorkSiteInfoController extends BaseController {
-
-
-    private final IWorkSiteInfoService workSiteInfoService;
-
-    @ApiOperation("新增作业现场")
-    @PostMapping("add")
-    @ResponseBody
-    public Object addWorkSite(@RequestBody WorkSiteDetailDTO workSiteDetailDTO){
-        workSiteInfoService.addWorkSiteInfo(workSiteDetailDTO);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("编辑作业现场")
-    @PostMapping("update")
-    @ResponseBody
-    public Object updateWorkSite(@RequestBody WorkSiteDetailDTO workSiteDetailDTO){
-        workSiteInfoService.updateWorkSiteInfo(workSiteDetailDTO);
-        return ResponseData.success();
-    }
-
-
-    @ApiOperation("删除作业现场")
-    @PostMapping("delete")
-    @ResponseBody
-    public Object delete(@ApiParam("作业现场id列表")@RequestBody List<Long> projectIds){
-        workSiteInfoService.deleteProjects(projectIds);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("查询作业现场详情")
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = WorkSiteDetailDTO.class),
-    })
-    @GetMapping("detail")
-    @ResponseBody
-    public Object delete(@ApiParam(value = "作业现场id", example = "0")@RequestParam Long projectId){
-        WorkSiteDetailDTO detailDTO = workSiteInfoService.getWorkSiteDetail(projectId);
-        return ResponseData.success(detailDTO);
-    }
-
-    @ApiOperation("分页列表查询")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "workTitle",value = "作业名称", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "workRoad",value = "所属道路", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "workPersonName",value = "责任人姓名", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "startDate",value = "注册开始日期", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "endDate",value = "注册结束日期", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "projectState",value = "当前状态（字典值）", dataType = "String", paramType = "query")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = WorkSiteInfo.class),
-    })
-    @GetMapping("listPage")
-    @ResponseBody
-    public Object listPage(String workTitle,String workRoad,String workPersonName,String projectState,String startDate,String endDate){
-        Page<WorkSiteInfo> page = PageFactory.defaultPage();
-        QueryWrapper<WorkSiteInfo> queryWrapper = new QueryWrapper<>();
-        if(StrUtil.isNotEmpty(workTitle)){
-            queryWrapper.like("WORK_TITLE",workTitle);
-        }
-        if(StrUtil.isNotEmpty(workRoad)){
-            queryWrapper.like("WORK_ROAD",workRoad);
-        }
-        if(StrUtil.isNotEmpty(workPersonName)){
-            queryWrapper.like("WORKER_NAME",workPersonName);
-        }
-        if(StrUtil.isNotEmpty(projectState)){
-            queryWrapper.eq("PROJECT_STATE",projectState);
-        }
-        if(StrUtil.isNotEmpty(startDate)){
-            queryWrapper.ge("br_work_site_info.CREATE_TIME",startDate + " 00:00:00");
-        }
-        if(StrUtil.isNotEmpty(endDate)){
-            queryWrapper.le("br_work_site_info.CREATE_TIME",endDate + " 23:59:59");
-        }
-        page = workSiteInfoService.selectListPage(page,queryWrapper);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-    @ApiOperation("开始作业")
-    @PostMapping("start")
-    @ResponseBody
-    public Object start(@ApiParam(value = "作业现场id",example = "0")@RequestParam Long projectId){
-        workSiteInfoService.start(projectId);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("完成作业")
-    @PostMapping("finish")
-    @ResponseBody
-    public Object finish(@ApiParam(value = "作业现场id", example = "0")@RequestParam Long projectId){
-        workSiteInfoService.finish(projectId);
-        return ResponseData.success();
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/WorkerController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/WorkerController.java
deleted file mode 100644
index 796f94c..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/WorkerController.java
+++ /dev/null
@@ -1,136 +0,0 @@
-package com.casic.missiles.modular.system.controller;
-
-
-import cn.hutool.core.util.ObjectUtil;
-import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.core.base.controller.BaseController;
-import com.casic.missiles.core.page.PageFactory;
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.DeviceDetailDTO;
-import com.casic.missiles.modular.system.entity.Device;
-import com.casic.missiles.modular.system.entity.Worker;
-import com.casic.missiles.modular.system.service.IWorkerService;
-import io.swagger.annotations.*;
-import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.*;
-
-import org.springframework.stereotype.Controller;
-
-import java.util.Date;
-import java.util.List;
-
-import static com.casic.missiles.model.response.ResponseData.DEFAULT_SUCCESS_MESSAGE;
-
-/**
- * <p>
- *  前端控制器
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@Controller
-@RequestMapping("/worker")
-@RequiredArgsConstructor
-@Api(tags = "人员管理接口")
-public class WorkerController extends BaseController {
-
-    private final IWorkerService workerService;
-
-    @ApiOperation("分页列表查询")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "name",value = "姓名", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "deptId",value = "所属部门", dataType = "Long", paramType = "query", example = "0"),
-            @ApiImplicitParam(name = "status",value = "当前状态（字典值）", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "startDate",value = "注册开始日期", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "endDate",value = "注册结束日期", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "workerType",value = "人员类型（字典值）", dataType = "String", paramType = "query")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = Worker.class),
-    })
-    @GetMapping("listPage")
-    @ResponseBody
-    public Object listPage(String name,Long deptId, String status,String startDate,String endDate,String workerType){
-        Page<Worker> page = PageFactory.defaultPage();
-        QueryWrapper<Worker> queryWrapper = new QueryWrapper<>();
-        if(StrUtil.isNotEmpty(name)){
-            queryWrapper.like("WORKER_NAME",name);
-        }
-        if(ObjectUtil.isNotEmpty(deptId)){
-            queryWrapper.eq("DEPT_ID",deptId);
-        }
-        if(StrUtil.isNotEmpty(workerType)){
-            queryWrapper.eq("WORKER_TYPE",workerType);
-        }
-        if(StrUtil.isNotEmpty(startDate)){
-            queryWrapper.ge("CREATE_TIME",startDate + " 00:00:00");
-        }
-        if(StrUtil.isNotEmpty(endDate)){
-            queryWrapper.le("CREATE_TIME",endDate + " 23:59:59");
-        }
-        if(StrUtil.isNotEmpty(status)){
-            queryWrapper.eq("`STATUS`",status);
-        }
-        page = workerService.selectListPage(page,queryWrapper);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-    @ApiOperation("新增人员")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "worker", value = "人员信息", dataType = "Worker", paramType = "body", required = true),
-            @ApiImplicitParam(name = "projectId", value = "项目ID(入场申请需要)", dataType = "Long", paramType = "query", example = "0")
-    })
-    @PostMapping("add")
-    @ResponseBody
-    public Object add(@ApiParam("worker")@RequestBody Worker worker,
-                      @RequestParam(required = false) Long projectId){
-        workerService.addWorker(worker,projectId);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("编辑人员")
-    @PostMapping("update")
-    @ResponseBody
-    public Object update(@RequestBody Worker worker){
-        workerService.updateById(worker);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("删除人员")
-    @PostMapping("delete")
-    @ResponseBody
-    public Object delete(@ApiParam("人员id列表")@RequestBody List<Long> workIds){
-        workerService.removeByIds(workIds);
-        return ResponseData.success();
-    }
-
-
-    @ApiOperation(value = "获取人脸图片",notes = "返回人脸图片url")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "cameraIp",value = "摄像头IP", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "cameraPort",value = "摄像头端口号", dataType = "String", paramType = "query"),
-    })
-    @GetMapping("/face/register")
-    @ResponseBody
-    public Object faceRegister(String cameraIp,String cameraPort){
-        return ResponseData.success(workerService.faceRegister(cameraIp, cameraPort));
-    }
-
-
-    @ApiOperation(value = "查询临时入场人员列表")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "projectId", value = "项目ID",required = true,dataType = "Long", paramType = "query", example = "0")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = Worker.class),
-    })
-    @GetMapping("/projectTempWorker")
-    @ResponseBody
-    public Object projectTempWorker(Long projectId){
-        return ResponseData.success(workerService.projectTempWorker(projectId));
-    }
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/AlarmTypeCountDTO.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/AlarmTypeCountDTO.java
deleted file mode 100644
index 1a165a1..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/AlarmTypeCountDTO.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.casic.missiles.modular.system.dto;
-
-import io.swagger.annotations.ApiModel;
-import lombok.Data;
-
-@ApiModel(value = "AlarmTypeCountDTO",description = "报警类型统计（首页）")
-@Data
-public class AlarmTypeCountDTO {
-
-    private String alarmType;
-    private String alarmTypeName;
-    private Integer alarmCount;
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/AlarmUpload.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/AlarmUpload.java
deleted file mode 100644
index 73d7799..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/AlarmUpload.java
+++ /dev/null
@@ -1,46 +0,0 @@
-package com.casic.missiles.modular.system.dto;
-
-import cn.hutool.core.util.StrUtil;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-@ApiModel(value = "AlarmUpload",description = "报警上传")
-@Data
-public class AlarmUpload {
-
-    @ApiModelProperty(value = "摄像头ip")
-    private String cameraIp;
-
-    @ApiModelProperty(value = "摄像头端口")
-    private String cameraPort;
-    @ApiModelProperty(value = "安全树甲烷设备ip")
-    private String gasIp;
-    @ApiModelProperty(value = "安全树甲烷设备端口")
-    private String gasPort;
-    @ApiModelProperty(value = "报警值")
-    private String alarmValue;
-    @ApiModelProperty(value = "报警时间")
-    private String alarmTime;
-    @ApiModelProperty(value = "报警类型")
-    private String alarmType;
-    @ApiModelProperty(value = "报警图片")
-    private String alarmImage;
-    @ApiModelProperty(value = "报警内容")
-    private String alarmContent;
-
-    @Override
-    public String toString() {
-        return "AlarmUpload{" +
-                "cameraIp='" + cameraIp + '\'' +
-                ", cameraPort='" + cameraPort + '\'' +
-                ", gasIp='" + gasIp + '\'' +
-                ", gasPort='" + gasPort + '\'' +
-                ", alarmValue='" + alarmValue + '\'' +
-                ", alarmTime='" + alarmTime + '\'' +
-                ", alarmType='" + alarmType + '\'' +
-                ", alarmImage='" + (StrUtil.isNotEmpty(alarmImage) ? alarmImage.substring(0,50) : "null") + '\'' +
-                ", alarmContent='" + alarmContent + '\'' +
-                '}';
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/DeviceDetailDTO.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/DeviceDetailDTO.java
deleted file mode 100644
index ea518d9..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/DeviceDetailDTO.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package com.casic.missiles.modular.system.dto;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.casic.missiles.modular.system.entity.Device;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-@ApiModel("DeviceDetailDTO")
-@Data
-public class DeviceDetailDTO extends Device {
-
-    @ApiModelProperty(value = "摄像头编号")
-    private String cameraCode;
-
-    @ApiModelProperty(value = "摄像头IP")
-    private String cameraIp;
-
-    @ApiModelProperty(value = "摄像头端口")
-    private String cameraPort;
-
-    @ApiModelProperty(value = "激甲编号")
-    private String gasCode;
-
-    @ApiModelProperty(value = "激甲IP")
-    private String gasIp;
-
-    @ApiModelProperty(value = "激甲端口")
-    private String gasPort;
-
-    @ApiModelProperty(value = "智能帽衬编号")
-    private String hatLiningCode;
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/WorkSiteDetailDTO.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/WorkSiteDetailDTO.java
deleted file mode 100644
index 29378ff..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/WorkSiteDetailDTO.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package com.casic.missiles.modular.system.dto;
-
-import com.casic.missiles.modular.system.entity.ProjectDevice;
-import com.casic.missiles.modular.system.entity.ProjectWorker;
-import com.casic.missiles.modular.system.entity.WorkSiteInfo;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.util.List;
-
-@Data
-@ApiModel("WorkSiteDetailDTO")
-public class WorkSiteDetailDTO extends WorkSiteInfo {
-
-    @ApiModelProperty(value = "安全树列表",dataType = "ProjectDevice")
-    private List<ProjectDevice> deviceList;
-
-    @ApiModelProperty(value = "人员列表",dataType = "ProjectWorker")
-    private List<ProjectWorker> workerList;
-
-
-
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/WorkerLocationDTO.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/WorkerLocationDTO.java
deleted file mode 100644
index 6fd7b24..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/WorkerLocationDTO.java
+++ /dev/null
@@ -1,68 +0,0 @@
-package com.casic.missiles.modular.system.dto;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-@ApiModel(value = "WorkerLocationDTO",description = "人员位置列表（首页）")
-@Data
-public class WorkerLocationDTO {
-
-    @ApiModelProperty("人员ID")
-    private Long workerId;
-
-    @ApiModelProperty("人员姓名")
-    private String workerName;
-
-    @ApiModelProperty("安全帽编号")
-    private String hatCode;
-
-    @ApiModelProperty("安全帽ID")
-    private Long hatId;
-
-    @ApiModelProperty("背心编号")
-    private String vastCode;
-
-    @ApiModelProperty("手环编号")
-    private String braceletCode;
-
-    @ApiModelProperty("位置")
-    private String location;
-
-    @ApiModelProperty("时间")
-    private String time;
-
-    @ApiModelProperty("经度")
-    private String lng;
-
-    @ApiModelProperty("纬度")
-    private String lat;
-
-    @ApiModelProperty("心率")
-    private String heartRate;
-
-    @ApiModelProperty("血氧")
-    private String bloodOxygen;
-
-    @ApiModelProperty("一氧化碳")
-    private String co;
-
-    @ApiModelProperty("甲烷")
-    private String gas;
-
-    @ApiModelProperty("硫化氢")
-    private String h2s;
-
-    @ApiModelProperty("氧气")
-    private String o2;
-
-    @ApiModelProperty("信号")
-    private String signal;
-
-    @ApiModelProperty("电量")
-    private String cell;
-
-    @ApiModelProperty("是否报警")
-    private boolean alarmFlag;
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Alarm.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Alarm.java
new file mode 100644
index 0000000..4d2b7ef
--- /dev/null
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Alarm.java
@@ -0,0 +1,103 @@
+package com.casic.missiles.modular.system.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import java.util.Date;
+
+/**
+ * <p>
+ * 报警记录表
+ * </p>
+ *
+ * @author zyj
+ * @since 2023-05-25
+ */
+@Data
+@TableName("bus_alarm")
+public class Alarm implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    @TableId(value = "ID",type = IdType.ASSIGN_ID)
+    private Long id;
+
+    /**
+     * 设备ID
+     */
+    @TableField("DEVICE_ID")
+    private Long deviceId;
+
+    /**
+     * 报警类型
+     */
+    @TableField("ALARM_TYPE")
+    private String alarmType;
+
+    /**
+     * 报警时间
+     */
+    @TableField("ALARM_TIME")
+    private Date alarmTime;
+
+    /**
+     * 报警状态
+     */
+    @TableField("ALARM_STATUS")
+    private String alarmStatus;
+
+    /**
+     * 报警位置
+     */
+    @TableField("ALARM_LOCATION")
+    private String alarmLocation;
+
+    /**
+     * 报警图片
+     */
+    @TableField("ALARM_IMAGE")
+    private String alarmImage;
+
+    /**
+     * 视频通道号
+     */
+    @TableField("CHANNEL_NO")
+    private Integer channelNo;
+
+    /**
+     * 报警内容
+     */
+    @TableField("ALARM_CONTENT")
+    private String alarmContent;
+
+    /**
+     * 消警时间
+     */
+    @TableField("CANCEL_TIME")
+    private Date cancelTime;
+
+
+    @Override
+    public String toString() {
+        return "Alarm{" +
+            "id=" + id +
+            ", deviceId=" + deviceId +
+            ", alarmType=" + alarmType +
+            ", alarmTime=" + alarmTime +
+            ", alarmStatus=" + alarmStatus +
+            ", alarmLocation=" + alarmLocation +
+            ", alarmImage=" + alarmImage +
+            ", channelNo=" + channelNo +
+            ", alarmContent=" + alarmContent +
+            ", cancelTime=" + cancelTime +
+        "}";
+    }
+}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusAlarm.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusAlarm.java
deleted file mode 100644
index efb4a23..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusAlarm.java
+++ /dev/null
@@ -1,159 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.alibaba.fastjson.annotation.JSONField;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.time.LocalDateTime;
-import java.util.Date;
-
-/**
- * <p>
- * 报警记录表
- * </p>
- *
- * @author zyj
- * @since 2023-05-16
- */
-@Data
-@ApiModel("Alarm")
-@TableName("br_bus_alarm")
-public class BusAlarm implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 项目ID
-     */
-    @ApiModelProperty(value = "项目ID")
-    @TableField("PROJECT_ID")
-    private Long projectId;
-
-    /**
-     * 设备ID
-     */
-    @ApiModelProperty(value = "设备ID")
-    @TableField("DEVICE_ID")
-    private Long deviceId;
-
-    /**
-     * 报警类型
-     */
-    @ApiModelProperty(value = "报警类型")
-    @TableField("ALARM_TYPE")
-    private String alarmType;
-
-    /**
-     * 报警状态
-     */
-    @ApiModelProperty(value = "报警状态")
-    @TableField("ALARM_STATUS")
-    private String alarmStatus;
-
-    /**
-     * 报警值
-     */
-    @ApiModelProperty(value = "报警值")
-    @TableField("ALARM_VALUE")
-    private String alarmValue;
-
-    /**
-     * 报警图片
-     */
-    @ApiModelProperty(value = "报警图片")
-    @TableField("ALARM_IMAGE")
-    private String alarmImage;
-
-    /**
-     * 报警内容
-     */
-    @ApiModelProperty(value = "报警内容")
-    @TableField("ALARM_CONTENT")
-    private String alarmContent;
-
-    /**
-     * 报警时间
-     */
-    @ApiModelProperty(value = "报警时间")
-    @TableField("ALARM_TIME")
-    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
-    private Date alarmTime;
-
-    /**
-     * 消警时间
-     */
-    @ApiModelProperty(value = "消警时间")
-    @TableField("CANCEL_TIME")
-    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
-    private Date cancelTime;
-
-    /**
-     * 报警位置经度
-     */
-    @ApiModelProperty(value = "报警位置经度")
-    @TableField("ALARM_LNG")
-    private String alarmLng;
-
-    /**
-     * 报警位置纬度
-     */
-    @ApiModelProperty(value = "报警位置纬度")
-    @TableField("ALARM_LAT")
-    private String alarmLat;
-
-    @ApiModelProperty("报警类型名称")
-    @TableField(exist = false)
-    private String alarmStatusName;
-    @ApiModelProperty("报警类型名称")
-    @TableField(exist = false)
-    private String alarmTypeName;
-    @ApiModelProperty("作业名称")
-    @TableField(exist = false)
-    private String workTitle;
-    @ApiModelProperty("所属道路")
-    @TableField(exist = false)
-    private String workRoad;
-    @ApiModelProperty("作业状态")
-    @TableField(exist = false)
-    private String projectState;
-    @ApiModelProperty("作业状态名称")
-    @TableField(exist = false)
-    private String projectStateName;
-    @ApiModelProperty("负责人姓名")
-    @TableField(exist = false)
-    private String workPersonName;
-    @ApiModelProperty("负责人联系方式")
-    @TableField(exist = false)
-    private String workPersonPhoneNumber;
-
-
-    @Override
-    public String toString() {
-        return "BusAlarm{" +
-                "id=" + id +
-                ", projectId=" + projectId +
-                ", deviceId=" + deviceId +
-                ", alarmType=" + alarmType +
-                ", alarmValue=" + alarmValue +
-                ", alarmStatus=" + alarmStatus +
-                ", alarmImage=" + alarmImage +
-                ", alarmContent=" + alarmContent +
-                ", alarmTime=" + alarmTime +
-                ", cancelTime=" + cancelTime +
-                ", alarmLng=" + alarmLng +
-                ", alarmLat=" + alarmLat +
-                "}";
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusEvent.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusEvent.java
deleted file mode 100644
index a0b7543..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusEvent.java
+++ /dev/null
@@ -1,100 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.time.LocalDateTime;
-import java.util.Date;
-import java.util.List;
-
-/**
- * <p>
- * 事件表
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@TableName("br_bus_event")
-@Data
-@ApiModel("BusEvent")
-public class BusEvent implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @ApiModelProperty("事件ID")
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 事件标题
-     */
-    @ApiModelProperty("事件名称")
-    @TableField("EVENT_TITLE")
-    private String eventTitle;
-
-    /**
-     * 上报人员
-     */
-    @ApiModelProperty("上报人员")
-    @TableField("UPLOAD_NAME")
-    private String uploadName;
-
-    /**
-     * 联系方式
-     */
-    @ApiModelProperty("联系方式")
-    @TableField("PHONE_NUMBER")
-    private String phoneNumber;
-
-    /**
-     * 事件描述
-     */
-    @ApiModelProperty("事件描述")
-    @TableField("EVENT_DESCRIPTION")
-    private String eventDescription;
-
-    @ApiModelProperty("经度")
-    @TableField("LNG")
-    private String lng;
-
-    @ApiModelProperty("纬度")
-    @TableField("LAT")
-    private String lat;
-
-    /**
-     * 事件上传时间
-     */
-    @ApiModelProperty("事件上传时间")
-    @TableField("CREATE_TIME")
-    private Date createTime;
-
-    @ApiModelProperty("事件照片")
-    @TableField(exist = false)
-    private List<BusEventImage> imageList;
-
-
-
-    @Override
-    public String toString() {
-        return "BusEvent{" +
-            "id=" + id +
-            ", eventTitle=" + eventTitle +
-            ", uploadName=" + uploadName +
-            ", phoneNumber=" + phoneNumber +
-            ", eventDescription=" + eventDescription +
-            ", lng=" + lng +
-            ", lat=" + lat +
-            ", createTime=" + createTime +
-        "}";
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusEventImage.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusEventImage.java
deleted file mode 100644
index 1e75245..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusEventImage.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-
-/**
- * <p>
- * 事件图片表
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@TableName("br_bus_event_image")
-@Data
-@ApiModel("BusEventImage")
-public class BusEventImage implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 事件ID
-     */
-    @TableField("EVENT_ID")
-    private Long eventId;
-
-    /**
-     * 报警图片
-     */
-    @TableField("IMAGE")
-    @ApiModelProperty("图片url")
-    private String image;
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Device.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Device.java
index df89c70..ea7db5f 100644
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Device.java
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Device.java
@@ -1,30 +1,23 @@
 package com.casic.missiles.modular.system.entity;
 
-import com.alibaba.fastjson.annotation.JSONField;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.casic.missiles.core.base.json.DateDeserializer;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
-import java.util.Date;
 
 /**
  * <p>
- * 
+ * 设备记录表
  * </p>
  *
  * @author zyj
- * @since 2023-04-14
+ * @since 2023-05-25
  */
-@ApiModel("Device")
-@TableName("br_device")
 @Data
+@TableName("bus_device")
 public class Device implements Serializable {
 
     private static final long serialVersionUID = 1L;
@@ -32,82 +25,86 @@
     /**
      * 主键
      */
-    @ApiModelProperty(value = "设备ID")
     @TableId(value = "ID",type = IdType.ASSIGN_ID)
     private Long id;
 
     /**
-     * 设备编号
+     * 设备名称
      */
-    @ApiModelProperty(value = "设备编号")
-    @TableField("DEVICE_CODE")
-    private String deviceCode;
+    @TableField("DEVICE_NAME")
+    private String deviceName;
 
     /**
-     * 设备类型
+     * IP
      */
-    @ApiModelProperty(value = "设备类型")
-    @TableField("DEVICE_TYPE")
-    private String deviceType;
+    @TableField("IP")
+    private String ip;
 
     /**
-     * 设备批次
+     * 端口
      */
-    @ApiModelProperty(value = "设备批次")
-    @TableField("DEVICE_BATCH")
-    private String deviceBatch;
+    @TableField("PORT")
+    private String port;
 
     /**
-     * 厂家
+     * 用户名
      */
-    @ApiModelProperty(value = "厂家")
-    @TableField("MANUFACTURER")
-    private String manufacturer;
+    @TableField("USER_NAME")
+    private String userName;
 
     /**
-     * 是否供电
+     * 密码
      */
-    @ApiModelProperty(value = "是否供电")
-    @TableField("IS_POWER_SUPPLY")
-    private String isPowerSupply;
+    @TableField("PASSWORD")
+    private String password;
 
     /**
-     * 创建时间
+     * 连接类型
      */
-    @ApiModelProperty(value = "创建时间",dataType = "Date")
-    @TableField("CREATE_TIME")
-    private Date createTime;
+    @TableField("CONNECT_TYPE")
+    private String connectType;
 
-    @ApiModelProperty(value = "设备类型名称")
-    @TableField(exist = false)
-    private String deviceTypeName;
+    /**
+     * 位置
+     */
+    @TableField("LOCATION")
 
-    @ApiModelProperty(value = "是否供电名称")
-    @TableField(exist = false)
-    private String isPowerSupplyName;
+    private String location;
 
-    @ApiModelProperty(value = "注册时间",dataType = "String")
-    @TableField(exist = false)
-    private String registerTime;
+    /**
+     * 设备状态
+     */
+    @TableField("STATUS")
 
-    @ApiModelProperty(value = "当前状态")
-    @TableField(exist = false)
     private String status;
 
-    @ApiModelProperty(value = "当前状态名称")
-    @TableField(exist = false)
-    private String statusName;
+    /**
+     * 报警分组
+     */
+    @TableField("ALARM_GROUP")
+
+    private Long alarmGroup;
+
+    /**
+     * 视频通道数(预留)
+     */
+    @TableField("CHANNEL_NUM")
+    private Integer channelNum;
 
     @Override
     public String toString() {
         return "Device{" +
             "id=" + id +
-            ", deviceCode=" + deviceCode +
-            ", deviceType=" + deviceType +
-            ", deviceBatch=" + deviceBatch +
-            ", manufacturer=" + manufacturer +
-            ", isPowerSupply=" + isPowerSupply +
-            ", createTime=" + createTime +
+            ", deviceName=" + deviceName +
+            ", ip=" + ip +
+            ", port=" + port +
+            ", userName=" + userName +
+            ", password=" + password +
+            ", connectType=" + connectType +
+            ", location=" + location +
+            ", status=" + status +
+            ", alarmGroup=" + alarmGroup +
+            ", channelNum=" + channelNum +
         "}";
     }
 }
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/DeviceExt.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/DeviceExt.java
deleted file mode 100644
index 5ee7015..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/DeviceExt.java
+++ /dev/null
@@ -1,99 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-
-/**
- * <p>
- * 设备扩展信息表（安全树）
- * </p>
- *
- * @author zyj
- * @since 2023-04-27
- */
-@Data
-@TableName("br_device_ext")
-public class DeviceExt implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 设备ID
-     */
-    @TableField("DEVICE_ID")
-    private Long deviceId;
-
-    /**
-     * 摄像头编号
-     */
-    @TableField("CAMERA_CODE")
-    private String cameraCode;
-
-    /**
-     * 摄像头IP
-     */
-    @TableField("CAMERA_IP")
-    private String cameraIp;
-
-    /**
-     * 摄像头端口
-     */
-    @TableField("CAMERA_PORT")
-    private String cameraPort;
-
-    /**
-     * 激甲编号
-     */
-    @TableField("GAS_CODE")
-    private String gasCode;
-
-    /**
-     * 激甲IP
-     */
-    @TableField("GAS_IP")
-    private String gasIp;
-
-    /**
-     * 激甲端口
-     */
-    @TableField("GAS_PORT")
-    private String gasPort;
-
-    /**
-     * 甲烷报警阈值
-     */
-    @TableField("GAS_THRESHOLD")
-    private String gasThreshold;
-
-    @TableField(value = "HAT_LINING_CODE")
-    private String hatLiningCode;
-
-
-    @Override
-    public String toString() {
-        return "DeviceExt{" +
-            "id=" + id +
-            ", deviceId=" + deviceId +
-            ", cameraCode=" + cameraCode +
-            ", cameraIp=" + cameraIp +
-            ", cameraPort=" + cameraPort +
-            ", gasCode=" + gasCode +
-            ", gasIp=" + gasIp +
-            ", gasPort=" + gasPort +
-            ", gasThreshold=" + gasThreshold +
-            ", hatLiningCode=" + hatLiningCode +
-        "}";
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/ProjectDevice.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/ProjectDevice.java
deleted file mode 100644
index c4f3472..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/ProjectDevice.java
+++ /dev/null
@@ -1,62 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-
-/**
- * <p>
- * 
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@Data
-@ApiModel("ProjectDevice")
-@TableName("br_project_device")
-public class ProjectDevice implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 作业现场ID
-     */
-    @TableField("PROJECT_ID")
-    private Long projectId;
-
-    /**
-     * 设备ID
-     */
-    @TableField("DEVICE_ID")
-    @ApiModelProperty("设备ID（新增编辑时传）")
-    private Long deviceId;
-
-    /**
-     * 设备编号
-     */
-    @TableField(exist = false)
-    @ApiModelProperty("设备编号（详情中展示，新增编辑不用传）")
-    private String deviceCode;
-
-    @Override
-    public String toString() {
-        return "ProjectDevice{" +
-            "id=" + id +
-            ", projectId=" + projectId +
-            ", deviceId=" + deviceId +
-        "}";
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/ProjectWorker.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/ProjectWorker.java
deleted file mode 100644
index 10b23c4..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/ProjectWorker.java
+++ /dev/null
@@ -1,104 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import java.io.Serializable;
-
-/**
- * <p>
- * 
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@ApiModel("ProjectWorker")
-@TableName("br_project_worker")
-@Data
-@NoArgsConstructor
-@AllArgsConstructor
-public class ProjectWorker implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 作业现场ID
-     */
-    @TableField("PROJECT_ID")
-    private Long projectId;
-
-    /**
-     * 人员ID
-     */
-    @ApiModelProperty("人员ID")
-    @TableField("WORKER_ID")
-    private Long workerId;
-
-    /**
-     * 安全帽编号
-     */
-    @ApiModelProperty("安全帽编号")
-    @TableField("HAT_CODE")
-    private String hatCode;
-
-    /**
-     * 背心编号
-     */
-    @ApiModelProperty("背心编号")
-    @TableField("VAST_CODE")
-    private String vastCode;
-
-    /**
-     * 手环编号
-     */
-    @ApiModelProperty("手环编号")
-    @TableField("BRACELET_CODE")
-    private String braceletCode;
-
-    @ApiModelProperty("人员姓名（详情中展示，新增编辑不用传）")
-    @TableField(exist = false)
-    private String workerName;
-
-    @ApiModelProperty("人员部门ID（详情中展示，新增编辑不用传）")
-    @TableField(exist = false)
-    private String workerDeptId;
-
-    @ApiModelProperty("人员部门名称（详情中展示，新增编辑不用传）")
-    @TableField(exist = false)
-    private String workerDeptName;
-
-    @ApiModelProperty("人员联系方式（详情中展示，新增编辑不用传）")
-    @TableField(exist = false)
-    private String workerPhoneNumber;
-
-    public ProjectWorker(Long projectId, Long workerId) {
-        this.projectId = projectId;
-        this.workerId = workerId;
-    }
-
-    @Override
-    public String toString() {
-        return "ProjectWorker{" +
-            "id=" + id +
-            ", projectId=" + projectId +
-            ", workerId=" + workerId +
-            ", hatCode=" + hatCode +
-            ", vastCode=" + vastCode +
-            ", braceletCode=" + braceletCode +
-        "}";
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/WorkSiteInfo.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/WorkSiteInfo.java
deleted file mode 100644
index fa6f41d..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/WorkSiteInfo.java
+++ /dev/null
@@ -1,130 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.alibaba.fastjson.annotation.JSONField;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.time.LocalDateTime;
-import java.util.Date;
-
-/**
- * <p>
- * 作业现场表
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@ApiModel("WorkSiteInfo")
-@TableName("br_work_site_info")
-@Data
-public class WorkSiteInfo implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @ApiModelProperty("作业现场ID")
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 作业名称
-     */
-    @ApiModelProperty("作业名称")
-    @TableField("WORK_TITLE")
-    private String workTitle;
-
-    /**
-     * 责任人
-     */
-    @ApiModelProperty("责任人（人员ID）")
-    @TableField("WORK_PERSON")
-    private Long workPerson;
-
-    /**
-     * 作业描述
-     */
-    @ApiModelProperty("作业描述")
-    @TableField("WORK_SITE_DESC")
-    private String workSiteDesc;
-
-    /**
-     * 作业状态
-     */
-    @ApiModelProperty("作业状态")
-    @TableField("PROJECT_STATE")
-    private String projectState;
-
-    /**
-     * 所属道路
-     */
-    @ApiModelProperty("所属道路")
-    @TableField("WORK_ROAD")
-    private String workRoad;
-
-    @TableField("IMAGE_URL")
-    private String imageUrl;
-
-    @TableField("CREATE_TIME")
-    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
-    private Date createTime;
-    @TableField("UPDATE_TIME")
-    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
-    private Date updateTime;
-
-    @ApiModelProperty("开始时间")
-    @TableField("START_TIME")
-    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
-    private Date startTime;
-
-    @ApiModelProperty("结束时间")
-    @TableField("FINISH_TIME")
-    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
-    private Date finishTime;
-
-    @ApiModelProperty("负责人姓名（详情中使用，新增编辑不用传）")
-    @TableField(exist = false)
-    private String workPersonName;
-
-    @ApiModelProperty("负责人联系方式（详情中使用，新增编辑不用传）")
-    @TableField(exist = false)
-    private String workPersonPhoneNumber;
-
-    @ApiModelProperty("负责人所属部门ID（详情中使用，新增编辑不用传）")
-    @TableField(exist = false)
-    private Long workPersonDeptId;
-
-    @ApiModelProperty("负责人所属部门名称（详情中使用，新增编辑不用传）")
-    @TableField(exist = false)
-    private String workPersonDeptName;
-
-    @ApiModelProperty(value = "注册时间",dataType = "String")
-    @TableField(exist = false)
-    private String registerTime;
-
-    @ApiModelProperty("作业状态名称")
-    @TableField(exist = false)
-    private String projectStateName;
-
-    @Override
-    public String toString() {
-        return "WorkSiteInfo{" +
-            "id=" + id +
-            ", workTitle=" + workTitle +
-            ", workPerson=" + workPerson +
-            ", workSiteDesc=" + workSiteDesc +
-            ", projectState=" + projectState +
-            ", imageUrl=" + imageUrl +
-            ", updateTime=" + updateTime +
-            ", workRoad=" + workRoad +
-        "}";
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Worker.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Worker.java
deleted file mode 100644
index 28a4daa..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Worker.java
+++ /dev/null
@@ -1,147 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.time.LocalDateTime;
-import java.util.Date;
-
-/**
- * <p>
- * 
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@ApiModel("Worker")
-@TableName("br_worker")
-@Data
-public class Worker implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @ApiModelProperty(value = "人员ID")
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 姓名
-     */
-    @ApiModelProperty(value = "姓名")
-    @TableField("WORKER_NAME")
-    private String workerName;
-
-    /**
-     * 性别
-     */
-    @ApiModelProperty(value = "性别")
-    @TableField("GENDER")
-    private String gender;
-
-    /**
-     * 所属部门
-     */
-    @ApiModelProperty(value = "所属部门(人员管理)")
-    @TableField("DEPT_ID")
-    private Long deptId;
-
-    /**
-     * 所属单位
-     */
-    @ApiModelProperty(value = "所属单位(入场申请中使用)")
-    @TableField("OWNER_SHIP")
-    private String ownerShip;
-
-    /**
-     * 联系方式
-     */
-    @ApiModelProperty(value = "联系方式")
-    @TableField("PHONE_NUMBER")
-    private String phoneNumber;
-
-    /**
-     * 证件号
-     */
-    @ApiModelProperty(value = "证件号")
-    @TableField("ID_CARD_NUMBER")
-    private String idCardNumber;
-
-    /**
-     * 入场原因
-     */
-    @ApiModelProperty(value = "入场原因（入场申请中使用）")
-    @TableField("ENTER_REASON")
-    private String enterReason;
-
-    /**
-     * 入场人脸照片
-     */
-    @ApiModelProperty(value = "人脸照片（照片路径）")
-    @TableField("WORKER_AVATAR")
-    private String workerAvatar;
-
-    /**
-     * 申请入场时间
-     */
-    @ApiModelProperty(value = "注册时间/申请入场时间")
-    @TableField("CREATE_TIME")
-    private Date createTime;
-
-    /**
-     * 人员类型
-     */
-    @ApiModelProperty(value = "人员类型（区分人员管理和入场申请）")
-    @TableField("WORKER_TYPE")
-    private String workerType;
-
-    @ApiModelProperty(value = "性别名称")
-    @TableField(exist = false)
-    private String genderName;
-
-    @ApiModelProperty(value = "部门名称")
-    @TableField(exist = false)
-    private String deptName;
-
-    @ApiModelProperty(value = "注册时间",dataType = "String")
-    @TableField(exist = false)
-    private String registerTime;
-
-    @ApiModelProperty(value = "当前状态")
-    @TableField(exist = false)
-    private String status;
-
-    @ApiModelProperty(value = "当前状态名称")
-    @TableField(exist = false)
-    private String statusName;
-
-    @ApiModelProperty(value = "是否注册(0未注册；1已注册)",allowableValues = "0,1")
-    @TableField(exist = false)
-    private String isRegister;
-
-    @Override
-    public String toString() {
-        return "Worker{" +
-            "id=" + id +
-            ", workerName=" + workerName +
-            ", gender=" + gender +
-            ", deptId=" + deptId +
-            ", ownerShip=" + ownerShip +
-            ", phoneNumber=" + phoneNumber +
-            ", idCardNumber=" + idCardNumber +
-            ", enterReason=" + enterReason +
-            ", workerAvatar=" + workerAvatar +
-            ", createTime=" + createTime +
-            ", workerType=" + workerType +
-        "}";
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/AlarmMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/AlarmMapper.java
new file mode 100644
index 0000000..ea4c8be
--- /dev/null
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/AlarmMapper.java
@@ -0,0 +1,16 @@
+package com.casic.missiles.modular.system.mapper;
+
+import com.casic.missiles.modular.system.entity.Alarm;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 报警记录表 Mapper 接口
+ * </p>
+ *
+ * @author zyj
+ * @since 2023-05-25
+ */
+public interface AlarmMapper extends BaseMapper<Alarm> {
+
+}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/BusAlarmMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/BusAlarmMapper.java
deleted file mode 100644
index 9801742..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/BusAlarmMapper.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package com.casic.missiles.modular.system.mapper;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.modular.system.dto.AlarmTypeCountDTO;
-import com.casic.missiles.modular.system.entity.BusAlarm;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * <p>
- * 报警记录表 Mapper 接口
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface BusAlarmMapper extends BaseMapper<BusAlarm> {
-
-    Page<BusAlarm> listPage(Page<BusAlarm> page,@Param("ew")  QueryWrapper<BusAlarm> queryWrapper);
-
-    void cancelAlarm(@Param("deviceId")Long deviceId,@Param("alarmType") String alarmType);
-
-    List<AlarmTypeCountDTO> alarmCount(@Param("projectId")Long projectId, @Param("alarmStatus")String alarmStatus);
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/BusEventImageMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/BusEventImageMapper.java
deleted file mode 100644
index 9590b7d..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/BusEventImageMapper.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.casic.missiles.modular.system.mapper;
-
-import com.casic.missiles.modular.system.entity.BusEventImage;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * <p>
- * 事件图片表 Mapper 接口
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface BusEventImageMapper extends BaseMapper<BusEventImage> {
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/BusEventMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/BusEventMapper.java
deleted file mode 100644
index 3c85edf..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/BusEventMapper.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.casic.missiles.modular.system.mapper;
-
-import com.casic.missiles.modular.system.entity.BusEvent;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * <p>
- * 事件表 Mapper 接口
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface BusEventMapper extends BaseMapper<BusEvent> {
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/DeviceExtMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/DeviceExtMapper.java
deleted file mode 100644
index 4ca9212..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/DeviceExtMapper.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.casic.missiles.modular.system.mapper;
-
-import com.casic.missiles.modular.system.entity.DeviceExt;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * <p>
- * 设备扩展信息表（安全树） Mapper 接口
- * </p>
- *
- * @author zyj
- * @since 2023-04-27
- */
-public interface DeviceExtMapper extends BaseMapper<DeviceExt> {
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/DeviceMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/DeviceMapper.java
index 444c0c5..3d0bb02 100644
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/DeviceMapper.java
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/DeviceMapper.java
@@ -1,30 +1,16 @@
 package com.casic.missiles.modular.system.mapper;
 
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.modular.system.dto.DeviceDetailDTO;
-import com.casic.missiles.modular.system.dto.HelmetInfoDTO;
 import com.casic.missiles.modular.system.entity.Device;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
 
 /**
  * <p>
- *  Mapper 接口
+ * 设备记录表 Mapper 接口
  * </p>
  *
  * @author zyj
- * @since 2023-04-14
+ * @since 2023-05-25
  */
-@Mapper
 public interface DeviceMapper extends BaseMapper<Device> {
 
-    Page<DeviceDetailDTO> listDetailPage(Page<DeviceDetailDTO> page,@Param("ew") QueryWrapper<DeviceDetailDTO> ew);
-
-     List<Long> selectProjectDevice(@Param("projectId") Long projectId);
-
-    List<HelmetInfoDTO> selectHelmetList(@Param("deviceType")String deviceType);
 }
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/ProjectDeviceMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/ProjectDeviceMapper.java
deleted file mode 100644
index 1d0c14e..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/ProjectDeviceMapper.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package com.casic.missiles.modular.system.mapper;
-
-import com.casic.missiles.modular.system.dto.DeviceLocationDTO;
-import com.casic.missiles.modular.system.entity.ProjectDevice;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * <p>
- *  Mapper 接口
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface ProjectDeviceMapper extends BaseMapper<ProjectDevice> {
-     List<ProjectDevice> selectDetailByProjectId(@Param("projectId") Long projectId);
-
-     List<DeviceLocationDTO> selectDeviceLocationList(@Param("projectId") Long projectId);
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/ProjectWorkerMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/ProjectWorkerMapper.java
deleted file mode 100644
index 58583d1..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/ProjectWorkerMapper.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package com.casic.missiles.modular.system.mapper;
-
-import com.casic.missiles.modular.system.dto.WorkerLocationDTO;
-import com.casic.missiles.modular.system.entity.ProjectWorker;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * <p>
- *  Mapper 接口
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface ProjectWorkerMapper extends BaseMapper<ProjectWorker> {
-
-    List<ProjectWorker> selectDetailByProjectId(@Param("projectId") Long projectId,
-                                                @Param("workerType")String workerType);
-
-    List<WorkerLocationDTO> selectWorkerLocationList(@Param("projectId") Long projectId,
-                                                     @Param("workerType")String workerType);
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/WorkSiteInfoMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/WorkSiteInfoMapper.java
deleted file mode 100644
index a4934d2..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/WorkSiteInfoMapper.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.casic.missiles.modular.system.mapper;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.modular.system.entity.WorkSiteInfo;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Param;
-
-/**
- * <p>
- * 作业现场表 Mapper 接口
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface WorkSiteInfoMapper extends BaseMapper<WorkSiteInfo> {
-
-    Page<WorkSiteInfo> selectListPage(Page<WorkSiteInfo> page,@Param("ew") QueryWrapper<WorkSiteInfo> ew);
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/WorkerMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/WorkerMapper.java
deleted file mode 100644
index 258fb12..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/WorkerMapper.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package com.casic.missiles.modular.system.mapper;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.modular.system.dto.DeviceDetailDTO;
-import com.casic.missiles.modular.system.entity.Worker;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * <p>
- *  Mapper 接口
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface WorkerMapper extends BaseMapper<Worker> {
-
-
-    Page<Worker> selectListPage(Page<Worker> page, @Param("ew") QueryWrapper<Worker> ew);
-
-    List<String> selectWorkerAvatars(@Param("projectId")Long projectId);
-
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/AlarmMapper.xml b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/AlarmMapper.xml
new file mode 100644
index 0000000..25cb4ab
--- /dev/null
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/AlarmMapper.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.modular.system.mapper.AlarmMapper">
+
+</mapper>
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/BusAlarmMapper.xml b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/BusAlarmMapper.xml
deleted file mode 100644
index 595088a..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/BusAlarmMapper.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.casic.missiles.modular.system.mapper.BusAlarmMapper">
-
-    <select id="listPage" resultType="com.casic.missiles.modular.system.entity.BusAlarm">
-        SELECT
-            alarm.ID as id,
-            alarm.DEVICE_ID as deviceId,
-            alarm.PROJECT_ID as projectId,
-            alarm.ALARM_TYPE as alarmType,
-            alarm.ALARM_VALUE as alarmValue,
-            alarm.ALARM_STATUS as alarmStatus,
-            alarm.ALARM_IMAGE AS alarmImage,
-            alarm.ALARM_CONTENT as alarmContent,
-            alarm.ALARM_TIME as alarmTime,
-            alarm.CANCEL_TIME as cancelTime,
-            alarm.ALARM_LNG as alarmLng,
-            alarm.ALARM_LAT as alarmLat,
-            p.WORK_TITLE as workTitle,
-            p.WORK_ROAD as workRoad,
-            p.PROJECT_STATE as projectState,
-            w.WORKER_NAME as workPersonName,
-            w.PHONE_NUMBER as workPersonPhoneNumber
-        FROM
-            `br_bus_alarm` alarm
-                LEFT JOIN br_work_site_info p on alarm.PROJECT_ID = p.ID
-                LEFT JOIN br_worker w on p.WORK_PERSON = w.ID
-        <where>
-            <if test="ew != null">
-                ${ew.sqlSegment}
-            </if>
-        </where>
-    </select>
-
-    <select id="cancelAlarm">
-        update br_bus_alarm
-        set ALARM_STATUS = '1'
-        where DEVICE_ID = #{deviceId}
-          and ALARM_TYPE = #{alarmType}
-          and ALARM_STATUS = '0'
-    </select>
-
-    <select id="alarmCount" resultType="com.casic.missiles.modular.system.dto.AlarmTypeCountDTO">
-        SELECT
-            ALARM_TYPE as alarmType,
-            count(*) as alarmCount
-        from br_bus_alarm
-        <where>
-            <if test="projectId != null and projectId !=''">
-                and PROJECT_ID = #{projectId}
-            </if>
-            <if test="alarmStatus != null and alarmStatus !=''">
-                and ALARM_STATUS = #{alarmStatus}
-            </if>
-        </where>
-        group by ALARM_TYPE
-    </select>
-</mapper>
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/BusEventImageMapper.xml b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/BusEventImageMapper.xml
deleted file mode 100644
index fbc3db3..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/BusEventImageMapper.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.casic.missiles.modular.system.mapper.BusEventImageMapper">
-
-</mapper>
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/BusEventMapper.xml b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/BusEventMapper.xml
deleted file mode 100644
index 627d573..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/BusEventMapper.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.casic.missiles.modular.system.mapper.BusEventMapper">
-
-</mapper>
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/DeviceExtMapper.xml b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/DeviceExtMapper.xml
deleted file mode 100644
index 5321d1c..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/DeviceExtMapper.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.casic.missiles.modular.system.mapper.DeviceExtMapper">
-
-</mapper>
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/DeviceMapper.xml b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/DeviceMapper.xml
index 94262e1..88e7d01 100644
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/DeviceMapper.xml
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/DeviceMapper.xml
@@ -2,96 +2,4 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.casic.missiles.modular.system.mapper.DeviceMapper">
 
-    <select id="listDetailPage" resultType="com.casic.missiles.modular.system.dto.DeviceDetailDTO">
-        select
-        br_device.ID as id,
-        DEVICE_CODE as deviceCode,
-        DEVICE_TYPE as deviceType,
-        DEVICE_BATCH as deviceBatch,
-        MANUFACTURER as manufacturer,
-        IS_POWER_SUPPLY as isPowerSupply,
-        CREATE_TIME as createTime,
-        CAMERA_CODE as cameraCode,
-        CAMERA_IP as cameraIp,
-        CAMERA_PORT as cameraPort,
-        GAS_CODE as gasCode,
-        GAS_IP as gasIp,
-        GAS_PORT as gasPort,
-        HAT_LINING_CODE as hatLiningCode
-        from br_device
-        left join br_device_ext ext on ext.DEVICE_ID = br_device.ID
-        <where>
-            <if test="ew != null">
-                ${ew.sqlSegment}
-            </if>
-        </where>
-    </select>
-
-    <select id="selectProjectDevice" resultType="java.lang.Long">
-        with device_info as (
-            (SELECT
-            d.DEVICE_ID as DEVICE_ID,
-            d.PROJECT_ID as PROJECT_ID,
-            p.PROJECT_STATE as PROJECT_STATE
-            from br_project_device d
-            LEFT JOIN br_work_site_info p on p.ID = d.PROJECT_ID)
-
-            UNION ALL
-
-            (SELECT
-            d1.ID as DEVICE_ID,
-            w1.ID as PROJECT_ID,
-            w1.PROJECT_STATE as PROJECT_STATE
-            FROM br_project_worker pw1
-            LEFT JOIN br_device d1 on pw1.BRACELET_CODE = d1.DEVICE_CODE
-            LEFT JOIN br_work_site_info w1 on pw1.PROJECT_ID = w1.ID)
-
-            UNION ALL
-
-            (SELECT
-            d1.ID as DEVICE_ID,
-            w1.ID as PROJECT_ID,
-            w1.PROJECT_STATE as PROJECT_STATE
-            FROM br_project_worker pw1
-            LEFT JOIN br_device d1 on pw1.HAT_CODE = d1.DEVICE_CODE
-            LEFT JOIN br_work_site_info w1 on pw1.PROJECT_ID = w1.ID)
-
-
-            UNION ALL
-
-            (SELECT
-            d1.ID as DEVICE_ID,
-            w1.ID as PROJECT_ID,
-            w1.PROJECT_STATE as PROJECT_STATE
-            FROM br_project_worker pw1
-            LEFT JOIN br_device d1 on pw1.VAST_CODE = d1.DEVICE_CODE
-            LEFT JOIN br_work_site_info w1 on pw1.PROJECT_ID = w1.ID))
-
-        select DISTINCT DEVICE_ID from device_info
-        <where>
-            DEVICE_ID is not null
-            <choose>
-                <when test="projectId != null and projectId !=''">
-                    and PROJECT_ID = #{projectId}
-                </when>
-                <otherwise>
-                    AND PROJECT_STATE != '3'
-                </otherwise>
-            </choose>
-        </where>
-    </select>
-
-    <select id="selectHelmetList" resultType="com.casic.missiles.modular.system.dto.HelmetInfoDTO">
-        SELECT
-            a.ID AS deviceId,
-            a.DEVICE_CODE AS hatCode,
-            b.HAT_LINING_CODE AS hatLiningCode
-        FROM
-            br_device a
-                LEFT JOIN br_device_ext b ON a.ID = b.DEVICE_ID
-        WHERE
-            a.DEVICE_TYPE = #{deviceType}
-          AND a.DEVICE_CODE IS NOT NULL
-          AND b.HAT_LINING_CODE IS NOT NULL
-    </select>
 </mapper>
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/ProjectDeviceMapper.xml b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/ProjectDeviceMapper.xml
deleted file mode 100644
index c6d1c24..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/ProjectDeviceMapper.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.casic.missiles.modular.system.mapper.ProjectDeviceMapper">
-
-    <select id="selectDetailByProjectId" resultType="com.casic.missiles.modular.system.entity.ProjectDevice">
-        SELECT
-            pd.ID as id,
-            pd.PROJECT_ID as projectId,
-            pd.DEVICE_ID as deviceId,
-            d.DEVICE_CODE as deviceCode
-        from br_project_device pd
-        LEFT JOIN br_device d on pd.DEVICE_ID = d.ID
-        <where>
-            pd.PROJECT_ID = #{projectId}
-        </where>
-    </select>
-
-    <select id="selectDeviceLocationList" resultType="com.casic.missiles.modular.system.dto.DeviceLocationDTO">
-        SELECT
-        d.ID as deviceId,
-        d.DEVICE_TYPE as deviceType,
-        d.DEVICE_CODE as deviceCode,
-        if(EXISTS(select ID from br_bus_alarm WHERE DEVICE_ID = d.ID and ALARM_STATUS = '0'),true,false) as alarmFlag
-        FROM br_project_device pd, br_device d
-        where pd.DEVICE_ID = d.ID
-        and pd.PROJECT_ID = #{projectId}
-    </select>
-
-</mapper>
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/ProjectWorkerMapper.xml b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/ProjectWorkerMapper.xml
deleted file mode 100644
index 8d2de10..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/ProjectWorkerMapper.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.casic.missiles.modular.system.mapper.ProjectWorkerMapper">
-
-    <select id="selectDetailByProjectId" resultType="com.casic.missiles.modular.system.entity.ProjectWorker">
-        SELECT
-            pw.ID as id,
-            pw.PROJECT_ID as projectId,
-            pw.WORKER_ID as workerId,
-            w.WORKER_NAME as workerName,
-            w.DEPT_ID as workerDeptId,
-            pw.HAT_CODE as hatCode,
-            pw.VAST_CODE as vastCode,
-            pw.BRACELET_CODE as braceletCode,
-            w.PHONE_NUMBER as workerPhoneNumber
-        from br_project_worker pw
-        LEFT JOIN br_worker w on pw.WORKER_ID = w.ID
-        <where>
-            pw.PROJECT_ID = #{projectId}
-            <if test="workerType != null and workerType != ''">
-                and w.WORKER_TYPE = #{workerType}
-            </if>
-        </where>
-    </select>
-
-    <select id="selectWorkerLocationList" resultType="com.casic.missiles.modular.system.dto.WorkerLocationDTO">
-        select
-            w.ID as workerId,
-            w.WORKER_NAME as workerName,
-            pw.HAT_CODE as hatCode,
-            hd.ID as hatId,
-            pw.BRACELET_CODE as braceletCode,
-            pw.VAST_CODE as vastCode
-        from br_project_worker pw,br_worker w ,br_device hd
-        WHERE pw.WORKER_ID = w.ID
-          and pw.HAT_CODE = hd.DEVICE_CODE
-          and pw.PROJECT_ID = #{projectId}
-          and w.WORKER_TYPE = #{workerType}
-    </select>
-</mapper>

diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/AlarmController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/AlarmController.java
new file mode 100644
index 0000000..1795cf1
--- /dev/null
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/AlarmController.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.modular.system.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.stereotype.Controller;
+
+/**
+ * <p>
+ * 报警记录表 前端控制器
+ * </p>
+ *
+ * @author zyj
+ * @since 2023-05-25
+ */
+@Controller
+@RequestMapping("/system/alarm")
+public class AlarmController {
+
+}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusAlarmController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusAlarmController.java
deleted file mode 100644
index 1f82ebb..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusAlarmController.java
+++ /dev/null
@@ -1,102 +0,0 @@
-package com.casic.missiles.modular.system.controller;
-
-
-import cn.hutool.core.util.ObjectUtil;
-import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.core.base.controller.BaseController;
-import com.casic.missiles.core.page.PageFactory;
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.AlarmUpload;
-import com.casic.missiles.modular.system.dto.DeviceDetailDTO;
-import com.casic.missiles.modular.system.entity.BusAlarm;
-import com.casic.missiles.modular.system.service.IBusAlarmService;
-import io.swagger.annotations.*;
-import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.*;
-
-import org.springframework.stereotype.Controller;
-
-import static com.casic.missiles.model.response.ResponseData.DEFAULT_SUCCESS_MESSAGE;
-import static com.casic.missiles.modular.system.consts.AlarmConst.ALARM_STATUS_MANUAL_CANCEL;
-
-/**
- * <p>
- * 报警记录表 前端控制器
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@Api(tags = "报警管理接口")
-@Controller
-@RequestMapping("/alarm")
-@RequiredArgsConstructor
-public class BusAlarmController extends BaseController {
-
-    private final IBusAlarmService alarmService;
-
-    @ApiOperation("报警上报接口")
-    @PostMapping("/upload")
-    @ResponseBody
-    public Object upload(@RequestBody AlarmUpload alarmUpload){
-        alarmService.alarmUpload(alarmUpload);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("报警列表分页查询")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "workTitle", value = "作业名称",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "projectId", value = "作业ID",dataType = "Long", paramType = "query",example = "0"),
-            @ApiImplicitParam(name = "alarmStatus", value = "报警状态",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "projectState", value = "作业状态",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "alarmType", value = "报警类型",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "alarmStartTime", value = "报警开始时间",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "alarmEndTime", value = "报警结束时间",dataType = "String", paramType = "query")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = BusAlarm.class),
-    })
-    @GetMapping("/listPage")
-    @ResponseBody
-    public Object listPage(String workTitle,Long projectId,String alarmStatus,String projectState,String alarmType,String alarmStartTime,String alarmEndTime){
-        Page<BusAlarm> page = PageFactory.defaultPage();
-        QueryWrapper<BusAlarm> queryWrapper = new QueryWrapper<>();
-        if(StrUtil.isNotEmpty(workTitle)){
-            queryWrapper.like("p.WORK_TITLE",workTitle);
-        }
-        if(ObjectUtil.isNotEmpty(projectId)){
-            queryWrapper.eq("alarm.PROJECT_ID",projectId);
-        }
-        if(StrUtil.isNotEmpty(alarmStatus)){
-            queryWrapper.eq("alarm.ALARM_STATUS",alarmStatus);
-        }
-        if(StrUtil.isNotEmpty(projectState)){
-            queryWrapper.eq("p.PROJECT_STATE",projectState);
-        }
-        if(StrUtil.isNotEmpty(alarmType)){
-            queryWrapper.eq("alarm.ALARM_TYPE",alarmType);
-        }
-        if(StrUtil.isNotEmpty(alarmStartTime)){
-            queryWrapper.ge("alarm.ALARM_TIME",alarmStartTime);
-        }
-        if(StrUtil.isNotEmpty(alarmEndTime)){
-            queryWrapper.le("alarm.ALARM_TIME",alarmEndTime);
-        }
-        page = alarmService.listPage(page,queryWrapper);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-    @ApiOperation("消警")
-    @PostMapping("/cancel")
-    @ResponseBody
-    public Object cancel(@RequestParam("alarmId") Long alarmId){
-        UpdateWrapper<BusAlarm> updateWrapper = new UpdateWrapper<>();
-        updateWrapper.eq("ID",alarmId);
-        updateWrapper.set("ALARM_STATUS",ALARM_STATUS_MANUAL_CANCEL);
-        alarmService.update(updateWrapper);
-        return ResponseData.success();
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusEventController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusEventController.java
deleted file mode 100644
index dde5aad..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusEventController.java
+++ /dev/null
@@ -1,41 +0,0 @@
-package com.casic.missiles.modular.system.controller;
-
-
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.entity.BusEvent;
-import com.casic.missiles.modular.system.service.IBusEventService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.ResponseBody;
-
-/**
- * <p>
- * 事件表 前端控制器
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@Controller
-@RequestMapping("/event")
-@Api(tags = "事件上报")
-@RequiredArgsConstructor
-public class BusEventController {
-
-    private final IBusEventService eventService;
-
-    @ApiOperation("事件上报")
-    @PostMapping("add")
-    @ResponseBody
-    public Object add(@RequestBody BusEvent busEvent){
-        eventService.saveBusEvent(busEvent);
-        return ResponseData.success();
-    }
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
index 03abc5f..aa50d78 100644
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
@@ -1,121 +1,20 @@
 package com.casic.missiles.modular.system.controller;
 
 
-import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.core.base.controller.BaseController;
-import com.casic.missiles.core.page.PageFactory;
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.DeviceDetailDTO;
-import com.casic.missiles.modular.system.entity.Device;
-import com.casic.missiles.modular.system.service.IDeviceExtService;
-import com.casic.missiles.modular.system.service.IDeviceService;
-import io.swagger.annotations.*;
-import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.RequestMapping;
 
 import org.springframework.stereotype.Controller;
 
-import java.time.LocalDateTime;
-import java.util.Date;
-import java.util.List;
-
-import static com.casic.missiles.model.response.ResponseData.DEFAULT_SUCCESS_MESSAGE;
-
 /**
  * <p>
- *  前端控制器
+ * 设备记录表 前端控制器
  * </p>
  *
  * @author zyj
- * @since 2023-04-14
+ * @since 2023-05-25
  */
-@Api(tags = "设备管理接口")
-@RequiredArgsConstructor
 @Controller
-@RequestMapping("/device")
-public class DeviceController extends BaseController {
-    private final IDeviceService deviceService;
-    private final IDeviceExtService deviceExtService;
-
-    @ApiOperation("设备分页列表")
-    @ApiImplicitParams({
-        @ApiImplicitParam(name = "deviceType", value = "设备类型",dataType = "String", paramType = "query"),
-        @ApiImplicitParam(name = "deviceCode", value = "设备编号",dataType = "String", paramType = "query"),
-        @ApiImplicitParam(name = "status", value = "设备状态",dataType = "String", paramType = "query"),
-        @ApiImplicitParam(name = "projectId", value = "作业ID（如果传此参数，列表中返回该作业使用的设备）",dataType = "Long", paramType = "query", example = "0")
-    })
-    @ApiResponses({
-        @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = DeviceDetailDTO.class),
-    })
-    @GetMapping("listPage")
-    @ResponseBody
-    public Object listPage(String deviceType, String deviceCode, String status,Long projectId){
-        Page<DeviceDetailDTO> page = PageFactory.defaultPage();
-        QueryWrapper<DeviceDetailDTO> queryWrapper = new QueryWrapper<>();
-        if(StrUtil.isNotEmpty(deviceType)){
-            queryWrapper.eq("DEVICE_TYPE",deviceType);
-        }
-        if(StrUtil.isNotEmpty(deviceCode)){
-            queryWrapper.like("DEVICE_CODE",deviceCode);
-        }
-        page = deviceService.listPage(page,queryWrapper,status,projectId);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-    @ApiOperation("新增设备")
-    @PostMapping("add")
-    @ResponseBody
-    public Object add(@RequestBody DeviceDetailDTO deviceDetailDTO){
-        deviceService.saveDevice(deviceDetailDTO);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("编辑设备")
-    @PostMapping("update")
-    @ResponseBody
-    public Object update(@RequestBody DeviceDetailDTO deviceDetailDTO){
-        deviceService.updateDevice(deviceDetailDTO);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("删除设备")
-    @PostMapping("delete")
-    @ResponseBody
-    public Object delete(@ApiParam("设备id列表")@RequestBody List<Long> deviceIds){
-        deviceService.deleteDevices(deviceIds);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("设置甲烷阈值")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "gasIp", value = "安全树甲烷设备IP",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "gasPort", value = "安全树甲烷端口",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "threshold", value = "甲烷阈值",dataType = "String", paramType = "query")
-    })
-    @PostMapping("setThreshold")
-    @ResponseBody
-    public Object setThreshold(String gasIp,String gasPort,String threshold){
-        deviceExtService.setGasThreshold(gasIp, gasPort, threshold);
-        return ResponseData.success();
-    }
-
-
-    @ApiOperation("查询甲烷阈值")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "gasIp", value = "安全树甲烷设备IP",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "gasPort", value = "安全树甲烷端口",dataType = "String", paramType = "query")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = "{\"code\": 200,\"data\": \"100\",\"message\": \"请求成功\",\"success\": true}",response = String.class),
-    })
-    @GetMapping("getThreshold")
-    @ResponseBody
-    public Object getThreshold(String gasIp,String gasPort){
-        String data = deviceExtService.getGasThreshold(gasIp, gasPort);
-        return ResponseData.success(data);
-    }
-
+@RequestMapping("/system/device")
+public class DeviceController {
 
 }
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/OverviewController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/OverviewController.java
deleted file mode 100644
index 7570504..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/OverviewController.java
+++ /dev/null
@@ -1,70 +0,0 @@
-package com.casic.missiles.modular.system.controller;
-
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.AlarmTypeCountDTO;
-import com.casic.missiles.modular.system.dto.DeviceLocationDTO;
-import com.casic.missiles.modular.system.dto.WorkerLocationDTO;
-import com.casic.missiles.modular.system.service.IBusAlarmService;
-import com.casic.missiles.modular.system.service.IProjectDeviceService;
-import com.casic.missiles.modular.system.service.IProjectWorkerService;
-import io.swagger.annotations.*;
-import lombok.RequiredArgsConstructor;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.ResponseBody;
-
-import static com.casic.missiles.model.response.ResponseData.DEFAULT_SUCCESS_MESSAGE;
-import static com.casic.missiles.modular.system.consts.AlarmConst.ALARM_STATUS_ON;
-
-@Api(tags = "首页看板接口")
-@Controller
-@RequestMapping("overview")
-@RequiredArgsConstructor
-public class OverviewController {
-
-    private final IBusAlarmService alarmService;
-    private final IProjectDeviceService projectDeviceService;
-
-    private final IProjectWorkerService projectWorkerService;
-
-
-    @ApiOperation("报警统计接口")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "projectId", value = "作业ID",dataType = "Long", paramType = "query", example = "0")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = AlarmTypeCountDTO.class),
-    })
-    @GetMapping("/alarmCount")
-    @ResponseBody
-    public Object alarmCount(Long projectId){
-        return ResponseData.success(alarmService.alarmCount(projectId,ALARM_STATUS_ON));
-    }
-
-    @ApiOperation("设备列表接口")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "projectId", value = "作业ID",dataType = "Long", paramType = "query", example = "0")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = DeviceLocationDTO.class),
-    })
-    @GetMapping("/deviceList")
-    @ResponseBody
-    public Object deviceList(Long projectId){
-        return ResponseData.success(projectDeviceService.selectDeviceLocationList(projectId));
-    }
-
-    @ApiOperation("人员列表接口")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "projectId", value = "作业ID",dataType = "Long", paramType = "query", example = "0")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = WorkerLocationDTO.class),
-    })
-    @GetMapping("/workerList")
-    @ResponseBody
-    public Object workerList(Long projectId){
-        return ResponseData.success(projectWorkerService.selectWorkerLocationDTO(projectId));
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/WorkSiteInfoController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/WorkSiteInfoController.java
deleted file mode 100644
index af36d69..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/WorkSiteInfoController.java
+++ /dev/null
@@ -1,130 +0,0 @@
-package com.casic.missiles.modular.system.controller;
-
-
-import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.core.base.controller.BaseController;
-import com.casic.missiles.core.page.PageFactory;
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.WorkSiteDetailDTO;
-import com.casic.missiles.modular.system.entity.WorkSiteInfo;
-import com.casic.missiles.modular.system.service.IWorkSiteInfoService;
-import io.swagger.annotations.*;
-import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.*;
-
-import org.springframework.stereotype.Controller;
-
-import java.util.List;
-
-import static com.casic.missiles.model.response.ResponseData.DEFAULT_SUCCESS_MESSAGE;
-
-/**
- * <p>
- * 作业现场表 前端控制器
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@Controller
-@RequestMapping("/site")
-@Api(tags = "作业现场管理")
-@RequiredArgsConstructor
-public class WorkSiteInfoController extends BaseController {
-
-
-    private final IWorkSiteInfoService workSiteInfoService;
-
-    @ApiOperation("新增作业现场")
-    @PostMapping("add")
-    @ResponseBody
-    public Object addWorkSite(@RequestBody WorkSiteDetailDTO workSiteDetailDTO){
-        workSiteInfoService.addWorkSiteInfo(workSiteDetailDTO);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("编辑作业现场")
-    @PostMapping("update")
-    @ResponseBody
-    public Object updateWorkSite(@RequestBody WorkSiteDetailDTO workSiteDetailDTO){
-        workSiteInfoService.updateWorkSiteInfo(workSiteDetailDTO);
-        return ResponseData.success();
-    }
-
-
-    @ApiOperation("删除作业现场")
-    @PostMapping("delete")
-    @ResponseBody
-    public Object delete(@ApiParam("作业现场id列表")@RequestBody List<Long> projectIds){
-        workSiteInfoService.deleteProjects(projectIds);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("查询作业现场详情")
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = WorkSiteDetailDTO.class),
-    })
-    @GetMapping("detail")
-    @ResponseBody
-    public Object delete(@ApiParam(value = "作业现场id", example = "0")@RequestParam Long projectId){
-        WorkSiteDetailDTO detailDTO = workSiteInfoService.getWorkSiteDetail(projectId);
-        return ResponseData.success(detailDTO);
-    }
-
-    @ApiOperation("分页列表查询")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "workTitle",value = "作业名称", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "workRoad",value = "所属道路", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "workPersonName",value = "责任人姓名", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "startDate",value = "注册开始日期", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "endDate",value = "注册结束日期", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "projectState",value = "当前状态（字典值）", dataType = "String", paramType = "query")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = WorkSiteInfo.class),
-    })
-    @GetMapping("listPage")
-    @ResponseBody
-    public Object listPage(String workTitle,String workRoad,String workPersonName,String projectState,String startDate,String endDate){
-        Page<WorkSiteInfo> page = PageFactory.defaultPage();
-        QueryWrapper<WorkSiteInfo> queryWrapper = new QueryWrapper<>();
-        if(StrUtil.isNotEmpty(workTitle)){
-            queryWrapper.like("WORK_TITLE",workTitle);
-        }
-        if(StrUtil.isNotEmpty(workRoad)){
-            queryWrapper.like("WORK_ROAD",workRoad);
-        }
-        if(StrUtil.isNotEmpty(workPersonName)){
-            queryWrapper.like("WORKER_NAME",workPersonName);
-        }
-        if(StrUtil.isNotEmpty(projectState)){
-            queryWrapper.eq("PROJECT_STATE",projectState);
-        }
-        if(StrUtil.isNotEmpty(startDate)){
-            queryWrapper.ge("br_work_site_info.CREATE_TIME",startDate + " 00:00:00");
-        }
-        if(StrUtil.isNotEmpty(endDate)){
-            queryWrapper.le("br_work_site_info.CREATE_TIME",endDate + " 23:59:59");
-        }
-        page = workSiteInfoService.selectListPage(page,queryWrapper);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-    @ApiOperation("开始作业")
-    @PostMapping("start")
-    @ResponseBody
-    public Object start(@ApiParam(value = "作业现场id",example = "0")@RequestParam Long projectId){
-        workSiteInfoService.start(projectId);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("完成作业")
-    @PostMapping("finish")
-    @ResponseBody
-    public Object finish(@ApiParam(value = "作业现场id", example = "0")@RequestParam Long projectId){
-        workSiteInfoService.finish(projectId);
-        return ResponseData.success();
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/WorkerController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/WorkerController.java
deleted file mode 100644
index 796f94c..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/WorkerController.java
+++ /dev/null
@@ -1,136 +0,0 @@
-package com.casic.missiles.modular.system.controller;
-
-
-import cn.hutool.core.util.ObjectUtil;
-import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.core.base.controller.BaseController;
-import com.casic.missiles.core.page.PageFactory;
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.DeviceDetailDTO;
-import com.casic.missiles.modular.system.entity.Device;
-import com.casic.missiles.modular.system.entity.Worker;
-import com.casic.missiles.modular.system.service.IWorkerService;
-import io.swagger.annotations.*;
-import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.*;
-
-import org.springframework.stereotype.Controller;
-
-import java.util.Date;
-import java.util.List;
-
-import static com.casic.missiles.model.response.ResponseData.DEFAULT_SUCCESS_MESSAGE;
-
-/**
- * <p>
- *  前端控制器
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@Controller
-@RequestMapping("/worker")
-@RequiredArgsConstructor
-@Api(tags = "人员管理接口")
-public class WorkerController extends BaseController {
-
-    private final IWorkerService workerService;
-
-    @ApiOperation("分页列表查询")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "name",value = "姓名", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "deptId",value = "所属部门", dataType = "Long", paramType = "query", example = "0"),
-            @ApiImplicitParam(name = "status",value = "当前状态（字典值）", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "startDate",value = "注册开始日期", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "endDate",value = "注册结束日期", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "workerType",value = "人员类型（字典值）", dataType = "String", paramType = "query")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = Worker.class),
-    })
-    @GetMapping("listPage")
-    @ResponseBody
-    public Object listPage(String name,Long deptId, String status,String startDate,String endDate,String workerType){
-        Page<Worker> page = PageFactory.defaultPage();
-        QueryWrapper<Worker> queryWrapper = new QueryWrapper<>();
-        if(StrUtil.isNotEmpty(name)){
-            queryWrapper.like("WORKER_NAME",name);
-        }
-        if(ObjectUtil.isNotEmpty(deptId)){
-            queryWrapper.eq("DEPT_ID",deptId);
-        }
-        if(StrUtil.isNotEmpty(workerType)){
-            queryWrapper.eq("WORKER_TYPE",workerType);
-        }
-        if(StrUtil.isNotEmpty(startDate)){
-            queryWrapper.ge("CREATE_TIME",startDate + " 00:00:00");
-        }
-        if(StrUtil.isNotEmpty(endDate)){
-            queryWrapper.le("CREATE_TIME",endDate + " 23:59:59");
-        }
-        if(StrUtil.isNotEmpty(status)){
-            queryWrapper.eq("`STATUS`",status);
-        }
-        page = workerService.selectListPage(page,queryWrapper);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-    @ApiOperation("新增人员")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "worker", value = "人员信息", dataType = "Worker", paramType = "body", required = true),
-            @ApiImplicitParam(name = "projectId", value = "项目ID(入场申请需要)", dataType = "Long", paramType = "query", example = "0")
-    })
-    @PostMapping("add")
-    @ResponseBody
-    public Object add(@ApiParam("worker")@RequestBody Worker worker,
-                      @RequestParam(required = false) Long projectId){
-        workerService.addWorker(worker,projectId);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("编辑人员")
-    @PostMapping("update")
-    @ResponseBody
-    public Object update(@RequestBody Worker worker){
-        workerService.updateById(worker);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("删除人员")
-    @PostMapping("delete")
-    @ResponseBody
-    public Object delete(@ApiParam("人员id列表")@RequestBody List<Long> workIds){
-        workerService.removeByIds(workIds);
-        return ResponseData.success();
-    }
-
-
-    @ApiOperation(value = "获取人脸图片",notes = "返回人脸图片url")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "cameraIp",value = "摄像头IP", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "cameraPort",value = "摄像头端口号", dataType = "String", paramType = "query"),
-    })
-    @GetMapping("/face/register")
-    @ResponseBody
-    public Object faceRegister(String cameraIp,String cameraPort){
-        return ResponseData.success(workerService.faceRegister(cameraIp, cameraPort));
-    }
-
-
-    @ApiOperation(value = "查询临时入场人员列表")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "projectId", value = "项目ID",required = true,dataType = "Long", paramType = "query", example = "0")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = Worker.class),
-    })
-    @GetMapping("/projectTempWorker")
-    @ResponseBody
-    public Object projectTempWorker(Long projectId){
-        return ResponseData.success(workerService.projectTempWorker(projectId));
-    }
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/AlarmTypeCountDTO.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/AlarmTypeCountDTO.java
deleted file mode 100644
index 1a165a1..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/AlarmTypeCountDTO.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.casic.missiles.modular.system.dto;
-
-import io.swagger.annotations.ApiModel;
-import lombok.Data;
-
-@ApiModel(value = "AlarmTypeCountDTO",description = "报警类型统计（首页）")
-@Data
-public class AlarmTypeCountDTO {
-
-    private String alarmType;
-    private String alarmTypeName;
-    private Integer alarmCount;
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/AlarmUpload.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/AlarmUpload.java
deleted file mode 100644
index 73d7799..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/AlarmUpload.java
+++ /dev/null
@@ -1,46 +0,0 @@
-package com.casic.missiles.modular.system.dto;
-
-import cn.hutool.core.util.StrUtil;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-@ApiModel(value = "AlarmUpload",description = "报警上传")
-@Data
-public class AlarmUpload {
-
-    @ApiModelProperty(value = "摄像头ip")
-    private String cameraIp;
-
-    @ApiModelProperty(value = "摄像头端口")
-    private String cameraPort;
-    @ApiModelProperty(value = "安全树甲烷设备ip")
-    private String gasIp;
-    @ApiModelProperty(value = "安全树甲烷设备端口")
-    private String gasPort;
-    @ApiModelProperty(value = "报警值")
-    private String alarmValue;
-    @ApiModelProperty(value = "报警时间")
-    private String alarmTime;
-    @ApiModelProperty(value = "报警类型")
-    private String alarmType;
-    @ApiModelProperty(value = "报警图片")
-    private String alarmImage;
-    @ApiModelProperty(value = "报警内容")
-    private String alarmContent;
-
-    @Override
-    public String toString() {
-        return "AlarmUpload{" +
-                "cameraIp='" + cameraIp + '\'' +
-                ", cameraPort='" + cameraPort + '\'' +
-                ", gasIp='" + gasIp + '\'' +
-                ", gasPort='" + gasPort + '\'' +
-                ", alarmValue='" + alarmValue + '\'' +
-                ", alarmTime='" + alarmTime + '\'' +
-                ", alarmType='" + alarmType + '\'' +
-                ", alarmImage='" + (StrUtil.isNotEmpty(alarmImage) ? alarmImage.substring(0,50) : "null") + '\'' +
-                ", alarmContent='" + alarmContent + '\'' +
-                '}';
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/DeviceDetailDTO.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/DeviceDetailDTO.java
deleted file mode 100644
index ea518d9..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/DeviceDetailDTO.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package com.casic.missiles.modular.system.dto;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.casic.missiles.modular.system.entity.Device;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-@ApiModel("DeviceDetailDTO")
-@Data
-public class DeviceDetailDTO extends Device {
-
-    @ApiModelProperty(value = "摄像头编号")
-    private String cameraCode;
-
-    @ApiModelProperty(value = "摄像头IP")
-    private String cameraIp;
-
-    @ApiModelProperty(value = "摄像头端口")
-    private String cameraPort;
-
-    @ApiModelProperty(value = "激甲编号")
-    private String gasCode;
-
-    @ApiModelProperty(value = "激甲IP")
-    private String gasIp;
-
-    @ApiModelProperty(value = "激甲端口")
-    private String gasPort;
-
-    @ApiModelProperty(value = "智能帽衬编号")
-    private String hatLiningCode;
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/WorkSiteDetailDTO.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/WorkSiteDetailDTO.java
deleted file mode 100644
index 29378ff..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/WorkSiteDetailDTO.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package com.casic.missiles.modular.system.dto;
-
-import com.casic.missiles.modular.system.entity.ProjectDevice;
-import com.casic.missiles.modular.system.entity.ProjectWorker;
-import com.casic.missiles.modular.system.entity.WorkSiteInfo;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.util.List;
-
-@Data
-@ApiModel("WorkSiteDetailDTO")
-public class WorkSiteDetailDTO extends WorkSiteInfo {
-
-    @ApiModelProperty(value = "安全树列表",dataType = "ProjectDevice")
-    private List<ProjectDevice> deviceList;
-
-    @ApiModelProperty(value = "人员列表",dataType = "ProjectWorker")
-    private List<ProjectWorker> workerList;
-
-
-
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/WorkerLocationDTO.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/WorkerLocationDTO.java
deleted file mode 100644
index 6fd7b24..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/WorkerLocationDTO.java
+++ /dev/null
@@ -1,68 +0,0 @@
-package com.casic.missiles.modular.system.dto;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-@ApiModel(value = "WorkerLocationDTO",description = "人员位置列表（首页）")
-@Data
-public class WorkerLocationDTO {
-
-    @ApiModelProperty("人员ID")
-    private Long workerId;
-
-    @ApiModelProperty("人员姓名")
-    private String workerName;
-
-    @ApiModelProperty("安全帽编号")
-    private String hatCode;
-
-    @ApiModelProperty("安全帽ID")
-    private Long hatId;
-
-    @ApiModelProperty("背心编号")
-    private String vastCode;
-
-    @ApiModelProperty("手环编号")
-    private String braceletCode;
-
-    @ApiModelProperty("位置")
-    private String location;
-
-    @ApiModelProperty("时间")
-    private String time;
-
-    @ApiModelProperty("经度")
-    private String lng;
-
-    @ApiModelProperty("纬度")
-    private String lat;
-
-    @ApiModelProperty("心率")
-    private String heartRate;
-
-    @ApiModelProperty("血氧")
-    private String bloodOxygen;
-
-    @ApiModelProperty("一氧化碳")
-    private String co;
-
-    @ApiModelProperty("甲烷")
-    private String gas;
-
-    @ApiModelProperty("硫化氢")
-    private String h2s;
-
-    @ApiModelProperty("氧气")
-    private String o2;
-
-    @ApiModelProperty("信号")
-    private String signal;
-
-    @ApiModelProperty("电量")
-    private String cell;
-
-    @ApiModelProperty("是否报警")
-    private boolean alarmFlag;
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Alarm.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Alarm.java
new file mode 100644
index 0000000..4d2b7ef
--- /dev/null
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Alarm.java
@@ -0,0 +1,103 @@
+package com.casic.missiles.modular.system.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import java.util.Date;
+
+/**
+ * <p>
+ * 报警记录表
+ * </p>
+ *
+ * @author zyj
+ * @since 2023-05-25
+ */
+@Data
+@TableName("bus_alarm")
+public class Alarm implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    @TableId(value = "ID",type = IdType.ASSIGN_ID)
+    private Long id;
+
+    /**
+     * 设备ID
+     */
+    @TableField("DEVICE_ID")
+    private Long deviceId;
+
+    /**
+     * 报警类型
+     */
+    @TableField("ALARM_TYPE")
+    private String alarmType;
+
+    /**
+     * 报警时间
+     */
+    @TableField("ALARM_TIME")
+    private Date alarmTime;
+
+    /**
+     * 报警状态
+     */
+    @TableField("ALARM_STATUS")
+    private String alarmStatus;
+
+    /**
+     * 报警位置
+     */
+    @TableField("ALARM_LOCATION")
+    private String alarmLocation;
+
+    /**
+     * 报警图片
+     */
+    @TableField("ALARM_IMAGE")
+    private String alarmImage;
+
+    /**
+     * 视频通道号
+     */
+    @TableField("CHANNEL_NO")
+    private Integer channelNo;
+
+    /**
+     * 报警内容
+     */
+    @TableField("ALARM_CONTENT")
+    private String alarmContent;
+
+    /**
+     * 消警时间
+     */
+    @TableField("CANCEL_TIME")
+    private Date cancelTime;
+
+
+    @Override
+    public String toString() {
+        return "Alarm{" +
+            "id=" + id +
+            ", deviceId=" + deviceId +
+            ", alarmType=" + alarmType +
+            ", alarmTime=" + alarmTime +
+            ", alarmStatus=" + alarmStatus +
+            ", alarmLocation=" + alarmLocation +
+            ", alarmImage=" + alarmImage +
+            ", channelNo=" + channelNo +
+            ", alarmContent=" + alarmContent +
+            ", cancelTime=" + cancelTime +
+        "}";
+    }
+}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusAlarm.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusAlarm.java
deleted file mode 100644
index efb4a23..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusAlarm.java
+++ /dev/null
@@ -1,159 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.alibaba.fastjson.annotation.JSONField;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.time.LocalDateTime;
-import java.util.Date;
-
-/**
- * <p>
- * 报警记录表
- * </p>
- *
- * @author zyj
- * @since 2023-05-16
- */
-@Data
-@ApiModel("Alarm")
-@TableName("br_bus_alarm")
-public class BusAlarm implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 项目ID
-     */
-    @ApiModelProperty(value = "项目ID")
-    @TableField("PROJECT_ID")
-    private Long projectId;
-
-    /**
-     * 设备ID
-     */
-    @ApiModelProperty(value = "设备ID")
-    @TableField("DEVICE_ID")
-    private Long deviceId;
-
-    /**
-     * 报警类型
-     */
-    @ApiModelProperty(value = "报警类型")
-    @TableField("ALARM_TYPE")
-    private String alarmType;
-
-    /**
-     * 报警状态
-     */
-    @ApiModelProperty(value = "报警状态")
-    @TableField("ALARM_STATUS")
-    private String alarmStatus;
-
-    /**
-     * 报警值
-     */
-    @ApiModelProperty(value = "报警值")
-    @TableField("ALARM_VALUE")
-    private String alarmValue;
-
-    /**
-     * 报警图片
-     */
-    @ApiModelProperty(value = "报警图片")
-    @TableField("ALARM_IMAGE")
-    private String alarmImage;
-
-    /**
-     * 报警内容
-     */
-    @ApiModelProperty(value = "报警内容")
-    @TableField("ALARM_CONTENT")
-    private String alarmContent;
-
-    /**
-     * 报警时间
-     */
-    @ApiModelProperty(value = "报警时间")
-    @TableField("ALARM_TIME")
-    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
-    private Date alarmTime;
-
-    /**
-     * 消警时间
-     */
-    @ApiModelProperty(value = "消警时间")
-    @TableField("CANCEL_TIME")
-    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
-    private Date cancelTime;
-
-    /**
-     * 报警位置经度
-     */
-    @ApiModelProperty(value = "报警位置经度")
-    @TableField("ALARM_LNG")
-    private String alarmLng;
-
-    /**
-     * 报警位置纬度
-     */
-    @ApiModelProperty(value = "报警位置纬度")
-    @TableField("ALARM_LAT")
-    private String alarmLat;
-
-    @ApiModelProperty("报警类型名称")
-    @TableField(exist = false)
-    private String alarmStatusName;
-    @ApiModelProperty("报警类型名称")
-    @TableField(exist = false)
-    private String alarmTypeName;
-    @ApiModelProperty("作业名称")
-    @TableField(exist = false)
-    private String workTitle;
-    @ApiModelProperty("所属道路")
-    @TableField(exist = false)
-    private String workRoad;
-    @ApiModelProperty("作业状态")
-    @TableField(exist = false)
-    private String projectState;
-    @ApiModelProperty("作业状态名称")
-    @TableField(exist = false)
-    private String projectStateName;
-    @ApiModelProperty("负责人姓名")
-    @TableField(exist = false)
-    private String workPersonName;
-    @ApiModelProperty("负责人联系方式")
-    @TableField(exist = false)
-    private String workPersonPhoneNumber;
-
-
-    @Override
-    public String toString() {
-        return "BusAlarm{" +
-                "id=" + id +
-                ", projectId=" + projectId +
-                ", deviceId=" + deviceId +
-                ", alarmType=" + alarmType +
-                ", alarmValue=" + alarmValue +
-                ", alarmStatus=" + alarmStatus +
-                ", alarmImage=" + alarmImage +
-                ", alarmContent=" + alarmContent +
-                ", alarmTime=" + alarmTime +
-                ", cancelTime=" + cancelTime +
-                ", alarmLng=" + alarmLng +
-                ", alarmLat=" + alarmLat +
-                "}";
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusEvent.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusEvent.java
deleted file mode 100644
index a0b7543..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusEvent.java
+++ /dev/null
@@ -1,100 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.time.LocalDateTime;
-import java.util.Date;
-import java.util.List;
-
-/**
- * <p>
- * 事件表
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@TableName("br_bus_event")
-@Data
-@ApiModel("BusEvent")
-public class BusEvent implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @ApiModelProperty("事件ID")
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 事件标题
-     */
-    @ApiModelProperty("事件名称")
-    @TableField("EVENT_TITLE")
-    private String eventTitle;
-
-    /**
-     * 上报人员
-     */
-    @ApiModelProperty("上报人员")
-    @TableField("UPLOAD_NAME")
-    private String uploadName;
-
-    /**
-     * 联系方式
-     */
-    @ApiModelProperty("联系方式")
-    @TableField("PHONE_NUMBER")
-    private String phoneNumber;
-
-    /**
-     * 事件描述
-     */
-    @ApiModelProperty("事件描述")
-    @TableField("EVENT_DESCRIPTION")
-    private String eventDescription;
-
-    @ApiModelProperty("经度")
-    @TableField("LNG")
-    private String lng;
-
-    @ApiModelProperty("纬度")
-    @TableField("LAT")
-    private String lat;
-
-    /**
-     * 事件上传时间
-     */
-    @ApiModelProperty("事件上传时间")
-    @TableField("CREATE_TIME")
-    private Date createTime;
-
-    @ApiModelProperty("事件照片")
-    @TableField(exist = false)
-    private List<BusEventImage> imageList;
-
-
-
-    @Override
-    public String toString() {
-        return "BusEvent{" +
-            "id=" + id +
-            ", eventTitle=" + eventTitle +
-            ", uploadName=" + uploadName +
-            ", phoneNumber=" + phoneNumber +
-            ", eventDescription=" + eventDescription +
-            ", lng=" + lng +
-            ", lat=" + lat +
-            ", createTime=" + createTime +
-        "}";
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusEventImage.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusEventImage.java
deleted file mode 100644
index 1e75245..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusEventImage.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-
-/**
- * <p>
- * 事件图片表
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@TableName("br_bus_event_image")
-@Data
-@ApiModel("BusEventImage")
-public class BusEventImage implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 事件ID
-     */
-    @TableField("EVENT_ID")
-    private Long eventId;
-
-    /**
-     * 报警图片
-     */
-    @TableField("IMAGE")
-    @ApiModelProperty("图片url")
-    private String image;
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Device.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Device.java
index df89c70..ea7db5f 100644
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Device.java
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Device.java
@@ -1,30 +1,23 @@
 package com.casic.missiles.modular.system.entity;
 
-import com.alibaba.fastjson.annotation.JSONField;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.casic.missiles.core.base.json.DateDeserializer;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
-import java.util.Date;
 
 /**
  * <p>
- * 
+ * 设备记录表
  * </p>
  *
  * @author zyj
- * @since 2023-04-14
+ * @since 2023-05-25
  */
-@ApiModel("Device")
-@TableName("br_device")
 @Data
+@TableName("bus_device")
 public class Device implements Serializable {
 
     private static final long serialVersionUID = 1L;
@@ -32,82 +25,86 @@
     /**
      * 主键
      */
-    @ApiModelProperty(value = "设备ID")
     @TableId(value = "ID",type = IdType.ASSIGN_ID)
     private Long id;
 
     /**
-     * 设备编号
+     * 设备名称
      */
-    @ApiModelProperty(value = "设备编号")
-    @TableField("DEVICE_CODE")
-    private String deviceCode;
+    @TableField("DEVICE_NAME")
+    private String deviceName;
 
     /**
-     * 设备类型
+     * IP
      */
-    @ApiModelProperty(value = "设备类型")
-    @TableField("DEVICE_TYPE")
-    private String deviceType;
+    @TableField("IP")
+    private String ip;
 
     /**
-     * 设备批次
+     * 端口
      */
-    @ApiModelProperty(value = "设备批次")
-    @TableField("DEVICE_BATCH")
-    private String deviceBatch;
+    @TableField("PORT")
+    private String port;
 
     /**
-     * 厂家
+     * 用户名
      */
-    @ApiModelProperty(value = "厂家")
-    @TableField("MANUFACTURER")
-    private String manufacturer;
+    @TableField("USER_NAME")
+    private String userName;
 
     /**
-     * 是否供电
+     * 密码
      */
-    @ApiModelProperty(value = "是否供电")
-    @TableField("IS_POWER_SUPPLY")
-    private String isPowerSupply;
+    @TableField("PASSWORD")
+    private String password;
 
     /**
-     * 创建时间
+     * 连接类型
      */
-    @ApiModelProperty(value = "创建时间",dataType = "Date")
-    @TableField("CREATE_TIME")
-    private Date createTime;
+    @TableField("CONNECT_TYPE")
+    private String connectType;
 
-    @ApiModelProperty(value = "设备类型名称")
-    @TableField(exist = false)
-    private String deviceTypeName;
+    /**
+     * 位置
+     */
+    @TableField("LOCATION")
 
-    @ApiModelProperty(value = "是否供电名称")
-    @TableField(exist = false)
-    private String isPowerSupplyName;
+    private String location;
 
-    @ApiModelProperty(value = "注册时间",dataType = "String")
-    @TableField(exist = false)
-    private String registerTime;
+    /**
+     * 设备状态
+     */
+    @TableField("STATUS")
 
-    @ApiModelProperty(value = "当前状态")
-    @TableField(exist = false)
     private String status;
 
-    @ApiModelProperty(value = "当前状态名称")
-    @TableField(exist = false)
-    private String statusName;
+    /**
+     * 报警分组
+     */
+    @TableField("ALARM_GROUP")
+
+    private Long alarmGroup;
+
+    /**
+     * 视频通道数(预留)
+     */
+    @TableField("CHANNEL_NUM")
+    private Integer channelNum;
 
     @Override
     public String toString() {
         return "Device{" +
             "id=" + id +
-            ", deviceCode=" + deviceCode +
-            ", deviceType=" + deviceType +
-            ", deviceBatch=" + deviceBatch +
-            ", manufacturer=" + manufacturer +
-            ", isPowerSupply=" + isPowerSupply +
-            ", createTime=" + createTime +
+            ", deviceName=" + deviceName +
+            ", ip=" + ip +
+            ", port=" + port +
+            ", userName=" + userName +
+            ", password=" + password +
+            ", connectType=" + connectType +
+            ", location=" + location +
+            ", status=" + status +
+            ", alarmGroup=" + alarmGroup +
+            ", channelNum=" + channelNum +
         "}";
     }
 }
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/DeviceExt.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/DeviceExt.java
deleted file mode 100644
index 5ee7015..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/DeviceExt.java
+++ /dev/null
@@ -1,99 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-
-/**
- * <p>
- * 设备扩展信息表（安全树）
- * </p>
- *
- * @author zyj
- * @since 2023-04-27
- */
-@Data
-@TableName("br_device_ext")
-public class DeviceExt implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 设备ID
-     */
-    @TableField("DEVICE_ID")
-    private Long deviceId;
-
-    /**
-     * 摄像头编号
-     */
-    @TableField("CAMERA_CODE")
-    private String cameraCode;
-
-    /**
-     * 摄像头IP
-     */
-    @TableField("CAMERA_IP")
-    private String cameraIp;
-
-    /**
-     * 摄像头端口
-     */
-    @TableField("CAMERA_PORT")
-    private String cameraPort;
-
-    /**
-     * 激甲编号
-     */
-    @TableField("GAS_CODE")
-    private String gasCode;
-
-    /**
-     * 激甲IP
-     */
-    @TableField("GAS_IP")
-    private String gasIp;
-
-    /**
-     * 激甲端口
-     */
-    @TableField("GAS_PORT")
-    private String gasPort;
-
-    /**
-     * 甲烷报警阈值
-     */
-    @TableField("GAS_THRESHOLD")
-    private String gasThreshold;
-
-    @TableField(value = "HAT_LINING_CODE")
-    private String hatLiningCode;
-
-
-    @Override
-    public String toString() {
-        return "DeviceExt{" +
-            "id=" + id +
-            ", deviceId=" + deviceId +
-            ", cameraCode=" + cameraCode +
-            ", cameraIp=" + cameraIp +
-            ", cameraPort=" + cameraPort +
-            ", gasCode=" + gasCode +
-            ", gasIp=" + gasIp +
-            ", gasPort=" + gasPort +
-            ", gasThreshold=" + gasThreshold +
-            ", hatLiningCode=" + hatLiningCode +
-        "}";
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/ProjectDevice.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/ProjectDevice.java
deleted file mode 100644
index c4f3472..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/ProjectDevice.java
+++ /dev/null
@@ -1,62 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-
-/**
- * <p>
- * 
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@Data
-@ApiModel("ProjectDevice")
-@TableName("br_project_device")
-public class ProjectDevice implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 作业现场ID
-     */
-    @TableField("PROJECT_ID")
-    private Long projectId;
-
-    /**
-     * 设备ID
-     */
-    @TableField("DEVICE_ID")
-    @ApiModelProperty("设备ID（新增编辑时传）")
-    private Long deviceId;
-
-    /**
-     * 设备编号
-     */
-    @TableField(exist = false)
-    @ApiModelProperty("设备编号（详情中展示，新增编辑不用传）")
-    private String deviceCode;
-
-    @Override
-    public String toString() {
-        return "ProjectDevice{" +
-            "id=" + id +
-            ", projectId=" + projectId +
-            ", deviceId=" + deviceId +
-        "}";
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/ProjectWorker.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/ProjectWorker.java
deleted file mode 100644
index 10b23c4..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/ProjectWorker.java
+++ /dev/null
@@ -1,104 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import java.io.Serializable;
-
-/**
- * <p>
- * 
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@ApiModel("ProjectWorker")
-@TableName("br_project_worker")
-@Data
-@NoArgsConstructor
-@AllArgsConstructor
-public class ProjectWorker implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 作业现场ID
-     */
-    @TableField("PROJECT_ID")
-    private Long projectId;
-
-    /**
-     * 人员ID
-     */
-    @ApiModelProperty("人员ID")
-    @TableField("WORKER_ID")
-    private Long workerId;
-
-    /**
-     * 安全帽编号
-     */
-    @ApiModelProperty("安全帽编号")
-    @TableField("HAT_CODE")
-    private String hatCode;
-
-    /**
-     * 背心编号
-     */
-    @ApiModelProperty("背心编号")
-    @TableField("VAST_CODE")
-    private String vastCode;
-
-    /**
-     * 手环编号
-     */
-    @ApiModelProperty("手环编号")
-    @TableField("BRACELET_CODE")
-    private String braceletCode;
-
-    @ApiModelProperty("人员姓名（详情中展示，新增编辑不用传）")
-    @TableField(exist = false)
-    private String workerName;
-
-    @ApiModelProperty("人员部门ID（详情中展示，新增编辑不用传）")
-    @TableField(exist = false)
-    private String workerDeptId;
-
-    @ApiModelProperty("人员部门名称（详情中展示，新增编辑不用传）")
-    @TableField(exist = false)
-    private String workerDeptName;
-
-    @ApiModelProperty("人员联系方式（详情中展示，新增编辑不用传）")
-    @TableField(exist = false)
-    private String workerPhoneNumber;
-
-    public ProjectWorker(Long projectId, Long workerId) {
-        this.projectId = projectId;
-        this.workerId = workerId;
-    }
-
-    @Override
-    public String toString() {
-        return "ProjectWorker{" +
-            "id=" + id +
-            ", projectId=" + projectId +
-            ", workerId=" + workerId +
-            ", hatCode=" + hatCode +
-            ", vastCode=" + vastCode +
-            ", braceletCode=" + braceletCode +
-        "}";
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/WorkSiteInfo.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/WorkSiteInfo.java
deleted file mode 100644
index fa6f41d..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/WorkSiteInfo.java
+++ /dev/null
@@ -1,130 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.alibaba.fastjson.annotation.JSONField;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.time.LocalDateTime;
-import java.util.Date;
-
-/**
- * <p>
- * 作业现场表
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@ApiModel("WorkSiteInfo")
-@TableName("br_work_site_info")
-@Data
-public class WorkSiteInfo implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @ApiModelProperty("作业现场ID")
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 作业名称
-     */
-    @ApiModelProperty("作业名称")
-    @TableField("WORK_TITLE")
-    private String workTitle;
-
-    /**
-     * 责任人
-     */
-    @ApiModelProperty("责任人（人员ID）")
-    @TableField("WORK_PERSON")
-    private Long workPerson;
-
-    /**
-     * 作业描述
-     */
-    @ApiModelProperty("作业描述")
-    @TableField("WORK_SITE_DESC")
-    private String workSiteDesc;
-
-    /**
-     * 作业状态
-     */
-    @ApiModelProperty("作业状态")
-    @TableField("PROJECT_STATE")
-    private String projectState;
-
-    /**
-     * 所属道路
-     */
-    @ApiModelProperty("所属道路")
-    @TableField("WORK_ROAD")
-    private String workRoad;
-
-    @TableField("IMAGE_URL")
-    private String imageUrl;
-
-    @TableField("CREATE_TIME")
-    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
-    private Date createTime;
-    @TableField("UPDATE_TIME")
-    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
-    private Date updateTime;
-
-    @ApiModelProperty("开始时间")
-    @TableField("START_TIME")
-    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
-    private Date startTime;
-
-    @ApiModelProperty("结束时间")
-    @TableField("FINISH_TIME")
-    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
-    private Date finishTime;
-
-    @ApiModelProperty("负责人姓名（详情中使用，新增编辑不用传）")
-    @TableField(exist = false)
-    private String workPersonName;
-
-    @ApiModelProperty("负责人联系方式（详情中使用，新增编辑不用传）")
-    @TableField(exist = false)
-    private String workPersonPhoneNumber;
-
-    @ApiModelProperty("负责人所属部门ID（详情中使用，新增编辑不用传）")
-    @TableField(exist = false)
-    private Long workPersonDeptId;
-
-    @ApiModelProperty("负责人所属部门名称（详情中使用，新增编辑不用传）")
-    @TableField(exist = false)
-    private String workPersonDeptName;
-
-    @ApiModelProperty(value = "注册时间",dataType = "String")
-    @TableField(exist = false)
-    private String registerTime;
-
-    @ApiModelProperty("作业状态名称")
-    @TableField(exist = false)
-    private String projectStateName;
-
-    @Override
-    public String toString() {
-        return "WorkSiteInfo{" +
-            "id=" + id +
-            ", workTitle=" + workTitle +
-            ", workPerson=" + workPerson +
-            ", workSiteDesc=" + workSiteDesc +
-            ", projectState=" + projectState +
-            ", imageUrl=" + imageUrl +
-            ", updateTime=" + updateTime +
-            ", workRoad=" + workRoad +
-        "}";
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Worker.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Worker.java
deleted file mode 100644
index 28a4daa..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Worker.java
+++ /dev/null
@@ -1,147 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.time.LocalDateTime;
-import java.util.Date;
-
-/**
- * <p>
- * 
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@ApiModel("Worker")
-@TableName("br_worker")
-@Data
-public class Worker implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @ApiModelProperty(value = "人员ID")
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 姓名
-     */
-    @ApiModelProperty(value = "姓名")
-    @TableField("WORKER_NAME")
-    private String workerName;
-
-    /**
-     * 性别
-     */
-    @ApiModelProperty(value = "性别")
-    @TableField("GENDER")
-    private String gender;
-
-    /**
-     * 所属部门
-     */
-    @ApiModelProperty(value = "所属部门(人员管理)")
-    @TableField("DEPT_ID")
-    private Long deptId;
-
-    /**
-     * 所属单位
-     */
-    @ApiModelProperty(value = "所属单位(入场申请中使用)")
-    @TableField("OWNER_SHIP")
-    private String ownerShip;
-
-    /**
-     * 联系方式
-     */
-    @ApiModelProperty(value = "联系方式")
-    @TableField("PHONE_NUMBER")
-    private String phoneNumber;
-
-    /**
-     * 证件号
-     */
-    @ApiModelProperty(value = "证件号")
-    @TableField("ID_CARD_NUMBER")
-    private String idCardNumber;
-
-    /**
-     * 入场原因
-     */
-    @ApiModelProperty(value = "入场原因（入场申请中使用）")
-    @TableField("ENTER_REASON")
-    private String enterReason;
-
-    /**
-     * 入场人脸照片
-     */
-    @ApiModelProperty(value = "人脸照片（照片路径）")
-    @TableField("WORKER_AVATAR")
-    private String workerAvatar;
-
-    /**
-     * 申请入场时间
-     */
-    @ApiModelProperty(value = "注册时间/申请入场时间")
-    @TableField("CREATE_TIME")
-    private Date createTime;
-
-    /**
-     * 人员类型
-     */
-    @ApiModelProperty(value = "人员类型（区分人员管理和入场申请）")
-    @TableField("WORKER_TYPE")
-    private String workerType;
-
-    @ApiModelProperty(value = "性别名称")
-    @TableField(exist = false)
-    private String genderName;
-
-    @ApiModelProperty(value = "部门名称")
-    @TableField(exist = false)
-    private String deptName;
-
-    @ApiModelProperty(value = "注册时间",dataType = "String")
-    @TableField(exist = false)
-    private String registerTime;
-
-    @ApiModelProperty(value = "当前状态")
-    @TableField(exist = false)
-    private String status;
-
-    @ApiModelProperty(value = "当前状态名称")
-    @TableField(exist = false)
-    private String statusName;
-
-    @ApiModelProperty(value = "是否注册(0未注册；1已注册)",allowableValues = "0,1")
-    @TableField(exist = false)
-    private String isRegister;
-
-    @Override
-    public String toString() {
-        return "Worker{" +
-            "id=" + id +
-            ", workerName=" + workerName +
-            ", gender=" + gender +
-            ", deptId=" + deptId +
-            ", ownerShip=" + ownerShip +
-            ", phoneNumber=" + phoneNumber +
-            ", idCardNumber=" + idCardNumber +
-            ", enterReason=" + enterReason +
-            ", workerAvatar=" + workerAvatar +
-            ", createTime=" + createTime +
-            ", workerType=" + workerType +
-        "}";
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/AlarmMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/AlarmMapper.java
new file mode 100644
index 0000000..ea4c8be
--- /dev/null
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/AlarmMapper.java
@@ -0,0 +1,16 @@
+package com.casic.missiles.modular.system.mapper;
+
+import com.casic.missiles.modular.system.entity.Alarm;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 报警记录表 Mapper 接口
+ * </p>
+ *
+ * @author zyj
+ * @since 2023-05-25
+ */
+public interface AlarmMapper extends BaseMapper<Alarm> {
+
+}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/BusAlarmMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/BusAlarmMapper.java
deleted file mode 100644
index 9801742..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/BusAlarmMapper.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package com.casic.missiles.modular.system.mapper;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.modular.system.dto.AlarmTypeCountDTO;
-import com.casic.missiles.modular.system.entity.BusAlarm;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * <p>
- * 报警记录表 Mapper 接口
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface BusAlarmMapper extends BaseMapper<BusAlarm> {
-
-    Page<BusAlarm> listPage(Page<BusAlarm> page,@Param("ew")  QueryWrapper<BusAlarm> queryWrapper);
-
-    void cancelAlarm(@Param("deviceId")Long deviceId,@Param("alarmType") String alarmType);
-
-    List<AlarmTypeCountDTO> alarmCount(@Param("projectId")Long projectId, @Param("alarmStatus")String alarmStatus);
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/BusEventImageMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/BusEventImageMapper.java
deleted file mode 100644
index 9590b7d..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/BusEventImageMapper.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.casic.missiles.modular.system.mapper;
-
-import com.casic.missiles.modular.system.entity.BusEventImage;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * <p>
- * 事件图片表 Mapper 接口
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface BusEventImageMapper extends BaseMapper<BusEventImage> {
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/BusEventMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/BusEventMapper.java
deleted file mode 100644
index 3c85edf..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/BusEventMapper.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.casic.missiles.modular.system.mapper;
-
-import com.casic.missiles.modular.system.entity.BusEvent;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * <p>
- * 事件表 Mapper 接口
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface BusEventMapper extends BaseMapper<BusEvent> {
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/DeviceExtMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/DeviceExtMapper.java
deleted file mode 100644
index 4ca9212..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/DeviceExtMapper.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.casic.missiles.modular.system.mapper;
-
-import com.casic.missiles.modular.system.entity.DeviceExt;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * <p>
- * 设备扩展信息表（安全树） Mapper 接口
- * </p>
- *
- * @author zyj
- * @since 2023-04-27
- */
-public interface DeviceExtMapper extends BaseMapper<DeviceExt> {
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/DeviceMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/DeviceMapper.java
index 444c0c5..3d0bb02 100644
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/DeviceMapper.java
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/DeviceMapper.java
@@ -1,30 +1,16 @@
 package com.casic.missiles.modular.system.mapper;
 
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.modular.system.dto.DeviceDetailDTO;
-import com.casic.missiles.modular.system.dto.HelmetInfoDTO;
 import com.casic.missiles.modular.system.entity.Device;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
 
 /**
  * <p>
- *  Mapper 接口
+ * 设备记录表 Mapper 接口
  * </p>
  *
  * @author zyj
- * @since 2023-04-14
+ * @since 2023-05-25
  */
-@Mapper
 public interface DeviceMapper extends BaseMapper<Device> {
 
-    Page<DeviceDetailDTO> listDetailPage(Page<DeviceDetailDTO> page,@Param("ew") QueryWrapper<DeviceDetailDTO> ew);
-
-     List<Long> selectProjectDevice(@Param("projectId") Long projectId);
-
-    List<HelmetInfoDTO> selectHelmetList(@Param("deviceType")String deviceType);
 }
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/ProjectDeviceMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/ProjectDeviceMapper.java
deleted file mode 100644
index 1d0c14e..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/ProjectDeviceMapper.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package com.casic.missiles.modular.system.mapper;
-
-import com.casic.missiles.modular.system.dto.DeviceLocationDTO;
-import com.casic.missiles.modular.system.entity.ProjectDevice;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * <p>
- *  Mapper 接口
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface ProjectDeviceMapper extends BaseMapper<ProjectDevice> {
-     List<ProjectDevice> selectDetailByProjectId(@Param("projectId") Long projectId);
-
-     List<DeviceLocationDTO> selectDeviceLocationList(@Param("projectId") Long projectId);
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/ProjectWorkerMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/ProjectWorkerMapper.java
deleted file mode 100644
index 58583d1..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/ProjectWorkerMapper.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package com.casic.missiles.modular.system.mapper;
-
-import com.casic.missiles.modular.system.dto.WorkerLocationDTO;
-import com.casic.missiles.modular.system.entity.ProjectWorker;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * <p>
- *  Mapper 接口
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface ProjectWorkerMapper extends BaseMapper<ProjectWorker> {
-
-    List<ProjectWorker> selectDetailByProjectId(@Param("projectId") Long projectId,
-                                                @Param("workerType")String workerType);
-
-    List<WorkerLocationDTO> selectWorkerLocationList(@Param("projectId") Long projectId,
-                                                     @Param("workerType")String workerType);
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/WorkSiteInfoMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/WorkSiteInfoMapper.java
deleted file mode 100644
index a4934d2..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/WorkSiteInfoMapper.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.casic.missiles.modular.system.mapper;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.modular.system.entity.WorkSiteInfo;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Param;
-
-/**
- * <p>
- * 作业现场表 Mapper 接口
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface WorkSiteInfoMapper extends BaseMapper<WorkSiteInfo> {
-
-    Page<WorkSiteInfo> selectListPage(Page<WorkSiteInfo> page,@Param("ew") QueryWrapper<WorkSiteInfo> ew);
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/WorkerMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/WorkerMapper.java
deleted file mode 100644
index 258fb12..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/WorkerMapper.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package com.casic.missiles.modular.system.mapper;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.modular.system.dto.DeviceDetailDTO;
-import com.casic.missiles.modular.system.entity.Worker;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * <p>
- *  Mapper 接口
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface WorkerMapper extends BaseMapper<Worker> {
-
-
-    Page<Worker> selectListPage(Page<Worker> page, @Param("ew") QueryWrapper<Worker> ew);
-
-    List<String> selectWorkerAvatars(@Param("projectId")Long projectId);
-
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/AlarmMapper.xml b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/AlarmMapper.xml
new file mode 100644
index 0000000..25cb4ab
--- /dev/null
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/AlarmMapper.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.modular.system.mapper.AlarmMapper">
+
+</mapper>
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/BusAlarmMapper.xml b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/BusAlarmMapper.xml
deleted file mode 100644
index 595088a..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/BusAlarmMapper.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.casic.missiles.modular.system.mapper.BusAlarmMapper">
-
-    <select id="listPage" resultType="com.casic.missiles.modular.system.entity.BusAlarm">
-        SELECT
-            alarm.ID as id,
-            alarm.DEVICE_ID as deviceId,
-            alarm.PROJECT_ID as projectId,
-            alarm.ALARM_TYPE as alarmType,
-            alarm.ALARM_VALUE as alarmValue,
-            alarm.ALARM_STATUS as alarmStatus,
-            alarm.ALARM_IMAGE AS alarmImage,
-            alarm.ALARM_CONTENT as alarmContent,
-            alarm.ALARM_TIME as alarmTime,
-            alarm.CANCEL_TIME as cancelTime,
-            alarm.ALARM_LNG as alarmLng,
-            alarm.ALARM_LAT as alarmLat,
-            p.WORK_TITLE as workTitle,
-            p.WORK_ROAD as workRoad,
-            p.PROJECT_STATE as projectState,
-            w.WORKER_NAME as workPersonName,
-            w.PHONE_NUMBER as workPersonPhoneNumber
-        FROM
-            `br_bus_alarm` alarm
-                LEFT JOIN br_work_site_info p on alarm.PROJECT_ID = p.ID
-                LEFT JOIN br_worker w on p.WORK_PERSON = w.ID
-        <where>
-            <if test="ew != null">
-                ${ew.sqlSegment}
-            </if>
-        </where>
-    </select>
-
-    <select id="cancelAlarm">
-        update br_bus_alarm
-        set ALARM_STATUS = '1'
-        where DEVICE_ID = #{deviceId}
-          and ALARM_TYPE = #{alarmType}
-          and ALARM_STATUS = '0'
-    </select>
-
-    <select id="alarmCount" resultType="com.casic.missiles.modular.system.dto.AlarmTypeCountDTO">
-        SELECT
-            ALARM_TYPE as alarmType,
-            count(*) as alarmCount
-        from br_bus_alarm
-        <where>
-            <if test="projectId != null and projectId !=''">
-                and PROJECT_ID = #{projectId}
-            </if>
-            <if test="alarmStatus != null and alarmStatus !=''">
-                and ALARM_STATUS = #{alarmStatus}
-            </if>
-        </where>
-        group by ALARM_TYPE
-    </select>
-</mapper>
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/BusEventImageMapper.xml b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/BusEventImageMapper.xml
deleted file mode 100644
index fbc3db3..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/BusEventImageMapper.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.casic.missiles.modular.system.mapper.BusEventImageMapper">
-
-</mapper>
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/BusEventMapper.xml b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/BusEventMapper.xml
deleted file mode 100644
index 627d573..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/BusEventMapper.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.casic.missiles.modular.system.mapper.BusEventMapper">
-
-</mapper>
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/DeviceExtMapper.xml b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/DeviceExtMapper.xml
deleted file mode 100644
index 5321d1c..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/DeviceExtMapper.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.casic.missiles.modular.system.mapper.DeviceExtMapper">
-
-</mapper>
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/DeviceMapper.xml b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/DeviceMapper.xml
index 94262e1..88e7d01 100644
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/DeviceMapper.xml
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/DeviceMapper.xml
@@ -2,96 +2,4 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.casic.missiles.modular.system.mapper.DeviceMapper">
 
-    <select id="listDetailPage" resultType="com.casic.missiles.modular.system.dto.DeviceDetailDTO">
-        select
-        br_device.ID as id,
-        DEVICE_CODE as deviceCode,
-        DEVICE_TYPE as deviceType,
-        DEVICE_BATCH as deviceBatch,
-        MANUFACTURER as manufacturer,
-        IS_POWER_SUPPLY as isPowerSupply,
-        CREATE_TIME as createTime,
-        CAMERA_CODE as cameraCode,
-        CAMERA_IP as cameraIp,
-        CAMERA_PORT as cameraPort,
-        GAS_CODE as gasCode,
-        GAS_IP as gasIp,
-        GAS_PORT as gasPort,
-        HAT_LINING_CODE as hatLiningCode
-        from br_device
-        left join br_device_ext ext on ext.DEVICE_ID = br_device.ID
-        <where>
-            <if test="ew != null">
-                ${ew.sqlSegment}
-            </if>
-        </where>
-    </select>
-
-    <select id="selectProjectDevice" resultType="java.lang.Long">
-        with device_info as (
-            (SELECT
-            d.DEVICE_ID as DEVICE_ID,
-            d.PROJECT_ID as PROJECT_ID,
-            p.PROJECT_STATE as PROJECT_STATE
-            from br_project_device d
-            LEFT JOIN br_work_site_info p on p.ID = d.PROJECT_ID)
-
-            UNION ALL
-
-            (SELECT
-            d1.ID as DEVICE_ID,
-            w1.ID as PROJECT_ID,
-            w1.PROJECT_STATE as PROJECT_STATE
-            FROM br_project_worker pw1
-            LEFT JOIN br_device d1 on pw1.BRACELET_CODE = d1.DEVICE_CODE
-            LEFT JOIN br_work_site_info w1 on pw1.PROJECT_ID = w1.ID)
-
-            UNION ALL
-
-            (SELECT
-            d1.ID as DEVICE_ID,
-            w1.ID as PROJECT_ID,
-            w1.PROJECT_STATE as PROJECT_STATE
-            FROM br_project_worker pw1
-            LEFT JOIN br_device d1 on pw1.HAT_CODE = d1.DEVICE_CODE
-            LEFT JOIN br_work_site_info w1 on pw1.PROJECT_ID = w1.ID)
-
-
-            UNION ALL
-
-            (SELECT
-            d1.ID as DEVICE_ID,
-            w1.ID as PROJECT_ID,
-            w1.PROJECT_STATE as PROJECT_STATE
-            FROM br_project_worker pw1
-            LEFT JOIN br_device d1 on pw1.VAST_CODE = d1.DEVICE_CODE
-            LEFT JOIN br_work_site_info w1 on pw1.PROJECT_ID = w1.ID))
-
-        select DISTINCT DEVICE_ID from device_info
-        <where>
-            DEVICE_ID is not null
-            <choose>
-                <when test="projectId != null and projectId !=''">
-                    and PROJECT_ID = #{projectId}
-                </when>
-                <otherwise>
-                    AND PROJECT_STATE != '3'
-                </otherwise>
-            </choose>
-        </where>
-    </select>
-
-    <select id="selectHelmetList" resultType="com.casic.missiles.modular.system.dto.HelmetInfoDTO">
-        SELECT
-            a.ID AS deviceId,
-            a.DEVICE_CODE AS hatCode,
-            b.HAT_LINING_CODE AS hatLiningCode
-        FROM
-            br_device a
-                LEFT JOIN br_device_ext b ON a.ID = b.DEVICE_ID
-        WHERE
-            a.DEVICE_TYPE = #{deviceType}
-          AND a.DEVICE_CODE IS NOT NULL
-          AND b.HAT_LINING_CODE IS NOT NULL
-    </select>
 </mapper>
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/ProjectDeviceMapper.xml b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/ProjectDeviceMapper.xml
deleted file mode 100644
index c6d1c24..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/ProjectDeviceMapper.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.casic.missiles.modular.system.mapper.ProjectDeviceMapper">
-
-    <select id="selectDetailByProjectId" resultType="com.casic.missiles.modular.system.entity.ProjectDevice">
-        SELECT
-            pd.ID as id,
-            pd.PROJECT_ID as projectId,
-            pd.DEVICE_ID as deviceId,
-            d.DEVICE_CODE as deviceCode
-        from br_project_device pd
-        LEFT JOIN br_device d on pd.DEVICE_ID = d.ID
-        <where>
-            pd.PROJECT_ID = #{projectId}
-        </where>
-    </select>
-
-    <select id="selectDeviceLocationList" resultType="com.casic.missiles.modular.system.dto.DeviceLocationDTO">
-        SELECT
-        d.ID as deviceId,
-        d.DEVICE_TYPE as deviceType,
-        d.DEVICE_CODE as deviceCode,
-        if(EXISTS(select ID from br_bus_alarm WHERE DEVICE_ID = d.ID and ALARM_STATUS = '0'),true,false) as alarmFlag
-        FROM br_project_device pd, br_device d
-        where pd.DEVICE_ID = d.ID
-        and pd.PROJECT_ID = #{projectId}
-    </select>
-
-</mapper>
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/ProjectWorkerMapper.xml b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/ProjectWorkerMapper.xml
deleted file mode 100644
index 8d2de10..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/ProjectWorkerMapper.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.casic.missiles.modular.system.mapper.ProjectWorkerMapper">
-
-    <select id="selectDetailByProjectId" resultType="com.casic.missiles.modular.system.entity.ProjectWorker">
-        SELECT
-            pw.ID as id,
-            pw.PROJECT_ID as projectId,
-            pw.WORKER_ID as workerId,
-            w.WORKER_NAME as workerName,
-            w.DEPT_ID as workerDeptId,
-            pw.HAT_CODE as hatCode,
-            pw.VAST_CODE as vastCode,
-            pw.BRACELET_CODE as braceletCode,
-            w.PHONE_NUMBER as workerPhoneNumber
-        from br_project_worker pw
-        LEFT JOIN br_worker w on pw.WORKER_ID = w.ID
-        <where>
-            pw.PROJECT_ID = #{projectId}
-            <if test="workerType != null and workerType != ''">
-                and w.WORKER_TYPE = #{workerType}
-            </if>
-        </where>
-    </select>
-
-    <select id="selectWorkerLocationList" resultType="com.casic.missiles.modular.system.dto.WorkerLocationDTO">
-        select
-            w.ID as workerId,
-            w.WORKER_NAME as workerName,
-            pw.HAT_CODE as hatCode,
-            hd.ID as hatId,
-            pw.BRACELET_CODE as braceletCode,
-            pw.VAST_CODE as vastCode
-        from br_project_worker pw,br_worker w ,br_device hd
-        WHERE pw.WORKER_ID = w.ID
-          and pw.HAT_CODE = hd.DEVICE_CODE
-          and pw.PROJECT_ID = #{projectId}
-          and w.WORKER_TYPE = #{workerType}
-    </select>
-</mapper>
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/WorkSiteInfoMapper.xml b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/WorkSiteInfoMapper.xml
deleted file mode 100644
index 8f01326..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/WorkSiteInfoMapper.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.casic.missiles.modular.system.mapper.WorkSiteInfoMapper">
-
-    <select id="selectListPage" resultType="com.casic.missiles.modular.system.entity.WorkSiteInfo">
-        SELECT
-            br_work_site_info.ID AS id,
-            WORK_TITLE as workTitle,
-            WORK_ROAD as workRoad,
-            WORK_SITE_DESC as workSiteDesc,
-            WORK_PERSON as workPerson,
-            WORKER_NAME as workPersonName,
-            DEPT_ID as workPersonDeptId,
-            PHONE_NUMBER as workPersonPhoneNumber,
-            PROJECT_STATE as projectState,
-            br_work_site_info.CREATE_TIME AS createTime,
-            br_work_site_info.UPDATE_TIME AS updateTime
-        FROM br_work_site_info
-        LEFT JOIN br_worker w ON br_work_site_info.WORK_PERSON = w.ID
-        <where>
-            <if test="ew != null">
-                ${ew.sqlSegment}
-            </if>
-        </where>
-    </select>
-</mapper>

diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/AlarmController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/AlarmController.java
new file mode 100644
index 0000000..1795cf1
--- /dev/null
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/AlarmController.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.modular.system.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.stereotype.Controller;
+
+/**
+ * <p>
+ * 报警记录表 前端控制器
+ * </p>
+ *
+ * @author zyj
+ * @since 2023-05-25
+ */
+@Controller
+@RequestMapping("/system/alarm")
+public class AlarmController {
+
+}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusAlarmController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusAlarmController.java
deleted file mode 100644
index 1f82ebb..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusAlarmController.java
+++ /dev/null
@@ -1,102 +0,0 @@
-package com.casic.missiles.modular.system.controller;
-
-
-import cn.hutool.core.util.ObjectUtil;
-import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.core.base.controller.BaseController;
-import com.casic.missiles.core.page.PageFactory;
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.AlarmUpload;
-import com.casic.missiles.modular.system.dto.DeviceDetailDTO;
-import com.casic.missiles.modular.system.entity.BusAlarm;
-import com.casic.missiles.modular.system.service.IBusAlarmService;
-import io.swagger.annotations.*;
-import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.*;
-
-import org.springframework.stereotype.Controller;
-
-import static com.casic.missiles.model.response.ResponseData.DEFAULT_SUCCESS_MESSAGE;
-import static com.casic.missiles.modular.system.consts.AlarmConst.ALARM_STATUS_MANUAL_CANCEL;
-
-/**
- * <p>
- * 报警记录表 前端控制器
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@Api(tags = "报警管理接口")
-@Controller
-@RequestMapping("/alarm")
-@RequiredArgsConstructor
-public class BusAlarmController extends BaseController {
-
-    private final IBusAlarmService alarmService;
-
-    @ApiOperation("报警上报接口")
-    @PostMapping("/upload")
-    @ResponseBody
-    public Object upload(@RequestBody AlarmUpload alarmUpload){
-        alarmService.alarmUpload(alarmUpload);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("报警列表分页查询")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "workTitle", value = "作业名称",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "projectId", value = "作业ID",dataType = "Long", paramType = "query",example = "0"),
-            @ApiImplicitParam(name = "alarmStatus", value = "报警状态",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "projectState", value = "作业状态",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "alarmType", value = "报警类型",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "alarmStartTime", value = "报警开始时间",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "alarmEndTime", value = "报警结束时间",dataType = "String", paramType = "query")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = BusAlarm.class),
-    })
-    @GetMapping("/listPage")
-    @ResponseBody
-    public Object listPage(String workTitle,Long projectId,String alarmStatus,String projectState,String alarmType,String alarmStartTime,String alarmEndTime){
-        Page<BusAlarm> page = PageFactory.defaultPage();
-        QueryWrapper<BusAlarm> queryWrapper = new QueryWrapper<>();
-        if(StrUtil.isNotEmpty(workTitle)){
-            queryWrapper.like("p.WORK_TITLE",workTitle);
-        }
-        if(ObjectUtil.isNotEmpty(projectId)){
-            queryWrapper.eq("alarm.PROJECT_ID",projectId);
-        }
-        if(StrUtil.isNotEmpty(alarmStatus)){
-            queryWrapper.eq("alarm.ALARM_STATUS",alarmStatus);
-        }
-        if(StrUtil.isNotEmpty(projectState)){
-            queryWrapper.eq("p.PROJECT_STATE",projectState);
-        }
-        if(StrUtil.isNotEmpty(alarmType)){
-            queryWrapper.eq("alarm.ALARM_TYPE",alarmType);
-        }
-        if(StrUtil.isNotEmpty(alarmStartTime)){
-            queryWrapper.ge("alarm.ALARM_TIME",alarmStartTime);
-        }
-        if(StrUtil.isNotEmpty(alarmEndTime)){
-            queryWrapper.le("alarm.ALARM_TIME",alarmEndTime);
-        }
-        page = alarmService.listPage(page,queryWrapper);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-    @ApiOperation("消警")
-    @PostMapping("/cancel")
-    @ResponseBody
-    public Object cancel(@RequestParam("alarmId") Long alarmId){
-        UpdateWrapper<BusAlarm> updateWrapper = new UpdateWrapper<>();
-        updateWrapper.eq("ID",alarmId);
-        updateWrapper.set("ALARM_STATUS",ALARM_STATUS_MANUAL_CANCEL);
-        alarmService.update(updateWrapper);
-        return ResponseData.success();
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusEventController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusEventController.java
deleted file mode 100644
index dde5aad..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusEventController.java
+++ /dev/null
@@ -1,41 +0,0 @@
-package com.casic.missiles.modular.system.controller;
-
-
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.entity.BusEvent;
-import com.casic.missiles.modular.system.service.IBusEventService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.ResponseBody;
-
-/**
- * <p>
- * 事件表 前端控制器
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@Controller
-@RequestMapping("/event")
-@Api(tags = "事件上报")
-@RequiredArgsConstructor
-public class BusEventController {
-
-    private final IBusEventService eventService;
-
-    @ApiOperation("事件上报")
-    @PostMapping("add")
-    @ResponseBody
-    public Object add(@RequestBody BusEvent busEvent){
-        eventService.saveBusEvent(busEvent);
-        return ResponseData.success();
-    }
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
index 03abc5f..aa50d78 100644
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
@@ -1,121 +1,20 @@
 package com.casic.missiles.modular.system.controller;
 
 
-import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.core.base.controller.BaseController;
-import com.casic.missiles.core.page.PageFactory;
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.DeviceDetailDTO;
-import com.casic.missiles.modular.system.entity.Device;
-import com.casic.missiles.modular.system.service.IDeviceExtService;
-import com.casic.missiles.modular.system.service.IDeviceService;
-import io.swagger.annotations.*;
-import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.RequestMapping;
 
 import org.springframework.stereotype.Controller;
 
-import java.time.LocalDateTime;
-import java.util.Date;
-import java.util.List;
-
-import static com.casic.missiles.model.response.ResponseData.DEFAULT_SUCCESS_MESSAGE;
-
 /**
  * <p>
- *  前端控制器
+ * 设备记录表 前端控制器
  * </p>
  *
  * @author zyj
- * @since 2023-04-14
+ * @since 2023-05-25
  */
-@Api(tags = "设备管理接口")
-@RequiredArgsConstructor
 @Controller
-@RequestMapping("/device")
-public class DeviceController extends BaseController {
-    private final IDeviceService deviceService;
-    private final IDeviceExtService deviceExtService;
-
-    @ApiOperation("设备分页列表")
-    @ApiImplicitParams({
-        @ApiImplicitParam(name = "deviceType", value = "设备类型",dataType = "String", paramType = "query"),
-        @ApiImplicitParam(name = "deviceCode", value = "设备编号",dataType = "String", paramType = "query"),
-        @ApiImplicitParam(name = "status", value = "设备状态",dataType = "String", paramType = "query"),
-        @ApiImplicitParam(name = "projectId", value = "作业ID（如果传此参数，列表中返回该作业使用的设备）",dataType = "Long", paramType = "query", example = "0")
-    })
-    @ApiResponses({
-        @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = DeviceDetailDTO.class),
-    })
-    @GetMapping("listPage")
-    @ResponseBody
-    public Object listPage(String deviceType, String deviceCode, String status,Long projectId){
-        Page<DeviceDetailDTO> page = PageFactory.defaultPage();
-        QueryWrapper<DeviceDetailDTO> queryWrapper = new QueryWrapper<>();
-        if(StrUtil.isNotEmpty(deviceType)){
-            queryWrapper.eq("DEVICE_TYPE",deviceType);
-        }
-        if(StrUtil.isNotEmpty(deviceCode)){
-            queryWrapper.like("DEVICE_CODE",deviceCode);
-        }
-        page = deviceService.listPage(page,queryWrapper,status,projectId);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-    @ApiOperation("新增设备")
-    @PostMapping("add")
-    @ResponseBody
-    public Object add(@RequestBody DeviceDetailDTO deviceDetailDTO){
-        deviceService.saveDevice(deviceDetailDTO);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("编辑设备")
-    @PostMapping("update")
-    @ResponseBody
-    public Object update(@RequestBody DeviceDetailDTO deviceDetailDTO){
-        deviceService.updateDevice(deviceDetailDTO);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("删除设备")
-    @PostMapping("delete")
-    @ResponseBody
-    public Object delete(@ApiParam("设备id列表")@RequestBody List<Long> deviceIds){
-        deviceService.deleteDevices(deviceIds);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("设置甲烷阈值")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "gasIp", value = "安全树甲烷设备IP",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "gasPort", value = "安全树甲烷端口",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "threshold", value = "甲烷阈值",dataType = "String", paramType = "query")
-    })
-    @PostMapping("setThreshold")
-    @ResponseBody
-    public Object setThreshold(String gasIp,String gasPort,String threshold){
-        deviceExtService.setGasThreshold(gasIp, gasPort, threshold);
-        return ResponseData.success();
-    }
-
-
-    @ApiOperation("查询甲烷阈值")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "gasIp", value = "安全树甲烷设备IP",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "gasPort", value = "安全树甲烷端口",dataType = "String", paramType = "query")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = "{\"code\": 200,\"data\": \"100\",\"message\": \"请求成功\",\"success\": true}",response = String.class),
-    })
-    @GetMapping("getThreshold")
-    @ResponseBody
-    public Object getThreshold(String gasIp,String gasPort){
-        String data = deviceExtService.getGasThreshold(gasIp, gasPort);
-        return ResponseData.success(data);
-    }
-
+@RequestMapping("/system/device")
+public class DeviceController {
 
 }
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/OverviewController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/OverviewController.java
deleted file mode 100644
index 7570504..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/OverviewController.java
+++ /dev/null
@@ -1,70 +0,0 @@
-package com.casic.missiles.modular.system.controller;
-
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.AlarmTypeCountDTO;
-import com.casic.missiles.modular.system.dto.DeviceLocationDTO;
-import com.casic.missiles.modular.system.dto.WorkerLocationDTO;
-import com.casic.missiles.modular.system.service.IBusAlarmService;
-import com.casic.missiles.modular.system.service.IProjectDeviceService;
-import com.casic.missiles.modular.system.service.IProjectWorkerService;
-import io.swagger.annotations.*;
-import lombok.RequiredArgsConstructor;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.ResponseBody;
-
-import static com.casic.missiles.model.response.ResponseData.DEFAULT_SUCCESS_MESSAGE;
-import static com.casic.missiles.modular.system.consts.AlarmConst.ALARM_STATUS_ON;
-
-@Api(tags = "首页看板接口")
-@Controller
-@RequestMapping("overview")
-@RequiredArgsConstructor
-public class OverviewController {
-
-    private final IBusAlarmService alarmService;
-    private final IProjectDeviceService projectDeviceService;
-
-    private final IProjectWorkerService projectWorkerService;
-
-
-    @ApiOperation("报警统计接口")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "projectId", value = "作业ID",dataType = "Long", paramType = "query", example = "0")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = AlarmTypeCountDTO.class),
-    })
-    @GetMapping("/alarmCount")
-    @ResponseBody
-    public Object alarmCount(Long projectId){
-        return ResponseData.success(alarmService.alarmCount(projectId,ALARM_STATUS_ON));
-    }
-
-    @ApiOperation("设备列表接口")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "projectId", value = "作业ID",dataType = "Long", paramType = "query", example = "0")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = DeviceLocationDTO.class),
-    })
-    @GetMapping("/deviceList")
-    @ResponseBody
-    public Object deviceList(Long projectId){
-        return ResponseData.success(projectDeviceService.selectDeviceLocationList(projectId));
-    }
-
-    @ApiOperation("人员列表接口")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "projectId", value = "作业ID",dataType = "Long", paramType = "query", example = "0")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = WorkerLocationDTO.class),
-    })
-    @GetMapping("/workerList")
-    @ResponseBody
-    public Object workerList(Long projectId){
-        return ResponseData.success(projectWorkerService.selectWorkerLocationDTO(projectId));
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/WorkSiteInfoController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/WorkSiteInfoController.java
deleted file mode 100644
index af36d69..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/WorkSiteInfoController.java
+++ /dev/null
@@ -1,130 +0,0 @@
-package com.casic.missiles.modular.system.controller;
-
-
-import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.core.base.controller.BaseController;
-import com.casic.missiles.core.page.PageFactory;
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.WorkSiteDetailDTO;
-import com.casic.missiles.modular.system.entity.WorkSiteInfo;
-import com.casic.missiles.modular.system.service.IWorkSiteInfoService;
-import io.swagger.annotations.*;
-import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.*;
-
-import org.springframework.stereotype.Controller;
-
-import java.util.List;
-
-import static com.casic.missiles.model.response.ResponseData.DEFAULT_SUCCESS_MESSAGE;
-
-/**
- * <p>
- * 作业现场表 前端控制器
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@Controller
-@RequestMapping("/site")
-@Api(tags = "作业现场管理")
-@RequiredArgsConstructor
-public class WorkSiteInfoController extends BaseController {
-
-
-    private final IWorkSiteInfoService workSiteInfoService;
-
-    @ApiOperation("新增作业现场")
-    @PostMapping("add")
-    @ResponseBody
-    public Object addWorkSite(@RequestBody WorkSiteDetailDTO workSiteDetailDTO){
-        workSiteInfoService.addWorkSiteInfo(workSiteDetailDTO);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("编辑作业现场")
-    @PostMapping("update")
-    @ResponseBody
-    public Object updateWorkSite(@RequestBody WorkSiteDetailDTO workSiteDetailDTO){
-        workSiteInfoService.updateWorkSiteInfo(workSiteDetailDTO);
-        return ResponseData.success();
-    }
-
-
-    @ApiOperation("删除作业现场")
-    @PostMapping("delete")
-    @ResponseBody
-    public Object delete(@ApiParam("作业现场id列表")@RequestBody List<Long> projectIds){
-        workSiteInfoService.deleteProjects(projectIds);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("查询作业现场详情")
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = WorkSiteDetailDTO.class),
-    })
-    @GetMapping("detail")
-    @ResponseBody
-    public Object delete(@ApiParam(value = "作业现场id", example = "0")@RequestParam Long projectId){
-        WorkSiteDetailDTO detailDTO = workSiteInfoService.getWorkSiteDetail(projectId);
-        return ResponseData.success(detailDTO);
-    }
-
-    @ApiOperation("分页列表查询")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "workTitle",value = "作业名称", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "workRoad",value = "所属道路", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "workPersonName",value = "责任人姓名", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "startDate",value = "注册开始日期", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "endDate",value = "注册结束日期", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "projectState",value = "当前状态（字典值）", dataType = "String", paramType = "query")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = WorkSiteInfo.class),
-    })
-    @GetMapping("listPage")
-    @ResponseBody
-    public Object listPage(String workTitle,String workRoad,String workPersonName,String projectState,String startDate,String endDate){
-        Page<WorkSiteInfo> page = PageFactory.defaultPage();
-        QueryWrapper<WorkSiteInfo> queryWrapper = new QueryWrapper<>();
-        if(StrUtil.isNotEmpty(workTitle)){
-            queryWrapper.like("WORK_TITLE",workTitle);
-        }
-        if(StrUtil.isNotEmpty(workRoad)){
-            queryWrapper.like("WORK_ROAD",workRoad);
-        }
-        if(StrUtil.isNotEmpty(workPersonName)){
-            queryWrapper.like("WORKER_NAME",workPersonName);
-        }
-        if(StrUtil.isNotEmpty(projectState)){
-            queryWrapper.eq("PROJECT_STATE",projectState);
-        }
-        if(StrUtil.isNotEmpty(startDate)){
-            queryWrapper.ge("br_work_site_info.CREATE_TIME",startDate + " 00:00:00");
-        }
-        if(StrUtil.isNotEmpty(endDate)){
-            queryWrapper.le("br_work_site_info.CREATE_TIME",endDate + " 23:59:59");
-        }
-        page = workSiteInfoService.selectListPage(page,queryWrapper);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-    @ApiOperation("开始作业")
-    @PostMapping("start")
-    @ResponseBody
-    public Object start(@ApiParam(value = "作业现场id",example = "0")@RequestParam Long projectId){
-        workSiteInfoService.start(projectId);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("完成作业")
-    @PostMapping("finish")
-    @ResponseBody
-    public Object finish(@ApiParam(value = "作业现场id", example = "0")@RequestParam Long projectId){
-        workSiteInfoService.finish(projectId);
-        return ResponseData.success();
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/WorkerController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/WorkerController.java
deleted file mode 100644
index 796f94c..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/WorkerController.java
+++ /dev/null
@@ -1,136 +0,0 @@
-package com.casic.missiles.modular.system.controller;
-
-
-import cn.hutool.core.util.ObjectUtil;
-import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.core.base.controller.BaseController;
-import com.casic.missiles.core.page.PageFactory;
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.DeviceDetailDTO;
-import com.casic.missiles.modular.system.entity.Device;
-import com.casic.missiles.modular.system.entity.Worker;
-import com.casic.missiles.modular.system.service.IWorkerService;
-import io.swagger.annotations.*;
-import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.*;
-
-import org.springframework.stereotype.Controller;
-
-import java.util.Date;
-import java.util.List;
-
-import static com.casic.missiles.model.response.ResponseData.DEFAULT_SUCCESS_MESSAGE;
-
-/**
- * <p>
- *  前端控制器
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@Controller
-@RequestMapping("/worker")
-@RequiredArgsConstructor
-@Api(tags = "人员管理接口")
-public class WorkerController extends BaseController {
-
-    private final IWorkerService workerService;
-
-    @ApiOperation("分页列表查询")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "name",value = "姓名", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "deptId",value = "所属部门", dataType = "Long", paramType = "query", example = "0"),
-            @ApiImplicitParam(name = "status",value = "当前状态（字典值）", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "startDate",value = "注册开始日期", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "endDate",value = "注册结束日期", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "workerType",value = "人员类型（字典值）", dataType = "String", paramType = "query")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = Worker.class),
-    })
-    @GetMapping("listPage")
-    @ResponseBody
-    public Object listPage(String name,Long deptId, String status,String startDate,String endDate,String workerType){
-        Page<Worker> page = PageFactory.defaultPage();
-        QueryWrapper<Worker> queryWrapper = new QueryWrapper<>();
-        if(StrUtil.isNotEmpty(name)){
-            queryWrapper.like("WORKER_NAME",name);
-        }
-        if(ObjectUtil.isNotEmpty(deptId)){
-            queryWrapper.eq("DEPT_ID",deptId);
-        }
-        if(StrUtil.isNotEmpty(workerType)){
-            queryWrapper.eq("WORKER_TYPE",workerType);
-        }
-        if(StrUtil.isNotEmpty(startDate)){
-            queryWrapper.ge("CREATE_TIME",startDate + " 00:00:00");
-        }
-        if(StrUtil.isNotEmpty(endDate)){
-            queryWrapper.le("CREATE_TIME",endDate + " 23:59:59");
-        }
-        if(StrUtil.isNotEmpty(status)){
-            queryWrapper.eq("`STATUS`",status);
-        }
-        page = workerService.selectListPage(page,queryWrapper);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-    @ApiOperation("新增人员")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "worker", value = "人员信息", dataType = "Worker", paramType = "body", required = true),
-            @ApiImplicitParam(name = "projectId", value = "项目ID(入场申请需要)", dataType = "Long", paramType = "query", example = "0")
-    })
-    @PostMapping("add")
-    @ResponseBody
-    public Object add(@ApiParam("worker")@RequestBody Worker worker,
-                      @RequestParam(required = false) Long projectId){
-        workerService.addWorker(worker,projectId);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("编辑人员")
-    @PostMapping("update")
-    @ResponseBody
-    public Object update(@RequestBody Worker worker){
-        workerService.updateById(worker);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("删除人员")
-    @PostMapping("delete")
-    @ResponseBody
-    public Object delete(@ApiParam("人员id列表")@RequestBody List<Long> workIds){
-        workerService.removeByIds(workIds);
-        return ResponseData.success();
-    }
-
-
-    @ApiOperation(value = "获取人脸图片",notes = "返回人脸图片url")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "cameraIp",value = "摄像头IP", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "cameraPort",value = "摄像头端口号", dataType = "String", paramType = "query"),
-    })
-    @GetMapping("/face/register")
-    @ResponseBody
-    public Object faceRegister(String cameraIp,String cameraPort){
-        return ResponseData.success(workerService.faceRegister(cameraIp, cameraPort));
-    }
-
-
-    @ApiOperation(value = "查询临时入场人员列表")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "projectId", value = "项目ID",required = true,dataType = "Long", paramType = "query", example = "0")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = Worker.class),
-    })
-    @GetMapping("/projectTempWorker")
-    @ResponseBody
-    public Object projectTempWorker(Long projectId){
-        return ResponseData.success(workerService.projectTempWorker(projectId));
-    }
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/AlarmTypeCountDTO.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/AlarmTypeCountDTO.java
deleted file mode 100644
index 1a165a1..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/AlarmTypeCountDTO.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.casic.missiles.modular.system.dto;
-
-import io.swagger.annotations.ApiModel;
-import lombok.Data;
-
-@ApiModel(value = "AlarmTypeCountDTO",description = "报警类型统计（首页）")
-@Data
-public class AlarmTypeCountDTO {
-
-    private String alarmType;
-    private String alarmTypeName;
-    private Integer alarmCount;
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/AlarmUpload.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/AlarmUpload.java
deleted file mode 100644
index 73d7799..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/AlarmUpload.java
+++ /dev/null
@@ -1,46 +0,0 @@
-package com.casic.missiles.modular.system.dto;
-
-import cn.hutool.core.util.StrUtil;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-@ApiModel(value = "AlarmUpload",description = "报警上传")
-@Data
-public class AlarmUpload {
-
-    @ApiModelProperty(value = "摄像头ip")
-    private String cameraIp;
-
-    @ApiModelProperty(value = "摄像头端口")
-    private String cameraPort;
-    @ApiModelProperty(value = "安全树甲烷设备ip")
-    private String gasIp;
-    @ApiModelProperty(value = "安全树甲烷设备端口")
-    private String gasPort;
-    @ApiModelProperty(value = "报警值")
-    private String alarmValue;
-    @ApiModelProperty(value = "报警时间")
-    private String alarmTime;
-    @ApiModelProperty(value = "报警类型")
-    private String alarmType;
-    @ApiModelProperty(value = "报警图片")
-    private String alarmImage;
-    @ApiModelProperty(value = "报警内容")
-    private String alarmContent;
-
-    @Override
-    public String toString() {
-        return "AlarmUpload{" +
-                "cameraIp='" + cameraIp + '\'' +
-                ", cameraPort='" + cameraPort + '\'' +
-                ", gasIp='" + gasIp + '\'' +
-                ", gasPort='" + gasPort + '\'' +
-                ", alarmValue='" + alarmValue + '\'' +
-                ", alarmTime='" + alarmTime + '\'' +
-                ", alarmType='" + alarmType + '\'' +
-                ", alarmImage='" + (StrUtil.isNotEmpty(alarmImage) ? alarmImage.substring(0,50) : "null") + '\'' +
-                ", alarmContent='" + alarmContent + '\'' +
-                '}';
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/DeviceDetailDTO.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/DeviceDetailDTO.java
deleted file mode 100644
index ea518d9..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/DeviceDetailDTO.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package com.casic.missiles.modular.system.dto;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.casic.missiles.modular.system.entity.Device;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-@ApiModel("DeviceDetailDTO")
-@Data
-public class DeviceDetailDTO extends Device {
-
-    @ApiModelProperty(value = "摄像头编号")
-    private String cameraCode;
-
-    @ApiModelProperty(value = "摄像头IP")
-    private String cameraIp;
-
-    @ApiModelProperty(value = "摄像头端口")
-    private String cameraPort;
-
-    @ApiModelProperty(value = "激甲编号")
-    private String gasCode;
-
-    @ApiModelProperty(value = "激甲IP")
-    private String gasIp;
-
-    @ApiModelProperty(value = "激甲端口")
-    private String gasPort;
-
-    @ApiModelProperty(value = "智能帽衬编号")
-    private String hatLiningCode;
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/WorkSiteDetailDTO.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/WorkSiteDetailDTO.java
deleted file mode 100644
index 29378ff..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/WorkSiteDetailDTO.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package com.casic.missiles.modular.system.dto;
-
-import com.casic.missiles.modular.system.entity.ProjectDevice;
-import com.casic.missiles.modular.system.entity.ProjectWorker;
-import com.casic.missiles.modular.system.entity.WorkSiteInfo;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.util.List;
-
-@Data
-@ApiModel("WorkSiteDetailDTO")
-public class WorkSiteDetailDTO extends WorkSiteInfo {
-
-    @ApiModelProperty(value = "安全树列表",dataType = "ProjectDevice")
-    private List<ProjectDevice> deviceList;
-
-    @ApiModelProperty(value = "人员列表",dataType = "ProjectWorker")
-    private List<ProjectWorker> workerList;
-
-
-
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/WorkerLocationDTO.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/WorkerLocationDTO.java
deleted file mode 100644
index 6fd7b24..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/WorkerLocationDTO.java
+++ /dev/null
@@ -1,68 +0,0 @@
-package com.casic.missiles.modular.system.dto;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-@ApiModel(value = "WorkerLocationDTO",description = "人员位置列表（首页）")
-@Data
-public class WorkerLocationDTO {
-
-    @ApiModelProperty("人员ID")
-    private Long workerId;
-
-    @ApiModelProperty("人员姓名")
-    private String workerName;
-
-    @ApiModelProperty("安全帽编号")
-    private String hatCode;
-
-    @ApiModelProperty("安全帽ID")
-    private Long hatId;
-
-    @ApiModelProperty("背心编号")
-    private String vastCode;
-
-    @ApiModelProperty("手环编号")
-    private String braceletCode;
-
-    @ApiModelProperty("位置")
-    private String location;
-
-    @ApiModelProperty("时间")
-    private String time;
-
-    @ApiModelProperty("经度")
-    private String lng;
-
-    @ApiModelProperty("纬度")
-    private String lat;
-
-    @ApiModelProperty("心率")
-    private String heartRate;
-
-    @ApiModelProperty("血氧")
-    private String bloodOxygen;
-
-    @ApiModelProperty("一氧化碳")
-    private String co;
-
-    @ApiModelProperty("甲烷")
-    private String gas;
-
-    @ApiModelProperty("硫化氢")
-    private String h2s;
-
-    @ApiModelProperty("氧气")
-    private String o2;
-
-    @ApiModelProperty("信号")
-    private String signal;
-
-    @ApiModelProperty("电量")
-    private String cell;
-
-    @ApiModelProperty("是否报警")
-    private boolean alarmFlag;
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Alarm.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Alarm.java
new file mode 100644
index 0000000..4d2b7ef
--- /dev/null
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Alarm.java
@@ -0,0 +1,103 @@
+package com.casic.missiles.modular.system.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import java.util.Date;
+
+/**
+ * <p>
+ * 报警记录表
+ * </p>
+ *
+ * @author zyj
+ * @since 2023-05-25
+ */
+@Data
+@TableName("bus_alarm")
+public class Alarm implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    @TableId(value = "ID",type = IdType.ASSIGN_ID)
+    private Long id;
+
+    /**
+     * 设备ID
+     */
+    @TableField("DEVICE_ID")
+    private Long deviceId;
+
+    /**
+     * 报警类型
+     */
+    @TableField("ALARM_TYPE")
+    private String alarmType;
+
+    /**
+     * 报警时间
+     */
+    @TableField("ALARM_TIME")
+    private Date alarmTime;
+
+    /**
+     * 报警状态
+     */
+    @TableField("ALARM_STATUS")
+    private String alarmStatus;
+
+    /**
+     * 报警位置
+     */
+    @TableField("ALARM_LOCATION")
+    private String alarmLocation;
+
+    /**
+     * 报警图片
+     */
+    @TableField("ALARM_IMAGE")
+    private String alarmImage;
+
+    /**
+     * 视频通道号
+     */
+    @TableField("CHANNEL_NO")
+    private Integer channelNo;
+
+    /**
+     * 报警内容
+     */
+    @TableField("ALARM_CONTENT")
+    private String alarmContent;
+
+    /**
+     * 消警时间
+     */
+    @TableField("CANCEL_TIME")
+    private Date cancelTime;
+
+
+    @Override
+    public String toString() {
+        return "Alarm{" +
+            "id=" + id +
+            ", deviceId=" + deviceId +
+            ", alarmType=" + alarmType +
+            ", alarmTime=" + alarmTime +
+            ", alarmStatus=" + alarmStatus +
+            ", alarmLocation=" + alarmLocation +
+            ", alarmImage=" + alarmImage +
+            ", channelNo=" + channelNo +
+            ", alarmContent=" + alarmContent +
+            ", cancelTime=" + cancelTime +
+        "}";
+    }
+}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusAlarm.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusAlarm.java
deleted file mode 100644
index efb4a23..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusAlarm.java
+++ /dev/null
@@ -1,159 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.alibaba.fastjson.annotation.JSONField;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.time.LocalDateTime;
-import java.util.Date;
-
-/**
- * <p>
- * 报警记录表
- * </p>
- *
- * @author zyj
- * @since 2023-05-16
- */
-@Data
-@ApiModel("Alarm")
-@TableName("br_bus_alarm")
-public class BusAlarm implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 项目ID
-     */
-    @ApiModelProperty(value = "项目ID")
-    @TableField("PROJECT_ID")
-    private Long projectId;
-
-    /**
-     * 设备ID
-     */
-    @ApiModelProperty(value = "设备ID")
-    @TableField("DEVICE_ID")
-    private Long deviceId;
-
-    /**
-     * 报警类型
-     */
-    @ApiModelProperty(value = "报警类型")
-    @TableField("ALARM_TYPE")
-    private String alarmType;
-
-    /**
-     * 报警状态
-     */
-    @ApiModelProperty(value = "报警状态")
-    @TableField("ALARM_STATUS")
-    private String alarmStatus;
-
-    /**
-     * 报警值
-     */
-    @ApiModelProperty(value = "报警值")
-    @TableField("ALARM_VALUE")
-    private String alarmValue;
-
-    /**
-     * 报警图片
-     */
-    @ApiModelProperty(value = "报警图片")
-    @TableField("ALARM_IMAGE")
-    private String alarmImage;
-
-    /**
-     * 报警内容
-     */
-    @ApiModelProperty(value = "报警内容")
-    @TableField("ALARM_CONTENT")
-    private String alarmContent;
-
-    /**
-     * 报警时间
-     */
-    @ApiModelProperty(value = "报警时间")
-    @TableField("ALARM_TIME")
-    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
-    private Date alarmTime;
-
-    /**
-     * 消警时间
-     */
-    @ApiModelProperty(value = "消警时间")
-    @TableField("CANCEL_TIME")
-    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
-    private Date cancelTime;
-
-    /**
-     * 报警位置经度
-     */
-    @ApiModelProperty(value = "报警位置经度")
-    @TableField("ALARM_LNG")
-    private String alarmLng;
-
-    /**
-     * 报警位置纬度
-     */
-    @ApiModelProperty(value = "报警位置纬度")
-    @TableField("ALARM_LAT")
-    private String alarmLat;
-
-    @ApiModelProperty("报警类型名称")
-    @TableField(exist = false)
-    private String alarmStatusName;
-    @ApiModelProperty("报警类型名称")
-    @TableField(exist = false)
-    private String alarmTypeName;
-    @ApiModelProperty("作业名称")
-    @TableField(exist = false)
-    private String workTitle;
-    @ApiModelProperty("所属道路")
-    @TableField(exist = false)
-    private String workRoad;
-    @ApiModelProperty("作业状态")
-    @TableField(exist = false)
-    private String projectState;
-    @ApiModelProperty("作业状态名称")
-    @TableField(exist = false)
-    private String projectStateName;
-    @ApiModelProperty("负责人姓名")
-    @TableField(exist = false)
-    private String workPersonName;
-    @ApiModelProperty("负责人联系方式")
-    @TableField(exist = false)
-    private String workPersonPhoneNumber;
-
-
-    @Override
-    public String toString() {
-        return "BusAlarm{" +
-                "id=" + id +
-                ", projectId=" + projectId +
-                ", deviceId=" + deviceId +
-                ", alarmType=" + alarmType +
-                ", alarmValue=" + alarmValue +
-                ", alarmStatus=" + alarmStatus +
-                ", alarmImage=" + alarmImage +
-                ", alarmContent=" + alarmContent +
-                ", alarmTime=" + alarmTime +
-                ", cancelTime=" + cancelTime +
-                ", alarmLng=" + alarmLng +
-                ", alarmLat=" + alarmLat +
-                "}";
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusEvent.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusEvent.java
deleted file mode 100644
index a0b7543..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusEvent.java
+++ /dev/null
@@ -1,100 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.time.LocalDateTime;
-import java.util.Date;
-import java.util.List;
-
-/**
- * <p>
- * 事件表
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@TableName("br_bus_event")
-@Data
-@ApiModel("BusEvent")
-public class BusEvent implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @ApiModelProperty("事件ID")
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 事件标题
-     */
-    @ApiModelProperty("事件名称")
-    @TableField("EVENT_TITLE")
-    private String eventTitle;
-
-    /**
-     * 上报人员
-     */
-    @ApiModelProperty("上报人员")
-    @TableField("UPLOAD_NAME")
-    private String uploadName;
-
-    /**
-     * 联系方式
-     */
-    @ApiModelProperty("联系方式")
-    @TableField("PHONE_NUMBER")
-    private String phoneNumber;
-
-    /**
-     * 事件描述
-     */
-    @ApiModelProperty("事件描述")
-    @TableField("EVENT_DESCRIPTION")
-    private String eventDescription;
-
-    @ApiModelProperty("经度")
-    @TableField("LNG")
-    private String lng;
-
-    @ApiModelProperty("纬度")
-    @TableField("LAT")
-    private String lat;
-
-    /**
-     * 事件上传时间
-     */
-    @ApiModelProperty("事件上传时间")
-    @TableField("CREATE_TIME")
-    private Date createTime;
-
-    @ApiModelProperty("事件照片")
-    @TableField(exist = false)
-    private List<BusEventImage> imageList;
-
-
-
-    @Override
-    public String toString() {
-        return "BusEvent{" +
-            "id=" + id +
-            ", eventTitle=" + eventTitle +
-            ", uploadName=" + uploadName +
-            ", phoneNumber=" + phoneNumber +
-            ", eventDescription=" + eventDescription +
-            ", lng=" + lng +
-            ", lat=" + lat +
-            ", createTime=" + createTime +
-        "}";
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusEventImage.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusEventImage.java
deleted file mode 100644
index 1e75245..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusEventImage.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-
-/**
- * <p>
- * 事件图片表
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@TableName("br_bus_event_image")
-@Data
-@ApiModel("BusEventImage")
-public class BusEventImage implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 事件ID
-     */
-    @TableField("EVENT_ID")
-    private Long eventId;
-
-    /**
-     * 报警图片
-     */
-    @TableField("IMAGE")
-    @ApiModelProperty("图片url")
-    private String image;
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Device.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Device.java
index df89c70..ea7db5f 100644
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Device.java
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Device.java
@@ -1,30 +1,23 @@
 package com.casic.missiles.modular.system.entity;
 
-import com.alibaba.fastjson.annotation.JSONField;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.casic.missiles.core.base.json.DateDeserializer;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
-import java.util.Date;
 
 /**
  * <p>
- * 
+ * 设备记录表
  * </p>
  *
  * @author zyj
- * @since 2023-04-14
+ * @since 2023-05-25
  */
-@ApiModel("Device")
-@TableName("br_device")
 @Data
+@TableName("bus_device")
 public class Device implements Serializable {
 
     private static final long serialVersionUID = 1L;
@@ -32,82 +25,86 @@
     /**
      * 主键
      */
-    @ApiModelProperty(value = "设备ID")
     @TableId(value = "ID",type = IdType.ASSIGN_ID)
     private Long id;
 
     /**
-     * 设备编号
+     * 设备名称
      */
-    @ApiModelProperty(value = "设备编号")
-    @TableField("DEVICE_CODE")
-    private String deviceCode;
+    @TableField("DEVICE_NAME")
+    private String deviceName;
 
     /**
-     * 设备类型
+     * IP
      */
-    @ApiModelProperty(value = "设备类型")
-    @TableField("DEVICE_TYPE")
-    private String deviceType;
+    @TableField("IP")
+    private String ip;
 
     /**
-     * 设备批次
+     * 端口
      */
-    @ApiModelProperty(value = "设备批次")
-    @TableField("DEVICE_BATCH")
-    private String deviceBatch;
+    @TableField("PORT")
+    private String port;
 
     /**
-     * 厂家
+     * 用户名
      */
-    @ApiModelProperty(value = "厂家")
-    @TableField("MANUFACTURER")
-    private String manufacturer;
+    @TableField("USER_NAME")
+    private String userName;
 
     /**
-     * 是否供电
+     * 密码
      */
-    @ApiModelProperty(value = "是否供电")
-    @TableField("IS_POWER_SUPPLY")
-    private String isPowerSupply;
+    @TableField("PASSWORD")
+    private String password;
 
     /**
-     * 创建时间
+     * 连接类型
      */
-    @ApiModelProperty(value = "创建时间",dataType = "Date")
-    @TableField("CREATE_TIME")
-    private Date createTime;
+    @TableField("CONNECT_TYPE")
+    private String connectType;
 
-    @ApiModelProperty(value = "设备类型名称")
-    @TableField(exist = false)
-    private String deviceTypeName;
+    /**
+     * 位置
+     */
+    @TableField("LOCATION")
 
-    @ApiModelProperty(value = "是否供电名称")
-    @TableField(exist = false)
-    private String isPowerSupplyName;
+    private String location;
 
-    @ApiModelProperty(value = "注册时间",dataType = "String")
-    @TableField(exist = false)
-    private String registerTime;
+    /**
+     * 设备状态
+     */
+    @TableField("STATUS")
 
-    @ApiModelProperty(value = "当前状态")
-    @TableField(exist = false)
     private String status;
 
-    @ApiModelProperty(value = "当前状态名称")
-    @TableField(exist = false)
-    private String statusName;
+    /**
+     * 报警分组
+     */
+    @TableField("ALARM_GROUP")
+
+    private Long alarmGroup;
+
+    /**
+     * 视频通道数(预留)
+     */
+    @TableField("CHANNEL_NUM")
+    private Integer channelNum;
 
     @Override
     public String toString() {
         return "Device{" +
             "id=" + id +
-            ", deviceCode=" + deviceCode +
-            ", deviceType=" + deviceType +
-            ", deviceBatch=" + deviceBatch +
-            ", manufacturer=" + manufacturer +
-            ", isPowerSupply=" + isPowerSupply +
-            ", createTime=" + createTime +
+            ", deviceName=" + deviceName +
+            ", ip=" + ip +
+            ", port=" + port +
+            ", userName=" + userName +
+            ", password=" + password +
+            ", connectType=" + connectType +
+            ", location=" + location +
+            ", status=" + status +
+            ", alarmGroup=" + alarmGroup +
+            ", channelNum=" + channelNum +
         "}";
     }
 }
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/DeviceExt.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/DeviceExt.java
deleted file mode 100644
index 5ee7015..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/DeviceExt.java
+++ /dev/null
@@ -1,99 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-
-/**
- * <p>
- * 设备扩展信息表（安全树）
- * </p>
- *
- * @author zyj
- * @since 2023-04-27
- */
-@Data
-@TableName("br_device_ext")
-public class DeviceExt implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 设备ID
-     */
-    @TableField("DEVICE_ID")
-    private Long deviceId;
-
-    /**
-     * 摄像头编号
-     */
-    @TableField("CAMERA_CODE")
-    private String cameraCode;
-
-    /**
-     * 摄像头IP
-     */
-    @TableField("CAMERA_IP")
-    private String cameraIp;
-
-    /**
-     * 摄像头端口
-     */
-    @TableField("CAMERA_PORT")
-    private String cameraPort;
-
-    /**
-     * 激甲编号
-     */
-    @TableField("GAS_CODE")
-    private String gasCode;
-
-    /**
-     * 激甲IP
-     */
-    @TableField("GAS_IP")
-    private String gasIp;
-
-    /**
-     * 激甲端口
-     */
-    @TableField("GAS_PORT")
-    private String gasPort;
-
-    /**
-     * 甲烷报警阈值
-     */
-    @TableField("GAS_THRESHOLD")
-    private String gasThreshold;
-
-    @TableField(value = "HAT_LINING_CODE")
-    private String hatLiningCode;
-
-
-    @Override
-    public String toString() {
-        return "DeviceExt{" +
-            "id=" + id +
-            ", deviceId=" + deviceId +
-            ", cameraCode=" + cameraCode +
-            ", cameraIp=" + cameraIp +
-            ", cameraPort=" + cameraPort +
-            ", gasCode=" + gasCode +
-            ", gasIp=" + gasIp +
-            ", gasPort=" + gasPort +
-            ", gasThreshold=" + gasThreshold +
-            ", hatLiningCode=" + hatLiningCode +
-        "}";
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/ProjectDevice.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/ProjectDevice.java
deleted file mode 100644
index c4f3472..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/ProjectDevice.java
+++ /dev/null
@@ -1,62 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-
-/**
- * <p>
- * 
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@Data
-@ApiModel("ProjectDevice")
-@TableName("br_project_device")
-public class ProjectDevice implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 作业现场ID
-     */
-    @TableField("PROJECT_ID")
-    private Long projectId;
-
-    /**
-     * 设备ID
-     */
-    @TableField("DEVICE_ID")
-    @ApiModelProperty("设备ID（新增编辑时传）")
-    private Long deviceId;
-
-    /**
-     * 设备编号
-     */
-    @TableField(exist = false)
-    @ApiModelProperty("设备编号（详情中展示，新增编辑不用传）")
-    private String deviceCode;
-
-    @Override
-    public String toString() {
-        return "ProjectDevice{" +
-            "id=" + id +
-            ", projectId=" + projectId +
-            ", deviceId=" + deviceId +
-        "}";
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/ProjectWorker.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/ProjectWorker.java
deleted file mode 100644
index 10b23c4..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/ProjectWorker.java
+++ /dev/null
@@ -1,104 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import java.io.Serializable;
-
-/**
- * <p>
- * 
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@ApiModel("ProjectWorker")
-@TableName("br_project_worker")
-@Data
-@NoArgsConstructor
-@AllArgsConstructor
-public class ProjectWorker implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 作业现场ID
-     */
-    @TableField("PROJECT_ID")
-    private Long projectId;
-
-    /**
-     * 人员ID
-     */
-    @ApiModelProperty("人员ID")
-    @TableField("WORKER_ID")
-    private Long workerId;
-
-    /**
-     * 安全帽编号
-     */
-    @ApiModelProperty("安全帽编号")
-    @TableField("HAT_CODE")
-    private String hatCode;
-
-    /**
-     * 背心编号
-     */
-    @ApiModelProperty("背心编号")
-    @TableField("VAST_CODE")
-    private String vastCode;
-
-    /**
-     * 手环编号
-     */
-    @ApiModelProperty("手环编号")
-    @TableField("BRACELET_CODE")
-    private String braceletCode;
-
-    @ApiModelProperty("人员姓名（详情中展示，新增编辑不用传）")
-    @TableField(exist = false)
-    private String workerName;
-
-    @ApiModelProperty("人员部门ID（详情中展示，新增编辑不用传）")
-    @TableField(exist = false)
-    private String workerDeptId;
-
-    @ApiModelProperty("人员部门名称（详情中展示，新增编辑不用传）")
-    @TableField(exist = false)
-    private String workerDeptName;
-
-    @ApiModelProperty("人员联系方式（详情中展示，新增编辑不用传）")
-    @TableField(exist = false)
-    private String workerPhoneNumber;
-
-    public ProjectWorker(Long projectId, Long workerId) {
-        this.projectId = projectId;
-        this.workerId = workerId;
-    }
-
-    @Override
-    public String toString() {
-        return "ProjectWorker{" +
-            "id=" + id +
-            ", projectId=" + projectId +
-            ", workerId=" + workerId +
-            ", hatCode=" + hatCode +
-            ", vastCode=" + vastCode +
-            ", braceletCode=" + braceletCode +
-        "}";
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/WorkSiteInfo.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/WorkSiteInfo.java
deleted file mode 100644
index fa6f41d..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/WorkSiteInfo.java
+++ /dev/null
@@ -1,130 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.alibaba.fastjson.annotation.JSONField;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.time.LocalDateTime;
-import java.util.Date;
-
-/**
- * <p>
- * 作业现场表
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@ApiModel("WorkSiteInfo")
-@TableName("br_work_site_info")
-@Data
-public class WorkSiteInfo implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @ApiModelProperty("作业现场ID")
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 作业名称
-     */
-    @ApiModelProperty("作业名称")
-    @TableField("WORK_TITLE")
-    private String workTitle;
-
-    /**
-     * 责任人
-     */
-    @ApiModelProperty("责任人（人员ID）")
-    @TableField("WORK_PERSON")
-    private Long workPerson;
-
-    /**
-     * 作业描述
-     */
-    @ApiModelProperty("作业描述")
-    @TableField("WORK_SITE_DESC")
-    private String workSiteDesc;
-
-    /**
-     * 作业状态
-     */
-    @ApiModelProperty("作业状态")
-    @TableField("PROJECT_STATE")
-    private String projectState;
-
-    /**
-     * 所属道路
-     */
-    @ApiModelProperty("所属道路")
-    @TableField("WORK_ROAD")
-    private String workRoad;
-
-    @TableField("IMAGE_URL")
-    private String imageUrl;
-
-    @TableField("CREATE_TIME")
-    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
-    private Date createTime;
-    @TableField("UPDATE_TIME")
-    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
-    private Date updateTime;
-
-    @ApiModelProperty("开始时间")
-    @TableField("START_TIME")
-    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
-    private Date startTime;
-
-    @ApiModelProperty("结束时间")
-    @TableField("FINISH_TIME")
-    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
-    private Date finishTime;
-
-    @ApiModelProperty("负责人姓名（详情中使用，新增编辑不用传）")
-    @TableField(exist = false)
-    private String workPersonName;
-
-    @ApiModelProperty("负责人联系方式（详情中使用，新增编辑不用传）")
-    @TableField(exist = false)
-    private String workPersonPhoneNumber;
-
-    @ApiModelProperty("负责人所属部门ID（详情中使用，新增编辑不用传）")
-    @TableField(exist = false)
-    private Long workPersonDeptId;
-
-    @ApiModelProperty("负责人所属部门名称（详情中使用，新增编辑不用传）")
-    @TableField(exist = false)
-    private String workPersonDeptName;
-
-    @ApiModelProperty(value = "注册时间",dataType = "String")
-    @TableField(exist = false)
-    private String registerTime;
-
-    @ApiModelProperty("作业状态名称")
-    @TableField(exist = false)
-    private String projectStateName;
-
-    @Override
-    public String toString() {
-        return "WorkSiteInfo{" +
-            "id=" + id +
-            ", workTitle=" + workTitle +
-            ", workPerson=" + workPerson +
-            ", workSiteDesc=" + workSiteDesc +
-            ", projectState=" + projectState +
-            ", imageUrl=" + imageUrl +
-            ", updateTime=" + updateTime +
-            ", workRoad=" + workRoad +
-        "}";
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Worker.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Worker.java
deleted file mode 100644
index 28a4daa..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Worker.java
+++ /dev/null
@@ -1,147 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.time.LocalDateTime;
-import java.util.Date;
-
-/**
- * <p>
- * 
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@ApiModel("Worker")
-@TableName("br_worker")
-@Data
-public class Worker implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @ApiModelProperty(value = "人员ID")
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 姓名
-     */
-    @ApiModelProperty(value = "姓名")
-    @TableField("WORKER_NAME")
-    private String workerName;
-
-    /**
-     * 性别
-     */
-    @ApiModelProperty(value = "性别")
-    @TableField("GENDER")
-    private String gender;
-
-    /**
-     * 所属部门
-     */
-    @ApiModelProperty(value = "所属部门(人员管理)")
-    @TableField("DEPT_ID")
-    private Long deptId;
-
-    /**
-     * 所属单位
-     */
-    @ApiModelProperty(value = "所属单位(入场申请中使用)")
-    @TableField("OWNER_SHIP")
-    private String ownerShip;
-
-    /**
-     * 联系方式
-     */
-    @ApiModelProperty(value = "联系方式")
-    @TableField("PHONE_NUMBER")
-    private String phoneNumber;
-
-    /**
-     * 证件号
-     */
-    @ApiModelProperty(value = "证件号")
-    @TableField("ID_CARD_NUMBER")
-    private String idCardNumber;
-
-    /**
-     * 入场原因
-     */
-    @ApiModelProperty(value = "入场原因（入场申请中使用）")
-    @TableField("ENTER_REASON")
-    private String enterReason;
-
-    /**
-     * 入场人脸照片
-     */
-    @ApiModelProperty(value = "人脸照片（照片路径）")
-    @TableField("WORKER_AVATAR")
-    private String workerAvatar;
-
-    /**
-     * 申请入场时间
-     */
-    @ApiModelProperty(value = "注册时间/申请入场时间")
-    @TableField("CREATE_TIME")
-    private Date createTime;
-
-    /**
-     * 人员类型
-     */
-    @ApiModelProperty(value = "人员类型（区分人员管理和入场申请）")
-    @TableField("WORKER_TYPE")
-    private String workerType;
-
-    @ApiModelProperty(value = "性别名称")
-    @TableField(exist = false)
-    private String genderName;
-
-    @ApiModelProperty(value = "部门名称")
-    @TableField(exist = false)
-    private String deptName;
-
-    @ApiModelProperty(value = "注册时间",dataType = "String")
-    @TableField(exist = false)
-    private String registerTime;
-
-    @ApiModelProperty(value = "当前状态")
-    @TableField(exist = false)
-    private String status;
-
-    @ApiModelProperty(value = "当前状态名称")
-    @TableField(exist = false)
-    private String statusName;
-
-    @ApiModelProperty(value = "是否注册(0未注册；1已注册)",allowableValues = "0,1")
-    @TableField(exist = false)
-    private String isRegister;
-
-    @Override
-    public String toString() {
-        return "Worker{" +
-            "id=" + id +
-            ", workerName=" + workerName +
-            ", gender=" + gender +
-            ", deptId=" + deptId +
-            ", ownerShip=" + ownerShip +
-            ", phoneNumber=" + phoneNumber +
-            ", idCardNumber=" + idCardNumber +
-            ", enterReason=" + enterReason +
-            ", workerAvatar=" + workerAvatar +
-            ", createTime=" + createTime +
-            ", workerType=" + workerType +
-        "}";
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/AlarmMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/AlarmMapper.java
new file mode 100644
index 0000000..ea4c8be
--- /dev/null
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/AlarmMapper.java
@@ -0,0 +1,16 @@
+package com.casic.missiles.modular.system.mapper;
+
+import com.casic.missiles.modular.system.entity.Alarm;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 报警记录表 Mapper 接口
+ * </p>
+ *
+ * @author zyj
+ * @since 2023-05-25
+ */
+public interface AlarmMapper extends BaseMapper<Alarm> {
+
+}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/BusAlarmMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/BusAlarmMapper.java
deleted file mode 100644
index 9801742..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/BusAlarmMapper.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package com.casic.missiles.modular.system.mapper;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.modular.system.dto.AlarmTypeCountDTO;
-import com.casic.missiles.modular.system.entity.BusAlarm;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * <p>
- * 报警记录表 Mapper 接口
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface BusAlarmMapper extends BaseMapper<BusAlarm> {
-
-    Page<BusAlarm> listPage(Page<BusAlarm> page,@Param("ew")  QueryWrapper<BusAlarm> queryWrapper);
-
-    void cancelAlarm(@Param("deviceId")Long deviceId,@Param("alarmType") String alarmType);
-
-    List<AlarmTypeCountDTO> alarmCount(@Param("projectId")Long projectId, @Param("alarmStatus")String alarmStatus);
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/BusEventImageMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/BusEventImageMapper.java
deleted file mode 100644
index 9590b7d..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/BusEventImageMapper.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.casic.missiles.modular.system.mapper;
-
-import com.casic.missiles.modular.system.entity.BusEventImage;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * <p>
- * 事件图片表 Mapper 接口
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface BusEventImageMapper extends BaseMapper<BusEventImage> {
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/BusEventMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/BusEventMapper.java
deleted file mode 100644
index 3c85edf..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/BusEventMapper.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.casic.missiles.modular.system.mapper;
-
-import com.casic.missiles.modular.system.entity.BusEvent;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * <p>
- * 事件表 Mapper 接口
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface BusEventMapper extends BaseMapper<BusEvent> {
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/DeviceExtMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/DeviceExtMapper.java
deleted file mode 100644
index 4ca9212..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/DeviceExtMapper.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.casic.missiles.modular.system.mapper;
-
-import com.casic.missiles.modular.system.entity.DeviceExt;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * <p>
- * 设备扩展信息表（安全树） Mapper 接口
- * </p>
- *
- * @author zyj
- * @since 2023-04-27
- */
-public interface DeviceExtMapper extends BaseMapper<DeviceExt> {
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/DeviceMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/DeviceMapper.java
index 444c0c5..3d0bb02 100644
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/DeviceMapper.java
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/DeviceMapper.java
@@ -1,30 +1,16 @@
 package com.casic.missiles.modular.system.mapper;
 
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.modular.system.dto.DeviceDetailDTO;
-import com.casic.missiles.modular.system.dto.HelmetInfoDTO;
 import com.casic.missiles.modular.system.entity.Device;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
 
 /**
  * <p>
- *  Mapper 接口
+ * 设备记录表 Mapper 接口
  * </p>
  *
  * @author zyj
- * @since 2023-04-14
+ * @since 2023-05-25
  */
-@Mapper
 public interface DeviceMapper extends BaseMapper<Device> {
 
-    Page<DeviceDetailDTO> listDetailPage(Page<DeviceDetailDTO> page,@Param("ew") QueryWrapper<DeviceDetailDTO> ew);
-
-     List<Long> selectProjectDevice(@Param("projectId") Long projectId);
-
-    List<HelmetInfoDTO> selectHelmetList(@Param("deviceType")String deviceType);
 }
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/ProjectDeviceMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/ProjectDeviceMapper.java
deleted file mode 100644
index 1d0c14e..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/ProjectDeviceMapper.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package com.casic.missiles.modular.system.mapper;
-
-import com.casic.missiles.modular.system.dto.DeviceLocationDTO;
-import com.casic.missiles.modular.system.entity.ProjectDevice;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * <p>
- *  Mapper 接口
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface ProjectDeviceMapper extends BaseMapper<ProjectDevice> {
-     List<ProjectDevice> selectDetailByProjectId(@Param("projectId") Long projectId);
-
-     List<DeviceLocationDTO> selectDeviceLocationList(@Param("projectId") Long projectId);
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/ProjectWorkerMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/ProjectWorkerMapper.java
deleted file mode 100644
index 58583d1..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/ProjectWorkerMapper.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package com.casic.missiles.modular.system.mapper;
-
-import com.casic.missiles.modular.system.dto.WorkerLocationDTO;
-import com.casic.missiles.modular.system.entity.ProjectWorker;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * <p>
- *  Mapper 接口
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface ProjectWorkerMapper extends BaseMapper<ProjectWorker> {
-
-    List<ProjectWorker> selectDetailByProjectId(@Param("projectId") Long projectId,
-                                                @Param("workerType")String workerType);
-
-    List<WorkerLocationDTO> selectWorkerLocationList(@Param("projectId") Long projectId,
-                                                     @Param("workerType")String workerType);
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/WorkSiteInfoMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/WorkSiteInfoMapper.java
deleted file mode 100644
index a4934d2..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/WorkSiteInfoMapper.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.casic.missiles.modular.system.mapper;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.modular.system.entity.WorkSiteInfo;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Param;
-
-/**
- * <p>
- * 作业现场表 Mapper 接口
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface WorkSiteInfoMapper extends BaseMapper<WorkSiteInfo> {
-
-    Page<WorkSiteInfo> selectListPage(Page<WorkSiteInfo> page,@Param("ew") QueryWrapper<WorkSiteInfo> ew);
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/WorkerMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/WorkerMapper.java
deleted file mode 100644
index 258fb12..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/WorkerMapper.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package com.casic.missiles.modular.system.mapper;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.modular.system.dto.DeviceDetailDTO;
-import com.casic.missiles.modular.system.entity.Worker;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * <p>
- *  Mapper 接口
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface WorkerMapper extends BaseMapper<Worker> {
-
-
-    Page<Worker> selectListPage(Page<Worker> page, @Param("ew") QueryWrapper<Worker> ew);
-
-    List<String> selectWorkerAvatars(@Param("projectId")Long projectId);
-
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/AlarmMapper.xml b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/AlarmMapper.xml
new file mode 100644
index 0000000..25cb4ab
--- /dev/null
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/AlarmMapper.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.modular.system.mapper.AlarmMapper">
+
+</mapper>
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/BusAlarmMapper.xml b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/BusAlarmMapper.xml
deleted file mode 100644
index 595088a..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/BusAlarmMapper.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.casic.missiles.modular.system.mapper.BusAlarmMapper">
-
-    <select id="listPage" resultType="com.casic.missiles.modular.system.entity.BusAlarm">
-        SELECT
-            alarm.ID as id,
-            alarm.DEVICE_ID as deviceId,
-            alarm.PROJECT_ID as projectId,
-            alarm.ALARM_TYPE as alarmType,
-            alarm.ALARM_VALUE as alarmValue,
-            alarm.ALARM_STATUS as alarmStatus,
-            alarm.ALARM_IMAGE AS alarmImage,
-            alarm.ALARM_CONTENT as alarmContent,
-            alarm.ALARM_TIME as alarmTime,
-            alarm.CANCEL_TIME as cancelTime,
-            alarm.ALARM_LNG as alarmLng,
-            alarm.ALARM_LAT as alarmLat,
-            p.WORK_TITLE as workTitle,
-            p.WORK_ROAD as workRoad,
-            p.PROJECT_STATE as projectState,
-            w.WORKER_NAME as workPersonName,
-            w.PHONE_NUMBER as workPersonPhoneNumber
-        FROM
-            `br_bus_alarm` alarm
-                LEFT JOIN br_work_site_info p on alarm.PROJECT_ID = p.ID
-                LEFT JOIN br_worker w on p.WORK_PERSON = w.ID
-        <where>
-            <if test="ew != null">
-                ${ew.sqlSegment}
-            </if>
-        </where>
-    </select>
-
-    <select id="cancelAlarm">
-        update br_bus_alarm
-        set ALARM_STATUS = '1'
-        where DEVICE_ID = #{deviceId}
-          and ALARM_TYPE = #{alarmType}
-          and ALARM_STATUS = '0'
-    </select>
-
-    <select id="alarmCount" resultType="com.casic.missiles.modular.system.dto.AlarmTypeCountDTO">
-        SELECT
-            ALARM_TYPE as alarmType,
-            count(*) as alarmCount
-        from br_bus_alarm
-        <where>
-            <if test="projectId != null and projectId !=''">
-                and PROJECT_ID = #{projectId}
-            </if>
-            <if test="alarmStatus != null and alarmStatus !=''">
-                and ALARM_STATUS = #{alarmStatus}
-            </if>
-        </where>
-        group by ALARM_TYPE
-    </select>
-</mapper>
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/BusEventImageMapper.xml b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/BusEventImageMapper.xml
deleted file mode 100644
index fbc3db3..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/BusEventImageMapper.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.casic.missiles.modular.system.mapper.BusEventImageMapper">
-
-</mapper>
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/BusEventMapper.xml b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/BusEventMapper.xml
deleted file mode 100644
index 627d573..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/BusEventMapper.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.casic.missiles.modular.system.mapper.BusEventMapper">
-
-</mapper>
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/DeviceExtMapper.xml b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/DeviceExtMapper.xml
deleted file mode 100644
index 5321d1c..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/DeviceExtMapper.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.casic.missiles.modular.system.mapper.DeviceExtMapper">
-
-</mapper>
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/DeviceMapper.xml b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/DeviceMapper.xml
index 94262e1..88e7d01 100644
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/DeviceMapper.xml
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/DeviceMapper.xml
@@ -2,96 +2,4 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.casic.missiles.modular.system.mapper.DeviceMapper">
 
-    <select id="listDetailPage" resultType="com.casic.missiles.modular.system.dto.DeviceDetailDTO">
-        select
-        br_device.ID as id,
-        DEVICE_CODE as deviceCode,
-        DEVICE_TYPE as deviceType,
-        DEVICE_BATCH as deviceBatch,
-        MANUFACTURER as manufacturer,
-        IS_POWER_SUPPLY as isPowerSupply,
-        CREATE_TIME as createTime,
-        CAMERA_CODE as cameraCode,
-        CAMERA_IP as cameraIp,
-        CAMERA_PORT as cameraPort,
-        GAS_CODE as gasCode,
-        GAS_IP as gasIp,
-        GAS_PORT as gasPort,
-        HAT_LINING_CODE as hatLiningCode
-        from br_device
-        left join br_device_ext ext on ext.DEVICE_ID = br_device.ID
-        <where>
-            <if test="ew != null">
-                ${ew.sqlSegment}
-            </if>
-        </where>
-    </select>
-
-    <select id="selectProjectDevice" resultType="java.lang.Long">
-        with device_info as (
-            (SELECT
-            d.DEVICE_ID as DEVICE_ID,
-            d.PROJECT_ID as PROJECT_ID,
-            p.PROJECT_STATE as PROJECT_STATE
-            from br_project_device d
-            LEFT JOIN br_work_site_info p on p.ID = d.PROJECT_ID)
-
-            UNION ALL
-
-            (SELECT
-            d1.ID as DEVICE_ID,
-            w1.ID as PROJECT_ID,
-            w1.PROJECT_STATE as PROJECT_STATE
-            FROM br_project_worker pw1
-            LEFT JOIN br_device d1 on pw1.BRACELET_CODE = d1.DEVICE_CODE
-            LEFT JOIN br_work_site_info w1 on pw1.PROJECT_ID = w1.ID)
-
-            UNION ALL
-
-            (SELECT
-            d1.ID as DEVICE_ID,
-            w1.ID as PROJECT_ID,
-            w1.PROJECT_STATE as PROJECT_STATE
-            FROM br_project_worker pw1
-            LEFT JOIN br_device d1 on pw1.HAT_CODE = d1.DEVICE_CODE
-            LEFT JOIN br_work_site_info w1 on pw1.PROJECT_ID = w1.ID)
-
-
-            UNION ALL
-
-            (SELECT
-            d1.ID as DEVICE_ID,
-            w1.ID as PROJECT_ID,
-            w1.PROJECT_STATE as PROJECT_STATE
-            FROM br_project_worker pw1
-            LEFT JOIN br_device d1 on pw1.VAST_CODE = d1.DEVICE_CODE
-            LEFT JOIN br_work_site_info w1 on pw1.PROJECT_ID = w1.ID))
-
-        select DISTINCT DEVICE_ID from device_info
-        <where>
-            DEVICE_ID is not null
-            <choose>
-                <when test="projectId != null and projectId !=''">
-                    and PROJECT_ID = #{projectId}
-                </when>
-                <otherwise>
-                    AND PROJECT_STATE != '3'
-                </otherwise>
-            </choose>
-        </where>
-    </select>
-
-    <select id="selectHelmetList" resultType="com.casic.missiles.modular.system.dto.HelmetInfoDTO">
-        SELECT
-            a.ID AS deviceId,
-            a.DEVICE_CODE AS hatCode,
-            b.HAT_LINING_CODE AS hatLiningCode
-        FROM
-            br_device a
-                LEFT JOIN br_device_ext b ON a.ID = b.DEVICE_ID
-        WHERE
-            a.DEVICE_TYPE = #{deviceType}
-          AND a.DEVICE_CODE IS NOT NULL
-          AND b.HAT_LINING_CODE IS NOT NULL
-    </select>
 </mapper>
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/ProjectDeviceMapper.xml b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/ProjectDeviceMapper.xml
deleted file mode 100644
index c6d1c24..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/ProjectDeviceMapper.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.casic.missiles.modular.system.mapper.ProjectDeviceMapper">
-
-    <select id="selectDetailByProjectId" resultType="com.casic.missiles.modular.system.entity.ProjectDevice">
-        SELECT
-            pd.ID as id,
-            pd.PROJECT_ID as projectId,
-            pd.DEVICE_ID as deviceId,
-            d.DEVICE_CODE as deviceCode
-        from br_project_device pd
-        LEFT JOIN br_device d on pd.DEVICE_ID = d.ID
-        <where>
-            pd.PROJECT_ID = #{projectId}
-        </where>
-    </select>
-
-    <select id="selectDeviceLocationList" resultType="com.casic.missiles.modular.system.dto.DeviceLocationDTO">
-        SELECT
-        d.ID as deviceId,
-        d.DEVICE_TYPE as deviceType,
-        d.DEVICE_CODE as deviceCode,
-        if(EXISTS(select ID from br_bus_alarm WHERE DEVICE_ID = d.ID and ALARM_STATUS = '0'),true,false) as alarmFlag
-        FROM br_project_device pd, br_device d
-        where pd.DEVICE_ID = d.ID
-        and pd.PROJECT_ID = #{projectId}
-    </select>
-
-</mapper>
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/ProjectWorkerMapper.xml b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/ProjectWorkerMapper.xml
deleted file mode 100644
index 8d2de10..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/ProjectWorkerMapper.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.casic.missiles.modular.system.mapper.ProjectWorkerMapper">
-
-    <select id="selectDetailByProjectId" resultType="com.casic.missiles.modular.system.entity.ProjectWorker">
-        SELECT
-            pw.ID as id,
-            pw.PROJECT_ID as projectId,
-            pw.WORKER_ID as workerId,
-            w.WORKER_NAME as workerName,
-            w.DEPT_ID as workerDeptId,
-            pw.HAT_CODE as hatCode,
-            pw.VAST_CODE as vastCode,
-            pw.BRACELET_CODE as braceletCode,
-            w.PHONE_NUMBER as workerPhoneNumber
-        from br_project_worker pw
-        LEFT JOIN br_worker w on pw.WORKER_ID = w.ID
-        <where>
-            pw.PROJECT_ID = #{projectId}
-            <if test="workerType != null and workerType != ''">
-                and w.WORKER_TYPE = #{workerType}
-            </if>
-        </where>
-    </select>
-
-    <select id="selectWorkerLocationList" resultType="com.casic.missiles.modular.system.dto.WorkerLocationDTO">
-        select
-            w.ID as workerId,
-            w.WORKER_NAME as workerName,
-            pw.HAT_CODE as hatCode,
-            hd.ID as hatId,
-            pw.BRACELET_CODE as braceletCode,
-            pw.VAST_CODE as vastCode
-        from br_project_worker pw,br_worker w ,br_device hd
-        WHERE pw.WORKER_ID = w.ID
-          and pw.HAT_CODE = hd.DEVICE_CODE
-          and pw.PROJECT_ID = #{projectId}
-          and w.WORKER_TYPE = #{workerType}
-    </select>
-</mapper>
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/WorkSiteInfoMapper.xml b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/WorkSiteInfoMapper.xml
deleted file mode 100644
index 8f01326..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/WorkSiteInfoMapper.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.casic.missiles.modular.system.mapper.WorkSiteInfoMapper">
-
-    <select id="selectListPage" resultType="com.casic.missiles.modular.system.entity.WorkSiteInfo">
-        SELECT
-            br_work_site_info.ID AS id,
-            WORK_TITLE as workTitle,
-            WORK_ROAD as workRoad,
-            WORK_SITE_DESC as workSiteDesc,
-            WORK_PERSON as workPerson,
-            WORKER_NAME as workPersonName,
-            DEPT_ID as workPersonDeptId,
-            PHONE_NUMBER as workPersonPhoneNumber,
-            PROJECT_STATE as projectState,
-            br_work_site_info.CREATE_TIME AS createTime,
-            br_work_site_info.UPDATE_TIME AS updateTime
-        FROM br_work_site_info
-        LEFT JOIN br_worker w ON br_work_site_info.WORK_PERSON = w.ID
-        <where>
-            <if test="ew != null">
-                ${ew.sqlSegment}
-            </if>
-        </where>
-    </select>
-</mapper>
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/WorkerMapper.xml b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/WorkerMapper.xml
deleted file mode 100644
index 3e28b39..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/WorkerMapper.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.casic.missiles.modular.system.mapper.WorkerMapper">
-
-    <select id="selectListPage" resultType="com.casic.missiles.modular.system.entity.Worker">
-        WITH worker_project AS (
-            SELECT
-                w.id AS ID,
-                WORKER_NAME,
-                GENDER,
-                DEPT_ID,
-                OWNER_SHIP,
-                PHONE_NUMBER,
-                ID_CARD_NUMBER,
-                ENTER_REASON,
-                WORKER_AVATAR,
-                w.CREATE_TIME,
-                WORKER_TYPE,
-                IF( p.PROJECT_STATE != '3', 1, 0 ) AS `STATUS`
-            FROM br_worker w
-            LEFT JOIN br_project_worker pw ON w.ID = pw.WORKER_ID
-            LEFT JOIN br_work_site_info p ON pw.PROJECT_ID = p.ID
-        )
-
-        SELECT
-            ID AS id,
-            WORKER_NAME AS workerName,
-            GENDER AS gender,
-            DEPT_ID AS deptId,
-            OWNER_SHIP AS ownerShip,
-            PHONE_NUMBER AS phoneNumber,
-            ID_CARD_NUMBER AS idCardNumber,
-            ENTER_REASON AS enterReason,
-            WORKER_AVATAR AS workerAvatar,
-            CREATE_TIME AS createTime,
-            WORKER_TYPE AS workerType,
-            `STATUS` AS `status`
-        FROM worker_project
-        <where>
-            <if test="ew != null">
-                ${ew.sqlSegment}
-            </if>
-        </where>
-    </select>
-
-    <select id="selectWorkerAvatars" resultType="java.lang.String">
-        SELECT
-            WORKER_AVATAR
-        FROM
-            `br_worker`
-        WHERE
-        ID IN ( SELECT WORKER_ID FROM br_project_worker WHERE PROJECT_ID = #{projectId} )
-          AND WORKER_AVATAR IS NOT NULL
-          AND WORKER_AVATAR != ''
-    </select>
-</mapper>

diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/AlarmController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/AlarmController.java
new file mode 100644
index 0000000..1795cf1
--- /dev/null
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/AlarmController.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.modular.system.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.stereotype.Controller;
+
+/**
+ * <p>
+ * 报警记录表 前端控制器
+ * </p>
+ *
+ * @author zyj
+ * @since 2023-05-25
+ */
+@Controller
+@RequestMapping("/system/alarm")
+public class AlarmController {
+
+}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusAlarmController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusAlarmController.java
deleted file mode 100644
index 1f82ebb..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusAlarmController.java
+++ /dev/null
@@ -1,102 +0,0 @@
-package com.casic.missiles.modular.system.controller;
-
-
-import cn.hutool.core.util.ObjectUtil;
-import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.core.base.controller.BaseController;
-import com.casic.missiles.core.page.PageFactory;
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.AlarmUpload;
-import com.casic.missiles.modular.system.dto.DeviceDetailDTO;
-import com.casic.missiles.modular.system.entity.BusAlarm;
-import com.casic.missiles.modular.system.service.IBusAlarmService;
-import io.swagger.annotations.*;
-import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.*;
-
-import org.springframework.stereotype.Controller;
-
-import static com.casic.missiles.model.response.ResponseData.DEFAULT_SUCCESS_MESSAGE;
-import static com.casic.missiles.modular.system.consts.AlarmConst.ALARM_STATUS_MANUAL_CANCEL;
-
-/**
- * <p>
- * 报警记录表 前端控制器
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@Api(tags = "报警管理接口")
-@Controller
-@RequestMapping("/alarm")
-@RequiredArgsConstructor
-public class BusAlarmController extends BaseController {
-
-    private final IBusAlarmService alarmService;
-
-    @ApiOperation("报警上报接口")
-    @PostMapping("/upload")
-    @ResponseBody
-    public Object upload(@RequestBody AlarmUpload alarmUpload){
-        alarmService.alarmUpload(alarmUpload);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("报警列表分页查询")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "workTitle", value = "作业名称",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "projectId", value = "作业ID",dataType = "Long", paramType = "query",example = "0"),
-            @ApiImplicitParam(name = "alarmStatus", value = "报警状态",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "projectState", value = "作业状态",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "alarmType", value = "报警类型",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "alarmStartTime", value = "报警开始时间",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "alarmEndTime", value = "报警结束时间",dataType = "String", paramType = "query")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = BusAlarm.class),
-    })
-    @GetMapping("/listPage")
-    @ResponseBody
-    public Object listPage(String workTitle,Long projectId,String alarmStatus,String projectState,String alarmType,String alarmStartTime,String alarmEndTime){
-        Page<BusAlarm> page = PageFactory.defaultPage();
-        QueryWrapper<BusAlarm> queryWrapper = new QueryWrapper<>();
-        if(StrUtil.isNotEmpty(workTitle)){
-            queryWrapper.like("p.WORK_TITLE",workTitle);
-        }
-        if(ObjectUtil.isNotEmpty(projectId)){
-            queryWrapper.eq("alarm.PROJECT_ID",projectId);
-        }
-        if(StrUtil.isNotEmpty(alarmStatus)){
-            queryWrapper.eq("alarm.ALARM_STATUS",alarmStatus);
-        }
-        if(StrUtil.isNotEmpty(projectState)){
-            queryWrapper.eq("p.PROJECT_STATE",projectState);
-        }
-        if(StrUtil.isNotEmpty(alarmType)){
-            queryWrapper.eq("alarm.ALARM_TYPE",alarmType);
-        }
-        if(StrUtil.isNotEmpty(alarmStartTime)){
-            queryWrapper.ge("alarm.ALARM_TIME",alarmStartTime);
-        }
-        if(StrUtil.isNotEmpty(alarmEndTime)){
-            queryWrapper.le("alarm.ALARM_TIME",alarmEndTime);
-        }
-        page = alarmService.listPage(page,queryWrapper);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-    @ApiOperation("消警")
-    @PostMapping("/cancel")
-    @ResponseBody
-    public Object cancel(@RequestParam("alarmId") Long alarmId){
-        UpdateWrapper<BusAlarm> updateWrapper = new UpdateWrapper<>();
-        updateWrapper.eq("ID",alarmId);
-        updateWrapper.set("ALARM_STATUS",ALARM_STATUS_MANUAL_CANCEL);
-        alarmService.update(updateWrapper);
-        return ResponseData.success();
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusEventController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusEventController.java
deleted file mode 100644
index dde5aad..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusEventController.java
+++ /dev/null
@@ -1,41 +0,0 @@
-package com.casic.missiles.modular.system.controller;
-
-
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.entity.BusEvent;
-import com.casic.missiles.modular.system.service.IBusEventService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.ResponseBody;
-
-/**
- * <p>
- * 事件表 前端控制器
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@Controller
-@RequestMapping("/event")
-@Api(tags = "事件上报")
-@RequiredArgsConstructor
-public class BusEventController {
-
-    private final IBusEventService eventService;
-
-    @ApiOperation("事件上报")
-    @PostMapping("add")
-    @ResponseBody
-    public Object add(@RequestBody BusEvent busEvent){
-        eventService.saveBusEvent(busEvent);
-        return ResponseData.success();
-    }
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
index 03abc5f..aa50d78 100644
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
@@ -1,121 +1,20 @@
 package com.casic.missiles.modular.system.controller;
 
 
-import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.core.base.controller.BaseController;
-import com.casic.missiles.core.page.PageFactory;
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.DeviceDetailDTO;
-import com.casic.missiles.modular.system.entity.Device;
-import com.casic.missiles.modular.system.service.IDeviceExtService;
-import com.casic.missiles.modular.system.service.IDeviceService;
-import io.swagger.annotations.*;
-import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.RequestMapping;
 
 import org.springframework.stereotype.Controller;
 
-import java.time.LocalDateTime;
-import java.util.Date;
-import java.util.List;
-
-import static com.casic.missiles.model.response.ResponseData.DEFAULT_SUCCESS_MESSAGE;
-
 /**
  * <p>
- *  前端控制器
+ * 设备记录表 前端控制器
  * </p>
  *
  * @author zyj
- * @since 2023-04-14
+ * @since 2023-05-25
  */
-@Api(tags = "设备管理接口")
-@RequiredArgsConstructor
 @Controller
-@RequestMapping("/device")
-public class DeviceController extends BaseController {
-    private final IDeviceService deviceService;
-    private final IDeviceExtService deviceExtService;
-
-    @ApiOperation("设备分页列表")
-    @ApiImplicitParams({
-        @ApiImplicitParam(name = "deviceType", value = "设备类型",dataType = "String", paramType = "query"),
-        @ApiImplicitParam(name = "deviceCode", value = "设备编号",dataType = "String", paramType = "query"),
-        @ApiImplicitParam(name = "status", value = "设备状态",dataType = "String", paramType = "query"),
-        @ApiImplicitParam(name = "projectId", value = "作业ID（如果传此参数，列表中返回该作业使用的设备）",dataType = "Long", paramType = "query", example = "0")
-    })
-    @ApiResponses({
-        @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = DeviceDetailDTO.class),
-    })
-    @GetMapping("listPage")
-    @ResponseBody
-    public Object listPage(String deviceType, String deviceCode, String status,Long projectId){
-        Page<DeviceDetailDTO> page = PageFactory.defaultPage();
-        QueryWrapper<DeviceDetailDTO> queryWrapper = new QueryWrapper<>();
-        if(StrUtil.isNotEmpty(deviceType)){
-            queryWrapper.eq("DEVICE_TYPE",deviceType);
-        }
-        if(StrUtil.isNotEmpty(deviceCode)){
-            queryWrapper.like("DEVICE_CODE",deviceCode);
-        }
-        page = deviceService.listPage(page,queryWrapper,status,projectId);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-    @ApiOperation("新增设备")
-    @PostMapping("add")
-    @ResponseBody
-    public Object add(@RequestBody DeviceDetailDTO deviceDetailDTO){
-        deviceService.saveDevice(deviceDetailDTO);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("编辑设备")
-    @PostMapping("update")
-    @ResponseBody
-    public Object update(@RequestBody DeviceDetailDTO deviceDetailDTO){
-        deviceService.updateDevice(deviceDetailDTO);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("删除设备")
-    @PostMapping("delete")
-    @ResponseBody
-    public Object delete(@ApiParam("设备id列表")@RequestBody List<Long> deviceIds){
-        deviceService.deleteDevices(deviceIds);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("设置甲烷阈值")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "gasIp", value = "安全树甲烷设备IP",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "gasPort", value = "安全树甲烷端口",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "threshold", value = "甲烷阈值",dataType = "String", paramType = "query")
-    })
-    @PostMapping("setThreshold")
-    @ResponseBody
-    public Object setThreshold(String gasIp,String gasPort,String threshold){
-        deviceExtService.setGasThreshold(gasIp, gasPort, threshold);
-        return ResponseData.success();
-    }
-
-
-    @ApiOperation("查询甲烷阈值")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "gasIp", value = "安全树甲烷设备IP",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "gasPort", value = "安全树甲烷端口",dataType = "String", paramType = "query")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = "{\"code\": 200,\"data\": \"100\",\"message\": \"请求成功\",\"success\": true}",response = String.class),
-    })
-    @GetMapping("getThreshold")
-    @ResponseBody
-    public Object getThreshold(String gasIp,String gasPort){
-        String data = deviceExtService.getGasThreshold(gasIp, gasPort);
-        return ResponseData.success(data);
-    }
-
+@RequestMapping("/system/device")
+public class DeviceController {
 
 }
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/OverviewController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/OverviewController.java
deleted file mode 100644
index 7570504..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/OverviewController.java
+++ /dev/null
@@ -1,70 +0,0 @@
-package com.casic.missiles.modular.system.controller;
-
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.AlarmTypeCountDTO;
-import com.casic.missiles.modular.system.dto.DeviceLocationDTO;
-import com.casic.missiles.modular.system.dto.WorkerLocationDTO;
-import com.casic.missiles.modular.system.service.IBusAlarmService;
-import com.casic.missiles.modular.system.service.IProjectDeviceService;
-import com.casic.missiles.modular.system.service.IProjectWorkerService;
-import io.swagger.annotations.*;
-import lombok.RequiredArgsConstructor;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.ResponseBody;
-
-import static com.casic.missiles.model.response.ResponseData.DEFAULT_SUCCESS_MESSAGE;
-import static com.casic.missiles.modular.system.consts.AlarmConst.ALARM_STATUS_ON;
-
-@Api(tags = "首页看板接口")
-@Controller
-@RequestMapping("overview")
-@RequiredArgsConstructor
-public class OverviewController {
-
-    private final IBusAlarmService alarmService;
-    private final IProjectDeviceService projectDeviceService;
-
-    private final IProjectWorkerService projectWorkerService;
-
-
-    @ApiOperation("报警统计接口")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "projectId", value = "作业ID",dataType = "Long", paramType = "query", example = "0")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = AlarmTypeCountDTO.class),
-    })
-    @GetMapping("/alarmCount")
-    @ResponseBody
-    public Object alarmCount(Long projectId){
-        return ResponseData.success(alarmService.alarmCount(projectId,ALARM_STATUS_ON));
-    }
-
-    @ApiOperation("设备列表接口")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "projectId", value = "作业ID",dataType = "Long", paramType = "query", example = "0")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = DeviceLocationDTO.class),
-    })
-    @GetMapping("/deviceList")
-    @ResponseBody
-    public Object deviceList(Long projectId){
-        return ResponseData.success(projectDeviceService.selectDeviceLocationList(projectId));
-    }
-
-    @ApiOperation("人员列表接口")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "projectId", value = "作业ID",dataType = "Long", paramType = "query", example = "0")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = WorkerLocationDTO.class),
-    })
-    @GetMapping("/workerList")
-    @ResponseBody
-    public Object workerList(Long projectId){
-        return ResponseData.success(projectWorkerService.selectWorkerLocationDTO(projectId));
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/WorkSiteInfoController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/WorkSiteInfoController.java
deleted file mode 100644
index af36d69..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/WorkSiteInfoController.java
+++ /dev/null
@@ -1,130 +0,0 @@
-package com.casic.missiles.modular.system.controller;
-
-
-import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.core.base.controller.BaseController;
-import com.casic.missiles.core.page.PageFactory;
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.WorkSiteDetailDTO;
-import com.casic.missiles.modular.system.entity.WorkSiteInfo;
-import com.casic.missiles.modular.system.service.IWorkSiteInfoService;
-import io.swagger.annotations.*;
-import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.*;
-
-import org.springframework.stereotype.Controller;
-
-import java.util.List;
-
-import static com.casic.missiles.model.response.ResponseData.DEFAULT_SUCCESS_MESSAGE;
-
-/**
- * <p>
- * 作业现场表 前端控制器
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@Controller
-@RequestMapping("/site")
-@Api(tags = "作业现场管理")
-@RequiredArgsConstructor
-public class WorkSiteInfoController extends BaseController {
-
-
-    private final IWorkSiteInfoService workSiteInfoService;
-
-    @ApiOperation("新增作业现场")
-    @PostMapping("add")
-    @ResponseBody
-    public Object addWorkSite(@RequestBody WorkSiteDetailDTO workSiteDetailDTO){
-        workSiteInfoService.addWorkSiteInfo(workSiteDetailDTO);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("编辑作业现场")
-    @PostMapping("update")
-    @ResponseBody
-    public Object updateWorkSite(@RequestBody WorkSiteDetailDTO workSiteDetailDTO){
-        workSiteInfoService.updateWorkSiteInfo(workSiteDetailDTO);
-        return ResponseData.success();
-    }
-
-
-    @ApiOperation("删除作业现场")
-    @PostMapping("delete")
-    @ResponseBody
-    public Object delete(@ApiParam("作业现场id列表")@RequestBody List<Long> projectIds){
-        workSiteInfoService.deleteProjects(projectIds);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("查询作业现场详情")
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = WorkSiteDetailDTO.class),
-    })
-    @GetMapping("detail")
-    @ResponseBody
-    public Object delete(@ApiParam(value = "作业现场id", example = "0")@RequestParam Long projectId){
-        WorkSiteDetailDTO detailDTO = workSiteInfoService.getWorkSiteDetail(projectId);
-        return ResponseData.success(detailDTO);
-    }
-
-    @ApiOperation("分页列表查询")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "workTitle",value = "作业名称", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "workRoad",value = "所属道路", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "workPersonName",value = "责任人姓名", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "startDate",value = "注册开始日期", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "endDate",value = "注册结束日期", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "projectState",value = "当前状态（字典值）", dataType = "String", paramType = "query")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = WorkSiteInfo.class),
-    })
-    @GetMapping("listPage")
-    @ResponseBody
-    public Object listPage(String workTitle,String workRoad,String workPersonName,String projectState,String startDate,String endDate){
-        Page<WorkSiteInfo> page = PageFactory.defaultPage();
-        QueryWrapper<WorkSiteInfo> queryWrapper = new QueryWrapper<>();
-        if(StrUtil.isNotEmpty(workTitle)){
-            queryWrapper.like("WORK_TITLE",workTitle);
-        }
-        if(StrUtil.isNotEmpty(workRoad)){
-            queryWrapper.like("WORK_ROAD",workRoad);
-        }
-        if(StrUtil.isNotEmpty(workPersonName)){
-            queryWrapper.like("WORKER_NAME",workPersonName);
-        }
-        if(StrUtil.isNotEmpty(projectState)){
-            queryWrapper.eq("PROJECT_STATE",projectState);
-        }
-        if(StrUtil.isNotEmpty(startDate)){
-            queryWrapper.ge("br_work_site_info.CREATE_TIME",startDate + " 00:00:00");
-        }
-        if(StrUtil.isNotEmpty(endDate)){
-            queryWrapper.le("br_work_site_info.CREATE_TIME",endDate + " 23:59:59");
-        }
-        page = workSiteInfoService.selectListPage(page,queryWrapper);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-    @ApiOperation("开始作业")
-    @PostMapping("start")
-    @ResponseBody
-    public Object start(@ApiParam(value = "作业现场id",example = "0")@RequestParam Long projectId){
-        workSiteInfoService.start(projectId);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("完成作业")
-    @PostMapping("finish")
-    @ResponseBody
-    public Object finish(@ApiParam(value = "作业现场id", example = "0")@RequestParam Long projectId){
-        workSiteInfoService.finish(projectId);
-        return ResponseData.success();
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/WorkerController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/WorkerController.java
deleted file mode 100644
index 796f94c..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/WorkerController.java
+++ /dev/null
@@ -1,136 +0,0 @@
-package com.casic.missiles.modular.system.controller;
-
-
-import cn.hutool.core.util.ObjectUtil;
-import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.core.base.controller.BaseController;
-import com.casic.missiles.core.page.PageFactory;
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.DeviceDetailDTO;
-import com.casic.missiles.modular.system.entity.Device;
-import com.casic.missiles.modular.system.entity.Worker;
-import com.casic.missiles.modular.system.service.IWorkerService;
-import io.swagger.annotations.*;
-import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.*;
-
-import org.springframework.stereotype.Controller;
-
-import java.util.Date;
-import java.util.List;
-
-import static com.casic.missiles.model.response.ResponseData.DEFAULT_SUCCESS_MESSAGE;
-
-/**
- * <p>
- *  前端控制器
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@Controller
-@RequestMapping("/worker")
-@RequiredArgsConstructor
-@Api(tags = "人员管理接口")
-public class WorkerController extends BaseController {
-
-    private final IWorkerService workerService;
-
-    @ApiOperation("分页列表查询")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "name",value = "姓名", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "deptId",value = "所属部门", dataType = "Long", paramType = "query", example = "0"),
-            @ApiImplicitParam(name = "status",value = "当前状态（字典值）", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "startDate",value = "注册开始日期", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "endDate",value = "注册结束日期", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "workerType",value = "人员类型（字典值）", dataType = "String", paramType = "query")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = Worker.class),
-    })
-    @GetMapping("listPage")
-    @ResponseBody
-    public Object listPage(String name,Long deptId, String status,String startDate,String endDate,String workerType){
-        Page<Worker> page = PageFactory.defaultPage();
-        QueryWrapper<Worker> queryWrapper = new QueryWrapper<>();
-        if(StrUtil.isNotEmpty(name)){
-            queryWrapper.like("WORKER_NAME",name);
-        }
-        if(ObjectUtil.isNotEmpty(deptId)){
-            queryWrapper.eq("DEPT_ID",deptId);
-        }
-        if(StrUtil.isNotEmpty(workerType)){
-            queryWrapper.eq("WORKER_TYPE",workerType);
-        }
-        if(StrUtil.isNotEmpty(startDate)){
-            queryWrapper.ge("CREATE_TIME",startDate + " 00:00:00");
-        }
-        if(StrUtil.isNotEmpty(endDate)){
-            queryWrapper.le("CREATE_TIME",endDate + " 23:59:59");
-        }
-        if(StrUtil.isNotEmpty(status)){
-            queryWrapper.eq("`STATUS`",status);
-        }
-        page = workerService.selectListPage(page,queryWrapper);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-    @ApiOperation("新增人员")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "worker", value = "人员信息", dataType = "Worker", paramType = "body", required = true),
-            @ApiImplicitParam(name = "projectId", value = "项目ID(入场申请需要)", dataType = "Long", paramType = "query", example = "0")
-    })
-    @PostMapping("add")
-    @ResponseBody
-    public Object add(@ApiParam("worker")@RequestBody Worker worker,
-                      @RequestParam(required = false) Long projectId){
-        workerService.addWorker(worker,projectId);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("编辑人员")
-    @PostMapping("update")
-    @ResponseBody
-    public Object update(@RequestBody Worker worker){
-        workerService.updateById(worker);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("删除人员")
-    @PostMapping("delete")
-    @ResponseBody
-    public Object delete(@ApiParam("人员id列表")@RequestBody List<Long> workIds){
-        workerService.removeByIds(workIds);
-        return ResponseData.success();
-    }
-
-
-    @ApiOperation(value = "获取人脸图片",notes = "返回人脸图片url")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "cameraIp",value = "摄像头IP", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "cameraPort",value = "摄像头端口号", dataType = "String", paramType = "query"),
-    })
-    @GetMapping("/face/register")
-    @ResponseBody
-    public Object faceRegister(String cameraIp,String cameraPort){
-        return ResponseData.success(workerService.faceRegister(cameraIp, cameraPort));
-    }
-
-
-    @ApiOperation(value = "查询临时入场人员列表")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "projectId", value = "项目ID",required = true,dataType = "Long", paramType = "query", example = "0")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = Worker.class),
-    })
-    @GetMapping("/projectTempWorker")
-    @ResponseBody
-    public Object projectTempWorker(Long projectId){
-        return ResponseData.success(workerService.projectTempWorker(projectId));
-    }
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/AlarmTypeCountDTO.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/AlarmTypeCountDTO.java
deleted file mode 100644
index 1a165a1..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/AlarmTypeCountDTO.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.casic.missiles.modular.system.dto;
-
-import io.swagger.annotations.ApiModel;
-import lombok.Data;
-
-@ApiModel(value = "AlarmTypeCountDTO",description = "报警类型统计（首页）")
-@Data
-public class AlarmTypeCountDTO {
-
-    private String alarmType;
-    private String alarmTypeName;
-    private Integer alarmCount;
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/AlarmUpload.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/AlarmUpload.java
deleted file mode 100644
index 73d7799..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/AlarmUpload.java
+++ /dev/null
@@ -1,46 +0,0 @@
-package com.casic.missiles.modular.system.dto;
-
-import cn.hutool.core.util.StrUtil;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-@ApiModel(value = "AlarmUpload",description = "报警上传")
-@Data
-public class AlarmUpload {
-
-    @ApiModelProperty(value = "摄像头ip")
-    private String cameraIp;
-
-    @ApiModelProperty(value = "摄像头端口")
-    private String cameraPort;
-    @ApiModelProperty(value = "安全树甲烷设备ip")
-    private String gasIp;
-    @ApiModelProperty(value = "安全树甲烷设备端口")
-    private String gasPort;
-    @ApiModelProperty(value = "报警值")
-    private String alarmValue;
-    @ApiModelProperty(value = "报警时间")
-    private String alarmTime;
-    @ApiModelProperty(value = "报警类型")
-    private String alarmType;
-    @ApiModelProperty(value = "报警图片")
-    private String alarmImage;
-    @ApiModelProperty(value = "报警内容")
-    private String alarmContent;
-
-    @Override
-    public String toString() {
-        return "AlarmUpload{" +
-                "cameraIp='" + cameraIp + '\'' +
-                ", cameraPort='" + cameraPort + '\'' +
-                ", gasIp='" + gasIp + '\'' +
-                ", gasPort='" + gasPort + '\'' +
-                ", alarmValue='" + alarmValue + '\'' +
-                ", alarmTime='" + alarmTime + '\'' +
-                ", alarmType='" + alarmType + '\'' +
-                ", alarmImage='" + (StrUtil.isNotEmpty(alarmImage) ? alarmImage.substring(0,50) : "null") + '\'' +
-                ", alarmContent='" + alarmContent + '\'' +
-                '}';
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/DeviceDetailDTO.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/DeviceDetailDTO.java
deleted file mode 100644
index ea518d9..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/DeviceDetailDTO.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package com.casic.missiles.modular.system.dto;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.casic.missiles.modular.system.entity.Device;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-@ApiModel("DeviceDetailDTO")
-@Data
-public class DeviceDetailDTO extends Device {
-
-    @ApiModelProperty(value = "摄像头编号")
-    private String cameraCode;
-
-    @ApiModelProperty(value = "摄像头IP")
-    private String cameraIp;
-
-    @ApiModelProperty(value = "摄像头端口")
-    private String cameraPort;
-
-    @ApiModelProperty(value = "激甲编号")
-    private String gasCode;
-
-    @ApiModelProperty(value = "激甲IP")
-    private String gasIp;
-
-    @ApiModelProperty(value = "激甲端口")
-    private String gasPort;
-
-    @ApiModelProperty(value = "智能帽衬编号")
-    private String hatLiningCode;
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/WorkSiteDetailDTO.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/WorkSiteDetailDTO.java
deleted file mode 100644
index 29378ff..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/WorkSiteDetailDTO.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package com.casic.missiles.modular.system.dto;
-
-import com.casic.missiles.modular.system.entity.ProjectDevice;
-import com.casic.missiles.modular.system.entity.ProjectWorker;
-import com.casic.missiles.modular.system.entity.WorkSiteInfo;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.util.List;
-
-@Data
-@ApiModel("WorkSiteDetailDTO")
-public class WorkSiteDetailDTO extends WorkSiteInfo {
-
-    @ApiModelProperty(value = "安全树列表",dataType = "ProjectDevice")
-    private List<ProjectDevice> deviceList;
-
-    @ApiModelProperty(value = "人员列表",dataType = "ProjectWorker")
-    private List<ProjectWorker> workerList;
-
-
-
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/WorkerLocationDTO.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/WorkerLocationDTO.java
deleted file mode 100644
index 6fd7b24..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/WorkerLocationDTO.java
+++ /dev/null
@@ -1,68 +0,0 @@
-package com.casic.missiles.modular.system.dto;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-@ApiModel(value = "WorkerLocationDTO",description = "人员位置列表（首页）")
-@Data
-public class WorkerLocationDTO {
-
-    @ApiModelProperty("人员ID")
-    private Long workerId;
-
-    @ApiModelProperty("人员姓名")
-    private String workerName;
-
-    @ApiModelProperty("安全帽编号")
-    private String hatCode;
-
-    @ApiModelProperty("安全帽ID")
-    private Long hatId;
-
-    @ApiModelProperty("背心编号")
-    private String vastCode;
-
-    @ApiModelProperty("手环编号")
-    private String braceletCode;
-
-    @ApiModelProperty("位置")
-    private String location;
-
-    @ApiModelProperty("时间")
-    private String time;
-
-    @ApiModelProperty("经度")
-    private String lng;
-
-    @ApiModelProperty("纬度")
-    private String lat;
-
-    @ApiModelProperty("心率")
-    private String heartRate;
-
-    @ApiModelProperty("血氧")
-    private String bloodOxygen;
-
-    @ApiModelProperty("一氧化碳")
-    private String co;
-
-    @ApiModelProperty("甲烷")
-    private String gas;
-
-    @ApiModelProperty("硫化氢")
-    private String h2s;
-
-    @ApiModelProperty("氧气")
-    private String o2;
-
-    @ApiModelProperty("信号")
-    private String signal;
-
-    @ApiModelProperty("电量")
-    private String cell;
-
-    @ApiModelProperty("是否报警")
-    private boolean alarmFlag;
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Alarm.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Alarm.java
new file mode 100644
index 0000000..4d2b7ef
--- /dev/null
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Alarm.java
@@ -0,0 +1,103 @@
+package com.casic.missiles.modular.system.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import java.util.Date;
+
+/**
+ * <p>
+ * 报警记录表
+ * </p>
+ *
+ * @author zyj
+ * @since 2023-05-25
+ */
+@Data
+@TableName("bus_alarm")
+public class Alarm implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    @TableId(value = "ID",type = IdType.ASSIGN_ID)
+    private Long id;
+
+    /**
+     * 设备ID
+     */
+    @TableField("DEVICE_ID")
+    private Long deviceId;
+
+    /**
+     * 报警类型
+     */
+    @TableField("ALARM_TYPE")
+    private String alarmType;
+
+    /**
+     * 报警时间
+     */
+    @TableField("ALARM_TIME")
+    private Date alarmTime;
+
+    /**
+     * 报警状态
+     */
+    @TableField("ALARM_STATUS")
+    private String alarmStatus;
+
+    /**
+     * 报警位置
+     */
+    @TableField("ALARM_LOCATION")
+    private String alarmLocation;
+
+    /**
+     * 报警图片
+     */
+    @TableField("ALARM_IMAGE")
+    private String alarmImage;
+
+    /**
+     * 视频通道号
+     */
+    @TableField("CHANNEL_NO")
+    private Integer channelNo;
+
+    /**
+     * 报警内容
+     */
+    @TableField("ALARM_CONTENT")
+    private String alarmContent;
+
+    /**
+     * 消警时间
+     */
+    @TableField("CANCEL_TIME")
+    private Date cancelTime;
+
+
+    @Override
+    public String toString() {
+        return "Alarm{" +
+            "id=" + id +
+            ", deviceId=" + deviceId +
+            ", alarmType=" + alarmType +
+            ", alarmTime=" + alarmTime +
+            ", alarmStatus=" + alarmStatus +
+            ", alarmLocation=" + alarmLocation +
+            ", alarmImage=" + alarmImage +
+            ", channelNo=" + channelNo +
+            ", alarmContent=" + alarmContent +
+            ", cancelTime=" + cancelTime +
+        "}";
+    }
+}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusAlarm.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusAlarm.java
deleted file mode 100644
index efb4a23..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusAlarm.java
+++ /dev/null
@@ -1,159 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.alibaba.fastjson.annotation.JSONField;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.time.LocalDateTime;
-import java.util.Date;
-
-/**
- * <p>
- * 报警记录表
- * </p>
- *
- * @author zyj
- * @since 2023-05-16
- */
-@Data
-@ApiModel("Alarm")
-@TableName("br_bus_alarm")
-public class BusAlarm implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 项目ID
-     */
-    @ApiModelProperty(value = "项目ID")
-    @TableField("PROJECT_ID")
-    private Long projectId;
-
-    /**
-     * 设备ID
-     */
-    @ApiModelProperty(value = "设备ID")
-    @TableField("DEVICE_ID")
-    private Long deviceId;
-
-    /**
-     * 报警类型
-     */
-    @ApiModelProperty(value = "报警类型")
-    @TableField("ALARM_TYPE")
-    private String alarmType;
-
-    /**
-     * 报警状态
-     */
-    @ApiModelProperty(value = "报警状态")
-    @TableField("ALARM_STATUS")
-    private String alarmStatus;
-
-    /**
-     * 报警值
-     */
-    @ApiModelProperty(value = "报警值")
-    @TableField("ALARM_VALUE")
-    private String alarmValue;
-
-    /**
-     * 报警图片
-     */
-    @ApiModelProperty(value = "报警图片")
-    @TableField("ALARM_IMAGE")
-    private String alarmImage;
-
-    /**
-     * 报警内容
-     */
-    @ApiModelProperty(value = "报警内容")
-    @TableField("ALARM_CONTENT")
-    private String alarmContent;
-
-    /**
-     * 报警时间
-     */
-    @ApiModelProperty(value = "报警时间")
-    @TableField("ALARM_TIME")
-    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
-    private Date alarmTime;
-
-    /**
-     * 消警时间
-     */
-    @ApiModelProperty(value = "消警时间")
-    @TableField("CANCEL_TIME")
-    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
-    private Date cancelTime;
-
-    /**
-     * 报警位置经度
-     */
-    @ApiModelProperty(value = "报警位置经度")
-    @TableField("ALARM_LNG")
-    private String alarmLng;
-
-    /**
-     * 报警位置纬度
-     */
-    @ApiModelProperty(value = "报警位置纬度")
-    @TableField("ALARM_LAT")
-    private String alarmLat;
-
-    @ApiModelProperty("报警类型名称")
-    @TableField(exist = false)
-    private String alarmStatusName;
-    @ApiModelProperty("报警类型名称")
-    @TableField(exist = false)
-    private String alarmTypeName;
-    @ApiModelProperty("作业名称")
-    @TableField(exist = false)
-    private String workTitle;
-    @ApiModelProperty("所属道路")
-    @TableField(exist = false)
-    private String workRoad;
-    @ApiModelProperty("作业状态")
-    @TableField(exist = false)
-    private String projectState;
-    @ApiModelProperty("作业状态名称")
-    @TableField(exist = false)
-    private String projectStateName;
-    @ApiModelProperty("负责人姓名")
-    @TableField(exist = false)
-    private String workPersonName;
-    @ApiModelProperty("负责人联系方式")
-    @TableField(exist = false)
-    private String workPersonPhoneNumber;
-
-
-    @Override
-    public String toString() {
-        return "BusAlarm{" +
-                "id=" + id +
-                ", projectId=" + projectId +
-                ", deviceId=" + deviceId +
-                ", alarmType=" + alarmType +
-                ", alarmValue=" + alarmValue +
-                ", alarmStatus=" + alarmStatus +
-                ", alarmImage=" + alarmImage +
-                ", alarmContent=" + alarmContent +
-                ", alarmTime=" + alarmTime +
-                ", cancelTime=" + cancelTime +
-                ", alarmLng=" + alarmLng +
-                ", alarmLat=" + alarmLat +
-                "}";
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusEvent.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusEvent.java
deleted file mode 100644
index a0b7543..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusEvent.java
+++ /dev/null
@@ -1,100 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.time.LocalDateTime;
-import java.util.Date;
-import java.util.List;
-
-/**
- * <p>
- * 事件表
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@TableName("br_bus_event")
-@Data
-@ApiModel("BusEvent")
-public class BusEvent implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @ApiModelProperty("事件ID")
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 事件标题
-     */
-    @ApiModelProperty("事件名称")
-    @TableField("EVENT_TITLE")
-    private String eventTitle;
-
-    /**
-     * 上报人员
-     */
-    @ApiModelProperty("上报人员")
-    @TableField("UPLOAD_NAME")
-    private String uploadName;
-
-    /**
-     * 联系方式
-     */
-    @ApiModelProperty("联系方式")
-    @TableField("PHONE_NUMBER")
-    private String phoneNumber;
-
-    /**
-     * 事件描述
-     */
-    @ApiModelProperty("事件描述")
-    @TableField("EVENT_DESCRIPTION")
-    private String eventDescription;
-
-    @ApiModelProperty("经度")
-    @TableField("LNG")
-    private String lng;
-
-    @ApiModelProperty("纬度")
-    @TableField("LAT")
-    private String lat;
-
-    /**
-     * 事件上传时间
-     */
-    @ApiModelProperty("事件上传时间")
-    @TableField("CREATE_TIME")
-    private Date createTime;
-
-    @ApiModelProperty("事件照片")
-    @TableField(exist = false)
-    private List<BusEventImage> imageList;
-
-
-
-    @Override
-    public String toString() {
-        return "BusEvent{" +
-            "id=" + id +
-            ", eventTitle=" + eventTitle +
-            ", uploadName=" + uploadName +
-            ", phoneNumber=" + phoneNumber +
-            ", eventDescription=" + eventDescription +
-            ", lng=" + lng +
-            ", lat=" + lat +
-            ", createTime=" + createTime +
-        "}";
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusEventImage.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusEventImage.java
deleted file mode 100644
index 1e75245..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusEventImage.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-
-/**
- * <p>
- * 事件图片表
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@TableName("br_bus_event_image")
-@Data
-@ApiModel("BusEventImage")
-public class BusEventImage implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 事件ID
-     */
-    @TableField("EVENT_ID")
-    private Long eventId;
-
-    /**
-     * 报警图片
-     */
-    @TableField("IMAGE")
-    @ApiModelProperty("图片url")
-    private String image;
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Device.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Device.java
index df89c70..ea7db5f 100644
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Device.java
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Device.java
@@ -1,30 +1,23 @@
 package com.casic.missiles.modular.system.entity;
 
-import com.alibaba.fastjson.annotation.JSONField;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.casic.missiles.core.base.json.DateDeserializer;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
-import java.util.Date;
 
 /**
  * <p>
- * 
+ * 设备记录表
  * </p>
  *
  * @author zyj
- * @since 2023-04-14
+ * @since 2023-05-25
  */
-@ApiModel("Device")
-@TableName("br_device")
 @Data
+@TableName("bus_device")
 public class Device implements Serializable {
 
     private static final long serialVersionUID = 1L;
@@ -32,82 +25,86 @@
     /**
      * 主键
      */
-    @ApiModelProperty(value = "设备ID")
     @TableId(value = "ID",type = IdType.ASSIGN_ID)
     private Long id;
 
     /**
-     * 设备编号
+     * 设备名称
      */
-    @ApiModelProperty(value = "设备编号")
-    @TableField("DEVICE_CODE")
-    private String deviceCode;
+    @TableField("DEVICE_NAME")
+    private String deviceName;
 
     /**
-     * 设备类型
+     * IP
      */
-    @ApiModelProperty(value = "设备类型")
-    @TableField("DEVICE_TYPE")
-    private String deviceType;
+    @TableField("IP")
+    private String ip;
 
     /**
-     * 设备批次
+     * 端口
      */
-    @ApiModelProperty(value = "设备批次")
-    @TableField("DEVICE_BATCH")
-    private String deviceBatch;
+    @TableField("PORT")
+    private String port;
 
     /**
-     * 厂家
+     * 用户名
      */
-    @ApiModelProperty(value = "厂家")
-    @TableField("MANUFACTURER")
-    private String manufacturer;
+    @TableField("USER_NAME")
+    private String userName;
 
     /**
-     * 是否供电
+     * 密码
      */
-    @ApiModelProperty(value = "是否供电")
-    @TableField("IS_POWER_SUPPLY")
-    private String isPowerSupply;
+    @TableField("PASSWORD")
+    private String password;
 
     /**
-     * 创建时间
+     * 连接类型
      */
-    @ApiModelProperty(value = "创建时间",dataType = "Date")
-    @TableField("CREATE_TIME")
-    private Date createTime;
+    @TableField("CONNECT_TYPE")
+    private String connectType;
 
-    @ApiModelProperty(value = "设备类型名称")
-    @TableField(exist = false)
-    private String deviceTypeName;
+    /**
+     * 位置
+     */
+    @TableField("LOCATION")
 
-    @ApiModelProperty(value = "是否供电名称")
-    @TableField(exist = false)
-    private String isPowerSupplyName;
+    private String location;
 
-    @ApiModelProperty(value = "注册时间",dataType = "String")
-    @TableField(exist = false)
-    private String registerTime;
+    /**
+     * 设备状态
+     */
+    @TableField("STATUS")
 
-    @ApiModelProperty(value = "当前状态")
-    @TableField(exist = false)
     private String status;
 
-    @ApiModelProperty(value = "当前状态名称")
-    @TableField(exist = false)
-    private String statusName;
+    /**
+     * 报警分组
+     */
+    @TableField("ALARM_GROUP")
+
+    private Long alarmGroup;
+
+    /**
+     * 视频通道数(预留)
+     */
+    @TableField("CHANNEL_NUM")
+    private Integer channelNum;
 
     @Override
     public String toString() {
         return "Device{" +
             "id=" + id +
-            ", deviceCode=" + deviceCode +
-            ", deviceType=" + deviceType +
-            ", deviceBatch=" + deviceBatch +
-            ", manufacturer=" + manufacturer +
-            ", isPowerSupply=" + isPowerSupply +
-            ", createTime=" + createTime +
+            ", deviceName=" + deviceName +
+            ", ip=" + ip +
+            ", port=" + port +
+            ", userName=" + userName +
+            ", password=" + password +
+            ", connectType=" + connectType +
+            ", location=" + location +
+            ", status=" + status +
+            ", alarmGroup=" + alarmGroup +
+            ", channelNum=" + channelNum +
         "}";
     }
 }
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/DeviceExt.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/DeviceExt.java
deleted file mode 100644
index 5ee7015..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/DeviceExt.java
+++ /dev/null
@@ -1,99 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-
-/**
- * <p>
- * 设备扩展信息表（安全树）
- * </p>
- *
- * @author zyj
- * @since 2023-04-27
- */
-@Data
-@TableName("br_device_ext")
-public class DeviceExt implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 设备ID
-     */
-    @TableField("DEVICE_ID")
-    private Long deviceId;
-
-    /**
-     * 摄像头编号
-     */
-    @TableField("CAMERA_CODE")
-    private String cameraCode;
-
-    /**
-     * 摄像头IP
-     */
-    @TableField("CAMERA_IP")
-    private String cameraIp;
-
-    /**
-     * 摄像头端口
-     */
-    @TableField("CAMERA_PORT")
-    private String cameraPort;
-
-    /**
-     * 激甲编号
-     */
-    @TableField("GAS_CODE")
-    private String gasCode;
-
-    /**
-     * 激甲IP
-     */
-    @TableField("GAS_IP")
-    private String gasIp;
-
-    /**
-     * 激甲端口
-     */
-    @TableField("GAS_PORT")
-    private String gasPort;
-
-    /**
-     * 甲烷报警阈值
-     */
-    @TableField("GAS_THRESHOLD")
-    private String gasThreshold;
-
-    @TableField(value = "HAT_LINING_CODE")
-    private String hatLiningCode;
-
-
-    @Override
-    public String toString() {
-        return "DeviceExt{" +
-            "id=" + id +
-            ", deviceId=" + deviceId +
-            ", cameraCode=" + cameraCode +
-            ", cameraIp=" + cameraIp +
-            ", cameraPort=" + cameraPort +
-            ", gasCode=" + gasCode +
-            ", gasIp=" + gasIp +
-            ", gasPort=" + gasPort +
-            ", gasThreshold=" + gasThreshold +
-            ", hatLiningCode=" + hatLiningCode +
-        "}";
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/ProjectDevice.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/ProjectDevice.java
deleted file mode 100644
index c4f3472..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/ProjectDevice.java
+++ /dev/null
@@ -1,62 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-
-/**
- * <p>
- * 
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@Data
-@ApiModel("ProjectDevice")
-@TableName("br_project_device")
-public class ProjectDevice implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 作业现场ID
-     */
-    @TableField("PROJECT_ID")
-    private Long projectId;
-
-    /**
-     * 设备ID
-     */
-    @TableField("DEVICE_ID")
-    @ApiModelProperty("设备ID（新增编辑时传）")
-    private Long deviceId;
-
-    /**
-     * 设备编号
-     */
-    @TableField(exist = false)
-    @ApiModelProperty("设备编号（详情中展示，新增编辑不用传）")
-    private String deviceCode;
-
-    @Override
-    public String toString() {
-        return "ProjectDevice{" +
-            "id=" + id +
-            ", projectId=" + projectId +
-            ", deviceId=" + deviceId +
-        "}";
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/ProjectWorker.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/ProjectWorker.java
deleted file mode 100644
index 10b23c4..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/ProjectWorker.java
+++ /dev/null
@@ -1,104 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import java.io.Serializable;
-
-/**
- * <p>
- * 
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@ApiModel("ProjectWorker")
-@TableName("br_project_worker")
-@Data
-@NoArgsConstructor
-@AllArgsConstructor
-public class ProjectWorker implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 作业现场ID
-     */
-    @TableField("PROJECT_ID")
-    private Long projectId;
-
-    /**
-     * 人员ID
-     */
-    @ApiModelProperty("人员ID")
-    @TableField("WORKER_ID")
-    private Long workerId;
-
-    /**
-     * 安全帽编号
-     */
-    @ApiModelProperty("安全帽编号")
-    @TableField("HAT_CODE")
-    private String hatCode;
-
-    /**
-     * 背心编号
-     */
-    @ApiModelProperty("背心编号")
-    @TableField("VAST_CODE")
-    private String vastCode;
-
-    /**
-     * 手环编号
-     */
-    @ApiModelProperty("手环编号")
-    @TableField("BRACELET_CODE")
-    private String braceletCode;
-
-    @ApiModelProperty("人员姓名（详情中展示，新增编辑不用传）")
-    @TableField(exist = false)
-    private String workerName;
-
-    @ApiModelProperty("人员部门ID（详情中展示，新增编辑不用传）")
-    @TableField(exist = false)
-    private String workerDeptId;
-
-    @ApiModelProperty("人员部门名称（详情中展示，新增编辑不用传）")
-    @TableField(exist = false)
-    private String workerDeptName;
-
-    @ApiModelProperty("人员联系方式（详情中展示，新增编辑不用传）")
-    @TableField(exist = false)
-    private String workerPhoneNumber;
-
-    public ProjectWorker(Long projectId, Long workerId) {
-        this.projectId = projectId;
-        this.workerId = workerId;
-    }
-
-    @Override
-    public String toString() {
-        return "ProjectWorker{" +
-            "id=" + id +
-            ", projectId=" + projectId +
-            ", workerId=" + workerId +
-            ", hatCode=" + hatCode +
-            ", vastCode=" + vastCode +
-            ", braceletCode=" + braceletCode +
-        "}";
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/WorkSiteInfo.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/WorkSiteInfo.java
deleted file mode 100644
index fa6f41d..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/WorkSiteInfo.java
+++ /dev/null
@@ -1,130 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.alibaba.fastjson.annotation.JSONField;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.time.LocalDateTime;
-import java.util.Date;
-
-/**
- * <p>
- * 作业现场表
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@ApiModel("WorkSiteInfo")
-@TableName("br_work_site_info")
-@Data
-public class WorkSiteInfo implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @ApiModelProperty("作业现场ID")
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 作业名称
-     */
-    @ApiModelProperty("作业名称")
-    @TableField("WORK_TITLE")
-    private String workTitle;
-
-    /**
-     * 责任人
-     */
-    @ApiModelProperty("责任人（人员ID）")
-    @TableField("WORK_PERSON")
-    private Long workPerson;
-
-    /**
-     * 作业描述
-     */
-    @ApiModelProperty("作业描述")
-    @TableField("WORK_SITE_DESC")
-    private String workSiteDesc;
-
-    /**
-     * 作业状态
-     */
-    @ApiModelProperty("作业状态")
-    @TableField("PROJECT_STATE")
-    private String projectState;
-
-    /**
-     * 所属道路
-     */
-    @ApiModelProperty("所属道路")
-    @TableField("WORK_ROAD")
-    private String workRoad;
-
-    @TableField("IMAGE_URL")
-    private String imageUrl;
-
-    @TableField("CREATE_TIME")
-    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
-    private Date createTime;
-    @TableField("UPDATE_TIME")
-    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
-    private Date updateTime;
-
-    @ApiModelProperty("开始时间")
-    @TableField("START_TIME")
-    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
-    private Date startTime;
-
-    @ApiModelProperty("结束时间")
-    @TableField("FINISH_TIME")
-    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
-    private Date finishTime;
-
-    @ApiModelProperty("负责人姓名（详情中使用，新增编辑不用传）")
-    @TableField(exist = false)
-    private String workPersonName;
-
-    @ApiModelProperty("负责人联系方式（详情中使用，新增编辑不用传）")
-    @TableField(exist = false)
-    private String workPersonPhoneNumber;
-
-    @ApiModelProperty("负责人所属部门ID（详情中使用，新增编辑不用传）")
-    @TableField(exist = false)
-    private Long workPersonDeptId;
-
-    @ApiModelProperty("负责人所属部门名称（详情中使用，新增编辑不用传）")
-    @TableField(exist = false)
-    private String workPersonDeptName;
-
-    @ApiModelProperty(value = "注册时间",dataType = "String")
-    @TableField(exist = false)
-    private String registerTime;
-
-    @ApiModelProperty("作业状态名称")
-    @TableField(exist = false)
-    private String projectStateName;
-
-    @Override
-    public String toString() {
-        return "WorkSiteInfo{" +
-            "id=" + id +
-            ", workTitle=" + workTitle +
-            ", workPerson=" + workPerson +
-            ", workSiteDesc=" + workSiteDesc +
-            ", projectState=" + projectState +
-            ", imageUrl=" + imageUrl +
-            ", updateTime=" + updateTime +
-            ", workRoad=" + workRoad +
-        "}";
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Worker.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Worker.java
deleted file mode 100644
index 28a4daa..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Worker.java
+++ /dev/null
@@ -1,147 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.time.LocalDateTime;
-import java.util.Date;
-
-/**
- * <p>
- * 
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@ApiModel("Worker")
-@TableName("br_worker")
-@Data
-public class Worker implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @ApiModelProperty(value = "人员ID")
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 姓名
-     */
-    @ApiModelProperty(value = "姓名")
-    @TableField("WORKER_NAME")
-    private String workerName;
-
-    /**
-     * 性别
-     */
-    @ApiModelProperty(value = "性别")
-    @TableField("GENDER")
-    private String gender;
-
-    /**
-     * 所属部门
-     */
-    @ApiModelProperty(value = "所属部门(人员管理)")
-    @TableField("DEPT_ID")
-    private Long deptId;
-
-    /**
-     * 所属单位
-     */
-    @ApiModelProperty(value = "所属单位(入场申请中使用)")
-    @TableField("OWNER_SHIP")
-    private String ownerShip;
-
-    /**
-     * 联系方式
-     */
-    @ApiModelProperty(value = "联系方式")
-    @TableField("PHONE_NUMBER")
-    private String phoneNumber;
-
-    /**
-     * 证件号
-     */
-    @ApiModelProperty(value = "证件号")
-    @TableField("ID_CARD_NUMBER")
-    private String idCardNumber;
-
-    /**
-     * 入场原因
-     */
-    @ApiModelProperty(value = "入场原因（入场申请中使用）")
-    @TableField("ENTER_REASON")
-    private String enterReason;
-
-    /**
-     * 入场人脸照片
-     */
-    @ApiModelProperty(value = "人脸照片（照片路径）")
-    @TableField("WORKER_AVATAR")
-    private String workerAvatar;
-
-    /**
-     * 申请入场时间
-     */
-    @ApiModelProperty(value = "注册时间/申请入场时间")
-    @TableField("CREATE_TIME")
-    private Date createTime;
-
-    /**
-     * 人员类型
-     */
-    @ApiModelProperty(value = "人员类型（区分人员管理和入场申请）")
-    @TableField("WORKER_TYPE")
-    private String workerType;
-
-    @ApiModelProperty(value = "性别名称")
-    @TableField(exist = false)
-    private String genderName;
-
-    @ApiModelProperty(value = "部门名称")
-    @TableField(exist = false)
-    private String deptName;
-
-    @ApiModelProperty(value = "注册时间",dataType = "String")
-    @TableField(exist = false)
-    private String registerTime;
-
-    @ApiModelProperty(value = "当前状态")
-    @TableField(exist = false)
-    private String status;
-
-    @ApiModelProperty(value = "当前状态名称")
-    @TableField(exist = false)
-    private String statusName;
-
-    @ApiModelProperty(value = "是否注册(0未注册；1已注册)",allowableValues = "0,1")
-    @TableField(exist = false)
-    private String isRegister;
-
-    @Override
-    public String toString() {
-        return "Worker{" +
-            "id=" + id +
-            ", workerName=" + workerName +
-            ", gender=" + gender +
-            ", deptId=" + deptId +
-            ", ownerShip=" + ownerShip +
-            ", phoneNumber=" + phoneNumber +
-            ", idCardNumber=" + idCardNumber +
-            ", enterReason=" + enterReason +
-            ", workerAvatar=" + workerAvatar +
-            ", createTime=" + createTime +
-            ", workerType=" + workerType +
-        "}";
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/AlarmMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/AlarmMapper.java
new file mode 100644
index 0000000..ea4c8be
--- /dev/null
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/AlarmMapper.java
@@ -0,0 +1,16 @@
+package com.casic.missiles.modular.system.mapper;
+
+import com.casic.missiles.modular.system.entity.Alarm;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 报警记录表 Mapper 接口
+ * </p>
+ *
+ * @author zyj
+ * @since 2023-05-25
+ */
+public interface AlarmMapper extends BaseMapper<Alarm> {
+
+}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/BusAlarmMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/BusAlarmMapper.java
deleted file mode 100644
index 9801742..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/BusAlarmMapper.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package com.casic.missiles.modular.system.mapper;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.modular.system.dto.AlarmTypeCountDTO;
-import com.casic.missiles.modular.system.entity.BusAlarm;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * <p>
- * 报警记录表 Mapper 接口
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface BusAlarmMapper extends BaseMapper<BusAlarm> {
-
-    Page<BusAlarm> listPage(Page<BusAlarm> page,@Param("ew")  QueryWrapper<BusAlarm> queryWrapper);
-
-    void cancelAlarm(@Param("deviceId")Long deviceId,@Param("alarmType") String alarmType);
-
-    List<AlarmTypeCountDTO> alarmCount(@Param("projectId")Long projectId, @Param("alarmStatus")String alarmStatus);
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/BusEventImageMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/BusEventImageMapper.java
deleted file mode 100644
index 9590b7d..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/BusEventImageMapper.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.casic.missiles.modular.system.mapper;
-
-import com.casic.missiles.modular.system.entity.BusEventImage;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * <p>
- * 事件图片表 Mapper 接口
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface BusEventImageMapper extends BaseMapper<BusEventImage> {
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/BusEventMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/BusEventMapper.java
deleted file mode 100644
index 3c85edf..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/BusEventMapper.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.casic.missiles.modular.system.mapper;
-
-import com.casic.missiles.modular.system.entity.BusEvent;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * <p>
- * 事件表 Mapper 接口
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface BusEventMapper extends BaseMapper<BusEvent> {
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/DeviceExtMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/DeviceExtMapper.java
deleted file mode 100644
index 4ca9212..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/DeviceExtMapper.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.casic.missiles.modular.system.mapper;
-
-import com.casic.missiles.modular.system.entity.DeviceExt;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * <p>
- * 设备扩展信息表（安全树） Mapper 接口
- * </p>
- *
- * @author zyj
- * @since 2023-04-27
- */
-public interface DeviceExtMapper extends BaseMapper<DeviceExt> {
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/DeviceMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/DeviceMapper.java
index 444c0c5..3d0bb02 100644
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/DeviceMapper.java
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/DeviceMapper.java
@@ -1,30 +1,16 @@
 package com.casic.missiles.modular.system.mapper;
 
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.modular.system.dto.DeviceDetailDTO;
-import com.casic.missiles.modular.system.dto.HelmetInfoDTO;
 import com.casic.missiles.modular.system.entity.Device;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
 
 /**
  * <p>
- *  Mapper 接口
+ * 设备记录表 Mapper 接口
  * </p>
  *
  * @author zyj
- * @since 2023-04-14
+ * @since 2023-05-25
  */
-@Mapper
 public interface DeviceMapper extends BaseMapper<Device> {
 
-    Page<DeviceDetailDTO> listDetailPage(Page<DeviceDetailDTO> page,@Param("ew") QueryWrapper<DeviceDetailDTO> ew);
-
-     List<Long> selectProjectDevice(@Param("projectId") Long projectId);
-
-    List<HelmetInfoDTO> selectHelmetList(@Param("deviceType")String deviceType);
 }
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/ProjectDeviceMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/ProjectDeviceMapper.java
deleted file mode 100644
index 1d0c14e..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/ProjectDeviceMapper.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package com.casic.missiles.modular.system.mapper;
-
-import com.casic.missiles.modular.system.dto.DeviceLocationDTO;
-import com.casic.missiles.modular.system.entity.ProjectDevice;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * <p>
- *  Mapper 接口
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface ProjectDeviceMapper extends BaseMapper<ProjectDevice> {
-     List<ProjectDevice> selectDetailByProjectId(@Param("projectId") Long projectId);
-
-     List<DeviceLocationDTO> selectDeviceLocationList(@Param("projectId") Long projectId);
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/ProjectWorkerMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/ProjectWorkerMapper.java
deleted file mode 100644
index 58583d1..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/ProjectWorkerMapper.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package com.casic.missiles.modular.system.mapper;
-
-import com.casic.missiles.modular.system.dto.WorkerLocationDTO;
-import com.casic.missiles.modular.system.entity.ProjectWorker;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * <p>
- *  Mapper 接口
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface ProjectWorkerMapper extends BaseMapper<ProjectWorker> {
-
-    List<ProjectWorker> selectDetailByProjectId(@Param("projectId") Long projectId,
-                                                @Param("workerType")String workerType);
-
-    List<WorkerLocationDTO> selectWorkerLocationList(@Param("projectId") Long projectId,
-                                                     @Param("workerType")String workerType);
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/WorkSiteInfoMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/WorkSiteInfoMapper.java
deleted file mode 100644
index a4934d2..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/WorkSiteInfoMapper.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.casic.missiles.modular.system.mapper;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.modular.system.entity.WorkSiteInfo;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Param;
-
-/**
- * <p>
- * 作业现场表 Mapper 接口
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface WorkSiteInfoMapper extends BaseMapper<WorkSiteInfo> {
-
-    Page<WorkSiteInfo> selectListPage(Page<WorkSiteInfo> page,@Param("ew") QueryWrapper<WorkSiteInfo> ew);
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/WorkerMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/WorkerMapper.java
deleted file mode 100644
index 258fb12..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/WorkerMapper.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package com.casic.missiles.modular.system.mapper;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.modular.system.dto.DeviceDetailDTO;
-import com.casic.missiles.modular.system.entity.Worker;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * <p>
- *  Mapper 接口
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface WorkerMapper extends BaseMapper<Worker> {
-
-
-    Page<Worker> selectListPage(Page<Worker> page, @Param("ew") QueryWrapper<Worker> ew);
-
-    List<String> selectWorkerAvatars(@Param("projectId")Long projectId);
-
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/AlarmMapper.xml b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/AlarmMapper.xml
new file mode 100644
index 0000000..25cb4ab
--- /dev/null
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/AlarmMapper.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.modular.system.mapper.AlarmMapper">
+
+</mapper>
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/BusAlarmMapper.xml b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/BusAlarmMapper.xml
deleted file mode 100644
index 595088a..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/BusAlarmMapper.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.casic.missiles.modular.system.mapper.BusAlarmMapper">
-
-    <select id="listPage" resultType="com.casic.missiles.modular.system.entity.BusAlarm">
-        SELECT
-            alarm.ID as id,
-            alarm.DEVICE_ID as deviceId,
-            alarm.PROJECT_ID as projectId,
-            alarm.ALARM_TYPE as alarmType,
-            alarm.ALARM_VALUE as alarmValue,
-            alarm.ALARM_STATUS as alarmStatus,
-            alarm.ALARM_IMAGE AS alarmImage,
-            alarm.ALARM_CONTENT as alarmContent,
-            alarm.ALARM_TIME as alarmTime,
-            alarm.CANCEL_TIME as cancelTime,
-            alarm.ALARM_LNG as alarmLng,
-            alarm.ALARM_LAT as alarmLat,
-            p.WORK_TITLE as workTitle,
-            p.WORK_ROAD as workRoad,
-            p.PROJECT_STATE as projectState,
-            w.WORKER_NAME as workPersonName,
-            w.PHONE_NUMBER as workPersonPhoneNumber
-        FROM
-            `br_bus_alarm` alarm
-                LEFT JOIN br_work_site_info p on alarm.PROJECT_ID = p.ID
-                LEFT JOIN br_worker w on p.WORK_PERSON = w.ID
-        <where>
-            <if test="ew != null">
-                ${ew.sqlSegment}
-            </if>
-        </where>
-    </select>
-
-    <select id="cancelAlarm">
-        update br_bus_alarm
-        set ALARM_STATUS = '1'
-        where DEVICE_ID = #{deviceId}
-          and ALARM_TYPE = #{alarmType}
-          and ALARM_STATUS = '0'
-    </select>
-
-    <select id="alarmCount" resultType="com.casic.missiles.modular.system.dto.AlarmTypeCountDTO">
-        SELECT
-            ALARM_TYPE as alarmType,
-            count(*) as alarmCount
-        from br_bus_alarm
-        <where>
-            <if test="projectId != null and projectId !=''">
-                and PROJECT_ID = #{projectId}
-            </if>
-            <if test="alarmStatus != null and alarmStatus !=''">
-                and ALARM_STATUS = #{alarmStatus}
-            </if>
-        </where>
-        group by ALARM_TYPE
-    </select>
-</mapper>
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/BusEventImageMapper.xml b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/BusEventImageMapper.xml
deleted file mode 100644
index fbc3db3..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/BusEventImageMapper.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.casic.missiles.modular.system.mapper.BusEventImageMapper">
-
-</mapper>
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/BusEventMapper.xml b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/BusEventMapper.xml
deleted file mode 100644
index 627d573..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/BusEventMapper.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.casic.missiles.modular.system.mapper.BusEventMapper">
-
-</mapper>
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/DeviceExtMapper.xml b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/DeviceExtMapper.xml
deleted file mode 100644
index 5321d1c..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/DeviceExtMapper.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.casic.missiles.modular.system.mapper.DeviceExtMapper">
-
-</mapper>
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/DeviceMapper.xml b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/DeviceMapper.xml
index 94262e1..88e7d01 100644
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/DeviceMapper.xml
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/DeviceMapper.xml
@@ -2,96 +2,4 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.casic.missiles.modular.system.mapper.DeviceMapper">
 
-    <select id="listDetailPage" resultType="com.casic.missiles.modular.system.dto.DeviceDetailDTO">
-        select
-        br_device.ID as id,
-        DEVICE_CODE as deviceCode,
-        DEVICE_TYPE as deviceType,
-        DEVICE_BATCH as deviceBatch,
-        MANUFACTURER as manufacturer,
-        IS_POWER_SUPPLY as isPowerSupply,
-        CREATE_TIME as createTime,
-        CAMERA_CODE as cameraCode,
-        CAMERA_IP as cameraIp,
-        CAMERA_PORT as cameraPort,
-        GAS_CODE as gasCode,
-        GAS_IP as gasIp,
-        GAS_PORT as gasPort,
-        HAT_LINING_CODE as hatLiningCode
-        from br_device
-        left join br_device_ext ext on ext.DEVICE_ID = br_device.ID
-        <where>
-            <if test="ew != null">
-                ${ew.sqlSegment}
-            </if>
-        </where>
-    </select>
-
-    <select id="selectProjectDevice" resultType="java.lang.Long">
-        with device_info as (
-            (SELECT
-            d.DEVICE_ID as DEVICE_ID,
-            d.PROJECT_ID as PROJECT_ID,
-            p.PROJECT_STATE as PROJECT_STATE
-            from br_project_device d
-            LEFT JOIN br_work_site_info p on p.ID = d.PROJECT_ID)
-
-            UNION ALL
-
-            (SELECT
-            d1.ID as DEVICE_ID,
-            w1.ID as PROJECT_ID,
-            w1.PROJECT_STATE as PROJECT_STATE
-            FROM br_project_worker pw1
-            LEFT JOIN br_device d1 on pw1.BRACELET_CODE = d1.DEVICE_CODE
-            LEFT JOIN br_work_site_info w1 on pw1.PROJECT_ID = w1.ID)
-
-            UNION ALL
-
-            (SELECT
-            d1.ID as DEVICE_ID,
-            w1.ID as PROJECT_ID,
-            w1.PROJECT_STATE as PROJECT_STATE
-            FROM br_project_worker pw1
-            LEFT JOIN br_device d1 on pw1.HAT_CODE = d1.DEVICE_CODE
-            LEFT JOIN br_work_site_info w1 on pw1.PROJECT_ID = w1.ID)
-
-
-            UNION ALL
-
-            (SELECT
-            d1.ID as DEVICE_ID,
-            w1.ID as PROJECT_ID,
-            w1.PROJECT_STATE as PROJECT_STATE
-            FROM br_project_worker pw1
-            LEFT JOIN br_device d1 on pw1.VAST_CODE = d1.DEVICE_CODE
-            LEFT JOIN br_work_site_info w1 on pw1.PROJECT_ID = w1.ID))
-
-        select DISTINCT DEVICE_ID from device_info
-        <where>
-            DEVICE_ID is not null
-            <choose>
-                <when test="projectId != null and projectId !=''">
-                    and PROJECT_ID = #{projectId}
-                </when>
-                <otherwise>
-                    AND PROJECT_STATE != '3'
-                </otherwise>
-            </choose>
-        </where>
-    </select>
-
-    <select id="selectHelmetList" resultType="com.casic.missiles.modular.system.dto.HelmetInfoDTO">
-        SELECT
-            a.ID AS deviceId,
-            a.DEVICE_CODE AS hatCode,
-            b.HAT_LINING_CODE AS hatLiningCode
-        FROM
-            br_device a
-                LEFT JOIN br_device_ext b ON a.ID = b.DEVICE_ID
-        WHERE
-            a.DEVICE_TYPE = #{deviceType}
-          AND a.DEVICE_CODE IS NOT NULL
-          AND b.HAT_LINING_CODE IS NOT NULL
-    </select>
 </mapper>
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/ProjectDeviceMapper.xml b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/ProjectDeviceMapper.xml
deleted file mode 100644
index c6d1c24..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/ProjectDeviceMapper.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.casic.missiles.modular.system.mapper.ProjectDeviceMapper">
-
-    <select id="selectDetailByProjectId" resultType="com.casic.missiles.modular.system.entity.ProjectDevice">
-        SELECT
-            pd.ID as id,
-            pd.PROJECT_ID as projectId,
-            pd.DEVICE_ID as deviceId,
-            d.DEVICE_CODE as deviceCode
-        from br_project_device pd
-        LEFT JOIN br_device d on pd.DEVICE_ID = d.ID
-        <where>
-            pd.PROJECT_ID = #{projectId}
-        </where>
-    </select>
-
-    <select id="selectDeviceLocationList" resultType="com.casic.missiles.modular.system.dto.DeviceLocationDTO">
-        SELECT
-        d.ID as deviceId,
-        d.DEVICE_TYPE as deviceType,
-        d.DEVICE_CODE as deviceCode,
-        if(EXISTS(select ID from br_bus_alarm WHERE DEVICE_ID = d.ID and ALARM_STATUS = '0'),true,false) as alarmFlag
-        FROM br_project_device pd, br_device d
-        where pd.DEVICE_ID = d.ID
-        and pd.PROJECT_ID = #{projectId}
-    </select>
-
-</mapper>
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/ProjectWorkerMapper.xml b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/ProjectWorkerMapper.xml
deleted file mode 100644
index 8d2de10..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/ProjectWorkerMapper.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.casic.missiles.modular.system.mapper.ProjectWorkerMapper">
-
-    <select id="selectDetailByProjectId" resultType="com.casic.missiles.modular.system.entity.ProjectWorker">
-        SELECT
-            pw.ID as id,
-            pw.PROJECT_ID as projectId,
-            pw.WORKER_ID as workerId,
-            w.WORKER_NAME as workerName,
-            w.DEPT_ID as workerDeptId,
-            pw.HAT_CODE as hatCode,
-            pw.VAST_CODE as vastCode,
-            pw.BRACELET_CODE as braceletCode,
-            w.PHONE_NUMBER as workerPhoneNumber
-        from br_project_worker pw
-        LEFT JOIN br_worker w on pw.WORKER_ID = w.ID
-        <where>
-            pw.PROJECT_ID = #{projectId}
-            <if test="workerType != null and workerType != ''">
-                and w.WORKER_TYPE = #{workerType}
-            </if>
-        </where>
-    </select>
-
-    <select id="selectWorkerLocationList" resultType="com.casic.missiles.modular.system.dto.WorkerLocationDTO">
-        select
-            w.ID as workerId,
-            w.WORKER_NAME as workerName,
-            pw.HAT_CODE as hatCode,
-            hd.ID as hatId,
-            pw.BRACELET_CODE as braceletCode,
-            pw.VAST_CODE as vastCode
-        from br_project_worker pw,br_worker w ,br_device hd
-        WHERE pw.WORKER_ID = w.ID
-          and pw.HAT_CODE = hd.DEVICE_CODE
-          and pw.PROJECT_ID = #{projectId}
-          and w.WORKER_TYPE = #{workerType}
-    </select>
-</mapper>
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/WorkSiteInfoMapper.xml b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/WorkSiteInfoMapper.xml
deleted file mode 100644
index 8f01326..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/WorkSiteInfoMapper.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.casic.missiles.modular.system.mapper.WorkSiteInfoMapper">
-
-    <select id="selectListPage" resultType="com.casic.missiles.modular.system.entity.WorkSiteInfo">
-        SELECT
-            br_work_site_info.ID AS id,
-            WORK_TITLE as workTitle,
-            WORK_ROAD as workRoad,
-            WORK_SITE_DESC as workSiteDesc,
-            WORK_PERSON as workPerson,
-            WORKER_NAME as workPersonName,
-            DEPT_ID as workPersonDeptId,
-            PHONE_NUMBER as workPersonPhoneNumber,
-            PROJECT_STATE as projectState,
-            br_work_site_info.CREATE_TIME AS createTime,
-            br_work_site_info.UPDATE_TIME AS updateTime
-        FROM br_work_site_info
-        LEFT JOIN br_worker w ON br_work_site_info.WORK_PERSON = w.ID
-        <where>
-            <if test="ew != null">
-                ${ew.sqlSegment}
-            </if>
-        </where>
-    </select>
-</mapper>
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/WorkerMapper.xml b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/WorkerMapper.xml
deleted file mode 100644
index 3e28b39..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/WorkerMapper.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.casic.missiles.modular.system.mapper.WorkerMapper">
-
-    <select id="selectListPage" resultType="com.casic.missiles.modular.system.entity.Worker">
-        WITH worker_project AS (
-            SELECT
-                w.id AS ID,
-                WORKER_NAME,
-                GENDER,
-                DEPT_ID,
-                OWNER_SHIP,
-                PHONE_NUMBER,
-                ID_CARD_NUMBER,
-                ENTER_REASON,
-                WORKER_AVATAR,
-                w.CREATE_TIME,
-                WORKER_TYPE,
-                IF( p.PROJECT_STATE != '3', 1, 0 ) AS `STATUS`
-            FROM br_worker w
-            LEFT JOIN br_project_worker pw ON w.ID = pw.WORKER_ID
-            LEFT JOIN br_work_site_info p ON pw.PROJECT_ID = p.ID
-        )
-
-        SELECT
-            ID AS id,
-            WORKER_NAME AS workerName,
-            GENDER AS gender,
-            DEPT_ID AS deptId,
-            OWNER_SHIP AS ownerShip,
-            PHONE_NUMBER AS phoneNumber,
-            ID_CARD_NUMBER AS idCardNumber,
-            ENTER_REASON AS enterReason,
-            WORKER_AVATAR AS workerAvatar,
-            CREATE_TIME AS createTime,
-            WORKER_TYPE AS workerType,
-            `STATUS` AS `status`
-        FROM worker_project
-        <where>
-            <if test="ew != null">
-                ${ew.sqlSegment}
-            </if>
-        </where>
-    </select>
-
-    <select id="selectWorkerAvatars" resultType="java.lang.String">
-        SELECT
-            WORKER_AVATAR
-        FROM
-            `br_worker`
-        WHERE
-        ID IN ( SELECT WORKER_ID FROM br_project_worker WHERE PROJECT_ID = #{projectId} )
-          AND WORKER_AVATAR IS NOT NULL
-          AND WORKER_AVATAR != ''
-    </select>
-</mapper>
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IAlarmService.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IAlarmService.java
new file mode 100644
index 0000000..8bc01f4
--- /dev/null
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IAlarmService.java
@@ -0,0 +1,16 @@
+package com.casic.missiles.modular.system.service;
+
+import com.casic.missiles.modular.system.entity.Alarm;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 报警记录表 服务类
+ * </p>
+ *
+ * @author zyj
+ * @since 2023-05-25
+ */
+public interface IAlarmService extends IService<Alarm> {
+
+}

diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/AlarmController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/AlarmController.java
new file mode 100644
index 0000000..1795cf1
--- /dev/null
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/AlarmController.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.modular.system.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.stereotype.Controller;
+
+/**
+ * <p>
+ * 报警记录表 前端控制器
+ * </p>
+ *
+ * @author zyj
+ * @since 2023-05-25
+ */
+@Controller
+@RequestMapping("/system/alarm")
+public class AlarmController {
+
+}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusAlarmController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusAlarmController.java
deleted file mode 100644
index 1f82ebb..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusAlarmController.java
+++ /dev/null
@@ -1,102 +0,0 @@
-package com.casic.missiles.modular.system.controller;
-
-
-import cn.hutool.core.util.ObjectUtil;
-import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.core.base.controller.BaseController;
-import com.casic.missiles.core.page.PageFactory;
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.AlarmUpload;
-import com.casic.missiles.modular.system.dto.DeviceDetailDTO;
-import com.casic.missiles.modular.system.entity.BusAlarm;
-import com.casic.missiles.modular.system.service.IBusAlarmService;
-import io.swagger.annotations.*;
-import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.*;
-
-import org.springframework.stereotype.Controller;
-
-import static com.casic.missiles.model.response.ResponseData.DEFAULT_SUCCESS_MESSAGE;
-import static com.casic.missiles.modular.system.consts.AlarmConst.ALARM_STATUS_MANUAL_CANCEL;
-
-/**
- * <p>
- * 报警记录表 前端控制器
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@Api(tags = "报警管理接口")
-@Controller
-@RequestMapping("/alarm")
-@RequiredArgsConstructor
-public class BusAlarmController extends BaseController {
-
-    private final IBusAlarmService alarmService;
-
-    @ApiOperation("报警上报接口")
-    @PostMapping("/upload")
-    @ResponseBody
-    public Object upload(@RequestBody AlarmUpload alarmUpload){
-        alarmService.alarmUpload(alarmUpload);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("报警列表分页查询")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "workTitle", value = "作业名称",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "projectId", value = "作业ID",dataType = "Long", paramType = "query",example = "0"),
-            @ApiImplicitParam(name = "alarmStatus", value = "报警状态",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "projectState", value = "作业状态",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "alarmType", value = "报警类型",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "alarmStartTime", value = "报警开始时间",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "alarmEndTime", value = "报警结束时间",dataType = "String", paramType = "query")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = BusAlarm.class),
-    })
-    @GetMapping("/listPage")
-    @ResponseBody
-    public Object listPage(String workTitle,Long projectId,String alarmStatus,String projectState,String alarmType,String alarmStartTime,String alarmEndTime){
-        Page<BusAlarm> page = PageFactory.defaultPage();
-        QueryWrapper<BusAlarm> queryWrapper = new QueryWrapper<>();
-        if(StrUtil.isNotEmpty(workTitle)){
-            queryWrapper.like("p.WORK_TITLE",workTitle);
-        }
-        if(ObjectUtil.isNotEmpty(projectId)){
-            queryWrapper.eq("alarm.PROJECT_ID",projectId);
-        }
-        if(StrUtil.isNotEmpty(alarmStatus)){
-            queryWrapper.eq("alarm.ALARM_STATUS",alarmStatus);
-        }
-        if(StrUtil.isNotEmpty(projectState)){
-            queryWrapper.eq("p.PROJECT_STATE",projectState);
-        }
-        if(StrUtil.isNotEmpty(alarmType)){
-            queryWrapper.eq("alarm.ALARM_TYPE",alarmType);
-        }
-        if(StrUtil.isNotEmpty(alarmStartTime)){
-            queryWrapper.ge("alarm.ALARM_TIME",alarmStartTime);
-        }
-        if(StrUtil.isNotEmpty(alarmEndTime)){
-            queryWrapper.le("alarm.ALARM_TIME",alarmEndTime);
-        }
-        page = alarmService.listPage(page,queryWrapper);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-    @ApiOperation("消警")
-    @PostMapping("/cancel")
-    @ResponseBody
-    public Object cancel(@RequestParam("alarmId") Long alarmId){
-        UpdateWrapper<BusAlarm> updateWrapper = new UpdateWrapper<>();
-        updateWrapper.eq("ID",alarmId);
-        updateWrapper.set("ALARM_STATUS",ALARM_STATUS_MANUAL_CANCEL);
-        alarmService.update(updateWrapper);
-        return ResponseData.success();
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusEventController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusEventController.java
deleted file mode 100644
index dde5aad..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusEventController.java
+++ /dev/null
@@ -1,41 +0,0 @@
-package com.casic.missiles.modular.system.controller;
-
-
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.entity.BusEvent;
-import com.casic.missiles.modular.system.service.IBusEventService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.ResponseBody;
-
-/**
- * <p>
- * 事件表 前端控制器
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@Controller
-@RequestMapping("/event")
-@Api(tags = "事件上报")
-@RequiredArgsConstructor
-public class BusEventController {
-
-    private final IBusEventService eventService;
-
-    @ApiOperation("事件上报")
-    @PostMapping("add")
-    @ResponseBody
-    public Object add(@RequestBody BusEvent busEvent){
-        eventService.saveBusEvent(busEvent);
-        return ResponseData.success();
-    }
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
index 03abc5f..aa50d78 100644
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
@@ -1,121 +1,20 @@
 package com.casic.missiles.modular.system.controller;
 
 
-import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.core.base.controller.BaseController;
-import com.casic.missiles.core.page.PageFactory;
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.DeviceDetailDTO;
-import com.casic.missiles.modular.system.entity.Device;
-import com.casic.missiles.modular.system.service.IDeviceExtService;
-import com.casic.missiles.modular.system.service.IDeviceService;
-import io.swagger.annotations.*;
-import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.RequestMapping;
 
 import org.springframework.stereotype.Controller;
 
-import java.time.LocalDateTime;
-import java.util.Date;
-import java.util.List;
-
-import static com.casic.missiles.model.response.ResponseData.DEFAULT_SUCCESS_MESSAGE;
-
 /**
  * <p>
- *  前端控制器
+ * 设备记录表 前端控制器
  * </p>
  *
  * @author zyj
- * @since 2023-04-14
+ * @since 2023-05-25
  */
-@Api(tags = "设备管理接口")
-@RequiredArgsConstructor
 @Controller
-@RequestMapping("/device")
-public class DeviceController extends BaseController {
-    private final IDeviceService deviceService;
-    private final IDeviceExtService deviceExtService;
-
-    @ApiOperation("设备分页列表")
-    @ApiImplicitParams({
-        @ApiImplicitParam(name = "deviceType", value = "设备类型",dataType = "String", paramType = "query"),
-        @ApiImplicitParam(name = "deviceCode", value = "设备编号",dataType = "String", paramType = "query"),
-        @ApiImplicitParam(name = "status", value = "设备状态",dataType = "String", paramType = "query"),
-        @ApiImplicitParam(name = "projectId", value = "作业ID（如果传此参数，列表中返回该作业使用的设备）",dataType = "Long", paramType = "query", example = "0")
-    })
-    @ApiResponses({
-        @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = DeviceDetailDTO.class),
-    })
-    @GetMapping("listPage")
-    @ResponseBody
-    public Object listPage(String deviceType, String deviceCode, String status,Long projectId){
-        Page<DeviceDetailDTO> page = PageFactory.defaultPage();
-        QueryWrapper<DeviceDetailDTO> queryWrapper = new QueryWrapper<>();
-        if(StrUtil.isNotEmpty(deviceType)){
-            queryWrapper.eq("DEVICE_TYPE",deviceType);
-        }
-        if(StrUtil.isNotEmpty(deviceCode)){
-            queryWrapper.like("DEVICE_CODE",deviceCode);
-        }
-        page = deviceService.listPage(page,queryWrapper,status,projectId);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-    @ApiOperation("新增设备")
-    @PostMapping("add")
-    @ResponseBody
-    public Object add(@RequestBody DeviceDetailDTO deviceDetailDTO){
-        deviceService.saveDevice(deviceDetailDTO);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("编辑设备")
-    @PostMapping("update")
-    @ResponseBody
-    public Object update(@RequestBody DeviceDetailDTO deviceDetailDTO){
-        deviceService.updateDevice(deviceDetailDTO);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("删除设备")
-    @PostMapping("delete")
-    @ResponseBody
-    public Object delete(@ApiParam("设备id列表")@RequestBody List<Long> deviceIds){
-        deviceService.deleteDevices(deviceIds);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("设置甲烷阈值")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "gasIp", value = "安全树甲烷设备IP",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "gasPort", value = "安全树甲烷端口",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "threshold", value = "甲烷阈值",dataType = "String", paramType = "query")
-    })
-    @PostMapping("setThreshold")
-    @ResponseBody
-    public Object setThreshold(String gasIp,String gasPort,String threshold){
-        deviceExtService.setGasThreshold(gasIp, gasPort, threshold);
-        return ResponseData.success();
-    }
-
-
-    @ApiOperation("查询甲烷阈值")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "gasIp", value = "安全树甲烷设备IP",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "gasPort", value = "安全树甲烷端口",dataType = "String", paramType = "query")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = "{\"code\": 200,\"data\": \"100\",\"message\": \"请求成功\",\"success\": true}",response = String.class),
-    })
-    @GetMapping("getThreshold")
-    @ResponseBody
-    public Object getThreshold(String gasIp,String gasPort){
-        String data = deviceExtService.getGasThreshold(gasIp, gasPort);
-        return ResponseData.success(data);
-    }
-
+@RequestMapping("/system/device")
+public class DeviceController {
 
 }
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/OverviewController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/OverviewController.java
deleted file mode 100644
index 7570504..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/OverviewController.java
+++ /dev/null
@@ -1,70 +0,0 @@
-package com.casic.missiles.modular.system.controller;
-
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.AlarmTypeCountDTO;
-import com.casic.missiles.modular.system.dto.DeviceLocationDTO;
-import com.casic.missiles.modular.system.dto.WorkerLocationDTO;
-import com.casic.missiles.modular.system.service.IBusAlarmService;
-import com.casic.missiles.modular.system.service.IProjectDeviceService;
-import com.casic.missiles.modular.system.service.IProjectWorkerService;
-import io.swagger.annotations.*;
-import lombok.RequiredArgsConstructor;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.ResponseBody;
-
-import static com.casic.missiles.model.response.ResponseData.DEFAULT_SUCCESS_MESSAGE;
-import static com.casic.missiles.modular.system.consts.AlarmConst.ALARM_STATUS_ON;
-
-@Api(tags = "首页看板接口")
-@Controller
-@RequestMapping("overview")
-@RequiredArgsConstructor
-public class OverviewController {
-
-    private final IBusAlarmService alarmService;
-    private final IProjectDeviceService projectDeviceService;
-
-    private final IProjectWorkerService projectWorkerService;
-
-
-    @ApiOperation("报警统计接口")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "projectId", value = "作业ID",dataType = "Long", paramType = "query", example = "0")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = AlarmTypeCountDTO.class),
-    })
-    @GetMapping("/alarmCount")
-    @ResponseBody
-    public Object alarmCount(Long projectId){
-        return ResponseData.success(alarmService.alarmCount(projectId,ALARM_STATUS_ON));
-    }
-
-    @ApiOperation("设备列表接口")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "projectId", value = "作业ID",dataType = "Long", paramType = "query", example = "0")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = DeviceLocationDTO.class),
-    })
-    @GetMapping("/deviceList")
-    @ResponseBody
-    public Object deviceList(Long projectId){
-        return ResponseData.success(projectDeviceService.selectDeviceLocationList(projectId));
-    }
-
-    @ApiOperation("人员列表接口")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "projectId", value = "作业ID",dataType = "Long", paramType = "query", example = "0")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = WorkerLocationDTO.class),
-    })
-    @GetMapping("/workerList")
-    @ResponseBody
-    public Object workerList(Long projectId){
-        return ResponseData.success(projectWorkerService.selectWorkerLocationDTO(projectId));
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/WorkSiteInfoController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/WorkSiteInfoController.java
deleted file mode 100644
index af36d69..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/WorkSiteInfoController.java
+++ /dev/null
@@ -1,130 +0,0 @@
-package com.casic.missiles.modular.system.controller;
-
-
-import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.core.base.controller.BaseController;
-import com.casic.missiles.core.page.PageFactory;
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.WorkSiteDetailDTO;
-import com.casic.missiles.modular.system.entity.WorkSiteInfo;
-import com.casic.missiles.modular.system.service.IWorkSiteInfoService;
-import io.swagger.annotations.*;
-import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.*;
-
-import org.springframework.stereotype.Controller;
-
-import java.util.List;
-
-import static com.casic.missiles.model.response.ResponseData.DEFAULT_SUCCESS_MESSAGE;
-
-/**
- * <p>
- * 作业现场表 前端控制器
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@Controller
-@RequestMapping("/site")
-@Api(tags = "作业现场管理")
-@RequiredArgsConstructor
-public class WorkSiteInfoController extends BaseController {
-
-
-    private final IWorkSiteInfoService workSiteInfoService;
-
-    @ApiOperation("新增作业现场")
-    @PostMapping("add")
-    @ResponseBody
-    public Object addWorkSite(@RequestBody WorkSiteDetailDTO workSiteDetailDTO){
-        workSiteInfoService.addWorkSiteInfo(workSiteDetailDTO);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("编辑作业现场")
-    @PostMapping("update")
-    @ResponseBody
-    public Object updateWorkSite(@RequestBody WorkSiteDetailDTO workSiteDetailDTO){
-        workSiteInfoService.updateWorkSiteInfo(workSiteDetailDTO);
-        return ResponseData.success();
-    }
-
-
-    @ApiOperation("删除作业现场")
-    @PostMapping("delete")
-    @ResponseBody
-    public Object delete(@ApiParam("作业现场id列表")@RequestBody List<Long> projectIds){
-        workSiteInfoService.deleteProjects(projectIds);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("查询作业现场详情")
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = WorkSiteDetailDTO.class),
-    })
-    @GetMapping("detail")
-    @ResponseBody
-    public Object delete(@ApiParam(value = "作业现场id", example = "0")@RequestParam Long projectId){
-        WorkSiteDetailDTO detailDTO = workSiteInfoService.getWorkSiteDetail(projectId);
-        return ResponseData.success(detailDTO);
-    }
-
-    @ApiOperation("分页列表查询")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "workTitle",value = "作业名称", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "workRoad",value = "所属道路", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "workPersonName",value = "责任人姓名", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "startDate",value = "注册开始日期", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "endDate",value = "注册结束日期", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "projectState",value = "当前状态（字典值）", dataType = "String", paramType = "query")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = WorkSiteInfo.class),
-    })
-    @GetMapping("listPage")
-    @ResponseBody
-    public Object listPage(String workTitle,String workRoad,String workPersonName,String projectState,String startDate,String endDate){
-        Page<WorkSiteInfo> page = PageFactory.defaultPage();
-        QueryWrapper<WorkSiteInfo> queryWrapper = new QueryWrapper<>();
-        if(StrUtil.isNotEmpty(workTitle)){
-            queryWrapper.like("WORK_TITLE",workTitle);
-        }
-        if(StrUtil.isNotEmpty(workRoad)){
-            queryWrapper.like("WORK_ROAD",workRoad);
-        }
-        if(StrUtil.isNotEmpty(workPersonName)){
-            queryWrapper.like("WORKER_NAME",workPersonName);
-        }
-        if(StrUtil.isNotEmpty(projectState)){
-            queryWrapper.eq("PROJECT_STATE",projectState);
-        }
-        if(StrUtil.isNotEmpty(startDate)){
-            queryWrapper.ge("br_work_site_info.CREATE_TIME",startDate + " 00:00:00");
-        }
-        if(StrUtil.isNotEmpty(endDate)){
-            queryWrapper.le("br_work_site_info.CREATE_TIME",endDate + " 23:59:59");
-        }
-        page = workSiteInfoService.selectListPage(page,queryWrapper);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-    @ApiOperation("开始作业")
-    @PostMapping("start")
-    @ResponseBody
-    public Object start(@ApiParam(value = "作业现场id",example = "0")@RequestParam Long projectId){
-        workSiteInfoService.start(projectId);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("完成作业")
-    @PostMapping("finish")
-    @ResponseBody
-    public Object finish(@ApiParam(value = "作业现场id", example = "0")@RequestParam Long projectId){
-        workSiteInfoService.finish(projectId);
-        return ResponseData.success();
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/WorkerController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/WorkerController.java
deleted file mode 100644
index 796f94c..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/WorkerController.java
+++ /dev/null
@@ -1,136 +0,0 @@
-package com.casic.missiles.modular.system.controller;
-
-
-import cn.hutool.core.util.ObjectUtil;
-import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.core.base.controller.BaseController;
-import com.casic.missiles.core.page.PageFactory;
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.DeviceDetailDTO;
-import com.casic.missiles.modular.system.entity.Device;
-import com.casic.missiles.modular.system.entity.Worker;
-import com.casic.missiles.modular.system.service.IWorkerService;
-import io.swagger.annotations.*;
-import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.*;
-
-import org.springframework.stereotype.Controller;
-
-import java.util.Date;
-import java.util.List;
-
-import static com.casic.missiles.model.response.ResponseData.DEFAULT_SUCCESS_MESSAGE;
-
-/**
- * <p>
- *  前端控制器
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@Controller
-@RequestMapping("/worker")
-@RequiredArgsConstructor
-@Api(tags = "人员管理接口")
-public class WorkerController extends BaseController {
-
-    private final IWorkerService workerService;
-
-    @ApiOperation("分页列表查询")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "name",value = "姓名", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "deptId",value = "所属部门", dataType = "Long", paramType = "query", example = "0"),
-            @ApiImplicitParam(name = "status",value = "当前状态（字典值）", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "startDate",value = "注册开始日期", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "endDate",value = "注册结束日期", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "workerType",value = "人员类型（字典值）", dataType = "String", paramType = "query")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = Worker.class),
-    })
-    @GetMapping("listPage")
-    @ResponseBody
-    public Object listPage(String name,Long deptId, String status,String startDate,String endDate,String workerType){
-        Page<Worker> page = PageFactory.defaultPage();
-        QueryWrapper<Worker> queryWrapper = new QueryWrapper<>();
-        if(StrUtil.isNotEmpty(name)){
-            queryWrapper.like("WORKER_NAME",name);
-        }
-        if(ObjectUtil.isNotEmpty(deptId)){
-            queryWrapper.eq("DEPT_ID",deptId);
-        }
-        if(StrUtil.isNotEmpty(workerType)){
-            queryWrapper.eq("WORKER_TYPE",workerType);
-        }
-        if(StrUtil.isNotEmpty(startDate)){
-            queryWrapper.ge("CREATE_TIME",startDate + " 00:00:00");
-        }
-        if(StrUtil.isNotEmpty(endDate)){
-            queryWrapper.le("CREATE_TIME",endDate + " 23:59:59");
-        }
-        if(StrUtil.isNotEmpty(status)){
-            queryWrapper.eq("`STATUS`",status);
-        }
-        page = workerService.selectListPage(page,queryWrapper);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-    @ApiOperation("新增人员")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "worker", value = "人员信息", dataType = "Worker", paramType = "body", required = true),
-            @ApiImplicitParam(name = "projectId", value = "项目ID(入场申请需要)", dataType = "Long", paramType = "query", example = "0")
-    })
-    @PostMapping("add")
-    @ResponseBody
-    public Object add(@ApiParam("worker")@RequestBody Worker worker,
-                      @RequestParam(required = false) Long projectId){
-        workerService.addWorker(worker,projectId);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("编辑人员")
-    @PostMapping("update")
-    @ResponseBody
-    public Object update(@RequestBody Worker worker){
-        workerService.updateById(worker);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("删除人员")
-    @PostMapping("delete")
-    @ResponseBody
-    public Object delete(@ApiParam("人员id列表")@RequestBody List<Long> workIds){
-        workerService.removeByIds(workIds);
-        return ResponseData.success();
-    }
-
-
-    @ApiOperation(value = "获取人脸图片",notes = "返回人脸图片url")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "cameraIp",value = "摄像头IP", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "cameraPort",value = "摄像头端口号", dataType = "String", paramType = "query"),
-    })
-    @GetMapping("/face/register")
-    @ResponseBody
-    public Object faceRegister(String cameraIp,String cameraPort){
-        return ResponseData.success(workerService.faceRegister(cameraIp, cameraPort));
-    }
-
-
-    @ApiOperation(value = "查询临时入场人员列表")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "projectId", value = "项目ID",required = true,dataType = "Long", paramType = "query", example = "0")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = Worker.class),
-    })
-    @GetMapping("/projectTempWorker")
-    @ResponseBody
-    public Object projectTempWorker(Long projectId){
-        return ResponseData.success(workerService.projectTempWorker(projectId));
-    }
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/AlarmTypeCountDTO.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/AlarmTypeCountDTO.java
deleted file mode 100644
index 1a165a1..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/AlarmTypeCountDTO.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.casic.missiles.modular.system.dto;
-
-import io.swagger.annotations.ApiModel;
-import lombok.Data;
-
-@ApiModel(value = "AlarmTypeCountDTO",description = "报警类型统计（首页）")
-@Data
-public class AlarmTypeCountDTO {
-
-    private String alarmType;
-    private String alarmTypeName;
-    private Integer alarmCount;
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/AlarmUpload.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/AlarmUpload.java
deleted file mode 100644
index 73d7799..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/AlarmUpload.java
+++ /dev/null
@@ -1,46 +0,0 @@
-package com.casic.missiles.modular.system.dto;
-
-import cn.hutool.core.util.StrUtil;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-@ApiModel(value = "AlarmUpload",description = "报警上传")
-@Data
-public class AlarmUpload {
-
-    @ApiModelProperty(value = "摄像头ip")
-    private String cameraIp;
-
-    @ApiModelProperty(value = "摄像头端口")
-    private String cameraPort;
-    @ApiModelProperty(value = "安全树甲烷设备ip")
-    private String gasIp;
-    @ApiModelProperty(value = "安全树甲烷设备端口")
-    private String gasPort;
-    @ApiModelProperty(value = "报警值")
-    private String alarmValue;
-    @ApiModelProperty(value = "报警时间")
-    private String alarmTime;
-    @ApiModelProperty(value = "报警类型")
-    private String alarmType;
-    @ApiModelProperty(value = "报警图片")
-    private String alarmImage;
-    @ApiModelProperty(value = "报警内容")
-    private String alarmContent;
-
-    @Override
-    public String toString() {
-        return "AlarmUpload{" +
-                "cameraIp='" + cameraIp + '\'' +
-                ", cameraPort='" + cameraPort + '\'' +
-                ", gasIp='" + gasIp + '\'' +
-                ", gasPort='" + gasPort + '\'' +
-                ", alarmValue='" + alarmValue + '\'' +
-                ", alarmTime='" + alarmTime + '\'' +
-                ", alarmType='" + alarmType + '\'' +
-                ", alarmImage='" + (StrUtil.isNotEmpty(alarmImage) ? alarmImage.substring(0,50) : "null") + '\'' +
-                ", alarmContent='" + alarmContent + '\'' +
-                '}';
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/DeviceDetailDTO.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/DeviceDetailDTO.java
deleted file mode 100644
index ea518d9..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/DeviceDetailDTO.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package com.casic.missiles.modular.system.dto;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.casic.missiles.modular.system.entity.Device;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-@ApiModel("DeviceDetailDTO")
-@Data
-public class DeviceDetailDTO extends Device {
-
-    @ApiModelProperty(value = "摄像头编号")
-    private String cameraCode;
-
-    @ApiModelProperty(value = "摄像头IP")
-    private String cameraIp;
-
-    @ApiModelProperty(value = "摄像头端口")
-    private String cameraPort;
-
-    @ApiModelProperty(value = "激甲编号")
-    private String gasCode;
-
-    @ApiModelProperty(value = "激甲IP")
-    private String gasIp;
-
-    @ApiModelProperty(value = "激甲端口")
-    private String gasPort;
-
-    @ApiModelProperty(value = "智能帽衬编号")
-    private String hatLiningCode;
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/WorkSiteDetailDTO.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/WorkSiteDetailDTO.java
deleted file mode 100644
index 29378ff..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/WorkSiteDetailDTO.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package com.casic.missiles.modular.system.dto;
-
-import com.casic.missiles.modular.system.entity.ProjectDevice;
-import com.casic.missiles.modular.system.entity.ProjectWorker;
-import com.casic.missiles.modular.system.entity.WorkSiteInfo;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.util.List;
-
-@Data
-@ApiModel("WorkSiteDetailDTO")
-public class WorkSiteDetailDTO extends WorkSiteInfo {
-
-    @ApiModelProperty(value = "安全树列表",dataType = "ProjectDevice")
-    private List<ProjectDevice> deviceList;
-
-    @ApiModelProperty(value = "人员列表",dataType = "ProjectWorker")
-    private List<ProjectWorker> workerList;
-
-
-
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/WorkerLocationDTO.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/WorkerLocationDTO.java
deleted file mode 100644
index 6fd7b24..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/WorkerLocationDTO.java
+++ /dev/null
@@ -1,68 +0,0 @@
-package com.casic.missiles.modular.system.dto;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-@ApiModel(value = "WorkerLocationDTO",description = "人员位置列表（首页）")
-@Data
-public class WorkerLocationDTO {
-
-    @ApiModelProperty("人员ID")
-    private Long workerId;
-
-    @ApiModelProperty("人员姓名")
-    private String workerName;
-
-    @ApiModelProperty("安全帽编号")
-    private String hatCode;
-
-    @ApiModelProperty("安全帽ID")
-    private Long hatId;
-
-    @ApiModelProperty("背心编号")
-    private String vastCode;
-
-    @ApiModelProperty("手环编号")
-    private String braceletCode;
-
-    @ApiModelProperty("位置")
-    private String location;
-
-    @ApiModelProperty("时间")
-    private String time;
-
-    @ApiModelProperty("经度")
-    private String lng;
-
-    @ApiModelProperty("纬度")
-    private String lat;
-
-    @ApiModelProperty("心率")
-    private String heartRate;
-
-    @ApiModelProperty("血氧")
-    private String bloodOxygen;
-
-    @ApiModelProperty("一氧化碳")
-    private String co;
-
-    @ApiModelProperty("甲烷")
-    private String gas;
-
-    @ApiModelProperty("硫化氢")
-    private String h2s;
-
-    @ApiModelProperty("氧气")
-    private String o2;
-
-    @ApiModelProperty("信号")
-    private String signal;
-
-    @ApiModelProperty("电量")
-    private String cell;
-
-    @ApiModelProperty("是否报警")
-    private boolean alarmFlag;
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Alarm.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Alarm.java
new file mode 100644
index 0000000..4d2b7ef
--- /dev/null
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Alarm.java
@@ -0,0 +1,103 @@
+package com.casic.missiles.modular.system.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import java.util.Date;
+
+/**
+ * <p>
+ * 报警记录表
+ * </p>
+ *
+ * @author zyj
+ * @since 2023-05-25
+ */
+@Data
+@TableName("bus_alarm")
+public class Alarm implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    @TableId(value = "ID",type = IdType.ASSIGN_ID)
+    private Long id;
+
+    /**
+     * 设备ID
+     */
+    @TableField("DEVICE_ID")
+    private Long deviceId;
+
+    /**
+     * 报警类型
+     */
+    @TableField("ALARM_TYPE")
+    private String alarmType;
+
+    /**
+     * 报警时间
+     */
+    @TableField("ALARM_TIME")
+    private Date alarmTime;
+
+    /**
+     * 报警状态
+     */
+    @TableField("ALARM_STATUS")
+    private String alarmStatus;
+
+    /**
+     * 报警位置
+     */
+    @TableField("ALARM_LOCATION")
+    private String alarmLocation;
+
+    /**
+     * 报警图片
+     */
+    @TableField("ALARM_IMAGE")
+    private String alarmImage;
+
+    /**
+     * 视频通道号
+     */
+    @TableField("CHANNEL_NO")
+    private Integer channelNo;
+
+    /**
+     * 报警内容
+     */
+    @TableField("ALARM_CONTENT")
+    private String alarmContent;
+
+    /**
+     * 消警时间
+     */
+    @TableField("CANCEL_TIME")
+    private Date cancelTime;
+
+
+    @Override
+    public String toString() {
+        return "Alarm{" +
+            "id=" + id +
+            ", deviceId=" + deviceId +
+            ", alarmType=" + alarmType +
+            ", alarmTime=" + alarmTime +
+            ", alarmStatus=" + alarmStatus +
+            ", alarmLocation=" + alarmLocation +
+            ", alarmImage=" + alarmImage +
+            ", channelNo=" + channelNo +
+            ", alarmContent=" + alarmContent +
+            ", cancelTime=" + cancelTime +
+        "}";
+    }
+}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusAlarm.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusAlarm.java
deleted file mode 100644
index efb4a23..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusAlarm.java
+++ /dev/null
@@ -1,159 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.alibaba.fastjson.annotation.JSONField;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.time.LocalDateTime;
-import java.util.Date;
-
-/**
- * <p>
- * 报警记录表
- * </p>
- *
- * @author zyj
- * @since 2023-05-16
- */
-@Data
-@ApiModel("Alarm")
-@TableName("br_bus_alarm")
-public class BusAlarm implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 项目ID
-     */
-    @ApiModelProperty(value = "项目ID")
-    @TableField("PROJECT_ID")
-    private Long projectId;
-
-    /**
-     * 设备ID
-     */
-    @ApiModelProperty(value = "设备ID")
-    @TableField("DEVICE_ID")
-    private Long deviceId;
-
-    /**
-     * 报警类型
-     */
-    @ApiModelProperty(value = "报警类型")
-    @TableField("ALARM_TYPE")
-    private String alarmType;
-
-    /**
-     * 报警状态
-     */
-    @ApiModelProperty(value = "报警状态")
-    @TableField("ALARM_STATUS")
-    private String alarmStatus;
-
-    /**
-     * 报警值
-     */
-    @ApiModelProperty(value = "报警值")
-    @TableField("ALARM_VALUE")
-    private String alarmValue;
-
-    /**
-     * 报警图片
-     */
-    @ApiModelProperty(value = "报警图片")
-    @TableField("ALARM_IMAGE")
-    private String alarmImage;
-
-    /**
-     * 报警内容
-     */
-    @ApiModelProperty(value = "报警内容")
-    @TableField("ALARM_CONTENT")
-    private String alarmContent;
-
-    /**
-     * 报警时间
-     */
-    @ApiModelProperty(value = "报警时间")
-    @TableField("ALARM_TIME")
-    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
-    private Date alarmTime;
-
-    /**
-     * 消警时间
-     */
-    @ApiModelProperty(value = "消警时间")
-    @TableField("CANCEL_TIME")
-    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
-    private Date cancelTime;
-
-    /**
-     * 报警位置经度
-     */
-    @ApiModelProperty(value = "报警位置经度")
-    @TableField("ALARM_LNG")
-    private String alarmLng;
-
-    /**
-     * 报警位置纬度
-     */
-    @ApiModelProperty(value = "报警位置纬度")
-    @TableField("ALARM_LAT")
-    private String alarmLat;
-
-    @ApiModelProperty("报警类型名称")
-    @TableField(exist = false)
-    private String alarmStatusName;
-    @ApiModelProperty("报警类型名称")
-    @TableField(exist = false)
-    private String alarmTypeName;
-    @ApiModelProperty("作业名称")
-    @TableField(exist = false)
-    private String workTitle;
-    @ApiModelProperty("所属道路")
-    @TableField(exist = false)
-    private String workRoad;
-    @ApiModelProperty("作业状态")
-    @TableField(exist = false)
-    private String projectState;
-    @ApiModelProperty("作业状态名称")
-    @TableField(exist = false)
-    private String projectStateName;
-    @ApiModelProperty("负责人姓名")
-    @TableField(exist = false)
-    private String workPersonName;
-    @ApiModelProperty("负责人联系方式")
-    @TableField(exist = false)
-    private String workPersonPhoneNumber;
-
-
-    @Override
-    public String toString() {
-        return "BusAlarm{" +
-                "id=" + id +
-                ", projectId=" + projectId +
-                ", deviceId=" + deviceId +
-                ", alarmType=" + alarmType +
-                ", alarmValue=" + alarmValue +
-                ", alarmStatus=" + alarmStatus +
-                ", alarmImage=" + alarmImage +
-                ", alarmContent=" + alarmContent +
-                ", alarmTime=" + alarmTime +
-                ", cancelTime=" + cancelTime +
-                ", alarmLng=" + alarmLng +
-                ", alarmLat=" + alarmLat +
-                "}";
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusEvent.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusEvent.java
deleted file mode 100644
index a0b7543..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusEvent.java
+++ /dev/null
@@ -1,100 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.time.LocalDateTime;
-import java.util.Date;
-import java.util.List;
-
-/**
- * <p>
- * 事件表
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@TableName("br_bus_event")
-@Data
-@ApiModel("BusEvent")
-public class BusEvent implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @ApiModelProperty("事件ID")
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 事件标题
-     */
-    @ApiModelProperty("事件名称")
-    @TableField("EVENT_TITLE")
-    private String eventTitle;
-
-    /**
-     * 上报人员
-     */
-    @ApiModelProperty("上报人员")
-    @TableField("UPLOAD_NAME")
-    private String uploadName;
-
-    /**
-     * 联系方式
-     */
-    @ApiModelProperty("联系方式")
-    @TableField("PHONE_NUMBER")
-    private String phoneNumber;
-
-    /**
-     * 事件描述
-     */
-    @ApiModelProperty("事件描述")
-    @TableField("EVENT_DESCRIPTION")
-    private String eventDescription;
-
-    @ApiModelProperty("经度")
-    @TableField("LNG")
-    private String lng;
-
-    @ApiModelProperty("纬度")
-    @TableField("LAT")
-    private String lat;
-
-    /**
-     * 事件上传时间
-     */
-    @ApiModelProperty("事件上传时间")
-    @TableField("CREATE_TIME")
-    private Date createTime;
-
-    @ApiModelProperty("事件照片")
-    @TableField(exist = false)
-    private List<BusEventImage> imageList;
-
-
-
-    @Override
-    public String toString() {
-        return "BusEvent{" +
-            "id=" + id +
-            ", eventTitle=" + eventTitle +
-            ", uploadName=" + uploadName +
-            ", phoneNumber=" + phoneNumber +
-            ", eventDescription=" + eventDescription +
-            ", lng=" + lng +
-            ", lat=" + lat +
-            ", createTime=" + createTime +
-        "}";
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusEventImage.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusEventImage.java
deleted file mode 100644
index 1e75245..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusEventImage.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-
-/**
- * <p>
- * 事件图片表
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@TableName("br_bus_event_image")
-@Data
-@ApiModel("BusEventImage")
-public class BusEventImage implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 事件ID
-     */
-    @TableField("EVENT_ID")
-    private Long eventId;
-
-    /**
-     * 报警图片
-     */
-    @TableField("IMAGE")
-    @ApiModelProperty("图片url")
-    private String image;
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Device.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Device.java
index df89c70..ea7db5f 100644
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Device.java
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Device.java
@@ -1,30 +1,23 @@
 package com.casic.missiles.modular.system.entity;
 
-import com.alibaba.fastjson.annotation.JSONField;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.casic.missiles.core.base.json.DateDeserializer;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
-import java.util.Date;
 
 /**
  * <p>
- * 
+ * 设备记录表
  * </p>
  *
  * @author zyj
- * @since 2023-04-14
+ * @since 2023-05-25
  */
-@ApiModel("Device")
-@TableName("br_device")
 @Data
+@TableName("bus_device")
 public class Device implements Serializable {
 
     private static final long serialVersionUID = 1L;
@@ -32,82 +25,86 @@
     /**
      * 主键
      */
-    @ApiModelProperty(value = "设备ID")
     @TableId(value = "ID",type = IdType.ASSIGN_ID)
     private Long id;
 
     /**
-     * 设备编号
+     * 设备名称
      */
-    @ApiModelProperty(value = "设备编号")
-    @TableField("DEVICE_CODE")
-    private String deviceCode;
+    @TableField("DEVICE_NAME")
+    private String deviceName;
 
     /**
-     * 设备类型
+     * IP
      */
-    @ApiModelProperty(value = "设备类型")
-    @TableField("DEVICE_TYPE")
-    private String deviceType;
+    @TableField("IP")
+    private String ip;
 
     /**
-     * 设备批次
+     * 端口
      */
-    @ApiModelProperty(value = "设备批次")
-    @TableField("DEVICE_BATCH")
-    private String deviceBatch;
+    @TableField("PORT")
+    private String port;
 
     /**
-     * 厂家
+     * 用户名
      */
-    @ApiModelProperty(value = "厂家")
-    @TableField("MANUFACTURER")
-    private String manufacturer;
+    @TableField("USER_NAME")
+    private String userName;
 
     /**
-     * 是否供电
+     * 密码
      */
-    @ApiModelProperty(value = "是否供电")
-    @TableField("IS_POWER_SUPPLY")
-    private String isPowerSupply;
+    @TableField("PASSWORD")
+    private String password;
 
     /**
-     * 创建时间
+     * 连接类型
      */
-    @ApiModelProperty(value = "创建时间",dataType = "Date")
-    @TableField("CREATE_TIME")
-    private Date createTime;
+    @TableField("CONNECT_TYPE")
+    private String connectType;
 
-    @ApiModelProperty(value = "设备类型名称")
-    @TableField(exist = false)
-    private String deviceTypeName;
+    /**
+     * 位置
+     */
+    @TableField("LOCATION")
 
-    @ApiModelProperty(value = "是否供电名称")
-    @TableField(exist = false)
-    private String isPowerSupplyName;
+    private String location;
 
-    @ApiModelProperty(value = "注册时间",dataType = "String")
-    @TableField(exist = false)
-    private String registerTime;
+    /**
+     * 设备状态
+     */
+    @TableField("STATUS")
 
-    @ApiModelProperty(value = "当前状态")
-    @TableField(exist = false)
     private String status;
 
-    @ApiModelProperty(value = "当前状态名称")
-    @TableField(exist = false)
-    private String statusName;
+    /**
+     * 报警分组
+     */
+    @TableField("ALARM_GROUP")
+
+    private Long alarmGroup;
+
+    /**
+     * 视频通道数(预留)
+     */
+    @TableField("CHANNEL_NUM")
+    private Integer channelNum;
 
     @Override
     public String toString() {
         return "Device{" +
             "id=" + id +
-            ", deviceCode=" + deviceCode +
-            ", deviceType=" + deviceType +
-            ", deviceBatch=" + deviceBatch +
-            ", manufacturer=" + manufacturer +
-            ", isPowerSupply=" + isPowerSupply +
-            ", createTime=" + createTime +
+            ", deviceName=" + deviceName +
+            ", ip=" + ip +
+            ", port=" + port +
+            ", userName=" + userName +
+            ", password=" + password +
+            ", connectType=" + connectType +
+            ", location=" + location +
+            ", status=" + status +
+            ", alarmGroup=" + alarmGroup +
+            ", channelNum=" + channelNum +
         "}";
     }
 }
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/DeviceExt.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/DeviceExt.java
deleted file mode 100644
index 5ee7015..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/DeviceExt.java
+++ /dev/null
@@ -1,99 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-
-/**
- * <p>
- * 设备扩展信息表（安全树）
- * </p>
- *
- * @author zyj
- * @since 2023-04-27
- */
-@Data
-@TableName("br_device_ext")
-public class DeviceExt implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 设备ID
-     */
-    @TableField("DEVICE_ID")
-    private Long deviceId;
-
-    /**
-     * 摄像头编号
-     */
-    @TableField("CAMERA_CODE")
-    private String cameraCode;
-
-    /**
-     * 摄像头IP
-     */
-    @TableField("CAMERA_IP")
-    private String cameraIp;
-
-    /**
-     * 摄像头端口
-     */
-    @TableField("CAMERA_PORT")
-    private String cameraPort;
-
-    /**
-     * 激甲编号
-     */
-    @TableField("GAS_CODE")
-    private String gasCode;
-
-    /**
-     * 激甲IP
-     */
-    @TableField("GAS_IP")
-    private String gasIp;
-
-    /**
-     * 激甲端口
-     */
-    @TableField("GAS_PORT")
-    private String gasPort;
-
-    /**
-     * 甲烷报警阈值
-     */
-    @TableField("GAS_THRESHOLD")
-    private String gasThreshold;
-
-    @TableField(value = "HAT_LINING_CODE")
-    private String hatLiningCode;
-
-
-    @Override
-    public String toString() {
-        return "DeviceExt{" +
-            "id=" + id +
-            ", deviceId=" + deviceId +
-            ", cameraCode=" + cameraCode +
-            ", cameraIp=" + cameraIp +
-            ", cameraPort=" + cameraPort +
-            ", gasCode=" + gasCode +
-            ", gasIp=" + gasIp +
-            ", gasPort=" + gasPort +
-            ", gasThreshold=" + gasThreshold +
-            ", hatLiningCode=" + hatLiningCode +
-        "}";
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/ProjectDevice.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/ProjectDevice.java
deleted file mode 100644
index c4f3472..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/ProjectDevice.java
+++ /dev/null
@@ -1,62 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-
-/**
- * <p>
- * 
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@Data
-@ApiModel("ProjectDevice")
-@TableName("br_project_device")
-public class ProjectDevice implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 作业现场ID
-     */
-    @TableField("PROJECT_ID")
-    private Long projectId;
-
-    /**
-     * 设备ID
-     */
-    @TableField("DEVICE_ID")
-    @ApiModelProperty("设备ID（新增编辑时传）")
-    private Long deviceId;
-
-    /**
-     * 设备编号
-     */
-    @TableField(exist = false)
-    @ApiModelProperty("设备编号（详情中展示，新增编辑不用传）")
-    private String deviceCode;
-
-    @Override
-    public String toString() {
-        return "ProjectDevice{" +
-            "id=" + id +
-            ", projectId=" + projectId +
-            ", deviceId=" + deviceId +
-        "}";
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/ProjectWorker.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/ProjectWorker.java
deleted file mode 100644
index 10b23c4..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/ProjectWorker.java
+++ /dev/null
@@ -1,104 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import java.io.Serializable;
-
-/**
- * <p>
- * 
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@ApiModel("ProjectWorker")
-@TableName("br_project_worker")
-@Data
-@NoArgsConstructor
-@AllArgsConstructor
-public class ProjectWorker implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 作业现场ID
-     */
-    @TableField("PROJECT_ID")
-    private Long projectId;
-
-    /**
-     * 人员ID
-     */
-    @ApiModelProperty("人员ID")
-    @TableField("WORKER_ID")
-    private Long workerId;
-
-    /**
-     * 安全帽编号
-     */
-    @ApiModelProperty("安全帽编号")
-    @TableField("HAT_CODE")
-    private String hatCode;
-
-    /**
-     * 背心编号
-     */
-    @ApiModelProperty("背心编号")
-    @TableField("VAST_CODE")
-    private String vastCode;
-
-    /**
-     * 手环编号
-     */
-    @ApiModelProperty("手环编号")
-    @TableField("BRACELET_CODE")
-    private String braceletCode;
-
-    @ApiModelProperty("人员姓名（详情中展示，新增编辑不用传）")
-    @TableField(exist = false)
-    private String workerName;
-
-    @ApiModelProperty("人员部门ID（详情中展示，新增编辑不用传）")
-    @TableField(exist = false)
-    private String workerDeptId;
-
-    @ApiModelProperty("人员部门名称（详情中展示，新增编辑不用传）")
-    @TableField(exist = false)
-    private String workerDeptName;
-
-    @ApiModelProperty("人员联系方式（详情中展示，新增编辑不用传）")
-    @TableField(exist = false)
-    private String workerPhoneNumber;
-
-    public ProjectWorker(Long projectId, Long workerId) {
-        this.projectId = projectId;
-        this.workerId = workerId;
-    }
-
-    @Override
-    public String toString() {
-        return "ProjectWorker{" +
-            "id=" + id +
-            ", projectId=" + projectId +
-            ", workerId=" + workerId +
-            ", hatCode=" + hatCode +
-            ", vastCode=" + vastCode +
-            ", braceletCode=" + braceletCode +
-        "}";
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/WorkSiteInfo.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/WorkSiteInfo.java
deleted file mode 100644
index fa6f41d..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/WorkSiteInfo.java
+++ /dev/null
@@ -1,130 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.alibaba.fastjson.annotation.JSONField;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.time.LocalDateTime;
-import java.util.Date;
-
-/**
- * <p>
- * 作业现场表
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@ApiModel("WorkSiteInfo")
-@TableName("br_work_site_info")
-@Data
-public class WorkSiteInfo implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @ApiModelProperty("作业现场ID")
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 作业名称
-     */
-    @ApiModelProperty("作业名称")
-    @TableField("WORK_TITLE")
-    private String workTitle;
-
-    /**
-     * 责任人
-     */
-    @ApiModelProperty("责任人（人员ID）")
-    @TableField("WORK_PERSON")
-    private Long workPerson;
-
-    /**
-     * 作业描述
-     */
-    @ApiModelProperty("作业描述")
-    @TableField("WORK_SITE_DESC")
-    private String workSiteDesc;
-
-    /**
-     * 作业状态
-     */
-    @ApiModelProperty("作业状态")
-    @TableField("PROJECT_STATE")
-    private String projectState;
-
-    /**
-     * 所属道路
-     */
-    @ApiModelProperty("所属道路")
-    @TableField("WORK_ROAD")
-    private String workRoad;
-
-    @TableField("IMAGE_URL")
-    private String imageUrl;
-
-    @TableField("CREATE_TIME")
-    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
-    private Date createTime;
-    @TableField("UPDATE_TIME")
-    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
-    private Date updateTime;
-
-    @ApiModelProperty("开始时间")
-    @TableField("START_TIME")
-    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
-    private Date startTime;
-
-    @ApiModelProperty("结束时间")
-    @TableField("FINISH_TIME")
-    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
-    private Date finishTime;
-
-    @ApiModelProperty("负责人姓名（详情中使用，新增编辑不用传）")
-    @TableField(exist = false)
-    private String workPersonName;
-
-    @ApiModelProperty("负责人联系方式（详情中使用，新增编辑不用传）")
-    @TableField(exist = false)
-    private String workPersonPhoneNumber;
-
-    @ApiModelProperty("负责人所属部门ID（详情中使用，新增编辑不用传）")
-    @TableField(exist = false)
-    private Long workPersonDeptId;
-
-    @ApiModelProperty("负责人所属部门名称（详情中使用，新增编辑不用传）")
-    @TableField(exist = false)
-    private String workPersonDeptName;
-
-    @ApiModelProperty(value = "注册时间",dataType = "String")
-    @TableField(exist = false)
-    private String registerTime;
-
-    @ApiModelProperty("作业状态名称")
-    @TableField(exist = false)
-    private String projectStateName;
-
-    @Override
-    public String toString() {
-        return "WorkSiteInfo{" +
-            "id=" + id +
-            ", workTitle=" + workTitle +
-            ", workPerson=" + workPerson +
-            ", workSiteDesc=" + workSiteDesc +
-            ", projectState=" + projectState +
-            ", imageUrl=" + imageUrl +
-            ", updateTime=" + updateTime +
-            ", workRoad=" + workRoad +
-        "}";
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Worker.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Worker.java
deleted file mode 100644
index 28a4daa..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Worker.java
+++ /dev/null
@@ -1,147 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.time.LocalDateTime;
-import java.util.Date;
-
-/**
- * <p>
- * 
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@ApiModel("Worker")
-@TableName("br_worker")
-@Data
-public class Worker implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @ApiModelProperty(value = "人员ID")
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 姓名
-     */
-    @ApiModelProperty(value = "姓名")
-    @TableField("WORKER_NAME")
-    private String workerName;
-
-    /**
-     * 性别
-     */
-    @ApiModelProperty(value = "性别")
-    @TableField("GENDER")
-    private String gender;
-
-    /**
-     * 所属部门
-     */
-    @ApiModelProperty(value = "所属部门(人员管理)")
-    @TableField("DEPT_ID")
-    private Long deptId;
-
-    /**
-     * 所属单位
-     */
-    @ApiModelProperty(value = "所属单位(入场申请中使用)")
-    @TableField("OWNER_SHIP")
-    private String ownerShip;
-
-    /**
-     * 联系方式
-     */
-    @ApiModelProperty(value = "联系方式")
-    @TableField("PHONE_NUMBER")
-    private String phoneNumber;
-
-    /**
-     * 证件号
-     */
-    @ApiModelProperty(value = "证件号")
-    @TableField("ID_CARD_NUMBER")
-    private String idCardNumber;
-
-    /**
-     * 入场原因
-     */
-    @ApiModelProperty(value = "入场原因（入场申请中使用）")
-    @TableField("ENTER_REASON")
-    private String enterReason;
-
-    /**
-     * 入场人脸照片
-     */
-    @ApiModelProperty(value = "人脸照片（照片路径）")
-    @TableField("WORKER_AVATAR")
-    private String workerAvatar;
-
-    /**
-     * 申请入场时间
-     */
-    @ApiModelProperty(value = "注册时间/申请入场时间")
-    @TableField("CREATE_TIME")
-    private Date createTime;
-
-    /**
-     * 人员类型
-     */
-    @ApiModelProperty(value = "人员类型（区分人员管理和入场申请）")
-    @TableField("WORKER_TYPE")
-    private String workerType;
-
-    @ApiModelProperty(value = "性别名称")
-    @TableField(exist = false)
-    private String genderName;
-
-    @ApiModelProperty(value = "部门名称")
-    @TableField(exist = false)
-    private String deptName;
-
-    @ApiModelProperty(value = "注册时间",dataType = "String")
-    @TableField(exist = false)
-    private String registerTime;
-
-    @ApiModelProperty(value = "当前状态")
-    @TableField(exist = false)
-    private String status;
-
-    @ApiModelProperty(value = "当前状态名称")
-    @TableField(exist = false)
-    private String statusName;
-
-    @ApiModelProperty(value = "是否注册(0未注册；1已注册)",allowableValues = "0,1")
-    @TableField(exist = false)
-    private String isRegister;
-
-    @Override
-    public String toString() {
-        return "Worker{" +
-            "id=" + id +
-            ", workerName=" + workerName +
-            ", gender=" + gender +
-            ", deptId=" + deptId +
-            ", ownerShip=" + ownerShip +
-            ", phoneNumber=" + phoneNumber +
-            ", idCardNumber=" + idCardNumber +
-            ", enterReason=" + enterReason +
-            ", workerAvatar=" + workerAvatar +
-            ", createTime=" + createTime +
-            ", workerType=" + workerType +
-        "}";
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/AlarmMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/AlarmMapper.java
new file mode 100644
index 0000000..ea4c8be
--- /dev/null
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/AlarmMapper.java
@@ -0,0 +1,16 @@
+package com.casic.missiles.modular.system.mapper;
+
+import com.casic.missiles.modular.system.entity.Alarm;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 报警记录表 Mapper 接口
+ * </p>
+ *
+ * @author zyj
+ * @since 2023-05-25
+ */
+public interface AlarmMapper extends BaseMapper<Alarm> {
+
+}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/BusAlarmMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/BusAlarmMapper.java
deleted file mode 100644
index 9801742..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/BusAlarmMapper.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package com.casic.missiles.modular.system.mapper;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.modular.system.dto.AlarmTypeCountDTO;
-import com.casic.missiles.modular.system.entity.BusAlarm;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * <p>
- * 报警记录表 Mapper 接口
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface BusAlarmMapper extends BaseMapper<BusAlarm> {
-
-    Page<BusAlarm> listPage(Page<BusAlarm> page,@Param("ew")  QueryWrapper<BusAlarm> queryWrapper);
-
-    void cancelAlarm(@Param("deviceId")Long deviceId,@Param("alarmType") String alarmType);
-
-    List<AlarmTypeCountDTO> alarmCount(@Param("projectId")Long projectId, @Param("alarmStatus")String alarmStatus);
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/BusEventImageMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/BusEventImageMapper.java
deleted file mode 100644
index 9590b7d..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/BusEventImageMapper.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.casic.missiles.modular.system.mapper;
-
-import com.casic.missiles.modular.system.entity.BusEventImage;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * <p>
- * 事件图片表 Mapper 接口
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface BusEventImageMapper extends BaseMapper<BusEventImage> {
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/BusEventMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/BusEventMapper.java
deleted file mode 100644
index 3c85edf..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/BusEventMapper.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.casic.missiles.modular.system.mapper;
-
-import com.casic.missiles.modular.system.entity.BusEvent;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * <p>
- * 事件表 Mapper 接口
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface BusEventMapper extends BaseMapper<BusEvent> {
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/DeviceExtMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/DeviceExtMapper.java
deleted file mode 100644
index 4ca9212..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/DeviceExtMapper.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.casic.missiles.modular.system.mapper;
-
-import com.casic.missiles.modular.system.entity.DeviceExt;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * <p>
- * 设备扩展信息表（安全树） Mapper 接口
- * </p>
- *
- * @author zyj
- * @since 2023-04-27
- */
-public interface DeviceExtMapper extends BaseMapper<DeviceExt> {
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/DeviceMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/DeviceMapper.java
index 444c0c5..3d0bb02 100644
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/DeviceMapper.java
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/DeviceMapper.java
@@ -1,30 +1,16 @@
 package com.casic.missiles.modular.system.mapper;
 
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.modular.system.dto.DeviceDetailDTO;
-import com.casic.missiles.modular.system.dto.HelmetInfoDTO;
 import com.casic.missiles.modular.system.entity.Device;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
 
 /**
  * <p>
- *  Mapper 接口
+ * 设备记录表 Mapper 接口
  * </p>
  *
  * @author zyj
- * @since 2023-04-14
+ * @since 2023-05-25
  */
-@Mapper
 public interface DeviceMapper extends BaseMapper<Device> {
 
-    Page<DeviceDetailDTO> listDetailPage(Page<DeviceDetailDTO> page,@Param("ew") QueryWrapper<DeviceDetailDTO> ew);
-
-     List<Long> selectProjectDevice(@Param("projectId") Long projectId);
-
-    List<HelmetInfoDTO> selectHelmetList(@Param("deviceType")String deviceType);
 }
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/ProjectDeviceMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/ProjectDeviceMapper.java
deleted file mode 100644
index 1d0c14e..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/ProjectDeviceMapper.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package com.casic.missiles.modular.system.mapper;
-
-import com.casic.missiles.modular.system.dto.DeviceLocationDTO;
-import com.casic.missiles.modular.system.entity.ProjectDevice;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * <p>
- *  Mapper 接口
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface ProjectDeviceMapper extends BaseMapper<ProjectDevice> {
-     List<ProjectDevice> selectDetailByProjectId(@Param("projectId") Long projectId);
-
-     List<DeviceLocationDTO> selectDeviceLocationList(@Param("projectId") Long projectId);
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/ProjectWorkerMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/ProjectWorkerMapper.java
deleted file mode 100644
index 58583d1..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/ProjectWorkerMapper.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package com.casic.missiles.modular.system.mapper;
-
-import com.casic.missiles.modular.system.dto.WorkerLocationDTO;
-import com.casic.missiles.modular.system.entity.ProjectWorker;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * <p>
- *  Mapper 接口
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface ProjectWorkerMapper extends BaseMapper<ProjectWorker> {
-
-    List<ProjectWorker> selectDetailByProjectId(@Param("projectId") Long projectId,
-                                                @Param("workerType")String workerType);
-
-    List<WorkerLocationDTO> selectWorkerLocationList(@Param("projectId") Long projectId,
-                                                     @Param("workerType")String workerType);
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/WorkSiteInfoMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/WorkSiteInfoMapper.java
deleted file mode 100644
index a4934d2..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/WorkSiteInfoMapper.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.casic.missiles.modular.system.mapper;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.modular.system.entity.WorkSiteInfo;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Param;
-
-/**
- * <p>
- * 作业现场表 Mapper 接口
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface WorkSiteInfoMapper extends BaseMapper<WorkSiteInfo> {
-
-    Page<WorkSiteInfo> selectListPage(Page<WorkSiteInfo> page,@Param("ew") QueryWrapper<WorkSiteInfo> ew);
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/WorkerMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/WorkerMapper.java
deleted file mode 100644
index 258fb12..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/WorkerMapper.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package com.casic.missiles.modular.system.mapper;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.modular.system.dto.DeviceDetailDTO;
-import com.casic.missiles.modular.system.entity.Worker;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * <p>
- *  Mapper 接口
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface WorkerMapper extends BaseMapper<Worker> {
-
-
-    Page<Worker> selectListPage(Page<Worker> page, @Param("ew") QueryWrapper<Worker> ew);
-
-    List<String> selectWorkerAvatars(@Param("projectId")Long projectId);
-
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/AlarmMapper.xml b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/AlarmMapper.xml
new file mode 100644
index 0000000..25cb4ab
--- /dev/null
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/AlarmMapper.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.modular.system.mapper.AlarmMapper">
+
+</mapper>
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/BusAlarmMapper.xml b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/BusAlarmMapper.xml
deleted file mode 100644
index 595088a..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/BusAlarmMapper.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.casic.missiles.modular.system.mapper.BusAlarmMapper">
-
-    <select id="listPage" resultType="com.casic.missiles.modular.system.entity.BusAlarm">
-        SELECT
-            alarm.ID as id,
-            alarm.DEVICE_ID as deviceId,
-            alarm.PROJECT_ID as projectId,
-            alarm.ALARM_TYPE as alarmType,
-            alarm.ALARM_VALUE as alarmValue,
-            alarm.ALARM_STATUS as alarmStatus,
-            alarm.ALARM_IMAGE AS alarmImage,
-            alarm.ALARM_CONTENT as alarmContent,
-            alarm.ALARM_TIME as alarmTime,
-            alarm.CANCEL_TIME as cancelTime,
-            alarm.ALARM_LNG as alarmLng,
-            alarm.ALARM_LAT as alarmLat,
-            p.WORK_TITLE as workTitle,
-            p.WORK_ROAD as workRoad,
-            p.PROJECT_STATE as projectState,
-            w.WORKER_NAME as workPersonName,
-            w.PHONE_NUMBER as workPersonPhoneNumber
-        FROM
-            `br_bus_alarm` alarm
-                LEFT JOIN br_work_site_info p on alarm.PROJECT_ID = p.ID
-                LEFT JOIN br_worker w on p.WORK_PERSON = w.ID
-        <where>
-            <if test="ew != null">
-                ${ew.sqlSegment}
-            </if>
-        </where>
-    </select>
-
-    <select id="cancelAlarm">
-        update br_bus_alarm
-        set ALARM_STATUS = '1'
-        where DEVICE_ID = #{deviceId}
-          and ALARM_TYPE = #{alarmType}
-          and ALARM_STATUS = '0'
-    </select>
-
-    <select id="alarmCount" resultType="com.casic.missiles.modular.system.dto.AlarmTypeCountDTO">
-        SELECT
-            ALARM_TYPE as alarmType,
-            count(*) as alarmCount
-        from br_bus_alarm
-        <where>
-            <if test="projectId != null and projectId !=''">
-                and PROJECT_ID = #{projectId}
-            </if>
-            <if test="alarmStatus != null and alarmStatus !=''">
-                and ALARM_STATUS = #{alarmStatus}
-            </if>
-        </where>
-        group by ALARM_TYPE
-    </select>
-</mapper>
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/BusEventImageMapper.xml b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/BusEventImageMapper.xml
deleted file mode 100644
index fbc3db3..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/BusEventImageMapper.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.casic.missiles.modular.system.mapper.BusEventImageMapper">
-
-</mapper>
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/BusEventMapper.xml b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/BusEventMapper.xml
deleted file mode 100644
index 627d573..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/BusEventMapper.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.casic.missiles.modular.system.mapper.BusEventMapper">
-
-</mapper>
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/DeviceExtMapper.xml b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/DeviceExtMapper.xml
deleted file mode 100644
index 5321d1c..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/DeviceExtMapper.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.casic.missiles.modular.system.mapper.DeviceExtMapper">
-
-</mapper>
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/DeviceMapper.xml b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/DeviceMapper.xml
index 94262e1..88e7d01 100644
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/DeviceMapper.xml
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/DeviceMapper.xml
@@ -2,96 +2,4 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.casic.missiles.modular.system.mapper.DeviceMapper">
 
-    <select id="listDetailPage" resultType="com.casic.missiles.modular.system.dto.DeviceDetailDTO">
-        select
-        br_device.ID as id,
-        DEVICE_CODE as deviceCode,
-        DEVICE_TYPE as deviceType,
-        DEVICE_BATCH as deviceBatch,
-        MANUFACTURER as manufacturer,
-        IS_POWER_SUPPLY as isPowerSupply,
-        CREATE_TIME as createTime,
-        CAMERA_CODE as cameraCode,
-        CAMERA_IP as cameraIp,
-        CAMERA_PORT as cameraPort,
-        GAS_CODE as gasCode,
-        GAS_IP as gasIp,
-        GAS_PORT as gasPort,
-        HAT_LINING_CODE as hatLiningCode
-        from br_device
-        left join br_device_ext ext on ext.DEVICE_ID = br_device.ID
-        <where>
-            <if test="ew != null">
-                ${ew.sqlSegment}
-            </if>
-        </where>
-    </select>
-
-    <select id="selectProjectDevice" resultType="java.lang.Long">
-        with device_info as (
-            (SELECT
-            d.DEVICE_ID as DEVICE_ID,
-            d.PROJECT_ID as PROJECT_ID,
-            p.PROJECT_STATE as PROJECT_STATE
-            from br_project_device d
-            LEFT JOIN br_work_site_info p on p.ID = d.PROJECT_ID)
-
-            UNION ALL
-
-            (SELECT
-            d1.ID as DEVICE_ID,
-            w1.ID as PROJECT_ID,
-            w1.PROJECT_STATE as PROJECT_STATE
-            FROM br_project_worker pw1
-            LEFT JOIN br_device d1 on pw1.BRACELET_CODE = d1.DEVICE_CODE
-            LEFT JOIN br_work_site_info w1 on pw1.PROJECT_ID = w1.ID)
-
-            UNION ALL
-
-            (SELECT
-            d1.ID as DEVICE_ID,
-            w1.ID as PROJECT_ID,
-            w1.PROJECT_STATE as PROJECT_STATE
-            FROM br_project_worker pw1
-            LEFT JOIN br_device d1 on pw1.HAT_CODE = d1.DEVICE_CODE
-            LEFT JOIN br_work_site_info w1 on pw1.PROJECT_ID = w1.ID)
-
-
-            UNION ALL
-
-            (SELECT
-            d1.ID as DEVICE_ID,
-            w1.ID as PROJECT_ID,
-            w1.PROJECT_STATE as PROJECT_STATE
-            FROM br_project_worker pw1
-            LEFT JOIN br_device d1 on pw1.VAST_CODE = d1.DEVICE_CODE
-            LEFT JOIN br_work_site_info w1 on pw1.PROJECT_ID = w1.ID))
-
-        select DISTINCT DEVICE_ID from device_info
-        <where>
-            DEVICE_ID is not null
-            <choose>
-                <when test="projectId != null and projectId !=''">
-                    and PROJECT_ID = #{projectId}
-                </when>
-                <otherwise>
-                    AND PROJECT_STATE != '3'
-                </otherwise>
-            </choose>
-        </where>
-    </select>
-
-    <select id="selectHelmetList" resultType="com.casic.missiles.modular.system.dto.HelmetInfoDTO">
-        SELECT
-            a.ID AS deviceId,
-            a.DEVICE_CODE AS hatCode,
-            b.HAT_LINING_CODE AS hatLiningCode
-        FROM
-            br_device a
-                LEFT JOIN br_device_ext b ON a.ID = b.DEVICE_ID
-        WHERE
-            a.DEVICE_TYPE = #{deviceType}
-          AND a.DEVICE_CODE IS NOT NULL
-          AND b.HAT_LINING_CODE IS NOT NULL
-    </select>
 </mapper>
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/ProjectDeviceMapper.xml b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/ProjectDeviceMapper.xml
deleted file mode 100644
index c6d1c24..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/ProjectDeviceMapper.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.casic.missiles.modular.system.mapper.ProjectDeviceMapper">
-
-    <select id="selectDetailByProjectId" resultType="com.casic.missiles.modular.system.entity.ProjectDevice">
-        SELECT
-            pd.ID as id,
-            pd.PROJECT_ID as projectId,
-            pd.DEVICE_ID as deviceId,
-            d.DEVICE_CODE as deviceCode
-        from br_project_device pd
-        LEFT JOIN br_device d on pd.DEVICE_ID = d.ID
-        <where>
-            pd.PROJECT_ID = #{projectId}
-        </where>
-    </select>
-
-    <select id="selectDeviceLocationList" resultType="com.casic.missiles.modular.system.dto.DeviceLocationDTO">
-        SELECT
-        d.ID as deviceId,
-        d.DEVICE_TYPE as deviceType,
-        d.DEVICE_CODE as deviceCode,
-        if(EXISTS(select ID from br_bus_alarm WHERE DEVICE_ID = d.ID and ALARM_STATUS = '0'),true,false) as alarmFlag
-        FROM br_project_device pd, br_device d
-        where pd.DEVICE_ID = d.ID
-        and pd.PROJECT_ID = #{projectId}
-    </select>
-
-</mapper>
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/ProjectWorkerMapper.xml b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/ProjectWorkerMapper.xml
deleted file mode 100644
index 8d2de10..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/ProjectWorkerMapper.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.casic.missiles.modular.system.mapper.ProjectWorkerMapper">
-
-    <select id="selectDetailByProjectId" resultType="com.casic.missiles.modular.system.entity.ProjectWorker">
-        SELECT
-            pw.ID as id,
-            pw.PROJECT_ID as projectId,
-            pw.WORKER_ID as workerId,
-            w.WORKER_NAME as workerName,
-            w.DEPT_ID as workerDeptId,
-            pw.HAT_CODE as hatCode,
-            pw.VAST_CODE as vastCode,
-            pw.BRACELET_CODE as braceletCode,
-            w.PHONE_NUMBER as workerPhoneNumber
-        from br_project_worker pw
-        LEFT JOIN br_worker w on pw.WORKER_ID = w.ID
-        <where>
-            pw.PROJECT_ID = #{projectId}
-            <if test="workerType != null and workerType != ''">
-                and w.WORKER_TYPE = #{workerType}
-            </if>
-        </where>
-    </select>
-
-    <select id="selectWorkerLocationList" resultType="com.casic.missiles.modular.system.dto.WorkerLocationDTO">
-        select
-            w.ID as workerId,
-            w.WORKER_NAME as workerName,
-            pw.HAT_CODE as hatCode,
-            hd.ID as hatId,
-            pw.BRACELET_CODE as braceletCode,
-            pw.VAST_CODE as vastCode
-        from br_project_worker pw,br_worker w ,br_device hd
-        WHERE pw.WORKER_ID = w.ID
-          and pw.HAT_CODE = hd.DEVICE_CODE
-          and pw.PROJECT_ID = #{projectId}
-          and w.WORKER_TYPE = #{workerType}
-    </select>
-</mapper>
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/WorkSiteInfoMapper.xml b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/WorkSiteInfoMapper.xml
deleted file mode 100644
index 8f01326..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/WorkSiteInfoMapper.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.casic.missiles.modular.system.mapper.WorkSiteInfoMapper">
-
-    <select id="selectListPage" resultType="com.casic.missiles.modular.system.entity.WorkSiteInfo">
-        SELECT
-            br_work_site_info.ID AS id,
-            WORK_TITLE as workTitle,
-            WORK_ROAD as workRoad,
-            WORK_SITE_DESC as workSiteDesc,
-            WORK_PERSON as workPerson,
-            WORKER_NAME as workPersonName,
-            DEPT_ID as workPersonDeptId,
-            PHONE_NUMBER as workPersonPhoneNumber,
-            PROJECT_STATE as projectState,
-            br_work_site_info.CREATE_TIME AS createTime,
-            br_work_site_info.UPDATE_TIME AS updateTime
-        FROM br_work_site_info
-        LEFT JOIN br_worker w ON br_work_site_info.WORK_PERSON = w.ID
-        <where>
-            <if test="ew != null">
-                ${ew.sqlSegment}
-            </if>
-        </where>
-    </select>
-</mapper>
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/WorkerMapper.xml b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/WorkerMapper.xml
deleted file mode 100644
index 3e28b39..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/WorkerMapper.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.casic.missiles.modular.system.mapper.WorkerMapper">
-
-    <select id="selectListPage" resultType="com.casic.missiles.modular.system.entity.Worker">
-        WITH worker_project AS (
-            SELECT
-                w.id AS ID,
-                WORKER_NAME,
-                GENDER,
-                DEPT_ID,
-                OWNER_SHIP,
-                PHONE_NUMBER,
-                ID_CARD_NUMBER,
-                ENTER_REASON,
-                WORKER_AVATAR,
-                w.CREATE_TIME,
-                WORKER_TYPE,
-                IF( p.PROJECT_STATE != '3', 1, 0 ) AS `STATUS`
-            FROM br_worker w
-            LEFT JOIN br_project_worker pw ON w.ID = pw.WORKER_ID
-            LEFT JOIN br_work_site_info p ON pw.PROJECT_ID = p.ID
-        )
-
-        SELECT
-            ID AS id,
-            WORKER_NAME AS workerName,
-            GENDER AS gender,
-            DEPT_ID AS deptId,
-            OWNER_SHIP AS ownerShip,
-            PHONE_NUMBER AS phoneNumber,
-            ID_CARD_NUMBER AS idCardNumber,
-            ENTER_REASON AS enterReason,
-            WORKER_AVATAR AS workerAvatar,
-            CREATE_TIME AS createTime,
-            WORKER_TYPE AS workerType,
-            `STATUS` AS `status`
-        FROM worker_project
-        <where>
-            <if test="ew != null">
-                ${ew.sqlSegment}
-            </if>
-        </where>
-    </select>
-
-    <select id="selectWorkerAvatars" resultType="java.lang.String">
-        SELECT
-            WORKER_AVATAR
-        FROM
-            `br_worker`
-        WHERE
-        ID IN ( SELECT WORKER_ID FROM br_project_worker WHERE PROJECT_ID = #{projectId} )
-          AND WORKER_AVATAR IS NOT NULL
-          AND WORKER_AVATAR != ''
-    </select>
-</mapper>
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IAlarmService.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IAlarmService.java
new file mode 100644
index 0000000..8bc01f4
--- /dev/null
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IAlarmService.java
@@ -0,0 +1,16 @@
+package com.casic.missiles.modular.system.service;
+
+import com.casic.missiles.modular.system.entity.Alarm;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 报警记录表 服务类
+ * </p>
+ *
+ * @author zyj
+ * @since 2023-05-25
+ */
+public interface IAlarmService extends IService<Alarm> {
+
+}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IBusAlarmService.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IBusAlarmService.java
deleted file mode 100644
index f63c19c..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IBusAlarmService.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package com.casic.missiles.modular.system.service;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.modular.system.dto.AlarmTypeCountDTO;
-import com.casic.missiles.modular.system.dto.AlarmUpload;
-import com.casic.missiles.modular.system.entity.BusAlarm;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-import java.util.List;
-
-/**
- * <p>
- * 报警记录表 服务类
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface IBusAlarmService extends IService<BusAlarm> {
-
-    boolean alarmUpload(AlarmUpload alarmUpload);
-
-    Page<BusAlarm> listPage(Page<BusAlarm> page,QueryWrapper<BusAlarm> queryWrapper);
-
-    List<AlarmTypeCountDTO> alarmCount(Long projectId,String alarmStatus);
-
-}

diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/AlarmController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/AlarmController.java
new file mode 100644
index 0000000..1795cf1
--- /dev/null
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/AlarmController.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.modular.system.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.stereotype.Controller;
+
+/**
+ * <p>
+ * 报警记录表 前端控制器
+ * </p>
+ *
+ * @author zyj
+ * @since 2023-05-25
+ */
+@Controller
+@RequestMapping("/system/alarm")
+public class AlarmController {
+
+}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusAlarmController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusAlarmController.java
deleted file mode 100644
index 1f82ebb..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusAlarmController.java
+++ /dev/null
@@ -1,102 +0,0 @@
-package com.casic.missiles.modular.system.controller;
-
-
-import cn.hutool.core.util.ObjectUtil;
-import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.core.base.controller.BaseController;
-import com.casic.missiles.core.page.PageFactory;
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.AlarmUpload;
-import com.casic.missiles.modular.system.dto.DeviceDetailDTO;
-import com.casic.missiles.modular.system.entity.BusAlarm;
-import com.casic.missiles.modular.system.service.IBusAlarmService;
-import io.swagger.annotations.*;
-import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.*;
-
-import org.springframework.stereotype.Controller;
-
-import static com.casic.missiles.model.response.ResponseData.DEFAULT_SUCCESS_MESSAGE;
-import static com.casic.missiles.modular.system.consts.AlarmConst.ALARM_STATUS_MANUAL_CANCEL;
-
-/**
- * <p>
- * 报警记录表 前端控制器
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@Api(tags = "报警管理接口")
-@Controller
-@RequestMapping("/alarm")
-@RequiredArgsConstructor
-public class BusAlarmController extends BaseController {
-
-    private final IBusAlarmService alarmService;
-
-    @ApiOperation("报警上报接口")
-    @PostMapping("/upload")
-    @ResponseBody
-    public Object upload(@RequestBody AlarmUpload alarmUpload){
-        alarmService.alarmUpload(alarmUpload);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("报警列表分页查询")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "workTitle", value = "作业名称",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "projectId", value = "作业ID",dataType = "Long", paramType = "query",example = "0"),
-            @ApiImplicitParam(name = "alarmStatus", value = "报警状态",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "projectState", value = "作业状态",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "alarmType", value = "报警类型",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "alarmStartTime", value = "报警开始时间",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "alarmEndTime", value = "报警结束时间",dataType = "String", paramType = "query")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = BusAlarm.class),
-    })
-    @GetMapping("/listPage")
-    @ResponseBody
-    public Object listPage(String workTitle,Long projectId,String alarmStatus,String projectState,String alarmType,String alarmStartTime,String alarmEndTime){
-        Page<BusAlarm> page = PageFactory.defaultPage();
-        QueryWrapper<BusAlarm> queryWrapper = new QueryWrapper<>();
-        if(StrUtil.isNotEmpty(workTitle)){
-            queryWrapper.like("p.WORK_TITLE",workTitle);
-        }
-        if(ObjectUtil.isNotEmpty(projectId)){
-            queryWrapper.eq("alarm.PROJECT_ID",projectId);
-        }
-        if(StrUtil.isNotEmpty(alarmStatus)){
-            queryWrapper.eq("alarm.ALARM_STATUS",alarmStatus);
-        }
-        if(StrUtil.isNotEmpty(projectState)){
-            queryWrapper.eq("p.PROJECT_STATE",projectState);
-        }
-        if(StrUtil.isNotEmpty(alarmType)){
-            queryWrapper.eq("alarm.ALARM_TYPE",alarmType);
-        }
-        if(StrUtil.isNotEmpty(alarmStartTime)){
-            queryWrapper.ge("alarm.ALARM_TIME",alarmStartTime);
-        }
-        if(StrUtil.isNotEmpty(alarmEndTime)){
-            queryWrapper.le("alarm.ALARM_TIME",alarmEndTime);
-        }
-        page = alarmService.listPage(page,queryWrapper);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-    @ApiOperation("消警")
-    @PostMapping("/cancel")
-    @ResponseBody
-    public Object cancel(@RequestParam("alarmId") Long alarmId){
-        UpdateWrapper<BusAlarm> updateWrapper = new UpdateWrapper<>();
-        updateWrapper.eq("ID",alarmId);
-        updateWrapper.set("ALARM_STATUS",ALARM_STATUS_MANUAL_CANCEL);
-        alarmService.update(updateWrapper);
-        return ResponseData.success();
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusEventController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusEventController.java
deleted file mode 100644
index dde5aad..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusEventController.java
+++ /dev/null
@@ -1,41 +0,0 @@
-package com.casic.missiles.modular.system.controller;
-
-
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.entity.BusEvent;
-import com.casic.missiles.modular.system.service.IBusEventService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.ResponseBody;
-
-/**
- * <p>
- * 事件表 前端控制器
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@Controller
-@RequestMapping("/event")
-@Api(tags = "事件上报")
-@RequiredArgsConstructor
-public class BusEventController {
-
-    private final IBusEventService eventService;
-
-    @ApiOperation("事件上报")
-    @PostMapping("add")
-    @ResponseBody
-    public Object add(@RequestBody BusEvent busEvent){
-        eventService.saveBusEvent(busEvent);
-        return ResponseData.success();
-    }
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
index 03abc5f..aa50d78 100644
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
@@ -1,121 +1,20 @@
 package com.casic.missiles.modular.system.controller;
 
 
-import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.core.base.controller.BaseController;
-import com.casic.missiles.core.page.PageFactory;
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.DeviceDetailDTO;
-import com.casic.missiles.modular.system.entity.Device;
-import com.casic.missiles.modular.system.service.IDeviceExtService;
-import com.casic.missiles.modular.system.service.IDeviceService;
-import io.swagger.annotations.*;
-import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.RequestMapping;
 
 import org.springframework.stereotype.Controller;
 
-import java.time.LocalDateTime;
-import java.util.Date;
-import java.util.List;
-
-import static com.casic.missiles.model.response.ResponseData.DEFAULT_SUCCESS_MESSAGE;
-
 /**
  * <p>
- *  前端控制器
+ * 设备记录表 前端控制器
  * </p>
  *
  * @author zyj
- * @since 2023-04-14
+ * @since 2023-05-25
  */
-@Api(tags = "设备管理接口")
-@RequiredArgsConstructor
 @Controller
-@RequestMapping("/device")
-public class DeviceController extends BaseController {
-    private final IDeviceService deviceService;
-    private final IDeviceExtService deviceExtService;
-
-    @ApiOperation("设备分页列表")
-    @ApiImplicitParams({
-        @ApiImplicitParam(name = "deviceType", value = "设备类型",dataType = "String", paramType = "query"),
-        @ApiImplicitParam(name = "deviceCode", value = "设备编号",dataType = "String", paramType = "query"),
-        @ApiImplicitParam(name = "status", value = "设备状态",dataType = "String", paramType = "query"),
-        @ApiImplicitParam(name = "projectId", value = "作业ID（如果传此参数，列表中返回该作业使用的设备）",dataType = "Long", paramType = "query", example = "0")
-    })
-    @ApiResponses({
-        @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = DeviceDetailDTO.class),
-    })
-    @GetMapping("listPage")
-    @ResponseBody
-    public Object listPage(String deviceType, String deviceCode, String status,Long projectId){
-        Page<DeviceDetailDTO> page = PageFactory.defaultPage();
-        QueryWrapper<DeviceDetailDTO> queryWrapper = new QueryWrapper<>();
-        if(StrUtil.isNotEmpty(deviceType)){
-            queryWrapper.eq("DEVICE_TYPE",deviceType);
-        }
-        if(StrUtil.isNotEmpty(deviceCode)){
-            queryWrapper.like("DEVICE_CODE",deviceCode);
-        }
-        page = deviceService.listPage(page,queryWrapper,status,projectId);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-    @ApiOperation("新增设备")
-    @PostMapping("add")
-    @ResponseBody
-    public Object add(@RequestBody DeviceDetailDTO deviceDetailDTO){
-        deviceService.saveDevice(deviceDetailDTO);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("编辑设备")
-    @PostMapping("update")
-    @ResponseBody
-    public Object update(@RequestBody DeviceDetailDTO deviceDetailDTO){
-        deviceService.updateDevice(deviceDetailDTO);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("删除设备")
-    @PostMapping("delete")
-    @ResponseBody
-    public Object delete(@ApiParam("设备id列表")@RequestBody List<Long> deviceIds){
-        deviceService.deleteDevices(deviceIds);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("设置甲烷阈值")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "gasIp", value = "安全树甲烷设备IP",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "gasPort", value = "安全树甲烷端口",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "threshold", value = "甲烷阈值",dataType = "String", paramType = "query")
-    })
-    @PostMapping("setThreshold")
-    @ResponseBody
-    public Object setThreshold(String gasIp,String gasPort,String threshold){
-        deviceExtService.setGasThreshold(gasIp, gasPort, threshold);
-        return ResponseData.success();
-    }
-
-
-    @ApiOperation("查询甲烷阈值")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "gasIp", value = "安全树甲烷设备IP",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "gasPort", value = "安全树甲烷端口",dataType = "String", paramType = "query")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = "{\"code\": 200,\"data\": \"100\",\"message\": \"请求成功\",\"success\": true}",response = String.class),
-    })
-    @GetMapping("getThreshold")
-    @ResponseBody
-    public Object getThreshold(String gasIp,String gasPort){
-        String data = deviceExtService.getGasThreshold(gasIp, gasPort);
-        return ResponseData.success(data);
-    }
-
+@RequestMapping("/system/device")
+public class DeviceController {
 
 }
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/OverviewController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/OverviewController.java
deleted file mode 100644
index 7570504..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/OverviewController.java
+++ /dev/null
@@ -1,70 +0,0 @@
-package com.casic.missiles.modular.system.controller;
-
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.AlarmTypeCountDTO;
-import com.casic.missiles.modular.system.dto.DeviceLocationDTO;
-import com.casic.missiles.modular.system.dto.WorkerLocationDTO;
-import com.casic.missiles.modular.system.service.IBusAlarmService;
-import com.casic.missiles.modular.system.service.IProjectDeviceService;
-import com.casic.missiles.modular.system.service.IProjectWorkerService;
-import io.swagger.annotations.*;
-import lombok.RequiredArgsConstructor;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.ResponseBody;
-
-import static com.casic.missiles.model.response.ResponseData.DEFAULT_SUCCESS_MESSAGE;
-import static com.casic.missiles.modular.system.consts.AlarmConst.ALARM_STATUS_ON;
-
-@Api(tags = "首页看板接口")
-@Controller
-@RequestMapping("overview")
-@RequiredArgsConstructor
-public class OverviewController {
-
-    private final IBusAlarmService alarmService;
-    private final IProjectDeviceService projectDeviceService;
-
-    private final IProjectWorkerService projectWorkerService;
-
-
-    @ApiOperation("报警统计接口")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "projectId", value = "作业ID",dataType = "Long", paramType = "query", example = "0")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = AlarmTypeCountDTO.class),
-    })
-    @GetMapping("/alarmCount")
-    @ResponseBody
-    public Object alarmCount(Long projectId){
-        return ResponseData.success(alarmService.alarmCount(projectId,ALARM_STATUS_ON));
-    }
-
-    @ApiOperation("设备列表接口")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "projectId", value = "作业ID",dataType = "Long", paramType = "query", example = "0")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = DeviceLocationDTO.class),
-    })
-    @GetMapping("/deviceList")
-    @ResponseBody
-    public Object deviceList(Long projectId){
-        return ResponseData.success(projectDeviceService.selectDeviceLocationList(projectId));
-    }
-
-    @ApiOperation("人员列表接口")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "projectId", value = "作业ID",dataType = "Long", paramType = "query", example = "0")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = WorkerLocationDTO.class),
-    })
-    @GetMapping("/workerList")
-    @ResponseBody
-    public Object workerList(Long projectId){
-        return ResponseData.success(projectWorkerService.selectWorkerLocationDTO(projectId));
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/WorkSiteInfoController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/WorkSiteInfoController.java
deleted file mode 100644
index af36d69..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/WorkSiteInfoController.java
+++ /dev/null
@@ -1,130 +0,0 @@
-package com.casic.missiles.modular.system.controller;
-
-
-import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.core.base.controller.BaseController;
-import com.casic.missiles.core.page.PageFactory;
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.WorkSiteDetailDTO;
-import com.casic.missiles.modular.system.entity.WorkSiteInfo;
-import com.casic.missiles.modular.system.service.IWorkSiteInfoService;
-import io.swagger.annotations.*;
-import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.*;
-
-import org.springframework.stereotype.Controller;
-
-import java.util.List;
-
-import static com.casic.missiles.model.response.ResponseData.DEFAULT_SUCCESS_MESSAGE;
-
-/**
- * <p>
- * 作业现场表 前端控制器
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@Controller
-@RequestMapping("/site")
-@Api(tags = "作业现场管理")
-@RequiredArgsConstructor
-public class WorkSiteInfoController extends BaseController {
-
-
-    private final IWorkSiteInfoService workSiteInfoService;
-
-    @ApiOperation("新增作业现场")
-    @PostMapping("add")
-    @ResponseBody
-    public Object addWorkSite(@RequestBody WorkSiteDetailDTO workSiteDetailDTO){
-        workSiteInfoService.addWorkSiteInfo(workSiteDetailDTO);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("编辑作业现场")
-    @PostMapping("update")
-    @ResponseBody
-    public Object updateWorkSite(@RequestBody WorkSiteDetailDTO workSiteDetailDTO){
-        workSiteInfoService.updateWorkSiteInfo(workSiteDetailDTO);
-        return ResponseData.success();
-    }
-
-
-    @ApiOperation("删除作业现场")
-    @PostMapping("delete")
-    @ResponseBody
-    public Object delete(@ApiParam("作业现场id列表")@RequestBody List<Long> projectIds){
-        workSiteInfoService.deleteProjects(projectIds);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("查询作业现场详情")
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = WorkSiteDetailDTO.class),
-    })
-    @GetMapping("detail")
-    @ResponseBody
-    public Object delete(@ApiParam(value = "作业现场id", example = "0")@RequestParam Long projectId){
-        WorkSiteDetailDTO detailDTO = workSiteInfoService.getWorkSiteDetail(projectId);
-        return ResponseData.success(detailDTO);
-    }
-
-    @ApiOperation("分页列表查询")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "workTitle",value = "作业名称", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "workRoad",value = "所属道路", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "workPersonName",value = "责任人姓名", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "startDate",value = "注册开始日期", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "endDate",value = "注册结束日期", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "projectState",value = "当前状态（字典值）", dataType = "String", paramType = "query")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = WorkSiteInfo.class),
-    })
-    @GetMapping("listPage")
-    @ResponseBody
-    public Object listPage(String workTitle,String workRoad,String workPersonName,String projectState,String startDate,String endDate){
-        Page<WorkSiteInfo> page = PageFactory.defaultPage();
-        QueryWrapper<WorkSiteInfo> queryWrapper = new QueryWrapper<>();
-        if(StrUtil.isNotEmpty(workTitle)){
-            queryWrapper.like("WORK_TITLE",workTitle);
-        }
-        if(StrUtil.isNotEmpty(workRoad)){
-            queryWrapper.like("WORK_ROAD",workRoad);
-        }
-        if(StrUtil.isNotEmpty(workPersonName)){
-            queryWrapper.like("WORKER_NAME",workPersonName);
-        }
-        if(StrUtil.isNotEmpty(projectState)){
-            queryWrapper.eq("PROJECT_STATE",projectState);
-        }
-        if(StrUtil.isNotEmpty(startDate)){
-            queryWrapper.ge("br_work_site_info.CREATE_TIME",startDate + " 00:00:00");
-        }
-        if(StrUtil.isNotEmpty(endDate)){
-            queryWrapper.le("br_work_site_info.CREATE_TIME",endDate + " 23:59:59");
-        }
-        page = workSiteInfoService.selectListPage(page,queryWrapper);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-    @ApiOperation("开始作业")
-    @PostMapping("start")
-    @ResponseBody
-    public Object start(@ApiParam(value = "作业现场id",example = "0")@RequestParam Long projectId){
-        workSiteInfoService.start(projectId);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("完成作业")
-    @PostMapping("finish")
-    @ResponseBody
-    public Object finish(@ApiParam(value = "作业现场id", example = "0")@RequestParam Long projectId){
-        workSiteInfoService.finish(projectId);
-        return ResponseData.success();
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/WorkerController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/WorkerController.java
deleted file mode 100644
index 796f94c..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/WorkerController.java
+++ /dev/null
@@ -1,136 +0,0 @@
-package com.casic.missiles.modular.system.controller;
-
-
-import cn.hutool.core.util.ObjectUtil;
-import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.core.base.controller.BaseController;
-import com.casic.missiles.core.page.PageFactory;
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.DeviceDetailDTO;
-import com.casic.missiles.modular.system.entity.Device;
-import com.casic.missiles.modular.system.entity.Worker;
-import com.casic.missiles.modular.system.service.IWorkerService;
-import io.swagger.annotations.*;
-import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.*;
-
-import org.springframework.stereotype.Controller;
-
-import java.util.Date;
-import java.util.List;
-
-import static com.casic.missiles.model.response.ResponseData.DEFAULT_SUCCESS_MESSAGE;
-
-/**
- * <p>
- *  前端控制器
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@Controller
-@RequestMapping("/worker")
-@RequiredArgsConstructor
-@Api(tags = "人员管理接口")
-public class WorkerController extends BaseController {
-
-    private final IWorkerService workerService;
-
-    @ApiOperation("分页列表查询")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "name",value = "姓名", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "deptId",value = "所属部门", dataType = "Long", paramType = "query", example = "0"),
-            @ApiImplicitParam(name = "status",value = "当前状态（字典值）", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "startDate",value = "注册开始日期", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "endDate",value = "注册结束日期", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "workerType",value = "人员类型（字典值）", dataType = "String", paramType = "query")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = Worker.class),
-    })
-    @GetMapping("listPage")
-    @ResponseBody
-    public Object listPage(String name,Long deptId, String status,String startDate,String endDate,String workerType){
-        Page<Worker> page = PageFactory.defaultPage();
-        QueryWrapper<Worker> queryWrapper = new QueryWrapper<>();
-        if(StrUtil.isNotEmpty(name)){
-            queryWrapper.like("WORKER_NAME",name);
-        }
-        if(ObjectUtil.isNotEmpty(deptId)){
-            queryWrapper.eq("DEPT_ID",deptId);
-        }
-        if(StrUtil.isNotEmpty(workerType)){
-            queryWrapper.eq("WORKER_TYPE",workerType);
-        }
-        if(StrUtil.isNotEmpty(startDate)){
-            queryWrapper.ge("CREATE_TIME",startDate + " 00:00:00");
-        }
-        if(StrUtil.isNotEmpty(endDate)){
-            queryWrapper.le("CREATE_TIME",endDate + " 23:59:59");
-        }
-        if(StrUtil.isNotEmpty(status)){
-            queryWrapper.eq("`STATUS`",status);
-        }
-        page = workerService.selectListPage(page,queryWrapper);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-    @ApiOperation("新增人员")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "worker", value = "人员信息", dataType = "Worker", paramType = "body", required = true),
-            @ApiImplicitParam(name = "projectId", value = "项目ID(入场申请需要)", dataType = "Long", paramType = "query", example = "0")
-    })
-    @PostMapping("add")
-    @ResponseBody
-    public Object add(@ApiParam("worker")@RequestBody Worker worker,
-                      @RequestParam(required = false) Long projectId){
-        workerService.addWorker(worker,projectId);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("编辑人员")
-    @PostMapping("update")
-    @ResponseBody
-    public Object update(@RequestBody Worker worker){
-        workerService.updateById(worker);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("删除人员")
-    @PostMapping("delete")
-    @ResponseBody
-    public Object delete(@ApiParam("人员id列表")@RequestBody List<Long> workIds){
-        workerService.removeByIds(workIds);
-        return ResponseData.success();
-    }
-
-
-    @ApiOperation(value = "获取人脸图片",notes = "返回人脸图片url")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "cameraIp",value = "摄像头IP", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "cameraPort",value = "摄像头端口号", dataType = "String", paramType = "query"),
-    })
-    @GetMapping("/face/register")
-    @ResponseBody
-    public Object faceRegister(String cameraIp,String cameraPort){
-        return ResponseData.success(workerService.faceRegister(cameraIp, cameraPort));
-    }
-
-
-    @ApiOperation(value = "查询临时入场人员列表")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "projectId", value = "项目ID",required = true,dataType = "Long", paramType = "query", example = "0")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = Worker.class),
-    })
-    @GetMapping("/projectTempWorker")
-    @ResponseBody
-    public Object projectTempWorker(Long projectId){
-        return ResponseData.success(workerService.projectTempWorker(projectId));
-    }
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/AlarmTypeCountDTO.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/AlarmTypeCountDTO.java
deleted file mode 100644
index 1a165a1..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/AlarmTypeCountDTO.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.casic.missiles.modular.system.dto;
-
-import io.swagger.annotations.ApiModel;
-import lombok.Data;
-
-@ApiModel(value = "AlarmTypeCountDTO",description = "报警类型统计（首页）")
-@Data
-public class AlarmTypeCountDTO {
-
-    private String alarmType;
-    private String alarmTypeName;
-    private Integer alarmCount;
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/AlarmUpload.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/AlarmUpload.java
deleted file mode 100644
index 73d7799..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/AlarmUpload.java
+++ /dev/null
@@ -1,46 +0,0 @@
-package com.casic.missiles.modular.system.dto;
-
-import cn.hutool.core.util.StrUtil;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-@ApiModel(value = "AlarmUpload",description = "报警上传")
-@Data
-public class AlarmUpload {
-
-    @ApiModelProperty(value = "摄像头ip")
-    private String cameraIp;
-
-    @ApiModelProperty(value = "摄像头端口")
-    private String cameraPort;
-    @ApiModelProperty(value = "安全树甲烷设备ip")
-    private String gasIp;
-    @ApiModelProperty(value = "安全树甲烷设备端口")
-    private String gasPort;
-    @ApiModelProperty(value = "报警值")
-    private String alarmValue;
-    @ApiModelProperty(value = "报警时间")
-    private String alarmTime;
-    @ApiModelProperty(value = "报警类型")
-    private String alarmType;
-    @ApiModelProperty(value = "报警图片")
-    private String alarmImage;
-    @ApiModelProperty(value = "报警内容")
-    private String alarmContent;
-
-    @Override
-    public String toString() {
-        return "AlarmUpload{" +
-                "cameraIp='" + cameraIp + '\'' +
-                ", cameraPort='" + cameraPort + '\'' +
-                ", gasIp='" + gasIp + '\'' +
-                ", gasPort='" + gasPort + '\'' +
-                ", alarmValue='" + alarmValue + '\'' +
-                ", alarmTime='" + alarmTime + '\'' +
-                ", alarmType='" + alarmType + '\'' +
-                ", alarmImage='" + (StrUtil.isNotEmpty(alarmImage) ? alarmImage.substring(0,50) : "null") + '\'' +
-                ", alarmContent='" + alarmContent + '\'' +
-                '}';
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/DeviceDetailDTO.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/DeviceDetailDTO.java
deleted file mode 100644
index ea518d9..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/DeviceDetailDTO.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package com.casic.missiles.modular.system.dto;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.casic.missiles.modular.system.entity.Device;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-@ApiModel("DeviceDetailDTO")
-@Data
-public class DeviceDetailDTO extends Device {
-
-    @ApiModelProperty(value = "摄像头编号")
-    private String cameraCode;
-
-    @ApiModelProperty(value = "摄像头IP")
-    private String cameraIp;
-
-    @ApiModelProperty(value = "摄像头端口")
-    private String cameraPort;
-
-    @ApiModelProperty(value = "激甲编号")
-    private String gasCode;
-
-    @ApiModelProperty(value = "激甲IP")
-    private String gasIp;
-
-    @ApiModelProperty(value = "激甲端口")
-    private String gasPort;
-
-    @ApiModelProperty(value = "智能帽衬编号")
-    private String hatLiningCode;
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/WorkSiteDetailDTO.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/WorkSiteDetailDTO.java
deleted file mode 100644
index 29378ff..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/WorkSiteDetailDTO.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package com.casic.missiles.modular.system.dto;
-
-import com.casic.missiles.modular.system.entity.ProjectDevice;
-import com.casic.missiles.modular.system.entity.ProjectWorker;
-import com.casic.missiles.modular.system.entity.WorkSiteInfo;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.util.List;
-
-@Data
-@ApiModel("WorkSiteDetailDTO")
-public class WorkSiteDetailDTO extends WorkSiteInfo {
-
-    @ApiModelProperty(value = "安全树列表",dataType = "ProjectDevice")
-    private List<ProjectDevice> deviceList;
-
-    @ApiModelProperty(value = "人员列表",dataType = "ProjectWorker")
-    private List<ProjectWorker> workerList;
-
-
-
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/WorkerLocationDTO.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/WorkerLocationDTO.java
deleted file mode 100644
index 6fd7b24..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/WorkerLocationDTO.java
+++ /dev/null
@@ -1,68 +0,0 @@
-package com.casic.missiles.modular.system.dto;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-@ApiModel(value = "WorkerLocationDTO",description = "人员位置列表（首页）")
-@Data
-public class WorkerLocationDTO {
-
-    @ApiModelProperty("人员ID")
-    private Long workerId;
-
-    @ApiModelProperty("人员姓名")
-    private String workerName;
-
-    @ApiModelProperty("安全帽编号")
-    private String hatCode;
-
-    @ApiModelProperty("安全帽ID")
-    private Long hatId;
-
-    @ApiModelProperty("背心编号")
-    private String vastCode;
-
-    @ApiModelProperty("手环编号")
-    private String braceletCode;
-
-    @ApiModelProperty("位置")
-    private String location;
-
-    @ApiModelProperty("时间")
-    private String time;
-
-    @ApiModelProperty("经度")
-    private String lng;
-
-    @ApiModelProperty("纬度")
-    private String lat;
-
-    @ApiModelProperty("心率")
-    private String heartRate;
-
-    @ApiModelProperty("血氧")
-    private String bloodOxygen;
-
-    @ApiModelProperty("一氧化碳")
-    private String co;
-
-    @ApiModelProperty("甲烷")
-    private String gas;
-
-    @ApiModelProperty("硫化氢")
-    private String h2s;
-
-    @ApiModelProperty("氧气")
-    private String o2;
-
-    @ApiModelProperty("信号")
-    private String signal;
-
-    @ApiModelProperty("电量")
-    private String cell;
-
-    @ApiModelProperty("是否报警")
-    private boolean alarmFlag;
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Alarm.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Alarm.java
new file mode 100644
index 0000000..4d2b7ef
--- /dev/null
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Alarm.java
@@ -0,0 +1,103 @@
+package com.casic.missiles.modular.system.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import java.util.Date;
+
+/**
+ * <p>
+ * 报警记录表
+ * </p>
+ *
+ * @author zyj
+ * @since 2023-05-25
+ */
+@Data
+@TableName("bus_alarm")
+public class Alarm implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    @TableId(value = "ID",type = IdType.ASSIGN_ID)
+    private Long id;
+
+    /**
+     * 设备ID
+     */
+    @TableField("DEVICE_ID")
+    private Long deviceId;
+
+    /**
+     * 报警类型
+     */
+    @TableField("ALARM_TYPE")
+    private String alarmType;
+
+    /**
+     * 报警时间
+     */
+    @TableField("ALARM_TIME")
+    private Date alarmTime;
+
+    /**
+     * 报警状态
+     */
+    @TableField("ALARM_STATUS")
+    private String alarmStatus;
+
+    /**
+     * 报警位置
+     */
+    @TableField("ALARM_LOCATION")
+    private String alarmLocation;
+
+    /**
+     * 报警图片
+     */
+    @TableField("ALARM_IMAGE")
+    private String alarmImage;
+
+    /**
+     * 视频通道号
+     */
+    @TableField("CHANNEL_NO")
+    private Integer channelNo;
+
+    /**
+     * 报警内容
+     */
+    @TableField("ALARM_CONTENT")
+    private String alarmContent;
+
+    /**
+     * 消警时间
+     */
+    @TableField("CANCEL_TIME")
+    private Date cancelTime;
+
+
+    @Override
+    public String toString() {
+        return "Alarm{" +
+            "id=" + id +
+            ", deviceId=" + deviceId +
+            ", alarmType=" + alarmType +
+            ", alarmTime=" + alarmTime +
+            ", alarmStatus=" + alarmStatus +
+            ", alarmLocation=" + alarmLocation +
+            ", alarmImage=" + alarmImage +
+            ", channelNo=" + channelNo +
+            ", alarmContent=" + alarmContent +
+            ", cancelTime=" + cancelTime +
+        "}";
+    }
+}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusAlarm.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusAlarm.java
deleted file mode 100644
index efb4a23..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusAlarm.java
+++ /dev/null
@@ -1,159 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.alibaba.fastjson.annotation.JSONField;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.time.LocalDateTime;
-import java.util.Date;
-
-/**
- * <p>
- * 报警记录表
- * </p>
- *
- * @author zyj
- * @since 2023-05-16
- */
-@Data
-@ApiModel("Alarm")
-@TableName("br_bus_alarm")
-public class BusAlarm implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 项目ID
-     */
-    @ApiModelProperty(value = "项目ID")
-    @TableField("PROJECT_ID")
-    private Long projectId;
-
-    /**
-     * 设备ID
-     */
-    @ApiModelProperty(value = "设备ID")
-    @TableField("DEVICE_ID")
-    private Long deviceId;
-
-    /**
-     * 报警类型
-     */
-    @ApiModelProperty(value = "报警类型")
-    @TableField("ALARM_TYPE")
-    private String alarmType;
-
-    /**
-     * 报警状态
-     */
-    @ApiModelProperty(value = "报警状态")
-    @TableField("ALARM_STATUS")
-    private String alarmStatus;
-
-    /**
-     * 报警值
-     */
-    @ApiModelProperty(value = "报警值")
-    @TableField("ALARM_VALUE")
-    private String alarmValue;
-
-    /**
-     * 报警图片
-     */
-    @ApiModelProperty(value = "报警图片")
-    @TableField("ALARM_IMAGE")
-    private String alarmImage;
-
-    /**
-     * 报警内容
-     */
-    @ApiModelProperty(value = "报警内容")
-    @TableField("ALARM_CONTENT")
-    private String alarmContent;
-
-    /**
-     * 报警时间
-     */
-    @ApiModelProperty(value = "报警时间")
-    @TableField("ALARM_TIME")
-    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
-    private Date alarmTime;
-
-    /**
-     * 消警时间
-     */
-    @ApiModelProperty(value = "消警时间")
-    @TableField("CANCEL_TIME")
-    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
-    private Date cancelTime;
-
-    /**
-     * 报警位置经度
-     */
-    @ApiModelProperty(value = "报警位置经度")
-    @TableField("ALARM_LNG")
-    private String alarmLng;
-
-    /**
-     * 报警位置纬度
-     */
-    @ApiModelProperty(value = "报警位置纬度")
-    @TableField("ALARM_LAT")
-    private String alarmLat;
-
-    @ApiModelProperty("报警类型名称")
-    @TableField(exist = false)
-    private String alarmStatusName;
-    @ApiModelProperty("报警类型名称")
-    @TableField(exist = false)
-    private String alarmTypeName;
-    @ApiModelProperty("作业名称")
-    @TableField(exist = false)
-    private String workTitle;
-    @ApiModelProperty("所属道路")
-    @TableField(exist = false)
-    private String workRoad;
-    @ApiModelProperty("作业状态")
-    @TableField(exist = false)
-    private String projectState;
-    @ApiModelProperty("作业状态名称")
-    @TableField(exist = false)
-    private String projectStateName;
-    @ApiModelProperty("负责人姓名")
-    @TableField(exist = false)
-    private String workPersonName;
-    @ApiModelProperty("负责人联系方式")
-    @TableField(exist = false)
-    private String workPersonPhoneNumber;
-
-
-    @Override
-    public String toString() {
-        return "BusAlarm{" +
-                "id=" + id +
-                ", projectId=" + projectId +
-                ", deviceId=" + deviceId +
-                ", alarmType=" + alarmType +
-                ", alarmValue=" + alarmValue +
-                ", alarmStatus=" + alarmStatus +
-                ", alarmImage=" + alarmImage +
-                ", alarmContent=" + alarmContent +
-                ", alarmTime=" + alarmTime +
-                ", cancelTime=" + cancelTime +
-                ", alarmLng=" + alarmLng +
-                ", alarmLat=" + alarmLat +
-                "}";
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusEvent.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusEvent.java
deleted file mode 100644
index a0b7543..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusEvent.java
+++ /dev/null
@@ -1,100 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.time.LocalDateTime;
-import java.util.Date;
-import java.util.List;
-
-/**
- * <p>
- * 事件表
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@TableName("br_bus_event")
-@Data
-@ApiModel("BusEvent")
-public class BusEvent implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @ApiModelProperty("事件ID")
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 事件标题
-     */
-    @ApiModelProperty("事件名称")
-    @TableField("EVENT_TITLE")
-    private String eventTitle;
-
-    /**
-     * 上报人员
-     */
-    @ApiModelProperty("上报人员")
-    @TableField("UPLOAD_NAME")
-    private String uploadName;
-
-    /**
-     * 联系方式
-     */
-    @ApiModelProperty("联系方式")
-    @TableField("PHONE_NUMBER")
-    private String phoneNumber;
-
-    /**
-     * 事件描述
-     */
-    @ApiModelProperty("事件描述")
-    @TableField("EVENT_DESCRIPTION")
-    private String eventDescription;
-
-    @ApiModelProperty("经度")
-    @TableField("LNG")
-    private String lng;
-
-    @ApiModelProperty("纬度")
-    @TableField("LAT")
-    private String lat;
-
-    /**
-     * 事件上传时间
-     */
-    @ApiModelProperty("事件上传时间")
-    @TableField("CREATE_TIME")
-    private Date createTime;
-
-    @ApiModelProperty("事件照片")
-    @TableField(exist = false)
-    private List<BusEventImage> imageList;
-
-
-
-    @Override
-    public String toString() {
-        return "BusEvent{" +
-            "id=" + id +
-            ", eventTitle=" + eventTitle +
-            ", uploadName=" + uploadName +
-            ", phoneNumber=" + phoneNumber +
-            ", eventDescription=" + eventDescription +
-            ", lng=" + lng +
-            ", lat=" + lat +
-            ", createTime=" + createTime +
-        "}";
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusEventImage.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusEventImage.java
deleted file mode 100644
index 1e75245..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusEventImage.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-
-/**
- * <p>
- * 事件图片表
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@TableName("br_bus_event_image")
-@Data
-@ApiModel("BusEventImage")
-public class BusEventImage implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 事件ID
-     */
-    @TableField("EVENT_ID")
-    private Long eventId;
-
-    /**
-     * 报警图片
-     */
-    @TableField("IMAGE")
-    @ApiModelProperty("图片url")
-    private String image;
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Device.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Device.java
index df89c70..ea7db5f 100644
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Device.java
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Device.java
@@ -1,30 +1,23 @@
 package com.casic.missiles.modular.system.entity;
 
-import com.alibaba.fastjson.annotation.JSONField;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.casic.missiles.core.base.json.DateDeserializer;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
-import java.util.Date;
 
 /**
  * <p>
- * 
+ * 设备记录表
  * </p>
  *
  * @author zyj
- * @since 2023-04-14
+ * @since 2023-05-25
  */
-@ApiModel("Device")
-@TableName("br_device")
 @Data
+@TableName("bus_device")
 public class Device implements Serializable {
 
     private static final long serialVersionUID = 1L;
@@ -32,82 +25,86 @@
     /**
      * 主键
      */
-    @ApiModelProperty(value = "设备ID")
     @TableId(value = "ID",type = IdType.ASSIGN_ID)
     private Long id;
 
     /**
-     * 设备编号
+     * 设备名称
      */
-    @ApiModelProperty(value = "设备编号")
-    @TableField("DEVICE_CODE")
-    private String deviceCode;
+    @TableField("DEVICE_NAME")
+    private String deviceName;
 
     /**
-     * 设备类型
+     * IP
      */
-    @ApiModelProperty(value = "设备类型")
-    @TableField("DEVICE_TYPE")
-    private String deviceType;
+    @TableField("IP")
+    private String ip;
 
     /**
-     * 设备批次
+     * 端口
      */
-    @ApiModelProperty(value = "设备批次")
-    @TableField("DEVICE_BATCH")
-    private String deviceBatch;
+    @TableField("PORT")
+    private String port;
 
     /**
-     * 厂家
+     * 用户名
      */
-    @ApiModelProperty(value = "厂家")
-    @TableField("MANUFACTURER")
-    private String manufacturer;
+    @TableField("USER_NAME")
+    private String userName;
 
     /**
-     * 是否供电
+     * 密码
      */
-    @ApiModelProperty(value = "是否供电")
-    @TableField("IS_POWER_SUPPLY")
-    private String isPowerSupply;
+    @TableField("PASSWORD")
+    private String password;
 
     /**
-     * 创建时间
+     * 连接类型
      */
-    @ApiModelProperty(value = "创建时间",dataType = "Date")
-    @TableField("CREATE_TIME")
-    private Date createTime;
+    @TableField("CONNECT_TYPE")
+    private String connectType;
 
-    @ApiModelProperty(value = "设备类型名称")
-    @TableField(exist = false)
-    private String deviceTypeName;
+    /**
+     * 位置
+     */
+    @TableField("LOCATION")
 
-    @ApiModelProperty(value = "是否供电名称")
-    @TableField(exist = false)
-    private String isPowerSupplyName;
+    private String location;
 
-    @ApiModelProperty(value = "注册时间",dataType = "String")
-    @TableField(exist = false)
-    private String registerTime;
+    /**
+     * 设备状态
+     */
+    @TableField("STATUS")
 
-    @ApiModelProperty(value = "当前状态")
-    @TableField(exist = false)
     private String status;
 
-    @ApiModelProperty(value = "当前状态名称")
-    @TableField(exist = false)
-    private String statusName;
+    /**
+     * 报警分组
+     */
+    @TableField("ALARM_GROUP")
+
+    private Long alarmGroup;
+
+    /**
+     * 视频通道数(预留)
+     */
+    @TableField("CHANNEL_NUM")
+    private Integer channelNum;
 
     @Override
     public String toString() {
         return "Device{" +
             "id=" + id +
-            ", deviceCode=" + deviceCode +
-            ", deviceType=" + deviceType +
-            ", deviceBatch=" + deviceBatch +
-            ", manufacturer=" + manufacturer +
-            ", isPowerSupply=" + isPowerSupply +
-            ", createTime=" + createTime +
+            ", deviceName=" + deviceName +
+            ", ip=" + ip +
+            ", port=" + port +
+            ", userName=" + userName +
+            ", password=" + password +
+            ", connectType=" + connectType +
+            ", location=" + location +
+            ", status=" + status +
+            ", alarmGroup=" + alarmGroup +
+            ", channelNum=" + channelNum +
         "}";
     }
 }
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/DeviceExt.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/DeviceExt.java
deleted file mode 100644
index 5ee7015..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/DeviceExt.java
+++ /dev/null
@@ -1,99 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-
-/**
- * <p>
- * 设备扩展信息表（安全树）
- * </p>
- *
- * @author zyj
- * @since 2023-04-27
- */
-@Data
-@TableName("br_device_ext")
-public class DeviceExt implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 设备ID
-     */
-    @TableField("DEVICE_ID")
-    private Long deviceId;
-
-    /**
-     * 摄像头编号
-     */
-    @TableField("CAMERA_CODE")
-    private String cameraCode;
-
-    /**
-     * 摄像头IP
-     */
-    @TableField("CAMERA_IP")
-    private String cameraIp;
-
-    /**
-     * 摄像头端口
-     */
-    @TableField("CAMERA_PORT")
-    private String cameraPort;
-
-    /**
-     * 激甲编号
-     */
-    @TableField("GAS_CODE")
-    private String gasCode;
-
-    /**
-     * 激甲IP
-     */
-    @TableField("GAS_IP")
-    private String gasIp;
-
-    /**
-     * 激甲端口
-     */
-    @TableField("GAS_PORT")
-    private String gasPort;
-
-    /**
-     * 甲烷报警阈值
-     */
-    @TableField("GAS_THRESHOLD")
-    private String gasThreshold;
-
-    @TableField(value = "HAT_LINING_CODE")
-    private String hatLiningCode;
-
-
-    @Override
-    public String toString() {
-        return "DeviceExt{" +
-            "id=" + id +
-            ", deviceId=" + deviceId +
-            ", cameraCode=" + cameraCode +
-            ", cameraIp=" + cameraIp +
-            ", cameraPort=" + cameraPort +
-            ", gasCode=" + gasCode +
-            ", gasIp=" + gasIp +
-            ", gasPort=" + gasPort +
-            ", gasThreshold=" + gasThreshold +
-            ", hatLiningCode=" + hatLiningCode +
-        "}";
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/ProjectDevice.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/ProjectDevice.java
deleted file mode 100644
index c4f3472..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/ProjectDevice.java
+++ /dev/null
@@ -1,62 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-
-/**
- * <p>
- * 
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@Data
-@ApiModel("ProjectDevice")
-@TableName("br_project_device")
-public class ProjectDevice implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 作业现场ID
-     */
-    @TableField("PROJECT_ID")
-    private Long projectId;
-
-    /**
-     * 设备ID
-     */
-    @TableField("DEVICE_ID")
-    @ApiModelProperty("设备ID（新增编辑时传）")
-    private Long deviceId;
-
-    /**
-     * 设备编号
-     */
-    @TableField(exist = false)
-    @ApiModelProperty("设备编号（详情中展示，新增编辑不用传）")
-    private String deviceCode;
-
-    @Override
-    public String toString() {
-        return "ProjectDevice{" +
-            "id=" + id +
-            ", projectId=" + projectId +
-            ", deviceId=" + deviceId +
-        "}";
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/ProjectWorker.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/ProjectWorker.java
deleted file mode 100644
index 10b23c4..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/ProjectWorker.java
+++ /dev/null
@@ -1,104 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import java.io.Serializable;
-
-/**
- * <p>
- * 
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@ApiModel("ProjectWorker")
-@TableName("br_project_worker")
-@Data
-@NoArgsConstructor
-@AllArgsConstructor
-public class ProjectWorker implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 作业现场ID
-     */
-    @TableField("PROJECT_ID")
-    private Long projectId;
-
-    /**
-     * 人员ID
-     */
-    @ApiModelProperty("人员ID")
-    @TableField("WORKER_ID")
-    private Long workerId;
-
-    /**
-     * 安全帽编号
-     */
-    @ApiModelProperty("安全帽编号")
-    @TableField("HAT_CODE")
-    private String hatCode;
-
-    /**
-     * 背心编号
-     */
-    @ApiModelProperty("背心编号")
-    @TableField("VAST_CODE")
-    private String vastCode;
-
-    /**
-     * 手环编号
-     */
-    @ApiModelProperty("手环编号")
-    @TableField("BRACELET_CODE")
-    private String braceletCode;
-
-    @ApiModelProperty("人员姓名（详情中展示，新增编辑不用传）")
-    @TableField(exist = false)
-    private String workerName;
-
-    @ApiModelProperty("人员部门ID（详情中展示，新增编辑不用传）")
-    @TableField(exist = false)
-    private String workerDeptId;
-
-    @ApiModelProperty("人员部门名称（详情中展示，新增编辑不用传）")
-    @TableField(exist = false)
-    private String workerDeptName;
-
-    @ApiModelProperty("人员联系方式（详情中展示，新增编辑不用传）")
-    @TableField(exist = false)
-    private String workerPhoneNumber;
-
-    public ProjectWorker(Long projectId, Long workerId) {
-        this.projectId = projectId;
-        this.workerId = workerId;
-    }
-
-    @Override
-    public String toString() {
-        return "ProjectWorker{" +
-            "id=" + id +
-            ", projectId=" + projectId +
-            ", workerId=" + workerId +
-            ", hatCode=" + hatCode +
-            ", vastCode=" + vastCode +
-            ", braceletCode=" + braceletCode +
-        "}";
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/WorkSiteInfo.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/WorkSiteInfo.java
deleted file mode 100644
index fa6f41d..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/WorkSiteInfo.java
+++ /dev/null
@@ -1,130 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.alibaba.fastjson.annotation.JSONField;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.time.LocalDateTime;
-import java.util.Date;
-
-/**
- * <p>
- * 作业现场表
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@ApiModel("WorkSiteInfo")
-@TableName("br_work_site_info")
-@Data
-public class WorkSiteInfo implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @ApiModelProperty("作业现场ID")
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 作业名称
-     */
-    @ApiModelProperty("作业名称")
-    @TableField("WORK_TITLE")
-    private String workTitle;
-
-    /**
-     * 责任人
-     */
-    @ApiModelProperty("责任人（人员ID）")
-    @TableField("WORK_PERSON")
-    private Long workPerson;
-
-    /**
-     * 作业描述
-     */
-    @ApiModelProperty("作业描述")
-    @TableField("WORK_SITE_DESC")
-    private String workSiteDesc;
-
-    /**
-     * 作业状态
-     */
-    @ApiModelProperty("作业状态")
-    @TableField("PROJECT_STATE")
-    private String projectState;
-
-    /**
-     * 所属道路
-     */
-    @ApiModelProperty("所属道路")
-    @TableField("WORK_ROAD")
-    private String workRoad;
-
-    @TableField("IMAGE_URL")
-    private String imageUrl;
-
-    @TableField("CREATE_TIME")
-    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
-    private Date createTime;
-    @TableField("UPDATE_TIME")
-    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
-    private Date updateTime;
-
-    @ApiModelProperty("开始时间")
-    @TableField("START_TIME")
-    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
-    private Date startTime;
-
-    @ApiModelProperty("结束时间")
-    @TableField("FINISH_TIME")
-    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
-    private Date finishTime;
-
-    @ApiModelProperty("负责人姓名（详情中使用，新增编辑不用传）")
-    @TableField(exist = false)
-    private String workPersonName;
-
-    @ApiModelProperty("负责人联系方式（详情中使用，新增编辑不用传）")
-    @TableField(exist = false)
-    private String workPersonPhoneNumber;
-
-    @ApiModelProperty("负责人所属部门ID（详情中使用，新增编辑不用传）")
-    @TableField(exist = false)
-    private Long workPersonDeptId;
-
-    @ApiModelProperty("负责人所属部门名称（详情中使用，新增编辑不用传）")
-    @TableField(exist = false)
-    private String workPersonDeptName;
-
-    @ApiModelProperty(value = "注册时间",dataType = "String")
-    @TableField(exist = false)
-    private String registerTime;
-
-    @ApiModelProperty("作业状态名称")
-    @TableField(exist = false)
-    private String projectStateName;
-
-    @Override
-    public String toString() {
-        return "WorkSiteInfo{" +
-            "id=" + id +
-            ", workTitle=" + workTitle +
-            ", workPerson=" + workPerson +
-            ", workSiteDesc=" + workSiteDesc +
-            ", projectState=" + projectState +
-            ", imageUrl=" + imageUrl +
-            ", updateTime=" + updateTime +
-            ", workRoad=" + workRoad +
-        "}";
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Worker.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Worker.java
deleted file mode 100644
index 28a4daa..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Worker.java
+++ /dev/null
@@ -1,147 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.time.LocalDateTime;
-import java.util.Date;
-
-/**
- * <p>
- * 
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@ApiModel("Worker")
-@TableName("br_worker")
-@Data
-public class Worker implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @ApiModelProperty(value = "人员ID")
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 姓名
-     */
-    @ApiModelProperty(value = "姓名")
-    @TableField("WORKER_NAME")
-    private String workerName;
-
-    /**
-     * 性别
-     */
-    @ApiModelProperty(value = "性别")
-    @TableField("GENDER")
-    private String gender;
-
-    /**
-     * 所属部门
-     */
-    @ApiModelProperty(value = "所属部门(人员管理)")
-    @TableField("DEPT_ID")
-    private Long deptId;
-
-    /**
-     * 所属单位
-     */
-    @ApiModelProperty(value = "所属单位(入场申请中使用)")
-    @TableField("OWNER_SHIP")
-    private String ownerShip;
-
-    /**
-     * 联系方式
-     */
-    @ApiModelProperty(value = "联系方式")
-    @TableField("PHONE_NUMBER")
-    private String phoneNumber;
-
-    /**
-     * 证件号
-     */
-    @ApiModelProperty(value = "证件号")
-    @TableField("ID_CARD_NUMBER")
-    private String idCardNumber;
-
-    /**
-     * 入场原因
-     */
-    @ApiModelProperty(value = "入场原因（入场申请中使用）")
-    @TableField("ENTER_REASON")
-    private String enterReason;
-
-    /**
-     * 入场人脸照片
-     */
-    @ApiModelProperty(value = "人脸照片（照片路径）")
-    @TableField("WORKER_AVATAR")
-    private String workerAvatar;
-
-    /**
-     * 申请入场时间
-     */
-    @ApiModelProperty(value = "注册时间/申请入场时间")
-    @TableField("CREATE_TIME")
-    private Date createTime;
-
-    /**
-     * 人员类型
-     */
-    @ApiModelProperty(value = "人员类型（区分人员管理和入场申请）")
-    @TableField("WORKER_TYPE")
-    private String workerType;
-
-    @ApiModelProperty(value = "性别名称")
-    @TableField(exist = false)
-    private String genderName;
-
-    @ApiModelProperty(value = "部门名称")
-    @TableField(exist = false)
-    private String deptName;
-
-    @ApiModelProperty(value = "注册时间",dataType = "String")
-    @TableField(exist = false)
-    private String registerTime;
-
-    @ApiModelProperty(value = "当前状态")
-    @TableField(exist = false)
-    private String status;
-
-    @ApiModelProperty(value = "当前状态名称")
-    @TableField(exist = false)
-    private String statusName;
-
-    @ApiModelProperty(value = "是否注册(0未注册；1已注册)",allowableValues = "0,1")
-    @TableField(exist = false)
-    private String isRegister;
-
-    @Override
-    public String toString() {
-        return "Worker{" +
-            "id=" + id +
-            ", workerName=" + workerName +
-            ", gender=" + gender +
-            ", deptId=" + deptId +
-            ", ownerShip=" + ownerShip +
-            ", phoneNumber=" + phoneNumber +
-            ", idCardNumber=" + idCardNumber +
-            ", enterReason=" + enterReason +
-            ", workerAvatar=" + workerAvatar +
-            ", createTime=" + createTime +
-            ", workerType=" + workerType +
-        "}";
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/AlarmMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/AlarmMapper.java
new file mode 100644
index 0000000..ea4c8be
--- /dev/null
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/AlarmMapper.java
@@ -0,0 +1,16 @@
+package com.casic.missiles.modular.system.mapper;
+
+import com.casic.missiles.modular.system.entity.Alarm;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 报警记录表 Mapper 接口
+ * </p>
+ *
+ * @author zyj
+ * @since 2023-05-25
+ */
+public interface AlarmMapper extends BaseMapper<Alarm> {
+
+}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/BusAlarmMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/BusAlarmMapper.java
deleted file mode 100644
index 9801742..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/BusAlarmMapper.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package com.casic.missiles.modular.system.mapper;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.modular.system.dto.AlarmTypeCountDTO;
-import com.casic.missiles.modular.system.entity.BusAlarm;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * <p>
- * 报警记录表 Mapper 接口
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface BusAlarmMapper extends BaseMapper<BusAlarm> {
-
-    Page<BusAlarm> listPage(Page<BusAlarm> page,@Param("ew")  QueryWrapper<BusAlarm> queryWrapper);
-
-    void cancelAlarm(@Param("deviceId")Long deviceId,@Param("alarmType") String alarmType);
-
-    List<AlarmTypeCountDTO> alarmCount(@Param("projectId")Long projectId, @Param("alarmStatus")String alarmStatus);
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/BusEventImageMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/BusEventImageMapper.java
deleted file mode 100644
index 9590b7d..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/BusEventImageMapper.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.casic.missiles.modular.system.mapper;
-
-import com.casic.missiles.modular.system.entity.BusEventImage;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * <p>
- * 事件图片表 Mapper 接口
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface BusEventImageMapper extends BaseMapper<BusEventImage> {
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/BusEventMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/BusEventMapper.java
deleted file mode 100644
index 3c85edf..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/BusEventMapper.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.casic.missiles.modular.system.mapper;
-
-import com.casic.missiles.modular.system.entity.BusEvent;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * <p>
- * 事件表 Mapper 接口
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface BusEventMapper extends BaseMapper<BusEvent> {
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/DeviceExtMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/DeviceExtMapper.java
deleted file mode 100644
index 4ca9212..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/DeviceExtMapper.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.casic.missiles.modular.system.mapper;
-
-import com.casic.missiles.modular.system.entity.DeviceExt;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * <p>
- * 设备扩展信息表（安全树） Mapper 接口
- * </p>
- *
- * @author zyj
- * @since 2023-04-27
- */
-public interface DeviceExtMapper extends BaseMapper<DeviceExt> {
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/DeviceMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/DeviceMapper.java
index 444c0c5..3d0bb02 100644
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/DeviceMapper.java
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/DeviceMapper.java
@@ -1,30 +1,16 @@
 package com.casic.missiles.modular.system.mapper;
 
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.modular.system.dto.DeviceDetailDTO;
-import com.casic.missiles.modular.system.dto.HelmetInfoDTO;
 import com.casic.missiles.modular.system.entity.Device;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
 
 /**
  * <p>
- *  Mapper 接口
+ * 设备记录表 Mapper 接口
  * </p>
  *
  * @author zyj
- * @since 2023-04-14
+ * @since 2023-05-25
  */
-@Mapper
 public interface DeviceMapper extends BaseMapper<Device> {
 
-    Page<DeviceDetailDTO> listDetailPage(Page<DeviceDetailDTO> page,@Param("ew") QueryWrapper<DeviceDetailDTO> ew);
-
-     List<Long> selectProjectDevice(@Param("projectId") Long projectId);
-
-    List<HelmetInfoDTO> selectHelmetList(@Param("deviceType")String deviceType);
 }
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/ProjectDeviceMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/ProjectDeviceMapper.java
deleted file mode 100644
index 1d0c14e..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/ProjectDeviceMapper.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package com.casic.missiles.modular.system.mapper;
-
-import com.casic.missiles.modular.system.dto.DeviceLocationDTO;
-import com.casic.missiles.modular.system.entity.ProjectDevice;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * <p>
- *  Mapper 接口
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface ProjectDeviceMapper extends BaseMapper<ProjectDevice> {
-     List<ProjectDevice> selectDetailByProjectId(@Param("projectId") Long projectId);
-
-     List<DeviceLocationDTO> selectDeviceLocationList(@Param("projectId") Long projectId);
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/ProjectWorkerMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/ProjectWorkerMapper.java
deleted file mode 100644
index 58583d1..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/ProjectWorkerMapper.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package com.casic.missiles.modular.system.mapper;
-
-import com.casic.missiles.modular.system.dto.WorkerLocationDTO;
-import com.casic.missiles.modular.system.entity.ProjectWorker;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * <p>
- *  Mapper 接口
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface ProjectWorkerMapper extends BaseMapper<ProjectWorker> {
-
-    List<ProjectWorker> selectDetailByProjectId(@Param("projectId") Long projectId,
-                                                @Param("workerType")String workerType);
-
-    List<WorkerLocationDTO> selectWorkerLocationList(@Param("projectId") Long projectId,
-                                                     @Param("workerType")String workerType);
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/WorkSiteInfoMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/WorkSiteInfoMapper.java
deleted file mode 100644
index a4934d2..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/WorkSiteInfoMapper.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.casic.missiles.modular.system.mapper;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.modular.system.entity.WorkSiteInfo;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Param;
-
-/**
- * <p>
- * 作业现场表 Mapper 接口
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface WorkSiteInfoMapper extends BaseMapper<WorkSiteInfo> {
-
-    Page<WorkSiteInfo> selectListPage(Page<WorkSiteInfo> page,@Param("ew") QueryWrapper<WorkSiteInfo> ew);
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/WorkerMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/WorkerMapper.java
deleted file mode 100644
index 258fb12..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/WorkerMapper.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package com.casic.missiles.modular.system.mapper;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.modular.system.dto.DeviceDetailDTO;
-import com.casic.missiles.modular.system.entity.Worker;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * <p>
- *  Mapper 接口
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface WorkerMapper extends BaseMapper<Worker> {
-
-
-    Page<Worker> selectListPage(Page<Worker> page, @Param("ew") QueryWrapper<Worker> ew);
-
-    List<String> selectWorkerAvatars(@Param("projectId")Long projectId);
-
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/AlarmMapper.xml b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/AlarmMapper.xml
new file mode 100644
index 0000000..25cb4ab
--- /dev/null
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/AlarmMapper.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.modular.system.mapper.AlarmMapper">
+
+</mapper>
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/BusAlarmMapper.xml b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/BusAlarmMapper.xml
deleted file mode 100644
index 595088a..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/BusAlarmMapper.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.casic.missiles.modular.system.mapper.BusAlarmMapper">
-
-    <select id="listPage" resultType="com.casic.missiles.modular.system.entity.BusAlarm">
-        SELECT
-            alarm.ID as id,
-            alarm.DEVICE_ID as deviceId,
-            alarm.PROJECT_ID as projectId,
-            alarm.ALARM_TYPE as alarmType,
-            alarm.ALARM_VALUE as alarmValue,
-            alarm.ALARM_STATUS as alarmStatus,
-            alarm.ALARM_IMAGE AS alarmImage,
-            alarm.ALARM_CONTENT as alarmContent,
-            alarm.ALARM_TIME as alarmTime,
-            alarm.CANCEL_TIME as cancelTime,
-            alarm.ALARM_LNG as alarmLng,
-            alarm.ALARM_LAT as alarmLat,
-            p.WORK_TITLE as workTitle,
-            p.WORK_ROAD as workRoad,
-            p.PROJECT_STATE as projectState,
-            w.WORKER_NAME as workPersonName,
-            w.PHONE_NUMBER as workPersonPhoneNumber
-        FROM
-            `br_bus_alarm` alarm
-                LEFT JOIN br_work_site_info p on alarm.PROJECT_ID = p.ID
-                LEFT JOIN br_worker w on p.WORK_PERSON = w.ID
-        <where>
-            <if test="ew != null">
-                ${ew.sqlSegment}
-            </if>
-        </where>
-    </select>
-
-    <select id="cancelAlarm">
-        update br_bus_alarm
-        set ALARM_STATUS = '1'
-        where DEVICE_ID = #{deviceId}
-          and ALARM_TYPE = #{alarmType}
-          and ALARM_STATUS = '0'
-    </select>
-
-    <select id="alarmCount" resultType="com.casic.missiles.modular.system.dto.AlarmTypeCountDTO">
-        SELECT
-            ALARM_TYPE as alarmType,
-            count(*) as alarmCount
-        from br_bus_alarm
-        <where>
-            <if test="projectId != null and projectId !=''">
-                and PROJECT_ID = #{projectId}
-            </if>
-            <if test="alarmStatus != null and alarmStatus !=''">
-                and ALARM_STATUS = #{alarmStatus}
-            </if>
-        </where>
-        group by ALARM_TYPE
-    </select>
-</mapper>
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/BusEventImageMapper.xml b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/BusEventImageMapper.xml
deleted file mode 100644
index fbc3db3..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/BusEventImageMapper.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.casic.missiles.modular.system.mapper.BusEventImageMapper">
-
-</mapper>
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/BusEventMapper.xml b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/BusEventMapper.xml
deleted file mode 100644
index 627d573..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/BusEventMapper.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.casic.missiles.modular.system.mapper.BusEventMapper">
-
-</mapper>
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/DeviceExtMapper.xml b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/DeviceExtMapper.xml
deleted file mode 100644
index 5321d1c..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/DeviceExtMapper.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.casic.missiles.modular.system.mapper.DeviceExtMapper">
-
-</mapper>
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/DeviceMapper.xml b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/DeviceMapper.xml
index 94262e1..88e7d01 100644
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/DeviceMapper.xml
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/DeviceMapper.xml
@@ -2,96 +2,4 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.casic.missiles.modular.system.mapper.DeviceMapper">
 
-    <select id="listDetailPage" resultType="com.casic.missiles.modular.system.dto.DeviceDetailDTO">
-        select
-        br_device.ID as id,
-        DEVICE_CODE as deviceCode,
-        DEVICE_TYPE as deviceType,
-        DEVICE_BATCH as deviceBatch,
-        MANUFACTURER as manufacturer,
-        IS_POWER_SUPPLY as isPowerSupply,
-        CREATE_TIME as createTime,
-        CAMERA_CODE as cameraCode,
-        CAMERA_IP as cameraIp,
-        CAMERA_PORT as cameraPort,
-        GAS_CODE as gasCode,
-        GAS_IP as gasIp,
-        GAS_PORT as gasPort,
-        HAT_LINING_CODE as hatLiningCode
-        from br_device
-        left join br_device_ext ext on ext.DEVICE_ID = br_device.ID
-        <where>
-            <if test="ew != null">
-                ${ew.sqlSegment}
-            </if>
-        </where>
-    </select>
-
-    <select id="selectProjectDevice" resultType="java.lang.Long">
-        with device_info as (
-            (SELECT
-            d.DEVICE_ID as DEVICE_ID,
-            d.PROJECT_ID as PROJECT_ID,
-            p.PROJECT_STATE as PROJECT_STATE
-            from br_project_device d
-            LEFT JOIN br_work_site_info p on p.ID = d.PROJECT_ID)
-
-            UNION ALL
-
-            (SELECT
-            d1.ID as DEVICE_ID,
-            w1.ID as PROJECT_ID,
-            w1.PROJECT_STATE as PROJECT_STATE
-            FROM br_project_worker pw1
-            LEFT JOIN br_device d1 on pw1.BRACELET_CODE = d1.DEVICE_CODE
-            LEFT JOIN br_work_site_info w1 on pw1.PROJECT_ID = w1.ID)
-
-            UNION ALL
-
-            (SELECT
-            d1.ID as DEVICE_ID,
-            w1.ID as PROJECT_ID,
-            w1.PROJECT_STATE as PROJECT_STATE
-            FROM br_project_worker pw1
-            LEFT JOIN br_device d1 on pw1.HAT_CODE = d1.DEVICE_CODE
-            LEFT JOIN br_work_site_info w1 on pw1.PROJECT_ID = w1.ID)
-
-
-            UNION ALL
-
-            (SELECT
-            d1.ID as DEVICE_ID,
-            w1.ID as PROJECT_ID,
-            w1.PROJECT_STATE as PROJECT_STATE
-            FROM br_project_worker pw1
-            LEFT JOIN br_device d1 on pw1.VAST_CODE = d1.DEVICE_CODE
-            LEFT JOIN br_work_site_info w1 on pw1.PROJECT_ID = w1.ID))
-
-        select DISTINCT DEVICE_ID from device_info
-        <where>
-            DEVICE_ID is not null
-            <choose>
-                <when test="projectId != null and projectId !=''">
-                    and PROJECT_ID = #{projectId}
-                </when>
-                <otherwise>
-                    AND PROJECT_STATE != '3'
-                </otherwise>
-            </choose>
-        </where>
-    </select>
-
-    <select id="selectHelmetList" resultType="com.casic.missiles.modular.system.dto.HelmetInfoDTO">
-        SELECT
-            a.ID AS deviceId,
-            a.DEVICE_CODE AS hatCode,
-            b.HAT_LINING_CODE AS hatLiningCode
-        FROM
-            br_device a
-                LEFT JOIN br_device_ext b ON a.ID = b.DEVICE_ID
-        WHERE
-            a.DEVICE_TYPE = #{deviceType}
-          AND a.DEVICE_CODE IS NOT NULL
-          AND b.HAT_LINING_CODE IS NOT NULL
-    </select>
 </mapper>
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/ProjectDeviceMapper.xml b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/ProjectDeviceMapper.xml
deleted file mode 100644
index c6d1c24..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/ProjectDeviceMapper.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.casic.missiles.modular.system.mapper.ProjectDeviceMapper">
-
-    <select id="selectDetailByProjectId" resultType="com.casic.missiles.modular.system.entity.ProjectDevice">
-        SELECT
-            pd.ID as id,
-            pd.PROJECT_ID as projectId,
-            pd.DEVICE_ID as deviceId,
-            d.DEVICE_CODE as deviceCode
-        from br_project_device pd
-        LEFT JOIN br_device d on pd.DEVICE_ID = d.ID
-        <where>
-            pd.PROJECT_ID = #{projectId}
-        </where>
-    </select>
-
-    <select id="selectDeviceLocationList" resultType="com.casic.missiles.modular.system.dto.DeviceLocationDTO">
-        SELECT
-        d.ID as deviceId,
-        d.DEVICE_TYPE as deviceType,
-        d.DEVICE_CODE as deviceCode,
-        if(EXISTS(select ID from br_bus_alarm WHERE DEVICE_ID = d.ID and ALARM_STATUS = '0'),true,false) as alarmFlag
-        FROM br_project_device pd, br_device d
-        where pd.DEVICE_ID = d.ID
-        and pd.PROJECT_ID = #{projectId}
-    </select>
-
-</mapper>
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/ProjectWorkerMapper.xml b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/ProjectWorkerMapper.xml
deleted file mode 100644
index 8d2de10..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/ProjectWorkerMapper.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.casic.missiles.modular.system.mapper.ProjectWorkerMapper">
-
-    <select id="selectDetailByProjectId" resultType="com.casic.missiles.modular.system.entity.ProjectWorker">
-        SELECT
-            pw.ID as id,
-            pw.PROJECT_ID as projectId,
-            pw.WORKER_ID as workerId,
-            w.WORKER_NAME as workerName,
-            w.DEPT_ID as workerDeptId,
-            pw.HAT_CODE as hatCode,
-            pw.VAST_CODE as vastCode,
-            pw.BRACELET_CODE as braceletCode,
-            w.PHONE_NUMBER as workerPhoneNumber
-        from br_project_worker pw
-        LEFT JOIN br_worker w on pw.WORKER_ID = w.ID
-        <where>
-            pw.PROJECT_ID = #{projectId}
-            <if test="workerType != null and workerType != ''">
-                and w.WORKER_TYPE = #{workerType}
-            </if>
-        </where>
-    </select>
-
-    <select id="selectWorkerLocationList" resultType="com.casic.missiles.modular.system.dto.WorkerLocationDTO">
-        select
-            w.ID as workerId,
-            w.WORKER_NAME as workerName,
-            pw.HAT_CODE as hatCode,
-            hd.ID as hatId,
-            pw.BRACELET_CODE as braceletCode,
-            pw.VAST_CODE as vastCode
-        from br_project_worker pw,br_worker w ,br_device hd
-        WHERE pw.WORKER_ID = w.ID
-          and pw.HAT_CODE = hd.DEVICE_CODE
-          and pw.PROJECT_ID = #{projectId}
-          and w.WORKER_TYPE = #{workerType}
-    </select>
-</mapper>
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/WorkSiteInfoMapper.xml b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/WorkSiteInfoMapper.xml
deleted file mode 100644
index 8f01326..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/WorkSiteInfoMapper.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.casic.missiles.modular.system.mapper.WorkSiteInfoMapper">
-
-    <select id="selectListPage" resultType="com.casic.missiles.modular.system.entity.WorkSiteInfo">
-        SELECT
-            br_work_site_info.ID AS id,
-            WORK_TITLE as workTitle,
-            WORK_ROAD as workRoad,
-            WORK_SITE_DESC as workSiteDesc,
-            WORK_PERSON as workPerson,
-            WORKER_NAME as workPersonName,
-            DEPT_ID as workPersonDeptId,
-            PHONE_NUMBER as workPersonPhoneNumber,
-            PROJECT_STATE as projectState,
-            br_work_site_info.CREATE_TIME AS createTime,
-            br_work_site_info.UPDATE_TIME AS updateTime
-        FROM br_work_site_info
-        LEFT JOIN br_worker w ON br_work_site_info.WORK_PERSON = w.ID
-        <where>
-            <if test="ew != null">
-                ${ew.sqlSegment}
-            </if>
-        </where>
-    </select>
-</mapper>
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/WorkerMapper.xml b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/WorkerMapper.xml
deleted file mode 100644
index 3e28b39..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/WorkerMapper.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.casic.missiles.modular.system.mapper.WorkerMapper">
-
-    <select id="selectListPage" resultType="com.casic.missiles.modular.system.entity.Worker">
-        WITH worker_project AS (
-            SELECT
-                w.id AS ID,
-                WORKER_NAME,
-                GENDER,
-                DEPT_ID,
-                OWNER_SHIP,
-                PHONE_NUMBER,
-                ID_CARD_NUMBER,
-                ENTER_REASON,
-                WORKER_AVATAR,
-                w.CREATE_TIME,
-                WORKER_TYPE,
-                IF( p.PROJECT_STATE != '3', 1, 0 ) AS `STATUS`
-            FROM br_worker w
-            LEFT JOIN br_project_worker pw ON w.ID = pw.WORKER_ID
-            LEFT JOIN br_work_site_info p ON pw.PROJECT_ID = p.ID
-        )
-
-        SELECT
-            ID AS id,
-            WORKER_NAME AS workerName,
-            GENDER AS gender,
-            DEPT_ID AS deptId,
-            OWNER_SHIP AS ownerShip,
-            PHONE_NUMBER AS phoneNumber,
-            ID_CARD_NUMBER AS idCardNumber,
-            ENTER_REASON AS enterReason,
-            WORKER_AVATAR AS workerAvatar,
-            CREATE_TIME AS createTime,
-            WORKER_TYPE AS workerType,
-            `STATUS` AS `status`
-        FROM worker_project
-        <where>
-            <if test="ew != null">
-                ${ew.sqlSegment}
-            </if>
-        </where>
-    </select>
-
-    <select id="selectWorkerAvatars" resultType="java.lang.String">
-        SELECT
-            WORKER_AVATAR
-        FROM
-            `br_worker`
-        WHERE
-        ID IN ( SELECT WORKER_ID FROM br_project_worker WHERE PROJECT_ID = #{projectId} )
-          AND WORKER_AVATAR IS NOT NULL
-          AND WORKER_AVATAR != ''
-    </select>
-</mapper>
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IAlarmService.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IAlarmService.java
new file mode 100644
index 0000000..8bc01f4
--- /dev/null
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IAlarmService.java
@@ -0,0 +1,16 @@
+package com.casic.missiles.modular.system.service;
+
+import com.casic.missiles.modular.system.entity.Alarm;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 报警记录表 服务类
+ * </p>
+ *
+ * @author zyj
+ * @since 2023-05-25
+ */
+public interface IAlarmService extends IService<Alarm> {
+
+}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IBusAlarmService.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IBusAlarmService.java
deleted file mode 100644
index f63c19c..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IBusAlarmService.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package com.casic.missiles.modular.system.service;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.modular.system.dto.AlarmTypeCountDTO;
-import com.casic.missiles.modular.system.dto.AlarmUpload;
-import com.casic.missiles.modular.system.entity.BusAlarm;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-import java.util.List;
-
-/**
- * <p>
- * 报警记录表 服务类
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface IBusAlarmService extends IService<BusAlarm> {
-
-    boolean alarmUpload(AlarmUpload alarmUpload);
-
-    Page<BusAlarm> listPage(Page<BusAlarm> page,QueryWrapper<BusAlarm> queryWrapper);
-
-    List<AlarmTypeCountDTO> alarmCount(Long projectId,String alarmStatus);
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IBusEventImageService.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IBusEventImageService.java
deleted file mode 100644
index b1187ed..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IBusEventImageService.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.casic.missiles.modular.system.service;
-
-import com.casic.missiles.modular.system.entity.BusEventImage;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-import java.util.List;
-
-/**
- * <p>
- * 事件图片表 服务类
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface IBusEventImageService extends IService<BusEventImage> {
-
-    boolean saveBusEventImages(Long eventId, List<BusEventImage> imageList);
-
-}

diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/AlarmController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/AlarmController.java
new file mode 100644
index 0000000..1795cf1
--- /dev/null
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/AlarmController.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.modular.system.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.stereotype.Controller;
+
+/**
+ * <p>
+ * 报警记录表 前端控制器
+ * </p>
+ *
+ * @author zyj
+ * @since 2023-05-25
+ */
+@Controller
+@RequestMapping("/system/alarm")
+public class AlarmController {
+
+}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusAlarmController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusAlarmController.java
deleted file mode 100644
index 1f82ebb..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusAlarmController.java
+++ /dev/null
@@ -1,102 +0,0 @@
-package com.casic.missiles.modular.system.controller;
-
-
-import cn.hutool.core.util.ObjectUtil;
-import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.core.base.controller.BaseController;
-import com.casic.missiles.core.page.PageFactory;
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.AlarmUpload;
-import com.casic.missiles.modular.system.dto.DeviceDetailDTO;
-import com.casic.missiles.modular.system.entity.BusAlarm;
-import com.casic.missiles.modular.system.service.IBusAlarmService;
-import io.swagger.annotations.*;
-import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.*;
-
-import org.springframework.stereotype.Controller;
-
-import static com.casic.missiles.model.response.ResponseData.DEFAULT_SUCCESS_MESSAGE;
-import static com.casic.missiles.modular.system.consts.AlarmConst.ALARM_STATUS_MANUAL_CANCEL;
-
-/**
- * <p>
- * 报警记录表 前端控制器
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@Api(tags = "报警管理接口")
-@Controller
-@RequestMapping("/alarm")
-@RequiredArgsConstructor
-public class BusAlarmController extends BaseController {
-
-    private final IBusAlarmService alarmService;
-
-    @ApiOperation("报警上报接口")
-    @PostMapping("/upload")
-    @ResponseBody
-    public Object upload(@RequestBody AlarmUpload alarmUpload){
-        alarmService.alarmUpload(alarmUpload);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("报警列表分页查询")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "workTitle", value = "作业名称",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "projectId", value = "作业ID",dataType = "Long", paramType = "query",example = "0"),
-            @ApiImplicitParam(name = "alarmStatus", value = "报警状态",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "projectState", value = "作业状态",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "alarmType", value = "报警类型",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "alarmStartTime", value = "报警开始时间",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "alarmEndTime", value = "报警结束时间",dataType = "String", paramType = "query")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = BusAlarm.class),
-    })
-    @GetMapping("/listPage")
-    @ResponseBody
-    public Object listPage(String workTitle,Long projectId,String alarmStatus,String projectState,String alarmType,String alarmStartTime,String alarmEndTime){
-        Page<BusAlarm> page = PageFactory.defaultPage();
-        QueryWrapper<BusAlarm> queryWrapper = new QueryWrapper<>();
-        if(StrUtil.isNotEmpty(workTitle)){
-            queryWrapper.like("p.WORK_TITLE",workTitle);
-        }
-        if(ObjectUtil.isNotEmpty(projectId)){
-            queryWrapper.eq("alarm.PROJECT_ID",projectId);
-        }
-        if(StrUtil.isNotEmpty(alarmStatus)){
-            queryWrapper.eq("alarm.ALARM_STATUS",alarmStatus);
-        }
-        if(StrUtil.isNotEmpty(projectState)){
-            queryWrapper.eq("p.PROJECT_STATE",projectState);
-        }
-        if(StrUtil.isNotEmpty(alarmType)){
-            queryWrapper.eq("alarm.ALARM_TYPE",alarmType);
-        }
-        if(StrUtil.isNotEmpty(alarmStartTime)){
-            queryWrapper.ge("alarm.ALARM_TIME",alarmStartTime);
-        }
-        if(StrUtil.isNotEmpty(alarmEndTime)){
-            queryWrapper.le("alarm.ALARM_TIME",alarmEndTime);
-        }
-        page = alarmService.listPage(page,queryWrapper);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-    @ApiOperation("消警")
-    @PostMapping("/cancel")
-    @ResponseBody
-    public Object cancel(@RequestParam("alarmId") Long alarmId){
-        UpdateWrapper<BusAlarm> updateWrapper = new UpdateWrapper<>();
-        updateWrapper.eq("ID",alarmId);
-        updateWrapper.set("ALARM_STATUS",ALARM_STATUS_MANUAL_CANCEL);
-        alarmService.update(updateWrapper);
-        return ResponseData.success();
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusEventController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusEventController.java
deleted file mode 100644
index dde5aad..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusEventController.java
+++ /dev/null
@@ -1,41 +0,0 @@
-package com.casic.missiles.modular.system.controller;
-
-
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.entity.BusEvent;
-import com.casic.missiles.modular.system.service.IBusEventService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.ResponseBody;
-
-/**
- * <p>
- * 事件表 前端控制器
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@Controller
-@RequestMapping("/event")
-@Api(tags = "事件上报")
-@RequiredArgsConstructor
-public class BusEventController {
-
-    private final IBusEventService eventService;
-
-    @ApiOperation("事件上报")
-    @PostMapping("add")
-    @ResponseBody
-    public Object add(@RequestBody BusEvent busEvent){
-        eventService.saveBusEvent(busEvent);
-        return ResponseData.success();
-    }
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
index 03abc5f..aa50d78 100644
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
@@ -1,121 +1,20 @@
 package com.casic.missiles.modular.system.controller;
 
 
-import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.core.base.controller.BaseController;
-import com.casic.missiles.core.page.PageFactory;
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.DeviceDetailDTO;
-import com.casic.missiles.modular.system.entity.Device;
-import com.casic.missiles.modular.system.service.IDeviceExtService;
-import com.casic.missiles.modular.system.service.IDeviceService;
-import io.swagger.annotations.*;
-import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.RequestMapping;
 
 import org.springframework.stereotype.Controller;
 
-import java.time.LocalDateTime;
-import java.util.Date;
-import java.util.List;
-
-import static com.casic.missiles.model.response.ResponseData.DEFAULT_SUCCESS_MESSAGE;
-
 /**
  * <p>
- *  前端控制器
+ * 设备记录表 前端控制器
  * </p>
  *
  * @author zyj
- * @since 2023-04-14
+ * @since 2023-05-25
  */
-@Api(tags = "设备管理接口")
-@RequiredArgsConstructor
 @Controller
-@RequestMapping("/device")
-public class DeviceController extends BaseController {
-    private final IDeviceService deviceService;
-    private final IDeviceExtService deviceExtService;
-
-    @ApiOperation("设备分页列表")
-    @ApiImplicitParams({
-        @ApiImplicitParam(name = "deviceType", value = "设备类型",dataType = "String", paramType = "query"),
-        @ApiImplicitParam(name = "deviceCode", value = "设备编号",dataType = "String", paramType = "query"),
-        @ApiImplicitParam(name = "status", value = "设备状态",dataType = "String", paramType = "query"),
-        @ApiImplicitParam(name = "projectId", value = "作业ID（如果传此参数，列表中返回该作业使用的设备）",dataType = "Long", paramType = "query", example = "0")
-    })
-    @ApiResponses({
-        @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = DeviceDetailDTO.class),
-    })
-    @GetMapping("listPage")
-    @ResponseBody
-    public Object listPage(String deviceType, String deviceCode, String status,Long projectId){
-        Page<DeviceDetailDTO> page = PageFactory.defaultPage();
-        QueryWrapper<DeviceDetailDTO> queryWrapper = new QueryWrapper<>();
-        if(StrUtil.isNotEmpty(deviceType)){
-            queryWrapper.eq("DEVICE_TYPE",deviceType);
-        }
-        if(StrUtil.isNotEmpty(deviceCode)){
-            queryWrapper.like("DEVICE_CODE",deviceCode);
-        }
-        page = deviceService.listPage(page,queryWrapper,status,projectId);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-    @ApiOperation("新增设备")
-    @PostMapping("add")
-    @ResponseBody
-    public Object add(@RequestBody DeviceDetailDTO deviceDetailDTO){
-        deviceService.saveDevice(deviceDetailDTO);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("编辑设备")
-    @PostMapping("update")
-    @ResponseBody
-    public Object update(@RequestBody DeviceDetailDTO deviceDetailDTO){
-        deviceService.updateDevice(deviceDetailDTO);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("删除设备")
-    @PostMapping("delete")
-    @ResponseBody
-    public Object delete(@ApiParam("设备id列表")@RequestBody List<Long> deviceIds){
-        deviceService.deleteDevices(deviceIds);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("设置甲烷阈值")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "gasIp", value = "安全树甲烷设备IP",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "gasPort", value = "安全树甲烷端口",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "threshold", value = "甲烷阈值",dataType = "String", paramType = "query")
-    })
-    @PostMapping("setThreshold")
-    @ResponseBody
-    public Object setThreshold(String gasIp,String gasPort,String threshold){
-        deviceExtService.setGasThreshold(gasIp, gasPort, threshold);
-        return ResponseData.success();
-    }
-
-
-    @ApiOperation("查询甲烷阈值")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "gasIp", value = "安全树甲烷设备IP",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "gasPort", value = "安全树甲烷端口",dataType = "String", paramType = "query")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = "{\"code\": 200,\"data\": \"100\",\"message\": \"请求成功\",\"success\": true}",response = String.class),
-    })
-    @GetMapping("getThreshold")
-    @ResponseBody
-    public Object getThreshold(String gasIp,String gasPort){
-        String data = deviceExtService.getGasThreshold(gasIp, gasPort);
-        return ResponseData.success(data);
-    }
-
+@RequestMapping("/system/device")
+public class DeviceController {
 
 }
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/OverviewController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/OverviewController.java
deleted file mode 100644
index 7570504..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/OverviewController.java
+++ /dev/null
@@ -1,70 +0,0 @@
-package com.casic.missiles.modular.system.controller;
-
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.AlarmTypeCountDTO;
-import com.casic.missiles.modular.system.dto.DeviceLocationDTO;
-import com.casic.missiles.modular.system.dto.WorkerLocationDTO;
-import com.casic.missiles.modular.system.service.IBusAlarmService;
-import com.casic.missiles.modular.system.service.IProjectDeviceService;
-import com.casic.missiles.modular.system.service.IProjectWorkerService;
-import io.swagger.annotations.*;
-import lombok.RequiredArgsConstructor;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.ResponseBody;
-
-import static com.casic.missiles.model.response.ResponseData.DEFAULT_SUCCESS_MESSAGE;
-import static com.casic.missiles.modular.system.consts.AlarmConst.ALARM_STATUS_ON;
-
-@Api(tags = "首页看板接口")
-@Controller
-@RequestMapping("overview")
-@RequiredArgsConstructor
-public class OverviewController {
-
-    private final IBusAlarmService alarmService;
-    private final IProjectDeviceService projectDeviceService;
-
-    private final IProjectWorkerService projectWorkerService;
-
-
-    @ApiOperation("报警统计接口")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "projectId", value = "作业ID",dataType = "Long", paramType = "query", example = "0")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = AlarmTypeCountDTO.class),
-    })
-    @GetMapping("/alarmCount")
-    @ResponseBody
-    public Object alarmCount(Long projectId){
-        return ResponseData.success(alarmService.alarmCount(projectId,ALARM_STATUS_ON));
-    }
-
-    @ApiOperation("设备列表接口")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "projectId", value = "作业ID",dataType = "Long", paramType = "query", example = "0")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = DeviceLocationDTO.class),
-    })
-    @GetMapping("/deviceList")
-    @ResponseBody
-    public Object deviceList(Long projectId){
-        return ResponseData.success(projectDeviceService.selectDeviceLocationList(projectId));
-    }
-
-    @ApiOperation("人员列表接口")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "projectId", value = "作业ID",dataType = "Long", paramType = "query", example = "0")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = WorkerLocationDTO.class),
-    })
-    @GetMapping("/workerList")
-    @ResponseBody
-    public Object workerList(Long projectId){
-        return ResponseData.success(projectWorkerService.selectWorkerLocationDTO(projectId));
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/WorkSiteInfoController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/WorkSiteInfoController.java
deleted file mode 100644
index af36d69..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/WorkSiteInfoController.java
+++ /dev/null
@@ -1,130 +0,0 @@
-package com.casic.missiles.modular.system.controller;
-
-
-import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.core.base.controller.BaseController;
-import com.casic.missiles.core.page.PageFactory;
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.WorkSiteDetailDTO;
-import com.casic.missiles.modular.system.entity.WorkSiteInfo;
-import com.casic.missiles.modular.system.service.IWorkSiteInfoService;
-import io.swagger.annotations.*;
-import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.*;
-
-import org.springframework.stereotype.Controller;
-
-import java.util.List;
-
-import static com.casic.missiles.model.response.ResponseData.DEFAULT_SUCCESS_MESSAGE;
-
-/**
- * <p>
- * 作业现场表 前端控制器
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@Controller
-@RequestMapping("/site")
-@Api(tags = "作业现场管理")
-@RequiredArgsConstructor
-public class WorkSiteInfoController extends BaseController {
-
-
-    private final IWorkSiteInfoService workSiteInfoService;
-
-    @ApiOperation("新增作业现场")
-    @PostMapping("add")
-    @ResponseBody
-    public Object addWorkSite(@RequestBody WorkSiteDetailDTO workSiteDetailDTO){
-        workSiteInfoService.addWorkSiteInfo(workSiteDetailDTO);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("编辑作业现场")
-    @PostMapping("update")
-    @ResponseBody
-    public Object updateWorkSite(@RequestBody WorkSiteDetailDTO workSiteDetailDTO){
-        workSiteInfoService.updateWorkSiteInfo(workSiteDetailDTO);
-        return ResponseData.success();
-    }
-
-
-    @ApiOperation("删除作业现场")
-    @PostMapping("delete")
-    @ResponseBody
-    public Object delete(@ApiParam("作业现场id列表")@RequestBody List<Long> projectIds){
-        workSiteInfoService.deleteProjects(projectIds);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("查询作业现场详情")
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = WorkSiteDetailDTO.class),
-    })
-    @GetMapping("detail")
-    @ResponseBody
-    public Object delete(@ApiParam(value = "作业现场id", example = "0")@RequestParam Long projectId){
-        WorkSiteDetailDTO detailDTO = workSiteInfoService.getWorkSiteDetail(projectId);
-        return ResponseData.success(detailDTO);
-    }
-
-    @ApiOperation("分页列表查询")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "workTitle",value = "作业名称", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "workRoad",value = "所属道路", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "workPersonName",value = "责任人姓名", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "startDate",value = "注册开始日期", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "endDate",value = "注册结束日期", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "projectState",value = "当前状态（字典值）", dataType = "String", paramType = "query")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = WorkSiteInfo.class),
-    })
-    @GetMapping("listPage")
-    @ResponseBody
-    public Object listPage(String workTitle,String workRoad,String workPersonName,String projectState,String startDate,String endDate){
-        Page<WorkSiteInfo> page = PageFactory.defaultPage();
-        QueryWrapper<WorkSiteInfo> queryWrapper = new QueryWrapper<>();
-        if(StrUtil.isNotEmpty(workTitle)){
-            queryWrapper.like("WORK_TITLE",workTitle);
-        }
-        if(StrUtil.isNotEmpty(workRoad)){
-            queryWrapper.like("WORK_ROAD",workRoad);
-        }
-        if(StrUtil.isNotEmpty(workPersonName)){
-            queryWrapper.like("WORKER_NAME",workPersonName);
-        }
-        if(StrUtil.isNotEmpty(projectState)){
-            queryWrapper.eq("PROJECT_STATE",projectState);
-        }
-        if(StrUtil.isNotEmpty(startDate)){
-            queryWrapper.ge("br_work_site_info.CREATE_TIME",startDate + " 00:00:00");
-        }
-        if(StrUtil.isNotEmpty(endDate)){
-            queryWrapper.le("br_work_site_info.CREATE_TIME",endDate + " 23:59:59");
-        }
-        page = workSiteInfoService.selectListPage(page,queryWrapper);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-    @ApiOperation("开始作业")
-    @PostMapping("start")
-    @ResponseBody
-    public Object start(@ApiParam(value = "作业现场id",example = "0")@RequestParam Long projectId){
-        workSiteInfoService.start(projectId);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("完成作业")
-    @PostMapping("finish")
-    @ResponseBody
-    public Object finish(@ApiParam(value = "作业现场id", example = "0")@RequestParam Long projectId){
-        workSiteInfoService.finish(projectId);
-        return ResponseData.success();
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/WorkerController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/WorkerController.java
deleted file mode 100644
index 796f94c..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/WorkerController.java
+++ /dev/null
@@ -1,136 +0,0 @@
-package com.casic.missiles.modular.system.controller;
-
-
-import cn.hutool.core.util.ObjectUtil;
-import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.core.base.controller.BaseController;
-import com.casic.missiles.core.page.PageFactory;
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.DeviceDetailDTO;
-import com.casic.missiles.modular.system.entity.Device;
-import com.casic.missiles.modular.system.entity.Worker;
-import com.casic.missiles.modular.system.service.IWorkerService;
-import io.swagger.annotations.*;
-import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.*;
-
-import org.springframework.stereotype.Controller;
-
-import java.util.Date;
-import java.util.List;
-
-import static com.casic.missiles.model.response.ResponseData.DEFAULT_SUCCESS_MESSAGE;
-
-/**
- * <p>
- *  前端控制器
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@Controller
-@RequestMapping("/worker")
-@RequiredArgsConstructor
-@Api(tags = "人员管理接口")
-public class WorkerController extends BaseController {
-
-    private final IWorkerService workerService;
-
-    @ApiOperation("分页列表查询")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "name",value = "姓名", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "deptId",value = "所属部门", dataType = "Long", paramType = "query", example = "0"),
-            @ApiImplicitParam(name = "status",value = "当前状态（字典值）", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "startDate",value = "注册开始日期", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "endDate",value = "注册结束日期", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "workerType",value = "人员类型（字典值）", dataType = "String", paramType = "query")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = Worker.class),
-    })
-    @GetMapping("listPage")
-    @ResponseBody
-    public Object listPage(String name,Long deptId, String status,String startDate,String endDate,String workerType){
-        Page<Worker> page = PageFactory.defaultPage();
-        QueryWrapper<Worker> queryWrapper = new QueryWrapper<>();
-        if(StrUtil.isNotEmpty(name)){
-            queryWrapper.like("WORKER_NAME",name);
-        }
-        if(ObjectUtil.isNotEmpty(deptId)){
-            queryWrapper.eq("DEPT_ID",deptId);
-        }
-        if(StrUtil.isNotEmpty(workerType)){
-            queryWrapper.eq("WORKER_TYPE",workerType);
-        }
-        if(StrUtil.isNotEmpty(startDate)){
-            queryWrapper.ge("CREATE_TIME",startDate + " 00:00:00");
-        }
-        if(StrUtil.isNotEmpty(endDate)){
-            queryWrapper.le("CREATE_TIME",endDate + " 23:59:59");
-        }
-        if(StrUtil.isNotEmpty(status)){
-            queryWrapper.eq("`STATUS`",status);
-        }
-        page = workerService.selectListPage(page,queryWrapper);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-    @ApiOperation("新增人员")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "worker", value = "人员信息", dataType = "Worker", paramType = "body", required = true),
-            @ApiImplicitParam(name = "projectId", value = "项目ID(入场申请需要)", dataType = "Long", paramType = "query", example = "0")
-    })
-    @PostMapping("add")
-    @ResponseBody
-    public Object add(@ApiParam("worker")@RequestBody Worker worker,
-                      @RequestParam(required = false) Long projectId){
-        workerService.addWorker(worker,projectId);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("编辑人员")
-    @PostMapping("update")
-    @ResponseBody
-    public Object update(@RequestBody Worker worker){
-        workerService.updateById(worker);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("删除人员")
-    @PostMapping("delete")
-    @ResponseBody
-    public Object delete(@ApiParam("人员id列表")@RequestBody List<Long> workIds){
-        workerService.removeByIds(workIds);
-        return ResponseData.success();
-    }
-
-
-    @ApiOperation(value = "获取人脸图片",notes = "返回人脸图片url")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "cameraIp",value = "摄像头IP", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "cameraPort",value = "摄像头端口号", dataType = "String", paramType = "query"),
-    })
-    @GetMapping("/face/register")
-    @ResponseBody
-    public Object faceRegister(String cameraIp,String cameraPort){
-        return ResponseData.success(workerService.faceRegister(cameraIp, cameraPort));
-    }
-
-
-    @ApiOperation(value = "查询临时入场人员列表")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "projectId", value = "项目ID",required = true,dataType = "Long", paramType = "query", example = "0")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = Worker.class),
-    })
-    @GetMapping("/projectTempWorker")
-    @ResponseBody
-    public Object projectTempWorker(Long projectId){
-        return ResponseData.success(workerService.projectTempWorker(projectId));
-    }
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/AlarmTypeCountDTO.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/AlarmTypeCountDTO.java
deleted file mode 100644
index 1a165a1..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/AlarmTypeCountDTO.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.casic.missiles.modular.system.dto;
-
-import io.swagger.annotations.ApiModel;
-import lombok.Data;
-
-@ApiModel(value = "AlarmTypeCountDTO",description = "报警类型统计（首页）")
-@Data
-public class AlarmTypeCountDTO {
-
-    private String alarmType;
-    private String alarmTypeName;
-    private Integer alarmCount;
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/AlarmUpload.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/AlarmUpload.java
deleted file mode 100644
index 73d7799..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/AlarmUpload.java
+++ /dev/null
@@ -1,46 +0,0 @@
-package com.casic.missiles.modular.system.dto;
-
-import cn.hutool.core.util.StrUtil;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-@ApiModel(value = "AlarmUpload",description = "报警上传")
-@Data
-public class AlarmUpload {
-
-    @ApiModelProperty(value = "摄像头ip")
-    private String cameraIp;
-
-    @ApiModelProperty(value = "摄像头端口")
-    private String cameraPort;
-    @ApiModelProperty(value = "安全树甲烷设备ip")
-    private String gasIp;
-    @ApiModelProperty(value = "安全树甲烷设备端口")
-    private String gasPort;
-    @ApiModelProperty(value = "报警值")
-    private String alarmValue;
-    @ApiModelProperty(value = "报警时间")
-    private String alarmTime;
-    @ApiModelProperty(value = "报警类型")
-    private String alarmType;
-    @ApiModelProperty(value = "报警图片")
-    private String alarmImage;
-    @ApiModelProperty(value = "报警内容")
-    private String alarmContent;
-
-    @Override
-    public String toString() {
-        return "AlarmUpload{" +
-                "cameraIp='" + cameraIp + '\'' +
-                ", cameraPort='" + cameraPort + '\'' +
-                ", gasIp='" + gasIp + '\'' +
-                ", gasPort='" + gasPort + '\'' +
-                ", alarmValue='" + alarmValue + '\'' +
-                ", alarmTime='" + alarmTime + '\'' +
-                ", alarmType='" + alarmType + '\'' +
-                ", alarmImage='" + (StrUtil.isNotEmpty(alarmImage) ? alarmImage.substring(0,50) : "null") + '\'' +
-                ", alarmContent='" + alarmContent + '\'' +
-                '}';
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/DeviceDetailDTO.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/DeviceDetailDTO.java
deleted file mode 100644
index ea518d9..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/DeviceDetailDTO.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package com.casic.missiles.modular.system.dto;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.casic.missiles.modular.system.entity.Device;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-@ApiModel("DeviceDetailDTO")
-@Data
-public class DeviceDetailDTO extends Device {
-
-    @ApiModelProperty(value = "摄像头编号")
-    private String cameraCode;
-
-    @ApiModelProperty(value = "摄像头IP")
-    private String cameraIp;
-
-    @ApiModelProperty(value = "摄像头端口")
-    private String cameraPort;
-
-    @ApiModelProperty(value = "激甲编号")
-    private String gasCode;
-
-    @ApiModelProperty(value = "激甲IP")
-    private String gasIp;
-
-    @ApiModelProperty(value = "激甲端口")
-    private String gasPort;
-
-    @ApiModelProperty(value = "智能帽衬编号")
-    private String hatLiningCode;
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/WorkSiteDetailDTO.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/WorkSiteDetailDTO.java
deleted file mode 100644
index 29378ff..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/WorkSiteDetailDTO.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package com.casic.missiles.modular.system.dto;
-
-import com.casic.missiles.modular.system.entity.ProjectDevice;
-import com.casic.missiles.modular.system.entity.ProjectWorker;
-import com.casic.missiles.modular.system.entity.WorkSiteInfo;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.util.List;
-
-@Data
-@ApiModel("WorkSiteDetailDTO")
-public class WorkSiteDetailDTO extends WorkSiteInfo {
-
-    @ApiModelProperty(value = "安全树列表",dataType = "ProjectDevice")
-    private List<ProjectDevice> deviceList;
-
-    @ApiModelProperty(value = "人员列表",dataType = "ProjectWorker")
-    private List<ProjectWorker> workerList;
-
-
-
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/WorkerLocationDTO.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/WorkerLocationDTO.java
deleted file mode 100644
index 6fd7b24..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/WorkerLocationDTO.java
+++ /dev/null
@@ -1,68 +0,0 @@
-package com.casic.missiles.modular.system.dto;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-@ApiModel(value = "WorkerLocationDTO",description = "人员位置列表（首页）")
-@Data
-public class WorkerLocationDTO {
-
-    @ApiModelProperty("人员ID")
-    private Long workerId;
-
-    @ApiModelProperty("人员姓名")
-    private String workerName;
-
-    @ApiModelProperty("安全帽编号")
-    private String hatCode;
-
-    @ApiModelProperty("安全帽ID")
-    private Long hatId;
-
-    @ApiModelProperty("背心编号")
-    private String vastCode;
-
-    @ApiModelProperty("手环编号")
-    private String braceletCode;
-
-    @ApiModelProperty("位置")
-    private String location;
-
-    @ApiModelProperty("时间")
-    private String time;
-
-    @ApiModelProperty("经度")
-    private String lng;
-
-    @ApiModelProperty("纬度")
-    private String lat;
-
-    @ApiModelProperty("心率")
-    private String heartRate;
-
-    @ApiModelProperty("血氧")
-    private String bloodOxygen;
-
-    @ApiModelProperty("一氧化碳")
-    private String co;
-
-    @ApiModelProperty("甲烷")
-    private String gas;
-
-    @ApiModelProperty("硫化氢")
-    private String h2s;
-
-    @ApiModelProperty("氧气")
-    private String o2;
-
-    @ApiModelProperty("信号")
-    private String signal;
-
-    @ApiModelProperty("电量")
-    private String cell;
-
-    @ApiModelProperty("是否报警")
-    private boolean alarmFlag;
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Alarm.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Alarm.java
new file mode 100644
index 0000000..4d2b7ef
--- /dev/null
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Alarm.java
@@ -0,0 +1,103 @@
+package com.casic.missiles.modular.system.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import java.util.Date;
+
+/**
+ * <p>
+ * 报警记录表
+ * </p>
+ *
+ * @author zyj
+ * @since 2023-05-25
+ */
+@Data
+@TableName("bus_alarm")
+public class Alarm implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    @TableId(value = "ID",type = IdType.ASSIGN_ID)
+    private Long id;
+
+    /**
+     * 设备ID
+     */
+    @TableField("DEVICE_ID")
+    private Long deviceId;
+
+    /**
+     * 报警类型
+     */
+    @TableField("ALARM_TYPE")
+    private String alarmType;
+
+    /**
+     * 报警时间
+     */
+    @TableField("ALARM_TIME")
+    private Date alarmTime;
+
+    /**
+     * 报警状态
+     */
+    @TableField("ALARM_STATUS")
+    private String alarmStatus;
+
+    /**
+     * 报警位置
+     */
+    @TableField("ALARM_LOCATION")
+    private String alarmLocation;
+
+    /**
+     * 报警图片
+     */
+    @TableField("ALARM_IMAGE")
+    private String alarmImage;
+
+    /**
+     * 视频通道号
+     */
+    @TableField("CHANNEL_NO")
+    private Integer channelNo;
+
+    /**
+     * 报警内容
+     */
+    @TableField("ALARM_CONTENT")
+    private String alarmContent;
+
+    /**
+     * 消警时间
+     */
+    @TableField("CANCEL_TIME")
+    private Date cancelTime;
+
+
+    @Override
+    public String toString() {
+        return "Alarm{" +
+            "id=" + id +
+            ", deviceId=" + deviceId +
+            ", alarmType=" + alarmType +
+            ", alarmTime=" + alarmTime +
+            ", alarmStatus=" + alarmStatus +
+            ", alarmLocation=" + alarmLocation +
+            ", alarmImage=" + alarmImage +
+            ", channelNo=" + channelNo +
+            ", alarmContent=" + alarmContent +
+            ", cancelTime=" + cancelTime +
+        "}";
+    }
+}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusAlarm.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusAlarm.java
deleted file mode 100644
index efb4a23..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusAlarm.java
+++ /dev/null
@@ -1,159 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.alibaba.fastjson.annotation.JSONField;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.time.LocalDateTime;
-import java.util.Date;
-
-/**
- * <p>
- * 报警记录表
- * </p>
- *
- * @author zyj
- * @since 2023-05-16
- */
-@Data
-@ApiModel("Alarm")
-@TableName("br_bus_alarm")
-public class BusAlarm implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 项目ID
-     */
-    @ApiModelProperty(value = "项目ID")
-    @TableField("PROJECT_ID")
-    private Long projectId;
-
-    /**
-     * 设备ID
-     */
-    @ApiModelProperty(value = "设备ID")
-    @TableField("DEVICE_ID")
-    private Long deviceId;
-
-    /**
-     * 报警类型
-     */
-    @ApiModelProperty(value = "报警类型")
-    @TableField("ALARM_TYPE")
-    private String alarmType;
-
-    /**
-     * 报警状态
-     */
-    @ApiModelProperty(value = "报警状态")
-    @TableField("ALARM_STATUS")
-    private String alarmStatus;
-
-    /**
-     * 报警值
-     */
-    @ApiModelProperty(value = "报警值")
-    @TableField("ALARM_VALUE")
-    private String alarmValue;
-
-    /**
-     * 报警图片
-     */
-    @ApiModelProperty(value = "报警图片")
-    @TableField("ALARM_IMAGE")
-    private String alarmImage;
-
-    /**
-     * 报警内容
-     */
-    @ApiModelProperty(value = "报警内容")
-    @TableField("ALARM_CONTENT")
-    private String alarmContent;
-
-    /**
-     * 报警时间
-     */
-    @ApiModelProperty(value = "报警时间")
-    @TableField("ALARM_TIME")
-    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
-    private Date alarmTime;
-
-    /**
-     * 消警时间
-     */
-    @ApiModelProperty(value = "消警时间")
-    @TableField("CANCEL_TIME")
-    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
-    private Date cancelTime;
-
-    /**
-     * 报警位置经度
-     */
-    @ApiModelProperty(value = "报警位置经度")
-    @TableField("ALARM_LNG")
-    private String alarmLng;
-
-    /**
-     * 报警位置纬度
-     */
-    @ApiModelProperty(value = "报警位置纬度")
-    @TableField("ALARM_LAT")
-    private String alarmLat;
-
-    @ApiModelProperty("报警类型名称")
-    @TableField(exist = false)
-    private String alarmStatusName;
-    @ApiModelProperty("报警类型名称")
-    @TableField(exist = false)
-    private String alarmTypeName;
-    @ApiModelProperty("作业名称")
-    @TableField(exist = false)
-    private String workTitle;
-    @ApiModelProperty("所属道路")
-    @TableField(exist = false)
-    private String workRoad;
-    @ApiModelProperty("作业状态")
-    @TableField(exist = false)
-    private String projectState;
-    @ApiModelProperty("作业状态名称")
-    @TableField(exist = false)
-    private String projectStateName;
-    @ApiModelProperty("负责人姓名")
-    @TableField(exist = false)
-    private String workPersonName;
-    @ApiModelProperty("负责人联系方式")
-    @TableField(exist = false)
-    private String workPersonPhoneNumber;
-
-
-    @Override
-    public String toString() {
-        return "BusAlarm{" +
-                "id=" + id +
-                ", projectId=" + projectId +
-                ", deviceId=" + deviceId +
-                ", alarmType=" + alarmType +
-                ", alarmValue=" + alarmValue +
-                ", alarmStatus=" + alarmStatus +
-                ", alarmImage=" + alarmImage +
-                ", alarmContent=" + alarmContent +
-                ", alarmTime=" + alarmTime +
-                ", cancelTime=" + cancelTime +
-                ", alarmLng=" + alarmLng +
-                ", alarmLat=" + alarmLat +
-                "}";
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusEvent.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusEvent.java
deleted file mode 100644
index a0b7543..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusEvent.java
+++ /dev/null
@@ -1,100 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.time.LocalDateTime;
-import java.util.Date;
-import java.util.List;
-
-/**
- * <p>
- * 事件表
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@TableName("br_bus_event")
-@Data
-@ApiModel("BusEvent")
-public class BusEvent implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @ApiModelProperty("事件ID")
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 事件标题
-     */
-    @ApiModelProperty("事件名称")
-    @TableField("EVENT_TITLE")
-    private String eventTitle;
-
-    /**
-     * 上报人员
-     */
-    @ApiModelProperty("上报人员")
-    @TableField("UPLOAD_NAME")
-    private String uploadName;
-
-    /**
-     * 联系方式
-     */
-    @ApiModelProperty("联系方式")
-    @TableField("PHONE_NUMBER")
-    private String phoneNumber;
-
-    /**
-     * 事件描述
-     */
-    @ApiModelProperty("事件描述")
-    @TableField("EVENT_DESCRIPTION")
-    private String eventDescription;
-
-    @ApiModelProperty("经度")
-    @TableField("LNG")
-    private String lng;
-
-    @ApiModelProperty("纬度")
-    @TableField("LAT")
-    private String lat;
-
-    /**
-     * 事件上传时间
-     */
-    @ApiModelProperty("事件上传时间")
-    @TableField("CREATE_TIME")
-    private Date createTime;
-
-    @ApiModelProperty("事件照片")
-    @TableField(exist = false)
-    private List<BusEventImage> imageList;
-
-
-
-    @Override
-    public String toString() {
-        return "BusEvent{" +
-            "id=" + id +
-            ", eventTitle=" + eventTitle +
-            ", uploadName=" + uploadName +
-            ", phoneNumber=" + phoneNumber +
-            ", eventDescription=" + eventDescription +
-            ", lng=" + lng +
-            ", lat=" + lat +
-            ", createTime=" + createTime +
-        "}";
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusEventImage.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusEventImage.java
deleted file mode 100644
index 1e75245..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusEventImage.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-
-/**
- * <p>
- * 事件图片表
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@TableName("br_bus_event_image")
-@Data
-@ApiModel("BusEventImage")
-public class BusEventImage implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 事件ID
-     */
-    @TableField("EVENT_ID")
-    private Long eventId;
-
-    /**
-     * 报警图片
-     */
-    @TableField("IMAGE")
-    @ApiModelProperty("图片url")
-    private String image;
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Device.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Device.java
index df89c70..ea7db5f 100644
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Device.java
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Device.java
@@ -1,30 +1,23 @@
 package com.casic.missiles.modular.system.entity;
 
-import com.alibaba.fastjson.annotation.JSONField;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.casic.missiles.core.base.json.DateDeserializer;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
-import java.util.Date;
 
 /**
  * <p>
- * 
+ * 设备记录表
  * </p>
  *
  * @author zyj
- * @since 2023-04-14
+ * @since 2023-05-25
  */
-@ApiModel("Device")
-@TableName("br_device")
 @Data
+@TableName("bus_device")
 public class Device implements Serializable {
 
     private static final long serialVersionUID = 1L;
@@ -32,82 +25,86 @@
     /**
      * 主键
      */
-    @ApiModelProperty(value = "设备ID")
     @TableId(value = "ID",type = IdType.ASSIGN_ID)
     private Long id;
 
     /**
-     * 设备编号
+     * 设备名称
      */
-    @ApiModelProperty(value = "设备编号")
-    @TableField("DEVICE_CODE")
-    private String deviceCode;
+    @TableField("DEVICE_NAME")
+    private String deviceName;
 
     /**
-     * 设备类型
+     * IP
      */
-    @ApiModelProperty(value = "设备类型")
-    @TableField("DEVICE_TYPE")
-    private String deviceType;
+    @TableField("IP")
+    private String ip;
 
     /**
-     * 设备批次
+     * 端口
      */
-    @ApiModelProperty(value = "设备批次")
-    @TableField("DEVICE_BATCH")
-    private String deviceBatch;
+    @TableField("PORT")
+    private String port;
 
     /**
-     * 厂家
+     * 用户名
      */
-    @ApiModelProperty(value = "厂家")
-    @TableField("MANUFACTURER")
-    private String manufacturer;
+    @TableField("USER_NAME")
+    private String userName;
 
     /**
-     * 是否供电
+     * 密码
      */
-    @ApiModelProperty(value = "是否供电")
-    @TableField("IS_POWER_SUPPLY")
-    private String isPowerSupply;
+    @TableField("PASSWORD")
+    private String password;
 
     /**
-     * 创建时间
+     * 连接类型
      */
-    @ApiModelProperty(value = "创建时间",dataType = "Date")
-    @TableField("CREATE_TIME")
-    private Date createTime;
+    @TableField("CONNECT_TYPE")
+    private String connectType;
 
-    @ApiModelProperty(value = "设备类型名称")
-    @TableField(exist = false)
-    private String deviceTypeName;
+    /**
+     * 位置
+     */
+    @TableField("LOCATION")
 
-    @ApiModelProperty(value = "是否供电名称")
-    @TableField(exist = false)
-    private String isPowerSupplyName;
+    private String location;
 
-    @ApiModelProperty(value = "注册时间",dataType = "String")
-    @TableField(exist = false)
-    private String registerTime;
+    /**
+     * 设备状态
+     */
+    @TableField("STATUS")
 
-    @ApiModelProperty(value = "当前状态")
-    @TableField(exist = false)
     private String status;
 
-    @ApiModelProperty(value = "当前状态名称")
-    @TableField(exist = false)
-    private String statusName;
+    /**
+     * 报警分组
+     */
+    @TableField("ALARM_GROUP")
+
+    private Long alarmGroup;
+
+    /**
+     * 视频通道数(预留)
+     */
+    @TableField("CHANNEL_NUM")
+    private Integer channelNum;
 
     @Override
     public String toString() {
         return "Device{" +
             "id=" + id +
-            ", deviceCode=" + deviceCode +
-            ", deviceType=" + deviceType +
-            ", deviceBatch=" + deviceBatch +
-            ", manufacturer=" + manufacturer +
-            ", isPowerSupply=" + isPowerSupply +
-            ", createTime=" + createTime +
+            ", deviceName=" + deviceName +
+            ", ip=" + ip +
+            ", port=" + port +
+            ", userName=" + userName +
+            ", password=" + password +
+            ", connectType=" + connectType +
+            ", location=" + location +
+            ", status=" + status +
+            ", alarmGroup=" + alarmGroup +
+            ", channelNum=" + channelNum +
         "}";
     }
 }
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/DeviceExt.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/DeviceExt.java
deleted file mode 100644
index 5ee7015..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/DeviceExt.java
+++ /dev/null
@@ -1,99 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-
-/**
- * <p>
- * 设备扩展信息表（安全树）
- * </p>
- *
- * @author zyj
- * @since 2023-04-27
- */
-@Data
-@TableName("br_device_ext")
-public class DeviceExt implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 设备ID
-     */
-    @TableField("DEVICE_ID")
-    private Long deviceId;
-
-    /**
-     * 摄像头编号
-     */
-    @TableField("CAMERA_CODE")
-    private String cameraCode;
-
-    /**
-     * 摄像头IP
-     */
-    @TableField("CAMERA_IP")
-    private String cameraIp;
-
-    /**
-     * 摄像头端口
-     */
-    @TableField("CAMERA_PORT")
-    private String cameraPort;
-
-    /**
-     * 激甲编号
-     */
-    @TableField("GAS_CODE")
-    private String gasCode;
-
-    /**
-     * 激甲IP
-     */
-    @TableField("GAS_IP")
-    private String gasIp;
-
-    /**
-     * 激甲端口
-     */
-    @TableField("GAS_PORT")
-    private String gasPort;
-
-    /**
-     * 甲烷报警阈值
-     */
-    @TableField("GAS_THRESHOLD")
-    private String gasThreshold;
-
-    @TableField(value = "HAT_LINING_CODE")
-    private String hatLiningCode;
-
-
-    @Override
-    public String toString() {
-        return "DeviceExt{" +
-            "id=" + id +
-            ", deviceId=" + deviceId +
-            ", cameraCode=" + cameraCode +
-            ", cameraIp=" + cameraIp +
-            ", cameraPort=" + cameraPort +
-            ", gasCode=" + gasCode +
-            ", gasIp=" + gasIp +
-            ", gasPort=" + gasPort +
-            ", gasThreshold=" + gasThreshold +
-            ", hatLiningCode=" + hatLiningCode +
-        "}";
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/ProjectDevice.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/ProjectDevice.java
deleted file mode 100644
index c4f3472..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/ProjectDevice.java
+++ /dev/null
@@ -1,62 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-
-/**
- * <p>
- * 
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@Data
-@ApiModel("ProjectDevice")
-@TableName("br_project_device")
-public class ProjectDevice implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 作业现场ID
-     */
-    @TableField("PROJECT_ID")
-    private Long projectId;
-
-    /**
-     * 设备ID
-     */
-    @TableField("DEVICE_ID")
-    @ApiModelProperty("设备ID（新增编辑时传）")
-    private Long deviceId;
-
-    /**
-     * 设备编号
-     */
-    @TableField(exist = false)
-    @ApiModelProperty("设备编号（详情中展示，新增编辑不用传）")
-    private String deviceCode;
-
-    @Override
-    public String toString() {
-        return "ProjectDevice{" +
-            "id=" + id +
-            ", projectId=" + projectId +
-            ", deviceId=" + deviceId +
-        "}";
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/ProjectWorker.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/ProjectWorker.java
deleted file mode 100644
index 10b23c4..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/ProjectWorker.java
+++ /dev/null
@@ -1,104 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import java.io.Serializable;
-
-/**
- * <p>
- * 
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@ApiModel("ProjectWorker")
-@TableName("br_project_worker")
-@Data
-@NoArgsConstructor
-@AllArgsConstructor
-public class ProjectWorker implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 作业现场ID
-     */
-    @TableField("PROJECT_ID")
-    private Long projectId;
-
-    /**
-     * 人员ID
-     */
-    @ApiModelProperty("人员ID")
-    @TableField("WORKER_ID")
-    private Long workerId;
-
-    /**
-     * 安全帽编号
-     */
-    @ApiModelProperty("安全帽编号")
-    @TableField("HAT_CODE")
-    private String hatCode;
-
-    /**
-     * 背心编号
-     */
-    @ApiModelProperty("背心编号")
-    @TableField("VAST_CODE")
-    private String vastCode;
-
-    /**
-     * 手环编号
-     */
-    @ApiModelProperty("手环编号")
-    @TableField("BRACELET_CODE")
-    private String braceletCode;
-
-    @ApiModelProperty("人员姓名（详情中展示，新增编辑不用传）")
-    @TableField(exist = false)
-    private String workerName;
-
-    @ApiModelProperty("人员部门ID（详情中展示，新增编辑不用传）")
-    @TableField(exist = false)
-    private String workerDeptId;
-
-    @ApiModelProperty("人员部门名称（详情中展示，新增编辑不用传）")
-    @TableField(exist = false)
-    private String workerDeptName;
-
-    @ApiModelProperty("人员联系方式（详情中展示，新增编辑不用传）")
-    @TableField(exist = false)
-    private String workerPhoneNumber;
-
-    public ProjectWorker(Long projectId, Long workerId) {
-        this.projectId = projectId;
-        this.workerId = workerId;
-    }
-
-    @Override
-    public String toString() {
-        return "ProjectWorker{" +
-            "id=" + id +
-            ", projectId=" + projectId +
-            ", workerId=" + workerId +
-            ", hatCode=" + hatCode +
-            ", vastCode=" + vastCode +
-            ", braceletCode=" + braceletCode +
-        "}";
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/WorkSiteInfo.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/WorkSiteInfo.java
deleted file mode 100644
index fa6f41d..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/WorkSiteInfo.java
+++ /dev/null
@@ -1,130 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.alibaba.fastjson.annotation.JSONField;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.time.LocalDateTime;
-import java.util.Date;
-
-/**
- * <p>
- * 作业现场表
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@ApiModel("WorkSiteInfo")
-@TableName("br_work_site_info")
-@Data
-public class WorkSiteInfo implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @ApiModelProperty("作业现场ID")
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 作业名称
-     */
-    @ApiModelProperty("作业名称")
-    @TableField("WORK_TITLE")
-    private String workTitle;
-
-    /**
-     * 责任人
-     */
-    @ApiModelProperty("责任人（人员ID）")
-    @TableField("WORK_PERSON")
-    private Long workPerson;
-
-    /**
-     * 作业描述
-     */
-    @ApiModelProperty("作业描述")
-    @TableField("WORK_SITE_DESC")
-    private String workSiteDesc;
-
-    /**
-     * 作业状态
-     */
-    @ApiModelProperty("作业状态")
-    @TableField("PROJECT_STATE")
-    private String projectState;
-
-    /**
-     * 所属道路
-     */
-    @ApiModelProperty("所属道路")
-    @TableField("WORK_ROAD")
-    private String workRoad;
-
-    @TableField("IMAGE_URL")
-    private String imageUrl;
-
-    @TableField("CREATE_TIME")
-    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
-    private Date createTime;
-    @TableField("UPDATE_TIME")
-    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
-    private Date updateTime;
-
-    @ApiModelProperty("开始时间")
-    @TableField("START_TIME")
-    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
-    private Date startTime;
-
-    @ApiModelProperty("结束时间")
-    @TableField("FINISH_TIME")
-    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
-    private Date finishTime;
-
-    @ApiModelProperty("负责人姓名（详情中使用，新增编辑不用传）")
-    @TableField(exist = false)
-    private String workPersonName;
-
-    @ApiModelProperty("负责人联系方式（详情中使用，新增编辑不用传）")
-    @TableField(exist = false)
-    private String workPersonPhoneNumber;
-
-    @ApiModelProperty("负责人所属部门ID（详情中使用，新增编辑不用传）")
-    @TableField(exist = false)
-    private Long workPersonDeptId;
-
-    @ApiModelProperty("负责人所属部门名称（详情中使用，新增编辑不用传）")
-    @TableField(exist = false)
-    private String workPersonDeptName;
-
-    @ApiModelProperty(value = "注册时间",dataType = "String")
-    @TableField(exist = false)
-    private String registerTime;
-
-    @ApiModelProperty("作业状态名称")
-    @TableField(exist = false)
-    private String projectStateName;
-
-    @Override
-    public String toString() {
-        return "WorkSiteInfo{" +
-            "id=" + id +
-            ", workTitle=" + workTitle +
-            ", workPerson=" + workPerson +
-            ", workSiteDesc=" + workSiteDesc +
-            ", projectState=" + projectState +
-            ", imageUrl=" + imageUrl +
-            ", updateTime=" + updateTime +
-            ", workRoad=" + workRoad +
-        "}";
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Worker.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Worker.java
deleted file mode 100644
index 28a4daa..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Worker.java
+++ /dev/null
@@ -1,147 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.time.LocalDateTime;
-import java.util.Date;
-
-/**
- * <p>
- * 
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@ApiModel("Worker")
-@TableName("br_worker")
-@Data
-public class Worker implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @ApiModelProperty(value = "人员ID")
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 姓名
-     */
-    @ApiModelProperty(value = "姓名")
-    @TableField("WORKER_NAME")
-    private String workerName;
-
-    /**
-     * 性别
-     */
-    @ApiModelProperty(value = "性别")
-    @TableField("GENDER")
-    private String gender;
-
-    /**
-     * 所属部门
-     */
-    @ApiModelProperty(value = "所属部门(人员管理)")
-    @TableField("DEPT_ID")
-    private Long deptId;
-
-    /**
-     * 所属单位
-     */
-    @ApiModelProperty(value = "所属单位(入场申请中使用)")
-    @TableField("OWNER_SHIP")
-    private String ownerShip;
-
-    /**
-     * 联系方式
-     */
-    @ApiModelProperty(value = "联系方式")
-    @TableField("PHONE_NUMBER")
-    private String phoneNumber;
-
-    /**
-     * 证件号
-     */
-    @ApiModelProperty(value = "证件号")
-    @TableField("ID_CARD_NUMBER")
-    private String idCardNumber;
-
-    /**
-     * 入场原因
-     */
-    @ApiModelProperty(value = "入场原因（入场申请中使用）")
-    @TableField("ENTER_REASON")
-    private String enterReason;
-
-    /**
-     * 入场人脸照片
-     */
-    @ApiModelProperty(value = "人脸照片（照片路径）")
-    @TableField("WORKER_AVATAR")
-    private String workerAvatar;
-
-    /**
-     * 申请入场时间
-     */
-    @ApiModelProperty(value = "注册时间/申请入场时间")
-    @TableField("CREATE_TIME")
-    private Date createTime;
-
-    /**
-     * 人员类型
-     */
-    @ApiModelProperty(value = "人员类型（区分人员管理和入场申请）")
-    @TableField("WORKER_TYPE")
-    private String workerType;
-
-    @ApiModelProperty(value = "性别名称")
-    @TableField(exist = false)
-    private String genderName;
-
-    @ApiModelProperty(value = "部门名称")
-    @TableField(exist = false)
-    private String deptName;
-
-    @ApiModelProperty(value = "注册时间",dataType = "String")
-    @TableField(exist = false)
-    private String registerTime;
-
-    @ApiModelProperty(value = "当前状态")
-    @TableField(exist = false)
-    private String status;
-
-    @ApiModelProperty(value = "当前状态名称")
-    @TableField(exist = false)
-    private String statusName;
-
-    @ApiModelProperty(value = "是否注册(0未注册；1已注册)",allowableValues = "0,1")
-    @TableField(exist = false)
-    private String isRegister;
-
-    @Override
-    public String toString() {
-        return "Worker{" +
-            "id=" + id +
-            ", workerName=" + workerName +
-            ", gender=" + gender +
-            ", deptId=" + deptId +
-            ", ownerShip=" + ownerShip +
-            ", phoneNumber=" + phoneNumber +
-            ", idCardNumber=" + idCardNumber +
-            ", enterReason=" + enterReason +
-            ", workerAvatar=" + workerAvatar +
-            ", createTime=" + createTime +
-            ", workerType=" + workerType +
-        "}";
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/AlarmMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/AlarmMapper.java
new file mode 100644
index 0000000..ea4c8be
--- /dev/null
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/AlarmMapper.java
@@ -0,0 +1,16 @@
+package com.casic.missiles.modular.system.mapper;
+
+import com.casic.missiles.modular.system.entity.Alarm;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 报警记录表 Mapper 接口
+ * </p>
+ *
+ * @author zyj
+ * @since 2023-05-25
+ */
+public interface AlarmMapper extends BaseMapper<Alarm> {
+
+}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/BusAlarmMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/BusAlarmMapper.java
deleted file mode 100644
index 9801742..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/BusAlarmMapper.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package com.casic.missiles.modular.system.mapper;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.modular.system.dto.AlarmTypeCountDTO;
-import com.casic.missiles.modular.system.entity.BusAlarm;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * <p>
- * 报警记录表 Mapper 接口
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface BusAlarmMapper extends BaseMapper<BusAlarm> {
-
-    Page<BusAlarm> listPage(Page<BusAlarm> page,@Param("ew")  QueryWrapper<BusAlarm> queryWrapper);
-
-    void cancelAlarm(@Param("deviceId")Long deviceId,@Param("alarmType") String alarmType);
-
-    List<AlarmTypeCountDTO> alarmCount(@Param("projectId")Long projectId, @Param("alarmStatus")String alarmStatus);
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/BusEventImageMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/BusEventImageMapper.java
deleted file mode 100644
index 9590b7d..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/BusEventImageMapper.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.casic.missiles.modular.system.mapper;
-
-import com.casic.missiles.modular.system.entity.BusEventImage;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * <p>
- * 事件图片表 Mapper 接口
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface BusEventImageMapper extends BaseMapper<BusEventImage> {
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/BusEventMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/BusEventMapper.java
deleted file mode 100644
index 3c85edf..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/BusEventMapper.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.casic.missiles.modular.system.mapper;
-
-import com.casic.missiles.modular.system.entity.BusEvent;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * <p>
- * 事件表 Mapper 接口
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface BusEventMapper extends BaseMapper<BusEvent> {
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/DeviceExtMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/DeviceExtMapper.java
deleted file mode 100644
index 4ca9212..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/DeviceExtMapper.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.casic.missiles.modular.system.mapper;
-
-import com.casic.missiles.modular.system.entity.DeviceExt;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * <p>
- * 设备扩展信息表（安全树） Mapper 接口
- * </p>
- *
- * @author zyj
- * @since 2023-04-27
- */
-public interface DeviceExtMapper extends BaseMapper<DeviceExt> {
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/DeviceMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/DeviceMapper.java
index 444c0c5..3d0bb02 100644
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/DeviceMapper.java
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/DeviceMapper.java
@@ -1,30 +1,16 @@
 package com.casic.missiles.modular.system.mapper;
 
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.modular.system.dto.DeviceDetailDTO;
-import com.casic.missiles.modular.system.dto.HelmetInfoDTO;
 import com.casic.missiles.modular.system.entity.Device;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
 
 /**
  * <p>
- *  Mapper 接口
+ * 设备记录表 Mapper 接口
  * </p>
  *
  * @author zyj
- * @since 2023-04-14
+ * @since 2023-05-25
  */
-@Mapper
 public interface DeviceMapper extends BaseMapper<Device> {
 
-    Page<DeviceDetailDTO> listDetailPage(Page<DeviceDetailDTO> page,@Param("ew") QueryWrapper<DeviceDetailDTO> ew);
-
-     List<Long> selectProjectDevice(@Param("projectId") Long projectId);
-
-    List<HelmetInfoDTO> selectHelmetList(@Param("deviceType")String deviceType);
 }
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/ProjectDeviceMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/ProjectDeviceMapper.java
deleted file mode 100644
index 1d0c14e..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/ProjectDeviceMapper.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package com.casic.missiles.modular.system.mapper;
-
-import com.casic.missiles.modular.system.dto.DeviceLocationDTO;
-import com.casic.missiles.modular.system.entity.ProjectDevice;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * <p>
- *  Mapper 接口
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface ProjectDeviceMapper extends BaseMapper<ProjectDevice> {
-     List<ProjectDevice> selectDetailByProjectId(@Param("projectId") Long projectId);
-
-     List<DeviceLocationDTO> selectDeviceLocationList(@Param("projectId") Long projectId);
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/ProjectWorkerMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/ProjectWorkerMapper.java
deleted file mode 100644
index 58583d1..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/ProjectWorkerMapper.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package com.casic.missiles.modular.system.mapper;
-
-import com.casic.missiles.modular.system.dto.WorkerLocationDTO;
-import com.casic.missiles.modular.system.entity.ProjectWorker;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * <p>
- *  Mapper 接口
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface ProjectWorkerMapper extends BaseMapper<ProjectWorker> {
-
-    List<ProjectWorker> selectDetailByProjectId(@Param("projectId") Long projectId,
-                                                @Param("workerType")String workerType);
-
-    List<WorkerLocationDTO> selectWorkerLocationList(@Param("projectId") Long projectId,
-                                                     @Param("workerType")String workerType);
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/WorkSiteInfoMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/WorkSiteInfoMapper.java
deleted file mode 100644
index a4934d2..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/WorkSiteInfoMapper.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.casic.missiles.modular.system.mapper;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.modular.system.entity.WorkSiteInfo;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Param;
-
-/**
- * <p>
- * 作业现场表 Mapper 接口
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface WorkSiteInfoMapper extends BaseMapper<WorkSiteInfo> {
-
-    Page<WorkSiteInfo> selectListPage(Page<WorkSiteInfo> page,@Param("ew") QueryWrapper<WorkSiteInfo> ew);
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/WorkerMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/WorkerMapper.java
deleted file mode 100644
index 258fb12..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/WorkerMapper.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package com.casic.missiles.modular.system.mapper;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.modular.system.dto.DeviceDetailDTO;
-import com.casic.missiles.modular.system.entity.Worker;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * <p>
- *  Mapper 接口
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface WorkerMapper extends BaseMapper<Worker> {
-
-
-    Page<Worker> selectListPage(Page<Worker> page, @Param("ew") QueryWrapper<Worker> ew);
-
-    List<String> selectWorkerAvatars(@Param("projectId")Long projectId);
-
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/AlarmMapper.xml b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/AlarmMapper.xml
new file mode 100644
index 0000000..25cb4ab
--- /dev/null
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/AlarmMapper.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.modular.system.mapper.AlarmMapper">
+
+</mapper>
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/BusAlarmMapper.xml b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/BusAlarmMapper.xml
deleted file mode 100644
index 595088a..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/BusAlarmMapper.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.casic.missiles.modular.system.mapper.BusAlarmMapper">
-
-    <select id="listPage" resultType="com.casic.missiles.modular.system.entity.BusAlarm">
-        SELECT
-            alarm.ID as id,
-            alarm.DEVICE_ID as deviceId,
-            alarm.PROJECT_ID as projectId,
-            alarm.ALARM_TYPE as alarmType,
-            alarm.ALARM_VALUE as alarmValue,
-            alarm.ALARM_STATUS as alarmStatus,
-            alarm.ALARM_IMAGE AS alarmImage,
-            alarm.ALARM_CONTENT as alarmContent,
-            alarm.ALARM_TIME as alarmTime,
-            alarm.CANCEL_TIME as cancelTime,
-            alarm.ALARM_LNG as alarmLng,
-            alarm.ALARM_LAT as alarmLat,
-            p.WORK_TITLE as workTitle,
-            p.WORK_ROAD as workRoad,
-            p.PROJECT_STATE as projectState,
-            w.WORKER_NAME as workPersonName,
-            w.PHONE_NUMBER as workPersonPhoneNumber
-        FROM
-            `br_bus_alarm` alarm
-                LEFT JOIN br_work_site_info p on alarm.PROJECT_ID = p.ID
-                LEFT JOIN br_worker w on p.WORK_PERSON = w.ID
-        <where>
-            <if test="ew != null">
-                ${ew.sqlSegment}
-            </if>
-        </where>
-    </select>
-
-    <select id="cancelAlarm">
-        update br_bus_alarm
-        set ALARM_STATUS = '1'
-        where DEVICE_ID = #{deviceId}
-          and ALARM_TYPE = #{alarmType}
-          and ALARM_STATUS = '0'
-    </select>
-
-    <select id="alarmCount" resultType="com.casic.missiles.modular.system.dto.AlarmTypeCountDTO">
-        SELECT
-            ALARM_TYPE as alarmType,
-            count(*) as alarmCount
-        from br_bus_alarm
-        <where>
-            <if test="projectId != null and projectId !=''">
-                and PROJECT_ID = #{projectId}
-            </if>
-            <if test="alarmStatus != null and alarmStatus !=''">
-                and ALARM_STATUS = #{alarmStatus}
-            </if>
-        </where>
-        group by ALARM_TYPE
-    </select>
-</mapper>
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/BusEventImageMapper.xml b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/BusEventImageMapper.xml
deleted file mode 100644
index fbc3db3..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/BusEventImageMapper.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.casic.missiles.modular.system.mapper.BusEventImageMapper">
-
-</mapper>
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/BusEventMapper.xml b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/BusEventMapper.xml
deleted file mode 100644
index 627d573..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/BusEventMapper.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.casic.missiles.modular.system.mapper.BusEventMapper">
-
-</mapper>
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/DeviceExtMapper.xml b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/DeviceExtMapper.xml
deleted file mode 100644
index 5321d1c..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/DeviceExtMapper.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.casic.missiles.modular.system.mapper.DeviceExtMapper">
-
-</mapper>
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/DeviceMapper.xml b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/DeviceMapper.xml
index 94262e1..88e7d01 100644
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/DeviceMapper.xml
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/DeviceMapper.xml
@@ -2,96 +2,4 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.casic.missiles.modular.system.mapper.DeviceMapper">
 
-    <select id="listDetailPage" resultType="com.casic.missiles.modular.system.dto.DeviceDetailDTO">
-        select
-        br_device.ID as id,
-        DEVICE_CODE as deviceCode,
-        DEVICE_TYPE as deviceType,
-        DEVICE_BATCH as deviceBatch,
-        MANUFACTURER as manufacturer,
-        IS_POWER_SUPPLY as isPowerSupply,
-        CREATE_TIME as createTime,
-        CAMERA_CODE as cameraCode,
-        CAMERA_IP as cameraIp,
-        CAMERA_PORT as cameraPort,
-        GAS_CODE as gasCode,
-        GAS_IP as gasIp,
-        GAS_PORT as gasPort,
-        HAT_LINING_CODE as hatLiningCode
-        from br_device
-        left join br_device_ext ext on ext.DEVICE_ID = br_device.ID
-        <where>
-            <if test="ew != null">
-                ${ew.sqlSegment}
-            </if>
-        </where>
-    </select>
-
-    <select id="selectProjectDevice" resultType="java.lang.Long">
-        with device_info as (
-            (SELECT
-            d.DEVICE_ID as DEVICE_ID,
-            d.PROJECT_ID as PROJECT_ID,
-            p.PROJECT_STATE as PROJECT_STATE
-            from br_project_device d
-            LEFT JOIN br_work_site_info p on p.ID = d.PROJECT_ID)
-
-            UNION ALL
-
-            (SELECT
-            d1.ID as DEVICE_ID,
-            w1.ID as PROJECT_ID,
-            w1.PROJECT_STATE as PROJECT_STATE
-            FROM br_project_worker pw1
-            LEFT JOIN br_device d1 on pw1.BRACELET_CODE = d1.DEVICE_CODE
-            LEFT JOIN br_work_site_info w1 on pw1.PROJECT_ID = w1.ID)
-
-            UNION ALL
-
-            (SELECT
-            d1.ID as DEVICE_ID,
-            w1.ID as PROJECT_ID,
-            w1.PROJECT_STATE as PROJECT_STATE
-            FROM br_project_worker pw1
-            LEFT JOIN br_device d1 on pw1.HAT_CODE = d1.DEVICE_CODE
-            LEFT JOIN br_work_site_info w1 on pw1.PROJECT_ID = w1.ID)
-
-
-            UNION ALL
-
-            (SELECT
-            d1.ID as DEVICE_ID,
-            w1.ID as PROJECT_ID,
-            w1.PROJECT_STATE as PROJECT_STATE
-            FROM br_project_worker pw1
-            LEFT JOIN br_device d1 on pw1.VAST_CODE = d1.DEVICE_CODE
-            LEFT JOIN br_work_site_info w1 on pw1.PROJECT_ID = w1.ID))
-
-        select DISTINCT DEVICE_ID from device_info
-        <where>
-            DEVICE_ID is not null
-            <choose>
-                <when test="projectId != null and projectId !=''">
-                    and PROJECT_ID = #{projectId}
-                </when>
-                <otherwise>
-                    AND PROJECT_STATE != '3'
-                </otherwise>
-            </choose>
-        </where>
-    </select>
-
-    <select id="selectHelmetList" resultType="com.casic.missiles.modular.system.dto.HelmetInfoDTO">
-        SELECT
-            a.ID AS deviceId,
-            a.DEVICE_CODE AS hatCode,
-            b.HAT_LINING_CODE AS hatLiningCode
-        FROM
-            br_device a
-                LEFT JOIN br_device_ext b ON a.ID = b.DEVICE_ID
-        WHERE
-            a.DEVICE_TYPE = #{deviceType}
-          AND a.DEVICE_CODE IS NOT NULL
-          AND b.HAT_LINING_CODE IS NOT NULL
-    </select>
 </mapper>
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/ProjectDeviceMapper.xml b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/ProjectDeviceMapper.xml
deleted file mode 100644
index c6d1c24..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/ProjectDeviceMapper.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.casic.missiles.modular.system.mapper.ProjectDeviceMapper">
-
-    <select id="selectDetailByProjectId" resultType="com.casic.missiles.modular.system.entity.ProjectDevice">
-        SELECT
-            pd.ID as id,
-            pd.PROJECT_ID as projectId,
-            pd.DEVICE_ID as deviceId,
-            d.DEVICE_CODE as deviceCode
-        from br_project_device pd
-        LEFT JOIN br_device d on pd.DEVICE_ID = d.ID
-        <where>
-            pd.PROJECT_ID = #{projectId}
-        </where>
-    </select>
-
-    <select id="selectDeviceLocationList" resultType="com.casic.missiles.modular.system.dto.DeviceLocationDTO">
-        SELECT
-        d.ID as deviceId,
-        d.DEVICE_TYPE as deviceType,
-        d.DEVICE_CODE as deviceCode,
-        if(EXISTS(select ID from br_bus_alarm WHERE DEVICE_ID = d.ID and ALARM_STATUS = '0'),true,false) as alarmFlag
-        FROM br_project_device pd, br_device d
-        where pd.DEVICE_ID = d.ID
-        and pd.PROJECT_ID = #{projectId}
-    </select>
-
-</mapper>
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/ProjectWorkerMapper.xml b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/ProjectWorkerMapper.xml
deleted file mode 100644
index 8d2de10..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/ProjectWorkerMapper.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.casic.missiles.modular.system.mapper.ProjectWorkerMapper">
-
-    <select id="selectDetailByProjectId" resultType="com.casic.missiles.modular.system.entity.ProjectWorker">
-        SELECT
-            pw.ID as id,
-            pw.PROJECT_ID as projectId,
-            pw.WORKER_ID as workerId,
-            w.WORKER_NAME as workerName,
-            w.DEPT_ID as workerDeptId,
-            pw.HAT_CODE as hatCode,
-            pw.VAST_CODE as vastCode,
-            pw.BRACELET_CODE as braceletCode,
-            w.PHONE_NUMBER as workerPhoneNumber
-        from br_project_worker pw
-        LEFT JOIN br_worker w on pw.WORKER_ID = w.ID
-        <where>
-            pw.PROJECT_ID = #{projectId}
-            <if test="workerType != null and workerType != ''">
-                and w.WORKER_TYPE = #{workerType}
-            </if>
-        </where>
-    </select>
-
-    <select id="selectWorkerLocationList" resultType="com.casic.missiles.modular.system.dto.WorkerLocationDTO">
-        select
-            w.ID as workerId,
-            w.WORKER_NAME as workerName,
-            pw.HAT_CODE as hatCode,
-            hd.ID as hatId,
-            pw.BRACELET_CODE as braceletCode,
-            pw.VAST_CODE as vastCode
-        from br_project_worker pw,br_worker w ,br_device hd
-        WHERE pw.WORKER_ID = w.ID
-          and pw.HAT_CODE = hd.DEVICE_CODE
-          and pw.PROJECT_ID = #{projectId}
-          and w.WORKER_TYPE = #{workerType}
-    </select>
-</mapper>
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/WorkSiteInfoMapper.xml b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/WorkSiteInfoMapper.xml
deleted file mode 100644
index 8f01326..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/WorkSiteInfoMapper.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.casic.missiles.modular.system.mapper.WorkSiteInfoMapper">
-
-    <select id="selectListPage" resultType="com.casic.missiles.modular.system.entity.WorkSiteInfo">
-        SELECT
-            br_work_site_info.ID AS id,
-            WORK_TITLE as workTitle,
-            WORK_ROAD as workRoad,
-            WORK_SITE_DESC as workSiteDesc,
-            WORK_PERSON as workPerson,
-            WORKER_NAME as workPersonName,
-            DEPT_ID as workPersonDeptId,
-            PHONE_NUMBER as workPersonPhoneNumber,
-            PROJECT_STATE as projectState,
-            br_work_site_info.CREATE_TIME AS createTime,
-            br_work_site_info.UPDATE_TIME AS updateTime
-        FROM br_work_site_info
-        LEFT JOIN br_worker w ON br_work_site_info.WORK_PERSON = w.ID
-        <where>
-            <if test="ew != null">
-                ${ew.sqlSegment}
-            </if>
-        </where>
-    </select>
-</mapper>
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/WorkerMapper.xml b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/WorkerMapper.xml
deleted file mode 100644
index 3e28b39..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/WorkerMapper.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.casic.missiles.modular.system.mapper.WorkerMapper">
-
-    <select id="selectListPage" resultType="com.casic.missiles.modular.system.entity.Worker">
-        WITH worker_project AS (
-            SELECT
-                w.id AS ID,
-                WORKER_NAME,
-                GENDER,
-                DEPT_ID,
-                OWNER_SHIP,
-                PHONE_NUMBER,
-                ID_CARD_NUMBER,
-                ENTER_REASON,
-                WORKER_AVATAR,
-                w.CREATE_TIME,
-                WORKER_TYPE,
-                IF( p.PROJECT_STATE != '3', 1, 0 ) AS `STATUS`
-            FROM br_worker w
-            LEFT JOIN br_project_worker pw ON w.ID = pw.WORKER_ID
-            LEFT JOIN br_work_site_info p ON pw.PROJECT_ID = p.ID
-        )
-
-        SELECT
-            ID AS id,
-            WORKER_NAME AS workerName,
-            GENDER AS gender,
-            DEPT_ID AS deptId,
-            OWNER_SHIP AS ownerShip,
-            PHONE_NUMBER AS phoneNumber,
-            ID_CARD_NUMBER AS idCardNumber,
-            ENTER_REASON AS enterReason,
-            WORKER_AVATAR AS workerAvatar,
-            CREATE_TIME AS createTime,
-            WORKER_TYPE AS workerType,
-            `STATUS` AS `status`
-        FROM worker_project
-        <where>
-            <if test="ew != null">
-                ${ew.sqlSegment}
-            </if>
-        </where>
-    </select>
-
-    <select id="selectWorkerAvatars" resultType="java.lang.String">
-        SELECT
-            WORKER_AVATAR
-        FROM
-            `br_worker`
-        WHERE
-        ID IN ( SELECT WORKER_ID FROM br_project_worker WHERE PROJECT_ID = #{projectId} )
-          AND WORKER_AVATAR IS NOT NULL
-          AND WORKER_AVATAR != ''
-    </select>
-</mapper>
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IAlarmService.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IAlarmService.java
new file mode 100644
index 0000000..8bc01f4
--- /dev/null
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IAlarmService.java
@@ -0,0 +1,16 @@
+package com.casic.missiles.modular.system.service;
+
+import com.casic.missiles.modular.system.entity.Alarm;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 报警记录表 服务类
+ * </p>
+ *
+ * @author zyj
+ * @since 2023-05-25
+ */
+public interface IAlarmService extends IService<Alarm> {
+
+}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IBusAlarmService.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IBusAlarmService.java
deleted file mode 100644
index f63c19c..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IBusAlarmService.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package com.casic.missiles.modular.system.service;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.modular.system.dto.AlarmTypeCountDTO;
-import com.casic.missiles.modular.system.dto.AlarmUpload;
-import com.casic.missiles.modular.system.entity.BusAlarm;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-import java.util.List;
-
-/**
- * <p>
- * 报警记录表 服务类
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface IBusAlarmService extends IService<BusAlarm> {
-
-    boolean alarmUpload(AlarmUpload alarmUpload);
-
-    Page<BusAlarm> listPage(Page<BusAlarm> page,QueryWrapper<BusAlarm> queryWrapper);
-
-    List<AlarmTypeCountDTO> alarmCount(Long projectId,String alarmStatus);
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IBusEventImageService.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IBusEventImageService.java
deleted file mode 100644
index b1187ed..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IBusEventImageService.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.casic.missiles.modular.system.service;
-
-import com.casic.missiles.modular.system.entity.BusEventImage;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-import java.util.List;
-
-/**
- * <p>
- * 事件图片表 服务类
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface IBusEventImageService extends IService<BusEventImage> {
-
-    boolean saveBusEventImages(Long eventId, List<BusEventImage> imageList);
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IBusEventService.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IBusEventService.java
deleted file mode 100644
index 85c48d0..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IBusEventService.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package com.casic.missiles.modular.system.service;
-
-import com.casic.missiles.modular.system.entity.BusEvent;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-/**
- * <p>
- * 事件表 服务类
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface IBusEventService extends IService<BusEvent> {
-
-    boolean saveBusEvent(BusEvent busEvent);
-}

diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/AlarmController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/AlarmController.java
new file mode 100644
index 0000000..1795cf1
--- /dev/null
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/AlarmController.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.modular.system.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.stereotype.Controller;
+
+/**
+ * <p>
+ * 报警记录表 前端控制器
+ * </p>
+ *
+ * @author zyj
+ * @since 2023-05-25
+ */
+@Controller
+@RequestMapping("/system/alarm")
+public class AlarmController {
+
+}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusAlarmController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusAlarmController.java
deleted file mode 100644
index 1f82ebb..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusAlarmController.java
+++ /dev/null
@@ -1,102 +0,0 @@
-package com.casic.missiles.modular.system.controller;
-
-
-import cn.hutool.core.util.ObjectUtil;
-import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.core.base.controller.BaseController;
-import com.casic.missiles.core.page.PageFactory;
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.AlarmUpload;
-import com.casic.missiles.modular.system.dto.DeviceDetailDTO;
-import com.casic.missiles.modular.system.entity.BusAlarm;
-import com.casic.missiles.modular.system.service.IBusAlarmService;
-import io.swagger.annotations.*;
-import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.*;
-
-import org.springframework.stereotype.Controller;
-
-import static com.casic.missiles.model.response.ResponseData.DEFAULT_SUCCESS_MESSAGE;
-import static com.casic.missiles.modular.system.consts.AlarmConst.ALARM_STATUS_MANUAL_CANCEL;
-
-/**
- * <p>
- * 报警记录表 前端控制器
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@Api(tags = "报警管理接口")
-@Controller
-@RequestMapping("/alarm")
-@RequiredArgsConstructor
-public class BusAlarmController extends BaseController {
-
-    private final IBusAlarmService alarmService;
-
-    @ApiOperation("报警上报接口")
-    @PostMapping("/upload")
-    @ResponseBody
-    public Object upload(@RequestBody AlarmUpload alarmUpload){
-        alarmService.alarmUpload(alarmUpload);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("报警列表分页查询")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "workTitle", value = "作业名称",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "projectId", value = "作业ID",dataType = "Long", paramType = "query",example = "0"),
-            @ApiImplicitParam(name = "alarmStatus", value = "报警状态",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "projectState", value = "作业状态",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "alarmType", value = "报警类型",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "alarmStartTime", value = "报警开始时间",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "alarmEndTime", value = "报警结束时间",dataType = "String", paramType = "query")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = BusAlarm.class),
-    })
-    @GetMapping("/listPage")
-    @ResponseBody
-    public Object listPage(String workTitle,Long projectId,String alarmStatus,String projectState,String alarmType,String alarmStartTime,String alarmEndTime){
-        Page<BusAlarm> page = PageFactory.defaultPage();
-        QueryWrapper<BusAlarm> queryWrapper = new QueryWrapper<>();
-        if(StrUtil.isNotEmpty(workTitle)){
-            queryWrapper.like("p.WORK_TITLE",workTitle);
-        }
-        if(ObjectUtil.isNotEmpty(projectId)){
-            queryWrapper.eq("alarm.PROJECT_ID",projectId);
-        }
-        if(StrUtil.isNotEmpty(alarmStatus)){
-            queryWrapper.eq("alarm.ALARM_STATUS",alarmStatus);
-        }
-        if(StrUtil.isNotEmpty(projectState)){
-            queryWrapper.eq("p.PROJECT_STATE",projectState);
-        }
-        if(StrUtil.isNotEmpty(alarmType)){
-            queryWrapper.eq("alarm.ALARM_TYPE",alarmType);
-        }
-        if(StrUtil.isNotEmpty(alarmStartTime)){
-            queryWrapper.ge("alarm.ALARM_TIME",alarmStartTime);
-        }
-        if(StrUtil.isNotEmpty(alarmEndTime)){
-            queryWrapper.le("alarm.ALARM_TIME",alarmEndTime);
-        }
-        page = alarmService.listPage(page,queryWrapper);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-    @ApiOperation("消警")
-    @PostMapping("/cancel")
-    @ResponseBody
-    public Object cancel(@RequestParam("alarmId") Long alarmId){
-        UpdateWrapper<BusAlarm> updateWrapper = new UpdateWrapper<>();
-        updateWrapper.eq("ID",alarmId);
-        updateWrapper.set("ALARM_STATUS",ALARM_STATUS_MANUAL_CANCEL);
-        alarmService.update(updateWrapper);
-        return ResponseData.success();
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusEventController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusEventController.java
deleted file mode 100644
index dde5aad..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusEventController.java
+++ /dev/null
@@ -1,41 +0,0 @@
-package com.casic.missiles.modular.system.controller;
-
-
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.entity.BusEvent;
-import com.casic.missiles.modular.system.service.IBusEventService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.ResponseBody;
-
-/**
- * <p>
- * 事件表 前端控制器
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@Controller
-@RequestMapping("/event")
-@Api(tags = "事件上报")
-@RequiredArgsConstructor
-public class BusEventController {
-
-    private final IBusEventService eventService;
-
-    @ApiOperation("事件上报")
-    @PostMapping("add")
-    @ResponseBody
-    public Object add(@RequestBody BusEvent busEvent){
-        eventService.saveBusEvent(busEvent);
-        return ResponseData.success();
-    }
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
index 03abc5f..aa50d78 100644
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
@@ -1,121 +1,20 @@
 package com.casic.missiles.modular.system.controller;
 
 
-import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.core.base.controller.BaseController;
-import com.casic.missiles.core.page.PageFactory;
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.DeviceDetailDTO;
-import com.casic.missiles.modular.system.entity.Device;
-import com.casic.missiles.modular.system.service.IDeviceExtService;
-import com.casic.missiles.modular.system.service.IDeviceService;
-import io.swagger.annotations.*;
-import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.RequestMapping;
 
 import org.springframework.stereotype.Controller;
 
-import java.time.LocalDateTime;
-import java.util.Date;
-import java.util.List;
-
-import static com.casic.missiles.model.response.ResponseData.DEFAULT_SUCCESS_MESSAGE;
-
 /**
  * <p>
- *  前端控制器
+ * 设备记录表 前端控制器
  * </p>
  *
  * @author zyj
- * @since 2023-04-14
+ * @since 2023-05-25
  */
-@Api(tags = "设备管理接口")
-@RequiredArgsConstructor
 @Controller
-@RequestMapping("/device")
-public class DeviceController extends BaseController {
-    private final IDeviceService deviceService;
-    private final IDeviceExtService deviceExtService;
-
-    @ApiOperation("设备分页列表")
-    @ApiImplicitParams({
-        @ApiImplicitParam(name = "deviceType", value = "设备类型",dataType = "String", paramType = "query"),
-        @ApiImplicitParam(name = "deviceCode", value = "设备编号",dataType = "String", paramType = "query"),
-        @ApiImplicitParam(name = "status", value = "设备状态",dataType = "String", paramType = "query"),
-        @ApiImplicitParam(name = "projectId", value = "作业ID（如果传此参数，列表中返回该作业使用的设备）",dataType = "Long", paramType = "query", example = "0")
-    })
-    @ApiResponses({
-        @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = DeviceDetailDTO.class),
-    })
-    @GetMapping("listPage")
-    @ResponseBody
-    public Object listPage(String deviceType, String deviceCode, String status,Long projectId){
-        Page<DeviceDetailDTO> page = PageFactory.defaultPage();
-        QueryWrapper<DeviceDetailDTO> queryWrapper = new QueryWrapper<>();
-        if(StrUtil.isNotEmpty(deviceType)){
-            queryWrapper.eq("DEVICE_TYPE",deviceType);
-        }
-        if(StrUtil.isNotEmpty(deviceCode)){
-            queryWrapper.like("DEVICE_CODE",deviceCode);
-        }
-        page = deviceService.listPage(page,queryWrapper,status,projectId);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-    @ApiOperation("新增设备")
-    @PostMapping("add")
-    @ResponseBody
-    public Object add(@RequestBody DeviceDetailDTO deviceDetailDTO){
-        deviceService.saveDevice(deviceDetailDTO);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("编辑设备")
-    @PostMapping("update")
-    @ResponseBody
-    public Object update(@RequestBody DeviceDetailDTO deviceDetailDTO){
-        deviceService.updateDevice(deviceDetailDTO);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("删除设备")
-    @PostMapping("delete")
-    @ResponseBody
-    public Object delete(@ApiParam("设备id列表")@RequestBody List<Long> deviceIds){
-        deviceService.deleteDevices(deviceIds);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("设置甲烷阈值")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "gasIp", value = "安全树甲烷设备IP",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "gasPort", value = "安全树甲烷端口",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "threshold", value = "甲烷阈值",dataType = "String", paramType = "query")
-    })
-    @PostMapping("setThreshold")
-    @ResponseBody
-    public Object setThreshold(String gasIp,String gasPort,String threshold){
-        deviceExtService.setGasThreshold(gasIp, gasPort, threshold);
-        return ResponseData.success();
-    }
-
-
-    @ApiOperation("查询甲烷阈值")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "gasIp", value = "安全树甲烷设备IP",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "gasPort", value = "安全树甲烷端口",dataType = "String", paramType = "query")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = "{\"code\": 200,\"data\": \"100\",\"message\": \"请求成功\",\"success\": true}",response = String.class),
-    })
-    @GetMapping("getThreshold")
-    @ResponseBody
-    public Object getThreshold(String gasIp,String gasPort){
-        String data = deviceExtService.getGasThreshold(gasIp, gasPort);
-        return ResponseData.success(data);
-    }
-
+@RequestMapping("/system/device")
+public class DeviceController {
 
 }
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/OverviewController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/OverviewController.java
deleted file mode 100644
index 7570504..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/OverviewController.java
+++ /dev/null
@@ -1,70 +0,0 @@
-package com.casic.missiles.modular.system.controller;
-
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.AlarmTypeCountDTO;
-import com.casic.missiles.modular.system.dto.DeviceLocationDTO;
-import com.casic.missiles.modular.system.dto.WorkerLocationDTO;
-import com.casic.missiles.modular.system.service.IBusAlarmService;
-import com.casic.missiles.modular.system.service.IProjectDeviceService;
-import com.casic.missiles.modular.system.service.IProjectWorkerService;
-import io.swagger.annotations.*;
-import lombok.RequiredArgsConstructor;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.ResponseBody;
-
-import static com.casic.missiles.model.response.ResponseData.DEFAULT_SUCCESS_MESSAGE;
-import static com.casic.missiles.modular.system.consts.AlarmConst.ALARM_STATUS_ON;
-
-@Api(tags = "首页看板接口")
-@Controller
-@RequestMapping("overview")
-@RequiredArgsConstructor
-public class OverviewController {
-
-    private final IBusAlarmService alarmService;
-    private final IProjectDeviceService projectDeviceService;
-
-    private final IProjectWorkerService projectWorkerService;
-
-
-    @ApiOperation("报警统计接口")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "projectId", value = "作业ID",dataType = "Long", paramType = "query", example = "0")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = AlarmTypeCountDTO.class),
-    })
-    @GetMapping("/alarmCount")
-    @ResponseBody
-    public Object alarmCount(Long projectId){
-        return ResponseData.success(alarmService.alarmCount(projectId,ALARM_STATUS_ON));
-    }
-
-    @ApiOperation("设备列表接口")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "projectId", value = "作业ID",dataType = "Long", paramType = "query", example = "0")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = DeviceLocationDTO.class),
-    })
-    @GetMapping("/deviceList")
-    @ResponseBody
-    public Object deviceList(Long projectId){
-        return ResponseData.success(projectDeviceService.selectDeviceLocationList(projectId));
-    }
-
-    @ApiOperation("人员列表接口")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "projectId", value = "作业ID",dataType = "Long", paramType = "query", example = "0")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = WorkerLocationDTO.class),
-    })
-    @GetMapping("/workerList")
-    @ResponseBody
-    public Object workerList(Long projectId){
-        return ResponseData.success(projectWorkerService.selectWorkerLocationDTO(projectId));
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/WorkSiteInfoController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/WorkSiteInfoController.java
deleted file mode 100644
index af36d69..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/WorkSiteInfoController.java
+++ /dev/null
@@ -1,130 +0,0 @@
-package com.casic.missiles.modular.system.controller;
-
-
-import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.core.base.controller.BaseController;
-import com.casic.missiles.core.page.PageFactory;
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.WorkSiteDetailDTO;
-import com.casic.missiles.modular.system.entity.WorkSiteInfo;
-import com.casic.missiles.modular.system.service.IWorkSiteInfoService;
-import io.swagger.annotations.*;
-import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.*;
-
-import org.springframework.stereotype.Controller;
-
-import java.util.List;
-
-import static com.casic.missiles.model.response.ResponseData.DEFAULT_SUCCESS_MESSAGE;
-
-/**
- * <p>
- * 作业现场表 前端控制器
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@Controller
-@RequestMapping("/site")
-@Api(tags = "作业现场管理")
-@RequiredArgsConstructor
-public class WorkSiteInfoController extends BaseController {
-
-
-    private final IWorkSiteInfoService workSiteInfoService;
-
-    @ApiOperation("新增作业现场")
-    @PostMapping("add")
-    @ResponseBody
-    public Object addWorkSite(@RequestBody WorkSiteDetailDTO workSiteDetailDTO){
-        workSiteInfoService.addWorkSiteInfo(workSiteDetailDTO);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("编辑作业现场")
-    @PostMapping("update")
-    @ResponseBody
-    public Object updateWorkSite(@RequestBody WorkSiteDetailDTO workSiteDetailDTO){
-        workSiteInfoService.updateWorkSiteInfo(workSiteDetailDTO);
-        return ResponseData.success();
-    }
-
-
-    @ApiOperation("删除作业现场")
-    @PostMapping("delete")
-    @ResponseBody
-    public Object delete(@ApiParam("作业现场id列表")@RequestBody List<Long> projectIds){
-        workSiteInfoService.deleteProjects(projectIds);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("查询作业现场详情")
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = WorkSiteDetailDTO.class),
-    })
-    @GetMapping("detail")
-    @ResponseBody
-    public Object delete(@ApiParam(value = "作业现场id", example = "0")@RequestParam Long projectId){
-        WorkSiteDetailDTO detailDTO = workSiteInfoService.getWorkSiteDetail(projectId);
-        return ResponseData.success(detailDTO);
-    }
-
-    @ApiOperation("分页列表查询")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "workTitle",value = "作业名称", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "workRoad",value = "所属道路", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "workPersonName",value = "责任人姓名", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "startDate",value = "注册开始日期", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "endDate",value = "注册结束日期", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "projectState",value = "当前状态（字典值）", dataType = "String", paramType = "query")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = WorkSiteInfo.class),
-    })
-    @GetMapping("listPage")
-    @ResponseBody
-    public Object listPage(String workTitle,String workRoad,String workPersonName,String projectState,String startDate,String endDate){
-        Page<WorkSiteInfo> page = PageFactory.defaultPage();
-        QueryWrapper<WorkSiteInfo> queryWrapper = new QueryWrapper<>();
-        if(StrUtil.isNotEmpty(workTitle)){
-            queryWrapper.like("WORK_TITLE",workTitle);
-        }
-        if(StrUtil.isNotEmpty(workRoad)){
-            queryWrapper.like("WORK_ROAD",workRoad);
-        }
-        if(StrUtil.isNotEmpty(workPersonName)){
-            queryWrapper.like("WORKER_NAME",workPersonName);
-        }
-        if(StrUtil.isNotEmpty(projectState)){
-            queryWrapper.eq("PROJECT_STATE",projectState);
-        }
-        if(StrUtil.isNotEmpty(startDate)){
-            queryWrapper.ge("br_work_site_info.CREATE_TIME",startDate + " 00:00:00");
-        }
-        if(StrUtil.isNotEmpty(endDate)){
-            queryWrapper.le("br_work_site_info.CREATE_TIME",endDate + " 23:59:59");
-        }
-        page = workSiteInfoService.selectListPage(page,queryWrapper);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-    @ApiOperation("开始作业")
-    @PostMapping("start")
-    @ResponseBody
-    public Object start(@ApiParam(value = "作业现场id",example = "0")@RequestParam Long projectId){
-        workSiteInfoService.start(projectId);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("完成作业")
-    @PostMapping("finish")
-    @ResponseBody
-    public Object finish(@ApiParam(value = "作业现场id", example = "0")@RequestParam Long projectId){
-        workSiteInfoService.finish(projectId);
-        return ResponseData.success();
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/WorkerController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/WorkerController.java
deleted file mode 100644
index 796f94c..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/WorkerController.java
+++ /dev/null
@@ -1,136 +0,0 @@
-package com.casic.missiles.modular.system.controller;
-
-
-import cn.hutool.core.util.ObjectUtil;
-import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.core.base.controller.BaseController;
-import com.casic.missiles.core.page.PageFactory;
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.DeviceDetailDTO;
-import com.casic.missiles.modular.system.entity.Device;
-import com.casic.missiles.modular.system.entity.Worker;
-import com.casic.missiles.modular.system.service.IWorkerService;
-import io.swagger.annotations.*;
-import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.*;
-
-import org.springframework.stereotype.Controller;
-
-import java.util.Date;
-import java.util.List;
-
-import static com.casic.missiles.model.response.ResponseData.DEFAULT_SUCCESS_MESSAGE;
-
-/**
- * <p>
- *  前端控制器
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@Controller
-@RequestMapping("/worker")
-@RequiredArgsConstructor
-@Api(tags = "人员管理接口")
-public class WorkerController extends BaseController {
-
-    private final IWorkerService workerService;
-
-    @ApiOperation("分页列表查询")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "name",value = "姓名", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "deptId",value = "所属部门", dataType = "Long", paramType = "query", example = "0"),
-            @ApiImplicitParam(name = "status",value = "当前状态（字典值）", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "startDate",value = "注册开始日期", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "endDate",value = "注册结束日期", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "workerType",value = "人员类型（字典值）", dataType = "String", paramType = "query")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = Worker.class),
-    })
-    @GetMapping("listPage")
-    @ResponseBody
-    public Object listPage(String name,Long deptId, String status,String startDate,String endDate,String workerType){
-        Page<Worker> page = PageFactory.defaultPage();
-        QueryWrapper<Worker> queryWrapper = new QueryWrapper<>();
-        if(StrUtil.isNotEmpty(name)){
-            queryWrapper.like("WORKER_NAME",name);
-        }
-        if(ObjectUtil.isNotEmpty(deptId)){
-            queryWrapper.eq("DEPT_ID",deptId);
-        }
-        if(StrUtil.isNotEmpty(workerType)){
-            queryWrapper.eq("WORKER_TYPE",workerType);
-        }
-        if(StrUtil.isNotEmpty(startDate)){
-            queryWrapper.ge("CREATE_TIME",startDate + " 00:00:00");
-        }
-        if(StrUtil.isNotEmpty(endDate)){
-            queryWrapper.le("CREATE_TIME",endDate + " 23:59:59");
-        }
-        if(StrUtil.isNotEmpty(status)){
-            queryWrapper.eq("`STATUS`",status);
-        }
-        page = workerService.selectListPage(page,queryWrapper);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-    @ApiOperation("新增人员")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "worker", value = "人员信息", dataType = "Worker", paramType = "body", required = true),
-            @ApiImplicitParam(name = "projectId", value = "项目ID(入场申请需要)", dataType = "Long", paramType = "query", example = "0")
-    })
-    @PostMapping("add")
-    @ResponseBody
-    public Object add(@ApiParam("worker")@RequestBody Worker worker,
-                      @RequestParam(required = false) Long projectId){
-        workerService.addWorker(worker,projectId);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("编辑人员")
-    @PostMapping("update")
-    @ResponseBody
-    public Object update(@RequestBody Worker worker){
-        workerService.updateById(worker);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("删除人员")
-    @PostMapping("delete")
-    @ResponseBody
-    public Object delete(@ApiParam("人员id列表")@RequestBody List<Long> workIds){
-        workerService.removeByIds(workIds);
-        return ResponseData.success();
-    }
-
-
-    @ApiOperation(value = "获取人脸图片",notes = "返回人脸图片url")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "cameraIp",value = "摄像头IP", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "cameraPort",value = "摄像头端口号", dataType = "String", paramType = "query"),
-    })
-    @GetMapping("/face/register")
-    @ResponseBody
-    public Object faceRegister(String cameraIp,String cameraPort){
-        return ResponseData.success(workerService.faceRegister(cameraIp, cameraPort));
-    }
-
-
-    @ApiOperation(value = "查询临时入场人员列表")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "projectId", value = "项目ID",required = true,dataType = "Long", paramType = "query", example = "0")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = Worker.class),
-    })
-    @GetMapping("/projectTempWorker")
-    @ResponseBody
-    public Object projectTempWorker(Long projectId){
-        return ResponseData.success(workerService.projectTempWorker(projectId));
-    }
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/AlarmTypeCountDTO.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/AlarmTypeCountDTO.java
deleted file mode 100644
index 1a165a1..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/AlarmTypeCountDTO.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.casic.missiles.modular.system.dto;
-
-import io.swagger.annotations.ApiModel;
-import lombok.Data;
-
-@ApiModel(value = "AlarmTypeCountDTO",description = "报警类型统计（首页）")
-@Data
-public class AlarmTypeCountDTO {
-
-    private String alarmType;
-    private String alarmTypeName;
-    private Integer alarmCount;
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/AlarmUpload.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/AlarmUpload.java
deleted file mode 100644
index 73d7799..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/AlarmUpload.java
+++ /dev/null
@@ -1,46 +0,0 @@
-package com.casic.missiles.modular.system.dto;
-
-import cn.hutool.core.util.StrUtil;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-@ApiModel(value = "AlarmUpload",description = "报警上传")
-@Data
-public class AlarmUpload {
-
-    @ApiModelProperty(value = "摄像头ip")
-    private String cameraIp;
-
-    @ApiModelProperty(value = "摄像头端口")
-    private String cameraPort;
-    @ApiModelProperty(value = "安全树甲烷设备ip")
-    private String gasIp;
-    @ApiModelProperty(value = "安全树甲烷设备端口")
-    private String gasPort;
-    @ApiModelProperty(value = "报警值")
-    private String alarmValue;
-    @ApiModelProperty(value = "报警时间")
-    private String alarmTime;
-    @ApiModelProperty(value = "报警类型")
-    private String alarmType;
-    @ApiModelProperty(value = "报警图片")
-    private String alarmImage;
-    @ApiModelProperty(value = "报警内容")
-    private String alarmContent;
-
-    @Override
-    public String toString() {
-        return "AlarmUpload{" +
-                "cameraIp='" + cameraIp + '\'' +
-                ", cameraPort='" + cameraPort + '\'' +
-                ", gasIp='" + gasIp + '\'' +
-                ", gasPort='" + gasPort + '\'' +
-                ", alarmValue='" + alarmValue + '\'' +
-                ", alarmTime='" + alarmTime + '\'' +
-                ", alarmType='" + alarmType + '\'' +
-                ", alarmImage='" + (StrUtil.isNotEmpty(alarmImage) ? alarmImage.substring(0,50) : "null") + '\'' +
-                ", alarmContent='" + alarmContent + '\'' +
-                '}';
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/DeviceDetailDTO.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/DeviceDetailDTO.java
deleted file mode 100644
index ea518d9..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/DeviceDetailDTO.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package com.casic.missiles.modular.system.dto;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.casic.missiles.modular.system.entity.Device;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-@ApiModel("DeviceDetailDTO")
-@Data
-public class DeviceDetailDTO extends Device {
-
-    @ApiModelProperty(value = "摄像头编号")
-    private String cameraCode;
-
-    @ApiModelProperty(value = "摄像头IP")
-    private String cameraIp;
-
-    @ApiModelProperty(value = "摄像头端口")
-    private String cameraPort;
-
-    @ApiModelProperty(value = "激甲编号")
-    private String gasCode;
-
-    @ApiModelProperty(value = "激甲IP")
-    private String gasIp;
-
-    @ApiModelProperty(value = "激甲端口")
-    private String gasPort;
-
-    @ApiModelProperty(value = "智能帽衬编号")
-    private String hatLiningCode;
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/WorkSiteDetailDTO.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/WorkSiteDetailDTO.java
deleted file mode 100644
index 29378ff..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/WorkSiteDetailDTO.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package com.casic.missiles.modular.system.dto;
-
-import com.casic.missiles.modular.system.entity.ProjectDevice;
-import com.casic.missiles.modular.system.entity.ProjectWorker;
-import com.casic.missiles.modular.system.entity.WorkSiteInfo;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.util.List;
-
-@Data
-@ApiModel("WorkSiteDetailDTO")
-public class WorkSiteDetailDTO extends WorkSiteInfo {
-
-    @ApiModelProperty(value = "安全树列表",dataType = "ProjectDevice")
-    private List<ProjectDevice> deviceList;
-
-    @ApiModelProperty(value = "人员列表",dataType = "ProjectWorker")
-    private List<ProjectWorker> workerList;
-
-
-
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/WorkerLocationDTO.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/WorkerLocationDTO.java
deleted file mode 100644
index 6fd7b24..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/WorkerLocationDTO.java
+++ /dev/null
@@ -1,68 +0,0 @@
-package com.casic.missiles.modular.system.dto;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-@ApiModel(value = "WorkerLocationDTO",description = "人员位置列表（首页）")
-@Data
-public class WorkerLocationDTO {
-
-    @ApiModelProperty("人员ID")
-    private Long workerId;
-
-    @ApiModelProperty("人员姓名")
-    private String workerName;
-
-    @ApiModelProperty("安全帽编号")
-    private String hatCode;
-
-    @ApiModelProperty("安全帽ID")
-    private Long hatId;
-
-    @ApiModelProperty("背心编号")
-    private String vastCode;
-
-    @ApiModelProperty("手环编号")
-    private String braceletCode;
-
-    @ApiModelProperty("位置")
-    private String location;
-
-    @ApiModelProperty("时间")
-    private String time;
-
-    @ApiModelProperty("经度")
-    private String lng;
-
-    @ApiModelProperty("纬度")
-    private String lat;
-
-    @ApiModelProperty("心率")
-    private String heartRate;
-
-    @ApiModelProperty("血氧")
-    private String bloodOxygen;
-
-    @ApiModelProperty("一氧化碳")
-    private String co;
-
-    @ApiModelProperty("甲烷")
-    private String gas;
-
-    @ApiModelProperty("硫化氢")
-    private String h2s;
-
-    @ApiModelProperty("氧气")
-    private String o2;
-
-    @ApiModelProperty("信号")
-    private String signal;
-
-    @ApiModelProperty("电量")
-    private String cell;
-
-    @ApiModelProperty("是否报警")
-    private boolean alarmFlag;
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Alarm.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Alarm.java
new file mode 100644
index 0000000..4d2b7ef
--- /dev/null
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Alarm.java
@@ -0,0 +1,103 @@
+package com.casic.missiles.modular.system.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import java.util.Date;
+
+/**
+ * <p>
+ * 报警记录表
+ * </p>
+ *
+ * @author zyj
+ * @since 2023-05-25
+ */
+@Data
+@TableName("bus_alarm")
+public class Alarm implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    @TableId(value = "ID",type = IdType.ASSIGN_ID)
+    private Long id;
+
+    /**
+     * 设备ID
+     */
+    @TableField("DEVICE_ID")
+    private Long deviceId;
+
+    /**
+     * 报警类型
+     */
+    @TableField("ALARM_TYPE")
+    private String alarmType;
+
+    /**
+     * 报警时间
+     */
+    @TableField("ALARM_TIME")
+    private Date alarmTime;
+
+    /**
+     * 报警状态
+     */
+    @TableField("ALARM_STATUS")
+    private String alarmStatus;
+
+    /**
+     * 报警位置
+     */
+    @TableField("ALARM_LOCATION")
+    private String alarmLocation;
+
+    /**
+     * 报警图片
+     */
+    @TableField("ALARM_IMAGE")
+    private String alarmImage;
+
+    /**
+     * 视频通道号
+     */
+    @TableField("CHANNEL_NO")
+    private Integer channelNo;
+
+    /**
+     * 报警内容
+     */
+    @TableField("ALARM_CONTENT")
+    private String alarmContent;
+
+    /**
+     * 消警时间
+     */
+    @TableField("CANCEL_TIME")
+    private Date cancelTime;
+
+
+    @Override
+    public String toString() {
+        return "Alarm{" +
+            "id=" + id +
+            ", deviceId=" + deviceId +
+            ", alarmType=" + alarmType +
+            ", alarmTime=" + alarmTime +
+            ", alarmStatus=" + alarmStatus +
+            ", alarmLocation=" + alarmLocation +
+            ", alarmImage=" + alarmImage +
+            ", channelNo=" + channelNo +
+            ", alarmContent=" + alarmContent +
+            ", cancelTime=" + cancelTime +
+        "}";
+    }
+}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusAlarm.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusAlarm.java
deleted file mode 100644
index efb4a23..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusAlarm.java
+++ /dev/null
@@ -1,159 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.alibaba.fastjson.annotation.JSONField;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.time.LocalDateTime;
-import java.util.Date;
-
-/**
- * <p>
- * 报警记录表
- * </p>
- *
- * @author zyj
- * @since 2023-05-16
- */
-@Data
-@ApiModel("Alarm")
-@TableName("br_bus_alarm")
-public class BusAlarm implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 项目ID
-     */
-    @ApiModelProperty(value = "项目ID")
-    @TableField("PROJECT_ID")
-    private Long projectId;
-
-    /**
-     * 设备ID
-     */
-    @ApiModelProperty(value = "设备ID")
-    @TableField("DEVICE_ID")
-    private Long deviceId;
-
-    /**
-     * 报警类型
-     */
-    @ApiModelProperty(value = "报警类型")
-    @TableField("ALARM_TYPE")
-    private String alarmType;
-
-    /**
-     * 报警状态
-     */
-    @ApiModelProperty(value = "报警状态")
-    @TableField("ALARM_STATUS")
-    private String alarmStatus;
-
-    /**
-     * 报警值
-     */
-    @ApiModelProperty(value = "报警值")
-    @TableField("ALARM_VALUE")
-    private String alarmValue;
-
-    /**
-     * 报警图片
-     */
-    @ApiModelProperty(value = "报警图片")
-    @TableField("ALARM_IMAGE")
-    private String alarmImage;
-
-    /**
-     * 报警内容
-     */
-    @ApiModelProperty(value = "报警内容")
-    @TableField("ALARM_CONTENT")
-    private String alarmContent;
-
-    /**
-     * 报警时间
-     */
-    @ApiModelProperty(value = "报警时间")
-    @TableField("ALARM_TIME")
-    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
-    private Date alarmTime;
-
-    /**
-     * 消警时间
-     */
-    @ApiModelProperty(value = "消警时间")
-    @TableField("CANCEL_TIME")
-    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
-    private Date cancelTime;
-
-    /**
-     * 报警位置经度
-     */
-    @ApiModelProperty(value = "报警位置经度")
-    @TableField("ALARM_LNG")
-    private String alarmLng;
-
-    /**
-     * 报警位置纬度
-     */
-    @ApiModelProperty(value = "报警位置纬度")
-    @TableField("ALARM_LAT")
-    private String alarmLat;
-
-    @ApiModelProperty("报警类型名称")
-    @TableField(exist = false)
-    private String alarmStatusName;
-    @ApiModelProperty("报警类型名称")
-    @TableField(exist = false)
-    private String alarmTypeName;
-    @ApiModelProperty("作业名称")
-    @TableField(exist = false)
-    private String workTitle;
-    @ApiModelProperty("所属道路")
-    @TableField(exist = false)
-    private String workRoad;
-    @ApiModelProperty("作业状态")
-    @TableField(exist = false)
-    private String projectState;
-    @ApiModelProperty("作业状态名称")
-    @TableField(exist = false)
-    private String projectStateName;
-    @ApiModelProperty("负责人姓名")
-    @TableField(exist = false)
-    private String workPersonName;
-    @ApiModelProperty("负责人联系方式")
-    @TableField(exist = false)
-    private String workPersonPhoneNumber;
-
-
-    @Override
-    public String toString() {
-        return "BusAlarm{" +
-                "id=" + id +
-                ", projectId=" + projectId +
-                ", deviceId=" + deviceId +
-                ", alarmType=" + alarmType +
-                ", alarmValue=" + alarmValue +
-                ", alarmStatus=" + alarmStatus +
-                ", alarmImage=" + alarmImage +
-                ", alarmContent=" + alarmContent +
-                ", alarmTime=" + alarmTime +
-                ", cancelTime=" + cancelTime +
-                ", alarmLng=" + alarmLng +
-                ", alarmLat=" + alarmLat +
-                "}";
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusEvent.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusEvent.java
deleted file mode 100644
index a0b7543..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusEvent.java
+++ /dev/null
@@ -1,100 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.time.LocalDateTime;
-import java.util.Date;
-import java.util.List;
-
-/**
- * <p>
- * 事件表
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@TableName("br_bus_event")
-@Data
-@ApiModel("BusEvent")
-public class BusEvent implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @ApiModelProperty("事件ID")
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 事件标题
-     */
-    @ApiModelProperty("事件名称")
-    @TableField("EVENT_TITLE")
-    private String eventTitle;
-
-    /**
-     * 上报人员
-     */
-    @ApiModelProperty("上报人员")
-    @TableField("UPLOAD_NAME")
-    private String uploadName;
-
-    /**
-     * 联系方式
-     */
-    @ApiModelProperty("联系方式")
-    @TableField("PHONE_NUMBER")
-    private String phoneNumber;
-
-    /**
-     * 事件描述
-     */
-    @ApiModelProperty("事件描述")
-    @TableField("EVENT_DESCRIPTION")
-    private String eventDescription;
-
-    @ApiModelProperty("经度")
-    @TableField("LNG")
-    private String lng;
-
-    @ApiModelProperty("纬度")
-    @TableField("LAT")
-    private String lat;
-
-    /**
-     * 事件上传时间
-     */
-    @ApiModelProperty("事件上传时间")
-    @TableField("CREATE_TIME")
-    private Date createTime;
-
-    @ApiModelProperty("事件照片")
-    @TableField(exist = false)
-    private List<BusEventImage> imageList;
-
-
-
-    @Override
-    public String toString() {
-        return "BusEvent{" +
-            "id=" + id +
-            ", eventTitle=" + eventTitle +
-            ", uploadName=" + uploadName +
-            ", phoneNumber=" + phoneNumber +
-            ", eventDescription=" + eventDescription +
-            ", lng=" + lng +
-            ", lat=" + lat +
-            ", createTime=" + createTime +
-        "}";
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusEventImage.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusEventImage.java
deleted file mode 100644
index 1e75245..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusEventImage.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-
-/**
- * <p>
- * 事件图片表
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@TableName("br_bus_event_image")
-@Data
-@ApiModel("BusEventImage")
-public class BusEventImage implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 事件ID
-     */
-    @TableField("EVENT_ID")
-    private Long eventId;
-
-    /**
-     * 报警图片
-     */
-    @TableField("IMAGE")
-    @ApiModelProperty("图片url")
-    private String image;
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Device.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Device.java
index df89c70..ea7db5f 100644
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Device.java
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Device.java
@@ -1,30 +1,23 @@
 package com.casic.missiles.modular.system.entity;
 
-import com.alibaba.fastjson.annotation.JSONField;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.casic.missiles.core.base.json.DateDeserializer;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
-import java.util.Date;
 
 /**
  * <p>
- * 
+ * 设备记录表
  * </p>
  *
  * @author zyj
- * @since 2023-04-14
+ * @since 2023-05-25
  */
-@ApiModel("Device")
-@TableName("br_device")
 @Data
+@TableName("bus_device")
 public class Device implements Serializable {
 
     private static final long serialVersionUID = 1L;
@@ -32,82 +25,86 @@
     /**
      * 主键
      */
-    @ApiModelProperty(value = "设备ID")
     @TableId(value = "ID",type = IdType.ASSIGN_ID)
     private Long id;
 
     /**
-     * 设备编号
+     * 设备名称
      */
-    @ApiModelProperty(value = "设备编号")
-    @TableField("DEVICE_CODE")
-    private String deviceCode;
+    @TableField("DEVICE_NAME")
+    private String deviceName;
 
     /**
-     * 设备类型
+     * IP
      */
-    @ApiModelProperty(value = "设备类型")
-    @TableField("DEVICE_TYPE")
-    private String deviceType;
+    @TableField("IP")
+    private String ip;
 
     /**
-     * 设备批次
+     * 端口
      */
-    @ApiModelProperty(value = "设备批次")
-    @TableField("DEVICE_BATCH")
-    private String deviceBatch;
+    @TableField("PORT")
+    private String port;
 
     /**
-     * 厂家
+     * 用户名
      */
-    @ApiModelProperty(value = "厂家")
-    @TableField("MANUFACTURER")
-    private String manufacturer;
+    @TableField("USER_NAME")
+    private String userName;
 
     /**
-     * 是否供电
+     * 密码
      */
-    @ApiModelProperty(value = "是否供电")
-    @TableField("IS_POWER_SUPPLY")
-    private String isPowerSupply;
+    @TableField("PASSWORD")
+    private String password;
 
     /**
-     * 创建时间
+     * 连接类型
      */
-    @ApiModelProperty(value = "创建时间",dataType = "Date")
-    @TableField("CREATE_TIME")
-    private Date createTime;
+    @TableField("CONNECT_TYPE")
+    private String connectType;
 
-    @ApiModelProperty(value = "设备类型名称")
-    @TableField(exist = false)
-    private String deviceTypeName;
+    /**
+     * 位置
+     */
+    @TableField("LOCATION")
 
-    @ApiModelProperty(value = "是否供电名称")
-    @TableField(exist = false)
-    private String isPowerSupplyName;
+    private String location;
 
-    @ApiModelProperty(value = "注册时间",dataType = "String")
-    @TableField(exist = false)
-    private String registerTime;
+    /**
+     * 设备状态
+     */
+    @TableField("STATUS")
 
-    @ApiModelProperty(value = "当前状态")
-    @TableField(exist = false)
     private String status;
 
-    @ApiModelProperty(value = "当前状态名称")
-    @TableField(exist = false)
-    private String statusName;
+    /**
+     * 报警分组
+     */
+    @TableField("ALARM_GROUP")
+
+    private Long alarmGroup;
+
+    /**
+     * 视频通道数(预留)
+     */
+    @TableField("CHANNEL_NUM")
+    private Integer channelNum;
 
     @Override
     public String toString() {
         return "Device{" +
             "id=" + id +
-            ", deviceCode=" + deviceCode +
-            ", deviceType=" + deviceType +
-            ", deviceBatch=" + deviceBatch +
-            ", manufacturer=" + manufacturer +
-            ", isPowerSupply=" + isPowerSupply +
-            ", createTime=" + createTime +
+            ", deviceName=" + deviceName +
+            ", ip=" + ip +
+            ", port=" + port +
+            ", userName=" + userName +
+            ", password=" + password +
+            ", connectType=" + connectType +
+            ", location=" + location +
+            ", status=" + status +
+            ", alarmGroup=" + alarmGroup +
+            ", channelNum=" + channelNum +
         "}";
     }
 }
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/DeviceExt.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/DeviceExt.java
deleted file mode 100644
index 5ee7015..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/DeviceExt.java
+++ /dev/null
@@ -1,99 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-
-/**
- * <p>
- * 设备扩展信息表（安全树）
- * </p>
- *
- * @author zyj
- * @since 2023-04-27
- */
-@Data
-@TableName("br_device_ext")
-public class DeviceExt implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 设备ID
-     */
-    @TableField("DEVICE_ID")
-    private Long deviceId;
-
-    /**
-     * 摄像头编号
-     */
-    @TableField("CAMERA_CODE")
-    private String cameraCode;
-
-    /**
-     * 摄像头IP
-     */
-    @TableField("CAMERA_IP")
-    private String cameraIp;
-
-    /**
-     * 摄像头端口
-     */
-    @TableField("CAMERA_PORT")
-    private String cameraPort;
-
-    /**
-     * 激甲编号
-     */
-    @TableField("GAS_CODE")
-    private String gasCode;
-
-    /**
-     * 激甲IP
-     */
-    @TableField("GAS_IP")
-    private String gasIp;
-
-    /**
-     * 激甲端口
-     */
-    @TableField("GAS_PORT")
-    private String gasPort;
-
-    /**
-     * 甲烷报警阈值
-     */
-    @TableField("GAS_THRESHOLD")
-    private String gasThreshold;
-
-    @TableField(value = "HAT_LINING_CODE")
-    private String hatLiningCode;
-
-
-    @Override
-    public String toString() {
-        return "DeviceExt{" +
-            "id=" + id +
-            ", deviceId=" + deviceId +
-            ", cameraCode=" + cameraCode +
-            ", cameraIp=" + cameraIp +
-            ", cameraPort=" + cameraPort +
-            ", gasCode=" + gasCode +
-            ", gasIp=" + gasIp +
-            ", gasPort=" + gasPort +
-            ", gasThreshold=" + gasThreshold +
-            ", hatLiningCode=" + hatLiningCode +
-        "}";
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/ProjectDevice.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/ProjectDevice.java
deleted file mode 100644
index c4f3472..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/ProjectDevice.java
+++ /dev/null
@@ -1,62 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-
-/**
- * <p>
- * 
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@Data
-@ApiModel("ProjectDevice")
-@TableName("br_project_device")
-public class ProjectDevice implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 作业现场ID
-     */
-    @TableField("PROJECT_ID")
-    private Long projectId;
-
-    /**
-     * 设备ID
-     */
-    @TableField("DEVICE_ID")
-    @ApiModelProperty("设备ID（新增编辑时传）")
-    private Long deviceId;
-
-    /**
-     * 设备编号
-     */
-    @TableField(exist = false)
-    @ApiModelProperty("设备编号（详情中展示，新增编辑不用传）")
-    private String deviceCode;
-
-    @Override
-    public String toString() {
-        return "ProjectDevice{" +
-            "id=" + id +
-            ", projectId=" + projectId +
-            ", deviceId=" + deviceId +
-        "}";
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/ProjectWorker.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/ProjectWorker.java
deleted file mode 100644
index 10b23c4..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/ProjectWorker.java
+++ /dev/null
@@ -1,104 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import java.io.Serializable;
-
-/**
- * <p>
- * 
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@ApiModel("ProjectWorker")
-@TableName("br_project_worker")
-@Data
-@NoArgsConstructor
-@AllArgsConstructor
-public class ProjectWorker implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 作业现场ID
-     */
-    @TableField("PROJECT_ID")
-    private Long projectId;
-
-    /**
-     * 人员ID
-     */
-    @ApiModelProperty("人员ID")
-    @TableField("WORKER_ID")
-    private Long workerId;
-
-    /**
-     * 安全帽编号
-     */
-    @ApiModelProperty("安全帽编号")
-    @TableField("HAT_CODE")
-    private String hatCode;
-
-    /**
-     * 背心编号
-     */
-    @ApiModelProperty("背心编号")
-    @TableField("VAST_CODE")
-    private String vastCode;
-
-    /**
-     * 手环编号
-     */
-    @ApiModelProperty("手环编号")
-    @TableField("BRACELET_CODE")
-    private String braceletCode;
-
-    @ApiModelProperty("人员姓名（详情中展示，新增编辑不用传）")
-    @TableField(exist = false)
-    private String workerName;
-
-    @ApiModelProperty("人员部门ID（详情中展示，新增编辑不用传）")
-    @TableField(exist = false)
-    private String workerDeptId;
-
-    @ApiModelProperty("人员部门名称（详情中展示，新增编辑不用传）")
-    @TableField(exist = false)
-    private String workerDeptName;
-
-    @ApiModelProperty("人员联系方式（详情中展示，新增编辑不用传）")
-    @TableField(exist = false)
-    private String workerPhoneNumber;
-
-    public ProjectWorker(Long projectId, Long workerId) {
-        this.projectId = projectId;
-        this.workerId = workerId;
-    }
-
-    @Override
-    public String toString() {
-        return "ProjectWorker{" +
-            "id=" + id +
-            ", projectId=" + projectId +
-            ", workerId=" + workerId +
-            ", hatCode=" + hatCode +
-            ", vastCode=" + vastCode +
-            ", braceletCode=" + braceletCode +
-        "}";
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/WorkSiteInfo.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/WorkSiteInfo.java
deleted file mode 100644
index fa6f41d..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/WorkSiteInfo.java
+++ /dev/null
@@ -1,130 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.alibaba.fastjson.annotation.JSONField;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.time.LocalDateTime;
-import java.util.Date;
-
-/**
- * <p>
- * 作业现场表
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@ApiModel("WorkSiteInfo")
-@TableName("br_work_site_info")
-@Data
-public class WorkSiteInfo implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @ApiModelProperty("作业现场ID")
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 作业名称
-     */
-    @ApiModelProperty("作业名称")
-    @TableField("WORK_TITLE")
-    private String workTitle;
-
-    /**
-     * 责任人
-     */
-    @ApiModelProperty("责任人（人员ID）")
-    @TableField("WORK_PERSON")
-    private Long workPerson;
-
-    /**
-     * 作业描述
-     */
-    @ApiModelProperty("作业描述")
-    @TableField("WORK_SITE_DESC")
-    private String workSiteDesc;
-
-    /**
-     * 作业状态
-     */
-    @ApiModelProperty("作业状态")
-    @TableField("PROJECT_STATE")
-    private String projectState;
-
-    /**
-     * 所属道路
-     */
-    @ApiModelProperty("所属道路")
-    @TableField("WORK_ROAD")
-    private String workRoad;
-
-    @TableField("IMAGE_URL")
-    private String imageUrl;
-
-    @TableField("CREATE_TIME")
-    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
-    private Date createTime;
-    @TableField("UPDATE_TIME")
-    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
-    private Date updateTime;
-
-    @ApiModelProperty("开始时间")
-    @TableField("START_TIME")
-    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
-    private Date startTime;
-
-    @ApiModelProperty("结束时间")
-    @TableField("FINISH_TIME")
-    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
-    private Date finishTime;
-
-    @ApiModelProperty("负责人姓名（详情中使用，新增编辑不用传）")
-    @TableField(exist = false)
-    private String workPersonName;
-
-    @ApiModelProperty("负责人联系方式（详情中使用，新增编辑不用传）")
-    @TableField(exist = false)
-    private String workPersonPhoneNumber;
-
-    @ApiModelProperty("负责人所属部门ID（详情中使用，新增编辑不用传）")
-    @TableField(exist = false)
-    private Long workPersonDeptId;
-
-    @ApiModelProperty("负责人所属部门名称（详情中使用，新增编辑不用传）")
-    @TableField(exist = false)
-    private String workPersonDeptName;
-
-    @ApiModelProperty(value = "注册时间",dataType = "String")
-    @TableField(exist = false)
-    private String registerTime;
-
-    @ApiModelProperty("作业状态名称")
-    @TableField(exist = false)
-    private String projectStateName;
-
-    @Override
-    public String toString() {
-        return "WorkSiteInfo{" +
-            "id=" + id +
-            ", workTitle=" + workTitle +
-            ", workPerson=" + workPerson +
-            ", workSiteDesc=" + workSiteDesc +
-            ", projectState=" + projectState +
-            ", imageUrl=" + imageUrl +
-            ", updateTime=" + updateTime +
-            ", workRoad=" + workRoad +
-        "}";
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Worker.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Worker.java
deleted file mode 100644
index 28a4daa..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Worker.java
+++ /dev/null
@@ -1,147 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.time.LocalDateTime;
-import java.util.Date;
-
-/**
- * <p>
- * 
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@ApiModel("Worker")
-@TableName("br_worker")
-@Data
-public class Worker implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @ApiModelProperty(value = "人员ID")
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 姓名
-     */
-    @ApiModelProperty(value = "姓名")
-    @TableField("WORKER_NAME")
-    private String workerName;
-
-    /**
-     * 性别
-     */
-    @ApiModelProperty(value = "性别")
-    @TableField("GENDER")
-    private String gender;
-
-    /**
-     * 所属部门
-     */
-    @ApiModelProperty(value = "所属部门(人员管理)")
-    @TableField("DEPT_ID")
-    private Long deptId;
-
-    /**
-     * 所属单位
-     */
-    @ApiModelProperty(value = "所属单位(入场申请中使用)")
-    @TableField("OWNER_SHIP")
-    private String ownerShip;
-
-    /**
-     * 联系方式
-     */
-    @ApiModelProperty(value = "联系方式")
-    @TableField("PHONE_NUMBER")
-    private String phoneNumber;
-
-    /**
-     * 证件号
-     */
-    @ApiModelProperty(value = "证件号")
-    @TableField("ID_CARD_NUMBER")
-    private String idCardNumber;
-
-    /**
-     * 入场原因
-     */
-    @ApiModelProperty(value = "入场原因（入场申请中使用）")
-    @TableField("ENTER_REASON")
-    private String enterReason;
-
-    /**
-     * 入场人脸照片
-     */
-    @ApiModelProperty(value = "人脸照片（照片路径）")
-    @TableField("WORKER_AVATAR")
-    private String workerAvatar;
-
-    /**
-     * 申请入场时间
-     */
-    @ApiModelProperty(value = "注册时间/申请入场时间")
-    @TableField("CREATE_TIME")
-    private Date createTime;
-
-    /**
-     * 人员类型
-     */
-    @ApiModelProperty(value = "人员类型（区分人员管理和入场申请）")
-    @TableField("WORKER_TYPE")
-    private String workerType;
-
-    @ApiModelProperty(value = "性别名称")
-    @TableField(exist = false)
-    private String genderName;
-
-    @ApiModelProperty(value = "部门名称")
-    @TableField(exist = false)
-    private String deptName;
-
-    @ApiModelProperty(value = "注册时间",dataType = "String")
-    @TableField(exist = false)
-    private String registerTime;
-
-    @ApiModelProperty(value = "当前状态")
-    @TableField(exist = false)
-    private String status;
-
-    @ApiModelProperty(value = "当前状态名称")
-    @TableField(exist = false)
-    private String statusName;
-
-    @ApiModelProperty(value = "是否注册(0未注册；1已注册)",allowableValues = "0,1")
-    @TableField(exist = false)
-    private String isRegister;
-
-    @Override
-    public String toString() {
-        return "Worker{" +
-            "id=" + id +
-            ", workerName=" + workerName +
-            ", gender=" + gender +
-            ", deptId=" + deptId +
-            ", ownerShip=" + ownerShip +
-            ", phoneNumber=" + phoneNumber +
-            ", idCardNumber=" + idCardNumber +
-            ", enterReason=" + enterReason +
-            ", workerAvatar=" + workerAvatar +
-            ", createTime=" + createTime +
-            ", workerType=" + workerType +
-        "}";
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/AlarmMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/AlarmMapper.java
new file mode 100644
index 0000000..ea4c8be
--- /dev/null
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/AlarmMapper.java
@@ -0,0 +1,16 @@
+package com.casic.missiles.modular.system.mapper;
+
+import com.casic.missiles.modular.system.entity.Alarm;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 报警记录表 Mapper 接口
+ * </p>
+ *
+ * @author zyj
+ * @since 2023-05-25
+ */
+public interface AlarmMapper extends BaseMapper<Alarm> {
+
+}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/BusAlarmMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/BusAlarmMapper.java
deleted file mode 100644
index 9801742..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/BusAlarmMapper.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package com.casic.missiles.modular.system.mapper;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.modular.system.dto.AlarmTypeCountDTO;
-import com.casic.missiles.modular.system.entity.BusAlarm;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * <p>
- * 报警记录表 Mapper 接口
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface BusAlarmMapper extends BaseMapper<BusAlarm> {
-
-    Page<BusAlarm> listPage(Page<BusAlarm> page,@Param("ew")  QueryWrapper<BusAlarm> queryWrapper);
-
-    void cancelAlarm(@Param("deviceId")Long deviceId,@Param("alarmType") String alarmType);
-
-    List<AlarmTypeCountDTO> alarmCount(@Param("projectId")Long projectId, @Param("alarmStatus")String alarmStatus);
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/BusEventImageMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/BusEventImageMapper.java
deleted file mode 100644
index 9590b7d..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/BusEventImageMapper.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.casic.missiles.modular.system.mapper;
-
-import com.casic.missiles.modular.system.entity.BusEventImage;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * <p>
- * 事件图片表 Mapper 接口
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface BusEventImageMapper extends BaseMapper<BusEventImage> {
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/BusEventMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/BusEventMapper.java
deleted file mode 100644
index 3c85edf..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/BusEventMapper.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.casic.missiles.modular.system.mapper;
-
-import com.casic.missiles.modular.system.entity.BusEvent;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * <p>
- * 事件表 Mapper 接口
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface BusEventMapper extends BaseMapper<BusEvent> {
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/DeviceExtMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/DeviceExtMapper.java
deleted file mode 100644
index 4ca9212..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/DeviceExtMapper.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.casic.missiles.modular.system.mapper;
-
-import com.casic.missiles.modular.system.entity.DeviceExt;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * <p>
- * 设备扩展信息表（安全树） Mapper 接口
- * </p>
- *
- * @author zyj
- * @since 2023-04-27
- */
-public interface DeviceExtMapper extends BaseMapper<DeviceExt> {
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/DeviceMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/DeviceMapper.java
index 444c0c5..3d0bb02 100644
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/DeviceMapper.java
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/DeviceMapper.java
@@ -1,30 +1,16 @@
 package com.casic.missiles.modular.system.mapper;
 
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.modular.system.dto.DeviceDetailDTO;
-import com.casic.missiles.modular.system.dto.HelmetInfoDTO;
 import com.casic.missiles.modular.system.entity.Device;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
 
 /**
  * <p>
- *  Mapper 接口
+ * 设备记录表 Mapper 接口
  * </p>
  *
  * @author zyj
- * @since 2023-04-14
+ * @since 2023-05-25
  */
-@Mapper
 public interface DeviceMapper extends BaseMapper<Device> {
 
-    Page<DeviceDetailDTO> listDetailPage(Page<DeviceDetailDTO> page,@Param("ew") QueryWrapper<DeviceDetailDTO> ew);
-
-     List<Long> selectProjectDevice(@Param("projectId") Long projectId);
-
-    List<HelmetInfoDTO> selectHelmetList(@Param("deviceType")String deviceType);
 }
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/ProjectDeviceMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/ProjectDeviceMapper.java
deleted file mode 100644
index 1d0c14e..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/ProjectDeviceMapper.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package com.casic.missiles.modular.system.mapper;
-
-import com.casic.missiles.modular.system.dto.DeviceLocationDTO;
-import com.casic.missiles.modular.system.entity.ProjectDevice;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * <p>
- *  Mapper 接口
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface ProjectDeviceMapper extends BaseMapper<ProjectDevice> {
-     List<ProjectDevice> selectDetailByProjectId(@Param("projectId") Long projectId);
-
-     List<DeviceLocationDTO> selectDeviceLocationList(@Param("projectId") Long projectId);
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/ProjectWorkerMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/ProjectWorkerMapper.java
deleted file mode 100644
index 58583d1..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/ProjectWorkerMapper.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package com.casic.missiles.modular.system.mapper;
-
-import com.casic.missiles.modular.system.dto.WorkerLocationDTO;
-import com.casic.missiles.modular.system.entity.ProjectWorker;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * <p>
- *  Mapper 接口
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface ProjectWorkerMapper extends BaseMapper<ProjectWorker> {
-
-    List<ProjectWorker> selectDetailByProjectId(@Param("projectId") Long projectId,
-                                                @Param("workerType")String workerType);
-
-    List<WorkerLocationDTO> selectWorkerLocationList(@Param("projectId") Long projectId,
-                                                     @Param("workerType")String workerType);
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/WorkSiteInfoMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/WorkSiteInfoMapper.java
deleted file mode 100644
index a4934d2..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/WorkSiteInfoMapper.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.casic.missiles.modular.system.mapper;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.modular.system.entity.WorkSiteInfo;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Param;
-
-/**
- * <p>
- * 作业现场表 Mapper 接口
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface WorkSiteInfoMapper extends BaseMapper<WorkSiteInfo> {
-
-    Page<WorkSiteInfo> selectListPage(Page<WorkSiteInfo> page,@Param("ew") QueryWrapper<WorkSiteInfo> ew);
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/WorkerMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/WorkerMapper.java
deleted file mode 100644
index 258fb12..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/WorkerMapper.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package com.casic.missiles.modular.system.mapper;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.modular.system.dto.DeviceDetailDTO;
-import com.casic.missiles.modular.system.entity.Worker;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * <p>
- *  Mapper 接口
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface WorkerMapper extends BaseMapper<Worker> {
-
-
-    Page<Worker> selectListPage(Page<Worker> page, @Param("ew") QueryWrapper<Worker> ew);
-
-    List<String> selectWorkerAvatars(@Param("projectId")Long projectId);
-
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/AlarmMapper.xml b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/AlarmMapper.xml
new file mode 100644
index 0000000..25cb4ab
--- /dev/null
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/AlarmMapper.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.modular.system.mapper.AlarmMapper">
+
+</mapper>
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/BusAlarmMapper.xml b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/BusAlarmMapper.xml
deleted file mode 100644
index 595088a..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/BusAlarmMapper.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.casic.missiles.modular.system.mapper.BusAlarmMapper">
-
-    <select id="listPage" resultType="com.casic.missiles.modular.system.entity.BusAlarm">
-        SELECT
-            alarm.ID as id,
-            alarm.DEVICE_ID as deviceId,
-            alarm.PROJECT_ID as projectId,
-            alarm.ALARM_TYPE as alarmType,
-            alarm.ALARM_VALUE as alarmValue,
-            alarm.ALARM_STATUS as alarmStatus,
-            alarm.ALARM_IMAGE AS alarmImage,
-            alarm.ALARM_CONTENT as alarmContent,
-            alarm.ALARM_TIME as alarmTime,
-            alarm.CANCEL_TIME as cancelTime,
-            alarm.ALARM_LNG as alarmLng,
-            alarm.ALARM_LAT as alarmLat,
-            p.WORK_TITLE as workTitle,
-            p.WORK_ROAD as workRoad,
-            p.PROJECT_STATE as projectState,
-            w.WORKER_NAME as workPersonName,
-            w.PHONE_NUMBER as workPersonPhoneNumber
-        FROM
-            `br_bus_alarm` alarm
-                LEFT JOIN br_work_site_info p on alarm.PROJECT_ID = p.ID
-                LEFT JOIN br_worker w on p.WORK_PERSON = w.ID
-        <where>
-            <if test="ew != null">
-                ${ew.sqlSegment}
-            </if>
-        </where>
-    </select>
-
-    <select id="cancelAlarm">
-        update br_bus_alarm
-        set ALARM_STATUS = '1'
-        where DEVICE_ID = #{deviceId}
-          and ALARM_TYPE = #{alarmType}
-          and ALARM_STATUS = '0'
-    </select>
-
-    <select id="alarmCount" resultType="com.casic.missiles.modular.system.dto.AlarmTypeCountDTO">
-        SELECT
-            ALARM_TYPE as alarmType,
-            count(*) as alarmCount
-        from br_bus_alarm
-        <where>
-            <if test="projectId != null and projectId !=''">
-                and PROJECT_ID = #{projectId}
-            </if>
-            <if test="alarmStatus != null and alarmStatus !=''">
-                and ALARM_STATUS = #{alarmStatus}
-            </if>
-        </where>
-        group by ALARM_TYPE
-    </select>
-</mapper>
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/BusEventImageMapper.xml b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/BusEventImageMapper.xml
deleted file mode 100644
index fbc3db3..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/BusEventImageMapper.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.casic.missiles.modular.system.mapper.BusEventImageMapper">
-
-</mapper>
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/BusEventMapper.xml b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/BusEventMapper.xml
deleted file mode 100644
index 627d573..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/BusEventMapper.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.casic.missiles.modular.system.mapper.BusEventMapper">
-
-</mapper>
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/DeviceExtMapper.xml b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/DeviceExtMapper.xml
deleted file mode 100644
index 5321d1c..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/DeviceExtMapper.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.casic.missiles.modular.system.mapper.DeviceExtMapper">
-
-</mapper>
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/DeviceMapper.xml b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/DeviceMapper.xml
index 94262e1..88e7d01 100644
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/DeviceMapper.xml
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/DeviceMapper.xml
@@ -2,96 +2,4 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.casic.missiles.modular.system.mapper.DeviceMapper">
 
-    <select id="listDetailPage" resultType="com.casic.missiles.modular.system.dto.DeviceDetailDTO">
-        select
-        br_device.ID as id,
-        DEVICE_CODE as deviceCode,
-        DEVICE_TYPE as deviceType,
-        DEVICE_BATCH as deviceBatch,
-        MANUFACTURER as manufacturer,
-        IS_POWER_SUPPLY as isPowerSupply,
-        CREATE_TIME as createTime,
-        CAMERA_CODE as cameraCode,
-        CAMERA_IP as cameraIp,
-        CAMERA_PORT as cameraPort,
-        GAS_CODE as gasCode,
-        GAS_IP as gasIp,
-        GAS_PORT as gasPort,
-        HAT_LINING_CODE as hatLiningCode
-        from br_device
-        left join br_device_ext ext on ext.DEVICE_ID = br_device.ID
-        <where>
-            <if test="ew != null">
-                ${ew.sqlSegment}
-            </if>
-        </where>
-    </select>
-
-    <select id="selectProjectDevice" resultType="java.lang.Long">
-        with device_info as (
-            (SELECT
-            d.DEVICE_ID as DEVICE_ID,
-            d.PROJECT_ID as PROJECT_ID,
-            p.PROJECT_STATE as PROJECT_STATE
-            from br_project_device d
-            LEFT JOIN br_work_site_info p on p.ID = d.PROJECT_ID)
-
-            UNION ALL
-
-            (SELECT
-            d1.ID as DEVICE_ID,
-            w1.ID as PROJECT_ID,
-            w1.PROJECT_STATE as PROJECT_STATE
-            FROM br_project_worker pw1
-            LEFT JOIN br_device d1 on pw1.BRACELET_CODE = d1.DEVICE_CODE
-            LEFT JOIN br_work_site_info w1 on pw1.PROJECT_ID = w1.ID)
-
-            UNION ALL
-
-            (SELECT
-            d1.ID as DEVICE_ID,
-            w1.ID as PROJECT_ID,
-            w1.PROJECT_STATE as PROJECT_STATE
-            FROM br_project_worker pw1
-            LEFT JOIN br_device d1 on pw1.HAT_CODE = d1.DEVICE_CODE
-            LEFT JOIN br_work_site_info w1 on pw1.PROJECT_ID = w1.ID)
-
-
-            UNION ALL
-
-            (SELECT
-            d1.ID as DEVICE_ID,
-            w1.ID as PROJECT_ID,
-            w1.PROJECT_STATE as PROJECT_STATE
-            FROM br_project_worker pw1
-            LEFT JOIN br_device d1 on pw1.VAST_CODE = d1.DEVICE_CODE
-            LEFT JOIN br_work_site_info w1 on pw1.PROJECT_ID = w1.ID))
-
-        select DISTINCT DEVICE_ID from device_info
-        <where>
-            DEVICE_ID is not null
-            <choose>
-                <when test="projectId != null and projectId !=''">
-                    and PROJECT_ID = #{projectId}
-                </when>
-                <otherwise>
-                    AND PROJECT_STATE != '3'
-                </otherwise>
-            </choose>
-        </where>
-    </select>
-
-    <select id="selectHelmetList" resultType="com.casic.missiles.modular.system.dto.HelmetInfoDTO">
-        SELECT
-            a.ID AS deviceId,
-            a.DEVICE_CODE AS hatCode,
-            b.HAT_LINING_CODE AS hatLiningCode
-        FROM
-            br_device a
-                LEFT JOIN br_device_ext b ON a.ID = b.DEVICE_ID
-        WHERE
-            a.DEVICE_TYPE = #{deviceType}
-          AND a.DEVICE_CODE IS NOT NULL
-          AND b.HAT_LINING_CODE IS NOT NULL
-    </select>
 </mapper>
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/ProjectDeviceMapper.xml b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/ProjectDeviceMapper.xml
deleted file mode 100644
index c6d1c24..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/ProjectDeviceMapper.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.casic.missiles.modular.system.mapper.ProjectDeviceMapper">
-
-    <select id="selectDetailByProjectId" resultType="com.casic.missiles.modular.system.entity.ProjectDevice">
-        SELECT
-            pd.ID as id,
-            pd.PROJECT_ID as projectId,
-            pd.DEVICE_ID as deviceId,
-            d.DEVICE_CODE as deviceCode
-        from br_project_device pd
-        LEFT JOIN br_device d on pd.DEVICE_ID = d.ID
-        <where>
-            pd.PROJECT_ID = #{projectId}
-        </where>
-    </select>
-
-    <select id="selectDeviceLocationList" resultType="com.casic.missiles.modular.system.dto.DeviceLocationDTO">
-        SELECT
-        d.ID as deviceId,
-        d.DEVICE_TYPE as deviceType,
-        d.DEVICE_CODE as deviceCode,
-        if(EXISTS(select ID from br_bus_alarm WHERE DEVICE_ID = d.ID and ALARM_STATUS = '0'),true,false) as alarmFlag
-        FROM br_project_device pd, br_device d
-        where pd.DEVICE_ID = d.ID
-        and pd.PROJECT_ID = #{projectId}
-    </select>
-
-</mapper>
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/ProjectWorkerMapper.xml b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/ProjectWorkerMapper.xml
deleted file mode 100644
index 8d2de10..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/ProjectWorkerMapper.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.casic.missiles.modular.system.mapper.ProjectWorkerMapper">
-
-    <select id="selectDetailByProjectId" resultType="com.casic.missiles.modular.system.entity.ProjectWorker">
-        SELECT
-            pw.ID as id,
-            pw.PROJECT_ID as projectId,
-            pw.WORKER_ID as workerId,
-            w.WORKER_NAME as workerName,
-            w.DEPT_ID as workerDeptId,
-            pw.HAT_CODE as hatCode,
-            pw.VAST_CODE as vastCode,
-            pw.BRACELET_CODE as braceletCode,
-            w.PHONE_NUMBER as workerPhoneNumber
-        from br_project_worker pw
-        LEFT JOIN br_worker w on pw.WORKER_ID = w.ID
-        <where>
-            pw.PROJECT_ID = #{projectId}
-            <if test="workerType != null and workerType != ''">
-                and w.WORKER_TYPE = #{workerType}
-            </if>
-        </where>
-    </select>
-
-    <select id="selectWorkerLocationList" resultType="com.casic.missiles.modular.system.dto.WorkerLocationDTO">
-        select
-            w.ID as workerId,
-            w.WORKER_NAME as workerName,
-            pw.HAT_CODE as hatCode,
-            hd.ID as hatId,
-            pw.BRACELET_CODE as braceletCode,
-            pw.VAST_CODE as vastCode
-        from br_project_worker pw,br_worker w ,br_device hd
-        WHERE pw.WORKER_ID = w.ID
-          and pw.HAT_CODE = hd.DEVICE_CODE
-          and pw.PROJECT_ID = #{projectId}
-          and w.WORKER_TYPE = #{workerType}
-    </select>
-</mapper>
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/WorkSiteInfoMapper.xml b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/WorkSiteInfoMapper.xml
deleted file mode 100644
index 8f01326..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/WorkSiteInfoMapper.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.casic.missiles.modular.system.mapper.WorkSiteInfoMapper">
-
-    <select id="selectListPage" resultType="com.casic.missiles.modular.system.entity.WorkSiteInfo">
-        SELECT
-            br_work_site_info.ID AS id,
-            WORK_TITLE as workTitle,
-            WORK_ROAD as workRoad,
-            WORK_SITE_DESC as workSiteDesc,
-            WORK_PERSON as workPerson,
-            WORKER_NAME as workPersonName,
-            DEPT_ID as workPersonDeptId,
-            PHONE_NUMBER as workPersonPhoneNumber,
-            PROJECT_STATE as projectState,
-            br_work_site_info.CREATE_TIME AS createTime,
-            br_work_site_info.UPDATE_TIME AS updateTime
-        FROM br_work_site_info
-        LEFT JOIN br_worker w ON br_work_site_info.WORK_PERSON = w.ID
-        <where>
-            <if test="ew != null">
-                ${ew.sqlSegment}
-            </if>
-        </where>
-    </select>
-</mapper>
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/WorkerMapper.xml b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/WorkerMapper.xml
deleted file mode 100644
index 3e28b39..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/WorkerMapper.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.casic.missiles.modular.system.mapper.WorkerMapper">
-
-    <select id="selectListPage" resultType="com.casic.missiles.modular.system.entity.Worker">
-        WITH worker_project AS (
-            SELECT
-                w.id AS ID,
-                WORKER_NAME,
-                GENDER,
-                DEPT_ID,
-                OWNER_SHIP,
-                PHONE_NUMBER,
-                ID_CARD_NUMBER,
-                ENTER_REASON,
-                WORKER_AVATAR,
-                w.CREATE_TIME,
-                WORKER_TYPE,
-                IF( p.PROJECT_STATE != '3', 1, 0 ) AS `STATUS`
-            FROM br_worker w
-            LEFT JOIN br_project_worker pw ON w.ID = pw.WORKER_ID
-            LEFT JOIN br_work_site_info p ON pw.PROJECT_ID = p.ID
-        )
-
-        SELECT
-            ID AS id,
-            WORKER_NAME AS workerName,
-            GENDER AS gender,
-            DEPT_ID AS deptId,
-            OWNER_SHIP AS ownerShip,
-            PHONE_NUMBER AS phoneNumber,
-            ID_CARD_NUMBER AS idCardNumber,
-            ENTER_REASON AS enterReason,
-            WORKER_AVATAR AS workerAvatar,
-            CREATE_TIME AS createTime,
-            WORKER_TYPE AS workerType,
-            `STATUS` AS `status`
-        FROM worker_project
-        <where>
-            <if test="ew != null">
-                ${ew.sqlSegment}
-            </if>
-        </where>
-    </select>
-
-    <select id="selectWorkerAvatars" resultType="java.lang.String">
-        SELECT
-            WORKER_AVATAR
-        FROM
-            `br_worker`
-        WHERE
-        ID IN ( SELECT WORKER_ID FROM br_project_worker WHERE PROJECT_ID = #{projectId} )
-          AND WORKER_AVATAR IS NOT NULL
-          AND WORKER_AVATAR != ''
-    </select>
-</mapper>
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IAlarmService.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IAlarmService.java
new file mode 100644
index 0000000..8bc01f4
--- /dev/null
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IAlarmService.java
@@ -0,0 +1,16 @@
+package com.casic.missiles.modular.system.service;
+
+import com.casic.missiles.modular.system.entity.Alarm;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 报警记录表 服务类
+ * </p>
+ *
+ * @author zyj
+ * @since 2023-05-25
+ */
+public interface IAlarmService extends IService<Alarm> {
+
+}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IBusAlarmService.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IBusAlarmService.java
deleted file mode 100644
index f63c19c..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IBusAlarmService.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package com.casic.missiles.modular.system.service;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.modular.system.dto.AlarmTypeCountDTO;
-import com.casic.missiles.modular.system.dto.AlarmUpload;
-import com.casic.missiles.modular.system.entity.BusAlarm;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-import java.util.List;
-
-/**
- * <p>
- * 报警记录表 服务类
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface IBusAlarmService extends IService<BusAlarm> {
-
-    boolean alarmUpload(AlarmUpload alarmUpload);
-
-    Page<BusAlarm> listPage(Page<BusAlarm> page,QueryWrapper<BusAlarm> queryWrapper);
-
-    List<AlarmTypeCountDTO> alarmCount(Long projectId,String alarmStatus);
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IBusEventImageService.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IBusEventImageService.java
deleted file mode 100644
index b1187ed..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IBusEventImageService.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.casic.missiles.modular.system.service;
-
-import com.casic.missiles.modular.system.entity.BusEventImage;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-import java.util.List;
-
-/**
- * <p>
- * 事件图片表 服务类
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface IBusEventImageService extends IService<BusEventImage> {
-
-    boolean saveBusEventImages(Long eventId, List<BusEventImage> imageList);
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IBusEventService.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IBusEventService.java
deleted file mode 100644
index 85c48d0..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IBusEventService.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package com.casic.missiles.modular.system.service;
-
-import com.casic.missiles.modular.system.entity.BusEvent;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-/**
- * <p>
- * 事件表 服务类
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface IBusEventService extends IService<BusEvent> {
-
-    boolean saveBusEvent(BusEvent busEvent);
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IDeviceExtService.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IDeviceExtService.java
deleted file mode 100644
index 6fc5361..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IDeviceExtService.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package com.casic.missiles.modular.system.service;
-
-import com.casic.missiles.modular.system.dto.DeviceDetailDTO;
-import com.casic.missiles.modular.system.entity.DeviceExt;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-import java.util.List;
-
-/**
- * <p>
- * 设备扩展信息表（安全树） 服务类
- * </p>
- *
- * @author zyj
- * @since 2023-04-27
- */
-public interface IDeviceExtService extends IService<DeviceExt> {
-
-    boolean saveDeviceExt(DeviceDetailDTO deviceDetailDTO);
-
-    boolean updateDeviceExt(DeviceDetailDTO deviceDetailDTO);
-
-    boolean removeByDeviceIds(List<Long> deviceIds);
-
-    boolean setGasThreshold(String gasIp,String gasPort,String threshold);
-
-    String getGasThreshold(String gasIp,String gasPort);
-
-    Long selectByGasIpPort(String gasIp,String gasPort);
-
-    Long selectByCameraIpPort(String cameraIp,String cameraPort);
-
-}

diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/AlarmController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/AlarmController.java
new file mode 100644
index 0000000..1795cf1
--- /dev/null
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/AlarmController.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.modular.system.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.stereotype.Controller;
+
+/**
+ * <p>
+ * 报警记录表 前端控制器
+ * </p>
+ *
+ * @author zyj
+ * @since 2023-05-25
+ */
+@Controller
+@RequestMapping("/system/alarm")
+public class AlarmController {
+
+}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusAlarmController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusAlarmController.java
deleted file mode 100644
index 1f82ebb..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusAlarmController.java
+++ /dev/null
@@ -1,102 +0,0 @@
-package com.casic.missiles.modular.system.controller;
-
-
-import cn.hutool.core.util.ObjectUtil;
-import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.core.base.controller.BaseController;
-import com.casic.missiles.core.page.PageFactory;
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.AlarmUpload;
-import com.casic.missiles.modular.system.dto.DeviceDetailDTO;
-import com.casic.missiles.modular.system.entity.BusAlarm;
-import com.casic.missiles.modular.system.service.IBusAlarmService;
-import io.swagger.annotations.*;
-import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.*;
-
-import org.springframework.stereotype.Controller;
-
-import static com.casic.missiles.model.response.ResponseData.DEFAULT_SUCCESS_MESSAGE;
-import static com.casic.missiles.modular.system.consts.AlarmConst.ALARM_STATUS_MANUAL_CANCEL;
-
-/**
- * <p>
- * 报警记录表 前端控制器
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@Api(tags = "报警管理接口")
-@Controller
-@RequestMapping("/alarm")
-@RequiredArgsConstructor
-public class BusAlarmController extends BaseController {
-
-    private final IBusAlarmService alarmService;
-
-    @ApiOperation("报警上报接口")
-    @PostMapping("/upload")
-    @ResponseBody
-    public Object upload(@RequestBody AlarmUpload alarmUpload){
-        alarmService.alarmUpload(alarmUpload);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("报警列表分页查询")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "workTitle", value = "作业名称",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "projectId", value = "作业ID",dataType = "Long", paramType = "query",example = "0"),
-            @ApiImplicitParam(name = "alarmStatus", value = "报警状态",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "projectState", value = "作业状态",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "alarmType", value = "报警类型",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "alarmStartTime", value = "报警开始时间",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "alarmEndTime", value = "报警结束时间",dataType = "String", paramType = "query")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = BusAlarm.class),
-    })
-    @GetMapping("/listPage")
-    @ResponseBody
-    public Object listPage(String workTitle,Long projectId,String alarmStatus,String projectState,String alarmType,String alarmStartTime,String alarmEndTime){
-        Page<BusAlarm> page = PageFactory.defaultPage();
-        QueryWrapper<BusAlarm> queryWrapper = new QueryWrapper<>();
-        if(StrUtil.isNotEmpty(workTitle)){
-            queryWrapper.like("p.WORK_TITLE",workTitle);
-        }
-        if(ObjectUtil.isNotEmpty(projectId)){
-            queryWrapper.eq("alarm.PROJECT_ID",projectId);
-        }
-        if(StrUtil.isNotEmpty(alarmStatus)){
-            queryWrapper.eq("alarm.ALARM_STATUS",alarmStatus);
-        }
-        if(StrUtil.isNotEmpty(projectState)){
-            queryWrapper.eq("p.PROJECT_STATE",projectState);
-        }
-        if(StrUtil.isNotEmpty(alarmType)){
-            queryWrapper.eq("alarm.ALARM_TYPE",alarmType);
-        }
-        if(StrUtil.isNotEmpty(alarmStartTime)){
-            queryWrapper.ge("alarm.ALARM_TIME",alarmStartTime);
-        }
-        if(StrUtil.isNotEmpty(alarmEndTime)){
-            queryWrapper.le("alarm.ALARM_TIME",alarmEndTime);
-        }
-        page = alarmService.listPage(page,queryWrapper);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-    @ApiOperation("消警")
-    @PostMapping("/cancel")
-    @ResponseBody
-    public Object cancel(@RequestParam("alarmId") Long alarmId){
-        UpdateWrapper<BusAlarm> updateWrapper = new UpdateWrapper<>();
-        updateWrapper.eq("ID",alarmId);
-        updateWrapper.set("ALARM_STATUS",ALARM_STATUS_MANUAL_CANCEL);
-        alarmService.update(updateWrapper);
-        return ResponseData.success();
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusEventController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusEventController.java
deleted file mode 100644
index dde5aad..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusEventController.java
+++ /dev/null
@@ -1,41 +0,0 @@
-package com.casic.missiles.modular.system.controller;
-
-
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.entity.BusEvent;
-import com.casic.missiles.modular.system.service.IBusEventService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.ResponseBody;
-
-/**
- * <p>
- * 事件表 前端控制器
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@Controller
-@RequestMapping("/event")
-@Api(tags = "事件上报")
-@RequiredArgsConstructor
-public class BusEventController {
-
-    private final IBusEventService eventService;
-
-    @ApiOperation("事件上报")
-    @PostMapping("add")
-    @ResponseBody
-    public Object add(@RequestBody BusEvent busEvent){
-        eventService.saveBusEvent(busEvent);
-        return ResponseData.success();
-    }
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
index 03abc5f..aa50d78 100644
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
@@ -1,121 +1,20 @@
 package com.casic.missiles.modular.system.controller;
 
 
-import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.core.base.controller.BaseController;
-import com.casic.missiles.core.page.PageFactory;
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.DeviceDetailDTO;
-import com.casic.missiles.modular.system.entity.Device;
-import com.casic.missiles.modular.system.service.IDeviceExtService;
-import com.casic.missiles.modular.system.service.IDeviceService;
-import io.swagger.annotations.*;
-import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.RequestMapping;
 
 import org.springframework.stereotype.Controller;
 
-import java.time.LocalDateTime;
-import java.util.Date;
-import java.util.List;
-
-import static com.casic.missiles.model.response.ResponseData.DEFAULT_SUCCESS_MESSAGE;
-
 /**
  * <p>
- *  前端控制器
+ * 设备记录表 前端控制器
  * </p>
  *
  * @author zyj
- * @since 2023-04-14
+ * @since 2023-05-25
  */
-@Api(tags = "设备管理接口")
-@RequiredArgsConstructor
 @Controller
-@RequestMapping("/device")
-public class DeviceController extends BaseController {
-    private final IDeviceService deviceService;
-    private final IDeviceExtService deviceExtService;
-
-    @ApiOperation("设备分页列表")
-    @ApiImplicitParams({
-        @ApiImplicitParam(name = "deviceType", value = "设备类型",dataType = "String", paramType = "query"),
-        @ApiImplicitParam(name = "deviceCode", value = "设备编号",dataType = "String", paramType = "query"),
-        @ApiImplicitParam(name = "status", value = "设备状态",dataType = "String", paramType = "query"),
-        @ApiImplicitParam(name = "projectId", value = "作业ID（如果传此参数，列表中返回该作业使用的设备）",dataType = "Long", paramType = "query", example = "0")
-    })
-    @ApiResponses({
-        @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = DeviceDetailDTO.class),
-    })
-    @GetMapping("listPage")
-    @ResponseBody
-    public Object listPage(String deviceType, String deviceCode, String status,Long projectId){
-        Page<DeviceDetailDTO> page = PageFactory.defaultPage();
-        QueryWrapper<DeviceDetailDTO> queryWrapper = new QueryWrapper<>();
-        if(StrUtil.isNotEmpty(deviceType)){
-            queryWrapper.eq("DEVICE_TYPE",deviceType);
-        }
-        if(StrUtil.isNotEmpty(deviceCode)){
-            queryWrapper.like("DEVICE_CODE",deviceCode);
-        }
-        page = deviceService.listPage(page,queryWrapper,status,projectId);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-    @ApiOperation("新增设备")
-    @PostMapping("add")
-    @ResponseBody
-    public Object add(@RequestBody DeviceDetailDTO deviceDetailDTO){
-        deviceService.saveDevice(deviceDetailDTO);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("编辑设备")
-    @PostMapping("update")
-    @ResponseBody
-    public Object update(@RequestBody DeviceDetailDTO deviceDetailDTO){
-        deviceService.updateDevice(deviceDetailDTO);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("删除设备")
-    @PostMapping("delete")
-    @ResponseBody
-    public Object delete(@ApiParam("设备id列表")@RequestBody List<Long> deviceIds){
-        deviceService.deleteDevices(deviceIds);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("设置甲烷阈值")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "gasIp", value = "安全树甲烷设备IP",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "gasPort", value = "安全树甲烷端口",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "threshold", value = "甲烷阈值",dataType = "String", paramType = "query")
-    })
-    @PostMapping("setThreshold")
-    @ResponseBody
-    public Object setThreshold(String gasIp,String gasPort,String threshold){
-        deviceExtService.setGasThreshold(gasIp, gasPort, threshold);
-        return ResponseData.success();
-    }
-
-
-    @ApiOperation("查询甲烷阈值")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "gasIp", value = "安全树甲烷设备IP",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "gasPort", value = "安全树甲烷端口",dataType = "String", paramType = "query")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = "{\"code\": 200,\"data\": \"100\",\"message\": \"请求成功\",\"success\": true}",response = String.class),
-    })
-    @GetMapping("getThreshold")
-    @ResponseBody
-    public Object getThreshold(String gasIp,String gasPort){
-        String data = deviceExtService.getGasThreshold(gasIp, gasPort);
-        return ResponseData.success(data);
-    }
-
+@RequestMapping("/system/device")
+public class DeviceController {
 
 }
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/OverviewController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/OverviewController.java
deleted file mode 100644
index 7570504..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/OverviewController.java
+++ /dev/null
@@ -1,70 +0,0 @@
-package com.casic.missiles.modular.system.controller;
-
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.AlarmTypeCountDTO;
-import com.casic.missiles.modular.system.dto.DeviceLocationDTO;
-import com.casic.missiles.modular.system.dto.WorkerLocationDTO;
-import com.casic.missiles.modular.system.service.IBusAlarmService;
-import com.casic.missiles.modular.system.service.IProjectDeviceService;
-import com.casic.missiles.modular.system.service.IProjectWorkerService;
-import io.swagger.annotations.*;
-import lombok.RequiredArgsConstructor;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.ResponseBody;
-
-import static com.casic.missiles.model.response.ResponseData.DEFAULT_SUCCESS_MESSAGE;
-import static com.casic.missiles.modular.system.consts.AlarmConst.ALARM_STATUS_ON;
-
-@Api(tags = "首页看板接口")
-@Controller
-@RequestMapping("overview")
-@RequiredArgsConstructor
-public class OverviewController {
-
-    private final IBusAlarmService alarmService;
-    private final IProjectDeviceService projectDeviceService;
-
-    private final IProjectWorkerService projectWorkerService;
-
-
-    @ApiOperation("报警统计接口")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "projectId", value = "作业ID",dataType = "Long", paramType = "query", example = "0")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = AlarmTypeCountDTO.class),
-    })
-    @GetMapping("/alarmCount")
-    @ResponseBody
-    public Object alarmCount(Long projectId){
-        return ResponseData.success(alarmService.alarmCount(projectId,ALARM_STATUS_ON));
-    }
-
-    @ApiOperation("设备列表接口")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "projectId", value = "作业ID",dataType = "Long", paramType = "query", example = "0")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = DeviceLocationDTO.class),
-    })
-    @GetMapping("/deviceList")
-    @ResponseBody
-    public Object deviceList(Long projectId){
-        return ResponseData.success(projectDeviceService.selectDeviceLocationList(projectId));
-    }
-
-    @ApiOperation("人员列表接口")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "projectId", value = "作业ID",dataType = "Long", paramType = "query", example = "0")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = WorkerLocationDTO.class),
-    })
-    @GetMapping("/workerList")
-    @ResponseBody
-    public Object workerList(Long projectId){
-        return ResponseData.success(projectWorkerService.selectWorkerLocationDTO(projectId));
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/WorkSiteInfoController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/WorkSiteInfoController.java
deleted file mode 100644
index af36d69..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/WorkSiteInfoController.java
+++ /dev/null
@@ -1,130 +0,0 @@
-package com.casic.missiles.modular.system.controller;
-
-
-import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.core.base.controller.BaseController;
-import com.casic.missiles.core.page.PageFactory;
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.WorkSiteDetailDTO;
-import com.casic.missiles.modular.system.entity.WorkSiteInfo;
-import com.casic.missiles.modular.system.service.IWorkSiteInfoService;
-import io.swagger.annotations.*;
-import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.*;
-
-import org.springframework.stereotype.Controller;
-
-import java.util.List;
-
-import static com.casic.missiles.model.response.ResponseData.DEFAULT_SUCCESS_MESSAGE;
-
-/**
- * <p>
- * 作业现场表 前端控制器
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@Controller
-@RequestMapping("/site")
-@Api(tags = "作业现场管理")
-@RequiredArgsConstructor
-public class WorkSiteInfoController extends BaseController {
-
-
-    private final IWorkSiteInfoService workSiteInfoService;
-
-    @ApiOperation("新增作业现场")
-    @PostMapping("add")
-    @ResponseBody
-    public Object addWorkSite(@RequestBody WorkSiteDetailDTO workSiteDetailDTO){
-        workSiteInfoService.addWorkSiteInfo(workSiteDetailDTO);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("编辑作业现场")
-    @PostMapping("update")
-    @ResponseBody
-    public Object updateWorkSite(@RequestBody WorkSiteDetailDTO workSiteDetailDTO){
-        workSiteInfoService.updateWorkSiteInfo(workSiteDetailDTO);
-        return ResponseData.success();
-    }
-
-
-    @ApiOperation("删除作业现场")
-    @PostMapping("delete")
-    @ResponseBody
-    public Object delete(@ApiParam("作业现场id列表")@RequestBody List<Long> projectIds){
-        workSiteInfoService.deleteProjects(projectIds);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("查询作业现场详情")
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = WorkSiteDetailDTO.class),
-    })
-    @GetMapping("detail")
-    @ResponseBody
-    public Object delete(@ApiParam(value = "作业现场id", example = "0")@RequestParam Long projectId){
-        WorkSiteDetailDTO detailDTO = workSiteInfoService.getWorkSiteDetail(projectId);
-        return ResponseData.success(detailDTO);
-    }
-
-    @ApiOperation("分页列表查询")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "workTitle",value = "作业名称", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "workRoad",value = "所属道路", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "workPersonName",value = "责任人姓名", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "startDate",value = "注册开始日期", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "endDate",value = "注册结束日期", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "projectState",value = "当前状态（字典值）", dataType = "String", paramType = "query")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = WorkSiteInfo.class),
-    })
-    @GetMapping("listPage")
-    @ResponseBody
-    public Object listPage(String workTitle,String workRoad,String workPersonName,String projectState,String startDate,String endDate){
-        Page<WorkSiteInfo> page = PageFactory.defaultPage();
-        QueryWrapper<WorkSiteInfo> queryWrapper = new QueryWrapper<>();
-        if(StrUtil.isNotEmpty(workTitle)){
-            queryWrapper.like("WORK_TITLE",workTitle);
-        }
-        if(StrUtil.isNotEmpty(workRoad)){
-            queryWrapper.like("WORK_ROAD",workRoad);
-        }
-        if(StrUtil.isNotEmpty(workPersonName)){
-            queryWrapper.like("WORKER_NAME",workPersonName);
-        }
-        if(StrUtil.isNotEmpty(projectState)){
-            queryWrapper.eq("PROJECT_STATE",projectState);
-        }
-        if(StrUtil.isNotEmpty(startDate)){
-            queryWrapper.ge("br_work_site_info.CREATE_TIME",startDate + " 00:00:00");
-        }
-        if(StrUtil.isNotEmpty(endDate)){
-            queryWrapper.le("br_work_site_info.CREATE_TIME",endDate + " 23:59:59");
-        }
-        page = workSiteInfoService.selectListPage(page,queryWrapper);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-    @ApiOperation("开始作业")
-    @PostMapping("start")
-    @ResponseBody
-    public Object start(@ApiParam(value = "作业现场id",example = "0")@RequestParam Long projectId){
-        workSiteInfoService.start(projectId);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("完成作业")
-    @PostMapping("finish")
-    @ResponseBody
-    public Object finish(@ApiParam(value = "作业现场id", example = "0")@RequestParam Long projectId){
-        workSiteInfoService.finish(projectId);
-        return ResponseData.success();
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/WorkerController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/WorkerController.java
deleted file mode 100644
index 796f94c..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/WorkerController.java
+++ /dev/null
@@ -1,136 +0,0 @@
-package com.casic.missiles.modular.system.controller;
-
-
-import cn.hutool.core.util.ObjectUtil;
-import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.core.base.controller.BaseController;
-import com.casic.missiles.core.page.PageFactory;
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.DeviceDetailDTO;
-import com.casic.missiles.modular.system.entity.Device;
-import com.casic.missiles.modular.system.entity.Worker;
-import com.casic.missiles.modular.system.service.IWorkerService;
-import io.swagger.annotations.*;
-import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.*;
-
-import org.springframework.stereotype.Controller;
-
-import java.util.Date;
-import java.util.List;
-
-import static com.casic.missiles.model.response.ResponseData.DEFAULT_SUCCESS_MESSAGE;
-
-/**
- * <p>
- *  前端控制器
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@Controller
-@RequestMapping("/worker")
-@RequiredArgsConstructor
-@Api(tags = "人员管理接口")
-public class WorkerController extends BaseController {
-
-    private final IWorkerService workerService;
-
-    @ApiOperation("分页列表查询")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "name",value = "姓名", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "deptId",value = "所属部门", dataType = "Long", paramType = "query", example = "0"),
-            @ApiImplicitParam(name = "status",value = "当前状态（字典值）", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "startDate",value = "注册开始日期", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "endDate",value = "注册结束日期", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "workerType",value = "人员类型（字典值）", dataType = "String", paramType = "query")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = Worker.class),
-    })
-    @GetMapping("listPage")
-    @ResponseBody
-    public Object listPage(String name,Long deptId, String status,String startDate,String endDate,String workerType){
-        Page<Worker> page = PageFactory.defaultPage();
-        QueryWrapper<Worker> queryWrapper = new QueryWrapper<>();
-        if(StrUtil.isNotEmpty(name)){
-            queryWrapper.like("WORKER_NAME",name);
-        }
-        if(ObjectUtil.isNotEmpty(deptId)){
-            queryWrapper.eq("DEPT_ID",deptId);
-        }
-        if(StrUtil.isNotEmpty(workerType)){
-            queryWrapper.eq("WORKER_TYPE",workerType);
-        }
-        if(StrUtil.isNotEmpty(startDate)){
-            queryWrapper.ge("CREATE_TIME",startDate + " 00:00:00");
-        }
-        if(StrUtil.isNotEmpty(endDate)){
-            queryWrapper.le("CREATE_TIME",endDate + " 23:59:59");
-        }
-        if(StrUtil.isNotEmpty(status)){
-            queryWrapper.eq("`STATUS`",status);
-        }
-        page = workerService.selectListPage(page,queryWrapper);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-    @ApiOperation("新增人员")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "worker", value = "人员信息", dataType = "Worker", paramType = "body", required = true),
-            @ApiImplicitParam(name = "projectId", value = "项目ID(入场申请需要)", dataType = "Long", paramType = "query", example = "0")
-    })
-    @PostMapping("add")
-    @ResponseBody
-    public Object add(@ApiParam("worker")@RequestBody Worker worker,
-                      @RequestParam(required = false) Long projectId){
-        workerService.addWorker(worker,projectId);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("编辑人员")
-    @PostMapping("update")
-    @ResponseBody
-    public Object update(@RequestBody Worker worker){
-        workerService.updateById(worker);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("删除人员")
-    @PostMapping("delete")
-    @ResponseBody
-    public Object delete(@ApiParam("人员id列表")@RequestBody List<Long> workIds){
-        workerService.removeByIds(workIds);
-        return ResponseData.success();
-    }
-
-
-    @ApiOperation(value = "获取人脸图片",notes = "返回人脸图片url")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "cameraIp",value = "摄像头IP", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "cameraPort",value = "摄像头端口号", dataType = "String", paramType = "query"),
-    })
-    @GetMapping("/face/register")
-    @ResponseBody
-    public Object faceRegister(String cameraIp,String cameraPort){
-        return ResponseData.success(workerService.faceRegister(cameraIp, cameraPort));
-    }
-
-
-    @ApiOperation(value = "查询临时入场人员列表")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "projectId", value = "项目ID",required = true,dataType = "Long", paramType = "query", example = "0")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = Worker.class),
-    })
-    @GetMapping("/projectTempWorker")
-    @ResponseBody
-    public Object projectTempWorker(Long projectId){
-        return ResponseData.success(workerService.projectTempWorker(projectId));
-    }
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/AlarmTypeCountDTO.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/AlarmTypeCountDTO.java
deleted file mode 100644
index 1a165a1..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/AlarmTypeCountDTO.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.casic.missiles.modular.system.dto;
-
-import io.swagger.annotations.ApiModel;
-import lombok.Data;
-
-@ApiModel(value = "AlarmTypeCountDTO",description = "报警类型统计（首页）")
-@Data
-public class AlarmTypeCountDTO {
-
-    private String alarmType;
-    private String alarmTypeName;
-    private Integer alarmCount;
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/AlarmUpload.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/AlarmUpload.java
deleted file mode 100644
index 73d7799..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/AlarmUpload.java
+++ /dev/null
@@ -1,46 +0,0 @@
-package com.casic.missiles.modular.system.dto;
-
-import cn.hutool.core.util.StrUtil;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-@ApiModel(value = "AlarmUpload",description = "报警上传")
-@Data
-public class AlarmUpload {
-
-    @ApiModelProperty(value = "摄像头ip")
-    private String cameraIp;
-
-    @ApiModelProperty(value = "摄像头端口")
-    private String cameraPort;
-    @ApiModelProperty(value = "安全树甲烷设备ip")
-    private String gasIp;
-    @ApiModelProperty(value = "安全树甲烷设备端口")
-    private String gasPort;
-    @ApiModelProperty(value = "报警值")
-    private String alarmValue;
-    @ApiModelProperty(value = "报警时间")
-    private String alarmTime;
-    @ApiModelProperty(value = "报警类型")
-    private String alarmType;
-    @ApiModelProperty(value = "报警图片")
-    private String alarmImage;
-    @ApiModelProperty(value = "报警内容")
-    private String alarmContent;
-
-    @Override
-    public String toString() {
-        return "AlarmUpload{" +
-                "cameraIp='" + cameraIp + '\'' +
-                ", cameraPort='" + cameraPort + '\'' +
-                ", gasIp='" + gasIp + '\'' +
-                ", gasPort='" + gasPort + '\'' +
-                ", alarmValue='" + alarmValue + '\'' +
-                ", alarmTime='" + alarmTime + '\'' +
-                ", alarmType='" + alarmType + '\'' +
-                ", alarmImage='" + (StrUtil.isNotEmpty(alarmImage) ? alarmImage.substring(0,50) : "null") + '\'' +
-                ", alarmContent='" + alarmContent + '\'' +
-                '}';
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/DeviceDetailDTO.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/DeviceDetailDTO.java
deleted file mode 100644
index ea518d9..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/DeviceDetailDTO.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package com.casic.missiles.modular.system.dto;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.casic.missiles.modular.system.entity.Device;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-@ApiModel("DeviceDetailDTO")
-@Data
-public class DeviceDetailDTO extends Device {
-
-    @ApiModelProperty(value = "摄像头编号")
-    private String cameraCode;
-
-    @ApiModelProperty(value = "摄像头IP")
-    private String cameraIp;
-
-    @ApiModelProperty(value = "摄像头端口")
-    private String cameraPort;
-
-    @ApiModelProperty(value = "激甲编号")
-    private String gasCode;
-
-    @ApiModelProperty(value = "激甲IP")
-    private String gasIp;
-
-    @ApiModelProperty(value = "激甲端口")
-    private String gasPort;
-
-    @ApiModelProperty(value = "智能帽衬编号")
-    private String hatLiningCode;
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/WorkSiteDetailDTO.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/WorkSiteDetailDTO.java
deleted file mode 100644
index 29378ff..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/WorkSiteDetailDTO.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package com.casic.missiles.modular.system.dto;
-
-import com.casic.missiles.modular.system.entity.ProjectDevice;
-import com.casic.missiles.modular.system.entity.ProjectWorker;
-import com.casic.missiles.modular.system.entity.WorkSiteInfo;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.util.List;
-
-@Data
-@ApiModel("WorkSiteDetailDTO")
-public class WorkSiteDetailDTO extends WorkSiteInfo {
-
-    @ApiModelProperty(value = "安全树列表",dataType = "ProjectDevice")
-    private List<ProjectDevice> deviceList;
-
-    @ApiModelProperty(value = "人员列表",dataType = "ProjectWorker")
-    private List<ProjectWorker> workerList;
-
-
-
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/WorkerLocationDTO.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/WorkerLocationDTO.java
deleted file mode 100644
index 6fd7b24..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/WorkerLocationDTO.java
+++ /dev/null
@@ -1,68 +0,0 @@
-package com.casic.missiles.modular.system.dto;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-@ApiModel(value = "WorkerLocationDTO",description = "人员位置列表（首页）")
-@Data
-public class WorkerLocationDTO {
-
-    @ApiModelProperty("人员ID")
-    private Long workerId;
-
-    @ApiModelProperty("人员姓名")
-    private String workerName;
-
-    @ApiModelProperty("安全帽编号")
-    private String hatCode;
-
-    @ApiModelProperty("安全帽ID")
-    private Long hatId;
-
-    @ApiModelProperty("背心编号")
-    private String vastCode;
-
-    @ApiModelProperty("手环编号")
-    private String braceletCode;
-
-    @ApiModelProperty("位置")
-    private String location;
-
-    @ApiModelProperty("时间")
-    private String time;
-
-    @ApiModelProperty("经度")
-    private String lng;
-
-    @ApiModelProperty("纬度")
-    private String lat;
-
-    @ApiModelProperty("心率")
-    private String heartRate;
-
-    @ApiModelProperty("血氧")
-    private String bloodOxygen;
-
-    @ApiModelProperty("一氧化碳")
-    private String co;
-
-    @ApiModelProperty("甲烷")
-    private String gas;
-
-    @ApiModelProperty("硫化氢")
-    private String h2s;
-
-    @ApiModelProperty("氧气")
-    private String o2;
-
-    @ApiModelProperty("信号")
-    private String signal;
-
-    @ApiModelProperty("电量")
-    private String cell;
-
-    @ApiModelProperty("是否报警")
-    private boolean alarmFlag;
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Alarm.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Alarm.java
new file mode 100644
index 0000000..4d2b7ef
--- /dev/null
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Alarm.java
@@ -0,0 +1,103 @@
+package com.casic.missiles.modular.system.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import java.util.Date;
+
+/**
+ * <p>
+ * 报警记录表
+ * </p>
+ *
+ * @author zyj
+ * @since 2023-05-25
+ */
+@Data
+@TableName("bus_alarm")
+public class Alarm implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    @TableId(value = "ID",type = IdType.ASSIGN_ID)
+    private Long id;
+
+    /**
+     * 设备ID
+     */
+    @TableField("DEVICE_ID")
+    private Long deviceId;
+
+    /**
+     * 报警类型
+     */
+    @TableField("ALARM_TYPE")
+    private String alarmType;
+
+    /**
+     * 报警时间
+     */
+    @TableField("ALARM_TIME")
+    private Date alarmTime;
+
+    /**
+     * 报警状态
+     */
+    @TableField("ALARM_STATUS")
+    private String alarmStatus;
+
+    /**
+     * 报警位置
+     */
+    @TableField("ALARM_LOCATION")
+    private String alarmLocation;
+
+    /**
+     * 报警图片
+     */
+    @TableField("ALARM_IMAGE")
+    private String alarmImage;
+
+    /**
+     * 视频通道号
+     */
+    @TableField("CHANNEL_NO")
+    private Integer channelNo;
+
+    /**
+     * 报警内容
+     */
+    @TableField("ALARM_CONTENT")
+    private String alarmContent;
+
+    /**
+     * 消警时间
+     */
+    @TableField("CANCEL_TIME")
+    private Date cancelTime;
+
+
+    @Override
+    public String toString() {
+        return "Alarm{" +
+            "id=" + id +
+            ", deviceId=" + deviceId +
+            ", alarmType=" + alarmType +
+            ", alarmTime=" + alarmTime +
+            ", alarmStatus=" + alarmStatus +
+            ", alarmLocation=" + alarmLocation +
+            ", alarmImage=" + alarmImage +
+            ", channelNo=" + channelNo +
+            ", alarmContent=" + alarmContent +
+            ", cancelTime=" + cancelTime +
+        "}";
+    }
+}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusAlarm.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusAlarm.java
deleted file mode 100644
index efb4a23..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusAlarm.java
+++ /dev/null
@@ -1,159 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.alibaba.fastjson.annotation.JSONField;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.time.LocalDateTime;
-import java.util.Date;
-
-/**
- * <p>
- * 报警记录表
- * </p>
- *
- * @author zyj
- * @since 2023-05-16
- */
-@Data
-@ApiModel("Alarm")
-@TableName("br_bus_alarm")
-public class BusAlarm implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 项目ID
-     */
-    @ApiModelProperty(value = "项目ID")
-    @TableField("PROJECT_ID")
-    private Long projectId;
-
-    /**
-     * 设备ID
-     */
-    @ApiModelProperty(value = "设备ID")
-    @TableField("DEVICE_ID")
-    private Long deviceId;
-
-    /**
-     * 报警类型
-     */
-    @ApiModelProperty(value = "报警类型")
-    @TableField("ALARM_TYPE")
-    private String alarmType;
-
-    /**
-     * 报警状态
-     */
-    @ApiModelProperty(value = "报警状态")
-    @TableField("ALARM_STATUS")
-    private String alarmStatus;
-
-    /**
-     * 报警值
-     */
-    @ApiModelProperty(value = "报警值")
-    @TableField("ALARM_VALUE")
-    private String alarmValue;
-
-    /**
-     * 报警图片
-     */
-    @ApiModelProperty(value = "报警图片")
-    @TableField("ALARM_IMAGE")
-    private String alarmImage;
-
-    /**
-     * 报警内容
-     */
-    @ApiModelProperty(value = "报警内容")
-    @TableField("ALARM_CONTENT")
-    private String alarmContent;
-
-    /**
-     * 报警时间
-     */
-    @ApiModelProperty(value = "报警时间")
-    @TableField("ALARM_TIME")
-    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
-    private Date alarmTime;
-
-    /**
-     * 消警时间
-     */
-    @ApiModelProperty(value = "消警时间")
-    @TableField("CANCEL_TIME")
-    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
-    private Date cancelTime;
-
-    /**
-     * 报警位置经度
-     */
-    @ApiModelProperty(value = "报警位置经度")
-    @TableField("ALARM_LNG")
-    private String alarmLng;
-
-    /**
-     * 报警位置纬度
-     */
-    @ApiModelProperty(value = "报警位置纬度")
-    @TableField("ALARM_LAT")
-    private String alarmLat;
-
-    @ApiModelProperty("报警类型名称")
-    @TableField(exist = false)
-    private String alarmStatusName;
-    @ApiModelProperty("报警类型名称")
-    @TableField(exist = false)
-    private String alarmTypeName;
-    @ApiModelProperty("作业名称")
-    @TableField(exist = false)
-    private String workTitle;
-    @ApiModelProperty("所属道路")
-    @TableField(exist = false)
-    private String workRoad;
-    @ApiModelProperty("作业状态")
-    @TableField(exist = false)
-    private String projectState;
-    @ApiModelProperty("作业状态名称")
-    @TableField(exist = false)
-    private String projectStateName;
-    @ApiModelProperty("负责人姓名")
-    @TableField(exist = false)
-    private String workPersonName;
-    @ApiModelProperty("负责人联系方式")
-    @TableField(exist = false)
-    private String workPersonPhoneNumber;
-
-
-    @Override
-    public String toString() {
-        return "BusAlarm{" +
-                "id=" + id +
-                ", projectId=" + projectId +
-                ", deviceId=" + deviceId +
-                ", alarmType=" + alarmType +
-                ", alarmValue=" + alarmValue +
-                ", alarmStatus=" + alarmStatus +
-                ", alarmImage=" + alarmImage +
-                ", alarmContent=" + alarmContent +
-                ", alarmTime=" + alarmTime +
-                ", cancelTime=" + cancelTime +
-                ", alarmLng=" + alarmLng +
-                ", alarmLat=" + alarmLat +
-                "}";
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusEvent.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusEvent.java
deleted file mode 100644
index a0b7543..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusEvent.java
+++ /dev/null
@@ -1,100 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.time.LocalDateTime;
-import java.util.Date;
-import java.util.List;
-
-/**
- * <p>
- * 事件表
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@TableName("br_bus_event")
-@Data
-@ApiModel("BusEvent")
-public class BusEvent implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @ApiModelProperty("事件ID")
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 事件标题
-     */
-    @ApiModelProperty("事件名称")
-    @TableField("EVENT_TITLE")
-    private String eventTitle;
-
-    /**
-     * 上报人员
-     */
-    @ApiModelProperty("上报人员")
-    @TableField("UPLOAD_NAME")
-    private String uploadName;
-
-    /**
-     * 联系方式
-     */
-    @ApiModelProperty("联系方式")
-    @TableField("PHONE_NUMBER")
-    private String phoneNumber;
-
-    /**
-     * 事件描述
-     */
-    @ApiModelProperty("事件描述")
-    @TableField("EVENT_DESCRIPTION")
-    private String eventDescription;
-
-    @ApiModelProperty("经度")
-    @TableField("LNG")
-    private String lng;
-
-    @ApiModelProperty("纬度")
-    @TableField("LAT")
-    private String lat;
-
-    /**
-     * 事件上传时间
-     */
-    @ApiModelProperty("事件上传时间")
-    @TableField("CREATE_TIME")
-    private Date createTime;
-
-    @ApiModelProperty("事件照片")
-    @TableField(exist = false)
-    private List<BusEventImage> imageList;
-
-
-
-    @Override
-    public String toString() {
-        return "BusEvent{" +
-            "id=" + id +
-            ", eventTitle=" + eventTitle +
-            ", uploadName=" + uploadName +
-            ", phoneNumber=" + phoneNumber +
-            ", eventDescription=" + eventDescription +
-            ", lng=" + lng +
-            ", lat=" + lat +
-            ", createTime=" + createTime +
-        "}";
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusEventImage.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusEventImage.java
deleted file mode 100644
index 1e75245..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusEventImage.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-
-/**
- * <p>
- * 事件图片表
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@TableName("br_bus_event_image")
-@Data
-@ApiModel("BusEventImage")
-public class BusEventImage implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 事件ID
-     */
-    @TableField("EVENT_ID")
-    private Long eventId;
-
-    /**
-     * 报警图片
-     */
-    @TableField("IMAGE")
-    @ApiModelProperty("图片url")
-    private String image;
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Device.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Device.java
index df89c70..ea7db5f 100644
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Device.java
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Device.java
@@ -1,30 +1,23 @@
 package com.casic.missiles.modular.system.entity;
 
-import com.alibaba.fastjson.annotation.JSONField;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.casic.missiles.core.base.json.DateDeserializer;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
-import java.util.Date;
 
 /**
  * <p>
- * 
+ * 设备记录表
  * </p>
  *
  * @author zyj
- * @since 2023-04-14
+ * @since 2023-05-25
  */
-@ApiModel("Device")
-@TableName("br_device")
 @Data
+@TableName("bus_device")
 public class Device implements Serializable {
 
     private static final long serialVersionUID = 1L;
@@ -32,82 +25,86 @@
     /**
      * 主键
      */
-    @ApiModelProperty(value = "设备ID")
     @TableId(value = "ID",type = IdType.ASSIGN_ID)
     private Long id;
 
     /**
-     * 设备编号
+     * 设备名称
      */
-    @ApiModelProperty(value = "设备编号")
-    @TableField("DEVICE_CODE")
-    private String deviceCode;
+    @TableField("DEVICE_NAME")
+    private String deviceName;
 
     /**
-     * 设备类型
+     * IP
      */
-    @ApiModelProperty(value = "设备类型")
-    @TableField("DEVICE_TYPE")
-    private String deviceType;
+    @TableField("IP")
+    private String ip;
 
     /**
-     * 设备批次
+     * 端口
      */
-    @ApiModelProperty(value = "设备批次")
-    @TableField("DEVICE_BATCH")
-    private String deviceBatch;
+    @TableField("PORT")
+    private String port;
 
     /**
-     * 厂家
+     * 用户名
      */
-    @ApiModelProperty(value = "厂家")
-    @TableField("MANUFACTURER")
-    private String manufacturer;
+    @TableField("USER_NAME")
+    private String userName;
 
     /**
-     * 是否供电
+     * 密码
      */
-    @ApiModelProperty(value = "是否供电")
-    @TableField("IS_POWER_SUPPLY")
-    private String isPowerSupply;
+    @TableField("PASSWORD")
+    private String password;
 
     /**
-     * 创建时间
+     * 连接类型
      */
-    @ApiModelProperty(value = "创建时间",dataType = "Date")
-    @TableField("CREATE_TIME")
-    private Date createTime;
+    @TableField("CONNECT_TYPE")
+    private String connectType;
 
-    @ApiModelProperty(value = "设备类型名称")
-    @TableField(exist = false)
-    private String deviceTypeName;
+    /**
+     * 位置
+     */
+    @TableField("LOCATION")
 
-    @ApiModelProperty(value = "是否供电名称")
-    @TableField(exist = false)
-    private String isPowerSupplyName;
+    private String location;
 
-    @ApiModelProperty(value = "注册时间",dataType = "String")
-    @TableField(exist = false)
-    private String registerTime;
+    /**
+     * 设备状态
+     */
+    @TableField("STATUS")
 
-    @ApiModelProperty(value = "当前状态")
-    @TableField(exist = false)
     private String status;
 
-    @ApiModelProperty(value = "当前状态名称")
-    @TableField(exist = false)
-    private String statusName;
+    /**
+     * 报警分组
+     */
+    @TableField("ALARM_GROUP")
+
+    private Long alarmGroup;
+
+    /**
+     * 视频通道数(预留)
+     */
+    @TableField("CHANNEL_NUM")
+    private Integer channelNum;
 
     @Override
     public String toString() {
         return "Device{" +
             "id=" + id +
-            ", deviceCode=" + deviceCode +
-            ", deviceType=" + deviceType +
-            ", deviceBatch=" + deviceBatch +
-            ", manufacturer=" + manufacturer +
-            ", isPowerSupply=" + isPowerSupply +
-            ", createTime=" + createTime +
+            ", deviceName=" + deviceName +
+            ", ip=" + ip +
+            ", port=" + port +
+            ", userName=" + userName +
+            ", password=" + password +
+            ", connectType=" + connectType +
+            ", location=" + location +
+            ", status=" + status +
+            ", alarmGroup=" + alarmGroup +
+            ", channelNum=" + channelNum +
         "}";
     }
 }
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/DeviceExt.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/DeviceExt.java
deleted file mode 100644
index 5ee7015..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/DeviceExt.java
+++ /dev/null
@@ -1,99 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-
-/**
- * <p>
- * 设备扩展信息表（安全树）
- * </p>
- *
- * @author zyj
- * @since 2023-04-27
- */
-@Data
-@TableName("br_device_ext")
-public class DeviceExt implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 设备ID
-     */
-    @TableField("DEVICE_ID")
-    private Long deviceId;
-
-    /**
-     * 摄像头编号
-     */
-    @TableField("CAMERA_CODE")
-    private String cameraCode;
-
-    /**
-     * 摄像头IP
-     */
-    @TableField("CAMERA_IP")
-    private String cameraIp;
-
-    /**
-     * 摄像头端口
-     */
-    @TableField("CAMERA_PORT")
-    private String cameraPort;
-
-    /**
-     * 激甲编号
-     */
-    @TableField("GAS_CODE")
-    private String gasCode;
-
-    /**
-     * 激甲IP
-     */
-    @TableField("GAS_IP")
-    private String gasIp;
-
-    /**
-     * 激甲端口
-     */
-    @TableField("GAS_PORT")
-    private String gasPort;
-
-    /**
-     * 甲烷报警阈值
-     */
-    @TableField("GAS_THRESHOLD")
-    private String gasThreshold;
-
-    @TableField(value = "HAT_LINING_CODE")
-    private String hatLiningCode;
-
-
-    @Override
-    public String toString() {
-        return "DeviceExt{" +
-            "id=" + id +
-            ", deviceId=" + deviceId +
-            ", cameraCode=" + cameraCode +
-            ", cameraIp=" + cameraIp +
-            ", cameraPort=" + cameraPort +
-            ", gasCode=" + gasCode +
-            ", gasIp=" + gasIp +
-            ", gasPort=" + gasPort +
-            ", gasThreshold=" + gasThreshold +
-            ", hatLiningCode=" + hatLiningCode +
-        "}";
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/ProjectDevice.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/ProjectDevice.java
deleted file mode 100644
index c4f3472..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/ProjectDevice.java
+++ /dev/null
@@ -1,62 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-
-/**
- * <p>
- * 
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@Data
-@ApiModel("ProjectDevice")
-@TableName("br_project_device")
-public class ProjectDevice implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 作业现场ID
-     */
-    @TableField("PROJECT_ID")
-    private Long projectId;
-
-    /**
-     * 设备ID
-     */
-    @TableField("DEVICE_ID")
-    @ApiModelProperty("设备ID（新增编辑时传）")
-    private Long deviceId;
-
-    /**
-     * 设备编号
-     */
-    @TableField(exist = false)
-    @ApiModelProperty("设备编号（详情中展示，新增编辑不用传）")
-    private String deviceCode;
-
-    @Override
-    public String toString() {
-        return "ProjectDevice{" +
-            "id=" + id +
-            ", projectId=" + projectId +
-            ", deviceId=" + deviceId +
-        "}";
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/ProjectWorker.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/ProjectWorker.java
deleted file mode 100644
index 10b23c4..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/ProjectWorker.java
+++ /dev/null
@@ -1,104 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import java.io.Serializable;
-
-/**
- * <p>
- * 
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@ApiModel("ProjectWorker")
-@TableName("br_project_worker")
-@Data
-@NoArgsConstructor
-@AllArgsConstructor
-public class ProjectWorker implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 作业现场ID
-     */
-    @TableField("PROJECT_ID")
-    private Long projectId;
-
-    /**
-     * 人员ID
-     */
-    @ApiModelProperty("人员ID")
-    @TableField("WORKER_ID")
-    private Long workerId;
-
-    /**
-     * 安全帽编号
-     */
-    @ApiModelProperty("安全帽编号")
-    @TableField("HAT_CODE")
-    private String hatCode;
-
-    /**
-     * 背心编号
-     */
-    @ApiModelProperty("背心编号")
-    @TableField("VAST_CODE")
-    private String vastCode;
-
-    /**
-     * 手环编号
-     */
-    @ApiModelProperty("手环编号")
-    @TableField("BRACELET_CODE")
-    private String braceletCode;
-
-    @ApiModelProperty("人员姓名（详情中展示，新增编辑不用传）")
-    @TableField(exist = false)
-    private String workerName;
-
-    @ApiModelProperty("人员部门ID（详情中展示，新增编辑不用传）")
-    @TableField(exist = false)
-    private String workerDeptId;
-
-    @ApiModelProperty("人员部门名称（详情中展示，新增编辑不用传）")
-    @TableField(exist = false)
-    private String workerDeptName;
-
-    @ApiModelProperty("人员联系方式（详情中展示，新增编辑不用传）")
-    @TableField(exist = false)
-    private String workerPhoneNumber;
-
-    public ProjectWorker(Long projectId, Long workerId) {
-        this.projectId = projectId;
-        this.workerId = workerId;
-    }
-
-    @Override
-    public String toString() {
-        return "ProjectWorker{" +
-            "id=" + id +
-            ", projectId=" + projectId +
-            ", workerId=" + workerId +
-            ", hatCode=" + hatCode +
-            ", vastCode=" + vastCode +
-            ", braceletCode=" + braceletCode +
-        "}";
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/WorkSiteInfo.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/WorkSiteInfo.java
deleted file mode 100644
index fa6f41d..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/WorkSiteInfo.java
+++ /dev/null
@@ -1,130 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.alibaba.fastjson.annotation.JSONField;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.time.LocalDateTime;
-import java.util.Date;
-
-/**
- * <p>
- * 作业现场表
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@ApiModel("WorkSiteInfo")
-@TableName("br_work_site_info")
-@Data
-public class WorkSiteInfo implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @ApiModelProperty("作业现场ID")
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 作业名称
-     */
-    @ApiModelProperty("作业名称")
-    @TableField("WORK_TITLE")
-    private String workTitle;
-
-    /**
-     * 责任人
-     */
-    @ApiModelProperty("责任人（人员ID）")
-    @TableField("WORK_PERSON")
-    private Long workPerson;
-
-    /**
-     * 作业描述
-     */
-    @ApiModelProperty("作业描述")
-    @TableField("WORK_SITE_DESC")
-    private String workSiteDesc;
-
-    /**
-     * 作业状态
-     */
-    @ApiModelProperty("作业状态")
-    @TableField("PROJECT_STATE")
-    private String projectState;
-
-    /**
-     * 所属道路
-     */
-    @ApiModelProperty("所属道路")
-    @TableField("WORK_ROAD")
-    private String workRoad;
-
-    @TableField("IMAGE_URL")
-    private String imageUrl;
-
-    @TableField("CREATE_TIME")
-    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
-    private Date createTime;
-    @TableField("UPDATE_TIME")
-    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
-    private Date updateTime;
-
-    @ApiModelProperty("开始时间")
-    @TableField("START_TIME")
-    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
-    private Date startTime;
-
-    @ApiModelProperty("结束时间")
-    @TableField("FINISH_TIME")
-    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
-    private Date finishTime;
-
-    @ApiModelProperty("负责人姓名（详情中使用，新增编辑不用传）")
-    @TableField(exist = false)
-    private String workPersonName;
-
-    @ApiModelProperty("负责人联系方式（详情中使用，新增编辑不用传）")
-    @TableField(exist = false)
-    private String workPersonPhoneNumber;
-
-    @ApiModelProperty("负责人所属部门ID（详情中使用，新增编辑不用传）")
-    @TableField(exist = false)
-    private Long workPersonDeptId;
-
-    @ApiModelProperty("负责人所属部门名称（详情中使用，新增编辑不用传）")
-    @TableField(exist = false)
-    private String workPersonDeptName;
-
-    @ApiModelProperty(value = "注册时间",dataType = "String")
-    @TableField(exist = false)
-    private String registerTime;
-
-    @ApiModelProperty("作业状态名称")
-    @TableField(exist = false)
-    private String projectStateName;
-
-    @Override
-    public String toString() {
-        return "WorkSiteInfo{" +
-            "id=" + id +
-            ", workTitle=" + workTitle +
-            ", workPerson=" + workPerson +
-            ", workSiteDesc=" + workSiteDesc +
-            ", projectState=" + projectState +
-            ", imageUrl=" + imageUrl +
-            ", updateTime=" + updateTime +
-            ", workRoad=" + workRoad +
-        "}";
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Worker.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Worker.java
deleted file mode 100644
index 28a4daa..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Worker.java
+++ /dev/null
@@ -1,147 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.time.LocalDateTime;
-import java.util.Date;
-
-/**
- * <p>
- * 
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@ApiModel("Worker")
-@TableName("br_worker")
-@Data
-public class Worker implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @ApiModelProperty(value = "人员ID")
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 姓名
-     */
-    @ApiModelProperty(value = "姓名")
-    @TableField("WORKER_NAME")
-    private String workerName;
-
-    /**
-     * 性别
-     */
-    @ApiModelProperty(value = "性别")
-    @TableField("GENDER")
-    private String gender;
-
-    /**
-     * 所属部门
-     */
-    @ApiModelProperty(value = "所属部门(人员管理)")
-    @TableField("DEPT_ID")
-    private Long deptId;
-
-    /**
-     * 所属单位
-     */
-    @ApiModelProperty(value = "所属单位(入场申请中使用)")
-    @TableField("OWNER_SHIP")
-    private String ownerShip;
-
-    /**
-     * 联系方式
-     */
-    @ApiModelProperty(value = "联系方式")
-    @TableField("PHONE_NUMBER")
-    private String phoneNumber;
-
-    /**
-     * 证件号
-     */
-    @ApiModelProperty(value = "证件号")
-    @TableField("ID_CARD_NUMBER")
-    private String idCardNumber;
-
-    /**
-     * 入场原因
-     */
-    @ApiModelProperty(value = "入场原因（入场申请中使用）")
-    @TableField("ENTER_REASON")
-    private String enterReason;
-
-    /**
-     * 入场人脸照片
-     */
-    @ApiModelProperty(value = "人脸照片（照片路径）")
-    @TableField("WORKER_AVATAR")
-    private String workerAvatar;
-
-    /**
-     * 申请入场时间
-     */
-    @ApiModelProperty(value = "注册时间/申请入场时间")
-    @TableField("CREATE_TIME")
-    private Date createTime;
-
-    /**
-     * 人员类型
-     */
-    @ApiModelProperty(value = "人员类型（区分人员管理和入场申请）")
-    @TableField("WORKER_TYPE")
-    private String workerType;
-
-    @ApiModelProperty(value = "性别名称")
-    @TableField(exist = false)
-    private String genderName;
-
-    @ApiModelProperty(value = "部门名称")
-    @TableField(exist = false)
-    private String deptName;
-
-    @ApiModelProperty(value = "注册时间",dataType = "String")
-    @TableField(exist = false)
-    private String registerTime;
-
-    @ApiModelProperty(value = "当前状态")
-    @TableField(exist = false)
-    private String status;
-
-    @ApiModelProperty(value = "当前状态名称")
-    @TableField(exist = false)
-    private String statusName;
-
-    @ApiModelProperty(value = "是否注册(0未注册；1已注册)",allowableValues = "0,1")
-    @TableField(exist = false)
-    private String isRegister;
-
-    @Override
-    public String toString() {
-        return "Worker{" +
-            "id=" + id +
-            ", workerName=" + workerName +
-            ", gender=" + gender +
-            ", deptId=" + deptId +
-            ", ownerShip=" + ownerShip +
-            ", phoneNumber=" + phoneNumber +
-            ", idCardNumber=" + idCardNumber +
-            ", enterReason=" + enterReason +
-            ", workerAvatar=" + workerAvatar +
-            ", createTime=" + createTime +
-            ", workerType=" + workerType +
-        "}";
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/AlarmMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/AlarmMapper.java
new file mode 100644
index 0000000..ea4c8be
--- /dev/null
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/AlarmMapper.java
@@ -0,0 +1,16 @@
+package com.casic.missiles.modular.system.mapper;
+
+import com.casic.missiles.modular.system.entity.Alarm;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 报警记录表 Mapper 接口
+ * </p>
+ *
+ * @author zyj
+ * @since 2023-05-25
+ */
+public interface AlarmMapper extends BaseMapper<Alarm> {
+
+}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/BusAlarmMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/BusAlarmMapper.java
deleted file mode 100644
index 9801742..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/BusAlarmMapper.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package com.casic.missiles.modular.system.mapper;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.modular.system.dto.AlarmTypeCountDTO;
-import com.casic.missiles.modular.system.entity.BusAlarm;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * <p>
- * 报警记录表 Mapper 接口
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface BusAlarmMapper extends BaseMapper<BusAlarm> {
-
-    Page<BusAlarm> listPage(Page<BusAlarm> page,@Param("ew")  QueryWrapper<BusAlarm> queryWrapper);
-
-    void cancelAlarm(@Param("deviceId")Long deviceId,@Param("alarmType") String alarmType);
-
-    List<AlarmTypeCountDTO> alarmCount(@Param("projectId")Long projectId, @Param("alarmStatus")String alarmStatus);
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/BusEventImageMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/BusEventImageMapper.java
deleted file mode 100644
index 9590b7d..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/BusEventImageMapper.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.casic.missiles.modular.system.mapper;
-
-import com.casic.missiles.modular.system.entity.BusEventImage;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * <p>
- * 事件图片表 Mapper 接口
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface BusEventImageMapper extends BaseMapper<BusEventImage> {
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/BusEventMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/BusEventMapper.java
deleted file mode 100644
index 3c85edf..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/BusEventMapper.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.casic.missiles.modular.system.mapper;
-
-import com.casic.missiles.modular.system.entity.BusEvent;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * <p>
- * 事件表 Mapper 接口
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface BusEventMapper extends BaseMapper<BusEvent> {
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/DeviceExtMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/DeviceExtMapper.java
deleted file mode 100644
index 4ca9212..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/DeviceExtMapper.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.casic.missiles.modular.system.mapper;
-
-import com.casic.missiles.modular.system.entity.DeviceExt;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * <p>
- * 设备扩展信息表（安全树） Mapper 接口
- * </p>
- *
- * @author zyj
- * @since 2023-04-27
- */
-public interface DeviceExtMapper extends BaseMapper<DeviceExt> {
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/DeviceMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/DeviceMapper.java
index 444c0c5..3d0bb02 100644
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/DeviceMapper.java
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/DeviceMapper.java
@@ -1,30 +1,16 @@
 package com.casic.missiles.modular.system.mapper;
 
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.modular.system.dto.DeviceDetailDTO;
-import com.casic.missiles.modular.system.dto.HelmetInfoDTO;
 import com.casic.missiles.modular.system.entity.Device;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
 
 /**
  * <p>
- *  Mapper 接口
+ * 设备记录表 Mapper 接口
  * </p>
  *
  * @author zyj
- * @since 2023-04-14
+ * @since 2023-05-25
  */
-@Mapper
 public interface DeviceMapper extends BaseMapper<Device> {
 
-    Page<DeviceDetailDTO> listDetailPage(Page<DeviceDetailDTO> page,@Param("ew") QueryWrapper<DeviceDetailDTO> ew);
-
-     List<Long> selectProjectDevice(@Param("projectId") Long projectId);
-
-    List<HelmetInfoDTO> selectHelmetList(@Param("deviceType")String deviceType);
 }
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/ProjectDeviceMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/ProjectDeviceMapper.java
deleted file mode 100644
index 1d0c14e..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/ProjectDeviceMapper.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package com.casic.missiles.modular.system.mapper;
-
-import com.casic.missiles.modular.system.dto.DeviceLocationDTO;
-import com.casic.missiles.modular.system.entity.ProjectDevice;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * <p>
- *  Mapper 接口
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface ProjectDeviceMapper extends BaseMapper<ProjectDevice> {
-     List<ProjectDevice> selectDetailByProjectId(@Param("projectId") Long projectId);
-
-     List<DeviceLocationDTO> selectDeviceLocationList(@Param("projectId") Long projectId);
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/ProjectWorkerMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/ProjectWorkerMapper.java
deleted file mode 100644
index 58583d1..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/ProjectWorkerMapper.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package com.casic.missiles.modular.system.mapper;
-
-import com.casic.missiles.modular.system.dto.WorkerLocationDTO;
-import com.casic.missiles.modular.system.entity.ProjectWorker;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * <p>
- *  Mapper 接口
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface ProjectWorkerMapper extends BaseMapper<ProjectWorker> {
-
-    List<ProjectWorker> selectDetailByProjectId(@Param("projectId") Long projectId,
-                                                @Param("workerType")String workerType);
-
-    List<WorkerLocationDTO> selectWorkerLocationList(@Param("projectId") Long projectId,
-                                                     @Param("workerType")String workerType);
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/WorkSiteInfoMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/WorkSiteInfoMapper.java
deleted file mode 100644
index a4934d2..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/WorkSiteInfoMapper.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.casic.missiles.modular.system.mapper;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.modular.system.entity.WorkSiteInfo;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Param;
-
-/**
- * <p>
- * 作业现场表 Mapper 接口
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface WorkSiteInfoMapper extends BaseMapper<WorkSiteInfo> {
-
-    Page<WorkSiteInfo> selectListPage(Page<WorkSiteInfo> page,@Param("ew") QueryWrapper<WorkSiteInfo> ew);
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/WorkerMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/WorkerMapper.java
deleted file mode 100644
index 258fb12..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/WorkerMapper.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package com.casic.missiles.modular.system.mapper;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.modular.system.dto.DeviceDetailDTO;
-import com.casic.missiles.modular.system.entity.Worker;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * <p>
- *  Mapper 接口
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface WorkerMapper extends BaseMapper<Worker> {
-
-
-    Page<Worker> selectListPage(Page<Worker> page, @Param("ew") QueryWrapper<Worker> ew);
-
-    List<String> selectWorkerAvatars(@Param("projectId")Long projectId);
-
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/AlarmMapper.xml b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/AlarmMapper.xml
new file mode 100644
index 0000000..25cb4ab
--- /dev/null
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/AlarmMapper.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.modular.system.mapper.AlarmMapper">
+
+</mapper>
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/BusAlarmMapper.xml b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/BusAlarmMapper.xml
deleted file mode 100644
index 595088a..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/BusAlarmMapper.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.casic.missiles.modular.system.mapper.BusAlarmMapper">
-
-    <select id="listPage" resultType="com.casic.missiles.modular.system.entity.BusAlarm">
-        SELECT
-            alarm.ID as id,
-            alarm.DEVICE_ID as deviceId,
-            alarm.PROJECT_ID as projectId,
-            alarm.ALARM_TYPE as alarmType,
-            alarm.ALARM_VALUE as alarmValue,
-            alarm.ALARM_STATUS as alarmStatus,
-            alarm.ALARM_IMAGE AS alarmImage,
-            alarm.ALARM_CONTENT as alarmContent,
-            alarm.ALARM_TIME as alarmTime,
-            alarm.CANCEL_TIME as cancelTime,
-            alarm.ALARM_LNG as alarmLng,
-            alarm.ALARM_LAT as alarmLat,
-            p.WORK_TITLE as workTitle,
-            p.WORK_ROAD as workRoad,
-            p.PROJECT_STATE as projectState,
-            w.WORKER_NAME as workPersonName,
-            w.PHONE_NUMBER as workPersonPhoneNumber
-        FROM
-            `br_bus_alarm` alarm
-                LEFT JOIN br_work_site_info p on alarm.PROJECT_ID = p.ID
-                LEFT JOIN br_worker w on p.WORK_PERSON = w.ID
-        <where>
-            <if test="ew != null">
-                ${ew.sqlSegment}
-            </if>
-        </where>
-    </select>
-
-    <select id="cancelAlarm">
-        update br_bus_alarm
-        set ALARM_STATUS = '1'
-        where DEVICE_ID = #{deviceId}
-          and ALARM_TYPE = #{alarmType}
-          and ALARM_STATUS = '0'
-    </select>
-
-    <select id="alarmCount" resultType="com.casic.missiles.modular.system.dto.AlarmTypeCountDTO">
-        SELECT
-            ALARM_TYPE as alarmType,
-            count(*) as alarmCount
-        from br_bus_alarm
-        <where>
-            <if test="projectId != null and projectId !=''">
-                and PROJECT_ID = #{projectId}
-            </if>
-            <if test="alarmStatus != null and alarmStatus !=''">
-                and ALARM_STATUS = #{alarmStatus}
-            </if>
-        </where>
-        group by ALARM_TYPE
-    </select>
-</mapper>
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/BusEventImageMapper.xml b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/BusEventImageMapper.xml
deleted file mode 100644
index fbc3db3..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/BusEventImageMapper.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.casic.missiles.modular.system.mapper.BusEventImageMapper">
-
-</mapper>
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/BusEventMapper.xml b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/BusEventMapper.xml
deleted file mode 100644
index 627d573..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/BusEventMapper.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.casic.missiles.modular.system.mapper.BusEventMapper">
-
-</mapper>
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/DeviceExtMapper.xml b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/DeviceExtMapper.xml
deleted file mode 100644
index 5321d1c..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/DeviceExtMapper.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.casic.missiles.modular.system.mapper.DeviceExtMapper">
-
-</mapper>
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/DeviceMapper.xml b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/DeviceMapper.xml
index 94262e1..88e7d01 100644
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/DeviceMapper.xml
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/DeviceMapper.xml
@@ -2,96 +2,4 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.casic.missiles.modular.system.mapper.DeviceMapper">
 
-    <select id="listDetailPage" resultType="com.casic.missiles.modular.system.dto.DeviceDetailDTO">
-        select
-        br_device.ID as id,
-        DEVICE_CODE as deviceCode,
-        DEVICE_TYPE as deviceType,
-        DEVICE_BATCH as deviceBatch,
-        MANUFACTURER as manufacturer,
-        IS_POWER_SUPPLY as isPowerSupply,
-        CREATE_TIME as createTime,
-        CAMERA_CODE as cameraCode,
-        CAMERA_IP as cameraIp,
-        CAMERA_PORT as cameraPort,
-        GAS_CODE as gasCode,
-        GAS_IP as gasIp,
-        GAS_PORT as gasPort,
-        HAT_LINING_CODE as hatLiningCode
-        from br_device
-        left join br_device_ext ext on ext.DEVICE_ID = br_device.ID
-        <where>
-            <if test="ew != null">
-                ${ew.sqlSegment}
-            </if>
-        </where>
-    </select>
-
-    <select id="selectProjectDevice" resultType="java.lang.Long">
-        with device_info as (
-            (SELECT
-            d.DEVICE_ID as DEVICE_ID,
-            d.PROJECT_ID as PROJECT_ID,
-            p.PROJECT_STATE as PROJECT_STATE
-            from br_project_device d
-            LEFT JOIN br_work_site_info p on p.ID = d.PROJECT_ID)
-
-            UNION ALL
-
-            (SELECT
-            d1.ID as DEVICE_ID,
-            w1.ID as PROJECT_ID,
-            w1.PROJECT_STATE as PROJECT_STATE
-            FROM br_project_worker pw1
-            LEFT JOIN br_device d1 on pw1.BRACELET_CODE = d1.DEVICE_CODE
-            LEFT JOIN br_work_site_info w1 on pw1.PROJECT_ID = w1.ID)
-
-            UNION ALL
-
-            (SELECT
-            d1.ID as DEVICE_ID,
-            w1.ID as PROJECT_ID,
-            w1.PROJECT_STATE as PROJECT_STATE
-            FROM br_project_worker pw1
-            LEFT JOIN br_device d1 on pw1.HAT_CODE = d1.DEVICE_CODE
-            LEFT JOIN br_work_site_info w1 on pw1.PROJECT_ID = w1.ID)
-
-
-            UNION ALL
-
-            (SELECT
-            d1.ID as DEVICE_ID,
-            w1.ID as PROJECT_ID,
-            w1.PROJECT_STATE as PROJECT_STATE
-            FROM br_project_worker pw1
-            LEFT JOIN br_device d1 on pw1.VAST_CODE = d1.DEVICE_CODE
-            LEFT JOIN br_work_site_info w1 on pw1.PROJECT_ID = w1.ID))
-
-        select DISTINCT DEVICE_ID from device_info
-        <where>
-            DEVICE_ID is not null
-            <choose>
-                <when test="projectId != null and projectId !=''">
-                    and PROJECT_ID = #{projectId}
-                </when>
-                <otherwise>
-                    AND PROJECT_STATE != '3'
-                </otherwise>
-            </choose>
-        </where>
-    </select>
-
-    <select id="selectHelmetList" resultType="com.casic.missiles.modular.system.dto.HelmetInfoDTO">
-        SELECT
-            a.ID AS deviceId,
-            a.DEVICE_CODE AS hatCode,
-            b.HAT_LINING_CODE AS hatLiningCode
-        FROM
-            br_device a
-                LEFT JOIN br_device_ext b ON a.ID = b.DEVICE_ID
-        WHERE
-            a.DEVICE_TYPE = #{deviceType}
-          AND a.DEVICE_CODE IS NOT NULL
-          AND b.HAT_LINING_CODE IS NOT NULL
-    </select>
 </mapper>
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/ProjectDeviceMapper.xml b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/ProjectDeviceMapper.xml
deleted file mode 100644
index c6d1c24..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/ProjectDeviceMapper.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.casic.missiles.modular.system.mapper.ProjectDeviceMapper">
-
-    <select id="selectDetailByProjectId" resultType="com.casic.missiles.modular.system.entity.ProjectDevice">
-        SELECT
-            pd.ID as id,
-            pd.PROJECT_ID as projectId,
-            pd.DEVICE_ID as deviceId,
-            d.DEVICE_CODE as deviceCode
-        from br_project_device pd
-        LEFT JOIN br_device d on pd.DEVICE_ID = d.ID
-        <where>
-            pd.PROJECT_ID = #{projectId}
-        </where>
-    </select>
-
-    <select id="selectDeviceLocationList" resultType="com.casic.missiles.modular.system.dto.DeviceLocationDTO">
-        SELECT
-        d.ID as deviceId,
-        d.DEVICE_TYPE as deviceType,
-        d.DEVICE_CODE as deviceCode,
-        if(EXISTS(select ID from br_bus_alarm WHERE DEVICE_ID = d.ID and ALARM_STATUS = '0'),true,false) as alarmFlag
-        FROM br_project_device pd, br_device d
-        where pd.DEVICE_ID = d.ID
-        and pd.PROJECT_ID = #{projectId}
-    </select>
-
-</mapper>
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/ProjectWorkerMapper.xml b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/ProjectWorkerMapper.xml
deleted file mode 100644
index 8d2de10..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/ProjectWorkerMapper.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.casic.missiles.modular.system.mapper.ProjectWorkerMapper">
-
-    <select id="selectDetailByProjectId" resultType="com.casic.missiles.modular.system.entity.ProjectWorker">
-        SELECT
-            pw.ID as id,
-            pw.PROJECT_ID as projectId,
-            pw.WORKER_ID as workerId,
-            w.WORKER_NAME as workerName,
-            w.DEPT_ID as workerDeptId,
-            pw.HAT_CODE as hatCode,
-            pw.VAST_CODE as vastCode,
-            pw.BRACELET_CODE as braceletCode,
-            w.PHONE_NUMBER as workerPhoneNumber
-        from br_project_worker pw
-        LEFT JOIN br_worker w on pw.WORKER_ID = w.ID
-        <where>
-            pw.PROJECT_ID = #{projectId}
-            <if test="workerType != null and workerType != ''">
-                and w.WORKER_TYPE = #{workerType}
-            </if>
-        </where>
-    </select>
-
-    <select id="selectWorkerLocationList" resultType="com.casic.missiles.modular.system.dto.WorkerLocationDTO">
-        select
-            w.ID as workerId,
-            w.WORKER_NAME as workerName,
-            pw.HAT_CODE as hatCode,
-            hd.ID as hatId,
-            pw.BRACELET_CODE as braceletCode,
-            pw.VAST_CODE as vastCode
-        from br_project_worker pw,br_worker w ,br_device hd
-        WHERE pw.WORKER_ID = w.ID
-          and pw.HAT_CODE = hd.DEVICE_CODE
-          and pw.PROJECT_ID = #{projectId}
-          and w.WORKER_TYPE = #{workerType}
-    </select>
-</mapper>
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/WorkSiteInfoMapper.xml b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/WorkSiteInfoMapper.xml
deleted file mode 100644
index 8f01326..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/WorkSiteInfoMapper.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.casic.missiles.modular.system.mapper.WorkSiteInfoMapper">
-
-    <select id="selectListPage" resultType="com.casic.missiles.modular.system.entity.WorkSiteInfo">
-        SELECT
-            br_work_site_info.ID AS id,
-            WORK_TITLE as workTitle,
-            WORK_ROAD as workRoad,
-            WORK_SITE_DESC as workSiteDesc,
-            WORK_PERSON as workPerson,
-            WORKER_NAME as workPersonName,
-            DEPT_ID as workPersonDeptId,
-            PHONE_NUMBER as workPersonPhoneNumber,
-            PROJECT_STATE as projectState,
-            br_work_site_info.CREATE_TIME AS createTime,
-            br_work_site_info.UPDATE_TIME AS updateTime
-        FROM br_work_site_info
-        LEFT JOIN br_worker w ON br_work_site_info.WORK_PERSON = w.ID
-        <where>
-            <if test="ew != null">
-                ${ew.sqlSegment}
-            </if>
-        </where>
-    </select>
-</mapper>
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/WorkerMapper.xml b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/WorkerMapper.xml
deleted file mode 100644
index 3e28b39..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/WorkerMapper.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.casic.missiles.modular.system.mapper.WorkerMapper">
-
-    <select id="selectListPage" resultType="com.casic.missiles.modular.system.entity.Worker">
-        WITH worker_project AS (
-            SELECT
-                w.id AS ID,
-                WORKER_NAME,
-                GENDER,
-                DEPT_ID,
-                OWNER_SHIP,
-                PHONE_NUMBER,
-                ID_CARD_NUMBER,
-                ENTER_REASON,
-                WORKER_AVATAR,
-                w.CREATE_TIME,
-                WORKER_TYPE,
-                IF( p.PROJECT_STATE != '3', 1, 0 ) AS `STATUS`
-            FROM br_worker w
-            LEFT JOIN br_project_worker pw ON w.ID = pw.WORKER_ID
-            LEFT JOIN br_work_site_info p ON pw.PROJECT_ID = p.ID
-        )
-
-        SELECT
-            ID AS id,
-            WORKER_NAME AS workerName,
-            GENDER AS gender,
-            DEPT_ID AS deptId,
-            OWNER_SHIP AS ownerShip,
-            PHONE_NUMBER AS phoneNumber,
-            ID_CARD_NUMBER AS idCardNumber,
-            ENTER_REASON AS enterReason,
-            WORKER_AVATAR AS workerAvatar,
-            CREATE_TIME AS createTime,
-            WORKER_TYPE AS workerType,
-            `STATUS` AS `status`
-        FROM worker_project
-        <where>
-            <if test="ew != null">
-                ${ew.sqlSegment}
-            </if>
-        </where>
-    </select>
-
-    <select id="selectWorkerAvatars" resultType="java.lang.String">
-        SELECT
-            WORKER_AVATAR
-        FROM
-            `br_worker`
-        WHERE
-        ID IN ( SELECT WORKER_ID FROM br_project_worker WHERE PROJECT_ID = #{projectId} )
-          AND WORKER_AVATAR IS NOT NULL
-          AND WORKER_AVATAR != ''
-    </select>
-</mapper>
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IAlarmService.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IAlarmService.java
new file mode 100644
index 0000000..8bc01f4
--- /dev/null
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IAlarmService.java
@@ -0,0 +1,16 @@
+package com.casic.missiles.modular.system.service;
+
+import com.casic.missiles.modular.system.entity.Alarm;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 报警记录表 服务类
+ * </p>
+ *
+ * @author zyj
+ * @since 2023-05-25
+ */
+public interface IAlarmService extends IService<Alarm> {
+
+}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IBusAlarmService.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IBusAlarmService.java
deleted file mode 100644
index f63c19c..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IBusAlarmService.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package com.casic.missiles.modular.system.service;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.modular.system.dto.AlarmTypeCountDTO;
-import com.casic.missiles.modular.system.dto.AlarmUpload;
-import com.casic.missiles.modular.system.entity.BusAlarm;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-import java.util.List;
-
-/**
- * <p>
- * 报警记录表 服务类
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface IBusAlarmService extends IService<BusAlarm> {
-
-    boolean alarmUpload(AlarmUpload alarmUpload);
-
-    Page<BusAlarm> listPage(Page<BusAlarm> page,QueryWrapper<BusAlarm> queryWrapper);
-
-    List<AlarmTypeCountDTO> alarmCount(Long projectId,String alarmStatus);
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IBusEventImageService.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IBusEventImageService.java
deleted file mode 100644
index b1187ed..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IBusEventImageService.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.casic.missiles.modular.system.service;
-
-import com.casic.missiles.modular.system.entity.BusEventImage;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-import java.util.List;
-
-/**
- * <p>
- * 事件图片表 服务类
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface IBusEventImageService extends IService<BusEventImage> {
-
-    boolean saveBusEventImages(Long eventId, List<BusEventImage> imageList);
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IBusEventService.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IBusEventService.java
deleted file mode 100644
index 85c48d0..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IBusEventService.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package com.casic.missiles.modular.system.service;
-
-import com.casic.missiles.modular.system.entity.BusEvent;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-/**
- * <p>
- * 事件表 服务类
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface IBusEventService extends IService<BusEvent> {
-
-    boolean saveBusEvent(BusEvent busEvent);
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IDeviceExtService.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IDeviceExtService.java
deleted file mode 100644
index 6fc5361..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IDeviceExtService.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package com.casic.missiles.modular.system.service;
-
-import com.casic.missiles.modular.system.dto.DeviceDetailDTO;
-import com.casic.missiles.modular.system.entity.DeviceExt;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-import java.util.List;
-
-/**
- * <p>
- * 设备扩展信息表（安全树） 服务类
- * </p>
- *
- * @author zyj
- * @since 2023-04-27
- */
-public interface IDeviceExtService extends IService<DeviceExt> {
-
-    boolean saveDeviceExt(DeviceDetailDTO deviceDetailDTO);
-
-    boolean updateDeviceExt(DeviceDetailDTO deviceDetailDTO);
-
-    boolean removeByDeviceIds(List<Long> deviceIds);
-
-    boolean setGasThreshold(String gasIp,String gasPort,String threshold);
-
-    String getGasThreshold(String gasIp,String gasPort);
-
-    Long selectByGasIpPort(String gasIp,String gasPort);
-
-    Long selectByCameraIpPort(String cameraIp,String cameraPort);
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java
index 9e62756..00a421d 100644
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java
@@ -1,32 +1,16 @@
 package com.casic.missiles.modular.system.service;
 
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.modular.system.dto.DeviceDetailDTO;
-import com.casic.missiles.modular.system.dto.HelmetInfoDTO;
 import com.casic.missiles.modular.system.entity.Device;
 import com.baomidou.mybatisplus.extension.service.IService;
 
-import java.util.List;
-
 /**
  * <p>
- *  服务类
+ * 设备记录表 服务类
  * </p>
  *
  * @author zyj
- * @since 2023-04-14
+ * @since 2023-05-25
  */
 public interface IDeviceService extends IService<Device> {
 
-    boolean saveDevice(DeviceDetailDTO deviceDetailDTO);
-
-    boolean updateDevice(DeviceDetailDTO deviceDetailDTO);
-
-    boolean deleteDevices(List<Long> deviceIds);
-
-    Page<DeviceDetailDTO> listPage(Page<DeviceDetailDTO> page, QueryWrapper<DeviceDetailDTO> queryWrapper, String status,Long projectId);
-
-    List<Long> selectProjectDevice(Long projectId);
-
 }

diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/AlarmController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/AlarmController.java
new file mode 100644
index 0000000..1795cf1
--- /dev/null
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/AlarmController.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.modular.system.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.stereotype.Controller;
+
+/**
+ * <p>
+ * 报警记录表 前端控制器
+ * </p>
+ *
+ * @author zyj
+ * @since 2023-05-25
+ */
+@Controller
+@RequestMapping("/system/alarm")
+public class AlarmController {
+
+}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusAlarmController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusAlarmController.java
deleted file mode 100644
index 1f82ebb..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusAlarmController.java
+++ /dev/null
@@ -1,102 +0,0 @@
-package com.casic.missiles.modular.system.controller;
-
-
-import cn.hutool.core.util.ObjectUtil;
-import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.core.base.controller.BaseController;
-import com.casic.missiles.core.page.PageFactory;
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.AlarmUpload;
-import com.casic.missiles.modular.system.dto.DeviceDetailDTO;
-import com.casic.missiles.modular.system.entity.BusAlarm;
-import com.casic.missiles.modular.system.service.IBusAlarmService;
-import io.swagger.annotations.*;
-import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.*;
-
-import org.springframework.stereotype.Controller;
-
-import static com.casic.missiles.model.response.ResponseData.DEFAULT_SUCCESS_MESSAGE;
-import static com.casic.missiles.modular.system.consts.AlarmConst.ALARM_STATUS_MANUAL_CANCEL;
-
-/**
- * <p>
- * 报警记录表 前端控制器
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@Api(tags = "报警管理接口")
-@Controller
-@RequestMapping("/alarm")
-@RequiredArgsConstructor
-public class BusAlarmController extends BaseController {
-
-    private final IBusAlarmService alarmService;
-
-    @ApiOperation("报警上报接口")
-    @PostMapping("/upload")
-    @ResponseBody
-    public Object upload(@RequestBody AlarmUpload alarmUpload){
-        alarmService.alarmUpload(alarmUpload);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("报警列表分页查询")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "workTitle", value = "作业名称",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "projectId", value = "作业ID",dataType = "Long", paramType = "query",example = "0"),
-            @ApiImplicitParam(name = "alarmStatus", value = "报警状态",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "projectState", value = "作业状态",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "alarmType", value = "报警类型",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "alarmStartTime", value = "报警开始时间",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "alarmEndTime", value = "报警结束时间",dataType = "String", paramType = "query")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = BusAlarm.class),
-    })
-    @GetMapping("/listPage")
-    @ResponseBody
-    public Object listPage(String workTitle,Long projectId,String alarmStatus,String projectState,String alarmType,String alarmStartTime,String alarmEndTime){
-        Page<BusAlarm> page = PageFactory.defaultPage();
-        QueryWrapper<BusAlarm> queryWrapper = new QueryWrapper<>();
-        if(StrUtil.isNotEmpty(workTitle)){
-            queryWrapper.like("p.WORK_TITLE",workTitle);
-        }
-        if(ObjectUtil.isNotEmpty(projectId)){
-            queryWrapper.eq("alarm.PROJECT_ID",projectId);
-        }
-        if(StrUtil.isNotEmpty(alarmStatus)){
-            queryWrapper.eq("alarm.ALARM_STATUS",alarmStatus);
-        }
-        if(StrUtil.isNotEmpty(projectState)){
-            queryWrapper.eq("p.PROJECT_STATE",projectState);
-        }
-        if(StrUtil.isNotEmpty(alarmType)){
-            queryWrapper.eq("alarm.ALARM_TYPE",alarmType);
-        }
-        if(StrUtil.isNotEmpty(alarmStartTime)){
-            queryWrapper.ge("alarm.ALARM_TIME",alarmStartTime);
-        }
-        if(StrUtil.isNotEmpty(alarmEndTime)){
-            queryWrapper.le("alarm.ALARM_TIME",alarmEndTime);
-        }
-        page = alarmService.listPage(page,queryWrapper);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-    @ApiOperation("消警")
-    @PostMapping("/cancel")
-    @ResponseBody
-    public Object cancel(@RequestParam("alarmId") Long alarmId){
-        UpdateWrapper<BusAlarm> updateWrapper = new UpdateWrapper<>();
-        updateWrapper.eq("ID",alarmId);
-        updateWrapper.set("ALARM_STATUS",ALARM_STATUS_MANUAL_CANCEL);
-        alarmService.update(updateWrapper);
-        return ResponseData.success();
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusEventController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusEventController.java
deleted file mode 100644
index dde5aad..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusEventController.java
+++ /dev/null
@@ -1,41 +0,0 @@
-package com.casic.missiles.modular.system.controller;
-
-
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.entity.BusEvent;
-import com.casic.missiles.modular.system.service.IBusEventService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.ResponseBody;
-
-/**
- * <p>
- * 事件表 前端控制器
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@Controller
-@RequestMapping("/event")
-@Api(tags = "事件上报")
-@RequiredArgsConstructor
-public class BusEventController {
-
-    private final IBusEventService eventService;
-
-    @ApiOperation("事件上报")
-    @PostMapping("add")
-    @ResponseBody
-    public Object add(@RequestBody BusEvent busEvent){
-        eventService.saveBusEvent(busEvent);
-        return ResponseData.success();
-    }
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
index 03abc5f..aa50d78 100644
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
@@ -1,121 +1,20 @@
 package com.casic.missiles.modular.system.controller;
 
 
-import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.core.base.controller.BaseController;
-import com.casic.missiles.core.page.PageFactory;
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.DeviceDetailDTO;
-import com.casic.missiles.modular.system.entity.Device;
-import com.casic.missiles.modular.system.service.IDeviceExtService;
-import com.casic.missiles.modular.system.service.IDeviceService;
-import io.swagger.annotations.*;
-import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.RequestMapping;
 
 import org.springframework.stereotype.Controller;
 
-import java.time.LocalDateTime;
-import java.util.Date;
-import java.util.List;
-
-import static com.casic.missiles.model.response.ResponseData.DEFAULT_SUCCESS_MESSAGE;
-
 /**
  * <p>
- *  前端控制器
+ * 设备记录表 前端控制器
  * </p>
  *
  * @author zyj
- * @since 2023-04-14
+ * @since 2023-05-25
  */
-@Api(tags = "设备管理接口")
-@RequiredArgsConstructor
 @Controller
-@RequestMapping("/device")
-public class DeviceController extends BaseController {
-    private final IDeviceService deviceService;
-    private final IDeviceExtService deviceExtService;
-
-    @ApiOperation("设备分页列表")
-    @ApiImplicitParams({
-        @ApiImplicitParam(name = "deviceType", value = "设备类型",dataType = "String", paramType = "query"),
-        @ApiImplicitParam(name = "deviceCode", value = "设备编号",dataType = "String", paramType = "query"),
-        @ApiImplicitParam(name = "status", value = "设备状态",dataType = "String", paramType = "query"),
-        @ApiImplicitParam(name = "projectId", value = "作业ID（如果传此参数，列表中返回该作业使用的设备）",dataType = "Long", paramType = "query", example = "0")
-    })
-    @ApiResponses({
-        @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = DeviceDetailDTO.class),
-    })
-    @GetMapping("listPage")
-    @ResponseBody
-    public Object listPage(String deviceType, String deviceCode, String status,Long projectId){
-        Page<DeviceDetailDTO> page = PageFactory.defaultPage();
-        QueryWrapper<DeviceDetailDTO> queryWrapper = new QueryWrapper<>();
-        if(StrUtil.isNotEmpty(deviceType)){
-            queryWrapper.eq("DEVICE_TYPE",deviceType);
-        }
-        if(StrUtil.isNotEmpty(deviceCode)){
-            queryWrapper.like("DEVICE_CODE",deviceCode);
-        }
-        page = deviceService.listPage(page,queryWrapper,status,projectId);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-    @ApiOperation("新增设备")
-    @PostMapping("add")
-    @ResponseBody
-    public Object add(@RequestBody DeviceDetailDTO deviceDetailDTO){
-        deviceService.saveDevice(deviceDetailDTO);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("编辑设备")
-    @PostMapping("update")
-    @ResponseBody
-    public Object update(@RequestBody DeviceDetailDTO deviceDetailDTO){
-        deviceService.updateDevice(deviceDetailDTO);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("删除设备")
-    @PostMapping("delete")
-    @ResponseBody
-    public Object delete(@ApiParam("设备id列表")@RequestBody List<Long> deviceIds){
-        deviceService.deleteDevices(deviceIds);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("设置甲烷阈值")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "gasIp", value = "安全树甲烷设备IP",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "gasPort", value = "安全树甲烷端口",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "threshold", value = "甲烷阈值",dataType = "String", paramType = "query")
-    })
-    @PostMapping("setThreshold")
-    @ResponseBody
-    public Object setThreshold(String gasIp,String gasPort,String threshold){
-        deviceExtService.setGasThreshold(gasIp, gasPort, threshold);
-        return ResponseData.success();
-    }
-
-
-    @ApiOperation("查询甲烷阈值")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "gasIp", value = "安全树甲烷设备IP",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "gasPort", value = "安全树甲烷端口",dataType = "String", paramType = "query")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = "{\"code\": 200,\"data\": \"100\",\"message\": \"请求成功\",\"success\": true}",response = String.class),
-    })
-    @GetMapping("getThreshold")
-    @ResponseBody
-    public Object getThreshold(String gasIp,String gasPort){
-        String data = deviceExtService.getGasThreshold(gasIp, gasPort);
-        return ResponseData.success(data);
-    }
-
+@RequestMapping("/system/device")
+public class DeviceController {
 
 }
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/OverviewController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/OverviewController.java
deleted file mode 100644
index 7570504..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/OverviewController.java
+++ /dev/null
@@ -1,70 +0,0 @@
-package com.casic.missiles.modular.system.controller;
-
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.AlarmTypeCountDTO;
-import com.casic.missiles.modular.system.dto.DeviceLocationDTO;
-import com.casic.missiles.modular.system.dto.WorkerLocationDTO;
-import com.casic.missiles.modular.system.service.IBusAlarmService;
-import com.casic.missiles.modular.system.service.IProjectDeviceService;
-import com.casic.missiles.modular.system.service.IProjectWorkerService;
-import io.swagger.annotations.*;
-import lombok.RequiredArgsConstructor;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.ResponseBody;
-
-import static com.casic.missiles.model.response.ResponseData.DEFAULT_SUCCESS_MESSAGE;
-import static com.casic.missiles.modular.system.consts.AlarmConst.ALARM_STATUS_ON;
-
-@Api(tags = "首页看板接口")
-@Controller
-@RequestMapping("overview")
-@RequiredArgsConstructor
-public class OverviewController {
-
-    private final IBusAlarmService alarmService;
-    private final IProjectDeviceService projectDeviceService;
-
-    private final IProjectWorkerService projectWorkerService;
-
-
-    @ApiOperation("报警统计接口")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "projectId", value = "作业ID",dataType = "Long", paramType = "query", example = "0")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = AlarmTypeCountDTO.class),
-    })
-    @GetMapping("/alarmCount")
-    @ResponseBody
-    public Object alarmCount(Long projectId){
-        return ResponseData.success(alarmService.alarmCount(projectId,ALARM_STATUS_ON));
-    }
-
-    @ApiOperation("设备列表接口")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "projectId", value = "作业ID",dataType = "Long", paramType = "query", example = "0")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = DeviceLocationDTO.class),
-    })
-    @GetMapping("/deviceList")
-    @ResponseBody
-    public Object deviceList(Long projectId){
-        return ResponseData.success(projectDeviceService.selectDeviceLocationList(projectId));
-    }
-
-    @ApiOperation("人员列表接口")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "projectId", value = "作业ID",dataType = "Long", paramType = "query", example = "0")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = WorkerLocationDTO.class),
-    })
-    @GetMapping("/workerList")
-    @ResponseBody
-    public Object workerList(Long projectId){
-        return ResponseData.success(projectWorkerService.selectWorkerLocationDTO(projectId));
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/WorkSiteInfoController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/WorkSiteInfoController.java
deleted file mode 100644
index af36d69..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/WorkSiteInfoController.java
+++ /dev/null
@@ -1,130 +0,0 @@
-package com.casic.missiles.modular.system.controller;
-
-
-import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.core.base.controller.BaseController;
-import com.casic.missiles.core.page.PageFactory;
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.WorkSiteDetailDTO;
-import com.casic.missiles.modular.system.entity.WorkSiteInfo;
-import com.casic.missiles.modular.system.service.IWorkSiteInfoService;
-import io.swagger.annotations.*;
-import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.*;
-
-import org.springframework.stereotype.Controller;
-
-import java.util.List;
-
-import static com.casic.missiles.model.response.ResponseData.DEFAULT_SUCCESS_MESSAGE;
-
-/**
- * <p>
- * 作业现场表 前端控制器
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@Controller
-@RequestMapping("/site")
-@Api(tags = "作业现场管理")
-@RequiredArgsConstructor
-public class WorkSiteInfoController extends BaseController {
-
-
-    private final IWorkSiteInfoService workSiteInfoService;
-
-    @ApiOperation("新增作业现场")
-    @PostMapping("add")
-    @ResponseBody
-    public Object addWorkSite(@RequestBody WorkSiteDetailDTO workSiteDetailDTO){
-        workSiteInfoService.addWorkSiteInfo(workSiteDetailDTO);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("编辑作业现场")
-    @PostMapping("update")
-    @ResponseBody
-    public Object updateWorkSite(@RequestBody WorkSiteDetailDTO workSiteDetailDTO){
-        workSiteInfoService.updateWorkSiteInfo(workSiteDetailDTO);
-        return ResponseData.success();
-    }
-
-
-    @ApiOperation("删除作业现场")
-    @PostMapping("delete")
-    @ResponseBody
-    public Object delete(@ApiParam("作业现场id列表")@RequestBody List<Long> projectIds){
-        workSiteInfoService.deleteProjects(projectIds);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("查询作业现场详情")
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = WorkSiteDetailDTO.class),
-    })
-    @GetMapping("detail")
-    @ResponseBody
-    public Object delete(@ApiParam(value = "作业现场id", example = "0")@RequestParam Long projectId){
-        WorkSiteDetailDTO detailDTO = workSiteInfoService.getWorkSiteDetail(projectId);
-        return ResponseData.success(detailDTO);
-    }
-
-    @ApiOperation("分页列表查询")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "workTitle",value = "作业名称", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "workRoad",value = "所属道路", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "workPersonName",value = "责任人姓名", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "startDate",value = "注册开始日期", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "endDate",value = "注册结束日期", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "projectState",value = "当前状态（字典值）", dataType = "String", paramType = "query")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = WorkSiteInfo.class),
-    })
-    @GetMapping("listPage")
-    @ResponseBody
-    public Object listPage(String workTitle,String workRoad,String workPersonName,String projectState,String startDate,String endDate){
-        Page<WorkSiteInfo> page = PageFactory.defaultPage();
-        QueryWrapper<WorkSiteInfo> queryWrapper = new QueryWrapper<>();
-        if(StrUtil.isNotEmpty(workTitle)){
-            queryWrapper.like("WORK_TITLE",workTitle);
-        }
-        if(StrUtil.isNotEmpty(workRoad)){
-            queryWrapper.like("WORK_ROAD",workRoad);
-        }
-        if(StrUtil.isNotEmpty(workPersonName)){
-            queryWrapper.like("WORKER_NAME",workPersonName);
-        }
-        if(StrUtil.isNotEmpty(projectState)){
-            queryWrapper.eq("PROJECT_STATE",projectState);
-        }
-        if(StrUtil.isNotEmpty(startDate)){
-            queryWrapper.ge("br_work_site_info.CREATE_TIME",startDate + " 00:00:00");
-        }
-        if(StrUtil.isNotEmpty(endDate)){
-            queryWrapper.le("br_work_site_info.CREATE_TIME",endDate + " 23:59:59");
-        }
-        page = workSiteInfoService.selectListPage(page,queryWrapper);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-    @ApiOperation("开始作业")
-    @PostMapping("start")
-    @ResponseBody
-    public Object start(@ApiParam(value = "作业现场id",example = "0")@RequestParam Long projectId){
-        workSiteInfoService.start(projectId);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("完成作业")
-    @PostMapping("finish")
-    @ResponseBody
-    public Object finish(@ApiParam(value = "作业现场id", example = "0")@RequestParam Long projectId){
-        workSiteInfoService.finish(projectId);
-        return ResponseData.success();
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/WorkerController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/WorkerController.java
deleted file mode 100644
index 796f94c..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/WorkerController.java
+++ /dev/null
@@ -1,136 +0,0 @@
-package com.casic.missiles.modular.system.controller;
-
-
-import cn.hutool.core.util.ObjectUtil;
-import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.core.base.controller.BaseController;
-import com.casic.missiles.core.page.PageFactory;
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.DeviceDetailDTO;
-import com.casic.missiles.modular.system.entity.Device;
-import com.casic.missiles.modular.system.entity.Worker;
-import com.casic.missiles.modular.system.service.IWorkerService;
-import io.swagger.annotations.*;
-import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.*;
-
-import org.springframework.stereotype.Controller;
-
-import java.util.Date;
-import java.util.List;
-
-import static com.casic.missiles.model.response.ResponseData.DEFAULT_SUCCESS_MESSAGE;
-
-/**
- * <p>
- *  前端控制器
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@Controller
-@RequestMapping("/worker")
-@RequiredArgsConstructor
-@Api(tags = "人员管理接口")
-public class WorkerController extends BaseController {
-
-    private final IWorkerService workerService;
-
-    @ApiOperation("分页列表查询")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "name",value = "姓名", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "deptId",value = "所属部门", dataType = "Long", paramType = "query", example = "0"),
-            @ApiImplicitParam(name = "status",value = "当前状态（字典值）", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "startDate",value = "注册开始日期", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "endDate",value = "注册结束日期", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "workerType",value = "人员类型（字典值）", dataType = "String", paramType = "query")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = Worker.class),
-    })
-    @GetMapping("listPage")
-    @ResponseBody
-    public Object listPage(String name,Long deptId, String status,String startDate,String endDate,String workerType){
-        Page<Worker> page = PageFactory.defaultPage();
-        QueryWrapper<Worker> queryWrapper = new QueryWrapper<>();
-        if(StrUtil.isNotEmpty(name)){
-            queryWrapper.like("WORKER_NAME",name);
-        }
-        if(ObjectUtil.isNotEmpty(deptId)){
-            queryWrapper.eq("DEPT_ID",deptId);
-        }
-        if(StrUtil.isNotEmpty(workerType)){
-            queryWrapper.eq("WORKER_TYPE",workerType);
-        }
-        if(StrUtil.isNotEmpty(startDate)){
-            queryWrapper.ge("CREATE_TIME",startDate + " 00:00:00");
-        }
-        if(StrUtil.isNotEmpty(endDate)){
-            queryWrapper.le("CREATE_TIME",endDate + " 23:59:59");
-        }
-        if(StrUtil.isNotEmpty(status)){
-            queryWrapper.eq("`STATUS`",status);
-        }
-        page = workerService.selectListPage(page,queryWrapper);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-    @ApiOperation("新增人员")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "worker", value = "人员信息", dataType = "Worker", paramType = "body", required = true),
-            @ApiImplicitParam(name = "projectId", value = "项目ID(入场申请需要)", dataType = "Long", paramType = "query", example = "0")
-    })
-    @PostMapping("add")
-    @ResponseBody
-    public Object add(@ApiParam("worker")@RequestBody Worker worker,
-                      @RequestParam(required = false) Long projectId){
-        workerService.addWorker(worker,projectId);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("编辑人员")
-    @PostMapping("update")
-    @ResponseBody
-    public Object update(@RequestBody Worker worker){
-        workerService.updateById(worker);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("删除人员")
-    @PostMapping("delete")
-    @ResponseBody
-    public Object delete(@ApiParam("人员id列表")@RequestBody List<Long> workIds){
-        workerService.removeByIds(workIds);
-        return ResponseData.success();
-    }
-
-
-    @ApiOperation(value = "获取人脸图片",notes = "返回人脸图片url")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "cameraIp",value = "摄像头IP", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "cameraPort",value = "摄像头端口号", dataType = "String", paramType = "query"),
-    })
-    @GetMapping("/face/register")
-    @ResponseBody
-    public Object faceRegister(String cameraIp,String cameraPort){
-        return ResponseData.success(workerService.faceRegister(cameraIp, cameraPort));
-    }
-
-
-    @ApiOperation(value = "查询临时入场人员列表")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "projectId", value = "项目ID",required = true,dataType = "Long", paramType = "query", example = "0")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = Worker.class),
-    })
-    @GetMapping("/projectTempWorker")
-    @ResponseBody
-    public Object projectTempWorker(Long projectId){
-        return ResponseData.success(workerService.projectTempWorker(projectId));
-    }
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/AlarmTypeCountDTO.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/AlarmTypeCountDTO.java
deleted file mode 100644
index 1a165a1..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/AlarmTypeCountDTO.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.casic.missiles.modular.system.dto;
-
-import io.swagger.annotations.ApiModel;
-import lombok.Data;
-
-@ApiModel(value = "AlarmTypeCountDTO",description = "报警类型统计（首页）")
-@Data
-public class AlarmTypeCountDTO {
-
-    private String alarmType;
-    private String alarmTypeName;
-    private Integer alarmCount;
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/AlarmUpload.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/AlarmUpload.java
deleted file mode 100644
index 73d7799..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/AlarmUpload.java
+++ /dev/null
@@ -1,46 +0,0 @@
-package com.casic.missiles.modular.system.dto;
-
-import cn.hutool.core.util.StrUtil;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-@ApiModel(value = "AlarmUpload",description = "报警上传")
-@Data
-public class AlarmUpload {
-
-    @ApiModelProperty(value = "摄像头ip")
-    private String cameraIp;
-
-    @ApiModelProperty(value = "摄像头端口")
-    private String cameraPort;
-    @ApiModelProperty(value = "安全树甲烷设备ip")
-    private String gasIp;
-    @ApiModelProperty(value = "安全树甲烷设备端口")
-    private String gasPort;
-    @ApiModelProperty(value = "报警值")
-    private String alarmValue;
-    @ApiModelProperty(value = "报警时间")
-    private String alarmTime;
-    @ApiModelProperty(value = "报警类型")
-    private String alarmType;
-    @ApiModelProperty(value = "报警图片")
-    private String alarmImage;
-    @ApiModelProperty(value = "报警内容")
-    private String alarmContent;
-
-    @Override
-    public String toString() {
-        return "AlarmUpload{" +
-                "cameraIp='" + cameraIp + '\'' +
-                ", cameraPort='" + cameraPort + '\'' +
-                ", gasIp='" + gasIp + '\'' +
-                ", gasPort='" + gasPort + '\'' +
-                ", alarmValue='" + alarmValue + '\'' +
-                ", alarmTime='" + alarmTime + '\'' +
-                ", alarmType='" + alarmType + '\'' +
-                ", alarmImage='" + (StrUtil.isNotEmpty(alarmImage) ? alarmImage.substring(0,50) : "null") + '\'' +
-                ", alarmContent='" + alarmContent + '\'' +
-                '}';
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/DeviceDetailDTO.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/DeviceDetailDTO.java
deleted file mode 100644
index ea518d9..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/DeviceDetailDTO.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package com.casic.missiles.modular.system.dto;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.casic.missiles.modular.system.entity.Device;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-@ApiModel("DeviceDetailDTO")
-@Data
-public class DeviceDetailDTO extends Device {
-
-    @ApiModelProperty(value = "摄像头编号")
-    private String cameraCode;
-
-    @ApiModelProperty(value = "摄像头IP")
-    private String cameraIp;
-
-    @ApiModelProperty(value = "摄像头端口")
-    private String cameraPort;
-
-    @ApiModelProperty(value = "激甲编号")
-    private String gasCode;
-
-    @ApiModelProperty(value = "激甲IP")
-    private String gasIp;
-
-    @ApiModelProperty(value = "激甲端口")
-    private String gasPort;
-
-    @ApiModelProperty(value = "智能帽衬编号")
-    private String hatLiningCode;
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/WorkSiteDetailDTO.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/WorkSiteDetailDTO.java
deleted file mode 100644
index 29378ff..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/WorkSiteDetailDTO.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package com.casic.missiles.modular.system.dto;
-
-import com.casic.missiles.modular.system.entity.ProjectDevice;
-import com.casic.missiles.modular.system.entity.ProjectWorker;
-import com.casic.missiles.modular.system.entity.WorkSiteInfo;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.util.List;
-
-@Data
-@ApiModel("WorkSiteDetailDTO")
-public class WorkSiteDetailDTO extends WorkSiteInfo {
-
-    @ApiModelProperty(value = "安全树列表",dataType = "ProjectDevice")
-    private List<ProjectDevice> deviceList;
-
-    @ApiModelProperty(value = "人员列表",dataType = "ProjectWorker")
-    private List<ProjectWorker> workerList;
-
-
-
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/WorkerLocationDTO.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/WorkerLocationDTO.java
deleted file mode 100644
index 6fd7b24..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/WorkerLocationDTO.java
+++ /dev/null
@@ -1,68 +0,0 @@
-package com.casic.missiles.modular.system.dto;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-@ApiModel(value = "WorkerLocationDTO",description = "人员位置列表（首页）")
-@Data
-public class WorkerLocationDTO {
-
-    @ApiModelProperty("人员ID")
-    private Long workerId;
-
-    @ApiModelProperty("人员姓名")
-    private String workerName;
-
-    @ApiModelProperty("安全帽编号")
-    private String hatCode;
-
-    @ApiModelProperty("安全帽ID")
-    private Long hatId;
-
-    @ApiModelProperty("背心编号")
-    private String vastCode;
-
-    @ApiModelProperty("手环编号")
-    private String braceletCode;
-
-    @ApiModelProperty("位置")
-    private String location;
-
-    @ApiModelProperty("时间")
-    private String time;
-
-    @ApiModelProperty("经度")
-    private String lng;
-
-    @ApiModelProperty("纬度")
-    private String lat;
-
-    @ApiModelProperty("心率")
-    private String heartRate;
-
-    @ApiModelProperty("血氧")
-    private String bloodOxygen;
-
-    @ApiModelProperty("一氧化碳")
-    private String co;
-
-    @ApiModelProperty("甲烷")
-    private String gas;
-
-    @ApiModelProperty("硫化氢")
-    private String h2s;
-
-    @ApiModelProperty("氧气")
-    private String o2;
-
-    @ApiModelProperty("信号")
-    private String signal;
-
-    @ApiModelProperty("电量")
-    private String cell;
-
-    @ApiModelProperty("是否报警")
-    private boolean alarmFlag;
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Alarm.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Alarm.java
new file mode 100644
index 0000000..4d2b7ef
--- /dev/null
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Alarm.java
@@ -0,0 +1,103 @@
+package com.casic.missiles.modular.system.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import java.util.Date;
+
+/**
+ * <p>
+ * 报警记录表
+ * </p>
+ *
+ * @author zyj
+ * @since 2023-05-25
+ */
+@Data
+@TableName("bus_alarm")
+public class Alarm implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    @TableId(value = "ID",type = IdType.ASSIGN_ID)
+    private Long id;
+
+    /**
+     * 设备ID
+     */
+    @TableField("DEVICE_ID")
+    private Long deviceId;
+
+    /**
+     * 报警类型
+     */
+    @TableField("ALARM_TYPE")
+    private String alarmType;
+
+    /**
+     * 报警时间
+     */
+    @TableField("ALARM_TIME")
+    private Date alarmTime;
+
+    /**
+     * 报警状态
+     */
+    @TableField("ALARM_STATUS")
+    private String alarmStatus;
+
+    /**
+     * 报警位置
+     */
+    @TableField("ALARM_LOCATION")
+    private String alarmLocation;
+
+    /**
+     * 报警图片
+     */
+    @TableField("ALARM_IMAGE")
+    private String alarmImage;
+
+    /**
+     * 视频通道号
+     */
+    @TableField("CHANNEL_NO")
+    private Integer channelNo;
+
+    /**
+     * 报警内容
+     */
+    @TableField("ALARM_CONTENT")
+    private String alarmContent;
+
+    /**
+     * 消警时间
+     */
+    @TableField("CANCEL_TIME")
+    private Date cancelTime;
+
+
+    @Override
+    public String toString() {
+        return "Alarm{" +
+            "id=" + id +
+            ", deviceId=" + deviceId +
+            ", alarmType=" + alarmType +
+            ", alarmTime=" + alarmTime +
+            ", alarmStatus=" + alarmStatus +
+            ", alarmLocation=" + alarmLocation +
+            ", alarmImage=" + alarmImage +
+            ", channelNo=" + channelNo +
+            ", alarmContent=" + alarmContent +
+            ", cancelTime=" + cancelTime +
+        "}";
+    }
+}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusAlarm.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusAlarm.java
deleted file mode 100644
index efb4a23..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusAlarm.java
+++ /dev/null
@@ -1,159 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.alibaba.fastjson.annotation.JSONField;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.time.LocalDateTime;
-import java.util.Date;
-
-/**
- * <p>
- * 报警记录表
- * </p>
- *
- * @author zyj
- * @since 2023-05-16
- */
-@Data
-@ApiModel("Alarm")
-@TableName("br_bus_alarm")
-public class BusAlarm implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 项目ID
-     */
-    @ApiModelProperty(value = "项目ID")
-    @TableField("PROJECT_ID")
-    private Long projectId;
-
-    /**
-     * 设备ID
-     */
-    @ApiModelProperty(value = "设备ID")
-    @TableField("DEVICE_ID")
-    private Long deviceId;
-
-    /**
-     * 报警类型
-     */
-    @ApiModelProperty(value = "报警类型")
-    @TableField("ALARM_TYPE")
-    private String alarmType;
-
-    /**
-     * 报警状态
-     */
-    @ApiModelProperty(value = "报警状态")
-    @TableField("ALARM_STATUS")
-    private String alarmStatus;
-
-    /**
-     * 报警值
-     */
-    @ApiModelProperty(value = "报警值")
-    @TableField("ALARM_VALUE")
-    private String alarmValue;
-
-    /**
-     * 报警图片
-     */
-    @ApiModelProperty(value = "报警图片")
-    @TableField("ALARM_IMAGE")
-    private String alarmImage;
-
-    /**
-     * 报警内容
-     */
-    @ApiModelProperty(value = "报警内容")
-    @TableField("ALARM_CONTENT")
-    private String alarmContent;
-
-    /**
-     * 报警时间
-     */
-    @ApiModelProperty(value = "报警时间")
-    @TableField("ALARM_TIME")
-    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
-    private Date alarmTime;
-
-    /**
-     * 消警时间
-     */
-    @ApiModelProperty(value = "消警时间")
-    @TableField("CANCEL_TIME")
-    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
-    private Date cancelTime;
-
-    /**
-     * 报警位置经度
-     */
-    @ApiModelProperty(value = "报警位置经度")
-    @TableField("ALARM_LNG")
-    private String alarmLng;
-
-    /**
-     * 报警位置纬度
-     */
-    @ApiModelProperty(value = "报警位置纬度")
-    @TableField("ALARM_LAT")
-    private String alarmLat;
-
-    @ApiModelProperty("报警类型名称")
-    @TableField(exist = false)
-    private String alarmStatusName;
-    @ApiModelProperty("报警类型名称")
-    @TableField(exist = false)
-    private String alarmTypeName;
-    @ApiModelProperty("作业名称")
-    @TableField(exist = false)
-    private String workTitle;
-    @ApiModelProperty("所属道路")
-    @TableField(exist = false)
-    private String workRoad;
-    @ApiModelProperty("作业状态")
-    @TableField(exist = false)
-    private String projectState;
-    @ApiModelProperty("作业状态名称")
-    @TableField(exist = false)
-    private String projectStateName;
-    @ApiModelProperty("负责人姓名")
-    @TableField(exist = false)
-    private String workPersonName;
-    @ApiModelProperty("负责人联系方式")
-    @TableField(exist = false)
-    private String workPersonPhoneNumber;
-
-
-    @Override
-    public String toString() {
-        return "BusAlarm{" +
-                "id=" + id +
-                ", projectId=" + projectId +
-                ", deviceId=" + deviceId +
-                ", alarmType=" + alarmType +
-                ", alarmValue=" + alarmValue +
-                ", alarmStatus=" + alarmStatus +
-                ", alarmImage=" + alarmImage +
-                ", alarmContent=" + alarmContent +
-                ", alarmTime=" + alarmTime +
-                ", cancelTime=" + cancelTime +
-                ", alarmLng=" + alarmLng +
-                ", alarmLat=" + alarmLat +
-                "}";
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusEvent.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusEvent.java
deleted file mode 100644
index a0b7543..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusEvent.java
+++ /dev/null
@@ -1,100 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.time.LocalDateTime;
-import java.util.Date;
-import java.util.List;
-
-/**
- * <p>
- * 事件表
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@TableName("br_bus_event")
-@Data
-@ApiModel("BusEvent")
-public class BusEvent implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @ApiModelProperty("事件ID")
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 事件标题
-     */
-    @ApiModelProperty("事件名称")
-    @TableField("EVENT_TITLE")
-    private String eventTitle;
-
-    /**
-     * 上报人员
-     */
-    @ApiModelProperty("上报人员")
-    @TableField("UPLOAD_NAME")
-    private String uploadName;
-
-    /**
-     * 联系方式
-     */
-    @ApiModelProperty("联系方式")
-    @TableField("PHONE_NUMBER")
-    private String phoneNumber;
-
-    /**
-     * 事件描述
-     */
-    @ApiModelProperty("事件描述")
-    @TableField("EVENT_DESCRIPTION")
-    private String eventDescription;
-
-    @ApiModelProperty("经度")
-    @TableField("LNG")
-    private String lng;
-
-    @ApiModelProperty("纬度")
-    @TableField("LAT")
-    private String lat;
-
-    /**
-     * 事件上传时间
-     */
-    @ApiModelProperty("事件上传时间")
-    @TableField("CREATE_TIME")
-    private Date createTime;
-
-    @ApiModelProperty("事件照片")
-    @TableField(exist = false)
-    private List<BusEventImage> imageList;
-
-
-
-    @Override
-    public String toString() {
-        return "BusEvent{" +
-            "id=" + id +
-            ", eventTitle=" + eventTitle +
-            ", uploadName=" + uploadName +
-            ", phoneNumber=" + phoneNumber +
-            ", eventDescription=" + eventDescription +
-            ", lng=" + lng +
-            ", lat=" + lat +
-            ", createTime=" + createTime +
-        "}";
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusEventImage.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusEventImage.java
deleted file mode 100644
index 1e75245..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusEventImage.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-
-/**
- * <p>
- * 事件图片表
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@TableName("br_bus_event_image")
-@Data
-@ApiModel("BusEventImage")
-public class BusEventImage implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 事件ID
-     */
-    @TableField("EVENT_ID")
-    private Long eventId;
-
-    /**
-     * 报警图片
-     */
-    @TableField("IMAGE")
-    @ApiModelProperty("图片url")
-    private String image;
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Device.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Device.java
index df89c70..ea7db5f 100644
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Device.java
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Device.java
@@ -1,30 +1,23 @@
 package com.casic.missiles.modular.system.entity;
 
-import com.alibaba.fastjson.annotation.JSONField;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.casic.missiles.core.base.json.DateDeserializer;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
-import java.util.Date;
 
 /**
  * <p>
- * 
+ * 设备记录表
  * </p>
  *
  * @author zyj
- * @since 2023-04-14
+ * @since 2023-05-25
  */
-@ApiModel("Device")
-@TableName("br_device")
 @Data
+@TableName("bus_device")
 public class Device implements Serializable {
 
     private static final long serialVersionUID = 1L;
@@ -32,82 +25,86 @@
     /**
      * 主键
      */
-    @ApiModelProperty(value = "设备ID")
     @TableId(value = "ID",type = IdType.ASSIGN_ID)
     private Long id;
 
     /**
-     * 设备编号
+     * 设备名称
      */
-    @ApiModelProperty(value = "设备编号")
-    @TableField("DEVICE_CODE")
-    private String deviceCode;
+    @TableField("DEVICE_NAME")
+    private String deviceName;
 
     /**
-     * 设备类型
+     * IP
      */
-    @ApiModelProperty(value = "设备类型")
-    @TableField("DEVICE_TYPE")
-    private String deviceType;
+    @TableField("IP")
+    private String ip;
 
     /**
-     * 设备批次
+     * 端口
      */
-    @ApiModelProperty(value = "设备批次")
-    @TableField("DEVICE_BATCH")
-    private String deviceBatch;
+    @TableField("PORT")
+    private String port;
 
     /**
-     * 厂家
+     * 用户名
      */
-    @ApiModelProperty(value = "厂家")
-    @TableField("MANUFACTURER")
-    private String manufacturer;
+    @TableField("USER_NAME")
+    private String userName;
 
     /**
-     * 是否供电
+     * 密码
      */
-    @ApiModelProperty(value = "是否供电")
-    @TableField("IS_POWER_SUPPLY")
-    private String isPowerSupply;
+    @TableField("PASSWORD")
+    private String password;
 
     /**
-     * 创建时间
+     * 连接类型
      */
-    @ApiModelProperty(value = "创建时间",dataType = "Date")
-    @TableField("CREATE_TIME")
-    private Date createTime;
+    @TableField("CONNECT_TYPE")
+    private String connectType;
 
-    @ApiModelProperty(value = "设备类型名称")
-    @TableField(exist = false)
-    private String deviceTypeName;
+    /**
+     * 位置
+     */
+    @TableField("LOCATION")
 
-    @ApiModelProperty(value = "是否供电名称")
-    @TableField(exist = false)
-    private String isPowerSupplyName;
+    private String location;
 
-    @ApiModelProperty(value = "注册时间",dataType = "String")
-    @TableField(exist = false)
-    private String registerTime;
+    /**
+     * 设备状态
+     */
+    @TableField("STATUS")
 
-    @ApiModelProperty(value = "当前状态")
-    @TableField(exist = false)
     private String status;
 
-    @ApiModelProperty(value = "当前状态名称")
-    @TableField(exist = false)
-    private String statusName;
+    /**
+     * 报警分组
+     */
+    @TableField("ALARM_GROUP")
+
+    private Long alarmGroup;
+
+    /**
+     * 视频通道数(预留)
+     */
+    @TableField("CHANNEL_NUM")
+    private Integer channelNum;
 
     @Override
     public String toString() {
         return "Device{" +
             "id=" + id +
-            ", deviceCode=" + deviceCode +
-            ", deviceType=" + deviceType +
-            ", deviceBatch=" + deviceBatch +
-            ", manufacturer=" + manufacturer +
-            ", isPowerSupply=" + isPowerSupply +
-            ", createTime=" + createTime +
+            ", deviceName=" + deviceName +
+            ", ip=" + ip +
+            ", port=" + port +
+            ", userName=" + userName +
+            ", password=" + password +
+            ", connectType=" + connectType +
+            ", location=" + location +
+            ", status=" + status +
+            ", alarmGroup=" + alarmGroup +
+            ", channelNum=" + channelNum +
         "}";
     }
 }
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/DeviceExt.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/DeviceExt.java
deleted file mode 100644
index 5ee7015..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/DeviceExt.java
+++ /dev/null
@@ -1,99 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-
-/**
- * <p>
- * 设备扩展信息表（安全树）
- * </p>
- *
- * @author zyj
- * @since 2023-04-27
- */
-@Data
-@TableName("br_device_ext")
-public class DeviceExt implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 设备ID
-     */
-    @TableField("DEVICE_ID")
-    private Long deviceId;
-
-    /**
-     * 摄像头编号
-     */
-    @TableField("CAMERA_CODE")
-    private String cameraCode;
-
-    /**
-     * 摄像头IP
-     */
-    @TableField("CAMERA_IP")
-    private String cameraIp;
-
-    /**
-     * 摄像头端口
-     */
-    @TableField("CAMERA_PORT")
-    private String cameraPort;
-
-    /**
-     * 激甲编号
-     */
-    @TableField("GAS_CODE")
-    private String gasCode;
-
-    /**
-     * 激甲IP
-     */
-    @TableField("GAS_IP")
-    private String gasIp;
-
-    /**
-     * 激甲端口
-     */
-    @TableField("GAS_PORT")
-    private String gasPort;
-
-    /**
-     * 甲烷报警阈值
-     */
-    @TableField("GAS_THRESHOLD")
-    private String gasThreshold;
-
-    @TableField(value = "HAT_LINING_CODE")
-    private String hatLiningCode;
-
-
-    @Override
-    public String toString() {
-        return "DeviceExt{" +
-            "id=" + id +
-            ", deviceId=" + deviceId +
-            ", cameraCode=" + cameraCode +
-            ", cameraIp=" + cameraIp +
-            ", cameraPort=" + cameraPort +
-            ", gasCode=" + gasCode +
-            ", gasIp=" + gasIp +
-            ", gasPort=" + gasPort +
-            ", gasThreshold=" + gasThreshold +
-            ", hatLiningCode=" + hatLiningCode +
-        "}";
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/ProjectDevice.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/ProjectDevice.java
deleted file mode 100644
index c4f3472..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/ProjectDevice.java
+++ /dev/null
@@ -1,62 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-
-/**
- * <p>
- * 
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@Data
-@ApiModel("ProjectDevice")
-@TableName("br_project_device")
-public class ProjectDevice implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 作业现场ID
-     */
-    @TableField("PROJECT_ID")
-    private Long projectId;
-
-    /**
-     * 设备ID
-     */
-    @TableField("DEVICE_ID")
-    @ApiModelProperty("设备ID（新增编辑时传）")
-    private Long deviceId;
-
-    /**
-     * 设备编号
-     */
-    @TableField(exist = false)
-    @ApiModelProperty("设备编号（详情中展示，新增编辑不用传）")
-    private String deviceCode;
-
-    @Override
-    public String toString() {
-        return "ProjectDevice{" +
-            "id=" + id +
-            ", projectId=" + projectId +
-            ", deviceId=" + deviceId +
-        "}";
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/ProjectWorker.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/ProjectWorker.java
deleted file mode 100644
index 10b23c4..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/ProjectWorker.java
+++ /dev/null
@@ -1,104 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import java.io.Serializable;
-
-/**
- * <p>
- * 
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@ApiModel("ProjectWorker")
-@TableName("br_project_worker")
-@Data
-@NoArgsConstructor
-@AllArgsConstructor
-public class ProjectWorker implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 作业现场ID
-     */
-    @TableField("PROJECT_ID")
-    private Long projectId;
-
-    /**
-     * 人员ID
-     */
-    @ApiModelProperty("人员ID")
-    @TableField("WORKER_ID")
-    private Long workerId;
-
-    /**
-     * 安全帽编号
-     */
-    @ApiModelProperty("安全帽编号")
-    @TableField("HAT_CODE")
-    private String hatCode;
-
-    /**
-     * 背心编号
-     */
-    @ApiModelProperty("背心编号")
-    @TableField("VAST_CODE")
-    private String vastCode;
-
-    /**
-     * 手环编号
-     */
-    @ApiModelProperty("手环编号")
-    @TableField("BRACELET_CODE")
-    private String braceletCode;
-
-    @ApiModelProperty("人员姓名（详情中展示，新增编辑不用传）")
-    @TableField(exist = false)
-    private String workerName;
-
-    @ApiModelProperty("人员部门ID（详情中展示，新增编辑不用传）")
-    @TableField(exist = false)
-    private String workerDeptId;
-
-    @ApiModelProperty("人员部门名称（详情中展示，新增编辑不用传）")
-    @TableField(exist = false)
-    private String workerDeptName;
-
-    @ApiModelProperty("人员联系方式（详情中展示，新增编辑不用传）")
-    @TableField(exist = false)
-    private String workerPhoneNumber;
-
-    public ProjectWorker(Long projectId, Long workerId) {
-        this.projectId = projectId;
-        this.workerId = workerId;
-    }
-
-    @Override
-    public String toString() {
-        return "ProjectWorker{" +
-            "id=" + id +
-            ", projectId=" + projectId +
-            ", workerId=" + workerId +
-            ", hatCode=" + hatCode +
-            ", vastCode=" + vastCode +
-            ", braceletCode=" + braceletCode +
-        "}";
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/WorkSiteInfo.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/WorkSiteInfo.java
deleted file mode 100644
index fa6f41d..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/WorkSiteInfo.java
+++ /dev/null
@@ -1,130 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.alibaba.fastjson.annotation.JSONField;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.time.LocalDateTime;
-import java.util.Date;
-
-/**
- * <p>
- * 作业现场表
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@ApiModel("WorkSiteInfo")
-@TableName("br_work_site_info")
-@Data
-public class WorkSiteInfo implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @ApiModelProperty("作业现场ID")
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 作业名称
-     */
-    @ApiModelProperty("作业名称")
-    @TableField("WORK_TITLE")
-    private String workTitle;
-
-    /**
-     * 责任人
-     */
-    @ApiModelProperty("责任人（人员ID）")
-    @TableField("WORK_PERSON")
-    private Long workPerson;
-
-    /**
-     * 作业描述
-     */
-    @ApiModelProperty("作业描述")
-    @TableField("WORK_SITE_DESC")
-    private String workSiteDesc;
-
-    /**
-     * 作业状态
-     */
-    @ApiModelProperty("作业状态")
-    @TableField("PROJECT_STATE")
-    private String projectState;
-
-    /**
-     * 所属道路
-     */
-    @ApiModelProperty("所属道路")
-    @TableField("WORK_ROAD")
-    private String workRoad;
-
-    @TableField("IMAGE_URL")
-    private String imageUrl;
-
-    @TableField("CREATE_TIME")
-    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
-    private Date createTime;
-    @TableField("UPDATE_TIME")
-    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
-    private Date updateTime;
-
-    @ApiModelProperty("开始时间")
-    @TableField("START_TIME")
-    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
-    private Date startTime;
-
-    @ApiModelProperty("结束时间")
-    @TableField("FINISH_TIME")
-    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
-    private Date finishTime;
-
-    @ApiModelProperty("负责人姓名（详情中使用，新增编辑不用传）")
-    @TableField(exist = false)
-    private String workPersonName;
-
-    @ApiModelProperty("负责人联系方式（详情中使用，新增编辑不用传）")
-    @TableField(exist = false)
-    private String workPersonPhoneNumber;
-
-    @ApiModelProperty("负责人所属部门ID（详情中使用，新增编辑不用传）")
-    @TableField(exist = false)
-    private Long workPersonDeptId;
-
-    @ApiModelProperty("负责人所属部门名称（详情中使用，新增编辑不用传）")
-    @TableField(exist = false)
-    private String workPersonDeptName;
-
-    @ApiModelProperty(value = "注册时间",dataType = "String")
-    @TableField(exist = false)
-    private String registerTime;
-
-    @ApiModelProperty("作业状态名称")
-    @TableField(exist = false)
-    private String projectStateName;
-
-    @Override
-    public String toString() {
-        return "WorkSiteInfo{" +
-            "id=" + id +
-            ", workTitle=" + workTitle +
-            ", workPerson=" + workPerson +
-            ", workSiteDesc=" + workSiteDesc +
-            ", projectState=" + projectState +
-            ", imageUrl=" + imageUrl +
-            ", updateTime=" + updateTime +
-            ", workRoad=" + workRoad +
-        "}";
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Worker.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Worker.java
deleted file mode 100644
index 28a4daa..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Worker.java
+++ /dev/null
@@ -1,147 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.time.LocalDateTime;
-import java.util.Date;
-
-/**
- * <p>
- * 
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@ApiModel("Worker")
-@TableName("br_worker")
-@Data
-public class Worker implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @ApiModelProperty(value = "人员ID")
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 姓名
-     */
-    @ApiModelProperty(value = "姓名")
-    @TableField("WORKER_NAME")
-    private String workerName;
-
-    /**
-     * 性别
-     */
-    @ApiModelProperty(value = "性别")
-    @TableField("GENDER")
-    private String gender;
-
-    /**
-     * 所属部门
-     */
-    @ApiModelProperty(value = "所属部门(人员管理)")
-    @TableField("DEPT_ID")
-    private Long deptId;
-
-    /**
-     * 所属单位
-     */
-    @ApiModelProperty(value = "所属单位(入场申请中使用)")
-    @TableField("OWNER_SHIP")
-    private String ownerShip;
-
-    /**
-     * 联系方式
-     */
-    @ApiModelProperty(value = "联系方式")
-    @TableField("PHONE_NUMBER")
-    private String phoneNumber;
-
-    /**
-     * 证件号
-     */
-    @ApiModelProperty(value = "证件号")
-    @TableField("ID_CARD_NUMBER")
-    private String idCardNumber;
-
-    /**
-     * 入场原因
-     */
-    @ApiModelProperty(value = "入场原因（入场申请中使用）")
-    @TableField("ENTER_REASON")
-    private String enterReason;
-
-    /**
-     * 入场人脸照片
-     */
-    @ApiModelProperty(value = "人脸照片（照片路径）")
-    @TableField("WORKER_AVATAR")
-    private String workerAvatar;
-
-    /**
-     * 申请入场时间
-     */
-    @ApiModelProperty(value = "注册时间/申请入场时间")
-    @TableField("CREATE_TIME")
-    private Date createTime;
-
-    /**
-     * 人员类型
-     */
-    @ApiModelProperty(value = "人员类型（区分人员管理和入场申请）")
-    @TableField("WORKER_TYPE")
-    private String workerType;
-
-    @ApiModelProperty(value = "性别名称")
-    @TableField(exist = false)
-    private String genderName;
-
-    @ApiModelProperty(value = "部门名称")
-    @TableField(exist = false)
-    private String deptName;
-
-    @ApiModelProperty(value = "注册时间",dataType = "String")
-    @TableField(exist = false)
-    private String registerTime;
-
-    @ApiModelProperty(value = "当前状态")
-    @TableField(exist = false)
-    private String status;
-
-    @ApiModelProperty(value = "当前状态名称")
-    @TableField(exist = false)
-    private String statusName;
-
-    @ApiModelProperty(value = "是否注册(0未注册；1已注册)",allowableValues = "0,1")
-    @TableField(exist = false)
-    private String isRegister;
-
-    @Override
-    public String toString() {
-        return "Worker{" +
-            "id=" + id +
-            ", workerName=" + workerName +
-            ", gender=" + gender +
-            ", deptId=" + deptId +
-            ", ownerShip=" + ownerShip +
-            ", phoneNumber=" + phoneNumber +
-            ", idCardNumber=" + idCardNumber +
-            ", enterReason=" + enterReason +
-            ", workerAvatar=" + workerAvatar +
-            ", createTime=" + createTime +
-            ", workerType=" + workerType +
-        "}";
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/AlarmMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/AlarmMapper.java
new file mode 100644
index 0000000..ea4c8be
--- /dev/null
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/AlarmMapper.java
@@ -0,0 +1,16 @@
+package com.casic.missiles.modular.system.mapper;
+
+import com.casic.missiles.modular.system.entity.Alarm;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 报警记录表 Mapper 接口
+ * </p>
+ *
+ * @author zyj
+ * @since 2023-05-25
+ */
+public interface AlarmMapper extends BaseMapper<Alarm> {
+
+}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/BusAlarmMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/BusAlarmMapper.java
deleted file mode 100644
index 9801742..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/BusAlarmMapper.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package com.casic.missiles.modular.system.mapper;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.modular.system.dto.AlarmTypeCountDTO;
-import com.casic.missiles.modular.system.entity.BusAlarm;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * <p>
- * 报警记录表 Mapper 接口
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface BusAlarmMapper extends BaseMapper<BusAlarm> {
-
-    Page<BusAlarm> listPage(Page<BusAlarm> page,@Param("ew")  QueryWrapper<BusAlarm> queryWrapper);
-
-    void cancelAlarm(@Param("deviceId")Long deviceId,@Param("alarmType") String alarmType);
-
-    List<AlarmTypeCountDTO> alarmCount(@Param("projectId")Long projectId, @Param("alarmStatus")String alarmStatus);
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/BusEventImageMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/BusEventImageMapper.java
deleted file mode 100644
index 9590b7d..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/BusEventImageMapper.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.casic.missiles.modular.system.mapper;
-
-import com.casic.missiles.modular.system.entity.BusEventImage;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * <p>
- * 事件图片表 Mapper 接口
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface BusEventImageMapper extends BaseMapper<BusEventImage> {
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/BusEventMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/BusEventMapper.java
deleted file mode 100644
index 3c85edf..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/BusEventMapper.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.casic.missiles.modular.system.mapper;
-
-import com.casic.missiles.modular.system.entity.BusEvent;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * <p>
- * 事件表 Mapper 接口
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface BusEventMapper extends BaseMapper<BusEvent> {
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/DeviceExtMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/DeviceExtMapper.java
deleted file mode 100644
index 4ca9212..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/DeviceExtMapper.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.casic.missiles.modular.system.mapper;
-
-import com.casic.missiles.modular.system.entity.DeviceExt;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * <p>
- * 设备扩展信息表（安全树） Mapper 接口
- * </p>
- *
- * @author zyj
- * @since 2023-04-27
- */
-public interface DeviceExtMapper extends BaseMapper<DeviceExt> {
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/DeviceMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/DeviceMapper.java
index 444c0c5..3d0bb02 100644
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/DeviceMapper.java
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/DeviceMapper.java
@@ -1,30 +1,16 @@
 package com.casic.missiles.modular.system.mapper;
 
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.modular.system.dto.DeviceDetailDTO;
-import com.casic.missiles.modular.system.dto.HelmetInfoDTO;
 import com.casic.missiles.modular.system.entity.Device;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
 
 /**
  * <p>
- *  Mapper 接口
+ * 设备记录表 Mapper 接口
  * </p>
  *
  * @author zyj
- * @since 2023-04-14
+ * @since 2023-05-25
  */
-@Mapper
 public interface DeviceMapper extends BaseMapper<Device> {
 
-    Page<DeviceDetailDTO> listDetailPage(Page<DeviceDetailDTO> page,@Param("ew") QueryWrapper<DeviceDetailDTO> ew);
-
-     List<Long> selectProjectDevice(@Param("projectId") Long projectId);
-
-    List<HelmetInfoDTO> selectHelmetList(@Param("deviceType")String deviceType);
 }
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/ProjectDeviceMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/ProjectDeviceMapper.java
deleted file mode 100644
index 1d0c14e..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/ProjectDeviceMapper.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package com.casic.missiles.modular.system.mapper;
-
-import com.casic.missiles.modular.system.dto.DeviceLocationDTO;
-import com.casic.missiles.modular.system.entity.ProjectDevice;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * <p>
- *  Mapper 接口
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface ProjectDeviceMapper extends BaseMapper<ProjectDevice> {
-     List<ProjectDevice> selectDetailByProjectId(@Param("projectId") Long projectId);
-
-     List<DeviceLocationDTO> selectDeviceLocationList(@Param("projectId") Long projectId);
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/ProjectWorkerMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/ProjectWorkerMapper.java
deleted file mode 100644
index 58583d1..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/ProjectWorkerMapper.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package com.casic.missiles.modular.system.mapper;
-
-import com.casic.missiles.modular.system.dto.WorkerLocationDTO;
-import com.casic.missiles.modular.system.entity.ProjectWorker;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * <p>
- *  Mapper 接口
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface ProjectWorkerMapper extends BaseMapper<ProjectWorker> {
-
-    List<ProjectWorker> selectDetailByProjectId(@Param("projectId") Long projectId,
-                                                @Param("workerType")String workerType);
-
-    List<WorkerLocationDTO> selectWorkerLocationList(@Param("projectId") Long projectId,
-                                                     @Param("workerType")String workerType);
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/WorkSiteInfoMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/WorkSiteInfoMapper.java
deleted file mode 100644
index a4934d2..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/WorkSiteInfoMapper.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.casic.missiles.modular.system.mapper;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.modular.system.entity.WorkSiteInfo;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Param;
-
-/**
- * <p>
- * 作业现场表 Mapper 接口
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface WorkSiteInfoMapper extends BaseMapper<WorkSiteInfo> {
-
-    Page<WorkSiteInfo> selectListPage(Page<WorkSiteInfo> page,@Param("ew") QueryWrapper<WorkSiteInfo> ew);
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/WorkerMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/WorkerMapper.java
deleted file mode 100644
index 258fb12..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/WorkerMapper.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package com.casic.missiles.modular.system.mapper;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.modular.system.dto.DeviceDetailDTO;
-import com.casic.missiles.modular.system.entity.Worker;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * <p>
- *  Mapper 接口
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface WorkerMapper extends BaseMapper<Worker> {
-
-
-    Page<Worker> selectListPage(Page<Worker> page, @Param("ew") QueryWrapper<Worker> ew);
-
-    List<String> selectWorkerAvatars(@Param("projectId")Long projectId);
-
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/AlarmMapper.xml b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/AlarmMapper.xml
new file mode 100644
index 0000000..25cb4ab
--- /dev/null
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/AlarmMapper.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.modular.system.mapper.AlarmMapper">
+
+</mapper>
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/BusAlarmMapper.xml b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/BusAlarmMapper.xml
deleted file mode 100644
index 595088a..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/BusAlarmMapper.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.casic.missiles.modular.system.mapper.BusAlarmMapper">
-
-    <select id="listPage" resultType="com.casic.missiles.modular.system.entity.BusAlarm">
-        SELECT
-            alarm.ID as id,
-            alarm.DEVICE_ID as deviceId,
-            alarm.PROJECT_ID as projectId,
-            alarm.ALARM_TYPE as alarmType,
-            alarm.ALARM_VALUE as alarmValue,
-            alarm.ALARM_STATUS as alarmStatus,
-            alarm.ALARM_IMAGE AS alarmImage,
-            alarm.ALARM_CONTENT as alarmContent,
-            alarm.ALARM_TIME as alarmTime,
-            alarm.CANCEL_TIME as cancelTime,
-            alarm.ALARM_LNG as alarmLng,
-            alarm.ALARM_LAT as alarmLat,
-            p.WORK_TITLE as workTitle,
-            p.WORK_ROAD as workRoad,
-            p.PROJECT_STATE as projectState,
-            w.WORKER_NAME as workPersonName,
-            w.PHONE_NUMBER as workPersonPhoneNumber
-        FROM
-            `br_bus_alarm` alarm
-                LEFT JOIN br_work_site_info p on alarm.PROJECT_ID = p.ID
-                LEFT JOIN br_worker w on p.WORK_PERSON = w.ID
-        <where>
-            <if test="ew != null">
-                ${ew.sqlSegment}
-            </if>
-        </where>
-    </select>
-
-    <select id="cancelAlarm">
-        update br_bus_alarm
-        set ALARM_STATUS = '1'
-        where DEVICE_ID = #{deviceId}
-          and ALARM_TYPE = #{alarmType}
-          and ALARM_STATUS = '0'
-    </select>
-
-    <select id="alarmCount" resultType="com.casic.missiles.modular.system.dto.AlarmTypeCountDTO">
-        SELECT
-            ALARM_TYPE as alarmType,
-            count(*) as alarmCount
-        from br_bus_alarm
-        <where>
-            <if test="projectId != null and projectId !=''">
-                and PROJECT_ID = #{projectId}
-            </if>
-            <if test="alarmStatus != null and alarmStatus !=''">
-                and ALARM_STATUS = #{alarmStatus}
-            </if>
-        </where>
-        group by ALARM_TYPE
-    </select>
-</mapper>
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/BusEventImageMapper.xml b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/BusEventImageMapper.xml
deleted file mode 100644
index fbc3db3..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/BusEventImageMapper.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.casic.missiles.modular.system.mapper.BusEventImageMapper">
-
-</mapper>
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/BusEventMapper.xml b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/BusEventMapper.xml
deleted file mode 100644
index 627d573..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/BusEventMapper.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.casic.missiles.modular.system.mapper.BusEventMapper">
-
-</mapper>
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/DeviceExtMapper.xml b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/DeviceExtMapper.xml
deleted file mode 100644
index 5321d1c..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/DeviceExtMapper.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.casic.missiles.modular.system.mapper.DeviceExtMapper">
-
-</mapper>
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/DeviceMapper.xml b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/DeviceMapper.xml
index 94262e1..88e7d01 100644
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/DeviceMapper.xml
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/DeviceMapper.xml
@@ -2,96 +2,4 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.casic.missiles.modular.system.mapper.DeviceMapper">
 
-    <select id="listDetailPage" resultType="com.casic.missiles.modular.system.dto.DeviceDetailDTO">
-        select
-        br_device.ID as id,
-        DEVICE_CODE as deviceCode,
-        DEVICE_TYPE as deviceType,
-        DEVICE_BATCH as deviceBatch,
-        MANUFACTURER as manufacturer,
-        IS_POWER_SUPPLY as isPowerSupply,
-        CREATE_TIME as createTime,
-        CAMERA_CODE as cameraCode,
-        CAMERA_IP as cameraIp,
-        CAMERA_PORT as cameraPort,
-        GAS_CODE as gasCode,
-        GAS_IP as gasIp,
-        GAS_PORT as gasPort,
-        HAT_LINING_CODE as hatLiningCode
-        from br_device
-        left join br_device_ext ext on ext.DEVICE_ID = br_device.ID
-        <where>
-            <if test="ew != null">
-                ${ew.sqlSegment}
-            </if>
-        </where>
-    </select>
-
-    <select id="selectProjectDevice" resultType="java.lang.Long">
-        with device_info as (
-            (SELECT
-            d.DEVICE_ID as DEVICE_ID,
-            d.PROJECT_ID as PROJECT_ID,
-            p.PROJECT_STATE as PROJECT_STATE
-            from br_project_device d
-            LEFT JOIN br_work_site_info p on p.ID = d.PROJECT_ID)
-
-            UNION ALL
-
-            (SELECT
-            d1.ID as DEVICE_ID,
-            w1.ID as PROJECT_ID,
-            w1.PROJECT_STATE as PROJECT_STATE
-            FROM br_project_worker pw1
-            LEFT JOIN br_device d1 on pw1.BRACELET_CODE = d1.DEVICE_CODE
-            LEFT JOIN br_work_site_info w1 on pw1.PROJECT_ID = w1.ID)
-
-            UNION ALL
-
-            (SELECT
-            d1.ID as DEVICE_ID,
-            w1.ID as PROJECT_ID,
-            w1.PROJECT_STATE as PROJECT_STATE
-            FROM br_project_worker pw1
-            LEFT JOIN br_device d1 on pw1.HAT_CODE = d1.DEVICE_CODE
-            LEFT JOIN br_work_site_info w1 on pw1.PROJECT_ID = w1.ID)
-
-
-            UNION ALL
-
-            (SELECT
-            d1.ID as DEVICE_ID,
-            w1.ID as PROJECT_ID,
-            w1.PROJECT_STATE as PROJECT_STATE
-            FROM br_project_worker pw1
-            LEFT JOIN br_device d1 on pw1.VAST_CODE = d1.DEVICE_CODE
-            LEFT JOIN br_work_site_info w1 on pw1.PROJECT_ID = w1.ID))
-
-        select DISTINCT DEVICE_ID from device_info
-        <where>
-            DEVICE_ID is not null
-            <choose>
-                <when test="projectId != null and projectId !=''">
-                    and PROJECT_ID = #{projectId}
-                </when>
-                <otherwise>
-                    AND PROJECT_STATE != '3'
-                </otherwise>
-            </choose>
-        </where>
-    </select>
-
-    <select id="selectHelmetList" resultType="com.casic.missiles.modular.system.dto.HelmetInfoDTO">
-        SELECT
-            a.ID AS deviceId,
-            a.DEVICE_CODE AS hatCode,
-            b.HAT_LINING_CODE AS hatLiningCode
-        FROM
-            br_device a
-                LEFT JOIN br_device_ext b ON a.ID = b.DEVICE_ID
-        WHERE
-            a.DEVICE_TYPE = #{deviceType}
-          AND a.DEVICE_CODE IS NOT NULL
-          AND b.HAT_LINING_CODE IS NOT NULL
-    </select>
 </mapper>
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/ProjectDeviceMapper.xml b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/ProjectDeviceMapper.xml
deleted file mode 100644
index c6d1c24..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/ProjectDeviceMapper.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.casic.missiles.modular.system.mapper.ProjectDeviceMapper">
-
-    <select id="selectDetailByProjectId" resultType="com.casic.missiles.modular.system.entity.ProjectDevice">
-        SELECT
-            pd.ID as id,
-            pd.PROJECT_ID as projectId,
-            pd.DEVICE_ID as deviceId,
-            d.DEVICE_CODE as deviceCode
-        from br_project_device pd
-        LEFT JOIN br_device d on pd.DEVICE_ID = d.ID
-        <where>
-            pd.PROJECT_ID = #{projectId}
-        </where>
-    </select>
-
-    <select id="selectDeviceLocationList" resultType="com.casic.missiles.modular.system.dto.DeviceLocationDTO">
-        SELECT
-        d.ID as deviceId,
-        d.DEVICE_TYPE as deviceType,
-        d.DEVICE_CODE as deviceCode,
-        if(EXISTS(select ID from br_bus_alarm WHERE DEVICE_ID = d.ID and ALARM_STATUS = '0'),true,false) as alarmFlag
-        FROM br_project_device pd, br_device d
-        where pd.DEVICE_ID = d.ID
-        and pd.PROJECT_ID = #{projectId}
-    </select>
-
-</mapper>
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/ProjectWorkerMapper.xml b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/ProjectWorkerMapper.xml
deleted file mode 100644
index 8d2de10..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/ProjectWorkerMapper.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.casic.missiles.modular.system.mapper.ProjectWorkerMapper">
-
-    <select id="selectDetailByProjectId" resultType="com.casic.missiles.modular.system.entity.ProjectWorker">
-        SELECT
-            pw.ID as id,
-            pw.PROJECT_ID as projectId,
-            pw.WORKER_ID as workerId,
-            w.WORKER_NAME as workerName,
-            w.DEPT_ID as workerDeptId,
-            pw.HAT_CODE as hatCode,
-            pw.VAST_CODE as vastCode,
-            pw.BRACELET_CODE as braceletCode,
-            w.PHONE_NUMBER as workerPhoneNumber
-        from br_project_worker pw
-        LEFT JOIN br_worker w on pw.WORKER_ID = w.ID
-        <where>
-            pw.PROJECT_ID = #{projectId}
-            <if test="workerType != null and workerType != ''">
-                and w.WORKER_TYPE = #{workerType}
-            </if>
-        </where>
-    </select>
-
-    <select id="selectWorkerLocationList" resultType="com.casic.missiles.modular.system.dto.WorkerLocationDTO">
-        select
-            w.ID as workerId,
-            w.WORKER_NAME as workerName,
-            pw.HAT_CODE as hatCode,
-            hd.ID as hatId,
-            pw.BRACELET_CODE as braceletCode,
-            pw.VAST_CODE as vastCode
-        from br_project_worker pw,br_worker w ,br_device hd
-        WHERE pw.WORKER_ID = w.ID
-          and pw.HAT_CODE = hd.DEVICE_CODE
-          and pw.PROJECT_ID = #{projectId}
-          and w.WORKER_TYPE = #{workerType}
-    </select>
-</mapper>
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/WorkSiteInfoMapper.xml b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/WorkSiteInfoMapper.xml
deleted file mode 100644
index 8f01326..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/WorkSiteInfoMapper.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.casic.missiles.modular.system.mapper.WorkSiteInfoMapper">
-
-    <select id="selectListPage" resultType="com.casic.missiles.modular.system.entity.WorkSiteInfo">
-        SELECT
-            br_work_site_info.ID AS id,
-            WORK_TITLE as workTitle,
-            WORK_ROAD as workRoad,
-            WORK_SITE_DESC as workSiteDesc,
-            WORK_PERSON as workPerson,
-            WORKER_NAME as workPersonName,
-            DEPT_ID as workPersonDeptId,
-            PHONE_NUMBER as workPersonPhoneNumber,
-            PROJECT_STATE as projectState,
-            br_work_site_info.CREATE_TIME AS createTime,
-            br_work_site_info.UPDATE_TIME AS updateTime
-        FROM br_work_site_info
-        LEFT JOIN br_worker w ON br_work_site_info.WORK_PERSON = w.ID
-        <where>
-            <if test="ew != null">
-                ${ew.sqlSegment}
-            </if>
-        </where>
-    </select>
-</mapper>
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/WorkerMapper.xml b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/WorkerMapper.xml
deleted file mode 100644
index 3e28b39..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/WorkerMapper.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.casic.missiles.modular.system.mapper.WorkerMapper">
-
-    <select id="selectListPage" resultType="com.casic.missiles.modular.system.entity.Worker">
-        WITH worker_project AS (
-            SELECT
-                w.id AS ID,
-                WORKER_NAME,
-                GENDER,
-                DEPT_ID,
-                OWNER_SHIP,
-                PHONE_NUMBER,
-                ID_CARD_NUMBER,
-                ENTER_REASON,
-                WORKER_AVATAR,
-                w.CREATE_TIME,
-                WORKER_TYPE,
-                IF( p.PROJECT_STATE != '3', 1, 0 ) AS `STATUS`
-            FROM br_worker w
-            LEFT JOIN br_project_worker pw ON w.ID = pw.WORKER_ID
-            LEFT JOIN br_work_site_info p ON pw.PROJECT_ID = p.ID
-        )
-
-        SELECT
-            ID AS id,
-            WORKER_NAME AS workerName,
-            GENDER AS gender,
-            DEPT_ID AS deptId,
-            OWNER_SHIP AS ownerShip,
-            PHONE_NUMBER AS phoneNumber,
-            ID_CARD_NUMBER AS idCardNumber,
-            ENTER_REASON AS enterReason,
-            WORKER_AVATAR AS workerAvatar,
-            CREATE_TIME AS createTime,
-            WORKER_TYPE AS workerType,
-            `STATUS` AS `status`
-        FROM worker_project
-        <where>
-            <if test="ew != null">
-                ${ew.sqlSegment}
-            </if>
-        </where>
-    </select>
-
-    <select id="selectWorkerAvatars" resultType="java.lang.String">
-        SELECT
-            WORKER_AVATAR
-        FROM
-            `br_worker`
-        WHERE
-        ID IN ( SELECT WORKER_ID FROM br_project_worker WHERE PROJECT_ID = #{projectId} )
-          AND WORKER_AVATAR IS NOT NULL
-          AND WORKER_AVATAR != ''
-    </select>
-</mapper>
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IAlarmService.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IAlarmService.java
new file mode 100644
index 0000000..8bc01f4
--- /dev/null
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IAlarmService.java
@@ -0,0 +1,16 @@
+package com.casic.missiles.modular.system.service;
+
+import com.casic.missiles.modular.system.entity.Alarm;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 报警记录表 服务类
+ * </p>
+ *
+ * @author zyj
+ * @since 2023-05-25
+ */
+public interface IAlarmService extends IService<Alarm> {
+
+}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IBusAlarmService.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IBusAlarmService.java
deleted file mode 100644
index f63c19c..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IBusAlarmService.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package com.casic.missiles.modular.system.service;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.modular.system.dto.AlarmTypeCountDTO;
-import com.casic.missiles.modular.system.dto.AlarmUpload;
-import com.casic.missiles.modular.system.entity.BusAlarm;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-import java.util.List;
-
-/**
- * <p>
- * 报警记录表 服务类
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface IBusAlarmService extends IService<BusAlarm> {
-
-    boolean alarmUpload(AlarmUpload alarmUpload);
-
-    Page<BusAlarm> listPage(Page<BusAlarm> page,QueryWrapper<BusAlarm> queryWrapper);
-
-    List<AlarmTypeCountDTO> alarmCount(Long projectId,String alarmStatus);
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IBusEventImageService.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IBusEventImageService.java
deleted file mode 100644
index b1187ed..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IBusEventImageService.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.casic.missiles.modular.system.service;
-
-import com.casic.missiles.modular.system.entity.BusEventImage;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-import java.util.List;
-
-/**
- * <p>
- * 事件图片表 服务类
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface IBusEventImageService extends IService<BusEventImage> {
-
-    boolean saveBusEventImages(Long eventId, List<BusEventImage> imageList);
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IBusEventService.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IBusEventService.java
deleted file mode 100644
index 85c48d0..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IBusEventService.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package com.casic.missiles.modular.system.service;
-
-import com.casic.missiles.modular.system.entity.BusEvent;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-/**
- * <p>
- * 事件表 服务类
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface IBusEventService extends IService<BusEvent> {
-
-    boolean saveBusEvent(BusEvent busEvent);
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IDeviceExtService.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IDeviceExtService.java
deleted file mode 100644
index 6fc5361..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IDeviceExtService.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package com.casic.missiles.modular.system.service;
-
-import com.casic.missiles.modular.system.dto.DeviceDetailDTO;
-import com.casic.missiles.modular.system.entity.DeviceExt;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-import java.util.List;
-
-/**
- * <p>
- * 设备扩展信息表（安全树） 服务类
- * </p>
- *
- * @author zyj
- * @since 2023-04-27
- */
-public interface IDeviceExtService extends IService<DeviceExt> {
-
-    boolean saveDeviceExt(DeviceDetailDTO deviceDetailDTO);
-
-    boolean updateDeviceExt(DeviceDetailDTO deviceDetailDTO);
-
-    boolean removeByDeviceIds(List<Long> deviceIds);
-
-    boolean setGasThreshold(String gasIp,String gasPort,String threshold);
-
-    String getGasThreshold(String gasIp,String gasPort);
-
-    Long selectByGasIpPort(String gasIp,String gasPort);
-
-    Long selectByCameraIpPort(String cameraIp,String cameraPort);
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java
index 9e62756..00a421d 100644
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java
@@ -1,32 +1,16 @@
 package com.casic.missiles.modular.system.service;
 
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.modular.system.dto.DeviceDetailDTO;
-import com.casic.missiles.modular.system.dto.HelmetInfoDTO;
 import com.casic.missiles.modular.system.entity.Device;
 import com.baomidou.mybatisplus.extension.service.IService;
 
-import java.util.List;
-
 /**
  * <p>
- *  服务类
+ * 设备记录表 服务类
  * </p>
  *
  * @author zyj
- * @since 2023-04-14
+ * @since 2023-05-25
  */
 public interface IDeviceService extends IService<Device> {
 
-    boolean saveDevice(DeviceDetailDTO deviceDetailDTO);
-
-    boolean updateDevice(DeviceDetailDTO deviceDetailDTO);
-
-    boolean deleteDevices(List<Long> deviceIds);
-
-    Page<DeviceDetailDTO> listPage(Page<DeviceDetailDTO> page, QueryWrapper<DeviceDetailDTO> queryWrapper, String status,Long projectId);
-
-    List<Long> selectProjectDevice(Long projectId);
-
 }
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IProjectDeviceService.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IProjectDeviceService.java
deleted file mode 100644
index 8599411..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IProjectDeviceService.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package com.casic.missiles.modular.system.service;
-
-import com.casic.missiles.modular.system.dto.DeviceLocationDTO;
-import com.casic.missiles.modular.system.entity.ProjectDevice;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-import java.util.List;
-
-/**
- * <p>
- *  服务类
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface IProjectDeviceService extends IService<ProjectDevice> {
-
-    boolean saveProjectDeviceList(Long projectId, List<ProjectDevice> projectDeviceList);
-
-    boolean updateProjectDeviceList(Long projectId, List<ProjectDevice> projectDeviceList);
-
-    boolean deleteByProjectId(Long projectId);
-
-    boolean deleteByProjectIds(List<Long> projectIds);
-
-    List<ProjectDevice> selectDetailByProjectId(Long projectId);
-
-    Long selectProjectIdByDevice(Long deviceId);
-
-    List<DeviceLocationDTO> selectDeviceLocationList(Long projectId);
-
-}

diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/AlarmController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/AlarmController.java
new file mode 100644
index 0000000..1795cf1
--- /dev/null
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/AlarmController.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.modular.system.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.stereotype.Controller;
+
+/**
+ * <p>
+ * 报警记录表 前端控制器
+ * </p>
+ *
+ * @author zyj
+ * @since 2023-05-25
+ */
+@Controller
+@RequestMapping("/system/alarm")
+public class AlarmController {
+
+}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusAlarmController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusAlarmController.java
deleted file mode 100644
index 1f82ebb..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusAlarmController.java
+++ /dev/null
@@ -1,102 +0,0 @@
-package com.casic.missiles.modular.system.controller;
-
-
-import cn.hutool.core.util.ObjectUtil;
-import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.core.base.controller.BaseController;
-import com.casic.missiles.core.page.PageFactory;
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.AlarmUpload;
-import com.casic.missiles.modular.system.dto.DeviceDetailDTO;
-import com.casic.missiles.modular.system.entity.BusAlarm;
-import com.casic.missiles.modular.system.service.IBusAlarmService;
-import io.swagger.annotations.*;
-import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.*;
-
-import org.springframework.stereotype.Controller;
-
-import static com.casic.missiles.model.response.ResponseData.DEFAULT_SUCCESS_MESSAGE;
-import static com.casic.missiles.modular.system.consts.AlarmConst.ALARM_STATUS_MANUAL_CANCEL;
-
-/**
- * <p>
- * 报警记录表 前端控制器
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@Api(tags = "报警管理接口")
-@Controller
-@RequestMapping("/alarm")
-@RequiredArgsConstructor
-public class BusAlarmController extends BaseController {
-
-    private final IBusAlarmService alarmService;
-
-    @ApiOperation("报警上报接口")
-    @PostMapping("/upload")
-    @ResponseBody
-    public Object upload(@RequestBody AlarmUpload alarmUpload){
-        alarmService.alarmUpload(alarmUpload);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("报警列表分页查询")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "workTitle", value = "作业名称",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "projectId", value = "作业ID",dataType = "Long", paramType = "query",example = "0"),
-            @ApiImplicitParam(name = "alarmStatus", value = "报警状态",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "projectState", value = "作业状态",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "alarmType", value = "报警类型",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "alarmStartTime", value = "报警开始时间",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "alarmEndTime", value = "报警结束时间",dataType = "String", paramType = "query")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = BusAlarm.class),
-    })
-    @GetMapping("/listPage")
-    @ResponseBody
-    public Object listPage(String workTitle,Long projectId,String alarmStatus,String projectState,String alarmType,String alarmStartTime,String alarmEndTime){
-        Page<BusAlarm> page = PageFactory.defaultPage();
-        QueryWrapper<BusAlarm> queryWrapper = new QueryWrapper<>();
-        if(StrUtil.isNotEmpty(workTitle)){
-            queryWrapper.like("p.WORK_TITLE",workTitle);
-        }
-        if(ObjectUtil.isNotEmpty(projectId)){
-            queryWrapper.eq("alarm.PROJECT_ID",projectId);
-        }
-        if(StrUtil.isNotEmpty(alarmStatus)){
-            queryWrapper.eq("alarm.ALARM_STATUS",alarmStatus);
-        }
-        if(StrUtil.isNotEmpty(projectState)){
-            queryWrapper.eq("p.PROJECT_STATE",projectState);
-        }
-        if(StrUtil.isNotEmpty(alarmType)){
-            queryWrapper.eq("alarm.ALARM_TYPE",alarmType);
-        }
-        if(StrUtil.isNotEmpty(alarmStartTime)){
-            queryWrapper.ge("alarm.ALARM_TIME",alarmStartTime);
-        }
-        if(StrUtil.isNotEmpty(alarmEndTime)){
-            queryWrapper.le("alarm.ALARM_TIME",alarmEndTime);
-        }
-        page = alarmService.listPage(page,queryWrapper);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-    @ApiOperation("消警")
-    @PostMapping("/cancel")
-    @ResponseBody
-    public Object cancel(@RequestParam("alarmId") Long alarmId){
-        UpdateWrapper<BusAlarm> updateWrapper = new UpdateWrapper<>();
-        updateWrapper.eq("ID",alarmId);
-        updateWrapper.set("ALARM_STATUS",ALARM_STATUS_MANUAL_CANCEL);
-        alarmService.update(updateWrapper);
-        return ResponseData.success();
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusEventController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusEventController.java
deleted file mode 100644
index dde5aad..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusEventController.java
+++ /dev/null
@@ -1,41 +0,0 @@
-package com.casic.missiles.modular.system.controller;
-
-
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.entity.BusEvent;
-import com.casic.missiles.modular.system.service.IBusEventService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.ResponseBody;
-
-/**
- * <p>
- * 事件表 前端控制器
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@Controller
-@RequestMapping("/event")
-@Api(tags = "事件上报")
-@RequiredArgsConstructor
-public class BusEventController {
-
-    private final IBusEventService eventService;
-
-    @ApiOperation("事件上报")
-    @PostMapping("add")
-    @ResponseBody
-    public Object add(@RequestBody BusEvent busEvent){
-        eventService.saveBusEvent(busEvent);
-        return ResponseData.success();
-    }
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
index 03abc5f..aa50d78 100644
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
@@ -1,121 +1,20 @@
 package com.casic.missiles.modular.system.controller;
 
 
-import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.core.base.controller.BaseController;
-import com.casic.missiles.core.page.PageFactory;
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.DeviceDetailDTO;
-import com.casic.missiles.modular.system.entity.Device;
-import com.casic.missiles.modular.system.service.IDeviceExtService;
-import com.casic.missiles.modular.system.service.IDeviceService;
-import io.swagger.annotations.*;
-import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.RequestMapping;
 
 import org.springframework.stereotype.Controller;
 
-import java.time.LocalDateTime;
-import java.util.Date;
-import java.util.List;
-
-import static com.casic.missiles.model.response.ResponseData.DEFAULT_SUCCESS_MESSAGE;
-
 /**
  * <p>
- *  前端控制器
+ * 设备记录表 前端控制器
  * </p>
  *
  * @author zyj
- * @since 2023-04-14
+ * @since 2023-05-25
  */
-@Api(tags = "设备管理接口")
-@RequiredArgsConstructor
 @Controller
-@RequestMapping("/device")
-public class DeviceController extends BaseController {
-    private final IDeviceService deviceService;
-    private final IDeviceExtService deviceExtService;
-
-    @ApiOperation("设备分页列表")
-    @ApiImplicitParams({
-        @ApiImplicitParam(name = "deviceType", value = "设备类型",dataType = "String", paramType = "query"),
-        @ApiImplicitParam(name = "deviceCode", value = "设备编号",dataType = "String", paramType = "query"),
-        @ApiImplicitParam(name = "status", value = "设备状态",dataType = "String", paramType = "query"),
-        @ApiImplicitParam(name = "projectId", value = "作业ID（如果传此参数，列表中返回该作业使用的设备）",dataType = "Long", paramType = "query", example = "0")
-    })
-    @ApiResponses({
-        @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = DeviceDetailDTO.class),
-    })
-    @GetMapping("listPage")
-    @ResponseBody
-    public Object listPage(String deviceType, String deviceCode, String status,Long projectId){
-        Page<DeviceDetailDTO> page = PageFactory.defaultPage();
-        QueryWrapper<DeviceDetailDTO> queryWrapper = new QueryWrapper<>();
-        if(StrUtil.isNotEmpty(deviceType)){
-            queryWrapper.eq("DEVICE_TYPE",deviceType);
-        }
-        if(StrUtil.isNotEmpty(deviceCode)){
-            queryWrapper.like("DEVICE_CODE",deviceCode);
-        }
-        page = deviceService.listPage(page,queryWrapper,status,projectId);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-    @ApiOperation("新增设备")
-    @PostMapping("add")
-    @ResponseBody
-    public Object add(@RequestBody DeviceDetailDTO deviceDetailDTO){
-        deviceService.saveDevice(deviceDetailDTO);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("编辑设备")
-    @PostMapping("update")
-    @ResponseBody
-    public Object update(@RequestBody DeviceDetailDTO deviceDetailDTO){
-        deviceService.updateDevice(deviceDetailDTO);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("删除设备")
-    @PostMapping("delete")
-    @ResponseBody
-    public Object delete(@ApiParam("设备id列表")@RequestBody List<Long> deviceIds){
-        deviceService.deleteDevices(deviceIds);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("设置甲烷阈值")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "gasIp", value = "安全树甲烷设备IP",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "gasPort", value = "安全树甲烷端口",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "threshold", value = "甲烷阈值",dataType = "String", paramType = "query")
-    })
-    @PostMapping("setThreshold")
-    @ResponseBody
-    public Object setThreshold(String gasIp,String gasPort,String threshold){
-        deviceExtService.setGasThreshold(gasIp, gasPort, threshold);
-        return ResponseData.success();
-    }
-
-
-    @ApiOperation("查询甲烷阈值")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "gasIp", value = "安全树甲烷设备IP",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "gasPort", value = "安全树甲烷端口",dataType = "String", paramType = "query")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = "{\"code\": 200,\"data\": \"100\",\"message\": \"请求成功\",\"success\": true}",response = String.class),
-    })
-    @GetMapping("getThreshold")
-    @ResponseBody
-    public Object getThreshold(String gasIp,String gasPort){
-        String data = deviceExtService.getGasThreshold(gasIp, gasPort);
-        return ResponseData.success(data);
-    }
-
+@RequestMapping("/system/device")
+public class DeviceController {
 
 }
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/OverviewController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/OverviewController.java
deleted file mode 100644
index 7570504..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/OverviewController.java
+++ /dev/null
@@ -1,70 +0,0 @@
-package com.casic.missiles.modular.system.controller;
-
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.AlarmTypeCountDTO;
-import com.casic.missiles.modular.system.dto.DeviceLocationDTO;
-import com.casic.missiles.modular.system.dto.WorkerLocationDTO;
-import com.casic.missiles.modular.system.service.IBusAlarmService;
-import com.casic.missiles.modular.system.service.IProjectDeviceService;
-import com.casic.missiles.modular.system.service.IProjectWorkerService;
-import io.swagger.annotations.*;
-import lombok.RequiredArgsConstructor;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.ResponseBody;
-
-import static com.casic.missiles.model.response.ResponseData.DEFAULT_SUCCESS_MESSAGE;
-import static com.casic.missiles.modular.system.consts.AlarmConst.ALARM_STATUS_ON;
-
-@Api(tags = "首页看板接口")
-@Controller
-@RequestMapping("overview")
-@RequiredArgsConstructor
-public class OverviewController {
-
-    private final IBusAlarmService alarmService;
-    private final IProjectDeviceService projectDeviceService;
-
-    private final IProjectWorkerService projectWorkerService;
-
-
-    @ApiOperation("报警统计接口")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "projectId", value = "作业ID",dataType = "Long", paramType = "query", example = "0")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = AlarmTypeCountDTO.class),
-    })
-    @GetMapping("/alarmCount")
-    @ResponseBody
-    public Object alarmCount(Long projectId){
-        return ResponseData.success(alarmService.alarmCount(projectId,ALARM_STATUS_ON));
-    }
-
-    @ApiOperation("设备列表接口")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "projectId", value = "作业ID",dataType = "Long", paramType = "query", example = "0")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = DeviceLocationDTO.class),
-    })
-    @GetMapping("/deviceList")
-    @ResponseBody
-    public Object deviceList(Long projectId){
-        return ResponseData.success(projectDeviceService.selectDeviceLocationList(projectId));
-    }
-
-    @ApiOperation("人员列表接口")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "projectId", value = "作业ID",dataType = "Long", paramType = "query", example = "0")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = WorkerLocationDTO.class),
-    })
-    @GetMapping("/workerList")
-    @ResponseBody
-    public Object workerList(Long projectId){
-        return ResponseData.success(projectWorkerService.selectWorkerLocationDTO(projectId));
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/WorkSiteInfoController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/WorkSiteInfoController.java
deleted file mode 100644
index af36d69..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/WorkSiteInfoController.java
+++ /dev/null
@@ -1,130 +0,0 @@
-package com.casic.missiles.modular.system.controller;
-
-
-import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.core.base.controller.BaseController;
-import com.casic.missiles.core.page.PageFactory;
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.WorkSiteDetailDTO;
-import com.casic.missiles.modular.system.entity.WorkSiteInfo;
-import com.casic.missiles.modular.system.service.IWorkSiteInfoService;
-import io.swagger.annotations.*;
-import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.*;
-
-import org.springframework.stereotype.Controller;
-
-import java.util.List;
-
-import static com.casic.missiles.model.response.ResponseData.DEFAULT_SUCCESS_MESSAGE;
-
-/**
- * <p>
- * 作业现场表 前端控制器
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@Controller
-@RequestMapping("/site")
-@Api(tags = "作业现场管理")
-@RequiredArgsConstructor
-public class WorkSiteInfoController extends BaseController {
-
-
-    private final IWorkSiteInfoService workSiteInfoService;
-
-    @ApiOperation("新增作业现场")
-    @PostMapping("add")
-    @ResponseBody
-    public Object addWorkSite(@RequestBody WorkSiteDetailDTO workSiteDetailDTO){
-        workSiteInfoService.addWorkSiteInfo(workSiteDetailDTO);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("编辑作业现场")
-    @PostMapping("update")
-    @ResponseBody
-    public Object updateWorkSite(@RequestBody WorkSiteDetailDTO workSiteDetailDTO){
-        workSiteInfoService.updateWorkSiteInfo(workSiteDetailDTO);
-        return ResponseData.success();
-    }
-
-
-    @ApiOperation("删除作业现场")
-    @PostMapping("delete")
-    @ResponseBody
-    public Object delete(@ApiParam("作业现场id列表")@RequestBody List<Long> projectIds){
-        workSiteInfoService.deleteProjects(projectIds);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("查询作业现场详情")
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = WorkSiteDetailDTO.class),
-    })
-    @GetMapping("detail")
-    @ResponseBody
-    public Object delete(@ApiParam(value = "作业现场id", example = "0")@RequestParam Long projectId){
-        WorkSiteDetailDTO detailDTO = workSiteInfoService.getWorkSiteDetail(projectId);
-        return ResponseData.success(detailDTO);
-    }
-
-    @ApiOperation("分页列表查询")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "workTitle",value = "作业名称", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "workRoad",value = "所属道路", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "workPersonName",value = "责任人姓名", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "startDate",value = "注册开始日期", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "endDate",value = "注册结束日期", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "projectState",value = "当前状态（字典值）", dataType = "String", paramType = "query")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = WorkSiteInfo.class),
-    })
-    @GetMapping("listPage")
-    @ResponseBody
-    public Object listPage(String workTitle,String workRoad,String workPersonName,String projectState,String startDate,String endDate){
-        Page<WorkSiteInfo> page = PageFactory.defaultPage();
-        QueryWrapper<WorkSiteInfo> queryWrapper = new QueryWrapper<>();
-        if(StrUtil.isNotEmpty(workTitle)){
-            queryWrapper.like("WORK_TITLE",workTitle);
-        }
-        if(StrUtil.isNotEmpty(workRoad)){
-            queryWrapper.like("WORK_ROAD",workRoad);
-        }
-        if(StrUtil.isNotEmpty(workPersonName)){
-            queryWrapper.like("WORKER_NAME",workPersonName);
-        }
-        if(StrUtil.isNotEmpty(projectState)){
-            queryWrapper.eq("PROJECT_STATE",projectState);
-        }
-        if(StrUtil.isNotEmpty(startDate)){
-            queryWrapper.ge("br_work_site_info.CREATE_TIME",startDate + " 00:00:00");
-        }
-        if(StrUtil.isNotEmpty(endDate)){
-            queryWrapper.le("br_work_site_info.CREATE_TIME",endDate + " 23:59:59");
-        }
-        page = workSiteInfoService.selectListPage(page,queryWrapper);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-    @ApiOperation("开始作业")
-    @PostMapping("start")
-    @ResponseBody
-    public Object start(@ApiParam(value = "作业现场id",example = "0")@RequestParam Long projectId){
-        workSiteInfoService.start(projectId);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("完成作业")
-    @PostMapping("finish")
-    @ResponseBody
-    public Object finish(@ApiParam(value = "作业现场id", example = "0")@RequestParam Long projectId){
-        workSiteInfoService.finish(projectId);
-        return ResponseData.success();
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/WorkerController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/WorkerController.java
deleted file mode 100644
index 796f94c..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/WorkerController.java
+++ /dev/null
@@ -1,136 +0,0 @@
-package com.casic.missiles.modular.system.controller;
-
-
-import cn.hutool.core.util.ObjectUtil;
-import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.core.base.controller.BaseController;
-import com.casic.missiles.core.page.PageFactory;
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.DeviceDetailDTO;
-import com.casic.missiles.modular.system.entity.Device;
-import com.casic.missiles.modular.system.entity.Worker;
-import com.casic.missiles.modular.system.service.IWorkerService;
-import io.swagger.annotations.*;
-import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.*;
-
-import org.springframework.stereotype.Controller;
-
-import java.util.Date;
-import java.util.List;
-
-import static com.casic.missiles.model.response.ResponseData.DEFAULT_SUCCESS_MESSAGE;
-
-/**
- * <p>
- *  前端控制器
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@Controller
-@RequestMapping("/worker")
-@RequiredArgsConstructor
-@Api(tags = "人员管理接口")
-public class WorkerController extends BaseController {
-
-    private final IWorkerService workerService;
-
-    @ApiOperation("分页列表查询")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "name",value = "姓名", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "deptId",value = "所属部门", dataType = "Long", paramType = "query", example = "0"),
-            @ApiImplicitParam(name = "status",value = "当前状态（字典值）", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "startDate",value = "注册开始日期", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "endDate",value = "注册结束日期", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "workerType",value = "人员类型（字典值）", dataType = "String", paramType = "query")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = Worker.class),
-    })
-    @GetMapping("listPage")
-    @ResponseBody
-    public Object listPage(String name,Long deptId, String status,String startDate,String endDate,String workerType){
-        Page<Worker> page = PageFactory.defaultPage();
-        QueryWrapper<Worker> queryWrapper = new QueryWrapper<>();
-        if(StrUtil.isNotEmpty(name)){
-            queryWrapper.like("WORKER_NAME",name);
-        }
-        if(ObjectUtil.isNotEmpty(deptId)){
-            queryWrapper.eq("DEPT_ID",deptId);
-        }
-        if(StrUtil.isNotEmpty(workerType)){
-            queryWrapper.eq("WORKER_TYPE",workerType);
-        }
-        if(StrUtil.isNotEmpty(startDate)){
-            queryWrapper.ge("CREATE_TIME",startDate + " 00:00:00");
-        }
-        if(StrUtil.isNotEmpty(endDate)){
-            queryWrapper.le("CREATE_TIME",endDate + " 23:59:59");
-        }
-        if(StrUtil.isNotEmpty(status)){
-            queryWrapper.eq("`STATUS`",status);
-        }
-        page = workerService.selectListPage(page,queryWrapper);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-    @ApiOperation("新增人员")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "worker", value = "人员信息", dataType = "Worker", paramType = "body", required = true),
-            @ApiImplicitParam(name = "projectId", value = "项目ID(入场申请需要)", dataType = "Long", paramType = "query", example = "0")
-    })
-    @PostMapping("add")
-    @ResponseBody
-    public Object add(@ApiParam("worker")@RequestBody Worker worker,
-                      @RequestParam(required = false) Long projectId){
-        workerService.addWorker(worker,projectId);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("编辑人员")
-    @PostMapping("update")
-    @ResponseBody
-    public Object update(@RequestBody Worker worker){
-        workerService.updateById(worker);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("删除人员")
-    @PostMapping("delete")
-    @ResponseBody
-    public Object delete(@ApiParam("人员id列表")@RequestBody List<Long> workIds){
-        workerService.removeByIds(workIds);
-        return ResponseData.success();
-    }
-
-
-    @ApiOperation(value = "获取人脸图片",notes = "返回人脸图片url")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "cameraIp",value = "摄像头IP", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "cameraPort",value = "摄像头端口号", dataType = "String", paramType = "query"),
-    })
-    @GetMapping("/face/register")
-    @ResponseBody
-    public Object faceRegister(String cameraIp,String cameraPort){
-        return ResponseData.success(workerService.faceRegister(cameraIp, cameraPort));
-    }
-
-
-    @ApiOperation(value = "查询临时入场人员列表")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "projectId", value = "项目ID",required = true,dataType = "Long", paramType = "query", example = "0")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = Worker.class),
-    })
-    @GetMapping("/projectTempWorker")
-    @ResponseBody
-    public Object projectTempWorker(Long projectId){
-        return ResponseData.success(workerService.projectTempWorker(projectId));
-    }
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/AlarmTypeCountDTO.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/AlarmTypeCountDTO.java
deleted file mode 100644
index 1a165a1..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/AlarmTypeCountDTO.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.casic.missiles.modular.system.dto;
-
-import io.swagger.annotations.ApiModel;
-import lombok.Data;
-
-@ApiModel(value = "AlarmTypeCountDTO",description = "报警类型统计（首页）")
-@Data
-public class AlarmTypeCountDTO {
-
-    private String alarmType;
-    private String alarmTypeName;
-    private Integer alarmCount;
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/AlarmUpload.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/AlarmUpload.java
deleted file mode 100644
index 73d7799..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/AlarmUpload.java
+++ /dev/null
@@ -1,46 +0,0 @@
-package com.casic.missiles.modular.system.dto;
-
-import cn.hutool.core.util.StrUtil;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-@ApiModel(value = "AlarmUpload",description = "报警上传")
-@Data
-public class AlarmUpload {
-
-    @ApiModelProperty(value = "摄像头ip")
-    private String cameraIp;
-
-    @ApiModelProperty(value = "摄像头端口")
-    private String cameraPort;
-    @ApiModelProperty(value = "安全树甲烷设备ip")
-    private String gasIp;
-    @ApiModelProperty(value = "安全树甲烷设备端口")
-    private String gasPort;
-    @ApiModelProperty(value = "报警值")
-    private String alarmValue;
-    @ApiModelProperty(value = "报警时间")
-    private String alarmTime;
-    @ApiModelProperty(value = "报警类型")
-    private String alarmType;
-    @ApiModelProperty(value = "报警图片")
-    private String alarmImage;
-    @ApiModelProperty(value = "报警内容")
-    private String alarmContent;
-
-    @Override
-    public String toString() {
-        return "AlarmUpload{" +
-                "cameraIp='" + cameraIp + '\'' +
-                ", cameraPort='" + cameraPort + '\'' +
-                ", gasIp='" + gasIp + '\'' +
-                ", gasPort='" + gasPort + '\'' +
-                ", alarmValue='" + alarmValue + '\'' +
-                ", alarmTime='" + alarmTime + '\'' +
-                ", alarmType='" + alarmType + '\'' +
-                ", alarmImage='" + (StrUtil.isNotEmpty(alarmImage) ? alarmImage.substring(0,50) : "null") + '\'' +
-                ", alarmContent='" + alarmContent + '\'' +
-                '}';
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/DeviceDetailDTO.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/DeviceDetailDTO.java
deleted file mode 100644
index ea518d9..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/DeviceDetailDTO.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package com.casic.missiles.modular.system.dto;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.casic.missiles.modular.system.entity.Device;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-@ApiModel("DeviceDetailDTO")
-@Data
-public class DeviceDetailDTO extends Device {
-
-    @ApiModelProperty(value = "摄像头编号")
-    private String cameraCode;
-
-    @ApiModelProperty(value = "摄像头IP")
-    private String cameraIp;
-
-    @ApiModelProperty(value = "摄像头端口")
-    private String cameraPort;
-
-    @ApiModelProperty(value = "激甲编号")
-    private String gasCode;
-
-    @ApiModelProperty(value = "激甲IP")
-    private String gasIp;
-
-    @ApiModelProperty(value = "激甲端口")
-    private String gasPort;
-
-    @ApiModelProperty(value = "智能帽衬编号")
-    private String hatLiningCode;
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/WorkSiteDetailDTO.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/WorkSiteDetailDTO.java
deleted file mode 100644
index 29378ff..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/WorkSiteDetailDTO.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package com.casic.missiles.modular.system.dto;
-
-import com.casic.missiles.modular.system.entity.ProjectDevice;
-import com.casic.missiles.modular.system.entity.ProjectWorker;
-import com.casic.missiles.modular.system.entity.WorkSiteInfo;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.util.List;
-
-@Data
-@ApiModel("WorkSiteDetailDTO")
-public class WorkSiteDetailDTO extends WorkSiteInfo {
-
-    @ApiModelProperty(value = "安全树列表",dataType = "ProjectDevice")
-    private List<ProjectDevice> deviceList;
-
-    @ApiModelProperty(value = "人员列表",dataType = "ProjectWorker")
-    private List<ProjectWorker> workerList;
-
-
-
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/WorkerLocationDTO.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/WorkerLocationDTO.java
deleted file mode 100644
index 6fd7b24..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/WorkerLocationDTO.java
+++ /dev/null
@@ -1,68 +0,0 @@
-package com.casic.missiles.modular.system.dto;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-@ApiModel(value = "WorkerLocationDTO",description = "人员位置列表（首页）")
-@Data
-public class WorkerLocationDTO {
-
-    @ApiModelProperty("人员ID")
-    private Long workerId;
-
-    @ApiModelProperty("人员姓名")
-    private String workerName;
-
-    @ApiModelProperty("安全帽编号")
-    private String hatCode;
-
-    @ApiModelProperty("安全帽ID")
-    private Long hatId;
-
-    @ApiModelProperty("背心编号")
-    private String vastCode;
-
-    @ApiModelProperty("手环编号")
-    private String braceletCode;
-
-    @ApiModelProperty("位置")
-    private String location;
-
-    @ApiModelProperty("时间")
-    private String time;
-
-    @ApiModelProperty("经度")
-    private String lng;
-
-    @ApiModelProperty("纬度")
-    private String lat;
-
-    @ApiModelProperty("心率")
-    private String heartRate;
-
-    @ApiModelProperty("血氧")
-    private String bloodOxygen;
-
-    @ApiModelProperty("一氧化碳")
-    private String co;
-
-    @ApiModelProperty("甲烷")
-    private String gas;
-
-    @ApiModelProperty("硫化氢")
-    private String h2s;
-
-    @ApiModelProperty("氧气")
-    private String o2;
-
-    @ApiModelProperty("信号")
-    private String signal;
-
-    @ApiModelProperty("电量")
-    private String cell;
-
-    @ApiModelProperty("是否报警")
-    private boolean alarmFlag;
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Alarm.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Alarm.java
new file mode 100644
index 0000000..4d2b7ef
--- /dev/null
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Alarm.java
@@ -0,0 +1,103 @@
+package com.casic.missiles.modular.system.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import java.util.Date;
+
+/**
+ * <p>
+ * 报警记录表
+ * </p>
+ *
+ * @author zyj
+ * @since 2023-05-25
+ */
+@Data
+@TableName("bus_alarm")
+public class Alarm implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    @TableId(value = "ID",type = IdType.ASSIGN_ID)
+    private Long id;
+
+    /**
+     * 设备ID
+     */
+    @TableField("DEVICE_ID")
+    private Long deviceId;
+
+    /**
+     * 报警类型
+     */
+    @TableField("ALARM_TYPE")
+    private String alarmType;
+
+    /**
+     * 报警时间
+     */
+    @TableField("ALARM_TIME")
+    private Date alarmTime;
+
+    /**
+     * 报警状态
+     */
+    @TableField("ALARM_STATUS")
+    private String alarmStatus;
+
+    /**
+     * 报警位置
+     */
+    @TableField("ALARM_LOCATION")
+    private String alarmLocation;
+
+    /**
+     * 报警图片
+     */
+    @TableField("ALARM_IMAGE")
+    private String alarmImage;
+
+    /**
+     * 视频通道号
+     */
+    @TableField("CHANNEL_NO")
+    private Integer channelNo;
+
+    /**
+     * 报警内容
+     */
+    @TableField("ALARM_CONTENT")
+    private String alarmContent;
+
+    /**
+     * 消警时间
+     */
+    @TableField("CANCEL_TIME")
+    private Date cancelTime;
+
+
+    @Override
+    public String toString() {
+        return "Alarm{" +
+            "id=" + id +
+            ", deviceId=" + deviceId +
+            ", alarmType=" + alarmType +
+            ", alarmTime=" + alarmTime +
+            ", alarmStatus=" + alarmStatus +
+            ", alarmLocation=" + alarmLocation +
+            ", alarmImage=" + alarmImage +
+            ", channelNo=" + channelNo +
+            ", alarmContent=" + alarmContent +
+            ", cancelTime=" + cancelTime +
+        "}";
+    }
+}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusAlarm.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusAlarm.java
deleted file mode 100644
index efb4a23..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusAlarm.java
+++ /dev/null
@@ -1,159 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.alibaba.fastjson.annotation.JSONField;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.time.LocalDateTime;
-import java.util.Date;
-
-/**
- * <p>
- * 报警记录表
- * </p>
- *
- * @author zyj
- * @since 2023-05-16
- */
-@Data
-@ApiModel("Alarm")
-@TableName("br_bus_alarm")
-public class BusAlarm implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 项目ID
-     */
-    @ApiModelProperty(value = "项目ID")
-    @TableField("PROJECT_ID")
-    private Long projectId;
-
-    /**
-     * 设备ID
-     */
-    @ApiModelProperty(value = "设备ID")
-    @TableField("DEVICE_ID")
-    private Long deviceId;
-
-    /**
-     * 报警类型
-     */
-    @ApiModelProperty(value = "报警类型")
-    @TableField("ALARM_TYPE")
-    private String alarmType;
-
-    /**
-     * 报警状态
-     */
-    @ApiModelProperty(value = "报警状态")
-    @TableField("ALARM_STATUS")
-    private String alarmStatus;
-
-    /**
-     * 报警值
-     */
-    @ApiModelProperty(value = "报警值")
-    @TableField("ALARM_VALUE")
-    private String alarmValue;
-
-    /**
-     * 报警图片
-     */
-    @ApiModelProperty(value = "报警图片")
-    @TableField("ALARM_IMAGE")
-    private String alarmImage;
-
-    /**
-     * 报警内容
-     */
-    @ApiModelProperty(value = "报警内容")
-    @TableField("ALARM_CONTENT")
-    private String alarmContent;
-
-    /**
-     * 报警时间
-     */
-    @ApiModelProperty(value = "报警时间")
-    @TableField("ALARM_TIME")
-    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
-    private Date alarmTime;
-
-    /**
-     * 消警时间
-     */
-    @ApiModelProperty(value = "消警时间")
-    @TableField("CANCEL_TIME")
-    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
-    private Date cancelTime;
-
-    /**
-     * 报警位置经度
-     */
-    @ApiModelProperty(value = "报警位置经度")
-    @TableField("ALARM_LNG")
-    private String alarmLng;
-
-    /**
-     * 报警位置纬度
-     */
-    @ApiModelProperty(value = "报警位置纬度")
-    @TableField("ALARM_LAT")
-    private String alarmLat;
-
-    @ApiModelProperty("报警类型名称")
-    @TableField(exist = false)
-    private String alarmStatusName;
-    @ApiModelProperty("报警类型名称")
-    @TableField(exist = false)
-    private String alarmTypeName;
-    @ApiModelProperty("作业名称")
-    @TableField(exist = false)
-    private String workTitle;
-    @ApiModelProperty("所属道路")
-    @TableField(exist = false)
-    private String workRoad;
-    @ApiModelProperty("作业状态")
-    @TableField(exist = false)
-    private String projectState;
-    @ApiModelProperty("作业状态名称")
-    @TableField(exist = false)
-    private String projectStateName;
-    @ApiModelProperty("负责人姓名")
-    @TableField(exist = false)
-    private String workPersonName;
-    @ApiModelProperty("负责人联系方式")
-    @TableField(exist = false)
-    private String workPersonPhoneNumber;
-
-
-    @Override
-    public String toString() {
-        return "BusAlarm{" +
-                "id=" + id +
-                ", projectId=" + projectId +
-                ", deviceId=" + deviceId +
-                ", alarmType=" + alarmType +
-                ", alarmValue=" + alarmValue +
-                ", alarmStatus=" + alarmStatus +
-                ", alarmImage=" + alarmImage +
-                ", alarmContent=" + alarmContent +
-                ", alarmTime=" + alarmTime +
-                ", cancelTime=" + cancelTime +
-                ", alarmLng=" + alarmLng +
-                ", alarmLat=" + alarmLat +
-                "}";
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusEvent.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusEvent.java
deleted file mode 100644
index a0b7543..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusEvent.java
+++ /dev/null
@@ -1,100 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.time.LocalDateTime;
-import java.util.Date;
-import java.util.List;
-
-/**
- * <p>
- * 事件表
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@TableName("br_bus_event")
-@Data
-@ApiModel("BusEvent")
-public class BusEvent implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @ApiModelProperty("事件ID")
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 事件标题
-     */
-    @ApiModelProperty("事件名称")
-    @TableField("EVENT_TITLE")
-    private String eventTitle;
-
-    /**
-     * 上报人员
-     */
-    @ApiModelProperty("上报人员")
-    @TableField("UPLOAD_NAME")
-    private String uploadName;
-
-    /**
-     * 联系方式
-     */
-    @ApiModelProperty("联系方式")
-    @TableField("PHONE_NUMBER")
-    private String phoneNumber;
-
-    /**
-     * 事件描述
-     */
-    @ApiModelProperty("事件描述")
-    @TableField("EVENT_DESCRIPTION")
-    private String eventDescription;
-
-    @ApiModelProperty("经度")
-    @TableField("LNG")
-    private String lng;
-
-    @ApiModelProperty("纬度")
-    @TableField("LAT")
-    private String lat;
-
-    /**
-     * 事件上传时间
-     */
-    @ApiModelProperty("事件上传时间")
-    @TableField("CREATE_TIME")
-    private Date createTime;
-
-    @ApiModelProperty("事件照片")
-    @TableField(exist = false)
-    private List<BusEventImage> imageList;
-
-
-
-    @Override
-    public String toString() {
-        return "BusEvent{" +
-            "id=" + id +
-            ", eventTitle=" + eventTitle +
-            ", uploadName=" + uploadName +
-            ", phoneNumber=" + phoneNumber +
-            ", eventDescription=" + eventDescription +
-            ", lng=" + lng +
-            ", lat=" + lat +
-            ", createTime=" + createTime +
-        "}";
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusEventImage.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusEventImage.java
deleted file mode 100644
index 1e75245..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusEventImage.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-
-/**
- * <p>
- * 事件图片表
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@TableName("br_bus_event_image")
-@Data
-@ApiModel("BusEventImage")
-public class BusEventImage implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 事件ID
-     */
-    @TableField("EVENT_ID")
-    private Long eventId;
-
-    /**
-     * 报警图片
-     */
-    @TableField("IMAGE")
-    @ApiModelProperty("图片url")
-    private String image;
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Device.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Device.java
index df89c70..ea7db5f 100644
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Device.java
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Device.java
@@ -1,30 +1,23 @@
 package com.casic.missiles.modular.system.entity;
 
-import com.alibaba.fastjson.annotation.JSONField;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.casic.missiles.core.base.json.DateDeserializer;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
-import java.util.Date;
 
 /**
  * <p>
- * 
+ * 设备记录表
  * </p>
  *
  * @author zyj
- * @since 2023-04-14
+ * @since 2023-05-25
  */
-@ApiModel("Device")
-@TableName("br_device")
 @Data
+@TableName("bus_device")
 public class Device implements Serializable {
 
     private static final long serialVersionUID = 1L;
@@ -32,82 +25,86 @@
     /**
      * 主键
      */
-    @ApiModelProperty(value = "设备ID")
     @TableId(value = "ID",type = IdType.ASSIGN_ID)
     private Long id;
 
     /**
-     * 设备编号
+     * 设备名称
      */
-    @ApiModelProperty(value = "设备编号")
-    @TableField("DEVICE_CODE")
-    private String deviceCode;
+    @TableField("DEVICE_NAME")
+    private String deviceName;
 
     /**
-     * 设备类型
+     * IP
      */
-    @ApiModelProperty(value = "设备类型")
-    @TableField("DEVICE_TYPE")
-    private String deviceType;
+    @TableField("IP")
+    private String ip;
 
     /**
-     * 设备批次
+     * 端口
      */
-    @ApiModelProperty(value = "设备批次")
-    @TableField("DEVICE_BATCH")
-    private String deviceBatch;
+    @TableField("PORT")
+    private String port;
 
     /**
-     * 厂家
+     * 用户名
      */
-    @ApiModelProperty(value = "厂家")
-    @TableField("MANUFACTURER")
-    private String manufacturer;
+    @TableField("USER_NAME")
+    private String userName;
 
     /**
-     * 是否供电
+     * 密码
      */
-    @ApiModelProperty(value = "是否供电")
-    @TableField("IS_POWER_SUPPLY")
-    private String isPowerSupply;
+    @TableField("PASSWORD")
+    private String password;
 
     /**
-     * 创建时间
+     * 连接类型
      */
-    @ApiModelProperty(value = "创建时间",dataType = "Date")
-    @TableField("CREATE_TIME")
-    private Date createTime;
+    @TableField("CONNECT_TYPE")
+    private String connectType;
 
-    @ApiModelProperty(value = "设备类型名称")
-    @TableField(exist = false)
-    private String deviceTypeName;
+    /**
+     * 位置
+     */
+    @TableField("LOCATION")
 
-    @ApiModelProperty(value = "是否供电名称")
-    @TableField(exist = false)
-    private String isPowerSupplyName;
+    private String location;
 
-    @ApiModelProperty(value = "注册时间",dataType = "String")
-    @TableField(exist = false)
-    private String registerTime;
+    /**
+     * 设备状态
+     */
+    @TableField("STATUS")
 
-    @ApiModelProperty(value = "当前状态")
-    @TableField(exist = false)
     private String status;
 
-    @ApiModelProperty(value = "当前状态名称")
-    @TableField(exist = false)
-    private String statusName;
+    /**
+     * 报警分组
+     */
+    @TableField("ALARM_GROUP")
+
+    private Long alarmGroup;
+
+    /**
+     * 视频通道数(预留)
+     */
+    @TableField("CHANNEL_NUM")
+    private Integer channelNum;
 
     @Override
     public String toString() {
         return "Device{" +
             "id=" + id +
-            ", deviceCode=" + deviceCode +
-            ", deviceType=" + deviceType +
-            ", deviceBatch=" + deviceBatch +
-            ", manufacturer=" + manufacturer +
-            ", isPowerSupply=" + isPowerSupply +
-            ", createTime=" + createTime +
+            ", deviceName=" + deviceName +
+            ", ip=" + ip +
+            ", port=" + port +
+            ", userName=" + userName +
+            ", password=" + password +
+            ", connectType=" + connectType +
+            ", location=" + location +
+            ", status=" + status +
+            ", alarmGroup=" + alarmGroup +
+            ", channelNum=" + channelNum +
         "}";
     }
 }
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/DeviceExt.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/DeviceExt.java
deleted file mode 100644
index 5ee7015..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/DeviceExt.java
+++ /dev/null
@@ -1,99 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-
-/**
- * <p>
- * 设备扩展信息表（安全树）
- * </p>
- *
- * @author zyj
- * @since 2023-04-27
- */
-@Data
-@TableName("br_device_ext")
-public class DeviceExt implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 设备ID
-     */
-    @TableField("DEVICE_ID")
-    private Long deviceId;
-
-    /**
-     * 摄像头编号
-     */
-    @TableField("CAMERA_CODE")
-    private String cameraCode;
-
-    /**
-     * 摄像头IP
-     */
-    @TableField("CAMERA_IP")
-    private String cameraIp;
-
-    /**
-     * 摄像头端口
-     */
-    @TableField("CAMERA_PORT")
-    private String cameraPort;
-
-    /**
-     * 激甲编号
-     */
-    @TableField("GAS_CODE")
-    private String gasCode;
-
-    /**
-     * 激甲IP
-     */
-    @TableField("GAS_IP")
-    private String gasIp;
-
-    /**
-     * 激甲端口
-     */
-    @TableField("GAS_PORT")
-    private String gasPort;
-
-    /**
-     * 甲烷报警阈值
-     */
-    @TableField("GAS_THRESHOLD")
-    private String gasThreshold;
-
-    @TableField(value = "HAT_LINING_CODE")
-    private String hatLiningCode;
-
-
-    @Override
-    public String toString() {
-        return "DeviceExt{" +
-            "id=" + id +
-            ", deviceId=" + deviceId +
-            ", cameraCode=" + cameraCode +
-            ", cameraIp=" + cameraIp +
-            ", cameraPort=" + cameraPort +
-            ", gasCode=" + gasCode +
-            ", gasIp=" + gasIp +
-            ", gasPort=" + gasPort +
-            ", gasThreshold=" + gasThreshold +
-            ", hatLiningCode=" + hatLiningCode +
-        "}";
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/ProjectDevice.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/ProjectDevice.java
deleted file mode 100644
index c4f3472..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/ProjectDevice.java
+++ /dev/null
@@ -1,62 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-
-/**
- * <p>
- * 
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@Data
-@ApiModel("ProjectDevice")
-@TableName("br_project_device")
-public class ProjectDevice implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 作业现场ID
-     */
-    @TableField("PROJECT_ID")
-    private Long projectId;
-
-    /**
-     * 设备ID
-     */
-    @TableField("DEVICE_ID")
-    @ApiModelProperty("设备ID（新增编辑时传）")
-    private Long deviceId;
-
-    /**
-     * 设备编号
-     */
-    @TableField(exist = false)
-    @ApiModelProperty("设备编号（详情中展示，新增编辑不用传）")
-    private String deviceCode;
-
-    @Override
-    public String toString() {
-        return "ProjectDevice{" +
-            "id=" + id +
-            ", projectId=" + projectId +
-            ", deviceId=" + deviceId +
-        "}";
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/ProjectWorker.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/ProjectWorker.java
deleted file mode 100644
index 10b23c4..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/ProjectWorker.java
+++ /dev/null
@@ -1,104 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import java.io.Serializable;
-
-/**
- * <p>
- * 
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@ApiModel("ProjectWorker")
-@TableName("br_project_worker")
-@Data
-@NoArgsConstructor
-@AllArgsConstructor
-public class ProjectWorker implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 作业现场ID
-     */
-    @TableField("PROJECT_ID")
-    private Long projectId;
-
-    /**
-     * 人员ID
-     */
-    @ApiModelProperty("人员ID")
-    @TableField("WORKER_ID")
-    private Long workerId;
-
-    /**
-     * 安全帽编号
-     */
-    @ApiModelProperty("安全帽编号")
-    @TableField("HAT_CODE")
-    private String hatCode;
-
-    /**
-     * 背心编号
-     */
-    @ApiModelProperty("背心编号")
-    @TableField("VAST_CODE")
-    private String vastCode;
-
-    /**
-     * 手环编号
-     */
-    @ApiModelProperty("手环编号")
-    @TableField("BRACELET_CODE")
-    private String braceletCode;
-
-    @ApiModelProperty("人员姓名（详情中展示，新增编辑不用传）")
-    @TableField(exist = false)
-    private String workerName;
-
-    @ApiModelProperty("人员部门ID（详情中展示，新增编辑不用传）")
-    @TableField(exist = false)
-    private String workerDeptId;
-
-    @ApiModelProperty("人员部门名称（详情中展示，新增编辑不用传）")
-    @TableField(exist = false)
-    private String workerDeptName;
-
-    @ApiModelProperty("人员联系方式（详情中展示，新增编辑不用传）")
-    @TableField(exist = false)
-    private String workerPhoneNumber;
-
-    public ProjectWorker(Long projectId, Long workerId) {
-        this.projectId = projectId;
-        this.workerId = workerId;
-    }
-
-    @Override
-    public String toString() {
-        return "ProjectWorker{" +
-            "id=" + id +
-            ", projectId=" + projectId +
-            ", workerId=" + workerId +
-            ", hatCode=" + hatCode +
-            ", vastCode=" + vastCode +
-            ", braceletCode=" + braceletCode +
-        "}";
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/WorkSiteInfo.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/WorkSiteInfo.java
deleted file mode 100644
index fa6f41d..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/WorkSiteInfo.java
+++ /dev/null
@@ -1,130 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.alibaba.fastjson.annotation.JSONField;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.time.LocalDateTime;
-import java.util.Date;
-
-/**
- * <p>
- * 作业现场表
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@ApiModel("WorkSiteInfo")
-@TableName("br_work_site_info")
-@Data
-public class WorkSiteInfo implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @ApiModelProperty("作业现场ID")
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 作业名称
-     */
-    @ApiModelProperty("作业名称")
-    @TableField("WORK_TITLE")
-    private String workTitle;
-
-    /**
-     * 责任人
-     */
-    @ApiModelProperty("责任人（人员ID）")
-    @TableField("WORK_PERSON")
-    private Long workPerson;
-
-    /**
-     * 作业描述
-     */
-    @ApiModelProperty("作业描述")
-    @TableField("WORK_SITE_DESC")
-    private String workSiteDesc;
-
-    /**
-     * 作业状态
-     */
-    @ApiModelProperty("作业状态")
-    @TableField("PROJECT_STATE")
-    private String projectState;
-
-    /**
-     * 所属道路
-     */
-    @ApiModelProperty("所属道路")
-    @TableField("WORK_ROAD")
-    private String workRoad;
-
-    @TableField("IMAGE_URL")
-    private String imageUrl;
-
-    @TableField("CREATE_TIME")
-    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
-    private Date createTime;
-    @TableField("UPDATE_TIME")
-    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
-    private Date updateTime;
-
-    @ApiModelProperty("开始时间")
-    @TableField("START_TIME")
-    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
-    private Date startTime;
-
-    @ApiModelProperty("结束时间")
-    @TableField("FINISH_TIME")
-    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
-    private Date finishTime;
-
-    @ApiModelProperty("负责人姓名（详情中使用，新增编辑不用传）")
-    @TableField(exist = false)
-    private String workPersonName;
-
-    @ApiModelProperty("负责人联系方式（详情中使用，新增编辑不用传）")
-    @TableField(exist = false)
-    private String workPersonPhoneNumber;
-
-    @ApiModelProperty("负责人所属部门ID（详情中使用，新增编辑不用传）")
-    @TableField(exist = false)
-    private Long workPersonDeptId;
-
-    @ApiModelProperty("负责人所属部门名称（详情中使用，新增编辑不用传）")
-    @TableField(exist = false)
-    private String workPersonDeptName;
-
-    @ApiModelProperty(value = "注册时间",dataType = "String")
-    @TableField(exist = false)
-    private String registerTime;
-
-    @ApiModelProperty("作业状态名称")
-    @TableField(exist = false)
-    private String projectStateName;
-
-    @Override
-    public String toString() {
-        return "WorkSiteInfo{" +
-            "id=" + id +
-            ", workTitle=" + workTitle +
-            ", workPerson=" + workPerson +
-            ", workSiteDesc=" + workSiteDesc +
-            ", projectState=" + projectState +
-            ", imageUrl=" + imageUrl +
-            ", updateTime=" + updateTime +
-            ", workRoad=" + workRoad +
-        "}";
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Worker.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Worker.java
deleted file mode 100644
index 28a4daa..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Worker.java
+++ /dev/null
@@ -1,147 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.time.LocalDateTime;
-import java.util.Date;
-
-/**
- * <p>
- * 
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@ApiModel("Worker")
-@TableName("br_worker")
-@Data
-public class Worker implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @ApiModelProperty(value = "人员ID")
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 姓名
-     */
-    @ApiModelProperty(value = "姓名")
-    @TableField("WORKER_NAME")
-    private String workerName;
-
-    /**
-     * 性别
-     */
-    @ApiModelProperty(value = "性别")
-    @TableField("GENDER")
-    private String gender;
-
-    /**
-     * 所属部门
-     */
-    @ApiModelProperty(value = "所属部门(人员管理)")
-    @TableField("DEPT_ID")
-    private Long deptId;
-
-    /**
-     * 所属单位
-     */
-    @ApiModelProperty(value = "所属单位(入场申请中使用)")
-    @TableField("OWNER_SHIP")
-    private String ownerShip;
-
-    /**
-     * 联系方式
-     */
-    @ApiModelProperty(value = "联系方式")
-    @TableField("PHONE_NUMBER")
-    private String phoneNumber;
-
-    /**
-     * 证件号
-     */
-    @ApiModelProperty(value = "证件号")
-    @TableField("ID_CARD_NUMBER")
-    private String idCardNumber;
-
-    /**
-     * 入场原因
-     */
-    @ApiModelProperty(value = "入场原因（入场申请中使用）")
-    @TableField("ENTER_REASON")
-    private String enterReason;
-
-    /**
-     * 入场人脸照片
-     */
-    @ApiModelProperty(value = "人脸照片（照片路径）")
-    @TableField("WORKER_AVATAR")
-    private String workerAvatar;
-
-    /**
-     * 申请入场时间
-     */
-    @ApiModelProperty(value = "注册时间/申请入场时间")
-    @TableField("CREATE_TIME")
-    private Date createTime;
-
-    /**
-     * 人员类型
-     */
-    @ApiModelProperty(value = "人员类型（区分人员管理和入场申请）")
-    @TableField("WORKER_TYPE")
-    private String workerType;
-
-    @ApiModelProperty(value = "性别名称")
-    @TableField(exist = false)
-    private String genderName;
-
-    @ApiModelProperty(value = "部门名称")
-    @TableField(exist = false)
-    private String deptName;
-
-    @ApiModelProperty(value = "注册时间",dataType = "String")
-    @TableField(exist = false)
-    private String registerTime;
-
-    @ApiModelProperty(value = "当前状态")
-    @TableField(exist = false)
-    private String status;
-
-    @ApiModelProperty(value = "当前状态名称")
-    @TableField(exist = false)
-    private String statusName;
-
-    @ApiModelProperty(value = "是否注册(0未注册；1已注册)",allowableValues = "0,1")
-    @TableField(exist = false)
-    private String isRegister;
-
-    @Override
-    public String toString() {
-        return "Worker{" +
-            "id=" + id +
-            ", workerName=" + workerName +
-            ", gender=" + gender +
-            ", deptId=" + deptId +
-            ", ownerShip=" + ownerShip +
-            ", phoneNumber=" + phoneNumber +
-            ", idCardNumber=" + idCardNumber +
-            ", enterReason=" + enterReason +
-            ", workerAvatar=" + workerAvatar +
-            ", createTime=" + createTime +
-            ", workerType=" + workerType +
-        "}";
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/AlarmMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/AlarmMapper.java
new file mode 100644
index 0000000..ea4c8be
--- /dev/null
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/AlarmMapper.java
@@ -0,0 +1,16 @@
+package com.casic.missiles.modular.system.mapper;
+
+import com.casic.missiles.modular.system.entity.Alarm;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 报警记录表 Mapper 接口
+ * </p>
+ *
+ * @author zyj
+ * @since 2023-05-25
+ */
+public interface AlarmMapper extends BaseMapper<Alarm> {
+
+}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/BusAlarmMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/BusAlarmMapper.java
deleted file mode 100644
index 9801742..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/BusAlarmMapper.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package com.casic.missiles.modular.system.mapper;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.modular.system.dto.AlarmTypeCountDTO;
-import com.casic.missiles.modular.system.entity.BusAlarm;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * <p>
- * 报警记录表 Mapper 接口
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface BusAlarmMapper extends BaseMapper<BusAlarm> {
-
-    Page<BusAlarm> listPage(Page<BusAlarm> page,@Param("ew")  QueryWrapper<BusAlarm> queryWrapper);
-
-    void cancelAlarm(@Param("deviceId")Long deviceId,@Param("alarmType") String alarmType);
-
-    List<AlarmTypeCountDTO> alarmCount(@Param("projectId")Long projectId, @Param("alarmStatus")String alarmStatus);
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/BusEventImageMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/BusEventImageMapper.java
deleted file mode 100644
index 9590b7d..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/BusEventImageMapper.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.casic.missiles.modular.system.mapper;
-
-import com.casic.missiles.modular.system.entity.BusEventImage;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * <p>
- * 事件图片表 Mapper 接口
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface BusEventImageMapper extends BaseMapper<BusEventImage> {
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/BusEventMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/BusEventMapper.java
deleted file mode 100644
index 3c85edf..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/BusEventMapper.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.casic.missiles.modular.system.mapper;
-
-import com.casic.missiles.modular.system.entity.BusEvent;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * <p>
- * 事件表 Mapper 接口
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface BusEventMapper extends BaseMapper<BusEvent> {
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/DeviceExtMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/DeviceExtMapper.java
deleted file mode 100644
index 4ca9212..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/DeviceExtMapper.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.casic.missiles.modular.system.mapper;
-
-import com.casic.missiles.modular.system.entity.DeviceExt;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * <p>
- * 设备扩展信息表（安全树） Mapper 接口
- * </p>
- *
- * @author zyj
- * @since 2023-04-27
- */
-public interface DeviceExtMapper extends BaseMapper<DeviceExt> {
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/DeviceMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/DeviceMapper.java
index 444c0c5..3d0bb02 100644
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/DeviceMapper.java
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/DeviceMapper.java
@@ -1,30 +1,16 @@
 package com.casic.missiles.modular.system.mapper;
 
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.modular.system.dto.DeviceDetailDTO;
-import com.casic.missiles.modular.system.dto.HelmetInfoDTO;
 import com.casic.missiles.modular.system.entity.Device;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
 
 /**
  * <p>
- *  Mapper 接口
+ * 设备记录表 Mapper 接口
  * </p>
  *
  * @author zyj
- * @since 2023-04-14
+ * @since 2023-05-25
  */
-@Mapper
 public interface DeviceMapper extends BaseMapper<Device> {
 
-    Page<DeviceDetailDTO> listDetailPage(Page<DeviceDetailDTO> page,@Param("ew") QueryWrapper<DeviceDetailDTO> ew);
-
-     List<Long> selectProjectDevice(@Param("projectId") Long projectId);
-
-    List<HelmetInfoDTO> selectHelmetList(@Param("deviceType")String deviceType);
 }
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/ProjectDeviceMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/ProjectDeviceMapper.java
deleted file mode 100644
index 1d0c14e..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/ProjectDeviceMapper.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package com.casic.missiles.modular.system.mapper;
-
-import com.casic.missiles.modular.system.dto.DeviceLocationDTO;
-import com.casic.missiles.modular.system.entity.ProjectDevice;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * <p>
- *  Mapper 接口
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface ProjectDeviceMapper extends BaseMapper<ProjectDevice> {
-     List<ProjectDevice> selectDetailByProjectId(@Param("projectId") Long projectId);
-
-     List<DeviceLocationDTO> selectDeviceLocationList(@Param("projectId") Long projectId);
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/ProjectWorkerMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/ProjectWorkerMapper.java
deleted file mode 100644
index 58583d1..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/ProjectWorkerMapper.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package com.casic.missiles.modular.system.mapper;
-
-import com.casic.missiles.modular.system.dto.WorkerLocationDTO;
-import com.casic.missiles.modular.system.entity.ProjectWorker;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * <p>
- *  Mapper 接口
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface ProjectWorkerMapper extends BaseMapper<ProjectWorker> {
-
-    List<ProjectWorker> selectDetailByProjectId(@Param("projectId") Long projectId,
-                                                @Param("workerType")String workerType);
-
-    List<WorkerLocationDTO> selectWorkerLocationList(@Param("projectId") Long projectId,
-                                                     @Param("workerType")String workerType);
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/WorkSiteInfoMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/WorkSiteInfoMapper.java
deleted file mode 100644
index a4934d2..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/WorkSiteInfoMapper.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.casic.missiles.modular.system.mapper;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.modular.system.entity.WorkSiteInfo;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Param;
-
-/**
- * <p>
- * 作业现场表 Mapper 接口
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface WorkSiteInfoMapper extends BaseMapper<WorkSiteInfo> {
-
-    Page<WorkSiteInfo> selectListPage(Page<WorkSiteInfo> page,@Param("ew") QueryWrapper<WorkSiteInfo> ew);
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/WorkerMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/WorkerMapper.java
deleted file mode 100644
index 258fb12..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/WorkerMapper.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package com.casic.missiles.modular.system.mapper;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.modular.system.dto.DeviceDetailDTO;
-import com.casic.missiles.modular.system.entity.Worker;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * <p>
- *  Mapper 接口
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface WorkerMapper extends BaseMapper<Worker> {
-
-
-    Page<Worker> selectListPage(Page<Worker> page, @Param("ew") QueryWrapper<Worker> ew);
-
-    List<String> selectWorkerAvatars(@Param("projectId")Long projectId);
-
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/AlarmMapper.xml b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/AlarmMapper.xml
new file mode 100644
index 0000000..25cb4ab
--- /dev/null
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/AlarmMapper.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.modular.system.mapper.AlarmMapper">
+
+</mapper>
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/BusAlarmMapper.xml b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/BusAlarmMapper.xml
deleted file mode 100644
index 595088a..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/BusAlarmMapper.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.casic.missiles.modular.system.mapper.BusAlarmMapper">
-
-    <select id="listPage" resultType="com.casic.missiles.modular.system.entity.BusAlarm">
-        SELECT
-            alarm.ID as id,
-            alarm.DEVICE_ID as deviceId,
-            alarm.PROJECT_ID as projectId,
-            alarm.ALARM_TYPE as alarmType,
-            alarm.ALARM_VALUE as alarmValue,
-            alarm.ALARM_STATUS as alarmStatus,
-            alarm.ALARM_IMAGE AS alarmImage,
-            alarm.ALARM_CONTENT as alarmContent,
-            alarm.ALARM_TIME as alarmTime,
-            alarm.CANCEL_TIME as cancelTime,
-            alarm.ALARM_LNG as alarmLng,
-            alarm.ALARM_LAT as alarmLat,
-            p.WORK_TITLE as workTitle,
-            p.WORK_ROAD as workRoad,
-            p.PROJECT_STATE as projectState,
-            w.WORKER_NAME as workPersonName,
-            w.PHONE_NUMBER as workPersonPhoneNumber
-        FROM
-            `br_bus_alarm` alarm
-                LEFT JOIN br_work_site_info p on alarm.PROJECT_ID = p.ID
-                LEFT JOIN br_worker w on p.WORK_PERSON = w.ID
-        <where>
-            <if test="ew != null">
-                ${ew.sqlSegment}
-            </if>
-        </where>
-    </select>
-
-    <select id="cancelAlarm">
-        update br_bus_alarm
-        set ALARM_STATUS = '1'
-        where DEVICE_ID = #{deviceId}
-          and ALARM_TYPE = #{alarmType}
-          and ALARM_STATUS = '0'
-    </select>
-
-    <select id="alarmCount" resultType="com.casic.missiles.modular.system.dto.AlarmTypeCountDTO">
-        SELECT
-            ALARM_TYPE as alarmType,
-            count(*) as alarmCount
-        from br_bus_alarm
-        <where>
-            <if test="projectId != null and projectId !=''">
-                and PROJECT_ID = #{projectId}
-            </if>
-            <if test="alarmStatus != null and alarmStatus !=''">
-                and ALARM_STATUS = #{alarmStatus}
-            </if>
-        </where>
-        group by ALARM_TYPE
-    </select>
-</mapper>
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/BusEventImageMapper.xml b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/BusEventImageMapper.xml
deleted file mode 100644
index fbc3db3..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/BusEventImageMapper.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.casic.missiles.modular.system.mapper.BusEventImageMapper">
-
-</mapper>
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/BusEventMapper.xml b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/BusEventMapper.xml
deleted file mode 100644
index 627d573..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/BusEventMapper.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.casic.missiles.modular.system.mapper.BusEventMapper">
-
-</mapper>
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/DeviceExtMapper.xml b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/DeviceExtMapper.xml
deleted file mode 100644
index 5321d1c..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/DeviceExtMapper.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.casic.missiles.modular.system.mapper.DeviceExtMapper">
-
-</mapper>
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/DeviceMapper.xml b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/DeviceMapper.xml
index 94262e1..88e7d01 100644
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/DeviceMapper.xml
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/DeviceMapper.xml
@@ -2,96 +2,4 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.casic.missiles.modular.system.mapper.DeviceMapper">
 
-    <select id="listDetailPage" resultType="com.casic.missiles.modular.system.dto.DeviceDetailDTO">
-        select
-        br_device.ID as id,
-        DEVICE_CODE as deviceCode,
-        DEVICE_TYPE as deviceType,
-        DEVICE_BATCH as deviceBatch,
-        MANUFACTURER as manufacturer,
-        IS_POWER_SUPPLY as isPowerSupply,
-        CREATE_TIME as createTime,
-        CAMERA_CODE as cameraCode,
-        CAMERA_IP as cameraIp,
-        CAMERA_PORT as cameraPort,
-        GAS_CODE as gasCode,
-        GAS_IP as gasIp,
-        GAS_PORT as gasPort,
-        HAT_LINING_CODE as hatLiningCode
-        from br_device
-        left join br_device_ext ext on ext.DEVICE_ID = br_device.ID
-        <where>
-            <if test="ew != null">
-                ${ew.sqlSegment}
-            </if>
-        </where>
-    </select>
-
-    <select id="selectProjectDevice" resultType="java.lang.Long">
-        with device_info as (
-            (SELECT
-            d.DEVICE_ID as DEVICE_ID,
-            d.PROJECT_ID as PROJECT_ID,
-            p.PROJECT_STATE as PROJECT_STATE
-            from br_project_device d
-            LEFT JOIN br_work_site_info p on p.ID = d.PROJECT_ID)
-
-            UNION ALL
-
-            (SELECT
-            d1.ID as DEVICE_ID,
-            w1.ID as PROJECT_ID,
-            w1.PROJECT_STATE as PROJECT_STATE
-            FROM br_project_worker pw1
-            LEFT JOIN br_device d1 on pw1.BRACELET_CODE = d1.DEVICE_CODE
-            LEFT JOIN br_work_site_info w1 on pw1.PROJECT_ID = w1.ID)
-
-            UNION ALL
-
-            (SELECT
-            d1.ID as DEVICE_ID,
-            w1.ID as PROJECT_ID,
-            w1.PROJECT_STATE as PROJECT_STATE
-            FROM br_project_worker pw1
-            LEFT JOIN br_device d1 on pw1.HAT_CODE = d1.DEVICE_CODE
-            LEFT JOIN br_work_site_info w1 on pw1.PROJECT_ID = w1.ID)
-
-
-            UNION ALL
-
-            (SELECT
-            d1.ID as DEVICE_ID,
-            w1.ID as PROJECT_ID,
-            w1.PROJECT_STATE as PROJECT_STATE
-            FROM br_project_worker pw1
-            LEFT JOIN br_device d1 on pw1.VAST_CODE = d1.DEVICE_CODE
-            LEFT JOIN br_work_site_info w1 on pw1.PROJECT_ID = w1.ID))
-
-        select DISTINCT DEVICE_ID from device_info
-        <where>
-            DEVICE_ID is not null
-            <choose>
-                <when test="projectId != null and projectId !=''">
-                    and PROJECT_ID = #{projectId}
-                </when>
-                <otherwise>
-                    AND PROJECT_STATE != '3'
-                </otherwise>
-            </choose>
-        </where>
-    </select>
-
-    <select id="selectHelmetList" resultType="com.casic.missiles.modular.system.dto.HelmetInfoDTO">
-        SELECT
-            a.ID AS deviceId,
-            a.DEVICE_CODE AS hatCode,
-            b.HAT_LINING_CODE AS hatLiningCode
-        FROM
-            br_device a
-                LEFT JOIN br_device_ext b ON a.ID = b.DEVICE_ID
-        WHERE
-            a.DEVICE_TYPE = #{deviceType}
-          AND a.DEVICE_CODE IS NOT NULL
-          AND b.HAT_LINING_CODE IS NOT NULL
-    </select>
 </mapper>
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/ProjectDeviceMapper.xml b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/ProjectDeviceMapper.xml
deleted file mode 100644
index c6d1c24..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/ProjectDeviceMapper.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.casic.missiles.modular.system.mapper.ProjectDeviceMapper">
-
-    <select id="selectDetailByProjectId" resultType="com.casic.missiles.modular.system.entity.ProjectDevice">
-        SELECT
-            pd.ID as id,
-            pd.PROJECT_ID as projectId,
-            pd.DEVICE_ID as deviceId,
-            d.DEVICE_CODE as deviceCode
-        from br_project_device pd
-        LEFT JOIN br_device d on pd.DEVICE_ID = d.ID
-        <where>
-            pd.PROJECT_ID = #{projectId}
-        </where>
-    </select>
-
-    <select id="selectDeviceLocationList" resultType="com.casic.missiles.modular.system.dto.DeviceLocationDTO">
-        SELECT
-        d.ID as deviceId,
-        d.DEVICE_TYPE as deviceType,
-        d.DEVICE_CODE as deviceCode,
-        if(EXISTS(select ID from br_bus_alarm WHERE DEVICE_ID = d.ID and ALARM_STATUS = '0'),true,false) as alarmFlag
-        FROM br_project_device pd, br_device d
-        where pd.DEVICE_ID = d.ID
-        and pd.PROJECT_ID = #{projectId}
-    </select>
-
-</mapper>
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/ProjectWorkerMapper.xml b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/ProjectWorkerMapper.xml
deleted file mode 100644
index 8d2de10..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/ProjectWorkerMapper.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.casic.missiles.modular.system.mapper.ProjectWorkerMapper">
-
-    <select id="selectDetailByProjectId" resultType="com.casic.missiles.modular.system.entity.ProjectWorker">
-        SELECT
-            pw.ID as id,
-            pw.PROJECT_ID as projectId,
-            pw.WORKER_ID as workerId,
-            w.WORKER_NAME as workerName,
-            w.DEPT_ID as workerDeptId,
-            pw.HAT_CODE as hatCode,
-            pw.VAST_CODE as vastCode,
-            pw.BRACELET_CODE as braceletCode,
-            w.PHONE_NUMBER as workerPhoneNumber
-        from br_project_worker pw
-        LEFT JOIN br_worker w on pw.WORKER_ID = w.ID
-        <where>
-            pw.PROJECT_ID = #{projectId}
-            <if test="workerType != null and workerType != ''">
-                and w.WORKER_TYPE = #{workerType}
-            </if>
-        </where>
-    </select>
-
-    <select id="selectWorkerLocationList" resultType="com.casic.missiles.modular.system.dto.WorkerLocationDTO">
-        select
-            w.ID as workerId,
-            w.WORKER_NAME as workerName,
-            pw.HAT_CODE as hatCode,
-            hd.ID as hatId,
-            pw.BRACELET_CODE as braceletCode,
-            pw.VAST_CODE as vastCode
-        from br_project_worker pw,br_worker w ,br_device hd
-        WHERE pw.WORKER_ID = w.ID
-          and pw.HAT_CODE = hd.DEVICE_CODE
-          and pw.PROJECT_ID = #{projectId}
-          and w.WORKER_TYPE = #{workerType}
-    </select>
-</mapper>
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/WorkSiteInfoMapper.xml b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/WorkSiteInfoMapper.xml
deleted file mode 100644
index 8f01326..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/WorkSiteInfoMapper.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.casic.missiles.modular.system.mapper.WorkSiteInfoMapper">
-
-    <select id="selectListPage" resultType="com.casic.missiles.modular.system.entity.WorkSiteInfo">
-        SELECT
-            br_work_site_info.ID AS id,
-            WORK_TITLE as workTitle,
-            WORK_ROAD as workRoad,
-            WORK_SITE_DESC as workSiteDesc,
-            WORK_PERSON as workPerson,
-            WORKER_NAME as workPersonName,
-            DEPT_ID as workPersonDeptId,
-            PHONE_NUMBER as workPersonPhoneNumber,
-            PROJECT_STATE as projectState,
-            br_work_site_info.CREATE_TIME AS createTime,
-            br_work_site_info.UPDATE_TIME AS updateTime
-        FROM br_work_site_info
-        LEFT JOIN br_worker w ON br_work_site_info.WORK_PERSON = w.ID
-        <where>
-            <if test="ew != null">
-                ${ew.sqlSegment}
-            </if>
-        </where>
-    </select>
-</mapper>
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/WorkerMapper.xml b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/WorkerMapper.xml
deleted file mode 100644
index 3e28b39..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/WorkerMapper.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.casic.missiles.modular.system.mapper.WorkerMapper">
-
-    <select id="selectListPage" resultType="com.casic.missiles.modular.system.entity.Worker">
-        WITH worker_project AS (
-            SELECT
-                w.id AS ID,
-                WORKER_NAME,
-                GENDER,
-                DEPT_ID,
-                OWNER_SHIP,
-                PHONE_NUMBER,
-                ID_CARD_NUMBER,
-                ENTER_REASON,
-                WORKER_AVATAR,
-                w.CREATE_TIME,
-                WORKER_TYPE,
-                IF( p.PROJECT_STATE != '3', 1, 0 ) AS `STATUS`
-            FROM br_worker w
-            LEFT JOIN br_project_worker pw ON w.ID = pw.WORKER_ID
-            LEFT JOIN br_work_site_info p ON pw.PROJECT_ID = p.ID
-        )
-
-        SELECT
-            ID AS id,
-            WORKER_NAME AS workerName,
-            GENDER AS gender,
-            DEPT_ID AS deptId,
-            OWNER_SHIP AS ownerShip,
-            PHONE_NUMBER AS phoneNumber,
-            ID_CARD_NUMBER AS idCardNumber,
-            ENTER_REASON AS enterReason,
-            WORKER_AVATAR AS workerAvatar,
-            CREATE_TIME AS createTime,
-            WORKER_TYPE AS workerType,
-            `STATUS` AS `status`
-        FROM worker_project
-        <where>
-            <if test="ew != null">
-                ${ew.sqlSegment}
-            </if>
-        </where>
-    </select>
-
-    <select id="selectWorkerAvatars" resultType="java.lang.String">
-        SELECT
-            WORKER_AVATAR
-        FROM
-            `br_worker`
-        WHERE
-        ID IN ( SELECT WORKER_ID FROM br_project_worker WHERE PROJECT_ID = #{projectId} )
-          AND WORKER_AVATAR IS NOT NULL
-          AND WORKER_AVATAR != ''
-    </select>
-</mapper>
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IAlarmService.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IAlarmService.java
new file mode 100644
index 0000000..8bc01f4
--- /dev/null
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IAlarmService.java
@@ -0,0 +1,16 @@
+package com.casic.missiles.modular.system.service;
+
+import com.casic.missiles.modular.system.entity.Alarm;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 报警记录表 服务类
+ * </p>
+ *
+ * @author zyj
+ * @since 2023-05-25
+ */
+public interface IAlarmService extends IService<Alarm> {
+
+}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IBusAlarmService.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IBusAlarmService.java
deleted file mode 100644
index f63c19c..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IBusAlarmService.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package com.casic.missiles.modular.system.service;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.modular.system.dto.AlarmTypeCountDTO;
-import com.casic.missiles.modular.system.dto.AlarmUpload;
-import com.casic.missiles.modular.system.entity.BusAlarm;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-import java.util.List;
-
-/**
- * <p>
- * 报警记录表 服务类
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface IBusAlarmService extends IService<BusAlarm> {
-
-    boolean alarmUpload(AlarmUpload alarmUpload);
-
-    Page<BusAlarm> listPage(Page<BusAlarm> page,QueryWrapper<BusAlarm> queryWrapper);
-
-    List<AlarmTypeCountDTO> alarmCount(Long projectId,String alarmStatus);
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IBusEventImageService.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IBusEventImageService.java
deleted file mode 100644
index b1187ed..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IBusEventImageService.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.casic.missiles.modular.system.service;
-
-import com.casic.missiles.modular.system.entity.BusEventImage;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-import java.util.List;
-
-/**
- * <p>
- * 事件图片表 服务类
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface IBusEventImageService extends IService<BusEventImage> {
-
-    boolean saveBusEventImages(Long eventId, List<BusEventImage> imageList);
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IBusEventService.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IBusEventService.java
deleted file mode 100644
index 85c48d0..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IBusEventService.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package com.casic.missiles.modular.system.service;
-
-import com.casic.missiles.modular.system.entity.BusEvent;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-/**
- * <p>
- * 事件表 服务类
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface IBusEventService extends IService<BusEvent> {
-
-    boolean saveBusEvent(BusEvent busEvent);
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IDeviceExtService.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IDeviceExtService.java
deleted file mode 100644
index 6fc5361..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IDeviceExtService.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package com.casic.missiles.modular.system.service;
-
-import com.casic.missiles.modular.system.dto.DeviceDetailDTO;
-import com.casic.missiles.modular.system.entity.DeviceExt;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-import java.util.List;
-
-/**
- * <p>
- * 设备扩展信息表（安全树） 服务类
- * </p>
- *
- * @author zyj
- * @since 2023-04-27
- */
-public interface IDeviceExtService extends IService<DeviceExt> {
-
-    boolean saveDeviceExt(DeviceDetailDTO deviceDetailDTO);
-
-    boolean updateDeviceExt(DeviceDetailDTO deviceDetailDTO);
-
-    boolean removeByDeviceIds(List<Long> deviceIds);
-
-    boolean setGasThreshold(String gasIp,String gasPort,String threshold);
-
-    String getGasThreshold(String gasIp,String gasPort);
-
-    Long selectByGasIpPort(String gasIp,String gasPort);
-
-    Long selectByCameraIpPort(String cameraIp,String cameraPort);
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java
index 9e62756..00a421d 100644
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java
@@ -1,32 +1,16 @@
 package com.casic.missiles.modular.system.service;
 
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.modular.system.dto.DeviceDetailDTO;
-import com.casic.missiles.modular.system.dto.HelmetInfoDTO;
 import com.casic.missiles.modular.system.entity.Device;
 import com.baomidou.mybatisplus.extension.service.IService;
 
-import java.util.List;
-
 /**
  * <p>
- *  服务类
+ * 设备记录表 服务类
  * </p>
  *
  * @author zyj
- * @since 2023-04-14
+ * @since 2023-05-25
  */
 public interface IDeviceService extends IService<Device> {
 
-    boolean saveDevice(DeviceDetailDTO deviceDetailDTO);
-
-    boolean updateDevice(DeviceDetailDTO deviceDetailDTO);
-
-    boolean deleteDevices(List<Long> deviceIds);
-
-    Page<DeviceDetailDTO> listPage(Page<DeviceDetailDTO> page, QueryWrapper<DeviceDetailDTO> queryWrapper, String status,Long projectId);
-
-    List<Long> selectProjectDevice(Long projectId);
-
 }
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IProjectDeviceService.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IProjectDeviceService.java
deleted file mode 100644
index 8599411..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IProjectDeviceService.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package com.casic.missiles.modular.system.service;
-
-import com.casic.missiles.modular.system.dto.DeviceLocationDTO;
-import com.casic.missiles.modular.system.entity.ProjectDevice;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-import java.util.List;
-
-/**
- * <p>
- *  服务类
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface IProjectDeviceService extends IService<ProjectDevice> {
-
-    boolean saveProjectDeviceList(Long projectId, List<ProjectDevice> projectDeviceList);
-
-    boolean updateProjectDeviceList(Long projectId, List<ProjectDevice> projectDeviceList);
-
-    boolean deleteByProjectId(Long projectId);
-
-    boolean deleteByProjectIds(List<Long> projectIds);
-
-    List<ProjectDevice> selectDetailByProjectId(Long projectId);
-
-    Long selectProjectIdByDevice(Long deviceId);
-
-    List<DeviceLocationDTO> selectDeviceLocationList(Long projectId);
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IProjectWorkerService.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IProjectWorkerService.java
deleted file mode 100644
index e921bc3..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IProjectWorkerService.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package com.casic.missiles.modular.system.service;
-
-import com.casic.missiles.modular.system.dto.WorkerLocationDTO;
-import com.casic.missiles.modular.system.entity.ProjectDevice;
-import com.casic.missiles.modular.system.entity.ProjectWorker;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-import java.util.List;
-
-/**
- * <p>
- *  服务类
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface IProjectWorkerService extends IService<ProjectWorker> {
-
-    boolean saveProjectWorkerList(Long projectId, List<ProjectWorker> projectWorkerList);
-
-    boolean updateProjectWorkerList(Long projectId, List<ProjectWorker> projectWorkerList);
-
-    boolean deleteByProjectId(Long projectId);
-
-    boolean deleteByProjectIds(List<Long> projectIds);
-
-    List<ProjectWorker> selectDetailByProjectId(Long projectId,String workerType);
-
-    List<WorkerLocationDTO> selectWorkerLocationDTO(Long projectId);
-}

diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/AlarmController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/AlarmController.java
new file mode 100644
index 0000000..1795cf1
--- /dev/null
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/AlarmController.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.modular.system.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.stereotype.Controller;
+
+/**
+ * <p>
+ * 报警记录表 前端控制器
+ * </p>
+ *
+ * @author zyj
+ * @since 2023-05-25
+ */
+@Controller
+@RequestMapping("/system/alarm")
+public class AlarmController {
+
+}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusAlarmController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusAlarmController.java
deleted file mode 100644
index 1f82ebb..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusAlarmController.java
+++ /dev/null
@@ -1,102 +0,0 @@
-package com.casic.missiles.modular.system.controller;
-
-
-import cn.hutool.core.util.ObjectUtil;
-import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.core.base.controller.BaseController;
-import com.casic.missiles.core.page.PageFactory;
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.AlarmUpload;
-import com.casic.missiles.modular.system.dto.DeviceDetailDTO;
-import com.casic.missiles.modular.system.entity.BusAlarm;
-import com.casic.missiles.modular.system.service.IBusAlarmService;
-import io.swagger.annotations.*;
-import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.*;
-
-import org.springframework.stereotype.Controller;
-
-import static com.casic.missiles.model.response.ResponseData.DEFAULT_SUCCESS_MESSAGE;
-import static com.casic.missiles.modular.system.consts.AlarmConst.ALARM_STATUS_MANUAL_CANCEL;
-
-/**
- * <p>
- * 报警记录表 前端控制器
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@Api(tags = "报警管理接口")
-@Controller
-@RequestMapping("/alarm")
-@RequiredArgsConstructor
-public class BusAlarmController extends BaseController {
-
-    private final IBusAlarmService alarmService;
-
-    @ApiOperation("报警上报接口")
-    @PostMapping("/upload")
-    @ResponseBody
-    public Object upload(@RequestBody AlarmUpload alarmUpload){
-        alarmService.alarmUpload(alarmUpload);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("报警列表分页查询")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "workTitle", value = "作业名称",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "projectId", value = "作业ID",dataType = "Long", paramType = "query",example = "0"),
-            @ApiImplicitParam(name = "alarmStatus", value = "报警状态",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "projectState", value = "作业状态",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "alarmType", value = "报警类型",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "alarmStartTime", value = "报警开始时间",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "alarmEndTime", value = "报警结束时间",dataType = "String", paramType = "query")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = BusAlarm.class),
-    })
-    @GetMapping("/listPage")
-    @ResponseBody
-    public Object listPage(String workTitle,Long projectId,String alarmStatus,String projectState,String alarmType,String alarmStartTime,String alarmEndTime){
-        Page<BusAlarm> page = PageFactory.defaultPage();
-        QueryWrapper<BusAlarm> queryWrapper = new QueryWrapper<>();
-        if(StrUtil.isNotEmpty(workTitle)){
-            queryWrapper.like("p.WORK_TITLE",workTitle);
-        }
-        if(ObjectUtil.isNotEmpty(projectId)){
-            queryWrapper.eq("alarm.PROJECT_ID",projectId);
-        }
-        if(StrUtil.isNotEmpty(alarmStatus)){
-            queryWrapper.eq("alarm.ALARM_STATUS",alarmStatus);
-        }
-        if(StrUtil.isNotEmpty(projectState)){
-            queryWrapper.eq("p.PROJECT_STATE",projectState);
-        }
-        if(StrUtil.isNotEmpty(alarmType)){
-            queryWrapper.eq("alarm.ALARM_TYPE",alarmType);
-        }
-        if(StrUtil.isNotEmpty(alarmStartTime)){
-            queryWrapper.ge("alarm.ALARM_TIME",alarmStartTime);
-        }
-        if(StrUtil.isNotEmpty(alarmEndTime)){
-            queryWrapper.le("alarm.ALARM_TIME",alarmEndTime);
-        }
-        page = alarmService.listPage(page,queryWrapper);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-    @ApiOperation("消警")
-    @PostMapping("/cancel")
-    @ResponseBody
-    public Object cancel(@RequestParam("alarmId") Long alarmId){
-        UpdateWrapper<BusAlarm> updateWrapper = new UpdateWrapper<>();
-        updateWrapper.eq("ID",alarmId);
-        updateWrapper.set("ALARM_STATUS",ALARM_STATUS_MANUAL_CANCEL);
-        alarmService.update(updateWrapper);
-        return ResponseData.success();
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusEventController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusEventController.java
deleted file mode 100644
index dde5aad..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusEventController.java
+++ /dev/null
@@ -1,41 +0,0 @@
-package com.casic.missiles.modular.system.controller;
-
-
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.entity.BusEvent;
-import com.casic.missiles.modular.system.service.IBusEventService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.ResponseBody;
-
-/**
- * <p>
- * 事件表 前端控制器
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@Controller
-@RequestMapping("/event")
-@Api(tags = "事件上报")
-@RequiredArgsConstructor
-public class BusEventController {
-
-    private final IBusEventService eventService;
-
-    @ApiOperation("事件上报")
-    @PostMapping("add")
-    @ResponseBody
-    public Object add(@RequestBody BusEvent busEvent){
-        eventService.saveBusEvent(busEvent);
-        return ResponseData.success();
-    }
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
index 03abc5f..aa50d78 100644
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
@@ -1,121 +1,20 @@
 package com.casic.missiles.modular.system.controller;
 
 
-import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.core.base.controller.BaseController;
-import com.casic.missiles.core.page.PageFactory;
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.DeviceDetailDTO;
-import com.casic.missiles.modular.system.entity.Device;
-import com.casic.missiles.modular.system.service.IDeviceExtService;
-import com.casic.missiles.modular.system.service.IDeviceService;
-import io.swagger.annotations.*;
-import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.RequestMapping;
 
 import org.springframework.stereotype.Controller;
 
-import java.time.LocalDateTime;
-import java.util.Date;
-import java.util.List;
-
-import static com.casic.missiles.model.response.ResponseData.DEFAULT_SUCCESS_MESSAGE;
-
 /**
  * <p>
- *  前端控制器
+ * 设备记录表 前端控制器
  * </p>
  *
  * @author zyj
- * @since 2023-04-14
+ * @since 2023-05-25
  */
-@Api(tags = "设备管理接口")
-@RequiredArgsConstructor
 @Controller
-@RequestMapping("/device")
-public class DeviceController extends BaseController {
-    private final IDeviceService deviceService;
-    private final IDeviceExtService deviceExtService;
-
-    @ApiOperation("设备分页列表")
-    @ApiImplicitParams({
-        @ApiImplicitParam(name = "deviceType", value = "设备类型",dataType = "String", paramType = "query"),
-        @ApiImplicitParam(name = "deviceCode", value = "设备编号",dataType = "String", paramType = "query"),
-        @ApiImplicitParam(name = "status", value = "设备状态",dataType = "String", paramType = "query"),
-        @ApiImplicitParam(name = "projectId", value = "作业ID（如果传此参数，列表中返回该作业使用的设备）",dataType = "Long", paramType = "query", example = "0")
-    })
-    @ApiResponses({
-        @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = DeviceDetailDTO.class),
-    })
-    @GetMapping("listPage")
-    @ResponseBody
-    public Object listPage(String deviceType, String deviceCode, String status,Long projectId){
-        Page<DeviceDetailDTO> page = PageFactory.defaultPage();
-        QueryWrapper<DeviceDetailDTO> queryWrapper = new QueryWrapper<>();
-        if(StrUtil.isNotEmpty(deviceType)){
-            queryWrapper.eq("DEVICE_TYPE",deviceType);
-        }
-        if(StrUtil.isNotEmpty(deviceCode)){
-            queryWrapper.like("DEVICE_CODE",deviceCode);
-        }
-        page = deviceService.listPage(page,queryWrapper,status,projectId);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-    @ApiOperation("新增设备")
-    @PostMapping("add")
-    @ResponseBody
-    public Object add(@RequestBody DeviceDetailDTO deviceDetailDTO){
-        deviceService.saveDevice(deviceDetailDTO);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("编辑设备")
-    @PostMapping("update")
-    @ResponseBody
-    public Object update(@RequestBody DeviceDetailDTO deviceDetailDTO){
-        deviceService.updateDevice(deviceDetailDTO);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("删除设备")
-    @PostMapping("delete")
-    @ResponseBody
-    public Object delete(@ApiParam("设备id列表")@RequestBody List<Long> deviceIds){
-        deviceService.deleteDevices(deviceIds);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("设置甲烷阈值")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "gasIp", value = "安全树甲烷设备IP",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "gasPort", value = "安全树甲烷端口",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "threshold", value = "甲烷阈值",dataType = "String", paramType = "query")
-    })
-    @PostMapping("setThreshold")
-    @ResponseBody
-    public Object setThreshold(String gasIp,String gasPort,String threshold){
-        deviceExtService.setGasThreshold(gasIp, gasPort, threshold);
-        return ResponseData.success();
-    }
-
-
-    @ApiOperation("查询甲烷阈值")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "gasIp", value = "安全树甲烷设备IP",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "gasPort", value = "安全树甲烷端口",dataType = "String", paramType = "query")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = "{\"code\": 200,\"data\": \"100\",\"message\": \"请求成功\",\"success\": true}",response = String.class),
-    })
-    @GetMapping("getThreshold")
-    @ResponseBody
-    public Object getThreshold(String gasIp,String gasPort){
-        String data = deviceExtService.getGasThreshold(gasIp, gasPort);
-        return ResponseData.success(data);
-    }
-
+@RequestMapping("/system/device")
+public class DeviceController {
 
 }
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/OverviewController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/OverviewController.java
deleted file mode 100644
index 7570504..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/OverviewController.java
+++ /dev/null
@@ -1,70 +0,0 @@
-package com.casic.missiles.modular.system.controller;
-
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.AlarmTypeCountDTO;
-import com.casic.missiles.modular.system.dto.DeviceLocationDTO;
-import com.casic.missiles.modular.system.dto.WorkerLocationDTO;
-import com.casic.missiles.modular.system.service.IBusAlarmService;
-import com.casic.missiles.modular.system.service.IProjectDeviceService;
-import com.casic.missiles.modular.system.service.IProjectWorkerService;
-import io.swagger.annotations.*;
-import lombok.RequiredArgsConstructor;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.ResponseBody;
-
-import static com.casic.missiles.model.response.ResponseData.DEFAULT_SUCCESS_MESSAGE;
-import static com.casic.missiles.modular.system.consts.AlarmConst.ALARM_STATUS_ON;
-
-@Api(tags = "首页看板接口")
-@Controller
-@RequestMapping("overview")
-@RequiredArgsConstructor
-public class OverviewController {
-
-    private final IBusAlarmService alarmService;
-    private final IProjectDeviceService projectDeviceService;
-
-    private final IProjectWorkerService projectWorkerService;
-
-
-    @ApiOperation("报警统计接口")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "projectId", value = "作业ID",dataType = "Long", paramType = "query", example = "0")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = AlarmTypeCountDTO.class),
-    })
-    @GetMapping("/alarmCount")
-    @ResponseBody
-    public Object alarmCount(Long projectId){
-        return ResponseData.success(alarmService.alarmCount(projectId,ALARM_STATUS_ON));
-    }
-
-    @ApiOperation("设备列表接口")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "projectId", value = "作业ID",dataType = "Long", paramType = "query", example = "0")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = DeviceLocationDTO.class),
-    })
-    @GetMapping("/deviceList")
-    @ResponseBody
-    public Object deviceList(Long projectId){
-        return ResponseData.success(projectDeviceService.selectDeviceLocationList(projectId));
-    }
-
-    @ApiOperation("人员列表接口")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "projectId", value = "作业ID",dataType = "Long", paramType = "query", example = "0")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = WorkerLocationDTO.class),
-    })
-    @GetMapping("/workerList")
-    @ResponseBody
-    public Object workerList(Long projectId){
-        return ResponseData.success(projectWorkerService.selectWorkerLocationDTO(projectId));
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/WorkSiteInfoController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/WorkSiteInfoController.java
deleted file mode 100644
index af36d69..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/WorkSiteInfoController.java
+++ /dev/null
@@ -1,130 +0,0 @@
-package com.casic.missiles.modular.system.controller;
-
-
-import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.core.base.controller.BaseController;
-import com.casic.missiles.core.page.PageFactory;
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.WorkSiteDetailDTO;
-import com.casic.missiles.modular.system.entity.WorkSiteInfo;
-import com.casic.missiles.modular.system.service.IWorkSiteInfoService;
-import io.swagger.annotations.*;
-import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.*;
-
-import org.springframework.stereotype.Controller;
-
-import java.util.List;
-
-import static com.casic.missiles.model.response.ResponseData.DEFAULT_SUCCESS_MESSAGE;
-
-/**
- * <p>
- * 作业现场表 前端控制器
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@Controller
-@RequestMapping("/site")
-@Api(tags = "作业现场管理")
-@RequiredArgsConstructor
-public class WorkSiteInfoController extends BaseController {
-
-
-    private final IWorkSiteInfoService workSiteInfoService;
-
-    @ApiOperation("新增作业现场")
-    @PostMapping("add")
-    @ResponseBody
-    public Object addWorkSite(@RequestBody WorkSiteDetailDTO workSiteDetailDTO){
-        workSiteInfoService.addWorkSiteInfo(workSiteDetailDTO);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("编辑作业现场")
-    @PostMapping("update")
-    @ResponseBody
-    public Object updateWorkSite(@RequestBody WorkSiteDetailDTO workSiteDetailDTO){
-        workSiteInfoService.updateWorkSiteInfo(workSiteDetailDTO);
-        return ResponseData.success();
-    }
-
-
-    @ApiOperation("删除作业现场")
-    @PostMapping("delete")
-    @ResponseBody
-    public Object delete(@ApiParam("作业现场id列表")@RequestBody List<Long> projectIds){
-        workSiteInfoService.deleteProjects(projectIds);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("查询作业现场详情")
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = WorkSiteDetailDTO.class),
-    })
-    @GetMapping("detail")
-    @ResponseBody
-    public Object delete(@ApiParam(value = "作业现场id", example = "0")@RequestParam Long projectId){
-        WorkSiteDetailDTO detailDTO = workSiteInfoService.getWorkSiteDetail(projectId);
-        return ResponseData.success(detailDTO);
-    }
-
-    @ApiOperation("分页列表查询")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "workTitle",value = "作业名称", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "workRoad",value = "所属道路", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "workPersonName",value = "责任人姓名", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "startDate",value = "注册开始日期", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "endDate",value = "注册结束日期", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "projectState",value = "当前状态（字典值）", dataType = "String", paramType = "query")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = WorkSiteInfo.class),
-    })
-    @GetMapping("listPage")
-    @ResponseBody
-    public Object listPage(String workTitle,String workRoad,String workPersonName,String projectState,String startDate,String endDate){
-        Page<WorkSiteInfo> page = PageFactory.defaultPage();
-        QueryWrapper<WorkSiteInfo> queryWrapper = new QueryWrapper<>();
-        if(StrUtil.isNotEmpty(workTitle)){
-            queryWrapper.like("WORK_TITLE",workTitle);
-        }
-        if(StrUtil.isNotEmpty(workRoad)){
-            queryWrapper.like("WORK_ROAD",workRoad);
-        }
-        if(StrUtil.isNotEmpty(workPersonName)){
-            queryWrapper.like("WORKER_NAME",workPersonName);
-        }
-        if(StrUtil.isNotEmpty(projectState)){
-            queryWrapper.eq("PROJECT_STATE",projectState);
-        }
-        if(StrUtil.isNotEmpty(startDate)){
-            queryWrapper.ge("br_work_site_info.CREATE_TIME",startDate + " 00:00:00");
-        }
-        if(StrUtil.isNotEmpty(endDate)){
-            queryWrapper.le("br_work_site_info.CREATE_TIME",endDate + " 23:59:59");
-        }
-        page = workSiteInfoService.selectListPage(page,queryWrapper);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-    @ApiOperation("开始作业")
-    @PostMapping("start")
-    @ResponseBody
-    public Object start(@ApiParam(value = "作业现场id",example = "0")@RequestParam Long projectId){
-        workSiteInfoService.start(projectId);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("完成作业")
-    @PostMapping("finish")
-    @ResponseBody
-    public Object finish(@ApiParam(value = "作业现场id", example = "0")@RequestParam Long projectId){
-        workSiteInfoService.finish(projectId);
-        return ResponseData.success();
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/WorkerController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/WorkerController.java
deleted file mode 100644
index 796f94c..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/WorkerController.java
+++ /dev/null
@@ -1,136 +0,0 @@
-package com.casic.missiles.modular.system.controller;
-
-
-import cn.hutool.core.util.ObjectUtil;
-import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.core.base.controller.BaseController;
-import com.casic.missiles.core.page.PageFactory;
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.DeviceDetailDTO;
-import com.casic.missiles.modular.system.entity.Device;
-import com.casic.missiles.modular.system.entity.Worker;
-import com.casic.missiles.modular.system.service.IWorkerService;
-import io.swagger.annotations.*;
-import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.*;
-
-import org.springframework.stereotype.Controller;
-
-import java.util.Date;
-import java.util.List;
-
-import static com.casic.missiles.model.response.ResponseData.DEFAULT_SUCCESS_MESSAGE;
-
-/**
- * <p>
- *  前端控制器
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@Controller
-@RequestMapping("/worker")
-@RequiredArgsConstructor
-@Api(tags = "人员管理接口")
-public class WorkerController extends BaseController {
-
-    private final IWorkerService workerService;
-
-    @ApiOperation("分页列表查询")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "name",value = "姓名", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "deptId",value = "所属部门", dataType = "Long", paramType = "query", example = "0"),
-            @ApiImplicitParam(name = "status",value = "当前状态（字典值）", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "startDate",value = "注册开始日期", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "endDate",value = "注册结束日期", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "workerType",value = "人员类型（字典值）", dataType = "String", paramType = "query")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = Worker.class),
-    })
-    @GetMapping("listPage")
-    @ResponseBody
-    public Object listPage(String name,Long deptId, String status,String startDate,String endDate,String workerType){
-        Page<Worker> page = PageFactory.defaultPage();
-        QueryWrapper<Worker> queryWrapper = new QueryWrapper<>();
-        if(StrUtil.isNotEmpty(name)){
-            queryWrapper.like("WORKER_NAME",name);
-        }
-        if(ObjectUtil.isNotEmpty(deptId)){
-            queryWrapper.eq("DEPT_ID",deptId);
-        }
-        if(StrUtil.isNotEmpty(workerType)){
-            queryWrapper.eq("WORKER_TYPE",workerType);
-        }
-        if(StrUtil.isNotEmpty(startDate)){
-            queryWrapper.ge("CREATE_TIME",startDate + " 00:00:00");
-        }
-        if(StrUtil.isNotEmpty(endDate)){
-            queryWrapper.le("CREATE_TIME",endDate + " 23:59:59");
-        }
-        if(StrUtil.isNotEmpty(status)){
-            queryWrapper.eq("`STATUS`",status);
-        }
-        page = workerService.selectListPage(page,queryWrapper);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-    @ApiOperation("新增人员")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "worker", value = "人员信息", dataType = "Worker", paramType = "body", required = true),
-            @ApiImplicitParam(name = "projectId", value = "项目ID(入场申请需要)", dataType = "Long", paramType = "query", example = "0")
-    })
-    @PostMapping("add")
-    @ResponseBody
-    public Object add(@ApiParam("worker")@RequestBody Worker worker,
-                      @RequestParam(required = false) Long projectId){
-        workerService.addWorker(worker,projectId);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("编辑人员")
-    @PostMapping("update")
-    @ResponseBody
-    public Object update(@RequestBody Worker worker){
-        workerService.updateById(worker);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("删除人员")
-    @PostMapping("delete")
-    @ResponseBody
-    public Object delete(@ApiParam("人员id列表")@RequestBody List<Long> workIds){
-        workerService.removeByIds(workIds);
-        return ResponseData.success();
-    }
-
-
-    @ApiOperation(value = "获取人脸图片",notes = "返回人脸图片url")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "cameraIp",value = "摄像头IP", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "cameraPort",value = "摄像头端口号", dataType = "String", paramType = "query"),
-    })
-    @GetMapping("/face/register")
-    @ResponseBody
-    public Object faceRegister(String cameraIp,String cameraPort){
-        return ResponseData.success(workerService.faceRegister(cameraIp, cameraPort));
-    }
-
-
-    @ApiOperation(value = "查询临时入场人员列表")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "projectId", value = "项目ID",required = true,dataType = "Long", paramType = "query", example = "0")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = Worker.class),
-    })
-    @GetMapping("/projectTempWorker")
-    @ResponseBody
-    public Object projectTempWorker(Long projectId){
-        return ResponseData.success(workerService.projectTempWorker(projectId));
-    }
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/AlarmTypeCountDTO.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/AlarmTypeCountDTO.java
deleted file mode 100644
index 1a165a1..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/AlarmTypeCountDTO.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.casic.missiles.modular.system.dto;
-
-import io.swagger.annotations.ApiModel;
-import lombok.Data;
-
-@ApiModel(value = "AlarmTypeCountDTO",description = "报警类型统计（首页）")
-@Data
-public class AlarmTypeCountDTO {
-
-    private String alarmType;
-    private String alarmTypeName;
-    private Integer alarmCount;
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/AlarmUpload.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/AlarmUpload.java
deleted file mode 100644
index 73d7799..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/AlarmUpload.java
+++ /dev/null
@@ -1,46 +0,0 @@
-package com.casic.missiles.modular.system.dto;
-
-import cn.hutool.core.util.StrUtil;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-@ApiModel(value = "AlarmUpload",description = "报警上传")
-@Data
-public class AlarmUpload {
-
-    @ApiModelProperty(value = "摄像头ip")
-    private String cameraIp;
-
-    @ApiModelProperty(value = "摄像头端口")
-    private String cameraPort;
-    @ApiModelProperty(value = "安全树甲烷设备ip")
-    private String gasIp;
-    @ApiModelProperty(value = "安全树甲烷设备端口")
-    private String gasPort;
-    @ApiModelProperty(value = "报警值")
-    private String alarmValue;
-    @ApiModelProperty(value = "报警时间")
-    private String alarmTime;
-    @ApiModelProperty(value = "报警类型")
-    private String alarmType;
-    @ApiModelProperty(value = "报警图片")
-    private String alarmImage;
-    @ApiModelProperty(value = "报警内容")
-    private String alarmContent;
-
-    @Override
-    public String toString() {
-        return "AlarmUpload{" +
-                "cameraIp='" + cameraIp + '\'' +
-                ", cameraPort='" + cameraPort + '\'' +
-                ", gasIp='" + gasIp + '\'' +
-                ", gasPort='" + gasPort + '\'' +
-                ", alarmValue='" + alarmValue + '\'' +
-                ", alarmTime='" + alarmTime + '\'' +
-                ", alarmType='" + alarmType + '\'' +
-                ", alarmImage='" + (StrUtil.isNotEmpty(alarmImage) ? alarmImage.substring(0,50) : "null") + '\'' +
-                ", alarmContent='" + alarmContent + '\'' +
-                '}';
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/DeviceDetailDTO.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/DeviceDetailDTO.java
deleted file mode 100644
index ea518d9..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/DeviceDetailDTO.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package com.casic.missiles.modular.system.dto;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.casic.missiles.modular.system.entity.Device;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-@ApiModel("DeviceDetailDTO")
-@Data
-public class DeviceDetailDTO extends Device {
-
-    @ApiModelProperty(value = "摄像头编号")
-    private String cameraCode;
-
-    @ApiModelProperty(value = "摄像头IP")
-    private String cameraIp;
-
-    @ApiModelProperty(value = "摄像头端口")
-    private String cameraPort;
-
-    @ApiModelProperty(value = "激甲编号")
-    private String gasCode;
-
-    @ApiModelProperty(value = "激甲IP")
-    private String gasIp;
-
-    @ApiModelProperty(value = "激甲端口")
-    private String gasPort;
-
-    @ApiModelProperty(value = "智能帽衬编号")
-    private String hatLiningCode;
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/WorkSiteDetailDTO.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/WorkSiteDetailDTO.java
deleted file mode 100644
index 29378ff..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/WorkSiteDetailDTO.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package com.casic.missiles.modular.system.dto;
-
-import com.casic.missiles.modular.system.entity.ProjectDevice;
-import com.casic.missiles.modular.system.entity.ProjectWorker;
-import com.casic.missiles.modular.system.entity.WorkSiteInfo;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.util.List;
-
-@Data
-@ApiModel("WorkSiteDetailDTO")
-public class WorkSiteDetailDTO extends WorkSiteInfo {
-
-    @ApiModelProperty(value = "安全树列表",dataType = "ProjectDevice")
-    private List<ProjectDevice> deviceList;
-
-    @ApiModelProperty(value = "人员列表",dataType = "ProjectWorker")
-    private List<ProjectWorker> workerList;
-
-
-
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/WorkerLocationDTO.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/WorkerLocationDTO.java
deleted file mode 100644
index 6fd7b24..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/WorkerLocationDTO.java
+++ /dev/null
@@ -1,68 +0,0 @@
-package com.casic.missiles.modular.system.dto;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-@ApiModel(value = "WorkerLocationDTO",description = "人员位置列表（首页）")
-@Data
-public class WorkerLocationDTO {
-
-    @ApiModelProperty("人员ID")
-    private Long workerId;
-
-    @ApiModelProperty("人员姓名")
-    private String workerName;
-
-    @ApiModelProperty("安全帽编号")
-    private String hatCode;
-
-    @ApiModelProperty("安全帽ID")
-    private Long hatId;
-
-    @ApiModelProperty("背心编号")
-    private String vastCode;
-
-    @ApiModelProperty("手环编号")
-    private String braceletCode;
-
-    @ApiModelProperty("位置")
-    private String location;
-
-    @ApiModelProperty("时间")
-    private String time;
-
-    @ApiModelProperty("经度")
-    private String lng;
-
-    @ApiModelProperty("纬度")
-    private String lat;
-
-    @ApiModelProperty("心率")
-    private String heartRate;
-
-    @ApiModelProperty("血氧")
-    private String bloodOxygen;
-
-    @ApiModelProperty("一氧化碳")
-    private String co;
-
-    @ApiModelProperty("甲烷")
-    private String gas;
-
-    @ApiModelProperty("硫化氢")
-    private String h2s;
-
-    @ApiModelProperty("氧气")
-    private String o2;
-
-    @ApiModelProperty("信号")
-    private String signal;
-
-    @ApiModelProperty("电量")
-    private String cell;
-
-    @ApiModelProperty("是否报警")
-    private boolean alarmFlag;
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Alarm.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Alarm.java
new file mode 100644
index 0000000..4d2b7ef
--- /dev/null
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Alarm.java
@@ -0,0 +1,103 @@
+package com.casic.missiles.modular.system.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import java.util.Date;
+
+/**
+ * <p>
+ * 报警记录表
+ * </p>
+ *
+ * @author zyj
+ * @since 2023-05-25
+ */
+@Data
+@TableName("bus_alarm")
+public class Alarm implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    @TableId(value = "ID",type = IdType.ASSIGN_ID)
+    private Long id;
+
+    /**
+     * 设备ID
+     */
+    @TableField("DEVICE_ID")
+    private Long deviceId;
+
+    /**
+     * 报警类型
+     */
+    @TableField("ALARM_TYPE")
+    private String alarmType;
+
+    /**
+     * 报警时间
+     */
+    @TableField("ALARM_TIME")
+    private Date alarmTime;
+
+    /**
+     * 报警状态
+     */
+    @TableField("ALARM_STATUS")
+    private String alarmStatus;
+
+    /**
+     * 报警位置
+     */
+    @TableField("ALARM_LOCATION")
+    private String alarmLocation;
+
+    /**
+     * 报警图片
+     */
+    @TableField("ALARM_IMAGE")
+    private String alarmImage;
+
+    /**
+     * 视频通道号
+     */
+    @TableField("CHANNEL_NO")
+    private Integer channelNo;
+
+    /**
+     * 报警内容
+     */
+    @TableField("ALARM_CONTENT")
+    private String alarmContent;
+
+    /**
+     * 消警时间
+     */
+    @TableField("CANCEL_TIME")
+    private Date cancelTime;
+
+
+    @Override
+    public String toString() {
+        return "Alarm{" +
+            "id=" + id +
+            ", deviceId=" + deviceId +
+            ", alarmType=" + alarmType +
+            ", alarmTime=" + alarmTime +
+            ", alarmStatus=" + alarmStatus +
+            ", alarmLocation=" + alarmLocation +
+            ", alarmImage=" + alarmImage +
+            ", channelNo=" + channelNo +
+            ", alarmContent=" + alarmContent +
+            ", cancelTime=" + cancelTime +
+        "}";
+    }
+}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusAlarm.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusAlarm.java
deleted file mode 100644
index efb4a23..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusAlarm.java
+++ /dev/null
@@ -1,159 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.alibaba.fastjson.annotation.JSONField;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.time.LocalDateTime;
-import java.util.Date;
-
-/**
- * <p>
- * 报警记录表
- * </p>
- *
- * @author zyj
- * @since 2023-05-16
- */
-@Data
-@ApiModel("Alarm")
-@TableName("br_bus_alarm")
-public class BusAlarm implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 项目ID
-     */
-    @ApiModelProperty(value = "项目ID")
-    @TableField("PROJECT_ID")
-    private Long projectId;
-
-    /**
-     * 设备ID
-     */
-    @ApiModelProperty(value = "设备ID")
-    @TableField("DEVICE_ID")
-    private Long deviceId;
-
-    /**
-     * 报警类型
-     */
-    @ApiModelProperty(value = "报警类型")
-    @TableField("ALARM_TYPE")
-    private String alarmType;
-
-    /**
-     * 报警状态
-     */
-    @ApiModelProperty(value = "报警状态")
-    @TableField("ALARM_STATUS")
-    private String alarmStatus;
-
-    /**
-     * 报警值
-     */
-    @ApiModelProperty(value = "报警值")
-    @TableField("ALARM_VALUE")
-    private String alarmValue;
-
-    /**
-     * 报警图片
-     */
-    @ApiModelProperty(value = "报警图片")
-    @TableField("ALARM_IMAGE")
-    private String alarmImage;
-
-    /**
-     * 报警内容
-     */
-    @ApiModelProperty(value = "报警内容")
-    @TableField("ALARM_CONTENT")
-    private String alarmContent;
-
-    /**
-     * 报警时间
-     */
-    @ApiModelProperty(value = "报警时间")
-    @TableField("ALARM_TIME")
-    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
-    private Date alarmTime;
-
-    /**
-     * 消警时间
-     */
-    @ApiModelProperty(value = "消警时间")
-    @TableField("CANCEL_TIME")
-    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
-    private Date cancelTime;
-
-    /**
-     * 报警位置经度
-     */
-    @ApiModelProperty(value = "报警位置经度")
-    @TableField("ALARM_LNG")
-    private String alarmLng;
-
-    /**
-     * 报警位置纬度
-     */
-    @ApiModelProperty(value = "报警位置纬度")
-    @TableField("ALARM_LAT")
-    private String alarmLat;
-
-    @ApiModelProperty("报警类型名称")
-    @TableField(exist = false)
-    private String alarmStatusName;
-    @ApiModelProperty("报警类型名称")
-    @TableField(exist = false)
-    private String alarmTypeName;
-    @ApiModelProperty("作业名称")
-    @TableField(exist = false)
-    private String workTitle;
-    @ApiModelProperty("所属道路")
-    @TableField(exist = false)
-    private String workRoad;
-    @ApiModelProperty("作业状态")
-    @TableField(exist = false)
-    private String projectState;
-    @ApiModelProperty("作业状态名称")
-    @TableField(exist = false)
-    private String projectStateName;
-    @ApiModelProperty("负责人姓名")
-    @TableField(exist = false)
-    private String workPersonName;
-    @ApiModelProperty("负责人联系方式")
-    @TableField(exist = false)
-    private String workPersonPhoneNumber;
-
-
-    @Override
-    public String toString() {
-        return "BusAlarm{" +
-                "id=" + id +
-                ", projectId=" + projectId +
-                ", deviceId=" + deviceId +
-                ", alarmType=" + alarmType +
-                ", alarmValue=" + alarmValue +
-                ", alarmStatus=" + alarmStatus +
-                ", alarmImage=" + alarmImage +
-                ", alarmContent=" + alarmContent +
-                ", alarmTime=" + alarmTime +
-                ", cancelTime=" + cancelTime +
-                ", alarmLng=" + alarmLng +
-                ", alarmLat=" + alarmLat +
-                "}";
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusEvent.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusEvent.java
deleted file mode 100644
index a0b7543..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusEvent.java
+++ /dev/null
@@ -1,100 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.time.LocalDateTime;
-import java.util.Date;
-import java.util.List;
-
-/**
- * <p>
- * 事件表
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@TableName("br_bus_event")
-@Data
-@ApiModel("BusEvent")
-public class BusEvent implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @ApiModelProperty("事件ID")
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 事件标题
-     */
-    @ApiModelProperty("事件名称")
-    @TableField("EVENT_TITLE")
-    private String eventTitle;
-
-    /**
-     * 上报人员
-     */
-    @ApiModelProperty("上报人员")
-    @TableField("UPLOAD_NAME")
-    private String uploadName;
-
-    /**
-     * 联系方式
-     */
-    @ApiModelProperty("联系方式")
-    @TableField("PHONE_NUMBER")
-    private String phoneNumber;
-
-    /**
-     * 事件描述
-     */
-    @ApiModelProperty("事件描述")
-    @TableField("EVENT_DESCRIPTION")
-    private String eventDescription;
-
-    @ApiModelProperty("经度")
-    @TableField("LNG")
-    private String lng;
-
-    @ApiModelProperty("纬度")
-    @TableField("LAT")
-    private String lat;
-
-    /**
-     * 事件上传时间
-     */
-    @ApiModelProperty("事件上传时间")
-    @TableField("CREATE_TIME")
-    private Date createTime;
-
-    @ApiModelProperty("事件照片")
-    @TableField(exist = false)
-    private List<BusEventImage> imageList;
-
-
-
-    @Override
-    public String toString() {
-        return "BusEvent{" +
-            "id=" + id +
-            ", eventTitle=" + eventTitle +
-            ", uploadName=" + uploadName +
-            ", phoneNumber=" + phoneNumber +
-            ", eventDescription=" + eventDescription +
-            ", lng=" + lng +
-            ", lat=" + lat +
-            ", createTime=" + createTime +
-        "}";
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusEventImage.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusEventImage.java
deleted file mode 100644
index 1e75245..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusEventImage.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-
-/**
- * <p>
- * 事件图片表
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@TableName("br_bus_event_image")
-@Data
-@ApiModel("BusEventImage")
-public class BusEventImage implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 事件ID
-     */
-    @TableField("EVENT_ID")
-    private Long eventId;
-
-    /**
-     * 报警图片
-     */
-    @TableField("IMAGE")
-    @ApiModelProperty("图片url")
-    private String image;
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Device.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Device.java
index df89c70..ea7db5f 100644
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Device.java
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Device.java
@@ -1,30 +1,23 @@
 package com.casic.missiles.modular.system.entity;
 
-import com.alibaba.fastjson.annotation.JSONField;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.casic.missiles.core.base.json.DateDeserializer;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
-import java.util.Date;
 
 /**
  * <p>
- * 
+ * 设备记录表
  * </p>
  *
  * @author zyj
- * @since 2023-04-14
+ * @since 2023-05-25
  */
-@ApiModel("Device")
-@TableName("br_device")
 @Data
+@TableName("bus_device")
 public class Device implements Serializable {
 
     private static final long serialVersionUID = 1L;
@@ -32,82 +25,86 @@
     /**
      * 主键
      */
-    @ApiModelProperty(value = "设备ID")
     @TableId(value = "ID",type = IdType.ASSIGN_ID)
     private Long id;
 
     /**
-     * 设备编号
+     * 设备名称
      */
-    @ApiModelProperty(value = "设备编号")
-    @TableField("DEVICE_CODE")
-    private String deviceCode;
+    @TableField("DEVICE_NAME")
+    private String deviceName;
 
     /**
-     * 设备类型
+     * IP
      */
-    @ApiModelProperty(value = "设备类型")
-    @TableField("DEVICE_TYPE")
-    private String deviceType;
+    @TableField("IP")
+    private String ip;
 
     /**
-     * 设备批次
+     * 端口
      */
-    @ApiModelProperty(value = "设备批次")
-    @TableField("DEVICE_BATCH")
-    private String deviceBatch;
+    @TableField("PORT")
+    private String port;
 
     /**
-     * 厂家
+     * 用户名
      */
-    @ApiModelProperty(value = "厂家")
-    @TableField("MANUFACTURER")
-    private String manufacturer;
+    @TableField("USER_NAME")
+    private String userName;
 
     /**
-     * 是否供电
+     * 密码
      */
-    @ApiModelProperty(value = "是否供电")
-    @TableField("IS_POWER_SUPPLY")
-    private String isPowerSupply;
+    @TableField("PASSWORD")
+    private String password;
 
     /**
-     * 创建时间
+     * 连接类型
      */
-    @ApiModelProperty(value = "创建时间",dataType = "Date")
-    @TableField("CREATE_TIME")
-    private Date createTime;
+    @TableField("CONNECT_TYPE")
+    private String connectType;
 
-    @ApiModelProperty(value = "设备类型名称")
-    @TableField(exist = false)
-    private String deviceTypeName;
+    /**
+     * 位置
+     */
+    @TableField("LOCATION")
 
-    @ApiModelProperty(value = "是否供电名称")
-    @TableField(exist = false)
-    private String isPowerSupplyName;
+    private String location;
 
-    @ApiModelProperty(value = "注册时间",dataType = "String")
-    @TableField(exist = false)
-    private String registerTime;
+    /**
+     * 设备状态
+     */
+    @TableField("STATUS")
 
-    @ApiModelProperty(value = "当前状态")
-    @TableField(exist = false)
     private String status;
 
-    @ApiModelProperty(value = "当前状态名称")
-    @TableField(exist = false)
-    private String statusName;
+    /**
+     * 报警分组
+     */
+    @TableField("ALARM_GROUP")
+
+    private Long alarmGroup;
+
+    /**
+     * 视频通道数(预留)
+     */
+    @TableField("CHANNEL_NUM")
+    private Integer channelNum;
 
     @Override
     public String toString() {
         return "Device{" +
             "id=" + id +
-            ", deviceCode=" + deviceCode +
-            ", deviceType=" + deviceType +
-            ", deviceBatch=" + deviceBatch +
-            ", manufacturer=" + manufacturer +
-            ", isPowerSupply=" + isPowerSupply +
-            ", createTime=" + createTime +
+            ", deviceName=" + deviceName +
+            ", ip=" + ip +
+            ", port=" + port +
+            ", userName=" + userName +
+            ", password=" + password +
+            ", connectType=" + connectType +
+            ", location=" + location +
+            ", status=" + status +
+            ", alarmGroup=" + alarmGroup +
+            ", channelNum=" + channelNum +
         "}";
     }
 }
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/DeviceExt.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/DeviceExt.java
deleted file mode 100644
index 5ee7015..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/DeviceExt.java
+++ /dev/null
@@ -1,99 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-
-/**
- * <p>
- * 设备扩展信息表（安全树）
- * </p>
- *
- * @author zyj
- * @since 2023-04-27
- */
-@Data
-@TableName("br_device_ext")
-public class DeviceExt implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 设备ID
-     */
-    @TableField("DEVICE_ID")
-    private Long deviceId;
-
-    /**
-     * 摄像头编号
-     */
-    @TableField("CAMERA_CODE")
-    private String cameraCode;
-
-    /**
-     * 摄像头IP
-     */
-    @TableField("CAMERA_IP")
-    private String cameraIp;
-
-    /**
-     * 摄像头端口
-     */
-    @TableField("CAMERA_PORT")
-    private String cameraPort;
-
-    /**
-     * 激甲编号
-     */
-    @TableField("GAS_CODE")
-    private String gasCode;
-
-    /**
-     * 激甲IP
-     */
-    @TableField("GAS_IP")
-    private String gasIp;
-
-    /**
-     * 激甲端口
-     */
-    @TableField("GAS_PORT")
-    private String gasPort;
-
-    /**
-     * 甲烷报警阈值
-     */
-    @TableField("GAS_THRESHOLD")
-    private String gasThreshold;
-
-    @TableField(value = "HAT_LINING_CODE")
-    private String hatLiningCode;
-
-
-    @Override
-    public String toString() {
-        return "DeviceExt{" +
-            "id=" + id +
-            ", deviceId=" + deviceId +
-            ", cameraCode=" + cameraCode +
-            ", cameraIp=" + cameraIp +
-            ", cameraPort=" + cameraPort +
-            ", gasCode=" + gasCode +
-            ", gasIp=" + gasIp +
-            ", gasPort=" + gasPort +
-            ", gasThreshold=" + gasThreshold +
-            ", hatLiningCode=" + hatLiningCode +
-        "}";
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/ProjectDevice.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/ProjectDevice.java
deleted file mode 100644
index c4f3472..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/ProjectDevice.java
+++ /dev/null
@@ -1,62 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-
-/**
- * <p>
- * 
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@Data
-@ApiModel("ProjectDevice")
-@TableName("br_project_device")
-public class ProjectDevice implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 作业现场ID
-     */
-    @TableField("PROJECT_ID")
-    private Long projectId;
-
-    /**
-     * 设备ID
-     */
-    @TableField("DEVICE_ID")
-    @ApiModelProperty("设备ID（新增编辑时传）")
-    private Long deviceId;
-
-    /**
-     * 设备编号
-     */
-    @TableField(exist = false)
-    @ApiModelProperty("设备编号（详情中展示，新增编辑不用传）")
-    private String deviceCode;
-
-    @Override
-    public String toString() {
-        return "ProjectDevice{" +
-            "id=" + id +
-            ", projectId=" + projectId +
-            ", deviceId=" + deviceId +
-        "}";
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/ProjectWorker.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/ProjectWorker.java
deleted file mode 100644
index 10b23c4..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/ProjectWorker.java
+++ /dev/null
@@ -1,104 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import java.io.Serializable;
-
-/**
- * <p>
- * 
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@ApiModel("ProjectWorker")
-@TableName("br_project_worker")
-@Data
-@NoArgsConstructor
-@AllArgsConstructor
-public class ProjectWorker implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 作业现场ID
-     */
-    @TableField("PROJECT_ID")
-    private Long projectId;
-
-    /**
-     * 人员ID
-     */
-    @ApiModelProperty("人员ID")
-    @TableField("WORKER_ID")
-    private Long workerId;
-
-    /**
-     * 安全帽编号
-     */
-    @ApiModelProperty("安全帽编号")
-    @TableField("HAT_CODE")
-    private String hatCode;
-
-    /**
-     * 背心编号
-     */
-    @ApiModelProperty("背心编号")
-    @TableField("VAST_CODE")
-    private String vastCode;
-
-    /**
-     * 手环编号
-     */
-    @ApiModelProperty("手环编号")
-    @TableField("BRACELET_CODE")
-    private String braceletCode;
-
-    @ApiModelProperty("人员姓名（详情中展示，新增编辑不用传）")
-    @TableField(exist = false)
-    private String workerName;
-
-    @ApiModelProperty("人员部门ID（详情中展示，新增编辑不用传）")
-    @TableField(exist = false)
-    private String workerDeptId;
-
-    @ApiModelProperty("人员部门名称（详情中展示，新增编辑不用传）")
-    @TableField(exist = false)
-    private String workerDeptName;
-
-    @ApiModelProperty("人员联系方式（详情中展示，新增编辑不用传）")
-    @TableField(exist = false)
-    private String workerPhoneNumber;
-
-    public ProjectWorker(Long projectId, Long workerId) {
-        this.projectId = projectId;
-        this.workerId = workerId;
-    }
-
-    @Override
-    public String toString() {
-        return "ProjectWorker{" +
-            "id=" + id +
-            ", projectId=" + projectId +
-            ", workerId=" + workerId +
-            ", hatCode=" + hatCode +
-            ", vastCode=" + vastCode +
-            ", braceletCode=" + braceletCode +
-        "}";
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/WorkSiteInfo.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/WorkSiteInfo.java
deleted file mode 100644
index fa6f41d..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/WorkSiteInfo.java
+++ /dev/null
@@ -1,130 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.alibaba.fastjson.annotation.JSONField;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.time.LocalDateTime;
-import java.util.Date;
-
-/**
- * <p>
- * 作业现场表
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@ApiModel("WorkSiteInfo")
-@TableName("br_work_site_info")
-@Data
-public class WorkSiteInfo implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @ApiModelProperty("作业现场ID")
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 作业名称
-     */
-    @ApiModelProperty("作业名称")
-    @TableField("WORK_TITLE")
-    private String workTitle;
-
-    /**
-     * 责任人
-     */
-    @ApiModelProperty("责任人（人员ID）")
-    @TableField("WORK_PERSON")
-    private Long workPerson;
-
-    /**
-     * 作业描述
-     */
-    @ApiModelProperty("作业描述")
-    @TableField("WORK_SITE_DESC")
-    private String workSiteDesc;
-
-    /**
-     * 作业状态
-     */
-    @ApiModelProperty("作业状态")
-    @TableField("PROJECT_STATE")
-    private String projectState;
-
-    /**
-     * 所属道路
-     */
-    @ApiModelProperty("所属道路")
-    @TableField("WORK_ROAD")
-    private String workRoad;
-
-    @TableField("IMAGE_URL")
-    private String imageUrl;
-
-    @TableField("CREATE_TIME")
-    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
-    private Date createTime;
-    @TableField("UPDATE_TIME")
-    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
-    private Date updateTime;
-
-    @ApiModelProperty("开始时间")
-    @TableField("START_TIME")
-    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
-    private Date startTime;
-
-    @ApiModelProperty("结束时间")
-    @TableField("FINISH_TIME")
-    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
-    private Date finishTime;
-
-    @ApiModelProperty("负责人姓名（详情中使用，新增编辑不用传）")
-    @TableField(exist = false)
-    private String workPersonName;
-
-    @ApiModelProperty("负责人联系方式（详情中使用，新增编辑不用传）")
-    @TableField(exist = false)
-    private String workPersonPhoneNumber;
-
-    @ApiModelProperty("负责人所属部门ID（详情中使用，新增编辑不用传）")
-    @TableField(exist = false)
-    private Long workPersonDeptId;
-
-    @ApiModelProperty("负责人所属部门名称（详情中使用，新增编辑不用传）")
-    @TableField(exist = false)
-    private String workPersonDeptName;
-
-    @ApiModelProperty(value = "注册时间",dataType = "String")
-    @TableField(exist = false)
-    private String registerTime;
-
-    @ApiModelProperty("作业状态名称")
-    @TableField(exist = false)
-    private String projectStateName;
-
-    @Override
-    public String toString() {
-        return "WorkSiteInfo{" +
-            "id=" + id +
-            ", workTitle=" + workTitle +
-            ", workPerson=" + workPerson +
-            ", workSiteDesc=" + workSiteDesc +
-            ", projectState=" + projectState +
-            ", imageUrl=" + imageUrl +
-            ", updateTime=" + updateTime +
-            ", workRoad=" + workRoad +
-        "}";
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Worker.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Worker.java
deleted file mode 100644
index 28a4daa..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Worker.java
+++ /dev/null
@@ -1,147 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.time.LocalDateTime;
-import java.util.Date;
-
-/**
- * <p>
- * 
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@ApiModel("Worker")
-@TableName("br_worker")
-@Data
-public class Worker implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @ApiModelProperty(value = "人员ID")
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 姓名
-     */
-    @ApiModelProperty(value = "姓名")
-    @TableField("WORKER_NAME")
-    private String workerName;
-
-    /**
-     * 性别
-     */
-    @ApiModelProperty(value = "性别")
-    @TableField("GENDER")
-    private String gender;
-
-    /**
-     * 所属部门
-     */
-    @ApiModelProperty(value = "所属部门(人员管理)")
-    @TableField("DEPT_ID")
-    private Long deptId;
-
-    /**
-     * 所属单位
-     */
-    @ApiModelProperty(value = "所属单位(入场申请中使用)")
-    @TableField("OWNER_SHIP")
-    private String ownerShip;
-
-    /**
-     * 联系方式
-     */
-    @ApiModelProperty(value = "联系方式")
-    @TableField("PHONE_NUMBER")
-    private String phoneNumber;
-
-    /**
-     * 证件号
-     */
-    @ApiModelProperty(value = "证件号")
-    @TableField("ID_CARD_NUMBER")
-    private String idCardNumber;
-
-    /**
-     * 入场原因
-     */
-    @ApiModelProperty(value = "入场原因（入场申请中使用）")
-    @TableField("ENTER_REASON")
-    private String enterReason;
-
-    /**
-     * 入场人脸照片
-     */
-    @ApiModelProperty(value = "人脸照片（照片路径）")
-    @TableField("WORKER_AVATAR")
-    private String workerAvatar;
-
-    /**
-     * 申请入场时间
-     */
-    @ApiModelProperty(value = "注册时间/申请入场时间")
-    @TableField("CREATE_TIME")
-    private Date createTime;
-
-    /**
-     * 人员类型
-     */
-    @ApiModelProperty(value = "人员类型（区分人员管理和入场申请）")
-    @TableField("WORKER_TYPE")
-    private String workerType;
-
-    @ApiModelProperty(value = "性别名称")
-    @TableField(exist = false)
-    private String genderName;
-
-    @ApiModelProperty(value = "部门名称")
-    @TableField(exist = false)
-    private String deptName;
-
-    @ApiModelProperty(value = "注册时间",dataType = "String")
-    @TableField(exist = false)
-    private String registerTime;
-
-    @ApiModelProperty(value = "当前状态")
-    @TableField(exist = false)
-    private String status;
-
-    @ApiModelProperty(value = "当前状态名称")
-    @TableField(exist = false)
-    private String statusName;
-
-    @ApiModelProperty(value = "是否注册(0未注册；1已注册)",allowableValues = "0,1")
-    @TableField(exist = false)
-    private String isRegister;
-
-    @Override
-    public String toString() {
-        return "Worker{" +
-            "id=" + id +
-            ", workerName=" + workerName +
-            ", gender=" + gender +
-            ", deptId=" + deptId +
-            ", ownerShip=" + ownerShip +
-            ", phoneNumber=" + phoneNumber +
-            ", idCardNumber=" + idCardNumber +
-            ", enterReason=" + enterReason +
-            ", workerAvatar=" + workerAvatar +
-            ", createTime=" + createTime +
-            ", workerType=" + workerType +
-        "}";
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/AlarmMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/AlarmMapper.java
new file mode 100644
index 0000000..ea4c8be
--- /dev/null
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/AlarmMapper.java
@@ -0,0 +1,16 @@
+package com.casic.missiles.modular.system.mapper;
+
+import com.casic.missiles.modular.system.entity.Alarm;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 报警记录表 Mapper 接口
+ * </p>
+ *
+ * @author zyj
+ * @since 2023-05-25
+ */
+public interface AlarmMapper extends BaseMapper<Alarm> {
+
+}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/BusAlarmMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/BusAlarmMapper.java
deleted file mode 100644
index 9801742..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/BusAlarmMapper.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package com.casic.missiles.modular.system.mapper;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.modular.system.dto.AlarmTypeCountDTO;
-import com.casic.missiles.modular.system.entity.BusAlarm;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * <p>
- * 报警记录表 Mapper 接口
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface BusAlarmMapper extends BaseMapper<BusAlarm> {
-
-    Page<BusAlarm> listPage(Page<BusAlarm> page,@Param("ew")  QueryWrapper<BusAlarm> queryWrapper);
-
-    void cancelAlarm(@Param("deviceId")Long deviceId,@Param("alarmType") String alarmType);
-
-    List<AlarmTypeCountDTO> alarmCount(@Param("projectId")Long projectId, @Param("alarmStatus")String alarmStatus);
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/BusEventImageMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/BusEventImageMapper.java
deleted file mode 100644
index 9590b7d..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/BusEventImageMapper.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.casic.missiles.modular.system.mapper;
-
-import com.casic.missiles.modular.system.entity.BusEventImage;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * <p>
- * 事件图片表 Mapper 接口
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface BusEventImageMapper extends BaseMapper<BusEventImage> {
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/BusEventMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/BusEventMapper.java
deleted file mode 100644
index 3c85edf..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/BusEventMapper.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.casic.missiles.modular.system.mapper;
-
-import com.casic.missiles.modular.system.entity.BusEvent;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * <p>
- * 事件表 Mapper 接口
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface BusEventMapper extends BaseMapper<BusEvent> {
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/DeviceExtMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/DeviceExtMapper.java
deleted file mode 100644
index 4ca9212..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/DeviceExtMapper.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.casic.missiles.modular.system.mapper;
-
-import com.casic.missiles.modular.system.entity.DeviceExt;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * <p>
- * 设备扩展信息表（安全树） Mapper 接口
- * </p>
- *
- * @author zyj
- * @since 2023-04-27
- */
-public interface DeviceExtMapper extends BaseMapper<DeviceExt> {
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/DeviceMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/DeviceMapper.java
index 444c0c5..3d0bb02 100644
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/DeviceMapper.java
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/DeviceMapper.java
@@ -1,30 +1,16 @@
 package com.casic.missiles.modular.system.mapper;
 
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.modular.system.dto.DeviceDetailDTO;
-import com.casic.missiles.modular.system.dto.HelmetInfoDTO;
 import com.casic.missiles.modular.system.entity.Device;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
 
 /**
  * <p>
- *  Mapper 接口
+ * 设备记录表 Mapper 接口
  * </p>
  *
  * @author zyj
- * @since 2023-04-14
+ * @since 2023-05-25
  */
-@Mapper
 public interface DeviceMapper extends BaseMapper<Device> {
 
-    Page<DeviceDetailDTO> listDetailPage(Page<DeviceDetailDTO> page,@Param("ew") QueryWrapper<DeviceDetailDTO> ew);
-
-     List<Long> selectProjectDevice(@Param("projectId") Long projectId);
-
-    List<HelmetInfoDTO> selectHelmetList(@Param("deviceType")String deviceType);
 }
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/ProjectDeviceMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/ProjectDeviceMapper.java
deleted file mode 100644
index 1d0c14e..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/ProjectDeviceMapper.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package com.casic.missiles.modular.system.mapper;
-
-import com.casic.missiles.modular.system.dto.DeviceLocationDTO;
-import com.casic.missiles.modular.system.entity.ProjectDevice;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * <p>
- *  Mapper 接口
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface ProjectDeviceMapper extends BaseMapper<ProjectDevice> {
-     List<ProjectDevice> selectDetailByProjectId(@Param("projectId") Long projectId);
-
-     List<DeviceLocationDTO> selectDeviceLocationList(@Param("projectId") Long projectId);
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/ProjectWorkerMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/ProjectWorkerMapper.java
deleted file mode 100644
index 58583d1..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/ProjectWorkerMapper.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package com.casic.missiles.modular.system.mapper;
-
-import com.casic.missiles.modular.system.dto.WorkerLocationDTO;
-import com.casic.missiles.modular.system.entity.ProjectWorker;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * <p>
- *  Mapper 接口
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface ProjectWorkerMapper extends BaseMapper<ProjectWorker> {
-
-    List<ProjectWorker> selectDetailByProjectId(@Param("projectId") Long projectId,
-                                                @Param("workerType")String workerType);
-
-    List<WorkerLocationDTO> selectWorkerLocationList(@Param("projectId") Long projectId,
-                                                     @Param("workerType")String workerType);
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/WorkSiteInfoMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/WorkSiteInfoMapper.java
deleted file mode 100644
index a4934d2..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/WorkSiteInfoMapper.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.casic.missiles.modular.system.mapper;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.modular.system.entity.WorkSiteInfo;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Param;
-
-/**
- * <p>
- * 作业现场表 Mapper 接口
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface WorkSiteInfoMapper extends BaseMapper<WorkSiteInfo> {
-
-    Page<WorkSiteInfo> selectListPage(Page<WorkSiteInfo> page,@Param("ew") QueryWrapper<WorkSiteInfo> ew);
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/WorkerMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/WorkerMapper.java
deleted file mode 100644
index 258fb12..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/WorkerMapper.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package com.casic.missiles.modular.system.mapper;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.modular.system.dto.DeviceDetailDTO;
-import com.casic.missiles.modular.system.entity.Worker;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * <p>
- *  Mapper 接口
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface WorkerMapper extends BaseMapper<Worker> {
-
-
-    Page<Worker> selectListPage(Page<Worker> page, @Param("ew") QueryWrapper<Worker> ew);
-
-    List<String> selectWorkerAvatars(@Param("projectId")Long projectId);
-
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/AlarmMapper.xml b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/AlarmMapper.xml
new file mode 100644
index 0000000..25cb4ab
--- /dev/null
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/AlarmMapper.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.modular.system.mapper.AlarmMapper">
+
+</mapper>
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/BusAlarmMapper.xml b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/BusAlarmMapper.xml
deleted file mode 100644
index 595088a..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/BusAlarmMapper.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.casic.missiles.modular.system.mapper.BusAlarmMapper">
-
-    <select id="listPage" resultType="com.casic.missiles.modular.system.entity.BusAlarm">
-        SELECT
-            alarm.ID as id,
-            alarm.DEVICE_ID as deviceId,
-            alarm.PROJECT_ID as projectId,
-            alarm.ALARM_TYPE as alarmType,
-            alarm.ALARM_VALUE as alarmValue,
-            alarm.ALARM_STATUS as alarmStatus,
-            alarm.ALARM_IMAGE AS alarmImage,
-            alarm.ALARM_CONTENT as alarmContent,
-            alarm.ALARM_TIME as alarmTime,
-            alarm.CANCEL_TIME as cancelTime,
-            alarm.ALARM_LNG as alarmLng,
-            alarm.ALARM_LAT as alarmLat,
-            p.WORK_TITLE as workTitle,
-            p.WORK_ROAD as workRoad,
-            p.PROJECT_STATE as projectState,
-            w.WORKER_NAME as workPersonName,
-            w.PHONE_NUMBER as workPersonPhoneNumber
-        FROM
-            `br_bus_alarm` alarm
-                LEFT JOIN br_work_site_info p on alarm.PROJECT_ID = p.ID
-                LEFT JOIN br_worker w on p.WORK_PERSON = w.ID
-        <where>
-            <if test="ew != null">
-                ${ew.sqlSegment}
-            </if>
-        </where>
-    </select>
-
-    <select id="cancelAlarm">
-        update br_bus_alarm
-        set ALARM_STATUS = '1'
-        where DEVICE_ID = #{deviceId}
-          and ALARM_TYPE = #{alarmType}
-          and ALARM_STATUS = '0'
-    </select>
-
-    <select id="alarmCount" resultType="com.casic.missiles.modular.system.dto.AlarmTypeCountDTO">
-        SELECT
-            ALARM_TYPE as alarmType,
-            count(*) as alarmCount
-        from br_bus_alarm
-        <where>
-            <if test="projectId != null and projectId !=''">
-                and PROJECT_ID = #{projectId}
-            </if>
-            <if test="alarmStatus != null and alarmStatus !=''">
-                and ALARM_STATUS = #{alarmStatus}
-            </if>
-        </where>
-        group by ALARM_TYPE
-    </select>
-</mapper>
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/BusEventImageMapper.xml b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/BusEventImageMapper.xml
deleted file mode 100644
index fbc3db3..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/BusEventImageMapper.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.casic.missiles.modular.system.mapper.BusEventImageMapper">
-
-</mapper>
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/BusEventMapper.xml b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/BusEventMapper.xml
deleted file mode 100644
index 627d573..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/BusEventMapper.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.casic.missiles.modular.system.mapper.BusEventMapper">
-
-</mapper>
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/DeviceExtMapper.xml b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/DeviceExtMapper.xml
deleted file mode 100644
index 5321d1c..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/DeviceExtMapper.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.casic.missiles.modular.system.mapper.DeviceExtMapper">
-
-</mapper>
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/DeviceMapper.xml b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/DeviceMapper.xml
index 94262e1..88e7d01 100644
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/DeviceMapper.xml
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/DeviceMapper.xml
@@ -2,96 +2,4 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.casic.missiles.modular.system.mapper.DeviceMapper">
 
-    <select id="listDetailPage" resultType="com.casic.missiles.modular.system.dto.DeviceDetailDTO">
-        select
-        br_device.ID as id,
-        DEVICE_CODE as deviceCode,
-        DEVICE_TYPE as deviceType,
-        DEVICE_BATCH as deviceBatch,
-        MANUFACTURER as manufacturer,
-        IS_POWER_SUPPLY as isPowerSupply,
-        CREATE_TIME as createTime,
-        CAMERA_CODE as cameraCode,
-        CAMERA_IP as cameraIp,
-        CAMERA_PORT as cameraPort,
-        GAS_CODE as gasCode,
-        GAS_IP as gasIp,
-        GAS_PORT as gasPort,
-        HAT_LINING_CODE as hatLiningCode
-        from br_device
-        left join br_device_ext ext on ext.DEVICE_ID = br_device.ID
-        <where>
-            <if test="ew != null">
-                ${ew.sqlSegment}
-            </if>
-        </where>
-    </select>
-
-    <select id="selectProjectDevice" resultType="java.lang.Long">
-        with device_info as (
-            (SELECT
-            d.DEVICE_ID as DEVICE_ID,
-            d.PROJECT_ID as PROJECT_ID,
-            p.PROJECT_STATE as PROJECT_STATE
-            from br_project_device d
-            LEFT JOIN br_work_site_info p on p.ID = d.PROJECT_ID)
-
-            UNION ALL
-
-            (SELECT
-            d1.ID as DEVICE_ID,
-            w1.ID as PROJECT_ID,
-            w1.PROJECT_STATE as PROJECT_STATE
-            FROM br_project_worker pw1
-            LEFT JOIN br_device d1 on pw1.BRACELET_CODE = d1.DEVICE_CODE
-            LEFT JOIN br_work_site_info w1 on pw1.PROJECT_ID = w1.ID)
-
-            UNION ALL
-
-            (SELECT
-            d1.ID as DEVICE_ID,
-            w1.ID as PROJECT_ID,
-            w1.PROJECT_STATE as PROJECT_STATE
-            FROM br_project_worker pw1
-            LEFT JOIN br_device d1 on pw1.HAT_CODE = d1.DEVICE_CODE
-            LEFT JOIN br_work_site_info w1 on pw1.PROJECT_ID = w1.ID)
-
-
-            UNION ALL
-
-            (SELECT
-            d1.ID as DEVICE_ID,
-            w1.ID as PROJECT_ID,
-            w1.PROJECT_STATE as PROJECT_STATE
-            FROM br_project_worker pw1
-            LEFT JOIN br_device d1 on pw1.VAST_CODE = d1.DEVICE_CODE
-            LEFT JOIN br_work_site_info w1 on pw1.PROJECT_ID = w1.ID))
-
-        select DISTINCT DEVICE_ID from device_info
-        <where>
-            DEVICE_ID is not null
-            <choose>
-                <when test="projectId != null and projectId !=''">
-                    and PROJECT_ID = #{projectId}
-                </when>
-                <otherwise>
-                    AND PROJECT_STATE != '3'
-                </otherwise>
-            </choose>
-        </where>
-    </select>
-
-    <select id="selectHelmetList" resultType="com.casic.missiles.modular.system.dto.HelmetInfoDTO">
-        SELECT
-            a.ID AS deviceId,
-            a.DEVICE_CODE AS hatCode,
-            b.HAT_LINING_CODE AS hatLiningCode
-        FROM
-            br_device a
-                LEFT JOIN br_device_ext b ON a.ID = b.DEVICE_ID
-        WHERE
-            a.DEVICE_TYPE = #{deviceType}
-          AND a.DEVICE_CODE IS NOT NULL
-          AND b.HAT_LINING_CODE IS NOT NULL
-    </select>
 </mapper>
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/ProjectDeviceMapper.xml b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/ProjectDeviceMapper.xml
deleted file mode 100644
index c6d1c24..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/ProjectDeviceMapper.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.casic.missiles.modular.system.mapper.ProjectDeviceMapper">
-
-    <select id="selectDetailByProjectId" resultType="com.casic.missiles.modular.system.entity.ProjectDevice">
-        SELECT
-            pd.ID as id,
-            pd.PROJECT_ID as projectId,
-            pd.DEVICE_ID as deviceId,
-            d.DEVICE_CODE as deviceCode
-        from br_project_device pd
-        LEFT JOIN br_device d on pd.DEVICE_ID = d.ID
-        <where>
-            pd.PROJECT_ID = #{projectId}
-        </where>
-    </select>
-
-    <select id="selectDeviceLocationList" resultType="com.casic.missiles.modular.system.dto.DeviceLocationDTO">
-        SELECT
-        d.ID as deviceId,
-        d.DEVICE_TYPE as deviceType,
-        d.DEVICE_CODE as deviceCode,
-        if(EXISTS(select ID from br_bus_alarm WHERE DEVICE_ID = d.ID and ALARM_STATUS = '0'),true,false) as alarmFlag
-        FROM br_project_device pd, br_device d
-        where pd.DEVICE_ID = d.ID
-        and pd.PROJECT_ID = #{projectId}
-    </select>
-
-</mapper>
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/ProjectWorkerMapper.xml b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/ProjectWorkerMapper.xml
deleted file mode 100644
index 8d2de10..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/ProjectWorkerMapper.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.casic.missiles.modular.system.mapper.ProjectWorkerMapper">
-
-    <select id="selectDetailByProjectId" resultType="com.casic.missiles.modular.system.entity.ProjectWorker">
-        SELECT
-            pw.ID as id,
-            pw.PROJECT_ID as projectId,
-            pw.WORKER_ID as workerId,
-            w.WORKER_NAME as workerName,
-            w.DEPT_ID as workerDeptId,
-            pw.HAT_CODE as hatCode,
-            pw.VAST_CODE as vastCode,
-            pw.BRACELET_CODE as braceletCode,
-            w.PHONE_NUMBER as workerPhoneNumber
-        from br_project_worker pw
-        LEFT JOIN br_worker w on pw.WORKER_ID = w.ID
-        <where>
-            pw.PROJECT_ID = #{projectId}
-            <if test="workerType != null and workerType != ''">
-                and w.WORKER_TYPE = #{workerType}
-            </if>
-        </where>
-    </select>
-
-    <select id="selectWorkerLocationList" resultType="com.casic.missiles.modular.system.dto.WorkerLocationDTO">
-        select
-            w.ID as workerId,
-            w.WORKER_NAME as workerName,
-            pw.HAT_CODE as hatCode,
-            hd.ID as hatId,
-            pw.BRACELET_CODE as braceletCode,
-            pw.VAST_CODE as vastCode
-        from br_project_worker pw,br_worker w ,br_device hd
-        WHERE pw.WORKER_ID = w.ID
-          and pw.HAT_CODE = hd.DEVICE_CODE
-          and pw.PROJECT_ID = #{projectId}
-          and w.WORKER_TYPE = #{workerType}
-    </select>
-</mapper>
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/WorkSiteInfoMapper.xml b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/WorkSiteInfoMapper.xml
deleted file mode 100644
index 8f01326..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/WorkSiteInfoMapper.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.casic.missiles.modular.system.mapper.WorkSiteInfoMapper">
-
-    <select id="selectListPage" resultType="com.casic.missiles.modular.system.entity.WorkSiteInfo">
-        SELECT
-            br_work_site_info.ID AS id,
-            WORK_TITLE as workTitle,
-            WORK_ROAD as workRoad,
-            WORK_SITE_DESC as workSiteDesc,
-            WORK_PERSON as workPerson,
-            WORKER_NAME as workPersonName,
-            DEPT_ID as workPersonDeptId,
-            PHONE_NUMBER as workPersonPhoneNumber,
-            PROJECT_STATE as projectState,
-            br_work_site_info.CREATE_TIME AS createTime,
-            br_work_site_info.UPDATE_TIME AS updateTime
-        FROM br_work_site_info
-        LEFT JOIN br_worker w ON br_work_site_info.WORK_PERSON = w.ID
-        <where>
-            <if test="ew != null">
-                ${ew.sqlSegment}
-            </if>
-        </where>
-    </select>
-</mapper>
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/WorkerMapper.xml b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/WorkerMapper.xml
deleted file mode 100644
index 3e28b39..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/WorkerMapper.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.casic.missiles.modular.system.mapper.WorkerMapper">
-
-    <select id="selectListPage" resultType="com.casic.missiles.modular.system.entity.Worker">
-        WITH worker_project AS (
-            SELECT
-                w.id AS ID,
-                WORKER_NAME,
-                GENDER,
-                DEPT_ID,
-                OWNER_SHIP,
-                PHONE_NUMBER,
-                ID_CARD_NUMBER,
-                ENTER_REASON,
-                WORKER_AVATAR,
-                w.CREATE_TIME,
-                WORKER_TYPE,
-                IF( p.PROJECT_STATE != '3', 1, 0 ) AS `STATUS`
-            FROM br_worker w
-            LEFT JOIN br_project_worker pw ON w.ID = pw.WORKER_ID
-            LEFT JOIN br_work_site_info p ON pw.PROJECT_ID = p.ID
-        )
-
-        SELECT
-            ID AS id,
-            WORKER_NAME AS workerName,
-            GENDER AS gender,
-            DEPT_ID AS deptId,
-            OWNER_SHIP AS ownerShip,
-            PHONE_NUMBER AS phoneNumber,
-            ID_CARD_NUMBER AS idCardNumber,
-            ENTER_REASON AS enterReason,
-            WORKER_AVATAR AS workerAvatar,
-            CREATE_TIME AS createTime,
-            WORKER_TYPE AS workerType,
-            `STATUS` AS `status`
-        FROM worker_project
-        <where>
-            <if test="ew != null">
-                ${ew.sqlSegment}
-            </if>
-        </where>
-    </select>
-
-    <select id="selectWorkerAvatars" resultType="java.lang.String">
-        SELECT
-            WORKER_AVATAR
-        FROM
-            `br_worker`
-        WHERE
-        ID IN ( SELECT WORKER_ID FROM br_project_worker WHERE PROJECT_ID = #{projectId} )
-          AND WORKER_AVATAR IS NOT NULL
-          AND WORKER_AVATAR != ''
-    </select>
-</mapper>
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IAlarmService.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IAlarmService.java
new file mode 100644
index 0000000..8bc01f4
--- /dev/null
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IAlarmService.java
@@ -0,0 +1,16 @@
+package com.casic.missiles.modular.system.service;
+
+import com.casic.missiles.modular.system.entity.Alarm;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 报警记录表 服务类
+ * </p>
+ *
+ * @author zyj
+ * @since 2023-05-25
+ */
+public interface IAlarmService extends IService<Alarm> {
+
+}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IBusAlarmService.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IBusAlarmService.java
deleted file mode 100644
index f63c19c..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IBusAlarmService.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package com.casic.missiles.modular.system.service;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.modular.system.dto.AlarmTypeCountDTO;
-import com.casic.missiles.modular.system.dto.AlarmUpload;
-import com.casic.missiles.modular.system.entity.BusAlarm;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-import java.util.List;
-
-/**
- * <p>
- * 报警记录表 服务类
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface IBusAlarmService extends IService<BusAlarm> {
-
-    boolean alarmUpload(AlarmUpload alarmUpload);
-
-    Page<BusAlarm> listPage(Page<BusAlarm> page,QueryWrapper<BusAlarm> queryWrapper);
-
-    List<AlarmTypeCountDTO> alarmCount(Long projectId,String alarmStatus);
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IBusEventImageService.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IBusEventImageService.java
deleted file mode 100644
index b1187ed..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IBusEventImageService.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.casic.missiles.modular.system.service;
-
-import com.casic.missiles.modular.system.entity.BusEventImage;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-import java.util.List;
-
-/**
- * <p>
- * 事件图片表 服务类
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface IBusEventImageService extends IService<BusEventImage> {
-
-    boolean saveBusEventImages(Long eventId, List<BusEventImage> imageList);
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IBusEventService.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IBusEventService.java
deleted file mode 100644
index 85c48d0..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IBusEventService.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package com.casic.missiles.modular.system.service;
-
-import com.casic.missiles.modular.system.entity.BusEvent;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-/**
- * <p>
- * 事件表 服务类
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface IBusEventService extends IService<BusEvent> {
-
-    boolean saveBusEvent(BusEvent busEvent);
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IDeviceExtService.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IDeviceExtService.java
deleted file mode 100644
index 6fc5361..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IDeviceExtService.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package com.casic.missiles.modular.system.service;
-
-import com.casic.missiles.modular.system.dto.DeviceDetailDTO;
-import com.casic.missiles.modular.system.entity.DeviceExt;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-import java.util.List;
-
-/**
- * <p>
- * 设备扩展信息表（安全树） 服务类
- * </p>
- *
- * @author zyj
- * @since 2023-04-27
- */
-public interface IDeviceExtService extends IService<DeviceExt> {
-
-    boolean saveDeviceExt(DeviceDetailDTO deviceDetailDTO);
-
-    boolean updateDeviceExt(DeviceDetailDTO deviceDetailDTO);
-
-    boolean removeByDeviceIds(List<Long> deviceIds);
-
-    boolean setGasThreshold(String gasIp,String gasPort,String threshold);
-
-    String getGasThreshold(String gasIp,String gasPort);
-
-    Long selectByGasIpPort(String gasIp,String gasPort);
-
-    Long selectByCameraIpPort(String cameraIp,String cameraPort);
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java
index 9e62756..00a421d 100644
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java
@@ -1,32 +1,16 @@
 package com.casic.missiles.modular.system.service;
 
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.modular.system.dto.DeviceDetailDTO;
-import com.casic.missiles.modular.system.dto.HelmetInfoDTO;
 import com.casic.missiles.modular.system.entity.Device;
 import com.baomidou.mybatisplus.extension.service.IService;
 
-import java.util.List;
-
 /**
  * <p>
- *  服务类
+ * 设备记录表 服务类
  * </p>
  *
  * @author zyj
- * @since 2023-04-14
+ * @since 2023-05-25
  */
 public interface IDeviceService extends IService<Device> {
 
-    boolean saveDevice(DeviceDetailDTO deviceDetailDTO);
-
-    boolean updateDevice(DeviceDetailDTO deviceDetailDTO);
-
-    boolean deleteDevices(List<Long> deviceIds);
-
-    Page<DeviceDetailDTO> listPage(Page<DeviceDetailDTO> page, QueryWrapper<DeviceDetailDTO> queryWrapper, String status,Long projectId);
-
-    List<Long> selectProjectDevice(Long projectId);
-
 }
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IProjectDeviceService.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IProjectDeviceService.java
deleted file mode 100644
index 8599411..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IProjectDeviceService.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package com.casic.missiles.modular.system.service;
-
-import com.casic.missiles.modular.system.dto.DeviceLocationDTO;
-import com.casic.missiles.modular.system.entity.ProjectDevice;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-import java.util.List;
-
-/**
- * <p>
- *  服务类
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface IProjectDeviceService extends IService<ProjectDevice> {
-
-    boolean saveProjectDeviceList(Long projectId, List<ProjectDevice> projectDeviceList);
-
-    boolean updateProjectDeviceList(Long projectId, List<ProjectDevice> projectDeviceList);
-
-    boolean deleteByProjectId(Long projectId);
-
-    boolean deleteByProjectIds(List<Long> projectIds);
-
-    List<ProjectDevice> selectDetailByProjectId(Long projectId);
-
-    Long selectProjectIdByDevice(Long deviceId);
-
-    List<DeviceLocationDTO> selectDeviceLocationList(Long projectId);
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IProjectWorkerService.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IProjectWorkerService.java
deleted file mode 100644
index e921bc3..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IProjectWorkerService.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package com.casic.missiles.modular.system.service;
-
-import com.casic.missiles.modular.system.dto.WorkerLocationDTO;
-import com.casic.missiles.modular.system.entity.ProjectDevice;
-import com.casic.missiles.modular.system.entity.ProjectWorker;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-import java.util.List;
-
-/**
- * <p>
- *  服务类
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface IProjectWorkerService extends IService<ProjectWorker> {
-
-    boolean saveProjectWorkerList(Long projectId, List<ProjectWorker> projectWorkerList);
-
-    boolean updateProjectWorkerList(Long projectId, List<ProjectWorker> projectWorkerList);
-
-    boolean deleteByProjectId(Long projectId);
-
-    boolean deleteByProjectIds(List<Long> projectIds);
-
-    List<ProjectWorker> selectDetailByProjectId(Long projectId,String workerType);
-
-    List<WorkerLocationDTO> selectWorkerLocationDTO(Long projectId);
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IWorkSiteInfoService.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IWorkSiteInfoService.java
deleted file mode 100644
index 58a8590..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IWorkSiteInfoService.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package com.casic.missiles.modular.system.service;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.modular.system.dto.WorkSiteDetailDTO;
-import com.casic.missiles.modular.system.entity.WorkSiteInfo;
-import com.baomidou.mybatisplus.extension.service.IService;
-import java.util.List;
-/**
- * <p>
- * 作业现场表 服务类
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface IWorkSiteInfoService extends IService<WorkSiteInfo> {
-
-    boolean addWorkSiteInfo(WorkSiteDetailDTO workSiteDetailDTO);
-
-    boolean updateWorkSiteInfo(WorkSiteDetailDTO workSiteDetailDTO);
-
-    boolean deleteProjects(List<Long> projectIds);
-
-    WorkSiteDetailDTO getWorkSiteDetail(Long projectId);
-
-    Page<WorkSiteInfo> selectListPage(Page<WorkSiteInfo> page, QueryWrapper<WorkSiteInfo> queryWrapper);
-
-    boolean start(Long projectId);
-
-    boolean finish(Long projectId);
-
-}

diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/AlarmController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/AlarmController.java
new file mode 100644
index 0000000..1795cf1
--- /dev/null
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/AlarmController.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.modular.system.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.stereotype.Controller;
+
+/**
+ * <p>
+ * 报警记录表 前端控制器
+ * </p>
+ *
+ * @author zyj
+ * @since 2023-05-25
+ */
+@Controller
+@RequestMapping("/system/alarm")
+public class AlarmController {
+
+}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusAlarmController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusAlarmController.java
deleted file mode 100644
index 1f82ebb..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusAlarmController.java
+++ /dev/null
@@ -1,102 +0,0 @@
-package com.casic.missiles.modular.system.controller;
-
-
-import cn.hutool.core.util.ObjectUtil;
-import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.core.base.controller.BaseController;
-import com.casic.missiles.core.page.PageFactory;
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.AlarmUpload;
-import com.casic.missiles.modular.system.dto.DeviceDetailDTO;
-import com.casic.missiles.modular.system.entity.BusAlarm;
-import com.casic.missiles.modular.system.service.IBusAlarmService;
-import io.swagger.annotations.*;
-import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.*;
-
-import org.springframework.stereotype.Controller;
-
-import static com.casic.missiles.model.response.ResponseData.DEFAULT_SUCCESS_MESSAGE;
-import static com.casic.missiles.modular.system.consts.AlarmConst.ALARM_STATUS_MANUAL_CANCEL;
-
-/**
- * <p>
- * 报警记录表 前端控制器
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@Api(tags = "报警管理接口")
-@Controller
-@RequestMapping("/alarm")
-@RequiredArgsConstructor
-public class BusAlarmController extends BaseController {
-
-    private final IBusAlarmService alarmService;
-
-    @ApiOperation("报警上报接口")
-    @PostMapping("/upload")
-    @ResponseBody
-    public Object upload(@RequestBody AlarmUpload alarmUpload){
-        alarmService.alarmUpload(alarmUpload);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("报警列表分页查询")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "workTitle", value = "作业名称",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "projectId", value = "作业ID",dataType = "Long", paramType = "query",example = "0"),
-            @ApiImplicitParam(name = "alarmStatus", value = "报警状态",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "projectState", value = "作业状态",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "alarmType", value = "报警类型",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "alarmStartTime", value = "报警开始时间",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "alarmEndTime", value = "报警结束时间",dataType = "String", paramType = "query")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = BusAlarm.class),
-    })
-    @GetMapping("/listPage")
-    @ResponseBody
-    public Object listPage(String workTitle,Long projectId,String alarmStatus,String projectState,String alarmType,String alarmStartTime,String alarmEndTime){
-        Page<BusAlarm> page = PageFactory.defaultPage();
-        QueryWrapper<BusAlarm> queryWrapper = new QueryWrapper<>();
-        if(StrUtil.isNotEmpty(workTitle)){
-            queryWrapper.like("p.WORK_TITLE",workTitle);
-        }
-        if(ObjectUtil.isNotEmpty(projectId)){
-            queryWrapper.eq("alarm.PROJECT_ID",projectId);
-        }
-        if(StrUtil.isNotEmpty(alarmStatus)){
-            queryWrapper.eq("alarm.ALARM_STATUS",alarmStatus);
-        }
-        if(StrUtil.isNotEmpty(projectState)){
-            queryWrapper.eq("p.PROJECT_STATE",projectState);
-        }
-        if(StrUtil.isNotEmpty(alarmType)){
-            queryWrapper.eq("alarm.ALARM_TYPE",alarmType);
-        }
-        if(StrUtil.isNotEmpty(alarmStartTime)){
-            queryWrapper.ge("alarm.ALARM_TIME",alarmStartTime);
-        }
-        if(StrUtil.isNotEmpty(alarmEndTime)){
-            queryWrapper.le("alarm.ALARM_TIME",alarmEndTime);
-        }
-        page = alarmService.listPage(page,queryWrapper);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-    @ApiOperation("消警")
-    @PostMapping("/cancel")
-    @ResponseBody
-    public Object cancel(@RequestParam("alarmId") Long alarmId){
-        UpdateWrapper<BusAlarm> updateWrapper = new UpdateWrapper<>();
-        updateWrapper.eq("ID",alarmId);
-        updateWrapper.set("ALARM_STATUS",ALARM_STATUS_MANUAL_CANCEL);
-        alarmService.update(updateWrapper);
-        return ResponseData.success();
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusEventController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusEventController.java
deleted file mode 100644
index dde5aad..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusEventController.java
+++ /dev/null
@@ -1,41 +0,0 @@
-package com.casic.missiles.modular.system.controller;
-
-
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.entity.BusEvent;
-import com.casic.missiles.modular.system.service.IBusEventService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.ResponseBody;
-
-/**
- * <p>
- * 事件表 前端控制器
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@Controller
-@RequestMapping("/event")
-@Api(tags = "事件上报")
-@RequiredArgsConstructor
-public class BusEventController {
-
-    private final IBusEventService eventService;
-
-    @ApiOperation("事件上报")
-    @PostMapping("add")
-    @ResponseBody
-    public Object add(@RequestBody BusEvent busEvent){
-        eventService.saveBusEvent(busEvent);
-        return ResponseData.success();
-    }
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
index 03abc5f..aa50d78 100644
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
@@ -1,121 +1,20 @@
 package com.casic.missiles.modular.system.controller;
 
 
-import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.core.base.controller.BaseController;
-import com.casic.missiles.core.page.PageFactory;
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.DeviceDetailDTO;
-import com.casic.missiles.modular.system.entity.Device;
-import com.casic.missiles.modular.system.service.IDeviceExtService;
-import com.casic.missiles.modular.system.service.IDeviceService;
-import io.swagger.annotations.*;
-import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.RequestMapping;
 
 import org.springframework.stereotype.Controller;
 
-import java.time.LocalDateTime;
-import java.util.Date;
-import java.util.List;
-
-import static com.casic.missiles.model.response.ResponseData.DEFAULT_SUCCESS_MESSAGE;
-
 /**
  * <p>
- *  前端控制器
+ * 设备记录表 前端控制器
  * </p>
  *
  * @author zyj
- * @since 2023-04-14
+ * @since 2023-05-25
  */
-@Api(tags = "设备管理接口")
-@RequiredArgsConstructor
 @Controller
-@RequestMapping("/device")
-public class DeviceController extends BaseController {
-    private final IDeviceService deviceService;
-    private final IDeviceExtService deviceExtService;
-
-    @ApiOperation("设备分页列表")
-    @ApiImplicitParams({
-        @ApiImplicitParam(name = "deviceType", value = "设备类型",dataType = "String", paramType = "query"),
-        @ApiImplicitParam(name = "deviceCode", value = "设备编号",dataType = "String", paramType = "query"),
-        @ApiImplicitParam(name = "status", value = "设备状态",dataType = "String", paramType = "query"),
-        @ApiImplicitParam(name = "projectId", value = "作业ID（如果传此参数，列表中返回该作业使用的设备）",dataType = "Long", paramType = "query", example = "0")
-    })
-    @ApiResponses({
-        @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = DeviceDetailDTO.class),
-    })
-    @GetMapping("listPage")
-    @ResponseBody
-    public Object listPage(String deviceType, String deviceCode, String status,Long projectId){
-        Page<DeviceDetailDTO> page = PageFactory.defaultPage();
-        QueryWrapper<DeviceDetailDTO> queryWrapper = new QueryWrapper<>();
-        if(StrUtil.isNotEmpty(deviceType)){
-            queryWrapper.eq("DEVICE_TYPE",deviceType);
-        }
-        if(StrUtil.isNotEmpty(deviceCode)){
-            queryWrapper.like("DEVICE_CODE",deviceCode);
-        }
-        page = deviceService.listPage(page,queryWrapper,status,projectId);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-    @ApiOperation("新增设备")
-    @PostMapping("add")
-    @ResponseBody
-    public Object add(@RequestBody DeviceDetailDTO deviceDetailDTO){
-        deviceService.saveDevice(deviceDetailDTO);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("编辑设备")
-    @PostMapping("update")
-    @ResponseBody
-    public Object update(@RequestBody DeviceDetailDTO deviceDetailDTO){
-        deviceService.updateDevice(deviceDetailDTO);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("删除设备")
-    @PostMapping("delete")
-    @ResponseBody
-    public Object delete(@ApiParam("设备id列表")@RequestBody List<Long> deviceIds){
-        deviceService.deleteDevices(deviceIds);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("设置甲烷阈值")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "gasIp", value = "安全树甲烷设备IP",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "gasPort", value = "安全树甲烷端口",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "threshold", value = "甲烷阈值",dataType = "String", paramType = "query")
-    })
-    @PostMapping("setThreshold")
-    @ResponseBody
-    public Object setThreshold(String gasIp,String gasPort,String threshold){
-        deviceExtService.setGasThreshold(gasIp, gasPort, threshold);
-        return ResponseData.success();
-    }
-
-
-    @ApiOperation("查询甲烷阈值")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "gasIp", value = "安全树甲烷设备IP",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "gasPort", value = "安全树甲烷端口",dataType = "String", paramType = "query")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = "{\"code\": 200,\"data\": \"100\",\"message\": \"请求成功\",\"success\": true}",response = String.class),
-    })
-    @GetMapping("getThreshold")
-    @ResponseBody
-    public Object getThreshold(String gasIp,String gasPort){
-        String data = deviceExtService.getGasThreshold(gasIp, gasPort);
-        return ResponseData.success(data);
-    }
-
+@RequestMapping("/system/device")
+public class DeviceController {
 
 }
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/OverviewController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/OverviewController.java
deleted file mode 100644
index 7570504..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/OverviewController.java
+++ /dev/null
@@ -1,70 +0,0 @@
-package com.casic.missiles.modular.system.controller;
-
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.AlarmTypeCountDTO;
-import com.casic.missiles.modular.system.dto.DeviceLocationDTO;
-import com.casic.missiles.modular.system.dto.WorkerLocationDTO;
-import com.casic.missiles.modular.system.service.IBusAlarmService;
-import com.casic.missiles.modular.system.service.IProjectDeviceService;
-import com.casic.missiles.modular.system.service.IProjectWorkerService;
-import io.swagger.annotations.*;
-import lombok.RequiredArgsConstructor;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.ResponseBody;
-
-import static com.casic.missiles.model.response.ResponseData.DEFAULT_SUCCESS_MESSAGE;
-import static com.casic.missiles.modular.system.consts.AlarmConst.ALARM_STATUS_ON;
-
-@Api(tags = "首页看板接口")
-@Controller
-@RequestMapping("overview")
-@RequiredArgsConstructor
-public class OverviewController {
-
-    private final IBusAlarmService alarmService;
-    private final IProjectDeviceService projectDeviceService;
-
-    private final IProjectWorkerService projectWorkerService;
-
-
-    @ApiOperation("报警统计接口")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "projectId", value = "作业ID",dataType = "Long", paramType = "query", example = "0")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = AlarmTypeCountDTO.class),
-    })
-    @GetMapping("/alarmCount")
-    @ResponseBody
-    public Object alarmCount(Long projectId){
-        return ResponseData.success(alarmService.alarmCount(projectId,ALARM_STATUS_ON));
-    }
-
-    @ApiOperation("设备列表接口")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "projectId", value = "作业ID",dataType = "Long", paramType = "query", example = "0")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = DeviceLocationDTO.class),
-    })
-    @GetMapping("/deviceList")
-    @ResponseBody
-    public Object deviceList(Long projectId){
-        return ResponseData.success(projectDeviceService.selectDeviceLocationList(projectId));
-    }
-
-    @ApiOperation("人员列表接口")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "projectId", value = "作业ID",dataType = "Long", paramType = "query", example = "0")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = WorkerLocationDTO.class),
-    })
-    @GetMapping("/workerList")
-    @ResponseBody
-    public Object workerList(Long projectId){
-        return ResponseData.success(projectWorkerService.selectWorkerLocationDTO(projectId));
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/WorkSiteInfoController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/WorkSiteInfoController.java
deleted file mode 100644
index af36d69..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/WorkSiteInfoController.java
+++ /dev/null
@@ -1,130 +0,0 @@
-package com.casic.missiles.modular.system.controller;
-
-
-import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.core.base.controller.BaseController;
-import com.casic.missiles.core.page.PageFactory;
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.WorkSiteDetailDTO;
-import com.casic.missiles.modular.system.entity.WorkSiteInfo;
-import com.casic.missiles.modular.system.service.IWorkSiteInfoService;
-import io.swagger.annotations.*;
-import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.*;
-
-import org.springframework.stereotype.Controller;
-
-import java.util.List;
-
-import static com.casic.missiles.model.response.ResponseData.DEFAULT_SUCCESS_MESSAGE;
-
-/**
- * <p>
- * 作业现场表 前端控制器
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@Controller
-@RequestMapping("/site")
-@Api(tags = "作业现场管理")
-@RequiredArgsConstructor
-public class WorkSiteInfoController extends BaseController {
-
-
-    private final IWorkSiteInfoService workSiteInfoService;
-
-    @ApiOperation("新增作业现场")
-    @PostMapping("add")
-    @ResponseBody
-    public Object addWorkSite(@RequestBody WorkSiteDetailDTO workSiteDetailDTO){
-        workSiteInfoService.addWorkSiteInfo(workSiteDetailDTO);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("编辑作业现场")
-    @PostMapping("update")
-    @ResponseBody
-    public Object updateWorkSite(@RequestBody WorkSiteDetailDTO workSiteDetailDTO){
-        workSiteInfoService.updateWorkSiteInfo(workSiteDetailDTO);
-        return ResponseData.success();
-    }
-
-
-    @ApiOperation("删除作业现场")
-    @PostMapping("delete")
-    @ResponseBody
-    public Object delete(@ApiParam("作业现场id列表")@RequestBody List<Long> projectIds){
-        workSiteInfoService.deleteProjects(projectIds);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("查询作业现场详情")
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = WorkSiteDetailDTO.class),
-    })
-    @GetMapping("detail")
-    @ResponseBody
-    public Object delete(@ApiParam(value = "作业现场id", example = "0")@RequestParam Long projectId){
-        WorkSiteDetailDTO detailDTO = workSiteInfoService.getWorkSiteDetail(projectId);
-        return ResponseData.success(detailDTO);
-    }
-
-    @ApiOperation("分页列表查询")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "workTitle",value = "作业名称", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "workRoad",value = "所属道路", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "workPersonName",value = "责任人姓名", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "startDate",value = "注册开始日期", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "endDate",value = "注册结束日期", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "projectState",value = "当前状态（字典值）", dataType = "String", paramType = "query")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = WorkSiteInfo.class),
-    })
-    @GetMapping("listPage")
-    @ResponseBody
-    public Object listPage(String workTitle,String workRoad,String workPersonName,String projectState,String startDate,String endDate){
-        Page<WorkSiteInfo> page = PageFactory.defaultPage();
-        QueryWrapper<WorkSiteInfo> queryWrapper = new QueryWrapper<>();
-        if(StrUtil.isNotEmpty(workTitle)){
-            queryWrapper.like("WORK_TITLE",workTitle);
-        }
-        if(StrUtil.isNotEmpty(workRoad)){
-            queryWrapper.like("WORK_ROAD",workRoad);
-        }
-        if(StrUtil.isNotEmpty(workPersonName)){
-            queryWrapper.like("WORKER_NAME",workPersonName);
-        }
-        if(StrUtil.isNotEmpty(projectState)){
-            queryWrapper.eq("PROJECT_STATE",projectState);
-        }
-        if(StrUtil.isNotEmpty(startDate)){
-            queryWrapper.ge("br_work_site_info.CREATE_TIME",startDate + " 00:00:00");
-        }
-        if(StrUtil.isNotEmpty(endDate)){
-            queryWrapper.le("br_work_site_info.CREATE_TIME",endDate + " 23:59:59");
-        }
-        page = workSiteInfoService.selectListPage(page,queryWrapper);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-    @ApiOperation("开始作业")
-    @PostMapping("start")
-    @ResponseBody
-    public Object start(@ApiParam(value = "作业现场id",example = "0")@RequestParam Long projectId){
-        workSiteInfoService.start(projectId);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("完成作业")
-    @PostMapping("finish")
-    @ResponseBody
-    public Object finish(@ApiParam(value = "作业现场id", example = "0")@RequestParam Long projectId){
-        workSiteInfoService.finish(projectId);
-        return ResponseData.success();
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/WorkerController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/WorkerController.java
deleted file mode 100644
index 796f94c..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/WorkerController.java
+++ /dev/null
@@ -1,136 +0,0 @@
-package com.casic.missiles.modular.system.controller;
-
-
-import cn.hutool.core.util.ObjectUtil;
-import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.core.base.controller.BaseController;
-import com.casic.missiles.core.page.PageFactory;
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.DeviceDetailDTO;
-import com.casic.missiles.modular.system.entity.Device;
-import com.casic.missiles.modular.system.entity.Worker;
-import com.casic.missiles.modular.system.service.IWorkerService;
-import io.swagger.annotations.*;
-import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.*;
-
-import org.springframework.stereotype.Controller;
-
-import java.util.Date;
-import java.util.List;
-
-import static com.casic.missiles.model.response.ResponseData.DEFAULT_SUCCESS_MESSAGE;
-
-/**
- * <p>
- *  前端控制器
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@Controller
-@RequestMapping("/worker")
-@RequiredArgsConstructor
-@Api(tags = "人员管理接口")
-public class WorkerController extends BaseController {
-
-    private final IWorkerService workerService;
-
-    @ApiOperation("分页列表查询")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "name",value = "姓名", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "deptId",value = "所属部门", dataType = "Long", paramType = "query", example = "0"),
-            @ApiImplicitParam(name = "status",value = "当前状态（字典值）", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "startDate",value = "注册开始日期", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "endDate",value = "注册结束日期", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "workerType",value = "人员类型（字典值）", dataType = "String", paramType = "query")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = Worker.class),
-    })
-    @GetMapping("listPage")
-    @ResponseBody
-    public Object listPage(String name,Long deptId, String status,String startDate,String endDate,String workerType){
-        Page<Worker> page = PageFactory.defaultPage();
-        QueryWrapper<Worker> queryWrapper = new QueryWrapper<>();
-        if(StrUtil.isNotEmpty(name)){
-            queryWrapper.like("WORKER_NAME",name);
-        }
-        if(ObjectUtil.isNotEmpty(deptId)){
-            queryWrapper.eq("DEPT_ID",deptId);
-        }
-        if(StrUtil.isNotEmpty(workerType)){
-            queryWrapper.eq("WORKER_TYPE",workerType);
-        }
-        if(StrUtil.isNotEmpty(startDate)){
-            queryWrapper.ge("CREATE_TIME",startDate + " 00:00:00");
-        }
-        if(StrUtil.isNotEmpty(endDate)){
-            queryWrapper.le("CREATE_TIME",endDate + " 23:59:59");
-        }
-        if(StrUtil.isNotEmpty(status)){
-            queryWrapper.eq("`STATUS`",status);
-        }
-        page = workerService.selectListPage(page,queryWrapper);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-    @ApiOperation("新增人员")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "worker", value = "人员信息", dataType = "Worker", paramType = "body", required = true),
-            @ApiImplicitParam(name = "projectId", value = "项目ID(入场申请需要)", dataType = "Long", paramType = "query", example = "0")
-    })
-    @PostMapping("add")
-    @ResponseBody
-    public Object add(@ApiParam("worker")@RequestBody Worker worker,
-                      @RequestParam(required = false) Long projectId){
-        workerService.addWorker(worker,projectId);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("编辑人员")
-    @PostMapping("update")
-    @ResponseBody
-    public Object update(@RequestBody Worker worker){
-        workerService.updateById(worker);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("删除人员")
-    @PostMapping("delete")
-    @ResponseBody
-    public Object delete(@ApiParam("人员id列表")@RequestBody List<Long> workIds){
-        workerService.removeByIds(workIds);
-        return ResponseData.success();
-    }
-
-
-    @ApiOperation(value = "获取人脸图片",notes = "返回人脸图片url")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "cameraIp",value = "摄像头IP", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "cameraPort",value = "摄像头端口号", dataType = "String", paramType = "query"),
-    })
-    @GetMapping("/face/register")
-    @ResponseBody
-    public Object faceRegister(String cameraIp,String cameraPort){
-        return ResponseData.success(workerService.faceRegister(cameraIp, cameraPort));
-    }
-
-
-    @ApiOperation(value = "查询临时入场人员列表")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "projectId", value = "项目ID",required = true,dataType = "Long", paramType = "query", example = "0")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = Worker.class),
-    })
-    @GetMapping("/projectTempWorker")
-    @ResponseBody
-    public Object projectTempWorker(Long projectId){
-        return ResponseData.success(workerService.projectTempWorker(projectId));
-    }
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/AlarmTypeCountDTO.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/AlarmTypeCountDTO.java
deleted file mode 100644
index 1a165a1..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/AlarmTypeCountDTO.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.casic.missiles.modular.system.dto;
-
-import io.swagger.annotations.ApiModel;
-import lombok.Data;
-
-@ApiModel(value = "AlarmTypeCountDTO",description = "报警类型统计（首页）")
-@Data
-public class AlarmTypeCountDTO {
-
-    private String alarmType;
-    private String alarmTypeName;
-    private Integer alarmCount;
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/AlarmUpload.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/AlarmUpload.java
deleted file mode 100644
index 73d7799..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/AlarmUpload.java
+++ /dev/null
@@ -1,46 +0,0 @@
-package com.casic.missiles.modular.system.dto;
-
-import cn.hutool.core.util.StrUtil;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-@ApiModel(value = "AlarmUpload",description = "报警上传")
-@Data
-public class AlarmUpload {
-
-    @ApiModelProperty(value = "摄像头ip")
-    private String cameraIp;
-
-    @ApiModelProperty(value = "摄像头端口")
-    private String cameraPort;
-    @ApiModelProperty(value = "安全树甲烷设备ip")
-    private String gasIp;
-    @ApiModelProperty(value = "安全树甲烷设备端口")
-    private String gasPort;
-    @ApiModelProperty(value = "报警值")
-    private String alarmValue;
-    @ApiModelProperty(value = "报警时间")
-    private String alarmTime;
-    @ApiModelProperty(value = "报警类型")
-    private String alarmType;
-    @ApiModelProperty(value = "报警图片")
-    private String alarmImage;
-    @ApiModelProperty(value = "报警内容")
-    private String alarmContent;
-
-    @Override
-    public String toString() {
-        return "AlarmUpload{" +
-                "cameraIp='" + cameraIp + '\'' +
-                ", cameraPort='" + cameraPort + '\'' +
-                ", gasIp='" + gasIp + '\'' +
-                ", gasPort='" + gasPort + '\'' +
-                ", alarmValue='" + alarmValue + '\'' +
-                ", alarmTime='" + alarmTime + '\'' +
-                ", alarmType='" + alarmType + '\'' +
-                ", alarmImage='" + (StrUtil.isNotEmpty(alarmImage) ? alarmImage.substring(0,50) : "null") + '\'' +
-                ", alarmContent='" + alarmContent + '\'' +
-                '}';
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/DeviceDetailDTO.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/DeviceDetailDTO.java
deleted file mode 100644
index ea518d9..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/DeviceDetailDTO.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package com.casic.missiles.modular.system.dto;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.casic.missiles.modular.system.entity.Device;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-@ApiModel("DeviceDetailDTO")
-@Data
-public class DeviceDetailDTO extends Device {
-
-    @ApiModelProperty(value = "摄像头编号")
-    private String cameraCode;
-
-    @ApiModelProperty(value = "摄像头IP")
-    private String cameraIp;
-
-    @ApiModelProperty(value = "摄像头端口")
-    private String cameraPort;
-
-    @ApiModelProperty(value = "激甲编号")
-    private String gasCode;
-
-    @ApiModelProperty(value = "激甲IP")
-    private String gasIp;
-
-    @ApiModelProperty(value = "激甲端口")
-    private String gasPort;
-
-    @ApiModelProperty(value = "智能帽衬编号")
-    private String hatLiningCode;
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/WorkSiteDetailDTO.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/WorkSiteDetailDTO.java
deleted file mode 100644
index 29378ff..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/WorkSiteDetailDTO.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package com.casic.missiles.modular.system.dto;
-
-import com.casic.missiles.modular.system.entity.ProjectDevice;
-import com.casic.missiles.modular.system.entity.ProjectWorker;
-import com.casic.missiles.modular.system.entity.WorkSiteInfo;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.util.List;
-
-@Data
-@ApiModel("WorkSiteDetailDTO")
-public class WorkSiteDetailDTO extends WorkSiteInfo {
-
-    @ApiModelProperty(value = "安全树列表",dataType = "ProjectDevice")
-    private List<ProjectDevice> deviceList;
-
-    @ApiModelProperty(value = "人员列表",dataType = "ProjectWorker")
-    private List<ProjectWorker> workerList;
-
-
-
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/WorkerLocationDTO.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/WorkerLocationDTO.java
deleted file mode 100644
index 6fd7b24..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/WorkerLocationDTO.java
+++ /dev/null
@@ -1,68 +0,0 @@
-package com.casic.missiles.modular.system.dto;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-@ApiModel(value = "WorkerLocationDTO",description = "人员位置列表（首页）")
-@Data
-public class WorkerLocationDTO {
-
-    @ApiModelProperty("人员ID")
-    private Long workerId;
-
-    @ApiModelProperty("人员姓名")
-    private String workerName;
-
-    @ApiModelProperty("安全帽编号")
-    private String hatCode;
-
-    @ApiModelProperty("安全帽ID")
-    private Long hatId;
-
-    @ApiModelProperty("背心编号")
-    private String vastCode;
-
-    @ApiModelProperty("手环编号")
-    private String braceletCode;
-
-    @ApiModelProperty("位置")
-    private String location;
-
-    @ApiModelProperty("时间")
-    private String time;
-
-    @ApiModelProperty("经度")
-    private String lng;
-
-    @ApiModelProperty("纬度")
-    private String lat;
-
-    @ApiModelProperty("心率")
-    private String heartRate;
-
-    @ApiModelProperty("血氧")
-    private String bloodOxygen;
-
-    @ApiModelProperty("一氧化碳")
-    private String co;
-
-    @ApiModelProperty("甲烷")
-    private String gas;
-
-    @ApiModelProperty("硫化氢")
-    private String h2s;
-
-    @ApiModelProperty("氧气")
-    private String o2;
-
-    @ApiModelProperty("信号")
-    private String signal;
-
-    @ApiModelProperty("电量")
-    private String cell;
-
-    @ApiModelProperty("是否报警")
-    private boolean alarmFlag;
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Alarm.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Alarm.java
new file mode 100644
index 0000000..4d2b7ef
--- /dev/null
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Alarm.java
@@ -0,0 +1,103 @@
+package com.casic.missiles.modular.system.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import java.util.Date;
+
+/**
+ * <p>
+ * 报警记录表
+ * </p>
+ *
+ * @author zyj
+ * @since 2023-05-25
+ */
+@Data
+@TableName("bus_alarm")
+public class Alarm implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    @TableId(value = "ID",type = IdType.ASSIGN_ID)
+    private Long id;
+
+    /**
+     * 设备ID
+     */
+    @TableField("DEVICE_ID")
+    private Long deviceId;
+
+    /**
+     * 报警类型
+     */
+    @TableField("ALARM_TYPE")
+    private String alarmType;
+
+    /**
+     * 报警时间
+     */
+    @TableField("ALARM_TIME")
+    private Date alarmTime;
+
+    /**
+     * 报警状态
+     */
+    @TableField("ALARM_STATUS")
+    private String alarmStatus;
+
+    /**
+     * 报警位置
+     */
+    @TableField("ALARM_LOCATION")
+    private String alarmLocation;
+
+    /**
+     * 报警图片
+     */
+    @TableField("ALARM_IMAGE")
+    private String alarmImage;
+
+    /**
+     * 视频通道号
+     */
+    @TableField("CHANNEL_NO")
+    private Integer channelNo;
+
+    /**
+     * 报警内容
+     */
+    @TableField("ALARM_CONTENT")
+    private String alarmContent;
+
+    /**
+     * 消警时间
+     */
+    @TableField("CANCEL_TIME")
+    private Date cancelTime;
+
+
+    @Override
+    public String toString() {
+        return "Alarm{" +
+            "id=" + id +
+            ", deviceId=" + deviceId +
+            ", alarmType=" + alarmType +
+            ", alarmTime=" + alarmTime +
+            ", alarmStatus=" + alarmStatus +
+            ", alarmLocation=" + alarmLocation +
+            ", alarmImage=" + alarmImage +
+            ", channelNo=" + channelNo +
+            ", alarmContent=" + alarmContent +
+            ", cancelTime=" + cancelTime +
+        "}";
+    }
+}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusAlarm.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusAlarm.java
deleted file mode 100644
index efb4a23..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusAlarm.java
+++ /dev/null
@@ -1,159 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.alibaba.fastjson.annotation.JSONField;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.time.LocalDateTime;
-import java.util.Date;
-
-/**
- * <p>
- * 报警记录表
- * </p>
- *
- * @author zyj
- * @since 2023-05-16
- */
-@Data
-@ApiModel("Alarm")
-@TableName("br_bus_alarm")
-public class BusAlarm implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 项目ID
-     */
-    @ApiModelProperty(value = "项目ID")
-    @TableField("PROJECT_ID")
-    private Long projectId;
-
-    /**
-     * 设备ID
-     */
-    @ApiModelProperty(value = "设备ID")
-    @TableField("DEVICE_ID")
-    private Long deviceId;
-
-    /**
-     * 报警类型
-     */
-    @ApiModelProperty(value = "报警类型")
-    @TableField("ALARM_TYPE")
-    private String alarmType;
-
-    /**
-     * 报警状态
-     */
-    @ApiModelProperty(value = "报警状态")
-    @TableField("ALARM_STATUS")
-    private String alarmStatus;
-
-    /**
-     * 报警值
-     */
-    @ApiModelProperty(value = "报警值")
-    @TableField("ALARM_VALUE")
-    private String alarmValue;
-
-    /**
-     * 报警图片
-     */
-    @ApiModelProperty(value = "报警图片")
-    @TableField("ALARM_IMAGE")
-    private String alarmImage;
-
-    /**
-     * 报警内容
-     */
-    @ApiModelProperty(value = "报警内容")
-    @TableField("ALARM_CONTENT")
-    private String alarmContent;
-
-    /**
-     * 报警时间
-     */
-    @ApiModelProperty(value = "报警时间")
-    @TableField("ALARM_TIME")
-    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
-    private Date alarmTime;
-
-    /**
-     * 消警时间
-     */
-    @ApiModelProperty(value = "消警时间")
-    @TableField("CANCEL_TIME")
-    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
-    private Date cancelTime;
-
-    /**
-     * 报警位置经度
-     */
-    @ApiModelProperty(value = "报警位置经度")
-    @TableField("ALARM_LNG")
-    private String alarmLng;
-
-    /**
-     * 报警位置纬度
-     */
-    @ApiModelProperty(value = "报警位置纬度")
-    @TableField("ALARM_LAT")
-    private String alarmLat;
-
-    @ApiModelProperty("报警类型名称")
-    @TableField(exist = false)
-    private String alarmStatusName;
-    @ApiModelProperty("报警类型名称")
-    @TableField(exist = false)
-    private String alarmTypeName;
-    @ApiModelProperty("作业名称")
-    @TableField(exist = false)
-    private String workTitle;
-    @ApiModelProperty("所属道路")
-    @TableField(exist = false)
-    private String workRoad;
-    @ApiModelProperty("作业状态")
-    @TableField(exist = false)
-    private String projectState;
-    @ApiModelProperty("作业状态名称")
-    @TableField(exist = false)
-    private String projectStateName;
-    @ApiModelProperty("负责人姓名")
-    @TableField(exist = false)
-    private String workPersonName;
-    @ApiModelProperty("负责人联系方式")
-    @TableField(exist = false)
-    private String workPersonPhoneNumber;
-
-
-    @Override
-    public String toString() {
-        return "BusAlarm{" +
-                "id=" + id +
-                ", projectId=" + projectId +
-                ", deviceId=" + deviceId +
-                ", alarmType=" + alarmType +
-                ", alarmValue=" + alarmValue +
-                ", alarmStatus=" + alarmStatus +
-                ", alarmImage=" + alarmImage +
-                ", alarmContent=" + alarmContent +
-                ", alarmTime=" + alarmTime +
-                ", cancelTime=" + cancelTime +
-                ", alarmLng=" + alarmLng +
-                ", alarmLat=" + alarmLat +
-                "}";
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusEvent.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusEvent.java
deleted file mode 100644
index a0b7543..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusEvent.java
+++ /dev/null
@@ -1,100 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.time.LocalDateTime;
-import java.util.Date;
-import java.util.List;
-
-/**
- * <p>
- * 事件表
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@TableName("br_bus_event")
-@Data
-@ApiModel("BusEvent")
-public class BusEvent implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @ApiModelProperty("事件ID")
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 事件标题
-     */
-    @ApiModelProperty("事件名称")
-    @TableField("EVENT_TITLE")
-    private String eventTitle;
-
-    /**
-     * 上报人员
-     */
-    @ApiModelProperty("上报人员")
-    @TableField("UPLOAD_NAME")
-    private String uploadName;
-
-    /**
-     * 联系方式
-     */
-    @ApiModelProperty("联系方式")
-    @TableField("PHONE_NUMBER")
-    private String phoneNumber;
-
-    /**
-     * 事件描述
-     */
-    @ApiModelProperty("事件描述")
-    @TableField("EVENT_DESCRIPTION")
-    private String eventDescription;
-
-    @ApiModelProperty("经度")
-    @TableField("LNG")
-    private String lng;
-
-    @ApiModelProperty("纬度")
-    @TableField("LAT")
-    private String lat;
-
-    /**
-     * 事件上传时间
-     */
-    @ApiModelProperty("事件上传时间")
-    @TableField("CREATE_TIME")
-    private Date createTime;
-
-    @ApiModelProperty("事件照片")
-    @TableField(exist = false)
-    private List<BusEventImage> imageList;
-
-
-
-    @Override
-    public String toString() {
-        return "BusEvent{" +
-            "id=" + id +
-            ", eventTitle=" + eventTitle +
-            ", uploadName=" + uploadName +
-            ", phoneNumber=" + phoneNumber +
-            ", eventDescription=" + eventDescription +
-            ", lng=" + lng +
-            ", lat=" + lat +
-            ", createTime=" + createTime +
-        "}";
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusEventImage.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusEventImage.java
deleted file mode 100644
index 1e75245..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusEventImage.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-
-/**
- * <p>
- * 事件图片表
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@TableName("br_bus_event_image")
-@Data
-@ApiModel("BusEventImage")
-public class BusEventImage implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 事件ID
-     */
-    @TableField("EVENT_ID")
-    private Long eventId;
-
-    /**
-     * 报警图片
-     */
-    @TableField("IMAGE")
-    @ApiModelProperty("图片url")
-    private String image;
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Device.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Device.java
index df89c70..ea7db5f 100644
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Device.java
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Device.java
@@ -1,30 +1,23 @@
 package com.casic.missiles.modular.system.entity;
 
-import com.alibaba.fastjson.annotation.JSONField;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.casic.missiles.core.base.json.DateDeserializer;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
-import java.util.Date;
 
 /**
  * <p>
- * 
+ * 设备记录表
  * </p>
  *
  * @author zyj
- * @since 2023-04-14
+ * @since 2023-05-25
  */
-@ApiModel("Device")
-@TableName("br_device")
 @Data
+@TableName("bus_device")
 public class Device implements Serializable {
 
     private static final long serialVersionUID = 1L;
@@ -32,82 +25,86 @@
     /**
      * 主键
      */
-    @ApiModelProperty(value = "设备ID")
     @TableId(value = "ID",type = IdType.ASSIGN_ID)
     private Long id;
 
     /**
-     * 设备编号
+     * 设备名称
      */
-    @ApiModelProperty(value = "设备编号")
-    @TableField("DEVICE_CODE")
-    private String deviceCode;
+    @TableField("DEVICE_NAME")
+    private String deviceName;
 
     /**
-     * 设备类型
+     * IP
      */
-    @ApiModelProperty(value = "设备类型")
-    @TableField("DEVICE_TYPE")
-    private String deviceType;
+    @TableField("IP")
+    private String ip;
 
     /**
-     * 设备批次
+     * 端口
      */
-    @ApiModelProperty(value = "设备批次")
-    @TableField("DEVICE_BATCH")
-    private String deviceBatch;
+    @TableField("PORT")
+    private String port;
 
     /**
-     * 厂家
+     * 用户名
      */
-    @ApiModelProperty(value = "厂家")
-    @TableField("MANUFACTURER")
-    private String manufacturer;
+    @TableField("USER_NAME")
+    private String userName;
 
     /**
-     * 是否供电
+     * 密码
      */
-    @ApiModelProperty(value = "是否供电")
-    @TableField("IS_POWER_SUPPLY")
-    private String isPowerSupply;
+    @TableField("PASSWORD")
+    private String password;
 
     /**
-     * 创建时间
+     * 连接类型
      */
-    @ApiModelProperty(value = "创建时间",dataType = "Date")
-    @TableField("CREATE_TIME")
-    private Date createTime;
+    @TableField("CONNECT_TYPE")
+    private String connectType;
 
-    @ApiModelProperty(value = "设备类型名称")
-    @TableField(exist = false)
-    private String deviceTypeName;
+    /**
+     * 位置
+     */
+    @TableField("LOCATION")
 
-    @ApiModelProperty(value = "是否供电名称")
-    @TableField(exist = false)
-    private String isPowerSupplyName;
+    private String location;
 
-    @ApiModelProperty(value = "注册时间",dataType = "String")
-    @TableField(exist = false)
-    private String registerTime;
+    /**
+     * 设备状态
+     */
+    @TableField("STATUS")
 
-    @ApiModelProperty(value = "当前状态")
-    @TableField(exist = false)
     private String status;
 
-    @ApiModelProperty(value = "当前状态名称")
-    @TableField(exist = false)
-    private String statusName;
+    /**
+     * 报警分组
+     */
+    @TableField("ALARM_GROUP")
+
+    private Long alarmGroup;
+
+    /**
+     * 视频通道数(预留)
+     */
+    @TableField("CHANNEL_NUM")
+    private Integer channelNum;
 
     @Override
     public String toString() {
         return "Device{" +
             "id=" + id +
-            ", deviceCode=" + deviceCode +
-            ", deviceType=" + deviceType +
-            ", deviceBatch=" + deviceBatch +
-            ", manufacturer=" + manufacturer +
-            ", isPowerSupply=" + isPowerSupply +
-            ", createTime=" + createTime +
+            ", deviceName=" + deviceName +
+            ", ip=" + ip +
+            ", port=" + port +
+            ", userName=" + userName +
+            ", password=" + password +
+            ", connectType=" + connectType +
+            ", location=" + location +
+            ", status=" + status +
+            ", alarmGroup=" + alarmGroup +
+            ", channelNum=" + channelNum +
         "}";
     }
 }
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/DeviceExt.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/DeviceExt.java
deleted file mode 100644
index 5ee7015..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/DeviceExt.java
+++ /dev/null
@@ -1,99 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-
-/**
- * <p>
- * 设备扩展信息表（安全树）
- * </p>
- *
- * @author zyj
- * @since 2023-04-27
- */
-@Data
-@TableName("br_device_ext")
-public class DeviceExt implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 设备ID
-     */
-    @TableField("DEVICE_ID")
-    private Long deviceId;
-
-    /**
-     * 摄像头编号
-     */
-    @TableField("CAMERA_CODE")
-    private String cameraCode;
-
-    /**
-     * 摄像头IP
-     */
-    @TableField("CAMERA_IP")
-    private String cameraIp;
-
-    /**
-     * 摄像头端口
-     */
-    @TableField("CAMERA_PORT")
-    private String cameraPort;
-
-    /**
-     * 激甲编号
-     */
-    @TableField("GAS_CODE")
-    private String gasCode;
-
-    /**
-     * 激甲IP
-     */
-    @TableField("GAS_IP")
-    private String gasIp;
-
-    /**
-     * 激甲端口
-     */
-    @TableField("GAS_PORT")
-    private String gasPort;
-
-    /**
-     * 甲烷报警阈值
-     */
-    @TableField("GAS_THRESHOLD")
-    private String gasThreshold;
-
-    @TableField(value = "HAT_LINING_CODE")
-    private String hatLiningCode;
-
-
-    @Override
-    public String toString() {
-        return "DeviceExt{" +
-            "id=" + id +
-            ", deviceId=" + deviceId +
-            ", cameraCode=" + cameraCode +
-            ", cameraIp=" + cameraIp +
-            ", cameraPort=" + cameraPort +
-            ", gasCode=" + gasCode +
-            ", gasIp=" + gasIp +
-            ", gasPort=" + gasPort +
-            ", gasThreshold=" + gasThreshold +
-            ", hatLiningCode=" + hatLiningCode +
-        "}";
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/ProjectDevice.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/ProjectDevice.java
deleted file mode 100644
index c4f3472..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/ProjectDevice.java
+++ /dev/null
@@ -1,62 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-
-/**
- * <p>
- * 
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@Data
-@ApiModel("ProjectDevice")
-@TableName("br_project_device")
-public class ProjectDevice implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 作业现场ID
-     */
-    @TableField("PROJECT_ID")
-    private Long projectId;
-
-    /**
-     * 设备ID
-     */
-    @TableField("DEVICE_ID")
-    @ApiModelProperty("设备ID（新增编辑时传）")
-    private Long deviceId;
-
-    /**
-     * 设备编号
-     */
-    @TableField(exist = false)
-    @ApiModelProperty("设备编号（详情中展示，新增编辑不用传）")
-    private String deviceCode;
-
-    @Override
-    public String toString() {
-        return "ProjectDevice{" +
-            "id=" + id +
-            ", projectId=" + projectId +
-            ", deviceId=" + deviceId +
-        "}";
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/ProjectWorker.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/ProjectWorker.java
deleted file mode 100644
index 10b23c4..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/ProjectWorker.java
+++ /dev/null
@@ -1,104 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import java.io.Serializable;
-
-/**
- * <p>
- * 
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@ApiModel("ProjectWorker")
-@TableName("br_project_worker")
-@Data
-@NoArgsConstructor
-@AllArgsConstructor
-public class ProjectWorker implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 作业现场ID
-     */
-    @TableField("PROJECT_ID")
-    private Long projectId;
-
-    /**
-     * 人员ID
-     */
-    @ApiModelProperty("人员ID")
-    @TableField("WORKER_ID")
-    private Long workerId;
-
-    /**
-     * 安全帽编号
-     */
-    @ApiModelProperty("安全帽编号")
-    @TableField("HAT_CODE")
-    private String hatCode;
-
-    /**
-     * 背心编号
-     */
-    @ApiModelProperty("背心编号")
-    @TableField("VAST_CODE")
-    private String vastCode;
-
-    /**
-     * 手环编号
-     */
-    @ApiModelProperty("手环编号")
-    @TableField("BRACELET_CODE")
-    private String braceletCode;
-
-    @ApiModelProperty("人员姓名（详情中展示，新增编辑不用传）")
-    @TableField(exist = false)
-    private String workerName;
-
-    @ApiModelProperty("人员部门ID（详情中展示，新增编辑不用传）")
-    @TableField(exist = false)
-    private String workerDeptId;
-
-    @ApiModelProperty("人员部门名称（详情中展示，新增编辑不用传）")
-    @TableField(exist = false)
-    private String workerDeptName;
-
-    @ApiModelProperty("人员联系方式（详情中展示，新增编辑不用传）")
-    @TableField(exist = false)
-    private String workerPhoneNumber;
-
-    public ProjectWorker(Long projectId, Long workerId) {
-        this.projectId = projectId;
-        this.workerId = workerId;
-    }
-
-    @Override
-    public String toString() {
-        return "ProjectWorker{" +
-            "id=" + id +
-            ", projectId=" + projectId +
-            ", workerId=" + workerId +
-            ", hatCode=" + hatCode +
-            ", vastCode=" + vastCode +
-            ", braceletCode=" + braceletCode +
-        "}";
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/WorkSiteInfo.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/WorkSiteInfo.java
deleted file mode 100644
index fa6f41d..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/WorkSiteInfo.java
+++ /dev/null
@@ -1,130 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.alibaba.fastjson.annotation.JSONField;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.time.LocalDateTime;
-import java.util.Date;
-
-/**
- * <p>
- * 作业现场表
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@ApiModel("WorkSiteInfo")
-@TableName("br_work_site_info")
-@Data
-public class WorkSiteInfo implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @ApiModelProperty("作业现场ID")
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 作业名称
-     */
-    @ApiModelProperty("作业名称")
-    @TableField("WORK_TITLE")
-    private String workTitle;
-
-    /**
-     * 责任人
-     */
-    @ApiModelProperty("责任人（人员ID）")
-    @TableField("WORK_PERSON")
-    private Long workPerson;
-
-    /**
-     * 作业描述
-     */
-    @ApiModelProperty("作业描述")
-    @TableField("WORK_SITE_DESC")
-    private String workSiteDesc;
-
-    /**
-     * 作业状态
-     */
-    @ApiModelProperty("作业状态")
-    @TableField("PROJECT_STATE")
-    private String projectState;
-
-    /**
-     * 所属道路
-     */
-    @ApiModelProperty("所属道路")
-    @TableField("WORK_ROAD")
-    private String workRoad;
-
-    @TableField("IMAGE_URL")
-    private String imageUrl;
-
-    @TableField("CREATE_TIME")
-    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
-    private Date createTime;
-    @TableField("UPDATE_TIME")
-    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
-    private Date updateTime;
-
-    @ApiModelProperty("开始时间")
-    @TableField("START_TIME")
-    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
-    private Date startTime;
-
-    @ApiModelProperty("结束时间")
-    @TableField("FINISH_TIME")
-    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
-    private Date finishTime;
-
-    @ApiModelProperty("负责人姓名（详情中使用，新增编辑不用传）")
-    @TableField(exist = false)
-    private String workPersonName;
-
-    @ApiModelProperty("负责人联系方式（详情中使用，新增编辑不用传）")
-    @TableField(exist = false)
-    private String workPersonPhoneNumber;
-
-    @ApiModelProperty("负责人所属部门ID（详情中使用，新增编辑不用传）")
-    @TableField(exist = false)
-    private Long workPersonDeptId;
-
-    @ApiModelProperty("负责人所属部门名称（详情中使用，新增编辑不用传）")
-    @TableField(exist = false)
-    private String workPersonDeptName;
-
-    @ApiModelProperty(value = "注册时间",dataType = "String")
-    @TableField(exist = false)
-    private String registerTime;
-
-    @ApiModelProperty("作业状态名称")
-    @TableField(exist = false)
-    private String projectStateName;
-
-    @Override
-    public String toString() {
-        return "WorkSiteInfo{" +
-            "id=" + id +
-            ", workTitle=" + workTitle +
-            ", workPerson=" + workPerson +
-            ", workSiteDesc=" + workSiteDesc +
-            ", projectState=" + projectState +
-            ", imageUrl=" + imageUrl +
-            ", updateTime=" + updateTime +
-            ", workRoad=" + workRoad +
-        "}";
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Worker.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Worker.java
deleted file mode 100644
index 28a4daa..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Worker.java
+++ /dev/null
@@ -1,147 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.time.LocalDateTime;
-import java.util.Date;
-
-/**
- * <p>
- * 
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@ApiModel("Worker")
-@TableName("br_worker")
-@Data
-public class Worker implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @ApiModelProperty(value = "人员ID")
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 姓名
-     */
-    @ApiModelProperty(value = "姓名")
-    @TableField("WORKER_NAME")
-    private String workerName;
-
-    /**
-     * 性别
-     */
-    @ApiModelProperty(value = "性别")
-    @TableField("GENDER")
-    private String gender;
-
-    /**
-     * 所属部门
-     */
-    @ApiModelProperty(value = "所属部门(人员管理)")
-    @TableField("DEPT_ID")
-    private Long deptId;
-
-    /**
-     * 所属单位
-     */
-    @ApiModelProperty(value = "所属单位(入场申请中使用)")
-    @TableField("OWNER_SHIP")
-    private String ownerShip;
-
-    /**
-     * 联系方式
-     */
-    @ApiModelProperty(value = "联系方式")
-    @TableField("PHONE_NUMBER")
-    private String phoneNumber;
-
-    /**
-     * 证件号
-     */
-    @ApiModelProperty(value = "证件号")
-    @TableField("ID_CARD_NUMBER")
-    private String idCardNumber;
-
-    /**
-     * 入场原因
-     */
-    @ApiModelProperty(value = "入场原因（入场申请中使用）")
-    @TableField("ENTER_REASON")
-    private String enterReason;
-
-    /**
-     * 入场人脸照片
-     */
-    @ApiModelProperty(value = "人脸照片（照片路径）")
-    @TableField("WORKER_AVATAR")
-    private String workerAvatar;
-
-    /**
-     * 申请入场时间
-     */
-    @ApiModelProperty(value = "注册时间/申请入场时间")
-    @TableField("CREATE_TIME")
-    private Date createTime;
-
-    /**
-     * 人员类型
-     */
-    @ApiModelProperty(value = "人员类型（区分人员管理和入场申请）")
-    @TableField("WORKER_TYPE")
-    private String workerType;
-
-    @ApiModelProperty(value = "性别名称")
-    @TableField(exist = false)
-    private String genderName;
-
-    @ApiModelProperty(value = "部门名称")
-    @TableField(exist = false)
-    private String deptName;
-
-    @ApiModelProperty(value = "注册时间",dataType = "String")
-    @TableField(exist = false)
-    private String registerTime;
-
-    @ApiModelProperty(value = "当前状态")
-    @TableField(exist = false)
-    private String status;
-
-    @ApiModelProperty(value = "当前状态名称")
-    @TableField(exist = false)
-    private String statusName;
-
-    @ApiModelProperty(value = "是否注册(0未注册；1已注册)",allowableValues = "0,1")
-    @TableField(exist = false)
-    private String isRegister;
-
-    @Override
-    public String toString() {
-        return "Worker{" +
-            "id=" + id +
-            ", workerName=" + workerName +
-            ", gender=" + gender +
-            ", deptId=" + deptId +
-            ", ownerShip=" + ownerShip +
-            ", phoneNumber=" + phoneNumber +
-            ", idCardNumber=" + idCardNumber +
-            ", enterReason=" + enterReason +
-            ", workerAvatar=" + workerAvatar +
-            ", createTime=" + createTime +
-            ", workerType=" + workerType +
-        "}";
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/AlarmMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/AlarmMapper.java
new file mode 100644
index 0000000..ea4c8be
--- /dev/null
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/AlarmMapper.java
@@ -0,0 +1,16 @@
+package com.casic.missiles.modular.system.mapper;
+
+import com.casic.missiles.modular.system.entity.Alarm;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 报警记录表 Mapper 接口
+ * </p>
+ *
+ * @author zyj
+ * @since 2023-05-25
+ */
+public interface AlarmMapper extends BaseMapper<Alarm> {
+
+}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/BusAlarmMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/BusAlarmMapper.java
deleted file mode 100644
index 9801742..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/BusAlarmMapper.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package com.casic.missiles.modular.system.mapper;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.modular.system.dto.AlarmTypeCountDTO;
-import com.casic.missiles.modular.system.entity.BusAlarm;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * <p>
- * 报警记录表 Mapper 接口
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface BusAlarmMapper extends BaseMapper<BusAlarm> {
-
-    Page<BusAlarm> listPage(Page<BusAlarm> page,@Param("ew")  QueryWrapper<BusAlarm> queryWrapper);
-
-    void cancelAlarm(@Param("deviceId")Long deviceId,@Param("alarmType") String alarmType);
-
-    List<AlarmTypeCountDTO> alarmCount(@Param("projectId")Long projectId, @Param("alarmStatus")String alarmStatus);
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/BusEventImageMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/BusEventImageMapper.java
deleted file mode 100644
index 9590b7d..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/BusEventImageMapper.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.casic.missiles.modular.system.mapper;
-
-import com.casic.missiles.modular.system.entity.BusEventImage;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * <p>
- * 事件图片表 Mapper 接口
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface BusEventImageMapper extends BaseMapper<BusEventImage> {
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/BusEventMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/BusEventMapper.java
deleted file mode 100644
index 3c85edf..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/BusEventMapper.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.casic.missiles.modular.system.mapper;
-
-import com.casic.missiles.modular.system.entity.BusEvent;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * <p>
- * 事件表 Mapper 接口
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface BusEventMapper extends BaseMapper<BusEvent> {
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/DeviceExtMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/DeviceExtMapper.java
deleted file mode 100644
index 4ca9212..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/DeviceExtMapper.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.casic.missiles.modular.system.mapper;
-
-import com.casic.missiles.modular.system.entity.DeviceExt;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * <p>
- * 设备扩展信息表（安全树） Mapper 接口
- * </p>
- *
- * @author zyj
- * @since 2023-04-27
- */
-public interface DeviceExtMapper extends BaseMapper<DeviceExt> {
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/DeviceMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/DeviceMapper.java
index 444c0c5..3d0bb02 100644
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/DeviceMapper.java
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/DeviceMapper.java
@@ -1,30 +1,16 @@
 package com.casic.missiles.modular.system.mapper;
 
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.modular.system.dto.DeviceDetailDTO;
-import com.casic.missiles.modular.system.dto.HelmetInfoDTO;
 import com.casic.missiles.modular.system.entity.Device;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
 
 /**
  * <p>
- *  Mapper 接口
+ * 设备记录表 Mapper 接口
  * </p>
  *
  * @author zyj
- * @since 2023-04-14
+ * @since 2023-05-25
  */
-@Mapper
 public interface DeviceMapper extends BaseMapper<Device> {
 
-    Page<DeviceDetailDTO> listDetailPage(Page<DeviceDetailDTO> page,@Param("ew") QueryWrapper<DeviceDetailDTO> ew);
-
-     List<Long> selectProjectDevice(@Param("projectId") Long projectId);
-
-    List<HelmetInfoDTO> selectHelmetList(@Param("deviceType")String deviceType);
 }
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/ProjectDeviceMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/ProjectDeviceMapper.java
deleted file mode 100644
index 1d0c14e..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/ProjectDeviceMapper.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package com.casic.missiles.modular.system.mapper;
-
-import com.casic.missiles.modular.system.dto.DeviceLocationDTO;
-import com.casic.missiles.modular.system.entity.ProjectDevice;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * <p>
- *  Mapper 接口
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface ProjectDeviceMapper extends BaseMapper<ProjectDevice> {
-     List<ProjectDevice> selectDetailByProjectId(@Param("projectId") Long projectId);
-
-     List<DeviceLocationDTO> selectDeviceLocationList(@Param("projectId") Long projectId);
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/ProjectWorkerMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/ProjectWorkerMapper.java
deleted file mode 100644
index 58583d1..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/ProjectWorkerMapper.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package com.casic.missiles.modular.system.mapper;
-
-import com.casic.missiles.modular.system.dto.WorkerLocationDTO;
-import com.casic.missiles.modular.system.entity.ProjectWorker;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * <p>
- *  Mapper 接口
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface ProjectWorkerMapper extends BaseMapper<ProjectWorker> {
-
-    List<ProjectWorker> selectDetailByProjectId(@Param("projectId") Long projectId,
-                                                @Param("workerType")String workerType);
-
-    List<WorkerLocationDTO> selectWorkerLocationList(@Param("projectId") Long projectId,
-                                                     @Param("workerType")String workerType);
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/WorkSiteInfoMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/WorkSiteInfoMapper.java
deleted file mode 100644
index a4934d2..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/WorkSiteInfoMapper.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.casic.missiles.modular.system.mapper;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.modular.system.entity.WorkSiteInfo;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Param;
-
-/**
- * <p>
- * 作业现场表 Mapper 接口
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface WorkSiteInfoMapper extends BaseMapper<WorkSiteInfo> {
-
-    Page<WorkSiteInfo> selectListPage(Page<WorkSiteInfo> page,@Param("ew") QueryWrapper<WorkSiteInfo> ew);
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/WorkerMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/WorkerMapper.java
deleted file mode 100644
index 258fb12..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/WorkerMapper.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package com.casic.missiles.modular.system.mapper;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.modular.system.dto.DeviceDetailDTO;
-import com.casic.missiles.modular.system.entity.Worker;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * <p>
- *  Mapper 接口
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface WorkerMapper extends BaseMapper<Worker> {
-
-
-    Page<Worker> selectListPage(Page<Worker> page, @Param("ew") QueryWrapper<Worker> ew);
-
-    List<String> selectWorkerAvatars(@Param("projectId")Long projectId);
-
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/AlarmMapper.xml b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/AlarmMapper.xml
new file mode 100644
index 0000000..25cb4ab
--- /dev/null
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/AlarmMapper.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.modular.system.mapper.AlarmMapper">
+
+</mapper>
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/BusAlarmMapper.xml b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/BusAlarmMapper.xml
deleted file mode 100644
index 595088a..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/BusAlarmMapper.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.casic.missiles.modular.system.mapper.BusAlarmMapper">
-
-    <select id="listPage" resultType="com.casic.missiles.modular.system.entity.BusAlarm">
-        SELECT
-            alarm.ID as id,
-            alarm.DEVICE_ID as deviceId,
-            alarm.PROJECT_ID as projectId,
-            alarm.ALARM_TYPE as alarmType,
-            alarm.ALARM_VALUE as alarmValue,
-            alarm.ALARM_STATUS as alarmStatus,
-            alarm.ALARM_IMAGE AS alarmImage,
-            alarm.ALARM_CONTENT as alarmContent,
-            alarm.ALARM_TIME as alarmTime,
-            alarm.CANCEL_TIME as cancelTime,
-            alarm.ALARM_LNG as alarmLng,
-            alarm.ALARM_LAT as alarmLat,
-            p.WORK_TITLE as workTitle,
-            p.WORK_ROAD as workRoad,
-            p.PROJECT_STATE as projectState,
-            w.WORKER_NAME as workPersonName,
-            w.PHONE_NUMBER as workPersonPhoneNumber
-        FROM
-            `br_bus_alarm` alarm
-                LEFT JOIN br_work_site_info p on alarm.PROJECT_ID = p.ID
-                LEFT JOIN br_worker w on p.WORK_PERSON = w.ID
-        <where>
-            <if test="ew != null">
-                ${ew.sqlSegment}
-            </if>
-        </where>
-    </select>
-
-    <select id="cancelAlarm">
-        update br_bus_alarm
-        set ALARM_STATUS = '1'
-        where DEVICE_ID = #{deviceId}
-          and ALARM_TYPE = #{alarmType}
-          and ALARM_STATUS = '0'
-    </select>
-
-    <select id="alarmCount" resultType="com.casic.missiles.modular.system.dto.AlarmTypeCountDTO">
-        SELECT
-            ALARM_TYPE as alarmType,
-            count(*) as alarmCount
-        from br_bus_alarm
-        <where>
-            <if test="projectId != null and projectId !=''">
-                and PROJECT_ID = #{projectId}
-            </if>
-            <if test="alarmStatus != null and alarmStatus !=''">
-                and ALARM_STATUS = #{alarmStatus}
-            </if>
-        </where>
-        group by ALARM_TYPE
-    </select>
-</mapper>
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/BusEventImageMapper.xml b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/BusEventImageMapper.xml
deleted file mode 100644
index fbc3db3..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/BusEventImageMapper.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.casic.missiles.modular.system.mapper.BusEventImageMapper">
-
-</mapper>
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/BusEventMapper.xml b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/BusEventMapper.xml
deleted file mode 100644
index 627d573..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/BusEventMapper.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.casic.missiles.modular.system.mapper.BusEventMapper">
-
-</mapper>
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/DeviceExtMapper.xml b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/DeviceExtMapper.xml
deleted file mode 100644
index 5321d1c..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/DeviceExtMapper.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.casic.missiles.modular.system.mapper.DeviceExtMapper">
-
-</mapper>
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/DeviceMapper.xml b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/DeviceMapper.xml
index 94262e1..88e7d01 100644
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/DeviceMapper.xml
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/DeviceMapper.xml
@@ -2,96 +2,4 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.casic.missiles.modular.system.mapper.DeviceMapper">
 
-    <select id="listDetailPage" resultType="com.casic.missiles.modular.system.dto.DeviceDetailDTO">
-        select
-        br_device.ID as id,
-        DEVICE_CODE as deviceCode,
-        DEVICE_TYPE as deviceType,
-        DEVICE_BATCH as deviceBatch,
-        MANUFACTURER as manufacturer,
-        IS_POWER_SUPPLY as isPowerSupply,
-        CREATE_TIME as createTime,
-        CAMERA_CODE as cameraCode,
-        CAMERA_IP as cameraIp,
-        CAMERA_PORT as cameraPort,
-        GAS_CODE as gasCode,
-        GAS_IP as gasIp,
-        GAS_PORT as gasPort,
-        HAT_LINING_CODE as hatLiningCode
-        from br_device
-        left join br_device_ext ext on ext.DEVICE_ID = br_device.ID
-        <where>
-            <if test="ew != null">
-                ${ew.sqlSegment}
-            </if>
-        </where>
-    </select>
-
-    <select id="selectProjectDevice" resultType="java.lang.Long">
-        with device_info as (
-            (SELECT
-            d.DEVICE_ID as DEVICE_ID,
-            d.PROJECT_ID as PROJECT_ID,
-            p.PROJECT_STATE as PROJECT_STATE
-            from br_project_device d
-            LEFT JOIN br_work_site_info p on p.ID = d.PROJECT_ID)
-
-            UNION ALL
-
-            (SELECT
-            d1.ID as DEVICE_ID,
-            w1.ID as PROJECT_ID,
-            w1.PROJECT_STATE as PROJECT_STATE
-            FROM br_project_worker pw1
-            LEFT JOIN br_device d1 on pw1.BRACELET_CODE = d1.DEVICE_CODE
-            LEFT JOIN br_work_site_info w1 on pw1.PROJECT_ID = w1.ID)
-
-            UNION ALL
-
-            (SELECT
-            d1.ID as DEVICE_ID,
-            w1.ID as PROJECT_ID,
-            w1.PROJECT_STATE as PROJECT_STATE
-            FROM br_project_worker pw1
-            LEFT JOIN br_device d1 on pw1.HAT_CODE = d1.DEVICE_CODE
-            LEFT JOIN br_work_site_info w1 on pw1.PROJECT_ID = w1.ID)
-
-
-            UNION ALL
-
-            (SELECT
-            d1.ID as DEVICE_ID,
-            w1.ID as PROJECT_ID,
-            w1.PROJECT_STATE as PROJECT_STATE
-            FROM br_project_worker pw1
-            LEFT JOIN br_device d1 on pw1.VAST_CODE = d1.DEVICE_CODE
-            LEFT JOIN br_work_site_info w1 on pw1.PROJECT_ID = w1.ID))
-
-        select DISTINCT DEVICE_ID from device_info
-        <where>
-            DEVICE_ID is not null
-            <choose>
-                <when test="projectId != null and projectId !=''">
-                    and PROJECT_ID = #{projectId}
-                </when>
-                <otherwise>
-                    AND PROJECT_STATE != '3'
-                </otherwise>
-            </choose>
-        </where>
-    </select>
-
-    <select id="selectHelmetList" resultType="com.casic.missiles.modular.system.dto.HelmetInfoDTO">
-        SELECT
-            a.ID AS deviceId,
-            a.DEVICE_CODE AS hatCode,
-            b.HAT_LINING_CODE AS hatLiningCode
-        FROM
-            br_device a
-                LEFT JOIN br_device_ext b ON a.ID = b.DEVICE_ID
-        WHERE
-            a.DEVICE_TYPE = #{deviceType}
-          AND a.DEVICE_CODE IS NOT NULL
-          AND b.HAT_LINING_CODE IS NOT NULL
-    </select>
 </mapper>
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/ProjectDeviceMapper.xml b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/ProjectDeviceMapper.xml
deleted file mode 100644
index c6d1c24..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/ProjectDeviceMapper.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.casic.missiles.modular.system.mapper.ProjectDeviceMapper">
-
-    <select id="selectDetailByProjectId" resultType="com.casic.missiles.modular.system.entity.ProjectDevice">
-        SELECT
-            pd.ID as id,
-            pd.PROJECT_ID as projectId,
-            pd.DEVICE_ID as deviceId,
-            d.DEVICE_CODE as deviceCode
-        from br_project_device pd
-        LEFT JOIN br_device d on pd.DEVICE_ID = d.ID
-        <where>
-            pd.PROJECT_ID = #{projectId}
-        </where>
-    </select>
-
-    <select id="selectDeviceLocationList" resultType="com.casic.missiles.modular.system.dto.DeviceLocationDTO">
-        SELECT
-        d.ID as deviceId,
-        d.DEVICE_TYPE as deviceType,
-        d.DEVICE_CODE as deviceCode,
-        if(EXISTS(select ID from br_bus_alarm WHERE DEVICE_ID = d.ID and ALARM_STATUS = '0'),true,false) as alarmFlag
-        FROM br_project_device pd, br_device d
-        where pd.DEVICE_ID = d.ID
-        and pd.PROJECT_ID = #{projectId}
-    </select>
-
-</mapper>
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/ProjectWorkerMapper.xml b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/ProjectWorkerMapper.xml
deleted file mode 100644
index 8d2de10..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/ProjectWorkerMapper.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.casic.missiles.modular.system.mapper.ProjectWorkerMapper">
-
-    <select id="selectDetailByProjectId" resultType="com.casic.missiles.modular.system.entity.ProjectWorker">
-        SELECT
-            pw.ID as id,
-            pw.PROJECT_ID as projectId,
-            pw.WORKER_ID as workerId,
-            w.WORKER_NAME as workerName,
-            w.DEPT_ID as workerDeptId,
-            pw.HAT_CODE as hatCode,
-            pw.VAST_CODE as vastCode,
-            pw.BRACELET_CODE as braceletCode,
-            w.PHONE_NUMBER as workerPhoneNumber
-        from br_project_worker pw
-        LEFT JOIN br_worker w on pw.WORKER_ID = w.ID
-        <where>
-            pw.PROJECT_ID = #{projectId}
-            <if test="workerType != null and workerType != ''">
-                and w.WORKER_TYPE = #{workerType}
-            </if>
-        </where>
-    </select>
-
-    <select id="selectWorkerLocationList" resultType="com.casic.missiles.modular.system.dto.WorkerLocationDTO">
-        select
-            w.ID as workerId,
-            w.WORKER_NAME as workerName,
-            pw.HAT_CODE as hatCode,
-            hd.ID as hatId,
-            pw.BRACELET_CODE as braceletCode,
-            pw.VAST_CODE as vastCode
-        from br_project_worker pw,br_worker w ,br_device hd
-        WHERE pw.WORKER_ID = w.ID
-          and pw.HAT_CODE = hd.DEVICE_CODE
-          and pw.PROJECT_ID = #{projectId}
-          and w.WORKER_TYPE = #{workerType}
-    </select>
-</mapper>
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/WorkSiteInfoMapper.xml b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/WorkSiteInfoMapper.xml
deleted file mode 100644
index 8f01326..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/WorkSiteInfoMapper.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.casic.missiles.modular.system.mapper.WorkSiteInfoMapper">
-
-    <select id="selectListPage" resultType="com.casic.missiles.modular.system.entity.WorkSiteInfo">
-        SELECT
-            br_work_site_info.ID AS id,
-            WORK_TITLE as workTitle,
-            WORK_ROAD as workRoad,
-            WORK_SITE_DESC as workSiteDesc,
-            WORK_PERSON as workPerson,
-            WORKER_NAME as workPersonName,
-            DEPT_ID as workPersonDeptId,
-            PHONE_NUMBER as workPersonPhoneNumber,
-            PROJECT_STATE as projectState,
-            br_work_site_info.CREATE_TIME AS createTime,
-            br_work_site_info.UPDATE_TIME AS updateTime
-        FROM br_work_site_info
-        LEFT JOIN br_worker w ON br_work_site_info.WORK_PERSON = w.ID
-        <where>
-            <if test="ew != null">
-                ${ew.sqlSegment}
-            </if>
-        </where>
-    </select>
-</mapper>
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/WorkerMapper.xml b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/WorkerMapper.xml
deleted file mode 100644
index 3e28b39..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/WorkerMapper.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.casic.missiles.modular.system.mapper.WorkerMapper">
-
-    <select id="selectListPage" resultType="com.casic.missiles.modular.system.entity.Worker">
-        WITH worker_project AS (
-            SELECT
-                w.id AS ID,
-                WORKER_NAME,
-                GENDER,
-                DEPT_ID,
-                OWNER_SHIP,
-                PHONE_NUMBER,
-                ID_CARD_NUMBER,
-                ENTER_REASON,
-                WORKER_AVATAR,
-                w.CREATE_TIME,
-                WORKER_TYPE,
-                IF( p.PROJECT_STATE != '3', 1, 0 ) AS `STATUS`
-            FROM br_worker w
-            LEFT JOIN br_project_worker pw ON w.ID = pw.WORKER_ID
-            LEFT JOIN br_work_site_info p ON pw.PROJECT_ID = p.ID
-        )
-
-        SELECT
-            ID AS id,
-            WORKER_NAME AS workerName,
-            GENDER AS gender,
-            DEPT_ID AS deptId,
-            OWNER_SHIP AS ownerShip,
-            PHONE_NUMBER AS phoneNumber,
-            ID_CARD_NUMBER AS idCardNumber,
-            ENTER_REASON AS enterReason,
-            WORKER_AVATAR AS workerAvatar,
-            CREATE_TIME AS createTime,
-            WORKER_TYPE AS workerType,
-            `STATUS` AS `status`
-        FROM worker_project
-        <where>
-            <if test="ew != null">
-                ${ew.sqlSegment}
-            </if>
-        </where>
-    </select>
-
-    <select id="selectWorkerAvatars" resultType="java.lang.String">
-        SELECT
-            WORKER_AVATAR
-        FROM
-            `br_worker`
-        WHERE
-        ID IN ( SELECT WORKER_ID FROM br_project_worker WHERE PROJECT_ID = #{projectId} )
-          AND WORKER_AVATAR IS NOT NULL
-          AND WORKER_AVATAR != ''
-    </select>
-</mapper>
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IAlarmService.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IAlarmService.java
new file mode 100644
index 0000000..8bc01f4
--- /dev/null
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IAlarmService.java
@@ -0,0 +1,16 @@
+package com.casic.missiles.modular.system.service;
+
+import com.casic.missiles.modular.system.entity.Alarm;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 报警记录表 服务类
+ * </p>
+ *
+ * @author zyj
+ * @since 2023-05-25
+ */
+public interface IAlarmService extends IService<Alarm> {
+
+}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IBusAlarmService.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IBusAlarmService.java
deleted file mode 100644
index f63c19c..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IBusAlarmService.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package com.casic.missiles.modular.system.service;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.modular.system.dto.AlarmTypeCountDTO;
-import com.casic.missiles.modular.system.dto.AlarmUpload;
-import com.casic.missiles.modular.system.entity.BusAlarm;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-import java.util.List;
-
-/**
- * <p>
- * 报警记录表 服务类
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface IBusAlarmService extends IService<BusAlarm> {
-
-    boolean alarmUpload(AlarmUpload alarmUpload);
-
-    Page<BusAlarm> listPage(Page<BusAlarm> page,QueryWrapper<BusAlarm> queryWrapper);
-
-    List<AlarmTypeCountDTO> alarmCount(Long projectId,String alarmStatus);
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IBusEventImageService.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IBusEventImageService.java
deleted file mode 100644
index b1187ed..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IBusEventImageService.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.casic.missiles.modular.system.service;
-
-import com.casic.missiles.modular.system.entity.BusEventImage;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-import java.util.List;
-
-/**
- * <p>
- * 事件图片表 服务类
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface IBusEventImageService extends IService<BusEventImage> {
-
-    boolean saveBusEventImages(Long eventId, List<BusEventImage> imageList);
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IBusEventService.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IBusEventService.java
deleted file mode 100644
index 85c48d0..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IBusEventService.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package com.casic.missiles.modular.system.service;
-
-import com.casic.missiles.modular.system.entity.BusEvent;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-/**
- * <p>
- * 事件表 服务类
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface IBusEventService extends IService<BusEvent> {
-
-    boolean saveBusEvent(BusEvent busEvent);
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IDeviceExtService.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IDeviceExtService.java
deleted file mode 100644
index 6fc5361..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IDeviceExtService.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package com.casic.missiles.modular.system.service;
-
-import com.casic.missiles.modular.system.dto.DeviceDetailDTO;
-import com.casic.missiles.modular.system.entity.DeviceExt;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-import java.util.List;
-
-/**
- * <p>
- * 设备扩展信息表（安全树） 服务类
- * </p>
- *
- * @author zyj
- * @since 2023-04-27
- */
-public interface IDeviceExtService extends IService<DeviceExt> {
-
-    boolean saveDeviceExt(DeviceDetailDTO deviceDetailDTO);
-
-    boolean updateDeviceExt(DeviceDetailDTO deviceDetailDTO);
-
-    boolean removeByDeviceIds(List<Long> deviceIds);
-
-    boolean setGasThreshold(String gasIp,String gasPort,String threshold);
-
-    String getGasThreshold(String gasIp,String gasPort);
-
-    Long selectByGasIpPort(String gasIp,String gasPort);
-
-    Long selectByCameraIpPort(String cameraIp,String cameraPort);
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java
index 9e62756..00a421d 100644
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java
@@ -1,32 +1,16 @@
 package com.casic.missiles.modular.system.service;
 
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.modular.system.dto.DeviceDetailDTO;
-import com.casic.missiles.modular.system.dto.HelmetInfoDTO;
 import com.casic.missiles.modular.system.entity.Device;
 import com.baomidou.mybatisplus.extension.service.IService;
 
-import java.util.List;
-
 /**
  * <p>
- *  服务类
+ * 设备记录表 服务类
  * </p>
  *
  * @author zyj
- * @since 2023-04-14
+ * @since 2023-05-25
  */
 public interface IDeviceService extends IService<Device> {
 
-    boolean saveDevice(DeviceDetailDTO deviceDetailDTO);
-
-    boolean updateDevice(DeviceDetailDTO deviceDetailDTO);
-
-    boolean deleteDevices(List<Long> deviceIds);
-
-    Page<DeviceDetailDTO> listPage(Page<DeviceDetailDTO> page, QueryWrapper<DeviceDetailDTO> queryWrapper, String status,Long projectId);
-
-    List<Long> selectProjectDevice(Long projectId);
-
 }
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IProjectDeviceService.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IProjectDeviceService.java
deleted file mode 100644
index 8599411..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IProjectDeviceService.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package com.casic.missiles.modular.system.service;
-
-import com.casic.missiles.modular.system.dto.DeviceLocationDTO;
-import com.casic.missiles.modular.system.entity.ProjectDevice;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-import java.util.List;
-
-/**
- * <p>
- *  服务类
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface IProjectDeviceService extends IService<ProjectDevice> {
-
-    boolean saveProjectDeviceList(Long projectId, List<ProjectDevice> projectDeviceList);
-
-    boolean updateProjectDeviceList(Long projectId, List<ProjectDevice> projectDeviceList);
-
-    boolean deleteByProjectId(Long projectId);
-
-    boolean deleteByProjectIds(List<Long> projectIds);
-
-    List<ProjectDevice> selectDetailByProjectId(Long projectId);
-
-    Long selectProjectIdByDevice(Long deviceId);
-
-    List<DeviceLocationDTO> selectDeviceLocationList(Long projectId);
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IProjectWorkerService.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IProjectWorkerService.java
deleted file mode 100644
index e921bc3..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IProjectWorkerService.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package com.casic.missiles.modular.system.service;
-
-import com.casic.missiles.modular.system.dto.WorkerLocationDTO;
-import com.casic.missiles.modular.system.entity.ProjectDevice;
-import com.casic.missiles.modular.system.entity.ProjectWorker;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-import java.util.List;
-
-/**
- * <p>
- *  服务类
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface IProjectWorkerService extends IService<ProjectWorker> {
-
-    boolean saveProjectWorkerList(Long projectId, List<ProjectWorker> projectWorkerList);
-
-    boolean updateProjectWorkerList(Long projectId, List<ProjectWorker> projectWorkerList);
-
-    boolean deleteByProjectId(Long projectId);
-
-    boolean deleteByProjectIds(List<Long> projectIds);
-
-    List<ProjectWorker> selectDetailByProjectId(Long projectId,String workerType);
-
-    List<WorkerLocationDTO> selectWorkerLocationDTO(Long projectId);
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IWorkSiteInfoService.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IWorkSiteInfoService.java
deleted file mode 100644
index 58a8590..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IWorkSiteInfoService.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package com.casic.missiles.modular.system.service;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.modular.system.dto.WorkSiteDetailDTO;
-import com.casic.missiles.modular.system.entity.WorkSiteInfo;
-import com.baomidou.mybatisplus.extension.service.IService;
-import java.util.List;
-/**
- * <p>
- * 作业现场表 服务类
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface IWorkSiteInfoService extends IService<WorkSiteInfo> {
-
-    boolean addWorkSiteInfo(WorkSiteDetailDTO workSiteDetailDTO);
-
-    boolean updateWorkSiteInfo(WorkSiteDetailDTO workSiteDetailDTO);
-
-    boolean deleteProjects(List<Long> projectIds);
-
-    WorkSiteDetailDTO getWorkSiteDetail(Long projectId);
-
-    Page<WorkSiteInfo> selectListPage(Page<WorkSiteInfo> page, QueryWrapper<WorkSiteInfo> queryWrapper);
-
-    boolean start(Long projectId);
-
-    boolean finish(Long projectId);
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IWorkerService.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IWorkerService.java
deleted file mode 100644
index 6c6ee98..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IWorkerService.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package com.casic.missiles.modular.system.service;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.modular.system.entity.Worker;
-import com.baomidou.mybatisplus.extension.service.IService;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * <p>
- *  服务类
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface IWorkerService extends IService<Worker> {
-
-    boolean addWorker(Worker worker,Long projectId);
-
-    Page<Worker> selectListPage(Page<Worker> page,QueryWrapper<Worker> ew);
-
-    Worker selectWorkerDetail(Long workerId);
-
-    List<String> faceRegister(String cameraIp,String cameraPort);
-
-    List<Worker> projectTempWorker(Long projectId);
-
-}

diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/AlarmController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/AlarmController.java
new file mode 100644
index 0000000..1795cf1
--- /dev/null
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/AlarmController.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.modular.system.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.stereotype.Controller;
+
+/**
+ * <p>
+ * 报警记录表 前端控制器
+ * </p>
+ *
+ * @author zyj
+ * @since 2023-05-25
+ */
+@Controller
+@RequestMapping("/system/alarm")
+public class AlarmController {
+
+}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusAlarmController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusAlarmController.java
deleted file mode 100644
index 1f82ebb..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusAlarmController.java
+++ /dev/null
@@ -1,102 +0,0 @@
-package com.casic.missiles.modular.system.controller;
-
-
-import cn.hutool.core.util.ObjectUtil;
-import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.core.base.controller.BaseController;
-import com.casic.missiles.core.page.PageFactory;
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.AlarmUpload;
-import com.casic.missiles.modular.system.dto.DeviceDetailDTO;
-import com.casic.missiles.modular.system.entity.BusAlarm;
-import com.casic.missiles.modular.system.service.IBusAlarmService;
-import io.swagger.annotations.*;
-import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.*;
-
-import org.springframework.stereotype.Controller;
-
-import static com.casic.missiles.model.response.ResponseData.DEFAULT_SUCCESS_MESSAGE;
-import static com.casic.missiles.modular.system.consts.AlarmConst.ALARM_STATUS_MANUAL_CANCEL;
-
-/**
- * <p>
- * 报警记录表 前端控制器
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@Api(tags = "报警管理接口")
-@Controller
-@RequestMapping("/alarm")
-@RequiredArgsConstructor
-public class BusAlarmController extends BaseController {
-
-    private final IBusAlarmService alarmService;
-
-    @ApiOperation("报警上报接口")
-    @PostMapping("/upload")
-    @ResponseBody
-    public Object upload(@RequestBody AlarmUpload alarmUpload){
-        alarmService.alarmUpload(alarmUpload);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("报警列表分页查询")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "workTitle", value = "作业名称",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "projectId", value = "作业ID",dataType = "Long", paramType = "query",example = "0"),
-            @ApiImplicitParam(name = "alarmStatus", value = "报警状态",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "projectState", value = "作业状态",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "alarmType", value = "报警类型",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "alarmStartTime", value = "报警开始时间",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "alarmEndTime", value = "报警结束时间",dataType = "String", paramType = "query")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = BusAlarm.class),
-    })
-    @GetMapping("/listPage")
-    @ResponseBody
-    public Object listPage(String workTitle,Long projectId,String alarmStatus,String projectState,String alarmType,String alarmStartTime,String alarmEndTime){
-        Page<BusAlarm> page = PageFactory.defaultPage();
-        QueryWrapper<BusAlarm> queryWrapper = new QueryWrapper<>();
-        if(StrUtil.isNotEmpty(workTitle)){
-            queryWrapper.like("p.WORK_TITLE",workTitle);
-        }
-        if(ObjectUtil.isNotEmpty(projectId)){
-            queryWrapper.eq("alarm.PROJECT_ID",projectId);
-        }
-        if(StrUtil.isNotEmpty(alarmStatus)){
-            queryWrapper.eq("alarm.ALARM_STATUS",alarmStatus);
-        }
-        if(StrUtil.isNotEmpty(projectState)){
-            queryWrapper.eq("p.PROJECT_STATE",projectState);
-        }
-        if(StrUtil.isNotEmpty(alarmType)){
-            queryWrapper.eq("alarm.ALARM_TYPE",alarmType);
-        }
-        if(StrUtil.isNotEmpty(alarmStartTime)){
-            queryWrapper.ge("alarm.ALARM_TIME",alarmStartTime);
-        }
-        if(StrUtil.isNotEmpty(alarmEndTime)){
-            queryWrapper.le("alarm.ALARM_TIME",alarmEndTime);
-        }
-        page = alarmService.listPage(page,queryWrapper);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-    @ApiOperation("消警")
-    @PostMapping("/cancel")
-    @ResponseBody
-    public Object cancel(@RequestParam("alarmId") Long alarmId){
-        UpdateWrapper<BusAlarm> updateWrapper = new UpdateWrapper<>();
-        updateWrapper.eq("ID",alarmId);
-        updateWrapper.set("ALARM_STATUS",ALARM_STATUS_MANUAL_CANCEL);
-        alarmService.update(updateWrapper);
-        return ResponseData.success();
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusEventController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusEventController.java
deleted file mode 100644
index dde5aad..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusEventController.java
+++ /dev/null
@@ -1,41 +0,0 @@
-package com.casic.missiles.modular.system.controller;
-
-
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.entity.BusEvent;
-import com.casic.missiles.modular.system.service.IBusEventService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.ResponseBody;
-
-/**
- * <p>
- * 事件表 前端控制器
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@Controller
-@RequestMapping("/event")
-@Api(tags = "事件上报")
-@RequiredArgsConstructor
-public class BusEventController {
-
-    private final IBusEventService eventService;
-
-    @ApiOperation("事件上报")
-    @PostMapping("add")
-    @ResponseBody
-    public Object add(@RequestBody BusEvent busEvent){
-        eventService.saveBusEvent(busEvent);
-        return ResponseData.success();
-    }
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
index 03abc5f..aa50d78 100644
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
@@ -1,121 +1,20 @@
 package com.casic.missiles.modular.system.controller;
 
 
-import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.core.base.controller.BaseController;
-import com.casic.missiles.core.page.PageFactory;
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.DeviceDetailDTO;
-import com.casic.missiles.modular.system.entity.Device;
-import com.casic.missiles.modular.system.service.IDeviceExtService;
-import com.casic.missiles.modular.system.service.IDeviceService;
-import io.swagger.annotations.*;
-import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.RequestMapping;
 
 import org.springframework.stereotype.Controller;
 
-import java.time.LocalDateTime;
-import java.util.Date;
-import java.util.List;
-
-import static com.casic.missiles.model.response.ResponseData.DEFAULT_SUCCESS_MESSAGE;
-
 /**
  * <p>
- *  前端控制器
+ * 设备记录表 前端控制器
  * </p>
  *
  * @author zyj
- * @since 2023-04-14
+ * @since 2023-05-25
  */
-@Api(tags = "设备管理接口")
-@RequiredArgsConstructor
 @Controller
-@RequestMapping("/device")
-public class DeviceController extends BaseController {
-    private final IDeviceService deviceService;
-    private final IDeviceExtService deviceExtService;
-
-    @ApiOperation("设备分页列表")
-    @ApiImplicitParams({
-        @ApiImplicitParam(name = "deviceType", value = "设备类型",dataType = "String", paramType = "query"),
-        @ApiImplicitParam(name = "deviceCode", value = "设备编号",dataType = "String", paramType = "query"),
-        @ApiImplicitParam(name = "status", value = "设备状态",dataType = "String", paramType = "query"),
-        @ApiImplicitParam(name = "projectId", value = "作业ID（如果传此参数，列表中返回该作业使用的设备）",dataType = "Long", paramType = "query", example = "0")
-    })
-    @ApiResponses({
-        @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = DeviceDetailDTO.class),
-    })
-    @GetMapping("listPage")
-    @ResponseBody
-    public Object listPage(String deviceType, String deviceCode, String status,Long projectId){
-        Page<DeviceDetailDTO> page = PageFactory.defaultPage();
-        QueryWrapper<DeviceDetailDTO> queryWrapper = new QueryWrapper<>();
-        if(StrUtil.isNotEmpty(deviceType)){
-            queryWrapper.eq("DEVICE_TYPE",deviceType);
-        }
-        if(StrUtil.isNotEmpty(deviceCode)){
-            queryWrapper.like("DEVICE_CODE",deviceCode);
-        }
-        page = deviceService.listPage(page,queryWrapper,status,projectId);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-    @ApiOperation("新增设备")
-    @PostMapping("add")
-    @ResponseBody
-    public Object add(@RequestBody DeviceDetailDTO deviceDetailDTO){
-        deviceService.saveDevice(deviceDetailDTO);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("编辑设备")
-    @PostMapping("update")
-    @ResponseBody
-    public Object update(@RequestBody DeviceDetailDTO deviceDetailDTO){
-        deviceService.updateDevice(deviceDetailDTO);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("删除设备")
-    @PostMapping("delete")
-    @ResponseBody
-    public Object delete(@ApiParam("设备id列表")@RequestBody List<Long> deviceIds){
-        deviceService.deleteDevices(deviceIds);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("设置甲烷阈值")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "gasIp", value = "安全树甲烷设备IP",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "gasPort", value = "安全树甲烷端口",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "threshold", value = "甲烷阈值",dataType = "String", paramType = "query")
-    })
-    @PostMapping("setThreshold")
-    @ResponseBody
-    public Object setThreshold(String gasIp,String gasPort,String threshold){
-        deviceExtService.setGasThreshold(gasIp, gasPort, threshold);
-        return ResponseData.success();
-    }
-
-
-    @ApiOperation("查询甲烷阈值")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "gasIp", value = "安全树甲烷设备IP",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "gasPort", value = "安全树甲烷端口",dataType = "String", paramType = "query")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = "{\"code\": 200,\"data\": \"100\",\"message\": \"请求成功\",\"success\": true}",response = String.class),
-    })
-    @GetMapping("getThreshold")
-    @ResponseBody
-    public Object getThreshold(String gasIp,String gasPort){
-        String data = deviceExtService.getGasThreshold(gasIp, gasPort);
-        return ResponseData.success(data);
-    }
-
+@RequestMapping("/system/device")
+public class DeviceController {
 
 }
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/OverviewController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/OverviewController.java
deleted file mode 100644
index 7570504..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/OverviewController.java
+++ /dev/null
@@ -1,70 +0,0 @@
-package com.casic.missiles.modular.system.controller;
-
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.AlarmTypeCountDTO;
-import com.casic.missiles.modular.system.dto.DeviceLocationDTO;
-import com.casic.missiles.modular.system.dto.WorkerLocationDTO;
-import com.casic.missiles.modular.system.service.IBusAlarmService;
-import com.casic.missiles.modular.system.service.IProjectDeviceService;
-import com.casic.missiles.modular.system.service.IProjectWorkerService;
-import io.swagger.annotations.*;
-import lombok.RequiredArgsConstructor;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.ResponseBody;
-
-import static com.casic.missiles.model.response.ResponseData.DEFAULT_SUCCESS_MESSAGE;
-import static com.casic.missiles.modular.system.consts.AlarmConst.ALARM_STATUS_ON;
-
-@Api(tags = "首页看板接口")
-@Controller
-@RequestMapping("overview")
-@RequiredArgsConstructor
-public class OverviewController {
-
-    private final IBusAlarmService alarmService;
-    private final IProjectDeviceService projectDeviceService;
-
-    private final IProjectWorkerService projectWorkerService;
-
-
-    @ApiOperation("报警统计接口")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "projectId", value = "作业ID",dataType = "Long", paramType = "query", example = "0")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = AlarmTypeCountDTO.class),
-    })
-    @GetMapping("/alarmCount")
-    @ResponseBody
-    public Object alarmCount(Long projectId){
-        return ResponseData.success(alarmService.alarmCount(projectId,ALARM_STATUS_ON));
-    }
-
-    @ApiOperation("设备列表接口")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "projectId", value = "作业ID",dataType = "Long", paramType = "query", example = "0")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = DeviceLocationDTO.class),
-    })
-    @GetMapping("/deviceList")
-    @ResponseBody
-    public Object deviceList(Long projectId){
-        return ResponseData.success(projectDeviceService.selectDeviceLocationList(projectId));
-    }
-
-    @ApiOperation("人员列表接口")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "projectId", value = "作业ID",dataType = "Long", paramType = "query", example = "0")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = WorkerLocationDTO.class),
-    })
-    @GetMapping("/workerList")
-    @ResponseBody
-    public Object workerList(Long projectId){
-        return ResponseData.success(projectWorkerService.selectWorkerLocationDTO(projectId));
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/WorkSiteInfoController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/WorkSiteInfoController.java
deleted file mode 100644
index af36d69..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/WorkSiteInfoController.java
+++ /dev/null
@@ -1,130 +0,0 @@
-package com.casic.missiles.modular.system.controller;
-
-
-import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.core.base.controller.BaseController;
-import com.casic.missiles.core.page.PageFactory;
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.WorkSiteDetailDTO;
-import com.casic.missiles.modular.system.entity.WorkSiteInfo;
-import com.casic.missiles.modular.system.service.IWorkSiteInfoService;
-import io.swagger.annotations.*;
-import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.*;
-
-import org.springframework.stereotype.Controller;
-
-import java.util.List;
-
-import static com.casic.missiles.model.response.ResponseData.DEFAULT_SUCCESS_MESSAGE;
-
-/**
- * <p>
- * 作业现场表 前端控制器
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@Controller
-@RequestMapping("/site")
-@Api(tags = "作业现场管理")
-@RequiredArgsConstructor
-public class WorkSiteInfoController extends BaseController {
-
-
-    private final IWorkSiteInfoService workSiteInfoService;
-
-    @ApiOperation("新增作业现场")
-    @PostMapping("add")
-    @ResponseBody
-    public Object addWorkSite(@RequestBody WorkSiteDetailDTO workSiteDetailDTO){
-        workSiteInfoService.addWorkSiteInfo(workSiteDetailDTO);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("编辑作业现场")
-    @PostMapping("update")
-    @ResponseBody
-    public Object updateWorkSite(@RequestBody WorkSiteDetailDTO workSiteDetailDTO){
-        workSiteInfoService.updateWorkSiteInfo(workSiteDetailDTO);
-        return ResponseData.success();
-    }
-
-
-    @ApiOperation("删除作业现场")
-    @PostMapping("delete")
-    @ResponseBody
-    public Object delete(@ApiParam("作业现场id列表")@RequestBody List<Long> projectIds){
-        workSiteInfoService.deleteProjects(projectIds);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("查询作业现场详情")
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = WorkSiteDetailDTO.class),
-    })
-    @GetMapping("detail")
-    @ResponseBody
-    public Object delete(@ApiParam(value = "作业现场id", example = "0")@RequestParam Long projectId){
-        WorkSiteDetailDTO detailDTO = workSiteInfoService.getWorkSiteDetail(projectId);
-        return ResponseData.success(detailDTO);
-    }
-
-    @ApiOperation("分页列表查询")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "workTitle",value = "作业名称", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "workRoad",value = "所属道路", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "workPersonName",value = "责任人姓名", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "startDate",value = "注册开始日期", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "endDate",value = "注册结束日期", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "projectState",value = "当前状态（字典值）", dataType = "String", paramType = "query")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = WorkSiteInfo.class),
-    })
-    @GetMapping("listPage")
-    @ResponseBody
-    public Object listPage(String workTitle,String workRoad,String workPersonName,String projectState,String startDate,String endDate){
-        Page<WorkSiteInfo> page = PageFactory.defaultPage();
-        QueryWrapper<WorkSiteInfo> queryWrapper = new QueryWrapper<>();
-        if(StrUtil.isNotEmpty(workTitle)){
-            queryWrapper.like("WORK_TITLE",workTitle);
-        }
-        if(StrUtil.isNotEmpty(workRoad)){
-            queryWrapper.like("WORK_ROAD",workRoad);
-        }
-        if(StrUtil.isNotEmpty(workPersonName)){
-            queryWrapper.like("WORKER_NAME",workPersonName);
-        }
-        if(StrUtil.isNotEmpty(projectState)){
-            queryWrapper.eq("PROJECT_STATE",projectState);
-        }
-        if(StrUtil.isNotEmpty(startDate)){
-            queryWrapper.ge("br_work_site_info.CREATE_TIME",startDate + " 00:00:00");
-        }
-        if(StrUtil.isNotEmpty(endDate)){
-            queryWrapper.le("br_work_site_info.CREATE_TIME",endDate + " 23:59:59");
-        }
-        page = workSiteInfoService.selectListPage(page,queryWrapper);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-    @ApiOperation("开始作业")
-    @PostMapping("start")
-    @ResponseBody
-    public Object start(@ApiParam(value = "作业现场id",example = "0")@RequestParam Long projectId){
-        workSiteInfoService.start(projectId);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("完成作业")
-    @PostMapping("finish")
-    @ResponseBody
-    public Object finish(@ApiParam(value = "作业现场id", example = "0")@RequestParam Long projectId){
-        workSiteInfoService.finish(projectId);
-        return ResponseData.success();
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/WorkerController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/WorkerController.java
deleted file mode 100644
index 796f94c..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/WorkerController.java
+++ /dev/null
@@ -1,136 +0,0 @@
-package com.casic.missiles.modular.system.controller;
-
-
-import cn.hutool.core.util.ObjectUtil;
-import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.core.base.controller.BaseController;
-import com.casic.missiles.core.page.PageFactory;
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.DeviceDetailDTO;
-import com.casic.missiles.modular.system.entity.Device;
-import com.casic.missiles.modular.system.entity.Worker;
-import com.casic.missiles.modular.system.service.IWorkerService;
-import io.swagger.annotations.*;
-import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.*;
-
-import org.springframework.stereotype.Controller;
-
-import java.util.Date;
-import java.util.List;
-
-import static com.casic.missiles.model.response.ResponseData.DEFAULT_SUCCESS_MESSAGE;
-
-/**
- * <p>
- *  前端控制器
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@Controller
-@RequestMapping("/worker")
-@RequiredArgsConstructor
-@Api(tags = "人员管理接口")
-public class WorkerController extends BaseController {
-
-    private final IWorkerService workerService;
-
-    @ApiOperation("分页列表查询")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "name",value = "姓名", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "deptId",value = "所属部门", dataType = "Long", paramType = "query", example = "0"),
-            @ApiImplicitParam(name = "status",value = "当前状态（字典值）", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "startDate",value = "注册开始日期", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "endDate",value = "注册结束日期", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "workerType",value = "人员类型（字典值）", dataType = "String", paramType = "query")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = Worker.class),
-    })
-    @GetMapping("listPage")
-    @ResponseBody
-    public Object listPage(String name,Long deptId, String status,String startDate,String endDate,String workerType){
-        Page<Worker> page = PageFactory.defaultPage();
-        QueryWrapper<Worker> queryWrapper = new QueryWrapper<>();
-        if(StrUtil.isNotEmpty(name)){
-            queryWrapper.like("WORKER_NAME",name);
-        }
-        if(ObjectUtil.isNotEmpty(deptId)){
-            queryWrapper.eq("DEPT_ID",deptId);
-        }
-        if(StrUtil.isNotEmpty(workerType)){
-            queryWrapper.eq("WORKER_TYPE",workerType);
-        }
-        if(StrUtil.isNotEmpty(startDate)){
-            queryWrapper.ge("CREATE_TIME",startDate + " 00:00:00");
-        }
-        if(StrUtil.isNotEmpty(endDate)){
-            queryWrapper.le("CREATE_TIME",endDate + " 23:59:59");
-        }
-        if(StrUtil.isNotEmpty(status)){
-            queryWrapper.eq("`STATUS`",status);
-        }
-        page = workerService.selectListPage(page,queryWrapper);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-    @ApiOperation("新增人员")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "worker", value = "人员信息", dataType = "Worker", paramType = "body", required = true),
-            @ApiImplicitParam(name = "projectId", value = "项目ID(入场申请需要)", dataType = "Long", paramType = "query", example = "0")
-    })
-    @PostMapping("add")
-    @ResponseBody
-    public Object add(@ApiParam("worker")@RequestBody Worker worker,
-                      @RequestParam(required = false) Long projectId){
-        workerService.addWorker(worker,projectId);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("编辑人员")
-    @PostMapping("update")
-    @ResponseBody
-    public Object update(@RequestBody Worker worker){
-        workerService.updateById(worker);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("删除人员")
-    @PostMapping("delete")
-    @ResponseBody
-    public Object delete(@ApiParam("人员id列表")@RequestBody List<Long> workIds){
-        workerService.removeByIds(workIds);
-        return ResponseData.success();
-    }
-
-
-    @ApiOperation(value = "获取人脸图片",notes = "返回人脸图片url")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "cameraIp",value = "摄像头IP", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "cameraPort",value = "摄像头端口号", dataType = "String", paramType = "query"),
-    })
-    @GetMapping("/face/register")
-    @ResponseBody
-    public Object faceRegister(String cameraIp,String cameraPort){
-        return ResponseData.success(workerService.faceRegister(cameraIp, cameraPort));
-    }
-
-
-    @ApiOperation(value = "查询临时入场人员列表")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "projectId", value = "项目ID",required = true,dataType = "Long", paramType = "query", example = "0")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = Worker.class),
-    })
-    @GetMapping("/projectTempWorker")
-    @ResponseBody
-    public Object projectTempWorker(Long projectId){
-        return ResponseData.success(workerService.projectTempWorker(projectId));
-    }
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/AlarmTypeCountDTO.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/AlarmTypeCountDTO.java
deleted file mode 100644
index 1a165a1..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/AlarmTypeCountDTO.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.casic.missiles.modular.system.dto;
-
-import io.swagger.annotations.ApiModel;
-import lombok.Data;
-
-@ApiModel(value = "AlarmTypeCountDTO",description = "报警类型统计（首页）")
-@Data
-public class AlarmTypeCountDTO {
-
-    private String alarmType;
-    private String alarmTypeName;
-    private Integer alarmCount;
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/AlarmUpload.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/AlarmUpload.java
deleted file mode 100644
index 73d7799..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/AlarmUpload.java
+++ /dev/null
@@ -1,46 +0,0 @@
-package com.casic.missiles.modular.system.dto;
-
-import cn.hutool.core.util.StrUtil;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-@ApiModel(value = "AlarmUpload",description = "报警上传")
-@Data
-public class AlarmUpload {
-
-    @ApiModelProperty(value = "摄像头ip")
-    private String cameraIp;
-
-    @ApiModelProperty(value = "摄像头端口")
-    private String cameraPort;
-    @ApiModelProperty(value = "安全树甲烷设备ip")
-    private String gasIp;
-    @ApiModelProperty(value = "安全树甲烷设备端口")
-    private String gasPort;
-    @ApiModelProperty(value = "报警值")
-    private String alarmValue;
-    @ApiModelProperty(value = "报警时间")
-    private String alarmTime;
-    @ApiModelProperty(value = "报警类型")
-    private String alarmType;
-    @ApiModelProperty(value = "报警图片")
-    private String alarmImage;
-    @ApiModelProperty(value = "报警内容")
-    private String alarmContent;
-
-    @Override
-    public String toString() {
-        return "AlarmUpload{" +
-                "cameraIp='" + cameraIp + '\'' +
-                ", cameraPort='" + cameraPort + '\'' +
-                ", gasIp='" + gasIp + '\'' +
-                ", gasPort='" + gasPort + '\'' +
-                ", alarmValue='" + alarmValue + '\'' +
-                ", alarmTime='" + alarmTime + '\'' +
-                ", alarmType='" + alarmType + '\'' +
-                ", alarmImage='" + (StrUtil.isNotEmpty(alarmImage) ? alarmImage.substring(0,50) : "null") + '\'' +
-                ", alarmContent='" + alarmContent + '\'' +
-                '}';
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/DeviceDetailDTO.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/DeviceDetailDTO.java
deleted file mode 100644
index ea518d9..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/DeviceDetailDTO.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package com.casic.missiles.modular.system.dto;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.casic.missiles.modular.system.entity.Device;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-@ApiModel("DeviceDetailDTO")
-@Data
-public class DeviceDetailDTO extends Device {
-
-    @ApiModelProperty(value = "摄像头编号")
-    private String cameraCode;
-
-    @ApiModelProperty(value = "摄像头IP")
-    private String cameraIp;
-
-    @ApiModelProperty(value = "摄像头端口")
-    private String cameraPort;
-
-    @ApiModelProperty(value = "激甲编号")
-    private String gasCode;
-
-    @ApiModelProperty(value = "激甲IP")
-    private String gasIp;
-
-    @ApiModelProperty(value = "激甲端口")
-    private String gasPort;
-
-    @ApiModelProperty(value = "智能帽衬编号")
-    private String hatLiningCode;
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/WorkSiteDetailDTO.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/WorkSiteDetailDTO.java
deleted file mode 100644
index 29378ff..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/WorkSiteDetailDTO.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package com.casic.missiles.modular.system.dto;
-
-import com.casic.missiles.modular.system.entity.ProjectDevice;
-import com.casic.missiles.modular.system.entity.ProjectWorker;
-import com.casic.missiles.modular.system.entity.WorkSiteInfo;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.util.List;
-
-@Data
-@ApiModel("WorkSiteDetailDTO")
-public class WorkSiteDetailDTO extends WorkSiteInfo {
-
-    @ApiModelProperty(value = "安全树列表",dataType = "ProjectDevice")
-    private List<ProjectDevice> deviceList;
-
-    @ApiModelProperty(value = "人员列表",dataType = "ProjectWorker")
-    private List<ProjectWorker> workerList;
-
-
-
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/WorkerLocationDTO.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/WorkerLocationDTO.java
deleted file mode 100644
index 6fd7b24..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/WorkerLocationDTO.java
+++ /dev/null
@@ -1,68 +0,0 @@
-package com.casic.missiles.modular.system.dto;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-@ApiModel(value = "WorkerLocationDTO",description = "人员位置列表（首页）")
-@Data
-public class WorkerLocationDTO {
-
-    @ApiModelProperty("人员ID")
-    private Long workerId;
-
-    @ApiModelProperty("人员姓名")
-    private String workerName;
-
-    @ApiModelProperty("安全帽编号")
-    private String hatCode;
-
-    @ApiModelProperty("安全帽ID")
-    private Long hatId;
-
-    @ApiModelProperty("背心编号")
-    private String vastCode;
-
-    @ApiModelProperty("手环编号")
-    private String braceletCode;
-
-    @ApiModelProperty("位置")
-    private String location;
-
-    @ApiModelProperty("时间")
-    private String time;
-
-    @ApiModelProperty("经度")
-    private String lng;
-
-    @ApiModelProperty("纬度")
-    private String lat;
-
-    @ApiModelProperty("心率")
-    private String heartRate;
-
-    @ApiModelProperty("血氧")
-    private String bloodOxygen;
-
-    @ApiModelProperty("一氧化碳")
-    private String co;
-
-    @ApiModelProperty("甲烷")
-    private String gas;
-
-    @ApiModelProperty("硫化氢")
-    private String h2s;
-
-    @ApiModelProperty("氧气")
-    private String o2;
-
-    @ApiModelProperty("信号")
-    private String signal;
-
-    @ApiModelProperty("电量")
-    private String cell;
-
-    @ApiModelProperty("是否报警")
-    private boolean alarmFlag;
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Alarm.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Alarm.java
new file mode 100644
index 0000000..4d2b7ef
--- /dev/null
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Alarm.java
@@ -0,0 +1,103 @@
+package com.casic.missiles.modular.system.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import java.util.Date;
+
+/**
+ * <p>
+ * 报警记录表
+ * </p>
+ *
+ * @author zyj
+ * @since 2023-05-25
+ */
+@Data
+@TableName("bus_alarm")
+public class Alarm implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    @TableId(value = "ID",type = IdType.ASSIGN_ID)
+    private Long id;
+
+    /**
+     * 设备ID
+     */
+    @TableField("DEVICE_ID")
+    private Long deviceId;
+
+    /**
+     * 报警类型
+     */
+    @TableField("ALARM_TYPE")
+    private String alarmType;
+
+    /**
+     * 报警时间
+     */
+    @TableField("ALARM_TIME")
+    private Date alarmTime;
+
+    /**
+     * 报警状态
+     */
+    @TableField("ALARM_STATUS")
+    private String alarmStatus;
+
+    /**
+     * 报警位置
+     */
+    @TableField("ALARM_LOCATION")
+    private String alarmLocation;
+
+    /**
+     * 报警图片
+     */
+    @TableField("ALARM_IMAGE")
+    private String alarmImage;
+
+    /**
+     * 视频通道号
+     */
+    @TableField("CHANNEL_NO")
+    private Integer channelNo;
+
+    /**
+     * 报警内容
+     */
+    @TableField("ALARM_CONTENT")
+    private String alarmContent;
+
+    /**
+     * 消警时间
+     */
+    @TableField("CANCEL_TIME")
+    private Date cancelTime;
+
+
+    @Override
+    public String toString() {
+        return "Alarm{" +
+            "id=" + id +
+            ", deviceId=" + deviceId +
+            ", alarmType=" + alarmType +
+            ", alarmTime=" + alarmTime +
+            ", alarmStatus=" + alarmStatus +
+            ", alarmLocation=" + alarmLocation +
+            ", alarmImage=" + alarmImage +
+            ", channelNo=" + channelNo +
+            ", alarmContent=" + alarmContent +
+            ", cancelTime=" + cancelTime +
+        "}";
+    }
+}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusAlarm.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusAlarm.java
deleted file mode 100644
index efb4a23..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusAlarm.java
+++ /dev/null
@@ -1,159 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.alibaba.fastjson.annotation.JSONField;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.time.LocalDateTime;
-import java.util.Date;
-
-/**
- * <p>
- * 报警记录表
- * </p>
- *
- * @author zyj
- * @since 2023-05-16
- */
-@Data
-@ApiModel("Alarm")
-@TableName("br_bus_alarm")
-public class BusAlarm implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 项目ID
-     */
-    @ApiModelProperty(value = "项目ID")
-    @TableField("PROJECT_ID")
-    private Long projectId;
-
-    /**
-     * 设备ID
-     */
-    @ApiModelProperty(value = "设备ID")
-    @TableField("DEVICE_ID")
-    private Long deviceId;
-
-    /**
-     * 报警类型
-     */
-    @ApiModelProperty(value = "报警类型")
-    @TableField("ALARM_TYPE")
-    private String alarmType;
-
-    /**
-     * 报警状态
-     */
-    @ApiModelProperty(value = "报警状态")
-    @TableField("ALARM_STATUS")
-    private String alarmStatus;
-
-    /**
-     * 报警值
-     */
-    @ApiModelProperty(value = "报警值")
-    @TableField("ALARM_VALUE")
-    private String alarmValue;
-
-    /**
-     * 报警图片
-     */
-    @ApiModelProperty(value = "报警图片")
-    @TableField("ALARM_IMAGE")
-    private String alarmImage;
-
-    /**
-     * 报警内容
-     */
-    @ApiModelProperty(value = "报警内容")
-    @TableField("ALARM_CONTENT")
-    private String alarmContent;
-
-    /**
-     * 报警时间
-     */
-    @ApiModelProperty(value = "报警时间")
-    @TableField("ALARM_TIME")
-    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
-    private Date alarmTime;
-
-    /**
-     * 消警时间
-     */
-    @ApiModelProperty(value = "消警时间")
-    @TableField("CANCEL_TIME")
-    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
-    private Date cancelTime;
-
-    /**
-     * 报警位置经度
-     */
-    @ApiModelProperty(value = "报警位置经度")
-    @TableField("ALARM_LNG")
-    private String alarmLng;
-
-    /**
-     * 报警位置纬度
-     */
-    @ApiModelProperty(value = "报警位置纬度")
-    @TableField("ALARM_LAT")
-    private String alarmLat;
-
-    @ApiModelProperty("报警类型名称")
-    @TableField(exist = false)
-    private String alarmStatusName;
-    @ApiModelProperty("报警类型名称")
-    @TableField(exist = false)
-    private String alarmTypeName;
-    @ApiModelProperty("作业名称")
-    @TableField(exist = false)
-    private String workTitle;
-    @ApiModelProperty("所属道路")
-    @TableField(exist = false)
-    private String workRoad;
-    @ApiModelProperty("作业状态")
-    @TableField(exist = false)
-    private String projectState;
-    @ApiModelProperty("作业状态名称")
-    @TableField(exist = false)
-    private String projectStateName;
-    @ApiModelProperty("负责人姓名")
-    @TableField(exist = false)
-    private String workPersonName;
-    @ApiModelProperty("负责人联系方式")
-    @TableField(exist = false)
-    private String workPersonPhoneNumber;
-
-
-    @Override
-    public String toString() {
-        return "BusAlarm{" +
-                "id=" + id +
-                ", projectId=" + projectId +
-                ", deviceId=" + deviceId +
-                ", alarmType=" + alarmType +
-                ", alarmValue=" + alarmValue +
-                ", alarmStatus=" + alarmStatus +
-                ", alarmImage=" + alarmImage +
-                ", alarmContent=" + alarmContent +
-                ", alarmTime=" + alarmTime +
-                ", cancelTime=" + cancelTime +
-                ", alarmLng=" + alarmLng +
-                ", alarmLat=" + alarmLat +
-                "}";
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusEvent.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusEvent.java
deleted file mode 100644
index a0b7543..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusEvent.java
+++ /dev/null
@@ -1,100 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.time.LocalDateTime;
-import java.util.Date;
-import java.util.List;
-
-/**
- * <p>
- * 事件表
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@TableName("br_bus_event")
-@Data
-@ApiModel("BusEvent")
-public class BusEvent implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @ApiModelProperty("事件ID")
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 事件标题
-     */
-    @ApiModelProperty("事件名称")
-    @TableField("EVENT_TITLE")
-    private String eventTitle;
-
-    /**
-     * 上报人员
-     */
-    @ApiModelProperty("上报人员")
-    @TableField("UPLOAD_NAME")
-    private String uploadName;
-
-    /**
-     * 联系方式
-     */
-    @ApiModelProperty("联系方式")
-    @TableField("PHONE_NUMBER")
-    private String phoneNumber;
-
-    /**
-     * 事件描述
-     */
-    @ApiModelProperty("事件描述")
-    @TableField("EVENT_DESCRIPTION")
-    private String eventDescription;
-
-    @ApiModelProperty("经度")
-    @TableField("LNG")
-    private String lng;
-
-    @ApiModelProperty("纬度")
-    @TableField("LAT")
-    private String lat;
-
-    /**
-     * 事件上传时间
-     */
-    @ApiModelProperty("事件上传时间")
-    @TableField("CREATE_TIME")
-    private Date createTime;
-
-    @ApiModelProperty("事件照片")
-    @TableField(exist = false)
-    private List<BusEventImage> imageList;
-
-
-
-    @Override
-    public String toString() {
-        return "BusEvent{" +
-            "id=" + id +
-            ", eventTitle=" + eventTitle +
-            ", uploadName=" + uploadName +
-            ", phoneNumber=" + phoneNumber +
-            ", eventDescription=" + eventDescription +
-            ", lng=" + lng +
-            ", lat=" + lat +
-            ", createTime=" + createTime +
-        "}";
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusEventImage.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusEventImage.java
deleted file mode 100644
index 1e75245..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusEventImage.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-
-/**
- * <p>
- * 事件图片表
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@TableName("br_bus_event_image")
-@Data
-@ApiModel("BusEventImage")
-public class BusEventImage implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 事件ID
-     */
-    @TableField("EVENT_ID")
-    private Long eventId;
-
-    /**
-     * 报警图片
-     */
-    @TableField("IMAGE")
-    @ApiModelProperty("图片url")
-    private String image;
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Device.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Device.java
index df89c70..ea7db5f 100644
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Device.java
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Device.java
@@ -1,30 +1,23 @@
 package com.casic.missiles.modular.system.entity;
 
-import com.alibaba.fastjson.annotation.JSONField;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.casic.missiles.core.base.json.DateDeserializer;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
-import java.util.Date;
 
 /**
  * <p>
- * 
+ * 设备记录表
  * </p>
  *
  * @author zyj
- * @since 2023-04-14
+ * @since 2023-05-25
  */
-@ApiModel("Device")
-@TableName("br_device")
 @Data
+@TableName("bus_device")
 public class Device implements Serializable {
 
     private static final long serialVersionUID = 1L;
@@ -32,82 +25,86 @@
     /**
      * 主键
      */
-    @ApiModelProperty(value = "设备ID")
     @TableId(value = "ID",type = IdType.ASSIGN_ID)
     private Long id;
 
     /**
-     * 设备编号
+     * 设备名称
      */
-    @ApiModelProperty(value = "设备编号")
-    @TableField("DEVICE_CODE")
-    private String deviceCode;
+    @TableField("DEVICE_NAME")
+    private String deviceName;
 
     /**
-     * 设备类型
+     * IP
      */
-    @ApiModelProperty(value = "设备类型")
-    @TableField("DEVICE_TYPE")
-    private String deviceType;
+    @TableField("IP")
+    private String ip;
 
     /**
-     * 设备批次
+     * 端口
      */
-    @ApiModelProperty(value = "设备批次")
-    @TableField("DEVICE_BATCH")
-    private String deviceBatch;
+    @TableField("PORT")
+    private String port;
 
     /**
-     * 厂家
+     * 用户名
      */
-    @ApiModelProperty(value = "厂家")
-    @TableField("MANUFACTURER")
-    private String manufacturer;
+    @TableField("USER_NAME")
+    private String userName;
 
     /**
-     * 是否供电
+     * 密码
      */
-    @ApiModelProperty(value = "是否供电")
-    @TableField("IS_POWER_SUPPLY")
-    private String isPowerSupply;
+    @TableField("PASSWORD")
+    private String password;
 
     /**
-     * 创建时间
+     * 连接类型
      */
-    @ApiModelProperty(value = "创建时间",dataType = "Date")
-    @TableField("CREATE_TIME")
-    private Date createTime;
+    @TableField("CONNECT_TYPE")
+    private String connectType;
 
-    @ApiModelProperty(value = "设备类型名称")
-    @TableField(exist = false)
-    private String deviceTypeName;
+    /**
+     * 位置
+     */
+    @TableField("LOCATION")
 
-    @ApiModelProperty(value = "是否供电名称")
-    @TableField(exist = false)
-    private String isPowerSupplyName;
+    private String location;
 
-    @ApiModelProperty(value = "注册时间",dataType = "String")
-    @TableField(exist = false)
-    private String registerTime;
+    /**
+     * 设备状态
+     */
+    @TableField("STATUS")
 
-    @ApiModelProperty(value = "当前状态")
-    @TableField(exist = false)
     private String status;
 
-    @ApiModelProperty(value = "当前状态名称")
-    @TableField(exist = false)
-    private String statusName;
+    /**
+     * 报警分组
+     */
+    @TableField("ALARM_GROUP")
+
+    private Long alarmGroup;
+
+    /**
+     * 视频通道数(预留)
+     */
+    @TableField("CHANNEL_NUM")
+    private Integer channelNum;
 
     @Override
     public String toString() {
         return "Device{" +
             "id=" + id +
-            ", deviceCode=" + deviceCode +
-            ", deviceType=" + deviceType +
-            ", deviceBatch=" + deviceBatch +
-            ", manufacturer=" + manufacturer +
-            ", isPowerSupply=" + isPowerSupply +
-            ", createTime=" + createTime +
+            ", deviceName=" + deviceName +
+            ", ip=" + ip +
+            ", port=" + port +
+            ", userName=" + userName +
+            ", password=" + password +
+            ", connectType=" + connectType +
+            ", location=" + location +
+            ", status=" + status +
+            ", alarmGroup=" + alarmGroup +
+            ", channelNum=" + channelNum +
         "}";
     }
 }
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/DeviceExt.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/DeviceExt.java
deleted file mode 100644
index 5ee7015..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/DeviceExt.java
+++ /dev/null
@@ -1,99 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-
-/**
- * <p>
- * 设备扩展信息表（安全树）
- * </p>
- *
- * @author zyj
- * @since 2023-04-27
- */
-@Data
-@TableName("br_device_ext")
-public class DeviceExt implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 设备ID
-     */
-    @TableField("DEVICE_ID")
-    private Long deviceId;
-
-    /**
-     * 摄像头编号
-     */
-    @TableField("CAMERA_CODE")
-    private String cameraCode;
-
-    /**
-     * 摄像头IP
-     */
-    @TableField("CAMERA_IP")
-    private String cameraIp;
-
-    /**
-     * 摄像头端口
-     */
-    @TableField("CAMERA_PORT")
-    private String cameraPort;
-
-    /**
-     * 激甲编号
-     */
-    @TableField("GAS_CODE")
-    private String gasCode;
-
-    /**
-     * 激甲IP
-     */
-    @TableField("GAS_IP")
-    private String gasIp;
-
-    /**
-     * 激甲端口
-     */
-    @TableField("GAS_PORT")
-    private String gasPort;
-
-    /**
-     * 甲烷报警阈值
-     */
-    @TableField("GAS_THRESHOLD")
-    private String gasThreshold;
-
-    @TableField(value = "HAT_LINING_CODE")
-    private String hatLiningCode;
-
-
-    @Override
-    public String toString() {
-        return "DeviceExt{" +
-            "id=" + id +
-            ", deviceId=" + deviceId +
-            ", cameraCode=" + cameraCode +
-            ", cameraIp=" + cameraIp +
-            ", cameraPort=" + cameraPort +
-            ", gasCode=" + gasCode +
-            ", gasIp=" + gasIp +
-            ", gasPort=" + gasPort +
-            ", gasThreshold=" + gasThreshold +
-            ", hatLiningCode=" + hatLiningCode +
-        "}";
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/ProjectDevice.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/ProjectDevice.java
deleted file mode 100644
index c4f3472..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/ProjectDevice.java
+++ /dev/null
@@ -1,62 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-
-/**
- * <p>
- * 
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@Data
-@ApiModel("ProjectDevice")
-@TableName("br_project_device")
-public class ProjectDevice implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 作业现场ID
-     */
-    @TableField("PROJECT_ID")
-    private Long projectId;
-
-    /**
-     * 设备ID
-     */
-    @TableField("DEVICE_ID")
-    @ApiModelProperty("设备ID（新增编辑时传）")
-    private Long deviceId;
-
-    /**
-     * 设备编号
-     */
-    @TableField(exist = false)
-    @ApiModelProperty("设备编号（详情中展示，新增编辑不用传）")
-    private String deviceCode;
-
-    @Override
-    public String toString() {
-        return "ProjectDevice{" +
-            "id=" + id +
-            ", projectId=" + projectId +
-            ", deviceId=" + deviceId +
-        "}";
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/ProjectWorker.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/ProjectWorker.java
deleted file mode 100644
index 10b23c4..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/ProjectWorker.java
+++ /dev/null
@@ -1,104 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import java.io.Serializable;
-
-/**
- * <p>
- * 
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@ApiModel("ProjectWorker")
-@TableName("br_project_worker")
-@Data
-@NoArgsConstructor
-@AllArgsConstructor
-public class ProjectWorker implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 作业现场ID
-     */
-    @TableField("PROJECT_ID")
-    private Long projectId;
-
-    /**
-     * 人员ID
-     */
-    @ApiModelProperty("人员ID")
-    @TableField("WORKER_ID")
-    private Long workerId;
-
-    /**
-     * 安全帽编号
-     */
-    @ApiModelProperty("安全帽编号")
-    @TableField("HAT_CODE")
-    private String hatCode;
-
-    /**
-     * 背心编号
-     */
-    @ApiModelProperty("背心编号")
-    @TableField("VAST_CODE")
-    private String vastCode;
-
-    /**
-     * 手环编号
-     */
-    @ApiModelProperty("手环编号")
-    @TableField("BRACELET_CODE")
-    private String braceletCode;
-
-    @ApiModelProperty("人员姓名（详情中展示，新增编辑不用传）")
-    @TableField(exist = false)
-    private String workerName;
-
-    @ApiModelProperty("人员部门ID（详情中展示，新增编辑不用传）")
-    @TableField(exist = false)
-    private String workerDeptId;
-
-    @ApiModelProperty("人员部门名称（详情中展示，新增编辑不用传）")
-    @TableField(exist = false)
-    private String workerDeptName;
-
-    @ApiModelProperty("人员联系方式（详情中展示，新增编辑不用传）")
-    @TableField(exist = false)
-    private String workerPhoneNumber;
-
-    public ProjectWorker(Long projectId, Long workerId) {
-        this.projectId = projectId;
-        this.workerId = workerId;
-    }
-
-    @Override
-    public String toString() {
-        return "ProjectWorker{" +
-            "id=" + id +
-            ", projectId=" + projectId +
-            ", workerId=" + workerId +
-            ", hatCode=" + hatCode +
-            ", vastCode=" + vastCode +
-            ", braceletCode=" + braceletCode +
-        "}";
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/WorkSiteInfo.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/WorkSiteInfo.java
deleted file mode 100644
index fa6f41d..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/WorkSiteInfo.java
+++ /dev/null
@@ -1,130 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.alibaba.fastjson.annotation.JSONField;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.time.LocalDateTime;
-import java.util.Date;
-
-/**
- * <p>
- * 作业现场表
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@ApiModel("WorkSiteInfo")
-@TableName("br_work_site_info")
-@Data
-public class WorkSiteInfo implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @ApiModelProperty("作业现场ID")
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 作业名称
-     */
-    @ApiModelProperty("作业名称")
-    @TableField("WORK_TITLE")
-    private String workTitle;
-
-    /**
-     * 责任人
-     */
-    @ApiModelProperty("责任人（人员ID）")
-    @TableField("WORK_PERSON")
-    private Long workPerson;
-
-    /**
-     * 作业描述
-     */
-    @ApiModelProperty("作业描述")
-    @TableField("WORK_SITE_DESC")
-    private String workSiteDesc;
-
-    /**
-     * 作业状态
-     */
-    @ApiModelProperty("作业状态")
-    @TableField("PROJECT_STATE")
-    private String projectState;
-
-    /**
-     * 所属道路
-     */
-    @ApiModelProperty("所属道路")
-    @TableField("WORK_ROAD")
-    private String workRoad;
-
-    @TableField("IMAGE_URL")
-    private String imageUrl;
-
-    @TableField("CREATE_TIME")
-    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
-    private Date createTime;
-    @TableField("UPDATE_TIME")
-    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
-    private Date updateTime;
-
-    @ApiModelProperty("开始时间")
-    @TableField("START_TIME")
-    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
-    private Date startTime;
-
-    @ApiModelProperty("结束时间")
-    @TableField("FINISH_TIME")
-    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
-    private Date finishTime;
-
-    @ApiModelProperty("负责人姓名（详情中使用，新增编辑不用传）")
-    @TableField(exist = false)
-    private String workPersonName;
-
-    @ApiModelProperty("负责人联系方式（详情中使用，新增编辑不用传）")
-    @TableField(exist = false)
-    private String workPersonPhoneNumber;
-
-    @ApiModelProperty("负责人所属部门ID（详情中使用，新增编辑不用传）")
-    @TableField(exist = false)
-    private Long workPersonDeptId;
-
-    @ApiModelProperty("负责人所属部门名称（详情中使用，新增编辑不用传）")
-    @TableField(exist = false)
-    private String workPersonDeptName;
-
-    @ApiModelProperty(value = "注册时间",dataType = "String")
-    @TableField(exist = false)
-    private String registerTime;
-
-    @ApiModelProperty("作业状态名称")
-    @TableField(exist = false)
-    private String projectStateName;
-
-    @Override
-    public String toString() {
-        return "WorkSiteInfo{" +
-            "id=" + id +
-            ", workTitle=" + workTitle +
-            ", workPerson=" + workPerson +
-            ", workSiteDesc=" + workSiteDesc +
-            ", projectState=" + projectState +
-            ", imageUrl=" + imageUrl +
-            ", updateTime=" + updateTime +
-            ", workRoad=" + workRoad +
-        "}";
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Worker.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Worker.java
deleted file mode 100644
index 28a4daa..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Worker.java
+++ /dev/null
@@ -1,147 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.time.LocalDateTime;
-import java.util.Date;
-
-/**
- * <p>
- * 
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@ApiModel("Worker")
-@TableName("br_worker")
-@Data
-public class Worker implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @ApiModelProperty(value = "人员ID")
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 姓名
-     */
-    @ApiModelProperty(value = "姓名")
-    @TableField("WORKER_NAME")
-    private String workerName;
-
-    /**
-     * 性别
-     */
-    @ApiModelProperty(value = "性别")
-    @TableField("GENDER")
-    private String gender;
-
-    /**
-     * 所属部门
-     */
-    @ApiModelProperty(value = "所属部门(人员管理)")
-    @TableField("DEPT_ID")
-    private Long deptId;
-
-    /**
-     * 所属单位
-     */
-    @ApiModelProperty(value = "所属单位(入场申请中使用)")
-    @TableField("OWNER_SHIP")
-    private String ownerShip;
-
-    /**
-     * 联系方式
-     */
-    @ApiModelProperty(value = "联系方式")
-    @TableField("PHONE_NUMBER")
-    private String phoneNumber;
-
-    /**
-     * 证件号
-     */
-    @ApiModelProperty(value = "证件号")
-    @TableField("ID_CARD_NUMBER")
-    private String idCardNumber;
-
-    /**
-     * 入场原因
-     */
-    @ApiModelProperty(value = "入场原因（入场申请中使用）")
-    @TableField("ENTER_REASON")
-    private String enterReason;
-
-    /**
-     * 入场人脸照片
-     */
-    @ApiModelProperty(value = "人脸照片（照片路径）")
-    @TableField("WORKER_AVATAR")
-    private String workerAvatar;
-
-    /**
-     * 申请入场时间
-     */
-    @ApiModelProperty(value = "注册时间/申请入场时间")
-    @TableField("CREATE_TIME")
-    private Date createTime;
-
-    /**
-     * 人员类型
-     */
-    @ApiModelProperty(value = "人员类型（区分人员管理和入场申请）")
-    @TableField("WORKER_TYPE")
-    private String workerType;
-
-    @ApiModelProperty(value = "性别名称")
-    @TableField(exist = false)
-    private String genderName;
-
-    @ApiModelProperty(value = "部门名称")
-    @TableField(exist = false)
-    private String deptName;
-
-    @ApiModelProperty(value = "注册时间",dataType = "String")
-    @TableField(exist = false)
-    private String registerTime;
-
-    @ApiModelProperty(value = "当前状态")
-    @TableField(exist = false)
-    private String status;
-
-    @ApiModelProperty(value = "当前状态名称")
-    @TableField(exist = false)
-    private String statusName;
-
-    @ApiModelProperty(value = "是否注册(0未注册；1已注册)",allowableValues = "0,1")
-    @TableField(exist = false)
-    private String isRegister;
-
-    @Override
-    public String toString() {
-        return "Worker{" +
-            "id=" + id +
-            ", workerName=" + workerName +
-            ", gender=" + gender +
-            ", deptId=" + deptId +
-            ", ownerShip=" + ownerShip +
-            ", phoneNumber=" + phoneNumber +
-            ", idCardNumber=" + idCardNumber +
-            ", enterReason=" + enterReason +
-            ", workerAvatar=" + workerAvatar +
-            ", createTime=" + createTime +
-            ", workerType=" + workerType +
-        "}";
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/AlarmMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/AlarmMapper.java
new file mode 100644
index 0000000..ea4c8be
--- /dev/null
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/AlarmMapper.java
@@ -0,0 +1,16 @@
+package com.casic.missiles.modular.system.mapper;
+
+import com.casic.missiles.modular.system.entity.Alarm;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 报警记录表 Mapper 接口
+ * </p>
+ *
+ * @author zyj
+ * @since 2023-05-25
+ */
+public interface AlarmMapper extends BaseMapper<Alarm> {
+
+}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/BusAlarmMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/BusAlarmMapper.java
deleted file mode 100644
index 9801742..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/BusAlarmMapper.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package com.casic.missiles.modular.system.mapper;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.modular.system.dto.AlarmTypeCountDTO;
-import com.casic.missiles.modular.system.entity.BusAlarm;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * <p>
- * 报警记录表 Mapper 接口
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface BusAlarmMapper extends BaseMapper<BusAlarm> {
-
-    Page<BusAlarm> listPage(Page<BusAlarm> page,@Param("ew")  QueryWrapper<BusAlarm> queryWrapper);
-
-    void cancelAlarm(@Param("deviceId")Long deviceId,@Param("alarmType") String alarmType);
-
-    List<AlarmTypeCountDTO> alarmCount(@Param("projectId")Long projectId, @Param("alarmStatus")String alarmStatus);
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/BusEventImageMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/BusEventImageMapper.java
deleted file mode 100644
index 9590b7d..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/BusEventImageMapper.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.casic.missiles.modular.system.mapper;
-
-import com.casic.missiles.modular.system.entity.BusEventImage;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * <p>
- * 事件图片表 Mapper 接口
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface BusEventImageMapper extends BaseMapper<BusEventImage> {
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/BusEventMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/BusEventMapper.java
deleted file mode 100644
index 3c85edf..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/BusEventMapper.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.casic.missiles.modular.system.mapper;
-
-import com.casic.missiles.modular.system.entity.BusEvent;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * <p>
- * 事件表 Mapper 接口
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface BusEventMapper extends BaseMapper<BusEvent> {
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/DeviceExtMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/DeviceExtMapper.java
deleted file mode 100644
index 4ca9212..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/DeviceExtMapper.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.casic.missiles.modular.system.mapper;
-
-import com.casic.missiles.modular.system.entity.DeviceExt;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * <p>
- * 设备扩展信息表（安全树） Mapper 接口
- * </p>
- *
- * @author zyj
- * @since 2023-04-27
- */
-public interface DeviceExtMapper extends BaseMapper<DeviceExt> {
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/DeviceMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/DeviceMapper.java
index 444c0c5..3d0bb02 100644
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/DeviceMapper.java
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/DeviceMapper.java
@@ -1,30 +1,16 @@
 package com.casic.missiles.modular.system.mapper;
 
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.modular.system.dto.DeviceDetailDTO;
-import com.casic.missiles.modular.system.dto.HelmetInfoDTO;
 import com.casic.missiles.modular.system.entity.Device;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
 
 /**
  * <p>
- *  Mapper 接口
+ * 设备记录表 Mapper 接口
  * </p>
  *
  * @author zyj
- * @since 2023-04-14
+ * @since 2023-05-25
  */
-@Mapper
 public interface DeviceMapper extends BaseMapper<Device> {
 
-    Page<DeviceDetailDTO> listDetailPage(Page<DeviceDetailDTO> page,@Param("ew") QueryWrapper<DeviceDetailDTO> ew);
-
-     List<Long> selectProjectDevice(@Param("projectId") Long projectId);
-
-    List<HelmetInfoDTO> selectHelmetList(@Param("deviceType")String deviceType);
 }
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/ProjectDeviceMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/ProjectDeviceMapper.java
deleted file mode 100644
index 1d0c14e..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/ProjectDeviceMapper.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package com.casic.missiles.modular.system.mapper;
-
-import com.casic.missiles.modular.system.dto.DeviceLocationDTO;
-import com.casic.missiles.modular.system.entity.ProjectDevice;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * <p>
- *  Mapper 接口
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface ProjectDeviceMapper extends BaseMapper<ProjectDevice> {
-     List<ProjectDevice> selectDetailByProjectId(@Param("projectId") Long projectId);
-
-     List<DeviceLocationDTO> selectDeviceLocationList(@Param("projectId") Long projectId);
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/ProjectWorkerMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/ProjectWorkerMapper.java
deleted file mode 100644
index 58583d1..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/ProjectWorkerMapper.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package com.casic.missiles.modular.system.mapper;
-
-import com.casic.missiles.modular.system.dto.WorkerLocationDTO;
-import com.casic.missiles.modular.system.entity.ProjectWorker;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * <p>
- *  Mapper 接口
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface ProjectWorkerMapper extends BaseMapper<ProjectWorker> {
-
-    List<ProjectWorker> selectDetailByProjectId(@Param("projectId") Long projectId,
-                                                @Param("workerType")String workerType);
-
-    List<WorkerLocationDTO> selectWorkerLocationList(@Param("projectId") Long projectId,
-                                                     @Param("workerType")String workerType);
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/WorkSiteInfoMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/WorkSiteInfoMapper.java
deleted file mode 100644
index a4934d2..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/WorkSiteInfoMapper.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.casic.missiles.modular.system.mapper;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.modular.system.entity.WorkSiteInfo;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Param;
-
-/**
- * <p>
- * 作业现场表 Mapper 接口
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface WorkSiteInfoMapper extends BaseMapper<WorkSiteInfo> {
-
-    Page<WorkSiteInfo> selectListPage(Page<WorkSiteInfo> page,@Param("ew") QueryWrapper<WorkSiteInfo> ew);
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/WorkerMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/WorkerMapper.java
deleted file mode 100644
index 258fb12..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/WorkerMapper.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package com.casic.missiles.modular.system.mapper;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.modular.system.dto.DeviceDetailDTO;
-import com.casic.missiles.modular.system.entity.Worker;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * <p>
- *  Mapper 接口
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface WorkerMapper extends BaseMapper<Worker> {
-
-
-    Page<Worker> selectListPage(Page<Worker> page, @Param("ew") QueryWrapper<Worker> ew);
-
-    List<String> selectWorkerAvatars(@Param("projectId")Long projectId);
-
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/AlarmMapper.xml b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/AlarmMapper.xml
new file mode 100644
index 0000000..25cb4ab
--- /dev/null
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/AlarmMapper.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.modular.system.mapper.AlarmMapper">
+
+</mapper>
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/BusAlarmMapper.xml b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/BusAlarmMapper.xml
deleted file mode 100644
index 595088a..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/BusAlarmMapper.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.casic.missiles.modular.system.mapper.BusAlarmMapper">
-
-    <select id="listPage" resultType="com.casic.missiles.modular.system.entity.BusAlarm">
-        SELECT
-            alarm.ID as id,
-            alarm.DEVICE_ID as deviceId,
-            alarm.PROJECT_ID as projectId,
-            alarm.ALARM_TYPE as alarmType,
-            alarm.ALARM_VALUE as alarmValue,
-            alarm.ALARM_STATUS as alarmStatus,
-            alarm.ALARM_IMAGE AS alarmImage,
-            alarm.ALARM_CONTENT as alarmContent,
-            alarm.ALARM_TIME as alarmTime,
-            alarm.CANCEL_TIME as cancelTime,
-            alarm.ALARM_LNG as alarmLng,
-            alarm.ALARM_LAT as alarmLat,
-            p.WORK_TITLE as workTitle,
-            p.WORK_ROAD as workRoad,
-            p.PROJECT_STATE as projectState,
-            w.WORKER_NAME as workPersonName,
-            w.PHONE_NUMBER as workPersonPhoneNumber
-        FROM
-            `br_bus_alarm` alarm
-                LEFT JOIN br_work_site_info p on alarm.PROJECT_ID = p.ID
-                LEFT JOIN br_worker w on p.WORK_PERSON = w.ID
-        <where>
-            <if test="ew != null">
-                ${ew.sqlSegment}
-            </if>
-        </where>
-    </select>
-
-    <select id="cancelAlarm">
-        update br_bus_alarm
-        set ALARM_STATUS = '1'
-        where DEVICE_ID = #{deviceId}
-          and ALARM_TYPE = #{alarmType}
-          and ALARM_STATUS = '0'
-    </select>
-
-    <select id="alarmCount" resultType="com.casic.missiles.modular.system.dto.AlarmTypeCountDTO">
-        SELECT
-            ALARM_TYPE as alarmType,
-            count(*) as alarmCount
-        from br_bus_alarm
-        <where>
-            <if test="projectId != null and projectId !=''">
-                and PROJECT_ID = #{projectId}
-            </if>
-            <if test="alarmStatus != null and alarmStatus !=''">
-                and ALARM_STATUS = #{alarmStatus}
-            </if>
-        </where>
-        group by ALARM_TYPE
-    </select>
-</mapper>
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/BusEventImageMapper.xml b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/BusEventImageMapper.xml
deleted file mode 100644
index fbc3db3..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/BusEventImageMapper.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.casic.missiles.modular.system.mapper.BusEventImageMapper">
-
-</mapper>
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/BusEventMapper.xml b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/BusEventMapper.xml
deleted file mode 100644
index 627d573..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/BusEventMapper.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.casic.missiles.modular.system.mapper.BusEventMapper">
-
-</mapper>
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/DeviceExtMapper.xml b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/DeviceExtMapper.xml
deleted file mode 100644
index 5321d1c..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/DeviceExtMapper.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.casic.missiles.modular.system.mapper.DeviceExtMapper">
-
-</mapper>
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/DeviceMapper.xml b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/DeviceMapper.xml
index 94262e1..88e7d01 100644
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/DeviceMapper.xml
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/DeviceMapper.xml
@@ -2,96 +2,4 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.casic.missiles.modular.system.mapper.DeviceMapper">
 
-    <select id="listDetailPage" resultType="com.casic.missiles.modular.system.dto.DeviceDetailDTO">
-        select
-        br_device.ID as id,
-        DEVICE_CODE as deviceCode,
-        DEVICE_TYPE as deviceType,
-        DEVICE_BATCH as deviceBatch,
-        MANUFACTURER as manufacturer,
-        IS_POWER_SUPPLY as isPowerSupply,
-        CREATE_TIME as createTime,
-        CAMERA_CODE as cameraCode,
-        CAMERA_IP as cameraIp,
-        CAMERA_PORT as cameraPort,
-        GAS_CODE as gasCode,
-        GAS_IP as gasIp,
-        GAS_PORT as gasPort,
-        HAT_LINING_CODE as hatLiningCode
-        from br_device
-        left join br_device_ext ext on ext.DEVICE_ID = br_device.ID
-        <where>
-            <if test="ew != null">
-                ${ew.sqlSegment}
-            </if>
-        </where>
-    </select>
-
-    <select id="selectProjectDevice" resultType="java.lang.Long">
-        with device_info as (
-            (SELECT
-            d.DEVICE_ID as DEVICE_ID,
-            d.PROJECT_ID as PROJECT_ID,
-            p.PROJECT_STATE as PROJECT_STATE
-            from br_project_device d
-            LEFT JOIN br_work_site_info p on p.ID = d.PROJECT_ID)
-
-            UNION ALL
-
-            (SELECT
-            d1.ID as DEVICE_ID,
-            w1.ID as PROJECT_ID,
-            w1.PROJECT_STATE as PROJECT_STATE
-            FROM br_project_worker pw1
-            LEFT JOIN br_device d1 on pw1.BRACELET_CODE = d1.DEVICE_CODE
-            LEFT JOIN br_work_site_info w1 on pw1.PROJECT_ID = w1.ID)
-
-            UNION ALL
-
-            (SELECT
-            d1.ID as DEVICE_ID,
-            w1.ID as PROJECT_ID,
-            w1.PROJECT_STATE as PROJECT_STATE
-            FROM br_project_worker pw1
-            LEFT JOIN br_device d1 on pw1.HAT_CODE = d1.DEVICE_CODE
-            LEFT JOIN br_work_site_info w1 on pw1.PROJECT_ID = w1.ID)
-
-
-            UNION ALL
-
-            (SELECT
-            d1.ID as DEVICE_ID,
-            w1.ID as PROJECT_ID,
-            w1.PROJECT_STATE as PROJECT_STATE
-            FROM br_project_worker pw1
-            LEFT JOIN br_device d1 on pw1.VAST_CODE = d1.DEVICE_CODE
-            LEFT JOIN br_work_site_info w1 on pw1.PROJECT_ID = w1.ID))
-
-        select DISTINCT DEVICE_ID from device_info
-        <where>
-            DEVICE_ID is not null
-            <choose>
-                <when test="projectId != null and projectId !=''">
-                    and PROJECT_ID = #{projectId}
-                </when>
-                <otherwise>
-                    AND PROJECT_STATE != '3'
-                </otherwise>
-            </choose>
-        </where>
-    </select>
-
-    <select id="selectHelmetList" resultType="com.casic.missiles.modular.system.dto.HelmetInfoDTO">
-        SELECT
-            a.ID AS deviceId,
-            a.DEVICE_CODE AS hatCode,
-            b.HAT_LINING_CODE AS hatLiningCode
-        FROM
-            br_device a
-                LEFT JOIN br_device_ext b ON a.ID = b.DEVICE_ID
-        WHERE
-            a.DEVICE_TYPE = #{deviceType}
-          AND a.DEVICE_CODE IS NOT NULL
-          AND b.HAT_LINING_CODE IS NOT NULL
-    </select>
 </mapper>
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/ProjectDeviceMapper.xml b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/ProjectDeviceMapper.xml
deleted file mode 100644
index c6d1c24..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/ProjectDeviceMapper.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.casic.missiles.modular.system.mapper.ProjectDeviceMapper">
-
-    <select id="selectDetailByProjectId" resultType="com.casic.missiles.modular.system.entity.ProjectDevice">
-        SELECT
-            pd.ID as id,
-            pd.PROJECT_ID as projectId,
-            pd.DEVICE_ID as deviceId,
-            d.DEVICE_CODE as deviceCode
-        from br_project_device pd
-        LEFT JOIN br_device d on pd.DEVICE_ID = d.ID
-        <where>
-            pd.PROJECT_ID = #{projectId}
-        </where>
-    </select>
-
-    <select id="selectDeviceLocationList" resultType="com.casic.missiles.modular.system.dto.DeviceLocationDTO">
-        SELECT
-        d.ID as deviceId,
-        d.DEVICE_TYPE as deviceType,
-        d.DEVICE_CODE as deviceCode,
-        if(EXISTS(select ID from br_bus_alarm WHERE DEVICE_ID = d.ID and ALARM_STATUS = '0'),true,false) as alarmFlag
-        FROM br_project_device pd, br_device d
-        where pd.DEVICE_ID = d.ID
-        and pd.PROJECT_ID = #{projectId}
-    </select>
-
-</mapper>
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/ProjectWorkerMapper.xml b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/ProjectWorkerMapper.xml
deleted file mode 100644
index 8d2de10..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/ProjectWorkerMapper.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.casic.missiles.modular.system.mapper.ProjectWorkerMapper">
-
-    <select id="selectDetailByProjectId" resultType="com.casic.missiles.modular.system.entity.ProjectWorker">
-        SELECT
-            pw.ID as id,
-            pw.PROJECT_ID as projectId,
-            pw.WORKER_ID as workerId,
-            w.WORKER_NAME as workerName,
-            w.DEPT_ID as workerDeptId,
-            pw.HAT_CODE as hatCode,
-            pw.VAST_CODE as vastCode,
-            pw.BRACELET_CODE as braceletCode,
-            w.PHONE_NUMBER as workerPhoneNumber
-        from br_project_worker pw
-        LEFT JOIN br_worker w on pw.WORKER_ID = w.ID
-        <where>
-            pw.PROJECT_ID = #{projectId}
-            <if test="workerType != null and workerType != ''">
-                and w.WORKER_TYPE = #{workerType}
-            </if>
-        </where>
-    </select>
-
-    <select id="selectWorkerLocationList" resultType="com.casic.missiles.modular.system.dto.WorkerLocationDTO">
-        select
-            w.ID as workerId,
-            w.WORKER_NAME as workerName,
-            pw.HAT_CODE as hatCode,
-            hd.ID as hatId,
-            pw.BRACELET_CODE as braceletCode,
-            pw.VAST_CODE as vastCode
-        from br_project_worker pw,br_worker w ,br_device hd
-        WHERE pw.WORKER_ID = w.ID
-          and pw.HAT_CODE = hd.DEVICE_CODE
-          and pw.PROJECT_ID = #{projectId}
-          and w.WORKER_TYPE = #{workerType}
-    </select>
-</mapper>
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/WorkSiteInfoMapper.xml b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/WorkSiteInfoMapper.xml
deleted file mode 100644
index 8f01326..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/WorkSiteInfoMapper.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.casic.missiles.modular.system.mapper.WorkSiteInfoMapper">
-
-    <select id="selectListPage" resultType="com.casic.missiles.modular.system.entity.WorkSiteInfo">
-        SELECT
-            br_work_site_info.ID AS id,
-            WORK_TITLE as workTitle,
-            WORK_ROAD as workRoad,
-            WORK_SITE_DESC as workSiteDesc,
-            WORK_PERSON as workPerson,
-            WORKER_NAME as workPersonName,
-            DEPT_ID as workPersonDeptId,
-            PHONE_NUMBER as workPersonPhoneNumber,
-            PROJECT_STATE as projectState,
-            br_work_site_info.CREATE_TIME AS createTime,
-            br_work_site_info.UPDATE_TIME AS updateTime
-        FROM br_work_site_info
-        LEFT JOIN br_worker w ON br_work_site_info.WORK_PERSON = w.ID
-        <where>
-            <if test="ew != null">
-                ${ew.sqlSegment}
-            </if>
-        </where>
-    </select>
-</mapper>
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/WorkerMapper.xml b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/WorkerMapper.xml
deleted file mode 100644
index 3e28b39..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/WorkerMapper.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.casic.missiles.modular.system.mapper.WorkerMapper">
-
-    <select id="selectListPage" resultType="com.casic.missiles.modular.system.entity.Worker">
-        WITH worker_project AS (
-            SELECT
-                w.id AS ID,
-                WORKER_NAME,
-                GENDER,
-                DEPT_ID,
-                OWNER_SHIP,
-                PHONE_NUMBER,
-                ID_CARD_NUMBER,
-                ENTER_REASON,
-                WORKER_AVATAR,
-                w.CREATE_TIME,
-                WORKER_TYPE,
-                IF( p.PROJECT_STATE != '3', 1, 0 ) AS `STATUS`
-            FROM br_worker w
-            LEFT JOIN br_project_worker pw ON w.ID = pw.WORKER_ID
-            LEFT JOIN br_work_site_info p ON pw.PROJECT_ID = p.ID
-        )
-
-        SELECT
-            ID AS id,
-            WORKER_NAME AS workerName,
-            GENDER AS gender,
-            DEPT_ID AS deptId,
-            OWNER_SHIP AS ownerShip,
-            PHONE_NUMBER AS phoneNumber,
-            ID_CARD_NUMBER AS idCardNumber,
-            ENTER_REASON AS enterReason,
-            WORKER_AVATAR AS workerAvatar,
-            CREATE_TIME AS createTime,
-            WORKER_TYPE AS workerType,
-            `STATUS` AS `status`
-        FROM worker_project
-        <where>
-            <if test="ew != null">
-                ${ew.sqlSegment}
-            </if>
-        </where>
-    </select>
-
-    <select id="selectWorkerAvatars" resultType="java.lang.String">
-        SELECT
-            WORKER_AVATAR
-        FROM
-            `br_worker`
-        WHERE
-        ID IN ( SELECT WORKER_ID FROM br_project_worker WHERE PROJECT_ID = #{projectId} )
-          AND WORKER_AVATAR IS NOT NULL
-          AND WORKER_AVATAR != ''
-    </select>
-</mapper>
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IAlarmService.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IAlarmService.java
new file mode 100644
index 0000000..8bc01f4
--- /dev/null
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IAlarmService.java
@@ -0,0 +1,16 @@
+package com.casic.missiles.modular.system.service;
+
+import com.casic.missiles.modular.system.entity.Alarm;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 报警记录表 服务类
+ * </p>
+ *
+ * @author zyj
+ * @since 2023-05-25
+ */
+public interface IAlarmService extends IService<Alarm> {
+
+}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IBusAlarmService.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IBusAlarmService.java
deleted file mode 100644
index f63c19c..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IBusAlarmService.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package com.casic.missiles.modular.system.service;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.modular.system.dto.AlarmTypeCountDTO;
-import com.casic.missiles.modular.system.dto.AlarmUpload;
-import com.casic.missiles.modular.system.entity.BusAlarm;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-import java.util.List;
-
-/**
- * <p>
- * 报警记录表 服务类
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface IBusAlarmService extends IService<BusAlarm> {
-
-    boolean alarmUpload(AlarmUpload alarmUpload);
-
-    Page<BusAlarm> listPage(Page<BusAlarm> page,QueryWrapper<BusAlarm> queryWrapper);
-
-    List<AlarmTypeCountDTO> alarmCount(Long projectId,String alarmStatus);
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IBusEventImageService.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IBusEventImageService.java
deleted file mode 100644
index b1187ed..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IBusEventImageService.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.casic.missiles.modular.system.service;
-
-import com.casic.missiles.modular.system.entity.BusEventImage;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-import java.util.List;
-
-/**
- * <p>
- * 事件图片表 服务类
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface IBusEventImageService extends IService<BusEventImage> {
-
-    boolean saveBusEventImages(Long eventId, List<BusEventImage> imageList);
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IBusEventService.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IBusEventService.java
deleted file mode 100644
index 85c48d0..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IBusEventService.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package com.casic.missiles.modular.system.service;
-
-import com.casic.missiles.modular.system.entity.BusEvent;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-/**
- * <p>
- * 事件表 服务类
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface IBusEventService extends IService<BusEvent> {
-
-    boolean saveBusEvent(BusEvent busEvent);
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IDeviceExtService.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IDeviceExtService.java
deleted file mode 100644
index 6fc5361..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IDeviceExtService.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package com.casic.missiles.modular.system.service;
-
-import com.casic.missiles.modular.system.dto.DeviceDetailDTO;
-import com.casic.missiles.modular.system.entity.DeviceExt;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-import java.util.List;
-
-/**
- * <p>
- * 设备扩展信息表（安全树） 服务类
- * </p>
- *
- * @author zyj
- * @since 2023-04-27
- */
-public interface IDeviceExtService extends IService<DeviceExt> {
-
-    boolean saveDeviceExt(DeviceDetailDTO deviceDetailDTO);
-
-    boolean updateDeviceExt(DeviceDetailDTO deviceDetailDTO);
-
-    boolean removeByDeviceIds(List<Long> deviceIds);
-
-    boolean setGasThreshold(String gasIp,String gasPort,String threshold);
-
-    String getGasThreshold(String gasIp,String gasPort);
-
-    Long selectByGasIpPort(String gasIp,String gasPort);
-
-    Long selectByCameraIpPort(String cameraIp,String cameraPort);
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java
index 9e62756..00a421d 100644
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java
@@ -1,32 +1,16 @@
 package com.casic.missiles.modular.system.service;
 
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.modular.system.dto.DeviceDetailDTO;
-import com.casic.missiles.modular.system.dto.HelmetInfoDTO;
 import com.casic.missiles.modular.system.entity.Device;
 import com.baomidou.mybatisplus.extension.service.IService;
 
-import java.util.List;
-
 /**
  * <p>
- *  服务类
+ * 设备记录表 服务类
  * </p>
  *
  * @author zyj
- * @since 2023-04-14
+ * @since 2023-05-25
  */
 public interface IDeviceService extends IService<Device> {
 
-    boolean saveDevice(DeviceDetailDTO deviceDetailDTO);
-
-    boolean updateDevice(DeviceDetailDTO deviceDetailDTO);
-
-    boolean deleteDevices(List<Long> deviceIds);
-
-    Page<DeviceDetailDTO> listPage(Page<DeviceDetailDTO> page, QueryWrapper<DeviceDetailDTO> queryWrapper, String status,Long projectId);
-
-    List<Long> selectProjectDevice(Long projectId);
-
 }
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IProjectDeviceService.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IProjectDeviceService.java
deleted file mode 100644
index 8599411..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IProjectDeviceService.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package com.casic.missiles.modular.system.service;
-
-import com.casic.missiles.modular.system.dto.DeviceLocationDTO;
-import com.casic.missiles.modular.system.entity.ProjectDevice;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-import java.util.List;
-
-/**
- * <p>
- *  服务类
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface IProjectDeviceService extends IService<ProjectDevice> {
-
-    boolean saveProjectDeviceList(Long projectId, List<ProjectDevice> projectDeviceList);
-
-    boolean updateProjectDeviceList(Long projectId, List<ProjectDevice> projectDeviceList);
-
-    boolean deleteByProjectId(Long projectId);
-
-    boolean deleteByProjectIds(List<Long> projectIds);
-
-    List<ProjectDevice> selectDetailByProjectId(Long projectId);
-
-    Long selectProjectIdByDevice(Long deviceId);
-
-    List<DeviceLocationDTO> selectDeviceLocationList(Long projectId);
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IProjectWorkerService.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IProjectWorkerService.java
deleted file mode 100644
index e921bc3..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IProjectWorkerService.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package com.casic.missiles.modular.system.service;
-
-import com.casic.missiles.modular.system.dto.WorkerLocationDTO;
-import com.casic.missiles.modular.system.entity.ProjectDevice;
-import com.casic.missiles.modular.system.entity.ProjectWorker;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-import java.util.List;
-
-/**
- * <p>
- *  服务类
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface IProjectWorkerService extends IService<ProjectWorker> {
-
-    boolean saveProjectWorkerList(Long projectId, List<ProjectWorker> projectWorkerList);
-
-    boolean updateProjectWorkerList(Long projectId, List<ProjectWorker> projectWorkerList);
-
-    boolean deleteByProjectId(Long projectId);
-
-    boolean deleteByProjectIds(List<Long> projectIds);
-
-    List<ProjectWorker> selectDetailByProjectId(Long projectId,String workerType);
-
-    List<WorkerLocationDTO> selectWorkerLocationDTO(Long projectId);
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IWorkSiteInfoService.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IWorkSiteInfoService.java
deleted file mode 100644
index 58a8590..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IWorkSiteInfoService.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package com.casic.missiles.modular.system.service;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.modular.system.dto.WorkSiteDetailDTO;
-import com.casic.missiles.modular.system.entity.WorkSiteInfo;
-import com.baomidou.mybatisplus.extension.service.IService;
-import java.util.List;
-/**
- * <p>
- * 作业现场表 服务类
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface IWorkSiteInfoService extends IService<WorkSiteInfo> {
-
-    boolean addWorkSiteInfo(WorkSiteDetailDTO workSiteDetailDTO);
-
-    boolean updateWorkSiteInfo(WorkSiteDetailDTO workSiteDetailDTO);
-
-    boolean deleteProjects(List<Long> projectIds);
-
-    WorkSiteDetailDTO getWorkSiteDetail(Long projectId);
-
-    Page<WorkSiteInfo> selectListPage(Page<WorkSiteInfo> page, QueryWrapper<WorkSiteInfo> queryWrapper);
-
-    boolean start(Long projectId);
-
-    boolean finish(Long projectId);
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IWorkerService.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IWorkerService.java
deleted file mode 100644
index 6c6ee98..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IWorkerService.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package com.casic.missiles.modular.system.service;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.modular.system.entity.Worker;
-import com.baomidou.mybatisplus.extension.service.IService;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * <p>
- *  服务类
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface IWorkerService extends IService<Worker> {
-
-    boolean addWorker(Worker worker,Long projectId);
-
-    Page<Worker> selectListPage(Page<Worker> page,QueryWrapper<Worker> ew);
-
-    Worker selectWorkerDetail(Long workerId);
-
-    List<String> faceRegister(String cameraIp,String cameraPort);
-
-    List<Worker> projectTempWorker(Long projectId);
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/impl/AlarmServiceImpl.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/impl/AlarmServiceImpl.java
new file mode 100644
index 0000000..6e5959b
--- /dev/null
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/impl/AlarmServiceImpl.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.modular.system.service.impl;
+
+import com.casic.missiles.modular.system.entity.Alarm;
+import com.casic.missiles.modular.system.mapper.AlarmMapper;
+import com.casic.missiles.modular.system.service.IAlarmService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 报警记录表 服务实现类
+ * </p>
+ *
+ * @author zyj
+ * @since 2023-05-25
+ */
+@Service
+public class AlarmServiceImpl extends ServiceImpl<AlarmMapper, Alarm> implements IAlarmService {
+
+}

diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/AlarmController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/AlarmController.java
new file mode 100644
index 0000000..1795cf1
--- /dev/null
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/AlarmController.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.modular.system.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.stereotype.Controller;
+
+/**
+ * <p>
+ * 报警记录表 前端控制器
+ * </p>
+ *
+ * @author zyj
+ * @since 2023-05-25
+ */
+@Controller
+@RequestMapping("/system/alarm")
+public class AlarmController {
+
+}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusAlarmController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusAlarmController.java
deleted file mode 100644
index 1f82ebb..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusAlarmController.java
+++ /dev/null
@@ -1,102 +0,0 @@
-package com.casic.missiles.modular.system.controller;
-
-
-import cn.hutool.core.util.ObjectUtil;
-import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.core.base.controller.BaseController;
-import com.casic.missiles.core.page.PageFactory;
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.AlarmUpload;
-import com.casic.missiles.modular.system.dto.DeviceDetailDTO;
-import com.casic.missiles.modular.system.entity.BusAlarm;
-import com.casic.missiles.modular.system.service.IBusAlarmService;
-import io.swagger.annotations.*;
-import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.*;
-
-import org.springframework.stereotype.Controller;
-
-import static com.casic.missiles.model.response.ResponseData.DEFAULT_SUCCESS_MESSAGE;
-import static com.casic.missiles.modular.system.consts.AlarmConst.ALARM_STATUS_MANUAL_CANCEL;
-
-/**
- * <p>
- * 报警记录表 前端控制器
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@Api(tags = "报警管理接口")
-@Controller
-@RequestMapping("/alarm")
-@RequiredArgsConstructor
-public class BusAlarmController extends BaseController {
-
-    private final IBusAlarmService alarmService;
-
-    @ApiOperation("报警上报接口")
-    @PostMapping("/upload")
-    @ResponseBody
-    public Object upload(@RequestBody AlarmUpload alarmUpload){
-        alarmService.alarmUpload(alarmUpload);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("报警列表分页查询")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "workTitle", value = "作业名称",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "projectId", value = "作业ID",dataType = "Long", paramType = "query",example = "0"),
-            @ApiImplicitParam(name = "alarmStatus", value = "报警状态",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "projectState", value = "作业状态",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "alarmType", value = "报警类型",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "alarmStartTime", value = "报警开始时间",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "alarmEndTime", value = "报警结束时间",dataType = "String", paramType = "query")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = BusAlarm.class),
-    })
-    @GetMapping("/listPage")
-    @ResponseBody
-    public Object listPage(String workTitle,Long projectId,String alarmStatus,String projectState,String alarmType,String alarmStartTime,String alarmEndTime){
-        Page<BusAlarm> page = PageFactory.defaultPage();
-        QueryWrapper<BusAlarm> queryWrapper = new QueryWrapper<>();
-        if(StrUtil.isNotEmpty(workTitle)){
-            queryWrapper.like("p.WORK_TITLE",workTitle);
-        }
-        if(ObjectUtil.isNotEmpty(projectId)){
-            queryWrapper.eq("alarm.PROJECT_ID",projectId);
-        }
-        if(StrUtil.isNotEmpty(alarmStatus)){
-            queryWrapper.eq("alarm.ALARM_STATUS",alarmStatus);
-        }
-        if(StrUtil.isNotEmpty(projectState)){
-            queryWrapper.eq("p.PROJECT_STATE",projectState);
-        }
-        if(StrUtil.isNotEmpty(alarmType)){
-            queryWrapper.eq("alarm.ALARM_TYPE",alarmType);
-        }
-        if(StrUtil.isNotEmpty(alarmStartTime)){
-            queryWrapper.ge("alarm.ALARM_TIME",alarmStartTime);
-        }
-        if(StrUtil.isNotEmpty(alarmEndTime)){
-            queryWrapper.le("alarm.ALARM_TIME",alarmEndTime);
-        }
-        page = alarmService.listPage(page,queryWrapper);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-    @ApiOperation("消警")
-    @PostMapping("/cancel")
-    @ResponseBody
-    public Object cancel(@RequestParam("alarmId") Long alarmId){
-        UpdateWrapper<BusAlarm> updateWrapper = new UpdateWrapper<>();
-        updateWrapper.eq("ID",alarmId);
-        updateWrapper.set("ALARM_STATUS",ALARM_STATUS_MANUAL_CANCEL);
-        alarmService.update(updateWrapper);
-        return ResponseData.success();
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusEventController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusEventController.java
deleted file mode 100644
index dde5aad..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusEventController.java
+++ /dev/null
@@ -1,41 +0,0 @@
-package com.casic.missiles.modular.system.controller;
-
-
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.entity.BusEvent;
-import com.casic.missiles.modular.system.service.IBusEventService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.ResponseBody;
-
-/**
- * <p>
- * 事件表 前端控制器
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@Controller
-@RequestMapping("/event")
-@Api(tags = "事件上报")
-@RequiredArgsConstructor
-public class BusEventController {
-
-    private final IBusEventService eventService;
-
-    @ApiOperation("事件上报")
-    @PostMapping("add")
-    @ResponseBody
-    public Object add(@RequestBody BusEvent busEvent){
-        eventService.saveBusEvent(busEvent);
-        return ResponseData.success();
-    }
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
index 03abc5f..aa50d78 100644
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
@@ -1,121 +1,20 @@
 package com.casic.missiles.modular.system.controller;
 
 
-import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.core.base.controller.BaseController;
-import com.casic.missiles.core.page.PageFactory;
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.DeviceDetailDTO;
-import com.casic.missiles.modular.system.entity.Device;
-import com.casic.missiles.modular.system.service.IDeviceExtService;
-import com.casic.missiles.modular.system.service.IDeviceService;
-import io.swagger.annotations.*;
-import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.RequestMapping;
 
 import org.springframework.stereotype.Controller;
 
-import java.time.LocalDateTime;
-import java.util.Date;
-import java.util.List;
-
-import static com.casic.missiles.model.response.ResponseData.DEFAULT_SUCCESS_MESSAGE;
-
 /**
  * <p>
- *  前端控制器
+ * 设备记录表 前端控制器
  * </p>
  *
  * @author zyj
- * @since 2023-04-14
+ * @since 2023-05-25
  */
-@Api(tags = "设备管理接口")
-@RequiredArgsConstructor
 @Controller
-@RequestMapping("/device")
-public class DeviceController extends BaseController {
-    private final IDeviceService deviceService;
-    private final IDeviceExtService deviceExtService;
-
-    @ApiOperation("设备分页列表")
-    @ApiImplicitParams({
-        @ApiImplicitParam(name = "deviceType", value = "设备类型",dataType = "String", paramType = "query"),
-        @ApiImplicitParam(name = "deviceCode", value = "设备编号",dataType = "String", paramType = "query"),
-        @ApiImplicitParam(name = "status", value = "设备状态",dataType = "String", paramType = "query"),
-        @ApiImplicitParam(name = "projectId", value = "作业ID（如果传此参数，列表中返回该作业使用的设备）",dataType = "Long", paramType = "query", example = "0")
-    })
-    @ApiResponses({
-        @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = DeviceDetailDTO.class),
-    })
-    @GetMapping("listPage")
-    @ResponseBody
-    public Object listPage(String deviceType, String deviceCode, String status,Long projectId){
-        Page<DeviceDetailDTO> page = PageFactory.defaultPage();
-        QueryWrapper<DeviceDetailDTO> queryWrapper = new QueryWrapper<>();
-        if(StrUtil.isNotEmpty(deviceType)){
-            queryWrapper.eq("DEVICE_TYPE",deviceType);
-        }
-        if(StrUtil.isNotEmpty(deviceCode)){
-            queryWrapper.like("DEVICE_CODE",deviceCode);
-        }
-        page = deviceService.listPage(page,queryWrapper,status,projectId);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-    @ApiOperation("新增设备")
-    @PostMapping("add")
-    @ResponseBody
-    public Object add(@RequestBody DeviceDetailDTO deviceDetailDTO){
-        deviceService.saveDevice(deviceDetailDTO);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("编辑设备")
-    @PostMapping("update")
-    @ResponseBody
-    public Object update(@RequestBody DeviceDetailDTO deviceDetailDTO){
-        deviceService.updateDevice(deviceDetailDTO);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("删除设备")
-    @PostMapping("delete")
-    @ResponseBody
-    public Object delete(@ApiParam("设备id列表")@RequestBody List<Long> deviceIds){
-        deviceService.deleteDevices(deviceIds);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("设置甲烷阈值")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "gasIp", value = "安全树甲烷设备IP",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "gasPort", value = "安全树甲烷端口",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "threshold", value = "甲烷阈值",dataType = "String", paramType = "query")
-    })
-    @PostMapping("setThreshold")
-    @ResponseBody
-    public Object setThreshold(String gasIp,String gasPort,String threshold){
-        deviceExtService.setGasThreshold(gasIp, gasPort, threshold);
-        return ResponseData.success();
-    }
-
-
-    @ApiOperation("查询甲烷阈值")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "gasIp", value = "安全树甲烷设备IP",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "gasPort", value = "安全树甲烷端口",dataType = "String", paramType = "query")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = "{\"code\": 200,\"data\": \"100\",\"message\": \"请求成功\",\"success\": true}",response = String.class),
-    })
-    @GetMapping("getThreshold")
-    @ResponseBody
-    public Object getThreshold(String gasIp,String gasPort){
-        String data = deviceExtService.getGasThreshold(gasIp, gasPort);
-        return ResponseData.success(data);
-    }
-
+@RequestMapping("/system/device")
+public class DeviceController {
 
 }
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/OverviewController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/OverviewController.java
deleted file mode 100644
index 7570504..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/OverviewController.java
+++ /dev/null
@@ -1,70 +0,0 @@
-package com.casic.missiles.modular.system.controller;
-
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.AlarmTypeCountDTO;
-import com.casic.missiles.modular.system.dto.DeviceLocationDTO;
-import com.casic.missiles.modular.system.dto.WorkerLocationDTO;
-import com.casic.missiles.modular.system.service.IBusAlarmService;
-import com.casic.missiles.modular.system.service.IProjectDeviceService;
-import com.casic.missiles.modular.system.service.IProjectWorkerService;
-import io.swagger.annotations.*;
-import lombok.RequiredArgsConstructor;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.ResponseBody;
-
-import static com.casic.missiles.model.response.ResponseData.DEFAULT_SUCCESS_MESSAGE;
-import static com.casic.missiles.modular.system.consts.AlarmConst.ALARM_STATUS_ON;
-
-@Api(tags = "首页看板接口")
-@Controller
-@RequestMapping("overview")
-@RequiredArgsConstructor
-public class OverviewController {
-
-    private final IBusAlarmService alarmService;
-    private final IProjectDeviceService projectDeviceService;
-
-    private final IProjectWorkerService projectWorkerService;
-
-
-    @ApiOperation("报警统计接口")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "projectId", value = "作业ID",dataType = "Long", paramType = "query", example = "0")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = AlarmTypeCountDTO.class),
-    })
-    @GetMapping("/alarmCount")
-    @ResponseBody
-    public Object alarmCount(Long projectId){
-        return ResponseData.success(alarmService.alarmCount(projectId,ALARM_STATUS_ON));
-    }
-
-    @ApiOperation("设备列表接口")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "projectId", value = "作业ID",dataType = "Long", paramType = "query", example = "0")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = DeviceLocationDTO.class),
-    })
-    @GetMapping("/deviceList")
-    @ResponseBody
-    public Object deviceList(Long projectId){
-        return ResponseData.success(projectDeviceService.selectDeviceLocationList(projectId));
-    }
-
-    @ApiOperation("人员列表接口")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "projectId", value = "作业ID",dataType = "Long", paramType = "query", example = "0")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = WorkerLocationDTO.class),
-    })
-    @GetMapping("/workerList")
-    @ResponseBody
-    public Object workerList(Long projectId){
-        return ResponseData.success(projectWorkerService.selectWorkerLocationDTO(projectId));
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/WorkSiteInfoController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/WorkSiteInfoController.java
deleted file mode 100644
index af36d69..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/WorkSiteInfoController.java
+++ /dev/null
@@ -1,130 +0,0 @@
-package com.casic.missiles.modular.system.controller;
-
-
-import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.core.base.controller.BaseController;
-import com.casic.missiles.core.page.PageFactory;
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.WorkSiteDetailDTO;
-import com.casic.missiles.modular.system.entity.WorkSiteInfo;
-import com.casic.missiles.modular.system.service.IWorkSiteInfoService;
-import io.swagger.annotations.*;
-import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.*;
-
-import org.springframework.stereotype.Controller;
-
-import java.util.List;
-
-import static com.casic.missiles.model.response.ResponseData.DEFAULT_SUCCESS_MESSAGE;
-
-/**
- * <p>
- * 作业现场表 前端控制器
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@Controller
-@RequestMapping("/site")
-@Api(tags = "作业现场管理")
-@RequiredArgsConstructor
-public class WorkSiteInfoController extends BaseController {
-
-
-    private final IWorkSiteInfoService workSiteInfoService;
-
-    @ApiOperation("新增作业现场")
-    @PostMapping("add")
-    @ResponseBody
-    public Object addWorkSite(@RequestBody WorkSiteDetailDTO workSiteDetailDTO){
-        workSiteInfoService.addWorkSiteInfo(workSiteDetailDTO);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("编辑作业现场")
-    @PostMapping("update")
-    @ResponseBody
-    public Object updateWorkSite(@RequestBody WorkSiteDetailDTO workSiteDetailDTO){
-        workSiteInfoService.updateWorkSiteInfo(workSiteDetailDTO);
-        return ResponseData.success();
-    }
-
-
-    @ApiOperation("删除作业现场")
-    @PostMapping("delete")
-    @ResponseBody
-    public Object delete(@ApiParam("作业现场id列表")@RequestBody List<Long> projectIds){
-        workSiteInfoService.deleteProjects(projectIds);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("查询作业现场详情")
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = WorkSiteDetailDTO.class),
-    })
-    @GetMapping("detail")
-    @ResponseBody
-    public Object delete(@ApiParam(value = "作业现场id", example = "0")@RequestParam Long projectId){
-        WorkSiteDetailDTO detailDTO = workSiteInfoService.getWorkSiteDetail(projectId);
-        return ResponseData.success(detailDTO);
-    }
-
-    @ApiOperation("分页列表查询")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "workTitle",value = "作业名称", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "workRoad",value = "所属道路", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "workPersonName",value = "责任人姓名", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "startDate",value = "注册开始日期", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "endDate",value = "注册结束日期", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "projectState",value = "当前状态（字典值）", dataType = "String", paramType = "query")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = WorkSiteInfo.class),
-    })
-    @GetMapping("listPage")
-    @ResponseBody
-    public Object listPage(String workTitle,String workRoad,String workPersonName,String projectState,String startDate,String endDate){
-        Page<WorkSiteInfo> page = PageFactory.defaultPage();
-        QueryWrapper<WorkSiteInfo> queryWrapper = new QueryWrapper<>();
-        if(StrUtil.isNotEmpty(workTitle)){
-            queryWrapper.like("WORK_TITLE",workTitle);
-        }
-        if(StrUtil.isNotEmpty(workRoad)){
-            queryWrapper.like("WORK_ROAD",workRoad);
-        }
-        if(StrUtil.isNotEmpty(workPersonName)){
-            queryWrapper.like("WORKER_NAME",workPersonName);
-        }
-        if(StrUtil.isNotEmpty(projectState)){
-            queryWrapper.eq("PROJECT_STATE",projectState);
-        }
-        if(StrUtil.isNotEmpty(startDate)){
-            queryWrapper.ge("br_work_site_info.CREATE_TIME",startDate + " 00:00:00");
-        }
-        if(StrUtil.isNotEmpty(endDate)){
-            queryWrapper.le("br_work_site_info.CREATE_TIME",endDate + " 23:59:59");
-        }
-        page = workSiteInfoService.selectListPage(page,queryWrapper);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-    @ApiOperation("开始作业")
-    @PostMapping("start")
-    @ResponseBody
-    public Object start(@ApiParam(value = "作业现场id",example = "0")@RequestParam Long projectId){
-        workSiteInfoService.start(projectId);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("完成作业")
-    @PostMapping("finish")
-    @ResponseBody
-    public Object finish(@ApiParam(value = "作业现场id", example = "0")@RequestParam Long projectId){
-        workSiteInfoService.finish(projectId);
-        return ResponseData.success();
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/WorkerController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/WorkerController.java
deleted file mode 100644
index 796f94c..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/WorkerController.java
+++ /dev/null
@@ -1,136 +0,0 @@
-package com.casic.missiles.modular.system.controller;
-
-
-import cn.hutool.core.util.ObjectUtil;
-import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.core.base.controller.BaseController;
-import com.casic.missiles.core.page.PageFactory;
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.DeviceDetailDTO;
-import com.casic.missiles.modular.system.entity.Device;
-import com.casic.missiles.modular.system.entity.Worker;
-import com.casic.missiles.modular.system.service.IWorkerService;
-import io.swagger.annotations.*;
-import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.*;
-
-import org.springframework.stereotype.Controller;
-
-import java.util.Date;
-import java.util.List;
-
-import static com.casic.missiles.model.response.ResponseData.DEFAULT_SUCCESS_MESSAGE;
-
-/**
- * <p>
- *  前端控制器
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@Controller
-@RequestMapping("/worker")
-@RequiredArgsConstructor
-@Api(tags = "人员管理接口")
-public class WorkerController extends BaseController {
-
-    private final IWorkerService workerService;
-
-    @ApiOperation("分页列表查询")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "name",value = "姓名", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "deptId",value = "所属部门", dataType = "Long", paramType = "query", example = "0"),
-            @ApiImplicitParam(name = "status",value = "当前状态（字典值）", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "startDate",value = "注册开始日期", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "endDate",value = "注册结束日期", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "workerType",value = "人员类型（字典值）", dataType = "String", paramType = "query")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = Worker.class),
-    })
-    @GetMapping("listPage")
-    @ResponseBody
-    public Object listPage(String name,Long deptId, String status,String startDate,String endDate,String workerType){
-        Page<Worker> page = PageFactory.defaultPage();
-        QueryWrapper<Worker> queryWrapper = new QueryWrapper<>();
-        if(StrUtil.isNotEmpty(name)){
-            queryWrapper.like("WORKER_NAME",name);
-        }
-        if(ObjectUtil.isNotEmpty(deptId)){
-            queryWrapper.eq("DEPT_ID",deptId);
-        }
-        if(StrUtil.isNotEmpty(workerType)){
-            queryWrapper.eq("WORKER_TYPE",workerType);
-        }
-        if(StrUtil.isNotEmpty(startDate)){
-            queryWrapper.ge("CREATE_TIME",startDate + " 00:00:00");
-        }
-        if(StrUtil.isNotEmpty(endDate)){
-            queryWrapper.le("CREATE_TIME",endDate + " 23:59:59");
-        }
-        if(StrUtil.isNotEmpty(status)){
-            queryWrapper.eq("`STATUS`",status);
-        }
-        page = workerService.selectListPage(page,queryWrapper);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-    @ApiOperation("新增人员")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "worker", value = "人员信息", dataType = "Worker", paramType = "body", required = true),
-            @ApiImplicitParam(name = "projectId", value = "项目ID(入场申请需要)", dataType = "Long", paramType = "query", example = "0")
-    })
-    @PostMapping("add")
-    @ResponseBody
-    public Object add(@ApiParam("worker")@RequestBody Worker worker,
-                      @RequestParam(required = false) Long projectId){
-        workerService.addWorker(worker,projectId);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("编辑人员")
-    @PostMapping("update")
-    @ResponseBody
-    public Object update(@RequestBody Worker worker){
-        workerService.updateById(worker);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("删除人员")
-    @PostMapping("delete")
-    @ResponseBody
-    public Object delete(@ApiParam("人员id列表")@RequestBody List<Long> workIds){
-        workerService.removeByIds(workIds);
-        return ResponseData.success();
-    }
-
-
-    @ApiOperation(value = "获取人脸图片",notes = "返回人脸图片url")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "cameraIp",value = "摄像头IP", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "cameraPort",value = "摄像头端口号", dataType = "String", paramType = "query"),
-    })
-    @GetMapping("/face/register")
-    @ResponseBody
-    public Object faceRegister(String cameraIp,String cameraPort){
-        return ResponseData.success(workerService.faceRegister(cameraIp, cameraPort));
-    }
-
-
-    @ApiOperation(value = "查询临时入场人员列表")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "projectId", value = "项目ID",required = true,dataType = "Long", paramType = "query", example = "0")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = Worker.class),
-    })
-    @GetMapping("/projectTempWorker")
-    @ResponseBody
-    public Object projectTempWorker(Long projectId){
-        return ResponseData.success(workerService.projectTempWorker(projectId));
-    }
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/AlarmTypeCountDTO.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/AlarmTypeCountDTO.java
deleted file mode 100644
index 1a165a1..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/AlarmTypeCountDTO.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.casic.missiles.modular.system.dto;
-
-import io.swagger.annotations.ApiModel;
-import lombok.Data;
-
-@ApiModel(value = "AlarmTypeCountDTO",description = "报警类型统计（首页）")
-@Data
-public class AlarmTypeCountDTO {
-
-    private String alarmType;
-    private String alarmTypeName;
-    private Integer alarmCount;
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/AlarmUpload.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/AlarmUpload.java
deleted file mode 100644
index 73d7799..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/AlarmUpload.java
+++ /dev/null
@@ -1,46 +0,0 @@
-package com.casic.missiles.modular.system.dto;
-
-import cn.hutool.core.util.StrUtil;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-@ApiModel(value = "AlarmUpload",description = "报警上传")
-@Data
-public class AlarmUpload {
-
-    @ApiModelProperty(value = "摄像头ip")
-    private String cameraIp;
-
-    @ApiModelProperty(value = "摄像头端口")
-    private String cameraPort;
-    @ApiModelProperty(value = "安全树甲烷设备ip")
-    private String gasIp;
-    @ApiModelProperty(value = "安全树甲烷设备端口")
-    private String gasPort;
-    @ApiModelProperty(value = "报警值")
-    private String alarmValue;
-    @ApiModelProperty(value = "报警时间")
-    private String alarmTime;
-    @ApiModelProperty(value = "报警类型")
-    private String alarmType;
-    @ApiModelProperty(value = "报警图片")
-    private String alarmImage;
-    @ApiModelProperty(value = "报警内容")
-    private String alarmContent;
-
-    @Override
-    public String toString() {
-        return "AlarmUpload{" +
-                "cameraIp='" + cameraIp + '\'' +
-                ", cameraPort='" + cameraPort + '\'' +
-                ", gasIp='" + gasIp + '\'' +
-                ", gasPort='" + gasPort + '\'' +
-                ", alarmValue='" + alarmValue + '\'' +
-                ", alarmTime='" + alarmTime + '\'' +
-                ", alarmType='" + alarmType + '\'' +
-                ", alarmImage='" + (StrUtil.isNotEmpty(alarmImage) ? alarmImage.substring(0,50) : "null") + '\'' +
-                ", alarmContent='" + alarmContent + '\'' +
-                '}';
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/DeviceDetailDTO.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/DeviceDetailDTO.java
deleted file mode 100644
index ea518d9..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/DeviceDetailDTO.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package com.casic.missiles.modular.system.dto;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.casic.missiles.modular.system.entity.Device;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-@ApiModel("DeviceDetailDTO")
-@Data
-public class DeviceDetailDTO extends Device {
-
-    @ApiModelProperty(value = "摄像头编号")
-    private String cameraCode;
-
-    @ApiModelProperty(value = "摄像头IP")
-    private String cameraIp;
-
-    @ApiModelProperty(value = "摄像头端口")
-    private String cameraPort;
-
-    @ApiModelProperty(value = "激甲编号")
-    private String gasCode;
-
-    @ApiModelProperty(value = "激甲IP")
-    private String gasIp;
-
-    @ApiModelProperty(value = "激甲端口")
-    private String gasPort;
-
-    @ApiModelProperty(value = "智能帽衬编号")
-    private String hatLiningCode;
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/WorkSiteDetailDTO.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/WorkSiteDetailDTO.java
deleted file mode 100644
index 29378ff..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/WorkSiteDetailDTO.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package com.casic.missiles.modular.system.dto;
-
-import com.casic.missiles.modular.system.entity.ProjectDevice;
-import com.casic.missiles.modular.system.entity.ProjectWorker;
-import com.casic.missiles.modular.system.entity.WorkSiteInfo;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.util.List;
-
-@Data
-@ApiModel("WorkSiteDetailDTO")
-public class WorkSiteDetailDTO extends WorkSiteInfo {
-
-    @ApiModelProperty(value = "安全树列表",dataType = "ProjectDevice")
-    private List<ProjectDevice> deviceList;
-
-    @ApiModelProperty(value = "人员列表",dataType = "ProjectWorker")
-    private List<ProjectWorker> workerList;
-
-
-
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/WorkerLocationDTO.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/WorkerLocationDTO.java
deleted file mode 100644
index 6fd7b24..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/WorkerLocationDTO.java
+++ /dev/null
@@ -1,68 +0,0 @@
-package com.casic.missiles.modular.system.dto;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-@ApiModel(value = "WorkerLocationDTO",description = "人员位置列表（首页）")
-@Data
-public class WorkerLocationDTO {
-
-    @ApiModelProperty("人员ID")
-    private Long workerId;
-
-    @ApiModelProperty("人员姓名")
-    private String workerName;
-
-    @ApiModelProperty("安全帽编号")
-    private String hatCode;
-
-    @ApiModelProperty("安全帽ID")
-    private Long hatId;
-
-    @ApiModelProperty("背心编号")
-    private String vastCode;
-
-    @ApiModelProperty("手环编号")
-    private String braceletCode;
-
-    @ApiModelProperty("位置")
-    private String location;
-
-    @ApiModelProperty("时间")
-    private String time;
-
-    @ApiModelProperty("经度")
-    private String lng;
-
-    @ApiModelProperty("纬度")
-    private String lat;
-
-    @ApiModelProperty("心率")
-    private String heartRate;
-
-    @ApiModelProperty("血氧")
-    private String bloodOxygen;
-
-    @ApiModelProperty("一氧化碳")
-    private String co;
-
-    @ApiModelProperty("甲烷")
-    private String gas;
-
-    @ApiModelProperty("硫化氢")
-    private String h2s;
-
-    @ApiModelProperty("氧气")
-    private String o2;
-
-    @ApiModelProperty("信号")
-    private String signal;
-
-    @ApiModelProperty("电量")
-    private String cell;
-
-    @ApiModelProperty("是否报警")
-    private boolean alarmFlag;
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Alarm.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Alarm.java
new file mode 100644
index 0000000..4d2b7ef
--- /dev/null
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Alarm.java
@@ -0,0 +1,103 @@
+package com.casic.missiles.modular.system.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import java.util.Date;
+
+/**
+ * <p>
+ * 报警记录表
+ * </p>
+ *
+ * @author zyj
+ * @since 2023-05-25
+ */
+@Data
+@TableName("bus_alarm")
+public class Alarm implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    @TableId(value = "ID",type = IdType.ASSIGN_ID)
+    private Long id;
+
+    /**
+     * 设备ID
+     */
+    @TableField("DEVICE_ID")
+    private Long deviceId;
+
+    /**
+     * 报警类型
+     */
+    @TableField("ALARM_TYPE")
+    private String alarmType;
+
+    /**
+     * 报警时间
+     */
+    @TableField("ALARM_TIME")
+    private Date alarmTime;
+
+    /**
+     * 报警状态
+     */
+    @TableField("ALARM_STATUS")
+    private String alarmStatus;
+
+    /**
+     * 报警位置
+     */
+    @TableField("ALARM_LOCATION")
+    private String alarmLocation;
+
+    /**
+     * 报警图片
+     */
+    @TableField("ALARM_IMAGE")
+    private String alarmImage;
+
+    /**
+     * 视频通道号
+     */
+    @TableField("CHANNEL_NO")
+    private Integer channelNo;
+
+    /**
+     * 报警内容
+     */
+    @TableField("ALARM_CONTENT")
+    private String alarmContent;
+
+    /**
+     * 消警时间
+     */
+    @TableField("CANCEL_TIME")
+    private Date cancelTime;
+
+
+    @Override
+    public String toString() {
+        return "Alarm{" +
+            "id=" + id +
+            ", deviceId=" + deviceId +
+            ", alarmType=" + alarmType +
+            ", alarmTime=" + alarmTime +
+            ", alarmStatus=" + alarmStatus +
+            ", alarmLocation=" + alarmLocation +
+            ", alarmImage=" + alarmImage +
+            ", channelNo=" + channelNo +
+            ", alarmContent=" + alarmContent +
+            ", cancelTime=" + cancelTime +
+        "}";
+    }
+}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusAlarm.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusAlarm.java
deleted file mode 100644
index efb4a23..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusAlarm.java
+++ /dev/null
@@ -1,159 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.alibaba.fastjson.annotation.JSONField;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.time.LocalDateTime;
-import java.util.Date;
-
-/**
- * <p>
- * 报警记录表
- * </p>
- *
- * @author zyj
- * @since 2023-05-16
- */
-@Data
-@ApiModel("Alarm")
-@TableName("br_bus_alarm")
-public class BusAlarm implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 项目ID
-     */
-    @ApiModelProperty(value = "项目ID")
-    @TableField("PROJECT_ID")
-    private Long projectId;
-
-    /**
-     * 设备ID
-     */
-    @ApiModelProperty(value = "设备ID")
-    @TableField("DEVICE_ID")
-    private Long deviceId;
-
-    /**
-     * 报警类型
-     */
-    @ApiModelProperty(value = "报警类型")
-    @TableField("ALARM_TYPE")
-    private String alarmType;
-
-    /**
-     * 报警状态
-     */
-    @ApiModelProperty(value = "报警状态")
-    @TableField("ALARM_STATUS")
-    private String alarmStatus;
-
-    /**
-     * 报警值
-     */
-    @ApiModelProperty(value = "报警值")
-    @TableField("ALARM_VALUE")
-    private String alarmValue;
-
-    /**
-     * 报警图片
-     */
-    @ApiModelProperty(value = "报警图片")
-    @TableField("ALARM_IMAGE")
-    private String alarmImage;
-
-    /**
-     * 报警内容
-     */
-    @ApiModelProperty(value = "报警内容")
-    @TableField("ALARM_CONTENT")
-    private String alarmContent;
-
-    /**
-     * 报警时间
-     */
-    @ApiModelProperty(value = "报警时间")
-    @TableField("ALARM_TIME")
-    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
-    private Date alarmTime;
-
-    /**
-     * 消警时间
-     */
-    @ApiModelProperty(value = "消警时间")
-    @TableField("CANCEL_TIME")
-    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
-    private Date cancelTime;
-
-    /**
-     * 报警位置经度
-     */
-    @ApiModelProperty(value = "报警位置经度")
-    @TableField("ALARM_LNG")
-    private String alarmLng;
-
-    /**
-     * 报警位置纬度
-     */
-    @ApiModelProperty(value = "报警位置纬度")
-    @TableField("ALARM_LAT")
-    private String alarmLat;
-
-    @ApiModelProperty("报警类型名称")
-    @TableField(exist = false)
-    private String alarmStatusName;
-    @ApiModelProperty("报警类型名称")
-    @TableField(exist = false)
-    private String alarmTypeName;
-    @ApiModelProperty("作业名称")
-    @TableField(exist = false)
-    private String workTitle;
-    @ApiModelProperty("所属道路")
-    @TableField(exist = false)
-    private String workRoad;
-    @ApiModelProperty("作业状态")
-    @TableField(exist = false)
-    private String projectState;
-    @ApiModelProperty("作业状态名称")
-    @TableField(exist = false)
-    private String projectStateName;
-    @ApiModelProperty("负责人姓名")
-    @TableField(exist = false)
-    private String workPersonName;
-    @ApiModelProperty("负责人联系方式")
-    @TableField(exist = false)
-    private String workPersonPhoneNumber;
-
-
-    @Override
-    public String toString() {
-        return "BusAlarm{" +
-                "id=" + id +
-                ", projectId=" + projectId +
-                ", deviceId=" + deviceId +
-                ", alarmType=" + alarmType +
-                ", alarmValue=" + alarmValue +
-                ", alarmStatus=" + alarmStatus +
-                ", alarmImage=" + alarmImage +
-                ", alarmContent=" + alarmContent +
-                ", alarmTime=" + alarmTime +
-                ", cancelTime=" + cancelTime +
-                ", alarmLng=" + alarmLng +
-                ", alarmLat=" + alarmLat +
-                "}";
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusEvent.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusEvent.java
deleted file mode 100644
index a0b7543..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusEvent.java
+++ /dev/null
@@ -1,100 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.time.LocalDateTime;
-import java.util.Date;
-import java.util.List;
-
-/**
- * <p>
- * 事件表
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@TableName("br_bus_event")
-@Data
-@ApiModel("BusEvent")
-public class BusEvent implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @ApiModelProperty("事件ID")
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 事件标题
-     */
-    @ApiModelProperty("事件名称")
-    @TableField("EVENT_TITLE")
-    private String eventTitle;
-
-    /**
-     * 上报人员
-     */
-    @ApiModelProperty("上报人员")
-    @TableField("UPLOAD_NAME")
-    private String uploadName;
-
-    /**
-     * 联系方式
-     */
-    @ApiModelProperty("联系方式")
-    @TableField("PHONE_NUMBER")
-    private String phoneNumber;
-
-    /**
-     * 事件描述
-     */
-    @ApiModelProperty("事件描述")
-    @TableField("EVENT_DESCRIPTION")
-    private String eventDescription;
-
-    @ApiModelProperty("经度")
-    @TableField("LNG")
-    private String lng;
-
-    @ApiModelProperty("纬度")
-    @TableField("LAT")
-    private String lat;
-
-    /**
-     * 事件上传时间
-     */
-    @ApiModelProperty("事件上传时间")
-    @TableField("CREATE_TIME")
-    private Date createTime;
-
-    @ApiModelProperty("事件照片")
-    @TableField(exist = false)
-    private List<BusEventImage> imageList;
-
-
-
-    @Override
-    public String toString() {
-        return "BusEvent{" +
-            "id=" + id +
-            ", eventTitle=" + eventTitle +
-            ", uploadName=" + uploadName +
-            ", phoneNumber=" + phoneNumber +
-            ", eventDescription=" + eventDescription +
-            ", lng=" + lng +
-            ", lat=" + lat +
-            ", createTime=" + createTime +
-        "}";
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusEventImage.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusEventImage.java
deleted file mode 100644
index 1e75245..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusEventImage.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-
-/**
- * <p>
- * 事件图片表
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@TableName("br_bus_event_image")
-@Data
-@ApiModel("BusEventImage")
-public class BusEventImage implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 事件ID
-     */
-    @TableField("EVENT_ID")
-    private Long eventId;
-
-    /**
-     * 报警图片
-     */
-    @TableField("IMAGE")
-    @ApiModelProperty("图片url")
-    private String image;
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Device.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Device.java
index df89c70..ea7db5f 100644
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Device.java
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Device.java
@@ -1,30 +1,23 @@
 package com.casic.missiles.modular.system.entity;
 
-import com.alibaba.fastjson.annotation.JSONField;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.casic.missiles.core.base.json.DateDeserializer;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
-import java.util.Date;
 
 /**
  * <p>
- * 
+ * 设备记录表
  * </p>
  *
  * @author zyj
- * @since 2023-04-14
+ * @since 2023-05-25
  */
-@ApiModel("Device")
-@TableName("br_device")
 @Data
+@TableName("bus_device")
 public class Device implements Serializable {
 
     private static final long serialVersionUID = 1L;
@@ -32,82 +25,86 @@
     /**
      * 主键
      */
-    @ApiModelProperty(value = "设备ID")
     @TableId(value = "ID",type = IdType.ASSIGN_ID)
     private Long id;
 
     /**
-     * 设备编号
+     * 设备名称
      */
-    @ApiModelProperty(value = "设备编号")
-    @TableField("DEVICE_CODE")
-    private String deviceCode;
+    @TableField("DEVICE_NAME")
+    private String deviceName;
 
     /**
-     * 设备类型
+     * IP
      */
-    @ApiModelProperty(value = "设备类型")
-    @TableField("DEVICE_TYPE")
-    private String deviceType;
+    @TableField("IP")
+    private String ip;
 
     /**
-     * 设备批次
+     * 端口
      */
-    @ApiModelProperty(value = "设备批次")
-    @TableField("DEVICE_BATCH")
-    private String deviceBatch;
+    @TableField("PORT")
+    private String port;
 
     /**
-     * 厂家
+     * 用户名
      */
-    @ApiModelProperty(value = "厂家")
-    @TableField("MANUFACTURER")
-    private String manufacturer;
+    @TableField("USER_NAME")
+    private String userName;
 
     /**
-     * 是否供电
+     * 密码
      */
-    @ApiModelProperty(value = "是否供电")
-    @TableField("IS_POWER_SUPPLY")
-    private String isPowerSupply;
+    @TableField("PASSWORD")
+    private String password;
 
     /**
-     * 创建时间
+     * 连接类型
      */
-    @ApiModelProperty(value = "创建时间",dataType = "Date")
-    @TableField("CREATE_TIME")
-    private Date createTime;
+    @TableField("CONNECT_TYPE")
+    private String connectType;
 
-    @ApiModelProperty(value = "设备类型名称")
-    @TableField(exist = false)
-    private String deviceTypeName;
+    /**
+     * 位置
+     */
+    @TableField("LOCATION")
 
-    @ApiModelProperty(value = "是否供电名称")
-    @TableField(exist = false)
-    private String isPowerSupplyName;
+    private String location;
 
-    @ApiModelProperty(value = "注册时间",dataType = "String")
-    @TableField(exist = false)
-    private String registerTime;
+    /**
+     * 设备状态
+     */
+    @TableField("STATUS")
 
-    @ApiModelProperty(value = "当前状态")
-    @TableField(exist = false)
     private String status;
 
-    @ApiModelProperty(value = "当前状态名称")
-    @TableField(exist = false)
-    private String statusName;
+    /**
+     * 报警分组
+     */
+    @TableField("ALARM_GROUP")
+
+    private Long alarmGroup;
+
+    /**
+     * 视频通道数(预留)
+     */
+    @TableField("CHANNEL_NUM")
+    private Integer channelNum;
 
     @Override
     public String toString() {
         return "Device{" +
             "id=" + id +
-            ", deviceCode=" + deviceCode +
-            ", deviceType=" + deviceType +
-            ", deviceBatch=" + deviceBatch +
-            ", manufacturer=" + manufacturer +
-            ", isPowerSupply=" + isPowerSupply +
-            ", createTime=" + createTime +
+            ", deviceName=" + deviceName +
+            ", ip=" + ip +
+            ", port=" + port +
+            ", userName=" + userName +
+            ", password=" + password +
+            ", connectType=" + connectType +
+            ", location=" + location +
+            ", status=" + status +
+            ", alarmGroup=" + alarmGroup +
+            ", channelNum=" + channelNum +
         "}";
     }
 }
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/DeviceExt.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/DeviceExt.java
deleted file mode 100644
index 5ee7015..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/DeviceExt.java
+++ /dev/null
@@ -1,99 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-
-/**
- * <p>
- * 设备扩展信息表（安全树）
- * </p>
- *
- * @author zyj
- * @since 2023-04-27
- */
-@Data
-@TableName("br_device_ext")
-public class DeviceExt implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 设备ID
-     */
-    @TableField("DEVICE_ID")
-    private Long deviceId;
-
-    /**
-     * 摄像头编号
-     */
-    @TableField("CAMERA_CODE")
-    private String cameraCode;
-
-    /**
-     * 摄像头IP
-     */
-    @TableField("CAMERA_IP")
-    private String cameraIp;
-
-    /**
-     * 摄像头端口
-     */
-    @TableField("CAMERA_PORT")
-    private String cameraPort;
-
-    /**
-     * 激甲编号
-     */
-    @TableField("GAS_CODE")
-    private String gasCode;
-
-    /**
-     * 激甲IP
-     */
-    @TableField("GAS_IP")
-    private String gasIp;
-
-    /**
-     * 激甲端口
-     */
-    @TableField("GAS_PORT")
-    private String gasPort;
-
-    /**
-     * 甲烷报警阈值
-     */
-    @TableField("GAS_THRESHOLD")
-    private String gasThreshold;
-
-    @TableField(value = "HAT_LINING_CODE")
-    private String hatLiningCode;
-
-
-    @Override
-    public String toString() {
-        return "DeviceExt{" +
-            "id=" + id +
-            ", deviceId=" + deviceId +
-            ", cameraCode=" + cameraCode +
-            ", cameraIp=" + cameraIp +
-            ", cameraPort=" + cameraPort +
-            ", gasCode=" + gasCode +
-            ", gasIp=" + gasIp +
-            ", gasPort=" + gasPort +
-            ", gasThreshold=" + gasThreshold +
-            ", hatLiningCode=" + hatLiningCode +
-        "}";
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/ProjectDevice.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/ProjectDevice.java
deleted file mode 100644
index c4f3472..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/ProjectDevice.java
+++ /dev/null
@@ -1,62 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-
-/**
- * <p>
- * 
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@Data
-@ApiModel("ProjectDevice")
-@TableName("br_project_device")
-public class ProjectDevice implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 作业现场ID
-     */
-    @TableField("PROJECT_ID")
-    private Long projectId;
-
-    /**
-     * 设备ID
-     */
-    @TableField("DEVICE_ID")
-    @ApiModelProperty("设备ID（新增编辑时传）")
-    private Long deviceId;
-
-    /**
-     * 设备编号
-     */
-    @TableField(exist = false)
-    @ApiModelProperty("设备编号（详情中展示，新增编辑不用传）")
-    private String deviceCode;
-
-    @Override
-    public String toString() {
-        return "ProjectDevice{" +
-            "id=" + id +
-            ", projectId=" + projectId +
-            ", deviceId=" + deviceId +
-        "}";
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/ProjectWorker.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/ProjectWorker.java
deleted file mode 100644
index 10b23c4..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/ProjectWorker.java
+++ /dev/null
@@ -1,104 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import java.io.Serializable;
-
-/**
- * <p>
- * 
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@ApiModel("ProjectWorker")
-@TableName("br_project_worker")
-@Data
-@NoArgsConstructor
-@AllArgsConstructor
-public class ProjectWorker implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 作业现场ID
-     */
-    @TableField("PROJECT_ID")
-    private Long projectId;
-
-    /**
-     * 人员ID
-     */
-    @ApiModelProperty("人员ID")
-    @TableField("WORKER_ID")
-    private Long workerId;
-
-    /**
-     * 安全帽编号
-     */
-    @ApiModelProperty("安全帽编号")
-    @TableField("HAT_CODE")
-    private String hatCode;
-
-    /**
-     * 背心编号
-     */
-    @ApiModelProperty("背心编号")
-    @TableField("VAST_CODE")
-    private String vastCode;
-
-    /**
-     * 手环编号
-     */
-    @ApiModelProperty("手环编号")
-    @TableField("BRACELET_CODE")
-    private String braceletCode;
-
-    @ApiModelProperty("人员姓名（详情中展示，新增编辑不用传）")
-    @TableField(exist = false)
-    private String workerName;
-
-    @ApiModelProperty("人员部门ID（详情中展示，新增编辑不用传）")
-    @TableField(exist = false)
-    private String workerDeptId;
-
-    @ApiModelProperty("人员部门名称（详情中展示，新增编辑不用传）")
-    @TableField(exist = false)
-    private String workerDeptName;
-
-    @ApiModelProperty("人员联系方式（详情中展示，新增编辑不用传）")
-    @TableField(exist = false)
-    private String workerPhoneNumber;
-
-    public ProjectWorker(Long projectId, Long workerId) {
-        this.projectId = projectId;
-        this.workerId = workerId;
-    }
-
-    @Override
-    public String toString() {
-        return "ProjectWorker{" +
-            "id=" + id +
-            ", projectId=" + projectId +
-            ", workerId=" + workerId +
-            ", hatCode=" + hatCode +
-            ", vastCode=" + vastCode +
-            ", braceletCode=" + braceletCode +
-        "}";
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/WorkSiteInfo.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/WorkSiteInfo.java
deleted file mode 100644
index fa6f41d..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/WorkSiteInfo.java
+++ /dev/null
@@ -1,130 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.alibaba.fastjson.annotation.JSONField;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.time.LocalDateTime;
-import java.util.Date;
-
-/**
- * <p>
- * 作业现场表
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@ApiModel("WorkSiteInfo")
-@TableName("br_work_site_info")
-@Data
-public class WorkSiteInfo implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @ApiModelProperty("作业现场ID")
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 作业名称
-     */
-    @ApiModelProperty("作业名称")
-    @TableField("WORK_TITLE")
-    private String workTitle;
-
-    /**
-     * 责任人
-     */
-    @ApiModelProperty("责任人（人员ID）")
-    @TableField("WORK_PERSON")
-    private Long workPerson;
-
-    /**
-     * 作业描述
-     */
-    @ApiModelProperty("作业描述")
-    @TableField("WORK_SITE_DESC")
-    private String workSiteDesc;
-
-    /**
-     * 作业状态
-     */
-    @ApiModelProperty("作业状态")
-    @TableField("PROJECT_STATE")
-    private String projectState;
-
-    /**
-     * 所属道路
-     */
-    @ApiModelProperty("所属道路")
-    @TableField("WORK_ROAD")
-    private String workRoad;
-
-    @TableField("IMAGE_URL")
-    private String imageUrl;
-
-    @TableField("CREATE_TIME")
-    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
-    private Date createTime;
-    @TableField("UPDATE_TIME")
-    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
-    private Date updateTime;
-
-    @ApiModelProperty("开始时间")
-    @TableField("START_TIME")
-    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
-    private Date startTime;
-
-    @ApiModelProperty("结束时间")
-    @TableField("FINISH_TIME")
-    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
-    private Date finishTime;
-
-    @ApiModelProperty("负责人姓名（详情中使用，新增编辑不用传）")
-    @TableField(exist = false)
-    private String workPersonName;
-
-    @ApiModelProperty("负责人联系方式（详情中使用，新增编辑不用传）")
-    @TableField(exist = false)
-    private String workPersonPhoneNumber;
-
-    @ApiModelProperty("负责人所属部门ID（详情中使用，新增编辑不用传）")
-    @TableField(exist = false)
-    private Long workPersonDeptId;
-
-    @ApiModelProperty("负责人所属部门名称（详情中使用，新增编辑不用传）")
-    @TableField(exist = false)
-    private String workPersonDeptName;
-
-    @ApiModelProperty(value = "注册时间",dataType = "String")
-    @TableField(exist = false)
-    private String registerTime;
-
-    @ApiModelProperty("作业状态名称")
-    @TableField(exist = false)
-    private String projectStateName;
-
-    @Override
-    public String toString() {
-        return "WorkSiteInfo{" +
-            "id=" + id +
-            ", workTitle=" + workTitle +
-            ", workPerson=" + workPerson +
-            ", workSiteDesc=" + workSiteDesc +
-            ", projectState=" + projectState +
-            ", imageUrl=" + imageUrl +
-            ", updateTime=" + updateTime +
-            ", workRoad=" + workRoad +
-        "}";
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Worker.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Worker.java
deleted file mode 100644
index 28a4daa..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Worker.java
+++ /dev/null
@@ -1,147 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.time.LocalDateTime;
-import java.util.Date;
-
-/**
- * <p>
- * 
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@ApiModel("Worker")
-@TableName("br_worker")
-@Data
-public class Worker implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @ApiModelProperty(value = "人员ID")
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 姓名
-     */
-    @ApiModelProperty(value = "姓名")
-    @TableField("WORKER_NAME")
-    private String workerName;
-
-    /**
-     * 性别
-     */
-    @ApiModelProperty(value = "性别")
-    @TableField("GENDER")
-    private String gender;
-
-    /**
-     * 所属部门
-     */
-    @ApiModelProperty(value = "所属部门(人员管理)")
-    @TableField("DEPT_ID")
-    private Long deptId;
-
-    /**
-     * 所属单位
-     */
-    @ApiModelProperty(value = "所属单位(入场申请中使用)")
-    @TableField("OWNER_SHIP")
-    private String ownerShip;
-
-    /**
-     * 联系方式
-     */
-    @ApiModelProperty(value = "联系方式")
-    @TableField("PHONE_NUMBER")
-    private String phoneNumber;
-
-    /**
-     * 证件号
-     */
-    @ApiModelProperty(value = "证件号")
-    @TableField("ID_CARD_NUMBER")
-    private String idCardNumber;
-
-    /**
-     * 入场原因
-     */
-    @ApiModelProperty(value = "入场原因（入场申请中使用）")
-    @TableField("ENTER_REASON")
-    private String enterReason;
-
-    /**
-     * 入场人脸照片
-     */
-    @ApiModelProperty(value = "人脸照片（照片路径）")
-    @TableField("WORKER_AVATAR")
-    private String workerAvatar;
-
-    /**
-     * 申请入场时间
-     */
-    @ApiModelProperty(value = "注册时间/申请入场时间")
-    @TableField("CREATE_TIME")
-    private Date createTime;
-
-    /**
-     * 人员类型
-     */
-    @ApiModelProperty(value = "人员类型（区分人员管理和入场申请）")
-    @TableField("WORKER_TYPE")
-    private String workerType;
-
-    @ApiModelProperty(value = "性别名称")
-    @TableField(exist = false)
-    private String genderName;
-
-    @ApiModelProperty(value = "部门名称")
-    @TableField(exist = false)
-    private String deptName;
-
-    @ApiModelProperty(value = "注册时间",dataType = "String")
-    @TableField(exist = false)
-    private String registerTime;
-
-    @ApiModelProperty(value = "当前状态")
-    @TableField(exist = false)
-    private String status;
-
-    @ApiModelProperty(value = "当前状态名称")
-    @TableField(exist = false)
-    private String statusName;
-
-    @ApiModelProperty(value = "是否注册(0未注册；1已注册)",allowableValues = "0,1")
-    @TableField(exist = false)
-    private String isRegister;
-
-    @Override
-    public String toString() {
-        return "Worker{" +
-            "id=" + id +
-            ", workerName=" + workerName +
-            ", gender=" + gender +
-            ", deptId=" + deptId +
-            ", ownerShip=" + ownerShip +
-            ", phoneNumber=" + phoneNumber +
-            ", idCardNumber=" + idCardNumber +
-            ", enterReason=" + enterReason +
-            ", workerAvatar=" + workerAvatar +
-            ", createTime=" + createTime +
-            ", workerType=" + workerType +
-        "}";
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/AlarmMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/AlarmMapper.java
new file mode 100644
index 0000000..ea4c8be
--- /dev/null
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/AlarmMapper.java
@@ -0,0 +1,16 @@
+package com.casic.missiles.modular.system.mapper;
+
+import com.casic.missiles.modular.system.entity.Alarm;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 报警记录表 Mapper 接口
+ * </p>
+ *
+ * @author zyj
+ * @since 2023-05-25
+ */
+public interface AlarmMapper extends BaseMapper<Alarm> {
+
+}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/BusAlarmMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/BusAlarmMapper.java
deleted file mode 100644
index 9801742..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/BusAlarmMapper.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package com.casic.missiles.modular.system.mapper;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.modular.system.dto.AlarmTypeCountDTO;
-import com.casic.missiles.modular.system.entity.BusAlarm;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * <p>
- * 报警记录表 Mapper 接口
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface BusAlarmMapper extends BaseMapper<BusAlarm> {
-
-    Page<BusAlarm> listPage(Page<BusAlarm> page,@Param("ew")  QueryWrapper<BusAlarm> queryWrapper);
-
-    void cancelAlarm(@Param("deviceId")Long deviceId,@Param("alarmType") String alarmType);
-
-    List<AlarmTypeCountDTO> alarmCount(@Param("projectId")Long projectId, @Param("alarmStatus")String alarmStatus);
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/BusEventImageMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/BusEventImageMapper.java
deleted file mode 100644
index 9590b7d..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/BusEventImageMapper.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.casic.missiles.modular.system.mapper;
-
-import com.casic.missiles.modular.system.entity.BusEventImage;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * <p>
- * 事件图片表 Mapper 接口
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface BusEventImageMapper extends BaseMapper<BusEventImage> {
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/BusEventMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/BusEventMapper.java
deleted file mode 100644
index 3c85edf..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/BusEventMapper.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.casic.missiles.modular.system.mapper;
-
-import com.casic.missiles.modular.system.entity.BusEvent;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * <p>
- * 事件表 Mapper 接口
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface BusEventMapper extends BaseMapper<BusEvent> {
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/DeviceExtMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/DeviceExtMapper.java
deleted file mode 100644
index 4ca9212..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/DeviceExtMapper.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.casic.missiles.modular.system.mapper;
-
-import com.casic.missiles.modular.system.entity.DeviceExt;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * <p>
- * 设备扩展信息表（安全树） Mapper 接口
- * </p>
- *
- * @author zyj
- * @since 2023-04-27
- */
-public interface DeviceExtMapper extends BaseMapper<DeviceExt> {
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/DeviceMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/DeviceMapper.java
index 444c0c5..3d0bb02 100644
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/DeviceMapper.java
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/DeviceMapper.java
@@ -1,30 +1,16 @@
 package com.casic.missiles.modular.system.mapper;
 
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.modular.system.dto.DeviceDetailDTO;
-import com.casic.missiles.modular.system.dto.HelmetInfoDTO;
 import com.casic.missiles.modular.system.entity.Device;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
 
 /**
  * <p>
- *  Mapper 接口
+ * 设备记录表 Mapper 接口
  * </p>
  *
  * @author zyj
- * @since 2023-04-14
+ * @since 2023-05-25
  */
-@Mapper
 public interface DeviceMapper extends BaseMapper<Device> {
 
-    Page<DeviceDetailDTO> listDetailPage(Page<DeviceDetailDTO> page,@Param("ew") QueryWrapper<DeviceDetailDTO> ew);
-
-     List<Long> selectProjectDevice(@Param("projectId") Long projectId);
-
-    List<HelmetInfoDTO> selectHelmetList(@Param("deviceType")String deviceType);
 }
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/ProjectDeviceMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/ProjectDeviceMapper.java
deleted file mode 100644
index 1d0c14e..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/ProjectDeviceMapper.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package com.casic.missiles.modular.system.mapper;
-
-import com.casic.missiles.modular.system.dto.DeviceLocationDTO;
-import com.casic.missiles.modular.system.entity.ProjectDevice;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * <p>
- *  Mapper 接口
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface ProjectDeviceMapper extends BaseMapper<ProjectDevice> {
-     List<ProjectDevice> selectDetailByProjectId(@Param("projectId") Long projectId);
-
-     List<DeviceLocationDTO> selectDeviceLocationList(@Param("projectId") Long projectId);
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/ProjectWorkerMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/ProjectWorkerMapper.java
deleted file mode 100644
index 58583d1..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/ProjectWorkerMapper.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package com.casic.missiles.modular.system.mapper;
-
-import com.casic.missiles.modular.system.dto.WorkerLocationDTO;
-import com.casic.missiles.modular.system.entity.ProjectWorker;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * <p>
- *  Mapper 接口
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface ProjectWorkerMapper extends BaseMapper<ProjectWorker> {
-
-    List<ProjectWorker> selectDetailByProjectId(@Param("projectId") Long projectId,
-                                                @Param("workerType")String workerType);
-
-    List<WorkerLocationDTO> selectWorkerLocationList(@Param("projectId") Long projectId,
-                                                     @Param("workerType")String workerType);
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/WorkSiteInfoMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/WorkSiteInfoMapper.java
deleted file mode 100644
index a4934d2..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/WorkSiteInfoMapper.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.casic.missiles.modular.system.mapper;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.modular.system.entity.WorkSiteInfo;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Param;
-
-/**
- * <p>
- * 作业现场表 Mapper 接口
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface WorkSiteInfoMapper extends BaseMapper<WorkSiteInfo> {
-
-    Page<WorkSiteInfo> selectListPage(Page<WorkSiteInfo> page,@Param("ew") QueryWrapper<WorkSiteInfo> ew);
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/WorkerMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/WorkerMapper.java
deleted file mode 100644
index 258fb12..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/WorkerMapper.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package com.casic.missiles.modular.system.mapper;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.modular.system.dto.DeviceDetailDTO;
-import com.casic.missiles.modular.system.entity.Worker;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * <p>
- *  Mapper 接口
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface WorkerMapper extends BaseMapper<Worker> {
-
-
-    Page<Worker> selectListPage(Page<Worker> page, @Param("ew") QueryWrapper<Worker> ew);
-
-    List<String> selectWorkerAvatars(@Param("projectId")Long projectId);
-
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/AlarmMapper.xml b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/AlarmMapper.xml
new file mode 100644
index 0000000..25cb4ab
--- /dev/null
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/AlarmMapper.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.modular.system.mapper.AlarmMapper">
+
+</mapper>
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/BusAlarmMapper.xml b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/BusAlarmMapper.xml
deleted file mode 100644
index 595088a..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/BusAlarmMapper.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.casic.missiles.modular.system.mapper.BusAlarmMapper">
-
-    <select id="listPage" resultType="com.casic.missiles.modular.system.entity.BusAlarm">
-        SELECT
-            alarm.ID as id,
-            alarm.DEVICE_ID as deviceId,
-            alarm.PROJECT_ID as projectId,
-            alarm.ALARM_TYPE as alarmType,
-            alarm.ALARM_VALUE as alarmValue,
-            alarm.ALARM_STATUS as alarmStatus,
-            alarm.ALARM_IMAGE AS alarmImage,
-            alarm.ALARM_CONTENT as alarmContent,
-            alarm.ALARM_TIME as alarmTime,
-            alarm.CANCEL_TIME as cancelTime,
-            alarm.ALARM_LNG as alarmLng,
-            alarm.ALARM_LAT as alarmLat,
-            p.WORK_TITLE as workTitle,
-            p.WORK_ROAD as workRoad,
-            p.PROJECT_STATE as projectState,
-            w.WORKER_NAME as workPersonName,
-            w.PHONE_NUMBER as workPersonPhoneNumber
-        FROM
-            `br_bus_alarm` alarm
-                LEFT JOIN br_work_site_info p on alarm.PROJECT_ID = p.ID
-                LEFT JOIN br_worker w on p.WORK_PERSON = w.ID
-        <where>
-            <if test="ew != null">
-                ${ew.sqlSegment}
-            </if>
-        </where>
-    </select>
-
-    <select id="cancelAlarm">
-        update br_bus_alarm
-        set ALARM_STATUS = '1'
-        where DEVICE_ID = #{deviceId}
-          and ALARM_TYPE = #{alarmType}
-          and ALARM_STATUS = '0'
-    </select>
-
-    <select id="alarmCount" resultType="com.casic.missiles.modular.system.dto.AlarmTypeCountDTO">
-        SELECT
-            ALARM_TYPE as alarmType,
-            count(*) as alarmCount
-        from br_bus_alarm
-        <where>
-            <if test="projectId != null and projectId !=''">
-                and PROJECT_ID = #{projectId}
-            </if>
-            <if test="alarmStatus != null and alarmStatus !=''">
-                and ALARM_STATUS = #{alarmStatus}
-            </if>
-        </where>
-        group by ALARM_TYPE
-    </select>
-</mapper>
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/BusEventImageMapper.xml b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/BusEventImageMapper.xml
deleted file mode 100644
index fbc3db3..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/BusEventImageMapper.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.casic.missiles.modular.system.mapper.BusEventImageMapper">
-
-</mapper>
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/BusEventMapper.xml b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/BusEventMapper.xml
deleted file mode 100644
index 627d573..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/BusEventMapper.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.casic.missiles.modular.system.mapper.BusEventMapper">
-
-</mapper>
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/DeviceExtMapper.xml b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/DeviceExtMapper.xml
deleted file mode 100644
index 5321d1c..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/DeviceExtMapper.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.casic.missiles.modular.system.mapper.DeviceExtMapper">
-
-</mapper>
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/DeviceMapper.xml b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/DeviceMapper.xml
index 94262e1..88e7d01 100644
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/DeviceMapper.xml
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/DeviceMapper.xml
@@ -2,96 +2,4 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.casic.missiles.modular.system.mapper.DeviceMapper">
 
-    <select id="listDetailPage" resultType="com.casic.missiles.modular.system.dto.DeviceDetailDTO">
-        select
-        br_device.ID as id,
-        DEVICE_CODE as deviceCode,
-        DEVICE_TYPE as deviceType,
-        DEVICE_BATCH as deviceBatch,
-        MANUFACTURER as manufacturer,
-        IS_POWER_SUPPLY as isPowerSupply,
-        CREATE_TIME as createTime,
-        CAMERA_CODE as cameraCode,
-        CAMERA_IP as cameraIp,
-        CAMERA_PORT as cameraPort,
-        GAS_CODE as gasCode,
-        GAS_IP as gasIp,
-        GAS_PORT as gasPort,
-        HAT_LINING_CODE as hatLiningCode
-        from br_device
-        left join br_device_ext ext on ext.DEVICE_ID = br_device.ID
-        <where>
-            <if test="ew != null">
-                ${ew.sqlSegment}
-            </if>
-        </where>
-    </select>
-
-    <select id="selectProjectDevice" resultType="java.lang.Long">
-        with device_info as (
-            (SELECT
-            d.DEVICE_ID as DEVICE_ID,
-            d.PROJECT_ID as PROJECT_ID,
-            p.PROJECT_STATE as PROJECT_STATE
-            from br_project_device d
-            LEFT JOIN br_work_site_info p on p.ID = d.PROJECT_ID)
-
-            UNION ALL
-
-            (SELECT
-            d1.ID as DEVICE_ID,
-            w1.ID as PROJECT_ID,
-            w1.PROJECT_STATE as PROJECT_STATE
-            FROM br_project_worker pw1
-            LEFT JOIN br_device d1 on pw1.BRACELET_CODE = d1.DEVICE_CODE
-            LEFT JOIN br_work_site_info w1 on pw1.PROJECT_ID = w1.ID)
-
-            UNION ALL
-
-            (SELECT
-            d1.ID as DEVICE_ID,
-            w1.ID as PROJECT_ID,
-            w1.PROJECT_STATE as PROJECT_STATE
-            FROM br_project_worker pw1
-            LEFT JOIN br_device d1 on pw1.HAT_CODE = d1.DEVICE_CODE
-            LEFT JOIN br_work_site_info w1 on pw1.PROJECT_ID = w1.ID)
-
-
-            UNION ALL
-
-            (SELECT
-            d1.ID as DEVICE_ID,
-            w1.ID as PROJECT_ID,
-            w1.PROJECT_STATE as PROJECT_STATE
-            FROM br_project_worker pw1
-            LEFT JOIN br_device d1 on pw1.VAST_CODE = d1.DEVICE_CODE
-            LEFT JOIN br_work_site_info w1 on pw1.PROJECT_ID = w1.ID))
-
-        select DISTINCT DEVICE_ID from device_info
-        <where>
-            DEVICE_ID is not null
-            <choose>
-                <when test="projectId != null and projectId !=''">
-                    and PROJECT_ID = #{projectId}
-                </when>
-                <otherwise>
-                    AND PROJECT_STATE != '3'
-                </otherwise>
-            </choose>
-        </where>
-    </select>
-
-    <select id="selectHelmetList" resultType="com.casic.missiles.modular.system.dto.HelmetInfoDTO">
-        SELECT
-            a.ID AS deviceId,
-            a.DEVICE_CODE AS hatCode,
-            b.HAT_LINING_CODE AS hatLiningCode
-        FROM
-            br_device a
-                LEFT JOIN br_device_ext b ON a.ID = b.DEVICE_ID
-        WHERE
-            a.DEVICE_TYPE = #{deviceType}
-          AND a.DEVICE_CODE IS NOT NULL
-          AND b.HAT_LINING_CODE IS NOT NULL
-    </select>
 </mapper>
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/ProjectDeviceMapper.xml b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/ProjectDeviceMapper.xml
deleted file mode 100644
index c6d1c24..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/ProjectDeviceMapper.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.casic.missiles.modular.system.mapper.ProjectDeviceMapper">
-
-    <select id="selectDetailByProjectId" resultType="com.casic.missiles.modular.system.entity.ProjectDevice">
-        SELECT
-            pd.ID as id,
-            pd.PROJECT_ID as projectId,
-            pd.DEVICE_ID as deviceId,
-            d.DEVICE_CODE as deviceCode
-        from br_project_device pd
-        LEFT JOIN br_device d on pd.DEVICE_ID = d.ID
-        <where>
-            pd.PROJECT_ID = #{projectId}
-        </where>
-    </select>
-
-    <select id="selectDeviceLocationList" resultType="com.casic.missiles.modular.system.dto.DeviceLocationDTO">
-        SELECT
-        d.ID as deviceId,
-        d.DEVICE_TYPE as deviceType,
-        d.DEVICE_CODE as deviceCode,
-        if(EXISTS(select ID from br_bus_alarm WHERE DEVICE_ID = d.ID and ALARM_STATUS = '0'),true,false) as alarmFlag
-        FROM br_project_device pd, br_device d
-        where pd.DEVICE_ID = d.ID
-        and pd.PROJECT_ID = #{projectId}
-    </select>
-
-</mapper>
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/ProjectWorkerMapper.xml b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/ProjectWorkerMapper.xml
deleted file mode 100644
index 8d2de10..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/ProjectWorkerMapper.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.casic.missiles.modular.system.mapper.ProjectWorkerMapper">
-
-    <select id="selectDetailByProjectId" resultType="com.casic.missiles.modular.system.entity.ProjectWorker">
-        SELECT
-            pw.ID as id,
-            pw.PROJECT_ID as projectId,
-            pw.WORKER_ID as workerId,
-            w.WORKER_NAME as workerName,
-            w.DEPT_ID as workerDeptId,
-            pw.HAT_CODE as hatCode,
-            pw.VAST_CODE as vastCode,
-            pw.BRACELET_CODE as braceletCode,
-            w.PHONE_NUMBER as workerPhoneNumber
-        from br_project_worker pw
-        LEFT JOIN br_worker w on pw.WORKER_ID = w.ID
-        <where>
-            pw.PROJECT_ID = #{projectId}
-            <if test="workerType != null and workerType != ''">
-                and w.WORKER_TYPE = #{workerType}
-            </if>
-        </where>
-    </select>
-
-    <select id="selectWorkerLocationList" resultType="com.casic.missiles.modular.system.dto.WorkerLocationDTO">
-        select
-            w.ID as workerId,
-            w.WORKER_NAME as workerName,
-            pw.HAT_CODE as hatCode,
-            hd.ID as hatId,
-            pw.BRACELET_CODE as braceletCode,
-            pw.VAST_CODE as vastCode
-        from br_project_worker pw,br_worker w ,br_device hd
-        WHERE pw.WORKER_ID = w.ID
-          and pw.HAT_CODE = hd.DEVICE_CODE
-          and pw.PROJECT_ID = #{projectId}
-          and w.WORKER_TYPE = #{workerType}
-    </select>
-</mapper>
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/WorkSiteInfoMapper.xml b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/WorkSiteInfoMapper.xml
deleted file mode 100644
index 8f01326..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/WorkSiteInfoMapper.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.casic.missiles.modular.system.mapper.WorkSiteInfoMapper">
-
-    <select id="selectListPage" resultType="com.casic.missiles.modular.system.entity.WorkSiteInfo">
-        SELECT
-            br_work_site_info.ID AS id,
-            WORK_TITLE as workTitle,
-            WORK_ROAD as workRoad,
-            WORK_SITE_DESC as workSiteDesc,
-            WORK_PERSON as workPerson,
-            WORKER_NAME as workPersonName,
-            DEPT_ID as workPersonDeptId,
-            PHONE_NUMBER as workPersonPhoneNumber,
-            PROJECT_STATE as projectState,
-            br_work_site_info.CREATE_TIME AS createTime,
-            br_work_site_info.UPDATE_TIME AS updateTime
-        FROM br_work_site_info
-        LEFT JOIN br_worker w ON br_work_site_info.WORK_PERSON = w.ID
-        <where>
-            <if test="ew != null">
-                ${ew.sqlSegment}
-            </if>
-        </where>
-    </select>
-</mapper>
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/WorkerMapper.xml b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/WorkerMapper.xml
deleted file mode 100644
index 3e28b39..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/WorkerMapper.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.casic.missiles.modular.system.mapper.WorkerMapper">
-
-    <select id="selectListPage" resultType="com.casic.missiles.modular.system.entity.Worker">
-        WITH worker_project AS (
-            SELECT
-                w.id AS ID,
-                WORKER_NAME,
-                GENDER,
-                DEPT_ID,
-                OWNER_SHIP,
-                PHONE_NUMBER,
-                ID_CARD_NUMBER,
-                ENTER_REASON,
-                WORKER_AVATAR,
-                w.CREATE_TIME,
-                WORKER_TYPE,
-                IF( p.PROJECT_STATE != '3', 1, 0 ) AS `STATUS`
-            FROM br_worker w
-            LEFT JOIN br_project_worker pw ON w.ID = pw.WORKER_ID
-            LEFT JOIN br_work_site_info p ON pw.PROJECT_ID = p.ID
-        )
-
-        SELECT
-            ID AS id,
-            WORKER_NAME AS workerName,
-            GENDER AS gender,
-            DEPT_ID AS deptId,
-            OWNER_SHIP AS ownerShip,
-            PHONE_NUMBER AS phoneNumber,
-            ID_CARD_NUMBER AS idCardNumber,
-            ENTER_REASON AS enterReason,
-            WORKER_AVATAR AS workerAvatar,
-            CREATE_TIME AS createTime,
-            WORKER_TYPE AS workerType,
-            `STATUS` AS `status`
-        FROM worker_project
-        <where>
-            <if test="ew != null">
-                ${ew.sqlSegment}
-            </if>
-        </where>
-    </select>
-
-    <select id="selectWorkerAvatars" resultType="java.lang.String">
-        SELECT
-            WORKER_AVATAR
-        FROM
-            `br_worker`
-        WHERE
-        ID IN ( SELECT WORKER_ID FROM br_project_worker WHERE PROJECT_ID = #{projectId} )
-          AND WORKER_AVATAR IS NOT NULL
-          AND WORKER_AVATAR != ''
-    </select>
-</mapper>
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IAlarmService.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IAlarmService.java
new file mode 100644
index 0000000..8bc01f4
--- /dev/null
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IAlarmService.java
@@ -0,0 +1,16 @@
+package com.casic.missiles.modular.system.service;
+
+import com.casic.missiles.modular.system.entity.Alarm;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 报警记录表 服务类
+ * </p>
+ *
+ * @author zyj
+ * @since 2023-05-25
+ */
+public interface IAlarmService extends IService<Alarm> {
+
+}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IBusAlarmService.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IBusAlarmService.java
deleted file mode 100644
index f63c19c..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IBusAlarmService.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package com.casic.missiles.modular.system.service;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.modular.system.dto.AlarmTypeCountDTO;
-import com.casic.missiles.modular.system.dto.AlarmUpload;
-import com.casic.missiles.modular.system.entity.BusAlarm;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-import java.util.List;
-
-/**
- * <p>
- * 报警记录表 服务类
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface IBusAlarmService extends IService<BusAlarm> {
-
-    boolean alarmUpload(AlarmUpload alarmUpload);
-
-    Page<BusAlarm> listPage(Page<BusAlarm> page,QueryWrapper<BusAlarm> queryWrapper);
-
-    List<AlarmTypeCountDTO> alarmCount(Long projectId,String alarmStatus);
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IBusEventImageService.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IBusEventImageService.java
deleted file mode 100644
index b1187ed..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IBusEventImageService.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.casic.missiles.modular.system.service;
-
-import com.casic.missiles.modular.system.entity.BusEventImage;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-import java.util.List;
-
-/**
- * <p>
- * 事件图片表 服务类
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface IBusEventImageService extends IService<BusEventImage> {
-
-    boolean saveBusEventImages(Long eventId, List<BusEventImage> imageList);
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IBusEventService.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IBusEventService.java
deleted file mode 100644
index 85c48d0..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IBusEventService.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package com.casic.missiles.modular.system.service;
-
-import com.casic.missiles.modular.system.entity.BusEvent;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-/**
- * <p>
- * 事件表 服务类
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface IBusEventService extends IService<BusEvent> {
-
-    boolean saveBusEvent(BusEvent busEvent);
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IDeviceExtService.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IDeviceExtService.java
deleted file mode 100644
index 6fc5361..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IDeviceExtService.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package com.casic.missiles.modular.system.service;
-
-import com.casic.missiles.modular.system.dto.DeviceDetailDTO;
-import com.casic.missiles.modular.system.entity.DeviceExt;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-import java.util.List;
-
-/**
- * <p>
- * 设备扩展信息表（安全树） 服务类
- * </p>
- *
- * @author zyj
- * @since 2023-04-27
- */
-public interface IDeviceExtService extends IService<DeviceExt> {
-
-    boolean saveDeviceExt(DeviceDetailDTO deviceDetailDTO);
-
-    boolean updateDeviceExt(DeviceDetailDTO deviceDetailDTO);
-
-    boolean removeByDeviceIds(List<Long> deviceIds);
-
-    boolean setGasThreshold(String gasIp,String gasPort,String threshold);
-
-    String getGasThreshold(String gasIp,String gasPort);
-
-    Long selectByGasIpPort(String gasIp,String gasPort);
-
-    Long selectByCameraIpPort(String cameraIp,String cameraPort);
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java
index 9e62756..00a421d 100644
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java
@@ -1,32 +1,16 @@
 package com.casic.missiles.modular.system.service;
 
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.modular.system.dto.DeviceDetailDTO;
-import com.casic.missiles.modular.system.dto.HelmetInfoDTO;
 import com.casic.missiles.modular.system.entity.Device;
 import com.baomidou.mybatisplus.extension.service.IService;
 
-import java.util.List;
-
 /**
  * <p>
- *  服务类
+ * 设备记录表 服务类
  * </p>
  *
  * @author zyj
- * @since 2023-04-14
+ * @since 2023-05-25
  */
 public interface IDeviceService extends IService<Device> {
 
-    boolean saveDevice(DeviceDetailDTO deviceDetailDTO);
-
-    boolean updateDevice(DeviceDetailDTO deviceDetailDTO);
-
-    boolean deleteDevices(List<Long> deviceIds);
-
-    Page<DeviceDetailDTO> listPage(Page<DeviceDetailDTO> page, QueryWrapper<DeviceDetailDTO> queryWrapper, String status,Long projectId);
-
-    List<Long> selectProjectDevice(Long projectId);
-
 }
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IProjectDeviceService.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IProjectDeviceService.java
deleted file mode 100644
index 8599411..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IProjectDeviceService.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package com.casic.missiles.modular.system.service;
-
-import com.casic.missiles.modular.system.dto.DeviceLocationDTO;
-import com.casic.missiles.modular.system.entity.ProjectDevice;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-import java.util.List;
-
-/**
- * <p>
- *  服务类
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface IProjectDeviceService extends IService<ProjectDevice> {
-
-    boolean saveProjectDeviceList(Long projectId, List<ProjectDevice> projectDeviceList);
-
-    boolean updateProjectDeviceList(Long projectId, List<ProjectDevice> projectDeviceList);
-
-    boolean deleteByProjectId(Long projectId);
-
-    boolean deleteByProjectIds(List<Long> projectIds);
-
-    List<ProjectDevice> selectDetailByProjectId(Long projectId);
-
-    Long selectProjectIdByDevice(Long deviceId);
-
-    List<DeviceLocationDTO> selectDeviceLocationList(Long projectId);
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IProjectWorkerService.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IProjectWorkerService.java
deleted file mode 100644
index e921bc3..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IProjectWorkerService.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package com.casic.missiles.modular.system.service;
-
-import com.casic.missiles.modular.system.dto.WorkerLocationDTO;
-import com.casic.missiles.modular.system.entity.ProjectDevice;
-import com.casic.missiles.modular.system.entity.ProjectWorker;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-import java.util.List;
-
-/**
- * <p>
- *  服务类
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface IProjectWorkerService extends IService<ProjectWorker> {
-
-    boolean saveProjectWorkerList(Long projectId, List<ProjectWorker> projectWorkerList);
-
-    boolean updateProjectWorkerList(Long projectId, List<ProjectWorker> projectWorkerList);
-
-    boolean deleteByProjectId(Long projectId);
-
-    boolean deleteByProjectIds(List<Long> projectIds);
-
-    List<ProjectWorker> selectDetailByProjectId(Long projectId,String workerType);
-
-    List<WorkerLocationDTO> selectWorkerLocationDTO(Long projectId);
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IWorkSiteInfoService.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IWorkSiteInfoService.java
deleted file mode 100644
index 58a8590..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IWorkSiteInfoService.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package com.casic.missiles.modular.system.service;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.modular.system.dto.WorkSiteDetailDTO;
-import com.casic.missiles.modular.system.entity.WorkSiteInfo;
-import com.baomidou.mybatisplus.extension.service.IService;
-import java.util.List;
-/**
- * <p>
- * 作业现场表 服务类
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface IWorkSiteInfoService extends IService<WorkSiteInfo> {
-
-    boolean addWorkSiteInfo(WorkSiteDetailDTO workSiteDetailDTO);
-
-    boolean updateWorkSiteInfo(WorkSiteDetailDTO workSiteDetailDTO);
-
-    boolean deleteProjects(List<Long> projectIds);
-
-    WorkSiteDetailDTO getWorkSiteDetail(Long projectId);
-
-    Page<WorkSiteInfo> selectListPage(Page<WorkSiteInfo> page, QueryWrapper<WorkSiteInfo> queryWrapper);
-
-    boolean start(Long projectId);
-
-    boolean finish(Long projectId);
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IWorkerService.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IWorkerService.java
deleted file mode 100644
index 6c6ee98..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IWorkerService.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package com.casic.missiles.modular.system.service;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.modular.system.entity.Worker;
-import com.baomidou.mybatisplus.extension.service.IService;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * <p>
- *  服务类
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface IWorkerService extends IService<Worker> {
-
-    boolean addWorker(Worker worker,Long projectId);
-
-    Page<Worker> selectListPage(Page<Worker> page,QueryWrapper<Worker> ew);
-
-    Worker selectWorkerDetail(Long workerId);
-
-    List<String> faceRegister(String cameraIp,String cameraPort);
-
-    List<Worker> projectTempWorker(Long projectId);
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/impl/AlarmServiceImpl.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/impl/AlarmServiceImpl.java
new file mode 100644
index 0000000..6e5959b
--- /dev/null
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/impl/AlarmServiceImpl.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.modular.system.service.impl;
+
+import com.casic.missiles.modular.system.entity.Alarm;
+import com.casic.missiles.modular.system.mapper.AlarmMapper;
+import com.casic.missiles.modular.system.service.IAlarmService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 报警记录表 服务实现类
+ * </p>
+ *
+ * @author zyj
+ * @since 2023-05-25
+ */
+@Service
+public class AlarmServiceImpl extends ServiceImpl<AlarmMapper, Alarm> implements IAlarmService {
+
+}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/impl/BusAlarmServiceImpl.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/impl/BusAlarmServiceImpl.java
deleted file mode 100644
index b44de1d..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/impl/BusAlarmServiceImpl.java
+++ /dev/null
@@ -1,121 +0,0 @@
-package com.casic.missiles.modular.system.service.impl;
-
-import cn.hutool.core.date.DateUtil;
-import cn.hutool.core.util.ObjectUtil;
-import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.core.application.service.AbstractDictService;
-import com.casic.missiles.modular.system.consts.AlarmTypeEnum;
-import com.casic.missiles.modular.system.dto.AlarmTypeCountDTO;
-import com.casic.missiles.modular.system.dto.AlarmUpload;
-import com.casic.missiles.modular.system.entity.BusAlarm;
-import com.casic.missiles.modular.system.entity.DataTreeLocation;
-import com.casic.missiles.modular.system.mapper.BusAlarmMapper;
-import com.casic.missiles.modular.system.service.*;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.util.Date;
-import java.util.List;
-import java.util.stream.Collectors;
-
-import static com.casic.missiles.modular.system.consts.AlarmConst.ALARM_STATUS_ON;
-
-/**
- * <p>
- * 报警记录表 服务实现类
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@Service
-@RequiredArgsConstructor
-@Slf4j
-public class BusAlarmServiceImpl extends ServiceImpl<BusAlarmMapper, BusAlarm> implements IBusAlarmService {
-
-    private final IDeviceExtService deviceExtService;
-    private final IDeviceService deviceService;
-    private final IProjectDeviceService projectDeviceService;
-
-    private final ICasicFileService fileService;
-
-    private final AbstractDictService dictService;
-    private final IDataSupportService dataSupportService;
-
-    @Override
-    @Transactional
-    public boolean alarmUpload(AlarmUpload alarmUpload) {
-        log.info("alarm upload ==> {}",alarmUpload.toString());
-        Long deviceId = null;
-        if(StrUtil.isAllNotBlank(alarmUpload.getGasIp(),alarmUpload.getGasPort())){
-            deviceId = deviceExtService.selectByGasIpPort(alarmUpload.getGasIp(),alarmUpload.getGasPort());
-        }
-        if(ObjectUtil.isEmpty(deviceId) && StrUtil.isAllNotBlank(alarmUpload.getCameraIp(),alarmUpload.getCameraPort())){
-            deviceId = deviceExtService.selectByCameraIpPort(alarmUpload.getCameraIp(),alarmUpload.getCameraPort());
-        }
-
-        if(ObjectUtil.isEmpty(deviceId)){
-            return false;
-        }
-
-        BusAlarm alarm = new BusAlarm();
-        alarm.setDeviceId(deviceId);
-        alarm.setProjectId(projectDeviceService.selectProjectIdByDevice(deviceId));
-        alarm.setAlarmValue(alarmUpload.getAlarmValue());
-        if(StrUtil.isNotEmpty(alarmUpload.getAlarmTime())){
-            alarm.setAlarmTime(DateUtil.parseDateTime(alarmUpload.getAlarmTime()));
-        }else {
-            alarm.setAlarmTime(new Date());
-        }
-
-        alarm.setAlarmType(alarmUpload.getAlarmType());
-        alarm.setAlarmContent(alarmUpload.getAlarmContent());
-        if(StrUtil.isNotEmpty(alarmUpload.getAlarmImage())){
-            String imgBase64 = "data:image/jpeg;base64," + alarmUpload.getAlarmImage();
-            String imageUrl = fileService.saveFile(imgBase64);
-            alarm.setAlarmImage(imageUrl);
-        }
-        alarm.setAlarmStatus(ALARM_STATUS_ON);
-
-        DataTreeLocation treeLocation = dataSupportService.getTreeLocation(deviceId);
-        if(ObjectUtil.isNotEmpty(treeLocation)){
-            alarm.setAlarmLng(treeLocation.getGdLng());
-            alarm.setAlarmLat(treeLocation.getGdLat());
-        }
-
-        //自动消警
-        AlarmTypeEnum alarmTypeEnum = AlarmTypeEnum.getByAlarmType(alarm.getAlarmType());
-        if(ObjectUtil.isNotEmpty(alarmTypeEnum) && alarmTypeEnum.isAutoCancel()){
-            this.baseMapper.cancelAlarm(deviceId,alarm.getAlarmType());
-        }
-        return this.save(alarm);
-    }
-
-    @Override
-    public Page<BusAlarm> listPage(Page<BusAlarm> page, QueryWrapper<BusAlarm> queryWrapper) {
-        page = this.baseMapper.listPage(page, queryWrapper);
-        for (BusAlarm alarm : page.getRecords()) {
-            alarm.setAlarmTypeName(dictService.getDictNameByCode("alarmType",alarm.getAlarmType()));
-            alarm.setAlarmStatusName(dictService.getDictNameByCode("alarmStatus",alarm.getAlarmStatus()));
-            if(StrUtil.isNotEmpty(alarm.getProjectState())){
-                alarm.setProjectStateName(dictService.getDictNameByCode("projectStatus",alarm.getProjectState()));
-            }
-        }
-        return page;
-    }
-
-    @Override
-    public List<AlarmTypeCountDTO> alarmCount(Long projectId, String alarmStatus) {
-        List<AlarmTypeCountDTO> list = this.baseMapper.alarmCount(projectId, alarmStatus);
-        list = list.stream().filter(i->StrUtil.isNotEmpty(i.getAlarmType())).collect(Collectors.toList());
-        for (AlarmTypeCountDTO countDTO : list) {
-            countDTO.setAlarmTypeName(dictService.getDictNameByCode("alarmType",countDTO.getAlarmType()));
-        }
-        return list;
-    }
-}

diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/AlarmController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/AlarmController.java
new file mode 100644
index 0000000..1795cf1
--- /dev/null
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/AlarmController.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.modular.system.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.stereotype.Controller;
+
+/**
+ * <p>
+ * 报警记录表 前端控制器
+ * </p>
+ *
+ * @author zyj
+ * @since 2023-05-25
+ */
+@Controller
+@RequestMapping("/system/alarm")
+public class AlarmController {
+
+}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusAlarmController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusAlarmController.java
deleted file mode 100644
index 1f82ebb..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusAlarmController.java
+++ /dev/null
@@ -1,102 +0,0 @@
-package com.casic.missiles.modular.system.controller;
-
-
-import cn.hutool.core.util.ObjectUtil;
-import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.core.base.controller.BaseController;
-import com.casic.missiles.core.page.PageFactory;
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.AlarmUpload;
-import com.casic.missiles.modular.system.dto.DeviceDetailDTO;
-import com.casic.missiles.modular.system.entity.BusAlarm;
-import com.casic.missiles.modular.system.service.IBusAlarmService;
-import io.swagger.annotations.*;
-import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.*;
-
-import org.springframework.stereotype.Controller;
-
-import static com.casic.missiles.model.response.ResponseData.DEFAULT_SUCCESS_MESSAGE;
-import static com.casic.missiles.modular.system.consts.AlarmConst.ALARM_STATUS_MANUAL_CANCEL;
-
-/**
- * <p>
- * 报警记录表 前端控制器
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@Api(tags = "报警管理接口")
-@Controller
-@RequestMapping("/alarm")
-@RequiredArgsConstructor
-public class BusAlarmController extends BaseController {
-
-    private final IBusAlarmService alarmService;
-
-    @ApiOperation("报警上报接口")
-    @PostMapping("/upload")
-    @ResponseBody
-    public Object upload(@RequestBody AlarmUpload alarmUpload){
-        alarmService.alarmUpload(alarmUpload);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("报警列表分页查询")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "workTitle", value = "作业名称",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "projectId", value = "作业ID",dataType = "Long", paramType = "query",example = "0"),
-            @ApiImplicitParam(name = "alarmStatus", value = "报警状态",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "projectState", value = "作业状态",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "alarmType", value = "报警类型",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "alarmStartTime", value = "报警开始时间",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "alarmEndTime", value = "报警结束时间",dataType = "String", paramType = "query")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = BusAlarm.class),
-    })
-    @GetMapping("/listPage")
-    @ResponseBody
-    public Object listPage(String workTitle,Long projectId,String alarmStatus,String projectState,String alarmType,String alarmStartTime,String alarmEndTime){
-        Page<BusAlarm> page = PageFactory.defaultPage();
-        QueryWrapper<BusAlarm> queryWrapper = new QueryWrapper<>();
-        if(StrUtil.isNotEmpty(workTitle)){
-            queryWrapper.like("p.WORK_TITLE",workTitle);
-        }
-        if(ObjectUtil.isNotEmpty(projectId)){
-            queryWrapper.eq("alarm.PROJECT_ID",projectId);
-        }
-        if(StrUtil.isNotEmpty(alarmStatus)){
-            queryWrapper.eq("alarm.ALARM_STATUS",alarmStatus);
-        }
-        if(StrUtil.isNotEmpty(projectState)){
-            queryWrapper.eq("p.PROJECT_STATE",projectState);
-        }
-        if(StrUtil.isNotEmpty(alarmType)){
-            queryWrapper.eq("alarm.ALARM_TYPE",alarmType);
-        }
-        if(StrUtil.isNotEmpty(alarmStartTime)){
-            queryWrapper.ge("alarm.ALARM_TIME",alarmStartTime);
-        }
-        if(StrUtil.isNotEmpty(alarmEndTime)){
-            queryWrapper.le("alarm.ALARM_TIME",alarmEndTime);
-        }
-        page = alarmService.listPage(page,queryWrapper);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-    @ApiOperation("消警")
-    @PostMapping("/cancel")
-    @ResponseBody
-    public Object cancel(@RequestParam("alarmId") Long alarmId){
-        UpdateWrapper<BusAlarm> updateWrapper = new UpdateWrapper<>();
-        updateWrapper.eq("ID",alarmId);
-        updateWrapper.set("ALARM_STATUS",ALARM_STATUS_MANUAL_CANCEL);
-        alarmService.update(updateWrapper);
-        return ResponseData.success();
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusEventController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusEventController.java
deleted file mode 100644
index dde5aad..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusEventController.java
+++ /dev/null
@@ -1,41 +0,0 @@
-package com.casic.missiles.modular.system.controller;
-
-
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.entity.BusEvent;
-import com.casic.missiles.modular.system.service.IBusEventService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.ResponseBody;
-
-/**
- * <p>
- * 事件表 前端控制器
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@Controller
-@RequestMapping("/event")
-@Api(tags = "事件上报")
-@RequiredArgsConstructor
-public class BusEventController {
-
-    private final IBusEventService eventService;
-
-    @ApiOperation("事件上报")
-    @PostMapping("add")
-    @ResponseBody
-    public Object add(@RequestBody BusEvent busEvent){
-        eventService.saveBusEvent(busEvent);
-        return ResponseData.success();
-    }
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
index 03abc5f..aa50d78 100644
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
@@ -1,121 +1,20 @@
 package com.casic.missiles.modular.system.controller;
 
 
-import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.core.base.controller.BaseController;
-import com.casic.missiles.core.page.PageFactory;
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.DeviceDetailDTO;
-import com.casic.missiles.modular.system.entity.Device;
-import com.casic.missiles.modular.system.service.IDeviceExtService;
-import com.casic.missiles.modular.system.service.IDeviceService;
-import io.swagger.annotations.*;
-import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.RequestMapping;
 
 import org.springframework.stereotype.Controller;
 
-import java.time.LocalDateTime;
-import java.util.Date;
-import java.util.List;
-
-import static com.casic.missiles.model.response.ResponseData.DEFAULT_SUCCESS_MESSAGE;
-
 /**
  * <p>
- *  前端控制器
+ * 设备记录表 前端控制器
  * </p>
  *
  * @author zyj
- * @since 2023-04-14
+ * @since 2023-05-25
  */
-@Api(tags = "设备管理接口")
-@RequiredArgsConstructor
 @Controller
-@RequestMapping("/device")
-public class DeviceController extends BaseController {
-    private final IDeviceService deviceService;
-    private final IDeviceExtService deviceExtService;
-
-    @ApiOperation("设备分页列表")
-    @ApiImplicitParams({
-        @ApiImplicitParam(name = "deviceType", value = "设备类型",dataType = "String", paramType = "query"),
-        @ApiImplicitParam(name = "deviceCode", value = "设备编号",dataType = "String", paramType = "query"),
-        @ApiImplicitParam(name = "status", value = "设备状态",dataType = "String", paramType = "query"),
-        @ApiImplicitParam(name = "projectId", value = "作业ID（如果传此参数，列表中返回该作业使用的设备）",dataType = "Long", paramType = "query", example = "0")
-    })
-    @ApiResponses({
-        @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = DeviceDetailDTO.class),
-    })
-    @GetMapping("listPage")
-    @ResponseBody
-    public Object listPage(String deviceType, String deviceCode, String status,Long projectId){
-        Page<DeviceDetailDTO> page = PageFactory.defaultPage();
-        QueryWrapper<DeviceDetailDTO> queryWrapper = new QueryWrapper<>();
-        if(StrUtil.isNotEmpty(deviceType)){
-            queryWrapper.eq("DEVICE_TYPE",deviceType);
-        }
-        if(StrUtil.isNotEmpty(deviceCode)){
-            queryWrapper.like("DEVICE_CODE",deviceCode);
-        }
-        page = deviceService.listPage(page,queryWrapper,status,projectId);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-    @ApiOperation("新增设备")
-    @PostMapping("add")
-    @ResponseBody
-    public Object add(@RequestBody DeviceDetailDTO deviceDetailDTO){
-        deviceService.saveDevice(deviceDetailDTO);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("编辑设备")
-    @PostMapping("update")
-    @ResponseBody
-    public Object update(@RequestBody DeviceDetailDTO deviceDetailDTO){
-        deviceService.updateDevice(deviceDetailDTO);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("删除设备")
-    @PostMapping("delete")
-    @ResponseBody
-    public Object delete(@ApiParam("设备id列表")@RequestBody List<Long> deviceIds){
-        deviceService.deleteDevices(deviceIds);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("设置甲烷阈值")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "gasIp", value = "安全树甲烷设备IP",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "gasPort", value = "安全树甲烷端口",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "threshold", value = "甲烷阈值",dataType = "String", paramType = "query")
-    })
-    @PostMapping("setThreshold")
-    @ResponseBody
-    public Object setThreshold(String gasIp,String gasPort,String threshold){
-        deviceExtService.setGasThreshold(gasIp, gasPort, threshold);
-        return ResponseData.success();
-    }
-
-
-    @ApiOperation("查询甲烷阈值")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "gasIp", value = "安全树甲烷设备IP",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "gasPort", value = "安全树甲烷端口",dataType = "String", paramType = "query")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = "{\"code\": 200,\"data\": \"100\",\"message\": \"请求成功\",\"success\": true}",response = String.class),
-    })
-    @GetMapping("getThreshold")
-    @ResponseBody
-    public Object getThreshold(String gasIp,String gasPort){
-        String data = deviceExtService.getGasThreshold(gasIp, gasPort);
-        return ResponseData.success(data);
-    }
-
+@RequestMapping("/system/device")
+public class DeviceController {
 
 }
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/OverviewController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/OverviewController.java
deleted file mode 100644
index 7570504..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/OverviewController.java
+++ /dev/null
@@ -1,70 +0,0 @@
-package com.casic.missiles.modular.system.controller;
-
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.AlarmTypeCountDTO;
-import com.casic.missiles.modular.system.dto.DeviceLocationDTO;
-import com.casic.missiles.modular.system.dto.WorkerLocationDTO;
-import com.casic.missiles.modular.system.service.IBusAlarmService;
-import com.casic.missiles.modular.system.service.IProjectDeviceService;
-import com.casic.missiles.modular.system.service.IProjectWorkerService;
-import io.swagger.annotations.*;
-import lombok.RequiredArgsConstructor;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.ResponseBody;
-
-import static com.casic.missiles.model.response.ResponseData.DEFAULT_SUCCESS_MESSAGE;
-import static com.casic.missiles.modular.system.consts.AlarmConst.ALARM_STATUS_ON;
-
-@Api(tags = "首页看板接口")
-@Controller
-@RequestMapping("overview")
-@RequiredArgsConstructor
-public class OverviewController {
-
-    private final IBusAlarmService alarmService;
-    private final IProjectDeviceService projectDeviceService;
-
-    private final IProjectWorkerService projectWorkerService;
-
-
-    @ApiOperation("报警统计接口")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "projectId", value = "作业ID",dataType = "Long", paramType = "query", example = "0")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = AlarmTypeCountDTO.class),
-    })
-    @GetMapping("/alarmCount")
-    @ResponseBody
-    public Object alarmCount(Long projectId){
-        return ResponseData.success(alarmService.alarmCount(projectId,ALARM_STATUS_ON));
-    }
-
-    @ApiOperation("设备列表接口")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "projectId", value = "作业ID",dataType = "Long", paramType = "query", example = "0")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = DeviceLocationDTO.class),
-    })
-    @GetMapping("/deviceList")
-    @ResponseBody
-    public Object deviceList(Long projectId){
-        return ResponseData.success(projectDeviceService.selectDeviceLocationList(projectId));
-    }
-
-    @ApiOperation("人员列表接口")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "projectId", value = "作业ID",dataType = "Long", paramType = "query", example = "0")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = WorkerLocationDTO.class),
-    })
-    @GetMapping("/workerList")
-    @ResponseBody
-    public Object workerList(Long projectId){
-        return ResponseData.success(projectWorkerService.selectWorkerLocationDTO(projectId));
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/WorkSiteInfoController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/WorkSiteInfoController.java
deleted file mode 100644
index af36d69..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/WorkSiteInfoController.java
+++ /dev/null
@@ -1,130 +0,0 @@
-package com.casic.missiles.modular.system.controller;
-
-
-import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.core.base.controller.BaseController;
-import com.casic.missiles.core.page.PageFactory;
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.WorkSiteDetailDTO;
-import com.casic.missiles.modular.system.entity.WorkSiteInfo;
-import com.casic.missiles.modular.system.service.IWorkSiteInfoService;
-import io.swagger.annotations.*;
-import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.*;
-
-import org.springframework.stereotype.Controller;
-
-import java.util.List;
-
-import static com.casic.missiles.model.response.ResponseData.DEFAULT_SUCCESS_MESSAGE;
-
-/**
- * <p>
- * 作业现场表 前端控制器
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@Controller
-@RequestMapping("/site")
-@Api(tags = "作业现场管理")
-@RequiredArgsConstructor
-public class WorkSiteInfoController extends BaseController {
-
-
-    private final IWorkSiteInfoService workSiteInfoService;
-
-    @ApiOperation("新增作业现场")
-    @PostMapping("add")
-    @ResponseBody
-    public Object addWorkSite(@RequestBody WorkSiteDetailDTO workSiteDetailDTO){
-        workSiteInfoService.addWorkSiteInfo(workSiteDetailDTO);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("编辑作业现场")
-    @PostMapping("update")
-    @ResponseBody
-    public Object updateWorkSite(@RequestBody WorkSiteDetailDTO workSiteDetailDTO){
-        workSiteInfoService.updateWorkSiteInfo(workSiteDetailDTO);
-        return ResponseData.success();
-    }
-
-
-    @ApiOperation("删除作业现场")
-    @PostMapping("delete")
-    @ResponseBody
-    public Object delete(@ApiParam("作业现场id列表")@RequestBody List<Long> projectIds){
-        workSiteInfoService.deleteProjects(projectIds);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("查询作业现场详情")
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = WorkSiteDetailDTO.class),
-    })
-    @GetMapping("detail")
-    @ResponseBody
-    public Object delete(@ApiParam(value = "作业现场id", example = "0")@RequestParam Long projectId){
-        WorkSiteDetailDTO detailDTO = workSiteInfoService.getWorkSiteDetail(projectId);
-        return ResponseData.success(detailDTO);
-    }
-
-    @ApiOperation("分页列表查询")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "workTitle",value = "作业名称", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "workRoad",value = "所属道路", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "workPersonName",value = "责任人姓名", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "startDate",value = "注册开始日期", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "endDate",value = "注册结束日期", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "projectState",value = "当前状态（字典值）", dataType = "String", paramType = "query")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = WorkSiteInfo.class),
-    })
-    @GetMapping("listPage")
-    @ResponseBody
-    public Object listPage(String workTitle,String workRoad,String workPersonName,String projectState,String startDate,String endDate){
-        Page<WorkSiteInfo> page = PageFactory.defaultPage();
-        QueryWrapper<WorkSiteInfo> queryWrapper = new QueryWrapper<>();
-        if(StrUtil.isNotEmpty(workTitle)){
-            queryWrapper.like("WORK_TITLE",workTitle);
-        }
-        if(StrUtil.isNotEmpty(workRoad)){
-            queryWrapper.like("WORK_ROAD",workRoad);
-        }
-        if(StrUtil.isNotEmpty(workPersonName)){
-            queryWrapper.like("WORKER_NAME",workPersonName);
-        }
-        if(StrUtil.isNotEmpty(projectState)){
-            queryWrapper.eq("PROJECT_STATE",projectState);
-        }
-        if(StrUtil.isNotEmpty(startDate)){
-            queryWrapper.ge("br_work_site_info.CREATE_TIME",startDate + " 00:00:00");
-        }
-        if(StrUtil.isNotEmpty(endDate)){
-            queryWrapper.le("br_work_site_info.CREATE_TIME",endDate + " 23:59:59");
-        }
-        page = workSiteInfoService.selectListPage(page,queryWrapper);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-    @ApiOperation("开始作业")
-    @PostMapping("start")
-    @ResponseBody
-    public Object start(@ApiParam(value = "作业现场id",example = "0")@RequestParam Long projectId){
-        workSiteInfoService.start(projectId);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("完成作业")
-    @PostMapping("finish")
-    @ResponseBody
-    public Object finish(@ApiParam(value = "作业现场id", example = "0")@RequestParam Long projectId){
-        workSiteInfoService.finish(projectId);
-        return ResponseData.success();
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/WorkerController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/WorkerController.java
deleted file mode 100644
index 796f94c..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/WorkerController.java
+++ /dev/null
@@ -1,136 +0,0 @@
-package com.casic.missiles.modular.system.controller;
-
-
-import cn.hutool.core.util.ObjectUtil;
-import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.core.base.controller.BaseController;
-import com.casic.missiles.core.page.PageFactory;
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.DeviceDetailDTO;
-import com.casic.missiles.modular.system.entity.Device;
-import com.casic.missiles.modular.system.entity.Worker;
-import com.casic.missiles.modular.system.service.IWorkerService;
-import io.swagger.annotations.*;
-import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.*;
-
-import org.springframework.stereotype.Controller;
-
-import java.util.Date;
-import java.util.List;
-
-import static com.casic.missiles.model.response.ResponseData.DEFAULT_SUCCESS_MESSAGE;
-
-/**
- * <p>
- *  前端控制器
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@Controller
-@RequestMapping("/worker")
-@RequiredArgsConstructor
-@Api(tags = "人员管理接口")
-public class WorkerController extends BaseController {
-
-    private final IWorkerService workerService;
-
-    @ApiOperation("分页列表查询")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "name",value = "姓名", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "deptId",value = "所属部门", dataType = "Long", paramType = "query", example = "0"),
-            @ApiImplicitParam(name = "status",value = "当前状态（字典值）", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "startDate",value = "注册开始日期", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "endDate",value = "注册结束日期", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "workerType",value = "人员类型（字典值）", dataType = "String", paramType = "query")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = Worker.class),
-    })
-    @GetMapping("listPage")
-    @ResponseBody
-    public Object listPage(String name,Long deptId, String status,String startDate,String endDate,String workerType){
-        Page<Worker> page = PageFactory.defaultPage();
-        QueryWrapper<Worker> queryWrapper = new QueryWrapper<>();
-        if(StrUtil.isNotEmpty(name)){
-            queryWrapper.like("WORKER_NAME",name);
-        }
-        if(ObjectUtil.isNotEmpty(deptId)){
-            queryWrapper.eq("DEPT_ID",deptId);
-        }
-        if(StrUtil.isNotEmpty(workerType)){
-            queryWrapper.eq("WORKER_TYPE",workerType);
-        }
-        if(StrUtil.isNotEmpty(startDate)){
-            queryWrapper.ge("CREATE_TIME",startDate + " 00:00:00");
-        }
-        if(StrUtil.isNotEmpty(endDate)){
-            queryWrapper.le("CREATE_TIME",endDate + " 23:59:59");
-        }
-        if(StrUtil.isNotEmpty(status)){
-            queryWrapper.eq("`STATUS`",status);
-        }
-        page = workerService.selectListPage(page,queryWrapper);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-    @ApiOperation("新增人员")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "worker", value = "人员信息", dataType = "Worker", paramType = "body", required = true),
-            @ApiImplicitParam(name = "projectId", value = "项目ID(入场申请需要)", dataType = "Long", paramType = "query", example = "0")
-    })
-    @PostMapping("add")
-    @ResponseBody
-    public Object add(@ApiParam("worker")@RequestBody Worker worker,
-                      @RequestParam(required = false) Long projectId){
-        workerService.addWorker(worker,projectId);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("编辑人员")
-    @PostMapping("update")
-    @ResponseBody
-    public Object update(@RequestBody Worker worker){
-        workerService.updateById(worker);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("删除人员")
-    @PostMapping("delete")
-    @ResponseBody
-    public Object delete(@ApiParam("人员id列表")@RequestBody List<Long> workIds){
-        workerService.removeByIds(workIds);
-        return ResponseData.success();
-    }
-
-
-    @ApiOperation(value = "获取人脸图片",notes = "返回人脸图片url")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "cameraIp",value = "摄像头IP", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "cameraPort",value = "摄像头端口号", dataType = "String", paramType = "query"),
-    })
-    @GetMapping("/face/register")
-    @ResponseBody
-    public Object faceRegister(String cameraIp,String cameraPort){
-        return ResponseData.success(workerService.faceRegister(cameraIp, cameraPort));
-    }
-
-
-    @ApiOperation(value = "查询临时入场人员列表")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "projectId", value = "项目ID",required = true,dataType = "Long", paramType = "query", example = "0")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = Worker.class),
-    })
-    @GetMapping("/projectTempWorker")
-    @ResponseBody
-    public Object projectTempWorker(Long projectId){
-        return ResponseData.success(workerService.projectTempWorker(projectId));
-    }
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/AlarmTypeCountDTO.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/AlarmTypeCountDTO.java
deleted file mode 100644
index 1a165a1..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/AlarmTypeCountDTO.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.casic.missiles.modular.system.dto;
-
-import io.swagger.annotations.ApiModel;
-import lombok.Data;
-
-@ApiModel(value = "AlarmTypeCountDTO",description = "报警类型统计（首页）")
-@Data
-public class AlarmTypeCountDTO {
-
-    private String alarmType;
-    private String alarmTypeName;
-    private Integer alarmCount;
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/AlarmUpload.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/AlarmUpload.java
deleted file mode 100644
index 73d7799..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/AlarmUpload.java
+++ /dev/null
@@ -1,46 +0,0 @@
-package com.casic.missiles.modular.system.dto;
-
-import cn.hutool.core.util.StrUtil;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-@ApiModel(value = "AlarmUpload",description = "报警上传")
-@Data
-public class AlarmUpload {
-
-    @ApiModelProperty(value = "摄像头ip")
-    private String cameraIp;
-
-    @ApiModelProperty(value = "摄像头端口")
-    private String cameraPort;
-    @ApiModelProperty(value = "安全树甲烷设备ip")
-    private String gasIp;
-    @ApiModelProperty(value = "安全树甲烷设备端口")
-    private String gasPort;
-    @ApiModelProperty(value = "报警值")
-    private String alarmValue;
-    @ApiModelProperty(value = "报警时间")
-    private String alarmTime;
-    @ApiModelProperty(value = "报警类型")
-    private String alarmType;
-    @ApiModelProperty(value = "报警图片")
-    private String alarmImage;
-    @ApiModelProperty(value = "报警内容")
-    private String alarmContent;
-
-    @Override
-    public String toString() {
-        return "AlarmUpload{" +
-                "cameraIp='" + cameraIp + '\'' +
-                ", cameraPort='" + cameraPort + '\'' +
-                ", gasIp='" + gasIp + '\'' +
-                ", gasPort='" + gasPort + '\'' +
-                ", alarmValue='" + alarmValue + '\'' +
-                ", alarmTime='" + alarmTime + '\'' +
-                ", alarmType='" + alarmType + '\'' +
-                ", alarmImage='" + (StrUtil.isNotEmpty(alarmImage) ? alarmImage.substring(0,50) : "null") + '\'' +
-                ", alarmContent='" + alarmContent + '\'' +
-                '}';
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/DeviceDetailDTO.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/DeviceDetailDTO.java
deleted file mode 100644
index ea518d9..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/DeviceDetailDTO.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package com.casic.missiles.modular.system.dto;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.casic.missiles.modular.system.entity.Device;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-@ApiModel("DeviceDetailDTO")
-@Data
-public class DeviceDetailDTO extends Device {
-
-    @ApiModelProperty(value = "摄像头编号")
-    private String cameraCode;
-
-    @ApiModelProperty(value = "摄像头IP")
-    private String cameraIp;
-
-    @ApiModelProperty(value = "摄像头端口")
-    private String cameraPort;
-
-    @ApiModelProperty(value = "激甲编号")
-    private String gasCode;
-
-    @ApiModelProperty(value = "激甲IP")
-    private String gasIp;
-
-    @ApiModelProperty(value = "激甲端口")
-    private String gasPort;
-
-    @ApiModelProperty(value = "智能帽衬编号")
-    private String hatLiningCode;
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/WorkSiteDetailDTO.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/WorkSiteDetailDTO.java
deleted file mode 100644
index 29378ff..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/WorkSiteDetailDTO.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package com.casic.missiles.modular.system.dto;
-
-import com.casic.missiles.modular.system.entity.ProjectDevice;
-import com.casic.missiles.modular.system.entity.ProjectWorker;
-import com.casic.missiles.modular.system.entity.WorkSiteInfo;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.util.List;
-
-@Data
-@ApiModel("WorkSiteDetailDTO")
-public class WorkSiteDetailDTO extends WorkSiteInfo {
-
-    @ApiModelProperty(value = "安全树列表",dataType = "ProjectDevice")
-    private List<ProjectDevice> deviceList;
-
-    @ApiModelProperty(value = "人员列表",dataType = "ProjectWorker")
-    private List<ProjectWorker> workerList;
-
-
-
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/WorkerLocationDTO.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/WorkerLocationDTO.java
deleted file mode 100644
index 6fd7b24..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/WorkerLocationDTO.java
+++ /dev/null
@@ -1,68 +0,0 @@
-package com.casic.missiles.modular.system.dto;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-@ApiModel(value = "WorkerLocationDTO",description = "人员位置列表（首页）")
-@Data
-public class WorkerLocationDTO {
-
-    @ApiModelProperty("人员ID")
-    private Long workerId;
-
-    @ApiModelProperty("人员姓名")
-    private String workerName;
-
-    @ApiModelProperty("安全帽编号")
-    private String hatCode;
-
-    @ApiModelProperty("安全帽ID")
-    private Long hatId;
-
-    @ApiModelProperty("背心编号")
-    private String vastCode;
-
-    @ApiModelProperty("手环编号")
-    private String braceletCode;
-
-    @ApiModelProperty("位置")
-    private String location;
-
-    @ApiModelProperty("时间")
-    private String time;
-
-    @ApiModelProperty("经度")
-    private String lng;
-
-    @ApiModelProperty("纬度")
-    private String lat;
-
-    @ApiModelProperty("心率")
-    private String heartRate;
-
-    @ApiModelProperty("血氧")
-    private String bloodOxygen;
-
-    @ApiModelProperty("一氧化碳")
-    private String co;
-
-    @ApiModelProperty("甲烷")
-    private String gas;
-
-    @ApiModelProperty("硫化氢")
-    private String h2s;
-
-    @ApiModelProperty("氧气")
-    private String o2;
-
-    @ApiModelProperty("信号")
-    private String signal;
-
-    @ApiModelProperty("电量")
-    private String cell;
-
-    @ApiModelProperty("是否报警")
-    private boolean alarmFlag;
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Alarm.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Alarm.java
new file mode 100644
index 0000000..4d2b7ef
--- /dev/null
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Alarm.java
@@ -0,0 +1,103 @@
+package com.casic.missiles.modular.system.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import java.util.Date;
+
+/**
+ * <p>
+ * 报警记录表
+ * </p>
+ *
+ * @author zyj
+ * @since 2023-05-25
+ */
+@Data
+@TableName("bus_alarm")
+public class Alarm implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    @TableId(value = "ID",type = IdType.ASSIGN_ID)
+    private Long id;
+
+    /**
+     * 设备ID
+     */
+    @TableField("DEVICE_ID")
+    private Long deviceId;
+
+    /**
+     * 报警类型
+     */
+    @TableField("ALARM_TYPE")
+    private String alarmType;
+
+    /**
+     * 报警时间
+     */
+    @TableField("ALARM_TIME")
+    private Date alarmTime;
+
+    /**
+     * 报警状态
+     */
+    @TableField("ALARM_STATUS")
+    private String alarmStatus;
+
+    /**
+     * 报警位置
+     */
+    @TableField("ALARM_LOCATION")
+    private String alarmLocation;
+
+    /**
+     * 报警图片
+     */
+    @TableField("ALARM_IMAGE")
+    private String alarmImage;
+
+    /**
+     * 视频通道号
+     */
+    @TableField("CHANNEL_NO")
+    private Integer channelNo;
+
+    /**
+     * 报警内容
+     */
+    @TableField("ALARM_CONTENT")
+    private String alarmContent;
+
+    /**
+     * 消警时间
+     */
+    @TableField("CANCEL_TIME")
+    private Date cancelTime;
+
+
+    @Override
+    public String toString() {
+        return "Alarm{" +
+            "id=" + id +
+            ", deviceId=" + deviceId +
+            ", alarmType=" + alarmType +
+            ", alarmTime=" + alarmTime +
+            ", alarmStatus=" + alarmStatus +
+            ", alarmLocation=" + alarmLocation +
+            ", alarmImage=" + alarmImage +
+            ", channelNo=" + channelNo +
+            ", alarmContent=" + alarmContent +
+            ", cancelTime=" + cancelTime +
+        "}";
+    }
+}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusAlarm.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusAlarm.java
deleted file mode 100644
index efb4a23..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusAlarm.java
+++ /dev/null
@@ -1,159 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.alibaba.fastjson.annotation.JSONField;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.time.LocalDateTime;
-import java.util.Date;
-
-/**
- * <p>
- * 报警记录表
- * </p>
- *
- * @author zyj
- * @since 2023-05-16
- */
-@Data
-@ApiModel("Alarm")
-@TableName("br_bus_alarm")
-public class BusAlarm implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 项目ID
-     */
-    @ApiModelProperty(value = "项目ID")
-    @TableField("PROJECT_ID")
-    private Long projectId;
-
-    /**
-     * 设备ID
-     */
-    @ApiModelProperty(value = "设备ID")
-    @TableField("DEVICE_ID")
-    private Long deviceId;
-
-    /**
-     * 报警类型
-     */
-    @ApiModelProperty(value = "报警类型")
-    @TableField("ALARM_TYPE")
-    private String alarmType;
-
-    /**
-     * 报警状态
-     */
-    @ApiModelProperty(value = "报警状态")
-    @TableField("ALARM_STATUS")
-    private String alarmStatus;
-
-    /**
-     * 报警值
-     */
-    @ApiModelProperty(value = "报警值")
-    @TableField("ALARM_VALUE")
-    private String alarmValue;
-
-    /**
-     * 报警图片
-     */
-    @ApiModelProperty(value = "报警图片")
-    @TableField("ALARM_IMAGE")
-    private String alarmImage;
-
-    /**
-     * 报警内容
-     */
-    @ApiModelProperty(value = "报警内容")
-    @TableField("ALARM_CONTENT")
-    private String alarmContent;
-
-    /**
-     * 报警时间
-     */
-    @ApiModelProperty(value = "报警时间")
-    @TableField("ALARM_TIME")
-    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
-    private Date alarmTime;
-
-    /**
-     * 消警时间
-     */
-    @ApiModelProperty(value = "消警时间")
-    @TableField("CANCEL_TIME")
-    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
-    private Date cancelTime;
-
-    /**
-     * 报警位置经度
-     */
-    @ApiModelProperty(value = "报警位置经度")
-    @TableField("ALARM_LNG")
-    private String alarmLng;
-
-    /**
-     * 报警位置纬度
-     */
-    @ApiModelProperty(value = "报警位置纬度")
-    @TableField("ALARM_LAT")
-    private String alarmLat;
-
-    @ApiModelProperty("报警类型名称")
-    @TableField(exist = false)
-    private String alarmStatusName;
-    @ApiModelProperty("报警类型名称")
-    @TableField(exist = false)
-    private String alarmTypeName;
-    @ApiModelProperty("作业名称")
-    @TableField(exist = false)
-    private String workTitle;
-    @ApiModelProperty("所属道路")
-    @TableField(exist = false)
-    private String workRoad;
-    @ApiModelProperty("作业状态")
-    @TableField(exist = false)
-    private String projectState;
-    @ApiModelProperty("作业状态名称")
-    @TableField(exist = false)
-    private String projectStateName;
-    @ApiModelProperty("负责人姓名")
-    @TableField(exist = false)
-    private String workPersonName;
-    @ApiModelProperty("负责人联系方式")
-    @TableField(exist = false)
-    private String workPersonPhoneNumber;
-
-
-    @Override
-    public String toString() {
-        return "BusAlarm{" +
-                "id=" + id +
-                ", projectId=" + projectId +
-                ", deviceId=" + deviceId +
-                ", alarmType=" + alarmType +
-                ", alarmValue=" + alarmValue +
-                ", alarmStatus=" + alarmStatus +
-                ", alarmImage=" + alarmImage +
-                ", alarmContent=" + alarmContent +
-                ", alarmTime=" + alarmTime +
-                ", cancelTime=" + cancelTime +
-                ", alarmLng=" + alarmLng +
-                ", alarmLat=" + alarmLat +
-                "}";
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusEvent.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusEvent.java
deleted file mode 100644
index a0b7543..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusEvent.java
+++ /dev/null
@@ -1,100 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.time.LocalDateTime;
-import java.util.Date;
-import java.util.List;
-
-/**
- * <p>
- * 事件表
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@TableName("br_bus_event")
-@Data
-@ApiModel("BusEvent")
-public class BusEvent implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @ApiModelProperty("事件ID")
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 事件标题
-     */
-    @ApiModelProperty("事件名称")
-    @TableField("EVENT_TITLE")
-    private String eventTitle;
-
-    /**
-     * 上报人员
-     */
-    @ApiModelProperty("上报人员")
-    @TableField("UPLOAD_NAME")
-    private String uploadName;
-
-    /**
-     * 联系方式
-     */
-    @ApiModelProperty("联系方式")
-    @TableField("PHONE_NUMBER")
-    private String phoneNumber;
-
-    /**
-     * 事件描述
-     */
-    @ApiModelProperty("事件描述")
-    @TableField("EVENT_DESCRIPTION")
-    private String eventDescription;
-
-    @ApiModelProperty("经度")
-    @TableField("LNG")
-    private String lng;
-
-    @ApiModelProperty("纬度")
-    @TableField("LAT")
-    private String lat;
-
-    /**
-     * 事件上传时间
-     */
-    @ApiModelProperty("事件上传时间")
-    @TableField("CREATE_TIME")
-    private Date createTime;
-
-    @ApiModelProperty("事件照片")
-    @TableField(exist = false)
-    private List<BusEventImage> imageList;
-
-
-
-    @Override
-    public String toString() {
-        return "BusEvent{" +
-            "id=" + id +
-            ", eventTitle=" + eventTitle +
-            ", uploadName=" + uploadName +
-            ", phoneNumber=" + phoneNumber +
-            ", eventDescription=" + eventDescription +
-            ", lng=" + lng +
-            ", lat=" + lat +
-            ", createTime=" + createTime +
-        "}";
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusEventImage.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusEventImage.java
deleted file mode 100644
index 1e75245..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusEventImage.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-
-/**
- * <p>
- * 事件图片表
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@TableName("br_bus_event_image")
-@Data
-@ApiModel("BusEventImage")
-public class BusEventImage implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 事件ID
-     */
-    @TableField("EVENT_ID")
-    private Long eventId;
-
-    /**
-     * 报警图片
-     */
-    @TableField("IMAGE")
-    @ApiModelProperty("图片url")
-    private String image;
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Device.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Device.java
index df89c70..ea7db5f 100644
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Device.java
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Device.java
@@ -1,30 +1,23 @@
 package com.casic.missiles.modular.system.entity;
 
-import com.alibaba.fastjson.annotation.JSONField;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.casic.missiles.core.base.json.DateDeserializer;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
-import java.util.Date;
 
 /**
  * <p>
- * 
+ * 设备记录表
  * </p>
  *
  * @author zyj
- * @since 2023-04-14
+ * @since 2023-05-25
  */
-@ApiModel("Device")
-@TableName("br_device")
 @Data
+@TableName("bus_device")
 public class Device implements Serializable {
 
     private static final long serialVersionUID = 1L;
@@ -32,82 +25,86 @@
     /**
      * 主键
      */
-    @ApiModelProperty(value = "设备ID")
     @TableId(value = "ID",type = IdType.ASSIGN_ID)
     private Long id;
 
     /**
-     * 设备编号
+     * 设备名称
      */
-    @ApiModelProperty(value = "设备编号")
-    @TableField("DEVICE_CODE")
-    private String deviceCode;
+    @TableField("DEVICE_NAME")
+    private String deviceName;
 
     /**
-     * 设备类型
+     * IP
      */
-    @ApiModelProperty(value = "设备类型")
-    @TableField("DEVICE_TYPE")
-    private String deviceType;
+    @TableField("IP")
+    private String ip;
 
     /**
-     * 设备批次
+     * 端口
      */
-    @ApiModelProperty(value = "设备批次")
-    @TableField("DEVICE_BATCH")
-    private String deviceBatch;
+    @TableField("PORT")
+    private String port;
 
     /**
-     * 厂家
+     * 用户名
      */
-    @ApiModelProperty(value = "厂家")
-    @TableField("MANUFACTURER")
-    private String manufacturer;
+    @TableField("USER_NAME")
+    private String userName;
 
     /**
-     * 是否供电
+     * 密码
      */
-    @ApiModelProperty(value = "是否供电")
-    @TableField("IS_POWER_SUPPLY")
-    private String isPowerSupply;
+    @TableField("PASSWORD")
+    private String password;
 
     /**
-     * 创建时间
+     * 连接类型
      */
-    @ApiModelProperty(value = "创建时间",dataType = "Date")
-    @TableField("CREATE_TIME")
-    private Date createTime;
+    @TableField("CONNECT_TYPE")
+    private String connectType;
 
-    @ApiModelProperty(value = "设备类型名称")
-    @TableField(exist = false)
-    private String deviceTypeName;
+    /**
+     * 位置
+     */
+    @TableField("LOCATION")
 
-    @ApiModelProperty(value = "是否供电名称")
-    @TableField(exist = false)
-    private String isPowerSupplyName;
+    private String location;
 
-    @ApiModelProperty(value = "注册时间",dataType = "String")
-    @TableField(exist = false)
-    private String registerTime;
+    /**
+     * 设备状态
+     */
+    @TableField("STATUS")
 
-    @ApiModelProperty(value = "当前状态")
-    @TableField(exist = false)
     private String status;
 
-    @ApiModelProperty(value = "当前状态名称")
-    @TableField(exist = false)
-    private String statusName;
+    /**
+     * 报警分组
+     */
+    @TableField("ALARM_GROUP")
+
+    private Long alarmGroup;
+
+    /**
+     * 视频通道数(预留)
+     */
+    @TableField("CHANNEL_NUM")
+    private Integer channelNum;
 
     @Override
     public String toString() {
         return "Device{" +
             "id=" + id +
-            ", deviceCode=" + deviceCode +
-            ", deviceType=" + deviceType +
-            ", deviceBatch=" + deviceBatch +
-            ", manufacturer=" + manufacturer +
-            ", isPowerSupply=" + isPowerSupply +
-            ", createTime=" + createTime +
+            ", deviceName=" + deviceName +
+            ", ip=" + ip +
+            ", port=" + port +
+            ", userName=" + userName +
+            ", password=" + password +
+            ", connectType=" + connectType +
+            ", location=" + location +
+            ", status=" + status +
+            ", alarmGroup=" + alarmGroup +
+            ", channelNum=" + channelNum +
         "}";
     }
 }
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/DeviceExt.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/DeviceExt.java
deleted file mode 100644
index 5ee7015..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/DeviceExt.java
+++ /dev/null
@@ -1,99 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-
-/**
- * <p>
- * 设备扩展信息表（安全树）
- * </p>
- *
- * @author zyj
- * @since 2023-04-27
- */
-@Data
-@TableName("br_device_ext")
-public class DeviceExt implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 设备ID
-     */
-    @TableField("DEVICE_ID")
-    private Long deviceId;
-
-    /**
-     * 摄像头编号
-     */
-    @TableField("CAMERA_CODE")
-    private String cameraCode;
-
-    /**
-     * 摄像头IP
-     */
-    @TableField("CAMERA_IP")
-    private String cameraIp;
-
-    /**
-     * 摄像头端口
-     */
-    @TableField("CAMERA_PORT")
-    private String cameraPort;
-
-    /**
-     * 激甲编号
-     */
-    @TableField("GAS_CODE")
-    private String gasCode;
-
-    /**
-     * 激甲IP
-     */
-    @TableField("GAS_IP")
-    private String gasIp;
-
-    /**
-     * 激甲端口
-     */
-    @TableField("GAS_PORT")
-    private String gasPort;
-
-    /**
-     * 甲烷报警阈值
-     */
-    @TableField("GAS_THRESHOLD")
-    private String gasThreshold;
-
-    @TableField(value = "HAT_LINING_CODE")
-    private String hatLiningCode;
-
-
-    @Override
-    public String toString() {
-        return "DeviceExt{" +
-            "id=" + id +
-            ", deviceId=" + deviceId +
-            ", cameraCode=" + cameraCode +
-            ", cameraIp=" + cameraIp +
-            ", cameraPort=" + cameraPort +
-            ", gasCode=" + gasCode +
-            ", gasIp=" + gasIp +
-            ", gasPort=" + gasPort +
-            ", gasThreshold=" + gasThreshold +
-            ", hatLiningCode=" + hatLiningCode +
-        "}";
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/ProjectDevice.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/ProjectDevice.java
deleted file mode 100644
index c4f3472..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/ProjectDevice.java
+++ /dev/null
@@ -1,62 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-
-/**
- * <p>
- * 
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@Data
-@ApiModel("ProjectDevice")
-@TableName("br_project_device")
-public class ProjectDevice implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 作业现场ID
-     */
-    @TableField("PROJECT_ID")
-    private Long projectId;
-
-    /**
-     * 设备ID
-     */
-    @TableField("DEVICE_ID")
-    @ApiModelProperty("设备ID（新增编辑时传）")
-    private Long deviceId;
-
-    /**
-     * 设备编号
-     */
-    @TableField(exist = false)
-    @ApiModelProperty("设备编号（详情中展示，新增编辑不用传）")
-    private String deviceCode;
-
-    @Override
-    public String toString() {
-        return "ProjectDevice{" +
-            "id=" + id +
-            ", projectId=" + projectId +
-            ", deviceId=" + deviceId +
-        "}";
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/ProjectWorker.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/ProjectWorker.java
deleted file mode 100644
index 10b23c4..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/ProjectWorker.java
+++ /dev/null
@@ -1,104 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import java.io.Serializable;
-
-/**
- * <p>
- * 
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@ApiModel("ProjectWorker")
-@TableName("br_project_worker")
-@Data
-@NoArgsConstructor
-@AllArgsConstructor
-public class ProjectWorker implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 作业现场ID
-     */
-    @TableField("PROJECT_ID")
-    private Long projectId;
-
-    /**
-     * 人员ID
-     */
-    @ApiModelProperty("人员ID")
-    @TableField("WORKER_ID")
-    private Long workerId;
-
-    /**
-     * 安全帽编号
-     */
-    @ApiModelProperty("安全帽编号")
-    @TableField("HAT_CODE")
-    private String hatCode;
-
-    /**
-     * 背心编号
-     */
-    @ApiModelProperty("背心编号")
-    @TableField("VAST_CODE")
-    private String vastCode;
-
-    /**
-     * 手环编号
-     */
-    @ApiModelProperty("手环编号")
-    @TableField("BRACELET_CODE")
-    private String braceletCode;
-
-    @ApiModelProperty("人员姓名（详情中展示，新增编辑不用传）")
-    @TableField(exist = false)
-    private String workerName;
-
-    @ApiModelProperty("人员部门ID（详情中展示，新增编辑不用传）")
-    @TableField(exist = false)
-    private String workerDeptId;
-
-    @ApiModelProperty("人员部门名称（详情中展示，新增编辑不用传）")
-    @TableField(exist = false)
-    private String workerDeptName;
-
-    @ApiModelProperty("人员联系方式（详情中展示，新增编辑不用传）")
-    @TableField(exist = false)
-    private String workerPhoneNumber;
-
-    public ProjectWorker(Long projectId, Long workerId) {
-        this.projectId = projectId;
-        this.workerId = workerId;
-    }
-
-    @Override
-    public String toString() {
-        return "ProjectWorker{" +
-            "id=" + id +
-            ", projectId=" + projectId +
-            ", workerId=" + workerId +
-            ", hatCode=" + hatCode +
-            ", vastCode=" + vastCode +
-            ", braceletCode=" + braceletCode +
-        "}";
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/WorkSiteInfo.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/WorkSiteInfo.java
deleted file mode 100644
index fa6f41d..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/WorkSiteInfo.java
+++ /dev/null
@@ -1,130 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.alibaba.fastjson.annotation.JSONField;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.time.LocalDateTime;
-import java.util.Date;
-
-/**
- * <p>
- * 作业现场表
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@ApiModel("WorkSiteInfo")
-@TableName("br_work_site_info")
-@Data
-public class WorkSiteInfo implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @ApiModelProperty("作业现场ID")
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 作业名称
-     */
-    @ApiModelProperty("作业名称")
-    @TableField("WORK_TITLE")
-    private String workTitle;
-
-    /**
-     * 责任人
-     */
-    @ApiModelProperty("责任人（人员ID）")
-    @TableField("WORK_PERSON")
-    private Long workPerson;
-
-    /**
-     * 作业描述
-     */
-    @ApiModelProperty("作业描述")
-    @TableField("WORK_SITE_DESC")
-    private String workSiteDesc;
-
-    /**
-     * 作业状态
-     */
-    @ApiModelProperty("作业状态")
-    @TableField("PROJECT_STATE")
-    private String projectState;
-
-    /**
-     * 所属道路
-     */
-    @ApiModelProperty("所属道路")
-    @TableField("WORK_ROAD")
-    private String workRoad;
-
-    @TableField("IMAGE_URL")
-    private String imageUrl;
-
-    @TableField("CREATE_TIME")
-    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
-    private Date createTime;
-    @TableField("UPDATE_TIME")
-    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
-    private Date updateTime;
-
-    @ApiModelProperty("开始时间")
-    @TableField("START_TIME")
-    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
-    private Date startTime;
-
-    @ApiModelProperty("结束时间")
-    @TableField("FINISH_TIME")
-    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
-    private Date finishTime;
-
-    @ApiModelProperty("负责人姓名（详情中使用，新增编辑不用传）")
-    @TableField(exist = false)
-    private String workPersonName;
-
-    @ApiModelProperty("负责人联系方式（详情中使用，新增编辑不用传）")
-    @TableField(exist = false)
-    private String workPersonPhoneNumber;
-
-    @ApiModelProperty("负责人所属部门ID（详情中使用，新增编辑不用传）")
-    @TableField(exist = false)
-    private Long workPersonDeptId;
-
-    @ApiModelProperty("负责人所属部门名称（详情中使用，新增编辑不用传）")
-    @TableField(exist = false)
-    private String workPersonDeptName;
-
-    @ApiModelProperty(value = "注册时间",dataType = "String")
-    @TableField(exist = false)
-    private String registerTime;
-
-    @ApiModelProperty("作业状态名称")
-    @TableField(exist = false)
-    private String projectStateName;
-
-    @Override
-    public String toString() {
-        return "WorkSiteInfo{" +
-            "id=" + id +
-            ", workTitle=" + workTitle +
-            ", workPerson=" + workPerson +
-            ", workSiteDesc=" + workSiteDesc +
-            ", projectState=" + projectState +
-            ", imageUrl=" + imageUrl +
-            ", updateTime=" + updateTime +
-            ", workRoad=" + workRoad +
-        "}";
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Worker.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Worker.java
deleted file mode 100644
index 28a4daa..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Worker.java
+++ /dev/null
@@ -1,147 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.time.LocalDateTime;
-import java.util.Date;
-
-/**
- * <p>
- * 
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@ApiModel("Worker")
-@TableName("br_worker")
-@Data
-public class Worker implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @ApiModelProperty(value = "人员ID")
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 姓名
-     */
-    @ApiModelProperty(value = "姓名")
-    @TableField("WORKER_NAME")
-    private String workerName;
-
-    /**
-     * 性别
-     */
-    @ApiModelProperty(value = "性别")
-    @TableField("GENDER")
-    private String gender;
-
-    /**
-     * 所属部门
-     */
-    @ApiModelProperty(value = "所属部门(人员管理)")
-    @TableField("DEPT_ID")
-    private Long deptId;
-
-    /**
-     * 所属单位
-     */
-    @ApiModelProperty(value = "所属单位(入场申请中使用)")
-    @TableField("OWNER_SHIP")
-    private String ownerShip;
-
-    /**
-     * 联系方式
-     */
-    @ApiModelProperty(value = "联系方式")
-    @TableField("PHONE_NUMBER")
-    private String phoneNumber;
-
-    /**
-     * 证件号
-     */
-    @ApiModelProperty(value = "证件号")
-    @TableField("ID_CARD_NUMBER")
-    private String idCardNumber;
-
-    /**
-     * 入场原因
-     */
-    @ApiModelProperty(value = "入场原因（入场申请中使用）")
-    @TableField("ENTER_REASON")
-    private String enterReason;
-
-    /**
-     * 入场人脸照片
-     */
-    @ApiModelProperty(value = "人脸照片（照片路径）")
-    @TableField("WORKER_AVATAR")
-    private String workerAvatar;
-
-    /**
-     * 申请入场时间
-     */
-    @ApiModelProperty(value = "注册时间/申请入场时间")
-    @TableField("CREATE_TIME")
-    private Date createTime;
-
-    /**
-     * 人员类型
-     */
-    @ApiModelProperty(value = "人员类型（区分人员管理和入场申请）")
-    @TableField("WORKER_TYPE")
-    private String workerType;
-
-    @ApiModelProperty(value = "性别名称")
-    @TableField(exist = false)
-    private String genderName;
-
-    @ApiModelProperty(value = "部门名称")
-    @TableField(exist = false)
-    private String deptName;
-
-    @ApiModelProperty(value = "注册时间",dataType = "String")
-    @TableField(exist = false)
-    private String registerTime;
-
-    @ApiModelProperty(value = "当前状态")
-    @TableField(exist = false)
-    private String status;
-
-    @ApiModelProperty(value = "当前状态名称")
-    @TableField(exist = false)
-    private String statusName;
-
-    @ApiModelProperty(value = "是否注册(0未注册；1已注册)",allowableValues = "0,1")
-    @TableField(exist = false)
-    private String isRegister;
-
-    @Override
-    public String toString() {
-        return "Worker{" +
-            "id=" + id +
-            ", workerName=" + workerName +
-            ", gender=" + gender +
-            ", deptId=" + deptId +
-            ", ownerShip=" + ownerShip +
-            ", phoneNumber=" + phoneNumber +
-            ", idCardNumber=" + idCardNumber +
-            ", enterReason=" + enterReason +
-            ", workerAvatar=" + workerAvatar +
-            ", createTime=" + createTime +
-            ", workerType=" + workerType +
-        "}";
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/AlarmMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/AlarmMapper.java
new file mode 100644
index 0000000..ea4c8be
--- /dev/null
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/AlarmMapper.java
@@ -0,0 +1,16 @@
+package com.casic.missiles.modular.system.mapper;
+
+import com.casic.missiles.modular.system.entity.Alarm;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 报警记录表 Mapper 接口
+ * </p>
+ *
+ * @author zyj
+ * @since 2023-05-25
+ */
+public interface AlarmMapper extends BaseMapper<Alarm> {
+
+}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/BusAlarmMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/BusAlarmMapper.java
deleted file mode 100644
index 9801742..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/BusAlarmMapper.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package com.casic.missiles.modular.system.mapper;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.modular.system.dto.AlarmTypeCountDTO;
-import com.casic.missiles.modular.system.entity.BusAlarm;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * <p>
- * 报警记录表 Mapper 接口
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface BusAlarmMapper extends BaseMapper<BusAlarm> {
-
-    Page<BusAlarm> listPage(Page<BusAlarm> page,@Param("ew")  QueryWrapper<BusAlarm> queryWrapper);
-
-    void cancelAlarm(@Param("deviceId")Long deviceId,@Param("alarmType") String alarmType);
-
-    List<AlarmTypeCountDTO> alarmCount(@Param("projectId")Long projectId, @Param("alarmStatus")String alarmStatus);
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/BusEventImageMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/BusEventImageMapper.java
deleted file mode 100644
index 9590b7d..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/BusEventImageMapper.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.casic.missiles.modular.system.mapper;
-
-import com.casic.missiles.modular.system.entity.BusEventImage;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * <p>
- * 事件图片表 Mapper 接口
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface BusEventImageMapper extends BaseMapper<BusEventImage> {
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/BusEventMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/BusEventMapper.java
deleted file mode 100644
index 3c85edf..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/BusEventMapper.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.casic.missiles.modular.system.mapper;
-
-import com.casic.missiles.modular.system.entity.BusEvent;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * <p>
- * 事件表 Mapper 接口
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface BusEventMapper extends BaseMapper<BusEvent> {
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/DeviceExtMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/DeviceExtMapper.java
deleted file mode 100644
index 4ca9212..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/DeviceExtMapper.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.casic.missiles.modular.system.mapper;
-
-import com.casic.missiles.modular.system.entity.DeviceExt;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * <p>
- * 设备扩展信息表（安全树） Mapper 接口
- * </p>
- *
- * @author zyj
- * @since 2023-04-27
- */
-public interface DeviceExtMapper extends BaseMapper<DeviceExt> {
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/DeviceMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/DeviceMapper.java
index 444c0c5..3d0bb02 100644
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/DeviceMapper.java
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/DeviceMapper.java
@@ -1,30 +1,16 @@
 package com.casic.missiles.modular.system.mapper;
 
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.modular.system.dto.DeviceDetailDTO;
-import com.casic.missiles.modular.system.dto.HelmetInfoDTO;
 import com.casic.missiles.modular.system.entity.Device;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
 
 /**
  * <p>
- *  Mapper 接口
+ * 设备记录表 Mapper 接口
  * </p>
  *
  * @author zyj
- * @since 2023-04-14
+ * @since 2023-05-25
  */
-@Mapper
 public interface DeviceMapper extends BaseMapper<Device> {
 
-    Page<DeviceDetailDTO> listDetailPage(Page<DeviceDetailDTO> page,@Param("ew") QueryWrapper<DeviceDetailDTO> ew);
-
-     List<Long> selectProjectDevice(@Param("projectId") Long projectId);
-
-    List<HelmetInfoDTO> selectHelmetList(@Param("deviceType")String deviceType);
 }
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/ProjectDeviceMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/ProjectDeviceMapper.java
deleted file mode 100644
index 1d0c14e..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/ProjectDeviceMapper.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package com.casic.missiles.modular.system.mapper;
-
-import com.casic.missiles.modular.system.dto.DeviceLocationDTO;
-import com.casic.missiles.modular.system.entity.ProjectDevice;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * <p>
- *  Mapper 接口
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface ProjectDeviceMapper extends BaseMapper<ProjectDevice> {
-     List<ProjectDevice> selectDetailByProjectId(@Param("projectId") Long projectId);
-
-     List<DeviceLocationDTO> selectDeviceLocationList(@Param("projectId") Long projectId);
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/ProjectWorkerMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/ProjectWorkerMapper.java
deleted file mode 100644
index 58583d1..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/ProjectWorkerMapper.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package com.casic.missiles.modular.system.mapper;
-
-import com.casic.missiles.modular.system.dto.WorkerLocationDTO;
-import com.casic.missiles.modular.system.entity.ProjectWorker;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * <p>
- *  Mapper 接口
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface ProjectWorkerMapper extends BaseMapper<ProjectWorker> {
-
-    List<ProjectWorker> selectDetailByProjectId(@Param("projectId") Long projectId,
-                                                @Param("workerType")String workerType);
-
-    List<WorkerLocationDTO> selectWorkerLocationList(@Param("projectId") Long projectId,
-                                                     @Param("workerType")String workerType);
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/WorkSiteInfoMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/WorkSiteInfoMapper.java
deleted file mode 100644
index a4934d2..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/WorkSiteInfoMapper.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.casic.missiles.modular.system.mapper;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.modular.system.entity.WorkSiteInfo;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Param;
-
-/**
- * <p>
- * 作业现场表 Mapper 接口
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface WorkSiteInfoMapper extends BaseMapper<WorkSiteInfo> {
-
-    Page<WorkSiteInfo> selectListPage(Page<WorkSiteInfo> page,@Param("ew") QueryWrapper<WorkSiteInfo> ew);
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/WorkerMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/WorkerMapper.java
deleted file mode 100644
index 258fb12..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/WorkerMapper.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package com.casic.missiles.modular.system.mapper;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.modular.system.dto.DeviceDetailDTO;
-import com.casic.missiles.modular.system.entity.Worker;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * <p>
- *  Mapper 接口
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface WorkerMapper extends BaseMapper<Worker> {
-
-
-    Page<Worker> selectListPage(Page<Worker> page, @Param("ew") QueryWrapper<Worker> ew);
-
-    List<String> selectWorkerAvatars(@Param("projectId")Long projectId);
-
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/AlarmMapper.xml b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/AlarmMapper.xml
new file mode 100644
index 0000000..25cb4ab
--- /dev/null
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/AlarmMapper.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.modular.system.mapper.AlarmMapper">
+
+</mapper>
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/BusAlarmMapper.xml b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/BusAlarmMapper.xml
deleted file mode 100644
index 595088a..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/BusAlarmMapper.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.casic.missiles.modular.system.mapper.BusAlarmMapper">
-
-    <select id="listPage" resultType="com.casic.missiles.modular.system.entity.BusAlarm">
-        SELECT
-            alarm.ID as id,
-            alarm.DEVICE_ID as deviceId,
-            alarm.PROJECT_ID as projectId,
-            alarm.ALARM_TYPE as alarmType,
-            alarm.ALARM_VALUE as alarmValue,
-            alarm.ALARM_STATUS as alarmStatus,
-            alarm.ALARM_IMAGE AS alarmImage,
-            alarm.ALARM_CONTENT as alarmContent,
-            alarm.ALARM_TIME as alarmTime,
-            alarm.CANCEL_TIME as cancelTime,
-            alarm.ALARM_LNG as alarmLng,
-            alarm.ALARM_LAT as alarmLat,
-            p.WORK_TITLE as workTitle,
-            p.WORK_ROAD as workRoad,
-            p.PROJECT_STATE as projectState,
-            w.WORKER_NAME as workPersonName,
-            w.PHONE_NUMBER as workPersonPhoneNumber
-        FROM
-            `br_bus_alarm` alarm
-                LEFT JOIN br_work_site_info p on alarm.PROJECT_ID = p.ID
-                LEFT JOIN br_worker w on p.WORK_PERSON = w.ID
-        <where>
-            <if test="ew != null">
-                ${ew.sqlSegment}
-            </if>
-        </where>
-    </select>
-
-    <select id="cancelAlarm">
-        update br_bus_alarm
-        set ALARM_STATUS = '1'
-        where DEVICE_ID = #{deviceId}
-          and ALARM_TYPE = #{alarmType}
-          and ALARM_STATUS = '0'
-    </select>
-
-    <select id="alarmCount" resultType="com.casic.missiles.modular.system.dto.AlarmTypeCountDTO">
-        SELECT
-            ALARM_TYPE as alarmType,
-            count(*) as alarmCount
-        from br_bus_alarm
-        <where>
-            <if test="projectId != null and projectId !=''">
-                and PROJECT_ID = #{projectId}
-            </if>
-            <if test="alarmStatus != null and alarmStatus !=''">
-                and ALARM_STATUS = #{alarmStatus}
-            </if>
-        </where>
-        group by ALARM_TYPE
-    </select>
-</mapper>
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/BusEventImageMapper.xml b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/BusEventImageMapper.xml
deleted file mode 100644
index fbc3db3..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/BusEventImageMapper.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.casic.missiles.modular.system.mapper.BusEventImageMapper">
-
-</mapper>
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/BusEventMapper.xml b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/BusEventMapper.xml
deleted file mode 100644
index 627d573..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/BusEventMapper.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.casic.missiles.modular.system.mapper.BusEventMapper">
-
-</mapper>
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/DeviceExtMapper.xml b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/DeviceExtMapper.xml
deleted file mode 100644
index 5321d1c..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/DeviceExtMapper.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.casic.missiles.modular.system.mapper.DeviceExtMapper">
-
-</mapper>
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/DeviceMapper.xml b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/DeviceMapper.xml
index 94262e1..88e7d01 100644
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/DeviceMapper.xml
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/DeviceMapper.xml
@@ -2,96 +2,4 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.casic.missiles.modular.system.mapper.DeviceMapper">
 
-    <select id="listDetailPage" resultType="com.casic.missiles.modular.system.dto.DeviceDetailDTO">
-        select
-        br_device.ID as id,
-        DEVICE_CODE as deviceCode,
-        DEVICE_TYPE as deviceType,
-        DEVICE_BATCH as deviceBatch,
-        MANUFACTURER as manufacturer,
-        IS_POWER_SUPPLY as isPowerSupply,
-        CREATE_TIME as createTime,
-        CAMERA_CODE as cameraCode,
-        CAMERA_IP as cameraIp,
-        CAMERA_PORT as cameraPort,
-        GAS_CODE as gasCode,
-        GAS_IP as gasIp,
-        GAS_PORT as gasPort,
-        HAT_LINING_CODE as hatLiningCode
-        from br_device
-        left join br_device_ext ext on ext.DEVICE_ID = br_device.ID
-        <where>
-            <if test="ew != null">
-                ${ew.sqlSegment}
-            </if>
-        </where>
-    </select>
-
-    <select id="selectProjectDevice" resultType="java.lang.Long">
-        with device_info as (
-            (SELECT
-            d.DEVICE_ID as DEVICE_ID,
-            d.PROJECT_ID as PROJECT_ID,
-            p.PROJECT_STATE as PROJECT_STATE
-            from br_project_device d
-            LEFT JOIN br_work_site_info p on p.ID = d.PROJECT_ID)
-
-            UNION ALL
-
-            (SELECT
-            d1.ID as DEVICE_ID,
-            w1.ID as PROJECT_ID,
-            w1.PROJECT_STATE as PROJECT_STATE
-            FROM br_project_worker pw1
-            LEFT JOIN br_device d1 on pw1.BRACELET_CODE = d1.DEVICE_CODE
-            LEFT JOIN br_work_site_info w1 on pw1.PROJECT_ID = w1.ID)
-
-            UNION ALL
-
-            (SELECT
-            d1.ID as DEVICE_ID,
-            w1.ID as PROJECT_ID,
-            w1.PROJECT_STATE as PROJECT_STATE
-            FROM br_project_worker pw1
-            LEFT JOIN br_device d1 on pw1.HAT_CODE = d1.DEVICE_CODE
-            LEFT JOIN br_work_site_info w1 on pw1.PROJECT_ID = w1.ID)
-
-
-            UNION ALL
-
-            (SELECT
-            d1.ID as DEVICE_ID,
-            w1.ID as PROJECT_ID,
-            w1.PROJECT_STATE as PROJECT_STATE
-            FROM br_project_worker pw1
-            LEFT JOIN br_device d1 on pw1.VAST_CODE = d1.DEVICE_CODE
-            LEFT JOIN br_work_site_info w1 on pw1.PROJECT_ID = w1.ID))
-
-        select DISTINCT DEVICE_ID from device_info
-        <where>
-            DEVICE_ID is not null
-            <choose>
-                <when test="projectId != null and projectId !=''">
-                    and PROJECT_ID = #{projectId}
-                </when>
-                <otherwise>
-                    AND PROJECT_STATE != '3'
-                </otherwise>
-            </choose>
-        </where>
-    </select>
-
-    <select id="selectHelmetList" resultType="com.casic.missiles.modular.system.dto.HelmetInfoDTO">
-        SELECT
-            a.ID AS deviceId,
-            a.DEVICE_CODE AS hatCode,
-            b.HAT_LINING_CODE AS hatLiningCode
-        FROM
-            br_device a
-                LEFT JOIN br_device_ext b ON a.ID = b.DEVICE_ID
-        WHERE
-            a.DEVICE_TYPE = #{deviceType}
-          AND a.DEVICE_CODE IS NOT NULL
-          AND b.HAT_LINING_CODE IS NOT NULL
-    </select>
 </mapper>
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/ProjectDeviceMapper.xml b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/ProjectDeviceMapper.xml
deleted file mode 100644
index c6d1c24..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/ProjectDeviceMapper.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.casic.missiles.modular.system.mapper.ProjectDeviceMapper">
-
-    <select id="selectDetailByProjectId" resultType="com.casic.missiles.modular.system.entity.ProjectDevice">
-        SELECT
-            pd.ID as id,
-            pd.PROJECT_ID as projectId,
-            pd.DEVICE_ID as deviceId,
-            d.DEVICE_CODE as deviceCode
-        from br_project_device pd
-        LEFT JOIN br_device d on pd.DEVICE_ID = d.ID
-        <where>
-            pd.PROJECT_ID = #{projectId}
-        </where>
-    </select>
-
-    <select id="selectDeviceLocationList" resultType="com.casic.missiles.modular.system.dto.DeviceLocationDTO">
-        SELECT
-        d.ID as deviceId,
-        d.DEVICE_TYPE as deviceType,
-        d.DEVICE_CODE as deviceCode,
-        if(EXISTS(select ID from br_bus_alarm WHERE DEVICE_ID = d.ID and ALARM_STATUS = '0'),true,false) as alarmFlag
-        FROM br_project_device pd, br_device d
-        where pd.DEVICE_ID = d.ID
-        and pd.PROJECT_ID = #{projectId}
-    </select>
-
-</mapper>
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/ProjectWorkerMapper.xml b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/ProjectWorkerMapper.xml
deleted file mode 100644
index 8d2de10..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/ProjectWorkerMapper.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.casic.missiles.modular.system.mapper.ProjectWorkerMapper">
-
-    <select id="selectDetailByProjectId" resultType="com.casic.missiles.modular.system.entity.ProjectWorker">
-        SELECT
-            pw.ID as id,
-            pw.PROJECT_ID as projectId,
-            pw.WORKER_ID as workerId,
-            w.WORKER_NAME as workerName,
-            w.DEPT_ID as workerDeptId,
-            pw.HAT_CODE as hatCode,
-            pw.VAST_CODE as vastCode,
-            pw.BRACELET_CODE as braceletCode,
-            w.PHONE_NUMBER as workerPhoneNumber
-        from br_project_worker pw
-        LEFT JOIN br_worker w on pw.WORKER_ID = w.ID
-        <where>
-            pw.PROJECT_ID = #{projectId}
-            <if test="workerType != null and workerType != ''">
-                and w.WORKER_TYPE = #{workerType}
-            </if>
-        </where>
-    </select>
-
-    <select id="selectWorkerLocationList" resultType="com.casic.missiles.modular.system.dto.WorkerLocationDTO">
-        select
-            w.ID as workerId,
-            w.WORKER_NAME as workerName,
-            pw.HAT_CODE as hatCode,
-            hd.ID as hatId,
-            pw.BRACELET_CODE as braceletCode,
-            pw.VAST_CODE as vastCode
-        from br_project_worker pw,br_worker w ,br_device hd
-        WHERE pw.WORKER_ID = w.ID
-          and pw.HAT_CODE = hd.DEVICE_CODE
-          and pw.PROJECT_ID = #{projectId}
-          and w.WORKER_TYPE = #{workerType}
-    </select>
-</mapper>
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/WorkSiteInfoMapper.xml b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/WorkSiteInfoMapper.xml
deleted file mode 100644
index 8f01326..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/WorkSiteInfoMapper.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.casic.missiles.modular.system.mapper.WorkSiteInfoMapper">
-
-    <select id="selectListPage" resultType="com.casic.missiles.modular.system.entity.WorkSiteInfo">
-        SELECT
-            br_work_site_info.ID AS id,
-            WORK_TITLE as workTitle,
-            WORK_ROAD as workRoad,
-            WORK_SITE_DESC as workSiteDesc,
-            WORK_PERSON as workPerson,
-            WORKER_NAME as workPersonName,
-            DEPT_ID as workPersonDeptId,
-            PHONE_NUMBER as workPersonPhoneNumber,
-            PROJECT_STATE as projectState,
-            br_work_site_info.CREATE_TIME AS createTime,
-            br_work_site_info.UPDATE_TIME AS updateTime
-        FROM br_work_site_info
-        LEFT JOIN br_worker w ON br_work_site_info.WORK_PERSON = w.ID
-        <where>
-            <if test="ew != null">
-                ${ew.sqlSegment}
-            </if>
-        </where>
-    </select>
-</mapper>
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/WorkerMapper.xml b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/WorkerMapper.xml
deleted file mode 100644
index 3e28b39..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/WorkerMapper.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.casic.missiles.modular.system.mapper.WorkerMapper">
-
-    <select id="selectListPage" resultType="com.casic.missiles.modular.system.entity.Worker">
-        WITH worker_project AS (
-            SELECT
-                w.id AS ID,
-                WORKER_NAME,
-                GENDER,
-                DEPT_ID,
-                OWNER_SHIP,
-                PHONE_NUMBER,
-                ID_CARD_NUMBER,
-                ENTER_REASON,
-                WORKER_AVATAR,
-                w.CREATE_TIME,
-                WORKER_TYPE,
-                IF( p.PROJECT_STATE != '3', 1, 0 ) AS `STATUS`
-            FROM br_worker w
-            LEFT JOIN br_project_worker pw ON w.ID = pw.WORKER_ID
-            LEFT JOIN br_work_site_info p ON pw.PROJECT_ID = p.ID
-        )
-
-        SELECT
-            ID AS id,
-            WORKER_NAME AS workerName,
-            GENDER AS gender,
-            DEPT_ID AS deptId,
-            OWNER_SHIP AS ownerShip,
-            PHONE_NUMBER AS phoneNumber,
-            ID_CARD_NUMBER AS idCardNumber,
-            ENTER_REASON AS enterReason,
-            WORKER_AVATAR AS workerAvatar,
-            CREATE_TIME AS createTime,
-            WORKER_TYPE AS workerType,
-            `STATUS` AS `status`
-        FROM worker_project
-        <where>
-            <if test="ew != null">
-                ${ew.sqlSegment}
-            </if>
-        </where>
-    </select>
-
-    <select id="selectWorkerAvatars" resultType="java.lang.String">
-        SELECT
-            WORKER_AVATAR
-        FROM
-            `br_worker`
-        WHERE
-        ID IN ( SELECT WORKER_ID FROM br_project_worker WHERE PROJECT_ID = #{projectId} )
-          AND WORKER_AVATAR IS NOT NULL
-          AND WORKER_AVATAR != ''
-    </select>
-</mapper>
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IAlarmService.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IAlarmService.java
new file mode 100644
index 0000000..8bc01f4
--- /dev/null
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IAlarmService.java
@@ -0,0 +1,16 @@
+package com.casic.missiles.modular.system.service;
+
+import com.casic.missiles.modular.system.entity.Alarm;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 报警记录表 服务类
+ * </p>
+ *
+ * @author zyj
+ * @since 2023-05-25
+ */
+public interface IAlarmService extends IService<Alarm> {
+
+}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IBusAlarmService.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IBusAlarmService.java
deleted file mode 100644
index f63c19c..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IBusAlarmService.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package com.casic.missiles.modular.system.service;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.modular.system.dto.AlarmTypeCountDTO;
-import com.casic.missiles.modular.system.dto.AlarmUpload;
-import com.casic.missiles.modular.system.entity.BusAlarm;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-import java.util.List;
-
-/**
- * <p>
- * 报警记录表 服务类
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface IBusAlarmService extends IService<BusAlarm> {
-
-    boolean alarmUpload(AlarmUpload alarmUpload);
-
-    Page<BusAlarm> listPage(Page<BusAlarm> page,QueryWrapper<BusAlarm> queryWrapper);
-
-    List<AlarmTypeCountDTO> alarmCount(Long projectId,String alarmStatus);
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IBusEventImageService.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IBusEventImageService.java
deleted file mode 100644
index b1187ed..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IBusEventImageService.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.casic.missiles.modular.system.service;
-
-import com.casic.missiles.modular.system.entity.BusEventImage;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-import java.util.List;
-
-/**
- * <p>
- * 事件图片表 服务类
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface IBusEventImageService extends IService<BusEventImage> {
-
-    boolean saveBusEventImages(Long eventId, List<BusEventImage> imageList);
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IBusEventService.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IBusEventService.java
deleted file mode 100644
index 85c48d0..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IBusEventService.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package com.casic.missiles.modular.system.service;
-
-import com.casic.missiles.modular.system.entity.BusEvent;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-/**
- * <p>
- * 事件表 服务类
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface IBusEventService extends IService<BusEvent> {
-
-    boolean saveBusEvent(BusEvent busEvent);
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IDeviceExtService.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IDeviceExtService.java
deleted file mode 100644
index 6fc5361..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IDeviceExtService.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package com.casic.missiles.modular.system.service;
-
-import com.casic.missiles.modular.system.dto.DeviceDetailDTO;
-import com.casic.missiles.modular.system.entity.DeviceExt;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-import java.util.List;
-
-/**
- * <p>
- * 设备扩展信息表（安全树） 服务类
- * </p>
- *
- * @author zyj
- * @since 2023-04-27
- */
-public interface IDeviceExtService extends IService<DeviceExt> {
-
-    boolean saveDeviceExt(DeviceDetailDTO deviceDetailDTO);
-
-    boolean updateDeviceExt(DeviceDetailDTO deviceDetailDTO);
-
-    boolean removeByDeviceIds(List<Long> deviceIds);
-
-    boolean setGasThreshold(String gasIp,String gasPort,String threshold);
-
-    String getGasThreshold(String gasIp,String gasPort);
-
-    Long selectByGasIpPort(String gasIp,String gasPort);
-
-    Long selectByCameraIpPort(String cameraIp,String cameraPort);
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java
index 9e62756..00a421d 100644
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java
@@ -1,32 +1,16 @@
 package com.casic.missiles.modular.system.service;
 
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.modular.system.dto.DeviceDetailDTO;
-import com.casic.missiles.modular.system.dto.HelmetInfoDTO;
 import com.casic.missiles.modular.system.entity.Device;
 import com.baomidou.mybatisplus.extension.service.IService;
 
-import java.util.List;
-
 /**
  * <p>
- *  服务类
+ * 设备记录表 服务类
  * </p>
  *
  * @author zyj
- * @since 2023-04-14
+ * @since 2023-05-25
  */
 public interface IDeviceService extends IService<Device> {
 
-    boolean saveDevice(DeviceDetailDTO deviceDetailDTO);
-
-    boolean updateDevice(DeviceDetailDTO deviceDetailDTO);
-
-    boolean deleteDevices(List<Long> deviceIds);
-
-    Page<DeviceDetailDTO> listPage(Page<DeviceDetailDTO> page, QueryWrapper<DeviceDetailDTO> queryWrapper, String status,Long projectId);
-
-    List<Long> selectProjectDevice(Long projectId);
-
 }
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IProjectDeviceService.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IProjectDeviceService.java
deleted file mode 100644
index 8599411..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IProjectDeviceService.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package com.casic.missiles.modular.system.service;
-
-import com.casic.missiles.modular.system.dto.DeviceLocationDTO;
-import com.casic.missiles.modular.system.entity.ProjectDevice;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-import java.util.List;
-
-/**
- * <p>
- *  服务类
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface IProjectDeviceService extends IService<ProjectDevice> {
-
-    boolean saveProjectDeviceList(Long projectId, List<ProjectDevice> projectDeviceList);
-
-    boolean updateProjectDeviceList(Long projectId, List<ProjectDevice> projectDeviceList);
-
-    boolean deleteByProjectId(Long projectId);
-
-    boolean deleteByProjectIds(List<Long> projectIds);
-
-    List<ProjectDevice> selectDetailByProjectId(Long projectId);
-
-    Long selectProjectIdByDevice(Long deviceId);
-
-    List<DeviceLocationDTO> selectDeviceLocationList(Long projectId);
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IProjectWorkerService.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IProjectWorkerService.java
deleted file mode 100644
index e921bc3..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IProjectWorkerService.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package com.casic.missiles.modular.system.service;
-
-import com.casic.missiles.modular.system.dto.WorkerLocationDTO;
-import com.casic.missiles.modular.system.entity.ProjectDevice;
-import com.casic.missiles.modular.system.entity.ProjectWorker;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-import java.util.List;
-
-/**
- * <p>
- *  服务类
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface IProjectWorkerService extends IService<ProjectWorker> {
-
-    boolean saveProjectWorkerList(Long projectId, List<ProjectWorker> projectWorkerList);
-
-    boolean updateProjectWorkerList(Long projectId, List<ProjectWorker> projectWorkerList);
-
-    boolean deleteByProjectId(Long projectId);
-
-    boolean deleteByProjectIds(List<Long> projectIds);
-
-    List<ProjectWorker> selectDetailByProjectId(Long projectId,String workerType);
-
-    List<WorkerLocationDTO> selectWorkerLocationDTO(Long projectId);
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IWorkSiteInfoService.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IWorkSiteInfoService.java
deleted file mode 100644
index 58a8590..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IWorkSiteInfoService.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package com.casic.missiles.modular.system.service;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.modular.system.dto.WorkSiteDetailDTO;
-import com.casic.missiles.modular.system.entity.WorkSiteInfo;
-import com.baomidou.mybatisplus.extension.service.IService;
-import java.util.List;
-/**
- * <p>
- * 作业现场表 服务类
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface IWorkSiteInfoService extends IService<WorkSiteInfo> {
-
-    boolean addWorkSiteInfo(WorkSiteDetailDTO workSiteDetailDTO);
-
-    boolean updateWorkSiteInfo(WorkSiteDetailDTO workSiteDetailDTO);
-
-    boolean deleteProjects(List<Long> projectIds);
-
-    WorkSiteDetailDTO getWorkSiteDetail(Long projectId);
-
-    Page<WorkSiteInfo> selectListPage(Page<WorkSiteInfo> page, QueryWrapper<WorkSiteInfo> queryWrapper);
-
-    boolean start(Long projectId);
-
-    boolean finish(Long projectId);
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IWorkerService.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IWorkerService.java
deleted file mode 100644
index 6c6ee98..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IWorkerService.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package com.casic.missiles.modular.system.service;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.modular.system.entity.Worker;
-import com.baomidou.mybatisplus.extension.service.IService;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * <p>
- *  服务类
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface IWorkerService extends IService<Worker> {
-
-    boolean addWorker(Worker worker,Long projectId);
-
-    Page<Worker> selectListPage(Page<Worker> page,QueryWrapper<Worker> ew);
-
-    Worker selectWorkerDetail(Long workerId);
-
-    List<String> faceRegister(String cameraIp,String cameraPort);
-
-    List<Worker> projectTempWorker(Long projectId);
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/impl/AlarmServiceImpl.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/impl/AlarmServiceImpl.java
new file mode 100644
index 0000000..6e5959b
--- /dev/null
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/impl/AlarmServiceImpl.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.modular.system.service.impl;
+
+import com.casic.missiles.modular.system.entity.Alarm;
+import com.casic.missiles.modular.system.mapper.AlarmMapper;
+import com.casic.missiles.modular.system.service.IAlarmService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 报警记录表 服务实现类
+ * </p>
+ *
+ * @author zyj
+ * @since 2023-05-25
+ */
+@Service
+public class AlarmServiceImpl extends ServiceImpl<AlarmMapper, Alarm> implements IAlarmService {
+
+}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/impl/BusAlarmServiceImpl.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/impl/BusAlarmServiceImpl.java
deleted file mode 100644
index b44de1d..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/impl/BusAlarmServiceImpl.java
+++ /dev/null
@@ -1,121 +0,0 @@
-package com.casic.missiles.modular.system.service.impl;
-
-import cn.hutool.core.date.DateUtil;
-import cn.hutool.core.util.ObjectUtil;
-import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.core.application.service.AbstractDictService;
-import com.casic.missiles.modular.system.consts.AlarmTypeEnum;
-import com.casic.missiles.modular.system.dto.AlarmTypeCountDTO;
-import com.casic.missiles.modular.system.dto.AlarmUpload;
-import com.casic.missiles.modular.system.entity.BusAlarm;
-import com.casic.missiles.modular.system.entity.DataTreeLocation;
-import com.casic.missiles.modular.system.mapper.BusAlarmMapper;
-import com.casic.missiles.modular.system.service.*;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.util.Date;
-import java.util.List;
-import java.util.stream.Collectors;
-
-import static com.casic.missiles.modular.system.consts.AlarmConst.ALARM_STATUS_ON;
-
-/**
- * <p>
- * 报警记录表 服务实现类
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@Service
-@RequiredArgsConstructor
-@Slf4j
-public class BusAlarmServiceImpl extends ServiceImpl<BusAlarmMapper, BusAlarm> implements IBusAlarmService {
-
-    private final IDeviceExtService deviceExtService;
-    private final IDeviceService deviceService;
-    private final IProjectDeviceService projectDeviceService;
-
-    private final ICasicFileService fileService;
-
-    private final AbstractDictService dictService;
-    private final IDataSupportService dataSupportService;
-
-    @Override
-    @Transactional
-    public boolean alarmUpload(AlarmUpload alarmUpload) {
-        log.info("alarm upload ==> {}",alarmUpload.toString());
-        Long deviceId = null;
-        if(StrUtil.isAllNotBlank(alarmUpload.getGasIp(),alarmUpload.getGasPort())){
-            deviceId = deviceExtService.selectByGasIpPort(alarmUpload.getGasIp(),alarmUpload.getGasPort());
-        }
-        if(ObjectUtil.isEmpty(deviceId) && StrUtil.isAllNotBlank(alarmUpload.getCameraIp(),alarmUpload.getCameraPort())){
-            deviceId = deviceExtService.selectByCameraIpPort(alarmUpload.getCameraIp(),alarmUpload.getCameraPort());
-        }
-
-        if(ObjectUtil.isEmpty(deviceId)){
-            return false;
-        }
-
-        BusAlarm alarm = new BusAlarm();
-        alarm.setDeviceId(deviceId);
-        alarm.setProjectId(projectDeviceService.selectProjectIdByDevice(deviceId));
-        alarm.setAlarmValue(alarmUpload.getAlarmValue());
-        if(StrUtil.isNotEmpty(alarmUpload.getAlarmTime())){
-            alarm.setAlarmTime(DateUtil.parseDateTime(alarmUpload.getAlarmTime()));
-        }else {
-            alarm.setAlarmTime(new Date());
-        }
-
-        alarm.setAlarmType(alarmUpload.getAlarmType());
-        alarm.setAlarmContent(alarmUpload.getAlarmContent());
-        if(StrUtil.isNotEmpty(alarmUpload.getAlarmImage())){
-            String imgBase64 = "data:image/jpeg;base64," + alarmUpload.getAlarmImage();
-            String imageUrl = fileService.saveFile(imgBase64);
-            alarm.setAlarmImage(imageUrl);
-        }
-        alarm.setAlarmStatus(ALARM_STATUS_ON);
-
-        DataTreeLocation treeLocation = dataSupportService.getTreeLocation(deviceId);
-        if(ObjectUtil.isNotEmpty(treeLocation)){
-            alarm.setAlarmLng(treeLocation.getGdLng());
-            alarm.setAlarmLat(treeLocation.getGdLat());
-        }
-
-        //自动消警
-        AlarmTypeEnum alarmTypeEnum = AlarmTypeEnum.getByAlarmType(alarm.getAlarmType());
-        if(ObjectUtil.isNotEmpty(alarmTypeEnum) && alarmTypeEnum.isAutoCancel()){
-            this.baseMapper.cancelAlarm(deviceId,alarm.getAlarmType());
-        }
-        return this.save(alarm);
-    }
-
-    @Override
-    public Page<BusAlarm> listPage(Page<BusAlarm> page, QueryWrapper<BusAlarm> queryWrapper) {
-        page = this.baseMapper.listPage(page, queryWrapper);
-        for (BusAlarm alarm : page.getRecords()) {
-            alarm.setAlarmTypeName(dictService.getDictNameByCode("alarmType",alarm.getAlarmType()));
-            alarm.setAlarmStatusName(dictService.getDictNameByCode("alarmStatus",alarm.getAlarmStatus()));
-            if(StrUtil.isNotEmpty(alarm.getProjectState())){
-                alarm.setProjectStateName(dictService.getDictNameByCode("projectStatus",alarm.getProjectState()));
-            }
-        }
-        return page;
-    }
-
-    @Override
-    public List<AlarmTypeCountDTO> alarmCount(Long projectId, String alarmStatus) {
-        List<AlarmTypeCountDTO> list = this.baseMapper.alarmCount(projectId, alarmStatus);
-        list = list.stream().filter(i->StrUtil.isNotEmpty(i.getAlarmType())).collect(Collectors.toList());
-        for (AlarmTypeCountDTO countDTO : list) {
-            countDTO.setAlarmTypeName(dictService.getDictNameByCode("alarmType",countDTO.getAlarmType()));
-        }
-        return list;
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/impl/BusEventImageServiceImpl.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/impl/BusEventImageServiceImpl.java
deleted file mode 100644
index a43f7c1..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/impl/BusEventImageServiceImpl.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package com.casic.missiles.modular.system.service.impl;
-
-import com.casic.missiles.modular.system.entity.BusEventImage;
-import com.casic.missiles.modular.system.mapper.BusEventImageMapper;
-import com.casic.missiles.modular.system.service.IBusEventImageService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-/**
- * <p>
- * 事件图片表 服务实现类
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@Service
-public class BusEventImageServiceImpl extends ServiceImpl<BusEventImageMapper, BusEventImage> implements IBusEventImageService {
-
-    @Override
-    public boolean saveBusEventImages(Long eventId, List<BusEventImage> imageList) {
-        imageList.forEach(i->i.setEventId(eventId));
-        return this.saveBatch(imageList);
-    }
-}

diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/AlarmController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/AlarmController.java
new file mode 100644
index 0000000..1795cf1
--- /dev/null
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/AlarmController.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.modular.system.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.stereotype.Controller;
+
+/**
+ * <p>
+ * 报警记录表 前端控制器
+ * </p>
+ *
+ * @author zyj
+ * @since 2023-05-25
+ */
+@Controller
+@RequestMapping("/system/alarm")
+public class AlarmController {
+
+}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusAlarmController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusAlarmController.java
deleted file mode 100644
index 1f82ebb..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusAlarmController.java
+++ /dev/null
@@ -1,102 +0,0 @@
-package com.casic.missiles.modular.system.controller;
-
-
-import cn.hutool.core.util.ObjectUtil;
-import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.core.base.controller.BaseController;
-import com.casic.missiles.core.page.PageFactory;
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.AlarmUpload;
-import com.casic.missiles.modular.system.dto.DeviceDetailDTO;
-import com.casic.missiles.modular.system.entity.BusAlarm;
-import com.casic.missiles.modular.system.service.IBusAlarmService;
-import io.swagger.annotations.*;
-import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.*;
-
-import org.springframework.stereotype.Controller;
-
-import static com.casic.missiles.model.response.ResponseData.DEFAULT_SUCCESS_MESSAGE;
-import static com.casic.missiles.modular.system.consts.AlarmConst.ALARM_STATUS_MANUAL_CANCEL;
-
-/**
- * <p>
- * 报警记录表 前端控制器
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@Api(tags = "报警管理接口")
-@Controller
-@RequestMapping("/alarm")
-@RequiredArgsConstructor
-public class BusAlarmController extends BaseController {
-
-    private final IBusAlarmService alarmService;
-
-    @ApiOperation("报警上报接口")
-    @PostMapping("/upload")
-    @ResponseBody
-    public Object upload(@RequestBody AlarmUpload alarmUpload){
-        alarmService.alarmUpload(alarmUpload);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("报警列表分页查询")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "workTitle", value = "作业名称",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "projectId", value = "作业ID",dataType = "Long", paramType = "query",example = "0"),
-            @ApiImplicitParam(name = "alarmStatus", value = "报警状态",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "projectState", value = "作业状态",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "alarmType", value = "报警类型",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "alarmStartTime", value = "报警开始时间",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "alarmEndTime", value = "报警结束时间",dataType = "String", paramType = "query")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = BusAlarm.class),
-    })
-    @GetMapping("/listPage")
-    @ResponseBody
-    public Object listPage(String workTitle,Long projectId,String alarmStatus,String projectState,String alarmType,String alarmStartTime,String alarmEndTime){
-        Page<BusAlarm> page = PageFactory.defaultPage();
-        QueryWrapper<BusAlarm> queryWrapper = new QueryWrapper<>();
-        if(StrUtil.isNotEmpty(workTitle)){
-            queryWrapper.like("p.WORK_TITLE",workTitle);
-        }
-        if(ObjectUtil.isNotEmpty(projectId)){
-            queryWrapper.eq("alarm.PROJECT_ID",projectId);
-        }
-        if(StrUtil.isNotEmpty(alarmStatus)){
-            queryWrapper.eq("alarm.ALARM_STATUS",alarmStatus);
-        }
-        if(StrUtil.isNotEmpty(projectState)){
-            queryWrapper.eq("p.PROJECT_STATE",projectState);
-        }
-        if(StrUtil.isNotEmpty(alarmType)){
-            queryWrapper.eq("alarm.ALARM_TYPE",alarmType);
-        }
-        if(StrUtil.isNotEmpty(alarmStartTime)){
-            queryWrapper.ge("alarm.ALARM_TIME",alarmStartTime);
-        }
-        if(StrUtil.isNotEmpty(alarmEndTime)){
-            queryWrapper.le("alarm.ALARM_TIME",alarmEndTime);
-        }
-        page = alarmService.listPage(page,queryWrapper);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-    @ApiOperation("消警")
-    @PostMapping("/cancel")
-    @ResponseBody
-    public Object cancel(@RequestParam("alarmId") Long alarmId){
-        UpdateWrapper<BusAlarm> updateWrapper = new UpdateWrapper<>();
-        updateWrapper.eq("ID",alarmId);
-        updateWrapper.set("ALARM_STATUS",ALARM_STATUS_MANUAL_CANCEL);
-        alarmService.update(updateWrapper);
-        return ResponseData.success();
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusEventController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusEventController.java
deleted file mode 100644
index dde5aad..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusEventController.java
+++ /dev/null
@@ -1,41 +0,0 @@
-package com.casic.missiles.modular.system.controller;
-
-
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.entity.BusEvent;
-import com.casic.missiles.modular.system.service.IBusEventService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.ResponseBody;
-
-/**
- * <p>
- * 事件表 前端控制器
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@Controller
-@RequestMapping("/event")
-@Api(tags = "事件上报")
-@RequiredArgsConstructor
-public class BusEventController {
-
-    private final IBusEventService eventService;
-
-    @ApiOperation("事件上报")
-    @PostMapping("add")
-    @ResponseBody
-    public Object add(@RequestBody BusEvent busEvent){
-        eventService.saveBusEvent(busEvent);
-        return ResponseData.success();
-    }
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
index 03abc5f..aa50d78 100644
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
@@ -1,121 +1,20 @@
 package com.casic.missiles.modular.system.controller;
 
 
-import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.core.base.controller.BaseController;
-import com.casic.missiles.core.page.PageFactory;
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.DeviceDetailDTO;
-import com.casic.missiles.modular.system.entity.Device;
-import com.casic.missiles.modular.system.service.IDeviceExtService;
-import com.casic.missiles.modular.system.service.IDeviceService;
-import io.swagger.annotations.*;
-import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.RequestMapping;
 
 import org.springframework.stereotype.Controller;
 
-import java.time.LocalDateTime;
-import java.util.Date;
-import java.util.List;
-
-import static com.casic.missiles.model.response.ResponseData.DEFAULT_SUCCESS_MESSAGE;
-
 /**
  * <p>
- *  前端控制器
+ * 设备记录表 前端控制器
  * </p>
  *
  * @author zyj
- * @since 2023-04-14
+ * @since 2023-05-25
  */
-@Api(tags = "设备管理接口")
-@RequiredArgsConstructor
 @Controller
-@RequestMapping("/device")
-public class DeviceController extends BaseController {
-    private final IDeviceService deviceService;
-    private final IDeviceExtService deviceExtService;
-
-    @ApiOperation("设备分页列表")
-    @ApiImplicitParams({
-        @ApiImplicitParam(name = "deviceType", value = "设备类型",dataType = "String", paramType = "query"),
-        @ApiImplicitParam(name = "deviceCode", value = "设备编号",dataType = "String", paramType = "query"),
-        @ApiImplicitParam(name = "status", value = "设备状态",dataType = "String", paramType = "query"),
-        @ApiImplicitParam(name = "projectId", value = "作业ID（如果传此参数，列表中返回该作业使用的设备）",dataType = "Long", paramType = "query", example = "0")
-    })
-    @ApiResponses({
-        @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = DeviceDetailDTO.class),
-    })
-    @GetMapping("listPage")
-    @ResponseBody
-    public Object listPage(String deviceType, String deviceCode, String status,Long projectId){
-        Page<DeviceDetailDTO> page = PageFactory.defaultPage();
-        QueryWrapper<DeviceDetailDTO> queryWrapper = new QueryWrapper<>();
-        if(StrUtil.isNotEmpty(deviceType)){
-            queryWrapper.eq("DEVICE_TYPE",deviceType);
-        }
-        if(StrUtil.isNotEmpty(deviceCode)){
-            queryWrapper.like("DEVICE_CODE",deviceCode);
-        }
-        page = deviceService.listPage(page,queryWrapper,status,projectId);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-    @ApiOperation("新增设备")
-    @PostMapping("add")
-    @ResponseBody
-    public Object add(@RequestBody DeviceDetailDTO deviceDetailDTO){
-        deviceService.saveDevice(deviceDetailDTO);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("编辑设备")
-    @PostMapping("update")
-    @ResponseBody
-    public Object update(@RequestBody DeviceDetailDTO deviceDetailDTO){
-        deviceService.updateDevice(deviceDetailDTO);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("删除设备")
-    @PostMapping("delete")
-    @ResponseBody
-    public Object delete(@ApiParam("设备id列表")@RequestBody List<Long> deviceIds){
-        deviceService.deleteDevices(deviceIds);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("设置甲烷阈值")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "gasIp", value = "安全树甲烷设备IP",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "gasPort", value = "安全树甲烷端口",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "threshold", value = "甲烷阈值",dataType = "String", paramType = "query")
-    })
-    @PostMapping("setThreshold")
-    @ResponseBody
-    public Object setThreshold(String gasIp,String gasPort,String threshold){
-        deviceExtService.setGasThreshold(gasIp, gasPort, threshold);
-        return ResponseData.success();
-    }
-
-
-    @ApiOperation("查询甲烷阈值")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "gasIp", value = "安全树甲烷设备IP",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "gasPort", value = "安全树甲烷端口",dataType = "String", paramType = "query")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = "{\"code\": 200,\"data\": \"100\",\"message\": \"请求成功\",\"success\": true}",response = String.class),
-    })
-    @GetMapping("getThreshold")
-    @ResponseBody
-    public Object getThreshold(String gasIp,String gasPort){
-        String data = deviceExtService.getGasThreshold(gasIp, gasPort);
-        return ResponseData.success(data);
-    }
-
+@RequestMapping("/system/device")
+public class DeviceController {
 
 }
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/OverviewController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/OverviewController.java
deleted file mode 100644
index 7570504..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/OverviewController.java
+++ /dev/null
@@ -1,70 +0,0 @@
-package com.casic.missiles.modular.system.controller;
-
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.AlarmTypeCountDTO;
-import com.casic.missiles.modular.system.dto.DeviceLocationDTO;
-import com.casic.missiles.modular.system.dto.WorkerLocationDTO;
-import com.casic.missiles.modular.system.service.IBusAlarmService;
-import com.casic.missiles.modular.system.service.IProjectDeviceService;
-import com.casic.missiles.modular.system.service.IProjectWorkerService;
-import io.swagger.annotations.*;
-import lombok.RequiredArgsConstructor;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.ResponseBody;
-
-import static com.casic.missiles.model.response.ResponseData.DEFAULT_SUCCESS_MESSAGE;
-import static com.casic.missiles.modular.system.consts.AlarmConst.ALARM_STATUS_ON;
-
-@Api(tags = "首页看板接口")
-@Controller
-@RequestMapping("overview")
-@RequiredArgsConstructor
-public class OverviewController {
-
-    private final IBusAlarmService alarmService;
-    private final IProjectDeviceService projectDeviceService;
-
-    private final IProjectWorkerService projectWorkerService;
-
-
-    @ApiOperation("报警统计接口")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "projectId", value = "作业ID",dataType = "Long", paramType = "query", example = "0")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = AlarmTypeCountDTO.class),
-    })
-    @GetMapping("/alarmCount")
-    @ResponseBody
-    public Object alarmCount(Long projectId){
-        return ResponseData.success(alarmService.alarmCount(projectId,ALARM_STATUS_ON));
-    }
-
-    @ApiOperation("设备列表接口")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "projectId", value = "作业ID",dataType = "Long", paramType = "query", example = "0")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = DeviceLocationDTO.class),
-    })
-    @GetMapping("/deviceList")
-    @ResponseBody
-    public Object deviceList(Long projectId){
-        return ResponseData.success(projectDeviceService.selectDeviceLocationList(projectId));
-    }
-
-    @ApiOperation("人员列表接口")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "projectId", value = "作业ID",dataType = "Long", paramType = "query", example = "0")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = WorkerLocationDTO.class),
-    })
-    @GetMapping("/workerList")
-    @ResponseBody
-    public Object workerList(Long projectId){
-        return ResponseData.success(projectWorkerService.selectWorkerLocationDTO(projectId));
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/WorkSiteInfoController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/WorkSiteInfoController.java
deleted file mode 100644
index af36d69..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/WorkSiteInfoController.java
+++ /dev/null
@@ -1,130 +0,0 @@
-package com.casic.missiles.modular.system.controller;
-
-
-import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.core.base.controller.BaseController;
-import com.casic.missiles.core.page.PageFactory;
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.WorkSiteDetailDTO;
-import com.casic.missiles.modular.system.entity.WorkSiteInfo;
-import com.casic.missiles.modular.system.service.IWorkSiteInfoService;
-import io.swagger.annotations.*;
-import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.*;
-
-import org.springframework.stereotype.Controller;
-
-import java.util.List;
-
-import static com.casic.missiles.model.response.ResponseData.DEFAULT_SUCCESS_MESSAGE;
-
-/**
- * <p>
- * 作业现场表 前端控制器
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@Controller
-@RequestMapping("/site")
-@Api(tags = "作业现场管理")
-@RequiredArgsConstructor
-public class WorkSiteInfoController extends BaseController {
-
-
-    private final IWorkSiteInfoService workSiteInfoService;
-
-    @ApiOperation("新增作业现场")
-    @PostMapping("add")
-    @ResponseBody
-    public Object addWorkSite(@RequestBody WorkSiteDetailDTO workSiteDetailDTO){
-        workSiteInfoService.addWorkSiteInfo(workSiteDetailDTO);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("编辑作业现场")
-    @PostMapping("update")
-    @ResponseBody
-    public Object updateWorkSite(@RequestBody WorkSiteDetailDTO workSiteDetailDTO){
-        workSiteInfoService.updateWorkSiteInfo(workSiteDetailDTO);
-        return ResponseData.success();
-    }
-
-
-    @ApiOperation("删除作业现场")
-    @PostMapping("delete")
-    @ResponseBody
-    public Object delete(@ApiParam("作业现场id列表")@RequestBody List<Long> projectIds){
-        workSiteInfoService.deleteProjects(projectIds);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("查询作业现场详情")
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = WorkSiteDetailDTO.class),
-    })
-    @GetMapping("detail")
-    @ResponseBody
-    public Object delete(@ApiParam(value = "作业现场id", example = "0")@RequestParam Long projectId){
-        WorkSiteDetailDTO detailDTO = workSiteInfoService.getWorkSiteDetail(projectId);
-        return ResponseData.success(detailDTO);
-    }
-
-    @ApiOperation("分页列表查询")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "workTitle",value = "作业名称", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "workRoad",value = "所属道路", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "workPersonName",value = "责任人姓名", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "startDate",value = "注册开始日期", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "endDate",value = "注册结束日期", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "projectState",value = "当前状态（字典值）", dataType = "String", paramType = "query")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = WorkSiteInfo.class),
-    })
-    @GetMapping("listPage")
-    @ResponseBody
-    public Object listPage(String workTitle,String workRoad,String workPersonName,String projectState,String startDate,String endDate){
-        Page<WorkSiteInfo> page = PageFactory.defaultPage();
-        QueryWrapper<WorkSiteInfo> queryWrapper = new QueryWrapper<>();
-        if(StrUtil.isNotEmpty(workTitle)){
-            queryWrapper.like("WORK_TITLE",workTitle);
-        }
-        if(StrUtil.isNotEmpty(workRoad)){
-            queryWrapper.like("WORK_ROAD",workRoad);
-        }
-        if(StrUtil.isNotEmpty(workPersonName)){
-            queryWrapper.like("WORKER_NAME",workPersonName);
-        }
-        if(StrUtil.isNotEmpty(projectState)){
-            queryWrapper.eq("PROJECT_STATE",projectState);
-        }
-        if(StrUtil.isNotEmpty(startDate)){
-            queryWrapper.ge("br_work_site_info.CREATE_TIME",startDate + " 00:00:00");
-        }
-        if(StrUtil.isNotEmpty(endDate)){
-            queryWrapper.le("br_work_site_info.CREATE_TIME",endDate + " 23:59:59");
-        }
-        page = workSiteInfoService.selectListPage(page,queryWrapper);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-    @ApiOperation("开始作业")
-    @PostMapping("start")
-    @ResponseBody
-    public Object start(@ApiParam(value = "作业现场id",example = "0")@RequestParam Long projectId){
-        workSiteInfoService.start(projectId);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("完成作业")
-    @PostMapping("finish")
-    @ResponseBody
-    public Object finish(@ApiParam(value = "作业现场id", example = "0")@RequestParam Long projectId){
-        workSiteInfoService.finish(projectId);
-        return ResponseData.success();
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/WorkerController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/WorkerController.java
deleted file mode 100644
index 796f94c..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/WorkerController.java
+++ /dev/null
@@ -1,136 +0,0 @@
-package com.casic.missiles.modular.system.controller;
-
-
-import cn.hutool.core.util.ObjectUtil;
-import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.core.base.controller.BaseController;
-import com.casic.missiles.core.page.PageFactory;
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.DeviceDetailDTO;
-import com.casic.missiles.modular.system.entity.Device;
-import com.casic.missiles.modular.system.entity.Worker;
-import com.casic.missiles.modular.system.service.IWorkerService;
-import io.swagger.annotations.*;
-import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.*;
-
-import org.springframework.stereotype.Controller;
-
-import java.util.Date;
-import java.util.List;
-
-import static com.casic.missiles.model.response.ResponseData.DEFAULT_SUCCESS_MESSAGE;
-
-/**
- * <p>
- *  前端控制器
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@Controller
-@RequestMapping("/worker")
-@RequiredArgsConstructor
-@Api(tags = "人员管理接口")
-public class WorkerController extends BaseController {
-
-    private final IWorkerService workerService;
-
-    @ApiOperation("分页列表查询")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "name",value = "姓名", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "deptId",value = "所属部门", dataType = "Long", paramType = "query", example = "0"),
-            @ApiImplicitParam(name = "status",value = "当前状态（字典值）", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "startDate",value = "注册开始日期", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "endDate",value = "注册结束日期", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "workerType",value = "人员类型（字典值）", dataType = "String", paramType = "query")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = Worker.class),
-    })
-    @GetMapping("listPage")
-    @ResponseBody
-    public Object listPage(String name,Long deptId, String status,String startDate,String endDate,String workerType){
-        Page<Worker> page = PageFactory.defaultPage();
-        QueryWrapper<Worker> queryWrapper = new QueryWrapper<>();
-        if(StrUtil.isNotEmpty(name)){
-            queryWrapper.like("WORKER_NAME",name);
-        }
-        if(ObjectUtil.isNotEmpty(deptId)){
-            queryWrapper.eq("DEPT_ID",deptId);
-        }
-        if(StrUtil.isNotEmpty(workerType)){
-            queryWrapper.eq("WORKER_TYPE",workerType);
-        }
-        if(StrUtil.isNotEmpty(startDate)){
-            queryWrapper.ge("CREATE_TIME",startDate + " 00:00:00");
-        }
-        if(StrUtil.isNotEmpty(endDate)){
-            queryWrapper.le("CREATE_TIME",endDate + " 23:59:59");
-        }
-        if(StrUtil.isNotEmpty(status)){
-            queryWrapper.eq("`STATUS`",status);
-        }
-        page = workerService.selectListPage(page,queryWrapper);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-    @ApiOperation("新增人员")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "worker", value = "人员信息", dataType = "Worker", paramType = "body", required = true),
-            @ApiImplicitParam(name = "projectId", value = "项目ID(入场申请需要)", dataType = "Long", paramType = "query", example = "0")
-    })
-    @PostMapping("add")
-    @ResponseBody
-    public Object add(@ApiParam("worker")@RequestBody Worker worker,
-                      @RequestParam(required = false) Long projectId){
-        workerService.addWorker(worker,projectId);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("编辑人员")
-    @PostMapping("update")
-    @ResponseBody
-    public Object update(@RequestBody Worker worker){
-        workerService.updateById(worker);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("删除人员")
-    @PostMapping("delete")
-    @ResponseBody
-    public Object delete(@ApiParam("人员id列表")@RequestBody List<Long> workIds){
-        workerService.removeByIds(workIds);
-        return ResponseData.success();
-    }
-
-
-    @ApiOperation(value = "获取人脸图片",notes = "返回人脸图片url")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "cameraIp",value = "摄像头IP", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "cameraPort",value = "摄像头端口号", dataType = "String", paramType = "query"),
-    })
-    @GetMapping("/face/register")
-    @ResponseBody
-    public Object faceRegister(String cameraIp,String cameraPort){
-        return ResponseData.success(workerService.faceRegister(cameraIp, cameraPort));
-    }
-
-
-    @ApiOperation(value = "查询临时入场人员列表")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "projectId", value = "项目ID",required = true,dataType = "Long", paramType = "query", example = "0")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = Worker.class),
-    })
-    @GetMapping("/projectTempWorker")
-    @ResponseBody
-    public Object projectTempWorker(Long projectId){
-        return ResponseData.success(workerService.projectTempWorker(projectId));
-    }
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/AlarmTypeCountDTO.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/AlarmTypeCountDTO.java
deleted file mode 100644
index 1a165a1..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/AlarmTypeCountDTO.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.casic.missiles.modular.system.dto;
-
-import io.swagger.annotations.ApiModel;
-import lombok.Data;
-
-@ApiModel(value = "AlarmTypeCountDTO",description = "报警类型统计（首页）")
-@Data
-public class AlarmTypeCountDTO {
-
-    private String alarmType;
-    private String alarmTypeName;
-    private Integer alarmCount;
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/AlarmUpload.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/AlarmUpload.java
deleted file mode 100644
index 73d7799..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/AlarmUpload.java
+++ /dev/null
@@ -1,46 +0,0 @@
-package com.casic.missiles.modular.system.dto;
-
-import cn.hutool.core.util.StrUtil;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-@ApiModel(value = "AlarmUpload",description = "报警上传")
-@Data
-public class AlarmUpload {
-
-    @ApiModelProperty(value = "摄像头ip")
-    private String cameraIp;
-
-    @ApiModelProperty(value = "摄像头端口")
-    private String cameraPort;
-    @ApiModelProperty(value = "安全树甲烷设备ip")
-    private String gasIp;
-    @ApiModelProperty(value = "安全树甲烷设备端口")
-    private String gasPort;
-    @ApiModelProperty(value = "报警值")
-    private String alarmValue;
-    @ApiModelProperty(value = "报警时间")
-    private String alarmTime;
-    @ApiModelProperty(value = "报警类型")
-    private String alarmType;
-    @ApiModelProperty(value = "报警图片")
-    private String alarmImage;
-    @ApiModelProperty(value = "报警内容")
-    private String alarmContent;
-
-    @Override
-    public String toString() {
-        return "AlarmUpload{" +
-                "cameraIp='" + cameraIp + '\'' +
-                ", cameraPort='" + cameraPort + '\'' +
-                ", gasIp='" + gasIp + '\'' +
-                ", gasPort='" + gasPort + '\'' +
-                ", alarmValue='" + alarmValue + '\'' +
-                ", alarmTime='" + alarmTime + '\'' +
-                ", alarmType='" + alarmType + '\'' +
-                ", alarmImage='" + (StrUtil.isNotEmpty(alarmImage) ? alarmImage.substring(0,50) : "null") + '\'' +
-                ", alarmContent='" + alarmContent + '\'' +
-                '}';
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/DeviceDetailDTO.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/DeviceDetailDTO.java
deleted file mode 100644
index ea518d9..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/DeviceDetailDTO.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package com.casic.missiles.modular.system.dto;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.casic.missiles.modular.system.entity.Device;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-@ApiModel("DeviceDetailDTO")
-@Data
-public class DeviceDetailDTO extends Device {
-
-    @ApiModelProperty(value = "摄像头编号")
-    private String cameraCode;
-
-    @ApiModelProperty(value = "摄像头IP")
-    private String cameraIp;
-
-    @ApiModelProperty(value = "摄像头端口")
-    private String cameraPort;
-
-    @ApiModelProperty(value = "激甲编号")
-    private String gasCode;
-
-    @ApiModelProperty(value = "激甲IP")
-    private String gasIp;
-
-    @ApiModelProperty(value = "激甲端口")
-    private String gasPort;
-
-    @ApiModelProperty(value = "智能帽衬编号")
-    private String hatLiningCode;
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/WorkSiteDetailDTO.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/WorkSiteDetailDTO.java
deleted file mode 100644
index 29378ff..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/WorkSiteDetailDTO.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package com.casic.missiles.modular.system.dto;
-
-import com.casic.missiles.modular.system.entity.ProjectDevice;
-import com.casic.missiles.modular.system.entity.ProjectWorker;
-import com.casic.missiles.modular.system.entity.WorkSiteInfo;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.util.List;
-
-@Data
-@ApiModel("WorkSiteDetailDTO")
-public class WorkSiteDetailDTO extends WorkSiteInfo {
-
-    @ApiModelProperty(value = "安全树列表",dataType = "ProjectDevice")
-    private List<ProjectDevice> deviceList;
-
-    @ApiModelProperty(value = "人员列表",dataType = "ProjectWorker")
-    private List<ProjectWorker> workerList;
-
-
-
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/WorkerLocationDTO.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/WorkerLocationDTO.java
deleted file mode 100644
index 6fd7b24..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/WorkerLocationDTO.java
+++ /dev/null
@@ -1,68 +0,0 @@
-package com.casic.missiles.modular.system.dto;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-@ApiModel(value = "WorkerLocationDTO",description = "人员位置列表（首页）")
-@Data
-public class WorkerLocationDTO {
-
-    @ApiModelProperty("人员ID")
-    private Long workerId;
-
-    @ApiModelProperty("人员姓名")
-    private String workerName;
-
-    @ApiModelProperty("安全帽编号")
-    private String hatCode;
-
-    @ApiModelProperty("安全帽ID")
-    private Long hatId;
-
-    @ApiModelProperty("背心编号")
-    private String vastCode;
-
-    @ApiModelProperty("手环编号")
-    private String braceletCode;
-
-    @ApiModelProperty("位置")
-    private String location;
-
-    @ApiModelProperty("时间")
-    private String time;
-
-    @ApiModelProperty("经度")
-    private String lng;
-
-    @ApiModelProperty("纬度")
-    private String lat;
-
-    @ApiModelProperty("心率")
-    private String heartRate;
-
-    @ApiModelProperty("血氧")
-    private String bloodOxygen;
-
-    @ApiModelProperty("一氧化碳")
-    private String co;
-
-    @ApiModelProperty("甲烷")
-    private String gas;
-
-    @ApiModelProperty("硫化氢")
-    private String h2s;
-
-    @ApiModelProperty("氧气")
-    private String o2;
-
-    @ApiModelProperty("信号")
-    private String signal;
-
-    @ApiModelProperty("电量")
-    private String cell;
-
-    @ApiModelProperty("是否报警")
-    private boolean alarmFlag;
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Alarm.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Alarm.java
new file mode 100644
index 0000000..4d2b7ef
--- /dev/null
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Alarm.java
@@ -0,0 +1,103 @@
+package com.casic.missiles.modular.system.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import java.util.Date;
+
+/**
+ * <p>
+ * 报警记录表
+ * </p>
+ *
+ * @author zyj
+ * @since 2023-05-25
+ */
+@Data
+@TableName("bus_alarm")
+public class Alarm implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    @TableId(value = "ID",type = IdType.ASSIGN_ID)
+    private Long id;
+
+    /**
+     * 设备ID
+     */
+    @TableField("DEVICE_ID")
+    private Long deviceId;
+
+    /**
+     * 报警类型
+     */
+    @TableField("ALARM_TYPE")
+    private String alarmType;
+
+    /**
+     * 报警时间
+     */
+    @TableField("ALARM_TIME")
+    private Date alarmTime;
+
+    /**
+     * 报警状态
+     */
+    @TableField("ALARM_STATUS")
+    private String alarmStatus;
+
+    /**
+     * 报警位置
+     */
+    @TableField("ALARM_LOCATION")
+    private String alarmLocation;
+
+    /**
+     * 报警图片
+     */
+    @TableField("ALARM_IMAGE")
+    private String alarmImage;
+
+    /**
+     * 视频通道号
+     */
+    @TableField("CHANNEL_NO")
+    private Integer channelNo;
+
+    /**
+     * 报警内容
+     */
+    @TableField("ALARM_CONTENT")
+    private String alarmContent;
+
+    /**
+     * 消警时间
+     */
+    @TableField("CANCEL_TIME")
+    private Date cancelTime;
+
+
+    @Override
+    public String toString() {
+        return "Alarm{" +
+            "id=" + id +
+            ", deviceId=" + deviceId +
+            ", alarmType=" + alarmType +
+            ", alarmTime=" + alarmTime +
+            ", alarmStatus=" + alarmStatus +
+            ", alarmLocation=" + alarmLocation +
+            ", alarmImage=" + alarmImage +
+            ", channelNo=" + channelNo +
+            ", alarmContent=" + alarmContent +
+            ", cancelTime=" + cancelTime +
+        "}";
+    }
+}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusAlarm.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusAlarm.java
deleted file mode 100644
index efb4a23..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusAlarm.java
+++ /dev/null
@@ -1,159 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.alibaba.fastjson.annotation.JSONField;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.time.LocalDateTime;
-import java.util.Date;
-
-/**
- * <p>
- * 报警记录表
- * </p>
- *
- * @author zyj
- * @since 2023-05-16
- */
-@Data
-@ApiModel("Alarm")
-@TableName("br_bus_alarm")
-public class BusAlarm implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 项目ID
-     */
-    @ApiModelProperty(value = "项目ID")
-    @TableField("PROJECT_ID")
-    private Long projectId;
-
-    /**
-     * 设备ID
-     */
-    @ApiModelProperty(value = "设备ID")
-    @TableField("DEVICE_ID")
-    private Long deviceId;
-
-    /**
-     * 报警类型
-     */
-    @ApiModelProperty(value = "报警类型")
-    @TableField("ALARM_TYPE")
-    private String alarmType;
-
-    /**
-     * 报警状态
-     */
-    @ApiModelProperty(value = "报警状态")
-    @TableField("ALARM_STATUS")
-    private String alarmStatus;
-
-    /**
-     * 报警值
-     */
-    @ApiModelProperty(value = "报警值")
-    @TableField("ALARM_VALUE")
-    private String alarmValue;
-
-    /**
-     * 报警图片
-     */
-    @ApiModelProperty(value = "报警图片")
-    @TableField("ALARM_IMAGE")
-    private String alarmImage;
-
-    /**
-     * 报警内容
-     */
-    @ApiModelProperty(value = "报警内容")
-    @TableField("ALARM_CONTENT")
-    private String alarmContent;
-
-    /**
-     * 报警时间
-     */
-    @ApiModelProperty(value = "报警时间")
-    @TableField("ALARM_TIME")
-    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
-    private Date alarmTime;
-
-    /**
-     * 消警时间
-     */
-    @ApiModelProperty(value = "消警时间")
-    @TableField("CANCEL_TIME")
-    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
-    private Date cancelTime;
-
-    /**
-     * 报警位置经度
-     */
-    @ApiModelProperty(value = "报警位置经度")
-    @TableField("ALARM_LNG")
-    private String alarmLng;
-
-    /**
-     * 报警位置纬度
-     */
-    @ApiModelProperty(value = "报警位置纬度")
-    @TableField("ALARM_LAT")
-    private String alarmLat;
-
-    @ApiModelProperty("报警类型名称")
-    @TableField(exist = false)
-    private String alarmStatusName;
-    @ApiModelProperty("报警类型名称")
-    @TableField(exist = false)
-    private String alarmTypeName;
-    @ApiModelProperty("作业名称")
-    @TableField(exist = false)
-    private String workTitle;
-    @ApiModelProperty("所属道路")
-    @TableField(exist = false)
-    private String workRoad;
-    @ApiModelProperty("作业状态")
-    @TableField(exist = false)
-    private String projectState;
-    @ApiModelProperty("作业状态名称")
-    @TableField(exist = false)
-    private String projectStateName;
-    @ApiModelProperty("负责人姓名")
-    @TableField(exist = false)
-    private String workPersonName;
-    @ApiModelProperty("负责人联系方式")
-    @TableField(exist = false)
-    private String workPersonPhoneNumber;
-
-
-    @Override
-    public String toString() {
-        return "BusAlarm{" +
-                "id=" + id +
-                ", projectId=" + projectId +
-                ", deviceId=" + deviceId +
-                ", alarmType=" + alarmType +
-                ", alarmValue=" + alarmValue +
-                ", alarmStatus=" + alarmStatus +
-                ", alarmImage=" + alarmImage +
-                ", alarmContent=" + alarmContent +
-                ", alarmTime=" + alarmTime +
-                ", cancelTime=" + cancelTime +
-                ", alarmLng=" + alarmLng +
-                ", alarmLat=" + alarmLat +
-                "}";
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusEvent.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusEvent.java
deleted file mode 100644
index a0b7543..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusEvent.java
+++ /dev/null
@@ -1,100 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.time.LocalDateTime;
-import java.util.Date;
-import java.util.List;
-
-/**
- * <p>
- * 事件表
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@TableName("br_bus_event")
-@Data
-@ApiModel("BusEvent")
-public class BusEvent implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @ApiModelProperty("事件ID")
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 事件标题
-     */
-    @ApiModelProperty("事件名称")
-    @TableField("EVENT_TITLE")
-    private String eventTitle;
-
-    /**
-     * 上报人员
-     */
-    @ApiModelProperty("上报人员")
-    @TableField("UPLOAD_NAME")
-    private String uploadName;
-
-    /**
-     * 联系方式
-     */
-    @ApiModelProperty("联系方式")
-    @TableField("PHONE_NUMBER")
-    private String phoneNumber;
-
-    /**
-     * 事件描述
-     */
-    @ApiModelProperty("事件描述")
-    @TableField("EVENT_DESCRIPTION")
-    private String eventDescription;
-
-    @ApiModelProperty("经度")
-    @TableField("LNG")
-    private String lng;
-
-    @ApiModelProperty("纬度")
-    @TableField("LAT")
-    private String lat;
-
-    /**
-     * 事件上传时间
-     */
-    @ApiModelProperty("事件上传时间")
-    @TableField("CREATE_TIME")
-    private Date createTime;
-
-    @ApiModelProperty("事件照片")
-    @TableField(exist = false)
-    private List<BusEventImage> imageList;
-
-
-
-    @Override
-    public String toString() {
-        return "BusEvent{" +
-            "id=" + id +
-            ", eventTitle=" + eventTitle +
-            ", uploadName=" + uploadName +
-            ", phoneNumber=" + phoneNumber +
-            ", eventDescription=" + eventDescription +
-            ", lng=" + lng +
-            ", lat=" + lat +
-            ", createTime=" + createTime +
-        "}";
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusEventImage.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusEventImage.java
deleted file mode 100644
index 1e75245..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusEventImage.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-
-/**
- * <p>
- * 事件图片表
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@TableName("br_bus_event_image")
-@Data
-@ApiModel("BusEventImage")
-public class BusEventImage implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 事件ID
-     */
-    @TableField("EVENT_ID")
-    private Long eventId;
-
-    /**
-     * 报警图片
-     */
-    @TableField("IMAGE")
-    @ApiModelProperty("图片url")
-    private String image;
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Device.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Device.java
index df89c70..ea7db5f 100644
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Device.java
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Device.java
@@ -1,30 +1,23 @@
 package com.casic.missiles.modular.system.entity;
 
-import com.alibaba.fastjson.annotation.JSONField;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.casic.missiles.core.base.json.DateDeserializer;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
-import java.util.Date;
 
 /**
  * <p>
- * 
+ * 设备记录表
  * </p>
  *
  * @author zyj
- * @since 2023-04-14
+ * @since 2023-05-25
  */
-@ApiModel("Device")
-@TableName("br_device")
 @Data
+@TableName("bus_device")
 public class Device implements Serializable {
 
     private static final long serialVersionUID = 1L;
@@ -32,82 +25,86 @@
     /**
      * 主键
      */
-    @ApiModelProperty(value = "设备ID")
     @TableId(value = "ID",type = IdType.ASSIGN_ID)
     private Long id;
 
     /**
-     * 设备编号
+     * 设备名称
      */
-    @ApiModelProperty(value = "设备编号")
-    @TableField("DEVICE_CODE")
-    private String deviceCode;
+    @TableField("DEVICE_NAME")
+    private String deviceName;
 
     /**
-     * 设备类型
+     * IP
      */
-    @ApiModelProperty(value = "设备类型")
-    @TableField("DEVICE_TYPE")
-    private String deviceType;
+    @TableField("IP")
+    private String ip;
 
     /**
-     * 设备批次
+     * 端口
      */
-    @ApiModelProperty(value = "设备批次")
-    @TableField("DEVICE_BATCH")
-    private String deviceBatch;
+    @TableField("PORT")
+    private String port;
 
     /**
-     * 厂家
+     * 用户名
      */
-    @ApiModelProperty(value = "厂家")
-    @TableField("MANUFACTURER")
-    private String manufacturer;
+    @TableField("USER_NAME")
+    private String userName;
 
     /**
-     * 是否供电
+     * 密码
      */
-    @ApiModelProperty(value = "是否供电")
-    @TableField("IS_POWER_SUPPLY")
-    private String isPowerSupply;
+    @TableField("PASSWORD")
+    private String password;
 
     /**
-     * 创建时间
+     * 连接类型
      */
-    @ApiModelProperty(value = "创建时间",dataType = "Date")
-    @TableField("CREATE_TIME")
-    private Date createTime;
+    @TableField("CONNECT_TYPE")
+    private String connectType;
 
-    @ApiModelProperty(value = "设备类型名称")
-    @TableField(exist = false)
-    private String deviceTypeName;
+    /**
+     * 位置
+     */
+    @TableField("LOCATION")
 
-    @ApiModelProperty(value = "是否供电名称")
-    @TableField(exist = false)
-    private String isPowerSupplyName;
+    private String location;
 
-    @ApiModelProperty(value = "注册时间",dataType = "String")
-    @TableField(exist = false)
-    private String registerTime;
+    /**
+     * 设备状态
+     */
+    @TableField("STATUS")
 
-    @ApiModelProperty(value = "当前状态")
-    @TableField(exist = false)
     private String status;
 
-    @ApiModelProperty(value = "当前状态名称")
-    @TableField(exist = false)
-    private String statusName;
+    /**
+     * 报警分组
+     */
+    @TableField("ALARM_GROUP")
+
+    private Long alarmGroup;
+
+    /**
+     * 视频通道数(预留)
+     */
+    @TableField("CHANNEL_NUM")
+    private Integer channelNum;
 
     @Override
     public String toString() {
         return "Device{" +
             "id=" + id +
-            ", deviceCode=" + deviceCode +
-            ", deviceType=" + deviceType +
-            ", deviceBatch=" + deviceBatch +
-            ", manufacturer=" + manufacturer +
-            ", isPowerSupply=" + isPowerSupply +
-            ", createTime=" + createTime +
+            ", deviceName=" + deviceName +
+            ", ip=" + ip +
+            ", port=" + port +
+            ", userName=" + userName +
+            ", password=" + password +
+            ", connectType=" + connectType +
+            ", location=" + location +
+            ", status=" + status +
+            ", alarmGroup=" + alarmGroup +
+            ", channelNum=" + channelNum +
         "}";
     }
 }
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/DeviceExt.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/DeviceExt.java
deleted file mode 100644
index 5ee7015..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/DeviceExt.java
+++ /dev/null
@@ -1,99 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-
-/**
- * <p>
- * 设备扩展信息表（安全树）
- * </p>
- *
- * @author zyj
- * @since 2023-04-27
- */
-@Data
-@TableName("br_device_ext")
-public class DeviceExt implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 设备ID
-     */
-    @TableField("DEVICE_ID")
-    private Long deviceId;
-
-    /**
-     * 摄像头编号
-     */
-    @TableField("CAMERA_CODE")
-    private String cameraCode;
-
-    /**
-     * 摄像头IP
-     */
-    @TableField("CAMERA_IP")
-    private String cameraIp;
-
-    /**
-     * 摄像头端口
-     */
-    @TableField("CAMERA_PORT")
-    private String cameraPort;
-
-    /**
-     * 激甲编号
-     */
-    @TableField("GAS_CODE")
-    private String gasCode;
-
-    /**
-     * 激甲IP
-     */
-    @TableField("GAS_IP")
-    private String gasIp;
-
-    /**
-     * 激甲端口
-     */
-    @TableField("GAS_PORT")
-    private String gasPort;
-
-    /**
-     * 甲烷报警阈值
-     */
-    @TableField("GAS_THRESHOLD")
-    private String gasThreshold;
-
-    @TableField(value = "HAT_LINING_CODE")
-    private String hatLiningCode;
-
-
-    @Override
-    public String toString() {
-        return "DeviceExt{" +
-            "id=" + id +
-            ", deviceId=" + deviceId +
-            ", cameraCode=" + cameraCode +
-            ", cameraIp=" + cameraIp +
-            ", cameraPort=" + cameraPort +
-            ", gasCode=" + gasCode +
-            ", gasIp=" + gasIp +
-            ", gasPort=" + gasPort +
-            ", gasThreshold=" + gasThreshold +
-            ", hatLiningCode=" + hatLiningCode +
-        "}";
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/ProjectDevice.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/ProjectDevice.java
deleted file mode 100644
index c4f3472..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/ProjectDevice.java
+++ /dev/null
@@ -1,62 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-
-/**
- * <p>
- * 
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@Data
-@ApiModel("ProjectDevice")
-@TableName("br_project_device")
-public class ProjectDevice implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 作业现场ID
-     */
-    @TableField("PROJECT_ID")
-    private Long projectId;
-
-    /**
-     * 设备ID
-     */
-    @TableField("DEVICE_ID")
-    @ApiModelProperty("设备ID（新增编辑时传）")
-    private Long deviceId;
-
-    /**
-     * 设备编号
-     */
-    @TableField(exist = false)
-    @ApiModelProperty("设备编号（详情中展示，新增编辑不用传）")
-    private String deviceCode;
-
-    @Override
-    public String toString() {
-        return "ProjectDevice{" +
-            "id=" + id +
-            ", projectId=" + projectId +
-            ", deviceId=" + deviceId +
-        "}";
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/ProjectWorker.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/ProjectWorker.java
deleted file mode 100644
index 10b23c4..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/ProjectWorker.java
+++ /dev/null
@@ -1,104 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import java.io.Serializable;
-
-/**
- * <p>
- * 
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@ApiModel("ProjectWorker")
-@TableName("br_project_worker")
-@Data
-@NoArgsConstructor
-@AllArgsConstructor
-public class ProjectWorker implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 作业现场ID
-     */
-    @TableField("PROJECT_ID")
-    private Long projectId;
-
-    /**
-     * 人员ID
-     */
-    @ApiModelProperty("人员ID")
-    @TableField("WORKER_ID")
-    private Long workerId;
-
-    /**
-     * 安全帽编号
-     */
-    @ApiModelProperty("安全帽编号")
-    @TableField("HAT_CODE")
-    private String hatCode;
-
-    /**
-     * 背心编号
-     */
-    @ApiModelProperty("背心编号")
-    @TableField("VAST_CODE")
-    private String vastCode;
-
-    /**
-     * 手环编号
-     */
-    @ApiModelProperty("手环编号")
-    @TableField("BRACELET_CODE")
-    private String braceletCode;
-
-    @ApiModelProperty("人员姓名（详情中展示，新增编辑不用传）")
-    @TableField(exist = false)
-    private String workerName;
-
-    @ApiModelProperty("人员部门ID（详情中展示，新增编辑不用传）")
-    @TableField(exist = false)
-    private String workerDeptId;
-
-    @ApiModelProperty("人员部门名称（详情中展示，新增编辑不用传）")
-    @TableField(exist = false)
-    private String workerDeptName;
-
-    @ApiModelProperty("人员联系方式（详情中展示，新增编辑不用传）")
-    @TableField(exist = false)
-    private String workerPhoneNumber;
-
-    public ProjectWorker(Long projectId, Long workerId) {
-        this.projectId = projectId;
-        this.workerId = workerId;
-    }
-
-    @Override
-    public String toString() {
-        return "ProjectWorker{" +
-            "id=" + id +
-            ", projectId=" + projectId +
-            ", workerId=" + workerId +
-            ", hatCode=" + hatCode +
-            ", vastCode=" + vastCode +
-            ", braceletCode=" + braceletCode +
-        "}";
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/WorkSiteInfo.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/WorkSiteInfo.java
deleted file mode 100644
index fa6f41d..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/WorkSiteInfo.java
+++ /dev/null
@@ -1,130 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.alibaba.fastjson.annotation.JSONField;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.time.LocalDateTime;
-import java.util.Date;
-
-/**
- * <p>
- * 作业现场表
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@ApiModel("WorkSiteInfo")
-@TableName("br_work_site_info")
-@Data
-public class WorkSiteInfo implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @ApiModelProperty("作业现场ID")
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 作业名称
-     */
-    @ApiModelProperty("作业名称")
-    @TableField("WORK_TITLE")
-    private String workTitle;
-
-    /**
-     * 责任人
-     */
-    @ApiModelProperty("责任人（人员ID）")
-    @TableField("WORK_PERSON")
-    private Long workPerson;
-
-    /**
-     * 作业描述
-     */
-    @ApiModelProperty("作业描述")
-    @TableField("WORK_SITE_DESC")
-    private String workSiteDesc;
-
-    /**
-     * 作业状态
-     */
-    @ApiModelProperty("作业状态")
-    @TableField("PROJECT_STATE")
-    private String projectState;
-
-    /**
-     * 所属道路
-     */
-    @ApiModelProperty("所属道路")
-    @TableField("WORK_ROAD")
-    private String workRoad;
-
-    @TableField("IMAGE_URL")
-    private String imageUrl;
-
-    @TableField("CREATE_TIME")
-    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
-    private Date createTime;
-    @TableField("UPDATE_TIME")
-    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
-    private Date updateTime;
-
-    @ApiModelProperty("开始时间")
-    @TableField("START_TIME")
-    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
-    private Date startTime;
-
-    @ApiModelProperty("结束时间")
-    @TableField("FINISH_TIME")
-    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
-    private Date finishTime;
-
-    @ApiModelProperty("负责人姓名（详情中使用，新增编辑不用传）")
-    @TableField(exist = false)
-    private String workPersonName;
-
-    @ApiModelProperty("负责人联系方式（详情中使用，新增编辑不用传）")
-    @TableField(exist = false)
-    private String workPersonPhoneNumber;
-
-    @ApiModelProperty("负责人所属部门ID（详情中使用，新增编辑不用传）")
-    @TableField(exist = false)
-    private Long workPersonDeptId;
-
-    @ApiModelProperty("负责人所属部门名称（详情中使用，新增编辑不用传）")
-    @TableField(exist = false)
-    private String workPersonDeptName;
-
-    @ApiModelProperty(value = "注册时间",dataType = "String")
-    @TableField(exist = false)
-    private String registerTime;
-
-    @ApiModelProperty("作业状态名称")
-    @TableField(exist = false)
-    private String projectStateName;
-
-    @Override
-    public String toString() {
-        return "WorkSiteInfo{" +
-            "id=" + id +
-            ", workTitle=" + workTitle +
-            ", workPerson=" + workPerson +
-            ", workSiteDesc=" + workSiteDesc +
-            ", projectState=" + projectState +
-            ", imageUrl=" + imageUrl +
-            ", updateTime=" + updateTime +
-            ", workRoad=" + workRoad +
-        "}";
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Worker.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Worker.java
deleted file mode 100644
index 28a4daa..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Worker.java
+++ /dev/null
@@ -1,147 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.time.LocalDateTime;
-import java.util.Date;
-
-/**
- * <p>
- * 
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@ApiModel("Worker")
-@TableName("br_worker")
-@Data
-public class Worker implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @ApiModelProperty(value = "人员ID")
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 姓名
-     */
-    @ApiModelProperty(value = "姓名")
-    @TableField("WORKER_NAME")
-    private String workerName;
-
-    /**
-     * 性别
-     */
-    @ApiModelProperty(value = "性别")
-    @TableField("GENDER")
-    private String gender;
-
-    /**
-     * 所属部门
-     */
-    @ApiModelProperty(value = "所属部门(人员管理)")
-    @TableField("DEPT_ID")
-    private Long deptId;
-
-    /**
-     * 所属单位
-     */
-    @ApiModelProperty(value = "所属单位(入场申请中使用)")
-    @TableField("OWNER_SHIP")
-    private String ownerShip;
-
-    /**
-     * 联系方式
-     */
-    @ApiModelProperty(value = "联系方式")
-    @TableField("PHONE_NUMBER")
-    private String phoneNumber;
-
-    /**
-     * 证件号
-     */
-    @ApiModelProperty(value = "证件号")
-    @TableField("ID_CARD_NUMBER")
-    private String idCardNumber;
-
-    /**
-     * 入场原因
-     */
-    @ApiModelProperty(value = "入场原因（入场申请中使用）")
-    @TableField("ENTER_REASON")
-    private String enterReason;
-
-    /**
-     * 入场人脸照片
-     */
-    @ApiModelProperty(value = "人脸照片（照片路径）")
-    @TableField("WORKER_AVATAR")
-    private String workerAvatar;
-
-    /**
-     * 申请入场时间
-     */
-    @ApiModelProperty(value = "注册时间/申请入场时间")
-    @TableField("CREATE_TIME")
-    private Date createTime;
-
-    /**
-     * 人员类型
-     */
-    @ApiModelProperty(value = "人员类型（区分人员管理和入场申请）")
-    @TableField("WORKER_TYPE")
-    private String workerType;
-
-    @ApiModelProperty(value = "性别名称")
-    @TableField(exist = false)
-    private String genderName;
-
-    @ApiModelProperty(value = "部门名称")
-    @TableField(exist = false)
-    private String deptName;
-
-    @ApiModelProperty(value = "注册时间",dataType = "String")
-    @TableField(exist = false)
-    private String registerTime;
-
-    @ApiModelProperty(value = "当前状态")
-    @TableField(exist = false)
-    private String status;
-
-    @ApiModelProperty(value = "当前状态名称")
-    @TableField(exist = false)
-    private String statusName;
-
-    @ApiModelProperty(value = "是否注册(0未注册；1已注册)",allowableValues = "0,1")
-    @TableField(exist = false)
-    private String isRegister;
-
-    @Override
-    public String toString() {
-        return "Worker{" +
-            "id=" + id +
-            ", workerName=" + workerName +
-            ", gender=" + gender +
-            ", deptId=" + deptId +
-            ", ownerShip=" + ownerShip +
-            ", phoneNumber=" + phoneNumber +
-            ", idCardNumber=" + idCardNumber +
-            ", enterReason=" + enterReason +
-            ", workerAvatar=" + workerAvatar +
-            ", createTime=" + createTime +
-            ", workerType=" + workerType +
-        "}";
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/AlarmMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/AlarmMapper.java
new file mode 100644
index 0000000..ea4c8be
--- /dev/null
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/AlarmMapper.java
@@ -0,0 +1,16 @@
+package com.casic.missiles.modular.system.mapper;
+
+import com.casic.missiles.modular.system.entity.Alarm;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 报警记录表 Mapper 接口
+ * </p>
+ *
+ * @author zyj
+ * @since 2023-05-25
+ */
+public interface AlarmMapper extends BaseMapper<Alarm> {
+
+}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/BusAlarmMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/BusAlarmMapper.java
deleted file mode 100644
index 9801742..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/BusAlarmMapper.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package com.casic.missiles.modular.system.mapper;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.modular.system.dto.AlarmTypeCountDTO;
-import com.casic.missiles.modular.system.entity.BusAlarm;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * <p>
- * 报警记录表 Mapper 接口
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface BusAlarmMapper extends BaseMapper<BusAlarm> {
-
-    Page<BusAlarm> listPage(Page<BusAlarm> page,@Param("ew")  QueryWrapper<BusAlarm> queryWrapper);
-
-    void cancelAlarm(@Param("deviceId")Long deviceId,@Param("alarmType") String alarmType);
-
-    List<AlarmTypeCountDTO> alarmCount(@Param("projectId")Long projectId, @Param("alarmStatus")String alarmStatus);
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/BusEventImageMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/BusEventImageMapper.java
deleted file mode 100644
index 9590b7d..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/BusEventImageMapper.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.casic.missiles.modular.system.mapper;
-
-import com.casic.missiles.modular.system.entity.BusEventImage;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * <p>
- * 事件图片表 Mapper 接口
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface BusEventImageMapper extends BaseMapper<BusEventImage> {
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/BusEventMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/BusEventMapper.java
deleted file mode 100644
index 3c85edf..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/BusEventMapper.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.casic.missiles.modular.system.mapper;
-
-import com.casic.missiles.modular.system.entity.BusEvent;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * <p>
- * 事件表 Mapper 接口
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface BusEventMapper extends BaseMapper<BusEvent> {
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/DeviceExtMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/DeviceExtMapper.java
deleted file mode 100644
index 4ca9212..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/DeviceExtMapper.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.casic.missiles.modular.system.mapper;
-
-import com.casic.missiles.modular.system.entity.DeviceExt;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * <p>
- * 设备扩展信息表（安全树） Mapper 接口
- * </p>
- *
- * @author zyj
- * @since 2023-04-27
- */
-public interface DeviceExtMapper extends BaseMapper<DeviceExt> {
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/DeviceMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/DeviceMapper.java
index 444c0c5..3d0bb02 100644
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/DeviceMapper.java
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/DeviceMapper.java
@@ -1,30 +1,16 @@
 package com.casic.missiles.modular.system.mapper;
 
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.modular.system.dto.DeviceDetailDTO;
-import com.casic.missiles.modular.system.dto.HelmetInfoDTO;
 import com.casic.missiles.modular.system.entity.Device;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
 
 /**
  * <p>
- *  Mapper 接口
+ * 设备记录表 Mapper 接口
  * </p>
  *
  * @author zyj
- * @since 2023-04-14
+ * @since 2023-05-25
  */
-@Mapper
 public interface DeviceMapper extends BaseMapper<Device> {
 
-    Page<DeviceDetailDTO> listDetailPage(Page<DeviceDetailDTO> page,@Param("ew") QueryWrapper<DeviceDetailDTO> ew);
-
-     List<Long> selectProjectDevice(@Param("projectId") Long projectId);
-
-    List<HelmetInfoDTO> selectHelmetList(@Param("deviceType")String deviceType);
 }
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/ProjectDeviceMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/ProjectDeviceMapper.java
deleted file mode 100644
index 1d0c14e..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/ProjectDeviceMapper.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package com.casic.missiles.modular.system.mapper;
-
-import com.casic.missiles.modular.system.dto.DeviceLocationDTO;
-import com.casic.missiles.modular.system.entity.ProjectDevice;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * <p>
- *  Mapper 接口
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface ProjectDeviceMapper extends BaseMapper<ProjectDevice> {
-     List<ProjectDevice> selectDetailByProjectId(@Param("projectId") Long projectId);
-
-     List<DeviceLocationDTO> selectDeviceLocationList(@Param("projectId") Long projectId);
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/ProjectWorkerMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/ProjectWorkerMapper.java
deleted file mode 100644
index 58583d1..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/ProjectWorkerMapper.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package com.casic.missiles.modular.system.mapper;
-
-import com.casic.missiles.modular.system.dto.WorkerLocationDTO;
-import com.casic.missiles.modular.system.entity.ProjectWorker;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * <p>
- *  Mapper 接口
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface ProjectWorkerMapper extends BaseMapper<ProjectWorker> {
-
-    List<ProjectWorker> selectDetailByProjectId(@Param("projectId") Long projectId,
-                                                @Param("workerType")String workerType);
-
-    List<WorkerLocationDTO> selectWorkerLocationList(@Param("projectId") Long projectId,
-                                                     @Param("workerType")String workerType);
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/WorkSiteInfoMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/WorkSiteInfoMapper.java
deleted file mode 100644
index a4934d2..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/WorkSiteInfoMapper.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.casic.missiles.modular.system.mapper;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.modular.system.entity.WorkSiteInfo;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Param;
-
-/**
- * <p>
- * 作业现场表 Mapper 接口
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface WorkSiteInfoMapper extends BaseMapper<WorkSiteInfo> {
-
-    Page<WorkSiteInfo> selectListPage(Page<WorkSiteInfo> page,@Param("ew") QueryWrapper<WorkSiteInfo> ew);
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/WorkerMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/WorkerMapper.java
deleted file mode 100644
index 258fb12..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/WorkerMapper.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package com.casic.missiles.modular.system.mapper;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.modular.system.dto.DeviceDetailDTO;
-import com.casic.missiles.modular.system.entity.Worker;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * <p>
- *  Mapper 接口
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface WorkerMapper extends BaseMapper<Worker> {
-
-
-    Page<Worker> selectListPage(Page<Worker> page, @Param("ew") QueryWrapper<Worker> ew);
-
-    List<String> selectWorkerAvatars(@Param("projectId")Long projectId);
-
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/AlarmMapper.xml b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/AlarmMapper.xml
new file mode 100644
index 0000000..25cb4ab
--- /dev/null
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/AlarmMapper.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.modular.system.mapper.AlarmMapper">
+
+</mapper>
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/BusAlarmMapper.xml b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/BusAlarmMapper.xml
deleted file mode 100644
index 595088a..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/BusAlarmMapper.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.casic.missiles.modular.system.mapper.BusAlarmMapper">
-
-    <select id="listPage" resultType="com.casic.missiles.modular.system.entity.BusAlarm">
-        SELECT
-            alarm.ID as id,
-            alarm.DEVICE_ID as deviceId,
-            alarm.PROJECT_ID as projectId,
-            alarm.ALARM_TYPE as alarmType,
-            alarm.ALARM_VALUE as alarmValue,
-            alarm.ALARM_STATUS as alarmStatus,
-            alarm.ALARM_IMAGE AS alarmImage,
-            alarm.ALARM_CONTENT as alarmContent,
-            alarm.ALARM_TIME as alarmTime,
-            alarm.CANCEL_TIME as cancelTime,
-            alarm.ALARM_LNG as alarmLng,
-            alarm.ALARM_LAT as alarmLat,
-            p.WORK_TITLE as workTitle,
-            p.WORK_ROAD as workRoad,
-            p.PROJECT_STATE as projectState,
-            w.WORKER_NAME as workPersonName,
-            w.PHONE_NUMBER as workPersonPhoneNumber
-        FROM
-            `br_bus_alarm` alarm
-                LEFT JOIN br_work_site_info p on alarm.PROJECT_ID = p.ID
-                LEFT JOIN br_worker w on p.WORK_PERSON = w.ID
-        <where>
-            <if test="ew != null">
-                ${ew.sqlSegment}
-            </if>
-        </where>
-    </select>
-
-    <select id="cancelAlarm">
-        update br_bus_alarm
-        set ALARM_STATUS = '1'
-        where DEVICE_ID = #{deviceId}
-          and ALARM_TYPE = #{alarmType}
-          and ALARM_STATUS = '0'
-    </select>
-
-    <select id="alarmCount" resultType="com.casic.missiles.modular.system.dto.AlarmTypeCountDTO">
-        SELECT
-            ALARM_TYPE as alarmType,
-            count(*) as alarmCount
-        from br_bus_alarm
-        <where>
-            <if test="projectId != null and projectId !=''">
-                and PROJECT_ID = #{projectId}
-            </if>
-            <if test="alarmStatus != null and alarmStatus !=''">
-                and ALARM_STATUS = #{alarmStatus}
-            </if>
-        </where>
-        group by ALARM_TYPE
-    </select>
-</mapper>
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/BusEventImageMapper.xml b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/BusEventImageMapper.xml
deleted file mode 100644
index fbc3db3..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/BusEventImageMapper.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.casic.missiles.modular.system.mapper.BusEventImageMapper">
-
-</mapper>
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/BusEventMapper.xml b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/BusEventMapper.xml
deleted file mode 100644
index 627d573..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/BusEventMapper.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.casic.missiles.modular.system.mapper.BusEventMapper">
-
-</mapper>
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/DeviceExtMapper.xml b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/DeviceExtMapper.xml
deleted file mode 100644
index 5321d1c..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/DeviceExtMapper.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.casic.missiles.modular.system.mapper.DeviceExtMapper">
-
-</mapper>
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/DeviceMapper.xml b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/DeviceMapper.xml
index 94262e1..88e7d01 100644
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/DeviceMapper.xml
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/DeviceMapper.xml
@@ -2,96 +2,4 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.casic.missiles.modular.system.mapper.DeviceMapper">
 
-    <select id="listDetailPage" resultType="com.casic.missiles.modular.system.dto.DeviceDetailDTO">
-        select
-        br_device.ID as id,
-        DEVICE_CODE as deviceCode,
-        DEVICE_TYPE as deviceType,
-        DEVICE_BATCH as deviceBatch,
-        MANUFACTURER as manufacturer,
-        IS_POWER_SUPPLY as isPowerSupply,
-        CREATE_TIME as createTime,
-        CAMERA_CODE as cameraCode,
-        CAMERA_IP as cameraIp,
-        CAMERA_PORT as cameraPort,
-        GAS_CODE as gasCode,
-        GAS_IP as gasIp,
-        GAS_PORT as gasPort,
-        HAT_LINING_CODE as hatLiningCode
-        from br_device
-        left join br_device_ext ext on ext.DEVICE_ID = br_device.ID
-        <where>
-            <if test="ew != null">
-                ${ew.sqlSegment}
-            </if>
-        </where>
-    </select>
-
-    <select id="selectProjectDevice" resultType="java.lang.Long">
-        with device_info as (
-            (SELECT
-            d.DEVICE_ID as DEVICE_ID,
-            d.PROJECT_ID as PROJECT_ID,
-            p.PROJECT_STATE as PROJECT_STATE
-            from br_project_device d
-            LEFT JOIN br_work_site_info p on p.ID = d.PROJECT_ID)
-
-            UNION ALL
-
-            (SELECT
-            d1.ID as DEVICE_ID,
-            w1.ID as PROJECT_ID,
-            w1.PROJECT_STATE as PROJECT_STATE
-            FROM br_project_worker pw1
-            LEFT JOIN br_device d1 on pw1.BRACELET_CODE = d1.DEVICE_CODE
-            LEFT JOIN br_work_site_info w1 on pw1.PROJECT_ID = w1.ID)
-
-            UNION ALL
-
-            (SELECT
-            d1.ID as DEVICE_ID,
-            w1.ID as PROJECT_ID,
-            w1.PROJECT_STATE as PROJECT_STATE
-            FROM br_project_worker pw1
-            LEFT JOIN br_device d1 on pw1.HAT_CODE = d1.DEVICE_CODE
-            LEFT JOIN br_work_site_info w1 on pw1.PROJECT_ID = w1.ID)
-
-
-            UNION ALL
-
-            (SELECT
-            d1.ID as DEVICE_ID,
-            w1.ID as PROJECT_ID,
-            w1.PROJECT_STATE as PROJECT_STATE
-            FROM br_project_worker pw1
-            LEFT JOIN br_device d1 on pw1.VAST_CODE = d1.DEVICE_CODE
-            LEFT JOIN br_work_site_info w1 on pw1.PROJECT_ID = w1.ID))
-
-        select DISTINCT DEVICE_ID from device_info
-        <where>
-            DEVICE_ID is not null
-            <choose>
-                <when test="projectId != null and projectId !=''">
-                    and PROJECT_ID = #{projectId}
-                </when>
-                <otherwise>
-                    AND PROJECT_STATE != '3'
-                </otherwise>
-            </choose>
-        </where>
-    </select>
-
-    <select id="selectHelmetList" resultType="com.casic.missiles.modular.system.dto.HelmetInfoDTO">
-        SELECT
-            a.ID AS deviceId,
-            a.DEVICE_CODE AS hatCode,
-            b.HAT_LINING_CODE AS hatLiningCode
-        FROM
-            br_device a
-                LEFT JOIN br_device_ext b ON a.ID = b.DEVICE_ID
-        WHERE
-            a.DEVICE_TYPE = #{deviceType}
-          AND a.DEVICE_CODE IS NOT NULL
-          AND b.HAT_LINING_CODE IS NOT NULL
-    </select>
 </mapper>
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/ProjectDeviceMapper.xml b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/ProjectDeviceMapper.xml
deleted file mode 100644
index c6d1c24..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/ProjectDeviceMapper.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.casic.missiles.modular.system.mapper.ProjectDeviceMapper">
-
-    <select id="selectDetailByProjectId" resultType="com.casic.missiles.modular.system.entity.ProjectDevice">
-        SELECT
-            pd.ID as id,
-            pd.PROJECT_ID as projectId,
-            pd.DEVICE_ID as deviceId,
-            d.DEVICE_CODE as deviceCode
-        from br_project_device pd
-        LEFT JOIN br_device d on pd.DEVICE_ID = d.ID
-        <where>
-            pd.PROJECT_ID = #{projectId}
-        </where>
-    </select>
-
-    <select id="selectDeviceLocationList" resultType="com.casic.missiles.modular.system.dto.DeviceLocationDTO">
-        SELECT
-        d.ID as deviceId,
-        d.DEVICE_TYPE as deviceType,
-        d.DEVICE_CODE as deviceCode,
-        if(EXISTS(select ID from br_bus_alarm WHERE DEVICE_ID = d.ID and ALARM_STATUS = '0'),true,false) as alarmFlag
-        FROM br_project_device pd, br_device d
-        where pd.DEVICE_ID = d.ID
-        and pd.PROJECT_ID = #{projectId}
-    </select>
-
-</mapper>
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/ProjectWorkerMapper.xml b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/ProjectWorkerMapper.xml
deleted file mode 100644
index 8d2de10..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/ProjectWorkerMapper.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.casic.missiles.modular.system.mapper.ProjectWorkerMapper">
-
-    <select id="selectDetailByProjectId" resultType="com.casic.missiles.modular.system.entity.ProjectWorker">
-        SELECT
-            pw.ID as id,
-            pw.PROJECT_ID as projectId,
-            pw.WORKER_ID as workerId,
-            w.WORKER_NAME as workerName,
-            w.DEPT_ID as workerDeptId,
-            pw.HAT_CODE as hatCode,
-            pw.VAST_CODE as vastCode,
-            pw.BRACELET_CODE as braceletCode,
-            w.PHONE_NUMBER as workerPhoneNumber
-        from br_project_worker pw
-        LEFT JOIN br_worker w on pw.WORKER_ID = w.ID
-        <where>
-            pw.PROJECT_ID = #{projectId}
-            <if test="workerType != null and workerType != ''">
-                and w.WORKER_TYPE = #{workerType}
-            </if>
-        </where>
-    </select>
-
-    <select id="selectWorkerLocationList" resultType="com.casic.missiles.modular.system.dto.WorkerLocationDTO">
-        select
-            w.ID as workerId,
-            w.WORKER_NAME as workerName,
-            pw.HAT_CODE as hatCode,
-            hd.ID as hatId,
-            pw.BRACELET_CODE as braceletCode,
-            pw.VAST_CODE as vastCode
-        from br_project_worker pw,br_worker w ,br_device hd
-        WHERE pw.WORKER_ID = w.ID
-          and pw.HAT_CODE = hd.DEVICE_CODE
-          and pw.PROJECT_ID = #{projectId}
-          and w.WORKER_TYPE = #{workerType}
-    </select>
-</mapper>
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/WorkSiteInfoMapper.xml b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/WorkSiteInfoMapper.xml
deleted file mode 100644
index 8f01326..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/WorkSiteInfoMapper.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.casic.missiles.modular.system.mapper.WorkSiteInfoMapper">
-
-    <select id="selectListPage" resultType="com.casic.missiles.modular.system.entity.WorkSiteInfo">
-        SELECT
-            br_work_site_info.ID AS id,
-            WORK_TITLE as workTitle,
-            WORK_ROAD as workRoad,
-            WORK_SITE_DESC as workSiteDesc,
-            WORK_PERSON as workPerson,
-            WORKER_NAME as workPersonName,
-            DEPT_ID as workPersonDeptId,
-            PHONE_NUMBER as workPersonPhoneNumber,
-            PROJECT_STATE as projectState,
-            br_work_site_info.CREATE_TIME AS createTime,
-            br_work_site_info.UPDATE_TIME AS updateTime
-        FROM br_work_site_info
-        LEFT JOIN br_worker w ON br_work_site_info.WORK_PERSON = w.ID
-        <where>
-            <if test="ew != null">
-                ${ew.sqlSegment}
-            </if>
-        </where>
-    </select>
-</mapper>
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/WorkerMapper.xml b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/WorkerMapper.xml
deleted file mode 100644
index 3e28b39..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/WorkerMapper.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.casic.missiles.modular.system.mapper.WorkerMapper">
-
-    <select id="selectListPage" resultType="com.casic.missiles.modular.system.entity.Worker">
-        WITH worker_project AS (
-            SELECT
-                w.id AS ID,
-                WORKER_NAME,
-                GENDER,
-                DEPT_ID,
-                OWNER_SHIP,
-                PHONE_NUMBER,
-                ID_CARD_NUMBER,
-                ENTER_REASON,
-                WORKER_AVATAR,
-                w.CREATE_TIME,
-                WORKER_TYPE,
-                IF( p.PROJECT_STATE != '3', 1, 0 ) AS `STATUS`
-            FROM br_worker w
-            LEFT JOIN br_project_worker pw ON w.ID = pw.WORKER_ID
-            LEFT JOIN br_work_site_info p ON pw.PROJECT_ID = p.ID
-        )
-
-        SELECT
-            ID AS id,
-            WORKER_NAME AS workerName,
-            GENDER AS gender,
-            DEPT_ID AS deptId,
-            OWNER_SHIP AS ownerShip,
-            PHONE_NUMBER AS phoneNumber,
-            ID_CARD_NUMBER AS idCardNumber,
-            ENTER_REASON AS enterReason,
-            WORKER_AVATAR AS workerAvatar,
-            CREATE_TIME AS createTime,
-            WORKER_TYPE AS workerType,
-            `STATUS` AS `status`
-        FROM worker_project
-        <where>
-            <if test="ew != null">
-                ${ew.sqlSegment}
-            </if>
-        </where>
-    </select>
-
-    <select id="selectWorkerAvatars" resultType="java.lang.String">
-        SELECT
-            WORKER_AVATAR
-        FROM
-            `br_worker`
-        WHERE
-        ID IN ( SELECT WORKER_ID FROM br_project_worker WHERE PROJECT_ID = #{projectId} )
-          AND WORKER_AVATAR IS NOT NULL
-          AND WORKER_AVATAR != ''
-    </select>
-</mapper>
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IAlarmService.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IAlarmService.java
new file mode 100644
index 0000000..8bc01f4
--- /dev/null
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IAlarmService.java
@@ -0,0 +1,16 @@
+package com.casic.missiles.modular.system.service;
+
+import com.casic.missiles.modular.system.entity.Alarm;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 报警记录表 服务类
+ * </p>
+ *
+ * @author zyj
+ * @since 2023-05-25
+ */
+public interface IAlarmService extends IService<Alarm> {
+
+}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IBusAlarmService.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IBusAlarmService.java
deleted file mode 100644
index f63c19c..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IBusAlarmService.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package com.casic.missiles.modular.system.service;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.modular.system.dto.AlarmTypeCountDTO;
-import com.casic.missiles.modular.system.dto.AlarmUpload;
-import com.casic.missiles.modular.system.entity.BusAlarm;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-import java.util.List;
-
-/**
- * <p>
- * 报警记录表 服务类
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface IBusAlarmService extends IService<BusAlarm> {
-
-    boolean alarmUpload(AlarmUpload alarmUpload);
-
-    Page<BusAlarm> listPage(Page<BusAlarm> page,QueryWrapper<BusAlarm> queryWrapper);
-
-    List<AlarmTypeCountDTO> alarmCount(Long projectId,String alarmStatus);
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IBusEventImageService.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IBusEventImageService.java
deleted file mode 100644
index b1187ed..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IBusEventImageService.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.casic.missiles.modular.system.service;
-
-import com.casic.missiles.modular.system.entity.BusEventImage;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-import java.util.List;
-
-/**
- * <p>
- * 事件图片表 服务类
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface IBusEventImageService extends IService<BusEventImage> {
-
-    boolean saveBusEventImages(Long eventId, List<BusEventImage> imageList);
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IBusEventService.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IBusEventService.java
deleted file mode 100644
index 85c48d0..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IBusEventService.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package com.casic.missiles.modular.system.service;
-
-import com.casic.missiles.modular.system.entity.BusEvent;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-/**
- * <p>
- * 事件表 服务类
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface IBusEventService extends IService<BusEvent> {
-
-    boolean saveBusEvent(BusEvent busEvent);
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IDeviceExtService.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IDeviceExtService.java
deleted file mode 100644
index 6fc5361..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IDeviceExtService.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package com.casic.missiles.modular.system.service;
-
-import com.casic.missiles.modular.system.dto.DeviceDetailDTO;
-import com.casic.missiles.modular.system.entity.DeviceExt;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-import java.util.List;
-
-/**
- * <p>
- * 设备扩展信息表（安全树） 服务类
- * </p>
- *
- * @author zyj
- * @since 2023-04-27
- */
-public interface IDeviceExtService extends IService<DeviceExt> {
-
-    boolean saveDeviceExt(DeviceDetailDTO deviceDetailDTO);
-
-    boolean updateDeviceExt(DeviceDetailDTO deviceDetailDTO);
-
-    boolean removeByDeviceIds(List<Long> deviceIds);
-
-    boolean setGasThreshold(String gasIp,String gasPort,String threshold);
-
-    String getGasThreshold(String gasIp,String gasPort);
-
-    Long selectByGasIpPort(String gasIp,String gasPort);
-
-    Long selectByCameraIpPort(String cameraIp,String cameraPort);
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java
index 9e62756..00a421d 100644
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java
@@ -1,32 +1,16 @@
 package com.casic.missiles.modular.system.service;
 
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.modular.system.dto.DeviceDetailDTO;
-import com.casic.missiles.modular.system.dto.HelmetInfoDTO;
 import com.casic.missiles.modular.system.entity.Device;
 import com.baomidou.mybatisplus.extension.service.IService;
 
-import java.util.List;
-
 /**
  * <p>
- *  服务类
+ * 设备记录表 服务类
  * </p>
  *
  * @author zyj
- * @since 2023-04-14
+ * @since 2023-05-25
  */
 public interface IDeviceService extends IService<Device> {
 
-    boolean saveDevice(DeviceDetailDTO deviceDetailDTO);
-
-    boolean updateDevice(DeviceDetailDTO deviceDetailDTO);
-
-    boolean deleteDevices(List<Long> deviceIds);
-
-    Page<DeviceDetailDTO> listPage(Page<DeviceDetailDTO> page, QueryWrapper<DeviceDetailDTO> queryWrapper, String status,Long projectId);
-
-    List<Long> selectProjectDevice(Long projectId);
-
 }
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IProjectDeviceService.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IProjectDeviceService.java
deleted file mode 100644
index 8599411..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IProjectDeviceService.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package com.casic.missiles.modular.system.service;
-
-import com.casic.missiles.modular.system.dto.DeviceLocationDTO;
-import com.casic.missiles.modular.system.entity.ProjectDevice;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-import java.util.List;
-
-/**
- * <p>
- *  服务类
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface IProjectDeviceService extends IService<ProjectDevice> {
-
-    boolean saveProjectDeviceList(Long projectId, List<ProjectDevice> projectDeviceList);
-
-    boolean updateProjectDeviceList(Long projectId, List<ProjectDevice> projectDeviceList);
-
-    boolean deleteByProjectId(Long projectId);
-
-    boolean deleteByProjectIds(List<Long> projectIds);
-
-    List<ProjectDevice> selectDetailByProjectId(Long projectId);
-
-    Long selectProjectIdByDevice(Long deviceId);
-
-    List<DeviceLocationDTO> selectDeviceLocationList(Long projectId);
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IProjectWorkerService.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IProjectWorkerService.java
deleted file mode 100644
index e921bc3..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IProjectWorkerService.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package com.casic.missiles.modular.system.service;
-
-import com.casic.missiles.modular.system.dto.WorkerLocationDTO;
-import com.casic.missiles.modular.system.entity.ProjectDevice;
-import com.casic.missiles.modular.system.entity.ProjectWorker;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-import java.util.List;
-
-/**
- * <p>
- *  服务类
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface IProjectWorkerService extends IService<ProjectWorker> {
-
-    boolean saveProjectWorkerList(Long projectId, List<ProjectWorker> projectWorkerList);
-
-    boolean updateProjectWorkerList(Long projectId, List<ProjectWorker> projectWorkerList);
-
-    boolean deleteByProjectId(Long projectId);
-
-    boolean deleteByProjectIds(List<Long> projectIds);
-
-    List<ProjectWorker> selectDetailByProjectId(Long projectId,String workerType);
-
-    List<WorkerLocationDTO> selectWorkerLocationDTO(Long projectId);
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IWorkSiteInfoService.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IWorkSiteInfoService.java
deleted file mode 100644
index 58a8590..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IWorkSiteInfoService.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package com.casic.missiles.modular.system.service;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.modular.system.dto.WorkSiteDetailDTO;
-import com.casic.missiles.modular.system.entity.WorkSiteInfo;
-import com.baomidou.mybatisplus.extension.service.IService;
-import java.util.List;
-/**
- * <p>
- * 作业现场表 服务类
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface IWorkSiteInfoService extends IService<WorkSiteInfo> {
-
-    boolean addWorkSiteInfo(WorkSiteDetailDTO workSiteDetailDTO);
-
-    boolean updateWorkSiteInfo(WorkSiteDetailDTO workSiteDetailDTO);
-
-    boolean deleteProjects(List<Long> projectIds);
-
-    WorkSiteDetailDTO getWorkSiteDetail(Long projectId);
-
-    Page<WorkSiteInfo> selectListPage(Page<WorkSiteInfo> page, QueryWrapper<WorkSiteInfo> queryWrapper);
-
-    boolean start(Long projectId);
-
-    boolean finish(Long projectId);
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IWorkerService.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IWorkerService.java
deleted file mode 100644
index 6c6ee98..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IWorkerService.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package com.casic.missiles.modular.system.service;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.modular.system.entity.Worker;
-import com.baomidou.mybatisplus.extension.service.IService;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * <p>
- *  服务类
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface IWorkerService extends IService<Worker> {
-
-    boolean addWorker(Worker worker,Long projectId);
-
-    Page<Worker> selectListPage(Page<Worker> page,QueryWrapper<Worker> ew);
-
-    Worker selectWorkerDetail(Long workerId);
-
-    List<String> faceRegister(String cameraIp,String cameraPort);
-
-    List<Worker> projectTempWorker(Long projectId);
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/impl/AlarmServiceImpl.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/impl/AlarmServiceImpl.java
new file mode 100644
index 0000000..6e5959b
--- /dev/null
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/impl/AlarmServiceImpl.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.modular.system.service.impl;
+
+import com.casic.missiles.modular.system.entity.Alarm;
+import com.casic.missiles.modular.system.mapper.AlarmMapper;
+import com.casic.missiles.modular.system.service.IAlarmService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 报警记录表 服务实现类
+ * </p>
+ *
+ * @author zyj
+ * @since 2023-05-25
+ */
+@Service
+public class AlarmServiceImpl extends ServiceImpl<AlarmMapper, Alarm> implements IAlarmService {
+
+}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/impl/BusAlarmServiceImpl.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/impl/BusAlarmServiceImpl.java
deleted file mode 100644
index b44de1d..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/impl/BusAlarmServiceImpl.java
+++ /dev/null
@@ -1,121 +0,0 @@
-package com.casic.missiles.modular.system.service.impl;
-
-import cn.hutool.core.date.DateUtil;
-import cn.hutool.core.util.ObjectUtil;
-import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.core.application.service.AbstractDictService;
-import com.casic.missiles.modular.system.consts.AlarmTypeEnum;
-import com.casic.missiles.modular.system.dto.AlarmTypeCountDTO;
-import com.casic.missiles.modular.system.dto.AlarmUpload;
-import com.casic.missiles.modular.system.entity.BusAlarm;
-import com.casic.missiles.modular.system.entity.DataTreeLocation;
-import com.casic.missiles.modular.system.mapper.BusAlarmMapper;
-import com.casic.missiles.modular.system.service.*;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.util.Date;
-import java.util.List;
-import java.util.stream.Collectors;
-
-import static com.casic.missiles.modular.system.consts.AlarmConst.ALARM_STATUS_ON;
-
-/**
- * <p>
- * 报警记录表 服务实现类
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@Service
-@RequiredArgsConstructor
-@Slf4j
-public class BusAlarmServiceImpl extends ServiceImpl<BusAlarmMapper, BusAlarm> implements IBusAlarmService {
-
-    private final IDeviceExtService deviceExtService;
-    private final IDeviceService deviceService;
-    private final IProjectDeviceService projectDeviceService;
-
-    private final ICasicFileService fileService;
-
-    private final AbstractDictService dictService;
-    private final IDataSupportService dataSupportService;
-
-    @Override
-    @Transactional
-    public boolean alarmUpload(AlarmUpload alarmUpload) {
-        log.info("alarm upload ==> {}",alarmUpload.toString());
-        Long deviceId = null;
-        if(StrUtil.isAllNotBlank(alarmUpload.getGasIp(),alarmUpload.getGasPort())){
-            deviceId = deviceExtService.selectByGasIpPort(alarmUpload.getGasIp(),alarmUpload.getGasPort());
-        }
-        if(ObjectUtil.isEmpty(deviceId) && StrUtil.isAllNotBlank(alarmUpload.getCameraIp(),alarmUpload.getCameraPort())){
-            deviceId = deviceExtService.selectByCameraIpPort(alarmUpload.getCameraIp(),alarmUpload.getCameraPort());
-        }
-
-        if(ObjectUtil.isEmpty(deviceId)){
-            return false;
-        }
-
-        BusAlarm alarm = new BusAlarm();
-        alarm.setDeviceId(deviceId);
-        alarm.setProjectId(projectDeviceService.selectProjectIdByDevice(deviceId));
-        alarm.setAlarmValue(alarmUpload.getAlarmValue());
-        if(StrUtil.isNotEmpty(alarmUpload.getAlarmTime())){
-            alarm.setAlarmTime(DateUtil.parseDateTime(alarmUpload.getAlarmTime()));
-        }else {
-            alarm.setAlarmTime(new Date());
-        }
-
-        alarm.setAlarmType(alarmUpload.getAlarmType());
-        alarm.setAlarmContent(alarmUpload.getAlarmContent());
-        if(StrUtil.isNotEmpty(alarmUpload.getAlarmImage())){
-            String imgBase64 = "data:image/jpeg;base64," + alarmUpload.getAlarmImage();
-            String imageUrl = fileService.saveFile(imgBase64);
-            alarm.setAlarmImage(imageUrl);
-        }
-        alarm.setAlarmStatus(ALARM_STATUS_ON);
-
-        DataTreeLocation treeLocation = dataSupportService.getTreeLocation(deviceId);
-        if(ObjectUtil.isNotEmpty(treeLocation)){
-            alarm.setAlarmLng(treeLocation.getGdLng());
-            alarm.setAlarmLat(treeLocation.getGdLat());
-        }
-
-        //自动消警
-        AlarmTypeEnum alarmTypeEnum = AlarmTypeEnum.getByAlarmType(alarm.getAlarmType());
-        if(ObjectUtil.isNotEmpty(alarmTypeEnum) && alarmTypeEnum.isAutoCancel()){
-            this.baseMapper.cancelAlarm(deviceId,alarm.getAlarmType());
-        }
-        return this.save(alarm);
-    }
-
-    @Override
-    public Page<BusAlarm> listPage(Page<BusAlarm> page, QueryWrapper<BusAlarm> queryWrapper) {
-        page = this.baseMapper.listPage(page, queryWrapper);
-        for (BusAlarm alarm : page.getRecords()) {
-            alarm.setAlarmTypeName(dictService.getDictNameByCode("alarmType",alarm.getAlarmType()));
-            alarm.setAlarmStatusName(dictService.getDictNameByCode("alarmStatus",alarm.getAlarmStatus()));
-            if(StrUtil.isNotEmpty(alarm.getProjectState())){
-                alarm.setProjectStateName(dictService.getDictNameByCode("projectStatus",alarm.getProjectState()));
-            }
-        }
-        return page;
-    }
-
-    @Override
-    public List<AlarmTypeCountDTO> alarmCount(Long projectId, String alarmStatus) {
-        List<AlarmTypeCountDTO> list = this.baseMapper.alarmCount(projectId, alarmStatus);
-        list = list.stream().filter(i->StrUtil.isNotEmpty(i.getAlarmType())).collect(Collectors.toList());
-        for (AlarmTypeCountDTO countDTO : list) {
-            countDTO.setAlarmTypeName(dictService.getDictNameByCode("alarmType",countDTO.getAlarmType()));
-        }
-        return list;
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/impl/BusEventImageServiceImpl.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/impl/BusEventImageServiceImpl.java
deleted file mode 100644
index a43f7c1..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/impl/BusEventImageServiceImpl.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package com.casic.missiles.modular.system.service.impl;
-
-import com.casic.missiles.modular.system.entity.BusEventImage;
-import com.casic.missiles.modular.system.mapper.BusEventImageMapper;
-import com.casic.missiles.modular.system.service.IBusEventImageService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-/**
- * <p>
- * 事件图片表 服务实现类
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@Service
-public class BusEventImageServiceImpl extends ServiceImpl<BusEventImageMapper, BusEventImage> implements IBusEventImageService {
-
-    @Override
-    public boolean saveBusEventImages(Long eventId, List<BusEventImage> imageList) {
-        imageList.forEach(i->i.setEventId(eventId));
-        return this.saveBatch(imageList);
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/impl/BusEventServiceImpl.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/impl/BusEventServiceImpl.java
deleted file mode 100644
index 21e511c..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/impl/BusEventServiceImpl.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package com.casic.missiles.modular.system.service.impl;
-
-import com.casic.missiles.modular.system.entity.BusEvent;
-import com.casic.missiles.modular.system.mapper.BusEventMapper;
-import com.casic.missiles.modular.system.service.IBusEventImageService;
-import com.casic.missiles.modular.system.service.IBusEventService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import lombok.RequiredArgsConstructor;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.util.Date;
-
-/**
- * <p>
- * 事件表 服务实现类
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@Service
-@RequiredArgsConstructor
-public class BusEventServiceImpl extends ServiceImpl<BusEventMapper, BusEvent> implements IBusEventService {
-
-    private final IBusEventImageService busEventImageService;
-
-
-    @Override
-    @Transactional
-    public boolean saveBusEvent(BusEvent busEvent) {
-        busEvent.setCreateTime(new Date());
-        boolean res = this.save(busEvent);
-        if(res){
-            res = busEventImageService.saveBusEventImages(busEvent.getId(),busEvent.getImageList());
-        }
-        return res;
-    }
-}

diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/AlarmController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/AlarmController.java
new file mode 100644
index 0000000..1795cf1
--- /dev/null
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/AlarmController.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.modular.system.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.stereotype.Controller;
+
+/**
+ * <p>
+ * 报警记录表 前端控制器
+ * </p>
+ *
+ * @author zyj
+ * @since 2023-05-25
+ */
+@Controller
+@RequestMapping("/system/alarm")
+public class AlarmController {
+
+}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusAlarmController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusAlarmController.java
deleted file mode 100644
index 1f82ebb..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusAlarmController.java
+++ /dev/null
@@ -1,102 +0,0 @@
-package com.casic.missiles.modular.system.controller;
-
-
-import cn.hutool.core.util.ObjectUtil;
-import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.core.base.controller.BaseController;
-import com.casic.missiles.core.page.PageFactory;
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.AlarmUpload;
-import com.casic.missiles.modular.system.dto.DeviceDetailDTO;
-import com.casic.missiles.modular.system.entity.BusAlarm;
-import com.casic.missiles.modular.system.service.IBusAlarmService;
-import io.swagger.annotations.*;
-import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.*;
-
-import org.springframework.stereotype.Controller;
-
-import static com.casic.missiles.model.response.ResponseData.DEFAULT_SUCCESS_MESSAGE;
-import static com.casic.missiles.modular.system.consts.AlarmConst.ALARM_STATUS_MANUAL_CANCEL;
-
-/**
- * <p>
- * 报警记录表 前端控制器
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@Api(tags = "报警管理接口")
-@Controller
-@RequestMapping("/alarm")
-@RequiredArgsConstructor
-public class BusAlarmController extends BaseController {
-
-    private final IBusAlarmService alarmService;
-
-    @ApiOperation("报警上报接口")
-    @PostMapping("/upload")
-    @ResponseBody
-    public Object upload(@RequestBody AlarmUpload alarmUpload){
-        alarmService.alarmUpload(alarmUpload);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("报警列表分页查询")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "workTitle", value = "作业名称",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "projectId", value = "作业ID",dataType = "Long", paramType = "query",example = "0"),
-            @ApiImplicitParam(name = "alarmStatus", value = "报警状态",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "projectState", value = "作业状态",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "alarmType", value = "报警类型",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "alarmStartTime", value = "报警开始时间",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "alarmEndTime", value = "报警结束时间",dataType = "String", paramType = "query")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = BusAlarm.class),
-    })
-    @GetMapping("/listPage")
-    @ResponseBody
-    public Object listPage(String workTitle,Long projectId,String alarmStatus,String projectState,String alarmType,String alarmStartTime,String alarmEndTime){
-        Page<BusAlarm> page = PageFactory.defaultPage();
-        QueryWrapper<BusAlarm> queryWrapper = new QueryWrapper<>();
-        if(StrUtil.isNotEmpty(workTitle)){
-            queryWrapper.like("p.WORK_TITLE",workTitle);
-        }
-        if(ObjectUtil.isNotEmpty(projectId)){
-            queryWrapper.eq("alarm.PROJECT_ID",projectId);
-        }
-        if(StrUtil.isNotEmpty(alarmStatus)){
-            queryWrapper.eq("alarm.ALARM_STATUS",alarmStatus);
-        }
-        if(StrUtil.isNotEmpty(projectState)){
-            queryWrapper.eq("p.PROJECT_STATE",projectState);
-        }
-        if(StrUtil.isNotEmpty(alarmType)){
-            queryWrapper.eq("alarm.ALARM_TYPE",alarmType);
-        }
-        if(StrUtil.isNotEmpty(alarmStartTime)){
-            queryWrapper.ge("alarm.ALARM_TIME",alarmStartTime);
-        }
-        if(StrUtil.isNotEmpty(alarmEndTime)){
-            queryWrapper.le("alarm.ALARM_TIME",alarmEndTime);
-        }
-        page = alarmService.listPage(page,queryWrapper);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-    @ApiOperation("消警")
-    @PostMapping("/cancel")
-    @ResponseBody
-    public Object cancel(@RequestParam("alarmId") Long alarmId){
-        UpdateWrapper<BusAlarm> updateWrapper = new UpdateWrapper<>();
-        updateWrapper.eq("ID",alarmId);
-        updateWrapper.set("ALARM_STATUS",ALARM_STATUS_MANUAL_CANCEL);
-        alarmService.update(updateWrapper);
-        return ResponseData.success();
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusEventController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusEventController.java
deleted file mode 100644
index dde5aad..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusEventController.java
+++ /dev/null
@@ -1,41 +0,0 @@
-package com.casic.missiles.modular.system.controller;
-
-
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.entity.BusEvent;
-import com.casic.missiles.modular.system.service.IBusEventService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.ResponseBody;
-
-/**
- * <p>
- * 事件表 前端控制器
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@Controller
-@RequestMapping("/event")
-@Api(tags = "事件上报")
-@RequiredArgsConstructor
-public class BusEventController {
-
-    private final IBusEventService eventService;
-
-    @ApiOperation("事件上报")
-    @PostMapping("add")
-    @ResponseBody
-    public Object add(@RequestBody BusEvent busEvent){
-        eventService.saveBusEvent(busEvent);
-        return ResponseData.success();
-    }
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
index 03abc5f..aa50d78 100644
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
@@ -1,121 +1,20 @@
 package com.casic.missiles.modular.system.controller;
 
 
-import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.core.base.controller.BaseController;
-import com.casic.missiles.core.page.PageFactory;
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.DeviceDetailDTO;
-import com.casic.missiles.modular.system.entity.Device;
-import com.casic.missiles.modular.system.service.IDeviceExtService;
-import com.casic.missiles.modular.system.service.IDeviceService;
-import io.swagger.annotations.*;
-import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.RequestMapping;
 
 import org.springframework.stereotype.Controller;
 
-import java.time.LocalDateTime;
-import java.util.Date;
-import java.util.List;
-
-import static com.casic.missiles.model.response.ResponseData.DEFAULT_SUCCESS_MESSAGE;
-
 /**
  * <p>
- *  前端控制器
+ * 设备记录表 前端控制器
  * </p>
  *
  * @author zyj
- * @since 2023-04-14
+ * @since 2023-05-25
  */
-@Api(tags = "设备管理接口")
-@RequiredArgsConstructor
 @Controller
-@RequestMapping("/device")
-public class DeviceController extends BaseController {
-    private final IDeviceService deviceService;
-    private final IDeviceExtService deviceExtService;
-
-    @ApiOperation("设备分页列表")
-    @ApiImplicitParams({
-        @ApiImplicitParam(name = "deviceType", value = "设备类型",dataType = "String", paramType = "query"),
-        @ApiImplicitParam(name = "deviceCode", value = "设备编号",dataType = "String", paramType = "query"),
-        @ApiImplicitParam(name = "status", value = "设备状态",dataType = "String", paramType = "query"),
-        @ApiImplicitParam(name = "projectId", value = "作业ID（如果传此参数，列表中返回该作业使用的设备）",dataType = "Long", paramType = "query", example = "0")
-    })
-    @ApiResponses({
-        @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = DeviceDetailDTO.class),
-    })
-    @GetMapping("listPage")
-    @ResponseBody
-    public Object listPage(String deviceType, String deviceCode, String status,Long projectId){
-        Page<DeviceDetailDTO> page = PageFactory.defaultPage();
-        QueryWrapper<DeviceDetailDTO> queryWrapper = new QueryWrapper<>();
-        if(StrUtil.isNotEmpty(deviceType)){
-            queryWrapper.eq("DEVICE_TYPE",deviceType);
-        }
-        if(StrUtil.isNotEmpty(deviceCode)){
-            queryWrapper.like("DEVICE_CODE",deviceCode);
-        }
-        page = deviceService.listPage(page,queryWrapper,status,projectId);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-    @ApiOperation("新增设备")
-    @PostMapping("add")
-    @ResponseBody
-    public Object add(@RequestBody DeviceDetailDTO deviceDetailDTO){
-        deviceService.saveDevice(deviceDetailDTO);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("编辑设备")
-    @PostMapping("update")
-    @ResponseBody
-    public Object update(@RequestBody DeviceDetailDTO deviceDetailDTO){
-        deviceService.updateDevice(deviceDetailDTO);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("删除设备")
-    @PostMapping("delete")
-    @ResponseBody
-    public Object delete(@ApiParam("设备id列表")@RequestBody List<Long> deviceIds){
-        deviceService.deleteDevices(deviceIds);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("设置甲烷阈值")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "gasIp", value = "安全树甲烷设备IP",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "gasPort", value = "安全树甲烷端口",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "threshold", value = "甲烷阈值",dataType = "String", paramType = "query")
-    })
-    @PostMapping("setThreshold")
-    @ResponseBody
-    public Object setThreshold(String gasIp,String gasPort,String threshold){
-        deviceExtService.setGasThreshold(gasIp, gasPort, threshold);
-        return ResponseData.success();
-    }
-
-
-    @ApiOperation("查询甲烷阈值")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "gasIp", value = "安全树甲烷设备IP",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "gasPort", value = "安全树甲烷端口",dataType = "String", paramType = "query")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = "{\"code\": 200,\"data\": \"100\",\"message\": \"请求成功\",\"success\": true}",response = String.class),
-    })
-    @GetMapping("getThreshold")
-    @ResponseBody
-    public Object getThreshold(String gasIp,String gasPort){
-        String data = deviceExtService.getGasThreshold(gasIp, gasPort);
-        return ResponseData.success(data);
-    }
-
+@RequestMapping("/system/device")
+public class DeviceController {
 
 }
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/OverviewController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/OverviewController.java
deleted file mode 100644
index 7570504..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/OverviewController.java
+++ /dev/null
@@ -1,70 +0,0 @@
-package com.casic.missiles.modular.system.controller;
-
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.AlarmTypeCountDTO;
-import com.casic.missiles.modular.system.dto.DeviceLocationDTO;
-import com.casic.missiles.modular.system.dto.WorkerLocationDTO;
-import com.casic.missiles.modular.system.service.IBusAlarmService;
-import com.casic.missiles.modular.system.service.IProjectDeviceService;
-import com.casic.missiles.modular.system.service.IProjectWorkerService;
-import io.swagger.annotations.*;
-import lombok.RequiredArgsConstructor;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.ResponseBody;
-
-import static com.casic.missiles.model.response.ResponseData.DEFAULT_SUCCESS_MESSAGE;
-import static com.casic.missiles.modular.system.consts.AlarmConst.ALARM_STATUS_ON;
-
-@Api(tags = "首页看板接口")
-@Controller
-@RequestMapping("overview")
-@RequiredArgsConstructor
-public class OverviewController {
-
-    private final IBusAlarmService alarmService;
-    private final IProjectDeviceService projectDeviceService;
-
-    private final IProjectWorkerService projectWorkerService;
-
-
-    @ApiOperation("报警统计接口")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "projectId", value = "作业ID",dataType = "Long", paramType = "query", example = "0")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = AlarmTypeCountDTO.class),
-    })
-    @GetMapping("/alarmCount")
-    @ResponseBody
-    public Object alarmCount(Long projectId){
-        return ResponseData.success(alarmService.alarmCount(projectId,ALARM_STATUS_ON));
-    }
-
-    @ApiOperation("设备列表接口")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "projectId", value = "作业ID",dataType = "Long", paramType = "query", example = "0")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = DeviceLocationDTO.class),
-    })
-    @GetMapping("/deviceList")
-    @ResponseBody
-    public Object deviceList(Long projectId){
-        return ResponseData.success(projectDeviceService.selectDeviceLocationList(projectId));
-    }
-
-    @ApiOperation("人员列表接口")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "projectId", value = "作业ID",dataType = "Long", paramType = "query", example = "0")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = WorkerLocationDTO.class),
-    })
-    @GetMapping("/workerList")
-    @ResponseBody
-    public Object workerList(Long projectId){
-        return ResponseData.success(projectWorkerService.selectWorkerLocationDTO(projectId));
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/WorkSiteInfoController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/WorkSiteInfoController.java
deleted file mode 100644
index af36d69..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/WorkSiteInfoController.java
+++ /dev/null
@@ -1,130 +0,0 @@
-package com.casic.missiles.modular.system.controller;
-
-
-import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.core.base.controller.BaseController;
-import com.casic.missiles.core.page.PageFactory;
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.WorkSiteDetailDTO;
-import com.casic.missiles.modular.system.entity.WorkSiteInfo;
-import com.casic.missiles.modular.system.service.IWorkSiteInfoService;
-import io.swagger.annotations.*;
-import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.*;
-
-import org.springframework.stereotype.Controller;
-
-import java.util.List;
-
-import static com.casic.missiles.model.response.ResponseData.DEFAULT_SUCCESS_MESSAGE;
-
-/**
- * <p>
- * 作业现场表 前端控制器
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@Controller
-@RequestMapping("/site")
-@Api(tags = "作业现场管理")
-@RequiredArgsConstructor
-public class WorkSiteInfoController extends BaseController {
-
-
-    private final IWorkSiteInfoService workSiteInfoService;
-
-    @ApiOperation("新增作业现场")
-    @PostMapping("add")
-    @ResponseBody
-    public Object addWorkSite(@RequestBody WorkSiteDetailDTO workSiteDetailDTO){
-        workSiteInfoService.addWorkSiteInfo(workSiteDetailDTO);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("编辑作业现场")
-    @PostMapping("update")
-    @ResponseBody
-    public Object updateWorkSite(@RequestBody WorkSiteDetailDTO workSiteDetailDTO){
-        workSiteInfoService.updateWorkSiteInfo(workSiteDetailDTO);
-        return ResponseData.success();
-    }
-
-
-    @ApiOperation("删除作业现场")
-    @PostMapping("delete")
-    @ResponseBody
-    public Object delete(@ApiParam("作业现场id列表")@RequestBody List<Long> projectIds){
-        workSiteInfoService.deleteProjects(projectIds);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("查询作业现场详情")
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = WorkSiteDetailDTO.class),
-    })
-    @GetMapping("detail")
-    @ResponseBody
-    public Object delete(@ApiParam(value = "作业现场id", example = "0")@RequestParam Long projectId){
-        WorkSiteDetailDTO detailDTO = workSiteInfoService.getWorkSiteDetail(projectId);
-        return ResponseData.success(detailDTO);
-    }
-
-    @ApiOperation("分页列表查询")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "workTitle",value = "作业名称", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "workRoad",value = "所属道路", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "workPersonName",value = "责任人姓名", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "startDate",value = "注册开始日期", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "endDate",value = "注册结束日期", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "projectState",value = "当前状态（字典值）", dataType = "String", paramType = "query")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = WorkSiteInfo.class),
-    })
-    @GetMapping("listPage")
-    @ResponseBody
-    public Object listPage(String workTitle,String workRoad,String workPersonName,String projectState,String startDate,String endDate){
-        Page<WorkSiteInfo> page = PageFactory.defaultPage();
-        QueryWrapper<WorkSiteInfo> queryWrapper = new QueryWrapper<>();
-        if(StrUtil.isNotEmpty(workTitle)){
-            queryWrapper.like("WORK_TITLE",workTitle);
-        }
-        if(StrUtil.isNotEmpty(workRoad)){
-            queryWrapper.like("WORK_ROAD",workRoad);
-        }
-        if(StrUtil.isNotEmpty(workPersonName)){
-            queryWrapper.like("WORKER_NAME",workPersonName);
-        }
-        if(StrUtil.isNotEmpty(projectState)){
-            queryWrapper.eq("PROJECT_STATE",projectState);
-        }
-        if(StrUtil.isNotEmpty(startDate)){
-            queryWrapper.ge("br_work_site_info.CREATE_TIME",startDate + " 00:00:00");
-        }
-        if(StrUtil.isNotEmpty(endDate)){
-            queryWrapper.le("br_work_site_info.CREATE_TIME",endDate + " 23:59:59");
-        }
-        page = workSiteInfoService.selectListPage(page,queryWrapper);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-    @ApiOperation("开始作业")
-    @PostMapping("start")
-    @ResponseBody
-    public Object start(@ApiParam(value = "作业现场id",example = "0")@RequestParam Long projectId){
-        workSiteInfoService.start(projectId);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("完成作业")
-    @PostMapping("finish")
-    @ResponseBody
-    public Object finish(@ApiParam(value = "作业现场id", example = "0")@RequestParam Long projectId){
-        workSiteInfoService.finish(projectId);
-        return ResponseData.success();
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/WorkerController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/WorkerController.java
deleted file mode 100644
index 796f94c..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/WorkerController.java
+++ /dev/null
@@ -1,136 +0,0 @@
-package com.casic.missiles.modular.system.controller;
-
-
-import cn.hutool.core.util.ObjectUtil;
-import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.core.base.controller.BaseController;
-import com.casic.missiles.core.page.PageFactory;
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.DeviceDetailDTO;
-import com.casic.missiles.modular.system.entity.Device;
-import com.casic.missiles.modular.system.entity.Worker;
-import com.casic.missiles.modular.system.service.IWorkerService;
-import io.swagger.annotations.*;
-import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.*;
-
-import org.springframework.stereotype.Controller;
-
-import java.util.Date;
-import java.util.List;
-
-import static com.casic.missiles.model.response.ResponseData.DEFAULT_SUCCESS_MESSAGE;
-
-/**
- * <p>
- *  前端控制器
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@Controller
-@RequestMapping("/worker")
-@RequiredArgsConstructor
-@Api(tags = "人员管理接口")
-public class WorkerController extends BaseController {
-
-    private final IWorkerService workerService;
-
-    @ApiOperation("分页列表查询")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "name",value = "姓名", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "deptId",value = "所属部门", dataType = "Long", paramType = "query", example = "0"),
-            @ApiImplicitParam(name = "status",value = "当前状态（字典值）", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "startDate",value = "注册开始日期", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "endDate",value = "注册结束日期", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "workerType",value = "人员类型（字典值）", dataType = "String", paramType = "query")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = Worker.class),
-    })
-    @GetMapping("listPage")
-    @ResponseBody
-    public Object listPage(String name,Long deptId, String status,String startDate,String endDate,String workerType){
-        Page<Worker> page = PageFactory.defaultPage();
-        QueryWrapper<Worker> queryWrapper = new QueryWrapper<>();
-        if(StrUtil.isNotEmpty(name)){
-            queryWrapper.like("WORKER_NAME",name);
-        }
-        if(ObjectUtil.isNotEmpty(deptId)){
-            queryWrapper.eq("DEPT_ID",deptId);
-        }
-        if(StrUtil.isNotEmpty(workerType)){
-            queryWrapper.eq("WORKER_TYPE",workerType);
-        }
-        if(StrUtil.isNotEmpty(startDate)){
-            queryWrapper.ge("CREATE_TIME",startDate + " 00:00:00");
-        }
-        if(StrUtil.isNotEmpty(endDate)){
-            queryWrapper.le("CREATE_TIME",endDate + " 23:59:59");
-        }
-        if(StrUtil.isNotEmpty(status)){
-            queryWrapper.eq("`STATUS`",status);
-        }
-        page = workerService.selectListPage(page,queryWrapper);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-    @ApiOperation("新增人员")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "worker", value = "人员信息", dataType = "Worker", paramType = "body", required = true),
-            @ApiImplicitParam(name = "projectId", value = "项目ID(入场申请需要)", dataType = "Long", paramType = "query", example = "0")
-    })
-    @PostMapping("add")
-    @ResponseBody
-    public Object add(@ApiParam("worker")@RequestBody Worker worker,
-                      @RequestParam(required = false) Long projectId){
-        workerService.addWorker(worker,projectId);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("编辑人员")
-    @PostMapping("update")
-    @ResponseBody
-    public Object update(@RequestBody Worker worker){
-        workerService.updateById(worker);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("删除人员")
-    @PostMapping("delete")
-    @ResponseBody
-    public Object delete(@ApiParam("人员id列表")@RequestBody List<Long> workIds){
-        workerService.removeByIds(workIds);
-        return ResponseData.success();
-    }
-
-
-    @ApiOperation(value = "获取人脸图片",notes = "返回人脸图片url")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "cameraIp",value = "摄像头IP", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "cameraPort",value = "摄像头端口号", dataType = "String", paramType = "query"),
-    })
-    @GetMapping("/face/register")
-    @ResponseBody
-    public Object faceRegister(String cameraIp,String cameraPort){
-        return ResponseData.success(workerService.faceRegister(cameraIp, cameraPort));
-    }
-
-
-    @ApiOperation(value = "查询临时入场人员列表")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "projectId", value = "项目ID",required = true,dataType = "Long", paramType = "query", example = "0")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = Worker.class),
-    })
-    @GetMapping("/projectTempWorker")
-    @ResponseBody
-    public Object projectTempWorker(Long projectId){
-        return ResponseData.success(workerService.projectTempWorker(projectId));
-    }
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/AlarmTypeCountDTO.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/AlarmTypeCountDTO.java
deleted file mode 100644
index 1a165a1..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/AlarmTypeCountDTO.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.casic.missiles.modular.system.dto;
-
-import io.swagger.annotations.ApiModel;
-import lombok.Data;
-
-@ApiModel(value = "AlarmTypeCountDTO",description = "报警类型统计（首页）")
-@Data
-public class AlarmTypeCountDTO {
-
-    private String alarmType;
-    private String alarmTypeName;
-    private Integer alarmCount;
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/AlarmUpload.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/AlarmUpload.java
deleted file mode 100644
index 73d7799..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/AlarmUpload.java
+++ /dev/null
@@ -1,46 +0,0 @@
-package com.casic.missiles.modular.system.dto;
-
-import cn.hutool.core.util.StrUtil;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-@ApiModel(value = "AlarmUpload",description = "报警上传")
-@Data
-public class AlarmUpload {
-
-    @ApiModelProperty(value = "摄像头ip")
-    private String cameraIp;
-
-    @ApiModelProperty(value = "摄像头端口")
-    private String cameraPort;
-    @ApiModelProperty(value = "安全树甲烷设备ip")
-    private String gasIp;
-    @ApiModelProperty(value = "安全树甲烷设备端口")
-    private String gasPort;
-    @ApiModelProperty(value = "报警值")
-    private String alarmValue;
-    @ApiModelProperty(value = "报警时间")
-    private String alarmTime;
-    @ApiModelProperty(value = "报警类型")
-    private String alarmType;
-    @ApiModelProperty(value = "报警图片")
-    private String alarmImage;
-    @ApiModelProperty(value = "报警内容")
-    private String alarmContent;
-
-    @Override
-    public String toString() {
-        return "AlarmUpload{" +
-                "cameraIp='" + cameraIp + '\'' +
-                ", cameraPort='" + cameraPort + '\'' +
-                ", gasIp='" + gasIp + '\'' +
-                ", gasPort='" + gasPort + '\'' +
-                ", alarmValue='" + alarmValue + '\'' +
-                ", alarmTime='" + alarmTime + '\'' +
-                ", alarmType='" + alarmType + '\'' +
-                ", alarmImage='" + (StrUtil.isNotEmpty(alarmImage) ? alarmImage.substring(0,50) : "null") + '\'' +
-                ", alarmContent='" + alarmContent + '\'' +
-                '}';
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/DeviceDetailDTO.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/DeviceDetailDTO.java
deleted file mode 100644
index ea518d9..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/DeviceDetailDTO.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package com.casic.missiles.modular.system.dto;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.casic.missiles.modular.system.entity.Device;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-@ApiModel("DeviceDetailDTO")
-@Data
-public class DeviceDetailDTO extends Device {
-
-    @ApiModelProperty(value = "摄像头编号")
-    private String cameraCode;
-
-    @ApiModelProperty(value = "摄像头IP")
-    private String cameraIp;
-
-    @ApiModelProperty(value = "摄像头端口")
-    private String cameraPort;
-
-    @ApiModelProperty(value = "激甲编号")
-    private String gasCode;
-
-    @ApiModelProperty(value = "激甲IP")
-    private String gasIp;
-
-    @ApiModelProperty(value = "激甲端口")
-    private String gasPort;
-
-    @ApiModelProperty(value = "智能帽衬编号")
-    private String hatLiningCode;
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/WorkSiteDetailDTO.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/WorkSiteDetailDTO.java
deleted file mode 100644
index 29378ff..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/WorkSiteDetailDTO.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package com.casic.missiles.modular.system.dto;
-
-import com.casic.missiles.modular.system.entity.ProjectDevice;
-import com.casic.missiles.modular.system.entity.ProjectWorker;
-import com.casic.missiles.modular.system.entity.WorkSiteInfo;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.util.List;
-
-@Data
-@ApiModel("WorkSiteDetailDTO")
-public class WorkSiteDetailDTO extends WorkSiteInfo {
-
-    @ApiModelProperty(value = "安全树列表",dataType = "ProjectDevice")
-    private List<ProjectDevice> deviceList;
-
-    @ApiModelProperty(value = "人员列表",dataType = "ProjectWorker")
-    private List<ProjectWorker> workerList;
-
-
-
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/WorkerLocationDTO.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/WorkerLocationDTO.java
deleted file mode 100644
index 6fd7b24..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/WorkerLocationDTO.java
+++ /dev/null
@@ -1,68 +0,0 @@
-package com.casic.missiles.modular.system.dto;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-@ApiModel(value = "WorkerLocationDTO",description = "人员位置列表（首页）")
-@Data
-public class WorkerLocationDTO {
-
-    @ApiModelProperty("人员ID")
-    private Long workerId;
-
-    @ApiModelProperty("人员姓名")
-    private String workerName;
-
-    @ApiModelProperty("安全帽编号")
-    private String hatCode;
-
-    @ApiModelProperty("安全帽ID")
-    private Long hatId;
-
-    @ApiModelProperty("背心编号")
-    private String vastCode;
-
-    @ApiModelProperty("手环编号")
-    private String braceletCode;
-
-    @ApiModelProperty("位置")
-    private String location;
-
-    @ApiModelProperty("时间")
-    private String time;
-
-    @ApiModelProperty("经度")
-    private String lng;
-
-    @ApiModelProperty("纬度")
-    private String lat;
-
-    @ApiModelProperty("心率")
-    private String heartRate;
-
-    @ApiModelProperty("血氧")
-    private String bloodOxygen;
-
-    @ApiModelProperty("一氧化碳")
-    private String co;
-
-    @ApiModelProperty("甲烷")
-    private String gas;
-
-    @ApiModelProperty("硫化氢")
-    private String h2s;
-
-    @ApiModelProperty("氧气")
-    private String o2;
-
-    @ApiModelProperty("信号")
-    private String signal;
-
-    @ApiModelProperty("电量")
-    private String cell;
-
-    @ApiModelProperty("是否报警")
-    private boolean alarmFlag;
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Alarm.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Alarm.java
new file mode 100644
index 0000000..4d2b7ef
--- /dev/null
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Alarm.java
@@ -0,0 +1,103 @@
+package com.casic.missiles.modular.system.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import java.util.Date;
+
+/**
+ * <p>
+ * 报警记录表
+ * </p>
+ *
+ * @author zyj
+ * @since 2023-05-25
+ */
+@Data
+@TableName("bus_alarm")
+public class Alarm implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    @TableId(value = "ID",type = IdType.ASSIGN_ID)
+    private Long id;
+
+    /**
+     * 设备ID
+     */
+    @TableField("DEVICE_ID")
+    private Long deviceId;
+
+    /**
+     * 报警类型
+     */
+    @TableField("ALARM_TYPE")
+    private String alarmType;
+
+    /**
+     * 报警时间
+     */
+    @TableField("ALARM_TIME")
+    private Date alarmTime;
+
+    /**
+     * 报警状态
+     */
+    @TableField("ALARM_STATUS")
+    private String alarmStatus;
+
+    /**
+     * 报警位置
+     */
+    @TableField("ALARM_LOCATION")
+    private String alarmLocation;
+
+    /**
+     * 报警图片
+     */
+    @TableField("ALARM_IMAGE")
+    private String alarmImage;
+
+    /**
+     * 视频通道号
+     */
+    @TableField("CHANNEL_NO")
+    private Integer channelNo;
+
+    /**
+     * 报警内容
+     */
+    @TableField("ALARM_CONTENT")
+    private String alarmContent;
+
+    /**
+     * 消警时间
+     */
+    @TableField("CANCEL_TIME")
+    private Date cancelTime;
+
+
+    @Override
+    public String toString() {
+        return "Alarm{" +
+            "id=" + id +
+            ", deviceId=" + deviceId +
+            ", alarmType=" + alarmType +
+            ", alarmTime=" + alarmTime +
+            ", alarmStatus=" + alarmStatus +
+            ", alarmLocation=" + alarmLocation +
+            ", alarmImage=" + alarmImage +
+            ", channelNo=" + channelNo +
+            ", alarmContent=" + alarmContent +
+            ", cancelTime=" + cancelTime +
+        "}";
+    }
+}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusAlarm.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusAlarm.java
deleted file mode 100644
index efb4a23..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusAlarm.java
+++ /dev/null
@@ -1,159 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.alibaba.fastjson.annotation.JSONField;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.time.LocalDateTime;
-import java.util.Date;
-
-/**
- * <p>
- * 报警记录表
- * </p>
- *
- * @author zyj
- * @since 2023-05-16
- */
-@Data
-@ApiModel("Alarm")
-@TableName("br_bus_alarm")
-public class BusAlarm implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 项目ID
-     */
-    @ApiModelProperty(value = "项目ID")
-    @TableField("PROJECT_ID")
-    private Long projectId;
-
-    /**
-     * 设备ID
-     */
-    @ApiModelProperty(value = "设备ID")
-    @TableField("DEVICE_ID")
-    private Long deviceId;
-
-    /**
-     * 报警类型
-     */
-    @ApiModelProperty(value = "报警类型")
-    @TableField("ALARM_TYPE")
-    private String alarmType;
-
-    /**
-     * 报警状态
-     */
-    @ApiModelProperty(value = "报警状态")
-    @TableField("ALARM_STATUS")
-    private String alarmStatus;
-
-    /**
-     * 报警值
-     */
-    @ApiModelProperty(value = "报警值")
-    @TableField("ALARM_VALUE")
-    private String alarmValue;
-
-    /**
-     * 报警图片
-     */
-    @ApiModelProperty(value = "报警图片")
-    @TableField("ALARM_IMAGE")
-    private String alarmImage;
-
-    /**
-     * 报警内容
-     */
-    @ApiModelProperty(value = "报警内容")
-    @TableField("ALARM_CONTENT")
-    private String alarmContent;
-
-    /**
-     * 报警时间
-     */
-    @ApiModelProperty(value = "报警时间")
-    @TableField("ALARM_TIME")
-    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
-    private Date alarmTime;
-
-    /**
-     * 消警时间
-     */
-    @ApiModelProperty(value = "消警时间")
-    @TableField("CANCEL_TIME")
-    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
-    private Date cancelTime;
-
-    /**
-     * 报警位置经度
-     */
-    @ApiModelProperty(value = "报警位置经度")
-    @TableField("ALARM_LNG")
-    private String alarmLng;
-
-    /**
-     * 报警位置纬度
-     */
-    @ApiModelProperty(value = "报警位置纬度")
-    @TableField("ALARM_LAT")
-    private String alarmLat;
-
-    @ApiModelProperty("报警类型名称")
-    @TableField(exist = false)
-    private String alarmStatusName;
-    @ApiModelProperty("报警类型名称")
-    @TableField(exist = false)
-    private String alarmTypeName;
-    @ApiModelProperty("作业名称")
-    @TableField(exist = false)
-    private String workTitle;
-    @ApiModelProperty("所属道路")
-    @TableField(exist = false)
-    private String workRoad;
-    @ApiModelProperty("作业状态")
-    @TableField(exist = false)
-    private String projectState;
-    @ApiModelProperty("作业状态名称")
-    @TableField(exist = false)
-    private String projectStateName;
-    @ApiModelProperty("负责人姓名")
-    @TableField(exist = false)
-    private String workPersonName;
-    @ApiModelProperty("负责人联系方式")
-    @TableField(exist = false)
-    private String workPersonPhoneNumber;
-
-
-    @Override
-    public String toString() {
-        return "BusAlarm{" +
-                "id=" + id +
-                ", projectId=" + projectId +
-                ", deviceId=" + deviceId +
-                ", alarmType=" + alarmType +
-                ", alarmValue=" + alarmValue +
-                ", alarmStatus=" + alarmStatus +
-                ", alarmImage=" + alarmImage +
-                ", alarmContent=" + alarmContent +
-                ", alarmTime=" + alarmTime +
-                ", cancelTime=" + cancelTime +
-                ", alarmLng=" + alarmLng +
-                ", alarmLat=" + alarmLat +
-                "}";
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusEvent.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusEvent.java
deleted file mode 100644
index a0b7543..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusEvent.java
+++ /dev/null
@@ -1,100 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.time.LocalDateTime;
-import java.util.Date;
-import java.util.List;
-
-/**
- * <p>
- * 事件表
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@TableName("br_bus_event")
-@Data
-@ApiModel("BusEvent")
-public class BusEvent implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @ApiModelProperty("事件ID")
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 事件标题
-     */
-    @ApiModelProperty("事件名称")
-    @TableField("EVENT_TITLE")
-    private String eventTitle;
-
-    /**
-     * 上报人员
-     */
-    @ApiModelProperty("上报人员")
-    @TableField("UPLOAD_NAME")
-    private String uploadName;
-
-    /**
-     * 联系方式
-     */
-    @ApiModelProperty("联系方式")
-    @TableField("PHONE_NUMBER")
-    private String phoneNumber;
-
-    /**
-     * 事件描述
-     */
-    @ApiModelProperty("事件描述")
-    @TableField("EVENT_DESCRIPTION")
-    private String eventDescription;
-
-    @ApiModelProperty("经度")
-    @TableField("LNG")
-    private String lng;
-
-    @ApiModelProperty("纬度")
-    @TableField("LAT")
-    private String lat;
-
-    /**
-     * 事件上传时间
-     */
-    @ApiModelProperty("事件上传时间")
-    @TableField("CREATE_TIME")
-    private Date createTime;
-
-    @ApiModelProperty("事件照片")
-    @TableField(exist = false)
-    private List<BusEventImage> imageList;
-
-
-
-    @Override
-    public String toString() {
-        return "BusEvent{" +
-            "id=" + id +
-            ", eventTitle=" + eventTitle +
-            ", uploadName=" + uploadName +
-            ", phoneNumber=" + phoneNumber +
-            ", eventDescription=" + eventDescription +
-            ", lng=" + lng +
-            ", lat=" + lat +
-            ", createTime=" + createTime +
-        "}";
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusEventImage.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusEventImage.java
deleted file mode 100644
index 1e75245..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusEventImage.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-
-/**
- * <p>
- * 事件图片表
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@TableName("br_bus_event_image")
-@Data
-@ApiModel("BusEventImage")
-public class BusEventImage implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 事件ID
-     */
-    @TableField("EVENT_ID")
-    private Long eventId;
-
-    /**
-     * 报警图片
-     */
-    @TableField("IMAGE")
-    @ApiModelProperty("图片url")
-    private String image;
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Device.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Device.java
index df89c70..ea7db5f 100644
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Device.java
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Device.java
@@ -1,30 +1,23 @@
 package com.casic.missiles.modular.system.entity;
 
-import com.alibaba.fastjson.annotation.JSONField;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.casic.missiles.core.base.json.DateDeserializer;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
-import java.util.Date;
 
 /**
  * <p>
- * 
+ * 设备记录表
  * </p>
  *
  * @author zyj
- * @since 2023-04-14
+ * @since 2023-05-25
  */
-@ApiModel("Device")
-@TableName("br_device")
 @Data
+@TableName("bus_device")
 public class Device implements Serializable {
 
     private static final long serialVersionUID = 1L;
@@ -32,82 +25,86 @@
     /**
      * 主键
      */
-    @ApiModelProperty(value = "设备ID")
     @TableId(value = "ID",type = IdType.ASSIGN_ID)
     private Long id;
 
     /**
-     * 设备编号
+     * 设备名称
      */
-    @ApiModelProperty(value = "设备编号")
-    @TableField("DEVICE_CODE")
-    private String deviceCode;
+    @TableField("DEVICE_NAME")
+    private String deviceName;
 
     /**
-     * 设备类型
+     * IP
      */
-    @ApiModelProperty(value = "设备类型")
-    @TableField("DEVICE_TYPE")
-    private String deviceType;
+    @TableField("IP")
+    private String ip;
 
     /**
-     * 设备批次
+     * 端口
      */
-    @ApiModelProperty(value = "设备批次")
-    @TableField("DEVICE_BATCH")
-    private String deviceBatch;
+    @TableField("PORT")
+    private String port;
 
     /**
-     * 厂家
+     * 用户名
      */
-    @ApiModelProperty(value = "厂家")
-    @TableField("MANUFACTURER")
-    private String manufacturer;
+    @TableField("USER_NAME")
+    private String userName;
 
     /**
-     * 是否供电
+     * 密码
      */
-    @ApiModelProperty(value = "是否供电")
-    @TableField("IS_POWER_SUPPLY")
-    private String isPowerSupply;
+    @TableField("PASSWORD")
+    private String password;
 
     /**
-     * 创建时间
+     * 连接类型
      */
-    @ApiModelProperty(value = "创建时间",dataType = "Date")
-    @TableField("CREATE_TIME")
-    private Date createTime;
+    @TableField("CONNECT_TYPE")
+    private String connectType;
 
-    @ApiModelProperty(value = "设备类型名称")
-    @TableField(exist = false)
-    private String deviceTypeName;
+    /**
+     * 位置
+     */
+    @TableField("LOCATION")
 
-    @ApiModelProperty(value = "是否供电名称")
-    @TableField(exist = false)
-    private String isPowerSupplyName;
+    private String location;
 
-    @ApiModelProperty(value = "注册时间",dataType = "String")
-    @TableField(exist = false)
-    private String registerTime;
+    /**
+     * 设备状态
+     */
+    @TableField("STATUS")
 
-    @ApiModelProperty(value = "当前状态")
-    @TableField(exist = false)
     private String status;
 
-    @ApiModelProperty(value = "当前状态名称")
-    @TableField(exist = false)
-    private String statusName;
+    /**
+     * 报警分组
+     */
+    @TableField("ALARM_GROUP")
+
+    private Long alarmGroup;
+
+    /**
+     * 视频通道数(预留)
+     */
+    @TableField("CHANNEL_NUM")
+    private Integer channelNum;
 
     @Override
     public String toString() {
         return "Device{" +
             "id=" + id +
-            ", deviceCode=" + deviceCode +
-            ", deviceType=" + deviceType +
-            ", deviceBatch=" + deviceBatch +
-            ", manufacturer=" + manufacturer +
-            ", isPowerSupply=" + isPowerSupply +
-            ", createTime=" + createTime +
+            ", deviceName=" + deviceName +
+            ", ip=" + ip +
+            ", port=" + port +
+            ", userName=" + userName +
+            ", password=" + password +
+            ", connectType=" + connectType +
+            ", location=" + location +
+            ", status=" + status +
+            ", alarmGroup=" + alarmGroup +
+            ", channelNum=" + channelNum +
         "}";
     }
 }
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/DeviceExt.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/DeviceExt.java
deleted file mode 100644
index 5ee7015..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/DeviceExt.java
+++ /dev/null
@@ -1,99 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-
-/**
- * <p>
- * 设备扩展信息表（安全树）
- * </p>
- *
- * @author zyj
- * @since 2023-04-27
- */
-@Data
-@TableName("br_device_ext")
-public class DeviceExt implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 设备ID
-     */
-    @TableField("DEVICE_ID")
-    private Long deviceId;
-
-    /**
-     * 摄像头编号
-     */
-    @TableField("CAMERA_CODE")
-    private String cameraCode;
-
-    /**
-     * 摄像头IP
-     */
-    @TableField("CAMERA_IP")
-    private String cameraIp;
-
-    /**
-     * 摄像头端口
-     */
-    @TableField("CAMERA_PORT")
-    private String cameraPort;
-
-    /**
-     * 激甲编号
-     */
-    @TableField("GAS_CODE")
-    private String gasCode;
-
-    /**
-     * 激甲IP
-     */
-    @TableField("GAS_IP")
-    private String gasIp;
-
-    /**
-     * 激甲端口
-     */
-    @TableField("GAS_PORT")
-    private String gasPort;
-
-    /**
-     * 甲烷报警阈值
-     */
-    @TableField("GAS_THRESHOLD")
-    private String gasThreshold;
-
-    @TableField(value = "HAT_LINING_CODE")
-    private String hatLiningCode;
-
-
-    @Override
-    public String toString() {
-        return "DeviceExt{" +
-            "id=" + id +
-            ", deviceId=" + deviceId +
-            ", cameraCode=" + cameraCode +
-            ", cameraIp=" + cameraIp +
-            ", cameraPort=" + cameraPort +
-            ", gasCode=" + gasCode +
-            ", gasIp=" + gasIp +
-            ", gasPort=" + gasPort +
-            ", gasThreshold=" + gasThreshold +
-            ", hatLiningCode=" + hatLiningCode +
-        "}";
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/ProjectDevice.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/ProjectDevice.java
deleted file mode 100644
index c4f3472..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/ProjectDevice.java
+++ /dev/null
@@ -1,62 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-
-/**
- * <p>
- * 
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@Data
-@ApiModel("ProjectDevice")
-@TableName("br_project_device")
-public class ProjectDevice implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 作业现场ID
-     */
-    @TableField("PROJECT_ID")
-    private Long projectId;
-
-    /**
-     * 设备ID
-     */
-    @TableField("DEVICE_ID")
-    @ApiModelProperty("设备ID（新增编辑时传）")
-    private Long deviceId;
-
-    /**
-     * 设备编号
-     */
-    @TableField(exist = false)
-    @ApiModelProperty("设备编号（详情中展示，新增编辑不用传）")
-    private String deviceCode;
-
-    @Override
-    public String toString() {
-        return "ProjectDevice{" +
-            "id=" + id +
-            ", projectId=" + projectId +
-            ", deviceId=" + deviceId +
-        "}";
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/ProjectWorker.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/ProjectWorker.java
deleted file mode 100644
index 10b23c4..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/ProjectWorker.java
+++ /dev/null
@@ -1,104 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import java.io.Serializable;
-
-/**
- * <p>
- * 
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@ApiModel("ProjectWorker")
-@TableName("br_project_worker")
-@Data
-@NoArgsConstructor
-@AllArgsConstructor
-public class ProjectWorker implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 作业现场ID
-     */
-    @TableField("PROJECT_ID")
-    private Long projectId;
-
-    /**
-     * 人员ID
-     */
-    @ApiModelProperty("人员ID")
-    @TableField("WORKER_ID")
-    private Long workerId;
-
-    /**
-     * 安全帽编号
-     */
-    @ApiModelProperty("安全帽编号")
-    @TableField("HAT_CODE")
-    private String hatCode;
-
-    /**
-     * 背心编号
-     */
-    @ApiModelProperty("背心编号")
-    @TableField("VAST_CODE")
-    private String vastCode;
-
-    /**
-     * 手环编号
-     */
-    @ApiModelProperty("手环编号")
-    @TableField("BRACELET_CODE")
-    private String braceletCode;
-
-    @ApiModelProperty("人员姓名（详情中展示，新增编辑不用传）")
-    @TableField(exist = false)
-    private String workerName;
-
-    @ApiModelProperty("人员部门ID（详情中展示，新增编辑不用传）")
-    @TableField(exist = false)
-    private String workerDeptId;
-
-    @ApiModelProperty("人员部门名称（详情中展示，新增编辑不用传）")
-    @TableField(exist = false)
-    private String workerDeptName;
-
-    @ApiModelProperty("人员联系方式（详情中展示，新增编辑不用传）")
-    @TableField(exist = false)
-    private String workerPhoneNumber;
-
-    public ProjectWorker(Long projectId, Long workerId) {
-        this.projectId = projectId;
-        this.workerId = workerId;
-    }
-
-    @Override
-    public String toString() {
-        return "ProjectWorker{" +
-            "id=" + id +
-            ", projectId=" + projectId +
-            ", workerId=" + workerId +
-            ", hatCode=" + hatCode +
-            ", vastCode=" + vastCode +
-            ", braceletCode=" + braceletCode +
-        "}";
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/WorkSiteInfo.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/WorkSiteInfo.java
deleted file mode 100644
index fa6f41d..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/WorkSiteInfo.java
+++ /dev/null
@@ -1,130 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.alibaba.fastjson.annotation.JSONField;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.time.LocalDateTime;
-import java.util.Date;
-
-/**
- * <p>
- * 作业现场表
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@ApiModel("WorkSiteInfo")
-@TableName("br_work_site_info")
-@Data
-public class WorkSiteInfo implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @ApiModelProperty("作业现场ID")
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 作业名称
-     */
-    @ApiModelProperty("作业名称")
-    @TableField("WORK_TITLE")
-    private String workTitle;
-
-    /**
-     * 责任人
-     */
-    @ApiModelProperty("责任人（人员ID）")
-    @TableField("WORK_PERSON")
-    private Long workPerson;
-
-    /**
-     * 作业描述
-     */
-    @ApiModelProperty("作业描述")
-    @TableField("WORK_SITE_DESC")
-    private String workSiteDesc;
-
-    /**
-     * 作业状态
-     */
-    @ApiModelProperty("作业状态")
-    @TableField("PROJECT_STATE")
-    private String projectState;
-
-    /**
-     * 所属道路
-     */
-    @ApiModelProperty("所属道路")
-    @TableField("WORK_ROAD")
-    private String workRoad;
-
-    @TableField("IMAGE_URL")
-    private String imageUrl;
-
-    @TableField("CREATE_TIME")
-    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
-    private Date createTime;
-    @TableField("UPDATE_TIME")
-    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
-    private Date updateTime;
-
-    @ApiModelProperty("开始时间")
-    @TableField("START_TIME")
-    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
-    private Date startTime;
-
-    @ApiModelProperty("结束时间")
-    @TableField("FINISH_TIME")
-    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
-    private Date finishTime;
-
-    @ApiModelProperty("负责人姓名（详情中使用，新增编辑不用传）")
-    @TableField(exist = false)
-    private String workPersonName;
-
-    @ApiModelProperty("负责人联系方式（详情中使用，新增编辑不用传）")
-    @TableField(exist = false)
-    private String workPersonPhoneNumber;
-
-    @ApiModelProperty("负责人所属部门ID（详情中使用，新增编辑不用传）")
-    @TableField(exist = false)
-    private Long workPersonDeptId;
-
-    @ApiModelProperty("负责人所属部门名称（详情中使用，新增编辑不用传）")
-    @TableField(exist = false)
-    private String workPersonDeptName;
-
-    @ApiModelProperty(value = "注册时间",dataType = "String")
-    @TableField(exist = false)
-    private String registerTime;
-
-    @ApiModelProperty("作业状态名称")
-    @TableField(exist = false)
-    private String projectStateName;
-
-    @Override
-    public String toString() {
-        return "WorkSiteInfo{" +
-            "id=" + id +
-            ", workTitle=" + workTitle +
-            ", workPerson=" + workPerson +
-            ", workSiteDesc=" + workSiteDesc +
-            ", projectState=" + projectState +
-            ", imageUrl=" + imageUrl +
-            ", updateTime=" + updateTime +
-            ", workRoad=" + workRoad +
-        "}";
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Worker.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Worker.java
deleted file mode 100644
index 28a4daa..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Worker.java
+++ /dev/null
@@ -1,147 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.time.LocalDateTime;
-import java.util.Date;
-
-/**
- * <p>
- * 
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@ApiModel("Worker")
-@TableName("br_worker")
-@Data
-public class Worker implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @ApiModelProperty(value = "人员ID")
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 姓名
-     */
-    @ApiModelProperty(value = "姓名")
-    @TableField("WORKER_NAME")
-    private String workerName;
-
-    /**
-     * 性别
-     */
-    @ApiModelProperty(value = "性别")
-    @TableField("GENDER")
-    private String gender;
-
-    /**
-     * 所属部门
-     */
-    @ApiModelProperty(value = "所属部门(人员管理)")
-    @TableField("DEPT_ID")
-    private Long deptId;
-
-    /**
-     * 所属单位
-     */
-    @ApiModelProperty(value = "所属单位(入场申请中使用)")
-    @TableField("OWNER_SHIP")
-    private String ownerShip;
-
-    /**
-     * 联系方式
-     */
-    @ApiModelProperty(value = "联系方式")
-    @TableField("PHONE_NUMBER")
-    private String phoneNumber;
-
-    /**
-     * 证件号
-     */
-    @ApiModelProperty(value = "证件号")
-    @TableField("ID_CARD_NUMBER")
-    private String idCardNumber;
-
-    /**
-     * 入场原因
-     */
-    @ApiModelProperty(value = "入场原因（入场申请中使用）")
-    @TableField("ENTER_REASON")
-    private String enterReason;
-
-    /**
-     * 入场人脸照片
-     */
-    @ApiModelProperty(value = "人脸照片（照片路径）")
-    @TableField("WORKER_AVATAR")
-    private String workerAvatar;
-
-    /**
-     * 申请入场时间
-     */
-    @ApiModelProperty(value = "注册时间/申请入场时间")
-    @TableField("CREATE_TIME")
-    private Date createTime;
-
-    /**
-     * 人员类型
-     */
-    @ApiModelProperty(value = "人员类型（区分人员管理和入场申请）")
-    @TableField("WORKER_TYPE")
-    private String workerType;
-
-    @ApiModelProperty(value = "性别名称")
-    @TableField(exist = false)
-    private String genderName;
-
-    @ApiModelProperty(value = "部门名称")
-    @TableField(exist = false)
-    private String deptName;
-
-    @ApiModelProperty(value = "注册时间",dataType = "String")
-    @TableField(exist = false)
-    private String registerTime;
-
-    @ApiModelProperty(value = "当前状态")
-    @TableField(exist = false)
-    private String status;
-
-    @ApiModelProperty(value = "当前状态名称")
-    @TableField(exist = false)
-    private String statusName;
-
-    @ApiModelProperty(value = "是否注册(0未注册；1已注册)",allowableValues = "0,1")
-    @TableField(exist = false)
-    private String isRegister;
-
-    @Override
-    public String toString() {
-        return "Worker{" +
-            "id=" + id +
-            ", workerName=" + workerName +
-            ", gender=" + gender +
-            ", deptId=" + deptId +
-            ", ownerShip=" + ownerShip +
-            ", phoneNumber=" + phoneNumber +
-            ", idCardNumber=" + idCardNumber +
-            ", enterReason=" + enterReason +
-            ", workerAvatar=" + workerAvatar +
-            ", createTime=" + createTime +
-            ", workerType=" + workerType +
-        "}";
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/AlarmMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/AlarmMapper.java
new file mode 100644
index 0000000..ea4c8be
--- /dev/null
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/AlarmMapper.java
@@ -0,0 +1,16 @@
+package com.casic.missiles.modular.system.mapper;
+
+import com.casic.missiles.modular.system.entity.Alarm;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 报警记录表 Mapper 接口
+ * </p>
+ *
+ * @author zyj
+ * @since 2023-05-25
+ */
+public interface AlarmMapper extends BaseMapper<Alarm> {
+
+}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/BusAlarmMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/BusAlarmMapper.java
deleted file mode 100644
index 9801742..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/BusAlarmMapper.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package com.casic.missiles.modular.system.mapper;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.modular.system.dto.AlarmTypeCountDTO;
-import com.casic.missiles.modular.system.entity.BusAlarm;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * <p>
- * 报警记录表 Mapper 接口
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface BusAlarmMapper extends BaseMapper<BusAlarm> {
-
-    Page<BusAlarm> listPage(Page<BusAlarm> page,@Param("ew")  QueryWrapper<BusAlarm> queryWrapper);
-
-    void cancelAlarm(@Param("deviceId")Long deviceId,@Param("alarmType") String alarmType);
-
-    List<AlarmTypeCountDTO> alarmCount(@Param("projectId")Long projectId, @Param("alarmStatus")String alarmStatus);
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/BusEventImageMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/BusEventImageMapper.java
deleted file mode 100644
index 9590b7d..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/BusEventImageMapper.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.casic.missiles.modular.system.mapper;
-
-import com.casic.missiles.modular.system.entity.BusEventImage;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * <p>
- * 事件图片表 Mapper 接口
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface BusEventImageMapper extends BaseMapper<BusEventImage> {
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/BusEventMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/BusEventMapper.java
deleted file mode 100644
index 3c85edf..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/BusEventMapper.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.casic.missiles.modular.system.mapper;
-
-import com.casic.missiles.modular.system.entity.BusEvent;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * <p>
- * 事件表 Mapper 接口
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface BusEventMapper extends BaseMapper<BusEvent> {
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/DeviceExtMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/DeviceExtMapper.java
deleted file mode 100644
index 4ca9212..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/DeviceExtMapper.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.casic.missiles.modular.system.mapper;
-
-import com.casic.missiles.modular.system.entity.DeviceExt;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * <p>
- * 设备扩展信息表（安全树） Mapper 接口
- * </p>
- *
- * @author zyj
- * @since 2023-04-27
- */
-public interface DeviceExtMapper extends BaseMapper<DeviceExt> {
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/DeviceMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/DeviceMapper.java
index 444c0c5..3d0bb02 100644
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/DeviceMapper.java
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/DeviceMapper.java
@@ -1,30 +1,16 @@
 package com.casic.missiles.modular.system.mapper;
 
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.modular.system.dto.DeviceDetailDTO;
-import com.casic.missiles.modular.system.dto.HelmetInfoDTO;
 import com.casic.missiles.modular.system.entity.Device;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
 
 /**
  * <p>
- *  Mapper 接口
+ * 设备记录表 Mapper 接口
  * </p>
  *
  * @author zyj
- * @since 2023-04-14
+ * @since 2023-05-25
  */
-@Mapper
 public interface DeviceMapper extends BaseMapper<Device> {
 
-    Page<DeviceDetailDTO> listDetailPage(Page<DeviceDetailDTO> page,@Param("ew") QueryWrapper<DeviceDetailDTO> ew);
-
-     List<Long> selectProjectDevice(@Param("projectId") Long projectId);
-
-    List<HelmetInfoDTO> selectHelmetList(@Param("deviceType")String deviceType);
 }
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/ProjectDeviceMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/ProjectDeviceMapper.java
deleted file mode 100644
index 1d0c14e..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/ProjectDeviceMapper.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package com.casic.missiles.modular.system.mapper;
-
-import com.casic.missiles.modular.system.dto.DeviceLocationDTO;
-import com.casic.missiles.modular.system.entity.ProjectDevice;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * <p>
- *  Mapper 接口
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface ProjectDeviceMapper extends BaseMapper<ProjectDevice> {
-     List<ProjectDevice> selectDetailByProjectId(@Param("projectId") Long projectId);
-
-     List<DeviceLocationDTO> selectDeviceLocationList(@Param("projectId") Long projectId);
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/ProjectWorkerMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/ProjectWorkerMapper.java
deleted file mode 100644
index 58583d1..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/ProjectWorkerMapper.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package com.casic.missiles.modular.system.mapper;
-
-import com.casic.missiles.modular.system.dto.WorkerLocationDTO;
-import com.casic.missiles.modular.system.entity.ProjectWorker;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * <p>
- *  Mapper 接口
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface ProjectWorkerMapper extends BaseMapper<ProjectWorker> {
-
-    List<ProjectWorker> selectDetailByProjectId(@Param("projectId") Long projectId,
-                                                @Param("workerType")String workerType);
-
-    List<WorkerLocationDTO> selectWorkerLocationList(@Param("projectId") Long projectId,
-                                                     @Param("workerType")String workerType);
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/WorkSiteInfoMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/WorkSiteInfoMapper.java
deleted file mode 100644
index a4934d2..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/WorkSiteInfoMapper.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.casic.missiles.modular.system.mapper;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.modular.system.entity.WorkSiteInfo;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Param;
-
-/**
- * <p>
- * 作业现场表 Mapper 接口
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface WorkSiteInfoMapper extends BaseMapper<WorkSiteInfo> {
-
-    Page<WorkSiteInfo> selectListPage(Page<WorkSiteInfo> page,@Param("ew") QueryWrapper<WorkSiteInfo> ew);
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/WorkerMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/WorkerMapper.java
deleted file mode 100644
index 258fb12..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/WorkerMapper.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package com.casic.missiles.modular.system.mapper;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.modular.system.dto.DeviceDetailDTO;
-import com.casic.missiles.modular.system.entity.Worker;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * <p>
- *  Mapper 接口
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface WorkerMapper extends BaseMapper<Worker> {
-
-
-    Page<Worker> selectListPage(Page<Worker> page, @Param("ew") QueryWrapper<Worker> ew);
-
-    List<String> selectWorkerAvatars(@Param("projectId")Long projectId);
-
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/AlarmMapper.xml b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/AlarmMapper.xml
new file mode 100644
index 0000000..25cb4ab
--- /dev/null
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/AlarmMapper.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.modular.system.mapper.AlarmMapper">
+
+</mapper>
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/BusAlarmMapper.xml b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/BusAlarmMapper.xml
deleted file mode 100644
index 595088a..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/BusAlarmMapper.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.casic.missiles.modular.system.mapper.BusAlarmMapper">
-
-    <select id="listPage" resultType="com.casic.missiles.modular.system.entity.BusAlarm">
-        SELECT
-            alarm.ID as id,
-            alarm.DEVICE_ID as deviceId,
-            alarm.PROJECT_ID as projectId,
-            alarm.ALARM_TYPE as alarmType,
-            alarm.ALARM_VALUE as alarmValue,
-            alarm.ALARM_STATUS as alarmStatus,
-            alarm.ALARM_IMAGE AS alarmImage,
-            alarm.ALARM_CONTENT as alarmContent,
-            alarm.ALARM_TIME as alarmTime,
-            alarm.CANCEL_TIME as cancelTime,
-            alarm.ALARM_LNG as alarmLng,
-            alarm.ALARM_LAT as alarmLat,
-            p.WORK_TITLE as workTitle,
-            p.WORK_ROAD as workRoad,
-            p.PROJECT_STATE as projectState,
-            w.WORKER_NAME as workPersonName,
-            w.PHONE_NUMBER as workPersonPhoneNumber
-        FROM
-            `br_bus_alarm` alarm
-                LEFT JOIN br_work_site_info p on alarm.PROJECT_ID = p.ID
-                LEFT JOIN br_worker w on p.WORK_PERSON = w.ID
-        <where>
-            <if test="ew != null">
-                ${ew.sqlSegment}
-            </if>
-        </where>
-    </select>
-
-    <select id="cancelAlarm">
-        update br_bus_alarm
-        set ALARM_STATUS = '1'
-        where DEVICE_ID = #{deviceId}
-          and ALARM_TYPE = #{alarmType}
-          and ALARM_STATUS = '0'
-    </select>
-
-    <select id="alarmCount" resultType="com.casic.missiles.modular.system.dto.AlarmTypeCountDTO">
-        SELECT
-            ALARM_TYPE as alarmType,
-            count(*) as alarmCount
-        from br_bus_alarm
-        <where>
-            <if test="projectId != null and projectId !=''">
-                and PROJECT_ID = #{projectId}
-            </if>
-            <if test="alarmStatus != null and alarmStatus !=''">
-                and ALARM_STATUS = #{alarmStatus}
-            </if>
-        </where>
-        group by ALARM_TYPE
-    </select>
-</mapper>
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/BusEventImageMapper.xml b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/BusEventImageMapper.xml
deleted file mode 100644
index fbc3db3..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/BusEventImageMapper.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.casic.missiles.modular.system.mapper.BusEventImageMapper">
-
-</mapper>
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/BusEventMapper.xml b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/BusEventMapper.xml
deleted file mode 100644
index 627d573..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/BusEventMapper.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.casic.missiles.modular.system.mapper.BusEventMapper">
-
-</mapper>
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/DeviceExtMapper.xml b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/DeviceExtMapper.xml
deleted file mode 100644
index 5321d1c..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/DeviceExtMapper.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.casic.missiles.modular.system.mapper.DeviceExtMapper">
-
-</mapper>
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/DeviceMapper.xml b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/DeviceMapper.xml
index 94262e1..88e7d01 100644
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/DeviceMapper.xml
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/DeviceMapper.xml
@@ -2,96 +2,4 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.casic.missiles.modular.system.mapper.DeviceMapper">
 
-    <select id="listDetailPage" resultType="com.casic.missiles.modular.system.dto.DeviceDetailDTO">
-        select
-        br_device.ID as id,
-        DEVICE_CODE as deviceCode,
-        DEVICE_TYPE as deviceType,
-        DEVICE_BATCH as deviceBatch,
-        MANUFACTURER as manufacturer,
-        IS_POWER_SUPPLY as isPowerSupply,
-        CREATE_TIME as createTime,
-        CAMERA_CODE as cameraCode,
-        CAMERA_IP as cameraIp,
-        CAMERA_PORT as cameraPort,
-        GAS_CODE as gasCode,
-        GAS_IP as gasIp,
-        GAS_PORT as gasPort,
-        HAT_LINING_CODE as hatLiningCode
-        from br_device
-        left join br_device_ext ext on ext.DEVICE_ID = br_device.ID
-        <where>
-            <if test="ew != null">
-                ${ew.sqlSegment}
-            </if>
-        </where>
-    </select>
-
-    <select id="selectProjectDevice" resultType="java.lang.Long">
-        with device_info as (
-            (SELECT
-            d.DEVICE_ID as DEVICE_ID,
-            d.PROJECT_ID as PROJECT_ID,
-            p.PROJECT_STATE as PROJECT_STATE
-            from br_project_device d
-            LEFT JOIN br_work_site_info p on p.ID = d.PROJECT_ID)
-
-            UNION ALL
-
-            (SELECT
-            d1.ID as DEVICE_ID,
-            w1.ID as PROJECT_ID,
-            w1.PROJECT_STATE as PROJECT_STATE
-            FROM br_project_worker pw1
-            LEFT JOIN br_device d1 on pw1.BRACELET_CODE = d1.DEVICE_CODE
-            LEFT JOIN br_work_site_info w1 on pw1.PROJECT_ID = w1.ID)
-
-            UNION ALL
-
-            (SELECT
-            d1.ID as DEVICE_ID,
-            w1.ID as PROJECT_ID,
-            w1.PROJECT_STATE as PROJECT_STATE
-            FROM br_project_worker pw1
-            LEFT JOIN br_device d1 on pw1.HAT_CODE = d1.DEVICE_CODE
-            LEFT JOIN br_work_site_info w1 on pw1.PROJECT_ID = w1.ID)
-
-
-            UNION ALL
-
-            (SELECT
-            d1.ID as DEVICE_ID,
-            w1.ID as PROJECT_ID,
-            w1.PROJECT_STATE as PROJECT_STATE
-            FROM br_project_worker pw1
-            LEFT JOIN br_device d1 on pw1.VAST_CODE = d1.DEVICE_CODE
-            LEFT JOIN br_work_site_info w1 on pw1.PROJECT_ID = w1.ID))
-
-        select DISTINCT DEVICE_ID from device_info
-        <where>
-            DEVICE_ID is not null
-            <choose>
-                <when test="projectId != null and projectId !=''">
-                    and PROJECT_ID = #{projectId}
-                </when>
-                <otherwise>
-                    AND PROJECT_STATE != '3'
-                </otherwise>
-            </choose>
-        </where>
-    </select>
-
-    <select id="selectHelmetList" resultType="com.casic.missiles.modular.system.dto.HelmetInfoDTO">
-        SELECT
-            a.ID AS deviceId,
-            a.DEVICE_CODE AS hatCode,
-            b.HAT_LINING_CODE AS hatLiningCode
-        FROM
-            br_device a
-                LEFT JOIN br_device_ext b ON a.ID = b.DEVICE_ID
-        WHERE
-            a.DEVICE_TYPE = #{deviceType}
-          AND a.DEVICE_CODE IS NOT NULL
-          AND b.HAT_LINING_CODE IS NOT NULL
-    </select>
 </mapper>
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/ProjectDeviceMapper.xml b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/ProjectDeviceMapper.xml
deleted file mode 100644
index c6d1c24..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/ProjectDeviceMapper.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.casic.missiles.modular.system.mapper.ProjectDeviceMapper">
-
-    <select id="selectDetailByProjectId" resultType="com.casic.missiles.modular.system.entity.ProjectDevice">
-        SELECT
-            pd.ID as id,
-            pd.PROJECT_ID as projectId,
-            pd.DEVICE_ID as deviceId,
-            d.DEVICE_CODE as deviceCode
-        from br_project_device pd
-        LEFT JOIN br_device d on pd.DEVICE_ID = d.ID
-        <where>
-            pd.PROJECT_ID = #{projectId}
-        </where>
-    </select>
-
-    <select id="selectDeviceLocationList" resultType="com.casic.missiles.modular.system.dto.DeviceLocationDTO">
-        SELECT
-        d.ID as deviceId,
-        d.DEVICE_TYPE as deviceType,
-        d.DEVICE_CODE as deviceCode,
-        if(EXISTS(select ID from br_bus_alarm WHERE DEVICE_ID = d.ID and ALARM_STATUS = '0'),true,false) as alarmFlag
-        FROM br_project_device pd, br_device d
-        where pd.DEVICE_ID = d.ID
-        and pd.PROJECT_ID = #{projectId}
-    </select>
-
-</mapper>
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/ProjectWorkerMapper.xml b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/ProjectWorkerMapper.xml
deleted file mode 100644
index 8d2de10..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/ProjectWorkerMapper.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.casic.missiles.modular.system.mapper.ProjectWorkerMapper">
-
-    <select id="selectDetailByProjectId" resultType="com.casic.missiles.modular.system.entity.ProjectWorker">
-        SELECT
-            pw.ID as id,
-            pw.PROJECT_ID as projectId,
-            pw.WORKER_ID as workerId,
-            w.WORKER_NAME as workerName,
-            w.DEPT_ID as workerDeptId,
-            pw.HAT_CODE as hatCode,
-            pw.VAST_CODE as vastCode,
-            pw.BRACELET_CODE as braceletCode,
-            w.PHONE_NUMBER as workerPhoneNumber
-        from br_project_worker pw
-        LEFT JOIN br_worker w on pw.WORKER_ID = w.ID
-        <where>
-            pw.PROJECT_ID = #{projectId}
-            <if test="workerType != null and workerType != ''">
-                and w.WORKER_TYPE = #{workerType}
-            </if>
-        </where>
-    </select>
-
-    <select id="selectWorkerLocationList" resultType="com.casic.missiles.modular.system.dto.WorkerLocationDTO">
-        select
-            w.ID as workerId,
-            w.WORKER_NAME as workerName,
-            pw.HAT_CODE as hatCode,
-            hd.ID as hatId,
-            pw.BRACELET_CODE as braceletCode,
-            pw.VAST_CODE as vastCode
-        from br_project_worker pw,br_worker w ,br_device hd
-        WHERE pw.WORKER_ID = w.ID
-          and pw.HAT_CODE = hd.DEVICE_CODE
-          and pw.PROJECT_ID = #{projectId}
-          and w.WORKER_TYPE = #{workerType}
-    </select>
-</mapper>
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/WorkSiteInfoMapper.xml b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/WorkSiteInfoMapper.xml
deleted file mode 100644
index 8f01326..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/WorkSiteInfoMapper.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.casic.missiles.modular.system.mapper.WorkSiteInfoMapper">
-
-    <select id="selectListPage" resultType="com.casic.missiles.modular.system.entity.WorkSiteInfo">
-        SELECT
-            br_work_site_info.ID AS id,
-            WORK_TITLE as workTitle,
-            WORK_ROAD as workRoad,
-            WORK_SITE_DESC as workSiteDesc,
-            WORK_PERSON as workPerson,
-            WORKER_NAME as workPersonName,
-            DEPT_ID as workPersonDeptId,
-            PHONE_NUMBER as workPersonPhoneNumber,
-            PROJECT_STATE as projectState,
-            br_work_site_info.CREATE_TIME AS createTime,
-            br_work_site_info.UPDATE_TIME AS updateTime
-        FROM br_work_site_info
-        LEFT JOIN br_worker w ON br_work_site_info.WORK_PERSON = w.ID
-        <where>
-            <if test="ew != null">
-                ${ew.sqlSegment}
-            </if>
-        </where>
-    </select>
-</mapper>
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/WorkerMapper.xml b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/WorkerMapper.xml
deleted file mode 100644
index 3e28b39..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/WorkerMapper.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.casic.missiles.modular.system.mapper.WorkerMapper">
-
-    <select id="selectListPage" resultType="com.casic.missiles.modular.system.entity.Worker">
-        WITH worker_project AS (
-            SELECT
-                w.id AS ID,
-                WORKER_NAME,
-                GENDER,
-                DEPT_ID,
-                OWNER_SHIP,
-                PHONE_NUMBER,
-                ID_CARD_NUMBER,
-                ENTER_REASON,
-                WORKER_AVATAR,
-                w.CREATE_TIME,
-                WORKER_TYPE,
-                IF( p.PROJECT_STATE != '3', 1, 0 ) AS `STATUS`
-            FROM br_worker w
-            LEFT JOIN br_project_worker pw ON w.ID = pw.WORKER_ID
-            LEFT JOIN br_work_site_info p ON pw.PROJECT_ID = p.ID
-        )
-
-        SELECT
-            ID AS id,
-            WORKER_NAME AS workerName,
-            GENDER AS gender,
-            DEPT_ID AS deptId,
-            OWNER_SHIP AS ownerShip,
-            PHONE_NUMBER AS phoneNumber,
-            ID_CARD_NUMBER AS idCardNumber,
-            ENTER_REASON AS enterReason,
-            WORKER_AVATAR AS workerAvatar,
-            CREATE_TIME AS createTime,
-            WORKER_TYPE AS workerType,
-            `STATUS` AS `status`
-        FROM worker_project
-        <where>
-            <if test="ew != null">
-                ${ew.sqlSegment}
-            </if>
-        </where>
-    </select>
-
-    <select id="selectWorkerAvatars" resultType="java.lang.String">
-        SELECT
-            WORKER_AVATAR
-        FROM
-            `br_worker`
-        WHERE
-        ID IN ( SELECT WORKER_ID FROM br_project_worker WHERE PROJECT_ID = #{projectId} )
-          AND WORKER_AVATAR IS NOT NULL
-          AND WORKER_AVATAR != ''
-    </select>
-</mapper>
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IAlarmService.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IAlarmService.java
new file mode 100644
index 0000000..8bc01f4
--- /dev/null
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IAlarmService.java
@@ -0,0 +1,16 @@
+package com.casic.missiles.modular.system.service;
+
+import com.casic.missiles.modular.system.entity.Alarm;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 报警记录表 服务类
+ * </p>
+ *
+ * @author zyj
+ * @since 2023-05-25
+ */
+public interface IAlarmService extends IService<Alarm> {
+
+}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IBusAlarmService.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IBusAlarmService.java
deleted file mode 100644
index f63c19c..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IBusAlarmService.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package com.casic.missiles.modular.system.service;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.modular.system.dto.AlarmTypeCountDTO;
-import com.casic.missiles.modular.system.dto.AlarmUpload;
-import com.casic.missiles.modular.system.entity.BusAlarm;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-import java.util.List;
-
-/**
- * <p>
- * 报警记录表 服务类
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface IBusAlarmService extends IService<BusAlarm> {
-
-    boolean alarmUpload(AlarmUpload alarmUpload);
-
-    Page<BusAlarm> listPage(Page<BusAlarm> page,QueryWrapper<BusAlarm> queryWrapper);
-
-    List<AlarmTypeCountDTO> alarmCount(Long projectId,String alarmStatus);
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IBusEventImageService.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IBusEventImageService.java
deleted file mode 100644
index b1187ed..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IBusEventImageService.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.casic.missiles.modular.system.service;
-
-import com.casic.missiles.modular.system.entity.BusEventImage;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-import java.util.List;
-
-/**
- * <p>
- * 事件图片表 服务类
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface IBusEventImageService extends IService<BusEventImage> {
-
-    boolean saveBusEventImages(Long eventId, List<BusEventImage> imageList);
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IBusEventService.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IBusEventService.java
deleted file mode 100644
index 85c48d0..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IBusEventService.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package com.casic.missiles.modular.system.service;
-
-import com.casic.missiles.modular.system.entity.BusEvent;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-/**
- * <p>
- * 事件表 服务类
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface IBusEventService extends IService<BusEvent> {
-
-    boolean saveBusEvent(BusEvent busEvent);
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IDeviceExtService.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IDeviceExtService.java
deleted file mode 100644
index 6fc5361..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IDeviceExtService.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package com.casic.missiles.modular.system.service;
-
-import com.casic.missiles.modular.system.dto.DeviceDetailDTO;
-import com.casic.missiles.modular.system.entity.DeviceExt;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-import java.util.List;
-
-/**
- * <p>
- * 设备扩展信息表（安全树） 服务类
- * </p>
- *
- * @author zyj
- * @since 2023-04-27
- */
-public interface IDeviceExtService extends IService<DeviceExt> {
-
-    boolean saveDeviceExt(DeviceDetailDTO deviceDetailDTO);
-
-    boolean updateDeviceExt(DeviceDetailDTO deviceDetailDTO);
-
-    boolean removeByDeviceIds(List<Long> deviceIds);
-
-    boolean setGasThreshold(String gasIp,String gasPort,String threshold);
-
-    String getGasThreshold(String gasIp,String gasPort);
-
-    Long selectByGasIpPort(String gasIp,String gasPort);
-
-    Long selectByCameraIpPort(String cameraIp,String cameraPort);
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java
index 9e62756..00a421d 100644
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java
@@ -1,32 +1,16 @@
 package com.casic.missiles.modular.system.service;
 
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.modular.system.dto.DeviceDetailDTO;
-import com.casic.missiles.modular.system.dto.HelmetInfoDTO;
 import com.casic.missiles.modular.system.entity.Device;
 import com.baomidou.mybatisplus.extension.service.IService;
 
-import java.util.List;
-
 /**
  * <p>
- *  服务类
+ * 设备记录表 服务类
  * </p>
  *
  * @author zyj
- * @since 2023-04-14
+ * @since 2023-05-25
  */
 public interface IDeviceService extends IService<Device> {
 
-    boolean saveDevice(DeviceDetailDTO deviceDetailDTO);
-
-    boolean updateDevice(DeviceDetailDTO deviceDetailDTO);
-
-    boolean deleteDevices(List<Long> deviceIds);
-
-    Page<DeviceDetailDTO> listPage(Page<DeviceDetailDTO> page, QueryWrapper<DeviceDetailDTO> queryWrapper, String status,Long projectId);
-
-    List<Long> selectProjectDevice(Long projectId);
-
 }
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IProjectDeviceService.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IProjectDeviceService.java
deleted file mode 100644
index 8599411..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IProjectDeviceService.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package com.casic.missiles.modular.system.service;
-
-import com.casic.missiles.modular.system.dto.DeviceLocationDTO;
-import com.casic.missiles.modular.system.entity.ProjectDevice;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-import java.util.List;
-
-/**
- * <p>
- *  服务类
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface IProjectDeviceService extends IService<ProjectDevice> {
-
-    boolean saveProjectDeviceList(Long projectId, List<ProjectDevice> projectDeviceList);
-
-    boolean updateProjectDeviceList(Long projectId, List<ProjectDevice> projectDeviceList);
-
-    boolean deleteByProjectId(Long projectId);
-
-    boolean deleteByProjectIds(List<Long> projectIds);
-
-    List<ProjectDevice> selectDetailByProjectId(Long projectId);
-
-    Long selectProjectIdByDevice(Long deviceId);
-
-    List<DeviceLocationDTO> selectDeviceLocationList(Long projectId);
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IProjectWorkerService.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IProjectWorkerService.java
deleted file mode 100644
index e921bc3..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IProjectWorkerService.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package com.casic.missiles.modular.system.service;
-
-import com.casic.missiles.modular.system.dto.WorkerLocationDTO;
-import com.casic.missiles.modular.system.entity.ProjectDevice;
-import com.casic.missiles.modular.system.entity.ProjectWorker;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-import java.util.List;
-
-/**
- * <p>
- *  服务类
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface IProjectWorkerService extends IService<ProjectWorker> {
-
-    boolean saveProjectWorkerList(Long projectId, List<ProjectWorker> projectWorkerList);
-
-    boolean updateProjectWorkerList(Long projectId, List<ProjectWorker> projectWorkerList);
-
-    boolean deleteByProjectId(Long projectId);
-
-    boolean deleteByProjectIds(List<Long> projectIds);
-
-    List<ProjectWorker> selectDetailByProjectId(Long projectId,String workerType);
-
-    List<WorkerLocationDTO> selectWorkerLocationDTO(Long projectId);
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IWorkSiteInfoService.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IWorkSiteInfoService.java
deleted file mode 100644
index 58a8590..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IWorkSiteInfoService.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package com.casic.missiles.modular.system.service;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.modular.system.dto.WorkSiteDetailDTO;
-import com.casic.missiles.modular.system.entity.WorkSiteInfo;
-import com.baomidou.mybatisplus.extension.service.IService;
-import java.util.List;
-/**
- * <p>
- * 作业现场表 服务类
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface IWorkSiteInfoService extends IService<WorkSiteInfo> {
-
-    boolean addWorkSiteInfo(WorkSiteDetailDTO workSiteDetailDTO);
-
-    boolean updateWorkSiteInfo(WorkSiteDetailDTO workSiteDetailDTO);
-
-    boolean deleteProjects(List<Long> projectIds);
-
-    WorkSiteDetailDTO getWorkSiteDetail(Long projectId);
-
-    Page<WorkSiteInfo> selectListPage(Page<WorkSiteInfo> page, QueryWrapper<WorkSiteInfo> queryWrapper);
-
-    boolean start(Long projectId);
-
-    boolean finish(Long projectId);
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IWorkerService.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IWorkerService.java
deleted file mode 100644
index 6c6ee98..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IWorkerService.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package com.casic.missiles.modular.system.service;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.modular.system.entity.Worker;
-import com.baomidou.mybatisplus.extension.service.IService;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * <p>
- *  服务类
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface IWorkerService extends IService<Worker> {
-
-    boolean addWorker(Worker worker,Long projectId);
-
-    Page<Worker> selectListPage(Page<Worker> page,QueryWrapper<Worker> ew);
-
-    Worker selectWorkerDetail(Long workerId);
-
-    List<String> faceRegister(String cameraIp,String cameraPort);
-
-    List<Worker> projectTempWorker(Long projectId);
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/impl/AlarmServiceImpl.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/impl/AlarmServiceImpl.java
new file mode 100644
index 0000000..6e5959b
--- /dev/null
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/impl/AlarmServiceImpl.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.modular.system.service.impl;
+
+import com.casic.missiles.modular.system.entity.Alarm;
+import com.casic.missiles.modular.system.mapper.AlarmMapper;
+import com.casic.missiles.modular.system.service.IAlarmService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 报警记录表 服务实现类
+ * </p>
+ *
+ * @author zyj
+ * @since 2023-05-25
+ */
+@Service
+public class AlarmServiceImpl extends ServiceImpl<AlarmMapper, Alarm> implements IAlarmService {
+
+}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/impl/BusAlarmServiceImpl.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/impl/BusAlarmServiceImpl.java
deleted file mode 100644
index b44de1d..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/impl/BusAlarmServiceImpl.java
+++ /dev/null
@@ -1,121 +0,0 @@
-package com.casic.missiles.modular.system.service.impl;
-
-import cn.hutool.core.date.DateUtil;
-import cn.hutool.core.util.ObjectUtil;
-import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.core.application.service.AbstractDictService;
-import com.casic.missiles.modular.system.consts.AlarmTypeEnum;
-import com.casic.missiles.modular.system.dto.AlarmTypeCountDTO;
-import com.casic.missiles.modular.system.dto.AlarmUpload;
-import com.casic.missiles.modular.system.entity.BusAlarm;
-import com.casic.missiles.modular.system.entity.DataTreeLocation;
-import com.casic.missiles.modular.system.mapper.BusAlarmMapper;
-import com.casic.missiles.modular.system.service.*;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.util.Date;
-import java.util.List;
-import java.util.stream.Collectors;
-
-import static com.casic.missiles.modular.system.consts.AlarmConst.ALARM_STATUS_ON;
-
-/**
- * <p>
- * 报警记录表 服务实现类
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@Service
-@RequiredArgsConstructor
-@Slf4j
-public class BusAlarmServiceImpl extends ServiceImpl<BusAlarmMapper, BusAlarm> implements IBusAlarmService {
-
-    private final IDeviceExtService deviceExtService;
-    private final IDeviceService deviceService;
-    private final IProjectDeviceService projectDeviceService;
-
-    private final ICasicFileService fileService;
-
-    private final AbstractDictService dictService;
-    private final IDataSupportService dataSupportService;
-
-    @Override
-    @Transactional
-    public boolean alarmUpload(AlarmUpload alarmUpload) {
-        log.info("alarm upload ==> {}",alarmUpload.toString());
-        Long deviceId = null;
-        if(StrUtil.isAllNotBlank(alarmUpload.getGasIp(),alarmUpload.getGasPort())){
-            deviceId = deviceExtService.selectByGasIpPort(alarmUpload.getGasIp(),alarmUpload.getGasPort());
-        }
-        if(ObjectUtil.isEmpty(deviceId) && StrUtil.isAllNotBlank(alarmUpload.getCameraIp(),alarmUpload.getCameraPort())){
-            deviceId = deviceExtService.selectByCameraIpPort(alarmUpload.getCameraIp(),alarmUpload.getCameraPort());
-        }
-
-        if(ObjectUtil.isEmpty(deviceId)){
-            return false;
-        }
-
-        BusAlarm alarm = new BusAlarm();
-        alarm.setDeviceId(deviceId);
-        alarm.setProjectId(projectDeviceService.selectProjectIdByDevice(deviceId));
-        alarm.setAlarmValue(alarmUpload.getAlarmValue());
-        if(StrUtil.isNotEmpty(alarmUpload.getAlarmTime())){
-            alarm.setAlarmTime(DateUtil.parseDateTime(alarmUpload.getAlarmTime()));
-        }else {
-            alarm.setAlarmTime(new Date());
-        }
-
-        alarm.setAlarmType(alarmUpload.getAlarmType());
-        alarm.setAlarmContent(alarmUpload.getAlarmContent());
-        if(StrUtil.isNotEmpty(alarmUpload.getAlarmImage())){
-            String imgBase64 = "data:image/jpeg;base64," + alarmUpload.getAlarmImage();
-            String imageUrl = fileService.saveFile(imgBase64);
-            alarm.setAlarmImage(imageUrl);
-        }
-        alarm.setAlarmStatus(ALARM_STATUS_ON);
-
-        DataTreeLocation treeLocation = dataSupportService.getTreeLocation(deviceId);
-        if(ObjectUtil.isNotEmpty(treeLocation)){
-            alarm.setAlarmLng(treeLocation.getGdLng());
-            alarm.setAlarmLat(treeLocation.getGdLat());
-        }
-
-        //自动消警
-        AlarmTypeEnum alarmTypeEnum = AlarmTypeEnum.getByAlarmType(alarm.getAlarmType());
-        if(ObjectUtil.isNotEmpty(alarmTypeEnum) && alarmTypeEnum.isAutoCancel()){
-            this.baseMapper.cancelAlarm(deviceId,alarm.getAlarmType());
-        }
-        return this.save(alarm);
-    }
-
-    @Override
-    public Page<BusAlarm> listPage(Page<BusAlarm> page, QueryWrapper<BusAlarm> queryWrapper) {
-        page = this.baseMapper.listPage(page, queryWrapper);
-        for (BusAlarm alarm : page.getRecords()) {
-            alarm.setAlarmTypeName(dictService.getDictNameByCode("alarmType",alarm.getAlarmType()));
-            alarm.setAlarmStatusName(dictService.getDictNameByCode("alarmStatus",alarm.getAlarmStatus()));
-            if(StrUtil.isNotEmpty(alarm.getProjectState())){
-                alarm.setProjectStateName(dictService.getDictNameByCode("projectStatus",alarm.getProjectState()));
-            }
-        }
-        return page;
-    }
-
-    @Override
-    public List<AlarmTypeCountDTO> alarmCount(Long projectId, String alarmStatus) {
-        List<AlarmTypeCountDTO> list = this.baseMapper.alarmCount(projectId, alarmStatus);
-        list = list.stream().filter(i->StrUtil.isNotEmpty(i.getAlarmType())).collect(Collectors.toList());
-        for (AlarmTypeCountDTO countDTO : list) {
-            countDTO.setAlarmTypeName(dictService.getDictNameByCode("alarmType",countDTO.getAlarmType()));
-        }
-        return list;
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/impl/BusEventImageServiceImpl.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/impl/BusEventImageServiceImpl.java
deleted file mode 100644
index a43f7c1..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/impl/BusEventImageServiceImpl.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package com.casic.missiles.modular.system.service.impl;
-
-import com.casic.missiles.modular.system.entity.BusEventImage;
-import com.casic.missiles.modular.system.mapper.BusEventImageMapper;
-import com.casic.missiles.modular.system.service.IBusEventImageService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-/**
- * <p>
- * 事件图片表 服务实现类
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@Service
-public class BusEventImageServiceImpl extends ServiceImpl<BusEventImageMapper, BusEventImage> implements IBusEventImageService {
-
-    @Override
-    public boolean saveBusEventImages(Long eventId, List<BusEventImage> imageList) {
-        imageList.forEach(i->i.setEventId(eventId));
-        return this.saveBatch(imageList);
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/impl/BusEventServiceImpl.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/impl/BusEventServiceImpl.java
deleted file mode 100644
index 21e511c..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/impl/BusEventServiceImpl.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package com.casic.missiles.modular.system.service.impl;
-
-import com.casic.missiles.modular.system.entity.BusEvent;
-import com.casic.missiles.modular.system.mapper.BusEventMapper;
-import com.casic.missiles.modular.system.service.IBusEventImageService;
-import com.casic.missiles.modular.system.service.IBusEventService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import lombok.RequiredArgsConstructor;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.util.Date;
-
-/**
- * <p>
- * 事件表 服务实现类
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@Service
-@RequiredArgsConstructor
-public class BusEventServiceImpl extends ServiceImpl<BusEventMapper, BusEvent> implements IBusEventService {
-
-    private final IBusEventImageService busEventImageService;
-
-
-    @Override
-    @Transactional
-    public boolean saveBusEvent(BusEvent busEvent) {
-        busEvent.setCreateTime(new Date());
-        boolean res = this.save(busEvent);
-        if(res){
-            res = busEventImageService.saveBusEventImages(busEvent.getId(),busEvent.getImageList());
-        }
-        return res;
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceExtServiceImpl.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceExtServiceImpl.java
deleted file mode 100644
index 2bdb63d..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceExtServiceImpl.java
+++ /dev/null
@@ -1,102 +0,0 @@
-package com.casic.missiles.modular.system.service.impl;
-
-import cn.hutool.core.util.ObjectUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
-import com.casic.missiles.modular.system.dto.DeviceDetailDTO;
-import com.casic.missiles.modular.system.entity.DeviceExt;
-import com.casic.missiles.modular.system.mapper.DeviceExtMapper;
-import com.casic.missiles.modular.system.service.IDeviceExtService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-/**
- * <p>
- * 设备扩展信息表（安全树） 服务实现类
- * </p>
- *
- * @author zyj
- * @since 2023-04-27
- */
-@Service
-public class DeviceExtServiceImpl extends ServiceImpl<DeviceExtMapper, DeviceExt> implements IDeviceExtService {
-
-
-    @Override
-    public boolean saveDeviceExt(DeviceDetailDTO deviceDetailDTO) {
-        DeviceExt ext = new DeviceExt();
-        ext.setDeviceId(deviceDetailDTO.getId());
-        ext.setCameraCode(deviceDetailDTO.getCameraCode());
-        ext.setCameraIp(deviceDetailDTO.getCameraIp());
-        ext.setCameraPort(deviceDetailDTO.getCameraPort());
-        ext.setGasCode(deviceDetailDTO.getGasCode());
-        ext.setGasIp(deviceDetailDTO.getGasIp());
-        ext.setGasPort(deviceDetailDTO.getGasPort());
-        ext.setHatLiningCode(deviceDetailDTO.getHatLiningCode());
-        return this.save(ext);
-    }
-
-    @Override
-    public boolean updateDeviceExt(DeviceDetailDTO deviceDetailDTO) {
-        DeviceExt ext = this.selectByDeviceId(deviceDetailDTO.getId());
-        ext.setCameraCode(deviceDetailDTO.getCameraCode());
-        ext.setCameraIp(deviceDetailDTO.getCameraIp());
-        ext.setCameraPort(deviceDetailDTO.getCameraPort());
-        ext.setGasCode(deviceDetailDTO.getGasCode());
-        ext.setGasIp(deviceDetailDTO.getGasIp());
-        ext.setGasPort(deviceDetailDTO.getGasPort());
-        ext.setHatLiningCode(deviceDetailDTO.getHatLiningCode());
-        return this.updateById(ext);
-    }
-
-    @Override
-    public boolean removeByDeviceIds(List<Long> deviceIds) {
-        QueryWrapper<DeviceExt> queryWrapper = new QueryWrapper<>();
-        queryWrapper.in("DEVICE_ID",deviceIds);
-        return this.remove(queryWrapper);
-    }
-
-    @Override
-    public boolean setGasThreshold(String gasIp, String gasPort, String threshold) {
-        UpdateWrapper<DeviceExt> updateWrapper = new UpdateWrapper<>();
-        updateWrapper.set("GAS_THRESHOLD",threshold);
-        updateWrapper.eq("GAS_IP",gasIp);
-        updateWrapper.eq("GAS_PORT",gasPort);
-        return this.update(updateWrapper);
-    }
-
-    @Override
-    public String getGasThreshold(String gasIp, String gasPort) {
-        QueryWrapper<DeviceExt> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("GAS_IP",gasIp);
-        queryWrapper.eq("GAS_PORT",gasPort);
-        DeviceExt deviceExt = this.getOne(queryWrapper);
-        return ObjectUtil.isNotEmpty(deviceExt) ? deviceExt.getGasThreshold() : null;
-    }
-
-    private DeviceExt selectByDeviceId(Long deviceId){
-        QueryWrapper<DeviceExt> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("DEVICE_ID",deviceId);
-        return this.getOne(queryWrapper);
-    }
-
-    @Override
-    public Long selectByGasIpPort(String gasIp, String gasPort) {
-        QueryWrapper<DeviceExt> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("GAS_IP",gasIp);
-        queryWrapper.eq("GAS_PORT",gasPort);
-        DeviceExt deviceExt = this.getOne(queryWrapper);
-        return ObjectUtil.isNotEmpty(deviceExt) ? deviceExt.getDeviceId() : null;
-    }
-
-    @Override
-    public Long selectByCameraIpPort(String cameraIp, String cameraPort) {
-        QueryWrapper<DeviceExt> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("CAMERA_IP",cameraIp);
-        queryWrapper.eq("CAMERA_PORT",cameraPort);
-        DeviceExt deviceExt = this.getOne(queryWrapper);
-        return ObjectUtil.isNotEmpty(deviceExt) ? deviceExt.getDeviceId() : null;
-    }
-}

diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/AlarmController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/AlarmController.java
new file mode 100644
index 0000000..1795cf1
--- /dev/null
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/AlarmController.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.modular.system.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.stereotype.Controller;
+
+/**
+ * <p>
+ * 报警记录表 前端控制器
+ * </p>
+ *
+ * @author zyj
+ * @since 2023-05-25
+ */
+@Controller
+@RequestMapping("/system/alarm")
+public class AlarmController {
+
+}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusAlarmController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusAlarmController.java
deleted file mode 100644
index 1f82ebb..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusAlarmController.java
+++ /dev/null
@@ -1,102 +0,0 @@
-package com.casic.missiles.modular.system.controller;
-
-
-import cn.hutool.core.util.ObjectUtil;
-import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.core.base.controller.BaseController;
-import com.casic.missiles.core.page.PageFactory;
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.AlarmUpload;
-import com.casic.missiles.modular.system.dto.DeviceDetailDTO;
-import com.casic.missiles.modular.system.entity.BusAlarm;
-import com.casic.missiles.modular.system.service.IBusAlarmService;
-import io.swagger.annotations.*;
-import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.*;
-
-import org.springframework.stereotype.Controller;
-
-import static com.casic.missiles.model.response.ResponseData.DEFAULT_SUCCESS_MESSAGE;
-import static com.casic.missiles.modular.system.consts.AlarmConst.ALARM_STATUS_MANUAL_CANCEL;
-
-/**
- * <p>
- * 报警记录表 前端控制器
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@Api(tags = "报警管理接口")
-@Controller
-@RequestMapping("/alarm")
-@RequiredArgsConstructor
-public class BusAlarmController extends BaseController {
-
-    private final IBusAlarmService alarmService;
-
-    @ApiOperation("报警上报接口")
-    @PostMapping("/upload")
-    @ResponseBody
-    public Object upload(@RequestBody AlarmUpload alarmUpload){
-        alarmService.alarmUpload(alarmUpload);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("报警列表分页查询")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "workTitle", value = "作业名称",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "projectId", value = "作业ID",dataType = "Long", paramType = "query",example = "0"),
-            @ApiImplicitParam(name = "alarmStatus", value = "报警状态",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "projectState", value = "作业状态",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "alarmType", value = "报警类型",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "alarmStartTime", value = "报警开始时间",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "alarmEndTime", value = "报警结束时间",dataType = "String", paramType = "query")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = BusAlarm.class),
-    })
-    @GetMapping("/listPage")
-    @ResponseBody
-    public Object listPage(String workTitle,Long projectId,String alarmStatus,String projectState,String alarmType,String alarmStartTime,String alarmEndTime){
-        Page<BusAlarm> page = PageFactory.defaultPage();
-        QueryWrapper<BusAlarm> queryWrapper = new QueryWrapper<>();
-        if(StrUtil.isNotEmpty(workTitle)){
-            queryWrapper.like("p.WORK_TITLE",workTitle);
-        }
-        if(ObjectUtil.isNotEmpty(projectId)){
-            queryWrapper.eq("alarm.PROJECT_ID",projectId);
-        }
-        if(StrUtil.isNotEmpty(alarmStatus)){
-            queryWrapper.eq("alarm.ALARM_STATUS",alarmStatus);
-        }
-        if(StrUtil.isNotEmpty(projectState)){
-            queryWrapper.eq("p.PROJECT_STATE",projectState);
-        }
-        if(StrUtil.isNotEmpty(alarmType)){
-            queryWrapper.eq("alarm.ALARM_TYPE",alarmType);
-        }
-        if(StrUtil.isNotEmpty(alarmStartTime)){
-            queryWrapper.ge("alarm.ALARM_TIME",alarmStartTime);
-        }
-        if(StrUtil.isNotEmpty(alarmEndTime)){
-            queryWrapper.le("alarm.ALARM_TIME",alarmEndTime);
-        }
-        page = alarmService.listPage(page,queryWrapper);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-    @ApiOperation("消警")
-    @PostMapping("/cancel")
-    @ResponseBody
-    public Object cancel(@RequestParam("alarmId") Long alarmId){
-        UpdateWrapper<BusAlarm> updateWrapper = new UpdateWrapper<>();
-        updateWrapper.eq("ID",alarmId);
-        updateWrapper.set("ALARM_STATUS",ALARM_STATUS_MANUAL_CANCEL);
-        alarmService.update(updateWrapper);
-        return ResponseData.success();
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusEventController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusEventController.java
deleted file mode 100644
index dde5aad..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusEventController.java
+++ /dev/null
@@ -1,41 +0,0 @@
-package com.casic.missiles.modular.system.controller;
-
-
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.entity.BusEvent;
-import com.casic.missiles.modular.system.service.IBusEventService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.ResponseBody;
-
-/**
- * <p>
- * 事件表 前端控制器
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@Controller
-@RequestMapping("/event")
-@Api(tags = "事件上报")
-@RequiredArgsConstructor
-public class BusEventController {
-
-    private final IBusEventService eventService;
-
-    @ApiOperation("事件上报")
-    @PostMapping("add")
-    @ResponseBody
-    public Object add(@RequestBody BusEvent busEvent){
-        eventService.saveBusEvent(busEvent);
-        return ResponseData.success();
-    }
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
index 03abc5f..aa50d78 100644
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
@@ -1,121 +1,20 @@
 package com.casic.missiles.modular.system.controller;
 
 
-import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.core.base.controller.BaseController;
-import com.casic.missiles.core.page.PageFactory;
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.DeviceDetailDTO;
-import com.casic.missiles.modular.system.entity.Device;
-import com.casic.missiles.modular.system.service.IDeviceExtService;
-import com.casic.missiles.modular.system.service.IDeviceService;
-import io.swagger.annotations.*;
-import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.RequestMapping;
 
 import org.springframework.stereotype.Controller;
 
-import java.time.LocalDateTime;
-import java.util.Date;
-import java.util.List;
-
-import static com.casic.missiles.model.response.ResponseData.DEFAULT_SUCCESS_MESSAGE;
-
 /**
  * <p>
- *  前端控制器
+ * 设备记录表 前端控制器
  * </p>
  *
  * @author zyj
- * @since 2023-04-14
+ * @since 2023-05-25
  */
-@Api(tags = "设备管理接口")
-@RequiredArgsConstructor
 @Controller
-@RequestMapping("/device")
-public class DeviceController extends BaseController {
-    private final IDeviceService deviceService;
-    private final IDeviceExtService deviceExtService;
-
-    @ApiOperation("设备分页列表")
-    @ApiImplicitParams({
-        @ApiImplicitParam(name = "deviceType", value = "设备类型",dataType = "String", paramType = "query"),
-        @ApiImplicitParam(name = "deviceCode", value = "设备编号",dataType = "String", paramType = "query"),
-        @ApiImplicitParam(name = "status", value = "设备状态",dataType = "String", paramType = "query"),
-        @ApiImplicitParam(name = "projectId", value = "作业ID（如果传此参数，列表中返回该作业使用的设备）",dataType = "Long", paramType = "query", example = "0")
-    })
-    @ApiResponses({
-        @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = DeviceDetailDTO.class),
-    })
-    @GetMapping("listPage")
-    @ResponseBody
-    public Object listPage(String deviceType, String deviceCode, String status,Long projectId){
-        Page<DeviceDetailDTO> page = PageFactory.defaultPage();
-        QueryWrapper<DeviceDetailDTO> queryWrapper = new QueryWrapper<>();
-        if(StrUtil.isNotEmpty(deviceType)){
-            queryWrapper.eq("DEVICE_TYPE",deviceType);
-        }
-        if(StrUtil.isNotEmpty(deviceCode)){
-            queryWrapper.like("DEVICE_CODE",deviceCode);
-        }
-        page = deviceService.listPage(page,queryWrapper,status,projectId);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-    @ApiOperation("新增设备")
-    @PostMapping("add")
-    @ResponseBody
-    public Object add(@RequestBody DeviceDetailDTO deviceDetailDTO){
-        deviceService.saveDevice(deviceDetailDTO);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("编辑设备")
-    @PostMapping("update")
-    @ResponseBody
-    public Object update(@RequestBody DeviceDetailDTO deviceDetailDTO){
-        deviceService.updateDevice(deviceDetailDTO);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("删除设备")
-    @PostMapping("delete")
-    @ResponseBody
-    public Object delete(@ApiParam("设备id列表")@RequestBody List<Long> deviceIds){
-        deviceService.deleteDevices(deviceIds);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("设置甲烷阈值")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "gasIp", value = "安全树甲烷设备IP",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "gasPort", value = "安全树甲烷端口",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "threshold", value = "甲烷阈值",dataType = "String", paramType = "query")
-    })
-    @PostMapping("setThreshold")
-    @ResponseBody
-    public Object setThreshold(String gasIp,String gasPort,String threshold){
-        deviceExtService.setGasThreshold(gasIp, gasPort, threshold);
-        return ResponseData.success();
-    }
-
-
-    @ApiOperation("查询甲烷阈值")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "gasIp", value = "安全树甲烷设备IP",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "gasPort", value = "安全树甲烷端口",dataType = "String", paramType = "query")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = "{\"code\": 200,\"data\": \"100\",\"message\": \"请求成功\",\"success\": true}",response = String.class),
-    })
-    @GetMapping("getThreshold")
-    @ResponseBody
-    public Object getThreshold(String gasIp,String gasPort){
-        String data = deviceExtService.getGasThreshold(gasIp, gasPort);
-        return ResponseData.success(data);
-    }
-
+@RequestMapping("/system/device")
+public class DeviceController {
 
 }
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/OverviewController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/OverviewController.java
deleted file mode 100644
index 7570504..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/OverviewController.java
+++ /dev/null
@@ -1,70 +0,0 @@
-package com.casic.missiles.modular.system.controller;
-
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.AlarmTypeCountDTO;
-import com.casic.missiles.modular.system.dto.DeviceLocationDTO;
-import com.casic.missiles.modular.system.dto.WorkerLocationDTO;
-import com.casic.missiles.modular.system.service.IBusAlarmService;
-import com.casic.missiles.modular.system.service.IProjectDeviceService;
-import com.casic.missiles.modular.system.service.IProjectWorkerService;
-import io.swagger.annotations.*;
-import lombok.RequiredArgsConstructor;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.ResponseBody;
-
-import static com.casic.missiles.model.response.ResponseData.DEFAULT_SUCCESS_MESSAGE;
-import static com.casic.missiles.modular.system.consts.AlarmConst.ALARM_STATUS_ON;
-
-@Api(tags = "首页看板接口")
-@Controller
-@RequestMapping("overview")
-@RequiredArgsConstructor
-public class OverviewController {
-
-    private final IBusAlarmService alarmService;
-    private final IProjectDeviceService projectDeviceService;
-
-    private final IProjectWorkerService projectWorkerService;
-
-
-    @ApiOperation("报警统计接口")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "projectId", value = "作业ID",dataType = "Long", paramType = "query", example = "0")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = AlarmTypeCountDTO.class),
-    })
-    @GetMapping("/alarmCount")
-    @ResponseBody
-    public Object alarmCount(Long projectId){
-        return ResponseData.success(alarmService.alarmCount(projectId,ALARM_STATUS_ON));
-    }
-
-    @ApiOperation("设备列表接口")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "projectId", value = "作业ID",dataType = "Long", paramType = "query", example = "0")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = DeviceLocationDTO.class),
-    })
-    @GetMapping("/deviceList")
-    @ResponseBody
-    public Object deviceList(Long projectId){
-        return ResponseData.success(projectDeviceService.selectDeviceLocationList(projectId));
-    }
-
-    @ApiOperation("人员列表接口")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "projectId", value = "作业ID",dataType = "Long", paramType = "query", example = "0")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = WorkerLocationDTO.class),
-    })
-    @GetMapping("/workerList")
-    @ResponseBody
-    public Object workerList(Long projectId){
-        return ResponseData.success(projectWorkerService.selectWorkerLocationDTO(projectId));
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/WorkSiteInfoController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/WorkSiteInfoController.java
deleted file mode 100644
index af36d69..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/WorkSiteInfoController.java
+++ /dev/null
@@ -1,130 +0,0 @@
-package com.casic.missiles.modular.system.controller;
-
-
-import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.core.base.controller.BaseController;
-import com.casic.missiles.core.page.PageFactory;
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.WorkSiteDetailDTO;
-import com.casic.missiles.modular.system.entity.WorkSiteInfo;
-import com.casic.missiles.modular.system.service.IWorkSiteInfoService;
-import io.swagger.annotations.*;
-import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.*;
-
-import org.springframework.stereotype.Controller;
-
-import java.util.List;
-
-import static com.casic.missiles.model.response.ResponseData.DEFAULT_SUCCESS_MESSAGE;
-
-/**
- * <p>
- * 作业现场表 前端控制器
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@Controller
-@RequestMapping("/site")
-@Api(tags = "作业现场管理")
-@RequiredArgsConstructor
-public class WorkSiteInfoController extends BaseController {
-
-
-    private final IWorkSiteInfoService workSiteInfoService;
-
-    @ApiOperation("新增作业现场")
-    @PostMapping("add")
-    @ResponseBody
-    public Object addWorkSite(@RequestBody WorkSiteDetailDTO workSiteDetailDTO){
-        workSiteInfoService.addWorkSiteInfo(workSiteDetailDTO);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("编辑作业现场")
-    @PostMapping("update")
-    @ResponseBody
-    public Object updateWorkSite(@RequestBody WorkSiteDetailDTO workSiteDetailDTO){
-        workSiteInfoService.updateWorkSiteInfo(workSiteDetailDTO);
-        return ResponseData.success();
-    }
-
-
-    @ApiOperation("删除作业现场")
-    @PostMapping("delete")
-    @ResponseBody
-    public Object delete(@ApiParam("作业现场id列表")@RequestBody List<Long> projectIds){
-        workSiteInfoService.deleteProjects(projectIds);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("查询作业现场详情")
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = WorkSiteDetailDTO.class),
-    })
-    @GetMapping("detail")
-    @ResponseBody
-    public Object delete(@ApiParam(value = "作业现场id", example = "0")@RequestParam Long projectId){
-        WorkSiteDetailDTO detailDTO = workSiteInfoService.getWorkSiteDetail(projectId);
-        return ResponseData.success(detailDTO);
-    }
-
-    @ApiOperation("分页列表查询")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "workTitle",value = "作业名称", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "workRoad",value = "所属道路", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "workPersonName",value = "责任人姓名", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "startDate",value = "注册开始日期", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "endDate",value = "注册结束日期", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "projectState",value = "当前状态（字典值）", dataType = "String", paramType = "query")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = WorkSiteInfo.class),
-    })
-    @GetMapping("listPage")
-    @ResponseBody
-    public Object listPage(String workTitle,String workRoad,String workPersonName,String projectState,String startDate,String endDate){
-        Page<WorkSiteInfo> page = PageFactory.defaultPage();
-        QueryWrapper<WorkSiteInfo> queryWrapper = new QueryWrapper<>();
-        if(StrUtil.isNotEmpty(workTitle)){
-            queryWrapper.like("WORK_TITLE",workTitle);
-        }
-        if(StrUtil.isNotEmpty(workRoad)){
-            queryWrapper.like("WORK_ROAD",workRoad);
-        }
-        if(StrUtil.isNotEmpty(workPersonName)){
-            queryWrapper.like("WORKER_NAME",workPersonName);
-        }
-        if(StrUtil.isNotEmpty(projectState)){
-            queryWrapper.eq("PROJECT_STATE",projectState);
-        }
-        if(StrUtil.isNotEmpty(startDate)){
-            queryWrapper.ge("br_work_site_info.CREATE_TIME",startDate + " 00:00:00");
-        }
-        if(StrUtil.isNotEmpty(endDate)){
-            queryWrapper.le("br_work_site_info.CREATE_TIME",endDate + " 23:59:59");
-        }
-        page = workSiteInfoService.selectListPage(page,queryWrapper);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-    @ApiOperation("开始作业")
-    @PostMapping("start")
-    @ResponseBody
-    public Object start(@ApiParam(value = "作业现场id",example = "0")@RequestParam Long projectId){
-        workSiteInfoService.start(projectId);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("完成作业")
-    @PostMapping("finish")
-    @ResponseBody
-    public Object finish(@ApiParam(value = "作业现场id", example = "0")@RequestParam Long projectId){
-        workSiteInfoService.finish(projectId);
-        return ResponseData.success();
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/WorkerController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/WorkerController.java
deleted file mode 100644
index 796f94c..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/WorkerController.java
+++ /dev/null
@@ -1,136 +0,0 @@
-package com.casic.missiles.modular.system.controller;
-
-
-import cn.hutool.core.util.ObjectUtil;
-import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.core.base.controller.BaseController;
-import com.casic.missiles.core.page.PageFactory;
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.DeviceDetailDTO;
-import com.casic.missiles.modular.system.entity.Device;
-import com.casic.missiles.modular.system.entity.Worker;
-import com.casic.missiles.modular.system.service.IWorkerService;
-import io.swagger.annotations.*;
-import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.*;
-
-import org.springframework.stereotype.Controller;
-
-import java.util.Date;
-import java.util.List;
-
-import static com.casic.missiles.model.response.ResponseData.DEFAULT_SUCCESS_MESSAGE;
-
-/**
- * <p>
- *  前端控制器
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@Controller
-@RequestMapping("/worker")
-@RequiredArgsConstructor
-@Api(tags = "人员管理接口")
-public class WorkerController extends BaseController {
-
-    private final IWorkerService workerService;
-
-    @ApiOperation("分页列表查询")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "name",value = "姓名", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "deptId",value = "所属部门", dataType = "Long", paramType = "query", example = "0"),
-            @ApiImplicitParam(name = "status",value = "当前状态（字典值）", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "startDate",value = "注册开始日期", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "endDate",value = "注册结束日期", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "workerType",value = "人员类型（字典值）", dataType = "String", paramType = "query")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = Worker.class),
-    })
-    @GetMapping("listPage")
-    @ResponseBody
-    public Object listPage(String name,Long deptId, String status,String startDate,String endDate,String workerType){
-        Page<Worker> page = PageFactory.defaultPage();
-        QueryWrapper<Worker> queryWrapper = new QueryWrapper<>();
-        if(StrUtil.isNotEmpty(name)){
-            queryWrapper.like("WORKER_NAME",name);
-        }
-        if(ObjectUtil.isNotEmpty(deptId)){
-            queryWrapper.eq("DEPT_ID",deptId);
-        }
-        if(StrUtil.isNotEmpty(workerType)){
-            queryWrapper.eq("WORKER_TYPE",workerType);
-        }
-        if(StrUtil.isNotEmpty(startDate)){
-            queryWrapper.ge("CREATE_TIME",startDate + " 00:00:00");
-        }
-        if(StrUtil.isNotEmpty(endDate)){
-            queryWrapper.le("CREATE_TIME",endDate + " 23:59:59");
-        }
-        if(StrUtil.isNotEmpty(status)){
-            queryWrapper.eq("`STATUS`",status);
-        }
-        page = workerService.selectListPage(page,queryWrapper);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-    @ApiOperation("新增人员")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "worker", value = "人员信息", dataType = "Worker", paramType = "body", required = true),
-            @ApiImplicitParam(name = "projectId", value = "项目ID(入场申请需要)", dataType = "Long", paramType = "query", example = "0")
-    })
-    @PostMapping("add")
-    @ResponseBody
-    public Object add(@ApiParam("worker")@RequestBody Worker worker,
-                      @RequestParam(required = false) Long projectId){
-        workerService.addWorker(worker,projectId);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("编辑人员")
-    @PostMapping("update")
-    @ResponseBody
-    public Object update(@RequestBody Worker worker){
-        workerService.updateById(worker);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("删除人员")
-    @PostMapping("delete")
-    @ResponseBody
-    public Object delete(@ApiParam("人员id列表")@RequestBody List<Long> workIds){
-        workerService.removeByIds(workIds);
-        return ResponseData.success();
-    }
-
-
-    @ApiOperation(value = "获取人脸图片",notes = "返回人脸图片url")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "cameraIp",value = "摄像头IP", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "cameraPort",value = "摄像头端口号", dataType = "String", paramType = "query"),
-    })
-    @GetMapping("/face/register")
-    @ResponseBody
-    public Object faceRegister(String cameraIp,String cameraPort){
-        return ResponseData.success(workerService.faceRegister(cameraIp, cameraPort));
-    }
-
-
-    @ApiOperation(value = "查询临时入场人员列表")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "projectId", value = "项目ID",required = true,dataType = "Long", paramType = "query", example = "0")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = Worker.class),
-    })
-    @GetMapping("/projectTempWorker")
-    @ResponseBody
-    public Object projectTempWorker(Long projectId){
-        return ResponseData.success(workerService.projectTempWorker(projectId));
-    }
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/AlarmTypeCountDTO.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/AlarmTypeCountDTO.java
deleted file mode 100644
index 1a165a1..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/AlarmTypeCountDTO.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.casic.missiles.modular.system.dto;
-
-import io.swagger.annotations.ApiModel;
-import lombok.Data;
-
-@ApiModel(value = "AlarmTypeCountDTO",description = "报警类型统计（首页）")
-@Data
-public class AlarmTypeCountDTO {
-
-    private String alarmType;
-    private String alarmTypeName;
-    private Integer alarmCount;
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/AlarmUpload.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/AlarmUpload.java
deleted file mode 100644
index 73d7799..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/AlarmUpload.java
+++ /dev/null
@@ -1,46 +0,0 @@
-package com.casic.missiles.modular.system.dto;
-
-import cn.hutool.core.util.StrUtil;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-@ApiModel(value = "AlarmUpload",description = "报警上传")
-@Data
-public class AlarmUpload {
-
-    @ApiModelProperty(value = "摄像头ip")
-    private String cameraIp;
-
-    @ApiModelProperty(value = "摄像头端口")
-    private String cameraPort;
-    @ApiModelProperty(value = "安全树甲烷设备ip")
-    private String gasIp;
-    @ApiModelProperty(value = "安全树甲烷设备端口")
-    private String gasPort;
-    @ApiModelProperty(value = "报警值")
-    private String alarmValue;
-    @ApiModelProperty(value = "报警时间")
-    private String alarmTime;
-    @ApiModelProperty(value = "报警类型")
-    private String alarmType;
-    @ApiModelProperty(value = "报警图片")
-    private String alarmImage;
-    @ApiModelProperty(value = "报警内容")
-    private String alarmContent;
-
-    @Override
-    public String toString() {
-        return "AlarmUpload{" +
-                "cameraIp='" + cameraIp + '\'' +
-                ", cameraPort='" + cameraPort + '\'' +
-                ", gasIp='" + gasIp + '\'' +
-                ", gasPort='" + gasPort + '\'' +
-                ", alarmValue='" + alarmValue + '\'' +
-                ", alarmTime='" + alarmTime + '\'' +
-                ", alarmType='" + alarmType + '\'' +
-                ", alarmImage='" + (StrUtil.isNotEmpty(alarmImage) ? alarmImage.substring(0,50) : "null") + '\'' +
-                ", alarmContent='" + alarmContent + '\'' +
-                '}';
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/DeviceDetailDTO.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/DeviceDetailDTO.java
deleted file mode 100644
index ea518d9..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/DeviceDetailDTO.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package com.casic.missiles.modular.system.dto;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.casic.missiles.modular.system.entity.Device;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-@ApiModel("DeviceDetailDTO")
-@Data
-public class DeviceDetailDTO extends Device {
-
-    @ApiModelProperty(value = "摄像头编号")
-    private String cameraCode;
-
-    @ApiModelProperty(value = "摄像头IP")
-    private String cameraIp;
-
-    @ApiModelProperty(value = "摄像头端口")
-    private String cameraPort;
-
-    @ApiModelProperty(value = "激甲编号")
-    private String gasCode;
-
-    @ApiModelProperty(value = "激甲IP")
-    private String gasIp;
-
-    @ApiModelProperty(value = "激甲端口")
-    private String gasPort;
-
-    @ApiModelProperty(value = "智能帽衬编号")
-    private String hatLiningCode;
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/WorkSiteDetailDTO.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/WorkSiteDetailDTO.java
deleted file mode 100644
index 29378ff..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/WorkSiteDetailDTO.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package com.casic.missiles.modular.system.dto;
-
-import com.casic.missiles.modular.system.entity.ProjectDevice;
-import com.casic.missiles.modular.system.entity.ProjectWorker;
-import com.casic.missiles.modular.system.entity.WorkSiteInfo;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.util.List;
-
-@Data
-@ApiModel("WorkSiteDetailDTO")
-public class WorkSiteDetailDTO extends WorkSiteInfo {
-
-    @ApiModelProperty(value = "安全树列表",dataType = "ProjectDevice")
-    private List<ProjectDevice> deviceList;
-
-    @ApiModelProperty(value = "人员列表",dataType = "ProjectWorker")
-    private List<ProjectWorker> workerList;
-
-
-
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/WorkerLocationDTO.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/WorkerLocationDTO.java
deleted file mode 100644
index 6fd7b24..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/WorkerLocationDTO.java
+++ /dev/null
@@ -1,68 +0,0 @@
-package com.casic.missiles.modular.system.dto;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-@ApiModel(value = "WorkerLocationDTO",description = "人员位置列表（首页）")
-@Data
-public class WorkerLocationDTO {
-
-    @ApiModelProperty("人员ID")
-    private Long workerId;
-
-    @ApiModelProperty("人员姓名")
-    private String workerName;
-
-    @ApiModelProperty("安全帽编号")
-    private String hatCode;
-
-    @ApiModelProperty("安全帽ID")
-    private Long hatId;
-
-    @ApiModelProperty("背心编号")
-    private String vastCode;
-
-    @ApiModelProperty("手环编号")
-    private String braceletCode;
-
-    @ApiModelProperty("位置")
-    private String location;
-
-    @ApiModelProperty("时间")
-    private String time;
-
-    @ApiModelProperty("经度")
-    private String lng;
-
-    @ApiModelProperty("纬度")
-    private String lat;
-
-    @ApiModelProperty("心率")
-    private String heartRate;
-
-    @ApiModelProperty("血氧")
-    private String bloodOxygen;
-
-    @ApiModelProperty("一氧化碳")
-    private String co;
-
-    @ApiModelProperty("甲烷")
-    private String gas;
-
-    @ApiModelProperty("硫化氢")
-    private String h2s;
-
-    @ApiModelProperty("氧气")
-    private String o2;
-
-    @ApiModelProperty("信号")
-    private String signal;
-
-    @ApiModelProperty("电量")
-    private String cell;
-
-    @ApiModelProperty("是否报警")
-    private boolean alarmFlag;
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Alarm.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Alarm.java
new file mode 100644
index 0000000..4d2b7ef
--- /dev/null
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Alarm.java
@@ -0,0 +1,103 @@
+package com.casic.missiles.modular.system.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import java.util.Date;
+
+/**
+ * <p>
+ * 报警记录表
+ * </p>
+ *
+ * @author zyj
+ * @since 2023-05-25
+ */
+@Data
+@TableName("bus_alarm")
+public class Alarm implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    @TableId(value = "ID",type = IdType.ASSIGN_ID)
+    private Long id;
+
+    /**
+     * 设备ID
+     */
+    @TableField("DEVICE_ID")
+    private Long deviceId;
+
+    /**
+     * 报警类型
+     */
+    @TableField("ALARM_TYPE")
+    private String alarmType;
+
+    /**
+     * 报警时间
+     */
+    @TableField("ALARM_TIME")
+    private Date alarmTime;
+
+    /**
+     * 报警状态
+     */
+    @TableField("ALARM_STATUS")
+    private String alarmStatus;
+
+    /**
+     * 报警位置
+     */
+    @TableField("ALARM_LOCATION")
+    private String alarmLocation;
+
+    /**
+     * 报警图片
+     */
+    @TableField("ALARM_IMAGE")
+    private String alarmImage;
+
+    /**
+     * 视频通道号
+     */
+    @TableField("CHANNEL_NO")
+    private Integer channelNo;
+
+    /**
+     * 报警内容
+     */
+    @TableField("ALARM_CONTENT")
+    private String alarmContent;
+
+    /**
+     * 消警时间
+     */
+    @TableField("CANCEL_TIME")
+    private Date cancelTime;
+
+
+    @Override
+    public String toString() {
+        return "Alarm{" +
+            "id=" + id +
+            ", deviceId=" + deviceId +
+            ", alarmType=" + alarmType +
+            ", alarmTime=" + alarmTime +
+            ", alarmStatus=" + alarmStatus +
+            ", alarmLocation=" + alarmLocation +
+            ", alarmImage=" + alarmImage +
+            ", channelNo=" + channelNo +
+            ", alarmContent=" + alarmContent +
+            ", cancelTime=" + cancelTime +
+        "}";
+    }
+}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusAlarm.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusAlarm.java
deleted file mode 100644
index efb4a23..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusAlarm.java
+++ /dev/null
@@ -1,159 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.alibaba.fastjson.annotation.JSONField;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.time.LocalDateTime;
-import java.util.Date;
-
-/**
- * <p>
- * 报警记录表
- * </p>
- *
- * @author zyj
- * @since 2023-05-16
- */
-@Data
-@ApiModel("Alarm")
-@TableName("br_bus_alarm")
-public class BusAlarm implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 项目ID
-     */
-    @ApiModelProperty(value = "项目ID")
-    @TableField("PROJECT_ID")
-    private Long projectId;
-
-    /**
-     * 设备ID
-     */
-    @ApiModelProperty(value = "设备ID")
-    @TableField("DEVICE_ID")
-    private Long deviceId;
-
-    /**
-     * 报警类型
-     */
-    @ApiModelProperty(value = "报警类型")
-    @TableField("ALARM_TYPE")
-    private String alarmType;
-
-    /**
-     * 报警状态
-     */
-    @ApiModelProperty(value = "报警状态")
-    @TableField("ALARM_STATUS")
-    private String alarmStatus;
-
-    /**
-     * 报警值
-     */
-    @ApiModelProperty(value = "报警值")
-    @TableField("ALARM_VALUE")
-    private String alarmValue;
-
-    /**
-     * 报警图片
-     */
-    @ApiModelProperty(value = "报警图片")
-    @TableField("ALARM_IMAGE")
-    private String alarmImage;
-
-    /**
-     * 报警内容
-     */
-    @ApiModelProperty(value = "报警内容")
-    @TableField("ALARM_CONTENT")
-    private String alarmContent;
-
-    /**
-     * 报警时间
-     */
-    @ApiModelProperty(value = "报警时间")
-    @TableField("ALARM_TIME")
-    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
-    private Date alarmTime;
-
-    /**
-     * 消警时间
-     */
-    @ApiModelProperty(value = "消警时间")
-    @TableField("CANCEL_TIME")
-    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
-    private Date cancelTime;
-
-    /**
-     * 报警位置经度
-     */
-    @ApiModelProperty(value = "报警位置经度")
-    @TableField("ALARM_LNG")
-    private String alarmLng;
-
-    /**
-     * 报警位置纬度
-     */
-    @ApiModelProperty(value = "报警位置纬度")
-    @TableField("ALARM_LAT")
-    private String alarmLat;
-
-    @ApiModelProperty("报警类型名称")
-    @TableField(exist = false)
-    private String alarmStatusName;
-    @ApiModelProperty("报警类型名称")
-    @TableField(exist = false)
-    private String alarmTypeName;
-    @ApiModelProperty("作业名称")
-    @TableField(exist = false)
-    private String workTitle;
-    @ApiModelProperty("所属道路")
-    @TableField(exist = false)
-    private String workRoad;
-    @ApiModelProperty("作业状态")
-    @TableField(exist = false)
-    private String projectState;
-    @ApiModelProperty("作业状态名称")
-    @TableField(exist = false)
-    private String projectStateName;
-    @ApiModelProperty("负责人姓名")
-    @TableField(exist = false)
-    private String workPersonName;
-    @ApiModelProperty("负责人联系方式")
-    @TableField(exist = false)
-    private String workPersonPhoneNumber;
-
-
-    @Override
-    public String toString() {
-        return "BusAlarm{" +
-                "id=" + id +
-                ", projectId=" + projectId +
-                ", deviceId=" + deviceId +
-                ", alarmType=" + alarmType +
-                ", alarmValue=" + alarmValue +
-                ", alarmStatus=" + alarmStatus +
-                ", alarmImage=" + alarmImage +
-                ", alarmContent=" + alarmContent +
-                ", alarmTime=" + alarmTime +
-                ", cancelTime=" + cancelTime +
-                ", alarmLng=" + alarmLng +
-                ", alarmLat=" + alarmLat +
-                "}";
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusEvent.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusEvent.java
deleted file mode 100644
index a0b7543..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusEvent.java
+++ /dev/null
@@ -1,100 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.time.LocalDateTime;
-import java.util.Date;
-import java.util.List;
-
-/**
- * <p>
- * 事件表
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@TableName("br_bus_event")
-@Data
-@ApiModel("BusEvent")
-public class BusEvent implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @ApiModelProperty("事件ID")
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 事件标题
-     */
-    @ApiModelProperty("事件名称")
-    @TableField("EVENT_TITLE")
-    private String eventTitle;
-
-    /**
-     * 上报人员
-     */
-    @ApiModelProperty("上报人员")
-    @TableField("UPLOAD_NAME")
-    private String uploadName;
-
-    /**
-     * 联系方式
-     */
-    @ApiModelProperty("联系方式")
-    @TableField("PHONE_NUMBER")
-    private String phoneNumber;
-
-    /**
-     * 事件描述
-     */
-    @ApiModelProperty("事件描述")
-    @TableField("EVENT_DESCRIPTION")
-    private String eventDescription;
-
-    @ApiModelProperty("经度")
-    @TableField("LNG")
-    private String lng;
-
-    @ApiModelProperty("纬度")
-    @TableField("LAT")
-    private String lat;
-
-    /**
-     * 事件上传时间
-     */
-    @ApiModelProperty("事件上传时间")
-    @TableField("CREATE_TIME")
-    private Date createTime;
-
-    @ApiModelProperty("事件照片")
-    @TableField(exist = false)
-    private List<BusEventImage> imageList;
-
-
-
-    @Override
-    public String toString() {
-        return "BusEvent{" +
-            "id=" + id +
-            ", eventTitle=" + eventTitle +
-            ", uploadName=" + uploadName +
-            ", phoneNumber=" + phoneNumber +
-            ", eventDescription=" + eventDescription +
-            ", lng=" + lng +
-            ", lat=" + lat +
-            ", createTime=" + createTime +
-        "}";
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusEventImage.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusEventImage.java
deleted file mode 100644
index 1e75245..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusEventImage.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-
-/**
- * <p>
- * 事件图片表
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@TableName("br_bus_event_image")
-@Data
-@ApiModel("BusEventImage")
-public class BusEventImage implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 事件ID
-     */
-    @TableField("EVENT_ID")
-    private Long eventId;
-
-    /**
-     * 报警图片
-     */
-    @TableField("IMAGE")
-    @ApiModelProperty("图片url")
-    private String image;
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Device.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Device.java
index df89c70..ea7db5f 100644
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Device.java
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Device.java
@@ -1,30 +1,23 @@
 package com.casic.missiles.modular.system.entity;
 
-import com.alibaba.fastjson.annotation.JSONField;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.casic.missiles.core.base.json.DateDeserializer;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
-import java.util.Date;
 
 /**
  * <p>
- * 
+ * 设备记录表
  * </p>
  *
  * @author zyj
- * @since 2023-04-14
+ * @since 2023-05-25
  */
-@ApiModel("Device")
-@TableName("br_device")
 @Data
+@TableName("bus_device")
 public class Device implements Serializable {
 
     private static final long serialVersionUID = 1L;
@@ -32,82 +25,86 @@
     /**
      * 主键
      */
-    @ApiModelProperty(value = "设备ID")
     @TableId(value = "ID",type = IdType.ASSIGN_ID)
     private Long id;
 
     /**
-     * 设备编号
+     * 设备名称
      */
-    @ApiModelProperty(value = "设备编号")
-    @TableField("DEVICE_CODE")
-    private String deviceCode;
+    @TableField("DEVICE_NAME")
+    private String deviceName;
 
     /**
-     * 设备类型
+     * IP
      */
-    @ApiModelProperty(value = "设备类型")
-    @TableField("DEVICE_TYPE")
-    private String deviceType;
+    @TableField("IP")
+    private String ip;
 
     /**
-     * 设备批次
+     * 端口
      */
-    @ApiModelProperty(value = "设备批次")
-    @TableField("DEVICE_BATCH")
-    private String deviceBatch;
+    @TableField("PORT")
+    private String port;
 
     /**
-     * 厂家
+     * 用户名
      */
-    @ApiModelProperty(value = "厂家")
-    @TableField("MANUFACTURER")
-    private String manufacturer;
+    @TableField("USER_NAME")
+    private String userName;
 
     /**
-     * 是否供电
+     * 密码
      */
-    @ApiModelProperty(value = "是否供电")
-    @TableField("IS_POWER_SUPPLY")
-    private String isPowerSupply;
+    @TableField("PASSWORD")
+    private String password;
 
     /**
-     * 创建时间
+     * 连接类型
      */
-    @ApiModelProperty(value = "创建时间",dataType = "Date")
-    @TableField("CREATE_TIME")
-    private Date createTime;
+    @TableField("CONNECT_TYPE")
+    private String connectType;
 
-    @ApiModelProperty(value = "设备类型名称")
-    @TableField(exist = false)
-    private String deviceTypeName;
+    /**
+     * 位置
+     */
+    @TableField("LOCATION")
 
-    @ApiModelProperty(value = "是否供电名称")
-    @TableField(exist = false)
-    private String isPowerSupplyName;
+    private String location;
 
-    @ApiModelProperty(value = "注册时间",dataType = "String")
-    @TableField(exist = false)
-    private String registerTime;
+    /**
+     * 设备状态
+     */
+    @TableField("STATUS")
 
-    @ApiModelProperty(value = "当前状态")
-    @TableField(exist = false)
     private String status;
 
-    @ApiModelProperty(value = "当前状态名称")
-    @TableField(exist = false)
-    private String statusName;
+    /**
+     * 报警分组
+     */
+    @TableField("ALARM_GROUP")
+
+    private Long alarmGroup;
+
+    /**
+     * 视频通道数(预留)
+     */
+    @TableField("CHANNEL_NUM")
+    private Integer channelNum;
 
     @Override
     public String toString() {
         return "Device{" +
             "id=" + id +
-            ", deviceCode=" + deviceCode +
-            ", deviceType=" + deviceType +
-            ", deviceBatch=" + deviceBatch +
-            ", manufacturer=" + manufacturer +
-            ", isPowerSupply=" + isPowerSupply +
-            ", createTime=" + createTime +
+            ", deviceName=" + deviceName +
+            ", ip=" + ip +
+            ", port=" + port +
+            ", userName=" + userName +
+            ", password=" + password +
+            ", connectType=" + connectType +
+            ", location=" + location +
+            ", status=" + status +
+            ", alarmGroup=" + alarmGroup +
+            ", channelNum=" + channelNum +
         "}";
     }
 }
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/DeviceExt.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/DeviceExt.java
deleted file mode 100644
index 5ee7015..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/DeviceExt.java
+++ /dev/null
@@ -1,99 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-
-/**
- * <p>
- * 设备扩展信息表（安全树）
- * </p>
- *
- * @author zyj
- * @since 2023-04-27
- */
-@Data
-@TableName("br_device_ext")
-public class DeviceExt implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 设备ID
-     */
-    @TableField("DEVICE_ID")
-    private Long deviceId;
-
-    /**
-     * 摄像头编号
-     */
-    @TableField("CAMERA_CODE")
-    private String cameraCode;
-
-    /**
-     * 摄像头IP
-     */
-    @TableField("CAMERA_IP")
-    private String cameraIp;
-
-    /**
-     * 摄像头端口
-     */
-    @TableField("CAMERA_PORT")
-    private String cameraPort;
-
-    /**
-     * 激甲编号
-     */
-    @TableField("GAS_CODE")
-    private String gasCode;
-
-    /**
-     * 激甲IP
-     */
-    @TableField("GAS_IP")
-    private String gasIp;
-
-    /**
-     * 激甲端口
-     */
-    @TableField("GAS_PORT")
-    private String gasPort;
-
-    /**
-     * 甲烷报警阈值
-     */
-    @TableField("GAS_THRESHOLD")
-    private String gasThreshold;
-
-    @TableField(value = "HAT_LINING_CODE")
-    private String hatLiningCode;
-
-
-    @Override
-    public String toString() {
-        return "DeviceExt{" +
-            "id=" + id +
-            ", deviceId=" + deviceId +
-            ", cameraCode=" + cameraCode +
-            ", cameraIp=" + cameraIp +
-            ", cameraPort=" + cameraPort +
-            ", gasCode=" + gasCode +
-            ", gasIp=" + gasIp +
-            ", gasPort=" + gasPort +
-            ", gasThreshold=" + gasThreshold +
-            ", hatLiningCode=" + hatLiningCode +
-        "}";
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/ProjectDevice.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/ProjectDevice.java
deleted file mode 100644
index c4f3472..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/ProjectDevice.java
+++ /dev/null
@@ -1,62 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-
-/**
- * <p>
- * 
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@Data
-@ApiModel("ProjectDevice")
-@TableName("br_project_device")
-public class ProjectDevice implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 作业现场ID
-     */
-    @TableField("PROJECT_ID")
-    private Long projectId;
-
-    /**
-     * 设备ID
-     */
-    @TableField("DEVICE_ID")
-    @ApiModelProperty("设备ID（新增编辑时传）")
-    private Long deviceId;
-
-    /**
-     * 设备编号
-     */
-    @TableField(exist = false)
-    @ApiModelProperty("设备编号（详情中展示，新增编辑不用传）")
-    private String deviceCode;
-
-    @Override
-    public String toString() {
-        return "ProjectDevice{" +
-            "id=" + id +
-            ", projectId=" + projectId +
-            ", deviceId=" + deviceId +
-        "}";
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/ProjectWorker.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/ProjectWorker.java
deleted file mode 100644
index 10b23c4..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/ProjectWorker.java
+++ /dev/null
@@ -1,104 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import java.io.Serializable;
-
-/**
- * <p>
- * 
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@ApiModel("ProjectWorker")
-@TableName("br_project_worker")
-@Data
-@NoArgsConstructor
-@AllArgsConstructor
-public class ProjectWorker implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 作业现场ID
-     */
-    @TableField("PROJECT_ID")
-    private Long projectId;
-
-    /**
-     * 人员ID
-     */
-    @ApiModelProperty("人员ID")
-    @TableField("WORKER_ID")
-    private Long workerId;
-
-    /**
-     * 安全帽编号
-     */
-    @ApiModelProperty("安全帽编号")
-    @TableField("HAT_CODE")
-    private String hatCode;
-
-    /**
-     * 背心编号
-     */
-    @ApiModelProperty("背心编号")
-    @TableField("VAST_CODE")
-    private String vastCode;
-
-    /**
-     * 手环编号
-     */
-    @ApiModelProperty("手环编号")
-    @TableField("BRACELET_CODE")
-    private String braceletCode;
-
-    @ApiModelProperty("人员姓名（详情中展示，新增编辑不用传）")
-    @TableField(exist = false)
-    private String workerName;
-
-    @ApiModelProperty("人员部门ID（详情中展示，新增编辑不用传）")
-    @TableField(exist = false)
-    private String workerDeptId;
-
-    @ApiModelProperty("人员部门名称（详情中展示，新增编辑不用传）")
-    @TableField(exist = false)
-    private String workerDeptName;
-
-    @ApiModelProperty("人员联系方式（详情中展示，新增编辑不用传）")
-    @TableField(exist = false)
-    private String workerPhoneNumber;
-
-    public ProjectWorker(Long projectId, Long workerId) {
-        this.projectId = projectId;
-        this.workerId = workerId;
-    }
-
-    @Override
-    public String toString() {
-        return "ProjectWorker{" +
-            "id=" + id +
-            ", projectId=" + projectId +
-            ", workerId=" + workerId +
-            ", hatCode=" + hatCode +
-            ", vastCode=" + vastCode +
-            ", braceletCode=" + braceletCode +
-        "}";
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/WorkSiteInfo.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/WorkSiteInfo.java
deleted file mode 100644
index fa6f41d..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/WorkSiteInfo.java
+++ /dev/null
@@ -1,130 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.alibaba.fastjson.annotation.JSONField;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.time.LocalDateTime;
-import java.util.Date;
-
-/**
- * <p>
- * 作业现场表
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@ApiModel("WorkSiteInfo")
-@TableName("br_work_site_info")
-@Data
-public class WorkSiteInfo implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @ApiModelProperty("作业现场ID")
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 作业名称
-     */
-    @ApiModelProperty("作业名称")
-    @TableField("WORK_TITLE")
-    private String workTitle;
-
-    /**
-     * 责任人
-     */
-    @ApiModelProperty("责任人（人员ID）")
-    @TableField("WORK_PERSON")
-    private Long workPerson;
-
-    /**
-     * 作业描述
-     */
-    @ApiModelProperty("作业描述")
-    @TableField("WORK_SITE_DESC")
-    private String workSiteDesc;
-
-    /**
-     * 作业状态
-     */
-    @ApiModelProperty("作业状态")
-    @TableField("PROJECT_STATE")
-    private String projectState;
-
-    /**
-     * 所属道路
-     */
-    @ApiModelProperty("所属道路")
-    @TableField("WORK_ROAD")
-    private String workRoad;
-
-    @TableField("IMAGE_URL")
-    private String imageUrl;
-
-    @TableField("CREATE_TIME")
-    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
-    private Date createTime;
-    @TableField("UPDATE_TIME")
-    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
-    private Date updateTime;
-
-    @ApiModelProperty("开始时间")
-    @TableField("START_TIME")
-    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
-    private Date startTime;
-
-    @ApiModelProperty("结束时间")
-    @TableField("FINISH_TIME")
-    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
-    private Date finishTime;
-
-    @ApiModelProperty("负责人姓名（详情中使用，新增编辑不用传）")
-    @TableField(exist = false)
-    private String workPersonName;
-
-    @ApiModelProperty("负责人联系方式（详情中使用，新增编辑不用传）")
-    @TableField(exist = false)
-    private String workPersonPhoneNumber;
-
-    @ApiModelProperty("负责人所属部门ID（详情中使用，新增编辑不用传）")
-    @TableField(exist = false)
-    private Long workPersonDeptId;
-
-    @ApiModelProperty("负责人所属部门名称（详情中使用，新增编辑不用传）")
-    @TableField(exist = false)
-    private String workPersonDeptName;
-
-    @ApiModelProperty(value = "注册时间",dataType = "String")
-    @TableField(exist = false)
-    private String registerTime;
-
-    @ApiModelProperty("作业状态名称")
-    @TableField(exist = false)
-    private String projectStateName;
-
-    @Override
-    public String toString() {
-        return "WorkSiteInfo{" +
-            "id=" + id +
-            ", workTitle=" + workTitle +
-            ", workPerson=" + workPerson +
-            ", workSiteDesc=" + workSiteDesc +
-            ", projectState=" + projectState +
-            ", imageUrl=" + imageUrl +
-            ", updateTime=" + updateTime +
-            ", workRoad=" + workRoad +
-        "}";
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Worker.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Worker.java
deleted file mode 100644
index 28a4daa..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Worker.java
+++ /dev/null
@@ -1,147 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.time.LocalDateTime;
-import java.util.Date;
-
-/**
- * <p>
- * 
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@ApiModel("Worker")
-@TableName("br_worker")
-@Data
-public class Worker implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @ApiModelProperty(value = "人员ID")
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 姓名
-     */
-    @ApiModelProperty(value = "姓名")
-    @TableField("WORKER_NAME")
-    private String workerName;
-
-    /**
-     * 性别
-     */
-    @ApiModelProperty(value = "性别")
-    @TableField("GENDER")
-    private String gender;
-
-    /**
-     * 所属部门
-     */
-    @ApiModelProperty(value = "所属部门(人员管理)")
-    @TableField("DEPT_ID")
-    private Long deptId;
-
-    /**
-     * 所属单位
-     */
-    @ApiModelProperty(value = "所属单位(入场申请中使用)")
-    @TableField("OWNER_SHIP")
-    private String ownerShip;
-
-    /**
-     * 联系方式
-     */
-    @ApiModelProperty(value = "联系方式")
-    @TableField("PHONE_NUMBER")
-    private String phoneNumber;
-
-    /**
-     * 证件号
-     */
-    @ApiModelProperty(value = "证件号")
-    @TableField("ID_CARD_NUMBER")
-    private String idCardNumber;
-
-    /**
-     * 入场原因
-     */
-    @ApiModelProperty(value = "入场原因（入场申请中使用）")
-    @TableField("ENTER_REASON")
-    private String enterReason;
-
-    /**
-     * 入场人脸照片
-     */
-    @ApiModelProperty(value = "人脸照片（照片路径）")
-    @TableField("WORKER_AVATAR")
-    private String workerAvatar;
-
-    /**
-     * 申请入场时间
-     */
-    @ApiModelProperty(value = "注册时间/申请入场时间")
-    @TableField("CREATE_TIME")
-    private Date createTime;
-
-    /**
-     * 人员类型
-     */
-    @ApiModelProperty(value = "人员类型（区分人员管理和入场申请）")
-    @TableField("WORKER_TYPE")
-    private String workerType;
-
-    @ApiModelProperty(value = "性别名称")
-    @TableField(exist = false)
-    private String genderName;
-
-    @ApiModelProperty(value = "部门名称")
-    @TableField(exist = false)
-    private String deptName;
-
-    @ApiModelProperty(value = "注册时间",dataType = "String")
-    @TableField(exist = false)
-    private String registerTime;
-
-    @ApiModelProperty(value = "当前状态")
-    @TableField(exist = false)
-    private String status;
-
-    @ApiModelProperty(value = "当前状态名称")
-    @TableField(exist = false)
-    private String statusName;
-
-    @ApiModelProperty(value = "是否注册(0未注册；1已注册)",allowableValues = "0,1")
-    @TableField(exist = false)
-    private String isRegister;
-
-    @Override
-    public String toString() {
-        return "Worker{" +
-            "id=" + id +
-            ", workerName=" + workerName +
-            ", gender=" + gender +
-            ", deptId=" + deptId +
-            ", ownerShip=" + ownerShip +
-            ", phoneNumber=" + phoneNumber +
-            ", idCardNumber=" + idCardNumber +
-            ", enterReason=" + enterReason +
-            ", workerAvatar=" + workerAvatar +
-            ", createTime=" + createTime +
-            ", workerType=" + workerType +
-        "}";
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/AlarmMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/AlarmMapper.java
new file mode 100644
index 0000000..ea4c8be
--- /dev/null
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/AlarmMapper.java
@@ -0,0 +1,16 @@
+package com.casic.missiles.modular.system.mapper;
+
+import com.casic.missiles.modular.system.entity.Alarm;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 报警记录表 Mapper 接口
+ * </p>
+ *
+ * @author zyj
+ * @since 2023-05-25
+ */
+public interface AlarmMapper extends BaseMapper<Alarm> {
+
+}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/BusAlarmMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/BusAlarmMapper.java
deleted file mode 100644
index 9801742..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/BusAlarmMapper.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package com.casic.missiles.modular.system.mapper;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.modular.system.dto.AlarmTypeCountDTO;
-import com.casic.missiles.modular.system.entity.BusAlarm;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * <p>
- * 报警记录表 Mapper 接口
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface BusAlarmMapper extends BaseMapper<BusAlarm> {
-
-    Page<BusAlarm> listPage(Page<BusAlarm> page,@Param("ew")  QueryWrapper<BusAlarm> queryWrapper);
-
-    void cancelAlarm(@Param("deviceId")Long deviceId,@Param("alarmType") String alarmType);
-
-    List<AlarmTypeCountDTO> alarmCount(@Param("projectId")Long projectId, @Param("alarmStatus")String alarmStatus);
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/BusEventImageMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/BusEventImageMapper.java
deleted file mode 100644
index 9590b7d..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/BusEventImageMapper.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.casic.missiles.modular.system.mapper;
-
-import com.casic.missiles.modular.system.entity.BusEventImage;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * <p>
- * 事件图片表 Mapper 接口
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface BusEventImageMapper extends BaseMapper<BusEventImage> {
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/BusEventMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/BusEventMapper.java
deleted file mode 100644
index 3c85edf..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/BusEventMapper.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.casic.missiles.modular.system.mapper;
-
-import com.casic.missiles.modular.system.entity.BusEvent;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * <p>
- * 事件表 Mapper 接口
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface BusEventMapper extends BaseMapper<BusEvent> {
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/DeviceExtMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/DeviceExtMapper.java
deleted file mode 100644
index 4ca9212..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/DeviceExtMapper.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.casic.missiles.modular.system.mapper;
-
-import com.casic.missiles.modular.system.entity.DeviceExt;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * <p>
- * 设备扩展信息表（安全树） Mapper 接口
- * </p>
- *
- * @author zyj
- * @since 2023-04-27
- */
-public interface DeviceExtMapper extends BaseMapper<DeviceExt> {
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/DeviceMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/DeviceMapper.java
index 444c0c5..3d0bb02 100644
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/DeviceMapper.java
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/DeviceMapper.java
@@ -1,30 +1,16 @@
 package com.casic.missiles.modular.system.mapper;
 
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.modular.system.dto.DeviceDetailDTO;
-import com.casic.missiles.modular.system.dto.HelmetInfoDTO;
 import com.casic.missiles.modular.system.entity.Device;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
 
 /**
  * <p>
- *  Mapper 接口
+ * 设备记录表 Mapper 接口
  * </p>
  *
  * @author zyj
- * @since 2023-04-14
+ * @since 2023-05-25
  */
-@Mapper
 public interface DeviceMapper extends BaseMapper<Device> {
 
-    Page<DeviceDetailDTO> listDetailPage(Page<DeviceDetailDTO> page,@Param("ew") QueryWrapper<DeviceDetailDTO> ew);
-
-     List<Long> selectProjectDevice(@Param("projectId") Long projectId);
-
-    List<HelmetInfoDTO> selectHelmetList(@Param("deviceType")String deviceType);
 }
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/ProjectDeviceMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/ProjectDeviceMapper.java
deleted file mode 100644
index 1d0c14e..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/ProjectDeviceMapper.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package com.casic.missiles.modular.system.mapper;
-
-import com.casic.missiles.modular.system.dto.DeviceLocationDTO;
-import com.casic.missiles.modular.system.entity.ProjectDevice;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * <p>
- *  Mapper 接口
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface ProjectDeviceMapper extends BaseMapper<ProjectDevice> {
-     List<ProjectDevice> selectDetailByProjectId(@Param("projectId") Long projectId);
-
-     List<DeviceLocationDTO> selectDeviceLocationList(@Param("projectId") Long projectId);
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/ProjectWorkerMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/ProjectWorkerMapper.java
deleted file mode 100644
index 58583d1..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/ProjectWorkerMapper.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package com.casic.missiles.modular.system.mapper;
-
-import com.casic.missiles.modular.system.dto.WorkerLocationDTO;
-import com.casic.missiles.modular.system.entity.ProjectWorker;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * <p>
- *  Mapper 接口
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface ProjectWorkerMapper extends BaseMapper<ProjectWorker> {
-
-    List<ProjectWorker> selectDetailByProjectId(@Param("projectId") Long projectId,
-                                                @Param("workerType")String workerType);
-
-    List<WorkerLocationDTO> selectWorkerLocationList(@Param("projectId") Long projectId,
-                                                     @Param("workerType")String workerType);
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/WorkSiteInfoMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/WorkSiteInfoMapper.java
deleted file mode 100644
index a4934d2..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/WorkSiteInfoMapper.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.casic.missiles.modular.system.mapper;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.modular.system.entity.WorkSiteInfo;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Param;
-
-/**
- * <p>
- * 作业现场表 Mapper 接口
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface WorkSiteInfoMapper extends BaseMapper<WorkSiteInfo> {
-
-    Page<WorkSiteInfo> selectListPage(Page<WorkSiteInfo> page,@Param("ew") QueryWrapper<WorkSiteInfo> ew);
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/WorkerMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/WorkerMapper.java
deleted file mode 100644
index 258fb12..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/WorkerMapper.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package com.casic.missiles.modular.system.mapper;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.modular.system.dto.DeviceDetailDTO;
-import com.casic.missiles.modular.system.entity.Worker;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * <p>
- *  Mapper 接口
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface WorkerMapper extends BaseMapper<Worker> {
-
-
-    Page<Worker> selectListPage(Page<Worker> page, @Param("ew") QueryWrapper<Worker> ew);
-
-    List<String> selectWorkerAvatars(@Param("projectId")Long projectId);
-
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/AlarmMapper.xml b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/AlarmMapper.xml
new file mode 100644
index 0000000..25cb4ab
--- /dev/null
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/AlarmMapper.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.modular.system.mapper.AlarmMapper">
+
+</mapper>
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/BusAlarmMapper.xml b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/BusAlarmMapper.xml
deleted file mode 100644
index 595088a..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/BusAlarmMapper.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.casic.missiles.modular.system.mapper.BusAlarmMapper">
-
-    <select id="listPage" resultType="com.casic.missiles.modular.system.entity.BusAlarm">
-        SELECT
-            alarm.ID as id,
-            alarm.DEVICE_ID as deviceId,
-            alarm.PROJECT_ID as projectId,
-            alarm.ALARM_TYPE as alarmType,
-            alarm.ALARM_VALUE as alarmValue,
-            alarm.ALARM_STATUS as alarmStatus,
-            alarm.ALARM_IMAGE AS alarmImage,
-            alarm.ALARM_CONTENT as alarmContent,
-            alarm.ALARM_TIME as alarmTime,
-            alarm.CANCEL_TIME as cancelTime,
-            alarm.ALARM_LNG as alarmLng,
-            alarm.ALARM_LAT as alarmLat,
-            p.WORK_TITLE as workTitle,
-            p.WORK_ROAD as workRoad,
-            p.PROJECT_STATE as projectState,
-            w.WORKER_NAME as workPersonName,
-            w.PHONE_NUMBER as workPersonPhoneNumber
-        FROM
-            `br_bus_alarm` alarm
-                LEFT JOIN br_work_site_info p on alarm.PROJECT_ID = p.ID
-                LEFT JOIN br_worker w on p.WORK_PERSON = w.ID
-        <where>
-            <if test="ew != null">
-                ${ew.sqlSegment}
-            </if>
-        </where>
-    </select>
-
-    <select id="cancelAlarm">
-        update br_bus_alarm
-        set ALARM_STATUS = '1'
-        where DEVICE_ID = #{deviceId}
-          and ALARM_TYPE = #{alarmType}
-          and ALARM_STATUS = '0'
-    </select>
-
-    <select id="alarmCount" resultType="com.casic.missiles.modular.system.dto.AlarmTypeCountDTO">
-        SELECT
-            ALARM_TYPE as alarmType,
-            count(*) as alarmCount
-        from br_bus_alarm
-        <where>
-            <if test="projectId != null and projectId !=''">
-                and PROJECT_ID = #{projectId}
-            </if>
-            <if test="alarmStatus != null and alarmStatus !=''">
-                and ALARM_STATUS = #{alarmStatus}
-            </if>
-        </where>
-        group by ALARM_TYPE
-    </select>
-</mapper>
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/BusEventImageMapper.xml b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/BusEventImageMapper.xml
deleted file mode 100644
index fbc3db3..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/BusEventImageMapper.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.casic.missiles.modular.system.mapper.BusEventImageMapper">
-
-</mapper>
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/BusEventMapper.xml b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/BusEventMapper.xml
deleted file mode 100644
index 627d573..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/BusEventMapper.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.casic.missiles.modular.system.mapper.BusEventMapper">
-
-</mapper>
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/DeviceExtMapper.xml b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/DeviceExtMapper.xml
deleted file mode 100644
index 5321d1c..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/DeviceExtMapper.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.casic.missiles.modular.system.mapper.DeviceExtMapper">
-
-</mapper>
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/DeviceMapper.xml b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/DeviceMapper.xml
index 94262e1..88e7d01 100644
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/DeviceMapper.xml
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/DeviceMapper.xml
@@ -2,96 +2,4 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.casic.missiles.modular.system.mapper.DeviceMapper">
 
-    <select id="listDetailPage" resultType="com.casic.missiles.modular.system.dto.DeviceDetailDTO">
-        select
-        br_device.ID as id,
-        DEVICE_CODE as deviceCode,
-        DEVICE_TYPE as deviceType,
-        DEVICE_BATCH as deviceBatch,
-        MANUFACTURER as manufacturer,
-        IS_POWER_SUPPLY as isPowerSupply,
-        CREATE_TIME as createTime,
-        CAMERA_CODE as cameraCode,
-        CAMERA_IP as cameraIp,
-        CAMERA_PORT as cameraPort,
-        GAS_CODE as gasCode,
-        GAS_IP as gasIp,
-        GAS_PORT as gasPort,
-        HAT_LINING_CODE as hatLiningCode
-        from br_device
-        left join br_device_ext ext on ext.DEVICE_ID = br_device.ID
-        <where>
-            <if test="ew != null">
-                ${ew.sqlSegment}
-            </if>
-        </where>
-    </select>
-
-    <select id="selectProjectDevice" resultType="java.lang.Long">
-        with device_info as (
-            (SELECT
-            d.DEVICE_ID as DEVICE_ID,
-            d.PROJECT_ID as PROJECT_ID,
-            p.PROJECT_STATE as PROJECT_STATE
-            from br_project_device d
-            LEFT JOIN br_work_site_info p on p.ID = d.PROJECT_ID)
-
-            UNION ALL
-
-            (SELECT
-            d1.ID as DEVICE_ID,
-            w1.ID as PROJECT_ID,
-            w1.PROJECT_STATE as PROJECT_STATE
-            FROM br_project_worker pw1
-            LEFT JOIN br_device d1 on pw1.BRACELET_CODE = d1.DEVICE_CODE
-            LEFT JOIN br_work_site_info w1 on pw1.PROJECT_ID = w1.ID)
-
-            UNION ALL
-
-            (SELECT
-            d1.ID as DEVICE_ID,
-            w1.ID as PROJECT_ID,
-            w1.PROJECT_STATE as PROJECT_STATE
-            FROM br_project_worker pw1
-            LEFT JOIN br_device d1 on pw1.HAT_CODE = d1.DEVICE_CODE
-            LEFT JOIN br_work_site_info w1 on pw1.PROJECT_ID = w1.ID)
-
-
-            UNION ALL
-
-            (SELECT
-            d1.ID as DEVICE_ID,
-            w1.ID as PROJECT_ID,
-            w1.PROJECT_STATE as PROJECT_STATE
-            FROM br_project_worker pw1
-            LEFT JOIN br_device d1 on pw1.VAST_CODE = d1.DEVICE_CODE
-            LEFT JOIN br_work_site_info w1 on pw1.PROJECT_ID = w1.ID))
-
-        select DISTINCT DEVICE_ID from device_info
-        <where>
-            DEVICE_ID is not null
-            <choose>
-                <when test="projectId != null and projectId !=''">
-                    and PROJECT_ID = #{projectId}
-                </when>
-                <otherwise>
-                    AND PROJECT_STATE != '3'
-                </otherwise>
-            </choose>
-        </where>
-    </select>
-
-    <select id="selectHelmetList" resultType="com.casic.missiles.modular.system.dto.HelmetInfoDTO">
-        SELECT
-            a.ID AS deviceId,
-            a.DEVICE_CODE AS hatCode,
-            b.HAT_LINING_CODE AS hatLiningCode
-        FROM
-            br_device a
-                LEFT JOIN br_device_ext b ON a.ID = b.DEVICE_ID
-        WHERE
-            a.DEVICE_TYPE = #{deviceType}
-          AND a.DEVICE_CODE IS NOT NULL
-          AND b.HAT_LINING_CODE IS NOT NULL
-    </select>
 </mapper>
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/ProjectDeviceMapper.xml b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/ProjectDeviceMapper.xml
deleted file mode 100644
index c6d1c24..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/ProjectDeviceMapper.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.casic.missiles.modular.system.mapper.ProjectDeviceMapper">
-
-    <select id="selectDetailByProjectId" resultType="com.casic.missiles.modular.system.entity.ProjectDevice">
-        SELECT
-            pd.ID as id,
-            pd.PROJECT_ID as projectId,
-            pd.DEVICE_ID as deviceId,
-            d.DEVICE_CODE as deviceCode
-        from br_project_device pd
-        LEFT JOIN br_device d on pd.DEVICE_ID = d.ID
-        <where>
-            pd.PROJECT_ID = #{projectId}
-        </where>
-    </select>
-
-    <select id="selectDeviceLocationList" resultType="com.casic.missiles.modular.system.dto.DeviceLocationDTO">
-        SELECT
-        d.ID as deviceId,
-        d.DEVICE_TYPE as deviceType,
-        d.DEVICE_CODE as deviceCode,
-        if(EXISTS(select ID from br_bus_alarm WHERE DEVICE_ID = d.ID and ALARM_STATUS = '0'),true,false) as alarmFlag
-        FROM br_project_device pd, br_device d
-        where pd.DEVICE_ID = d.ID
-        and pd.PROJECT_ID = #{projectId}
-    </select>
-
-</mapper>
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/ProjectWorkerMapper.xml b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/ProjectWorkerMapper.xml
deleted file mode 100644
index 8d2de10..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/ProjectWorkerMapper.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.casic.missiles.modular.system.mapper.ProjectWorkerMapper">
-
-    <select id="selectDetailByProjectId" resultType="com.casic.missiles.modular.system.entity.ProjectWorker">
-        SELECT
-            pw.ID as id,
-            pw.PROJECT_ID as projectId,
-            pw.WORKER_ID as workerId,
-            w.WORKER_NAME as workerName,
-            w.DEPT_ID as workerDeptId,
-            pw.HAT_CODE as hatCode,
-            pw.VAST_CODE as vastCode,
-            pw.BRACELET_CODE as braceletCode,
-            w.PHONE_NUMBER as workerPhoneNumber
-        from br_project_worker pw
-        LEFT JOIN br_worker w on pw.WORKER_ID = w.ID
-        <where>
-            pw.PROJECT_ID = #{projectId}
-            <if test="workerType != null and workerType != ''">
-                and w.WORKER_TYPE = #{workerType}
-            </if>
-        </where>
-    </select>
-
-    <select id="selectWorkerLocationList" resultType="com.casic.missiles.modular.system.dto.WorkerLocationDTO">
-        select
-            w.ID as workerId,
-            w.WORKER_NAME as workerName,
-            pw.HAT_CODE as hatCode,
-            hd.ID as hatId,
-            pw.BRACELET_CODE as braceletCode,
-            pw.VAST_CODE as vastCode
-        from br_project_worker pw,br_worker w ,br_device hd
-        WHERE pw.WORKER_ID = w.ID
-          and pw.HAT_CODE = hd.DEVICE_CODE
-          and pw.PROJECT_ID = #{projectId}
-          and w.WORKER_TYPE = #{workerType}
-    </select>
-</mapper>
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/WorkSiteInfoMapper.xml b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/WorkSiteInfoMapper.xml
deleted file mode 100644
index 8f01326..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/WorkSiteInfoMapper.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.casic.missiles.modular.system.mapper.WorkSiteInfoMapper">
-
-    <select id="selectListPage" resultType="com.casic.missiles.modular.system.entity.WorkSiteInfo">
-        SELECT
-            br_work_site_info.ID AS id,
-            WORK_TITLE as workTitle,
-            WORK_ROAD as workRoad,
-            WORK_SITE_DESC as workSiteDesc,
-            WORK_PERSON as workPerson,
-            WORKER_NAME as workPersonName,
-            DEPT_ID as workPersonDeptId,
-            PHONE_NUMBER as workPersonPhoneNumber,
-            PROJECT_STATE as projectState,
-            br_work_site_info.CREATE_TIME AS createTime,
-            br_work_site_info.UPDATE_TIME AS updateTime
-        FROM br_work_site_info
-        LEFT JOIN br_worker w ON br_work_site_info.WORK_PERSON = w.ID
-        <where>
-            <if test="ew != null">
-                ${ew.sqlSegment}
-            </if>
-        </where>
-    </select>
-</mapper>
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/WorkerMapper.xml b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/WorkerMapper.xml
deleted file mode 100644
index 3e28b39..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/WorkerMapper.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.casic.missiles.modular.system.mapper.WorkerMapper">
-
-    <select id="selectListPage" resultType="com.casic.missiles.modular.system.entity.Worker">
-        WITH worker_project AS (
-            SELECT
-                w.id AS ID,
-                WORKER_NAME,
-                GENDER,
-                DEPT_ID,
-                OWNER_SHIP,
-                PHONE_NUMBER,
-                ID_CARD_NUMBER,
-                ENTER_REASON,
-                WORKER_AVATAR,
-                w.CREATE_TIME,
-                WORKER_TYPE,
-                IF( p.PROJECT_STATE != '3', 1, 0 ) AS `STATUS`
-            FROM br_worker w
-            LEFT JOIN br_project_worker pw ON w.ID = pw.WORKER_ID
-            LEFT JOIN br_work_site_info p ON pw.PROJECT_ID = p.ID
-        )
-
-        SELECT
-            ID AS id,
-            WORKER_NAME AS workerName,
-            GENDER AS gender,
-            DEPT_ID AS deptId,
-            OWNER_SHIP AS ownerShip,
-            PHONE_NUMBER AS phoneNumber,
-            ID_CARD_NUMBER AS idCardNumber,
-            ENTER_REASON AS enterReason,
-            WORKER_AVATAR AS workerAvatar,
-            CREATE_TIME AS createTime,
-            WORKER_TYPE AS workerType,
-            `STATUS` AS `status`
-        FROM worker_project
-        <where>
-            <if test="ew != null">
-                ${ew.sqlSegment}
-            </if>
-        </where>
-    </select>
-
-    <select id="selectWorkerAvatars" resultType="java.lang.String">
-        SELECT
-            WORKER_AVATAR
-        FROM
-            `br_worker`
-        WHERE
-        ID IN ( SELECT WORKER_ID FROM br_project_worker WHERE PROJECT_ID = #{projectId} )
-          AND WORKER_AVATAR IS NOT NULL
-          AND WORKER_AVATAR != ''
-    </select>
-</mapper>
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IAlarmService.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IAlarmService.java
new file mode 100644
index 0000000..8bc01f4
--- /dev/null
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IAlarmService.java
@@ -0,0 +1,16 @@
+package com.casic.missiles.modular.system.service;
+
+import com.casic.missiles.modular.system.entity.Alarm;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 报警记录表 服务类
+ * </p>
+ *
+ * @author zyj
+ * @since 2023-05-25
+ */
+public interface IAlarmService extends IService<Alarm> {
+
+}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IBusAlarmService.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IBusAlarmService.java
deleted file mode 100644
index f63c19c..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IBusAlarmService.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package com.casic.missiles.modular.system.service;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.modular.system.dto.AlarmTypeCountDTO;
-import com.casic.missiles.modular.system.dto.AlarmUpload;
-import com.casic.missiles.modular.system.entity.BusAlarm;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-import java.util.List;
-
-/**
- * <p>
- * 报警记录表 服务类
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface IBusAlarmService extends IService<BusAlarm> {
-
-    boolean alarmUpload(AlarmUpload alarmUpload);
-
-    Page<BusAlarm> listPage(Page<BusAlarm> page,QueryWrapper<BusAlarm> queryWrapper);
-
-    List<AlarmTypeCountDTO> alarmCount(Long projectId,String alarmStatus);
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IBusEventImageService.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IBusEventImageService.java
deleted file mode 100644
index b1187ed..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IBusEventImageService.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.casic.missiles.modular.system.service;
-
-import com.casic.missiles.modular.system.entity.BusEventImage;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-import java.util.List;
-
-/**
- * <p>
- * 事件图片表 服务类
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface IBusEventImageService extends IService<BusEventImage> {
-
-    boolean saveBusEventImages(Long eventId, List<BusEventImage> imageList);
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IBusEventService.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IBusEventService.java
deleted file mode 100644
index 85c48d0..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IBusEventService.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package com.casic.missiles.modular.system.service;
-
-import com.casic.missiles.modular.system.entity.BusEvent;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-/**
- * <p>
- * 事件表 服务类
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface IBusEventService extends IService<BusEvent> {
-
-    boolean saveBusEvent(BusEvent busEvent);
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IDeviceExtService.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IDeviceExtService.java
deleted file mode 100644
index 6fc5361..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IDeviceExtService.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package com.casic.missiles.modular.system.service;
-
-import com.casic.missiles.modular.system.dto.DeviceDetailDTO;
-import com.casic.missiles.modular.system.entity.DeviceExt;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-import java.util.List;
-
-/**
- * <p>
- * 设备扩展信息表（安全树） 服务类
- * </p>
- *
- * @author zyj
- * @since 2023-04-27
- */
-public interface IDeviceExtService extends IService<DeviceExt> {
-
-    boolean saveDeviceExt(DeviceDetailDTO deviceDetailDTO);
-
-    boolean updateDeviceExt(DeviceDetailDTO deviceDetailDTO);
-
-    boolean removeByDeviceIds(List<Long> deviceIds);
-
-    boolean setGasThreshold(String gasIp,String gasPort,String threshold);
-
-    String getGasThreshold(String gasIp,String gasPort);
-
-    Long selectByGasIpPort(String gasIp,String gasPort);
-
-    Long selectByCameraIpPort(String cameraIp,String cameraPort);
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java
index 9e62756..00a421d 100644
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java
@@ -1,32 +1,16 @@
 package com.casic.missiles.modular.system.service;
 
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.modular.system.dto.DeviceDetailDTO;
-import com.casic.missiles.modular.system.dto.HelmetInfoDTO;
 import com.casic.missiles.modular.system.entity.Device;
 import com.baomidou.mybatisplus.extension.service.IService;
 
-import java.util.List;
-
 /**
  * <p>
- *  服务类
+ * 设备记录表 服务类
  * </p>
  *
  * @author zyj
- * @since 2023-04-14
+ * @since 2023-05-25
  */
 public interface IDeviceService extends IService<Device> {
 
-    boolean saveDevice(DeviceDetailDTO deviceDetailDTO);
-
-    boolean updateDevice(DeviceDetailDTO deviceDetailDTO);
-
-    boolean deleteDevices(List<Long> deviceIds);
-
-    Page<DeviceDetailDTO> listPage(Page<DeviceDetailDTO> page, QueryWrapper<DeviceDetailDTO> queryWrapper, String status,Long projectId);
-
-    List<Long> selectProjectDevice(Long projectId);
-
 }
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IProjectDeviceService.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IProjectDeviceService.java
deleted file mode 100644
index 8599411..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IProjectDeviceService.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package com.casic.missiles.modular.system.service;
-
-import com.casic.missiles.modular.system.dto.DeviceLocationDTO;
-import com.casic.missiles.modular.system.entity.ProjectDevice;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-import java.util.List;
-
-/**
- * <p>
- *  服务类
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface IProjectDeviceService extends IService<ProjectDevice> {
-
-    boolean saveProjectDeviceList(Long projectId, List<ProjectDevice> projectDeviceList);
-
-    boolean updateProjectDeviceList(Long projectId, List<ProjectDevice> projectDeviceList);
-
-    boolean deleteByProjectId(Long projectId);
-
-    boolean deleteByProjectIds(List<Long> projectIds);
-
-    List<ProjectDevice> selectDetailByProjectId(Long projectId);
-
-    Long selectProjectIdByDevice(Long deviceId);
-
-    List<DeviceLocationDTO> selectDeviceLocationList(Long projectId);
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IProjectWorkerService.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IProjectWorkerService.java
deleted file mode 100644
index e921bc3..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IProjectWorkerService.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package com.casic.missiles.modular.system.service;
-
-import com.casic.missiles.modular.system.dto.WorkerLocationDTO;
-import com.casic.missiles.modular.system.entity.ProjectDevice;
-import com.casic.missiles.modular.system.entity.ProjectWorker;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-import java.util.List;
-
-/**
- * <p>
- *  服务类
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface IProjectWorkerService extends IService<ProjectWorker> {
-
-    boolean saveProjectWorkerList(Long projectId, List<ProjectWorker> projectWorkerList);
-
-    boolean updateProjectWorkerList(Long projectId, List<ProjectWorker> projectWorkerList);
-
-    boolean deleteByProjectId(Long projectId);
-
-    boolean deleteByProjectIds(List<Long> projectIds);
-
-    List<ProjectWorker> selectDetailByProjectId(Long projectId,String workerType);
-
-    List<WorkerLocationDTO> selectWorkerLocationDTO(Long projectId);
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IWorkSiteInfoService.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IWorkSiteInfoService.java
deleted file mode 100644
index 58a8590..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IWorkSiteInfoService.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package com.casic.missiles.modular.system.service;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.modular.system.dto.WorkSiteDetailDTO;
-import com.casic.missiles.modular.system.entity.WorkSiteInfo;
-import com.baomidou.mybatisplus.extension.service.IService;
-import java.util.List;
-/**
- * <p>
- * 作业现场表 服务类
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface IWorkSiteInfoService extends IService<WorkSiteInfo> {
-
-    boolean addWorkSiteInfo(WorkSiteDetailDTO workSiteDetailDTO);
-
-    boolean updateWorkSiteInfo(WorkSiteDetailDTO workSiteDetailDTO);
-
-    boolean deleteProjects(List<Long> projectIds);
-
-    WorkSiteDetailDTO getWorkSiteDetail(Long projectId);
-
-    Page<WorkSiteInfo> selectListPage(Page<WorkSiteInfo> page, QueryWrapper<WorkSiteInfo> queryWrapper);
-
-    boolean start(Long projectId);
-
-    boolean finish(Long projectId);
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IWorkerService.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IWorkerService.java
deleted file mode 100644
index 6c6ee98..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IWorkerService.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package com.casic.missiles.modular.system.service;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.modular.system.entity.Worker;
-import com.baomidou.mybatisplus.extension.service.IService;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * <p>
- *  服务类
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface IWorkerService extends IService<Worker> {
-
-    boolean addWorker(Worker worker,Long projectId);
-
-    Page<Worker> selectListPage(Page<Worker> page,QueryWrapper<Worker> ew);
-
-    Worker selectWorkerDetail(Long workerId);
-
-    List<String> faceRegister(String cameraIp,String cameraPort);
-
-    List<Worker> projectTempWorker(Long projectId);
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/impl/AlarmServiceImpl.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/impl/AlarmServiceImpl.java
new file mode 100644
index 0000000..6e5959b
--- /dev/null
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/impl/AlarmServiceImpl.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.modular.system.service.impl;
+
+import com.casic.missiles.modular.system.entity.Alarm;
+import com.casic.missiles.modular.system.mapper.AlarmMapper;
+import com.casic.missiles.modular.system.service.IAlarmService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 报警记录表 服务实现类
+ * </p>
+ *
+ * @author zyj
+ * @since 2023-05-25
+ */
+@Service
+public class AlarmServiceImpl extends ServiceImpl<AlarmMapper, Alarm> implements IAlarmService {
+
+}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/impl/BusAlarmServiceImpl.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/impl/BusAlarmServiceImpl.java
deleted file mode 100644
index b44de1d..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/impl/BusAlarmServiceImpl.java
+++ /dev/null
@@ -1,121 +0,0 @@
-package com.casic.missiles.modular.system.service.impl;
-
-import cn.hutool.core.date.DateUtil;
-import cn.hutool.core.util.ObjectUtil;
-import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.core.application.service.AbstractDictService;
-import com.casic.missiles.modular.system.consts.AlarmTypeEnum;
-import com.casic.missiles.modular.system.dto.AlarmTypeCountDTO;
-import com.casic.missiles.modular.system.dto.AlarmUpload;
-import com.casic.missiles.modular.system.entity.BusAlarm;
-import com.casic.missiles.modular.system.entity.DataTreeLocation;
-import com.casic.missiles.modular.system.mapper.BusAlarmMapper;
-import com.casic.missiles.modular.system.service.*;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.util.Date;
-import java.util.List;
-import java.util.stream.Collectors;
-
-import static com.casic.missiles.modular.system.consts.AlarmConst.ALARM_STATUS_ON;
-
-/**
- * <p>
- * 报警记录表 服务实现类
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@Service
-@RequiredArgsConstructor
-@Slf4j
-public class BusAlarmServiceImpl extends ServiceImpl<BusAlarmMapper, BusAlarm> implements IBusAlarmService {
-
-    private final IDeviceExtService deviceExtService;
-    private final IDeviceService deviceService;
-    private final IProjectDeviceService projectDeviceService;
-
-    private final ICasicFileService fileService;
-
-    private final AbstractDictService dictService;
-    private final IDataSupportService dataSupportService;
-
-    @Override
-    @Transactional
-    public boolean alarmUpload(AlarmUpload alarmUpload) {
-        log.info("alarm upload ==> {}",alarmUpload.toString());
-        Long deviceId = null;
-        if(StrUtil.isAllNotBlank(alarmUpload.getGasIp(),alarmUpload.getGasPort())){
-            deviceId = deviceExtService.selectByGasIpPort(alarmUpload.getGasIp(),alarmUpload.getGasPort());
-        }
-        if(ObjectUtil.isEmpty(deviceId) && StrUtil.isAllNotBlank(alarmUpload.getCameraIp(),alarmUpload.getCameraPort())){
-            deviceId = deviceExtService.selectByCameraIpPort(alarmUpload.getCameraIp(),alarmUpload.getCameraPort());
-        }
-
-        if(ObjectUtil.isEmpty(deviceId)){
-            return false;
-        }
-
-        BusAlarm alarm = new BusAlarm();
-        alarm.setDeviceId(deviceId);
-        alarm.setProjectId(projectDeviceService.selectProjectIdByDevice(deviceId));
-        alarm.setAlarmValue(alarmUpload.getAlarmValue());
-        if(StrUtil.isNotEmpty(alarmUpload.getAlarmTime())){
-            alarm.setAlarmTime(DateUtil.parseDateTime(alarmUpload.getAlarmTime()));
-        }else {
-            alarm.setAlarmTime(new Date());
-        }
-
-        alarm.setAlarmType(alarmUpload.getAlarmType());
-        alarm.setAlarmContent(alarmUpload.getAlarmContent());
-        if(StrUtil.isNotEmpty(alarmUpload.getAlarmImage())){
-            String imgBase64 = "data:image/jpeg;base64," + alarmUpload.getAlarmImage();
-            String imageUrl = fileService.saveFile(imgBase64);
-            alarm.setAlarmImage(imageUrl);
-        }
-        alarm.setAlarmStatus(ALARM_STATUS_ON);
-
-        DataTreeLocation treeLocation = dataSupportService.getTreeLocation(deviceId);
-        if(ObjectUtil.isNotEmpty(treeLocation)){
-            alarm.setAlarmLng(treeLocation.getGdLng());
-            alarm.setAlarmLat(treeLocation.getGdLat());
-        }
-
-        //自动消警
-        AlarmTypeEnum alarmTypeEnum = AlarmTypeEnum.getByAlarmType(alarm.getAlarmType());
-        if(ObjectUtil.isNotEmpty(alarmTypeEnum) && alarmTypeEnum.isAutoCancel()){
-            this.baseMapper.cancelAlarm(deviceId,alarm.getAlarmType());
-        }
-        return this.save(alarm);
-    }
-
-    @Override
-    public Page<BusAlarm> listPage(Page<BusAlarm> page, QueryWrapper<BusAlarm> queryWrapper) {
-        page = this.baseMapper.listPage(page, queryWrapper);
-        for (BusAlarm alarm : page.getRecords()) {
-            alarm.setAlarmTypeName(dictService.getDictNameByCode("alarmType",alarm.getAlarmType()));
-            alarm.setAlarmStatusName(dictService.getDictNameByCode("alarmStatus",alarm.getAlarmStatus()));
-            if(StrUtil.isNotEmpty(alarm.getProjectState())){
-                alarm.setProjectStateName(dictService.getDictNameByCode("projectStatus",alarm.getProjectState()));
-            }
-        }
-        return page;
-    }
-
-    @Override
-    public List<AlarmTypeCountDTO> alarmCount(Long projectId, String alarmStatus) {
-        List<AlarmTypeCountDTO> list = this.baseMapper.alarmCount(projectId, alarmStatus);
-        list = list.stream().filter(i->StrUtil.isNotEmpty(i.getAlarmType())).collect(Collectors.toList());
-        for (AlarmTypeCountDTO countDTO : list) {
-            countDTO.setAlarmTypeName(dictService.getDictNameByCode("alarmType",countDTO.getAlarmType()));
-        }
-        return list;
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/impl/BusEventImageServiceImpl.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/impl/BusEventImageServiceImpl.java
deleted file mode 100644
index a43f7c1..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/impl/BusEventImageServiceImpl.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package com.casic.missiles.modular.system.service.impl;
-
-import com.casic.missiles.modular.system.entity.BusEventImage;
-import com.casic.missiles.modular.system.mapper.BusEventImageMapper;
-import com.casic.missiles.modular.system.service.IBusEventImageService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-/**
- * <p>
- * 事件图片表 服务实现类
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@Service
-public class BusEventImageServiceImpl extends ServiceImpl<BusEventImageMapper, BusEventImage> implements IBusEventImageService {
-
-    @Override
-    public boolean saveBusEventImages(Long eventId, List<BusEventImage> imageList) {
-        imageList.forEach(i->i.setEventId(eventId));
-        return this.saveBatch(imageList);
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/impl/BusEventServiceImpl.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/impl/BusEventServiceImpl.java
deleted file mode 100644
index 21e511c..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/impl/BusEventServiceImpl.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package com.casic.missiles.modular.system.service.impl;
-
-import com.casic.missiles.modular.system.entity.BusEvent;
-import com.casic.missiles.modular.system.mapper.BusEventMapper;
-import com.casic.missiles.modular.system.service.IBusEventImageService;
-import com.casic.missiles.modular.system.service.IBusEventService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import lombok.RequiredArgsConstructor;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.util.Date;
-
-/**
- * <p>
- * 事件表 服务实现类
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@Service
-@RequiredArgsConstructor
-public class BusEventServiceImpl extends ServiceImpl<BusEventMapper, BusEvent> implements IBusEventService {
-
-    private final IBusEventImageService busEventImageService;
-
-
-    @Override
-    @Transactional
-    public boolean saveBusEvent(BusEvent busEvent) {
-        busEvent.setCreateTime(new Date());
-        boolean res = this.save(busEvent);
-        if(res){
-            res = busEventImageService.saveBusEventImages(busEvent.getId(),busEvent.getImageList());
-        }
-        return res;
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceExtServiceImpl.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceExtServiceImpl.java
deleted file mode 100644
index 2bdb63d..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceExtServiceImpl.java
+++ /dev/null
@@ -1,102 +0,0 @@
-package com.casic.missiles.modular.system.service.impl;
-
-import cn.hutool.core.util.ObjectUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
-import com.casic.missiles.modular.system.dto.DeviceDetailDTO;
-import com.casic.missiles.modular.system.entity.DeviceExt;
-import com.casic.missiles.modular.system.mapper.DeviceExtMapper;
-import com.casic.missiles.modular.system.service.IDeviceExtService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-/**
- * <p>
- * 设备扩展信息表（安全树） 服务实现类
- * </p>
- *
- * @author zyj
- * @since 2023-04-27
- */
-@Service
-public class DeviceExtServiceImpl extends ServiceImpl<DeviceExtMapper, DeviceExt> implements IDeviceExtService {
-
-
-    @Override
-    public boolean saveDeviceExt(DeviceDetailDTO deviceDetailDTO) {
-        DeviceExt ext = new DeviceExt();
-        ext.setDeviceId(deviceDetailDTO.getId());
-        ext.setCameraCode(deviceDetailDTO.getCameraCode());
-        ext.setCameraIp(deviceDetailDTO.getCameraIp());
-        ext.setCameraPort(deviceDetailDTO.getCameraPort());
-        ext.setGasCode(deviceDetailDTO.getGasCode());
-        ext.setGasIp(deviceDetailDTO.getGasIp());
-        ext.setGasPort(deviceDetailDTO.getGasPort());
-        ext.setHatLiningCode(deviceDetailDTO.getHatLiningCode());
-        return this.save(ext);
-    }
-
-    @Override
-    public boolean updateDeviceExt(DeviceDetailDTO deviceDetailDTO) {
-        DeviceExt ext = this.selectByDeviceId(deviceDetailDTO.getId());
-        ext.setCameraCode(deviceDetailDTO.getCameraCode());
-        ext.setCameraIp(deviceDetailDTO.getCameraIp());
-        ext.setCameraPort(deviceDetailDTO.getCameraPort());
-        ext.setGasCode(deviceDetailDTO.getGasCode());
-        ext.setGasIp(deviceDetailDTO.getGasIp());
-        ext.setGasPort(deviceDetailDTO.getGasPort());
-        ext.setHatLiningCode(deviceDetailDTO.getHatLiningCode());
-        return this.updateById(ext);
-    }
-
-    @Override
-    public boolean removeByDeviceIds(List<Long> deviceIds) {
-        QueryWrapper<DeviceExt> queryWrapper = new QueryWrapper<>();
-        queryWrapper.in("DEVICE_ID",deviceIds);
-        return this.remove(queryWrapper);
-    }
-
-    @Override
-    public boolean setGasThreshold(String gasIp, String gasPort, String threshold) {
-        UpdateWrapper<DeviceExt> updateWrapper = new UpdateWrapper<>();
-        updateWrapper.set("GAS_THRESHOLD",threshold);
-        updateWrapper.eq("GAS_IP",gasIp);
-        updateWrapper.eq("GAS_PORT",gasPort);
-        return this.update(updateWrapper);
-    }
-
-    @Override
-    public String getGasThreshold(String gasIp, String gasPort) {
-        QueryWrapper<DeviceExt> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("GAS_IP",gasIp);
-        queryWrapper.eq("GAS_PORT",gasPort);
-        DeviceExt deviceExt = this.getOne(queryWrapper);
-        return ObjectUtil.isNotEmpty(deviceExt) ? deviceExt.getGasThreshold() : null;
-    }
-
-    private DeviceExt selectByDeviceId(Long deviceId){
-        QueryWrapper<DeviceExt> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("DEVICE_ID",deviceId);
-        return this.getOne(queryWrapper);
-    }
-
-    @Override
-    public Long selectByGasIpPort(String gasIp, String gasPort) {
-        QueryWrapper<DeviceExt> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("GAS_IP",gasIp);
-        queryWrapper.eq("GAS_PORT",gasPort);
-        DeviceExt deviceExt = this.getOne(queryWrapper);
-        return ObjectUtil.isNotEmpty(deviceExt) ? deviceExt.getDeviceId() : null;
-    }
-
-    @Override
-    public Long selectByCameraIpPort(String cameraIp, String cameraPort) {
-        QueryWrapper<DeviceExt> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("CAMERA_IP",cameraIp);
-        queryWrapper.eq("CAMERA_PORT",cameraPort);
-        DeviceExt deviceExt = this.getOne(queryWrapper);
-        return ObjectUtil.isNotEmpty(deviceExt) ? deviceExt.getDeviceId() : null;
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java
index 9df79ef..31a5a18 100644
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java
@@ -1,125 +1,20 @@
 package com.casic.missiles.modular.system.service.impl;
 
-import cn.hutool.core.collection.CollUtil;
-import cn.hutool.core.date.DateUtil;
-import cn.hutool.core.util.ObjectUtil;
-import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.core.application.service.AbstractDictService;
-import com.casic.missiles.modular.system.dto.DeviceDetailDTO;
-import com.casic.missiles.modular.system.dto.HelmetInfoDTO;
 import com.casic.missiles.modular.system.entity.Device;
 import com.casic.missiles.modular.system.mapper.DeviceMapper;
-import com.casic.missiles.modular.system.service.IDeviceExtService;
 import com.casic.missiles.modular.system.service.IDeviceService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.casic.missiles.modular.system.service.IProjectDeviceService;
-import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.util.Date;
-import java.util.List;
-
-import static com.casic.missiles.modular.system.consts.DeviceConst.*;
 
 /**
  * <p>
- *  服务实现类
+ * 设备记录表 服务实现类
  * </p>
  *
  * @author zyj
- * @since 2023-04-14
+ * @since 2023-05-25
  */
 @Service
-@RequiredArgsConstructor
 public class DeviceServiceImpl extends ServiceImpl<DeviceMapper, Device> implements IDeviceService {
 
-    private final AbstractDictService dictService;
-    private final IDeviceExtService deviceExtService;
-
-    private final IProjectDeviceService projectDeviceService;
-
-    @Transactional
-    @Override
-    public boolean saveDevice(DeviceDetailDTO deviceDetailDTO) {
-        deviceDetailDTO.setCreateTime(new Date());
-        boolean deviceRes = this.save(deviceDetailDTO);
-        if(deviceRes && DEVICE_TYPE_TREE.equals(deviceDetailDTO.getDeviceType())){
-            deviceRes = deviceExtService.saveDeviceExt(deviceDetailDTO);
-        }
-        return deviceRes;
-    }
-
-    @Transactional
-    @Override
-    public boolean updateDevice(DeviceDetailDTO deviceDetailDTO) {
-        boolean deviceRes = this.updateById(deviceDetailDTO);
-        if(deviceRes && DEVICE_TYPE_TREE.equals(deviceDetailDTO.getDeviceType())){
-            deviceRes = deviceExtService.updateDeviceExt(deviceDetailDTO);
-        }
-        return deviceRes;
-    }
-
-    @Transactional
-    @Override
-    public boolean deleteDevices(List<Long> deviceIds) {
-        return this.removeByIds(deviceIds) & deviceExtService.removeByDeviceIds(deviceIds);
-    }
-
-    @Override
-    public Page<DeviceDetailDTO> listPage(Page<DeviceDetailDTO> page, QueryWrapper<DeviceDetailDTO> queryWrapper,String status,Long projectId) {
-        String ID_COLUMN_NAME = "br_device.ID";
-        List<Long> useDevices = this.selectProjectDevice(null);
-        List<Long> projectDevices;
-        if(ObjectUtil.isNotEmpty(projectId)){
-            projectDevices = this.selectProjectDevice(projectId);
-        } else {
-            projectDevices = null;
-        }
-
-        // 查询使用中的设备（如果传了 projectId，查询 使用中&&此现场）
-        if(DEVICE_STATUS_USE.equals(status)){
-            if(CollUtil.isEmpty(useDevices)){
-                return page;
-            }
-            if(ObjectUtil.isNotEmpty(projectId) && CollUtil.isEmpty(projectDevices)){
-                return page;
-            }
-            queryWrapper.in(ID_COLUMN_NAME,useDevices);
-            if(CollUtil.isNotEmpty(projectDevices)){
-                queryWrapper.in(ID_COLUMN_NAME,projectDevices);
-            }
-
-        }
-
-        // 查询未使用的设备（如果传了 projectId，查询 未使用||此现场）
-        if(DEVICE_STATUS_NORMAL.equals(status)) {
-            if (CollUtil.isNotEmpty(useDevices)) {
-                if (CollUtil.isEmpty(projectDevices)) {
-                    queryWrapper.notIn(ID_COLUMN_NAME, useDevices);
-                } else {
-                    queryWrapper.and(i -> i.notIn(ID_COLUMN_NAME, useDevices).or().in(ID_COLUMN_NAME, projectDevices));
-                }
-            }
-        }
-
-        page = this.baseMapper.listDetailPage(page, queryWrapper);
-        for (DeviceDetailDTO record : page.getRecords()) {
-            record.setDeviceTypeName(dictService.getDictNameByCode("deviceType",record.getDeviceType()));
-            record.setIsPowerSupplyName(dictService.getDictNameByCode("isPowerSupply",record.getIsPowerSupply()));
-            record.setRegisterTime(DateUtil.formatDate(record.getCreateTime()));
-            record.setStatus(useDevices.contains(record.getId()) ? DEVICE_STATUS_USE : DEVICE_STATUS_NORMAL);
-            record.setStatusName(dictService.getDictNameByCode("deviceStatus",record.getStatus()));
-        }
-        return page;
-    }
-
-    @Override
-    public List<Long> selectProjectDevice(Long projectId) {
-        return this.baseMapper.selectProjectDevice(projectId);
-    }
-
-
 }

diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/AlarmController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/AlarmController.java
new file mode 100644
index 0000000..1795cf1
--- /dev/null
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/AlarmController.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.modular.system.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.stereotype.Controller;
+
+/**
+ * <p>
+ * 报警记录表 前端控制器
+ * </p>
+ *
+ * @author zyj
+ * @since 2023-05-25
+ */
+@Controller
+@RequestMapping("/system/alarm")
+public class AlarmController {
+
+}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusAlarmController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusAlarmController.java
deleted file mode 100644
index 1f82ebb..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusAlarmController.java
+++ /dev/null
@@ -1,102 +0,0 @@
-package com.casic.missiles.modular.system.controller;
-
-
-import cn.hutool.core.util.ObjectUtil;
-import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.core.base.controller.BaseController;
-import com.casic.missiles.core.page.PageFactory;
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.AlarmUpload;
-import com.casic.missiles.modular.system.dto.DeviceDetailDTO;
-import com.casic.missiles.modular.system.entity.BusAlarm;
-import com.casic.missiles.modular.system.service.IBusAlarmService;
-import io.swagger.annotations.*;
-import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.*;
-
-import org.springframework.stereotype.Controller;
-
-import static com.casic.missiles.model.response.ResponseData.DEFAULT_SUCCESS_MESSAGE;
-import static com.casic.missiles.modular.system.consts.AlarmConst.ALARM_STATUS_MANUAL_CANCEL;
-
-/**
- * <p>
- * 报警记录表 前端控制器
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@Api(tags = "报警管理接口")
-@Controller
-@RequestMapping("/alarm")
-@RequiredArgsConstructor
-public class BusAlarmController extends BaseController {
-
-    private final IBusAlarmService alarmService;
-
-    @ApiOperation("报警上报接口")
-    @PostMapping("/upload")
-    @ResponseBody
-    public Object upload(@RequestBody AlarmUpload alarmUpload){
-        alarmService.alarmUpload(alarmUpload);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("报警列表分页查询")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "workTitle", value = "作业名称",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "projectId", value = "作业ID",dataType = "Long", paramType = "query",example = "0"),
-            @ApiImplicitParam(name = "alarmStatus", value = "报警状态",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "projectState", value = "作业状态",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "alarmType", value = "报警类型",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "alarmStartTime", value = "报警开始时间",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "alarmEndTime", value = "报警结束时间",dataType = "String", paramType = "query")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = BusAlarm.class),
-    })
-    @GetMapping("/listPage")
-    @ResponseBody
-    public Object listPage(String workTitle,Long projectId,String alarmStatus,String projectState,String alarmType,String alarmStartTime,String alarmEndTime){
-        Page<BusAlarm> page = PageFactory.defaultPage();
-        QueryWrapper<BusAlarm> queryWrapper = new QueryWrapper<>();
-        if(StrUtil.isNotEmpty(workTitle)){
-            queryWrapper.like("p.WORK_TITLE",workTitle);
-        }
-        if(ObjectUtil.isNotEmpty(projectId)){
-            queryWrapper.eq("alarm.PROJECT_ID",projectId);
-        }
-        if(StrUtil.isNotEmpty(alarmStatus)){
-            queryWrapper.eq("alarm.ALARM_STATUS",alarmStatus);
-        }
-        if(StrUtil.isNotEmpty(projectState)){
-            queryWrapper.eq("p.PROJECT_STATE",projectState);
-        }
-        if(StrUtil.isNotEmpty(alarmType)){
-            queryWrapper.eq("alarm.ALARM_TYPE",alarmType);
-        }
-        if(StrUtil.isNotEmpty(alarmStartTime)){
-            queryWrapper.ge("alarm.ALARM_TIME",alarmStartTime);
-        }
-        if(StrUtil.isNotEmpty(alarmEndTime)){
-            queryWrapper.le("alarm.ALARM_TIME",alarmEndTime);
-        }
-        page = alarmService.listPage(page,queryWrapper);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-    @ApiOperation("消警")
-    @PostMapping("/cancel")
-    @ResponseBody
-    public Object cancel(@RequestParam("alarmId") Long alarmId){
-        UpdateWrapper<BusAlarm> updateWrapper = new UpdateWrapper<>();
-        updateWrapper.eq("ID",alarmId);
-        updateWrapper.set("ALARM_STATUS",ALARM_STATUS_MANUAL_CANCEL);
-        alarmService.update(updateWrapper);
-        return ResponseData.success();
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusEventController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusEventController.java
deleted file mode 100644
index dde5aad..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusEventController.java
+++ /dev/null
@@ -1,41 +0,0 @@
-package com.casic.missiles.modular.system.controller;
-
-
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.entity.BusEvent;
-import com.casic.missiles.modular.system.service.IBusEventService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.ResponseBody;
-
-/**
- * <p>
- * 事件表 前端控制器
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@Controller
-@RequestMapping("/event")
-@Api(tags = "事件上报")
-@RequiredArgsConstructor
-public class BusEventController {
-
-    private final IBusEventService eventService;
-
-    @ApiOperation("事件上报")
-    @PostMapping("add")
-    @ResponseBody
-    public Object add(@RequestBody BusEvent busEvent){
-        eventService.saveBusEvent(busEvent);
-        return ResponseData.success();
-    }
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
index 03abc5f..aa50d78 100644
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
@@ -1,121 +1,20 @@
 package com.casic.missiles.modular.system.controller;
 
 
-import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.core.base.controller.BaseController;
-import com.casic.missiles.core.page.PageFactory;
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.DeviceDetailDTO;
-import com.casic.missiles.modular.system.entity.Device;
-import com.casic.missiles.modular.system.service.IDeviceExtService;
-import com.casic.missiles.modular.system.service.IDeviceService;
-import io.swagger.annotations.*;
-import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.RequestMapping;
 
 import org.springframework.stereotype.Controller;
 
-import java.time.LocalDateTime;
-import java.util.Date;
-import java.util.List;
-
-import static com.casic.missiles.model.response.ResponseData.DEFAULT_SUCCESS_MESSAGE;
-
 /**
  * <p>
- *  前端控制器
+ * 设备记录表 前端控制器
  * </p>
  *
  * @author zyj
- * @since 2023-04-14
+ * @since 2023-05-25
  */
-@Api(tags = "设备管理接口")
-@RequiredArgsConstructor
 @Controller
-@RequestMapping("/device")
-public class DeviceController extends BaseController {
-    private final IDeviceService deviceService;
-    private final IDeviceExtService deviceExtService;
-
-    @ApiOperation("设备分页列表")
-    @ApiImplicitParams({
-        @ApiImplicitParam(name = "deviceType", value = "设备类型",dataType = "String", paramType = "query"),
-        @ApiImplicitParam(name = "deviceCode", value = "设备编号",dataType = "String", paramType = "query"),
-        @ApiImplicitParam(name = "status", value = "设备状态",dataType = "String", paramType = "query"),
-        @ApiImplicitParam(name = "projectId", value = "作业ID（如果传此参数，列表中返回该作业使用的设备）",dataType = "Long", paramType = "query", example = "0")
-    })
-    @ApiResponses({
-        @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = DeviceDetailDTO.class),
-    })
-    @GetMapping("listPage")
-    @ResponseBody
-    public Object listPage(String deviceType, String deviceCode, String status,Long projectId){
-        Page<DeviceDetailDTO> page = PageFactory.defaultPage();
-        QueryWrapper<DeviceDetailDTO> queryWrapper = new QueryWrapper<>();
-        if(StrUtil.isNotEmpty(deviceType)){
-            queryWrapper.eq("DEVICE_TYPE",deviceType);
-        }
-        if(StrUtil.isNotEmpty(deviceCode)){
-            queryWrapper.like("DEVICE_CODE",deviceCode);
-        }
-        page = deviceService.listPage(page,queryWrapper,status,projectId);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-    @ApiOperation("新增设备")
-    @PostMapping("add")
-    @ResponseBody
-    public Object add(@RequestBody DeviceDetailDTO deviceDetailDTO){
-        deviceService.saveDevice(deviceDetailDTO);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("编辑设备")
-    @PostMapping("update")
-    @ResponseBody
-    public Object update(@RequestBody DeviceDetailDTO deviceDetailDTO){
-        deviceService.updateDevice(deviceDetailDTO);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("删除设备")
-    @PostMapping("delete")
-    @ResponseBody
-    public Object delete(@ApiParam("设备id列表")@RequestBody List<Long> deviceIds){
-        deviceService.deleteDevices(deviceIds);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("设置甲烷阈值")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "gasIp", value = "安全树甲烷设备IP",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "gasPort", value = "安全树甲烷端口",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "threshold", value = "甲烷阈值",dataType = "String", paramType = "query")
-    })
-    @PostMapping("setThreshold")
-    @ResponseBody
-    public Object setThreshold(String gasIp,String gasPort,String threshold){
-        deviceExtService.setGasThreshold(gasIp, gasPort, threshold);
-        return ResponseData.success();
-    }
-
-
-    @ApiOperation("查询甲烷阈值")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "gasIp", value = "安全树甲烷设备IP",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "gasPort", value = "安全树甲烷端口",dataType = "String", paramType = "query")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = "{\"code\": 200,\"data\": \"100\",\"message\": \"请求成功\",\"success\": true}",response = String.class),
-    })
-    @GetMapping("getThreshold")
-    @ResponseBody
-    public Object getThreshold(String gasIp,String gasPort){
-        String data = deviceExtService.getGasThreshold(gasIp, gasPort);
-        return ResponseData.success(data);
-    }
-
+@RequestMapping("/system/device")
+public class DeviceController {
 
 }
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/OverviewController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/OverviewController.java
deleted file mode 100644
index 7570504..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/OverviewController.java
+++ /dev/null
@@ -1,70 +0,0 @@
-package com.casic.missiles.modular.system.controller;
-
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.AlarmTypeCountDTO;
-import com.casic.missiles.modular.system.dto.DeviceLocationDTO;
-import com.casic.missiles.modular.system.dto.WorkerLocationDTO;
-import com.casic.missiles.modular.system.service.IBusAlarmService;
-import com.casic.missiles.modular.system.service.IProjectDeviceService;
-import com.casic.missiles.modular.system.service.IProjectWorkerService;
-import io.swagger.annotations.*;
-import lombok.RequiredArgsConstructor;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.ResponseBody;
-
-import static com.casic.missiles.model.response.ResponseData.DEFAULT_SUCCESS_MESSAGE;
-import static com.casic.missiles.modular.system.consts.AlarmConst.ALARM_STATUS_ON;
-
-@Api(tags = "首页看板接口")
-@Controller
-@RequestMapping("overview")
-@RequiredArgsConstructor
-public class OverviewController {
-
-    private final IBusAlarmService alarmService;
-    private final IProjectDeviceService projectDeviceService;
-
-    private final IProjectWorkerService projectWorkerService;
-
-
-    @ApiOperation("报警统计接口")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "projectId", value = "作业ID",dataType = "Long", paramType = "query", example = "0")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = AlarmTypeCountDTO.class),
-    })
-    @GetMapping("/alarmCount")
-    @ResponseBody
-    public Object alarmCount(Long projectId){
-        return ResponseData.success(alarmService.alarmCount(projectId,ALARM_STATUS_ON));
-    }
-
-    @ApiOperation("设备列表接口")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "projectId", value = "作业ID",dataType = "Long", paramType = "query", example = "0")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = DeviceLocationDTO.class),
-    })
-    @GetMapping("/deviceList")
-    @ResponseBody
-    public Object deviceList(Long projectId){
-        return ResponseData.success(projectDeviceService.selectDeviceLocationList(projectId));
-    }
-
-    @ApiOperation("人员列表接口")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "projectId", value = "作业ID",dataType = "Long", paramType = "query", example = "0")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = WorkerLocationDTO.class),
-    })
-    @GetMapping("/workerList")
-    @ResponseBody
-    public Object workerList(Long projectId){
-        return ResponseData.success(projectWorkerService.selectWorkerLocationDTO(projectId));
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/WorkSiteInfoController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/WorkSiteInfoController.java
deleted file mode 100644
index af36d69..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/WorkSiteInfoController.java
+++ /dev/null
@@ -1,130 +0,0 @@
-package com.casic.missiles.modular.system.controller;
-
-
-import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.core.base.controller.BaseController;
-import com.casic.missiles.core.page.PageFactory;
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.WorkSiteDetailDTO;
-import com.casic.missiles.modular.system.entity.WorkSiteInfo;
-import com.casic.missiles.modular.system.service.IWorkSiteInfoService;
-import io.swagger.annotations.*;
-import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.*;
-
-import org.springframework.stereotype.Controller;
-
-import java.util.List;
-
-import static com.casic.missiles.model.response.ResponseData.DEFAULT_SUCCESS_MESSAGE;
-
-/**
- * <p>
- * 作业现场表 前端控制器
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@Controller
-@RequestMapping("/site")
-@Api(tags = "作业现场管理")
-@RequiredArgsConstructor
-public class WorkSiteInfoController extends BaseController {
-
-
-    private final IWorkSiteInfoService workSiteInfoService;
-
-    @ApiOperation("新增作业现场")
-    @PostMapping("add")
-    @ResponseBody
-    public Object addWorkSite(@RequestBody WorkSiteDetailDTO workSiteDetailDTO){
-        workSiteInfoService.addWorkSiteInfo(workSiteDetailDTO);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("编辑作业现场")
-    @PostMapping("update")
-    @ResponseBody
-    public Object updateWorkSite(@RequestBody WorkSiteDetailDTO workSiteDetailDTO){
-        workSiteInfoService.updateWorkSiteInfo(workSiteDetailDTO);
-        return ResponseData.success();
-    }
-
-
-    @ApiOperation("删除作业现场")
-    @PostMapping("delete")
-    @ResponseBody
-    public Object delete(@ApiParam("作业现场id列表")@RequestBody List<Long> projectIds){
-        workSiteInfoService.deleteProjects(projectIds);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("查询作业现场详情")
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = WorkSiteDetailDTO.class),
-    })
-    @GetMapping("detail")
-    @ResponseBody
-    public Object delete(@ApiParam(value = "作业现场id", example = "0")@RequestParam Long projectId){
-        WorkSiteDetailDTO detailDTO = workSiteInfoService.getWorkSiteDetail(projectId);
-        return ResponseData.success(detailDTO);
-    }
-
-    @ApiOperation("分页列表查询")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "workTitle",value = "作业名称", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "workRoad",value = "所属道路", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "workPersonName",value = "责任人姓名", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "startDate",value = "注册开始日期", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "endDate",value = "注册结束日期", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "projectState",value = "当前状态（字典值）", dataType = "String", paramType = "query")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = WorkSiteInfo.class),
-    })
-    @GetMapping("listPage")
-    @ResponseBody
-    public Object listPage(String workTitle,String workRoad,String workPersonName,String projectState,String startDate,String endDate){
-        Page<WorkSiteInfo> page = PageFactory.defaultPage();
-        QueryWrapper<WorkSiteInfo> queryWrapper = new QueryWrapper<>();
-        if(StrUtil.isNotEmpty(workTitle)){
-            queryWrapper.like("WORK_TITLE",workTitle);
-        }
-        if(StrUtil.isNotEmpty(workRoad)){
-            queryWrapper.like("WORK_ROAD",workRoad);
-        }
-        if(StrUtil.isNotEmpty(workPersonName)){
-            queryWrapper.like("WORKER_NAME",workPersonName);
-        }
-        if(StrUtil.isNotEmpty(projectState)){
-            queryWrapper.eq("PROJECT_STATE",projectState);
-        }
-        if(StrUtil.isNotEmpty(startDate)){
-            queryWrapper.ge("br_work_site_info.CREATE_TIME",startDate + " 00:00:00");
-        }
-        if(StrUtil.isNotEmpty(endDate)){
-            queryWrapper.le("br_work_site_info.CREATE_TIME",endDate + " 23:59:59");
-        }
-        page = workSiteInfoService.selectListPage(page,queryWrapper);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-    @ApiOperation("开始作业")
-    @PostMapping("start")
-    @ResponseBody
-    public Object start(@ApiParam(value = "作业现场id",example = "0")@RequestParam Long projectId){
-        workSiteInfoService.start(projectId);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("完成作业")
-    @PostMapping("finish")
-    @ResponseBody
-    public Object finish(@ApiParam(value = "作业现场id", example = "0")@RequestParam Long projectId){
-        workSiteInfoService.finish(projectId);
-        return ResponseData.success();
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/WorkerController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/WorkerController.java
deleted file mode 100644
index 796f94c..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/WorkerController.java
+++ /dev/null
@@ -1,136 +0,0 @@
-package com.casic.missiles.modular.system.controller;
-
-
-import cn.hutool.core.util.ObjectUtil;
-import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.core.base.controller.BaseController;
-import com.casic.missiles.core.page.PageFactory;
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.DeviceDetailDTO;
-import com.casic.missiles.modular.system.entity.Device;
-import com.casic.missiles.modular.system.entity.Worker;
-import com.casic.missiles.modular.system.service.IWorkerService;
-import io.swagger.annotations.*;
-import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.*;
-
-import org.springframework.stereotype.Controller;
-
-import java.util.Date;
-import java.util.List;
-
-import static com.casic.missiles.model.response.ResponseData.DEFAULT_SUCCESS_MESSAGE;
-
-/**
- * <p>
- *  前端控制器
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@Controller
-@RequestMapping("/worker")
-@RequiredArgsConstructor
-@Api(tags = "人员管理接口")
-public class WorkerController extends BaseController {
-
-    private final IWorkerService workerService;
-
-    @ApiOperation("分页列表查询")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "name",value = "姓名", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "deptId",value = "所属部门", dataType = "Long", paramType = "query", example = "0"),
-            @ApiImplicitParam(name = "status",value = "当前状态（字典值）", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "startDate",value = "注册开始日期", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "endDate",value = "注册结束日期", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "workerType",value = "人员类型（字典值）", dataType = "String", paramType = "query")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = Worker.class),
-    })
-    @GetMapping("listPage")
-    @ResponseBody
-    public Object listPage(String name,Long deptId, String status,String startDate,String endDate,String workerType){
-        Page<Worker> page = PageFactory.defaultPage();
-        QueryWrapper<Worker> queryWrapper = new QueryWrapper<>();
-        if(StrUtil.isNotEmpty(name)){
-            queryWrapper.like("WORKER_NAME",name);
-        }
-        if(ObjectUtil.isNotEmpty(deptId)){
-            queryWrapper.eq("DEPT_ID",deptId);
-        }
-        if(StrUtil.isNotEmpty(workerType)){
-            queryWrapper.eq("WORKER_TYPE",workerType);
-        }
-        if(StrUtil.isNotEmpty(startDate)){
-            queryWrapper.ge("CREATE_TIME",startDate + " 00:00:00");
-        }
-        if(StrUtil.isNotEmpty(endDate)){
-            queryWrapper.le("CREATE_TIME",endDate + " 23:59:59");
-        }
-        if(StrUtil.isNotEmpty(status)){
-            queryWrapper.eq("`STATUS`",status);
-        }
-        page = workerService.selectListPage(page,queryWrapper);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-    @ApiOperation("新增人员")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "worker", value = "人员信息", dataType = "Worker", paramType = "body", required = true),
-            @ApiImplicitParam(name = "projectId", value = "项目ID(入场申请需要)", dataType = "Long", paramType = "query", example = "0")
-    })
-    @PostMapping("add")
-    @ResponseBody
-    public Object add(@ApiParam("worker")@RequestBody Worker worker,
-                      @RequestParam(required = false) Long projectId){
-        workerService.addWorker(worker,projectId);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("编辑人员")
-    @PostMapping("update")
-    @ResponseBody
-    public Object update(@RequestBody Worker worker){
-        workerService.updateById(worker);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("删除人员")
-    @PostMapping("delete")
-    @ResponseBody
-    public Object delete(@ApiParam("人员id列表")@RequestBody List<Long> workIds){
-        workerService.removeByIds(workIds);
-        return ResponseData.success();
-    }
-
-
-    @ApiOperation(value = "获取人脸图片",notes = "返回人脸图片url")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "cameraIp",value = "摄像头IP", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "cameraPort",value = "摄像头端口号", dataType = "String", paramType = "query"),
-    })
-    @GetMapping("/face/register")
-    @ResponseBody
-    public Object faceRegister(String cameraIp,String cameraPort){
-        return ResponseData.success(workerService.faceRegister(cameraIp, cameraPort));
-    }
-
-
-    @ApiOperation(value = "查询临时入场人员列表")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "projectId", value = "项目ID",required = true,dataType = "Long", paramType = "query", example = "0")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = Worker.class),
-    })
-    @GetMapping("/projectTempWorker")
-    @ResponseBody
-    public Object projectTempWorker(Long projectId){
-        return ResponseData.success(workerService.projectTempWorker(projectId));
-    }
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/AlarmTypeCountDTO.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/AlarmTypeCountDTO.java
deleted file mode 100644
index 1a165a1..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/AlarmTypeCountDTO.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.casic.missiles.modular.system.dto;
-
-import io.swagger.annotations.ApiModel;
-import lombok.Data;
-
-@ApiModel(value = "AlarmTypeCountDTO",description = "报警类型统计（首页）")
-@Data
-public class AlarmTypeCountDTO {
-
-    private String alarmType;
-    private String alarmTypeName;
-    private Integer alarmCount;
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/AlarmUpload.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/AlarmUpload.java
deleted file mode 100644
index 73d7799..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/AlarmUpload.java
+++ /dev/null
@@ -1,46 +0,0 @@
-package com.casic.missiles.modular.system.dto;
-
-import cn.hutool.core.util.StrUtil;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-@ApiModel(value = "AlarmUpload",description = "报警上传")
-@Data
-public class AlarmUpload {
-
-    @ApiModelProperty(value = "摄像头ip")
-    private String cameraIp;
-
-    @ApiModelProperty(value = "摄像头端口")
-    private String cameraPort;
-    @ApiModelProperty(value = "安全树甲烷设备ip")
-    private String gasIp;
-    @ApiModelProperty(value = "安全树甲烷设备端口")
-    private String gasPort;
-    @ApiModelProperty(value = "报警值")
-    private String alarmValue;
-    @ApiModelProperty(value = "报警时间")
-    private String alarmTime;
-    @ApiModelProperty(value = "报警类型")
-    private String alarmType;
-    @ApiModelProperty(value = "报警图片")
-    private String alarmImage;
-    @ApiModelProperty(value = "报警内容")
-    private String alarmContent;
-
-    @Override
-    public String toString() {
-        return "AlarmUpload{" +
-                "cameraIp='" + cameraIp + '\'' +
-                ", cameraPort='" + cameraPort + '\'' +
-                ", gasIp='" + gasIp + '\'' +
-                ", gasPort='" + gasPort + '\'' +
-                ", alarmValue='" + alarmValue + '\'' +
-                ", alarmTime='" + alarmTime + '\'' +
-                ", alarmType='" + alarmType + '\'' +
-                ", alarmImage='" + (StrUtil.isNotEmpty(alarmImage) ? alarmImage.substring(0,50) : "null") + '\'' +
-                ", alarmContent='" + alarmContent + '\'' +
-                '}';
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/DeviceDetailDTO.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/DeviceDetailDTO.java
deleted file mode 100644
index ea518d9..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/DeviceDetailDTO.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package com.casic.missiles.modular.system.dto;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.casic.missiles.modular.system.entity.Device;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-@ApiModel("DeviceDetailDTO")
-@Data
-public class DeviceDetailDTO extends Device {
-
-    @ApiModelProperty(value = "摄像头编号")
-    private String cameraCode;
-
-    @ApiModelProperty(value = "摄像头IP")
-    private String cameraIp;
-
-    @ApiModelProperty(value = "摄像头端口")
-    private String cameraPort;
-
-    @ApiModelProperty(value = "激甲编号")
-    private String gasCode;
-
-    @ApiModelProperty(value = "激甲IP")
-    private String gasIp;
-
-    @ApiModelProperty(value = "激甲端口")
-    private String gasPort;
-
-    @ApiModelProperty(value = "智能帽衬编号")
-    private String hatLiningCode;
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/WorkSiteDetailDTO.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/WorkSiteDetailDTO.java
deleted file mode 100644
index 29378ff..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/WorkSiteDetailDTO.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package com.casic.missiles.modular.system.dto;
-
-import com.casic.missiles.modular.system.entity.ProjectDevice;
-import com.casic.missiles.modular.system.entity.ProjectWorker;
-import com.casic.missiles.modular.system.entity.WorkSiteInfo;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.util.List;
-
-@Data
-@ApiModel("WorkSiteDetailDTO")
-public class WorkSiteDetailDTO extends WorkSiteInfo {
-
-    @ApiModelProperty(value = "安全树列表",dataType = "ProjectDevice")
-    private List<ProjectDevice> deviceList;
-
-    @ApiModelProperty(value = "人员列表",dataType = "ProjectWorker")
-    private List<ProjectWorker> workerList;
-
-
-
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/WorkerLocationDTO.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/WorkerLocationDTO.java
deleted file mode 100644
index 6fd7b24..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/WorkerLocationDTO.java
+++ /dev/null
@@ -1,68 +0,0 @@
-package com.casic.missiles.modular.system.dto;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-@ApiModel(value = "WorkerLocationDTO",description = "人员位置列表（首页）")
-@Data
-public class WorkerLocationDTO {
-
-    @ApiModelProperty("人员ID")
-    private Long workerId;
-
-    @ApiModelProperty("人员姓名")
-    private String workerName;
-
-    @ApiModelProperty("安全帽编号")
-    private String hatCode;
-
-    @ApiModelProperty("安全帽ID")
-    private Long hatId;
-
-    @ApiModelProperty("背心编号")
-    private String vastCode;
-
-    @ApiModelProperty("手环编号")
-    private String braceletCode;
-
-    @ApiModelProperty("位置")
-    private String location;
-
-    @ApiModelProperty("时间")
-    private String time;
-
-    @ApiModelProperty("经度")
-    private String lng;
-
-    @ApiModelProperty("纬度")
-    private String lat;
-
-    @ApiModelProperty("心率")
-    private String heartRate;
-
-    @ApiModelProperty("血氧")
-    private String bloodOxygen;
-
-    @ApiModelProperty("一氧化碳")
-    private String co;
-
-    @ApiModelProperty("甲烷")
-    private String gas;
-
-    @ApiModelProperty("硫化氢")
-    private String h2s;
-
-    @ApiModelProperty("氧气")
-    private String o2;
-
-    @ApiModelProperty("信号")
-    private String signal;
-
-    @ApiModelProperty("电量")
-    private String cell;
-
-    @ApiModelProperty("是否报警")
-    private boolean alarmFlag;
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Alarm.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Alarm.java
new file mode 100644
index 0000000..4d2b7ef
--- /dev/null
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Alarm.java
@@ -0,0 +1,103 @@
+package com.casic.missiles.modular.system.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import java.util.Date;
+
+/**
+ * <p>
+ * 报警记录表
+ * </p>
+ *
+ * @author zyj
+ * @since 2023-05-25
+ */
+@Data
+@TableName("bus_alarm")
+public class Alarm implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    @TableId(value = "ID",type = IdType.ASSIGN_ID)
+    private Long id;
+
+    /**
+     * 设备ID
+     */
+    @TableField("DEVICE_ID")
+    private Long deviceId;
+
+    /**
+     * 报警类型
+     */
+    @TableField("ALARM_TYPE")
+    private String alarmType;
+
+    /**
+     * 报警时间
+     */
+    @TableField("ALARM_TIME")
+    private Date alarmTime;
+
+    /**
+     * 报警状态
+     */
+    @TableField("ALARM_STATUS")
+    private String alarmStatus;
+
+    /**
+     * 报警位置
+     */
+    @TableField("ALARM_LOCATION")
+    private String alarmLocation;
+
+    /**
+     * 报警图片
+     */
+    @TableField("ALARM_IMAGE")
+    private String alarmImage;
+
+    /**
+     * 视频通道号
+     */
+    @TableField("CHANNEL_NO")
+    private Integer channelNo;
+
+    /**
+     * 报警内容
+     */
+    @TableField("ALARM_CONTENT")
+    private String alarmContent;
+
+    /**
+     * 消警时间
+     */
+    @TableField("CANCEL_TIME")
+    private Date cancelTime;
+
+
+    @Override
+    public String toString() {
+        return "Alarm{" +
+            "id=" + id +
+            ", deviceId=" + deviceId +
+            ", alarmType=" + alarmType +
+            ", alarmTime=" + alarmTime +
+            ", alarmStatus=" + alarmStatus +
+            ", alarmLocation=" + alarmLocation +
+            ", alarmImage=" + alarmImage +
+            ", channelNo=" + channelNo +
+            ", alarmContent=" + alarmContent +
+            ", cancelTime=" + cancelTime +
+        "}";
+    }
+}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusAlarm.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusAlarm.java
deleted file mode 100644
index efb4a23..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusAlarm.java
+++ /dev/null
@@ -1,159 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.alibaba.fastjson.annotation.JSONField;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.time.LocalDateTime;
-import java.util.Date;
-
-/**
- * <p>
- * 报警记录表
- * </p>
- *
- * @author zyj
- * @since 2023-05-16
- */
-@Data
-@ApiModel("Alarm")
-@TableName("br_bus_alarm")
-public class BusAlarm implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 项目ID
-     */
-    @ApiModelProperty(value = "项目ID")
-    @TableField("PROJECT_ID")
-    private Long projectId;
-
-    /**
-     * 设备ID
-     */
-    @ApiModelProperty(value = "设备ID")
-    @TableField("DEVICE_ID")
-    private Long deviceId;
-
-    /**
-     * 报警类型
-     */
-    @ApiModelProperty(value = "报警类型")
-    @TableField("ALARM_TYPE")
-    private String alarmType;
-
-    /**
-     * 报警状态
-     */
-    @ApiModelProperty(value = "报警状态")
-    @TableField("ALARM_STATUS")
-    private String alarmStatus;
-
-    /**
-     * 报警值
-     */
-    @ApiModelProperty(value = "报警值")
-    @TableField("ALARM_VALUE")
-    private String alarmValue;
-
-    /**
-     * 报警图片
-     */
-    @ApiModelProperty(value = "报警图片")
-    @TableField("ALARM_IMAGE")
-    private String alarmImage;
-
-    /**
-     * 报警内容
-     */
-    @ApiModelProperty(value = "报警内容")
-    @TableField("ALARM_CONTENT")
-    private String alarmContent;
-
-    /**
-     * 报警时间
-     */
-    @ApiModelProperty(value = "报警时间")
-    @TableField("ALARM_TIME")
-    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
-    private Date alarmTime;
-
-    /**
-     * 消警时间
-     */
-    @ApiModelProperty(value = "消警时间")
-    @TableField("CANCEL_TIME")
-    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
-    private Date cancelTime;
-
-    /**
-     * 报警位置经度
-     */
-    @ApiModelProperty(value = "报警位置经度")
-    @TableField("ALARM_LNG")
-    private String alarmLng;
-
-    /**
-     * 报警位置纬度
-     */
-    @ApiModelProperty(value = "报警位置纬度")
-    @TableField("ALARM_LAT")
-    private String alarmLat;
-
-    @ApiModelProperty("报警类型名称")
-    @TableField(exist = false)
-    private String alarmStatusName;
-    @ApiModelProperty("报警类型名称")
-    @TableField(exist = false)
-    private String alarmTypeName;
-    @ApiModelProperty("作业名称")
-    @TableField(exist = false)
-    private String workTitle;
-    @ApiModelProperty("所属道路")
-    @TableField(exist = false)
-    private String workRoad;
-    @ApiModelProperty("作业状态")
-    @TableField(exist = false)
-    private String projectState;
-    @ApiModelProperty("作业状态名称")
-    @TableField(exist = false)
-    private String projectStateName;
-    @ApiModelProperty("负责人姓名")
-    @TableField(exist = false)
-    private String workPersonName;
-    @ApiModelProperty("负责人联系方式")
-    @TableField(exist = false)
-    private String workPersonPhoneNumber;
-
-
-    @Override
-    public String toString() {
-        return "BusAlarm{" +
-                "id=" + id +
-                ", projectId=" + projectId +
-                ", deviceId=" + deviceId +
-                ", alarmType=" + alarmType +
-                ", alarmValue=" + alarmValue +
-                ", alarmStatus=" + alarmStatus +
-                ", alarmImage=" + alarmImage +
-                ", alarmContent=" + alarmContent +
-                ", alarmTime=" + alarmTime +
-                ", cancelTime=" + cancelTime +
-                ", alarmLng=" + alarmLng +
-                ", alarmLat=" + alarmLat +
-                "}";
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusEvent.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusEvent.java
deleted file mode 100644
index a0b7543..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusEvent.java
+++ /dev/null
@@ -1,100 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.time.LocalDateTime;
-import java.util.Date;
-import java.util.List;
-
-/**
- * <p>
- * 事件表
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@TableName("br_bus_event")
-@Data
-@ApiModel("BusEvent")
-public class BusEvent implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @ApiModelProperty("事件ID")
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 事件标题
-     */
-    @ApiModelProperty("事件名称")
-    @TableField("EVENT_TITLE")
-    private String eventTitle;
-
-    /**
-     * 上报人员
-     */
-    @ApiModelProperty("上报人员")
-    @TableField("UPLOAD_NAME")
-    private String uploadName;
-
-    /**
-     * 联系方式
-     */
-    @ApiModelProperty("联系方式")
-    @TableField("PHONE_NUMBER")
-    private String phoneNumber;
-
-    /**
-     * 事件描述
-     */
-    @ApiModelProperty("事件描述")
-    @TableField("EVENT_DESCRIPTION")
-    private String eventDescription;
-
-    @ApiModelProperty("经度")
-    @TableField("LNG")
-    private String lng;
-
-    @ApiModelProperty("纬度")
-    @TableField("LAT")
-    private String lat;
-
-    /**
-     * 事件上传时间
-     */
-    @ApiModelProperty("事件上传时间")
-    @TableField("CREATE_TIME")
-    private Date createTime;
-
-    @ApiModelProperty("事件照片")
-    @TableField(exist = false)
-    private List<BusEventImage> imageList;
-
-
-
-    @Override
-    public String toString() {
-        return "BusEvent{" +
-            "id=" + id +
-            ", eventTitle=" + eventTitle +
-            ", uploadName=" + uploadName +
-            ", phoneNumber=" + phoneNumber +
-            ", eventDescription=" + eventDescription +
-            ", lng=" + lng +
-            ", lat=" + lat +
-            ", createTime=" + createTime +
-        "}";
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusEventImage.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusEventImage.java
deleted file mode 100644
index 1e75245..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusEventImage.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-
-/**
- * <p>
- * 事件图片表
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@TableName("br_bus_event_image")
-@Data
-@ApiModel("BusEventImage")
-public class BusEventImage implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 事件ID
-     */
-    @TableField("EVENT_ID")
-    private Long eventId;
-
-    /**
-     * 报警图片
-     */
-    @TableField("IMAGE")
-    @ApiModelProperty("图片url")
-    private String image;
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Device.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Device.java
index df89c70..ea7db5f 100644
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Device.java
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Device.java
@@ -1,30 +1,23 @@
 package com.casic.missiles.modular.system.entity;
 
-import com.alibaba.fastjson.annotation.JSONField;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.casic.missiles.core.base.json.DateDeserializer;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
-import java.util.Date;
 
 /**
  * <p>
- * 
+ * 设备记录表
  * </p>
  *
  * @author zyj
- * @since 2023-04-14
+ * @since 2023-05-25
  */
-@ApiModel("Device")
-@TableName("br_device")
 @Data
+@TableName("bus_device")
 public class Device implements Serializable {
 
     private static final long serialVersionUID = 1L;
@@ -32,82 +25,86 @@
     /**
      * 主键
      */
-    @ApiModelProperty(value = "设备ID")
     @TableId(value = "ID",type = IdType.ASSIGN_ID)
     private Long id;
 
     /**
-     * 设备编号
+     * 设备名称
      */
-    @ApiModelProperty(value = "设备编号")
-    @TableField("DEVICE_CODE")
-    private String deviceCode;
+    @TableField("DEVICE_NAME")
+    private String deviceName;
 
     /**
-     * 设备类型
+     * IP
      */
-    @ApiModelProperty(value = "设备类型")
-    @TableField("DEVICE_TYPE")
-    private String deviceType;
+    @TableField("IP")
+    private String ip;
 
     /**
-     * 设备批次
+     * 端口
      */
-    @ApiModelProperty(value = "设备批次")
-    @TableField("DEVICE_BATCH")
-    private String deviceBatch;
+    @TableField("PORT")
+    private String port;
 
     /**
-     * 厂家
+     * 用户名
      */
-    @ApiModelProperty(value = "厂家")
-    @TableField("MANUFACTURER")
-    private String manufacturer;
+    @TableField("USER_NAME")
+    private String userName;
 
     /**
-     * 是否供电
+     * 密码
      */
-    @ApiModelProperty(value = "是否供电")
-    @TableField("IS_POWER_SUPPLY")
-    private String isPowerSupply;
+    @TableField("PASSWORD")
+    private String password;
 
     /**
-     * 创建时间
+     * 连接类型
      */
-    @ApiModelProperty(value = "创建时间",dataType = "Date")
-    @TableField("CREATE_TIME")
-    private Date createTime;
+    @TableField("CONNECT_TYPE")
+    private String connectType;
 
-    @ApiModelProperty(value = "设备类型名称")
-    @TableField(exist = false)
-    private String deviceTypeName;
+    /**
+     * 位置
+     */
+    @TableField("LOCATION")
 
-    @ApiModelProperty(value = "是否供电名称")
-    @TableField(exist = false)
-    private String isPowerSupplyName;
+    private String location;
 
-    @ApiModelProperty(value = "注册时间",dataType = "String")
-    @TableField(exist = false)
-    private String registerTime;
+    /**
+     * 设备状态
+     */
+    @TableField("STATUS")
 
-    @ApiModelProperty(value = "当前状态")
-    @TableField(exist = false)
     private String status;
 
-    @ApiModelProperty(value = "当前状态名称")
-    @TableField(exist = false)
-    private String statusName;
+    /**
+     * 报警分组
+     */
+    @TableField("ALARM_GROUP")
+
+    private Long alarmGroup;
+
+    /**
+     * 视频通道数(预留)
+     */
+    @TableField("CHANNEL_NUM")
+    private Integer channelNum;
 
     @Override
     public String toString() {
         return "Device{" +
             "id=" + id +
-            ", deviceCode=" + deviceCode +
-            ", deviceType=" + deviceType +
-            ", deviceBatch=" + deviceBatch +
-            ", manufacturer=" + manufacturer +
-            ", isPowerSupply=" + isPowerSupply +
-            ", createTime=" + createTime +
+            ", deviceName=" + deviceName +
+            ", ip=" + ip +
+            ", port=" + port +
+            ", userName=" + userName +
+            ", password=" + password +
+            ", connectType=" + connectType +
+            ", location=" + location +
+            ", status=" + status +
+            ", alarmGroup=" + alarmGroup +
+            ", channelNum=" + channelNum +
         "}";
     }
 }
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/DeviceExt.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/DeviceExt.java
deleted file mode 100644
index 5ee7015..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/DeviceExt.java
+++ /dev/null
@@ -1,99 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-
-/**
- * <p>
- * 设备扩展信息表（安全树）
- * </p>
- *
- * @author zyj
- * @since 2023-04-27
- */
-@Data
-@TableName("br_device_ext")
-public class DeviceExt implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 设备ID
-     */
-    @TableField("DEVICE_ID")
-    private Long deviceId;
-
-    /**
-     * 摄像头编号
-     */
-    @TableField("CAMERA_CODE")
-    private String cameraCode;
-
-    /**
-     * 摄像头IP
-     */
-    @TableField("CAMERA_IP")
-    private String cameraIp;
-
-    /**
-     * 摄像头端口
-     */
-    @TableField("CAMERA_PORT")
-    private String cameraPort;
-
-    /**
-     * 激甲编号
-     */
-    @TableField("GAS_CODE")
-    private String gasCode;
-
-    /**
-     * 激甲IP
-     */
-    @TableField("GAS_IP")
-    private String gasIp;
-
-    /**
-     * 激甲端口
-     */
-    @TableField("GAS_PORT")
-    private String gasPort;
-
-    /**
-     * 甲烷报警阈值
-     */
-    @TableField("GAS_THRESHOLD")
-    private String gasThreshold;
-
-    @TableField(value = "HAT_LINING_CODE")
-    private String hatLiningCode;
-
-
-    @Override
-    public String toString() {
-        return "DeviceExt{" +
-            "id=" + id +
-            ", deviceId=" + deviceId +
-            ", cameraCode=" + cameraCode +
-            ", cameraIp=" + cameraIp +
-            ", cameraPort=" + cameraPort +
-            ", gasCode=" + gasCode +
-            ", gasIp=" + gasIp +
-            ", gasPort=" + gasPort +
-            ", gasThreshold=" + gasThreshold +
-            ", hatLiningCode=" + hatLiningCode +
-        "}";
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/ProjectDevice.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/ProjectDevice.java
deleted file mode 100644
index c4f3472..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/ProjectDevice.java
+++ /dev/null
@@ -1,62 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-
-/**
- * <p>
- * 
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@Data
-@ApiModel("ProjectDevice")
-@TableName("br_project_device")
-public class ProjectDevice implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 作业现场ID
-     */
-    @TableField("PROJECT_ID")
-    private Long projectId;
-
-    /**
-     * 设备ID
-     */
-    @TableField("DEVICE_ID")
-    @ApiModelProperty("设备ID（新增编辑时传）")
-    private Long deviceId;
-
-    /**
-     * 设备编号
-     */
-    @TableField(exist = false)
-    @ApiModelProperty("设备编号（详情中展示，新增编辑不用传）")
-    private String deviceCode;
-
-    @Override
-    public String toString() {
-        return "ProjectDevice{" +
-            "id=" + id +
-            ", projectId=" + projectId +
-            ", deviceId=" + deviceId +
-        "}";
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/ProjectWorker.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/ProjectWorker.java
deleted file mode 100644
index 10b23c4..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/ProjectWorker.java
+++ /dev/null
@@ -1,104 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import java.io.Serializable;
-
-/**
- * <p>
- * 
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@ApiModel("ProjectWorker")
-@TableName("br_project_worker")
-@Data
-@NoArgsConstructor
-@AllArgsConstructor
-public class ProjectWorker implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 作业现场ID
-     */
-    @TableField("PROJECT_ID")
-    private Long projectId;
-
-    /**
-     * 人员ID
-     */
-    @ApiModelProperty("人员ID")
-    @TableField("WORKER_ID")
-    private Long workerId;
-
-    /**
-     * 安全帽编号
-     */
-    @ApiModelProperty("安全帽编号")
-    @TableField("HAT_CODE")
-    private String hatCode;
-
-    /**
-     * 背心编号
-     */
-    @ApiModelProperty("背心编号")
-    @TableField("VAST_CODE")
-    private String vastCode;
-
-    /**
-     * 手环编号
-     */
-    @ApiModelProperty("手环编号")
-    @TableField("BRACELET_CODE")
-    private String braceletCode;
-
-    @ApiModelProperty("人员姓名（详情中展示，新增编辑不用传）")
-    @TableField(exist = false)
-    private String workerName;
-
-    @ApiModelProperty("人员部门ID（详情中展示，新增编辑不用传）")
-    @TableField(exist = false)
-    private String workerDeptId;
-
-    @ApiModelProperty("人员部门名称（详情中展示，新增编辑不用传）")
-    @TableField(exist = false)
-    private String workerDeptName;
-
-    @ApiModelProperty("人员联系方式（详情中展示，新增编辑不用传）")
-    @TableField(exist = false)
-    private String workerPhoneNumber;
-
-    public ProjectWorker(Long projectId, Long workerId) {
-        this.projectId = projectId;
-        this.workerId = workerId;
-    }
-
-    @Override
-    public String toString() {
-        return "ProjectWorker{" +
-            "id=" + id +
-            ", projectId=" + projectId +
-            ", workerId=" + workerId +
-            ", hatCode=" + hatCode +
-            ", vastCode=" + vastCode +
-            ", braceletCode=" + braceletCode +
-        "}";
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/WorkSiteInfo.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/WorkSiteInfo.java
deleted file mode 100644
index fa6f41d..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/WorkSiteInfo.java
+++ /dev/null
@@ -1,130 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.alibaba.fastjson.annotation.JSONField;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.time.LocalDateTime;
-import java.util.Date;
-
-/**
- * <p>
- * 作业现场表
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@ApiModel("WorkSiteInfo")
-@TableName("br_work_site_info")
-@Data
-public class WorkSiteInfo implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @ApiModelProperty("作业现场ID")
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 作业名称
-     */
-    @ApiModelProperty("作业名称")
-    @TableField("WORK_TITLE")
-    private String workTitle;
-
-    /**
-     * 责任人
-     */
-    @ApiModelProperty("责任人（人员ID）")
-    @TableField("WORK_PERSON")
-    private Long workPerson;
-
-    /**
-     * 作业描述
-     */
-    @ApiModelProperty("作业描述")
-    @TableField("WORK_SITE_DESC")
-    private String workSiteDesc;
-
-    /**
-     * 作业状态
-     */
-    @ApiModelProperty("作业状态")
-    @TableField("PROJECT_STATE")
-    private String projectState;
-
-    /**
-     * 所属道路
-     */
-    @ApiModelProperty("所属道路")
-    @TableField("WORK_ROAD")
-    private String workRoad;
-
-    @TableField("IMAGE_URL")
-    private String imageUrl;
-
-    @TableField("CREATE_TIME")
-    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
-    private Date createTime;
-    @TableField("UPDATE_TIME")
-    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
-    private Date updateTime;
-
-    @ApiModelProperty("开始时间")
-    @TableField("START_TIME")
-    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
-    private Date startTime;
-
-    @ApiModelProperty("结束时间")
-    @TableField("FINISH_TIME")
-    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
-    private Date finishTime;
-
-    @ApiModelProperty("负责人姓名（详情中使用，新增编辑不用传）")
-    @TableField(exist = false)
-    private String workPersonName;
-
-    @ApiModelProperty("负责人联系方式（详情中使用，新增编辑不用传）")
-    @TableField(exist = false)
-    private String workPersonPhoneNumber;
-
-    @ApiModelProperty("负责人所属部门ID（详情中使用，新增编辑不用传）")
-    @TableField(exist = false)
-    private Long workPersonDeptId;
-
-    @ApiModelProperty("负责人所属部门名称（详情中使用，新增编辑不用传）")
-    @TableField(exist = false)
-    private String workPersonDeptName;
-
-    @ApiModelProperty(value = "注册时间",dataType = "String")
-    @TableField(exist = false)
-    private String registerTime;
-
-    @ApiModelProperty("作业状态名称")
-    @TableField(exist = false)
-    private String projectStateName;
-
-    @Override
-    public String toString() {
-        return "WorkSiteInfo{" +
-            "id=" + id +
-            ", workTitle=" + workTitle +
-            ", workPerson=" + workPerson +
-            ", workSiteDesc=" + workSiteDesc +
-            ", projectState=" + projectState +
-            ", imageUrl=" + imageUrl +
-            ", updateTime=" + updateTime +
-            ", workRoad=" + workRoad +
-        "}";
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Worker.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Worker.java
deleted file mode 100644
index 28a4daa..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Worker.java
+++ /dev/null
@@ -1,147 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.time.LocalDateTime;
-import java.util.Date;
-
-/**
- * <p>
- * 
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@ApiModel("Worker")
-@TableName("br_worker")
-@Data
-public class Worker implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @ApiModelProperty(value = "人员ID")
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 姓名
-     */
-    @ApiModelProperty(value = "姓名")
-    @TableField("WORKER_NAME")
-    private String workerName;
-
-    /**
-     * 性别
-     */
-    @ApiModelProperty(value = "性别")
-    @TableField("GENDER")
-    private String gender;
-
-    /**
-     * 所属部门
-     */
-    @ApiModelProperty(value = "所属部门(人员管理)")
-    @TableField("DEPT_ID")
-    private Long deptId;
-
-    /**
-     * 所属单位
-     */
-    @ApiModelProperty(value = "所属单位(入场申请中使用)")
-    @TableField("OWNER_SHIP")
-    private String ownerShip;
-
-    /**
-     * 联系方式
-     */
-    @ApiModelProperty(value = "联系方式")
-    @TableField("PHONE_NUMBER")
-    private String phoneNumber;
-
-    /**
-     * 证件号
-     */
-    @ApiModelProperty(value = "证件号")
-    @TableField("ID_CARD_NUMBER")
-    private String idCardNumber;
-
-    /**
-     * 入场原因
-     */
-    @ApiModelProperty(value = "入场原因（入场申请中使用）")
-    @TableField("ENTER_REASON")
-    private String enterReason;
-
-    /**
-     * 入场人脸照片
-     */
-    @ApiModelProperty(value = "人脸照片（照片路径）")
-    @TableField("WORKER_AVATAR")
-    private String workerAvatar;
-
-    /**
-     * 申请入场时间
-     */
-    @ApiModelProperty(value = "注册时间/申请入场时间")
-    @TableField("CREATE_TIME")
-    private Date createTime;
-
-    /**
-     * 人员类型
-     */
-    @ApiModelProperty(value = "人员类型（区分人员管理和入场申请）")
-    @TableField("WORKER_TYPE")
-    private String workerType;
-
-    @ApiModelProperty(value = "性别名称")
-    @TableField(exist = false)
-    private String genderName;
-
-    @ApiModelProperty(value = "部门名称")
-    @TableField(exist = false)
-    private String deptName;
-
-    @ApiModelProperty(value = "注册时间",dataType = "String")
-    @TableField(exist = false)
-    private String registerTime;
-
-    @ApiModelProperty(value = "当前状态")
-    @TableField(exist = false)
-    private String status;
-
-    @ApiModelProperty(value = "当前状态名称")
-    @TableField(exist = false)
-    private String statusName;
-
-    @ApiModelProperty(value = "是否注册(0未注册；1已注册)",allowableValues = "0,1")
-    @TableField(exist = false)
-    private String isRegister;
-
-    @Override
-    public String toString() {
-        return "Worker{" +
-            "id=" + id +
-            ", workerName=" + workerName +
-            ", gender=" + gender +
-            ", deptId=" + deptId +
-            ", ownerShip=" + ownerShip +
-            ", phoneNumber=" + phoneNumber +
-            ", idCardNumber=" + idCardNumber +
-            ", enterReason=" + enterReason +
-            ", workerAvatar=" + workerAvatar +
-            ", createTime=" + createTime +
-            ", workerType=" + workerType +
-        "}";
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/AlarmMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/AlarmMapper.java
new file mode 100644
index 0000000..ea4c8be
--- /dev/null
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/AlarmMapper.java
@@ -0,0 +1,16 @@
+package com.casic.missiles.modular.system.mapper;
+
+import com.casic.missiles.modular.system.entity.Alarm;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 报警记录表 Mapper 接口
+ * </p>
+ *
+ * @author zyj
+ * @since 2023-05-25
+ */
+public interface AlarmMapper extends BaseMapper<Alarm> {
+
+}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/BusAlarmMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/BusAlarmMapper.java
deleted file mode 100644
index 9801742..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/BusAlarmMapper.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package com.casic.missiles.modular.system.mapper;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.modular.system.dto.AlarmTypeCountDTO;
-import com.casic.missiles.modular.system.entity.BusAlarm;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * <p>
- * 报警记录表 Mapper 接口
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface BusAlarmMapper extends BaseMapper<BusAlarm> {
-
-    Page<BusAlarm> listPage(Page<BusAlarm> page,@Param("ew")  QueryWrapper<BusAlarm> queryWrapper);
-
-    void cancelAlarm(@Param("deviceId")Long deviceId,@Param("alarmType") String alarmType);
-
-    List<AlarmTypeCountDTO> alarmCount(@Param("projectId")Long projectId, @Param("alarmStatus")String alarmStatus);
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/BusEventImageMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/BusEventImageMapper.java
deleted file mode 100644
index 9590b7d..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/BusEventImageMapper.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.casic.missiles.modular.system.mapper;
-
-import com.casic.missiles.modular.system.entity.BusEventImage;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * <p>
- * 事件图片表 Mapper 接口
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface BusEventImageMapper extends BaseMapper<BusEventImage> {
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/BusEventMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/BusEventMapper.java
deleted file mode 100644
index 3c85edf..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/BusEventMapper.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.casic.missiles.modular.system.mapper;
-
-import com.casic.missiles.modular.system.entity.BusEvent;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * <p>
- * 事件表 Mapper 接口
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface BusEventMapper extends BaseMapper<BusEvent> {
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/DeviceExtMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/DeviceExtMapper.java
deleted file mode 100644
index 4ca9212..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/DeviceExtMapper.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.casic.missiles.modular.system.mapper;
-
-import com.casic.missiles.modular.system.entity.DeviceExt;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * <p>
- * 设备扩展信息表（安全树） Mapper 接口
- * </p>
- *
- * @author zyj
- * @since 2023-04-27
- */
-public interface DeviceExtMapper extends BaseMapper<DeviceExt> {
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/DeviceMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/DeviceMapper.java
index 444c0c5..3d0bb02 100644
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/DeviceMapper.java
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/DeviceMapper.java
@@ -1,30 +1,16 @@
 package com.casic.missiles.modular.system.mapper;
 
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.modular.system.dto.DeviceDetailDTO;
-import com.casic.missiles.modular.system.dto.HelmetInfoDTO;
 import com.casic.missiles.modular.system.entity.Device;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
 
 /**
  * <p>
- *  Mapper 接口
+ * 设备记录表 Mapper 接口
  * </p>
  *
  * @author zyj
- * @since 2023-04-14
+ * @since 2023-05-25
  */
-@Mapper
 public interface DeviceMapper extends BaseMapper<Device> {
 
-    Page<DeviceDetailDTO> listDetailPage(Page<DeviceDetailDTO> page,@Param("ew") QueryWrapper<DeviceDetailDTO> ew);
-
-     List<Long> selectProjectDevice(@Param("projectId") Long projectId);
-
-    List<HelmetInfoDTO> selectHelmetList(@Param("deviceType")String deviceType);
 }
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/ProjectDeviceMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/ProjectDeviceMapper.java
deleted file mode 100644
index 1d0c14e..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/ProjectDeviceMapper.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package com.casic.missiles.modular.system.mapper;
-
-import com.casic.missiles.modular.system.dto.DeviceLocationDTO;
-import com.casic.missiles.modular.system.entity.ProjectDevice;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * <p>
- *  Mapper 接口
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface ProjectDeviceMapper extends BaseMapper<ProjectDevice> {
-     List<ProjectDevice> selectDetailByProjectId(@Param("projectId") Long projectId);
-
-     List<DeviceLocationDTO> selectDeviceLocationList(@Param("projectId") Long projectId);
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/ProjectWorkerMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/ProjectWorkerMapper.java
deleted file mode 100644
index 58583d1..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/ProjectWorkerMapper.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package com.casic.missiles.modular.system.mapper;
-
-import com.casic.missiles.modular.system.dto.WorkerLocationDTO;
-import com.casic.missiles.modular.system.entity.ProjectWorker;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * <p>
- *  Mapper 接口
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface ProjectWorkerMapper extends BaseMapper<ProjectWorker> {
-
-    List<ProjectWorker> selectDetailByProjectId(@Param("projectId") Long projectId,
-                                                @Param("workerType")String workerType);
-
-    List<WorkerLocationDTO> selectWorkerLocationList(@Param("projectId") Long projectId,
-                                                     @Param("workerType")String workerType);
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/WorkSiteInfoMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/WorkSiteInfoMapper.java
deleted file mode 100644
index a4934d2..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/WorkSiteInfoMapper.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.casic.missiles.modular.system.mapper;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.modular.system.entity.WorkSiteInfo;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Param;
-
-/**
- * <p>
- * 作业现场表 Mapper 接口
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface WorkSiteInfoMapper extends BaseMapper<WorkSiteInfo> {
-
-    Page<WorkSiteInfo> selectListPage(Page<WorkSiteInfo> page,@Param("ew") QueryWrapper<WorkSiteInfo> ew);
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/WorkerMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/WorkerMapper.java
deleted file mode 100644
index 258fb12..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/WorkerMapper.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package com.casic.missiles.modular.system.mapper;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.modular.system.dto.DeviceDetailDTO;
-import com.casic.missiles.modular.system.entity.Worker;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * <p>
- *  Mapper 接口
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface WorkerMapper extends BaseMapper<Worker> {
-
-
-    Page<Worker> selectListPage(Page<Worker> page, @Param("ew") QueryWrapper<Worker> ew);
-
-    List<String> selectWorkerAvatars(@Param("projectId")Long projectId);
-
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/AlarmMapper.xml b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/AlarmMapper.xml
new file mode 100644
index 0000000..25cb4ab
--- /dev/null
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/AlarmMapper.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.modular.system.mapper.AlarmMapper">
+
+</mapper>
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/BusAlarmMapper.xml b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/BusAlarmMapper.xml
deleted file mode 100644
index 595088a..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/BusAlarmMapper.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.casic.missiles.modular.system.mapper.BusAlarmMapper">
-
-    <select id="listPage" resultType="com.casic.missiles.modular.system.entity.BusAlarm">
-        SELECT
-            alarm.ID as id,
-            alarm.DEVICE_ID as deviceId,
-            alarm.PROJECT_ID as projectId,
-            alarm.ALARM_TYPE as alarmType,
-            alarm.ALARM_VALUE as alarmValue,
-            alarm.ALARM_STATUS as alarmStatus,
-            alarm.ALARM_IMAGE AS alarmImage,
-            alarm.ALARM_CONTENT as alarmContent,
-            alarm.ALARM_TIME as alarmTime,
-            alarm.CANCEL_TIME as cancelTime,
-            alarm.ALARM_LNG as alarmLng,
-            alarm.ALARM_LAT as alarmLat,
-            p.WORK_TITLE as workTitle,
-            p.WORK_ROAD as workRoad,
-            p.PROJECT_STATE as projectState,
-            w.WORKER_NAME as workPersonName,
-            w.PHONE_NUMBER as workPersonPhoneNumber
-        FROM
-            `br_bus_alarm` alarm
-                LEFT JOIN br_work_site_info p on alarm.PROJECT_ID = p.ID
-                LEFT JOIN br_worker w on p.WORK_PERSON = w.ID
-        <where>
-            <if test="ew != null">
-                ${ew.sqlSegment}
-            </if>
-        </where>
-    </select>
-
-    <select id="cancelAlarm">
-        update br_bus_alarm
-        set ALARM_STATUS = '1'
-        where DEVICE_ID = #{deviceId}
-          and ALARM_TYPE = #{alarmType}
-          and ALARM_STATUS = '0'
-    </select>
-
-    <select id="alarmCount" resultType="com.casic.missiles.modular.system.dto.AlarmTypeCountDTO">
-        SELECT
-            ALARM_TYPE as alarmType,
-            count(*) as alarmCount
-        from br_bus_alarm
-        <where>
-            <if test="projectId != null and projectId !=''">
-                and PROJECT_ID = #{projectId}
-            </if>
-            <if test="alarmStatus != null and alarmStatus !=''">
-                and ALARM_STATUS = #{alarmStatus}
-            </if>
-        </where>
-        group by ALARM_TYPE
-    </select>
-</mapper>
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/BusEventImageMapper.xml b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/BusEventImageMapper.xml
deleted file mode 100644
index fbc3db3..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/BusEventImageMapper.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.casic.missiles.modular.system.mapper.BusEventImageMapper">
-
-</mapper>
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/BusEventMapper.xml b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/BusEventMapper.xml
deleted file mode 100644
index 627d573..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/BusEventMapper.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.casic.missiles.modular.system.mapper.BusEventMapper">
-
-</mapper>
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/DeviceExtMapper.xml b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/DeviceExtMapper.xml
deleted file mode 100644
index 5321d1c..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/DeviceExtMapper.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.casic.missiles.modular.system.mapper.DeviceExtMapper">
-
-</mapper>
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/DeviceMapper.xml b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/DeviceMapper.xml
index 94262e1..88e7d01 100644
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/DeviceMapper.xml
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/DeviceMapper.xml
@@ -2,96 +2,4 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.casic.missiles.modular.system.mapper.DeviceMapper">
 
-    <select id="listDetailPage" resultType="com.casic.missiles.modular.system.dto.DeviceDetailDTO">
-        select
-        br_device.ID as id,
-        DEVICE_CODE as deviceCode,
-        DEVICE_TYPE as deviceType,
-        DEVICE_BATCH as deviceBatch,
-        MANUFACTURER as manufacturer,
-        IS_POWER_SUPPLY as isPowerSupply,
-        CREATE_TIME as createTime,
-        CAMERA_CODE as cameraCode,
-        CAMERA_IP as cameraIp,
-        CAMERA_PORT as cameraPort,
-        GAS_CODE as gasCode,
-        GAS_IP as gasIp,
-        GAS_PORT as gasPort,
-        HAT_LINING_CODE as hatLiningCode
-        from br_device
-        left join br_device_ext ext on ext.DEVICE_ID = br_device.ID
-        <where>
-            <if test="ew != null">
-                ${ew.sqlSegment}
-            </if>
-        </where>
-    </select>
-
-    <select id="selectProjectDevice" resultType="java.lang.Long">
-        with device_info as (
-            (SELECT
-            d.DEVICE_ID as DEVICE_ID,
-            d.PROJECT_ID as PROJECT_ID,
-            p.PROJECT_STATE as PROJECT_STATE
-            from br_project_device d
-            LEFT JOIN br_work_site_info p on p.ID = d.PROJECT_ID)
-
-            UNION ALL
-
-            (SELECT
-            d1.ID as DEVICE_ID,
-            w1.ID as PROJECT_ID,
-            w1.PROJECT_STATE as PROJECT_STATE
-            FROM br_project_worker pw1
-            LEFT JOIN br_device d1 on pw1.BRACELET_CODE = d1.DEVICE_CODE
-            LEFT JOIN br_work_site_info w1 on pw1.PROJECT_ID = w1.ID)
-
-            UNION ALL
-
-            (SELECT
-            d1.ID as DEVICE_ID,
-            w1.ID as PROJECT_ID,
-            w1.PROJECT_STATE as PROJECT_STATE
-            FROM br_project_worker pw1
-            LEFT JOIN br_device d1 on pw1.HAT_CODE = d1.DEVICE_CODE
-            LEFT JOIN br_work_site_info w1 on pw1.PROJECT_ID = w1.ID)
-
-
-            UNION ALL
-
-            (SELECT
-            d1.ID as DEVICE_ID,
-            w1.ID as PROJECT_ID,
-            w1.PROJECT_STATE as PROJECT_STATE
-            FROM br_project_worker pw1
-            LEFT JOIN br_device d1 on pw1.VAST_CODE = d1.DEVICE_CODE
-            LEFT JOIN br_work_site_info w1 on pw1.PROJECT_ID = w1.ID))
-
-        select DISTINCT DEVICE_ID from device_info
-        <where>
-            DEVICE_ID is not null
-            <choose>
-                <when test="projectId != null and projectId !=''">
-                    and PROJECT_ID = #{projectId}
-                </when>
-                <otherwise>
-                    AND PROJECT_STATE != '3'
-                </otherwise>
-            </choose>
-        </where>
-    </select>
-
-    <select id="selectHelmetList" resultType="com.casic.missiles.modular.system.dto.HelmetInfoDTO">
-        SELECT
-            a.ID AS deviceId,
-            a.DEVICE_CODE AS hatCode,
-            b.HAT_LINING_CODE AS hatLiningCode
-        FROM
-            br_device a
-                LEFT JOIN br_device_ext b ON a.ID = b.DEVICE_ID
-        WHERE
-            a.DEVICE_TYPE = #{deviceType}
-          AND a.DEVICE_CODE IS NOT NULL
-          AND b.HAT_LINING_CODE IS NOT NULL
-    </select>
 </mapper>
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/ProjectDeviceMapper.xml b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/ProjectDeviceMapper.xml
deleted file mode 100644
index c6d1c24..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/ProjectDeviceMapper.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.casic.missiles.modular.system.mapper.ProjectDeviceMapper">
-
-    <select id="selectDetailByProjectId" resultType="com.casic.missiles.modular.system.entity.ProjectDevice">
-        SELECT
-            pd.ID as id,
-            pd.PROJECT_ID as projectId,
-            pd.DEVICE_ID as deviceId,
-            d.DEVICE_CODE as deviceCode
-        from br_project_device pd
-        LEFT JOIN br_device d on pd.DEVICE_ID = d.ID
-        <where>
-            pd.PROJECT_ID = #{projectId}
-        </where>
-    </select>
-
-    <select id="selectDeviceLocationList" resultType="com.casic.missiles.modular.system.dto.DeviceLocationDTO">
-        SELECT
-        d.ID as deviceId,
-        d.DEVICE_TYPE as deviceType,
-        d.DEVICE_CODE as deviceCode,
-        if(EXISTS(select ID from br_bus_alarm WHERE DEVICE_ID = d.ID and ALARM_STATUS = '0'),true,false) as alarmFlag
-        FROM br_project_device pd, br_device d
-        where pd.DEVICE_ID = d.ID
-        and pd.PROJECT_ID = #{projectId}
-    </select>
-
-</mapper>
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/ProjectWorkerMapper.xml b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/ProjectWorkerMapper.xml
deleted file mode 100644
index 8d2de10..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/ProjectWorkerMapper.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.casic.missiles.modular.system.mapper.ProjectWorkerMapper">
-
-    <select id="selectDetailByProjectId" resultType="com.casic.missiles.modular.system.entity.ProjectWorker">
-        SELECT
-            pw.ID as id,
-            pw.PROJECT_ID as projectId,
-            pw.WORKER_ID as workerId,
-            w.WORKER_NAME as workerName,
-            w.DEPT_ID as workerDeptId,
-            pw.HAT_CODE as hatCode,
-            pw.VAST_CODE as vastCode,
-            pw.BRACELET_CODE as braceletCode,
-            w.PHONE_NUMBER as workerPhoneNumber
-        from br_project_worker pw
-        LEFT JOIN br_worker w on pw.WORKER_ID = w.ID
-        <where>
-            pw.PROJECT_ID = #{projectId}
-            <if test="workerType != null and workerType != ''">
-                and w.WORKER_TYPE = #{workerType}
-            </if>
-        </where>
-    </select>
-
-    <select id="selectWorkerLocationList" resultType="com.casic.missiles.modular.system.dto.WorkerLocationDTO">
-        select
-            w.ID as workerId,
-            w.WORKER_NAME as workerName,
-            pw.HAT_CODE as hatCode,
-            hd.ID as hatId,
-            pw.BRACELET_CODE as braceletCode,
-            pw.VAST_CODE as vastCode
-        from br_project_worker pw,br_worker w ,br_device hd
-        WHERE pw.WORKER_ID = w.ID
-          and pw.HAT_CODE = hd.DEVICE_CODE
-          and pw.PROJECT_ID = #{projectId}
-          and w.WORKER_TYPE = #{workerType}
-    </select>
-</mapper>
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/WorkSiteInfoMapper.xml b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/WorkSiteInfoMapper.xml
deleted file mode 100644
index 8f01326..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/WorkSiteInfoMapper.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.casic.missiles.modular.system.mapper.WorkSiteInfoMapper">
-
-    <select id="selectListPage" resultType="com.casic.missiles.modular.system.entity.WorkSiteInfo">
-        SELECT
-            br_work_site_info.ID AS id,
-            WORK_TITLE as workTitle,
-            WORK_ROAD as workRoad,
-            WORK_SITE_DESC as workSiteDesc,
-            WORK_PERSON as workPerson,
-            WORKER_NAME as workPersonName,
-            DEPT_ID as workPersonDeptId,
-            PHONE_NUMBER as workPersonPhoneNumber,
-            PROJECT_STATE as projectState,
-            br_work_site_info.CREATE_TIME AS createTime,
-            br_work_site_info.UPDATE_TIME AS updateTime
-        FROM br_work_site_info
-        LEFT JOIN br_worker w ON br_work_site_info.WORK_PERSON = w.ID
-        <where>
-            <if test="ew != null">
-                ${ew.sqlSegment}
-            </if>
-        </where>
-    </select>
-</mapper>
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/WorkerMapper.xml b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/WorkerMapper.xml
deleted file mode 100644
index 3e28b39..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/WorkerMapper.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.casic.missiles.modular.system.mapper.WorkerMapper">
-
-    <select id="selectListPage" resultType="com.casic.missiles.modular.system.entity.Worker">
-        WITH worker_project AS (
-            SELECT
-                w.id AS ID,
-                WORKER_NAME,
-                GENDER,
-                DEPT_ID,
-                OWNER_SHIP,
-                PHONE_NUMBER,
-                ID_CARD_NUMBER,
-                ENTER_REASON,
-                WORKER_AVATAR,
-                w.CREATE_TIME,
-                WORKER_TYPE,
-                IF( p.PROJECT_STATE != '3', 1, 0 ) AS `STATUS`
-            FROM br_worker w
-            LEFT JOIN br_project_worker pw ON w.ID = pw.WORKER_ID
-            LEFT JOIN br_work_site_info p ON pw.PROJECT_ID = p.ID
-        )
-
-        SELECT
-            ID AS id,
-            WORKER_NAME AS workerName,
-            GENDER AS gender,
-            DEPT_ID AS deptId,
-            OWNER_SHIP AS ownerShip,
-            PHONE_NUMBER AS phoneNumber,
-            ID_CARD_NUMBER AS idCardNumber,
-            ENTER_REASON AS enterReason,
-            WORKER_AVATAR AS workerAvatar,
-            CREATE_TIME AS createTime,
-            WORKER_TYPE AS workerType,
-            `STATUS` AS `status`
-        FROM worker_project
-        <where>
-            <if test="ew != null">
-                ${ew.sqlSegment}
-            </if>
-        </where>
-    </select>
-
-    <select id="selectWorkerAvatars" resultType="java.lang.String">
-        SELECT
-            WORKER_AVATAR
-        FROM
-            `br_worker`
-        WHERE
-        ID IN ( SELECT WORKER_ID FROM br_project_worker WHERE PROJECT_ID = #{projectId} )
-          AND WORKER_AVATAR IS NOT NULL
-          AND WORKER_AVATAR != ''
-    </select>
-</mapper>
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IAlarmService.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IAlarmService.java
new file mode 100644
index 0000000..8bc01f4
--- /dev/null
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IAlarmService.java
@@ -0,0 +1,16 @@
+package com.casic.missiles.modular.system.service;
+
+import com.casic.missiles.modular.system.entity.Alarm;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 报警记录表 服务类
+ * </p>
+ *
+ * @author zyj
+ * @since 2023-05-25
+ */
+public interface IAlarmService extends IService<Alarm> {
+
+}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IBusAlarmService.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IBusAlarmService.java
deleted file mode 100644
index f63c19c..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IBusAlarmService.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package com.casic.missiles.modular.system.service;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.modular.system.dto.AlarmTypeCountDTO;
-import com.casic.missiles.modular.system.dto.AlarmUpload;
-import com.casic.missiles.modular.system.entity.BusAlarm;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-import java.util.List;
-
-/**
- * <p>
- * 报警记录表 服务类
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface IBusAlarmService extends IService<BusAlarm> {
-
-    boolean alarmUpload(AlarmUpload alarmUpload);
-
-    Page<BusAlarm> listPage(Page<BusAlarm> page,QueryWrapper<BusAlarm> queryWrapper);
-
-    List<AlarmTypeCountDTO> alarmCount(Long projectId,String alarmStatus);
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IBusEventImageService.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IBusEventImageService.java
deleted file mode 100644
index b1187ed..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IBusEventImageService.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.casic.missiles.modular.system.service;
-
-import com.casic.missiles.modular.system.entity.BusEventImage;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-import java.util.List;
-
-/**
- * <p>
- * 事件图片表 服务类
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface IBusEventImageService extends IService<BusEventImage> {
-
-    boolean saveBusEventImages(Long eventId, List<BusEventImage> imageList);
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IBusEventService.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IBusEventService.java
deleted file mode 100644
index 85c48d0..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IBusEventService.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package com.casic.missiles.modular.system.service;
-
-import com.casic.missiles.modular.system.entity.BusEvent;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-/**
- * <p>
- * 事件表 服务类
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface IBusEventService extends IService<BusEvent> {
-
-    boolean saveBusEvent(BusEvent busEvent);
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IDeviceExtService.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IDeviceExtService.java
deleted file mode 100644
index 6fc5361..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IDeviceExtService.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package com.casic.missiles.modular.system.service;
-
-import com.casic.missiles.modular.system.dto.DeviceDetailDTO;
-import com.casic.missiles.modular.system.entity.DeviceExt;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-import java.util.List;
-
-/**
- * <p>
- * 设备扩展信息表（安全树） 服务类
- * </p>
- *
- * @author zyj
- * @since 2023-04-27
- */
-public interface IDeviceExtService extends IService<DeviceExt> {
-
-    boolean saveDeviceExt(DeviceDetailDTO deviceDetailDTO);
-
-    boolean updateDeviceExt(DeviceDetailDTO deviceDetailDTO);
-
-    boolean removeByDeviceIds(List<Long> deviceIds);
-
-    boolean setGasThreshold(String gasIp,String gasPort,String threshold);
-
-    String getGasThreshold(String gasIp,String gasPort);
-
-    Long selectByGasIpPort(String gasIp,String gasPort);
-
-    Long selectByCameraIpPort(String cameraIp,String cameraPort);
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java
index 9e62756..00a421d 100644
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java
@@ -1,32 +1,16 @@
 package com.casic.missiles.modular.system.service;
 
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.modular.system.dto.DeviceDetailDTO;
-import com.casic.missiles.modular.system.dto.HelmetInfoDTO;
 import com.casic.missiles.modular.system.entity.Device;
 import com.baomidou.mybatisplus.extension.service.IService;
 
-import java.util.List;
-
 /**
  * <p>
- *  服务类
+ * 设备记录表 服务类
  * </p>
  *
  * @author zyj
- * @since 2023-04-14
+ * @since 2023-05-25
  */
 public interface IDeviceService extends IService<Device> {
 
-    boolean saveDevice(DeviceDetailDTO deviceDetailDTO);
-
-    boolean updateDevice(DeviceDetailDTO deviceDetailDTO);
-
-    boolean deleteDevices(List<Long> deviceIds);
-
-    Page<DeviceDetailDTO> listPage(Page<DeviceDetailDTO> page, QueryWrapper<DeviceDetailDTO> queryWrapper, String status,Long projectId);
-
-    List<Long> selectProjectDevice(Long projectId);
-
 }
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IProjectDeviceService.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IProjectDeviceService.java
deleted file mode 100644
index 8599411..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IProjectDeviceService.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package com.casic.missiles.modular.system.service;
-
-import com.casic.missiles.modular.system.dto.DeviceLocationDTO;
-import com.casic.missiles.modular.system.entity.ProjectDevice;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-import java.util.List;
-
-/**
- * <p>
- *  服务类
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface IProjectDeviceService extends IService<ProjectDevice> {
-
-    boolean saveProjectDeviceList(Long projectId, List<ProjectDevice> projectDeviceList);
-
-    boolean updateProjectDeviceList(Long projectId, List<ProjectDevice> projectDeviceList);
-
-    boolean deleteByProjectId(Long projectId);
-
-    boolean deleteByProjectIds(List<Long> projectIds);
-
-    List<ProjectDevice> selectDetailByProjectId(Long projectId);
-
-    Long selectProjectIdByDevice(Long deviceId);
-
-    List<DeviceLocationDTO> selectDeviceLocationList(Long projectId);
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IProjectWorkerService.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IProjectWorkerService.java
deleted file mode 100644
index e921bc3..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IProjectWorkerService.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package com.casic.missiles.modular.system.service;
-
-import com.casic.missiles.modular.system.dto.WorkerLocationDTO;
-import com.casic.missiles.modular.system.entity.ProjectDevice;
-import com.casic.missiles.modular.system.entity.ProjectWorker;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-import java.util.List;
-
-/**
- * <p>
- *  服务类
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface IProjectWorkerService extends IService<ProjectWorker> {
-
-    boolean saveProjectWorkerList(Long projectId, List<ProjectWorker> projectWorkerList);
-
-    boolean updateProjectWorkerList(Long projectId, List<ProjectWorker> projectWorkerList);
-
-    boolean deleteByProjectId(Long projectId);
-
-    boolean deleteByProjectIds(List<Long> projectIds);
-
-    List<ProjectWorker> selectDetailByProjectId(Long projectId,String workerType);
-
-    List<WorkerLocationDTO> selectWorkerLocationDTO(Long projectId);
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IWorkSiteInfoService.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IWorkSiteInfoService.java
deleted file mode 100644
index 58a8590..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IWorkSiteInfoService.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package com.casic.missiles.modular.system.service;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.modular.system.dto.WorkSiteDetailDTO;
-import com.casic.missiles.modular.system.entity.WorkSiteInfo;
-import com.baomidou.mybatisplus.extension.service.IService;
-import java.util.List;
-/**
- * <p>
- * 作业现场表 服务类
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface IWorkSiteInfoService extends IService<WorkSiteInfo> {
-
-    boolean addWorkSiteInfo(WorkSiteDetailDTO workSiteDetailDTO);
-
-    boolean updateWorkSiteInfo(WorkSiteDetailDTO workSiteDetailDTO);
-
-    boolean deleteProjects(List<Long> projectIds);
-
-    WorkSiteDetailDTO getWorkSiteDetail(Long projectId);
-
-    Page<WorkSiteInfo> selectListPage(Page<WorkSiteInfo> page, QueryWrapper<WorkSiteInfo> queryWrapper);
-
-    boolean start(Long projectId);
-
-    boolean finish(Long projectId);
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IWorkerService.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IWorkerService.java
deleted file mode 100644
index 6c6ee98..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IWorkerService.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package com.casic.missiles.modular.system.service;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.modular.system.entity.Worker;
-import com.baomidou.mybatisplus.extension.service.IService;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * <p>
- *  服务类
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface IWorkerService extends IService<Worker> {
-
-    boolean addWorker(Worker worker,Long projectId);
-
-    Page<Worker> selectListPage(Page<Worker> page,QueryWrapper<Worker> ew);
-
-    Worker selectWorkerDetail(Long workerId);
-
-    List<String> faceRegister(String cameraIp,String cameraPort);
-
-    List<Worker> projectTempWorker(Long projectId);
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/impl/AlarmServiceImpl.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/impl/AlarmServiceImpl.java
new file mode 100644
index 0000000..6e5959b
--- /dev/null
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/impl/AlarmServiceImpl.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.modular.system.service.impl;
+
+import com.casic.missiles.modular.system.entity.Alarm;
+import com.casic.missiles.modular.system.mapper.AlarmMapper;
+import com.casic.missiles.modular.system.service.IAlarmService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 报警记录表 服务实现类
+ * </p>
+ *
+ * @author zyj
+ * @since 2023-05-25
+ */
+@Service
+public class AlarmServiceImpl extends ServiceImpl<AlarmMapper, Alarm> implements IAlarmService {
+
+}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/impl/BusAlarmServiceImpl.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/impl/BusAlarmServiceImpl.java
deleted file mode 100644
index b44de1d..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/impl/BusAlarmServiceImpl.java
+++ /dev/null
@@ -1,121 +0,0 @@
-package com.casic.missiles.modular.system.service.impl;
-
-import cn.hutool.core.date.DateUtil;
-import cn.hutool.core.util.ObjectUtil;
-import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.core.application.service.AbstractDictService;
-import com.casic.missiles.modular.system.consts.AlarmTypeEnum;
-import com.casic.missiles.modular.system.dto.AlarmTypeCountDTO;
-import com.casic.missiles.modular.system.dto.AlarmUpload;
-import com.casic.missiles.modular.system.entity.BusAlarm;
-import com.casic.missiles.modular.system.entity.DataTreeLocation;
-import com.casic.missiles.modular.system.mapper.BusAlarmMapper;
-import com.casic.missiles.modular.system.service.*;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.util.Date;
-import java.util.List;
-import java.util.stream.Collectors;
-
-import static com.casic.missiles.modular.system.consts.AlarmConst.ALARM_STATUS_ON;
-
-/**
- * <p>
- * 报警记录表 服务实现类
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@Service
-@RequiredArgsConstructor
-@Slf4j
-public class BusAlarmServiceImpl extends ServiceImpl<BusAlarmMapper, BusAlarm> implements IBusAlarmService {
-
-    private final IDeviceExtService deviceExtService;
-    private final IDeviceService deviceService;
-    private final IProjectDeviceService projectDeviceService;
-
-    private final ICasicFileService fileService;
-
-    private final AbstractDictService dictService;
-    private final IDataSupportService dataSupportService;
-
-    @Override
-    @Transactional
-    public boolean alarmUpload(AlarmUpload alarmUpload) {
-        log.info("alarm upload ==> {}",alarmUpload.toString());
-        Long deviceId = null;
-        if(StrUtil.isAllNotBlank(alarmUpload.getGasIp(),alarmUpload.getGasPort())){
-            deviceId = deviceExtService.selectByGasIpPort(alarmUpload.getGasIp(),alarmUpload.getGasPort());
-        }
-        if(ObjectUtil.isEmpty(deviceId) && StrUtil.isAllNotBlank(alarmUpload.getCameraIp(),alarmUpload.getCameraPort())){
-            deviceId = deviceExtService.selectByCameraIpPort(alarmUpload.getCameraIp(),alarmUpload.getCameraPort());
-        }
-
-        if(ObjectUtil.isEmpty(deviceId)){
-            return false;
-        }
-
-        BusAlarm alarm = new BusAlarm();
-        alarm.setDeviceId(deviceId);
-        alarm.setProjectId(projectDeviceService.selectProjectIdByDevice(deviceId));
-        alarm.setAlarmValue(alarmUpload.getAlarmValue());
-        if(StrUtil.isNotEmpty(alarmUpload.getAlarmTime())){
-            alarm.setAlarmTime(DateUtil.parseDateTime(alarmUpload.getAlarmTime()));
-        }else {
-            alarm.setAlarmTime(new Date());
-        }
-
-        alarm.setAlarmType(alarmUpload.getAlarmType());
-        alarm.setAlarmContent(alarmUpload.getAlarmContent());
-        if(StrUtil.isNotEmpty(alarmUpload.getAlarmImage())){
-            String imgBase64 = "data:image/jpeg;base64," + alarmUpload.getAlarmImage();
-            String imageUrl = fileService.saveFile(imgBase64);
-            alarm.setAlarmImage(imageUrl);
-        }
-        alarm.setAlarmStatus(ALARM_STATUS_ON);
-
-        DataTreeLocation treeLocation = dataSupportService.getTreeLocation(deviceId);
-        if(ObjectUtil.isNotEmpty(treeLocation)){
-            alarm.setAlarmLng(treeLocation.getGdLng());
-            alarm.setAlarmLat(treeLocation.getGdLat());
-        }
-
-        //自动消警
-        AlarmTypeEnum alarmTypeEnum = AlarmTypeEnum.getByAlarmType(alarm.getAlarmType());
-        if(ObjectUtil.isNotEmpty(alarmTypeEnum) && alarmTypeEnum.isAutoCancel()){
-            this.baseMapper.cancelAlarm(deviceId,alarm.getAlarmType());
-        }
-        return this.save(alarm);
-    }
-
-    @Override
-    public Page<BusAlarm> listPage(Page<BusAlarm> page, QueryWrapper<BusAlarm> queryWrapper) {
-        page = this.baseMapper.listPage(page, queryWrapper);
-        for (BusAlarm alarm : page.getRecords()) {
-            alarm.setAlarmTypeName(dictService.getDictNameByCode("alarmType",alarm.getAlarmType()));
-            alarm.setAlarmStatusName(dictService.getDictNameByCode("alarmStatus",alarm.getAlarmStatus()));
-            if(StrUtil.isNotEmpty(alarm.getProjectState())){
-                alarm.setProjectStateName(dictService.getDictNameByCode("projectStatus",alarm.getProjectState()));
-            }
-        }
-        return page;
-    }
-
-    @Override
-    public List<AlarmTypeCountDTO> alarmCount(Long projectId, String alarmStatus) {
-        List<AlarmTypeCountDTO> list = this.baseMapper.alarmCount(projectId, alarmStatus);
-        list = list.stream().filter(i->StrUtil.isNotEmpty(i.getAlarmType())).collect(Collectors.toList());
-        for (AlarmTypeCountDTO countDTO : list) {
-            countDTO.setAlarmTypeName(dictService.getDictNameByCode("alarmType",countDTO.getAlarmType()));
-        }
-        return list;
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/impl/BusEventImageServiceImpl.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/impl/BusEventImageServiceImpl.java
deleted file mode 100644
index a43f7c1..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/impl/BusEventImageServiceImpl.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package com.casic.missiles.modular.system.service.impl;
-
-import com.casic.missiles.modular.system.entity.BusEventImage;
-import com.casic.missiles.modular.system.mapper.BusEventImageMapper;
-import com.casic.missiles.modular.system.service.IBusEventImageService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-/**
- * <p>
- * 事件图片表 服务实现类
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@Service
-public class BusEventImageServiceImpl extends ServiceImpl<BusEventImageMapper, BusEventImage> implements IBusEventImageService {
-
-    @Override
-    public boolean saveBusEventImages(Long eventId, List<BusEventImage> imageList) {
-        imageList.forEach(i->i.setEventId(eventId));
-        return this.saveBatch(imageList);
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/impl/BusEventServiceImpl.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/impl/BusEventServiceImpl.java
deleted file mode 100644
index 21e511c..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/impl/BusEventServiceImpl.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package com.casic.missiles.modular.system.service.impl;
-
-import com.casic.missiles.modular.system.entity.BusEvent;
-import com.casic.missiles.modular.system.mapper.BusEventMapper;
-import com.casic.missiles.modular.system.service.IBusEventImageService;
-import com.casic.missiles.modular.system.service.IBusEventService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import lombok.RequiredArgsConstructor;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.util.Date;
-
-/**
- * <p>
- * 事件表 服务实现类
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@Service
-@RequiredArgsConstructor
-public class BusEventServiceImpl extends ServiceImpl<BusEventMapper, BusEvent> implements IBusEventService {
-
-    private final IBusEventImageService busEventImageService;
-
-
-    @Override
-    @Transactional
-    public boolean saveBusEvent(BusEvent busEvent) {
-        busEvent.setCreateTime(new Date());
-        boolean res = this.save(busEvent);
-        if(res){
-            res = busEventImageService.saveBusEventImages(busEvent.getId(),busEvent.getImageList());
-        }
-        return res;
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceExtServiceImpl.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceExtServiceImpl.java
deleted file mode 100644
index 2bdb63d..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceExtServiceImpl.java
+++ /dev/null
@@ -1,102 +0,0 @@
-package com.casic.missiles.modular.system.service.impl;
-
-import cn.hutool.core.util.ObjectUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
-import com.casic.missiles.modular.system.dto.DeviceDetailDTO;
-import com.casic.missiles.modular.system.entity.DeviceExt;
-import com.casic.missiles.modular.system.mapper.DeviceExtMapper;
-import com.casic.missiles.modular.system.service.IDeviceExtService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-/**
- * <p>
- * 设备扩展信息表（安全树） 服务实现类
- * </p>
- *
- * @author zyj
- * @since 2023-04-27
- */
-@Service
-public class DeviceExtServiceImpl extends ServiceImpl<DeviceExtMapper, DeviceExt> implements IDeviceExtService {
-
-
-    @Override
-    public boolean saveDeviceExt(DeviceDetailDTO deviceDetailDTO) {
-        DeviceExt ext = new DeviceExt();
-        ext.setDeviceId(deviceDetailDTO.getId());
-        ext.setCameraCode(deviceDetailDTO.getCameraCode());
-        ext.setCameraIp(deviceDetailDTO.getCameraIp());
-        ext.setCameraPort(deviceDetailDTO.getCameraPort());
-        ext.setGasCode(deviceDetailDTO.getGasCode());
-        ext.setGasIp(deviceDetailDTO.getGasIp());
-        ext.setGasPort(deviceDetailDTO.getGasPort());
-        ext.setHatLiningCode(deviceDetailDTO.getHatLiningCode());
-        return this.save(ext);
-    }
-
-    @Override
-    public boolean updateDeviceExt(DeviceDetailDTO deviceDetailDTO) {
-        DeviceExt ext = this.selectByDeviceId(deviceDetailDTO.getId());
-        ext.setCameraCode(deviceDetailDTO.getCameraCode());
-        ext.setCameraIp(deviceDetailDTO.getCameraIp());
-        ext.setCameraPort(deviceDetailDTO.getCameraPort());
-        ext.setGasCode(deviceDetailDTO.getGasCode());
-        ext.setGasIp(deviceDetailDTO.getGasIp());
-        ext.setGasPort(deviceDetailDTO.getGasPort());
-        ext.setHatLiningCode(deviceDetailDTO.getHatLiningCode());
-        return this.updateById(ext);
-    }
-
-    @Override
-    public boolean removeByDeviceIds(List<Long> deviceIds) {
-        QueryWrapper<DeviceExt> queryWrapper = new QueryWrapper<>();
-        queryWrapper.in("DEVICE_ID",deviceIds);
-        return this.remove(queryWrapper);
-    }
-
-    @Override
-    public boolean setGasThreshold(String gasIp, String gasPort, String threshold) {
-        UpdateWrapper<DeviceExt> updateWrapper = new UpdateWrapper<>();
-        updateWrapper.set("GAS_THRESHOLD",threshold);
-        updateWrapper.eq("GAS_IP",gasIp);
-        updateWrapper.eq("GAS_PORT",gasPort);
-        return this.update(updateWrapper);
-    }
-
-    @Override
-    public String getGasThreshold(String gasIp, String gasPort) {
-        QueryWrapper<DeviceExt> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("GAS_IP",gasIp);
-        queryWrapper.eq("GAS_PORT",gasPort);
-        DeviceExt deviceExt = this.getOne(queryWrapper);
-        return ObjectUtil.isNotEmpty(deviceExt) ? deviceExt.getGasThreshold() : null;
-    }
-
-    private DeviceExt selectByDeviceId(Long deviceId){
-        QueryWrapper<DeviceExt> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("DEVICE_ID",deviceId);
-        return this.getOne(queryWrapper);
-    }
-
-    @Override
-    public Long selectByGasIpPort(String gasIp, String gasPort) {
-        QueryWrapper<DeviceExt> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("GAS_IP",gasIp);
-        queryWrapper.eq("GAS_PORT",gasPort);
-        DeviceExt deviceExt = this.getOne(queryWrapper);
-        return ObjectUtil.isNotEmpty(deviceExt) ? deviceExt.getDeviceId() : null;
-    }
-
-    @Override
-    public Long selectByCameraIpPort(String cameraIp, String cameraPort) {
-        QueryWrapper<DeviceExt> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("CAMERA_IP",cameraIp);
-        queryWrapper.eq("CAMERA_PORT",cameraPort);
-        DeviceExt deviceExt = this.getOne(queryWrapper);
-        return ObjectUtil.isNotEmpty(deviceExt) ? deviceExt.getDeviceId() : null;
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java
index 9df79ef..31a5a18 100644
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java
@@ -1,125 +1,20 @@
 package com.casic.missiles.modular.system.service.impl;
 
-import cn.hutool.core.collection.CollUtil;
-import cn.hutool.core.date.DateUtil;
-import cn.hutool.core.util.ObjectUtil;
-import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.core.application.service.AbstractDictService;
-import com.casic.missiles.modular.system.dto.DeviceDetailDTO;
-import com.casic.missiles.modular.system.dto.HelmetInfoDTO;
 import com.casic.missiles.modular.system.entity.Device;
 import com.casic.missiles.modular.system.mapper.DeviceMapper;
-import com.casic.missiles.modular.system.service.IDeviceExtService;
 import com.casic.missiles.modular.system.service.IDeviceService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.casic.missiles.modular.system.service.IProjectDeviceService;
-import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.util.Date;
-import java.util.List;
-
-import static com.casic.missiles.modular.system.consts.DeviceConst.*;
 
 /**
  * <p>
- *  服务实现类
+ * 设备记录表 服务实现类
  * </p>
  *
  * @author zyj
- * @since 2023-04-14
+ * @since 2023-05-25
  */
 @Service
-@RequiredArgsConstructor
 public class DeviceServiceImpl extends ServiceImpl<DeviceMapper, Device> implements IDeviceService {
 
-    private final AbstractDictService dictService;
-    private final IDeviceExtService deviceExtService;
-
-    private final IProjectDeviceService projectDeviceService;
-
-    @Transactional
-    @Override
-    public boolean saveDevice(DeviceDetailDTO deviceDetailDTO) {
-        deviceDetailDTO.setCreateTime(new Date());
-        boolean deviceRes = this.save(deviceDetailDTO);
-        if(deviceRes && DEVICE_TYPE_TREE.equals(deviceDetailDTO.getDeviceType())){
-            deviceRes = deviceExtService.saveDeviceExt(deviceDetailDTO);
-        }
-        return deviceRes;
-    }
-
-    @Transactional
-    @Override
-    public boolean updateDevice(DeviceDetailDTO deviceDetailDTO) {
-        boolean deviceRes = this.updateById(deviceDetailDTO);
-        if(deviceRes && DEVICE_TYPE_TREE.equals(deviceDetailDTO.getDeviceType())){
-            deviceRes = deviceExtService.updateDeviceExt(deviceDetailDTO);
-        }
-        return deviceRes;
-    }
-
-    @Transactional
-    @Override
-    public boolean deleteDevices(List<Long> deviceIds) {
-        return this.removeByIds(deviceIds) & deviceExtService.removeByDeviceIds(deviceIds);
-    }
-
-    @Override
-    public Page<DeviceDetailDTO> listPage(Page<DeviceDetailDTO> page, QueryWrapper<DeviceDetailDTO> queryWrapper,String status,Long projectId) {
-        String ID_COLUMN_NAME = "br_device.ID";
-        List<Long> useDevices = this.selectProjectDevice(null);
-        List<Long> projectDevices;
-        if(ObjectUtil.isNotEmpty(projectId)){
-            projectDevices = this.selectProjectDevice(projectId);
-        } else {
-            projectDevices = null;
-        }
-
-        // 查询使用中的设备（如果传了 projectId，查询 使用中&&此现场）
-        if(DEVICE_STATUS_USE.equals(status)){
-            if(CollUtil.isEmpty(useDevices)){
-                return page;
-            }
-            if(ObjectUtil.isNotEmpty(projectId) && CollUtil.isEmpty(projectDevices)){
-                return page;
-            }
-            queryWrapper.in(ID_COLUMN_NAME,useDevices);
-            if(CollUtil.isNotEmpty(projectDevices)){
-                queryWrapper.in(ID_COLUMN_NAME,projectDevices);
-            }
-
-        }
-
-        // 查询未使用的设备（如果传了 projectId，查询 未使用||此现场）
-        if(DEVICE_STATUS_NORMAL.equals(status)) {
-            if (CollUtil.isNotEmpty(useDevices)) {
-                if (CollUtil.isEmpty(projectDevices)) {
-                    queryWrapper.notIn(ID_COLUMN_NAME, useDevices);
-                } else {
-                    queryWrapper.and(i -> i.notIn(ID_COLUMN_NAME, useDevices).or().in(ID_COLUMN_NAME, projectDevices));
-                }
-            }
-        }
-
-        page = this.baseMapper.listDetailPage(page, queryWrapper);
-        for (DeviceDetailDTO record : page.getRecords()) {
-            record.setDeviceTypeName(dictService.getDictNameByCode("deviceType",record.getDeviceType()));
-            record.setIsPowerSupplyName(dictService.getDictNameByCode("isPowerSupply",record.getIsPowerSupply()));
-            record.setRegisterTime(DateUtil.formatDate(record.getCreateTime()));
-            record.setStatus(useDevices.contains(record.getId()) ? DEVICE_STATUS_USE : DEVICE_STATUS_NORMAL);
-            record.setStatusName(dictService.getDictNameByCode("deviceStatus",record.getStatus()));
-        }
-        return page;
-    }
-
-    @Override
-    public List<Long> selectProjectDevice(Long projectId) {
-        return this.baseMapper.selectProjectDevice(projectId);
-    }
-
-
 }
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceSupportServiceImpl.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceSupportServiceImpl.java
deleted file mode 100644
index ffd01ff..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceSupportServiceImpl.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package com.casic.missiles.modular.system.service.impl;
-
-import com.casic.missiles.modular.system.dto.HelmetInfoDTO;
-import com.casic.missiles.modular.system.mapper.DeviceMapper;
-import com.casic.missiles.modular.system.service.IDeviceExtService;
-import com.casic.missiles.modular.system.service.IDeviceSupportService;
-import lombok.RequiredArgsConstructor;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-import static com.casic.missiles.modular.system.consts.DeviceConst.DEVICE_TYPE_HAT;
-
-@Service
-@RequiredArgsConstructor
-public class DeviceSupportServiceImpl implements IDeviceSupportService {
-
-    private final IDeviceExtService deviceExtService;
-
-    private final DeviceMapper deviceMapper;
-
-    @Override
-    public Long selectByGasIpPort(String gasIp, String gasPort) {
-        return deviceExtService.selectByGasIpPort(gasIp, gasPort);
-    }
-
-    @Override
-    public List<HelmetInfoDTO> selectHelmetList() {
-        return deviceMapper.selectHelmetList(DEVICE_TYPE_HAT);
-    }
-}

diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/AlarmController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/AlarmController.java
new file mode 100644
index 0000000..1795cf1
--- /dev/null
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/AlarmController.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.modular.system.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.stereotype.Controller;
+
+/**
+ * <p>
+ * 报警记录表 前端控制器
+ * </p>
+ *
+ * @author zyj
+ * @since 2023-05-25
+ */
+@Controller
+@RequestMapping("/system/alarm")
+public class AlarmController {
+
+}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusAlarmController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusAlarmController.java
deleted file mode 100644
index 1f82ebb..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusAlarmController.java
+++ /dev/null
@@ -1,102 +0,0 @@
-package com.casic.missiles.modular.system.controller;
-
-
-import cn.hutool.core.util.ObjectUtil;
-import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.core.base.controller.BaseController;
-import com.casic.missiles.core.page.PageFactory;
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.AlarmUpload;
-import com.casic.missiles.modular.system.dto.DeviceDetailDTO;
-import com.casic.missiles.modular.system.entity.BusAlarm;
-import com.casic.missiles.modular.system.service.IBusAlarmService;
-import io.swagger.annotations.*;
-import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.*;
-
-import org.springframework.stereotype.Controller;
-
-import static com.casic.missiles.model.response.ResponseData.DEFAULT_SUCCESS_MESSAGE;
-import static com.casic.missiles.modular.system.consts.AlarmConst.ALARM_STATUS_MANUAL_CANCEL;
-
-/**
- * <p>
- * 报警记录表 前端控制器
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@Api(tags = "报警管理接口")
-@Controller
-@RequestMapping("/alarm")
-@RequiredArgsConstructor
-public class BusAlarmController extends BaseController {
-
-    private final IBusAlarmService alarmService;
-
-    @ApiOperation("报警上报接口")
-    @PostMapping("/upload")
-    @ResponseBody
-    public Object upload(@RequestBody AlarmUpload alarmUpload){
-        alarmService.alarmUpload(alarmUpload);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("报警列表分页查询")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "workTitle", value = "作业名称",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "projectId", value = "作业ID",dataType = "Long", paramType = "query",example = "0"),
-            @ApiImplicitParam(name = "alarmStatus", value = "报警状态",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "projectState", value = "作业状态",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "alarmType", value = "报警类型",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "alarmStartTime", value = "报警开始时间",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "alarmEndTime", value = "报警结束时间",dataType = "String", paramType = "query")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = BusAlarm.class),
-    })
-    @GetMapping("/listPage")
-    @ResponseBody
-    public Object listPage(String workTitle,Long projectId,String alarmStatus,String projectState,String alarmType,String alarmStartTime,String alarmEndTime){
-        Page<BusAlarm> page = PageFactory.defaultPage();
-        QueryWrapper<BusAlarm> queryWrapper = new QueryWrapper<>();
-        if(StrUtil.isNotEmpty(workTitle)){
-            queryWrapper.like("p.WORK_TITLE",workTitle);
-        }
-        if(ObjectUtil.isNotEmpty(projectId)){
-            queryWrapper.eq("alarm.PROJECT_ID",projectId);
-        }
-        if(StrUtil.isNotEmpty(alarmStatus)){
-            queryWrapper.eq("alarm.ALARM_STATUS",alarmStatus);
-        }
-        if(StrUtil.isNotEmpty(projectState)){
-            queryWrapper.eq("p.PROJECT_STATE",projectState);
-        }
-        if(StrUtil.isNotEmpty(alarmType)){
-            queryWrapper.eq("alarm.ALARM_TYPE",alarmType);
-        }
-        if(StrUtil.isNotEmpty(alarmStartTime)){
-            queryWrapper.ge("alarm.ALARM_TIME",alarmStartTime);
-        }
-        if(StrUtil.isNotEmpty(alarmEndTime)){
-            queryWrapper.le("alarm.ALARM_TIME",alarmEndTime);
-        }
-        page = alarmService.listPage(page,queryWrapper);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-    @ApiOperation("消警")
-    @PostMapping("/cancel")
-    @ResponseBody
-    public Object cancel(@RequestParam("alarmId") Long alarmId){
-        UpdateWrapper<BusAlarm> updateWrapper = new UpdateWrapper<>();
-        updateWrapper.eq("ID",alarmId);
-        updateWrapper.set("ALARM_STATUS",ALARM_STATUS_MANUAL_CANCEL);
-        alarmService.update(updateWrapper);
-        return ResponseData.success();
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusEventController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusEventController.java
deleted file mode 100644
index dde5aad..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusEventController.java
+++ /dev/null
@@ -1,41 +0,0 @@
-package com.casic.missiles.modular.system.controller;
-
-
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.entity.BusEvent;
-import com.casic.missiles.modular.system.service.IBusEventService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.ResponseBody;
-
-/**
- * <p>
- * 事件表 前端控制器
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@Controller
-@RequestMapping("/event")
-@Api(tags = "事件上报")
-@RequiredArgsConstructor
-public class BusEventController {
-
-    private final IBusEventService eventService;
-
-    @ApiOperation("事件上报")
-    @PostMapping("add")
-    @ResponseBody
-    public Object add(@RequestBody BusEvent busEvent){
-        eventService.saveBusEvent(busEvent);
-        return ResponseData.success();
-    }
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
index 03abc5f..aa50d78 100644
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
@@ -1,121 +1,20 @@
 package com.casic.missiles.modular.system.controller;
 
 
-import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.core.base.controller.BaseController;
-import com.casic.missiles.core.page.PageFactory;
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.DeviceDetailDTO;
-import com.casic.missiles.modular.system.entity.Device;
-import com.casic.missiles.modular.system.service.IDeviceExtService;
-import com.casic.missiles.modular.system.service.IDeviceService;
-import io.swagger.annotations.*;
-import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.RequestMapping;
 
 import org.springframework.stereotype.Controller;
 
-import java.time.LocalDateTime;
-import java.util.Date;
-import java.util.List;
-
-import static com.casic.missiles.model.response.ResponseData.DEFAULT_SUCCESS_MESSAGE;
-
 /**
  * <p>
- *  前端控制器
+ * 设备记录表 前端控制器
  * </p>
  *
  * @author zyj
- * @since 2023-04-14
+ * @since 2023-05-25
  */
-@Api(tags = "设备管理接口")
-@RequiredArgsConstructor
 @Controller
-@RequestMapping("/device")
-public class DeviceController extends BaseController {
-    private final IDeviceService deviceService;
-    private final IDeviceExtService deviceExtService;
-
-    @ApiOperation("设备分页列表")
-    @ApiImplicitParams({
-        @ApiImplicitParam(name = "deviceType", value = "设备类型",dataType = "String", paramType = "query"),
-        @ApiImplicitParam(name = "deviceCode", value = "设备编号",dataType = "String", paramType = "query"),
-        @ApiImplicitParam(name = "status", value = "设备状态",dataType = "String", paramType = "query"),
-        @ApiImplicitParam(name = "projectId", value = "作业ID（如果传此参数，列表中返回该作业使用的设备）",dataType = "Long", paramType = "query", example = "0")
-    })
-    @ApiResponses({
-        @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = DeviceDetailDTO.class),
-    })
-    @GetMapping("listPage")
-    @ResponseBody
-    public Object listPage(String deviceType, String deviceCode, String status,Long projectId){
-        Page<DeviceDetailDTO> page = PageFactory.defaultPage();
-        QueryWrapper<DeviceDetailDTO> queryWrapper = new QueryWrapper<>();
-        if(StrUtil.isNotEmpty(deviceType)){
-            queryWrapper.eq("DEVICE_TYPE",deviceType);
-        }
-        if(StrUtil.isNotEmpty(deviceCode)){
-            queryWrapper.like("DEVICE_CODE",deviceCode);
-        }
-        page = deviceService.listPage(page,queryWrapper,status,projectId);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-    @ApiOperation("新增设备")
-    @PostMapping("add")
-    @ResponseBody
-    public Object add(@RequestBody DeviceDetailDTO deviceDetailDTO){
-        deviceService.saveDevice(deviceDetailDTO);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("编辑设备")
-    @PostMapping("update")
-    @ResponseBody
-    public Object update(@RequestBody DeviceDetailDTO deviceDetailDTO){
-        deviceService.updateDevice(deviceDetailDTO);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("删除设备")
-    @PostMapping("delete")
-    @ResponseBody
-    public Object delete(@ApiParam("设备id列表")@RequestBody List<Long> deviceIds){
-        deviceService.deleteDevices(deviceIds);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("设置甲烷阈值")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "gasIp", value = "安全树甲烷设备IP",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "gasPort", value = "安全树甲烷端口",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "threshold", value = "甲烷阈值",dataType = "String", paramType = "query")
-    })
-    @PostMapping("setThreshold")
-    @ResponseBody
-    public Object setThreshold(String gasIp,String gasPort,String threshold){
-        deviceExtService.setGasThreshold(gasIp, gasPort, threshold);
-        return ResponseData.success();
-    }
-
-
-    @ApiOperation("查询甲烷阈值")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "gasIp", value = "安全树甲烷设备IP",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "gasPort", value = "安全树甲烷端口",dataType = "String", paramType = "query")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = "{\"code\": 200,\"data\": \"100\",\"message\": \"请求成功\",\"success\": true}",response = String.class),
-    })
-    @GetMapping("getThreshold")
-    @ResponseBody
-    public Object getThreshold(String gasIp,String gasPort){
-        String data = deviceExtService.getGasThreshold(gasIp, gasPort);
-        return ResponseData.success(data);
-    }
-
+@RequestMapping("/system/device")
+public class DeviceController {
 
 }
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/OverviewController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/OverviewController.java
deleted file mode 100644
index 7570504..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/OverviewController.java
+++ /dev/null
@@ -1,70 +0,0 @@
-package com.casic.missiles.modular.system.controller;
-
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.AlarmTypeCountDTO;
-import com.casic.missiles.modular.system.dto.DeviceLocationDTO;
-import com.casic.missiles.modular.system.dto.WorkerLocationDTO;
-import com.casic.missiles.modular.system.service.IBusAlarmService;
-import com.casic.missiles.modular.system.service.IProjectDeviceService;
-import com.casic.missiles.modular.system.service.IProjectWorkerService;
-import io.swagger.annotations.*;
-import lombok.RequiredArgsConstructor;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.ResponseBody;
-
-import static com.casic.missiles.model.response.ResponseData.DEFAULT_SUCCESS_MESSAGE;
-import static com.casic.missiles.modular.system.consts.AlarmConst.ALARM_STATUS_ON;
-
-@Api(tags = "首页看板接口")
-@Controller
-@RequestMapping("overview")
-@RequiredArgsConstructor
-public class OverviewController {
-
-    private final IBusAlarmService alarmService;
-    private final IProjectDeviceService projectDeviceService;
-
-    private final IProjectWorkerService projectWorkerService;
-
-
-    @ApiOperation("报警统计接口")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "projectId", value = "作业ID",dataType = "Long", paramType = "query", example = "0")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = AlarmTypeCountDTO.class),
-    })
-    @GetMapping("/alarmCount")
-    @ResponseBody
-    public Object alarmCount(Long projectId){
-        return ResponseData.success(alarmService.alarmCount(projectId,ALARM_STATUS_ON));
-    }
-
-    @ApiOperation("设备列表接口")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "projectId", value = "作业ID",dataType = "Long", paramType = "query", example = "0")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = DeviceLocationDTO.class),
-    })
-    @GetMapping("/deviceList")
-    @ResponseBody
-    public Object deviceList(Long projectId){
-        return ResponseData.success(projectDeviceService.selectDeviceLocationList(projectId));
-    }
-
-    @ApiOperation("人员列表接口")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "projectId", value = "作业ID",dataType = "Long", paramType = "query", example = "0")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = WorkerLocationDTO.class),
-    })
-    @GetMapping("/workerList")
-    @ResponseBody
-    public Object workerList(Long projectId){
-        return ResponseData.success(projectWorkerService.selectWorkerLocationDTO(projectId));
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/WorkSiteInfoController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/WorkSiteInfoController.java
deleted file mode 100644
index af36d69..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/WorkSiteInfoController.java
+++ /dev/null
@@ -1,130 +0,0 @@
-package com.casic.missiles.modular.system.controller;
-
-
-import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.core.base.controller.BaseController;
-import com.casic.missiles.core.page.PageFactory;
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.WorkSiteDetailDTO;
-import com.casic.missiles.modular.system.entity.WorkSiteInfo;
-import com.casic.missiles.modular.system.service.IWorkSiteInfoService;
-import io.swagger.annotations.*;
-import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.*;
-
-import org.springframework.stereotype.Controller;
-
-import java.util.List;
-
-import static com.casic.missiles.model.response.ResponseData.DEFAULT_SUCCESS_MESSAGE;
-
-/**
- * <p>
- * 作业现场表 前端控制器
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@Controller
-@RequestMapping("/site")
-@Api(tags = "作业现场管理")
-@RequiredArgsConstructor
-public class WorkSiteInfoController extends BaseController {
-
-
-    private final IWorkSiteInfoService workSiteInfoService;
-
-    @ApiOperation("新增作业现场")
-    @PostMapping("add")
-    @ResponseBody
-    public Object addWorkSite(@RequestBody WorkSiteDetailDTO workSiteDetailDTO){
-        workSiteInfoService.addWorkSiteInfo(workSiteDetailDTO);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("编辑作业现场")
-    @PostMapping("update")
-    @ResponseBody
-    public Object updateWorkSite(@RequestBody WorkSiteDetailDTO workSiteDetailDTO){
-        workSiteInfoService.updateWorkSiteInfo(workSiteDetailDTO);
-        return ResponseData.success();
-    }
-
-
-    @ApiOperation("删除作业现场")
-    @PostMapping("delete")
-    @ResponseBody
-    public Object delete(@ApiParam("作业现场id列表")@RequestBody List<Long> projectIds){
-        workSiteInfoService.deleteProjects(projectIds);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("查询作业现场详情")
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = WorkSiteDetailDTO.class),
-    })
-    @GetMapping("detail")
-    @ResponseBody
-    public Object delete(@ApiParam(value = "作业现场id", example = "0")@RequestParam Long projectId){
-        WorkSiteDetailDTO detailDTO = workSiteInfoService.getWorkSiteDetail(projectId);
-        return ResponseData.success(detailDTO);
-    }
-
-    @ApiOperation("分页列表查询")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "workTitle",value = "作业名称", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "workRoad",value = "所属道路", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "workPersonName",value = "责任人姓名", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "startDate",value = "注册开始日期", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "endDate",value = "注册结束日期", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "projectState",value = "当前状态（字典值）", dataType = "String", paramType = "query")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = WorkSiteInfo.class),
-    })
-    @GetMapping("listPage")
-    @ResponseBody
-    public Object listPage(String workTitle,String workRoad,String workPersonName,String projectState,String startDate,String endDate){
-        Page<WorkSiteInfo> page = PageFactory.defaultPage();
-        QueryWrapper<WorkSiteInfo> queryWrapper = new QueryWrapper<>();
-        if(StrUtil.isNotEmpty(workTitle)){
-            queryWrapper.like("WORK_TITLE",workTitle);
-        }
-        if(StrUtil.isNotEmpty(workRoad)){
-            queryWrapper.like("WORK_ROAD",workRoad);
-        }
-        if(StrUtil.isNotEmpty(workPersonName)){
-            queryWrapper.like("WORKER_NAME",workPersonName);
-        }
-        if(StrUtil.isNotEmpty(projectState)){
-            queryWrapper.eq("PROJECT_STATE",projectState);
-        }
-        if(StrUtil.isNotEmpty(startDate)){
-            queryWrapper.ge("br_work_site_info.CREATE_TIME",startDate + " 00:00:00");
-        }
-        if(StrUtil.isNotEmpty(endDate)){
-            queryWrapper.le("br_work_site_info.CREATE_TIME",endDate + " 23:59:59");
-        }
-        page = workSiteInfoService.selectListPage(page,queryWrapper);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-    @ApiOperation("开始作业")
-    @PostMapping("start")
-    @ResponseBody
-    public Object start(@ApiParam(value = "作业现场id",example = "0")@RequestParam Long projectId){
-        workSiteInfoService.start(projectId);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("完成作业")
-    @PostMapping("finish")
-    @ResponseBody
-    public Object finish(@ApiParam(value = "作业现场id", example = "0")@RequestParam Long projectId){
-        workSiteInfoService.finish(projectId);
-        return ResponseData.success();
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/WorkerController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/WorkerController.java
deleted file mode 100644
index 796f94c..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/WorkerController.java
+++ /dev/null
@@ -1,136 +0,0 @@
-package com.casic.missiles.modular.system.controller;
-
-
-import cn.hutool.core.util.ObjectUtil;
-import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.core.base.controller.BaseController;
-import com.casic.missiles.core.page.PageFactory;
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.DeviceDetailDTO;
-import com.casic.missiles.modular.system.entity.Device;
-import com.casic.missiles.modular.system.entity.Worker;
-import com.casic.missiles.modular.system.service.IWorkerService;
-import io.swagger.annotations.*;
-import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.*;
-
-import org.springframework.stereotype.Controller;
-
-import java.util.Date;
-import java.util.List;
-
-import static com.casic.missiles.model.response.ResponseData.DEFAULT_SUCCESS_MESSAGE;
-
-/**
- * <p>
- *  前端控制器
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@Controller
-@RequestMapping("/worker")
-@RequiredArgsConstructor
-@Api(tags = "人员管理接口")
-public class WorkerController extends BaseController {
-
-    private final IWorkerService workerService;
-
-    @ApiOperation("分页列表查询")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "name",value = "姓名", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "deptId",value = "所属部门", dataType = "Long", paramType = "query", example = "0"),
-            @ApiImplicitParam(name = "status",value = "当前状态（字典值）", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "startDate",value = "注册开始日期", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "endDate",value = "注册结束日期", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "workerType",value = "人员类型（字典值）", dataType = "String", paramType = "query")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = Worker.class),
-    })
-    @GetMapping("listPage")
-    @ResponseBody
-    public Object listPage(String name,Long deptId, String status,String startDate,String endDate,String workerType){
-        Page<Worker> page = PageFactory.defaultPage();
-        QueryWrapper<Worker> queryWrapper = new QueryWrapper<>();
-        if(StrUtil.isNotEmpty(name)){
-            queryWrapper.like("WORKER_NAME",name);
-        }
-        if(ObjectUtil.isNotEmpty(deptId)){
-            queryWrapper.eq("DEPT_ID",deptId);
-        }
-        if(StrUtil.isNotEmpty(workerType)){
-            queryWrapper.eq("WORKER_TYPE",workerType);
-        }
-        if(StrUtil.isNotEmpty(startDate)){
-            queryWrapper.ge("CREATE_TIME",startDate + " 00:00:00");
-        }
-        if(StrUtil.isNotEmpty(endDate)){
-            queryWrapper.le("CREATE_TIME",endDate + " 23:59:59");
-        }
-        if(StrUtil.isNotEmpty(status)){
-            queryWrapper.eq("`STATUS`",status);
-        }
-        page = workerService.selectListPage(page,queryWrapper);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-    @ApiOperation("新增人员")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "worker", value = "人员信息", dataType = "Worker", paramType = "body", required = true),
-            @ApiImplicitParam(name = "projectId", value = "项目ID(入场申请需要)", dataType = "Long", paramType = "query", example = "0")
-    })
-    @PostMapping("add")
-    @ResponseBody
-    public Object add(@ApiParam("worker")@RequestBody Worker worker,
-                      @RequestParam(required = false) Long projectId){
-        workerService.addWorker(worker,projectId);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("编辑人员")
-    @PostMapping("update")
-    @ResponseBody
-    public Object update(@RequestBody Worker worker){
-        workerService.updateById(worker);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("删除人员")
-    @PostMapping("delete")
-    @ResponseBody
-    public Object delete(@ApiParam("人员id列表")@RequestBody List<Long> workIds){
-        workerService.removeByIds(workIds);
-        return ResponseData.success();
-    }
-
-
-    @ApiOperation(value = "获取人脸图片",notes = "返回人脸图片url")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "cameraIp",value = "摄像头IP", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "cameraPort",value = "摄像头端口号", dataType = "String", paramType = "query"),
-    })
-    @GetMapping("/face/register")
-    @ResponseBody
-    public Object faceRegister(String cameraIp,String cameraPort){
-        return ResponseData.success(workerService.faceRegister(cameraIp, cameraPort));
-    }
-
-
-    @ApiOperation(value = "查询临时入场人员列表")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "projectId", value = "项目ID",required = true,dataType = "Long", paramType = "query", example = "0")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = Worker.class),
-    })
-    @GetMapping("/projectTempWorker")
-    @ResponseBody
-    public Object projectTempWorker(Long projectId){
-        return ResponseData.success(workerService.projectTempWorker(projectId));
-    }
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/AlarmTypeCountDTO.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/AlarmTypeCountDTO.java
deleted file mode 100644
index 1a165a1..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/AlarmTypeCountDTO.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.casic.missiles.modular.system.dto;
-
-import io.swagger.annotations.ApiModel;
-import lombok.Data;
-
-@ApiModel(value = "AlarmTypeCountDTO",description = "报警类型统计（首页）")
-@Data
-public class AlarmTypeCountDTO {
-
-    private String alarmType;
-    private String alarmTypeName;
-    private Integer alarmCount;
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/AlarmUpload.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/AlarmUpload.java
deleted file mode 100644
index 73d7799..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/AlarmUpload.java
+++ /dev/null
@@ -1,46 +0,0 @@
-package com.casic.missiles.modular.system.dto;
-
-import cn.hutool.core.util.StrUtil;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-@ApiModel(value = "AlarmUpload",description = "报警上传")
-@Data
-public class AlarmUpload {
-
-    @ApiModelProperty(value = "摄像头ip")
-    private String cameraIp;
-
-    @ApiModelProperty(value = "摄像头端口")
-    private String cameraPort;
-    @ApiModelProperty(value = "安全树甲烷设备ip")
-    private String gasIp;
-    @ApiModelProperty(value = "安全树甲烷设备端口")
-    private String gasPort;
-    @ApiModelProperty(value = "报警值")
-    private String alarmValue;
-    @ApiModelProperty(value = "报警时间")
-    private String alarmTime;
-    @ApiModelProperty(value = "报警类型")
-    private String alarmType;
-    @ApiModelProperty(value = "报警图片")
-    private String alarmImage;
-    @ApiModelProperty(value = "报警内容")
-    private String alarmContent;
-
-    @Override
-    public String toString() {
-        return "AlarmUpload{" +
-                "cameraIp='" + cameraIp + '\'' +
-                ", cameraPort='" + cameraPort + '\'' +
-                ", gasIp='" + gasIp + '\'' +
-                ", gasPort='" + gasPort + '\'' +
-                ", alarmValue='" + alarmValue + '\'' +
-                ", alarmTime='" + alarmTime + '\'' +
-                ", alarmType='" + alarmType + '\'' +
-                ", alarmImage='" + (StrUtil.isNotEmpty(alarmImage) ? alarmImage.substring(0,50) : "null") + '\'' +
-                ", alarmContent='" + alarmContent + '\'' +
-                '}';
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/DeviceDetailDTO.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/DeviceDetailDTO.java
deleted file mode 100644
index ea518d9..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/DeviceDetailDTO.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package com.casic.missiles.modular.system.dto;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.casic.missiles.modular.system.entity.Device;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-@ApiModel("DeviceDetailDTO")
-@Data
-public class DeviceDetailDTO extends Device {
-
-    @ApiModelProperty(value = "摄像头编号")
-    private String cameraCode;
-
-    @ApiModelProperty(value = "摄像头IP")
-    private String cameraIp;
-
-    @ApiModelProperty(value = "摄像头端口")
-    private String cameraPort;
-
-    @ApiModelProperty(value = "激甲编号")
-    private String gasCode;
-
-    @ApiModelProperty(value = "激甲IP")
-    private String gasIp;
-
-    @ApiModelProperty(value = "激甲端口")
-    private String gasPort;
-
-    @ApiModelProperty(value = "智能帽衬编号")
-    private String hatLiningCode;
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/WorkSiteDetailDTO.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/WorkSiteDetailDTO.java
deleted file mode 100644
index 29378ff..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/WorkSiteDetailDTO.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package com.casic.missiles.modular.system.dto;
-
-import com.casic.missiles.modular.system.entity.ProjectDevice;
-import com.casic.missiles.modular.system.entity.ProjectWorker;
-import com.casic.missiles.modular.system.entity.WorkSiteInfo;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.util.List;
-
-@Data
-@ApiModel("WorkSiteDetailDTO")
-public class WorkSiteDetailDTO extends WorkSiteInfo {
-
-    @ApiModelProperty(value = "安全树列表",dataType = "ProjectDevice")
-    private List<ProjectDevice> deviceList;
-
-    @ApiModelProperty(value = "人员列表",dataType = "ProjectWorker")
-    private List<ProjectWorker> workerList;
-
-
-
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/WorkerLocationDTO.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/WorkerLocationDTO.java
deleted file mode 100644
index 6fd7b24..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/WorkerLocationDTO.java
+++ /dev/null
@@ -1,68 +0,0 @@
-package com.casic.missiles.modular.system.dto;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-@ApiModel(value = "WorkerLocationDTO",description = "人员位置列表（首页）")
-@Data
-public class WorkerLocationDTO {
-
-    @ApiModelProperty("人员ID")
-    private Long workerId;
-
-    @ApiModelProperty("人员姓名")
-    private String workerName;
-
-    @ApiModelProperty("安全帽编号")
-    private String hatCode;
-
-    @ApiModelProperty("安全帽ID")
-    private Long hatId;
-
-    @ApiModelProperty("背心编号")
-    private String vastCode;
-
-    @ApiModelProperty("手环编号")
-    private String braceletCode;
-
-    @ApiModelProperty("位置")
-    private String location;
-
-    @ApiModelProperty("时间")
-    private String time;
-
-    @ApiModelProperty("经度")
-    private String lng;
-
-    @ApiModelProperty("纬度")
-    private String lat;
-
-    @ApiModelProperty("心率")
-    private String heartRate;
-
-    @ApiModelProperty("血氧")
-    private String bloodOxygen;
-
-    @ApiModelProperty("一氧化碳")
-    private String co;
-
-    @ApiModelProperty("甲烷")
-    private String gas;
-
-    @ApiModelProperty("硫化氢")
-    private String h2s;
-
-    @ApiModelProperty("氧气")
-    private String o2;
-
-    @ApiModelProperty("信号")
-    private String signal;
-
-    @ApiModelProperty("电量")
-    private String cell;
-
-    @ApiModelProperty("是否报警")
-    private boolean alarmFlag;
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Alarm.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Alarm.java
new file mode 100644
index 0000000..4d2b7ef
--- /dev/null
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Alarm.java
@@ -0,0 +1,103 @@
+package com.casic.missiles.modular.system.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import java.util.Date;
+
+/**
+ * <p>
+ * 报警记录表
+ * </p>
+ *
+ * @author zyj
+ * @since 2023-05-25
+ */
+@Data
+@TableName("bus_alarm")
+public class Alarm implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    @TableId(value = "ID",type = IdType.ASSIGN_ID)
+    private Long id;
+
+    /**
+     * 设备ID
+     */
+    @TableField("DEVICE_ID")
+    private Long deviceId;
+
+    /**
+     * 报警类型
+     */
+    @TableField("ALARM_TYPE")
+    private String alarmType;
+
+    /**
+     * 报警时间
+     */
+    @TableField("ALARM_TIME")
+    private Date alarmTime;
+
+    /**
+     * 报警状态
+     */
+    @TableField("ALARM_STATUS")
+    private String alarmStatus;
+
+    /**
+     * 报警位置
+     */
+    @TableField("ALARM_LOCATION")
+    private String alarmLocation;
+
+    /**
+     * 报警图片
+     */
+    @TableField("ALARM_IMAGE")
+    private String alarmImage;
+
+    /**
+     * 视频通道号
+     */
+    @TableField("CHANNEL_NO")
+    private Integer channelNo;
+
+    /**
+     * 报警内容
+     */
+    @TableField("ALARM_CONTENT")
+    private String alarmContent;
+
+    /**
+     * 消警时间
+     */
+    @TableField("CANCEL_TIME")
+    private Date cancelTime;
+
+
+    @Override
+    public String toString() {
+        return "Alarm{" +
+            "id=" + id +
+            ", deviceId=" + deviceId +
+            ", alarmType=" + alarmType +
+            ", alarmTime=" + alarmTime +
+            ", alarmStatus=" + alarmStatus +
+            ", alarmLocation=" + alarmLocation +
+            ", alarmImage=" + alarmImage +
+            ", channelNo=" + channelNo +
+            ", alarmContent=" + alarmContent +
+            ", cancelTime=" + cancelTime +
+        "}";
+    }
+}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusAlarm.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusAlarm.java
deleted file mode 100644
index efb4a23..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusAlarm.java
+++ /dev/null
@@ -1,159 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.alibaba.fastjson.annotation.JSONField;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.time.LocalDateTime;
-import java.util.Date;
-
-/**
- * <p>
- * 报警记录表
- * </p>
- *
- * @author zyj
- * @since 2023-05-16
- */
-@Data
-@ApiModel("Alarm")
-@TableName("br_bus_alarm")
-public class BusAlarm implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 项目ID
-     */
-    @ApiModelProperty(value = "项目ID")
-    @TableField("PROJECT_ID")
-    private Long projectId;
-
-    /**
-     * 设备ID
-     */
-    @ApiModelProperty(value = "设备ID")
-    @TableField("DEVICE_ID")
-    private Long deviceId;
-
-    /**
-     * 报警类型
-     */
-    @ApiModelProperty(value = "报警类型")
-    @TableField("ALARM_TYPE")
-    private String alarmType;
-
-    /**
-     * 报警状态
-     */
-    @ApiModelProperty(value = "报警状态")
-    @TableField("ALARM_STATUS")
-    private String alarmStatus;
-
-    /**
-     * 报警值
-     */
-    @ApiModelProperty(value = "报警值")
-    @TableField("ALARM_VALUE")
-    private String alarmValue;
-
-    /**
-     * 报警图片
-     */
-    @ApiModelProperty(value = "报警图片")
-    @TableField("ALARM_IMAGE")
-    private String alarmImage;
-
-    /**
-     * 报警内容
-     */
-    @ApiModelProperty(value = "报警内容")
-    @TableField("ALARM_CONTENT")
-    private String alarmContent;
-
-    /**
-     * 报警时间
-     */
-    @ApiModelProperty(value = "报警时间")
-    @TableField("ALARM_TIME")
-    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
-    private Date alarmTime;
-
-    /**
-     * 消警时间
-     */
-    @ApiModelProperty(value = "消警时间")
-    @TableField("CANCEL_TIME")
-    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
-    private Date cancelTime;
-
-    /**
-     * 报警位置经度
-     */
-    @ApiModelProperty(value = "报警位置经度")
-    @TableField("ALARM_LNG")
-    private String alarmLng;
-
-    /**
-     * 报警位置纬度
-     */
-    @ApiModelProperty(value = "报警位置纬度")
-    @TableField("ALARM_LAT")
-    private String alarmLat;
-
-    @ApiModelProperty("报警类型名称")
-    @TableField(exist = false)
-    private String alarmStatusName;
-    @ApiModelProperty("报警类型名称")
-    @TableField(exist = false)
-    private String alarmTypeName;
-    @ApiModelProperty("作业名称")
-    @TableField(exist = false)
-    private String workTitle;
-    @ApiModelProperty("所属道路")
-    @TableField(exist = false)
-    private String workRoad;
-    @ApiModelProperty("作业状态")
-    @TableField(exist = false)
-    private String projectState;
-    @ApiModelProperty("作业状态名称")
-    @TableField(exist = false)
-    private String projectStateName;
-    @ApiModelProperty("负责人姓名")
-    @TableField(exist = false)
-    private String workPersonName;
-    @ApiModelProperty("负责人联系方式")
-    @TableField(exist = false)
-    private String workPersonPhoneNumber;
-
-
-    @Override
-    public String toString() {
-        return "BusAlarm{" +
-                "id=" + id +
-                ", projectId=" + projectId +
-                ", deviceId=" + deviceId +
-                ", alarmType=" + alarmType +
-                ", alarmValue=" + alarmValue +
-                ", alarmStatus=" + alarmStatus +
-                ", alarmImage=" + alarmImage +
-                ", alarmContent=" + alarmContent +
-                ", alarmTime=" + alarmTime +
-                ", cancelTime=" + cancelTime +
-                ", alarmLng=" + alarmLng +
-                ", alarmLat=" + alarmLat +
-                "}";
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusEvent.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusEvent.java
deleted file mode 100644
index a0b7543..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusEvent.java
+++ /dev/null
@@ -1,100 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.time.LocalDateTime;
-import java.util.Date;
-import java.util.List;
-
-/**
- * <p>
- * 事件表
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@TableName("br_bus_event")
-@Data
-@ApiModel("BusEvent")
-public class BusEvent implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @ApiModelProperty("事件ID")
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 事件标题
-     */
-    @ApiModelProperty("事件名称")
-    @TableField("EVENT_TITLE")
-    private String eventTitle;
-
-    /**
-     * 上报人员
-     */
-    @ApiModelProperty("上报人员")
-    @TableField("UPLOAD_NAME")
-    private String uploadName;
-
-    /**
-     * 联系方式
-     */
-    @ApiModelProperty("联系方式")
-    @TableField("PHONE_NUMBER")
-    private String phoneNumber;
-
-    /**
-     * 事件描述
-     */
-    @ApiModelProperty("事件描述")
-    @TableField("EVENT_DESCRIPTION")
-    private String eventDescription;
-
-    @ApiModelProperty("经度")
-    @TableField("LNG")
-    private String lng;
-
-    @ApiModelProperty("纬度")
-    @TableField("LAT")
-    private String lat;
-
-    /**
-     * 事件上传时间
-     */
-    @ApiModelProperty("事件上传时间")
-    @TableField("CREATE_TIME")
-    private Date createTime;
-
-    @ApiModelProperty("事件照片")
-    @TableField(exist = false)
-    private List<BusEventImage> imageList;
-
-
-
-    @Override
-    public String toString() {
-        return "BusEvent{" +
-            "id=" + id +
-            ", eventTitle=" + eventTitle +
-            ", uploadName=" + uploadName +
-            ", phoneNumber=" + phoneNumber +
-            ", eventDescription=" + eventDescription +
-            ", lng=" + lng +
-            ", lat=" + lat +
-            ", createTime=" + createTime +
-        "}";
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusEventImage.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusEventImage.java
deleted file mode 100644
index 1e75245..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusEventImage.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-
-/**
- * <p>
- * 事件图片表
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@TableName("br_bus_event_image")
-@Data
-@ApiModel("BusEventImage")
-public class BusEventImage implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 事件ID
-     */
-    @TableField("EVENT_ID")
-    private Long eventId;
-
-    /**
-     * 报警图片
-     */
-    @TableField("IMAGE")
-    @ApiModelProperty("图片url")
-    private String image;
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Device.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Device.java
index df89c70..ea7db5f 100644
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Device.java
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Device.java
@@ -1,30 +1,23 @@
 package com.casic.missiles.modular.system.entity;
 
-import com.alibaba.fastjson.annotation.JSONField;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.casic.missiles.core.base.json.DateDeserializer;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
-import java.util.Date;
 
 /**
  * <p>
- * 
+ * 设备记录表
  * </p>
  *
  * @author zyj
- * @since 2023-04-14
+ * @since 2023-05-25
  */
-@ApiModel("Device")
-@TableName("br_device")
 @Data
+@TableName("bus_device")
 public class Device implements Serializable {
 
     private static final long serialVersionUID = 1L;
@@ -32,82 +25,86 @@
     /**
      * 主键
      */
-    @ApiModelProperty(value = "设备ID")
     @TableId(value = "ID",type = IdType.ASSIGN_ID)
     private Long id;
 
     /**
-     * 设备编号
+     * 设备名称
      */
-    @ApiModelProperty(value = "设备编号")
-    @TableField("DEVICE_CODE")
-    private String deviceCode;
+    @TableField("DEVICE_NAME")
+    private String deviceName;
 
     /**
-     * 设备类型
+     * IP
      */
-    @ApiModelProperty(value = "设备类型")
-    @TableField("DEVICE_TYPE")
-    private String deviceType;
+    @TableField("IP")
+    private String ip;
 
     /**
-     * 设备批次
+     * 端口
      */
-    @ApiModelProperty(value = "设备批次")
-    @TableField("DEVICE_BATCH")
-    private String deviceBatch;
+    @TableField("PORT")
+    private String port;
 
     /**
-     * 厂家
+     * 用户名
      */
-    @ApiModelProperty(value = "厂家")
-    @TableField("MANUFACTURER")
-    private String manufacturer;
+    @TableField("USER_NAME")
+    private String userName;
 
     /**
-     * 是否供电
+     * 密码
      */
-    @ApiModelProperty(value = "是否供电")
-    @TableField("IS_POWER_SUPPLY")
-    private String isPowerSupply;
+    @TableField("PASSWORD")
+    private String password;
 
     /**
-     * 创建时间
+     * 连接类型
      */
-    @ApiModelProperty(value = "创建时间",dataType = "Date")
-    @TableField("CREATE_TIME")
-    private Date createTime;
+    @TableField("CONNECT_TYPE")
+    private String connectType;
 
-    @ApiModelProperty(value = "设备类型名称")
-    @TableField(exist = false)
-    private String deviceTypeName;
+    /**
+     * 位置
+     */
+    @TableField("LOCATION")
 
-    @ApiModelProperty(value = "是否供电名称")
-    @TableField(exist = false)
-    private String isPowerSupplyName;
+    private String location;
 
-    @ApiModelProperty(value = "注册时间",dataType = "String")
-    @TableField(exist = false)
-    private String registerTime;
+    /**
+     * 设备状态
+     */
+    @TableField("STATUS")
 
-    @ApiModelProperty(value = "当前状态")
-    @TableField(exist = false)
     private String status;
 
-    @ApiModelProperty(value = "当前状态名称")
-    @TableField(exist = false)
-    private String statusName;
+    /**
+     * 报警分组
+     */
+    @TableField("ALARM_GROUP")
+
+    private Long alarmGroup;
+
+    /**
+     * 视频通道数(预留)
+     */
+    @TableField("CHANNEL_NUM")
+    private Integer channelNum;
 
     @Override
     public String toString() {
         return "Device{" +
             "id=" + id +
-            ", deviceCode=" + deviceCode +
-            ", deviceType=" + deviceType +
-            ", deviceBatch=" + deviceBatch +
-            ", manufacturer=" + manufacturer +
-            ", isPowerSupply=" + isPowerSupply +
-            ", createTime=" + createTime +
+            ", deviceName=" + deviceName +
+            ", ip=" + ip +
+            ", port=" + port +
+            ", userName=" + userName +
+            ", password=" + password +
+            ", connectType=" + connectType +
+            ", location=" + location +
+            ", status=" + status +
+            ", alarmGroup=" + alarmGroup +
+            ", channelNum=" + channelNum +
         "}";
     }
 }
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/DeviceExt.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/DeviceExt.java
deleted file mode 100644
index 5ee7015..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/DeviceExt.java
+++ /dev/null
@@ -1,99 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-
-/**
- * <p>
- * 设备扩展信息表（安全树）
- * </p>
- *
- * @author zyj
- * @since 2023-04-27
- */
-@Data
-@TableName("br_device_ext")
-public class DeviceExt implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 设备ID
-     */
-    @TableField("DEVICE_ID")
-    private Long deviceId;
-
-    /**
-     * 摄像头编号
-     */
-    @TableField("CAMERA_CODE")
-    private String cameraCode;
-
-    /**
-     * 摄像头IP
-     */
-    @TableField("CAMERA_IP")
-    private String cameraIp;
-
-    /**
-     * 摄像头端口
-     */
-    @TableField("CAMERA_PORT")
-    private String cameraPort;
-
-    /**
-     * 激甲编号
-     */
-    @TableField("GAS_CODE")
-    private String gasCode;
-
-    /**
-     * 激甲IP
-     */
-    @TableField("GAS_IP")
-    private String gasIp;
-
-    /**
-     * 激甲端口
-     */
-    @TableField("GAS_PORT")
-    private String gasPort;
-
-    /**
-     * 甲烷报警阈值
-     */
-    @TableField("GAS_THRESHOLD")
-    private String gasThreshold;
-
-    @TableField(value = "HAT_LINING_CODE")
-    private String hatLiningCode;
-
-
-    @Override
-    public String toString() {
-        return "DeviceExt{" +
-            "id=" + id +
-            ", deviceId=" + deviceId +
-            ", cameraCode=" + cameraCode +
-            ", cameraIp=" + cameraIp +
-            ", cameraPort=" + cameraPort +
-            ", gasCode=" + gasCode +
-            ", gasIp=" + gasIp +
-            ", gasPort=" + gasPort +
-            ", gasThreshold=" + gasThreshold +
-            ", hatLiningCode=" + hatLiningCode +
-        "}";
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/ProjectDevice.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/ProjectDevice.java
deleted file mode 100644
index c4f3472..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/ProjectDevice.java
+++ /dev/null
@@ -1,62 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-
-/**
- * <p>
- * 
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@Data
-@ApiModel("ProjectDevice")
-@TableName("br_project_device")
-public class ProjectDevice implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 作业现场ID
-     */
-    @TableField("PROJECT_ID")
-    private Long projectId;
-
-    /**
-     * 设备ID
-     */
-    @TableField("DEVICE_ID")
-    @ApiModelProperty("设备ID（新增编辑时传）")
-    private Long deviceId;
-
-    /**
-     * 设备编号
-     */
-    @TableField(exist = false)
-    @ApiModelProperty("设备编号（详情中展示，新增编辑不用传）")
-    private String deviceCode;
-
-    @Override
-    public String toString() {
-        return "ProjectDevice{" +
-            "id=" + id +
-            ", projectId=" + projectId +
-            ", deviceId=" + deviceId +
-        "}";
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/ProjectWorker.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/ProjectWorker.java
deleted file mode 100644
index 10b23c4..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/ProjectWorker.java
+++ /dev/null
@@ -1,104 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import java.io.Serializable;
-
-/**
- * <p>
- * 
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@ApiModel("ProjectWorker")
-@TableName("br_project_worker")
-@Data
-@NoArgsConstructor
-@AllArgsConstructor
-public class ProjectWorker implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 作业现场ID
-     */
-    @TableField("PROJECT_ID")
-    private Long projectId;
-
-    /**
-     * 人员ID
-     */
-    @ApiModelProperty("人员ID")
-    @TableField("WORKER_ID")
-    private Long workerId;
-
-    /**
-     * 安全帽编号
-     */
-    @ApiModelProperty("安全帽编号")
-    @TableField("HAT_CODE")
-    private String hatCode;
-
-    /**
-     * 背心编号
-     */
-    @ApiModelProperty("背心编号")
-    @TableField("VAST_CODE")
-    private String vastCode;
-
-    /**
-     * 手环编号
-     */
-    @ApiModelProperty("手环编号")
-    @TableField("BRACELET_CODE")
-    private String braceletCode;
-
-    @ApiModelProperty("人员姓名（详情中展示，新增编辑不用传）")
-    @TableField(exist = false)
-    private String workerName;
-
-    @ApiModelProperty("人员部门ID（详情中展示，新增编辑不用传）")
-    @TableField(exist = false)
-    private String workerDeptId;
-
-    @ApiModelProperty("人员部门名称（详情中展示，新增编辑不用传）")
-    @TableField(exist = false)
-    private String workerDeptName;
-
-    @ApiModelProperty("人员联系方式（详情中展示，新增编辑不用传）")
-    @TableField(exist = false)
-    private String workerPhoneNumber;
-
-    public ProjectWorker(Long projectId, Long workerId) {
-        this.projectId = projectId;
-        this.workerId = workerId;
-    }
-
-    @Override
-    public String toString() {
-        return "ProjectWorker{" +
-            "id=" + id +
-            ", projectId=" + projectId +
-            ", workerId=" + workerId +
-            ", hatCode=" + hatCode +
-            ", vastCode=" + vastCode +
-            ", braceletCode=" + braceletCode +
-        "}";
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/WorkSiteInfo.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/WorkSiteInfo.java
deleted file mode 100644
index fa6f41d..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/WorkSiteInfo.java
+++ /dev/null
@@ -1,130 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.alibaba.fastjson.annotation.JSONField;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.time.LocalDateTime;
-import java.util.Date;
-
-/**
- * <p>
- * 作业现场表
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@ApiModel("WorkSiteInfo")
-@TableName("br_work_site_info")
-@Data
-public class WorkSiteInfo implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @ApiModelProperty("作业现场ID")
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 作业名称
-     */
-    @ApiModelProperty("作业名称")
-    @TableField("WORK_TITLE")
-    private String workTitle;
-
-    /**
-     * 责任人
-     */
-    @ApiModelProperty("责任人（人员ID）")
-    @TableField("WORK_PERSON")
-    private Long workPerson;
-
-    /**
-     * 作业描述
-     */
-    @ApiModelProperty("作业描述")
-    @TableField("WORK_SITE_DESC")
-    private String workSiteDesc;
-
-    /**
-     * 作业状态
-     */
-    @ApiModelProperty("作业状态")
-    @TableField("PROJECT_STATE")
-    private String projectState;
-
-    /**
-     * 所属道路
-     */
-    @ApiModelProperty("所属道路")
-    @TableField("WORK_ROAD")
-    private String workRoad;
-
-    @TableField("IMAGE_URL")
-    private String imageUrl;
-
-    @TableField("CREATE_TIME")
-    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
-    private Date createTime;
-    @TableField("UPDATE_TIME")
-    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
-    private Date updateTime;
-
-    @ApiModelProperty("开始时间")
-    @TableField("START_TIME")
-    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
-    private Date startTime;
-
-    @ApiModelProperty("结束时间")
-    @TableField("FINISH_TIME")
-    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
-    private Date finishTime;
-
-    @ApiModelProperty("负责人姓名（详情中使用，新增编辑不用传）")
-    @TableField(exist = false)
-    private String workPersonName;
-
-    @ApiModelProperty("负责人联系方式（详情中使用，新增编辑不用传）")
-    @TableField(exist = false)
-    private String workPersonPhoneNumber;
-
-    @ApiModelProperty("负责人所属部门ID（详情中使用，新增编辑不用传）")
-    @TableField(exist = false)
-    private Long workPersonDeptId;
-
-    @ApiModelProperty("负责人所属部门名称（详情中使用，新增编辑不用传）")
-    @TableField(exist = false)
-    private String workPersonDeptName;
-
-    @ApiModelProperty(value = "注册时间",dataType = "String")
-    @TableField(exist = false)
-    private String registerTime;
-
-    @ApiModelProperty("作业状态名称")
-    @TableField(exist = false)
-    private String projectStateName;
-
-    @Override
-    public String toString() {
-        return "WorkSiteInfo{" +
-            "id=" + id +
-            ", workTitle=" + workTitle +
-            ", workPerson=" + workPerson +
-            ", workSiteDesc=" + workSiteDesc +
-            ", projectState=" + projectState +
-            ", imageUrl=" + imageUrl +
-            ", updateTime=" + updateTime +
-            ", workRoad=" + workRoad +
-        "}";
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Worker.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Worker.java
deleted file mode 100644
index 28a4daa..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Worker.java
+++ /dev/null
@@ -1,147 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.time.LocalDateTime;
-import java.util.Date;
-
-/**
- * <p>
- * 
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@ApiModel("Worker")
-@TableName("br_worker")
-@Data
-public class Worker implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @ApiModelProperty(value = "人员ID")
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 姓名
-     */
-    @ApiModelProperty(value = "姓名")
-    @TableField("WORKER_NAME")
-    private String workerName;
-
-    /**
-     * 性别
-     */
-    @ApiModelProperty(value = "性别")
-    @TableField("GENDER")
-    private String gender;
-
-    /**
-     * 所属部门
-     */
-    @ApiModelProperty(value = "所属部门(人员管理)")
-    @TableField("DEPT_ID")
-    private Long deptId;
-
-    /**
-     * 所属单位
-     */
-    @ApiModelProperty(value = "所属单位(入场申请中使用)")
-    @TableField("OWNER_SHIP")
-    private String ownerShip;
-
-    /**
-     * 联系方式
-     */
-    @ApiModelProperty(value = "联系方式")
-    @TableField("PHONE_NUMBER")
-    private String phoneNumber;
-
-    /**
-     * 证件号
-     */
-    @ApiModelProperty(value = "证件号")
-    @TableField("ID_CARD_NUMBER")
-    private String idCardNumber;
-
-    /**
-     * 入场原因
-     */
-    @ApiModelProperty(value = "入场原因（入场申请中使用）")
-    @TableField("ENTER_REASON")
-    private String enterReason;
-
-    /**
-     * 入场人脸照片
-     */
-    @ApiModelProperty(value = "人脸照片（照片路径）")
-    @TableField("WORKER_AVATAR")
-    private String workerAvatar;
-
-    /**
-     * 申请入场时间
-     */
-    @ApiModelProperty(value = "注册时间/申请入场时间")
-    @TableField("CREATE_TIME")
-    private Date createTime;
-
-    /**
-     * 人员类型
-     */
-    @ApiModelProperty(value = "人员类型（区分人员管理和入场申请）")
-    @TableField("WORKER_TYPE")
-    private String workerType;
-
-    @ApiModelProperty(value = "性别名称")
-    @TableField(exist = false)
-    private String genderName;
-
-    @ApiModelProperty(value = "部门名称")
-    @TableField(exist = false)
-    private String deptName;
-
-    @ApiModelProperty(value = "注册时间",dataType = "String")
-    @TableField(exist = false)
-    private String registerTime;
-
-    @ApiModelProperty(value = "当前状态")
-    @TableField(exist = false)
-    private String status;
-
-    @ApiModelProperty(value = "当前状态名称")
-    @TableField(exist = false)
-    private String statusName;
-
-    @ApiModelProperty(value = "是否注册(0未注册；1已注册)",allowableValues = "0,1")
-    @TableField(exist = false)
-    private String isRegister;
-
-    @Override
-    public String toString() {
-        return "Worker{" +
-            "id=" + id +
-            ", workerName=" + workerName +
-            ", gender=" + gender +
-            ", deptId=" + deptId +
-            ", ownerShip=" + ownerShip +
-            ", phoneNumber=" + phoneNumber +
-            ", idCardNumber=" + idCardNumber +
-            ", enterReason=" + enterReason +
-            ", workerAvatar=" + workerAvatar +
-            ", createTime=" + createTime +
-            ", workerType=" + workerType +
-        "}";
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/AlarmMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/AlarmMapper.java
new file mode 100644
index 0000000..ea4c8be
--- /dev/null
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/AlarmMapper.java
@@ -0,0 +1,16 @@
+package com.casic.missiles.modular.system.mapper;
+
+import com.casic.missiles.modular.system.entity.Alarm;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 报警记录表 Mapper 接口
+ * </p>
+ *
+ * @author zyj
+ * @since 2023-05-25
+ */
+public interface AlarmMapper extends BaseMapper<Alarm> {
+
+}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/BusAlarmMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/BusAlarmMapper.java
deleted file mode 100644
index 9801742..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/BusAlarmMapper.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package com.casic.missiles.modular.system.mapper;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.modular.system.dto.AlarmTypeCountDTO;
-import com.casic.missiles.modular.system.entity.BusAlarm;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * <p>
- * 报警记录表 Mapper 接口
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface BusAlarmMapper extends BaseMapper<BusAlarm> {
-
-    Page<BusAlarm> listPage(Page<BusAlarm> page,@Param("ew")  QueryWrapper<BusAlarm> queryWrapper);
-
-    void cancelAlarm(@Param("deviceId")Long deviceId,@Param("alarmType") String alarmType);
-
-    List<AlarmTypeCountDTO> alarmCount(@Param("projectId")Long projectId, @Param("alarmStatus")String alarmStatus);
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/BusEventImageMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/BusEventImageMapper.java
deleted file mode 100644
index 9590b7d..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/BusEventImageMapper.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.casic.missiles.modular.system.mapper;
-
-import com.casic.missiles.modular.system.entity.BusEventImage;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * <p>
- * 事件图片表 Mapper 接口
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface BusEventImageMapper extends BaseMapper<BusEventImage> {
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/BusEventMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/BusEventMapper.java
deleted file mode 100644
index 3c85edf..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/BusEventMapper.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.casic.missiles.modular.system.mapper;
-
-import com.casic.missiles.modular.system.entity.BusEvent;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * <p>
- * 事件表 Mapper 接口
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface BusEventMapper extends BaseMapper<BusEvent> {
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/DeviceExtMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/DeviceExtMapper.java
deleted file mode 100644
index 4ca9212..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/DeviceExtMapper.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.casic.missiles.modular.system.mapper;
-
-import com.casic.missiles.modular.system.entity.DeviceExt;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * <p>
- * 设备扩展信息表（安全树） Mapper 接口
- * </p>
- *
- * @author zyj
- * @since 2023-04-27
- */
-public interface DeviceExtMapper extends BaseMapper<DeviceExt> {
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/DeviceMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/DeviceMapper.java
index 444c0c5..3d0bb02 100644
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/DeviceMapper.java
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/DeviceMapper.java
@@ -1,30 +1,16 @@
 package com.casic.missiles.modular.system.mapper;
 
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.modular.system.dto.DeviceDetailDTO;
-import com.casic.missiles.modular.system.dto.HelmetInfoDTO;
 import com.casic.missiles.modular.system.entity.Device;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
 
 /**
  * <p>
- *  Mapper 接口
+ * 设备记录表 Mapper 接口
  * </p>
  *
  * @author zyj
- * @since 2023-04-14
+ * @since 2023-05-25
  */
-@Mapper
 public interface DeviceMapper extends BaseMapper<Device> {
 
-    Page<DeviceDetailDTO> listDetailPage(Page<DeviceDetailDTO> page,@Param("ew") QueryWrapper<DeviceDetailDTO> ew);
-
-     List<Long> selectProjectDevice(@Param("projectId") Long projectId);
-
-    List<HelmetInfoDTO> selectHelmetList(@Param("deviceType")String deviceType);
 }
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/ProjectDeviceMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/ProjectDeviceMapper.java
deleted file mode 100644
index 1d0c14e..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/ProjectDeviceMapper.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package com.casic.missiles.modular.system.mapper;
-
-import com.casic.missiles.modular.system.dto.DeviceLocationDTO;
-import com.casic.missiles.modular.system.entity.ProjectDevice;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * <p>
- *  Mapper 接口
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface ProjectDeviceMapper extends BaseMapper<ProjectDevice> {
-     List<ProjectDevice> selectDetailByProjectId(@Param("projectId") Long projectId);
-
-     List<DeviceLocationDTO> selectDeviceLocationList(@Param("projectId") Long projectId);
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/ProjectWorkerMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/ProjectWorkerMapper.java
deleted file mode 100644
index 58583d1..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/ProjectWorkerMapper.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package com.casic.missiles.modular.system.mapper;
-
-import com.casic.missiles.modular.system.dto.WorkerLocationDTO;
-import com.casic.missiles.modular.system.entity.ProjectWorker;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * <p>
- *  Mapper 接口
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface ProjectWorkerMapper extends BaseMapper<ProjectWorker> {
-
-    List<ProjectWorker> selectDetailByProjectId(@Param("projectId") Long projectId,
-                                                @Param("workerType")String workerType);
-
-    List<WorkerLocationDTO> selectWorkerLocationList(@Param("projectId") Long projectId,
-                                                     @Param("workerType")String workerType);
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/WorkSiteInfoMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/WorkSiteInfoMapper.java
deleted file mode 100644
index a4934d2..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/WorkSiteInfoMapper.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.casic.missiles.modular.system.mapper;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.modular.system.entity.WorkSiteInfo;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Param;
-
-/**
- * <p>
- * 作业现场表 Mapper 接口
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface WorkSiteInfoMapper extends BaseMapper<WorkSiteInfo> {
-
-    Page<WorkSiteInfo> selectListPage(Page<WorkSiteInfo> page,@Param("ew") QueryWrapper<WorkSiteInfo> ew);
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/WorkerMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/WorkerMapper.java
deleted file mode 100644
index 258fb12..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/WorkerMapper.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package com.casic.missiles.modular.system.mapper;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.modular.system.dto.DeviceDetailDTO;
-import com.casic.missiles.modular.system.entity.Worker;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * <p>
- *  Mapper 接口
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface WorkerMapper extends BaseMapper<Worker> {
-
-
-    Page<Worker> selectListPage(Page<Worker> page, @Param("ew") QueryWrapper<Worker> ew);
-
-    List<String> selectWorkerAvatars(@Param("projectId")Long projectId);
-
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/AlarmMapper.xml b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/AlarmMapper.xml
new file mode 100644
index 0000000..25cb4ab
--- /dev/null
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/AlarmMapper.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.modular.system.mapper.AlarmMapper">
+
+</mapper>
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/BusAlarmMapper.xml b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/BusAlarmMapper.xml
deleted file mode 100644
index 595088a..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/BusAlarmMapper.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.casic.missiles.modular.system.mapper.BusAlarmMapper">
-
-    <select id="listPage" resultType="com.casic.missiles.modular.system.entity.BusAlarm">
-        SELECT
-            alarm.ID as id,
-            alarm.DEVICE_ID as deviceId,
-            alarm.PROJECT_ID as projectId,
-            alarm.ALARM_TYPE as alarmType,
-            alarm.ALARM_VALUE as alarmValue,
-            alarm.ALARM_STATUS as alarmStatus,
-            alarm.ALARM_IMAGE AS alarmImage,
-            alarm.ALARM_CONTENT as alarmContent,
-            alarm.ALARM_TIME as alarmTime,
-            alarm.CANCEL_TIME as cancelTime,
-            alarm.ALARM_LNG as alarmLng,
-            alarm.ALARM_LAT as alarmLat,
-            p.WORK_TITLE as workTitle,
-            p.WORK_ROAD as workRoad,
-            p.PROJECT_STATE as projectState,
-            w.WORKER_NAME as workPersonName,
-            w.PHONE_NUMBER as workPersonPhoneNumber
-        FROM
-            `br_bus_alarm` alarm
-                LEFT JOIN br_work_site_info p on alarm.PROJECT_ID = p.ID
-                LEFT JOIN br_worker w on p.WORK_PERSON = w.ID
-        <where>
-            <if test="ew != null">
-                ${ew.sqlSegment}
-            </if>
-        </where>
-    </select>
-
-    <select id="cancelAlarm">
-        update br_bus_alarm
-        set ALARM_STATUS = '1'
-        where DEVICE_ID = #{deviceId}
-          and ALARM_TYPE = #{alarmType}
-          and ALARM_STATUS = '0'
-    </select>
-
-    <select id="alarmCount" resultType="com.casic.missiles.modular.system.dto.AlarmTypeCountDTO">
-        SELECT
-            ALARM_TYPE as alarmType,
-            count(*) as alarmCount
-        from br_bus_alarm
-        <where>
-            <if test="projectId != null and projectId !=''">
-                and PROJECT_ID = #{projectId}
-            </if>
-            <if test="alarmStatus != null and alarmStatus !=''">
-                and ALARM_STATUS = #{alarmStatus}
-            </if>
-        </where>
-        group by ALARM_TYPE
-    </select>
-</mapper>
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/BusEventImageMapper.xml b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/BusEventImageMapper.xml
deleted file mode 100644
index fbc3db3..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/BusEventImageMapper.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.casic.missiles.modular.system.mapper.BusEventImageMapper">
-
-</mapper>
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/BusEventMapper.xml b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/BusEventMapper.xml
deleted file mode 100644
index 627d573..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/BusEventMapper.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.casic.missiles.modular.system.mapper.BusEventMapper">
-
-</mapper>
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/DeviceExtMapper.xml b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/DeviceExtMapper.xml
deleted file mode 100644
index 5321d1c..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/DeviceExtMapper.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.casic.missiles.modular.system.mapper.DeviceExtMapper">
-
-</mapper>
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/DeviceMapper.xml b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/DeviceMapper.xml
index 94262e1..88e7d01 100644
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/DeviceMapper.xml
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/DeviceMapper.xml
@@ -2,96 +2,4 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.casic.missiles.modular.system.mapper.DeviceMapper">
 
-    <select id="listDetailPage" resultType="com.casic.missiles.modular.system.dto.DeviceDetailDTO">
-        select
-        br_device.ID as id,
-        DEVICE_CODE as deviceCode,
-        DEVICE_TYPE as deviceType,
-        DEVICE_BATCH as deviceBatch,
-        MANUFACTURER as manufacturer,
-        IS_POWER_SUPPLY as isPowerSupply,
-        CREATE_TIME as createTime,
-        CAMERA_CODE as cameraCode,
-        CAMERA_IP as cameraIp,
-        CAMERA_PORT as cameraPort,
-        GAS_CODE as gasCode,
-        GAS_IP as gasIp,
-        GAS_PORT as gasPort,
-        HAT_LINING_CODE as hatLiningCode
-        from br_device
-        left join br_device_ext ext on ext.DEVICE_ID = br_device.ID
-        <where>
-            <if test="ew != null">
-                ${ew.sqlSegment}
-            </if>
-        </where>
-    </select>
-
-    <select id="selectProjectDevice" resultType="java.lang.Long">
-        with device_info as (
-            (SELECT
-            d.DEVICE_ID as DEVICE_ID,
-            d.PROJECT_ID as PROJECT_ID,
-            p.PROJECT_STATE as PROJECT_STATE
-            from br_project_device d
-            LEFT JOIN br_work_site_info p on p.ID = d.PROJECT_ID)
-
-            UNION ALL
-
-            (SELECT
-            d1.ID as DEVICE_ID,
-            w1.ID as PROJECT_ID,
-            w1.PROJECT_STATE as PROJECT_STATE
-            FROM br_project_worker pw1
-            LEFT JOIN br_device d1 on pw1.BRACELET_CODE = d1.DEVICE_CODE
-            LEFT JOIN br_work_site_info w1 on pw1.PROJECT_ID = w1.ID)
-
-            UNION ALL
-
-            (SELECT
-            d1.ID as DEVICE_ID,
-            w1.ID as PROJECT_ID,
-            w1.PROJECT_STATE as PROJECT_STATE
-            FROM br_project_worker pw1
-            LEFT JOIN br_device d1 on pw1.HAT_CODE = d1.DEVICE_CODE
-            LEFT JOIN br_work_site_info w1 on pw1.PROJECT_ID = w1.ID)
-
-
-            UNION ALL
-
-            (SELECT
-            d1.ID as DEVICE_ID,
-            w1.ID as PROJECT_ID,
-            w1.PROJECT_STATE as PROJECT_STATE
-            FROM br_project_worker pw1
-            LEFT JOIN br_device d1 on pw1.VAST_CODE = d1.DEVICE_CODE
-            LEFT JOIN br_work_site_info w1 on pw1.PROJECT_ID = w1.ID))
-
-        select DISTINCT DEVICE_ID from device_info
-        <where>
-            DEVICE_ID is not null
-            <choose>
-                <when test="projectId != null and projectId !=''">
-                    and PROJECT_ID = #{projectId}
-                </when>
-                <otherwise>
-                    AND PROJECT_STATE != '3'
-                </otherwise>
-            </choose>
-        </where>
-    </select>
-
-    <select id="selectHelmetList" resultType="com.casic.missiles.modular.system.dto.HelmetInfoDTO">
-        SELECT
-            a.ID AS deviceId,
-            a.DEVICE_CODE AS hatCode,
-            b.HAT_LINING_CODE AS hatLiningCode
-        FROM
-            br_device a
-                LEFT JOIN br_device_ext b ON a.ID = b.DEVICE_ID
-        WHERE
-            a.DEVICE_TYPE = #{deviceType}
-          AND a.DEVICE_CODE IS NOT NULL
-          AND b.HAT_LINING_CODE IS NOT NULL
-    </select>
 </mapper>
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/ProjectDeviceMapper.xml b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/ProjectDeviceMapper.xml
deleted file mode 100644
index c6d1c24..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/ProjectDeviceMapper.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.casic.missiles.modular.system.mapper.ProjectDeviceMapper">
-
-    <select id="selectDetailByProjectId" resultType="com.casic.missiles.modular.system.entity.ProjectDevice">
-        SELECT
-            pd.ID as id,
-            pd.PROJECT_ID as projectId,
-            pd.DEVICE_ID as deviceId,
-            d.DEVICE_CODE as deviceCode
-        from br_project_device pd
-        LEFT JOIN br_device d on pd.DEVICE_ID = d.ID
-        <where>
-            pd.PROJECT_ID = #{projectId}
-        </where>
-    </select>
-
-    <select id="selectDeviceLocationList" resultType="com.casic.missiles.modular.system.dto.DeviceLocationDTO">
-        SELECT
-        d.ID as deviceId,
-        d.DEVICE_TYPE as deviceType,
-        d.DEVICE_CODE as deviceCode,
-        if(EXISTS(select ID from br_bus_alarm WHERE DEVICE_ID = d.ID and ALARM_STATUS = '0'),true,false) as alarmFlag
-        FROM br_project_device pd, br_device d
-        where pd.DEVICE_ID = d.ID
-        and pd.PROJECT_ID = #{projectId}
-    </select>
-
-</mapper>
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/ProjectWorkerMapper.xml b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/ProjectWorkerMapper.xml
deleted file mode 100644
index 8d2de10..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/ProjectWorkerMapper.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.casic.missiles.modular.system.mapper.ProjectWorkerMapper">
-
-    <select id="selectDetailByProjectId" resultType="com.casic.missiles.modular.system.entity.ProjectWorker">
-        SELECT
-            pw.ID as id,
-            pw.PROJECT_ID as projectId,
-            pw.WORKER_ID as workerId,
-            w.WORKER_NAME as workerName,
-            w.DEPT_ID as workerDeptId,
-            pw.HAT_CODE as hatCode,
-            pw.VAST_CODE as vastCode,
-            pw.BRACELET_CODE as braceletCode,
-            w.PHONE_NUMBER as workerPhoneNumber
-        from br_project_worker pw
-        LEFT JOIN br_worker w on pw.WORKER_ID = w.ID
-        <where>
-            pw.PROJECT_ID = #{projectId}
-            <if test="workerType != null and workerType != ''">
-                and w.WORKER_TYPE = #{workerType}
-            </if>
-        </where>
-    </select>
-
-    <select id="selectWorkerLocationList" resultType="com.casic.missiles.modular.system.dto.WorkerLocationDTO">
-        select
-            w.ID as workerId,
-            w.WORKER_NAME as workerName,
-            pw.HAT_CODE as hatCode,
-            hd.ID as hatId,
-            pw.BRACELET_CODE as braceletCode,
-            pw.VAST_CODE as vastCode
-        from br_project_worker pw,br_worker w ,br_device hd
-        WHERE pw.WORKER_ID = w.ID
-          and pw.HAT_CODE = hd.DEVICE_CODE
-          and pw.PROJECT_ID = #{projectId}
-          and w.WORKER_TYPE = #{workerType}
-    </select>
-</mapper>
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/WorkSiteInfoMapper.xml b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/WorkSiteInfoMapper.xml
deleted file mode 100644
index 8f01326..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/WorkSiteInfoMapper.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.casic.missiles.modular.system.mapper.WorkSiteInfoMapper">
-
-    <select id="selectListPage" resultType="com.casic.missiles.modular.system.entity.WorkSiteInfo">
-        SELECT
-            br_work_site_info.ID AS id,
-            WORK_TITLE as workTitle,
-            WORK_ROAD as workRoad,
-            WORK_SITE_DESC as workSiteDesc,
-            WORK_PERSON as workPerson,
-            WORKER_NAME as workPersonName,
-            DEPT_ID as workPersonDeptId,
-            PHONE_NUMBER as workPersonPhoneNumber,
-            PROJECT_STATE as projectState,
-            br_work_site_info.CREATE_TIME AS createTime,
-            br_work_site_info.UPDATE_TIME AS updateTime
-        FROM br_work_site_info
-        LEFT JOIN br_worker w ON br_work_site_info.WORK_PERSON = w.ID
-        <where>
-            <if test="ew != null">
-                ${ew.sqlSegment}
-            </if>
-        </where>
-    </select>
-</mapper>
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/WorkerMapper.xml b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/WorkerMapper.xml
deleted file mode 100644
index 3e28b39..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/WorkerMapper.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.casic.missiles.modular.system.mapper.WorkerMapper">
-
-    <select id="selectListPage" resultType="com.casic.missiles.modular.system.entity.Worker">
-        WITH worker_project AS (
-            SELECT
-                w.id AS ID,
-                WORKER_NAME,
-                GENDER,
-                DEPT_ID,
-                OWNER_SHIP,
-                PHONE_NUMBER,
-                ID_CARD_NUMBER,
-                ENTER_REASON,
-                WORKER_AVATAR,
-                w.CREATE_TIME,
-                WORKER_TYPE,
-                IF( p.PROJECT_STATE != '3', 1, 0 ) AS `STATUS`
-            FROM br_worker w
-            LEFT JOIN br_project_worker pw ON w.ID = pw.WORKER_ID
-            LEFT JOIN br_work_site_info p ON pw.PROJECT_ID = p.ID
-        )
-
-        SELECT
-            ID AS id,
-            WORKER_NAME AS workerName,
-            GENDER AS gender,
-            DEPT_ID AS deptId,
-            OWNER_SHIP AS ownerShip,
-            PHONE_NUMBER AS phoneNumber,
-            ID_CARD_NUMBER AS idCardNumber,
-            ENTER_REASON AS enterReason,
-            WORKER_AVATAR AS workerAvatar,
-            CREATE_TIME AS createTime,
-            WORKER_TYPE AS workerType,
-            `STATUS` AS `status`
-        FROM worker_project
-        <where>
-            <if test="ew != null">
-                ${ew.sqlSegment}
-            </if>
-        </where>
-    </select>
-
-    <select id="selectWorkerAvatars" resultType="java.lang.String">
-        SELECT
-            WORKER_AVATAR
-        FROM
-            `br_worker`
-        WHERE
-        ID IN ( SELECT WORKER_ID FROM br_project_worker WHERE PROJECT_ID = #{projectId} )
-          AND WORKER_AVATAR IS NOT NULL
-          AND WORKER_AVATAR != ''
-    </select>
-</mapper>
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IAlarmService.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IAlarmService.java
new file mode 100644
index 0000000..8bc01f4
--- /dev/null
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IAlarmService.java
@@ -0,0 +1,16 @@
+package com.casic.missiles.modular.system.service;
+
+import com.casic.missiles.modular.system.entity.Alarm;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 报警记录表 服务类
+ * </p>
+ *
+ * @author zyj
+ * @since 2023-05-25
+ */
+public interface IAlarmService extends IService<Alarm> {
+
+}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IBusAlarmService.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IBusAlarmService.java
deleted file mode 100644
index f63c19c..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IBusAlarmService.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package com.casic.missiles.modular.system.service;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.modular.system.dto.AlarmTypeCountDTO;
-import com.casic.missiles.modular.system.dto.AlarmUpload;
-import com.casic.missiles.modular.system.entity.BusAlarm;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-import java.util.List;
-
-/**
- * <p>
- * 报警记录表 服务类
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface IBusAlarmService extends IService<BusAlarm> {
-
-    boolean alarmUpload(AlarmUpload alarmUpload);
-
-    Page<BusAlarm> listPage(Page<BusAlarm> page,QueryWrapper<BusAlarm> queryWrapper);
-
-    List<AlarmTypeCountDTO> alarmCount(Long projectId,String alarmStatus);
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IBusEventImageService.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IBusEventImageService.java
deleted file mode 100644
index b1187ed..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IBusEventImageService.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.casic.missiles.modular.system.service;
-
-import com.casic.missiles.modular.system.entity.BusEventImage;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-import java.util.List;
-
-/**
- * <p>
- * 事件图片表 服务类
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface IBusEventImageService extends IService<BusEventImage> {
-
-    boolean saveBusEventImages(Long eventId, List<BusEventImage> imageList);
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IBusEventService.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IBusEventService.java
deleted file mode 100644
index 85c48d0..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IBusEventService.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package com.casic.missiles.modular.system.service;
-
-import com.casic.missiles.modular.system.entity.BusEvent;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-/**
- * <p>
- * 事件表 服务类
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface IBusEventService extends IService<BusEvent> {
-
-    boolean saveBusEvent(BusEvent busEvent);
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IDeviceExtService.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IDeviceExtService.java
deleted file mode 100644
index 6fc5361..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IDeviceExtService.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package com.casic.missiles.modular.system.service;
-
-import com.casic.missiles.modular.system.dto.DeviceDetailDTO;
-import com.casic.missiles.modular.system.entity.DeviceExt;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-import java.util.List;
-
-/**
- * <p>
- * 设备扩展信息表（安全树） 服务类
- * </p>
- *
- * @author zyj
- * @since 2023-04-27
- */
-public interface IDeviceExtService extends IService<DeviceExt> {
-
-    boolean saveDeviceExt(DeviceDetailDTO deviceDetailDTO);
-
-    boolean updateDeviceExt(DeviceDetailDTO deviceDetailDTO);
-
-    boolean removeByDeviceIds(List<Long> deviceIds);
-
-    boolean setGasThreshold(String gasIp,String gasPort,String threshold);
-
-    String getGasThreshold(String gasIp,String gasPort);
-
-    Long selectByGasIpPort(String gasIp,String gasPort);
-
-    Long selectByCameraIpPort(String cameraIp,String cameraPort);
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java
index 9e62756..00a421d 100644
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java
@@ -1,32 +1,16 @@
 package com.casic.missiles.modular.system.service;
 
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.modular.system.dto.DeviceDetailDTO;
-import com.casic.missiles.modular.system.dto.HelmetInfoDTO;
 import com.casic.missiles.modular.system.entity.Device;
 import com.baomidou.mybatisplus.extension.service.IService;
 
-import java.util.List;
-
 /**
  * <p>
- *  服务类
+ * 设备记录表 服务类
  * </p>
  *
  * @author zyj
- * @since 2023-04-14
+ * @since 2023-05-25
  */
 public interface IDeviceService extends IService<Device> {
 
-    boolean saveDevice(DeviceDetailDTO deviceDetailDTO);
-
-    boolean updateDevice(DeviceDetailDTO deviceDetailDTO);
-
-    boolean deleteDevices(List<Long> deviceIds);
-
-    Page<DeviceDetailDTO> listPage(Page<DeviceDetailDTO> page, QueryWrapper<DeviceDetailDTO> queryWrapper, String status,Long projectId);
-
-    List<Long> selectProjectDevice(Long projectId);
-
 }
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IProjectDeviceService.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IProjectDeviceService.java
deleted file mode 100644
index 8599411..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IProjectDeviceService.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package com.casic.missiles.modular.system.service;
-
-import com.casic.missiles.modular.system.dto.DeviceLocationDTO;
-import com.casic.missiles.modular.system.entity.ProjectDevice;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-import java.util.List;
-
-/**
- * <p>
- *  服务类
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface IProjectDeviceService extends IService<ProjectDevice> {
-
-    boolean saveProjectDeviceList(Long projectId, List<ProjectDevice> projectDeviceList);
-
-    boolean updateProjectDeviceList(Long projectId, List<ProjectDevice> projectDeviceList);
-
-    boolean deleteByProjectId(Long projectId);
-
-    boolean deleteByProjectIds(List<Long> projectIds);
-
-    List<ProjectDevice> selectDetailByProjectId(Long projectId);
-
-    Long selectProjectIdByDevice(Long deviceId);
-
-    List<DeviceLocationDTO> selectDeviceLocationList(Long projectId);
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IProjectWorkerService.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IProjectWorkerService.java
deleted file mode 100644
index e921bc3..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IProjectWorkerService.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package com.casic.missiles.modular.system.service;
-
-import com.casic.missiles.modular.system.dto.WorkerLocationDTO;
-import com.casic.missiles.modular.system.entity.ProjectDevice;
-import com.casic.missiles.modular.system.entity.ProjectWorker;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-import java.util.List;
-
-/**
- * <p>
- *  服务类
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface IProjectWorkerService extends IService<ProjectWorker> {
-
-    boolean saveProjectWorkerList(Long projectId, List<ProjectWorker> projectWorkerList);
-
-    boolean updateProjectWorkerList(Long projectId, List<ProjectWorker> projectWorkerList);
-
-    boolean deleteByProjectId(Long projectId);
-
-    boolean deleteByProjectIds(List<Long> projectIds);
-
-    List<ProjectWorker> selectDetailByProjectId(Long projectId,String workerType);
-
-    List<WorkerLocationDTO> selectWorkerLocationDTO(Long projectId);
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IWorkSiteInfoService.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IWorkSiteInfoService.java
deleted file mode 100644
index 58a8590..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IWorkSiteInfoService.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package com.casic.missiles.modular.system.service;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.modular.system.dto.WorkSiteDetailDTO;
-import com.casic.missiles.modular.system.entity.WorkSiteInfo;
-import com.baomidou.mybatisplus.extension.service.IService;
-import java.util.List;
-/**
- * <p>
- * 作业现场表 服务类
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface IWorkSiteInfoService extends IService<WorkSiteInfo> {
-
-    boolean addWorkSiteInfo(WorkSiteDetailDTO workSiteDetailDTO);
-
-    boolean updateWorkSiteInfo(WorkSiteDetailDTO workSiteDetailDTO);
-
-    boolean deleteProjects(List<Long> projectIds);
-
-    WorkSiteDetailDTO getWorkSiteDetail(Long projectId);
-
-    Page<WorkSiteInfo> selectListPage(Page<WorkSiteInfo> page, QueryWrapper<WorkSiteInfo> queryWrapper);
-
-    boolean start(Long projectId);
-
-    boolean finish(Long projectId);
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IWorkerService.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IWorkerService.java
deleted file mode 100644
index 6c6ee98..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IWorkerService.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package com.casic.missiles.modular.system.service;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.modular.system.entity.Worker;
-import com.baomidou.mybatisplus.extension.service.IService;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * <p>
- *  服务类
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface IWorkerService extends IService<Worker> {
-
-    boolean addWorker(Worker worker,Long projectId);
-
-    Page<Worker> selectListPage(Page<Worker> page,QueryWrapper<Worker> ew);
-
-    Worker selectWorkerDetail(Long workerId);
-
-    List<String> faceRegister(String cameraIp,String cameraPort);
-
-    List<Worker> projectTempWorker(Long projectId);
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/impl/AlarmServiceImpl.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/impl/AlarmServiceImpl.java
new file mode 100644
index 0000000..6e5959b
--- /dev/null
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/impl/AlarmServiceImpl.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.modular.system.service.impl;
+
+import com.casic.missiles.modular.system.entity.Alarm;
+import com.casic.missiles.modular.system.mapper.AlarmMapper;
+import com.casic.missiles.modular.system.service.IAlarmService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 报警记录表 服务实现类
+ * </p>
+ *
+ * @author zyj
+ * @since 2023-05-25
+ */
+@Service
+public class AlarmServiceImpl extends ServiceImpl<AlarmMapper, Alarm> implements IAlarmService {
+
+}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/impl/BusAlarmServiceImpl.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/impl/BusAlarmServiceImpl.java
deleted file mode 100644
index b44de1d..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/impl/BusAlarmServiceImpl.java
+++ /dev/null
@@ -1,121 +0,0 @@
-package com.casic.missiles.modular.system.service.impl;
-
-import cn.hutool.core.date.DateUtil;
-import cn.hutool.core.util.ObjectUtil;
-import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.core.application.service.AbstractDictService;
-import com.casic.missiles.modular.system.consts.AlarmTypeEnum;
-import com.casic.missiles.modular.system.dto.AlarmTypeCountDTO;
-import com.casic.missiles.modular.system.dto.AlarmUpload;
-import com.casic.missiles.modular.system.entity.BusAlarm;
-import com.casic.missiles.modular.system.entity.DataTreeLocation;
-import com.casic.missiles.modular.system.mapper.BusAlarmMapper;
-import com.casic.missiles.modular.system.service.*;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.util.Date;
-import java.util.List;
-import java.util.stream.Collectors;
-
-import static com.casic.missiles.modular.system.consts.AlarmConst.ALARM_STATUS_ON;
-
-/**
- * <p>
- * 报警记录表 服务实现类
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@Service
-@RequiredArgsConstructor
-@Slf4j
-public class BusAlarmServiceImpl extends ServiceImpl<BusAlarmMapper, BusAlarm> implements IBusAlarmService {
-
-    private final IDeviceExtService deviceExtService;
-    private final IDeviceService deviceService;
-    private final IProjectDeviceService projectDeviceService;
-
-    private final ICasicFileService fileService;
-
-    private final AbstractDictService dictService;
-    private final IDataSupportService dataSupportService;
-
-    @Override
-    @Transactional
-    public boolean alarmUpload(AlarmUpload alarmUpload) {
-        log.info("alarm upload ==> {}",alarmUpload.toString());
-        Long deviceId = null;
-        if(StrUtil.isAllNotBlank(alarmUpload.getGasIp(),alarmUpload.getGasPort())){
-            deviceId = deviceExtService.selectByGasIpPort(alarmUpload.getGasIp(),alarmUpload.getGasPort());
-        }
-        if(ObjectUtil.isEmpty(deviceId) && StrUtil.isAllNotBlank(alarmUpload.getCameraIp(),alarmUpload.getCameraPort())){
-            deviceId = deviceExtService.selectByCameraIpPort(alarmUpload.getCameraIp(),alarmUpload.getCameraPort());
-        }
-
-        if(ObjectUtil.isEmpty(deviceId)){
-            return false;
-        }
-
-        BusAlarm alarm = new BusAlarm();
-        alarm.setDeviceId(deviceId);
-        alarm.setProjectId(projectDeviceService.selectProjectIdByDevice(deviceId));
-        alarm.setAlarmValue(alarmUpload.getAlarmValue());
-        if(StrUtil.isNotEmpty(alarmUpload.getAlarmTime())){
-            alarm.setAlarmTime(DateUtil.parseDateTime(alarmUpload.getAlarmTime()));
-        }else {
-            alarm.setAlarmTime(new Date());
-        }
-
-        alarm.setAlarmType(alarmUpload.getAlarmType());
-        alarm.setAlarmContent(alarmUpload.getAlarmContent());
-        if(StrUtil.isNotEmpty(alarmUpload.getAlarmImage())){
-            String imgBase64 = "data:image/jpeg;base64," + alarmUpload.getAlarmImage();
-            String imageUrl = fileService.saveFile(imgBase64);
-            alarm.setAlarmImage(imageUrl);
-        }
-        alarm.setAlarmStatus(ALARM_STATUS_ON);
-
-        DataTreeLocation treeLocation = dataSupportService.getTreeLocation(deviceId);
-        if(ObjectUtil.isNotEmpty(treeLocation)){
-            alarm.setAlarmLng(treeLocation.getGdLng());
-            alarm.setAlarmLat(treeLocation.getGdLat());
-        }
-
-        //自动消警
-        AlarmTypeEnum alarmTypeEnum = AlarmTypeEnum.getByAlarmType(alarm.getAlarmType());
-        if(ObjectUtil.isNotEmpty(alarmTypeEnum) && alarmTypeEnum.isAutoCancel()){
-            this.baseMapper.cancelAlarm(deviceId,alarm.getAlarmType());
-        }
-        return this.save(alarm);
-    }
-
-    @Override
-    public Page<BusAlarm> listPage(Page<BusAlarm> page, QueryWrapper<BusAlarm> queryWrapper) {
-        page = this.baseMapper.listPage(page, queryWrapper);
-        for (BusAlarm alarm : page.getRecords()) {
-            alarm.setAlarmTypeName(dictService.getDictNameByCode("alarmType",alarm.getAlarmType()));
-            alarm.setAlarmStatusName(dictService.getDictNameByCode("alarmStatus",alarm.getAlarmStatus()));
-            if(StrUtil.isNotEmpty(alarm.getProjectState())){
-                alarm.setProjectStateName(dictService.getDictNameByCode("projectStatus",alarm.getProjectState()));
-            }
-        }
-        return page;
-    }
-
-    @Override
-    public List<AlarmTypeCountDTO> alarmCount(Long projectId, String alarmStatus) {
-        List<AlarmTypeCountDTO> list = this.baseMapper.alarmCount(projectId, alarmStatus);
-        list = list.stream().filter(i->StrUtil.isNotEmpty(i.getAlarmType())).collect(Collectors.toList());
-        for (AlarmTypeCountDTO countDTO : list) {
-            countDTO.setAlarmTypeName(dictService.getDictNameByCode("alarmType",countDTO.getAlarmType()));
-        }
-        return list;
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/impl/BusEventImageServiceImpl.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/impl/BusEventImageServiceImpl.java
deleted file mode 100644
index a43f7c1..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/impl/BusEventImageServiceImpl.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package com.casic.missiles.modular.system.service.impl;
-
-import com.casic.missiles.modular.system.entity.BusEventImage;
-import com.casic.missiles.modular.system.mapper.BusEventImageMapper;
-import com.casic.missiles.modular.system.service.IBusEventImageService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-/**
- * <p>
- * 事件图片表 服务实现类
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@Service
-public class BusEventImageServiceImpl extends ServiceImpl<BusEventImageMapper, BusEventImage> implements IBusEventImageService {
-
-    @Override
-    public boolean saveBusEventImages(Long eventId, List<BusEventImage> imageList) {
-        imageList.forEach(i->i.setEventId(eventId));
-        return this.saveBatch(imageList);
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/impl/BusEventServiceImpl.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/impl/BusEventServiceImpl.java
deleted file mode 100644
index 21e511c..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/impl/BusEventServiceImpl.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package com.casic.missiles.modular.system.service.impl;
-
-import com.casic.missiles.modular.system.entity.BusEvent;
-import com.casic.missiles.modular.system.mapper.BusEventMapper;
-import com.casic.missiles.modular.system.service.IBusEventImageService;
-import com.casic.missiles.modular.system.service.IBusEventService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import lombok.RequiredArgsConstructor;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.util.Date;
-
-/**
- * <p>
- * 事件表 服务实现类
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@Service
-@RequiredArgsConstructor
-public class BusEventServiceImpl extends ServiceImpl<BusEventMapper, BusEvent> implements IBusEventService {
-
-    private final IBusEventImageService busEventImageService;
-
-
-    @Override
-    @Transactional
-    public boolean saveBusEvent(BusEvent busEvent) {
-        busEvent.setCreateTime(new Date());
-        boolean res = this.save(busEvent);
-        if(res){
-            res = busEventImageService.saveBusEventImages(busEvent.getId(),busEvent.getImageList());
-        }
-        return res;
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceExtServiceImpl.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceExtServiceImpl.java
deleted file mode 100644
index 2bdb63d..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceExtServiceImpl.java
+++ /dev/null
@@ -1,102 +0,0 @@
-package com.casic.missiles.modular.system.service.impl;
-
-import cn.hutool.core.util.ObjectUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
-import com.casic.missiles.modular.system.dto.DeviceDetailDTO;
-import com.casic.missiles.modular.system.entity.DeviceExt;
-import com.casic.missiles.modular.system.mapper.DeviceExtMapper;
-import com.casic.missiles.modular.system.service.IDeviceExtService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-/**
- * <p>
- * 设备扩展信息表（安全树） 服务实现类
- * </p>
- *
- * @author zyj
- * @since 2023-04-27
- */
-@Service
-public class DeviceExtServiceImpl extends ServiceImpl<DeviceExtMapper, DeviceExt> implements IDeviceExtService {
-
-
-    @Override
-    public boolean saveDeviceExt(DeviceDetailDTO deviceDetailDTO) {
-        DeviceExt ext = new DeviceExt();
-        ext.setDeviceId(deviceDetailDTO.getId());
-        ext.setCameraCode(deviceDetailDTO.getCameraCode());
-        ext.setCameraIp(deviceDetailDTO.getCameraIp());
-        ext.setCameraPort(deviceDetailDTO.getCameraPort());
-        ext.setGasCode(deviceDetailDTO.getGasCode());
-        ext.setGasIp(deviceDetailDTO.getGasIp());
-        ext.setGasPort(deviceDetailDTO.getGasPort());
-        ext.setHatLiningCode(deviceDetailDTO.getHatLiningCode());
-        return this.save(ext);
-    }
-
-    @Override
-    public boolean updateDeviceExt(DeviceDetailDTO deviceDetailDTO) {
-        DeviceExt ext = this.selectByDeviceId(deviceDetailDTO.getId());
-        ext.setCameraCode(deviceDetailDTO.getCameraCode());
-        ext.setCameraIp(deviceDetailDTO.getCameraIp());
-        ext.setCameraPort(deviceDetailDTO.getCameraPort());
-        ext.setGasCode(deviceDetailDTO.getGasCode());
-        ext.setGasIp(deviceDetailDTO.getGasIp());
-        ext.setGasPort(deviceDetailDTO.getGasPort());
-        ext.setHatLiningCode(deviceDetailDTO.getHatLiningCode());
-        return this.updateById(ext);
-    }
-
-    @Override
-    public boolean removeByDeviceIds(List<Long> deviceIds) {
-        QueryWrapper<DeviceExt> queryWrapper = new QueryWrapper<>();
-        queryWrapper.in("DEVICE_ID",deviceIds);
-        return this.remove(queryWrapper);
-    }
-
-    @Override
-    public boolean setGasThreshold(String gasIp, String gasPort, String threshold) {
-        UpdateWrapper<DeviceExt> updateWrapper = new UpdateWrapper<>();
-        updateWrapper.set("GAS_THRESHOLD",threshold);
-        updateWrapper.eq("GAS_IP",gasIp);
-        updateWrapper.eq("GAS_PORT",gasPort);
-        return this.update(updateWrapper);
-    }
-
-    @Override
-    public String getGasThreshold(String gasIp, String gasPort) {
-        QueryWrapper<DeviceExt> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("GAS_IP",gasIp);
-        queryWrapper.eq("GAS_PORT",gasPort);
-        DeviceExt deviceExt = this.getOne(queryWrapper);
-        return ObjectUtil.isNotEmpty(deviceExt) ? deviceExt.getGasThreshold() : null;
-    }
-
-    private DeviceExt selectByDeviceId(Long deviceId){
-        QueryWrapper<DeviceExt> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("DEVICE_ID",deviceId);
-        return this.getOne(queryWrapper);
-    }
-
-    @Override
-    public Long selectByGasIpPort(String gasIp, String gasPort) {
-        QueryWrapper<DeviceExt> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("GAS_IP",gasIp);
-        queryWrapper.eq("GAS_PORT",gasPort);
-        DeviceExt deviceExt = this.getOne(queryWrapper);
-        return ObjectUtil.isNotEmpty(deviceExt) ? deviceExt.getDeviceId() : null;
-    }
-
-    @Override
-    public Long selectByCameraIpPort(String cameraIp, String cameraPort) {
-        QueryWrapper<DeviceExt> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("CAMERA_IP",cameraIp);
-        queryWrapper.eq("CAMERA_PORT",cameraPort);
-        DeviceExt deviceExt = this.getOne(queryWrapper);
-        return ObjectUtil.isNotEmpty(deviceExt) ? deviceExt.getDeviceId() : null;
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java
index 9df79ef..31a5a18 100644
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java
@@ -1,125 +1,20 @@
 package com.casic.missiles.modular.system.service.impl;
 
-import cn.hutool.core.collection.CollUtil;
-import cn.hutool.core.date.DateUtil;
-import cn.hutool.core.util.ObjectUtil;
-import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.core.application.service.AbstractDictService;
-import com.casic.missiles.modular.system.dto.DeviceDetailDTO;
-import com.casic.missiles.modular.system.dto.HelmetInfoDTO;
 import com.casic.missiles.modular.system.entity.Device;
 import com.casic.missiles.modular.system.mapper.DeviceMapper;
-import com.casic.missiles.modular.system.service.IDeviceExtService;
 import com.casic.missiles.modular.system.service.IDeviceService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.casic.missiles.modular.system.service.IProjectDeviceService;
-import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.util.Date;
-import java.util.List;
-
-import static com.casic.missiles.modular.system.consts.DeviceConst.*;
 
 /**
  * <p>
- *  服务实现类
+ * 设备记录表 服务实现类
  * </p>
  *
  * @author zyj
- * @since 2023-04-14
+ * @since 2023-05-25
  */
 @Service
-@RequiredArgsConstructor
 public class DeviceServiceImpl extends ServiceImpl<DeviceMapper, Device> implements IDeviceService {
 
-    private final AbstractDictService dictService;
-    private final IDeviceExtService deviceExtService;
-
-    private final IProjectDeviceService projectDeviceService;
-
-    @Transactional
-    @Override
-    public boolean saveDevice(DeviceDetailDTO deviceDetailDTO) {
-        deviceDetailDTO.setCreateTime(new Date());
-        boolean deviceRes = this.save(deviceDetailDTO);
-        if(deviceRes && DEVICE_TYPE_TREE.equals(deviceDetailDTO.getDeviceType())){
-            deviceRes = deviceExtService.saveDeviceExt(deviceDetailDTO);
-        }
-        return deviceRes;
-    }
-
-    @Transactional
-    @Override
-    public boolean updateDevice(DeviceDetailDTO deviceDetailDTO) {
-        boolean deviceRes = this.updateById(deviceDetailDTO);
-        if(deviceRes && DEVICE_TYPE_TREE.equals(deviceDetailDTO.getDeviceType())){
-            deviceRes = deviceExtService.updateDeviceExt(deviceDetailDTO);
-        }
-        return deviceRes;
-    }
-
-    @Transactional
-    @Override
-    public boolean deleteDevices(List<Long> deviceIds) {
-        return this.removeByIds(deviceIds) & deviceExtService.removeByDeviceIds(deviceIds);
-    }
-
-    @Override
-    public Page<DeviceDetailDTO> listPage(Page<DeviceDetailDTO> page, QueryWrapper<DeviceDetailDTO> queryWrapper,String status,Long projectId) {
-        String ID_COLUMN_NAME = "br_device.ID";
-        List<Long> useDevices = this.selectProjectDevice(null);
-        List<Long> projectDevices;
-        if(ObjectUtil.isNotEmpty(projectId)){
-            projectDevices = this.selectProjectDevice(projectId);
-        } else {
-            projectDevices = null;
-        }
-
-        // 查询使用中的设备（如果传了 projectId，查询 使用中&&此现场）
-        if(DEVICE_STATUS_USE.equals(status)){
-            if(CollUtil.isEmpty(useDevices)){
-                return page;
-            }
-            if(ObjectUtil.isNotEmpty(projectId) && CollUtil.isEmpty(projectDevices)){
-                return page;
-            }
-            queryWrapper.in(ID_COLUMN_NAME,useDevices);
-            if(CollUtil.isNotEmpty(projectDevices)){
-                queryWrapper.in(ID_COLUMN_NAME,projectDevices);
-            }
-
-        }
-
-        // 查询未使用的设备（如果传了 projectId，查询 未使用||此现场）
-        if(DEVICE_STATUS_NORMAL.equals(status)) {
-            if (CollUtil.isNotEmpty(useDevices)) {
-                if (CollUtil.isEmpty(projectDevices)) {
-                    queryWrapper.notIn(ID_COLUMN_NAME, useDevices);
-                } else {
-                    queryWrapper.and(i -> i.notIn(ID_COLUMN_NAME, useDevices).or().in(ID_COLUMN_NAME, projectDevices));
-                }
-            }
-        }
-
-        page = this.baseMapper.listDetailPage(page, queryWrapper);
-        for (DeviceDetailDTO record : page.getRecords()) {
-            record.setDeviceTypeName(dictService.getDictNameByCode("deviceType",record.getDeviceType()));
-            record.setIsPowerSupplyName(dictService.getDictNameByCode("isPowerSupply",record.getIsPowerSupply()));
-            record.setRegisterTime(DateUtil.formatDate(record.getCreateTime()));
-            record.setStatus(useDevices.contains(record.getId()) ? DEVICE_STATUS_USE : DEVICE_STATUS_NORMAL);
-            record.setStatusName(dictService.getDictNameByCode("deviceStatus",record.getStatus()));
-        }
-        return page;
-    }
-
-    @Override
-    public List<Long> selectProjectDevice(Long projectId) {
-        return this.baseMapper.selectProjectDevice(projectId);
-    }
-
-
 }
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceSupportServiceImpl.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceSupportServiceImpl.java
deleted file mode 100644
index ffd01ff..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceSupportServiceImpl.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package com.casic.missiles.modular.system.service.impl;
-
-import com.casic.missiles.modular.system.dto.HelmetInfoDTO;
-import com.casic.missiles.modular.system.mapper.DeviceMapper;
-import com.casic.missiles.modular.system.service.IDeviceExtService;
-import com.casic.missiles.modular.system.service.IDeviceSupportService;
-import lombok.RequiredArgsConstructor;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-import static com.casic.missiles.modular.system.consts.DeviceConst.DEVICE_TYPE_HAT;
-
-@Service
-@RequiredArgsConstructor
-public class DeviceSupportServiceImpl implements IDeviceSupportService {
-
-    private final IDeviceExtService deviceExtService;
-
-    private final DeviceMapper deviceMapper;
-
-    @Override
-    public Long selectByGasIpPort(String gasIp, String gasPort) {
-        return deviceExtService.selectByGasIpPort(gasIp, gasPort);
-    }
-
-    @Override
-    public List<HelmetInfoDTO> selectHelmetList() {
-        return deviceMapper.selectHelmetList(DEVICE_TYPE_HAT);
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/impl/ProjectDeviceServiceImpl.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/impl/ProjectDeviceServiceImpl.java
deleted file mode 100644
index 965f55c..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/impl/ProjectDeviceServiceImpl.java
+++ /dev/null
@@ -1,96 +0,0 @@
-package com.casic.missiles.modular.system.service.impl;
-
-import cn.hutool.core.date.DateUtil;
-import cn.hutool.core.util.ObjectUtil;
-import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.casic.missiles.modular.system.dto.DeviceLocationDTO;
-import com.casic.missiles.modular.system.entity.DataGas;
-import com.casic.missiles.modular.system.entity.DataTreeLocation;
-import com.casic.missiles.modular.system.entity.ProjectDevice;
-import com.casic.missiles.modular.system.mapper.ProjectDeviceMapper;
-import com.casic.missiles.modular.system.service.IDataSupportService;
-import com.casic.missiles.modular.system.service.IProjectDeviceService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.casic.missiles.modular.system.utils.LngLatUtil;
-import lombok.RequiredArgsConstructor;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.util.List;
-import java.util.stream.Collectors;
-
-/**
- * <p>
- *  服务实现类
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@Service
-@RequiredArgsConstructor
-public class ProjectDeviceServiceImpl extends ServiceImpl<ProjectDeviceMapper, ProjectDevice> implements IProjectDeviceService {
-
-    private final IDataSupportService dataSupportService;
-
-    @Override
-    public boolean saveProjectDeviceList(Long projectId, List<ProjectDevice> projectDeviceList) {
-        projectDeviceList.forEach(i->i.setProjectId(projectId));
-        return this.saveBatch(projectDeviceList);
-    }
-
-    @Transactional
-    @Override
-    public boolean updateProjectDeviceList(Long projectId, List<ProjectDevice> projectDeviceList) {
-        return this.deleteByProjectId(projectId) && this.saveProjectDeviceList(projectId, projectDeviceList);
-    }
-
-    @Override
-    public boolean deleteByProjectId(Long projectId) {
-        QueryWrapper<ProjectDevice> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("PROJECT_ID",projectId);
-        return this.remove(queryWrapper);
-    }
-
-    @Override
-    public boolean deleteByProjectIds(List<Long> projectId) {
-        QueryWrapper<ProjectDevice> queryWrapper = new QueryWrapper<>();
-        queryWrapper.in("PROJECT_ID",projectId);
-        return this.remove(queryWrapper);
-    }
-
-    @Override
-    public List<ProjectDevice> selectDetailByProjectId(Long projectId) {
-        return this.baseMapper.selectDetailByProjectId(projectId);
-    }
-
-    @Override
-    public Long selectProjectIdByDevice(Long deviceId) {
-        QueryWrapper<ProjectDevice> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("DEVICE_ID",deviceId);
-        queryWrapper.exists("(select Id FROM br_work_site_info p where p.ID = br_project_device.PROJECT_ID AND p.PROJECT_STATE != '3')");
-        ProjectDevice projectDevice = this.getOne(queryWrapper);
-        return ObjectUtil.isNotEmpty(projectDevice) ? projectDevice.getProjectId() : null;
-    }
-
-    @Override
-    public List<DeviceLocationDTO> selectDeviceLocationList(Long projectId) {
-        List<DeviceLocationDTO> list = this.baseMapper.selectDeviceLocationList(projectId);
-        for (DeviceLocationDTO locationDTO : list) {
-            DataGas dataGas = dataSupportService.getGasData(locationDTO.getDeviceId());
-            DataTreeLocation location = dataSupportService.getTreeLocation(locationDTO.getDeviceId(),true);
-            if(ObjectUtil.isNotEmpty(dataGas)){
-                locationDTO.setGasValue(dataGas.getGasValue());
-                locationDTO.setTime(DateUtil.formatDateTime(dataGas.getTs()));
-            }
-            if(ObjectUtil.isNotEmpty(location)){
-                locationDTO.setLng(location.getGdLng());
-                locationDTO.setLat(location.getGdLat());
-                locationDTO.setLocation(location.getLocation());
-            }
-        }
-        list = list.stream().filter(i-> StrUtil.isAllNotEmpty(i.getLng(),i.getLat())).collect(Collectors.toList());
-        return LngLatUtil.sort(list);
-    }
-}

diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/AlarmController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/AlarmController.java
new file mode 100644
index 0000000..1795cf1
--- /dev/null
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/AlarmController.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.modular.system.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.stereotype.Controller;
+
+/**
+ * <p>
+ * 报警记录表 前端控制器
+ * </p>
+ *
+ * @author zyj
+ * @since 2023-05-25
+ */
+@Controller
+@RequestMapping("/system/alarm")
+public class AlarmController {
+
+}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusAlarmController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusAlarmController.java
deleted file mode 100644
index 1f82ebb..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusAlarmController.java
+++ /dev/null
@@ -1,102 +0,0 @@
-package com.casic.missiles.modular.system.controller;
-
-
-import cn.hutool.core.util.ObjectUtil;
-import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.core.base.controller.BaseController;
-import com.casic.missiles.core.page.PageFactory;
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.AlarmUpload;
-import com.casic.missiles.modular.system.dto.DeviceDetailDTO;
-import com.casic.missiles.modular.system.entity.BusAlarm;
-import com.casic.missiles.modular.system.service.IBusAlarmService;
-import io.swagger.annotations.*;
-import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.*;
-
-import org.springframework.stereotype.Controller;
-
-import static com.casic.missiles.model.response.ResponseData.DEFAULT_SUCCESS_MESSAGE;
-import static com.casic.missiles.modular.system.consts.AlarmConst.ALARM_STATUS_MANUAL_CANCEL;
-
-/**
- * <p>
- * 报警记录表 前端控制器
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@Api(tags = "报警管理接口")
-@Controller
-@RequestMapping("/alarm")
-@RequiredArgsConstructor
-public class BusAlarmController extends BaseController {
-
-    private final IBusAlarmService alarmService;
-
-    @ApiOperation("报警上报接口")
-    @PostMapping("/upload")
-    @ResponseBody
-    public Object upload(@RequestBody AlarmUpload alarmUpload){
-        alarmService.alarmUpload(alarmUpload);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("报警列表分页查询")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "workTitle", value = "作业名称",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "projectId", value = "作业ID",dataType = "Long", paramType = "query",example = "0"),
-            @ApiImplicitParam(name = "alarmStatus", value = "报警状态",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "projectState", value = "作业状态",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "alarmType", value = "报警类型",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "alarmStartTime", value = "报警开始时间",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "alarmEndTime", value = "报警结束时间",dataType = "String", paramType = "query")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = BusAlarm.class),
-    })
-    @GetMapping("/listPage")
-    @ResponseBody
-    public Object listPage(String workTitle,Long projectId,String alarmStatus,String projectState,String alarmType,String alarmStartTime,String alarmEndTime){
-        Page<BusAlarm> page = PageFactory.defaultPage();
-        QueryWrapper<BusAlarm> queryWrapper = new QueryWrapper<>();
-        if(StrUtil.isNotEmpty(workTitle)){
-            queryWrapper.like("p.WORK_TITLE",workTitle);
-        }
-        if(ObjectUtil.isNotEmpty(projectId)){
-            queryWrapper.eq("alarm.PROJECT_ID",projectId);
-        }
-        if(StrUtil.isNotEmpty(alarmStatus)){
-            queryWrapper.eq("alarm.ALARM_STATUS",alarmStatus);
-        }
-        if(StrUtil.isNotEmpty(projectState)){
-            queryWrapper.eq("p.PROJECT_STATE",projectState);
-        }
-        if(StrUtil.isNotEmpty(alarmType)){
-            queryWrapper.eq("alarm.ALARM_TYPE",alarmType);
-        }
-        if(StrUtil.isNotEmpty(alarmStartTime)){
-            queryWrapper.ge("alarm.ALARM_TIME",alarmStartTime);
-        }
-        if(StrUtil.isNotEmpty(alarmEndTime)){
-            queryWrapper.le("alarm.ALARM_TIME",alarmEndTime);
-        }
-        page = alarmService.listPage(page,queryWrapper);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-    @ApiOperation("消警")
-    @PostMapping("/cancel")
-    @ResponseBody
-    public Object cancel(@RequestParam("alarmId") Long alarmId){
-        UpdateWrapper<BusAlarm> updateWrapper = new UpdateWrapper<>();
-        updateWrapper.eq("ID",alarmId);
-        updateWrapper.set("ALARM_STATUS",ALARM_STATUS_MANUAL_CANCEL);
-        alarmService.update(updateWrapper);
-        return ResponseData.success();
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusEventController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusEventController.java
deleted file mode 100644
index dde5aad..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusEventController.java
+++ /dev/null
@@ -1,41 +0,0 @@
-package com.casic.missiles.modular.system.controller;
-
-
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.entity.BusEvent;
-import com.casic.missiles.modular.system.service.IBusEventService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.ResponseBody;
-
-/**
- * <p>
- * 事件表 前端控制器
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@Controller
-@RequestMapping("/event")
-@Api(tags = "事件上报")
-@RequiredArgsConstructor
-public class BusEventController {
-
-    private final IBusEventService eventService;
-
-    @ApiOperation("事件上报")
-    @PostMapping("add")
-    @ResponseBody
-    public Object add(@RequestBody BusEvent busEvent){
-        eventService.saveBusEvent(busEvent);
-        return ResponseData.success();
-    }
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
index 03abc5f..aa50d78 100644
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
@@ -1,121 +1,20 @@
 package com.casic.missiles.modular.system.controller;
 
 
-import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.core.base.controller.BaseController;
-import com.casic.missiles.core.page.PageFactory;
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.DeviceDetailDTO;
-import com.casic.missiles.modular.system.entity.Device;
-import com.casic.missiles.modular.system.service.IDeviceExtService;
-import com.casic.missiles.modular.system.service.IDeviceService;
-import io.swagger.annotations.*;
-import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.RequestMapping;
 
 import org.springframework.stereotype.Controller;
 
-import java.time.LocalDateTime;
-import java.util.Date;
-import java.util.List;
-
-import static com.casic.missiles.model.response.ResponseData.DEFAULT_SUCCESS_MESSAGE;
-
 /**
  * <p>
- *  前端控制器
+ * 设备记录表 前端控制器
  * </p>
  *
  * @author zyj
- * @since 2023-04-14
+ * @since 2023-05-25
  */
-@Api(tags = "设备管理接口")
-@RequiredArgsConstructor
 @Controller
-@RequestMapping("/device")
-public class DeviceController extends BaseController {
-    private final IDeviceService deviceService;
-    private final IDeviceExtService deviceExtService;
-
-    @ApiOperation("设备分页列表")
-    @ApiImplicitParams({
-        @ApiImplicitParam(name = "deviceType", value = "设备类型",dataType = "String", paramType = "query"),
-        @ApiImplicitParam(name = "deviceCode", value = "设备编号",dataType = "String", paramType = "query"),
-        @ApiImplicitParam(name = "status", value = "设备状态",dataType = "String", paramType = "query"),
-        @ApiImplicitParam(name = "projectId", value = "作业ID（如果传此参数，列表中返回该作业使用的设备）",dataType = "Long", paramType = "query", example = "0")
-    })
-    @ApiResponses({
-        @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = DeviceDetailDTO.class),
-    })
-    @GetMapping("listPage")
-    @ResponseBody
-    public Object listPage(String deviceType, String deviceCode, String status,Long projectId){
-        Page<DeviceDetailDTO> page = PageFactory.defaultPage();
-        QueryWrapper<DeviceDetailDTO> queryWrapper = new QueryWrapper<>();
-        if(StrUtil.isNotEmpty(deviceType)){
-            queryWrapper.eq("DEVICE_TYPE",deviceType);
-        }
-        if(StrUtil.isNotEmpty(deviceCode)){
-            queryWrapper.like("DEVICE_CODE",deviceCode);
-        }
-        page = deviceService.listPage(page,queryWrapper,status,projectId);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-    @ApiOperation("新增设备")
-    @PostMapping("add")
-    @ResponseBody
-    public Object add(@RequestBody DeviceDetailDTO deviceDetailDTO){
-        deviceService.saveDevice(deviceDetailDTO);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("编辑设备")
-    @PostMapping("update")
-    @ResponseBody
-    public Object update(@RequestBody DeviceDetailDTO deviceDetailDTO){
-        deviceService.updateDevice(deviceDetailDTO);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("删除设备")
-    @PostMapping("delete")
-    @ResponseBody
-    public Object delete(@ApiParam("设备id列表")@RequestBody List<Long> deviceIds){
-        deviceService.deleteDevices(deviceIds);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("设置甲烷阈值")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "gasIp", value = "安全树甲烷设备IP",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "gasPort", value = "安全树甲烷端口",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "threshold", value = "甲烷阈值",dataType = "String", paramType = "query")
-    })
-    @PostMapping("setThreshold")
-    @ResponseBody
-    public Object setThreshold(String gasIp,String gasPort,String threshold){
-        deviceExtService.setGasThreshold(gasIp, gasPort, threshold);
-        return ResponseData.success();
-    }
-
-
-    @ApiOperation("查询甲烷阈值")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "gasIp", value = "安全树甲烷设备IP",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "gasPort", value = "安全树甲烷端口",dataType = "String", paramType = "query")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = "{\"code\": 200,\"data\": \"100\",\"message\": \"请求成功\",\"success\": true}",response = String.class),
-    })
-    @GetMapping("getThreshold")
-    @ResponseBody
-    public Object getThreshold(String gasIp,String gasPort){
-        String data = deviceExtService.getGasThreshold(gasIp, gasPort);
-        return ResponseData.success(data);
-    }
-
+@RequestMapping("/system/device")
+public class DeviceController {
 
 }
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/OverviewController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/OverviewController.java
deleted file mode 100644
index 7570504..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/OverviewController.java
+++ /dev/null
@@ -1,70 +0,0 @@
-package com.casic.missiles.modular.system.controller;
-
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.AlarmTypeCountDTO;
-import com.casic.missiles.modular.system.dto.DeviceLocationDTO;
-import com.casic.missiles.modular.system.dto.WorkerLocationDTO;
-import com.casic.missiles.modular.system.service.IBusAlarmService;
-import com.casic.missiles.modular.system.service.IProjectDeviceService;
-import com.casic.missiles.modular.system.service.IProjectWorkerService;
-import io.swagger.annotations.*;
-import lombok.RequiredArgsConstructor;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.ResponseBody;
-
-import static com.casic.missiles.model.response.ResponseData.DEFAULT_SUCCESS_MESSAGE;
-import static com.casic.missiles.modular.system.consts.AlarmConst.ALARM_STATUS_ON;
-
-@Api(tags = "首页看板接口")
-@Controller
-@RequestMapping("overview")
-@RequiredArgsConstructor
-public class OverviewController {
-
-    private final IBusAlarmService alarmService;
-    private final IProjectDeviceService projectDeviceService;
-
-    private final IProjectWorkerService projectWorkerService;
-
-
-    @ApiOperation("报警统计接口")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "projectId", value = "作业ID",dataType = "Long", paramType = "query", example = "0")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = AlarmTypeCountDTO.class),
-    })
-    @GetMapping("/alarmCount")
-    @ResponseBody
-    public Object alarmCount(Long projectId){
-        return ResponseData.success(alarmService.alarmCount(projectId,ALARM_STATUS_ON));
-    }
-
-    @ApiOperation("设备列表接口")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "projectId", value = "作业ID",dataType = "Long", paramType = "query", example = "0")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = DeviceLocationDTO.class),
-    })
-    @GetMapping("/deviceList")
-    @ResponseBody
-    public Object deviceList(Long projectId){
-        return ResponseData.success(projectDeviceService.selectDeviceLocationList(projectId));
-    }
-
-    @ApiOperation("人员列表接口")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "projectId", value = "作业ID",dataType = "Long", paramType = "query", example = "0")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = WorkerLocationDTO.class),
-    })
-    @GetMapping("/workerList")
-    @ResponseBody
-    public Object workerList(Long projectId){
-        return ResponseData.success(projectWorkerService.selectWorkerLocationDTO(projectId));
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/WorkSiteInfoController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/WorkSiteInfoController.java
deleted file mode 100644
index af36d69..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/WorkSiteInfoController.java
+++ /dev/null
@@ -1,130 +0,0 @@
-package com.casic.missiles.modular.system.controller;
-
-
-import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.core.base.controller.BaseController;
-import com.casic.missiles.core.page.PageFactory;
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.WorkSiteDetailDTO;
-import com.casic.missiles.modular.system.entity.WorkSiteInfo;
-import com.casic.missiles.modular.system.service.IWorkSiteInfoService;
-import io.swagger.annotations.*;
-import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.*;
-
-import org.springframework.stereotype.Controller;
-
-import java.util.List;
-
-import static com.casic.missiles.model.response.ResponseData.DEFAULT_SUCCESS_MESSAGE;
-
-/**
- * <p>
- * 作业现场表 前端控制器
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@Controller
-@RequestMapping("/site")
-@Api(tags = "作业现场管理")
-@RequiredArgsConstructor
-public class WorkSiteInfoController extends BaseController {
-
-
-    private final IWorkSiteInfoService workSiteInfoService;
-
-    @ApiOperation("新增作业现场")
-    @PostMapping("add")
-    @ResponseBody
-    public Object addWorkSite(@RequestBody WorkSiteDetailDTO workSiteDetailDTO){
-        workSiteInfoService.addWorkSiteInfo(workSiteDetailDTO);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("编辑作业现场")
-    @PostMapping("update")
-    @ResponseBody
-    public Object updateWorkSite(@RequestBody WorkSiteDetailDTO workSiteDetailDTO){
-        workSiteInfoService.updateWorkSiteInfo(workSiteDetailDTO);
-        return ResponseData.success();
-    }
-
-
-    @ApiOperation("删除作业现场")
-    @PostMapping("delete")
-    @ResponseBody
-    public Object delete(@ApiParam("作业现场id列表")@RequestBody List<Long> projectIds){
-        workSiteInfoService.deleteProjects(projectIds);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("查询作业现场详情")
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = WorkSiteDetailDTO.class),
-    })
-    @GetMapping("detail")
-    @ResponseBody
-    public Object delete(@ApiParam(value = "作业现场id", example = "0")@RequestParam Long projectId){
-        WorkSiteDetailDTO detailDTO = workSiteInfoService.getWorkSiteDetail(projectId);
-        return ResponseData.success(detailDTO);
-    }
-
-    @ApiOperation("分页列表查询")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "workTitle",value = "作业名称", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "workRoad",value = "所属道路", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "workPersonName",value = "责任人姓名", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "startDate",value = "注册开始日期", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "endDate",value = "注册结束日期", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "projectState",value = "当前状态（字典值）", dataType = "String", paramType = "query")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = WorkSiteInfo.class),
-    })
-    @GetMapping("listPage")
-    @ResponseBody
-    public Object listPage(String workTitle,String workRoad,String workPersonName,String projectState,String startDate,String endDate){
-        Page<WorkSiteInfo> page = PageFactory.defaultPage();
-        QueryWrapper<WorkSiteInfo> queryWrapper = new QueryWrapper<>();
-        if(StrUtil.isNotEmpty(workTitle)){
-            queryWrapper.like("WORK_TITLE",workTitle);
-        }
-        if(StrUtil.isNotEmpty(workRoad)){
-            queryWrapper.like("WORK_ROAD",workRoad);
-        }
-        if(StrUtil.isNotEmpty(workPersonName)){
-            queryWrapper.like("WORKER_NAME",workPersonName);
-        }
-        if(StrUtil.isNotEmpty(projectState)){
-            queryWrapper.eq("PROJECT_STATE",projectState);
-        }
-        if(StrUtil.isNotEmpty(startDate)){
-            queryWrapper.ge("br_work_site_info.CREATE_TIME",startDate + " 00:00:00");
-        }
-        if(StrUtil.isNotEmpty(endDate)){
-            queryWrapper.le("br_work_site_info.CREATE_TIME",endDate + " 23:59:59");
-        }
-        page = workSiteInfoService.selectListPage(page,queryWrapper);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-    @ApiOperation("开始作业")
-    @PostMapping("start")
-    @ResponseBody
-    public Object start(@ApiParam(value = "作业现场id",example = "0")@RequestParam Long projectId){
-        workSiteInfoService.start(projectId);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("完成作业")
-    @PostMapping("finish")
-    @ResponseBody
-    public Object finish(@ApiParam(value = "作业现场id", example = "0")@RequestParam Long projectId){
-        workSiteInfoService.finish(projectId);
-        return ResponseData.success();
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/WorkerController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/WorkerController.java
deleted file mode 100644
index 796f94c..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/WorkerController.java
+++ /dev/null
@@ -1,136 +0,0 @@
-package com.casic.missiles.modular.system.controller;
-
-
-import cn.hutool.core.util.ObjectUtil;
-import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.core.base.controller.BaseController;
-import com.casic.missiles.core.page.PageFactory;
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.DeviceDetailDTO;
-import com.casic.missiles.modular.system.entity.Device;
-import com.casic.missiles.modular.system.entity.Worker;
-import com.casic.missiles.modular.system.service.IWorkerService;
-import io.swagger.annotations.*;
-import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.*;
-
-import org.springframework.stereotype.Controller;
-
-import java.util.Date;
-import java.util.List;
-
-import static com.casic.missiles.model.response.ResponseData.DEFAULT_SUCCESS_MESSAGE;
-
-/**
- * <p>
- *  前端控制器
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@Controller
-@RequestMapping("/worker")
-@RequiredArgsConstructor
-@Api(tags = "人员管理接口")
-public class WorkerController extends BaseController {
-
-    private final IWorkerService workerService;
-
-    @ApiOperation("分页列表查询")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "name",value = "姓名", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "deptId",value = "所属部门", dataType = "Long", paramType = "query", example = "0"),
-            @ApiImplicitParam(name = "status",value = "当前状态（字典值）", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "startDate",value = "注册开始日期", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "endDate",value = "注册结束日期", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "workerType",value = "人员类型（字典值）", dataType = "String", paramType = "query")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = Worker.class),
-    })
-    @GetMapping("listPage")
-    @ResponseBody
-    public Object listPage(String name,Long deptId, String status,String startDate,String endDate,String workerType){
-        Page<Worker> page = PageFactory.defaultPage();
-        QueryWrapper<Worker> queryWrapper = new QueryWrapper<>();
-        if(StrUtil.isNotEmpty(name)){
-            queryWrapper.like("WORKER_NAME",name);
-        }
-        if(ObjectUtil.isNotEmpty(deptId)){
-            queryWrapper.eq("DEPT_ID",deptId);
-        }
-        if(StrUtil.isNotEmpty(workerType)){
-            queryWrapper.eq("WORKER_TYPE",workerType);
-        }
-        if(StrUtil.isNotEmpty(startDate)){
-            queryWrapper.ge("CREATE_TIME",startDate + " 00:00:00");
-        }
-        if(StrUtil.isNotEmpty(endDate)){
-            queryWrapper.le("CREATE_TIME",endDate + " 23:59:59");
-        }
-        if(StrUtil.isNotEmpty(status)){
-            queryWrapper.eq("`STATUS`",status);
-        }
-        page = workerService.selectListPage(page,queryWrapper);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-    @ApiOperation("新增人员")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "worker", value = "人员信息", dataType = "Worker", paramType = "body", required = true),
-            @ApiImplicitParam(name = "projectId", value = "项目ID(入场申请需要)", dataType = "Long", paramType = "query", example = "0")
-    })
-    @PostMapping("add")
-    @ResponseBody
-    public Object add(@ApiParam("worker")@RequestBody Worker worker,
-                      @RequestParam(required = false) Long projectId){
-        workerService.addWorker(worker,projectId);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("编辑人员")
-    @PostMapping("update")
-    @ResponseBody
-    public Object update(@RequestBody Worker worker){
-        workerService.updateById(worker);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("删除人员")
-    @PostMapping("delete")
-    @ResponseBody
-    public Object delete(@ApiParam("人员id列表")@RequestBody List<Long> workIds){
-        workerService.removeByIds(workIds);
-        return ResponseData.success();
-    }
-
-
-    @ApiOperation(value = "获取人脸图片",notes = "返回人脸图片url")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "cameraIp",value = "摄像头IP", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "cameraPort",value = "摄像头端口号", dataType = "String", paramType = "query"),
-    })
-    @GetMapping("/face/register")
-    @ResponseBody
-    public Object faceRegister(String cameraIp,String cameraPort){
-        return ResponseData.success(workerService.faceRegister(cameraIp, cameraPort));
-    }
-
-
-    @ApiOperation(value = "查询临时入场人员列表")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "projectId", value = "项目ID",required = true,dataType = "Long", paramType = "query", example = "0")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = Worker.class),
-    })
-    @GetMapping("/projectTempWorker")
-    @ResponseBody
-    public Object projectTempWorker(Long projectId){
-        return ResponseData.success(workerService.projectTempWorker(projectId));
-    }
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/AlarmTypeCountDTO.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/AlarmTypeCountDTO.java
deleted file mode 100644
index 1a165a1..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/AlarmTypeCountDTO.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.casic.missiles.modular.system.dto;
-
-import io.swagger.annotations.ApiModel;
-import lombok.Data;
-
-@ApiModel(value = "AlarmTypeCountDTO",description = "报警类型统计（首页）")
-@Data
-public class AlarmTypeCountDTO {
-
-    private String alarmType;
-    private String alarmTypeName;
-    private Integer alarmCount;
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/AlarmUpload.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/AlarmUpload.java
deleted file mode 100644
index 73d7799..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/AlarmUpload.java
+++ /dev/null
@@ -1,46 +0,0 @@
-package com.casic.missiles.modular.system.dto;
-
-import cn.hutool.core.util.StrUtil;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-@ApiModel(value = "AlarmUpload",description = "报警上传")
-@Data
-public class AlarmUpload {
-
-    @ApiModelProperty(value = "摄像头ip")
-    private String cameraIp;
-
-    @ApiModelProperty(value = "摄像头端口")
-    private String cameraPort;
-    @ApiModelProperty(value = "安全树甲烷设备ip")
-    private String gasIp;
-    @ApiModelProperty(value = "安全树甲烷设备端口")
-    private String gasPort;
-    @ApiModelProperty(value = "报警值")
-    private String alarmValue;
-    @ApiModelProperty(value = "报警时间")
-    private String alarmTime;
-    @ApiModelProperty(value = "报警类型")
-    private String alarmType;
-    @ApiModelProperty(value = "报警图片")
-    private String alarmImage;
-    @ApiModelProperty(value = "报警内容")
-    private String alarmContent;
-
-    @Override
-    public String toString() {
-        return "AlarmUpload{" +
-                "cameraIp='" + cameraIp + '\'' +
-                ", cameraPort='" + cameraPort + '\'' +
-                ", gasIp='" + gasIp + '\'' +
-                ", gasPort='" + gasPort + '\'' +
-                ", alarmValue='" + alarmValue + '\'' +
-                ", alarmTime='" + alarmTime + '\'' +
-                ", alarmType='" + alarmType + '\'' +
-                ", alarmImage='" + (StrUtil.isNotEmpty(alarmImage) ? alarmImage.substring(0,50) : "null") + '\'' +
-                ", alarmContent='" + alarmContent + '\'' +
-                '}';
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/DeviceDetailDTO.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/DeviceDetailDTO.java
deleted file mode 100644
index ea518d9..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/DeviceDetailDTO.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package com.casic.missiles.modular.system.dto;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.casic.missiles.modular.system.entity.Device;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-@ApiModel("DeviceDetailDTO")
-@Data
-public class DeviceDetailDTO extends Device {
-
-    @ApiModelProperty(value = "摄像头编号")
-    private String cameraCode;
-
-    @ApiModelProperty(value = "摄像头IP")
-    private String cameraIp;
-
-    @ApiModelProperty(value = "摄像头端口")
-    private String cameraPort;
-
-    @ApiModelProperty(value = "激甲编号")
-    private String gasCode;
-
-    @ApiModelProperty(value = "激甲IP")
-    private String gasIp;
-
-    @ApiModelProperty(value = "激甲端口")
-    private String gasPort;
-
-    @ApiModelProperty(value = "智能帽衬编号")
-    private String hatLiningCode;
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/WorkSiteDetailDTO.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/WorkSiteDetailDTO.java
deleted file mode 100644
index 29378ff..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/WorkSiteDetailDTO.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package com.casic.missiles.modular.system.dto;
-
-import com.casic.missiles.modular.system.entity.ProjectDevice;
-import com.casic.missiles.modular.system.entity.ProjectWorker;
-import com.casic.missiles.modular.system.entity.WorkSiteInfo;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.util.List;
-
-@Data
-@ApiModel("WorkSiteDetailDTO")
-public class WorkSiteDetailDTO extends WorkSiteInfo {
-
-    @ApiModelProperty(value = "安全树列表",dataType = "ProjectDevice")
-    private List<ProjectDevice> deviceList;
-
-    @ApiModelProperty(value = "人员列表",dataType = "ProjectWorker")
-    private List<ProjectWorker> workerList;
-
-
-
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/WorkerLocationDTO.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/WorkerLocationDTO.java
deleted file mode 100644
index 6fd7b24..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/WorkerLocationDTO.java
+++ /dev/null
@@ -1,68 +0,0 @@
-package com.casic.missiles.modular.system.dto;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-@ApiModel(value = "WorkerLocationDTO",description = "人员位置列表（首页）")
-@Data
-public class WorkerLocationDTO {
-
-    @ApiModelProperty("人员ID")
-    private Long workerId;
-
-    @ApiModelProperty("人员姓名")
-    private String workerName;
-
-    @ApiModelProperty("安全帽编号")
-    private String hatCode;
-
-    @ApiModelProperty("安全帽ID")
-    private Long hatId;
-
-    @ApiModelProperty("背心编号")
-    private String vastCode;
-
-    @ApiModelProperty("手环编号")
-    private String braceletCode;
-
-    @ApiModelProperty("位置")
-    private String location;
-
-    @ApiModelProperty("时间")
-    private String time;
-
-    @ApiModelProperty("经度")
-    private String lng;
-
-    @ApiModelProperty("纬度")
-    private String lat;
-
-    @ApiModelProperty("心率")
-    private String heartRate;
-
-    @ApiModelProperty("血氧")
-    private String bloodOxygen;
-
-    @ApiModelProperty("一氧化碳")
-    private String co;
-
-    @ApiModelProperty("甲烷")
-    private String gas;
-
-    @ApiModelProperty("硫化氢")
-    private String h2s;
-
-    @ApiModelProperty("氧气")
-    private String o2;
-
-    @ApiModelProperty("信号")
-    private String signal;
-
-    @ApiModelProperty("电量")
-    private String cell;
-
-    @ApiModelProperty("是否报警")
-    private boolean alarmFlag;
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Alarm.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Alarm.java
new file mode 100644
index 0000000..4d2b7ef
--- /dev/null
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Alarm.java
@@ -0,0 +1,103 @@
+package com.casic.missiles.modular.system.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import java.util.Date;
+
+/**
+ * <p>
+ * 报警记录表
+ * </p>
+ *
+ * @author zyj
+ * @since 2023-05-25
+ */
+@Data
+@TableName("bus_alarm")
+public class Alarm implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    @TableId(value = "ID",type = IdType.ASSIGN_ID)
+    private Long id;
+
+    /**
+     * 设备ID
+     */
+    @TableField("DEVICE_ID")
+    private Long deviceId;
+
+    /**
+     * 报警类型
+     */
+    @TableField("ALARM_TYPE")
+    private String alarmType;
+
+    /**
+     * 报警时间
+     */
+    @TableField("ALARM_TIME")
+    private Date alarmTime;
+
+    /**
+     * 报警状态
+     */
+    @TableField("ALARM_STATUS")
+    private String alarmStatus;
+
+    /**
+     * 报警位置
+     */
+    @TableField("ALARM_LOCATION")
+    private String alarmLocation;
+
+    /**
+     * 报警图片
+     */
+    @TableField("ALARM_IMAGE")
+    private String alarmImage;
+
+    /**
+     * 视频通道号
+     */
+    @TableField("CHANNEL_NO")
+    private Integer channelNo;
+
+    /**
+     * 报警内容
+     */
+    @TableField("ALARM_CONTENT")
+    private String alarmContent;
+
+    /**
+     * 消警时间
+     */
+    @TableField("CANCEL_TIME")
+    private Date cancelTime;
+
+
+    @Override
+    public String toString() {
+        return "Alarm{" +
+            "id=" + id +
+            ", deviceId=" + deviceId +
+            ", alarmType=" + alarmType +
+            ", alarmTime=" + alarmTime +
+            ", alarmStatus=" + alarmStatus +
+            ", alarmLocation=" + alarmLocation +
+            ", alarmImage=" + alarmImage +
+            ", channelNo=" + channelNo +
+            ", alarmContent=" + alarmContent +
+            ", cancelTime=" + cancelTime +
+        "}";
+    }
+}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusAlarm.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusAlarm.java
deleted file mode 100644
index efb4a23..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusAlarm.java
+++ /dev/null
@@ -1,159 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.alibaba.fastjson.annotation.JSONField;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.time.LocalDateTime;
-import java.util.Date;
-
-/**
- * <p>
- * 报警记录表
- * </p>
- *
- * @author zyj
- * @since 2023-05-16
- */
-@Data
-@ApiModel("Alarm")
-@TableName("br_bus_alarm")
-public class BusAlarm implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 项目ID
-     */
-    @ApiModelProperty(value = "项目ID")
-    @TableField("PROJECT_ID")
-    private Long projectId;
-
-    /**
-     * 设备ID
-     */
-    @ApiModelProperty(value = "设备ID")
-    @TableField("DEVICE_ID")
-    private Long deviceId;
-
-    /**
-     * 报警类型
-     */
-    @ApiModelProperty(value = "报警类型")
-    @TableField("ALARM_TYPE")
-    private String alarmType;
-
-    /**
-     * 报警状态
-     */
-    @ApiModelProperty(value = "报警状态")
-    @TableField("ALARM_STATUS")
-    private String alarmStatus;
-
-    /**
-     * 报警值
-     */
-    @ApiModelProperty(value = "报警值")
-    @TableField("ALARM_VALUE")
-    private String alarmValue;
-
-    /**
-     * 报警图片
-     */
-    @ApiModelProperty(value = "报警图片")
-    @TableField("ALARM_IMAGE")
-    private String alarmImage;
-
-    /**
-     * 报警内容
-     */
-    @ApiModelProperty(value = "报警内容")
-    @TableField("ALARM_CONTENT")
-    private String alarmContent;
-
-    /**
-     * 报警时间
-     */
-    @ApiModelProperty(value = "报警时间")
-    @TableField("ALARM_TIME")
-    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
-    private Date alarmTime;
-
-    /**
-     * 消警时间
-     */
-    @ApiModelProperty(value = "消警时间")
-    @TableField("CANCEL_TIME")
-    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
-    private Date cancelTime;
-
-    /**
-     * 报警位置经度
-     */
-    @ApiModelProperty(value = "报警位置经度")
-    @TableField("ALARM_LNG")
-    private String alarmLng;
-
-    /**
-     * 报警位置纬度
-     */
-    @ApiModelProperty(value = "报警位置纬度")
-    @TableField("ALARM_LAT")
-    private String alarmLat;
-
-    @ApiModelProperty("报警类型名称")
-    @TableField(exist = false)
-    private String alarmStatusName;
-    @ApiModelProperty("报警类型名称")
-    @TableField(exist = false)
-    private String alarmTypeName;
-    @ApiModelProperty("作业名称")
-    @TableField(exist = false)
-    private String workTitle;
-    @ApiModelProperty("所属道路")
-    @TableField(exist = false)
-    private String workRoad;
-    @ApiModelProperty("作业状态")
-    @TableField(exist = false)
-    private String projectState;
-    @ApiModelProperty("作业状态名称")
-    @TableField(exist = false)
-    private String projectStateName;
-    @ApiModelProperty("负责人姓名")
-    @TableField(exist = false)
-    private String workPersonName;
-    @ApiModelProperty("负责人联系方式")
-    @TableField(exist = false)
-    private String workPersonPhoneNumber;
-
-
-    @Override
-    public String toString() {
-        return "BusAlarm{" +
-                "id=" + id +
-                ", projectId=" + projectId +
-                ", deviceId=" + deviceId +
-                ", alarmType=" + alarmType +
-                ", alarmValue=" + alarmValue +
-                ", alarmStatus=" + alarmStatus +
-                ", alarmImage=" + alarmImage +
-                ", alarmContent=" + alarmContent +
-                ", alarmTime=" + alarmTime +
-                ", cancelTime=" + cancelTime +
-                ", alarmLng=" + alarmLng +
-                ", alarmLat=" + alarmLat +
-                "}";
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusEvent.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusEvent.java
deleted file mode 100644
index a0b7543..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusEvent.java
+++ /dev/null
@@ -1,100 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.time.LocalDateTime;
-import java.util.Date;
-import java.util.List;
-
-/**
- * <p>
- * 事件表
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@TableName("br_bus_event")
-@Data
-@ApiModel("BusEvent")
-public class BusEvent implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @ApiModelProperty("事件ID")
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 事件标题
-     */
-    @ApiModelProperty("事件名称")
-    @TableField("EVENT_TITLE")
-    private String eventTitle;
-
-    /**
-     * 上报人员
-     */
-    @ApiModelProperty("上报人员")
-    @TableField("UPLOAD_NAME")
-    private String uploadName;
-
-    /**
-     * 联系方式
-     */
-    @ApiModelProperty("联系方式")
-    @TableField("PHONE_NUMBER")
-    private String phoneNumber;
-
-    /**
-     * 事件描述
-     */
-    @ApiModelProperty("事件描述")
-    @TableField("EVENT_DESCRIPTION")
-    private String eventDescription;
-
-    @ApiModelProperty("经度")
-    @TableField("LNG")
-    private String lng;
-
-    @ApiModelProperty("纬度")
-    @TableField("LAT")
-    private String lat;
-
-    /**
-     * 事件上传时间
-     */
-    @ApiModelProperty("事件上传时间")
-    @TableField("CREATE_TIME")
-    private Date createTime;
-
-    @ApiModelProperty("事件照片")
-    @TableField(exist = false)
-    private List<BusEventImage> imageList;
-
-
-
-    @Override
-    public String toString() {
-        return "BusEvent{" +
-            "id=" + id +
-            ", eventTitle=" + eventTitle +
-            ", uploadName=" + uploadName +
-            ", phoneNumber=" + phoneNumber +
-            ", eventDescription=" + eventDescription +
-            ", lng=" + lng +
-            ", lat=" + lat +
-            ", createTime=" + createTime +
-        "}";
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusEventImage.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusEventImage.java
deleted file mode 100644
index 1e75245..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusEventImage.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-
-/**
- * <p>
- * 事件图片表
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@TableName("br_bus_event_image")
-@Data
-@ApiModel("BusEventImage")
-public class BusEventImage implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 事件ID
-     */
-    @TableField("EVENT_ID")
-    private Long eventId;
-
-    /**
-     * 报警图片
-     */
-    @TableField("IMAGE")
-    @ApiModelProperty("图片url")
-    private String image;
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Device.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Device.java
index df89c70..ea7db5f 100644
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Device.java
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Device.java
@@ -1,30 +1,23 @@
 package com.casic.missiles.modular.system.entity;
 
-import com.alibaba.fastjson.annotation.JSONField;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.casic.missiles.core.base.json.DateDeserializer;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
-import java.util.Date;
 
 /**
  * <p>
- * 
+ * 设备记录表
  * </p>
  *
  * @author zyj
- * @since 2023-04-14
+ * @since 2023-05-25
  */
-@ApiModel("Device")
-@TableName("br_device")
 @Data
+@TableName("bus_device")
 public class Device implements Serializable {
 
     private static final long serialVersionUID = 1L;
@@ -32,82 +25,86 @@
     /**
      * 主键
      */
-    @ApiModelProperty(value = "设备ID")
     @TableId(value = "ID",type = IdType.ASSIGN_ID)
     private Long id;
 
     /**
-     * 设备编号
+     * 设备名称
      */
-    @ApiModelProperty(value = "设备编号")
-    @TableField("DEVICE_CODE")
-    private String deviceCode;
+    @TableField("DEVICE_NAME")
+    private String deviceName;
 
     /**
-     * 设备类型
+     * IP
      */
-    @ApiModelProperty(value = "设备类型")
-    @TableField("DEVICE_TYPE")
-    private String deviceType;
+    @TableField("IP")
+    private String ip;
 
     /**
-     * 设备批次
+     * 端口
      */
-    @ApiModelProperty(value = "设备批次")
-    @TableField("DEVICE_BATCH")
-    private String deviceBatch;
+    @TableField("PORT")
+    private String port;
 
     /**
-     * 厂家
+     * 用户名
      */
-    @ApiModelProperty(value = "厂家")
-    @TableField("MANUFACTURER")
-    private String manufacturer;
+    @TableField("USER_NAME")
+    private String userName;
 
     /**
-     * 是否供电
+     * 密码
      */
-    @ApiModelProperty(value = "是否供电")
-    @TableField("IS_POWER_SUPPLY")
-    private String isPowerSupply;
+    @TableField("PASSWORD")
+    private String password;
 
     /**
-     * 创建时间
+     * 连接类型
      */
-    @ApiModelProperty(value = "创建时间",dataType = "Date")
-    @TableField("CREATE_TIME")
-    private Date createTime;
+    @TableField("CONNECT_TYPE")
+    private String connectType;
 
-    @ApiModelProperty(value = "设备类型名称")
-    @TableField(exist = false)
-    private String deviceTypeName;
+    /**
+     * 位置
+     */
+    @TableField("LOCATION")
 
-    @ApiModelProperty(value = "是否供电名称")
-    @TableField(exist = false)
-    private String isPowerSupplyName;
+    private String location;
 
-    @ApiModelProperty(value = "注册时间",dataType = "String")
-    @TableField(exist = false)
-    private String registerTime;
+    /**
+     * 设备状态
+     */
+    @TableField("STATUS")
 
-    @ApiModelProperty(value = "当前状态")
-    @TableField(exist = false)
     private String status;
 
-    @ApiModelProperty(value = "当前状态名称")
-    @TableField(exist = false)
-    private String statusName;
+    /**
+     * 报警分组
+     */
+    @TableField("ALARM_GROUP")
+
+    private Long alarmGroup;
+
+    /**
+     * 视频通道数(预留)
+     */
+    @TableField("CHANNEL_NUM")
+    private Integer channelNum;
 
     @Override
     public String toString() {
         return "Device{" +
             "id=" + id +
-            ", deviceCode=" + deviceCode +
-            ", deviceType=" + deviceType +
-            ", deviceBatch=" + deviceBatch +
-            ", manufacturer=" + manufacturer +
-            ", isPowerSupply=" + isPowerSupply +
-            ", createTime=" + createTime +
+            ", deviceName=" + deviceName +
+            ", ip=" + ip +
+            ", port=" + port +
+            ", userName=" + userName +
+            ", password=" + password +
+            ", connectType=" + connectType +
+            ", location=" + location +
+            ", status=" + status +
+            ", alarmGroup=" + alarmGroup +
+            ", channelNum=" + channelNum +
         "}";
     }
 }
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/DeviceExt.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/DeviceExt.java
deleted file mode 100644
index 5ee7015..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/DeviceExt.java
+++ /dev/null
@@ -1,99 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-
-/**
- * <p>
- * 设备扩展信息表（安全树）
- * </p>
- *
- * @author zyj
- * @since 2023-04-27
- */
-@Data
-@TableName("br_device_ext")
-public class DeviceExt implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 设备ID
-     */
-    @TableField("DEVICE_ID")
-    private Long deviceId;
-
-    /**
-     * 摄像头编号
-     */
-    @TableField("CAMERA_CODE")
-    private String cameraCode;
-
-    /**
-     * 摄像头IP
-     */
-    @TableField("CAMERA_IP")
-    private String cameraIp;
-
-    /**
-     * 摄像头端口
-     */
-    @TableField("CAMERA_PORT")
-    private String cameraPort;
-
-    /**
-     * 激甲编号
-     */
-    @TableField("GAS_CODE")
-    private String gasCode;
-
-    /**
-     * 激甲IP
-     */
-    @TableField("GAS_IP")
-    private String gasIp;
-
-    /**
-     * 激甲端口
-     */
-    @TableField("GAS_PORT")
-    private String gasPort;
-
-    /**
-     * 甲烷报警阈值
-     */
-    @TableField("GAS_THRESHOLD")
-    private String gasThreshold;
-
-    @TableField(value = "HAT_LINING_CODE")
-    private String hatLiningCode;
-
-
-    @Override
-    public String toString() {
-        return "DeviceExt{" +
-            "id=" + id +
-            ", deviceId=" + deviceId +
-            ", cameraCode=" + cameraCode +
-            ", cameraIp=" + cameraIp +
-            ", cameraPort=" + cameraPort +
-            ", gasCode=" + gasCode +
-            ", gasIp=" + gasIp +
-            ", gasPort=" + gasPort +
-            ", gasThreshold=" + gasThreshold +
-            ", hatLiningCode=" + hatLiningCode +
-        "}";
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/ProjectDevice.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/ProjectDevice.java
deleted file mode 100644
index c4f3472..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/ProjectDevice.java
+++ /dev/null
@@ -1,62 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-
-/**
- * <p>
- * 
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@Data
-@ApiModel("ProjectDevice")
-@TableName("br_project_device")
-public class ProjectDevice implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 作业现场ID
-     */
-    @TableField("PROJECT_ID")
-    private Long projectId;
-
-    /**
-     * 设备ID
-     */
-    @TableField("DEVICE_ID")
-    @ApiModelProperty("设备ID（新增编辑时传）")
-    private Long deviceId;
-
-    /**
-     * 设备编号
-     */
-    @TableField(exist = false)
-    @ApiModelProperty("设备编号（详情中展示，新增编辑不用传）")
-    private String deviceCode;
-
-    @Override
-    public String toString() {
-        return "ProjectDevice{" +
-            "id=" + id +
-            ", projectId=" + projectId +
-            ", deviceId=" + deviceId +
-        "}";
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/ProjectWorker.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/ProjectWorker.java
deleted file mode 100644
index 10b23c4..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/ProjectWorker.java
+++ /dev/null
@@ -1,104 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import java.io.Serializable;
-
-/**
- * <p>
- * 
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@ApiModel("ProjectWorker")
-@TableName("br_project_worker")
-@Data
-@NoArgsConstructor
-@AllArgsConstructor
-public class ProjectWorker implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 作业现场ID
-     */
-    @TableField("PROJECT_ID")
-    private Long projectId;
-
-    /**
-     * 人员ID
-     */
-    @ApiModelProperty("人员ID")
-    @TableField("WORKER_ID")
-    private Long workerId;
-
-    /**
-     * 安全帽编号
-     */
-    @ApiModelProperty("安全帽编号")
-    @TableField("HAT_CODE")
-    private String hatCode;
-
-    /**
-     * 背心编号
-     */
-    @ApiModelProperty("背心编号")
-    @TableField("VAST_CODE")
-    private String vastCode;
-
-    /**
-     * 手环编号
-     */
-    @ApiModelProperty("手环编号")
-    @TableField("BRACELET_CODE")
-    private String braceletCode;
-
-    @ApiModelProperty("人员姓名（详情中展示，新增编辑不用传）")
-    @TableField(exist = false)
-    private String workerName;
-
-    @ApiModelProperty("人员部门ID（详情中展示，新增编辑不用传）")
-    @TableField(exist = false)
-    private String workerDeptId;
-
-    @ApiModelProperty("人员部门名称（详情中展示，新增编辑不用传）")
-    @TableField(exist = false)
-    private String workerDeptName;
-
-    @ApiModelProperty("人员联系方式（详情中展示，新增编辑不用传）")
-    @TableField(exist = false)
-    private String workerPhoneNumber;
-
-    public ProjectWorker(Long projectId, Long workerId) {
-        this.projectId = projectId;
-        this.workerId = workerId;
-    }
-
-    @Override
-    public String toString() {
-        return "ProjectWorker{" +
-            "id=" + id +
-            ", projectId=" + projectId +
-            ", workerId=" + workerId +
-            ", hatCode=" + hatCode +
-            ", vastCode=" + vastCode +
-            ", braceletCode=" + braceletCode +
-        "}";
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/WorkSiteInfo.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/WorkSiteInfo.java
deleted file mode 100644
index fa6f41d..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/WorkSiteInfo.java
+++ /dev/null
@@ -1,130 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.alibaba.fastjson.annotation.JSONField;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.time.LocalDateTime;
-import java.util.Date;
-
-/**
- * <p>
- * 作业现场表
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@ApiModel("WorkSiteInfo")
-@TableName("br_work_site_info")
-@Data
-public class WorkSiteInfo implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @ApiModelProperty("作业现场ID")
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 作业名称
-     */
-    @ApiModelProperty("作业名称")
-    @TableField("WORK_TITLE")
-    private String workTitle;
-
-    /**
-     * 责任人
-     */
-    @ApiModelProperty("责任人（人员ID）")
-    @TableField("WORK_PERSON")
-    private Long workPerson;
-
-    /**
-     * 作业描述
-     */
-    @ApiModelProperty("作业描述")
-    @TableField("WORK_SITE_DESC")
-    private String workSiteDesc;
-
-    /**
-     * 作业状态
-     */
-    @ApiModelProperty("作业状态")
-    @TableField("PROJECT_STATE")
-    private String projectState;
-
-    /**
-     * 所属道路
-     */
-    @ApiModelProperty("所属道路")
-    @TableField("WORK_ROAD")
-    private String workRoad;
-
-    @TableField("IMAGE_URL")
-    private String imageUrl;
-
-    @TableField("CREATE_TIME")
-    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
-    private Date createTime;
-    @TableField("UPDATE_TIME")
-    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
-    private Date updateTime;
-
-    @ApiModelProperty("开始时间")
-    @TableField("START_TIME")
-    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
-    private Date startTime;
-
-    @ApiModelProperty("结束时间")
-    @TableField("FINISH_TIME")
-    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
-    private Date finishTime;
-
-    @ApiModelProperty("负责人姓名（详情中使用，新增编辑不用传）")
-    @TableField(exist = false)
-    private String workPersonName;
-
-    @ApiModelProperty("负责人联系方式（详情中使用，新增编辑不用传）")
-    @TableField(exist = false)
-    private String workPersonPhoneNumber;
-
-    @ApiModelProperty("负责人所属部门ID（详情中使用，新增编辑不用传）")
-    @TableField(exist = false)
-    private Long workPersonDeptId;
-
-    @ApiModelProperty("负责人所属部门名称（详情中使用，新增编辑不用传）")
-    @TableField(exist = false)
-    private String workPersonDeptName;
-
-    @ApiModelProperty(value = "注册时间",dataType = "String")
-    @TableField(exist = false)
-    private String registerTime;
-
-    @ApiModelProperty("作业状态名称")
-    @TableField(exist = false)
-    private String projectStateName;
-
-    @Override
-    public String toString() {
-        return "WorkSiteInfo{" +
-            "id=" + id +
-            ", workTitle=" + workTitle +
-            ", workPerson=" + workPerson +
-            ", workSiteDesc=" + workSiteDesc +
-            ", projectState=" + projectState +
-            ", imageUrl=" + imageUrl +
-            ", updateTime=" + updateTime +
-            ", workRoad=" + workRoad +
-        "}";
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Worker.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Worker.java
deleted file mode 100644
index 28a4daa..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Worker.java
+++ /dev/null
@@ -1,147 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.time.LocalDateTime;
-import java.util.Date;
-
-/**
- * <p>
- * 
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@ApiModel("Worker")
-@TableName("br_worker")
-@Data
-public class Worker implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @ApiModelProperty(value = "人员ID")
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 姓名
-     */
-    @ApiModelProperty(value = "姓名")
-    @TableField("WORKER_NAME")
-    private String workerName;
-
-    /**
-     * 性别
-     */
-    @ApiModelProperty(value = "性别")
-    @TableField("GENDER")
-    private String gender;
-
-    /**
-     * 所属部门
-     */
-    @ApiModelProperty(value = "所属部门(人员管理)")
-    @TableField("DEPT_ID")
-    private Long deptId;
-
-    /**
-     * 所属单位
-     */
-    @ApiModelProperty(value = "所属单位(入场申请中使用)")
-    @TableField("OWNER_SHIP")
-    private String ownerShip;
-
-    /**
-     * 联系方式
-     */
-    @ApiModelProperty(value = "联系方式")
-    @TableField("PHONE_NUMBER")
-    private String phoneNumber;
-
-    /**
-     * 证件号
-     */
-    @ApiModelProperty(value = "证件号")
-    @TableField("ID_CARD_NUMBER")
-    private String idCardNumber;
-
-    /**
-     * 入场原因
-     */
-    @ApiModelProperty(value = "入场原因（入场申请中使用）")
-    @TableField("ENTER_REASON")
-    private String enterReason;
-
-    /**
-     * 入场人脸照片
-     */
-    @ApiModelProperty(value = "人脸照片（照片路径）")
-    @TableField("WORKER_AVATAR")
-    private String workerAvatar;
-
-    /**
-     * 申请入场时间
-     */
-    @ApiModelProperty(value = "注册时间/申请入场时间")
-    @TableField("CREATE_TIME")
-    private Date createTime;
-
-    /**
-     * 人员类型
-     */
-    @ApiModelProperty(value = "人员类型（区分人员管理和入场申请）")
-    @TableField("WORKER_TYPE")
-    private String workerType;
-
-    @ApiModelProperty(value = "性别名称")
-    @TableField(exist = false)
-    private String genderName;
-
-    @ApiModelProperty(value = "部门名称")
-    @TableField(exist = false)
-    private String deptName;
-
-    @ApiModelProperty(value = "注册时间",dataType = "String")
-    @TableField(exist = false)
-    private String registerTime;
-
-    @ApiModelProperty(value = "当前状态")
-    @TableField(exist = false)
-    private String status;
-
-    @ApiModelProperty(value = "当前状态名称")
-    @TableField(exist = false)
-    private String statusName;
-
-    @ApiModelProperty(value = "是否注册(0未注册；1已注册)",allowableValues = "0,1")
-    @TableField(exist = false)
-    private String isRegister;
-
-    @Override
-    public String toString() {
-        return "Worker{" +
-            "id=" + id +
-            ", workerName=" + workerName +
-            ", gender=" + gender +
-            ", deptId=" + deptId +
-            ", ownerShip=" + ownerShip +
-            ", phoneNumber=" + phoneNumber +
-            ", idCardNumber=" + idCardNumber +
-            ", enterReason=" + enterReason +
-            ", workerAvatar=" + workerAvatar +
-            ", createTime=" + createTime +
-            ", workerType=" + workerType +
-        "}";
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/AlarmMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/AlarmMapper.java
new file mode 100644
index 0000000..ea4c8be
--- /dev/null
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/AlarmMapper.java
@@ -0,0 +1,16 @@
+package com.casic.missiles.modular.system.mapper;
+
+import com.casic.missiles.modular.system.entity.Alarm;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 报警记录表 Mapper 接口
+ * </p>
+ *
+ * @author zyj
+ * @since 2023-05-25
+ */
+public interface AlarmMapper extends BaseMapper<Alarm> {
+
+}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/BusAlarmMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/BusAlarmMapper.java
deleted file mode 100644
index 9801742..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/BusAlarmMapper.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package com.casic.missiles.modular.system.mapper;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.modular.system.dto.AlarmTypeCountDTO;
-import com.casic.missiles.modular.system.entity.BusAlarm;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * <p>
- * 报警记录表 Mapper 接口
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface BusAlarmMapper extends BaseMapper<BusAlarm> {
-
-    Page<BusAlarm> listPage(Page<BusAlarm> page,@Param("ew")  QueryWrapper<BusAlarm> queryWrapper);
-
-    void cancelAlarm(@Param("deviceId")Long deviceId,@Param("alarmType") String alarmType);
-
-    List<AlarmTypeCountDTO> alarmCount(@Param("projectId")Long projectId, @Param("alarmStatus")String alarmStatus);
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/BusEventImageMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/BusEventImageMapper.java
deleted file mode 100644
index 9590b7d..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/BusEventImageMapper.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.casic.missiles.modular.system.mapper;
-
-import com.casic.missiles.modular.system.entity.BusEventImage;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * <p>
- * 事件图片表 Mapper 接口
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface BusEventImageMapper extends BaseMapper<BusEventImage> {
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/BusEventMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/BusEventMapper.java
deleted file mode 100644
index 3c85edf..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/BusEventMapper.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.casic.missiles.modular.system.mapper;
-
-import com.casic.missiles.modular.system.entity.BusEvent;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * <p>
- * 事件表 Mapper 接口
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface BusEventMapper extends BaseMapper<BusEvent> {
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/DeviceExtMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/DeviceExtMapper.java
deleted file mode 100644
index 4ca9212..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/DeviceExtMapper.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.casic.missiles.modular.system.mapper;
-
-import com.casic.missiles.modular.system.entity.DeviceExt;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * <p>
- * 设备扩展信息表（安全树） Mapper 接口
- * </p>
- *
- * @author zyj
- * @since 2023-04-27
- */
-public interface DeviceExtMapper extends BaseMapper<DeviceExt> {
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/DeviceMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/DeviceMapper.java
index 444c0c5..3d0bb02 100644
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/DeviceMapper.java
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/DeviceMapper.java
@@ -1,30 +1,16 @@
 package com.casic.missiles.modular.system.mapper;
 
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.modular.system.dto.DeviceDetailDTO;
-import com.casic.missiles.modular.system.dto.HelmetInfoDTO;
 import com.casic.missiles.modular.system.entity.Device;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
 
 /**
  * <p>
- *  Mapper 接口
+ * 设备记录表 Mapper 接口
  * </p>
  *
  * @author zyj
- * @since 2023-04-14
+ * @since 2023-05-25
  */
-@Mapper
 public interface DeviceMapper extends BaseMapper<Device> {
 
-    Page<DeviceDetailDTO> listDetailPage(Page<DeviceDetailDTO> page,@Param("ew") QueryWrapper<DeviceDetailDTO> ew);
-
-     List<Long> selectProjectDevice(@Param("projectId") Long projectId);
-
-    List<HelmetInfoDTO> selectHelmetList(@Param("deviceType")String deviceType);
 }
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/ProjectDeviceMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/ProjectDeviceMapper.java
deleted file mode 100644
index 1d0c14e..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/ProjectDeviceMapper.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package com.casic.missiles.modular.system.mapper;
-
-import com.casic.missiles.modular.system.dto.DeviceLocationDTO;
-import com.casic.missiles.modular.system.entity.ProjectDevice;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * <p>
- *  Mapper 接口
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface ProjectDeviceMapper extends BaseMapper<ProjectDevice> {
-     List<ProjectDevice> selectDetailByProjectId(@Param("projectId") Long projectId);
-
-     List<DeviceLocationDTO> selectDeviceLocationList(@Param("projectId") Long projectId);
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/ProjectWorkerMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/ProjectWorkerMapper.java
deleted file mode 100644
index 58583d1..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/ProjectWorkerMapper.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package com.casic.missiles.modular.system.mapper;
-
-import com.casic.missiles.modular.system.dto.WorkerLocationDTO;
-import com.casic.missiles.modular.system.entity.ProjectWorker;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * <p>
- *  Mapper 接口
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface ProjectWorkerMapper extends BaseMapper<ProjectWorker> {
-
-    List<ProjectWorker> selectDetailByProjectId(@Param("projectId") Long projectId,
-                                                @Param("workerType")String workerType);
-
-    List<WorkerLocationDTO> selectWorkerLocationList(@Param("projectId") Long projectId,
-                                                     @Param("workerType")String workerType);
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/WorkSiteInfoMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/WorkSiteInfoMapper.java
deleted file mode 100644
index a4934d2..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/WorkSiteInfoMapper.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.casic.missiles.modular.system.mapper;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.modular.system.entity.WorkSiteInfo;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Param;
-
-/**
- * <p>
- * 作业现场表 Mapper 接口
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface WorkSiteInfoMapper extends BaseMapper<WorkSiteInfo> {
-
-    Page<WorkSiteInfo> selectListPage(Page<WorkSiteInfo> page,@Param("ew") QueryWrapper<WorkSiteInfo> ew);
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/WorkerMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/WorkerMapper.java
deleted file mode 100644
index 258fb12..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/WorkerMapper.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package com.casic.missiles.modular.system.mapper;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.modular.system.dto.DeviceDetailDTO;
-import com.casic.missiles.modular.system.entity.Worker;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * <p>
- *  Mapper 接口
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface WorkerMapper extends BaseMapper<Worker> {
-
-
-    Page<Worker> selectListPage(Page<Worker> page, @Param("ew") QueryWrapper<Worker> ew);
-
-    List<String> selectWorkerAvatars(@Param("projectId")Long projectId);
-
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/AlarmMapper.xml b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/AlarmMapper.xml
new file mode 100644
index 0000000..25cb4ab
--- /dev/null
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/AlarmMapper.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.modular.system.mapper.AlarmMapper">
+
+</mapper>
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/BusAlarmMapper.xml b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/BusAlarmMapper.xml
deleted file mode 100644
index 595088a..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/BusAlarmMapper.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.casic.missiles.modular.system.mapper.BusAlarmMapper">
-
-    <select id="listPage" resultType="com.casic.missiles.modular.system.entity.BusAlarm">
-        SELECT
-            alarm.ID as id,
-            alarm.DEVICE_ID as deviceId,
-            alarm.PROJECT_ID as projectId,
-            alarm.ALARM_TYPE as alarmType,
-            alarm.ALARM_VALUE as alarmValue,
-            alarm.ALARM_STATUS as alarmStatus,
-            alarm.ALARM_IMAGE AS alarmImage,
-            alarm.ALARM_CONTENT as alarmContent,
-            alarm.ALARM_TIME as alarmTime,
-            alarm.CANCEL_TIME as cancelTime,
-            alarm.ALARM_LNG as alarmLng,
-            alarm.ALARM_LAT as alarmLat,
-            p.WORK_TITLE as workTitle,
-            p.WORK_ROAD as workRoad,
-            p.PROJECT_STATE as projectState,
-            w.WORKER_NAME as workPersonName,
-            w.PHONE_NUMBER as workPersonPhoneNumber
-        FROM
-            `br_bus_alarm` alarm
-                LEFT JOIN br_work_site_info p on alarm.PROJECT_ID = p.ID
-                LEFT JOIN br_worker w on p.WORK_PERSON = w.ID
-        <where>
-            <if test="ew != null">
-                ${ew.sqlSegment}
-            </if>
-        </where>
-    </select>
-
-    <select id="cancelAlarm">
-        update br_bus_alarm
-        set ALARM_STATUS = '1'
-        where DEVICE_ID = #{deviceId}
-          and ALARM_TYPE = #{alarmType}
-          and ALARM_STATUS = '0'
-    </select>
-
-    <select id="alarmCount" resultType="com.casic.missiles.modular.system.dto.AlarmTypeCountDTO">
-        SELECT
-            ALARM_TYPE as alarmType,
-            count(*) as alarmCount
-        from br_bus_alarm
-        <where>
-            <if test="projectId != null and projectId !=''">
-                and PROJECT_ID = #{projectId}
-            </if>
-            <if test="alarmStatus != null and alarmStatus !=''">
-                and ALARM_STATUS = #{alarmStatus}
-            </if>
-        </where>
-        group by ALARM_TYPE
-    </select>
-</mapper>
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/BusEventImageMapper.xml b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/BusEventImageMapper.xml
deleted file mode 100644
index fbc3db3..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/BusEventImageMapper.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.casic.missiles.modular.system.mapper.BusEventImageMapper">
-
-</mapper>
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/BusEventMapper.xml b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/BusEventMapper.xml
deleted file mode 100644
index 627d573..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/BusEventMapper.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.casic.missiles.modular.system.mapper.BusEventMapper">
-
-</mapper>
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/DeviceExtMapper.xml b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/DeviceExtMapper.xml
deleted file mode 100644
index 5321d1c..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/DeviceExtMapper.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.casic.missiles.modular.system.mapper.DeviceExtMapper">
-
-</mapper>
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/DeviceMapper.xml b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/DeviceMapper.xml
index 94262e1..88e7d01 100644
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/DeviceMapper.xml
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/DeviceMapper.xml
@@ -2,96 +2,4 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.casic.missiles.modular.system.mapper.DeviceMapper">
 
-    <select id="listDetailPage" resultType="com.casic.missiles.modular.system.dto.DeviceDetailDTO">
-        select
-        br_device.ID as id,
-        DEVICE_CODE as deviceCode,
-        DEVICE_TYPE as deviceType,
-        DEVICE_BATCH as deviceBatch,
-        MANUFACTURER as manufacturer,
-        IS_POWER_SUPPLY as isPowerSupply,
-        CREATE_TIME as createTime,
-        CAMERA_CODE as cameraCode,
-        CAMERA_IP as cameraIp,
-        CAMERA_PORT as cameraPort,
-        GAS_CODE as gasCode,
-        GAS_IP as gasIp,
-        GAS_PORT as gasPort,
-        HAT_LINING_CODE as hatLiningCode
-        from br_device
-        left join br_device_ext ext on ext.DEVICE_ID = br_device.ID
-        <where>
-            <if test="ew != null">
-                ${ew.sqlSegment}
-            </if>
-        </where>
-    </select>
-
-    <select id="selectProjectDevice" resultType="java.lang.Long">
-        with device_info as (
-            (SELECT
-            d.DEVICE_ID as DEVICE_ID,
-            d.PROJECT_ID as PROJECT_ID,
-            p.PROJECT_STATE as PROJECT_STATE
-            from br_project_device d
-            LEFT JOIN br_work_site_info p on p.ID = d.PROJECT_ID)
-
-            UNION ALL
-
-            (SELECT
-            d1.ID as DEVICE_ID,
-            w1.ID as PROJECT_ID,
-            w1.PROJECT_STATE as PROJECT_STATE
-            FROM br_project_worker pw1
-            LEFT JOIN br_device d1 on pw1.BRACELET_CODE = d1.DEVICE_CODE
-            LEFT JOIN br_work_site_info w1 on pw1.PROJECT_ID = w1.ID)
-
-            UNION ALL
-
-            (SELECT
-            d1.ID as DEVICE_ID,
-            w1.ID as PROJECT_ID,
-            w1.PROJECT_STATE as PROJECT_STATE
-            FROM br_project_worker pw1
-            LEFT JOIN br_device d1 on pw1.HAT_CODE = d1.DEVICE_CODE
-            LEFT JOIN br_work_site_info w1 on pw1.PROJECT_ID = w1.ID)
-
-
-            UNION ALL
-
-            (SELECT
-            d1.ID as DEVICE_ID,
-            w1.ID as PROJECT_ID,
-            w1.PROJECT_STATE as PROJECT_STATE
-            FROM br_project_worker pw1
-            LEFT JOIN br_device d1 on pw1.VAST_CODE = d1.DEVICE_CODE
-            LEFT JOIN br_work_site_info w1 on pw1.PROJECT_ID = w1.ID))
-
-        select DISTINCT DEVICE_ID from device_info
-        <where>
-            DEVICE_ID is not null
-            <choose>
-                <when test="projectId != null and projectId !=''">
-                    and PROJECT_ID = #{projectId}
-                </when>
-                <otherwise>
-                    AND PROJECT_STATE != '3'
-                </otherwise>
-            </choose>
-        </where>
-    </select>
-
-    <select id="selectHelmetList" resultType="com.casic.missiles.modular.system.dto.HelmetInfoDTO">
-        SELECT
-            a.ID AS deviceId,
-            a.DEVICE_CODE AS hatCode,
-            b.HAT_LINING_CODE AS hatLiningCode
-        FROM
-            br_device a
-                LEFT JOIN br_device_ext b ON a.ID = b.DEVICE_ID
-        WHERE
-            a.DEVICE_TYPE = #{deviceType}
-          AND a.DEVICE_CODE IS NOT NULL
-          AND b.HAT_LINING_CODE IS NOT NULL
-    </select>
 </mapper>
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/ProjectDeviceMapper.xml b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/ProjectDeviceMapper.xml
deleted file mode 100644
index c6d1c24..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/ProjectDeviceMapper.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.casic.missiles.modular.system.mapper.ProjectDeviceMapper">
-
-    <select id="selectDetailByProjectId" resultType="com.casic.missiles.modular.system.entity.ProjectDevice">
-        SELECT
-            pd.ID as id,
-            pd.PROJECT_ID as projectId,
-            pd.DEVICE_ID as deviceId,
-            d.DEVICE_CODE as deviceCode
-        from br_project_device pd
-        LEFT JOIN br_device d on pd.DEVICE_ID = d.ID
-        <where>
-            pd.PROJECT_ID = #{projectId}
-        </where>
-    </select>
-
-    <select id="selectDeviceLocationList" resultType="com.casic.missiles.modular.system.dto.DeviceLocationDTO">
-        SELECT
-        d.ID as deviceId,
-        d.DEVICE_TYPE as deviceType,
-        d.DEVICE_CODE as deviceCode,
-        if(EXISTS(select ID from br_bus_alarm WHERE DEVICE_ID = d.ID and ALARM_STATUS = '0'),true,false) as alarmFlag
-        FROM br_project_device pd, br_device d
-        where pd.DEVICE_ID = d.ID
-        and pd.PROJECT_ID = #{projectId}
-    </select>
-
-</mapper>
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/ProjectWorkerMapper.xml b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/ProjectWorkerMapper.xml
deleted file mode 100644
index 8d2de10..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/ProjectWorkerMapper.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.casic.missiles.modular.system.mapper.ProjectWorkerMapper">
-
-    <select id="selectDetailByProjectId" resultType="com.casic.missiles.modular.system.entity.ProjectWorker">
-        SELECT
-            pw.ID as id,
-            pw.PROJECT_ID as projectId,
-            pw.WORKER_ID as workerId,
-            w.WORKER_NAME as workerName,
-            w.DEPT_ID as workerDeptId,
-            pw.HAT_CODE as hatCode,
-            pw.VAST_CODE as vastCode,
-            pw.BRACELET_CODE as braceletCode,
-            w.PHONE_NUMBER as workerPhoneNumber
-        from br_project_worker pw
-        LEFT JOIN br_worker w on pw.WORKER_ID = w.ID
-        <where>
-            pw.PROJECT_ID = #{projectId}
-            <if test="workerType != null and workerType != ''">
-                and w.WORKER_TYPE = #{workerType}
-            </if>
-        </where>
-    </select>
-
-    <select id="selectWorkerLocationList" resultType="com.casic.missiles.modular.system.dto.WorkerLocationDTO">
-        select
-            w.ID as workerId,
-            w.WORKER_NAME as workerName,
-            pw.HAT_CODE as hatCode,
-            hd.ID as hatId,
-            pw.BRACELET_CODE as braceletCode,
-            pw.VAST_CODE as vastCode
-        from br_project_worker pw,br_worker w ,br_device hd
-        WHERE pw.WORKER_ID = w.ID
-          and pw.HAT_CODE = hd.DEVICE_CODE
-          and pw.PROJECT_ID = #{projectId}
-          and w.WORKER_TYPE = #{workerType}
-    </select>
-</mapper>
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/WorkSiteInfoMapper.xml b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/WorkSiteInfoMapper.xml
deleted file mode 100644
index 8f01326..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/WorkSiteInfoMapper.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.casic.missiles.modular.system.mapper.WorkSiteInfoMapper">
-
-    <select id="selectListPage" resultType="com.casic.missiles.modular.system.entity.WorkSiteInfo">
-        SELECT
-            br_work_site_info.ID AS id,
-            WORK_TITLE as workTitle,
-            WORK_ROAD as workRoad,
-            WORK_SITE_DESC as workSiteDesc,
-            WORK_PERSON as workPerson,
-            WORKER_NAME as workPersonName,
-            DEPT_ID as workPersonDeptId,
-            PHONE_NUMBER as workPersonPhoneNumber,
-            PROJECT_STATE as projectState,
-            br_work_site_info.CREATE_TIME AS createTime,
-            br_work_site_info.UPDATE_TIME AS updateTime
-        FROM br_work_site_info
-        LEFT JOIN br_worker w ON br_work_site_info.WORK_PERSON = w.ID
-        <where>
-            <if test="ew != null">
-                ${ew.sqlSegment}
-            </if>
-        </where>
-    </select>
-</mapper>
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/WorkerMapper.xml b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/WorkerMapper.xml
deleted file mode 100644
index 3e28b39..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/WorkerMapper.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.casic.missiles.modular.system.mapper.WorkerMapper">
-
-    <select id="selectListPage" resultType="com.casic.missiles.modular.system.entity.Worker">
-        WITH worker_project AS (
-            SELECT
-                w.id AS ID,
-                WORKER_NAME,
-                GENDER,
-                DEPT_ID,
-                OWNER_SHIP,
-                PHONE_NUMBER,
-                ID_CARD_NUMBER,
-                ENTER_REASON,
-                WORKER_AVATAR,
-                w.CREATE_TIME,
-                WORKER_TYPE,
-                IF( p.PROJECT_STATE != '3', 1, 0 ) AS `STATUS`
-            FROM br_worker w
-            LEFT JOIN br_project_worker pw ON w.ID = pw.WORKER_ID
-            LEFT JOIN br_work_site_info p ON pw.PROJECT_ID = p.ID
-        )
-
-        SELECT
-            ID AS id,
-            WORKER_NAME AS workerName,
-            GENDER AS gender,
-            DEPT_ID AS deptId,
-            OWNER_SHIP AS ownerShip,
-            PHONE_NUMBER AS phoneNumber,
-            ID_CARD_NUMBER AS idCardNumber,
-            ENTER_REASON AS enterReason,
-            WORKER_AVATAR AS workerAvatar,
-            CREATE_TIME AS createTime,
-            WORKER_TYPE AS workerType,
-            `STATUS` AS `status`
-        FROM worker_project
-        <where>
-            <if test="ew != null">
-                ${ew.sqlSegment}
-            </if>
-        </where>
-    </select>
-
-    <select id="selectWorkerAvatars" resultType="java.lang.String">
-        SELECT
-            WORKER_AVATAR
-        FROM
-            `br_worker`
-        WHERE
-        ID IN ( SELECT WORKER_ID FROM br_project_worker WHERE PROJECT_ID = #{projectId} )
-          AND WORKER_AVATAR IS NOT NULL
-          AND WORKER_AVATAR != ''
-    </select>
-</mapper>
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IAlarmService.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IAlarmService.java
new file mode 100644
index 0000000..8bc01f4
--- /dev/null
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IAlarmService.java
@@ -0,0 +1,16 @@
+package com.casic.missiles.modular.system.service;
+
+import com.casic.missiles.modular.system.entity.Alarm;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 报警记录表 服务类
+ * </p>
+ *
+ * @author zyj
+ * @since 2023-05-25
+ */
+public interface IAlarmService extends IService<Alarm> {
+
+}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IBusAlarmService.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IBusAlarmService.java
deleted file mode 100644
index f63c19c..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IBusAlarmService.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package com.casic.missiles.modular.system.service;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.modular.system.dto.AlarmTypeCountDTO;
-import com.casic.missiles.modular.system.dto.AlarmUpload;
-import com.casic.missiles.modular.system.entity.BusAlarm;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-import java.util.List;
-
-/**
- * <p>
- * 报警记录表 服务类
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface IBusAlarmService extends IService<BusAlarm> {
-
-    boolean alarmUpload(AlarmUpload alarmUpload);
-
-    Page<BusAlarm> listPage(Page<BusAlarm> page,QueryWrapper<BusAlarm> queryWrapper);
-
-    List<AlarmTypeCountDTO> alarmCount(Long projectId,String alarmStatus);
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IBusEventImageService.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IBusEventImageService.java
deleted file mode 100644
index b1187ed..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IBusEventImageService.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.casic.missiles.modular.system.service;
-
-import com.casic.missiles.modular.system.entity.BusEventImage;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-import java.util.List;
-
-/**
- * <p>
- * 事件图片表 服务类
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface IBusEventImageService extends IService<BusEventImage> {
-
-    boolean saveBusEventImages(Long eventId, List<BusEventImage> imageList);
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IBusEventService.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IBusEventService.java
deleted file mode 100644
index 85c48d0..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IBusEventService.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package com.casic.missiles.modular.system.service;
-
-import com.casic.missiles.modular.system.entity.BusEvent;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-/**
- * <p>
- * 事件表 服务类
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface IBusEventService extends IService<BusEvent> {
-
-    boolean saveBusEvent(BusEvent busEvent);
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IDeviceExtService.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IDeviceExtService.java
deleted file mode 100644
index 6fc5361..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IDeviceExtService.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package com.casic.missiles.modular.system.service;
-
-import com.casic.missiles.modular.system.dto.DeviceDetailDTO;
-import com.casic.missiles.modular.system.entity.DeviceExt;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-import java.util.List;
-
-/**
- * <p>
- * 设备扩展信息表（安全树） 服务类
- * </p>
- *
- * @author zyj
- * @since 2023-04-27
- */
-public interface IDeviceExtService extends IService<DeviceExt> {
-
-    boolean saveDeviceExt(DeviceDetailDTO deviceDetailDTO);
-
-    boolean updateDeviceExt(DeviceDetailDTO deviceDetailDTO);
-
-    boolean removeByDeviceIds(List<Long> deviceIds);
-
-    boolean setGasThreshold(String gasIp,String gasPort,String threshold);
-
-    String getGasThreshold(String gasIp,String gasPort);
-
-    Long selectByGasIpPort(String gasIp,String gasPort);
-
-    Long selectByCameraIpPort(String cameraIp,String cameraPort);
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java
index 9e62756..00a421d 100644
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java
@@ -1,32 +1,16 @@
 package com.casic.missiles.modular.system.service;
 
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.modular.system.dto.DeviceDetailDTO;
-import com.casic.missiles.modular.system.dto.HelmetInfoDTO;
 import com.casic.missiles.modular.system.entity.Device;
 import com.baomidou.mybatisplus.extension.service.IService;
 
-import java.util.List;
-
 /**
  * <p>
- *  服务类
+ * 设备记录表 服务类
  * </p>
  *
  * @author zyj
- * @since 2023-04-14
+ * @since 2023-05-25
  */
 public interface IDeviceService extends IService<Device> {
 
-    boolean saveDevice(DeviceDetailDTO deviceDetailDTO);
-
-    boolean updateDevice(DeviceDetailDTO deviceDetailDTO);
-
-    boolean deleteDevices(List<Long> deviceIds);
-
-    Page<DeviceDetailDTO> listPage(Page<DeviceDetailDTO> page, QueryWrapper<DeviceDetailDTO> queryWrapper, String status,Long projectId);
-
-    List<Long> selectProjectDevice(Long projectId);
-
 }
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IProjectDeviceService.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IProjectDeviceService.java
deleted file mode 100644
index 8599411..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IProjectDeviceService.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package com.casic.missiles.modular.system.service;
-
-import com.casic.missiles.modular.system.dto.DeviceLocationDTO;
-import com.casic.missiles.modular.system.entity.ProjectDevice;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-import java.util.List;
-
-/**
- * <p>
- *  服务类
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface IProjectDeviceService extends IService<ProjectDevice> {
-
-    boolean saveProjectDeviceList(Long projectId, List<ProjectDevice> projectDeviceList);
-
-    boolean updateProjectDeviceList(Long projectId, List<ProjectDevice> projectDeviceList);
-
-    boolean deleteByProjectId(Long projectId);
-
-    boolean deleteByProjectIds(List<Long> projectIds);
-
-    List<ProjectDevice> selectDetailByProjectId(Long projectId);
-
-    Long selectProjectIdByDevice(Long deviceId);
-
-    List<DeviceLocationDTO> selectDeviceLocationList(Long projectId);
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IProjectWorkerService.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IProjectWorkerService.java
deleted file mode 100644
index e921bc3..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IProjectWorkerService.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package com.casic.missiles.modular.system.service;
-
-import com.casic.missiles.modular.system.dto.WorkerLocationDTO;
-import com.casic.missiles.modular.system.entity.ProjectDevice;
-import com.casic.missiles.modular.system.entity.ProjectWorker;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-import java.util.List;
-
-/**
- * <p>
- *  服务类
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface IProjectWorkerService extends IService<ProjectWorker> {
-
-    boolean saveProjectWorkerList(Long projectId, List<ProjectWorker> projectWorkerList);
-
-    boolean updateProjectWorkerList(Long projectId, List<ProjectWorker> projectWorkerList);
-
-    boolean deleteByProjectId(Long projectId);
-
-    boolean deleteByProjectIds(List<Long> projectIds);
-
-    List<ProjectWorker> selectDetailByProjectId(Long projectId,String workerType);
-
-    List<WorkerLocationDTO> selectWorkerLocationDTO(Long projectId);
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IWorkSiteInfoService.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IWorkSiteInfoService.java
deleted file mode 100644
index 58a8590..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IWorkSiteInfoService.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package com.casic.missiles.modular.system.service;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.modular.system.dto.WorkSiteDetailDTO;
-import com.casic.missiles.modular.system.entity.WorkSiteInfo;
-import com.baomidou.mybatisplus.extension.service.IService;
-import java.util.List;
-/**
- * <p>
- * 作业现场表 服务类
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface IWorkSiteInfoService extends IService<WorkSiteInfo> {
-
-    boolean addWorkSiteInfo(WorkSiteDetailDTO workSiteDetailDTO);
-
-    boolean updateWorkSiteInfo(WorkSiteDetailDTO workSiteDetailDTO);
-
-    boolean deleteProjects(List<Long> projectIds);
-
-    WorkSiteDetailDTO getWorkSiteDetail(Long projectId);
-
-    Page<WorkSiteInfo> selectListPage(Page<WorkSiteInfo> page, QueryWrapper<WorkSiteInfo> queryWrapper);
-
-    boolean start(Long projectId);
-
-    boolean finish(Long projectId);
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IWorkerService.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IWorkerService.java
deleted file mode 100644
index 6c6ee98..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IWorkerService.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package com.casic.missiles.modular.system.service;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.modular.system.entity.Worker;
-import com.baomidou.mybatisplus.extension.service.IService;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * <p>
- *  服务类
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface IWorkerService extends IService<Worker> {
-
-    boolean addWorker(Worker worker,Long projectId);
-
-    Page<Worker> selectListPage(Page<Worker> page,QueryWrapper<Worker> ew);
-
-    Worker selectWorkerDetail(Long workerId);
-
-    List<String> faceRegister(String cameraIp,String cameraPort);
-
-    List<Worker> projectTempWorker(Long projectId);
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/impl/AlarmServiceImpl.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/impl/AlarmServiceImpl.java
new file mode 100644
index 0000000..6e5959b
--- /dev/null
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/impl/AlarmServiceImpl.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.modular.system.service.impl;
+
+import com.casic.missiles.modular.system.entity.Alarm;
+import com.casic.missiles.modular.system.mapper.AlarmMapper;
+import com.casic.missiles.modular.system.service.IAlarmService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 报警记录表 服务实现类
+ * </p>
+ *
+ * @author zyj
+ * @since 2023-05-25
+ */
+@Service
+public class AlarmServiceImpl extends ServiceImpl<AlarmMapper, Alarm> implements IAlarmService {
+
+}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/impl/BusAlarmServiceImpl.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/impl/BusAlarmServiceImpl.java
deleted file mode 100644
index b44de1d..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/impl/BusAlarmServiceImpl.java
+++ /dev/null
@@ -1,121 +0,0 @@
-package com.casic.missiles.modular.system.service.impl;
-
-import cn.hutool.core.date.DateUtil;
-import cn.hutool.core.util.ObjectUtil;
-import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.core.application.service.AbstractDictService;
-import com.casic.missiles.modular.system.consts.AlarmTypeEnum;
-import com.casic.missiles.modular.system.dto.AlarmTypeCountDTO;
-import com.casic.missiles.modular.system.dto.AlarmUpload;
-import com.casic.missiles.modular.system.entity.BusAlarm;
-import com.casic.missiles.modular.system.entity.DataTreeLocation;
-import com.casic.missiles.modular.system.mapper.BusAlarmMapper;
-import com.casic.missiles.modular.system.service.*;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.util.Date;
-import java.util.List;
-import java.util.stream.Collectors;
-
-import static com.casic.missiles.modular.system.consts.AlarmConst.ALARM_STATUS_ON;
-
-/**
- * <p>
- * 报警记录表 服务实现类
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@Service
-@RequiredArgsConstructor
-@Slf4j
-public class BusAlarmServiceImpl extends ServiceImpl<BusAlarmMapper, BusAlarm> implements IBusAlarmService {
-
-    private final IDeviceExtService deviceExtService;
-    private final IDeviceService deviceService;
-    private final IProjectDeviceService projectDeviceService;
-
-    private final ICasicFileService fileService;
-
-    private final AbstractDictService dictService;
-    private final IDataSupportService dataSupportService;
-
-    @Override
-    @Transactional
-    public boolean alarmUpload(AlarmUpload alarmUpload) {
-        log.info("alarm upload ==> {}",alarmUpload.toString());
-        Long deviceId = null;
-        if(StrUtil.isAllNotBlank(alarmUpload.getGasIp(),alarmUpload.getGasPort())){
-            deviceId = deviceExtService.selectByGasIpPort(alarmUpload.getGasIp(),alarmUpload.getGasPort());
-        }
-        if(ObjectUtil.isEmpty(deviceId) && StrUtil.isAllNotBlank(alarmUpload.getCameraIp(),alarmUpload.getCameraPort())){
-            deviceId = deviceExtService.selectByCameraIpPort(alarmUpload.getCameraIp(),alarmUpload.getCameraPort());
-        }
-
-        if(ObjectUtil.isEmpty(deviceId)){
-            return false;
-        }
-
-        BusAlarm alarm = new BusAlarm();
-        alarm.setDeviceId(deviceId);
-        alarm.setProjectId(projectDeviceService.selectProjectIdByDevice(deviceId));
-        alarm.setAlarmValue(alarmUpload.getAlarmValue());
-        if(StrUtil.isNotEmpty(alarmUpload.getAlarmTime())){
-            alarm.setAlarmTime(DateUtil.parseDateTime(alarmUpload.getAlarmTime()));
-        }else {
-            alarm.setAlarmTime(new Date());
-        }
-
-        alarm.setAlarmType(alarmUpload.getAlarmType());
-        alarm.setAlarmContent(alarmUpload.getAlarmContent());
-        if(StrUtil.isNotEmpty(alarmUpload.getAlarmImage())){
-            String imgBase64 = "data:image/jpeg;base64," + alarmUpload.getAlarmImage();
-            String imageUrl = fileService.saveFile(imgBase64);
-            alarm.setAlarmImage(imageUrl);
-        }
-        alarm.setAlarmStatus(ALARM_STATUS_ON);
-
-        DataTreeLocation treeLocation = dataSupportService.getTreeLocation(deviceId);
-        if(ObjectUtil.isNotEmpty(treeLocation)){
-            alarm.setAlarmLng(treeLocation.getGdLng());
-            alarm.setAlarmLat(treeLocation.getGdLat());
-        }
-
-        //自动消警
-        AlarmTypeEnum alarmTypeEnum = AlarmTypeEnum.getByAlarmType(alarm.getAlarmType());
-        if(ObjectUtil.isNotEmpty(alarmTypeEnum) && alarmTypeEnum.isAutoCancel()){
-            this.baseMapper.cancelAlarm(deviceId,alarm.getAlarmType());
-        }
-        return this.save(alarm);
-    }
-
-    @Override
-    public Page<BusAlarm> listPage(Page<BusAlarm> page, QueryWrapper<BusAlarm> queryWrapper) {
-        page = this.baseMapper.listPage(page, queryWrapper);
-        for (BusAlarm alarm : page.getRecords()) {
-            alarm.setAlarmTypeName(dictService.getDictNameByCode("alarmType",alarm.getAlarmType()));
-            alarm.setAlarmStatusName(dictService.getDictNameByCode("alarmStatus",alarm.getAlarmStatus()));
-            if(StrUtil.isNotEmpty(alarm.getProjectState())){
-                alarm.setProjectStateName(dictService.getDictNameByCode("projectStatus",alarm.getProjectState()));
-            }
-        }
-        return page;
-    }
-
-    @Override
-    public List<AlarmTypeCountDTO> alarmCount(Long projectId, String alarmStatus) {
-        List<AlarmTypeCountDTO> list = this.baseMapper.alarmCount(projectId, alarmStatus);
-        list = list.stream().filter(i->StrUtil.isNotEmpty(i.getAlarmType())).collect(Collectors.toList());
-        for (AlarmTypeCountDTO countDTO : list) {
-            countDTO.setAlarmTypeName(dictService.getDictNameByCode("alarmType",countDTO.getAlarmType()));
-        }
-        return list;
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/impl/BusEventImageServiceImpl.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/impl/BusEventImageServiceImpl.java
deleted file mode 100644
index a43f7c1..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/impl/BusEventImageServiceImpl.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package com.casic.missiles.modular.system.service.impl;
-
-import com.casic.missiles.modular.system.entity.BusEventImage;
-import com.casic.missiles.modular.system.mapper.BusEventImageMapper;
-import com.casic.missiles.modular.system.service.IBusEventImageService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-/**
- * <p>
- * 事件图片表 服务实现类
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@Service
-public class BusEventImageServiceImpl extends ServiceImpl<BusEventImageMapper, BusEventImage> implements IBusEventImageService {
-
-    @Override
-    public boolean saveBusEventImages(Long eventId, List<BusEventImage> imageList) {
-        imageList.forEach(i->i.setEventId(eventId));
-        return this.saveBatch(imageList);
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/impl/BusEventServiceImpl.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/impl/BusEventServiceImpl.java
deleted file mode 100644
index 21e511c..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/impl/BusEventServiceImpl.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package com.casic.missiles.modular.system.service.impl;
-
-import com.casic.missiles.modular.system.entity.BusEvent;
-import com.casic.missiles.modular.system.mapper.BusEventMapper;
-import com.casic.missiles.modular.system.service.IBusEventImageService;
-import com.casic.missiles.modular.system.service.IBusEventService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import lombok.RequiredArgsConstructor;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.util.Date;
-
-/**
- * <p>
- * 事件表 服务实现类
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@Service
-@RequiredArgsConstructor
-public class BusEventServiceImpl extends ServiceImpl<BusEventMapper, BusEvent> implements IBusEventService {
-
-    private final IBusEventImageService busEventImageService;
-
-
-    @Override
-    @Transactional
-    public boolean saveBusEvent(BusEvent busEvent) {
-        busEvent.setCreateTime(new Date());
-        boolean res = this.save(busEvent);
-        if(res){
-            res = busEventImageService.saveBusEventImages(busEvent.getId(),busEvent.getImageList());
-        }
-        return res;
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceExtServiceImpl.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceExtServiceImpl.java
deleted file mode 100644
index 2bdb63d..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceExtServiceImpl.java
+++ /dev/null
@@ -1,102 +0,0 @@
-package com.casic.missiles.modular.system.service.impl;
-
-import cn.hutool.core.util.ObjectUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
-import com.casic.missiles.modular.system.dto.DeviceDetailDTO;
-import com.casic.missiles.modular.system.entity.DeviceExt;
-import com.casic.missiles.modular.system.mapper.DeviceExtMapper;
-import com.casic.missiles.modular.system.service.IDeviceExtService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-/**
- * <p>
- * 设备扩展信息表（安全树） 服务实现类
- * </p>
- *
- * @author zyj
- * @since 2023-04-27
- */
-@Service
-public class DeviceExtServiceImpl extends ServiceImpl<DeviceExtMapper, DeviceExt> implements IDeviceExtService {
-
-
-    @Override
-    public boolean saveDeviceExt(DeviceDetailDTO deviceDetailDTO) {
-        DeviceExt ext = new DeviceExt();
-        ext.setDeviceId(deviceDetailDTO.getId());
-        ext.setCameraCode(deviceDetailDTO.getCameraCode());
-        ext.setCameraIp(deviceDetailDTO.getCameraIp());
-        ext.setCameraPort(deviceDetailDTO.getCameraPort());
-        ext.setGasCode(deviceDetailDTO.getGasCode());
-        ext.setGasIp(deviceDetailDTO.getGasIp());
-        ext.setGasPort(deviceDetailDTO.getGasPort());
-        ext.setHatLiningCode(deviceDetailDTO.getHatLiningCode());
-        return this.save(ext);
-    }
-
-    @Override
-    public boolean updateDeviceExt(DeviceDetailDTO deviceDetailDTO) {
-        DeviceExt ext = this.selectByDeviceId(deviceDetailDTO.getId());
-        ext.setCameraCode(deviceDetailDTO.getCameraCode());
-        ext.setCameraIp(deviceDetailDTO.getCameraIp());
-        ext.setCameraPort(deviceDetailDTO.getCameraPort());
-        ext.setGasCode(deviceDetailDTO.getGasCode());
-        ext.setGasIp(deviceDetailDTO.getGasIp());
-        ext.setGasPort(deviceDetailDTO.getGasPort());
-        ext.setHatLiningCode(deviceDetailDTO.getHatLiningCode());
-        return this.updateById(ext);
-    }
-
-    @Override
-    public boolean removeByDeviceIds(List<Long> deviceIds) {
-        QueryWrapper<DeviceExt> queryWrapper = new QueryWrapper<>();
-        queryWrapper.in("DEVICE_ID",deviceIds);
-        return this.remove(queryWrapper);
-    }
-
-    @Override
-    public boolean setGasThreshold(String gasIp, String gasPort, String threshold) {
-        UpdateWrapper<DeviceExt> updateWrapper = new UpdateWrapper<>();
-        updateWrapper.set("GAS_THRESHOLD",threshold);
-        updateWrapper.eq("GAS_IP",gasIp);
-        updateWrapper.eq("GAS_PORT",gasPort);
-        return this.update(updateWrapper);
-    }
-
-    @Override
-    public String getGasThreshold(String gasIp, String gasPort) {
-        QueryWrapper<DeviceExt> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("GAS_IP",gasIp);
-        queryWrapper.eq("GAS_PORT",gasPort);
-        DeviceExt deviceExt = this.getOne(queryWrapper);
-        return ObjectUtil.isNotEmpty(deviceExt) ? deviceExt.getGasThreshold() : null;
-    }
-
-    private DeviceExt selectByDeviceId(Long deviceId){
-        QueryWrapper<DeviceExt> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("DEVICE_ID",deviceId);
-        return this.getOne(queryWrapper);
-    }
-
-    @Override
-    public Long selectByGasIpPort(String gasIp, String gasPort) {
-        QueryWrapper<DeviceExt> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("GAS_IP",gasIp);
-        queryWrapper.eq("GAS_PORT",gasPort);
-        DeviceExt deviceExt = this.getOne(queryWrapper);
-        return ObjectUtil.isNotEmpty(deviceExt) ? deviceExt.getDeviceId() : null;
-    }
-
-    @Override
-    public Long selectByCameraIpPort(String cameraIp, String cameraPort) {
-        QueryWrapper<DeviceExt> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("CAMERA_IP",cameraIp);
-        queryWrapper.eq("CAMERA_PORT",cameraPort);
-        DeviceExt deviceExt = this.getOne(queryWrapper);
-        return ObjectUtil.isNotEmpty(deviceExt) ? deviceExt.getDeviceId() : null;
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java
index 9df79ef..31a5a18 100644
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java
@@ -1,125 +1,20 @@
 package com.casic.missiles.modular.system.service.impl;
 
-import cn.hutool.core.collection.CollUtil;
-import cn.hutool.core.date.DateUtil;
-import cn.hutool.core.util.ObjectUtil;
-import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.core.application.service.AbstractDictService;
-import com.casic.missiles.modular.system.dto.DeviceDetailDTO;
-import com.casic.missiles.modular.system.dto.HelmetInfoDTO;
 import com.casic.missiles.modular.system.entity.Device;
 import com.casic.missiles.modular.system.mapper.DeviceMapper;
-import com.casic.missiles.modular.system.service.IDeviceExtService;
 import com.casic.missiles.modular.system.service.IDeviceService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.casic.missiles.modular.system.service.IProjectDeviceService;
-import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.util.Date;
-import java.util.List;
-
-import static com.casic.missiles.modular.system.consts.DeviceConst.*;
 
 /**
  * <p>
- *  服务实现类
+ * 设备记录表 服务实现类
  * </p>
  *
  * @author zyj
- * @since 2023-04-14
+ * @since 2023-05-25
  */
 @Service
-@RequiredArgsConstructor
 public class DeviceServiceImpl extends ServiceImpl<DeviceMapper, Device> implements IDeviceService {
 
-    private final AbstractDictService dictService;
-    private final IDeviceExtService deviceExtService;
-
-    private final IProjectDeviceService projectDeviceService;
-
-    @Transactional
-    @Override
-    public boolean saveDevice(DeviceDetailDTO deviceDetailDTO) {
-        deviceDetailDTO.setCreateTime(new Date());
-        boolean deviceRes = this.save(deviceDetailDTO);
-        if(deviceRes && DEVICE_TYPE_TREE.equals(deviceDetailDTO.getDeviceType())){
-            deviceRes = deviceExtService.saveDeviceExt(deviceDetailDTO);
-        }
-        return deviceRes;
-    }
-
-    @Transactional
-    @Override
-    public boolean updateDevice(DeviceDetailDTO deviceDetailDTO) {
-        boolean deviceRes = this.updateById(deviceDetailDTO);
-        if(deviceRes && DEVICE_TYPE_TREE.equals(deviceDetailDTO.getDeviceType())){
-            deviceRes = deviceExtService.updateDeviceExt(deviceDetailDTO);
-        }
-        return deviceRes;
-    }
-
-    @Transactional
-    @Override
-    public boolean deleteDevices(List<Long> deviceIds) {
-        return this.removeByIds(deviceIds) & deviceExtService.removeByDeviceIds(deviceIds);
-    }
-
-    @Override
-    public Page<DeviceDetailDTO> listPage(Page<DeviceDetailDTO> page, QueryWrapper<DeviceDetailDTO> queryWrapper,String status,Long projectId) {
-        String ID_COLUMN_NAME = "br_device.ID";
-        List<Long> useDevices = this.selectProjectDevice(null);
-        List<Long> projectDevices;
-        if(ObjectUtil.isNotEmpty(projectId)){
-            projectDevices = this.selectProjectDevice(projectId);
-        } else {
-            projectDevices = null;
-        }
-
-        // 查询使用中的设备（如果传了 projectId，查询 使用中&&此现场）
-        if(DEVICE_STATUS_USE.equals(status)){
-            if(CollUtil.isEmpty(useDevices)){
-                return page;
-            }
-            if(ObjectUtil.isNotEmpty(projectId) && CollUtil.isEmpty(projectDevices)){
-                return page;
-            }
-            queryWrapper.in(ID_COLUMN_NAME,useDevices);
-            if(CollUtil.isNotEmpty(projectDevices)){
-                queryWrapper.in(ID_COLUMN_NAME,projectDevices);
-            }
-
-        }
-
-        // 查询未使用的设备（如果传了 projectId，查询 未使用||此现场）
-        if(DEVICE_STATUS_NORMAL.equals(status)) {
-            if (CollUtil.isNotEmpty(useDevices)) {
-                if (CollUtil.isEmpty(projectDevices)) {
-                    queryWrapper.notIn(ID_COLUMN_NAME, useDevices);
-                } else {
-                    queryWrapper.and(i -> i.notIn(ID_COLUMN_NAME, useDevices).or().in(ID_COLUMN_NAME, projectDevices));
-                }
-            }
-        }
-
-        page = this.baseMapper.listDetailPage(page, queryWrapper);
-        for (DeviceDetailDTO record : page.getRecords()) {
-            record.setDeviceTypeName(dictService.getDictNameByCode("deviceType",record.getDeviceType()));
-            record.setIsPowerSupplyName(dictService.getDictNameByCode("isPowerSupply",record.getIsPowerSupply()));
-            record.setRegisterTime(DateUtil.formatDate(record.getCreateTime()));
-            record.setStatus(useDevices.contains(record.getId()) ? DEVICE_STATUS_USE : DEVICE_STATUS_NORMAL);
-            record.setStatusName(dictService.getDictNameByCode("deviceStatus",record.getStatus()));
-        }
-        return page;
-    }
-
-    @Override
-    public List<Long> selectProjectDevice(Long projectId) {
-        return this.baseMapper.selectProjectDevice(projectId);
-    }
-
-
 }
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceSupportServiceImpl.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceSupportServiceImpl.java
deleted file mode 100644
index ffd01ff..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceSupportServiceImpl.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package com.casic.missiles.modular.system.service.impl;
-
-import com.casic.missiles.modular.system.dto.HelmetInfoDTO;
-import com.casic.missiles.modular.system.mapper.DeviceMapper;
-import com.casic.missiles.modular.system.service.IDeviceExtService;
-import com.casic.missiles.modular.system.service.IDeviceSupportService;
-import lombok.RequiredArgsConstructor;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-import static com.casic.missiles.modular.system.consts.DeviceConst.DEVICE_TYPE_HAT;
-
-@Service
-@RequiredArgsConstructor
-public class DeviceSupportServiceImpl implements IDeviceSupportService {
-
-    private final IDeviceExtService deviceExtService;
-
-    private final DeviceMapper deviceMapper;
-
-    @Override
-    public Long selectByGasIpPort(String gasIp, String gasPort) {
-        return deviceExtService.selectByGasIpPort(gasIp, gasPort);
-    }
-
-    @Override
-    public List<HelmetInfoDTO> selectHelmetList() {
-        return deviceMapper.selectHelmetList(DEVICE_TYPE_HAT);
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/impl/ProjectDeviceServiceImpl.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/impl/ProjectDeviceServiceImpl.java
deleted file mode 100644
index 965f55c..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/impl/ProjectDeviceServiceImpl.java
+++ /dev/null
@@ -1,96 +0,0 @@
-package com.casic.missiles.modular.system.service.impl;
-
-import cn.hutool.core.date.DateUtil;
-import cn.hutool.core.util.ObjectUtil;
-import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.casic.missiles.modular.system.dto.DeviceLocationDTO;
-import com.casic.missiles.modular.system.entity.DataGas;
-import com.casic.missiles.modular.system.entity.DataTreeLocation;
-import com.casic.missiles.modular.system.entity.ProjectDevice;
-import com.casic.missiles.modular.system.mapper.ProjectDeviceMapper;
-import com.casic.missiles.modular.system.service.IDataSupportService;
-import com.casic.missiles.modular.system.service.IProjectDeviceService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.casic.missiles.modular.system.utils.LngLatUtil;
-import lombok.RequiredArgsConstructor;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.util.List;
-import java.util.stream.Collectors;
-
-/**
- * <p>
- *  服务实现类
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@Service
-@RequiredArgsConstructor
-public class ProjectDeviceServiceImpl extends ServiceImpl<ProjectDeviceMapper, ProjectDevice> implements IProjectDeviceService {
-
-    private final IDataSupportService dataSupportService;
-
-    @Override
-    public boolean saveProjectDeviceList(Long projectId, List<ProjectDevice> projectDeviceList) {
-        projectDeviceList.forEach(i->i.setProjectId(projectId));
-        return this.saveBatch(projectDeviceList);
-    }
-
-    @Transactional
-    @Override
-    public boolean updateProjectDeviceList(Long projectId, List<ProjectDevice> projectDeviceList) {
-        return this.deleteByProjectId(projectId) && this.saveProjectDeviceList(projectId, projectDeviceList);
-    }
-
-    @Override
-    public boolean deleteByProjectId(Long projectId) {
-        QueryWrapper<ProjectDevice> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("PROJECT_ID",projectId);
-        return this.remove(queryWrapper);
-    }
-
-    @Override
-    public boolean deleteByProjectIds(List<Long> projectId) {
-        QueryWrapper<ProjectDevice> queryWrapper = new QueryWrapper<>();
-        queryWrapper.in("PROJECT_ID",projectId);
-        return this.remove(queryWrapper);
-    }
-
-    @Override
-    public List<ProjectDevice> selectDetailByProjectId(Long projectId) {
-        return this.baseMapper.selectDetailByProjectId(projectId);
-    }
-
-    @Override
-    public Long selectProjectIdByDevice(Long deviceId) {
-        QueryWrapper<ProjectDevice> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("DEVICE_ID",deviceId);
-        queryWrapper.exists("(select Id FROM br_work_site_info p where p.ID = br_project_device.PROJECT_ID AND p.PROJECT_STATE != '3')");
-        ProjectDevice projectDevice = this.getOne(queryWrapper);
-        return ObjectUtil.isNotEmpty(projectDevice) ? projectDevice.getProjectId() : null;
-    }
-
-    @Override
-    public List<DeviceLocationDTO> selectDeviceLocationList(Long projectId) {
-        List<DeviceLocationDTO> list = this.baseMapper.selectDeviceLocationList(projectId);
-        for (DeviceLocationDTO locationDTO : list) {
-            DataGas dataGas = dataSupportService.getGasData(locationDTO.getDeviceId());
-            DataTreeLocation location = dataSupportService.getTreeLocation(locationDTO.getDeviceId(),true);
-            if(ObjectUtil.isNotEmpty(dataGas)){
-                locationDTO.setGasValue(dataGas.getGasValue());
-                locationDTO.setTime(DateUtil.formatDateTime(dataGas.getTs()));
-            }
-            if(ObjectUtil.isNotEmpty(location)){
-                locationDTO.setLng(location.getGdLng());
-                locationDTO.setLat(location.getGdLat());
-                locationDTO.setLocation(location.getLocation());
-            }
-        }
-        list = list.stream().filter(i-> StrUtil.isAllNotEmpty(i.getLng(),i.getLat())).collect(Collectors.toList());
-        return LngLatUtil.sort(list);
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/impl/ProjectWorkerServiceImpl.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/impl/ProjectWorkerServiceImpl.java
deleted file mode 100644
index c3ec86c..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/impl/ProjectWorkerServiceImpl.java
+++ /dev/null
@@ -1,101 +0,0 @@
-package com.casic.missiles.modular.system.service.impl;
-
-import cn.hutool.core.date.DateUtil;
-import cn.hutool.core.util.ObjectUtil;
-import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.casic.missiles.core.application.service.AbstractDeptService;
-import com.casic.missiles.modular.system.dto.WorkerLocationDTO;
-import com.casic.missiles.modular.system.entity.DataHelmetHealth;
-import com.casic.missiles.modular.system.entity.DataHelmetLocation;
-import com.casic.missiles.modular.system.entity.ProjectWorker;
-import com.casic.missiles.modular.system.mapper.ProjectWorkerMapper;
-import com.casic.missiles.modular.system.service.IHelmetSupportService;
-import com.casic.missiles.modular.system.service.IProjectWorkerService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import lombok.RequiredArgsConstructor;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.util.List;
-import java.util.stream.Collectors;
-
-import static com.casic.missiles.modular.system.consts.ProjectConst.WORKER_TYPE_NORMAL;
-
-/**
- * <p>
- *  服务实现类
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@Service
-@RequiredArgsConstructor
-public class ProjectWorkerServiceImpl extends ServiceImpl<ProjectWorkerMapper, ProjectWorker> implements IProjectWorkerService {
-
-    private final AbstractDeptService deptService;
-    private final IHelmetSupportService helmetSupportService;
-
-    @Override
-    public boolean saveProjectWorkerList(Long projectId, List<ProjectWorker> projectWorkerList) {
-        projectWorkerList.forEach(i->i.setProjectId(projectId));
-        return this.saveBatch(projectWorkerList);
-    }
-
-    @Transactional
-    @Override
-    public boolean updateProjectWorkerList(Long projectId, List<ProjectWorker> projectWorkerList) {
-        return this.deleteByProjectId(projectId) && this.saveProjectWorkerList(projectId, projectWorkerList) ;
-    }
-
-    @Override
-    public boolean deleteByProjectId(Long projectId) {
-        QueryWrapper<ProjectWorker> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("PROJECT_ID",projectId);
-        return this.remove(queryWrapper);
-    }
-
-    @Override
-    public boolean deleteByProjectIds(List<Long> projectIds) {
-        QueryWrapper<ProjectWorker> queryWrapper = new QueryWrapper<>();
-        queryWrapper.in("PROJECT_ID",projectIds);
-        return this.remove(queryWrapper);
-    }
-
-
-    @Override
-    public List<ProjectWorker> selectDetailByProjectId(Long projectId,String workerType) {
-        List<ProjectWorker> projectWorkerList = this.baseMapper.selectDetailByProjectId(projectId,workerType);
-        for (ProjectWorker projectWorker : projectWorkerList) {
-            if(ObjectUtil.isNotEmpty(projectWorker.getWorkerDeptId())){
-                projectWorker.setWorkerDeptName(deptService.getDeptName(projectWorker.getWorkerDeptId()));
-            }
-        }
-        return projectWorkerList;
-    }
-
-    @Override
-    public List<WorkerLocationDTO> selectWorkerLocationDTO(Long projectId) {
-        List<WorkerLocationDTO> projectWorkerList = this.baseMapper.selectWorkerLocationList(projectId,WORKER_TYPE_NORMAL);
-        for (WorkerLocationDTO workerLocationDTO : projectWorkerList) {
-            if(ObjectUtil.isNotEmpty(workerLocationDTO.getHatId())){
-                DataHelmetLocation location = helmetSupportService.getHelmetLocation(workerLocationDTO.getHatId(),true);
-                if(ObjectUtil.isNotEmpty(location)){
-                    workerLocationDTO.setLng(location.getGdLng());
-                    workerLocationDTO.setLat(location.getGdLat());
-                    workerLocationDTO.setLocation(location.getLocation());
-                }
-
-                DataHelmetHealth health = helmetSupportService.getHelmetHealth(workerLocationDTO.getHatId());
-                if(ObjectUtil.isNotEmpty(health)){
-                    workerLocationDTO.setBloodOxygen(health.getBloodOxygen());
-                    workerLocationDTO.setHeartRate(health.getHeartRate());
-                    workerLocationDTO.setTime(DateUtil.formatDateTime(health.getTs()));
-                }
-            }
-        }
-        projectWorkerList = projectWorkerList.stream().filter(i-> StrUtil.isAllNotEmpty(i.getLng(),i.getLat())).collect(Collectors.toList());
-        return projectWorkerList;
-    }
-}

diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/AlarmController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/AlarmController.java
new file mode 100644
index 0000000..1795cf1
--- /dev/null
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/AlarmController.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.modular.system.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.stereotype.Controller;
+
+/**
+ * <p>
+ * 报警记录表 前端控制器
+ * </p>
+ *
+ * @author zyj
+ * @since 2023-05-25
+ */
+@Controller
+@RequestMapping("/system/alarm")
+public class AlarmController {
+
+}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusAlarmController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusAlarmController.java
deleted file mode 100644
index 1f82ebb..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusAlarmController.java
+++ /dev/null
@@ -1,102 +0,0 @@
-package com.casic.missiles.modular.system.controller;
-
-
-import cn.hutool.core.util.ObjectUtil;
-import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.core.base.controller.BaseController;
-import com.casic.missiles.core.page.PageFactory;
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.AlarmUpload;
-import com.casic.missiles.modular.system.dto.DeviceDetailDTO;
-import com.casic.missiles.modular.system.entity.BusAlarm;
-import com.casic.missiles.modular.system.service.IBusAlarmService;
-import io.swagger.annotations.*;
-import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.*;
-
-import org.springframework.stereotype.Controller;
-
-import static com.casic.missiles.model.response.ResponseData.DEFAULT_SUCCESS_MESSAGE;
-import static com.casic.missiles.modular.system.consts.AlarmConst.ALARM_STATUS_MANUAL_CANCEL;
-
-/**
- * <p>
- * 报警记录表 前端控制器
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@Api(tags = "报警管理接口")
-@Controller
-@RequestMapping("/alarm")
-@RequiredArgsConstructor
-public class BusAlarmController extends BaseController {
-
-    private final IBusAlarmService alarmService;
-
-    @ApiOperation("报警上报接口")
-    @PostMapping("/upload")
-    @ResponseBody
-    public Object upload(@RequestBody AlarmUpload alarmUpload){
-        alarmService.alarmUpload(alarmUpload);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("报警列表分页查询")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "workTitle", value = "作业名称",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "projectId", value = "作业ID",dataType = "Long", paramType = "query",example = "0"),
-            @ApiImplicitParam(name = "alarmStatus", value = "报警状态",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "projectState", value = "作业状态",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "alarmType", value = "报警类型",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "alarmStartTime", value = "报警开始时间",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "alarmEndTime", value = "报警结束时间",dataType = "String", paramType = "query")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = BusAlarm.class),
-    })
-    @GetMapping("/listPage")
-    @ResponseBody
-    public Object listPage(String workTitle,Long projectId,String alarmStatus,String projectState,String alarmType,String alarmStartTime,String alarmEndTime){
-        Page<BusAlarm> page = PageFactory.defaultPage();
-        QueryWrapper<BusAlarm> queryWrapper = new QueryWrapper<>();
-        if(StrUtil.isNotEmpty(workTitle)){
-            queryWrapper.like("p.WORK_TITLE",workTitle);
-        }
-        if(ObjectUtil.isNotEmpty(projectId)){
-            queryWrapper.eq("alarm.PROJECT_ID",projectId);
-        }
-        if(StrUtil.isNotEmpty(alarmStatus)){
-            queryWrapper.eq("alarm.ALARM_STATUS",alarmStatus);
-        }
-        if(StrUtil.isNotEmpty(projectState)){
-            queryWrapper.eq("p.PROJECT_STATE",projectState);
-        }
-        if(StrUtil.isNotEmpty(alarmType)){
-            queryWrapper.eq("alarm.ALARM_TYPE",alarmType);
-        }
-        if(StrUtil.isNotEmpty(alarmStartTime)){
-            queryWrapper.ge("alarm.ALARM_TIME",alarmStartTime);
-        }
-        if(StrUtil.isNotEmpty(alarmEndTime)){
-            queryWrapper.le("alarm.ALARM_TIME",alarmEndTime);
-        }
-        page = alarmService.listPage(page,queryWrapper);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-    @ApiOperation("消警")
-    @PostMapping("/cancel")
-    @ResponseBody
-    public Object cancel(@RequestParam("alarmId") Long alarmId){
-        UpdateWrapper<BusAlarm> updateWrapper = new UpdateWrapper<>();
-        updateWrapper.eq("ID",alarmId);
-        updateWrapper.set("ALARM_STATUS",ALARM_STATUS_MANUAL_CANCEL);
-        alarmService.update(updateWrapper);
-        return ResponseData.success();
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusEventController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusEventController.java
deleted file mode 100644
index dde5aad..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusEventController.java
+++ /dev/null
@@ -1,41 +0,0 @@
-package com.casic.missiles.modular.system.controller;
-
-
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.entity.BusEvent;
-import com.casic.missiles.modular.system.service.IBusEventService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.ResponseBody;
-
-/**
- * <p>
- * 事件表 前端控制器
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@Controller
-@RequestMapping("/event")
-@Api(tags = "事件上报")
-@RequiredArgsConstructor
-public class BusEventController {
-
-    private final IBusEventService eventService;
-
-    @ApiOperation("事件上报")
-    @PostMapping("add")
-    @ResponseBody
-    public Object add(@RequestBody BusEvent busEvent){
-        eventService.saveBusEvent(busEvent);
-        return ResponseData.success();
-    }
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
index 03abc5f..aa50d78 100644
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
@@ -1,121 +1,20 @@
 package com.casic.missiles.modular.system.controller;
 
 
-import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.core.base.controller.BaseController;
-import com.casic.missiles.core.page.PageFactory;
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.DeviceDetailDTO;
-import com.casic.missiles.modular.system.entity.Device;
-import com.casic.missiles.modular.system.service.IDeviceExtService;
-import com.casic.missiles.modular.system.service.IDeviceService;
-import io.swagger.annotations.*;
-import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.RequestMapping;
 
 import org.springframework.stereotype.Controller;
 
-import java.time.LocalDateTime;
-import java.util.Date;
-import java.util.List;
-
-import static com.casic.missiles.model.response.ResponseData.DEFAULT_SUCCESS_MESSAGE;
-
 /**
  * <p>
- *  前端控制器
+ * 设备记录表 前端控制器
  * </p>
  *
  * @author zyj
- * @since 2023-04-14
+ * @since 2023-05-25
  */
-@Api(tags = "设备管理接口")
-@RequiredArgsConstructor
 @Controller
-@RequestMapping("/device")
-public class DeviceController extends BaseController {
-    private final IDeviceService deviceService;
-    private final IDeviceExtService deviceExtService;
-
-    @ApiOperation("设备分页列表")
-    @ApiImplicitParams({
-        @ApiImplicitParam(name = "deviceType", value = "设备类型",dataType = "String", paramType = "query"),
-        @ApiImplicitParam(name = "deviceCode", value = "设备编号",dataType = "String", paramType = "query"),
-        @ApiImplicitParam(name = "status", value = "设备状态",dataType = "String", paramType = "query"),
-        @ApiImplicitParam(name = "projectId", value = "作业ID（如果传此参数，列表中返回该作业使用的设备）",dataType = "Long", paramType = "query", example = "0")
-    })
-    @ApiResponses({
-        @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = DeviceDetailDTO.class),
-    })
-    @GetMapping("listPage")
-    @ResponseBody
-    public Object listPage(String deviceType, String deviceCode, String status,Long projectId){
-        Page<DeviceDetailDTO> page = PageFactory.defaultPage();
-        QueryWrapper<DeviceDetailDTO> queryWrapper = new QueryWrapper<>();
-        if(StrUtil.isNotEmpty(deviceType)){
-            queryWrapper.eq("DEVICE_TYPE",deviceType);
-        }
-        if(StrUtil.isNotEmpty(deviceCode)){
-            queryWrapper.like("DEVICE_CODE",deviceCode);
-        }
-        page = deviceService.listPage(page,queryWrapper,status,projectId);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-    @ApiOperation("新增设备")
-    @PostMapping("add")
-    @ResponseBody
-    public Object add(@RequestBody DeviceDetailDTO deviceDetailDTO){
-        deviceService.saveDevice(deviceDetailDTO);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("编辑设备")
-    @PostMapping("update")
-    @ResponseBody
-    public Object update(@RequestBody DeviceDetailDTO deviceDetailDTO){
-        deviceService.updateDevice(deviceDetailDTO);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("删除设备")
-    @PostMapping("delete")
-    @ResponseBody
-    public Object delete(@ApiParam("设备id列表")@RequestBody List<Long> deviceIds){
-        deviceService.deleteDevices(deviceIds);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("设置甲烷阈值")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "gasIp", value = "安全树甲烷设备IP",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "gasPort", value = "安全树甲烷端口",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "threshold", value = "甲烷阈值",dataType = "String", paramType = "query")
-    })
-    @PostMapping("setThreshold")
-    @ResponseBody
-    public Object setThreshold(String gasIp,String gasPort,String threshold){
-        deviceExtService.setGasThreshold(gasIp, gasPort, threshold);
-        return ResponseData.success();
-    }
-
-
-    @ApiOperation("查询甲烷阈值")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "gasIp", value = "安全树甲烷设备IP",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "gasPort", value = "安全树甲烷端口",dataType = "String", paramType = "query")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = "{\"code\": 200,\"data\": \"100\",\"message\": \"请求成功\",\"success\": true}",response = String.class),
-    })
-    @GetMapping("getThreshold")
-    @ResponseBody
-    public Object getThreshold(String gasIp,String gasPort){
-        String data = deviceExtService.getGasThreshold(gasIp, gasPort);
-        return ResponseData.success(data);
-    }
-
+@RequestMapping("/system/device")
+public class DeviceController {
 
 }
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/OverviewController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/OverviewController.java
deleted file mode 100644
index 7570504..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/OverviewController.java
+++ /dev/null
@@ -1,70 +0,0 @@
-package com.casic.missiles.modular.system.controller;
-
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.AlarmTypeCountDTO;
-import com.casic.missiles.modular.system.dto.DeviceLocationDTO;
-import com.casic.missiles.modular.system.dto.WorkerLocationDTO;
-import com.casic.missiles.modular.system.service.IBusAlarmService;
-import com.casic.missiles.modular.system.service.IProjectDeviceService;
-import com.casic.missiles.modular.system.service.IProjectWorkerService;
-import io.swagger.annotations.*;
-import lombok.RequiredArgsConstructor;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.ResponseBody;
-
-import static com.casic.missiles.model.response.ResponseData.DEFAULT_SUCCESS_MESSAGE;
-import static com.casic.missiles.modular.system.consts.AlarmConst.ALARM_STATUS_ON;
-
-@Api(tags = "首页看板接口")
-@Controller
-@RequestMapping("overview")
-@RequiredArgsConstructor
-public class OverviewController {
-
-    private final IBusAlarmService alarmService;
-    private final IProjectDeviceService projectDeviceService;
-
-    private final IProjectWorkerService projectWorkerService;
-
-
-    @ApiOperation("报警统计接口")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "projectId", value = "作业ID",dataType = "Long", paramType = "query", example = "0")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = AlarmTypeCountDTO.class),
-    })
-    @GetMapping("/alarmCount")
-    @ResponseBody
-    public Object alarmCount(Long projectId){
-        return ResponseData.success(alarmService.alarmCount(projectId,ALARM_STATUS_ON));
-    }
-
-    @ApiOperation("设备列表接口")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "projectId", value = "作业ID",dataType = "Long", paramType = "query", example = "0")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = DeviceLocationDTO.class),
-    })
-    @GetMapping("/deviceList")
-    @ResponseBody
-    public Object deviceList(Long projectId){
-        return ResponseData.success(projectDeviceService.selectDeviceLocationList(projectId));
-    }
-
-    @ApiOperation("人员列表接口")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "projectId", value = "作业ID",dataType = "Long", paramType = "query", example = "0")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = WorkerLocationDTO.class),
-    })
-    @GetMapping("/workerList")
-    @ResponseBody
-    public Object workerList(Long projectId){
-        return ResponseData.success(projectWorkerService.selectWorkerLocationDTO(projectId));
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/WorkSiteInfoController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/WorkSiteInfoController.java
deleted file mode 100644
index af36d69..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/WorkSiteInfoController.java
+++ /dev/null
@@ -1,130 +0,0 @@
-package com.casic.missiles.modular.system.controller;
-
-
-import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.core.base.controller.BaseController;
-import com.casic.missiles.core.page.PageFactory;
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.WorkSiteDetailDTO;
-import com.casic.missiles.modular.system.entity.WorkSiteInfo;
-import com.casic.missiles.modular.system.service.IWorkSiteInfoService;
-import io.swagger.annotations.*;
-import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.*;
-
-import org.springframework.stereotype.Controller;
-
-import java.util.List;
-
-import static com.casic.missiles.model.response.ResponseData.DEFAULT_SUCCESS_MESSAGE;
-
-/**
- * <p>
- * 作业现场表 前端控制器
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@Controller
-@RequestMapping("/site")
-@Api(tags = "作业现场管理")
-@RequiredArgsConstructor
-public class WorkSiteInfoController extends BaseController {
-
-
-    private final IWorkSiteInfoService workSiteInfoService;
-
-    @ApiOperation("新增作业现场")
-    @PostMapping("add")
-    @ResponseBody
-    public Object addWorkSite(@RequestBody WorkSiteDetailDTO workSiteDetailDTO){
-        workSiteInfoService.addWorkSiteInfo(workSiteDetailDTO);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("编辑作业现场")
-    @PostMapping("update")
-    @ResponseBody
-    public Object updateWorkSite(@RequestBody WorkSiteDetailDTO workSiteDetailDTO){
-        workSiteInfoService.updateWorkSiteInfo(workSiteDetailDTO);
-        return ResponseData.success();
-    }
-
-
-    @ApiOperation("删除作业现场")
-    @PostMapping("delete")
-    @ResponseBody
-    public Object delete(@ApiParam("作业现场id列表")@RequestBody List<Long> projectIds){
-        workSiteInfoService.deleteProjects(projectIds);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("查询作业现场详情")
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = WorkSiteDetailDTO.class),
-    })
-    @GetMapping("detail")
-    @ResponseBody
-    public Object delete(@ApiParam(value = "作业现场id", example = "0")@RequestParam Long projectId){
-        WorkSiteDetailDTO detailDTO = workSiteInfoService.getWorkSiteDetail(projectId);
-        return ResponseData.success(detailDTO);
-    }
-
-    @ApiOperation("分页列表查询")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "workTitle",value = "作业名称", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "workRoad",value = "所属道路", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "workPersonName",value = "责任人姓名", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "startDate",value = "注册开始日期", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "endDate",value = "注册结束日期", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "projectState",value = "当前状态（字典值）", dataType = "String", paramType = "query")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = WorkSiteInfo.class),
-    })
-    @GetMapping("listPage")
-    @ResponseBody
-    public Object listPage(String workTitle,String workRoad,String workPersonName,String projectState,String startDate,String endDate){
-        Page<WorkSiteInfo> page = PageFactory.defaultPage();
-        QueryWrapper<WorkSiteInfo> queryWrapper = new QueryWrapper<>();
-        if(StrUtil.isNotEmpty(workTitle)){
-            queryWrapper.like("WORK_TITLE",workTitle);
-        }
-        if(StrUtil.isNotEmpty(workRoad)){
-            queryWrapper.like("WORK_ROAD",workRoad);
-        }
-        if(StrUtil.isNotEmpty(workPersonName)){
-            queryWrapper.like("WORKER_NAME",workPersonName);
-        }
-        if(StrUtil.isNotEmpty(projectState)){
-            queryWrapper.eq("PROJECT_STATE",projectState);
-        }
-        if(StrUtil.isNotEmpty(startDate)){
-            queryWrapper.ge("br_work_site_info.CREATE_TIME",startDate + " 00:00:00");
-        }
-        if(StrUtil.isNotEmpty(endDate)){
-            queryWrapper.le("br_work_site_info.CREATE_TIME",endDate + " 23:59:59");
-        }
-        page = workSiteInfoService.selectListPage(page,queryWrapper);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-    @ApiOperation("开始作业")
-    @PostMapping("start")
-    @ResponseBody
-    public Object start(@ApiParam(value = "作业现场id",example = "0")@RequestParam Long projectId){
-        workSiteInfoService.start(projectId);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("完成作业")
-    @PostMapping("finish")
-    @ResponseBody
-    public Object finish(@ApiParam(value = "作业现场id", example = "0")@RequestParam Long projectId){
-        workSiteInfoService.finish(projectId);
-        return ResponseData.success();
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/WorkerController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/WorkerController.java
deleted file mode 100644
index 796f94c..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/WorkerController.java
+++ /dev/null
@@ -1,136 +0,0 @@
-package com.casic.missiles.modular.system.controller;
-
-
-import cn.hutool.core.util.ObjectUtil;
-import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.core.base.controller.BaseController;
-import com.casic.missiles.core.page.PageFactory;
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.DeviceDetailDTO;
-import com.casic.missiles.modular.system.entity.Device;
-import com.casic.missiles.modular.system.entity.Worker;
-import com.casic.missiles.modular.system.service.IWorkerService;
-import io.swagger.annotations.*;
-import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.*;
-
-import org.springframework.stereotype.Controller;
-
-import java.util.Date;
-import java.util.List;
-
-import static com.casic.missiles.model.response.ResponseData.DEFAULT_SUCCESS_MESSAGE;
-
-/**
- * <p>
- *  前端控制器
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@Controller
-@RequestMapping("/worker")
-@RequiredArgsConstructor
-@Api(tags = "人员管理接口")
-public class WorkerController extends BaseController {
-
-    private final IWorkerService workerService;
-
-    @ApiOperation("分页列表查询")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "name",value = "姓名", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "deptId",value = "所属部门", dataType = "Long", paramType = "query", example = "0"),
-            @ApiImplicitParam(name = "status",value = "当前状态（字典值）", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "startDate",value = "注册开始日期", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "endDate",value = "注册结束日期", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "workerType",value = "人员类型（字典值）", dataType = "String", paramType = "query")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = Worker.class),
-    })
-    @GetMapping("listPage")
-    @ResponseBody
-    public Object listPage(String name,Long deptId, String status,String startDate,String endDate,String workerType){
-        Page<Worker> page = PageFactory.defaultPage();
-        QueryWrapper<Worker> queryWrapper = new QueryWrapper<>();
-        if(StrUtil.isNotEmpty(name)){
-            queryWrapper.like("WORKER_NAME",name);
-        }
-        if(ObjectUtil.isNotEmpty(deptId)){
-            queryWrapper.eq("DEPT_ID",deptId);
-        }
-        if(StrUtil.isNotEmpty(workerType)){
-            queryWrapper.eq("WORKER_TYPE",workerType);
-        }
-        if(StrUtil.isNotEmpty(startDate)){
-            queryWrapper.ge("CREATE_TIME",startDate + " 00:00:00");
-        }
-        if(StrUtil.isNotEmpty(endDate)){
-            queryWrapper.le("CREATE_TIME",endDate + " 23:59:59");
-        }
-        if(StrUtil.isNotEmpty(status)){
-            queryWrapper.eq("`STATUS`",status);
-        }
-        page = workerService.selectListPage(page,queryWrapper);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-    @ApiOperation("新增人员")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "worker", value = "人员信息", dataType = "Worker", paramType = "body", required = true),
-            @ApiImplicitParam(name = "projectId", value = "项目ID(入场申请需要)", dataType = "Long", paramType = "query", example = "0")
-    })
-    @PostMapping("add")
-    @ResponseBody
-    public Object add(@ApiParam("worker")@RequestBody Worker worker,
-                      @RequestParam(required = false) Long projectId){
-        workerService.addWorker(worker,projectId);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("编辑人员")
-    @PostMapping("update")
-    @ResponseBody
-    public Object update(@RequestBody Worker worker){
-        workerService.updateById(worker);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("删除人员")
-    @PostMapping("delete")
-    @ResponseBody
-    public Object delete(@ApiParam("人员id列表")@RequestBody List<Long> workIds){
-        workerService.removeByIds(workIds);
-        return ResponseData.success();
-    }
-
-
-    @ApiOperation(value = "获取人脸图片",notes = "返回人脸图片url")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "cameraIp",value = "摄像头IP", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "cameraPort",value = "摄像头端口号", dataType = "String", paramType = "query"),
-    })
-    @GetMapping("/face/register")
-    @ResponseBody
-    public Object faceRegister(String cameraIp,String cameraPort){
-        return ResponseData.success(workerService.faceRegister(cameraIp, cameraPort));
-    }
-
-
-    @ApiOperation(value = "查询临时入场人员列表")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "projectId", value = "项目ID",required = true,dataType = "Long", paramType = "query", example = "0")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = Worker.class),
-    })
-    @GetMapping("/projectTempWorker")
-    @ResponseBody
-    public Object projectTempWorker(Long projectId){
-        return ResponseData.success(workerService.projectTempWorker(projectId));
-    }
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/AlarmTypeCountDTO.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/AlarmTypeCountDTO.java
deleted file mode 100644
index 1a165a1..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/AlarmTypeCountDTO.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.casic.missiles.modular.system.dto;
-
-import io.swagger.annotations.ApiModel;
-import lombok.Data;
-
-@ApiModel(value = "AlarmTypeCountDTO",description = "报警类型统计（首页）")
-@Data
-public class AlarmTypeCountDTO {
-
-    private String alarmType;
-    private String alarmTypeName;
-    private Integer alarmCount;
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/AlarmUpload.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/AlarmUpload.java
deleted file mode 100644
index 73d7799..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/AlarmUpload.java
+++ /dev/null
@@ -1,46 +0,0 @@
-package com.casic.missiles.modular.system.dto;
-
-import cn.hutool.core.util.StrUtil;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-@ApiModel(value = "AlarmUpload",description = "报警上传")
-@Data
-public class AlarmUpload {
-
-    @ApiModelProperty(value = "摄像头ip")
-    private String cameraIp;
-
-    @ApiModelProperty(value = "摄像头端口")
-    private String cameraPort;
-    @ApiModelProperty(value = "安全树甲烷设备ip")
-    private String gasIp;
-    @ApiModelProperty(value = "安全树甲烷设备端口")
-    private String gasPort;
-    @ApiModelProperty(value = "报警值")
-    private String alarmValue;
-    @ApiModelProperty(value = "报警时间")
-    private String alarmTime;
-    @ApiModelProperty(value = "报警类型")
-    private String alarmType;
-    @ApiModelProperty(value = "报警图片")
-    private String alarmImage;
-    @ApiModelProperty(value = "报警内容")
-    private String alarmContent;
-
-    @Override
-    public String toString() {
-        return "AlarmUpload{" +
-                "cameraIp='" + cameraIp + '\'' +
-                ", cameraPort='" + cameraPort + '\'' +
-                ", gasIp='" + gasIp + '\'' +
-                ", gasPort='" + gasPort + '\'' +
-                ", alarmValue='" + alarmValue + '\'' +
-                ", alarmTime='" + alarmTime + '\'' +
-                ", alarmType='" + alarmType + '\'' +
-                ", alarmImage='" + (StrUtil.isNotEmpty(alarmImage) ? alarmImage.substring(0,50) : "null") + '\'' +
-                ", alarmContent='" + alarmContent + '\'' +
-                '}';
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/DeviceDetailDTO.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/DeviceDetailDTO.java
deleted file mode 100644
index ea518d9..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/DeviceDetailDTO.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package com.casic.missiles.modular.system.dto;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.casic.missiles.modular.system.entity.Device;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-@ApiModel("DeviceDetailDTO")
-@Data
-public class DeviceDetailDTO extends Device {
-
-    @ApiModelProperty(value = "摄像头编号")
-    private String cameraCode;
-
-    @ApiModelProperty(value = "摄像头IP")
-    private String cameraIp;
-
-    @ApiModelProperty(value = "摄像头端口")
-    private String cameraPort;
-
-    @ApiModelProperty(value = "激甲编号")
-    private String gasCode;
-
-    @ApiModelProperty(value = "激甲IP")
-    private String gasIp;
-
-    @ApiModelProperty(value = "激甲端口")
-    private String gasPort;
-
-    @ApiModelProperty(value = "智能帽衬编号")
-    private String hatLiningCode;
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/WorkSiteDetailDTO.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/WorkSiteDetailDTO.java
deleted file mode 100644
index 29378ff..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/WorkSiteDetailDTO.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package com.casic.missiles.modular.system.dto;
-
-import com.casic.missiles.modular.system.entity.ProjectDevice;
-import com.casic.missiles.modular.system.entity.ProjectWorker;
-import com.casic.missiles.modular.system.entity.WorkSiteInfo;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.util.List;
-
-@Data
-@ApiModel("WorkSiteDetailDTO")
-public class WorkSiteDetailDTO extends WorkSiteInfo {
-
-    @ApiModelProperty(value = "安全树列表",dataType = "ProjectDevice")
-    private List<ProjectDevice> deviceList;
-
-    @ApiModelProperty(value = "人员列表",dataType = "ProjectWorker")
-    private List<ProjectWorker> workerList;
-
-
-
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/WorkerLocationDTO.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/WorkerLocationDTO.java
deleted file mode 100644
index 6fd7b24..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/WorkerLocationDTO.java
+++ /dev/null
@@ -1,68 +0,0 @@
-package com.casic.missiles.modular.system.dto;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-@ApiModel(value = "WorkerLocationDTO",description = "人员位置列表（首页）")
-@Data
-public class WorkerLocationDTO {
-
-    @ApiModelProperty("人员ID")
-    private Long workerId;
-
-    @ApiModelProperty("人员姓名")
-    private String workerName;
-
-    @ApiModelProperty("安全帽编号")
-    private String hatCode;
-
-    @ApiModelProperty("安全帽ID")
-    private Long hatId;
-
-    @ApiModelProperty("背心编号")
-    private String vastCode;
-
-    @ApiModelProperty("手环编号")
-    private String braceletCode;
-
-    @ApiModelProperty("位置")
-    private String location;
-
-    @ApiModelProperty("时间")
-    private String time;
-
-    @ApiModelProperty("经度")
-    private String lng;
-
-    @ApiModelProperty("纬度")
-    private String lat;
-
-    @ApiModelProperty("心率")
-    private String heartRate;
-
-    @ApiModelProperty("血氧")
-    private String bloodOxygen;
-
-    @ApiModelProperty("一氧化碳")
-    private String co;
-
-    @ApiModelProperty("甲烷")
-    private String gas;
-
-    @ApiModelProperty("硫化氢")
-    private String h2s;
-
-    @ApiModelProperty("氧气")
-    private String o2;
-
-    @ApiModelProperty("信号")
-    private String signal;
-
-    @ApiModelProperty("电量")
-    private String cell;
-
-    @ApiModelProperty("是否报警")
-    private boolean alarmFlag;
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Alarm.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Alarm.java
new file mode 100644
index 0000000..4d2b7ef
--- /dev/null
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Alarm.java
@@ -0,0 +1,103 @@
+package com.casic.missiles.modular.system.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import java.util.Date;
+
+/**
+ * <p>
+ * 报警记录表
+ * </p>
+ *
+ * @author zyj
+ * @since 2023-05-25
+ */
+@Data
+@TableName("bus_alarm")
+public class Alarm implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    @TableId(value = "ID",type = IdType.ASSIGN_ID)
+    private Long id;
+
+    /**
+     * 设备ID
+     */
+    @TableField("DEVICE_ID")
+    private Long deviceId;
+
+    /**
+     * 报警类型
+     */
+    @TableField("ALARM_TYPE")
+    private String alarmType;
+
+    /**
+     * 报警时间
+     */
+    @TableField("ALARM_TIME")
+    private Date alarmTime;
+
+    /**
+     * 报警状态
+     */
+    @TableField("ALARM_STATUS")
+    private String alarmStatus;
+
+    /**
+     * 报警位置
+     */
+    @TableField("ALARM_LOCATION")
+    private String alarmLocation;
+
+    /**
+     * 报警图片
+     */
+    @TableField("ALARM_IMAGE")
+    private String alarmImage;
+
+    /**
+     * 视频通道号
+     */
+    @TableField("CHANNEL_NO")
+    private Integer channelNo;
+
+    /**
+     * 报警内容
+     */
+    @TableField("ALARM_CONTENT")
+    private String alarmContent;
+
+    /**
+     * 消警时间
+     */
+    @TableField("CANCEL_TIME")
+    private Date cancelTime;
+
+
+    @Override
+    public String toString() {
+        return "Alarm{" +
+            "id=" + id +
+            ", deviceId=" + deviceId +
+            ", alarmType=" + alarmType +
+            ", alarmTime=" + alarmTime +
+            ", alarmStatus=" + alarmStatus +
+            ", alarmLocation=" + alarmLocation +
+            ", alarmImage=" + alarmImage +
+            ", channelNo=" + channelNo +
+            ", alarmContent=" + alarmContent +
+            ", cancelTime=" + cancelTime +
+        "}";
+    }
+}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusAlarm.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusAlarm.java
deleted file mode 100644
index efb4a23..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusAlarm.java
+++ /dev/null
@@ -1,159 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.alibaba.fastjson.annotation.JSONField;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.time.LocalDateTime;
-import java.util.Date;
-
-/**
- * <p>
- * 报警记录表
- * </p>
- *
- * @author zyj
- * @since 2023-05-16
- */
-@Data
-@ApiModel("Alarm")
-@TableName("br_bus_alarm")
-public class BusAlarm implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 项目ID
-     */
-    @ApiModelProperty(value = "项目ID")
-    @TableField("PROJECT_ID")
-    private Long projectId;
-
-    /**
-     * 设备ID
-     */
-    @ApiModelProperty(value = "设备ID")
-    @TableField("DEVICE_ID")
-    private Long deviceId;
-
-    /**
-     * 报警类型
-     */
-    @ApiModelProperty(value = "报警类型")
-    @TableField("ALARM_TYPE")
-    private String alarmType;
-
-    /**
-     * 报警状态
-     */
-    @ApiModelProperty(value = "报警状态")
-    @TableField("ALARM_STATUS")
-    private String alarmStatus;
-
-    /**
-     * 报警值
-     */
-    @ApiModelProperty(value = "报警值")
-    @TableField("ALARM_VALUE")
-    private String alarmValue;
-
-    /**
-     * 报警图片
-     */
-    @ApiModelProperty(value = "报警图片")
-    @TableField("ALARM_IMAGE")
-    private String alarmImage;
-
-    /**
-     * 报警内容
-     */
-    @ApiModelProperty(value = "报警内容")
-    @TableField("ALARM_CONTENT")
-    private String alarmContent;
-
-    /**
-     * 报警时间
-     */
-    @ApiModelProperty(value = "报警时间")
-    @TableField("ALARM_TIME")
-    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
-    private Date alarmTime;
-
-    /**
-     * 消警时间
-     */
-    @ApiModelProperty(value = "消警时间")
-    @TableField("CANCEL_TIME")
-    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
-    private Date cancelTime;
-
-    /**
-     * 报警位置经度
-     */
-    @ApiModelProperty(value = "报警位置经度")
-    @TableField("ALARM_LNG")
-    private String alarmLng;
-
-    /**
-     * 报警位置纬度
-     */
-    @ApiModelProperty(value = "报警位置纬度")
-    @TableField("ALARM_LAT")
-    private String alarmLat;
-
-    @ApiModelProperty("报警类型名称")
-    @TableField(exist = false)
-    private String alarmStatusName;
-    @ApiModelProperty("报警类型名称")
-    @TableField(exist = false)
-    private String alarmTypeName;
-    @ApiModelProperty("作业名称")
-    @TableField(exist = false)
-    private String workTitle;
-    @ApiModelProperty("所属道路")
-    @TableField(exist = false)
-    private String workRoad;
-    @ApiModelProperty("作业状态")
-    @TableField(exist = false)
-    private String projectState;
-    @ApiModelProperty("作业状态名称")
-    @TableField(exist = false)
-    private String projectStateName;
-    @ApiModelProperty("负责人姓名")
-    @TableField(exist = false)
-    private String workPersonName;
-    @ApiModelProperty("负责人联系方式")
-    @TableField(exist = false)
-    private String workPersonPhoneNumber;
-
-
-    @Override
-    public String toString() {
-        return "BusAlarm{" +
-                "id=" + id +
-                ", projectId=" + projectId +
-                ", deviceId=" + deviceId +
-                ", alarmType=" + alarmType +
-                ", alarmValue=" + alarmValue +
-                ", alarmStatus=" + alarmStatus +
-                ", alarmImage=" + alarmImage +
-                ", alarmContent=" + alarmContent +
-                ", alarmTime=" + alarmTime +
-                ", cancelTime=" + cancelTime +
-                ", alarmLng=" + alarmLng +
-                ", alarmLat=" + alarmLat +
-                "}";
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusEvent.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusEvent.java
deleted file mode 100644
index a0b7543..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusEvent.java
+++ /dev/null
@@ -1,100 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.time.LocalDateTime;
-import java.util.Date;
-import java.util.List;
-
-/**
- * <p>
- * 事件表
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@TableName("br_bus_event")
-@Data
-@ApiModel("BusEvent")
-public class BusEvent implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @ApiModelProperty("事件ID")
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 事件标题
-     */
-    @ApiModelProperty("事件名称")
-    @TableField("EVENT_TITLE")
-    private String eventTitle;
-
-    /**
-     * 上报人员
-     */
-    @ApiModelProperty("上报人员")
-    @TableField("UPLOAD_NAME")
-    private String uploadName;
-
-    /**
-     * 联系方式
-     */
-    @ApiModelProperty("联系方式")
-    @TableField("PHONE_NUMBER")
-    private String phoneNumber;
-
-    /**
-     * 事件描述
-     */
-    @ApiModelProperty("事件描述")
-    @TableField("EVENT_DESCRIPTION")
-    private String eventDescription;
-
-    @ApiModelProperty("经度")
-    @TableField("LNG")
-    private String lng;
-
-    @ApiModelProperty("纬度")
-    @TableField("LAT")
-    private String lat;
-
-    /**
-     * 事件上传时间
-     */
-    @ApiModelProperty("事件上传时间")
-    @TableField("CREATE_TIME")
-    private Date createTime;
-
-    @ApiModelProperty("事件照片")
-    @TableField(exist = false)
-    private List<BusEventImage> imageList;
-
-
-
-    @Override
-    public String toString() {
-        return "BusEvent{" +
-            "id=" + id +
-            ", eventTitle=" + eventTitle +
-            ", uploadName=" + uploadName +
-            ", phoneNumber=" + phoneNumber +
-            ", eventDescription=" + eventDescription +
-            ", lng=" + lng +
-            ", lat=" + lat +
-            ", createTime=" + createTime +
-        "}";
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusEventImage.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusEventImage.java
deleted file mode 100644
index 1e75245..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusEventImage.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-
-/**
- * <p>
- * 事件图片表
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@TableName("br_bus_event_image")
-@Data
-@ApiModel("BusEventImage")
-public class BusEventImage implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 事件ID
-     */
-    @TableField("EVENT_ID")
-    private Long eventId;
-
-    /**
-     * 报警图片
-     */
-    @TableField("IMAGE")
-    @ApiModelProperty("图片url")
-    private String image;
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Device.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Device.java
index df89c70..ea7db5f 100644
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Device.java
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Device.java
@@ -1,30 +1,23 @@
 package com.casic.missiles.modular.system.entity;
 
-import com.alibaba.fastjson.annotation.JSONField;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.casic.missiles.core.base.json.DateDeserializer;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
-import java.util.Date;
 
 /**
  * <p>
- * 
+ * 设备记录表
  * </p>
  *
  * @author zyj
- * @since 2023-04-14
+ * @since 2023-05-25
  */
-@ApiModel("Device")
-@TableName("br_device")
 @Data
+@TableName("bus_device")
 public class Device implements Serializable {
 
     private static final long serialVersionUID = 1L;
@@ -32,82 +25,86 @@
     /**
      * 主键
      */
-    @ApiModelProperty(value = "设备ID")
     @TableId(value = "ID",type = IdType.ASSIGN_ID)
     private Long id;
 
     /**
-     * 设备编号
+     * 设备名称
      */
-    @ApiModelProperty(value = "设备编号")
-    @TableField("DEVICE_CODE")
-    private String deviceCode;
+    @TableField("DEVICE_NAME")
+    private String deviceName;
 
     /**
-     * 设备类型
+     * IP
      */
-    @ApiModelProperty(value = "设备类型")
-    @TableField("DEVICE_TYPE")
-    private String deviceType;
+    @TableField("IP")
+    private String ip;
 
     /**
-     * 设备批次
+     * 端口
      */
-    @ApiModelProperty(value = "设备批次")
-    @TableField("DEVICE_BATCH")
-    private String deviceBatch;
+    @TableField("PORT")
+    private String port;
 
     /**
-     * 厂家
+     * 用户名
      */
-    @ApiModelProperty(value = "厂家")
-    @TableField("MANUFACTURER")
-    private String manufacturer;
+    @TableField("USER_NAME")
+    private String userName;
 
     /**
-     * 是否供电
+     * 密码
      */
-    @ApiModelProperty(value = "是否供电")
-    @TableField("IS_POWER_SUPPLY")
-    private String isPowerSupply;
+    @TableField("PASSWORD")
+    private String password;
 
     /**
-     * 创建时间
+     * 连接类型
      */
-    @ApiModelProperty(value = "创建时间",dataType = "Date")
-    @TableField("CREATE_TIME")
-    private Date createTime;
+    @TableField("CONNECT_TYPE")
+    private String connectType;
 
-    @ApiModelProperty(value = "设备类型名称")
-    @TableField(exist = false)
-    private String deviceTypeName;
+    /**
+     * 位置
+     */
+    @TableField("LOCATION")
 
-    @ApiModelProperty(value = "是否供电名称")
-    @TableField(exist = false)
-    private String isPowerSupplyName;
+    private String location;
 
-    @ApiModelProperty(value = "注册时间",dataType = "String")
-    @TableField(exist = false)
-    private String registerTime;
+    /**
+     * 设备状态
+     */
+    @TableField("STATUS")
 
-    @ApiModelProperty(value = "当前状态")
-    @TableField(exist = false)
     private String status;
 
-    @ApiModelProperty(value = "当前状态名称")
-    @TableField(exist = false)
-    private String statusName;
+    /**
+     * 报警分组
+     */
+    @TableField("ALARM_GROUP")
+
+    private Long alarmGroup;
+
+    /**
+     * 视频通道数(预留)
+     */
+    @TableField("CHANNEL_NUM")
+    private Integer channelNum;
 
     @Override
     public String toString() {
         return "Device{" +
             "id=" + id +
-            ", deviceCode=" + deviceCode +
-            ", deviceType=" + deviceType +
-            ", deviceBatch=" + deviceBatch +
-            ", manufacturer=" + manufacturer +
-            ", isPowerSupply=" + isPowerSupply +
-            ", createTime=" + createTime +
+            ", deviceName=" + deviceName +
+            ", ip=" + ip +
+            ", port=" + port +
+            ", userName=" + userName +
+            ", password=" + password +
+            ", connectType=" + connectType +
+            ", location=" + location +
+            ", status=" + status +
+            ", alarmGroup=" + alarmGroup +
+            ", channelNum=" + channelNum +
         "}";
     }
 }
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/DeviceExt.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/DeviceExt.java
deleted file mode 100644
index 5ee7015..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/DeviceExt.java
+++ /dev/null
@@ -1,99 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-
-/**
- * <p>
- * 设备扩展信息表（安全树）
- * </p>
- *
- * @author zyj
- * @since 2023-04-27
- */
-@Data
-@TableName("br_device_ext")
-public class DeviceExt implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 设备ID
-     */
-    @TableField("DEVICE_ID")
-    private Long deviceId;
-
-    /**
-     * 摄像头编号
-     */
-    @TableField("CAMERA_CODE")
-    private String cameraCode;
-
-    /**
-     * 摄像头IP
-     */
-    @TableField("CAMERA_IP")
-    private String cameraIp;
-
-    /**
-     * 摄像头端口
-     */
-    @TableField("CAMERA_PORT")
-    private String cameraPort;
-
-    /**
-     * 激甲编号
-     */
-    @TableField("GAS_CODE")
-    private String gasCode;
-
-    /**
-     * 激甲IP
-     */
-    @TableField("GAS_IP")
-    private String gasIp;
-
-    /**
-     * 激甲端口
-     */
-    @TableField("GAS_PORT")
-    private String gasPort;
-
-    /**
-     * 甲烷报警阈值
-     */
-    @TableField("GAS_THRESHOLD")
-    private String gasThreshold;
-
-    @TableField(value = "HAT_LINING_CODE")
-    private String hatLiningCode;
-
-
-    @Override
-    public String toString() {
-        return "DeviceExt{" +
-            "id=" + id +
-            ", deviceId=" + deviceId +
-            ", cameraCode=" + cameraCode +
-            ", cameraIp=" + cameraIp +
-            ", cameraPort=" + cameraPort +
-            ", gasCode=" + gasCode +
-            ", gasIp=" + gasIp +
-            ", gasPort=" + gasPort +
-            ", gasThreshold=" + gasThreshold +
-            ", hatLiningCode=" + hatLiningCode +
-        "}";
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/ProjectDevice.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/ProjectDevice.java
deleted file mode 100644
index c4f3472..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/ProjectDevice.java
+++ /dev/null
@@ -1,62 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-
-/**
- * <p>
- * 
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@Data
-@ApiModel("ProjectDevice")
-@TableName("br_project_device")
-public class ProjectDevice implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 作业现场ID
-     */
-    @TableField("PROJECT_ID")
-    private Long projectId;
-
-    /**
-     * 设备ID
-     */
-    @TableField("DEVICE_ID")
-    @ApiModelProperty("设备ID（新增编辑时传）")
-    private Long deviceId;
-
-    /**
-     * 设备编号
-     */
-    @TableField(exist = false)
-    @ApiModelProperty("设备编号（详情中展示，新增编辑不用传）")
-    private String deviceCode;
-
-    @Override
-    public String toString() {
-        return "ProjectDevice{" +
-            "id=" + id +
-            ", projectId=" + projectId +
-            ", deviceId=" + deviceId +
-        "}";
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/ProjectWorker.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/ProjectWorker.java
deleted file mode 100644
index 10b23c4..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/ProjectWorker.java
+++ /dev/null
@@ -1,104 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import java.io.Serializable;
-
-/**
- * <p>
- * 
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@ApiModel("ProjectWorker")
-@TableName("br_project_worker")
-@Data
-@NoArgsConstructor
-@AllArgsConstructor
-public class ProjectWorker implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 作业现场ID
-     */
-    @TableField("PROJECT_ID")
-    private Long projectId;
-
-    /**
-     * 人员ID
-     */
-    @ApiModelProperty("人员ID")
-    @TableField("WORKER_ID")
-    private Long workerId;
-
-    /**
-     * 安全帽编号
-     */
-    @ApiModelProperty("安全帽编号")
-    @TableField("HAT_CODE")
-    private String hatCode;
-
-    /**
-     * 背心编号
-     */
-    @ApiModelProperty("背心编号")
-    @TableField("VAST_CODE")
-    private String vastCode;
-
-    /**
-     * 手环编号
-     */
-    @ApiModelProperty("手环编号")
-    @TableField("BRACELET_CODE")
-    private String braceletCode;
-
-    @ApiModelProperty("人员姓名（详情中展示，新增编辑不用传）")
-    @TableField(exist = false)
-    private String workerName;
-
-    @ApiModelProperty("人员部门ID（详情中展示，新增编辑不用传）")
-    @TableField(exist = false)
-    private String workerDeptId;
-
-    @ApiModelProperty("人员部门名称（详情中展示，新增编辑不用传）")
-    @TableField(exist = false)
-    private String workerDeptName;
-
-    @ApiModelProperty("人员联系方式（详情中展示，新增编辑不用传）")
-    @TableField(exist = false)
-    private String workerPhoneNumber;
-
-    public ProjectWorker(Long projectId, Long workerId) {
-        this.projectId = projectId;
-        this.workerId = workerId;
-    }
-
-    @Override
-    public String toString() {
-        return "ProjectWorker{" +
-            "id=" + id +
-            ", projectId=" + projectId +
-            ", workerId=" + workerId +
-            ", hatCode=" + hatCode +
-            ", vastCode=" + vastCode +
-            ", braceletCode=" + braceletCode +
-        "}";
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/WorkSiteInfo.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/WorkSiteInfo.java
deleted file mode 100644
index fa6f41d..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/WorkSiteInfo.java
+++ /dev/null
@@ -1,130 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.alibaba.fastjson.annotation.JSONField;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.time.LocalDateTime;
-import java.util.Date;
-
-/**
- * <p>
- * 作业现场表
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@ApiModel("WorkSiteInfo")
-@TableName("br_work_site_info")
-@Data
-public class WorkSiteInfo implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @ApiModelProperty("作业现场ID")
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 作业名称
-     */
-    @ApiModelProperty("作业名称")
-    @TableField("WORK_TITLE")
-    private String workTitle;
-
-    /**
-     * 责任人
-     */
-    @ApiModelProperty("责任人（人员ID）")
-    @TableField("WORK_PERSON")
-    private Long workPerson;
-
-    /**
-     * 作业描述
-     */
-    @ApiModelProperty("作业描述")
-    @TableField("WORK_SITE_DESC")
-    private String workSiteDesc;
-
-    /**
-     * 作业状态
-     */
-    @ApiModelProperty("作业状态")
-    @TableField("PROJECT_STATE")
-    private String projectState;
-
-    /**
-     * 所属道路
-     */
-    @ApiModelProperty("所属道路")
-    @TableField("WORK_ROAD")
-    private String workRoad;
-
-    @TableField("IMAGE_URL")
-    private String imageUrl;
-
-    @TableField("CREATE_TIME")
-    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
-    private Date createTime;
-    @TableField("UPDATE_TIME")
-    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
-    private Date updateTime;
-
-    @ApiModelProperty("开始时间")
-    @TableField("START_TIME")
-    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
-    private Date startTime;
-
-    @ApiModelProperty("结束时间")
-    @TableField("FINISH_TIME")
-    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
-    private Date finishTime;
-
-    @ApiModelProperty("负责人姓名（详情中使用，新增编辑不用传）")
-    @TableField(exist = false)
-    private String workPersonName;
-
-    @ApiModelProperty("负责人联系方式（详情中使用，新增编辑不用传）")
-    @TableField(exist = false)
-    private String workPersonPhoneNumber;
-
-    @ApiModelProperty("负责人所属部门ID（详情中使用，新增编辑不用传）")
-    @TableField(exist = false)
-    private Long workPersonDeptId;
-
-    @ApiModelProperty("负责人所属部门名称（详情中使用，新增编辑不用传）")
-    @TableField(exist = false)
-    private String workPersonDeptName;
-
-    @ApiModelProperty(value = "注册时间",dataType = "String")
-    @TableField(exist = false)
-    private String registerTime;
-
-    @ApiModelProperty("作业状态名称")
-    @TableField(exist = false)
-    private String projectStateName;
-
-    @Override
-    public String toString() {
-        return "WorkSiteInfo{" +
-            "id=" + id +
-            ", workTitle=" + workTitle +
-            ", workPerson=" + workPerson +
-            ", workSiteDesc=" + workSiteDesc +
-            ", projectState=" + projectState +
-            ", imageUrl=" + imageUrl +
-            ", updateTime=" + updateTime +
-            ", workRoad=" + workRoad +
-        "}";
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Worker.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Worker.java
deleted file mode 100644
index 28a4daa..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Worker.java
+++ /dev/null
@@ -1,147 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.time.LocalDateTime;
-import java.util.Date;
-
-/**
- * <p>
- * 
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@ApiModel("Worker")
-@TableName("br_worker")
-@Data
-public class Worker implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @ApiModelProperty(value = "人员ID")
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 姓名
-     */
-    @ApiModelProperty(value = "姓名")
-    @TableField("WORKER_NAME")
-    private String workerName;
-
-    /**
-     * 性别
-     */
-    @ApiModelProperty(value = "性别")
-    @TableField("GENDER")
-    private String gender;
-
-    /**
-     * 所属部门
-     */
-    @ApiModelProperty(value = "所属部门(人员管理)")
-    @TableField("DEPT_ID")
-    private Long deptId;
-
-    /**
-     * 所属单位
-     */
-    @ApiModelProperty(value = "所属单位(入场申请中使用)")
-    @TableField("OWNER_SHIP")
-    private String ownerShip;
-
-    /**
-     * 联系方式
-     */
-    @ApiModelProperty(value = "联系方式")
-    @TableField("PHONE_NUMBER")
-    private String phoneNumber;
-
-    /**
-     * 证件号
-     */
-    @ApiModelProperty(value = "证件号")
-    @TableField("ID_CARD_NUMBER")
-    private String idCardNumber;
-
-    /**
-     * 入场原因
-     */
-    @ApiModelProperty(value = "入场原因（入场申请中使用）")
-    @TableField("ENTER_REASON")
-    private String enterReason;
-
-    /**
-     * 入场人脸照片
-     */
-    @ApiModelProperty(value = "人脸照片（照片路径）")
-    @TableField("WORKER_AVATAR")
-    private String workerAvatar;
-
-    /**
-     * 申请入场时间
-     */
-    @ApiModelProperty(value = "注册时间/申请入场时间")
-    @TableField("CREATE_TIME")
-    private Date createTime;
-
-    /**
-     * 人员类型
-     */
-    @ApiModelProperty(value = "人员类型（区分人员管理和入场申请）")
-    @TableField("WORKER_TYPE")
-    private String workerType;
-
-    @ApiModelProperty(value = "性别名称")
-    @TableField(exist = false)
-    private String genderName;
-
-    @ApiModelProperty(value = "部门名称")
-    @TableField(exist = false)
-    private String deptName;
-
-    @ApiModelProperty(value = "注册时间",dataType = "String")
-    @TableField(exist = false)
-    private String registerTime;
-
-    @ApiModelProperty(value = "当前状态")
-    @TableField(exist = false)
-    private String status;
-
-    @ApiModelProperty(value = "当前状态名称")
-    @TableField(exist = false)
-    private String statusName;
-
-    @ApiModelProperty(value = "是否注册(0未注册；1已注册)",allowableValues = "0,1")
-    @TableField(exist = false)
-    private String isRegister;
-
-    @Override
-    public String toString() {
-        return "Worker{" +
-            "id=" + id +
-            ", workerName=" + workerName +
-            ", gender=" + gender +
-            ", deptId=" + deptId +
-            ", ownerShip=" + ownerShip +
-            ", phoneNumber=" + phoneNumber +
-            ", idCardNumber=" + idCardNumber +
-            ", enterReason=" + enterReason +
-            ", workerAvatar=" + workerAvatar +
-            ", createTime=" + createTime +
-            ", workerType=" + workerType +
-        "}";
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/AlarmMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/AlarmMapper.java
new file mode 100644
index 0000000..ea4c8be
--- /dev/null
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/AlarmMapper.java
@@ -0,0 +1,16 @@
+package com.casic.missiles.modular.system.mapper;
+
+import com.casic.missiles.modular.system.entity.Alarm;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 报警记录表 Mapper 接口
+ * </p>
+ *
+ * @author zyj
+ * @since 2023-05-25
+ */
+public interface AlarmMapper extends BaseMapper<Alarm> {
+
+}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/BusAlarmMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/BusAlarmMapper.java
deleted file mode 100644
index 9801742..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/BusAlarmMapper.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package com.casic.missiles.modular.system.mapper;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.modular.system.dto.AlarmTypeCountDTO;
-import com.casic.missiles.modular.system.entity.BusAlarm;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * <p>
- * 报警记录表 Mapper 接口
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface BusAlarmMapper extends BaseMapper<BusAlarm> {
-
-    Page<BusAlarm> listPage(Page<BusAlarm> page,@Param("ew")  QueryWrapper<BusAlarm> queryWrapper);
-
-    void cancelAlarm(@Param("deviceId")Long deviceId,@Param("alarmType") String alarmType);
-
-    List<AlarmTypeCountDTO> alarmCount(@Param("projectId")Long projectId, @Param("alarmStatus")String alarmStatus);
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/BusEventImageMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/BusEventImageMapper.java
deleted file mode 100644
index 9590b7d..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/BusEventImageMapper.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.casic.missiles.modular.system.mapper;
-
-import com.casic.missiles.modular.system.entity.BusEventImage;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * <p>
- * 事件图片表 Mapper 接口
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface BusEventImageMapper extends BaseMapper<BusEventImage> {
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/BusEventMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/BusEventMapper.java
deleted file mode 100644
index 3c85edf..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/BusEventMapper.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.casic.missiles.modular.system.mapper;
-
-import com.casic.missiles.modular.system.entity.BusEvent;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * <p>
- * 事件表 Mapper 接口
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface BusEventMapper extends BaseMapper<BusEvent> {
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/DeviceExtMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/DeviceExtMapper.java
deleted file mode 100644
index 4ca9212..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/DeviceExtMapper.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.casic.missiles.modular.system.mapper;
-
-import com.casic.missiles.modular.system.entity.DeviceExt;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * <p>
- * 设备扩展信息表（安全树） Mapper 接口
- * </p>
- *
- * @author zyj
- * @since 2023-04-27
- */
-public interface DeviceExtMapper extends BaseMapper<DeviceExt> {
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/DeviceMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/DeviceMapper.java
index 444c0c5..3d0bb02 100644
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/DeviceMapper.java
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/DeviceMapper.java
@@ -1,30 +1,16 @@
 package com.casic.missiles.modular.system.mapper;
 
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.modular.system.dto.DeviceDetailDTO;
-import com.casic.missiles.modular.system.dto.HelmetInfoDTO;
 import com.casic.missiles.modular.system.entity.Device;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
 
 /**
  * <p>
- *  Mapper 接口
+ * 设备记录表 Mapper 接口
  * </p>
  *
  * @author zyj
- * @since 2023-04-14
+ * @since 2023-05-25
  */
-@Mapper
 public interface DeviceMapper extends BaseMapper<Device> {
 
-    Page<DeviceDetailDTO> listDetailPage(Page<DeviceDetailDTO> page,@Param("ew") QueryWrapper<DeviceDetailDTO> ew);
-
-     List<Long> selectProjectDevice(@Param("projectId") Long projectId);
-
-    List<HelmetInfoDTO> selectHelmetList(@Param("deviceType")String deviceType);
 }
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/ProjectDeviceMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/ProjectDeviceMapper.java
deleted file mode 100644
index 1d0c14e..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/ProjectDeviceMapper.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package com.casic.missiles.modular.system.mapper;
-
-import com.casic.missiles.modular.system.dto.DeviceLocationDTO;
-import com.casic.missiles.modular.system.entity.ProjectDevice;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * <p>
- *  Mapper 接口
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface ProjectDeviceMapper extends BaseMapper<ProjectDevice> {
-     List<ProjectDevice> selectDetailByProjectId(@Param("projectId") Long projectId);
-
-     List<DeviceLocationDTO> selectDeviceLocationList(@Param("projectId") Long projectId);
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/ProjectWorkerMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/ProjectWorkerMapper.java
deleted file mode 100644
index 58583d1..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/ProjectWorkerMapper.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package com.casic.missiles.modular.system.mapper;
-
-import com.casic.missiles.modular.system.dto.WorkerLocationDTO;
-import com.casic.missiles.modular.system.entity.ProjectWorker;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * <p>
- *  Mapper 接口
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface ProjectWorkerMapper extends BaseMapper<ProjectWorker> {
-
-    List<ProjectWorker> selectDetailByProjectId(@Param("projectId") Long projectId,
-                                                @Param("workerType")String workerType);
-
-    List<WorkerLocationDTO> selectWorkerLocationList(@Param("projectId") Long projectId,
-                                                     @Param("workerType")String workerType);
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/WorkSiteInfoMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/WorkSiteInfoMapper.java
deleted file mode 100644
index a4934d2..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/WorkSiteInfoMapper.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.casic.missiles.modular.system.mapper;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.modular.system.entity.WorkSiteInfo;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Param;
-
-/**
- * <p>
- * 作业现场表 Mapper 接口
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface WorkSiteInfoMapper extends BaseMapper<WorkSiteInfo> {
-
-    Page<WorkSiteInfo> selectListPage(Page<WorkSiteInfo> page,@Param("ew") QueryWrapper<WorkSiteInfo> ew);
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/WorkerMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/WorkerMapper.java
deleted file mode 100644
index 258fb12..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/WorkerMapper.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package com.casic.missiles.modular.system.mapper;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.modular.system.dto.DeviceDetailDTO;
-import com.casic.missiles.modular.system.entity.Worker;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * <p>
- *  Mapper 接口
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface WorkerMapper extends BaseMapper<Worker> {
-
-
-    Page<Worker> selectListPage(Page<Worker> page, @Param("ew") QueryWrapper<Worker> ew);
-
-    List<String> selectWorkerAvatars(@Param("projectId")Long projectId);
-
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/AlarmMapper.xml b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/AlarmMapper.xml
new file mode 100644
index 0000000..25cb4ab
--- /dev/null
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/AlarmMapper.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.modular.system.mapper.AlarmMapper">
+
+</mapper>
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/BusAlarmMapper.xml b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/BusAlarmMapper.xml
deleted file mode 100644
index 595088a..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/BusAlarmMapper.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.casic.missiles.modular.system.mapper.BusAlarmMapper">
-
-    <select id="listPage" resultType="com.casic.missiles.modular.system.entity.BusAlarm">
-        SELECT
-            alarm.ID as id,
-            alarm.DEVICE_ID as deviceId,
-            alarm.PROJECT_ID as projectId,
-            alarm.ALARM_TYPE as alarmType,
-            alarm.ALARM_VALUE as alarmValue,
-            alarm.ALARM_STATUS as alarmStatus,
-            alarm.ALARM_IMAGE AS alarmImage,
-            alarm.ALARM_CONTENT as alarmContent,
-            alarm.ALARM_TIME as alarmTime,
-            alarm.CANCEL_TIME as cancelTime,
-            alarm.ALARM_LNG as alarmLng,
-            alarm.ALARM_LAT as alarmLat,
-            p.WORK_TITLE as workTitle,
-            p.WORK_ROAD as workRoad,
-            p.PROJECT_STATE as projectState,
-            w.WORKER_NAME as workPersonName,
-            w.PHONE_NUMBER as workPersonPhoneNumber
-        FROM
-            `br_bus_alarm` alarm
-                LEFT JOIN br_work_site_info p on alarm.PROJECT_ID = p.ID
-                LEFT JOIN br_worker w on p.WORK_PERSON = w.ID
-        <where>
-            <if test="ew != null">
-                ${ew.sqlSegment}
-            </if>
-        </where>
-    </select>
-
-    <select id="cancelAlarm">
-        update br_bus_alarm
-        set ALARM_STATUS = '1'
-        where DEVICE_ID = #{deviceId}
-          and ALARM_TYPE = #{alarmType}
-          and ALARM_STATUS = '0'
-    </select>
-
-    <select id="alarmCount" resultType="com.casic.missiles.modular.system.dto.AlarmTypeCountDTO">
-        SELECT
-            ALARM_TYPE as alarmType,
-            count(*) as alarmCount
-        from br_bus_alarm
-        <where>
-            <if test="projectId != null and projectId !=''">
-                and PROJECT_ID = #{projectId}
-            </if>
-            <if test="alarmStatus != null and alarmStatus !=''">
-                and ALARM_STATUS = #{alarmStatus}
-            </if>
-        </where>
-        group by ALARM_TYPE
-    </select>
-</mapper>
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/BusEventImageMapper.xml b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/BusEventImageMapper.xml
deleted file mode 100644
index fbc3db3..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/BusEventImageMapper.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.casic.missiles.modular.system.mapper.BusEventImageMapper">
-
-</mapper>
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/BusEventMapper.xml b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/BusEventMapper.xml
deleted file mode 100644
index 627d573..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/BusEventMapper.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.casic.missiles.modular.system.mapper.BusEventMapper">
-
-</mapper>
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/DeviceExtMapper.xml b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/DeviceExtMapper.xml
deleted file mode 100644
index 5321d1c..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/DeviceExtMapper.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.casic.missiles.modular.system.mapper.DeviceExtMapper">
-
-</mapper>
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/DeviceMapper.xml b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/DeviceMapper.xml
index 94262e1..88e7d01 100644
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/DeviceMapper.xml
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/DeviceMapper.xml
@@ -2,96 +2,4 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.casic.missiles.modular.system.mapper.DeviceMapper">
 
-    <select id="listDetailPage" resultType="com.casic.missiles.modular.system.dto.DeviceDetailDTO">
-        select
-        br_device.ID as id,
-        DEVICE_CODE as deviceCode,
-        DEVICE_TYPE as deviceType,
-        DEVICE_BATCH as deviceBatch,
-        MANUFACTURER as manufacturer,
-        IS_POWER_SUPPLY as isPowerSupply,
-        CREATE_TIME as createTime,
-        CAMERA_CODE as cameraCode,
-        CAMERA_IP as cameraIp,
-        CAMERA_PORT as cameraPort,
-        GAS_CODE as gasCode,
-        GAS_IP as gasIp,
-        GAS_PORT as gasPort,
-        HAT_LINING_CODE as hatLiningCode
-        from br_device
-        left join br_device_ext ext on ext.DEVICE_ID = br_device.ID
-        <where>
-            <if test="ew != null">
-                ${ew.sqlSegment}
-            </if>
-        </where>
-    </select>
-
-    <select id="selectProjectDevice" resultType="java.lang.Long">
-        with device_info as (
-            (SELECT
-            d.DEVICE_ID as DEVICE_ID,
-            d.PROJECT_ID as PROJECT_ID,
-            p.PROJECT_STATE as PROJECT_STATE
-            from br_project_device d
-            LEFT JOIN br_work_site_info p on p.ID = d.PROJECT_ID)
-
-            UNION ALL
-
-            (SELECT
-            d1.ID as DEVICE_ID,
-            w1.ID as PROJECT_ID,
-            w1.PROJECT_STATE as PROJECT_STATE
-            FROM br_project_worker pw1
-            LEFT JOIN br_device d1 on pw1.BRACELET_CODE = d1.DEVICE_CODE
-            LEFT JOIN br_work_site_info w1 on pw1.PROJECT_ID = w1.ID)
-
-            UNION ALL
-
-            (SELECT
-            d1.ID as DEVICE_ID,
-            w1.ID as PROJECT_ID,
-            w1.PROJECT_STATE as PROJECT_STATE
-            FROM br_project_worker pw1
-            LEFT JOIN br_device d1 on pw1.HAT_CODE = d1.DEVICE_CODE
-            LEFT JOIN br_work_site_info w1 on pw1.PROJECT_ID = w1.ID)
-
-
-            UNION ALL
-
-            (SELECT
-            d1.ID as DEVICE_ID,
-            w1.ID as PROJECT_ID,
-            w1.PROJECT_STATE as PROJECT_STATE
-            FROM br_project_worker pw1
-            LEFT JOIN br_device d1 on pw1.VAST_CODE = d1.DEVICE_CODE
-            LEFT JOIN br_work_site_info w1 on pw1.PROJECT_ID = w1.ID))
-
-        select DISTINCT DEVICE_ID from device_info
-        <where>
-            DEVICE_ID is not null
-            <choose>
-                <when test="projectId != null and projectId !=''">
-                    and PROJECT_ID = #{projectId}
-                </when>
-                <otherwise>
-                    AND PROJECT_STATE != '3'
-                </otherwise>
-            </choose>
-        </where>
-    </select>
-
-    <select id="selectHelmetList" resultType="com.casic.missiles.modular.system.dto.HelmetInfoDTO">
-        SELECT
-            a.ID AS deviceId,
-            a.DEVICE_CODE AS hatCode,
-            b.HAT_LINING_CODE AS hatLiningCode
-        FROM
-            br_device a
-                LEFT JOIN br_device_ext b ON a.ID = b.DEVICE_ID
-        WHERE
-            a.DEVICE_TYPE = #{deviceType}
-          AND a.DEVICE_CODE IS NOT NULL
-          AND b.HAT_LINING_CODE IS NOT NULL
-    </select>
 </mapper>
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/ProjectDeviceMapper.xml b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/ProjectDeviceMapper.xml
deleted file mode 100644
index c6d1c24..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/ProjectDeviceMapper.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.casic.missiles.modular.system.mapper.ProjectDeviceMapper">
-
-    <select id="selectDetailByProjectId" resultType="com.casic.missiles.modular.system.entity.ProjectDevice">
-        SELECT
-            pd.ID as id,
-            pd.PROJECT_ID as projectId,
-            pd.DEVICE_ID as deviceId,
-            d.DEVICE_CODE as deviceCode
-        from br_project_device pd
-        LEFT JOIN br_device d on pd.DEVICE_ID = d.ID
-        <where>
-            pd.PROJECT_ID = #{projectId}
-        </where>
-    </select>
-
-    <select id="selectDeviceLocationList" resultType="com.casic.missiles.modular.system.dto.DeviceLocationDTO">
-        SELECT
-        d.ID as deviceId,
-        d.DEVICE_TYPE as deviceType,
-        d.DEVICE_CODE as deviceCode,
-        if(EXISTS(select ID from br_bus_alarm WHERE DEVICE_ID = d.ID and ALARM_STATUS = '0'),true,false) as alarmFlag
-        FROM br_project_device pd, br_device d
-        where pd.DEVICE_ID = d.ID
-        and pd.PROJECT_ID = #{projectId}
-    </select>
-
-</mapper>
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/ProjectWorkerMapper.xml b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/ProjectWorkerMapper.xml
deleted file mode 100644
index 8d2de10..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/ProjectWorkerMapper.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.casic.missiles.modular.system.mapper.ProjectWorkerMapper">
-
-    <select id="selectDetailByProjectId" resultType="com.casic.missiles.modular.system.entity.ProjectWorker">
-        SELECT
-            pw.ID as id,
-            pw.PROJECT_ID as projectId,
-            pw.WORKER_ID as workerId,
-            w.WORKER_NAME as workerName,
-            w.DEPT_ID as workerDeptId,
-            pw.HAT_CODE as hatCode,
-            pw.VAST_CODE as vastCode,
-            pw.BRACELET_CODE as braceletCode,
-            w.PHONE_NUMBER as workerPhoneNumber
-        from br_project_worker pw
-        LEFT JOIN br_worker w on pw.WORKER_ID = w.ID
-        <where>
-            pw.PROJECT_ID = #{projectId}
-            <if test="workerType != null and workerType != ''">
-                and w.WORKER_TYPE = #{workerType}
-            </if>
-        </where>
-    </select>
-
-    <select id="selectWorkerLocationList" resultType="com.casic.missiles.modular.system.dto.WorkerLocationDTO">
-        select
-            w.ID as workerId,
-            w.WORKER_NAME as workerName,
-            pw.HAT_CODE as hatCode,
-            hd.ID as hatId,
-            pw.BRACELET_CODE as braceletCode,
-            pw.VAST_CODE as vastCode
-        from br_project_worker pw,br_worker w ,br_device hd
-        WHERE pw.WORKER_ID = w.ID
-          and pw.HAT_CODE = hd.DEVICE_CODE
-          and pw.PROJECT_ID = #{projectId}
-          and w.WORKER_TYPE = #{workerType}
-    </select>
-</mapper>
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/WorkSiteInfoMapper.xml b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/WorkSiteInfoMapper.xml
deleted file mode 100644
index 8f01326..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/WorkSiteInfoMapper.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.casic.missiles.modular.system.mapper.WorkSiteInfoMapper">
-
-    <select id="selectListPage" resultType="com.casic.missiles.modular.system.entity.WorkSiteInfo">
-        SELECT
-            br_work_site_info.ID AS id,
-            WORK_TITLE as workTitle,
-            WORK_ROAD as workRoad,
-            WORK_SITE_DESC as workSiteDesc,
-            WORK_PERSON as workPerson,
-            WORKER_NAME as workPersonName,
-            DEPT_ID as workPersonDeptId,
-            PHONE_NUMBER as workPersonPhoneNumber,
-            PROJECT_STATE as projectState,
-            br_work_site_info.CREATE_TIME AS createTime,
-            br_work_site_info.UPDATE_TIME AS updateTime
-        FROM br_work_site_info
-        LEFT JOIN br_worker w ON br_work_site_info.WORK_PERSON = w.ID
-        <where>
-            <if test="ew != null">
-                ${ew.sqlSegment}
-            </if>
-        </where>
-    </select>
-</mapper>
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/WorkerMapper.xml b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/WorkerMapper.xml
deleted file mode 100644
index 3e28b39..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/WorkerMapper.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.casic.missiles.modular.system.mapper.WorkerMapper">
-
-    <select id="selectListPage" resultType="com.casic.missiles.modular.system.entity.Worker">
-        WITH worker_project AS (
-            SELECT
-                w.id AS ID,
-                WORKER_NAME,
-                GENDER,
-                DEPT_ID,
-                OWNER_SHIP,
-                PHONE_NUMBER,
-                ID_CARD_NUMBER,
-                ENTER_REASON,
-                WORKER_AVATAR,
-                w.CREATE_TIME,
-                WORKER_TYPE,
-                IF( p.PROJECT_STATE != '3', 1, 0 ) AS `STATUS`
-            FROM br_worker w
-            LEFT JOIN br_project_worker pw ON w.ID = pw.WORKER_ID
-            LEFT JOIN br_work_site_info p ON pw.PROJECT_ID = p.ID
-        )
-
-        SELECT
-            ID AS id,
-            WORKER_NAME AS workerName,
-            GENDER AS gender,
-            DEPT_ID AS deptId,
-            OWNER_SHIP AS ownerShip,
-            PHONE_NUMBER AS phoneNumber,
-            ID_CARD_NUMBER AS idCardNumber,
-            ENTER_REASON AS enterReason,
-            WORKER_AVATAR AS workerAvatar,
-            CREATE_TIME AS createTime,
-            WORKER_TYPE AS workerType,
-            `STATUS` AS `status`
-        FROM worker_project
-        <where>
-            <if test="ew != null">
-                ${ew.sqlSegment}
-            </if>
-        </where>
-    </select>
-
-    <select id="selectWorkerAvatars" resultType="java.lang.String">
-        SELECT
-            WORKER_AVATAR
-        FROM
-            `br_worker`
-        WHERE
-        ID IN ( SELECT WORKER_ID FROM br_project_worker WHERE PROJECT_ID = #{projectId} )
-          AND WORKER_AVATAR IS NOT NULL
-          AND WORKER_AVATAR != ''
-    </select>
-</mapper>
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IAlarmService.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IAlarmService.java
new file mode 100644
index 0000000..8bc01f4
--- /dev/null
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IAlarmService.java
@@ -0,0 +1,16 @@
+package com.casic.missiles.modular.system.service;
+
+import com.casic.missiles.modular.system.entity.Alarm;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 报警记录表 服务类
+ * </p>
+ *
+ * @author zyj
+ * @since 2023-05-25
+ */
+public interface IAlarmService extends IService<Alarm> {
+
+}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IBusAlarmService.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IBusAlarmService.java
deleted file mode 100644
index f63c19c..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IBusAlarmService.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package com.casic.missiles.modular.system.service;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.modular.system.dto.AlarmTypeCountDTO;
-import com.casic.missiles.modular.system.dto.AlarmUpload;
-import com.casic.missiles.modular.system.entity.BusAlarm;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-import java.util.List;
-
-/**
- * <p>
- * 报警记录表 服务类
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface IBusAlarmService extends IService<BusAlarm> {
-
-    boolean alarmUpload(AlarmUpload alarmUpload);
-
-    Page<BusAlarm> listPage(Page<BusAlarm> page,QueryWrapper<BusAlarm> queryWrapper);
-
-    List<AlarmTypeCountDTO> alarmCount(Long projectId,String alarmStatus);
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IBusEventImageService.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IBusEventImageService.java
deleted file mode 100644
index b1187ed..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IBusEventImageService.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.casic.missiles.modular.system.service;
-
-import com.casic.missiles.modular.system.entity.BusEventImage;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-import java.util.List;
-
-/**
- * <p>
- * 事件图片表 服务类
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface IBusEventImageService extends IService<BusEventImage> {
-
-    boolean saveBusEventImages(Long eventId, List<BusEventImage> imageList);
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IBusEventService.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IBusEventService.java
deleted file mode 100644
index 85c48d0..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IBusEventService.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package com.casic.missiles.modular.system.service;
-
-import com.casic.missiles.modular.system.entity.BusEvent;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-/**
- * <p>
- * 事件表 服务类
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface IBusEventService extends IService<BusEvent> {
-
-    boolean saveBusEvent(BusEvent busEvent);
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IDeviceExtService.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IDeviceExtService.java
deleted file mode 100644
index 6fc5361..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IDeviceExtService.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package com.casic.missiles.modular.system.service;
-
-import com.casic.missiles.modular.system.dto.DeviceDetailDTO;
-import com.casic.missiles.modular.system.entity.DeviceExt;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-import java.util.List;
-
-/**
- * <p>
- * 设备扩展信息表（安全树） 服务类
- * </p>
- *
- * @author zyj
- * @since 2023-04-27
- */
-public interface IDeviceExtService extends IService<DeviceExt> {
-
-    boolean saveDeviceExt(DeviceDetailDTO deviceDetailDTO);
-
-    boolean updateDeviceExt(DeviceDetailDTO deviceDetailDTO);
-
-    boolean removeByDeviceIds(List<Long> deviceIds);
-
-    boolean setGasThreshold(String gasIp,String gasPort,String threshold);
-
-    String getGasThreshold(String gasIp,String gasPort);
-
-    Long selectByGasIpPort(String gasIp,String gasPort);
-
-    Long selectByCameraIpPort(String cameraIp,String cameraPort);
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java
index 9e62756..00a421d 100644
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java
@@ -1,32 +1,16 @@
 package com.casic.missiles.modular.system.service;
 
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.modular.system.dto.DeviceDetailDTO;
-import com.casic.missiles.modular.system.dto.HelmetInfoDTO;
 import com.casic.missiles.modular.system.entity.Device;
 import com.baomidou.mybatisplus.extension.service.IService;
 
-import java.util.List;
-
 /**
  * <p>
- *  服务类
+ * 设备记录表 服务类
  * </p>
  *
  * @author zyj
- * @since 2023-04-14
+ * @since 2023-05-25
  */
 public interface IDeviceService extends IService<Device> {
 
-    boolean saveDevice(DeviceDetailDTO deviceDetailDTO);
-
-    boolean updateDevice(DeviceDetailDTO deviceDetailDTO);
-
-    boolean deleteDevices(List<Long> deviceIds);
-
-    Page<DeviceDetailDTO> listPage(Page<DeviceDetailDTO> page, QueryWrapper<DeviceDetailDTO> queryWrapper, String status,Long projectId);
-
-    List<Long> selectProjectDevice(Long projectId);
-
 }
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IProjectDeviceService.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IProjectDeviceService.java
deleted file mode 100644
index 8599411..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IProjectDeviceService.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package com.casic.missiles.modular.system.service;
-
-import com.casic.missiles.modular.system.dto.DeviceLocationDTO;
-import com.casic.missiles.modular.system.entity.ProjectDevice;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-import java.util.List;
-
-/**
- * <p>
- *  服务类
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface IProjectDeviceService extends IService<ProjectDevice> {
-
-    boolean saveProjectDeviceList(Long projectId, List<ProjectDevice> projectDeviceList);
-
-    boolean updateProjectDeviceList(Long projectId, List<ProjectDevice> projectDeviceList);
-
-    boolean deleteByProjectId(Long projectId);
-
-    boolean deleteByProjectIds(List<Long> projectIds);
-
-    List<ProjectDevice> selectDetailByProjectId(Long projectId);
-
-    Long selectProjectIdByDevice(Long deviceId);
-
-    List<DeviceLocationDTO> selectDeviceLocationList(Long projectId);
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IProjectWorkerService.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IProjectWorkerService.java
deleted file mode 100644
index e921bc3..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IProjectWorkerService.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package com.casic.missiles.modular.system.service;
-
-import com.casic.missiles.modular.system.dto.WorkerLocationDTO;
-import com.casic.missiles.modular.system.entity.ProjectDevice;
-import com.casic.missiles.modular.system.entity.ProjectWorker;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-import java.util.List;
-
-/**
- * <p>
- *  服务类
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface IProjectWorkerService extends IService<ProjectWorker> {
-
-    boolean saveProjectWorkerList(Long projectId, List<ProjectWorker> projectWorkerList);
-
-    boolean updateProjectWorkerList(Long projectId, List<ProjectWorker> projectWorkerList);
-
-    boolean deleteByProjectId(Long projectId);
-
-    boolean deleteByProjectIds(List<Long> projectIds);
-
-    List<ProjectWorker> selectDetailByProjectId(Long projectId,String workerType);
-
-    List<WorkerLocationDTO> selectWorkerLocationDTO(Long projectId);
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IWorkSiteInfoService.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IWorkSiteInfoService.java
deleted file mode 100644
index 58a8590..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IWorkSiteInfoService.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package com.casic.missiles.modular.system.service;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.modular.system.dto.WorkSiteDetailDTO;
-import com.casic.missiles.modular.system.entity.WorkSiteInfo;
-import com.baomidou.mybatisplus.extension.service.IService;
-import java.util.List;
-/**
- * <p>
- * 作业现场表 服务类
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface IWorkSiteInfoService extends IService<WorkSiteInfo> {
-
-    boolean addWorkSiteInfo(WorkSiteDetailDTO workSiteDetailDTO);
-
-    boolean updateWorkSiteInfo(WorkSiteDetailDTO workSiteDetailDTO);
-
-    boolean deleteProjects(List<Long> projectIds);
-
-    WorkSiteDetailDTO getWorkSiteDetail(Long projectId);
-
-    Page<WorkSiteInfo> selectListPage(Page<WorkSiteInfo> page, QueryWrapper<WorkSiteInfo> queryWrapper);
-
-    boolean start(Long projectId);
-
-    boolean finish(Long projectId);
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IWorkerService.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IWorkerService.java
deleted file mode 100644
index 6c6ee98..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IWorkerService.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package com.casic.missiles.modular.system.service;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.modular.system.entity.Worker;
-import com.baomidou.mybatisplus.extension.service.IService;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * <p>
- *  服务类
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface IWorkerService extends IService<Worker> {
-
-    boolean addWorker(Worker worker,Long projectId);
-
-    Page<Worker> selectListPage(Page<Worker> page,QueryWrapper<Worker> ew);
-
-    Worker selectWorkerDetail(Long workerId);
-
-    List<String> faceRegister(String cameraIp,String cameraPort);
-
-    List<Worker> projectTempWorker(Long projectId);
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/impl/AlarmServiceImpl.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/impl/AlarmServiceImpl.java
new file mode 100644
index 0000000..6e5959b
--- /dev/null
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/impl/AlarmServiceImpl.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.modular.system.service.impl;
+
+import com.casic.missiles.modular.system.entity.Alarm;
+import com.casic.missiles.modular.system.mapper.AlarmMapper;
+import com.casic.missiles.modular.system.service.IAlarmService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 报警记录表 服务实现类
+ * </p>
+ *
+ * @author zyj
+ * @since 2023-05-25
+ */
+@Service
+public class AlarmServiceImpl extends ServiceImpl<AlarmMapper, Alarm> implements IAlarmService {
+
+}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/impl/BusAlarmServiceImpl.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/impl/BusAlarmServiceImpl.java
deleted file mode 100644
index b44de1d..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/impl/BusAlarmServiceImpl.java
+++ /dev/null
@@ -1,121 +0,0 @@
-package com.casic.missiles.modular.system.service.impl;
-
-import cn.hutool.core.date.DateUtil;
-import cn.hutool.core.util.ObjectUtil;
-import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.core.application.service.AbstractDictService;
-import com.casic.missiles.modular.system.consts.AlarmTypeEnum;
-import com.casic.missiles.modular.system.dto.AlarmTypeCountDTO;
-import com.casic.missiles.modular.system.dto.AlarmUpload;
-import com.casic.missiles.modular.system.entity.BusAlarm;
-import com.casic.missiles.modular.system.entity.DataTreeLocation;
-import com.casic.missiles.modular.system.mapper.BusAlarmMapper;
-import com.casic.missiles.modular.system.service.*;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.util.Date;
-import java.util.List;
-import java.util.stream.Collectors;
-
-import static com.casic.missiles.modular.system.consts.AlarmConst.ALARM_STATUS_ON;
-
-/**
- * <p>
- * 报警记录表 服务实现类
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@Service
-@RequiredArgsConstructor
-@Slf4j
-public class BusAlarmServiceImpl extends ServiceImpl<BusAlarmMapper, BusAlarm> implements IBusAlarmService {
-
-    private final IDeviceExtService deviceExtService;
-    private final IDeviceService deviceService;
-    private final IProjectDeviceService projectDeviceService;
-
-    private final ICasicFileService fileService;
-
-    private final AbstractDictService dictService;
-    private final IDataSupportService dataSupportService;
-
-    @Override
-    @Transactional
-    public boolean alarmUpload(AlarmUpload alarmUpload) {
-        log.info("alarm upload ==> {}",alarmUpload.toString());
-        Long deviceId = null;
-        if(StrUtil.isAllNotBlank(alarmUpload.getGasIp(),alarmUpload.getGasPort())){
-            deviceId = deviceExtService.selectByGasIpPort(alarmUpload.getGasIp(),alarmUpload.getGasPort());
-        }
-        if(ObjectUtil.isEmpty(deviceId) && StrUtil.isAllNotBlank(alarmUpload.getCameraIp(),alarmUpload.getCameraPort())){
-            deviceId = deviceExtService.selectByCameraIpPort(alarmUpload.getCameraIp(),alarmUpload.getCameraPort());
-        }
-
-        if(ObjectUtil.isEmpty(deviceId)){
-            return false;
-        }
-
-        BusAlarm alarm = new BusAlarm();
-        alarm.setDeviceId(deviceId);
-        alarm.setProjectId(projectDeviceService.selectProjectIdByDevice(deviceId));
-        alarm.setAlarmValue(alarmUpload.getAlarmValue());
-        if(StrUtil.isNotEmpty(alarmUpload.getAlarmTime())){
-            alarm.setAlarmTime(DateUtil.parseDateTime(alarmUpload.getAlarmTime()));
-        }else {
-            alarm.setAlarmTime(new Date());
-        }
-
-        alarm.setAlarmType(alarmUpload.getAlarmType());
-        alarm.setAlarmContent(alarmUpload.getAlarmContent());
-        if(StrUtil.isNotEmpty(alarmUpload.getAlarmImage())){
-            String imgBase64 = "data:image/jpeg;base64," + alarmUpload.getAlarmImage();
-            String imageUrl = fileService.saveFile(imgBase64);
-            alarm.setAlarmImage(imageUrl);
-        }
-        alarm.setAlarmStatus(ALARM_STATUS_ON);
-
-        DataTreeLocation treeLocation = dataSupportService.getTreeLocation(deviceId);
-        if(ObjectUtil.isNotEmpty(treeLocation)){
-            alarm.setAlarmLng(treeLocation.getGdLng());
-            alarm.setAlarmLat(treeLocation.getGdLat());
-        }
-
-        //自动消警
-        AlarmTypeEnum alarmTypeEnum = AlarmTypeEnum.getByAlarmType(alarm.getAlarmType());
-        if(ObjectUtil.isNotEmpty(alarmTypeEnum) && alarmTypeEnum.isAutoCancel()){
-            this.baseMapper.cancelAlarm(deviceId,alarm.getAlarmType());
-        }
-        return this.save(alarm);
-    }
-
-    @Override
-    public Page<BusAlarm> listPage(Page<BusAlarm> page, QueryWrapper<BusAlarm> queryWrapper) {
-        page = this.baseMapper.listPage(page, queryWrapper);
-        for (BusAlarm alarm : page.getRecords()) {
-            alarm.setAlarmTypeName(dictService.getDictNameByCode("alarmType",alarm.getAlarmType()));
-            alarm.setAlarmStatusName(dictService.getDictNameByCode("alarmStatus",alarm.getAlarmStatus()));
-            if(StrUtil.isNotEmpty(alarm.getProjectState())){
-                alarm.setProjectStateName(dictService.getDictNameByCode("projectStatus",alarm.getProjectState()));
-            }
-        }
-        return page;
-    }
-
-    @Override
-    public List<AlarmTypeCountDTO> alarmCount(Long projectId, String alarmStatus) {
-        List<AlarmTypeCountDTO> list = this.baseMapper.alarmCount(projectId, alarmStatus);
-        list = list.stream().filter(i->StrUtil.isNotEmpty(i.getAlarmType())).collect(Collectors.toList());
-        for (AlarmTypeCountDTO countDTO : list) {
-            countDTO.setAlarmTypeName(dictService.getDictNameByCode("alarmType",countDTO.getAlarmType()));
-        }
-        return list;
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/impl/BusEventImageServiceImpl.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/impl/BusEventImageServiceImpl.java
deleted file mode 100644
index a43f7c1..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/impl/BusEventImageServiceImpl.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package com.casic.missiles.modular.system.service.impl;
-
-import com.casic.missiles.modular.system.entity.BusEventImage;
-import com.casic.missiles.modular.system.mapper.BusEventImageMapper;
-import com.casic.missiles.modular.system.service.IBusEventImageService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-/**
- * <p>
- * 事件图片表 服务实现类
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@Service
-public class BusEventImageServiceImpl extends ServiceImpl<BusEventImageMapper, BusEventImage> implements IBusEventImageService {
-
-    @Override
-    public boolean saveBusEventImages(Long eventId, List<BusEventImage> imageList) {
-        imageList.forEach(i->i.setEventId(eventId));
-        return this.saveBatch(imageList);
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/impl/BusEventServiceImpl.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/impl/BusEventServiceImpl.java
deleted file mode 100644
index 21e511c..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/impl/BusEventServiceImpl.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package com.casic.missiles.modular.system.service.impl;
-
-import com.casic.missiles.modular.system.entity.BusEvent;
-import com.casic.missiles.modular.system.mapper.BusEventMapper;
-import com.casic.missiles.modular.system.service.IBusEventImageService;
-import com.casic.missiles.modular.system.service.IBusEventService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import lombok.RequiredArgsConstructor;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.util.Date;
-
-/**
- * <p>
- * 事件表 服务实现类
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@Service
-@RequiredArgsConstructor
-public class BusEventServiceImpl extends ServiceImpl<BusEventMapper, BusEvent> implements IBusEventService {
-
-    private final IBusEventImageService busEventImageService;
-
-
-    @Override
-    @Transactional
-    public boolean saveBusEvent(BusEvent busEvent) {
-        busEvent.setCreateTime(new Date());
-        boolean res = this.save(busEvent);
-        if(res){
-            res = busEventImageService.saveBusEventImages(busEvent.getId(),busEvent.getImageList());
-        }
-        return res;
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceExtServiceImpl.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceExtServiceImpl.java
deleted file mode 100644
index 2bdb63d..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceExtServiceImpl.java
+++ /dev/null
@@ -1,102 +0,0 @@
-package com.casic.missiles.modular.system.service.impl;
-
-import cn.hutool.core.util.ObjectUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
-import com.casic.missiles.modular.system.dto.DeviceDetailDTO;
-import com.casic.missiles.modular.system.entity.DeviceExt;
-import com.casic.missiles.modular.system.mapper.DeviceExtMapper;
-import com.casic.missiles.modular.system.service.IDeviceExtService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-/**
- * <p>
- * 设备扩展信息表（安全树） 服务实现类
- * </p>
- *
- * @author zyj
- * @since 2023-04-27
- */
-@Service
-public class DeviceExtServiceImpl extends ServiceImpl<DeviceExtMapper, DeviceExt> implements IDeviceExtService {
-
-
-    @Override
-    public boolean saveDeviceExt(DeviceDetailDTO deviceDetailDTO) {
-        DeviceExt ext = new DeviceExt();
-        ext.setDeviceId(deviceDetailDTO.getId());
-        ext.setCameraCode(deviceDetailDTO.getCameraCode());
-        ext.setCameraIp(deviceDetailDTO.getCameraIp());
-        ext.setCameraPort(deviceDetailDTO.getCameraPort());
-        ext.setGasCode(deviceDetailDTO.getGasCode());
-        ext.setGasIp(deviceDetailDTO.getGasIp());
-        ext.setGasPort(deviceDetailDTO.getGasPort());
-        ext.setHatLiningCode(deviceDetailDTO.getHatLiningCode());
-        return this.save(ext);
-    }
-
-    @Override
-    public boolean updateDeviceExt(DeviceDetailDTO deviceDetailDTO) {
-        DeviceExt ext = this.selectByDeviceId(deviceDetailDTO.getId());
-        ext.setCameraCode(deviceDetailDTO.getCameraCode());
-        ext.setCameraIp(deviceDetailDTO.getCameraIp());
-        ext.setCameraPort(deviceDetailDTO.getCameraPort());
-        ext.setGasCode(deviceDetailDTO.getGasCode());
-        ext.setGasIp(deviceDetailDTO.getGasIp());
-        ext.setGasPort(deviceDetailDTO.getGasPort());
-        ext.setHatLiningCode(deviceDetailDTO.getHatLiningCode());
-        return this.updateById(ext);
-    }
-
-    @Override
-    public boolean removeByDeviceIds(List<Long> deviceIds) {
-        QueryWrapper<DeviceExt> queryWrapper = new QueryWrapper<>();
-        queryWrapper.in("DEVICE_ID",deviceIds);
-        return this.remove(queryWrapper);
-    }
-
-    @Override
-    public boolean setGasThreshold(String gasIp, String gasPort, String threshold) {
-        UpdateWrapper<DeviceExt> updateWrapper = new UpdateWrapper<>();
-        updateWrapper.set("GAS_THRESHOLD",threshold);
-        updateWrapper.eq("GAS_IP",gasIp);
-        updateWrapper.eq("GAS_PORT",gasPort);
-        return this.update(updateWrapper);
-    }
-
-    @Override
-    public String getGasThreshold(String gasIp, String gasPort) {
-        QueryWrapper<DeviceExt> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("GAS_IP",gasIp);
-        queryWrapper.eq("GAS_PORT",gasPort);
-        DeviceExt deviceExt = this.getOne(queryWrapper);
-        return ObjectUtil.isNotEmpty(deviceExt) ? deviceExt.getGasThreshold() : null;
-    }
-
-    private DeviceExt selectByDeviceId(Long deviceId){
-        QueryWrapper<DeviceExt> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("DEVICE_ID",deviceId);
-        return this.getOne(queryWrapper);
-    }
-
-    @Override
-    public Long selectByGasIpPort(String gasIp, String gasPort) {
-        QueryWrapper<DeviceExt> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("GAS_IP",gasIp);
-        queryWrapper.eq("GAS_PORT",gasPort);
-        DeviceExt deviceExt = this.getOne(queryWrapper);
-        return ObjectUtil.isNotEmpty(deviceExt) ? deviceExt.getDeviceId() : null;
-    }
-
-    @Override
-    public Long selectByCameraIpPort(String cameraIp, String cameraPort) {
-        QueryWrapper<DeviceExt> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("CAMERA_IP",cameraIp);
-        queryWrapper.eq("CAMERA_PORT",cameraPort);
-        DeviceExt deviceExt = this.getOne(queryWrapper);
-        return ObjectUtil.isNotEmpty(deviceExt) ? deviceExt.getDeviceId() : null;
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java
index 9df79ef..31a5a18 100644
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java
@@ -1,125 +1,20 @@
 package com.casic.missiles.modular.system.service.impl;
 
-import cn.hutool.core.collection.CollUtil;
-import cn.hutool.core.date.DateUtil;
-import cn.hutool.core.util.ObjectUtil;
-import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.core.application.service.AbstractDictService;
-import com.casic.missiles.modular.system.dto.DeviceDetailDTO;
-import com.casic.missiles.modular.system.dto.HelmetInfoDTO;
 import com.casic.missiles.modular.system.entity.Device;
 import com.casic.missiles.modular.system.mapper.DeviceMapper;
-import com.casic.missiles.modular.system.service.IDeviceExtService;
 import com.casic.missiles.modular.system.service.IDeviceService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.casic.missiles.modular.system.service.IProjectDeviceService;
-import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.util.Date;
-import java.util.List;
-
-import static com.casic.missiles.modular.system.consts.DeviceConst.*;
 
 /**
  * <p>
- *  服务实现类
+ * 设备记录表 服务实现类
  * </p>
  *
  * @author zyj
- * @since 2023-04-14
+ * @since 2023-05-25
  */
 @Service
-@RequiredArgsConstructor
 public class DeviceServiceImpl extends ServiceImpl<DeviceMapper, Device> implements IDeviceService {
 
-    private final AbstractDictService dictService;
-    private final IDeviceExtService deviceExtService;
-
-    private final IProjectDeviceService projectDeviceService;
-
-    @Transactional
-    @Override
-    public boolean saveDevice(DeviceDetailDTO deviceDetailDTO) {
-        deviceDetailDTO.setCreateTime(new Date());
-        boolean deviceRes = this.save(deviceDetailDTO);
-        if(deviceRes && DEVICE_TYPE_TREE.equals(deviceDetailDTO.getDeviceType())){
-            deviceRes = deviceExtService.saveDeviceExt(deviceDetailDTO);
-        }
-        return deviceRes;
-    }
-
-    @Transactional
-    @Override
-    public boolean updateDevice(DeviceDetailDTO deviceDetailDTO) {
-        boolean deviceRes = this.updateById(deviceDetailDTO);
-        if(deviceRes && DEVICE_TYPE_TREE.equals(deviceDetailDTO.getDeviceType())){
-            deviceRes = deviceExtService.updateDeviceExt(deviceDetailDTO);
-        }
-        return deviceRes;
-    }
-
-    @Transactional
-    @Override
-    public boolean deleteDevices(List<Long> deviceIds) {
-        return this.removeByIds(deviceIds) & deviceExtService.removeByDeviceIds(deviceIds);
-    }
-
-    @Override
-    public Page<DeviceDetailDTO> listPage(Page<DeviceDetailDTO> page, QueryWrapper<DeviceDetailDTO> queryWrapper,String status,Long projectId) {
-        String ID_COLUMN_NAME = "br_device.ID";
-        List<Long> useDevices = this.selectProjectDevice(null);
-        List<Long> projectDevices;
-        if(ObjectUtil.isNotEmpty(projectId)){
-            projectDevices = this.selectProjectDevice(projectId);
-        } else {
-            projectDevices = null;
-        }
-
-        // 查询使用中的设备（如果传了 projectId，查询 使用中&&此现场）
-        if(DEVICE_STATUS_USE.equals(status)){
-            if(CollUtil.isEmpty(useDevices)){
-                return page;
-            }
-            if(ObjectUtil.isNotEmpty(projectId) && CollUtil.isEmpty(projectDevices)){
-                return page;
-            }
-            queryWrapper.in(ID_COLUMN_NAME,useDevices);
-            if(CollUtil.isNotEmpty(projectDevices)){
-                queryWrapper.in(ID_COLUMN_NAME,projectDevices);
-            }
-
-        }
-
-        // 查询未使用的设备（如果传了 projectId，查询 未使用||此现场）
-        if(DEVICE_STATUS_NORMAL.equals(status)) {
-            if (CollUtil.isNotEmpty(useDevices)) {
-                if (CollUtil.isEmpty(projectDevices)) {
-                    queryWrapper.notIn(ID_COLUMN_NAME, useDevices);
-                } else {
-                    queryWrapper.and(i -> i.notIn(ID_COLUMN_NAME, useDevices).or().in(ID_COLUMN_NAME, projectDevices));
-                }
-            }
-        }
-
-        page = this.baseMapper.listDetailPage(page, queryWrapper);
-        for (DeviceDetailDTO record : page.getRecords()) {
-            record.setDeviceTypeName(dictService.getDictNameByCode("deviceType",record.getDeviceType()));
-            record.setIsPowerSupplyName(dictService.getDictNameByCode("isPowerSupply",record.getIsPowerSupply()));
-            record.setRegisterTime(DateUtil.formatDate(record.getCreateTime()));
-            record.setStatus(useDevices.contains(record.getId()) ? DEVICE_STATUS_USE : DEVICE_STATUS_NORMAL);
-            record.setStatusName(dictService.getDictNameByCode("deviceStatus",record.getStatus()));
-        }
-        return page;
-    }
-
-    @Override
-    public List<Long> selectProjectDevice(Long projectId) {
-        return this.baseMapper.selectProjectDevice(projectId);
-    }
-
-
 }
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceSupportServiceImpl.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceSupportServiceImpl.java
deleted file mode 100644
index ffd01ff..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceSupportServiceImpl.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package com.casic.missiles.modular.system.service.impl;
-
-import com.casic.missiles.modular.system.dto.HelmetInfoDTO;
-import com.casic.missiles.modular.system.mapper.DeviceMapper;
-import com.casic.missiles.modular.system.service.IDeviceExtService;
-import com.casic.missiles.modular.system.service.IDeviceSupportService;
-import lombok.RequiredArgsConstructor;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-import static com.casic.missiles.modular.system.consts.DeviceConst.DEVICE_TYPE_HAT;
-
-@Service
-@RequiredArgsConstructor
-public class DeviceSupportServiceImpl implements IDeviceSupportService {
-
-    private final IDeviceExtService deviceExtService;
-
-    private final DeviceMapper deviceMapper;
-
-    @Override
-    public Long selectByGasIpPort(String gasIp, String gasPort) {
-        return deviceExtService.selectByGasIpPort(gasIp, gasPort);
-    }
-
-    @Override
-    public List<HelmetInfoDTO> selectHelmetList() {
-        return deviceMapper.selectHelmetList(DEVICE_TYPE_HAT);
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/impl/ProjectDeviceServiceImpl.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/impl/ProjectDeviceServiceImpl.java
deleted file mode 100644
index 965f55c..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/impl/ProjectDeviceServiceImpl.java
+++ /dev/null
@@ -1,96 +0,0 @@
-package com.casic.missiles.modular.system.service.impl;
-
-import cn.hutool.core.date.DateUtil;
-import cn.hutool.core.util.ObjectUtil;
-import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.casic.missiles.modular.system.dto.DeviceLocationDTO;
-import com.casic.missiles.modular.system.entity.DataGas;
-import com.casic.missiles.modular.system.entity.DataTreeLocation;
-import com.casic.missiles.modular.system.entity.ProjectDevice;
-import com.casic.missiles.modular.system.mapper.ProjectDeviceMapper;
-import com.casic.missiles.modular.system.service.IDataSupportService;
-import com.casic.missiles.modular.system.service.IProjectDeviceService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.casic.missiles.modular.system.utils.LngLatUtil;
-import lombok.RequiredArgsConstructor;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.util.List;
-import java.util.stream.Collectors;
-
-/**
- * <p>
- *  服务实现类
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@Service
-@RequiredArgsConstructor
-public class ProjectDeviceServiceImpl extends ServiceImpl<ProjectDeviceMapper, ProjectDevice> implements IProjectDeviceService {
-
-    private final IDataSupportService dataSupportService;
-
-    @Override
-    public boolean saveProjectDeviceList(Long projectId, List<ProjectDevice> projectDeviceList) {
-        projectDeviceList.forEach(i->i.setProjectId(projectId));
-        return this.saveBatch(projectDeviceList);
-    }
-
-    @Transactional
-    @Override
-    public boolean updateProjectDeviceList(Long projectId, List<ProjectDevice> projectDeviceList) {
-        return this.deleteByProjectId(projectId) && this.saveProjectDeviceList(projectId, projectDeviceList);
-    }
-
-    @Override
-    public boolean deleteByProjectId(Long projectId) {
-        QueryWrapper<ProjectDevice> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("PROJECT_ID",projectId);
-        return this.remove(queryWrapper);
-    }
-
-    @Override
-    public boolean deleteByProjectIds(List<Long> projectId) {
-        QueryWrapper<ProjectDevice> queryWrapper = new QueryWrapper<>();
-        queryWrapper.in("PROJECT_ID",projectId);
-        return this.remove(queryWrapper);
-    }
-
-    @Override
-    public List<ProjectDevice> selectDetailByProjectId(Long projectId) {
-        return this.baseMapper.selectDetailByProjectId(projectId);
-    }
-
-    @Override
-    public Long selectProjectIdByDevice(Long deviceId) {
-        QueryWrapper<ProjectDevice> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("DEVICE_ID",deviceId);
-        queryWrapper.exists("(select Id FROM br_work_site_info p where p.ID = br_project_device.PROJECT_ID AND p.PROJECT_STATE != '3')");
-        ProjectDevice projectDevice = this.getOne(queryWrapper);
-        return ObjectUtil.isNotEmpty(projectDevice) ? projectDevice.getProjectId() : null;
-    }
-
-    @Override
-    public List<DeviceLocationDTO> selectDeviceLocationList(Long projectId) {
-        List<DeviceLocationDTO> list = this.baseMapper.selectDeviceLocationList(projectId);
-        for (DeviceLocationDTO locationDTO : list) {
-            DataGas dataGas = dataSupportService.getGasData(locationDTO.getDeviceId());
-            DataTreeLocation location = dataSupportService.getTreeLocation(locationDTO.getDeviceId(),true);
-            if(ObjectUtil.isNotEmpty(dataGas)){
-                locationDTO.setGasValue(dataGas.getGasValue());
-                locationDTO.setTime(DateUtil.formatDateTime(dataGas.getTs()));
-            }
-            if(ObjectUtil.isNotEmpty(location)){
-                locationDTO.setLng(location.getGdLng());
-                locationDTO.setLat(location.getGdLat());
-                locationDTO.setLocation(location.getLocation());
-            }
-        }
-        list = list.stream().filter(i-> StrUtil.isAllNotEmpty(i.getLng(),i.getLat())).collect(Collectors.toList());
-        return LngLatUtil.sort(list);
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/impl/ProjectWorkerServiceImpl.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/impl/ProjectWorkerServiceImpl.java
deleted file mode 100644
index c3ec86c..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/impl/ProjectWorkerServiceImpl.java
+++ /dev/null
@@ -1,101 +0,0 @@
-package com.casic.missiles.modular.system.service.impl;
-
-import cn.hutool.core.date.DateUtil;
-import cn.hutool.core.util.ObjectUtil;
-import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.casic.missiles.core.application.service.AbstractDeptService;
-import com.casic.missiles.modular.system.dto.WorkerLocationDTO;
-import com.casic.missiles.modular.system.entity.DataHelmetHealth;
-import com.casic.missiles.modular.system.entity.DataHelmetLocation;
-import com.casic.missiles.modular.system.entity.ProjectWorker;
-import com.casic.missiles.modular.system.mapper.ProjectWorkerMapper;
-import com.casic.missiles.modular.system.service.IHelmetSupportService;
-import com.casic.missiles.modular.system.service.IProjectWorkerService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import lombok.RequiredArgsConstructor;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.util.List;
-import java.util.stream.Collectors;
-
-import static com.casic.missiles.modular.system.consts.ProjectConst.WORKER_TYPE_NORMAL;
-
-/**
- * <p>
- *  服务实现类
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@Service
-@RequiredArgsConstructor
-public class ProjectWorkerServiceImpl extends ServiceImpl<ProjectWorkerMapper, ProjectWorker> implements IProjectWorkerService {
-
-    private final AbstractDeptService deptService;
-    private final IHelmetSupportService helmetSupportService;
-
-    @Override
-    public boolean saveProjectWorkerList(Long projectId, List<ProjectWorker> projectWorkerList) {
-        projectWorkerList.forEach(i->i.setProjectId(projectId));
-        return this.saveBatch(projectWorkerList);
-    }
-
-    @Transactional
-    @Override
-    public boolean updateProjectWorkerList(Long projectId, List<ProjectWorker> projectWorkerList) {
-        return this.deleteByProjectId(projectId) && this.saveProjectWorkerList(projectId, projectWorkerList) ;
-    }
-
-    @Override
-    public boolean deleteByProjectId(Long projectId) {
-        QueryWrapper<ProjectWorker> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("PROJECT_ID",projectId);
-        return this.remove(queryWrapper);
-    }
-
-    @Override
-    public boolean deleteByProjectIds(List<Long> projectIds) {
-        QueryWrapper<ProjectWorker> queryWrapper = new QueryWrapper<>();
-        queryWrapper.in("PROJECT_ID",projectIds);
-        return this.remove(queryWrapper);
-    }
-
-
-    @Override
-    public List<ProjectWorker> selectDetailByProjectId(Long projectId,String workerType) {
-        List<ProjectWorker> projectWorkerList = this.baseMapper.selectDetailByProjectId(projectId,workerType);
-        for (ProjectWorker projectWorker : projectWorkerList) {
-            if(ObjectUtil.isNotEmpty(projectWorker.getWorkerDeptId())){
-                projectWorker.setWorkerDeptName(deptService.getDeptName(projectWorker.getWorkerDeptId()));
-            }
-        }
-        return projectWorkerList;
-    }
-
-    @Override
-    public List<WorkerLocationDTO> selectWorkerLocationDTO(Long projectId) {
-        List<WorkerLocationDTO> projectWorkerList = this.baseMapper.selectWorkerLocationList(projectId,WORKER_TYPE_NORMAL);
-        for (WorkerLocationDTO workerLocationDTO : projectWorkerList) {
-            if(ObjectUtil.isNotEmpty(workerLocationDTO.getHatId())){
-                DataHelmetLocation location = helmetSupportService.getHelmetLocation(workerLocationDTO.getHatId(),true);
-                if(ObjectUtil.isNotEmpty(location)){
-                    workerLocationDTO.setLng(location.getGdLng());
-                    workerLocationDTO.setLat(location.getGdLat());
-                    workerLocationDTO.setLocation(location.getLocation());
-                }
-
-                DataHelmetHealth health = helmetSupportService.getHelmetHealth(workerLocationDTO.getHatId());
-                if(ObjectUtil.isNotEmpty(health)){
-                    workerLocationDTO.setBloodOxygen(health.getBloodOxygen());
-                    workerLocationDTO.setHeartRate(health.getHeartRate());
-                    workerLocationDTO.setTime(DateUtil.formatDateTime(health.getTs()));
-                }
-            }
-        }
-        projectWorkerList = projectWorkerList.stream().filter(i-> StrUtil.isAllNotEmpty(i.getLng(),i.getLat())).collect(Collectors.toList());
-        return projectWorkerList;
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/impl/WorkSiteInfoServiceImpl.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/impl/WorkSiteInfoServiceImpl.java
deleted file mode 100644
index 5068da2..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/impl/WorkSiteInfoServiceImpl.java
+++ /dev/null
@@ -1,151 +0,0 @@
-package com.casic.missiles.modular.system.service.impl;
-
-import cn.hutool.core.bean.BeanUtil;
-import cn.hutool.core.collection.CollUtil;
-import cn.hutool.core.date.DateUtil;
-import cn.hutool.core.util.ObjectUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.core.application.service.AbstractDeptService;
-import com.casic.missiles.core.application.service.AbstractDictService;
-import com.casic.missiles.modular.system.dto.WorkSiteDetailDTO;
-import com.casic.missiles.modular.system.entity.ProjectWorker;
-import com.casic.missiles.modular.system.entity.WorkSiteInfo;
-import com.casic.missiles.modular.system.entity.Worker;
-import com.casic.missiles.modular.system.mapper.WorkSiteInfoMapper;
-import com.casic.missiles.modular.system.service.*;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import lombok.RequiredArgsConstructor;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.stream.Collectors;
-
-import static com.casic.missiles.modular.system.consts.ProjectConst.*;
-
-/**
- * <p>
- * 作业现场表 服务实现类
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@Service
-@RequiredArgsConstructor
-public class WorkSiteInfoServiceImpl extends ServiceImpl<WorkSiteInfoMapper, WorkSiteInfo> implements IWorkSiteInfoService {
-
-    private final IProjectWorkerService projectWorkerService;
-    private final IProjectDeviceService projectDeviceService;
-
-    private final IWorkerService workerService;
-    private final IBraceletService braceletService;
-
-    private final AbstractDeptService deptService;
-    private final AbstractDictService dictService;
-    @Override
-    @Transactional
-    public boolean addWorkSiteInfo(WorkSiteDetailDTO workSiteDetailDTO) {
-        workSiteDetailDTO.setCreateTime(new Date());
-        workSiteDetailDTO.setUpdateTime(new Date());
-        workSiteDetailDTO.setProjectState(PROJECT_STATE_PREPARE);
-        boolean res = this.save(workSiteDetailDTO);
-        if(res){
-            res = projectDeviceService.saveProjectDeviceList(workSiteDetailDTO.getId(), workSiteDetailDTO.getDeviceList());
-            res = res & projectWorkerService.saveProjectWorkerList(workSiteDetailDTO.getId(), workSiteDetailDTO.getWorkerList());
-        }
-        return res;
-    }
-
-    @Override
-    @Transactional
-    public boolean updateWorkSiteInfo(WorkSiteDetailDTO workSiteDetailDTO) {
-        workSiteDetailDTO.setUpdateTime(new Date());
-        boolean res = this.updateById(workSiteDetailDTO);
-        if(res){
-            res = projectDeviceService.updateProjectDeviceList(workSiteDetailDTO.getId(), workSiteDetailDTO.getDeviceList());
-            res = res & projectWorkerService.updateProjectWorkerList(workSiteDetailDTO.getId(), workSiteDetailDTO.getWorkerList());
-        }
-        return res;
-    }
-
-    @Override
-    public boolean deleteProjects(List<Long> projectIds) {
-        if(CollUtil.isNotEmpty(projectIds)) {
-             projectDeviceService.deleteByProjectIds(projectIds);
-             projectWorkerService.deleteByProjectIds(projectIds);
-             return this.removeByIds(projectIds);
-        }
-        return true;
-    }
-
-    @Override
-    public WorkSiteDetailDTO getWorkSiteDetail(Long projectId) {
-        WorkSiteInfo workSiteInfo = this.getById(projectId);
-        WorkSiteDetailDTO workSiteDetailDTO = new WorkSiteDetailDTO();
-        BeanUtil.copyProperties(workSiteInfo,workSiteDetailDTO,true);
-        workSiteDetailDTO.setDeviceList(projectDeviceService.selectDetailByProjectId(projectId));
-        workSiteDetailDTO.setWorkerList(projectWorkerService.selectDetailByProjectId(projectId,WORKER_TYPE_NORMAL));
-
-        Worker responseWorker = workerService.selectWorkerDetail(workSiteDetailDTO.getWorkPerson());
-        if(ObjectUtil.isNotEmpty(responseWorker)){
-            workSiteDetailDTO.setWorkPersonName(responseWorker.getWorkerName());
-            workSiteDetailDTO.setWorkPersonPhoneNumber(responseWorker.getPhoneNumber());
-            workSiteDetailDTO.setWorkPersonDeptId(responseWorker.getDeptId());
-            workSiteDetailDTO.setWorkPersonDeptName(responseWorker.getDeptName());
-        }
-        return workSiteDetailDTO;
-    }
-
-    @Override
-    public Page<WorkSiteInfo> selectListPage(Page<WorkSiteInfo> page, QueryWrapper<WorkSiteInfo> queryWrapper) {
-        page = this.baseMapper.selectListPage(page, queryWrapper);
-        for (WorkSiteInfo workSiteInfo : page.getRecords()) {
-            workSiteInfo.setProjectStateName(dictService.getDictNameByCode("projectState", workSiteInfo.getProjectState()));
-            if(ObjectUtil.isNotEmpty(workSiteInfo.getWorkPersonDeptId())){
-                workSiteInfo.setWorkPersonDeptName(deptService.getDeptName(workSiteInfo.getWorkPersonDeptId()));
-            }
-            workSiteInfo.setRegisterTime(DateUtil.formatDate(workSiteInfo.getCreateTime()));
-        }
-        return page;
-    }
-
-    @Override
-    public boolean start(Long projectId) {
-        UpdateWrapper<WorkSiteInfo> updateWrapper = new UpdateWrapper<>();
-        updateWrapper.eq("ID",projectId);
-        updateWrapper.set("PROJECT_STATE",PROJECT_STATE_WORKING);
-        updateWrapper.set("START_TIME",new Date());
-        boolean res = this.update(updateWrapper);
-        //braceletService.enableBracelet(selectProjectBracelets(projectId));
-        return res;
-    }
-
-    @Override
-    public boolean finish(Long projectId) {
-        UpdateWrapper<WorkSiteInfo> updateWrapper = new UpdateWrapper<>();
-        updateWrapper.eq("ID",projectId);
-        updateWrapper.set("PROJECT_STATE",PROJECT_STATE_FINISH);
-        updateWrapper.set("FINISH_TIME",new Date());
-        boolean res = this.update(updateWrapper);
-        //braceletService.disableBracelet(selectProjectBracelets(projectId));
-        return res;
-    }
-
-    private List<String> selectProjectBracelets(Long projectId){
-        List<String> deviceCodes = new ArrayList<>();
-        QueryWrapper<ProjectWorker> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("PROJECT_ID",projectId);
-        queryWrapper.isNotNull("BRACELET_CODE");
-        queryWrapper.select("BRACELET_CODE");
-        List<Object> res = projectWorkerService.listObjs(queryWrapper);
-        if(CollUtil.isNotEmpty(res)){
-            deviceCodes = res.stream().map(Object::toString).distinct().collect(Collectors.toList());
-        }
-        return deviceCodes;
-    }
-}

diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/AlarmController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/AlarmController.java
new file mode 100644
index 0000000..1795cf1
--- /dev/null
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/AlarmController.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.modular.system.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.stereotype.Controller;
+
+/**
+ * <p>
+ * 报警记录表 前端控制器
+ * </p>
+ *
+ * @author zyj
+ * @since 2023-05-25
+ */
+@Controller
+@RequestMapping("/system/alarm")
+public class AlarmController {
+
+}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusAlarmController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusAlarmController.java
deleted file mode 100644
index 1f82ebb..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusAlarmController.java
+++ /dev/null
@@ -1,102 +0,0 @@
-package com.casic.missiles.modular.system.controller;
-
-
-import cn.hutool.core.util.ObjectUtil;
-import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.core.base.controller.BaseController;
-import com.casic.missiles.core.page.PageFactory;
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.AlarmUpload;
-import com.casic.missiles.modular.system.dto.DeviceDetailDTO;
-import com.casic.missiles.modular.system.entity.BusAlarm;
-import com.casic.missiles.modular.system.service.IBusAlarmService;
-import io.swagger.annotations.*;
-import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.*;
-
-import org.springframework.stereotype.Controller;
-
-import static com.casic.missiles.model.response.ResponseData.DEFAULT_SUCCESS_MESSAGE;
-import static com.casic.missiles.modular.system.consts.AlarmConst.ALARM_STATUS_MANUAL_CANCEL;
-
-/**
- * <p>
- * 报警记录表 前端控制器
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@Api(tags = "报警管理接口")
-@Controller
-@RequestMapping("/alarm")
-@RequiredArgsConstructor
-public class BusAlarmController extends BaseController {
-
-    private final IBusAlarmService alarmService;
-
-    @ApiOperation("报警上报接口")
-    @PostMapping("/upload")
-    @ResponseBody
-    public Object upload(@RequestBody AlarmUpload alarmUpload){
-        alarmService.alarmUpload(alarmUpload);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("报警列表分页查询")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "workTitle", value = "作业名称",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "projectId", value = "作业ID",dataType = "Long", paramType = "query",example = "0"),
-            @ApiImplicitParam(name = "alarmStatus", value = "报警状态",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "projectState", value = "作业状态",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "alarmType", value = "报警类型",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "alarmStartTime", value = "报警开始时间",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "alarmEndTime", value = "报警结束时间",dataType = "String", paramType = "query")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = BusAlarm.class),
-    })
-    @GetMapping("/listPage")
-    @ResponseBody
-    public Object listPage(String workTitle,Long projectId,String alarmStatus,String projectState,String alarmType,String alarmStartTime,String alarmEndTime){
-        Page<BusAlarm> page = PageFactory.defaultPage();
-        QueryWrapper<BusAlarm> queryWrapper = new QueryWrapper<>();
-        if(StrUtil.isNotEmpty(workTitle)){
-            queryWrapper.like("p.WORK_TITLE",workTitle);
-        }
-        if(ObjectUtil.isNotEmpty(projectId)){
-            queryWrapper.eq("alarm.PROJECT_ID",projectId);
-        }
-        if(StrUtil.isNotEmpty(alarmStatus)){
-            queryWrapper.eq("alarm.ALARM_STATUS",alarmStatus);
-        }
-        if(StrUtil.isNotEmpty(projectState)){
-            queryWrapper.eq("p.PROJECT_STATE",projectState);
-        }
-        if(StrUtil.isNotEmpty(alarmType)){
-            queryWrapper.eq("alarm.ALARM_TYPE",alarmType);
-        }
-        if(StrUtil.isNotEmpty(alarmStartTime)){
-            queryWrapper.ge("alarm.ALARM_TIME",alarmStartTime);
-        }
-        if(StrUtil.isNotEmpty(alarmEndTime)){
-            queryWrapper.le("alarm.ALARM_TIME",alarmEndTime);
-        }
-        page = alarmService.listPage(page,queryWrapper);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-    @ApiOperation("消警")
-    @PostMapping("/cancel")
-    @ResponseBody
-    public Object cancel(@RequestParam("alarmId") Long alarmId){
-        UpdateWrapper<BusAlarm> updateWrapper = new UpdateWrapper<>();
-        updateWrapper.eq("ID",alarmId);
-        updateWrapper.set("ALARM_STATUS",ALARM_STATUS_MANUAL_CANCEL);
-        alarmService.update(updateWrapper);
-        return ResponseData.success();
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusEventController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusEventController.java
deleted file mode 100644
index dde5aad..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/BusEventController.java
+++ /dev/null
@@ -1,41 +0,0 @@
-package com.casic.missiles.modular.system.controller;
-
-
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.entity.BusEvent;
-import com.casic.missiles.modular.system.service.IBusEventService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.ResponseBody;
-
-/**
- * <p>
- * 事件表 前端控制器
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@Controller
-@RequestMapping("/event")
-@Api(tags = "事件上报")
-@RequiredArgsConstructor
-public class BusEventController {
-
-    private final IBusEventService eventService;
-
-    @ApiOperation("事件上报")
-    @PostMapping("add")
-    @ResponseBody
-    public Object add(@RequestBody BusEvent busEvent){
-        eventService.saveBusEvent(busEvent);
-        return ResponseData.success();
-    }
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
index 03abc5f..aa50d78 100644
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
@@ -1,121 +1,20 @@
 package com.casic.missiles.modular.system.controller;
 
 
-import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.core.base.controller.BaseController;
-import com.casic.missiles.core.page.PageFactory;
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.DeviceDetailDTO;
-import com.casic.missiles.modular.system.entity.Device;
-import com.casic.missiles.modular.system.service.IDeviceExtService;
-import com.casic.missiles.modular.system.service.IDeviceService;
-import io.swagger.annotations.*;
-import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.RequestMapping;
 
 import org.springframework.stereotype.Controller;
 
-import java.time.LocalDateTime;
-import java.util.Date;
-import java.util.List;
-
-import static com.casic.missiles.model.response.ResponseData.DEFAULT_SUCCESS_MESSAGE;
-
 /**
  * <p>
- *  前端控制器
+ * 设备记录表 前端控制器
  * </p>
  *
  * @author zyj
- * @since 2023-04-14
+ * @since 2023-05-25
  */
-@Api(tags = "设备管理接口")
-@RequiredArgsConstructor
 @Controller
-@RequestMapping("/device")
-public class DeviceController extends BaseController {
-    private final IDeviceService deviceService;
-    private final IDeviceExtService deviceExtService;
-
-    @ApiOperation("设备分页列表")
-    @ApiImplicitParams({
-        @ApiImplicitParam(name = "deviceType", value = "设备类型",dataType = "String", paramType = "query"),
-        @ApiImplicitParam(name = "deviceCode", value = "设备编号",dataType = "String", paramType = "query"),
-        @ApiImplicitParam(name = "status", value = "设备状态",dataType = "String", paramType = "query"),
-        @ApiImplicitParam(name = "projectId", value = "作业ID（如果传此参数，列表中返回该作业使用的设备）",dataType = "Long", paramType = "query", example = "0")
-    })
-    @ApiResponses({
-        @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = DeviceDetailDTO.class),
-    })
-    @GetMapping("listPage")
-    @ResponseBody
-    public Object listPage(String deviceType, String deviceCode, String status,Long projectId){
-        Page<DeviceDetailDTO> page = PageFactory.defaultPage();
-        QueryWrapper<DeviceDetailDTO> queryWrapper = new QueryWrapper<>();
-        if(StrUtil.isNotEmpty(deviceType)){
-            queryWrapper.eq("DEVICE_TYPE",deviceType);
-        }
-        if(StrUtil.isNotEmpty(deviceCode)){
-            queryWrapper.like("DEVICE_CODE",deviceCode);
-        }
-        page = deviceService.listPage(page,queryWrapper,status,projectId);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-    @ApiOperation("新增设备")
-    @PostMapping("add")
-    @ResponseBody
-    public Object add(@RequestBody DeviceDetailDTO deviceDetailDTO){
-        deviceService.saveDevice(deviceDetailDTO);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("编辑设备")
-    @PostMapping("update")
-    @ResponseBody
-    public Object update(@RequestBody DeviceDetailDTO deviceDetailDTO){
-        deviceService.updateDevice(deviceDetailDTO);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("删除设备")
-    @PostMapping("delete")
-    @ResponseBody
-    public Object delete(@ApiParam("设备id列表")@RequestBody List<Long> deviceIds){
-        deviceService.deleteDevices(deviceIds);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("设置甲烷阈值")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "gasIp", value = "安全树甲烷设备IP",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "gasPort", value = "安全树甲烷端口",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "threshold", value = "甲烷阈值",dataType = "String", paramType = "query")
-    })
-    @PostMapping("setThreshold")
-    @ResponseBody
-    public Object setThreshold(String gasIp,String gasPort,String threshold){
-        deviceExtService.setGasThreshold(gasIp, gasPort, threshold);
-        return ResponseData.success();
-    }
-
-
-    @ApiOperation("查询甲烷阈值")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "gasIp", value = "安全树甲烷设备IP",dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "gasPort", value = "安全树甲烷端口",dataType = "String", paramType = "query")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = "{\"code\": 200,\"data\": \"100\",\"message\": \"请求成功\",\"success\": true}",response = String.class),
-    })
-    @GetMapping("getThreshold")
-    @ResponseBody
-    public Object getThreshold(String gasIp,String gasPort){
-        String data = deviceExtService.getGasThreshold(gasIp, gasPort);
-        return ResponseData.success(data);
-    }
-
+@RequestMapping("/system/device")
+public class DeviceController {
 
 }
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/OverviewController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/OverviewController.java
deleted file mode 100644
index 7570504..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/OverviewController.java
+++ /dev/null
@@ -1,70 +0,0 @@
-package com.casic.missiles.modular.system.controller;
-
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.AlarmTypeCountDTO;
-import com.casic.missiles.modular.system.dto.DeviceLocationDTO;
-import com.casic.missiles.modular.system.dto.WorkerLocationDTO;
-import com.casic.missiles.modular.system.service.IBusAlarmService;
-import com.casic.missiles.modular.system.service.IProjectDeviceService;
-import com.casic.missiles.modular.system.service.IProjectWorkerService;
-import io.swagger.annotations.*;
-import lombok.RequiredArgsConstructor;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.ResponseBody;
-
-import static com.casic.missiles.model.response.ResponseData.DEFAULT_SUCCESS_MESSAGE;
-import static com.casic.missiles.modular.system.consts.AlarmConst.ALARM_STATUS_ON;
-
-@Api(tags = "首页看板接口")
-@Controller
-@RequestMapping("overview")
-@RequiredArgsConstructor
-public class OverviewController {
-
-    private final IBusAlarmService alarmService;
-    private final IProjectDeviceService projectDeviceService;
-
-    private final IProjectWorkerService projectWorkerService;
-
-
-    @ApiOperation("报警统计接口")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "projectId", value = "作业ID",dataType = "Long", paramType = "query", example = "0")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = AlarmTypeCountDTO.class),
-    })
-    @GetMapping("/alarmCount")
-    @ResponseBody
-    public Object alarmCount(Long projectId){
-        return ResponseData.success(alarmService.alarmCount(projectId,ALARM_STATUS_ON));
-    }
-
-    @ApiOperation("设备列表接口")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "projectId", value = "作业ID",dataType = "Long", paramType = "query", example = "0")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = DeviceLocationDTO.class),
-    })
-    @GetMapping("/deviceList")
-    @ResponseBody
-    public Object deviceList(Long projectId){
-        return ResponseData.success(projectDeviceService.selectDeviceLocationList(projectId));
-    }
-
-    @ApiOperation("人员列表接口")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "projectId", value = "作业ID",dataType = "Long", paramType = "query", example = "0")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = WorkerLocationDTO.class),
-    })
-    @GetMapping("/workerList")
-    @ResponseBody
-    public Object workerList(Long projectId){
-        return ResponseData.success(projectWorkerService.selectWorkerLocationDTO(projectId));
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/WorkSiteInfoController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/WorkSiteInfoController.java
deleted file mode 100644
index af36d69..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/WorkSiteInfoController.java
+++ /dev/null
@@ -1,130 +0,0 @@
-package com.casic.missiles.modular.system.controller;
-
-
-import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.core.base.controller.BaseController;
-import com.casic.missiles.core.page.PageFactory;
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.WorkSiteDetailDTO;
-import com.casic.missiles.modular.system.entity.WorkSiteInfo;
-import com.casic.missiles.modular.system.service.IWorkSiteInfoService;
-import io.swagger.annotations.*;
-import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.*;
-
-import org.springframework.stereotype.Controller;
-
-import java.util.List;
-
-import static com.casic.missiles.model.response.ResponseData.DEFAULT_SUCCESS_MESSAGE;
-
-/**
- * <p>
- * 作业现场表 前端控制器
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@Controller
-@RequestMapping("/site")
-@Api(tags = "作业现场管理")
-@RequiredArgsConstructor
-public class WorkSiteInfoController extends BaseController {
-
-
-    private final IWorkSiteInfoService workSiteInfoService;
-
-    @ApiOperation("新增作业现场")
-    @PostMapping("add")
-    @ResponseBody
-    public Object addWorkSite(@RequestBody WorkSiteDetailDTO workSiteDetailDTO){
-        workSiteInfoService.addWorkSiteInfo(workSiteDetailDTO);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("编辑作业现场")
-    @PostMapping("update")
-    @ResponseBody
-    public Object updateWorkSite(@RequestBody WorkSiteDetailDTO workSiteDetailDTO){
-        workSiteInfoService.updateWorkSiteInfo(workSiteDetailDTO);
-        return ResponseData.success();
-    }
-
-
-    @ApiOperation("删除作业现场")
-    @PostMapping("delete")
-    @ResponseBody
-    public Object delete(@ApiParam("作业现场id列表")@RequestBody List<Long> projectIds){
-        workSiteInfoService.deleteProjects(projectIds);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("查询作业现场详情")
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = WorkSiteDetailDTO.class),
-    })
-    @GetMapping("detail")
-    @ResponseBody
-    public Object delete(@ApiParam(value = "作业现场id", example = "0")@RequestParam Long projectId){
-        WorkSiteDetailDTO detailDTO = workSiteInfoService.getWorkSiteDetail(projectId);
-        return ResponseData.success(detailDTO);
-    }
-
-    @ApiOperation("分页列表查询")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "workTitle",value = "作业名称", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "workRoad",value = "所属道路", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "workPersonName",value = "责任人姓名", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "startDate",value = "注册开始日期", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "endDate",value = "注册结束日期", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "projectState",value = "当前状态（字典值）", dataType = "String", paramType = "query")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = WorkSiteInfo.class),
-    })
-    @GetMapping("listPage")
-    @ResponseBody
-    public Object listPage(String workTitle,String workRoad,String workPersonName,String projectState,String startDate,String endDate){
-        Page<WorkSiteInfo> page = PageFactory.defaultPage();
-        QueryWrapper<WorkSiteInfo> queryWrapper = new QueryWrapper<>();
-        if(StrUtil.isNotEmpty(workTitle)){
-            queryWrapper.like("WORK_TITLE",workTitle);
-        }
-        if(StrUtil.isNotEmpty(workRoad)){
-            queryWrapper.like("WORK_ROAD",workRoad);
-        }
-        if(StrUtil.isNotEmpty(workPersonName)){
-            queryWrapper.like("WORKER_NAME",workPersonName);
-        }
-        if(StrUtil.isNotEmpty(projectState)){
-            queryWrapper.eq("PROJECT_STATE",projectState);
-        }
-        if(StrUtil.isNotEmpty(startDate)){
-            queryWrapper.ge("br_work_site_info.CREATE_TIME",startDate + " 00:00:00");
-        }
-        if(StrUtil.isNotEmpty(endDate)){
-            queryWrapper.le("br_work_site_info.CREATE_TIME",endDate + " 23:59:59");
-        }
-        page = workSiteInfoService.selectListPage(page,queryWrapper);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-    @ApiOperation("开始作业")
-    @PostMapping("start")
-    @ResponseBody
-    public Object start(@ApiParam(value = "作业现场id",example = "0")@RequestParam Long projectId){
-        workSiteInfoService.start(projectId);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("完成作业")
-    @PostMapping("finish")
-    @ResponseBody
-    public Object finish(@ApiParam(value = "作业现场id", example = "0")@RequestParam Long projectId){
-        workSiteInfoService.finish(projectId);
-        return ResponseData.success();
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/WorkerController.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/WorkerController.java
deleted file mode 100644
index 796f94c..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/controller/WorkerController.java
+++ /dev/null
@@ -1,136 +0,0 @@
-package com.casic.missiles.modular.system.controller;
-
-
-import cn.hutool.core.util.ObjectUtil;
-import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.core.base.controller.BaseController;
-import com.casic.missiles.core.page.PageFactory;
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.DeviceDetailDTO;
-import com.casic.missiles.modular.system.entity.Device;
-import com.casic.missiles.modular.system.entity.Worker;
-import com.casic.missiles.modular.system.service.IWorkerService;
-import io.swagger.annotations.*;
-import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.*;
-
-import org.springframework.stereotype.Controller;
-
-import java.util.Date;
-import java.util.List;
-
-import static com.casic.missiles.model.response.ResponseData.DEFAULT_SUCCESS_MESSAGE;
-
-/**
- * <p>
- *  前端控制器
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@Controller
-@RequestMapping("/worker")
-@RequiredArgsConstructor
-@Api(tags = "人员管理接口")
-public class WorkerController extends BaseController {
-
-    private final IWorkerService workerService;
-
-    @ApiOperation("分页列表查询")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "name",value = "姓名", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "deptId",value = "所属部门", dataType = "Long", paramType = "query", example = "0"),
-            @ApiImplicitParam(name = "status",value = "当前状态（字典值）", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "startDate",value = "注册开始日期", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "endDate",value = "注册结束日期", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "workerType",value = "人员类型（字典值）", dataType = "String", paramType = "query")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = Worker.class),
-    })
-    @GetMapping("listPage")
-    @ResponseBody
-    public Object listPage(String name,Long deptId, String status,String startDate,String endDate,String workerType){
-        Page<Worker> page = PageFactory.defaultPage();
-        QueryWrapper<Worker> queryWrapper = new QueryWrapper<>();
-        if(StrUtil.isNotEmpty(name)){
-            queryWrapper.like("WORKER_NAME",name);
-        }
-        if(ObjectUtil.isNotEmpty(deptId)){
-            queryWrapper.eq("DEPT_ID",deptId);
-        }
-        if(StrUtil.isNotEmpty(workerType)){
-            queryWrapper.eq("WORKER_TYPE",workerType);
-        }
-        if(StrUtil.isNotEmpty(startDate)){
-            queryWrapper.ge("CREATE_TIME",startDate + " 00:00:00");
-        }
-        if(StrUtil.isNotEmpty(endDate)){
-            queryWrapper.le("CREATE_TIME",endDate + " 23:59:59");
-        }
-        if(StrUtil.isNotEmpty(status)){
-            queryWrapper.eq("`STATUS`",status);
-        }
-        page = workerService.selectListPage(page,queryWrapper);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-    @ApiOperation("新增人员")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "worker", value = "人员信息", dataType = "Worker", paramType = "body", required = true),
-            @ApiImplicitParam(name = "projectId", value = "项目ID(入场申请需要)", dataType = "Long", paramType = "query", example = "0")
-    })
-    @PostMapping("add")
-    @ResponseBody
-    public Object add(@ApiParam("worker")@RequestBody Worker worker,
-                      @RequestParam(required = false) Long projectId){
-        workerService.addWorker(worker,projectId);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("编辑人员")
-    @PostMapping("update")
-    @ResponseBody
-    public Object update(@RequestBody Worker worker){
-        workerService.updateById(worker);
-        return ResponseData.success();
-    }
-
-    @ApiOperation("删除人员")
-    @PostMapping("delete")
-    @ResponseBody
-    public Object delete(@ApiParam("人员id列表")@RequestBody List<Long> workIds){
-        workerService.removeByIds(workIds);
-        return ResponseData.success();
-    }
-
-
-    @ApiOperation(value = "获取人脸图片",notes = "返回人脸图片url")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "cameraIp",value = "摄像头IP", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "cameraPort",value = "摄像头端口号", dataType = "String", paramType = "query"),
-    })
-    @GetMapping("/face/register")
-    @ResponseBody
-    public Object faceRegister(String cameraIp,String cameraPort){
-        return ResponseData.success(workerService.faceRegister(cameraIp, cameraPort));
-    }
-
-
-    @ApiOperation(value = "查询临时入场人员列表")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "projectId", value = "项目ID",required = true,dataType = "Long", paramType = "query", example = "0")
-    })
-    @ApiResponses({
-            @ApiResponse(code = 200,message = DEFAULT_SUCCESS_MESSAGE,response = Worker.class),
-    })
-    @GetMapping("/projectTempWorker")
-    @ResponseBody
-    public Object projectTempWorker(Long projectId){
-        return ResponseData.success(workerService.projectTempWorker(projectId));
-    }
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/AlarmTypeCountDTO.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/AlarmTypeCountDTO.java
deleted file mode 100644
index 1a165a1..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/AlarmTypeCountDTO.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.casic.missiles.modular.system.dto;
-
-import io.swagger.annotations.ApiModel;
-import lombok.Data;
-
-@ApiModel(value = "AlarmTypeCountDTO",description = "报警类型统计（首页）")
-@Data
-public class AlarmTypeCountDTO {
-
-    private String alarmType;
-    private String alarmTypeName;
-    private Integer alarmCount;
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/AlarmUpload.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/AlarmUpload.java
deleted file mode 100644
index 73d7799..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/AlarmUpload.java
+++ /dev/null
@@ -1,46 +0,0 @@
-package com.casic.missiles.modular.system.dto;
-
-import cn.hutool.core.util.StrUtil;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-@ApiModel(value = "AlarmUpload",description = "报警上传")
-@Data
-public class AlarmUpload {
-
-    @ApiModelProperty(value = "摄像头ip")
-    private String cameraIp;
-
-    @ApiModelProperty(value = "摄像头端口")
-    private String cameraPort;
-    @ApiModelProperty(value = "安全树甲烷设备ip")
-    private String gasIp;
-    @ApiModelProperty(value = "安全树甲烷设备端口")
-    private String gasPort;
-    @ApiModelProperty(value = "报警值")
-    private String alarmValue;
-    @ApiModelProperty(value = "报警时间")
-    private String alarmTime;
-    @ApiModelProperty(value = "报警类型")
-    private String alarmType;
-    @ApiModelProperty(value = "报警图片")
-    private String alarmImage;
-    @ApiModelProperty(value = "报警内容")
-    private String alarmContent;
-
-    @Override
-    public String toString() {
-        return "AlarmUpload{" +
-                "cameraIp='" + cameraIp + '\'' +
-                ", cameraPort='" + cameraPort + '\'' +
-                ", gasIp='" + gasIp + '\'' +
-                ", gasPort='" + gasPort + '\'' +
-                ", alarmValue='" + alarmValue + '\'' +
-                ", alarmTime='" + alarmTime + '\'' +
-                ", alarmType='" + alarmType + '\'' +
-                ", alarmImage='" + (StrUtil.isNotEmpty(alarmImage) ? alarmImage.substring(0,50) : "null") + '\'' +
-                ", alarmContent='" + alarmContent + '\'' +
-                '}';
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/DeviceDetailDTO.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/DeviceDetailDTO.java
deleted file mode 100644
index ea518d9..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/DeviceDetailDTO.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package com.casic.missiles.modular.system.dto;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.casic.missiles.modular.system.entity.Device;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-@ApiModel("DeviceDetailDTO")
-@Data
-public class DeviceDetailDTO extends Device {
-
-    @ApiModelProperty(value = "摄像头编号")
-    private String cameraCode;
-
-    @ApiModelProperty(value = "摄像头IP")
-    private String cameraIp;
-
-    @ApiModelProperty(value = "摄像头端口")
-    private String cameraPort;
-
-    @ApiModelProperty(value = "激甲编号")
-    private String gasCode;
-
-    @ApiModelProperty(value = "激甲IP")
-    private String gasIp;
-
-    @ApiModelProperty(value = "激甲端口")
-    private String gasPort;
-
-    @ApiModelProperty(value = "智能帽衬编号")
-    private String hatLiningCode;
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/WorkSiteDetailDTO.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/WorkSiteDetailDTO.java
deleted file mode 100644
index 29378ff..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/WorkSiteDetailDTO.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package com.casic.missiles.modular.system.dto;
-
-import com.casic.missiles.modular.system.entity.ProjectDevice;
-import com.casic.missiles.modular.system.entity.ProjectWorker;
-import com.casic.missiles.modular.system.entity.WorkSiteInfo;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.util.List;
-
-@Data
-@ApiModel("WorkSiteDetailDTO")
-public class WorkSiteDetailDTO extends WorkSiteInfo {
-
-    @ApiModelProperty(value = "安全树列表",dataType = "ProjectDevice")
-    private List<ProjectDevice> deviceList;
-
-    @ApiModelProperty(value = "人员列表",dataType = "ProjectWorker")
-    private List<ProjectWorker> workerList;
-
-
-
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/WorkerLocationDTO.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/WorkerLocationDTO.java
deleted file mode 100644
index 6fd7b24..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/dto/WorkerLocationDTO.java
+++ /dev/null
@@ -1,68 +0,0 @@
-package com.casic.missiles.modular.system.dto;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-@ApiModel(value = "WorkerLocationDTO",description = "人员位置列表（首页）")
-@Data
-public class WorkerLocationDTO {
-
-    @ApiModelProperty("人员ID")
-    private Long workerId;
-
-    @ApiModelProperty("人员姓名")
-    private String workerName;
-
-    @ApiModelProperty("安全帽编号")
-    private String hatCode;
-
-    @ApiModelProperty("安全帽ID")
-    private Long hatId;
-
-    @ApiModelProperty("背心编号")
-    private String vastCode;
-
-    @ApiModelProperty("手环编号")
-    private String braceletCode;
-
-    @ApiModelProperty("位置")
-    private String location;
-
-    @ApiModelProperty("时间")
-    private String time;
-
-    @ApiModelProperty("经度")
-    private String lng;
-
-    @ApiModelProperty("纬度")
-    private String lat;
-
-    @ApiModelProperty("心率")
-    private String heartRate;
-
-    @ApiModelProperty("血氧")
-    private String bloodOxygen;
-
-    @ApiModelProperty("一氧化碳")
-    private String co;
-
-    @ApiModelProperty("甲烷")
-    private String gas;
-
-    @ApiModelProperty("硫化氢")
-    private String h2s;
-
-    @ApiModelProperty("氧气")
-    private String o2;
-
-    @ApiModelProperty("信号")
-    private String signal;
-
-    @ApiModelProperty("电量")
-    private String cell;
-
-    @ApiModelProperty("是否报警")
-    private boolean alarmFlag;
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Alarm.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Alarm.java
new file mode 100644
index 0000000..4d2b7ef
--- /dev/null
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Alarm.java
@@ -0,0 +1,103 @@
+package com.casic.missiles.modular.system.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import java.util.Date;
+
+/**
+ * <p>
+ * 报警记录表
+ * </p>
+ *
+ * @author zyj
+ * @since 2023-05-25
+ */
+@Data
+@TableName("bus_alarm")
+public class Alarm implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    @TableId(value = "ID",type = IdType.ASSIGN_ID)
+    private Long id;
+
+    /**
+     * 设备ID
+     */
+    @TableField("DEVICE_ID")
+    private Long deviceId;
+
+    /**
+     * 报警类型
+     */
+    @TableField("ALARM_TYPE")
+    private String alarmType;
+
+    /**
+     * 报警时间
+     */
+    @TableField("ALARM_TIME")
+    private Date alarmTime;
+
+    /**
+     * 报警状态
+     */
+    @TableField("ALARM_STATUS")
+    private String alarmStatus;
+
+    /**
+     * 报警位置
+     */
+    @TableField("ALARM_LOCATION")
+    private String alarmLocation;
+
+    /**
+     * 报警图片
+     */
+    @TableField("ALARM_IMAGE")
+    private String alarmImage;
+
+    /**
+     * 视频通道号
+     */
+    @TableField("CHANNEL_NO")
+    private Integer channelNo;
+
+    /**
+     * 报警内容
+     */
+    @TableField("ALARM_CONTENT")
+    private String alarmContent;
+
+    /**
+     * 消警时间
+     */
+    @TableField("CANCEL_TIME")
+    private Date cancelTime;
+
+
+    @Override
+    public String toString() {
+        return "Alarm{" +
+            "id=" + id +
+            ", deviceId=" + deviceId +
+            ", alarmType=" + alarmType +
+            ", alarmTime=" + alarmTime +
+            ", alarmStatus=" + alarmStatus +
+            ", alarmLocation=" + alarmLocation +
+            ", alarmImage=" + alarmImage +
+            ", channelNo=" + channelNo +
+            ", alarmContent=" + alarmContent +
+            ", cancelTime=" + cancelTime +
+        "}";
+    }
+}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusAlarm.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusAlarm.java
deleted file mode 100644
index efb4a23..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusAlarm.java
+++ /dev/null
@@ -1,159 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.alibaba.fastjson.annotation.JSONField;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.time.LocalDateTime;
-import java.util.Date;
-
-/**
- * <p>
- * 报警记录表
- * </p>
- *
- * @author zyj
- * @since 2023-05-16
- */
-@Data
-@ApiModel("Alarm")
-@TableName("br_bus_alarm")
-public class BusAlarm implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 项目ID
-     */
-    @ApiModelProperty(value = "项目ID")
-    @TableField("PROJECT_ID")
-    private Long projectId;
-
-    /**
-     * 设备ID
-     */
-    @ApiModelProperty(value = "设备ID")
-    @TableField("DEVICE_ID")
-    private Long deviceId;
-
-    /**
-     * 报警类型
-     */
-    @ApiModelProperty(value = "报警类型")
-    @TableField("ALARM_TYPE")
-    private String alarmType;
-
-    /**
-     * 报警状态
-     */
-    @ApiModelProperty(value = "报警状态")
-    @TableField("ALARM_STATUS")
-    private String alarmStatus;
-
-    /**
-     * 报警值
-     */
-    @ApiModelProperty(value = "报警值")
-    @TableField("ALARM_VALUE")
-    private String alarmValue;
-
-    /**
-     * 报警图片
-     */
-    @ApiModelProperty(value = "报警图片")
-    @TableField("ALARM_IMAGE")
-    private String alarmImage;
-
-    /**
-     * 报警内容
-     */
-    @ApiModelProperty(value = "报警内容")
-    @TableField("ALARM_CONTENT")
-    private String alarmContent;
-
-    /**
-     * 报警时间
-     */
-    @ApiModelProperty(value = "报警时间")
-    @TableField("ALARM_TIME")
-    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
-    private Date alarmTime;
-
-    /**
-     * 消警时间
-     */
-    @ApiModelProperty(value = "消警时间")
-    @TableField("CANCEL_TIME")
-    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
-    private Date cancelTime;
-
-    /**
-     * 报警位置经度
-     */
-    @ApiModelProperty(value = "报警位置经度")
-    @TableField("ALARM_LNG")
-    private String alarmLng;
-
-    /**
-     * 报警位置纬度
-     */
-    @ApiModelProperty(value = "报警位置纬度")
-    @TableField("ALARM_LAT")
-    private String alarmLat;
-
-    @ApiModelProperty("报警类型名称")
-    @TableField(exist = false)
-    private String alarmStatusName;
-    @ApiModelProperty("报警类型名称")
-    @TableField(exist = false)
-    private String alarmTypeName;
-    @ApiModelProperty("作业名称")
-    @TableField(exist = false)
-    private String workTitle;
-    @ApiModelProperty("所属道路")
-    @TableField(exist = false)
-    private String workRoad;
-    @ApiModelProperty("作业状态")
-    @TableField(exist = false)
-    private String projectState;
-    @ApiModelProperty("作业状态名称")
-    @TableField(exist = false)
-    private String projectStateName;
-    @ApiModelProperty("负责人姓名")
-    @TableField(exist = false)
-    private String workPersonName;
-    @ApiModelProperty("负责人联系方式")
-    @TableField(exist = false)
-    private String workPersonPhoneNumber;
-
-
-    @Override
-    public String toString() {
-        return "BusAlarm{" +
-                "id=" + id +
-                ", projectId=" + projectId +
-                ", deviceId=" + deviceId +
-                ", alarmType=" + alarmType +
-                ", alarmValue=" + alarmValue +
-                ", alarmStatus=" + alarmStatus +
-                ", alarmImage=" + alarmImage +
-                ", alarmContent=" + alarmContent +
-                ", alarmTime=" + alarmTime +
-                ", cancelTime=" + cancelTime +
-                ", alarmLng=" + alarmLng +
-                ", alarmLat=" + alarmLat +
-                "}";
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusEvent.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusEvent.java
deleted file mode 100644
index a0b7543..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusEvent.java
+++ /dev/null
@@ -1,100 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.time.LocalDateTime;
-import java.util.Date;
-import java.util.List;
-
-/**
- * <p>
- * 事件表
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@TableName("br_bus_event")
-@Data
-@ApiModel("BusEvent")
-public class BusEvent implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @ApiModelProperty("事件ID")
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 事件标题
-     */
-    @ApiModelProperty("事件名称")
-    @TableField("EVENT_TITLE")
-    private String eventTitle;
-
-    /**
-     * 上报人员
-     */
-    @ApiModelProperty("上报人员")
-    @TableField("UPLOAD_NAME")
-    private String uploadName;
-
-    /**
-     * 联系方式
-     */
-    @ApiModelProperty("联系方式")
-    @TableField("PHONE_NUMBER")
-    private String phoneNumber;
-
-    /**
-     * 事件描述
-     */
-    @ApiModelProperty("事件描述")
-    @TableField("EVENT_DESCRIPTION")
-    private String eventDescription;
-
-    @ApiModelProperty("经度")
-    @TableField("LNG")
-    private String lng;
-
-    @ApiModelProperty("纬度")
-    @TableField("LAT")
-    private String lat;
-
-    /**
-     * 事件上传时间
-     */
-    @ApiModelProperty("事件上传时间")
-    @TableField("CREATE_TIME")
-    private Date createTime;
-
-    @ApiModelProperty("事件照片")
-    @TableField(exist = false)
-    private List<BusEventImage> imageList;
-
-
-
-    @Override
-    public String toString() {
-        return "BusEvent{" +
-            "id=" + id +
-            ", eventTitle=" + eventTitle +
-            ", uploadName=" + uploadName +
-            ", phoneNumber=" + phoneNumber +
-            ", eventDescription=" + eventDescription +
-            ", lng=" + lng +
-            ", lat=" + lat +
-            ", createTime=" + createTime +
-        "}";
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusEventImage.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusEventImage.java
deleted file mode 100644
index 1e75245..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/BusEventImage.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-
-/**
- * <p>
- * 事件图片表
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@TableName("br_bus_event_image")
-@Data
-@ApiModel("BusEventImage")
-public class BusEventImage implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 事件ID
-     */
-    @TableField("EVENT_ID")
-    private Long eventId;
-
-    /**
-     * 报警图片
-     */
-    @TableField("IMAGE")
-    @ApiModelProperty("图片url")
-    private String image;
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Device.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Device.java
index df89c70..ea7db5f 100644
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Device.java
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Device.java
@@ -1,30 +1,23 @@
 package com.casic.missiles.modular.system.entity;
 
-import com.alibaba.fastjson.annotation.JSONField;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.casic.missiles.core.base.json.DateDeserializer;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
-import java.util.Date;
 
 /**
  * <p>
- * 
+ * 设备记录表
  * </p>
  *
  * @author zyj
- * @since 2023-04-14
+ * @since 2023-05-25
  */
-@ApiModel("Device")
-@TableName("br_device")
 @Data
+@TableName("bus_device")
 public class Device implements Serializable {
 
     private static final long serialVersionUID = 1L;
@@ -32,82 +25,86 @@
     /**
      * 主键
      */
-    @ApiModelProperty(value = "设备ID")
     @TableId(value = "ID",type = IdType.ASSIGN_ID)
     private Long id;
 
     /**
-     * 设备编号
+     * 设备名称
      */
-    @ApiModelProperty(value = "设备编号")
-    @TableField("DEVICE_CODE")
-    private String deviceCode;
+    @TableField("DEVICE_NAME")
+    private String deviceName;
 
     /**
-     * 设备类型
+     * IP
      */
-    @ApiModelProperty(value = "设备类型")
-    @TableField("DEVICE_TYPE")
-    private String deviceType;
+    @TableField("IP")
+    private String ip;
 
     /**
-     * 设备批次
+     * 端口
      */
-    @ApiModelProperty(value = "设备批次")
-    @TableField("DEVICE_BATCH")
-    private String deviceBatch;
+    @TableField("PORT")
+    private String port;
 
     /**
-     * 厂家
+     * 用户名
      */
-    @ApiModelProperty(value = "厂家")
-    @TableField("MANUFACTURER")
-    private String manufacturer;
+    @TableField("USER_NAME")
+    private String userName;
 
     /**
-     * 是否供电
+     * 密码
      */
-    @ApiModelProperty(value = "是否供电")
-    @TableField("IS_POWER_SUPPLY")
-    private String isPowerSupply;
+    @TableField("PASSWORD")
+    private String password;
 
     /**
-     * 创建时间
+     * 连接类型
      */
-    @ApiModelProperty(value = "创建时间",dataType = "Date")
-    @TableField("CREATE_TIME")
-    private Date createTime;
+    @TableField("CONNECT_TYPE")
+    private String connectType;
 
-    @ApiModelProperty(value = "设备类型名称")
-    @TableField(exist = false)
-    private String deviceTypeName;
+    /**
+     * 位置
+     */
+    @TableField("LOCATION")
 
-    @ApiModelProperty(value = "是否供电名称")
-    @TableField(exist = false)
-    private String isPowerSupplyName;
+    private String location;
 
-    @ApiModelProperty(value = "注册时间",dataType = "String")
-    @TableField(exist = false)
-    private String registerTime;
+    /**
+     * 设备状态
+     */
+    @TableField("STATUS")
 
-    @ApiModelProperty(value = "当前状态")
-    @TableField(exist = false)
     private String status;
 
-    @ApiModelProperty(value = "当前状态名称")
-    @TableField(exist = false)
-    private String statusName;
+    /**
+     * 报警分组
+     */
+    @TableField("ALARM_GROUP")
+
+    private Long alarmGroup;
+
+    /**
+     * 视频通道数(预留)
+     */
+    @TableField("CHANNEL_NUM")
+    private Integer channelNum;
 
     @Override
     public String toString() {
         return "Device{" +
             "id=" + id +
-            ", deviceCode=" + deviceCode +
-            ", deviceType=" + deviceType +
-            ", deviceBatch=" + deviceBatch +
-            ", manufacturer=" + manufacturer +
-            ", isPowerSupply=" + isPowerSupply +
-            ", createTime=" + createTime +
+            ", deviceName=" + deviceName +
+            ", ip=" + ip +
+            ", port=" + port +
+            ", userName=" + userName +
+            ", password=" + password +
+            ", connectType=" + connectType +
+            ", location=" + location +
+            ", status=" + status +
+            ", alarmGroup=" + alarmGroup +
+            ", channelNum=" + channelNum +
         "}";
     }
 }
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/DeviceExt.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/DeviceExt.java
deleted file mode 100644
index 5ee7015..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/DeviceExt.java
+++ /dev/null
@@ -1,99 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-
-/**
- * <p>
- * 设备扩展信息表（安全树）
- * </p>
- *
- * @author zyj
- * @since 2023-04-27
- */
-@Data
-@TableName("br_device_ext")
-public class DeviceExt implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 设备ID
-     */
-    @TableField("DEVICE_ID")
-    private Long deviceId;
-
-    /**
-     * 摄像头编号
-     */
-    @TableField("CAMERA_CODE")
-    private String cameraCode;
-
-    /**
-     * 摄像头IP
-     */
-    @TableField("CAMERA_IP")
-    private String cameraIp;
-
-    /**
-     * 摄像头端口
-     */
-    @TableField("CAMERA_PORT")
-    private String cameraPort;
-
-    /**
-     * 激甲编号
-     */
-    @TableField("GAS_CODE")
-    private String gasCode;
-
-    /**
-     * 激甲IP
-     */
-    @TableField("GAS_IP")
-    private String gasIp;
-
-    /**
-     * 激甲端口
-     */
-    @TableField("GAS_PORT")
-    private String gasPort;
-
-    /**
-     * 甲烷报警阈值
-     */
-    @TableField("GAS_THRESHOLD")
-    private String gasThreshold;
-
-    @TableField(value = "HAT_LINING_CODE")
-    private String hatLiningCode;
-
-
-    @Override
-    public String toString() {
-        return "DeviceExt{" +
-            "id=" + id +
-            ", deviceId=" + deviceId +
-            ", cameraCode=" + cameraCode +
-            ", cameraIp=" + cameraIp +
-            ", cameraPort=" + cameraPort +
-            ", gasCode=" + gasCode +
-            ", gasIp=" + gasIp +
-            ", gasPort=" + gasPort +
-            ", gasThreshold=" + gasThreshold +
-            ", hatLiningCode=" + hatLiningCode +
-        "}";
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/ProjectDevice.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/ProjectDevice.java
deleted file mode 100644
index c4f3472..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/ProjectDevice.java
+++ /dev/null
@@ -1,62 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-
-/**
- * <p>
- * 
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@Data
-@ApiModel("ProjectDevice")
-@TableName("br_project_device")
-public class ProjectDevice implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 作业现场ID
-     */
-    @TableField("PROJECT_ID")
-    private Long projectId;
-
-    /**
-     * 设备ID
-     */
-    @TableField("DEVICE_ID")
-    @ApiModelProperty("设备ID（新增编辑时传）")
-    private Long deviceId;
-
-    /**
-     * 设备编号
-     */
-    @TableField(exist = false)
-    @ApiModelProperty("设备编号（详情中展示，新增编辑不用传）")
-    private String deviceCode;
-
-    @Override
-    public String toString() {
-        return "ProjectDevice{" +
-            "id=" + id +
-            ", projectId=" + projectId +
-            ", deviceId=" + deviceId +
-        "}";
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/ProjectWorker.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/ProjectWorker.java
deleted file mode 100644
index 10b23c4..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/ProjectWorker.java
+++ /dev/null
@@ -1,104 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import java.io.Serializable;
-
-/**
- * <p>
- * 
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@ApiModel("ProjectWorker")
-@TableName("br_project_worker")
-@Data
-@NoArgsConstructor
-@AllArgsConstructor
-public class ProjectWorker implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 作业现场ID
-     */
-    @TableField("PROJECT_ID")
-    private Long projectId;
-
-    /**
-     * 人员ID
-     */
-    @ApiModelProperty("人员ID")
-    @TableField("WORKER_ID")
-    private Long workerId;
-
-    /**
-     * 安全帽编号
-     */
-    @ApiModelProperty("安全帽编号")
-    @TableField("HAT_CODE")
-    private String hatCode;
-
-    /**
-     * 背心编号
-     */
-    @ApiModelProperty("背心编号")
-    @TableField("VAST_CODE")
-    private String vastCode;
-
-    /**
-     * 手环编号
-     */
-    @ApiModelProperty("手环编号")
-    @TableField("BRACELET_CODE")
-    private String braceletCode;
-
-    @ApiModelProperty("人员姓名（详情中展示，新增编辑不用传）")
-    @TableField(exist = false)
-    private String workerName;
-
-    @ApiModelProperty("人员部门ID（详情中展示，新增编辑不用传）")
-    @TableField(exist = false)
-    private String workerDeptId;
-
-    @ApiModelProperty("人员部门名称（详情中展示，新增编辑不用传）")
-    @TableField(exist = false)
-    private String workerDeptName;
-
-    @ApiModelProperty("人员联系方式（详情中展示，新增编辑不用传）")
-    @TableField(exist = false)
-    private String workerPhoneNumber;
-
-    public ProjectWorker(Long projectId, Long workerId) {
-        this.projectId = projectId;
-        this.workerId = workerId;
-    }
-
-    @Override
-    public String toString() {
-        return "ProjectWorker{" +
-            "id=" + id +
-            ", projectId=" + projectId +
-            ", workerId=" + workerId +
-            ", hatCode=" + hatCode +
-            ", vastCode=" + vastCode +
-            ", braceletCode=" + braceletCode +
-        "}";
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/WorkSiteInfo.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/WorkSiteInfo.java
deleted file mode 100644
index fa6f41d..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/WorkSiteInfo.java
+++ /dev/null
@@ -1,130 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.alibaba.fastjson.annotation.JSONField;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.time.LocalDateTime;
-import java.util.Date;
-
-/**
- * <p>
- * 作业现场表
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@ApiModel("WorkSiteInfo")
-@TableName("br_work_site_info")
-@Data
-public class WorkSiteInfo implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @ApiModelProperty("作业现场ID")
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 作业名称
-     */
-    @ApiModelProperty("作业名称")
-    @TableField("WORK_TITLE")
-    private String workTitle;
-
-    /**
-     * 责任人
-     */
-    @ApiModelProperty("责任人（人员ID）")
-    @TableField("WORK_PERSON")
-    private Long workPerson;
-
-    /**
-     * 作业描述
-     */
-    @ApiModelProperty("作业描述")
-    @TableField("WORK_SITE_DESC")
-    private String workSiteDesc;
-
-    /**
-     * 作业状态
-     */
-    @ApiModelProperty("作业状态")
-    @TableField("PROJECT_STATE")
-    private String projectState;
-
-    /**
-     * 所属道路
-     */
-    @ApiModelProperty("所属道路")
-    @TableField("WORK_ROAD")
-    private String workRoad;
-
-    @TableField("IMAGE_URL")
-    private String imageUrl;
-
-    @TableField("CREATE_TIME")
-    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
-    private Date createTime;
-    @TableField("UPDATE_TIME")
-    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
-    private Date updateTime;
-
-    @ApiModelProperty("开始时间")
-    @TableField("START_TIME")
-    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
-    private Date startTime;
-
-    @ApiModelProperty("结束时间")
-    @TableField("FINISH_TIME")
-    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
-    private Date finishTime;
-
-    @ApiModelProperty("负责人姓名（详情中使用，新增编辑不用传）")
-    @TableField(exist = false)
-    private String workPersonName;
-
-    @ApiModelProperty("负责人联系方式（详情中使用，新增编辑不用传）")
-    @TableField(exist = false)
-    private String workPersonPhoneNumber;
-
-    @ApiModelProperty("负责人所属部门ID（详情中使用，新增编辑不用传）")
-    @TableField(exist = false)
-    private Long workPersonDeptId;
-
-    @ApiModelProperty("负责人所属部门名称（详情中使用，新增编辑不用传）")
-    @TableField(exist = false)
-    private String workPersonDeptName;
-
-    @ApiModelProperty(value = "注册时间",dataType = "String")
-    @TableField(exist = false)
-    private String registerTime;
-
-    @ApiModelProperty("作业状态名称")
-    @TableField(exist = false)
-    private String projectStateName;
-
-    @Override
-    public String toString() {
-        return "WorkSiteInfo{" +
-            "id=" + id +
-            ", workTitle=" + workTitle +
-            ", workPerson=" + workPerson +
-            ", workSiteDesc=" + workSiteDesc +
-            ", projectState=" + projectState +
-            ", imageUrl=" + imageUrl +
-            ", updateTime=" + updateTime +
-            ", workRoad=" + workRoad +
-        "}";
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Worker.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Worker.java
deleted file mode 100644
index 28a4daa..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/entity/Worker.java
+++ /dev/null
@@ -1,147 +0,0 @@
-package com.casic.missiles.modular.system.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.time.LocalDateTime;
-import java.util.Date;
-
-/**
- * <p>
- * 
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@ApiModel("Worker")
-@TableName("br_worker")
-@Data
-public class Worker implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @ApiModelProperty(value = "人员ID")
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 姓名
-     */
-    @ApiModelProperty(value = "姓名")
-    @TableField("WORKER_NAME")
-    private String workerName;
-
-    /**
-     * 性别
-     */
-    @ApiModelProperty(value = "性别")
-    @TableField("GENDER")
-    private String gender;
-
-    /**
-     * 所属部门
-     */
-    @ApiModelProperty(value = "所属部门(人员管理)")
-    @TableField("DEPT_ID")
-    private Long deptId;
-
-    /**
-     * 所属单位
-     */
-    @ApiModelProperty(value = "所属单位(入场申请中使用)")
-    @TableField("OWNER_SHIP")
-    private String ownerShip;
-
-    /**
-     * 联系方式
-     */
-    @ApiModelProperty(value = "联系方式")
-    @TableField("PHONE_NUMBER")
-    private String phoneNumber;
-
-    /**
-     * 证件号
-     */
-    @ApiModelProperty(value = "证件号")
-    @TableField("ID_CARD_NUMBER")
-    private String idCardNumber;
-
-    /**
-     * 入场原因
-     */
-    @ApiModelProperty(value = "入场原因（入场申请中使用）")
-    @TableField("ENTER_REASON")
-    private String enterReason;
-
-    /**
-     * 入场人脸照片
-     */
-    @ApiModelProperty(value = "人脸照片（照片路径）")
-    @TableField("WORKER_AVATAR")
-    private String workerAvatar;
-
-    /**
-     * 申请入场时间
-     */
-    @ApiModelProperty(value = "注册时间/申请入场时间")
-    @TableField("CREATE_TIME")
-    private Date createTime;
-
-    /**
-     * 人员类型
-     */
-    @ApiModelProperty(value = "人员类型（区分人员管理和入场申请）")
-    @TableField("WORKER_TYPE")
-    private String workerType;
-
-    @ApiModelProperty(value = "性别名称")
-    @TableField(exist = false)
-    private String genderName;
-
-    @ApiModelProperty(value = "部门名称")
-    @TableField(exist = false)
-    private String deptName;
-
-    @ApiModelProperty(value = "注册时间",dataType = "String")
-    @TableField(exist = false)
-    private String registerTime;
-
-    @ApiModelProperty(value = "当前状态")
-    @TableField(exist = false)
-    private String status;
-
-    @ApiModelProperty(value = "当前状态名称")
-    @TableField(exist = false)
-    private String statusName;
-
-    @ApiModelProperty(value = "是否注册(0未注册；1已注册)",allowableValues = "0,1")
-    @TableField(exist = false)
-    private String isRegister;
-
-    @Override
-    public String toString() {
-        return "Worker{" +
-            "id=" + id +
-            ", workerName=" + workerName +
-            ", gender=" + gender +
-            ", deptId=" + deptId +
-            ", ownerShip=" + ownerShip +
-            ", phoneNumber=" + phoneNumber +
-            ", idCardNumber=" + idCardNumber +
-            ", enterReason=" + enterReason +
-            ", workerAvatar=" + workerAvatar +
-            ", createTime=" + createTime +
-            ", workerType=" + workerType +
-        "}";
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/AlarmMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/AlarmMapper.java
new file mode 100644
index 0000000..ea4c8be
--- /dev/null
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/AlarmMapper.java
@@ -0,0 +1,16 @@
+package com.casic.missiles.modular.system.mapper;
+
+import com.casic.missiles.modular.system.entity.Alarm;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 报警记录表 Mapper 接口
+ * </p>
+ *
+ * @author zyj
+ * @since 2023-05-25
+ */
+public interface AlarmMapper extends BaseMapper<Alarm> {
+
+}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/BusAlarmMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/BusAlarmMapper.java
deleted file mode 100644
index 9801742..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/BusAlarmMapper.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package com.casic.missiles.modular.system.mapper;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.modular.system.dto.AlarmTypeCountDTO;
-import com.casic.missiles.modular.system.entity.BusAlarm;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * <p>
- * 报警记录表 Mapper 接口
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface BusAlarmMapper extends BaseMapper<BusAlarm> {
-
-    Page<BusAlarm> listPage(Page<BusAlarm> page,@Param("ew")  QueryWrapper<BusAlarm> queryWrapper);
-
-    void cancelAlarm(@Param("deviceId")Long deviceId,@Param("alarmType") String alarmType);
-
-    List<AlarmTypeCountDTO> alarmCount(@Param("projectId")Long projectId, @Param("alarmStatus")String alarmStatus);
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/BusEventImageMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/BusEventImageMapper.java
deleted file mode 100644
index 9590b7d..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/BusEventImageMapper.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.casic.missiles.modular.system.mapper;
-
-import com.casic.missiles.modular.system.entity.BusEventImage;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * <p>
- * 事件图片表 Mapper 接口
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface BusEventImageMapper extends BaseMapper<BusEventImage> {
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/BusEventMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/BusEventMapper.java
deleted file mode 100644
index 3c85edf..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/BusEventMapper.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.casic.missiles.modular.system.mapper;
-
-import com.casic.missiles.modular.system.entity.BusEvent;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * <p>
- * 事件表 Mapper 接口
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface BusEventMapper extends BaseMapper<BusEvent> {
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/DeviceExtMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/DeviceExtMapper.java
deleted file mode 100644
index 4ca9212..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/DeviceExtMapper.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.casic.missiles.modular.system.mapper;
-
-import com.casic.missiles.modular.system.entity.DeviceExt;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * <p>
- * 设备扩展信息表（安全树） Mapper 接口
- * </p>
- *
- * @author zyj
- * @since 2023-04-27
- */
-public interface DeviceExtMapper extends BaseMapper<DeviceExt> {
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/DeviceMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/DeviceMapper.java
index 444c0c5..3d0bb02 100644
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/DeviceMapper.java
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/DeviceMapper.java
@@ -1,30 +1,16 @@
 package com.casic.missiles.modular.system.mapper;
 
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.modular.system.dto.DeviceDetailDTO;
-import com.casic.missiles.modular.system.dto.HelmetInfoDTO;
 import com.casic.missiles.modular.system.entity.Device;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
 
 /**
  * <p>
- *  Mapper 接口
+ * 设备记录表 Mapper 接口
  * </p>
  *
  * @author zyj
- * @since 2023-04-14
+ * @since 2023-05-25
  */
-@Mapper
 public interface DeviceMapper extends BaseMapper<Device> {
 
-    Page<DeviceDetailDTO> listDetailPage(Page<DeviceDetailDTO> page,@Param("ew") QueryWrapper<DeviceDetailDTO> ew);
-
-     List<Long> selectProjectDevice(@Param("projectId") Long projectId);
-
-    List<HelmetInfoDTO> selectHelmetList(@Param("deviceType")String deviceType);
 }
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/ProjectDeviceMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/ProjectDeviceMapper.java
deleted file mode 100644
index 1d0c14e..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/ProjectDeviceMapper.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package com.casic.missiles.modular.system.mapper;
-
-import com.casic.missiles.modular.system.dto.DeviceLocationDTO;
-import com.casic.missiles.modular.system.entity.ProjectDevice;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * <p>
- *  Mapper 接口
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface ProjectDeviceMapper extends BaseMapper<ProjectDevice> {
-     List<ProjectDevice> selectDetailByProjectId(@Param("projectId") Long projectId);
-
-     List<DeviceLocationDTO> selectDeviceLocationList(@Param("projectId") Long projectId);
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/ProjectWorkerMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/ProjectWorkerMapper.java
deleted file mode 100644
index 58583d1..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/ProjectWorkerMapper.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package com.casic.missiles.modular.system.mapper;
-
-import com.casic.missiles.modular.system.dto.WorkerLocationDTO;
-import com.casic.missiles.modular.system.entity.ProjectWorker;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * <p>
- *  Mapper 接口
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface ProjectWorkerMapper extends BaseMapper<ProjectWorker> {
-
-    List<ProjectWorker> selectDetailByProjectId(@Param("projectId") Long projectId,
-                                                @Param("workerType")String workerType);
-
-    List<WorkerLocationDTO> selectWorkerLocationList(@Param("projectId") Long projectId,
-                                                     @Param("workerType")String workerType);
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/WorkSiteInfoMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/WorkSiteInfoMapper.java
deleted file mode 100644
index a4934d2..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/WorkSiteInfoMapper.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.casic.missiles.modular.system.mapper;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.modular.system.entity.WorkSiteInfo;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Param;
-
-/**
- * <p>
- * 作业现场表 Mapper 接口
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface WorkSiteInfoMapper extends BaseMapper<WorkSiteInfo> {
-
-    Page<WorkSiteInfo> selectListPage(Page<WorkSiteInfo> page,@Param("ew") QueryWrapper<WorkSiteInfo> ew);
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/WorkerMapper.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/WorkerMapper.java
deleted file mode 100644
index 258fb12..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/WorkerMapper.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package com.casic.missiles.modular.system.mapper;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.modular.system.dto.DeviceDetailDTO;
-import com.casic.missiles.modular.system.entity.Worker;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * <p>
- *  Mapper 接口
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface WorkerMapper extends BaseMapper<Worker> {
-
-
-    Page<Worker> selectListPage(Page<Worker> page, @Param("ew") QueryWrapper<Worker> ew);
-
-    List<String> selectWorkerAvatars(@Param("projectId")Long projectId);
-
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/AlarmMapper.xml b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/AlarmMapper.xml
new file mode 100644
index 0000000..25cb4ab
--- /dev/null
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/AlarmMapper.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.modular.system.mapper.AlarmMapper">
+
+</mapper>
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/BusAlarmMapper.xml b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/BusAlarmMapper.xml
deleted file mode 100644
index 595088a..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/BusAlarmMapper.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.casic.missiles.modular.system.mapper.BusAlarmMapper">
-
-    <select id="listPage" resultType="com.casic.missiles.modular.system.entity.BusAlarm">
-        SELECT
-            alarm.ID as id,
-            alarm.DEVICE_ID as deviceId,
-            alarm.PROJECT_ID as projectId,
-            alarm.ALARM_TYPE as alarmType,
-            alarm.ALARM_VALUE as alarmValue,
-            alarm.ALARM_STATUS as alarmStatus,
-            alarm.ALARM_IMAGE AS alarmImage,
-            alarm.ALARM_CONTENT as alarmContent,
-            alarm.ALARM_TIME as alarmTime,
-            alarm.CANCEL_TIME as cancelTime,
-            alarm.ALARM_LNG as alarmLng,
-            alarm.ALARM_LAT as alarmLat,
-            p.WORK_TITLE as workTitle,
-            p.WORK_ROAD as workRoad,
-            p.PROJECT_STATE as projectState,
-            w.WORKER_NAME as workPersonName,
-            w.PHONE_NUMBER as workPersonPhoneNumber
-        FROM
-            `br_bus_alarm` alarm
-                LEFT JOIN br_work_site_info p on alarm.PROJECT_ID = p.ID
-                LEFT JOIN br_worker w on p.WORK_PERSON = w.ID
-        <where>
-            <if test="ew != null">
-                ${ew.sqlSegment}
-            </if>
-        </where>
-    </select>
-
-    <select id="cancelAlarm">
-        update br_bus_alarm
-        set ALARM_STATUS = '1'
-        where DEVICE_ID = #{deviceId}
-          and ALARM_TYPE = #{alarmType}
-          and ALARM_STATUS = '0'
-    </select>
-
-    <select id="alarmCount" resultType="com.casic.missiles.modular.system.dto.AlarmTypeCountDTO">
-        SELECT
-            ALARM_TYPE as alarmType,
-            count(*) as alarmCount
-        from br_bus_alarm
-        <where>
-            <if test="projectId != null and projectId !=''">
-                and PROJECT_ID = #{projectId}
-            </if>
-            <if test="alarmStatus != null and alarmStatus !=''">
-                and ALARM_STATUS = #{alarmStatus}
-            </if>
-        </where>
-        group by ALARM_TYPE
-    </select>
-</mapper>
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/BusEventImageMapper.xml b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/BusEventImageMapper.xml
deleted file mode 100644
index fbc3db3..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/BusEventImageMapper.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.casic.missiles.modular.system.mapper.BusEventImageMapper">
-
-</mapper>
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/BusEventMapper.xml b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/BusEventMapper.xml
deleted file mode 100644
index 627d573..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/BusEventMapper.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.casic.missiles.modular.system.mapper.BusEventMapper">
-
-</mapper>
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/DeviceExtMapper.xml b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/DeviceExtMapper.xml
deleted file mode 100644
index 5321d1c..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/DeviceExtMapper.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.casic.missiles.modular.system.mapper.DeviceExtMapper">
-
-</mapper>
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/DeviceMapper.xml b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/DeviceMapper.xml
index 94262e1..88e7d01 100644
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/DeviceMapper.xml
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/DeviceMapper.xml
@@ -2,96 +2,4 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.casic.missiles.modular.system.mapper.DeviceMapper">
 
-    <select id="listDetailPage" resultType="com.casic.missiles.modular.system.dto.DeviceDetailDTO">
-        select
-        br_device.ID as id,
-        DEVICE_CODE as deviceCode,
-        DEVICE_TYPE as deviceType,
-        DEVICE_BATCH as deviceBatch,
-        MANUFACTURER as manufacturer,
-        IS_POWER_SUPPLY as isPowerSupply,
-        CREATE_TIME as createTime,
-        CAMERA_CODE as cameraCode,
-        CAMERA_IP as cameraIp,
-        CAMERA_PORT as cameraPort,
-        GAS_CODE as gasCode,
-        GAS_IP as gasIp,
-        GAS_PORT as gasPort,
-        HAT_LINING_CODE as hatLiningCode
-        from br_device
-        left join br_device_ext ext on ext.DEVICE_ID = br_device.ID
-        <where>
-            <if test="ew != null">
-                ${ew.sqlSegment}
-            </if>
-        </where>
-    </select>
-
-    <select id="selectProjectDevice" resultType="java.lang.Long">
-        with device_info as (
-            (SELECT
-            d.DEVICE_ID as DEVICE_ID,
-            d.PROJECT_ID as PROJECT_ID,
-            p.PROJECT_STATE as PROJECT_STATE
-            from br_project_device d
-            LEFT JOIN br_work_site_info p on p.ID = d.PROJECT_ID)
-
-            UNION ALL
-
-            (SELECT
-            d1.ID as DEVICE_ID,
-            w1.ID as PROJECT_ID,
-            w1.PROJECT_STATE as PROJECT_STATE
-            FROM br_project_worker pw1
-            LEFT JOIN br_device d1 on pw1.BRACELET_CODE = d1.DEVICE_CODE
-            LEFT JOIN br_work_site_info w1 on pw1.PROJECT_ID = w1.ID)
-
-            UNION ALL
-
-            (SELECT
-            d1.ID as DEVICE_ID,
-            w1.ID as PROJECT_ID,
-            w1.PROJECT_STATE as PROJECT_STATE
-            FROM br_project_worker pw1
-            LEFT JOIN br_device d1 on pw1.HAT_CODE = d1.DEVICE_CODE
-            LEFT JOIN br_work_site_info w1 on pw1.PROJECT_ID = w1.ID)
-
-
-            UNION ALL
-
-            (SELECT
-            d1.ID as DEVICE_ID,
-            w1.ID as PROJECT_ID,
-            w1.PROJECT_STATE as PROJECT_STATE
-            FROM br_project_worker pw1
-            LEFT JOIN br_device d1 on pw1.VAST_CODE = d1.DEVICE_CODE
-            LEFT JOIN br_work_site_info w1 on pw1.PROJECT_ID = w1.ID))
-
-        select DISTINCT DEVICE_ID from device_info
-        <where>
-            DEVICE_ID is not null
-            <choose>
-                <when test="projectId != null and projectId !=''">
-                    and PROJECT_ID = #{projectId}
-                </when>
-                <otherwise>
-                    AND PROJECT_STATE != '3'
-                </otherwise>
-            </choose>
-        </where>
-    </select>
-
-    <select id="selectHelmetList" resultType="com.casic.missiles.modular.system.dto.HelmetInfoDTO">
-        SELECT
-            a.ID AS deviceId,
-            a.DEVICE_CODE AS hatCode,
-            b.HAT_LINING_CODE AS hatLiningCode
-        FROM
-            br_device a
-                LEFT JOIN br_device_ext b ON a.ID = b.DEVICE_ID
-        WHERE
-            a.DEVICE_TYPE = #{deviceType}
-          AND a.DEVICE_CODE IS NOT NULL
-          AND b.HAT_LINING_CODE IS NOT NULL
-    </select>
 </mapper>
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/ProjectDeviceMapper.xml b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/ProjectDeviceMapper.xml
deleted file mode 100644
index c6d1c24..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/ProjectDeviceMapper.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.casic.missiles.modular.system.mapper.ProjectDeviceMapper">
-
-    <select id="selectDetailByProjectId" resultType="com.casic.missiles.modular.system.entity.ProjectDevice">
-        SELECT
-            pd.ID as id,
-            pd.PROJECT_ID as projectId,
-            pd.DEVICE_ID as deviceId,
-            d.DEVICE_CODE as deviceCode
-        from br_project_device pd
-        LEFT JOIN br_device d on pd.DEVICE_ID = d.ID
-        <where>
-            pd.PROJECT_ID = #{projectId}
-        </where>
-    </select>
-
-    <select id="selectDeviceLocationList" resultType="com.casic.missiles.modular.system.dto.DeviceLocationDTO">
-        SELECT
-        d.ID as deviceId,
-        d.DEVICE_TYPE as deviceType,
-        d.DEVICE_CODE as deviceCode,
-        if(EXISTS(select ID from br_bus_alarm WHERE DEVICE_ID = d.ID and ALARM_STATUS = '0'),true,false) as alarmFlag
-        FROM br_project_device pd, br_device d
-        where pd.DEVICE_ID = d.ID
-        and pd.PROJECT_ID = #{projectId}
-    </select>
-
-</mapper>
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/ProjectWorkerMapper.xml b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/ProjectWorkerMapper.xml
deleted file mode 100644
index 8d2de10..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/ProjectWorkerMapper.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.casic.missiles.modular.system.mapper.ProjectWorkerMapper">
-
-    <select id="selectDetailByProjectId" resultType="com.casic.missiles.modular.system.entity.ProjectWorker">
-        SELECT
-            pw.ID as id,
-            pw.PROJECT_ID as projectId,
-            pw.WORKER_ID as workerId,
-            w.WORKER_NAME as workerName,
-            w.DEPT_ID as workerDeptId,
-            pw.HAT_CODE as hatCode,
-            pw.VAST_CODE as vastCode,
-            pw.BRACELET_CODE as braceletCode,
-            w.PHONE_NUMBER as workerPhoneNumber
-        from br_project_worker pw
-        LEFT JOIN br_worker w on pw.WORKER_ID = w.ID
-        <where>
-            pw.PROJECT_ID = #{projectId}
-            <if test="workerType != null and workerType != ''">
-                and w.WORKER_TYPE = #{workerType}
-            </if>
-        </where>
-    </select>
-
-    <select id="selectWorkerLocationList" resultType="com.casic.missiles.modular.system.dto.WorkerLocationDTO">
-        select
-            w.ID as workerId,
-            w.WORKER_NAME as workerName,
-            pw.HAT_CODE as hatCode,
-            hd.ID as hatId,
-            pw.BRACELET_CODE as braceletCode,
-            pw.VAST_CODE as vastCode
-        from br_project_worker pw,br_worker w ,br_device hd
-        WHERE pw.WORKER_ID = w.ID
-          and pw.HAT_CODE = hd.DEVICE_CODE
-          and pw.PROJECT_ID = #{projectId}
-          and w.WORKER_TYPE = #{workerType}
-    </select>
-</mapper>
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/WorkSiteInfoMapper.xml b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/WorkSiteInfoMapper.xml
deleted file mode 100644
index 8f01326..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/WorkSiteInfoMapper.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.casic.missiles.modular.system.mapper.WorkSiteInfoMapper">
-
-    <select id="selectListPage" resultType="com.casic.missiles.modular.system.entity.WorkSiteInfo">
-        SELECT
-            br_work_site_info.ID AS id,
-            WORK_TITLE as workTitle,
-            WORK_ROAD as workRoad,
-            WORK_SITE_DESC as workSiteDesc,
-            WORK_PERSON as workPerson,
-            WORKER_NAME as workPersonName,
-            DEPT_ID as workPersonDeptId,
-            PHONE_NUMBER as workPersonPhoneNumber,
-            PROJECT_STATE as projectState,
-            br_work_site_info.CREATE_TIME AS createTime,
-            br_work_site_info.UPDATE_TIME AS updateTime
-        FROM br_work_site_info
-        LEFT JOIN br_worker w ON br_work_site_info.WORK_PERSON = w.ID
-        <where>
-            <if test="ew != null">
-                ${ew.sqlSegment}
-            </if>
-        </where>
-    </select>
-</mapper>
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/WorkerMapper.xml b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/WorkerMapper.xml
deleted file mode 100644
index 3e28b39..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/mapper/mapping/WorkerMapper.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.casic.missiles.modular.system.mapper.WorkerMapper">
-
-    <select id="selectListPage" resultType="com.casic.missiles.modular.system.entity.Worker">
-        WITH worker_project AS (
-            SELECT
-                w.id AS ID,
-                WORKER_NAME,
-                GENDER,
-                DEPT_ID,
-                OWNER_SHIP,
-                PHONE_NUMBER,
-                ID_CARD_NUMBER,
-                ENTER_REASON,
-                WORKER_AVATAR,
-                w.CREATE_TIME,
-                WORKER_TYPE,
-                IF( p.PROJECT_STATE != '3', 1, 0 ) AS `STATUS`
-            FROM br_worker w
-            LEFT JOIN br_project_worker pw ON w.ID = pw.WORKER_ID
-            LEFT JOIN br_work_site_info p ON pw.PROJECT_ID = p.ID
-        )
-
-        SELECT
-            ID AS id,
-            WORKER_NAME AS workerName,
-            GENDER AS gender,
-            DEPT_ID AS deptId,
-            OWNER_SHIP AS ownerShip,
-            PHONE_NUMBER AS phoneNumber,
-            ID_CARD_NUMBER AS idCardNumber,
-            ENTER_REASON AS enterReason,
-            WORKER_AVATAR AS workerAvatar,
-            CREATE_TIME AS createTime,
-            WORKER_TYPE AS workerType,
-            `STATUS` AS `status`
-        FROM worker_project
-        <where>
-            <if test="ew != null">
-                ${ew.sqlSegment}
-            </if>
-        </where>
-    </select>
-
-    <select id="selectWorkerAvatars" resultType="java.lang.String">
-        SELECT
-            WORKER_AVATAR
-        FROM
-            `br_worker`
-        WHERE
-        ID IN ( SELECT WORKER_ID FROM br_project_worker WHERE PROJECT_ID = #{projectId} )
-          AND WORKER_AVATAR IS NOT NULL
-          AND WORKER_AVATAR != ''
-    </select>
-</mapper>
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IAlarmService.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IAlarmService.java
new file mode 100644
index 0000000..8bc01f4
--- /dev/null
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IAlarmService.java
@@ -0,0 +1,16 @@
+package com.casic.missiles.modular.system.service;
+
+import com.casic.missiles.modular.system.entity.Alarm;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 报警记录表 服务类
+ * </p>
+ *
+ * @author zyj
+ * @since 2023-05-25
+ */
+public interface IAlarmService extends IService<Alarm> {
+
+}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IBusAlarmService.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IBusAlarmService.java
deleted file mode 100644
index f63c19c..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IBusAlarmService.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package com.casic.missiles.modular.system.service;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.modular.system.dto.AlarmTypeCountDTO;
-import com.casic.missiles.modular.system.dto.AlarmUpload;
-import com.casic.missiles.modular.system.entity.BusAlarm;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-import java.util.List;
-
-/**
- * <p>
- * 报警记录表 服务类
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface IBusAlarmService extends IService<BusAlarm> {
-
-    boolean alarmUpload(AlarmUpload alarmUpload);
-
-    Page<BusAlarm> listPage(Page<BusAlarm> page,QueryWrapper<BusAlarm> queryWrapper);
-
-    List<AlarmTypeCountDTO> alarmCount(Long projectId,String alarmStatus);
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IBusEventImageService.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IBusEventImageService.java
deleted file mode 100644
index b1187ed..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IBusEventImageService.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.casic.missiles.modular.system.service;
-
-import com.casic.missiles.modular.system.entity.BusEventImage;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-import java.util.List;
-
-/**
- * <p>
- * 事件图片表 服务类
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface IBusEventImageService extends IService<BusEventImage> {
-
-    boolean saveBusEventImages(Long eventId, List<BusEventImage> imageList);
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IBusEventService.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IBusEventService.java
deleted file mode 100644
index 85c48d0..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IBusEventService.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package com.casic.missiles.modular.system.service;
-
-import com.casic.missiles.modular.system.entity.BusEvent;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-/**
- * <p>
- * 事件表 服务类
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface IBusEventService extends IService<BusEvent> {
-
-    boolean saveBusEvent(BusEvent busEvent);
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IDeviceExtService.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IDeviceExtService.java
deleted file mode 100644
index 6fc5361..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IDeviceExtService.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package com.casic.missiles.modular.system.service;
-
-import com.casic.missiles.modular.system.dto.DeviceDetailDTO;
-import com.casic.missiles.modular.system.entity.DeviceExt;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-import java.util.List;
-
-/**
- * <p>
- * 设备扩展信息表（安全树） 服务类
- * </p>
- *
- * @author zyj
- * @since 2023-04-27
- */
-public interface IDeviceExtService extends IService<DeviceExt> {
-
-    boolean saveDeviceExt(DeviceDetailDTO deviceDetailDTO);
-
-    boolean updateDeviceExt(DeviceDetailDTO deviceDetailDTO);
-
-    boolean removeByDeviceIds(List<Long> deviceIds);
-
-    boolean setGasThreshold(String gasIp,String gasPort,String threshold);
-
-    String getGasThreshold(String gasIp,String gasPort);
-
-    Long selectByGasIpPort(String gasIp,String gasPort);
-
-    Long selectByCameraIpPort(String cameraIp,String cameraPort);
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java
index 9e62756..00a421d 100644
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java
@@ -1,32 +1,16 @@
 package com.casic.missiles.modular.system.service;
 
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.modular.system.dto.DeviceDetailDTO;
-import com.casic.missiles.modular.system.dto.HelmetInfoDTO;
 import com.casic.missiles.modular.system.entity.Device;
 import com.baomidou.mybatisplus.extension.service.IService;
 
-import java.util.List;
-
 /**
  * <p>
- *  服务类
+ * 设备记录表 服务类
  * </p>
  *
  * @author zyj
- * @since 2023-04-14
+ * @since 2023-05-25
  */
 public interface IDeviceService extends IService<Device> {
 
-    boolean saveDevice(DeviceDetailDTO deviceDetailDTO);
-
-    boolean updateDevice(DeviceDetailDTO deviceDetailDTO);
-
-    boolean deleteDevices(List<Long> deviceIds);
-
-    Page<DeviceDetailDTO> listPage(Page<DeviceDetailDTO> page, QueryWrapper<DeviceDetailDTO> queryWrapper, String status,Long projectId);
-
-    List<Long> selectProjectDevice(Long projectId);
-
 }
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IProjectDeviceService.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IProjectDeviceService.java
deleted file mode 100644
index 8599411..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IProjectDeviceService.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package com.casic.missiles.modular.system.service;
-
-import com.casic.missiles.modular.system.dto.DeviceLocationDTO;
-import com.casic.missiles.modular.system.entity.ProjectDevice;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-import java.util.List;
-
-/**
- * <p>
- *  服务类
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface IProjectDeviceService extends IService<ProjectDevice> {
-
-    boolean saveProjectDeviceList(Long projectId, List<ProjectDevice> projectDeviceList);
-
-    boolean updateProjectDeviceList(Long projectId, List<ProjectDevice> projectDeviceList);
-
-    boolean deleteByProjectId(Long projectId);
-
-    boolean deleteByProjectIds(List<Long> projectIds);
-
-    List<ProjectDevice> selectDetailByProjectId(Long projectId);
-
-    Long selectProjectIdByDevice(Long deviceId);
-
-    List<DeviceLocationDTO> selectDeviceLocationList(Long projectId);
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IProjectWorkerService.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IProjectWorkerService.java
deleted file mode 100644
index e921bc3..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IProjectWorkerService.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package com.casic.missiles.modular.system.service;
-
-import com.casic.missiles.modular.system.dto.WorkerLocationDTO;
-import com.casic.missiles.modular.system.entity.ProjectDevice;
-import com.casic.missiles.modular.system.entity.ProjectWorker;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-import java.util.List;
-
-/**
- * <p>
- *  服务类
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface IProjectWorkerService extends IService<ProjectWorker> {
-
-    boolean saveProjectWorkerList(Long projectId, List<ProjectWorker> projectWorkerList);
-
-    boolean updateProjectWorkerList(Long projectId, List<ProjectWorker> projectWorkerList);
-
-    boolean deleteByProjectId(Long projectId);
-
-    boolean deleteByProjectIds(List<Long> projectIds);
-
-    List<ProjectWorker> selectDetailByProjectId(Long projectId,String workerType);
-
-    List<WorkerLocationDTO> selectWorkerLocationDTO(Long projectId);
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IWorkSiteInfoService.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IWorkSiteInfoService.java
deleted file mode 100644
index 58a8590..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IWorkSiteInfoService.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package com.casic.missiles.modular.system.service;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.modular.system.dto.WorkSiteDetailDTO;
-import com.casic.missiles.modular.system.entity.WorkSiteInfo;
-import com.baomidou.mybatisplus.extension.service.IService;
-import java.util.List;
-/**
- * <p>
- * 作业现场表 服务类
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface IWorkSiteInfoService extends IService<WorkSiteInfo> {
-
-    boolean addWorkSiteInfo(WorkSiteDetailDTO workSiteDetailDTO);
-
-    boolean updateWorkSiteInfo(WorkSiteDetailDTO workSiteDetailDTO);
-
-    boolean deleteProjects(List<Long> projectIds);
-
-    WorkSiteDetailDTO getWorkSiteDetail(Long projectId);
-
-    Page<WorkSiteInfo> selectListPage(Page<WorkSiteInfo> page, QueryWrapper<WorkSiteInfo> queryWrapper);
-
-    boolean start(Long projectId);
-
-    boolean finish(Long projectId);
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IWorkerService.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IWorkerService.java
deleted file mode 100644
index 6c6ee98..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/IWorkerService.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package com.casic.missiles.modular.system.service;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.modular.system.entity.Worker;
-import com.baomidou.mybatisplus.extension.service.IService;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * <p>
- *  服务类
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-public interface IWorkerService extends IService<Worker> {
-
-    boolean addWorker(Worker worker,Long projectId);
-
-    Page<Worker> selectListPage(Page<Worker> page,QueryWrapper<Worker> ew);
-
-    Worker selectWorkerDetail(Long workerId);
-
-    List<String> faceRegister(String cameraIp,String cameraPort);
-
-    List<Worker> projectTempWorker(Long projectId);
-
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/impl/AlarmServiceImpl.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/impl/AlarmServiceImpl.java
new file mode 100644
index 0000000..6e5959b
--- /dev/null
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/impl/AlarmServiceImpl.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.modular.system.service.impl;
+
+import com.casic.missiles.modular.system.entity.Alarm;
+import com.casic.missiles.modular.system.mapper.AlarmMapper;
+import com.casic.missiles.modular.system.service.IAlarmService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 报警记录表 服务实现类
+ * </p>
+ *
+ * @author zyj
+ * @since 2023-05-25
+ */
+@Service
+public class AlarmServiceImpl extends ServiceImpl<AlarmMapper, Alarm> implements IAlarmService {
+
+}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/impl/BusAlarmServiceImpl.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/impl/BusAlarmServiceImpl.java
deleted file mode 100644
index b44de1d..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/impl/BusAlarmServiceImpl.java
+++ /dev/null
@@ -1,121 +0,0 @@
-package com.casic.missiles.modular.system.service.impl;
-
-import cn.hutool.core.date.DateUtil;
-import cn.hutool.core.util.ObjectUtil;
-import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.core.application.service.AbstractDictService;
-import com.casic.missiles.modular.system.consts.AlarmTypeEnum;
-import com.casic.missiles.modular.system.dto.AlarmTypeCountDTO;
-import com.casic.missiles.modular.system.dto.AlarmUpload;
-import com.casic.missiles.modular.system.entity.BusAlarm;
-import com.casic.missiles.modular.system.entity.DataTreeLocation;
-import com.casic.missiles.modular.system.mapper.BusAlarmMapper;
-import com.casic.missiles.modular.system.service.*;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.util.Date;
-import java.util.List;
-import java.util.stream.Collectors;
-
-import static com.casic.missiles.modular.system.consts.AlarmConst.ALARM_STATUS_ON;
-
-/**
- * <p>
- * 报警记录表 服务实现类
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@Service
-@RequiredArgsConstructor
-@Slf4j
-public class BusAlarmServiceImpl extends ServiceImpl<BusAlarmMapper, BusAlarm> implements IBusAlarmService {
-
-    private final IDeviceExtService deviceExtService;
-    private final IDeviceService deviceService;
-    private final IProjectDeviceService projectDeviceService;
-
-    private final ICasicFileService fileService;
-
-    private final AbstractDictService dictService;
-    private final IDataSupportService dataSupportService;
-
-    @Override
-    @Transactional
-    public boolean alarmUpload(AlarmUpload alarmUpload) {
-        log.info("alarm upload ==> {}",alarmUpload.toString());
-        Long deviceId = null;
-        if(StrUtil.isAllNotBlank(alarmUpload.getGasIp(),alarmUpload.getGasPort())){
-            deviceId = deviceExtService.selectByGasIpPort(alarmUpload.getGasIp(),alarmUpload.getGasPort());
-        }
-        if(ObjectUtil.isEmpty(deviceId) && StrUtil.isAllNotBlank(alarmUpload.getCameraIp(),alarmUpload.getCameraPort())){
-            deviceId = deviceExtService.selectByCameraIpPort(alarmUpload.getCameraIp(),alarmUpload.getCameraPort());
-        }
-
-        if(ObjectUtil.isEmpty(deviceId)){
-            return false;
-        }
-
-        BusAlarm alarm = new BusAlarm();
-        alarm.setDeviceId(deviceId);
-        alarm.setProjectId(projectDeviceService.selectProjectIdByDevice(deviceId));
-        alarm.setAlarmValue(alarmUpload.getAlarmValue());
-        if(StrUtil.isNotEmpty(alarmUpload.getAlarmTime())){
-            alarm.setAlarmTime(DateUtil.parseDateTime(alarmUpload.getAlarmTime()));
-        }else {
-            alarm.setAlarmTime(new Date());
-        }
-
-        alarm.setAlarmType(alarmUpload.getAlarmType());
-        alarm.setAlarmContent(alarmUpload.getAlarmContent());
-        if(StrUtil.isNotEmpty(alarmUpload.getAlarmImage())){
-            String imgBase64 = "data:image/jpeg;base64," + alarmUpload.getAlarmImage();
-            String imageUrl = fileService.saveFile(imgBase64);
-            alarm.setAlarmImage(imageUrl);
-        }
-        alarm.setAlarmStatus(ALARM_STATUS_ON);
-
-        DataTreeLocation treeLocation = dataSupportService.getTreeLocation(deviceId);
-        if(ObjectUtil.isNotEmpty(treeLocation)){
-            alarm.setAlarmLng(treeLocation.getGdLng());
-            alarm.setAlarmLat(treeLocation.getGdLat());
-        }
-
-        //自动消警
-        AlarmTypeEnum alarmTypeEnum = AlarmTypeEnum.getByAlarmType(alarm.getAlarmType());
-        if(ObjectUtil.isNotEmpty(alarmTypeEnum) && alarmTypeEnum.isAutoCancel()){
-            this.baseMapper.cancelAlarm(deviceId,alarm.getAlarmType());
-        }
-        return this.save(alarm);
-    }
-
-    @Override
-    public Page<BusAlarm> listPage(Page<BusAlarm> page, QueryWrapper<BusAlarm> queryWrapper) {
-        page = this.baseMapper.listPage(page, queryWrapper);
-        for (BusAlarm alarm : page.getRecords()) {
-            alarm.setAlarmTypeName(dictService.getDictNameByCode("alarmType",alarm.getAlarmType()));
-            alarm.setAlarmStatusName(dictService.getDictNameByCode("alarmStatus",alarm.getAlarmStatus()));
-            if(StrUtil.isNotEmpty(alarm.getProjectState())){
-                alarm.setProjectStateName(dictService.getDictNameByCode("projectStatus",alarm.getProjectState()));
-            }
-        }
-        return page;
-    }
-
-    @Override
-    public List<AlarmTypeCountDTO> alarmCount(Long projectId, String alarmStatus) {
-        List<AlarmTypeCountDTO> list = this.baseMapper.alarmCount(projectId, alarmStatus);
-        list = list.stream().filter(i->StrUtil.isNotEmpty(i.getAlarmType())).collect(Collectors.toList());
-        for (AlarmTypeCountDTO countDTO : list) {
-            countDTO.setAlarmTypeName(dictService.getDictNameByCode("alarmType",countDTO.getAlarmType()));
-        }
-        return list;
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/impl/BusEventImageServiceImpl.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/impl/BusEventImageServiceImpl.java
deleted file mode 100644
index a43f7c1..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/impl/BusEventImageServiceImpl.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package com.casic.missiles.modular.system.service.impl;
-
-import com.casic.missiles.modular.system.entity.BusEventImage;
-import com.casic.missiles.modular.system.mapper.BusEventImageMapper;
-import com.casic.missiles.modular.system.service.IBusEventImageService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-/**
- * <p>
- * 事件图片表 服务实现类
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@Service
-public class BusEventImageServiceImpl extends ServiceImpl<BusEventImageMapper, BusEventImage> implements IBusEventImageService {
-
-    @Override
-    public boolean saveBusEventImages(Long eventId, List<BusEventImage> imageList) {
-        imageList.forEach(i->i.setEventId(eventId));
-        return this.saveBatch(imageList);
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/impl/BusEventServiceImpl.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/impl/BusEventServiceImpl.java
deleted file mode 100644
index 21e511c..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/impl/BusEventServiceImpl.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package com.casic.missiles.modular.system.service.impl;
-
-import com.casic.missiles.modular.system.entity.BusEvent;
-import com.casic.missiles.modular.system.mapper.BusEventMapper;
-import com.casic.missiles.modular.system.service.IBusEventImageService;
-import com.casic.missiles.modular.system.service.IBusEventService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import lombok.RequiredArgsConstructor;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.util.Date;
-
-/**
- * <p>
- * 事件表 服务实现类
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@Service
-@RequiredArgsConstructor
-public class BusEventServiceImpl extends ServiceImpl<BusEventMapper, BusEvent> implements IBusEventService {
-
-    private final IBusEventImageService busEventImageService;
-
-
-    @Override
-    @Transactional
-    public boolean saveBusEvent(BusEvent busEvent) {
-        busEvent.setCreateTime(new Date());
-        boolean res = this.save(busEvent);
-        if(res){
-            res = busEventImageService.saveBusEventImages(busEvent.getId(),busEvent.getImageList());
-        }
-        return res;
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceExtServiceImpl.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceExtServiceImpl.java
deleted file mode 100644
index 2bdb63d..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceExtServiceImpl.java
+++ /dev/null
@@ -1,102 +0,0 @@
-package com.casic.missiles.modular.system.service.impl;
-
-import cn.hutool.core.util.ObjectUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
-import com.casic.missiles.modular.system.dto.DeviceDetailDTO;
-import com.casic.missiles.modular.system.entity.DeviceExt;
-import com.casic.missiles.modular.system.mapper.DeviceExtMapper;
-import com.casic.missiles.modular.system.service.IDeviceExtService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-/**
- * <p>
- * 设备扩展信息表（安全树） 服务实现类
- * </p>
- *
- * @author zyj
- * @since 2023-04-27
- */
-@Service
-public class DeviceExtServiceImpl extends ServiceImpl<DeviceExtMapper, DeviceExt> implements IDeviceExtService {
-
-
-    @Override
-    public boolean saveDeviceExt(DeviceDetailDTO deviceDetailDTO) {
-        DeviceExt ext = new DeviceExt();
-        ext.setDeviceId(deviceDetailDTO.getId());
-        ext.setCameraCode(deviceDetailDTO.getCameraCode());
-        ext.setCameraIp(deviceDetailDTO.getCameraIp());
-        ext.setCameraPort(deviceDetailDTO.getCameraPort());
-        ext.setGasCode(deviceDetailDTO.getGasCode());
-        ext.setGasIp(deviceDetailDTO.getGasIp());
-        ext.setGasPort(deviceDetailDTO.getGasPort());
-        ext.setHatLiningCode(deviceDetailDTO.getHatLiningCode());
-        return this.save(ext);
-    }
-
-    @Override
-    public boolean updateDeviceExt(DeviceDetailDTO deviceDetailDTO) {
-        DeviceExt ext = this.selectByDeviceId(deviceDetailDTO.getId());
-        ext.setCameraCode(deviceDetailDTO.getCameraCode());
-        ext.setCameraIp(deviceDetailDTO.getCameraIp());
-        ext.setCameraPort(deviceDetailDTO.getCameraPort());
-        ext.setGasCode(deviceDetailDTO.getGasCode());
-        ext.setGasIp(deviceDetailDTO.getGasIp());
-        ext.setGasPort(deviceDetailDTO.getGasPort());
-        ext.setHatLiningCode(deviceDetailDTO.getHatLiningCode());
-        return this.updateById(ext);
-    }
-
-    @Override
-    public boolean removeByDeviceIds(List<Long> deviceIds) {
-        QueryWrapper<DeviceExt> queryWrapper = new QueryWrapper<>();
-        queryWrapper.in("DEVICE_ID",deviceIds);
-        return this.remove(queryWrapper);
-    }
-
-    @Override
-    public boolean setGasThreshold(String gasIp, String gasPort, String threshold) {
-        UpdateWrapper<DeviceExt> updateWrapper = new UpdateWrapper<>();
-        updateWrapper.set("GAS_THRESHOLD",threshold);
-        updateWrapper.eq("GAS_IP",gasIp);
-        updateWrapper.eq("GAS_PORT",gasPort);
-        return this.update(updateWrapper);
-    }
-
-    @Override
-    public String getGasThreshold(String gasIp, String gasPort) {
-        QueryWrapper<DeviceExt> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("GAS_IP",gasIp);
-        queryWrapper.eq("GAS_PORT",gasPort);
-        DeviceExt deviceExt = this.getOne(queryWrapper);
-        return ObjectUtil.isNotEmpty(deviceExt) ? deviceExt.getGasThreshold() : null;
-    }
-
-    private DeviceExt selectByDeviceId(Long deviceId){
-        QueryWrapper<DeviceExt> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("DEVICE_ID",deviceId);
-        return this.getOne(queryWrapper);
-    }
-
-    @Override
-    public Long selectByGasIpPort(String gasIp, String gasPort) {
-        QueryWrapper<DeviceExt> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("GAS_IP",gasIp);
-        queryWrapper.eq("GAS_PORT",gasPort);
-        DeviceExt deviceExt = this.getOne(queryWrapper);
-        return ObjectUtil.isNotEmpty(deviceExt) ? deviceExt.getDeviceId() : null;
-    }
-
-    @Override
-    public Long selectByCameraIpPort(String cameraIp, String cameraPort) {
-        QueryWrapper<DeviceExt> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("CAMERA_IP",cameraIp);
-        queryWrapper.eq("CAMERA_PORT",cameraPort);
-        DeviceExt deviceExt = this.getOne(queryWrapper);
-        return ObjectUtil.isNotEmpty(deviceExt) ? deviceExt.getDeviceId() : null;
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java
index 9df79ef..31a5a18 100644
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java
+++ b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java
@@ -1,125 +1,20 @@
 package com.casic.missiles.modular.system.service.impl;
 
-import cn.hutool.core.collection.CollUtil;
-import cn.hutool.core.date.DateUtil;
-import cn.hutool.core.util.ObjectUtil;
-import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.core.application.service.AbstractDictService;
-import com.casic.missiles.modular.system.dto.DeviceDetailDTO;
-import com.casic.missiles.modular.system.dto.HelmetInfoDTO;
 import com.casic.missiles.modular.system.entity.Device;
 import com.casic.missiles.modular.system.mapper.DeviceMapper;
-import com.casic.missiles.modular.system.service.IDeviceExtService;
 import com.casic.missiles.modular.system.service.IDeviceService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.casic.missiles.modular.system.service.IProjectDeviceService;
-import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.util.Date;
-import java.util.List;
-
-import static com.casic.missiles.modular.system.consts.DeviceConst.*;
 
 /**
  * <p>
- *  服务实现类
+ * 设备记录表 服务实现类
  * </p>
  *
  * @author zyj
- * @since 2023-04-14
+ * @since 2023-05-25
  */
 @Service
-@RequiredArgsConstructor
 public class DeviceServiceImpl extends ServiceImpl<DeviceMapper, Device> implements IDeviceService {
 
-    private final AbstractDictService dictService;
-    private final IDeviceExtService deviceExtService;
-
-    private final IProjectDeviceService projectDeviceService;
-
-    @Transactional
-    @Override
-    public boolean saveDevice(DeviceDetailDTO deviceDetailDTO) {
-        deviceDetailDTO.setCreateTime(new Date());
-        boolean deviceRes = this.save(deviceDetailDTO);
-        if(deviceRes && DEVICE_TYPE_TREE.equals(deviceDetailDTO.getDeviceType())){
-            deviceRes = deviceExtService.saveDeviceExt(deviceDetailDTO);
-        }
-        return deviceRes;
-    }
-
-    @Transactional
-    @Override
-    public boolean updateDevice(DeviceDetailDTO deviceDetailDTO) {
-        boolean deviceRes = this.updateById(deviceDetailDTO);
-        if(deviceRes && DEVICE_TYPE_TREE.equals(deviceDetailDTO.getDeviceType())){
-            deviceRes = deviceExtService.updateDeviceExt(deviceDetailDTO);
-        }
-        return deviceRes;
-    }
-
-    @Transactional
-    @Override
-    public boolean deleteDevices(List<Long> deviceIds) {
-        return this.removeByIds(deviceIds) & deviceExtService.removeByDeviceIds(deviceIds);
-    }
-
-    @Override
-    public Page<DeviceDetailDTO> listPage(Page<DeviceDetailDTO> page, QueryWrapper<DeviceDetailDTO> queryWrapper,String status,Long projectId) {
-        String ID_COLUMN_NAME = "br_device.ID";
-        List<Long> useDevices = this.selectProjectDevice(null);
-        List<Long> projectDevices;
-        if(ObjectUtil.isNotEmpty(projectId)){
-            projectDevices = this.selectProjectDevice(projectId);
-        } else {
-            projectDevices = null;
-        }
-
-        // 查询使用中的设备（如果传了 projectId，查询 使用中&&此现场）
-        if(DEVICE_STATUS_USE.equals(status)){
-            if(CollUtil.isEmpty(useDevices)){
-                return page;
-            }
-            if(ObjectUtil.isNotEmpty(projectId) && CollUtil.isEmpty(projectDevices)){
-                return page;
-            }
-            queryWrapper.in(ID_COLUMN_NAME,useDevices);
-            if(CollUtil.isNotEmpty(projectDevices)){
-                queryWrapper.in(ID_COLUMN_NAME,projectDevices);
-            }
-
-        }
-
-        // 查询未使用的设备（如果传了 projectId，查询 未使用||此现场）
-        if(DEVICE_STATUS_NORMAL.equals(status)) {
-            if (CollUtil.isNotEmpty(useDevices)) {
-                if (CollUtil.isEmpty(projectDevices)) {
-                    queryWrapper.notIn(ID_COLUMN_NAME, useDevices);
-                } else {
-                    queryWrapper.and(i -> i.notIn(ID_COLUMN_NAME, useDevices).or().in(ID_COLUMN_NAME, projectDevices));
-                }
-            }
-        }
-
-        page = this.baseMapper.listDetailPage(page, queryWrapper);
-        for (DeviceDetailDTO record : page.getRecords()) {
-            record.setDeviceTypeName(dictService.getDictNameByCode("deviceType",record.getDeviceType()));
-            record.setIsPowerSupplyName(dictService.getDictNameByCode("isPowerSupply",record.getIsPowerSupply()));
-            record.setRegisterTime(DateUtil.formatDate(record.getCreateTime()));
-            record.setStatus(useDevices.contains(record.getId()) ? DEVICE_STATUS_USE : DEVICE_STATUS_NORMAL);
-            record.setStatusName(dictService.getDictNameByCode("deviceStatus",record.getStatus()));
-        }
-        return page;
-    }
-
-    @Override
-    public List<Long> selectProjectDevice(Long projectId) {
-        return this.baseMapper.selectProjectDevice(projectId);
-    }
-
-
 }
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceSupportServiceImpl.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceSupportServiceImpl.java
deleted file mode 100644
index ffd01ff..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceSupportServiceImpl.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package com.casic.missiles.modular.system.service.impl;
-
-import com.casic.missiles.modular.system.dto.HelmetInfoDTO;
-import com.casic.missiles.modular.system.mapper.DeviceMapper;
-import com.casic.missiles.modular.system.service.IDeviceExtService;
-import com.casic.missiles.modular.system.service.IDeviceSupportService;
-import lombok.RequiredArgsConstructor;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-import static com.casic.missiles.modular.system.consts.DeviceConst.DEVICE_TYPE_HAT;
-
-@Service
-@RequiredArgsConstructor
-public class DeviceSupportServiceImpl implements IDeviceSupportService {
-
-    private final IDeviceExtService deviceExtService;
-
-    private final DeviceMapper deviceMapper;
-
-    @Override
-    public Long selectByGasIpPort(String gasIp, String gasPort) {
-        return deviceExtService.selectByGasIpPort(gasIp, gasPort);
-    }
-
-    @Override
-    public List<HelmetInfoDTO> selectHelmetList() {
-        return deviceMapper.selectHelmetList(DEVICE_TYPE_HAT);
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/impl/ProjectDeviceServiceImpl.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/impl/ProjectDeviceServiceImpl.java
deleted file mode 100644
index 965f55c..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/impl/ProjectDeviceServiceImpl.java
+++ /dev/null
@@ -1,96 +0,0 @@
-package com.casic.missiles.modular.system.service.impl;
-
-import cn.hutool.core.date.DateUtil;
-import cn.hutool.core.util.ObjectUtil;
-import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.casic.missiles.modular.system.dto.DeviceLocationDTO;
-import com.casic.missiles.modular.system.entity.DataGas;
-import com.casic.missiles.modular.system.entity.DataTreeLocation;
-import com.casic.missiles.modular.system.entity.ProjectDevice;
-import com.casic.missiles.modular.system.mapper.ProjectDeviceMapper;
-import com.casic.missiles.modular.system.service.IDataSupportService;
-import com.casic.missiles.modular.system.service.IProjectDeviceService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.casic.missiles.modular.system.utils.LngLatUtil;
-import lombok.RequiredArgsConstructor;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.util.List;
-import java.util.stream.Collectors;
-
-/**
- * <p>
- *  服务实现类
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@Service
-@RequiredArgsConstructor
-public class ProjectDeviceServiceImpl extends ServiceImpl<ProjectDeviceMapper, ProjectDevice> implements IProjectDeviceService {
-
-    private final IDataSupportService dataSupportService;
-
-    @Override
-    public boolean saveProjectDeviceList(Long projectId, List<ProjectDevice> projectDeviceList) {
-        projectDeviceList.forEach(i->i.setProjectId(projectId));
-        return this.saveBatch(projectDeviceList);
-    }
-
-    @Transactional
-    @Override
-    public boolean updateProjectDeviceList(Long projectId, List<ProjectDevice> projectDeviceList) {
-        return this.deleteByProjectId(projectId) && this.saveProjectDeviceList(projectId, projectDeviceList);
-    }
-
-    @Override
-    public boolean deleteByProjectId(Long projectId) {
-        QueryWrapper<ProjectDevice> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("PROJECT_ID",projectId);
-        return this.remove(queryWrapper);
-    }
-
-    @Override
-    public boolean deleteByProjectIds(List<Long> projectId) {
-        QueryWrapper<ProjectDevice> queryWrapper = new QueryWrapper<>();
-        queryWrapper.in("PROJECT_ID",projectId);
-        return this.remove(queryWrapper);
-    }
-
-    @Override
-    public List<ProjectDevice> selectDetailByProjectId(Long projectId) {
-        return this.baseMapper.selectDetailByProjectId(projectId);
-    }
-
-    @Override
-    public Long selectProjectIdByDevice(Long deviceId) {
-        QueryWrapper<ProjectDevice> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("DEVICE_ID",deviceId);
-        queryWrapper.exists("(select Id FROM br_work_site_info p where p.ID = br_project_device.PROJECT_ID AND p.PROJECT_STATE != '3')");
-        ProjectDevice projectDevice = this.getOne(queryWrapper);
-        return ObjectUtil.isNotEmpty(projectDevice) ? projectDevice.getProjectId() : null;
-    }
-
-    @Override
-    public List<DeviceLocationDTO> selectDeviceLocationList(Long projectId) {
-        List<DeviceLocationDTO> list = this.baseMapper.selectDeviceLocationList(projectId);
-        for (DeviceLocationDTO locationDTO : list) {
-            DataGas dataGas = dataSupportService.getGasData(locationDTO.getDeviceId());
-            DataTreeLocation location = dataSupportService.getTreeLocation(locationDTO.getDeviceId(),true);
-            if(ObjectUtil.isNotEmpty(dataGas)){
-                locationDTO.setGasValue(dataGas.getGasValue());
-                locationDTO.setTime(DateUtil.formatDateTime(dataGas.getTs()));
-            }
-            if(ObjectUtil.isNotEmpty(location)){
-                locationDTO.setLng(location.getGdLng());
-                locationDTO.setLat(location.getGdLat());
-                locationDTO.setLocation(location.getLocation());
-            }
-        }
-        list = list.stream().filter(i-> StrUtil.isAllNotEmpty(i.getLng(),i.getLat())).collect(Collectors.toList());
-        return LngLatUtil.sort(list);
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/impl/ProjectWorkerServiceImpl.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/impl/ProjectWorkerServiceImpl.java
deleted file mode 100644
index c3ec86c..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/impl/ProjectWorkerServiceImpl.java
+++ /dev/null
@@ -1,101 +0,0 @@
-package com.casic.missiles.modular.system.service.impl;
-
-import cn.hutool.core.date.DateUtil;
-import cn.hutool.core.util.ObjectUtil;
-import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.casic.missiles.core.application.service.AbstractDeptService;
-import com.casic.missiles.modular.system.dto.WorkerLocationDTO;
-import com.casic.missiles.modular.system.entity.DataHelmetHealth;
-import com.casic.missiles.modular.system.entity.DataHelmetLocation;
-import com.casic.missiles.modular.system.entity.ProjectWorker;
-import com.casic.missiles.modular.system.mapper.ProjectWorkerMapper;
-import com.casic.missiles.modular.system.service.IHelmetSupportService;
-import com.casic.missiles.modular.system.service.IProjectWorkerService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import lombok.RequiredArgsConstructor;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.util.List;
-import java.util.stream.Collectors;
-
-import static com.casic.missiles.modular.system.consts.ProjectConst.WORKER_TYPE_NORMAL;
-
-/**
- * <p>
- *  服务实现类
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@Service
-@RequiredArgsConstructor
-public class ProjectWorkerServiceImpl extends ServiceImpl<ProjectWorkerMapper, ProjectWorker> implements IProjectWorkerService {
-
-    private final AbstractDeptService deptService;
-    private final IHelmetSupportService helmetSupportService;
-
-    @Override
-    public boolean saveProjectWorkerList(Long projectId, List<ProjectWorker> projectWorkerList) {
-        projectWorkerList.forEach(i->i.setProjectId(projectId));
-        return this.saveBatch(projectWorkerList);
-    }
-
-    @Transactional
-    @Override
-    public boolean updateProjectWorkerList(Long projectId, List<ProjectWorker> projectWorkerList) {
-        return this.deleteByProjectId(projectId) && this.saveProjectWorkerList(projectId, projectWorkerList) ;
-    }
-
-    @Override
-    public boolean deleteByProjectId(Long projectId) {
-        QueryWrapper<ProjectWorker> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("PROJECT_ID",projectId);
-        return this.remove(queryWrapper);
-    }
-
-    @Override
-    public boolean deleteByProjectIds(List<Long> projectIds) {
-        QueryWrapper<ProjectWorker> queryWrapper = new QueryWrapper<>();
-        queryWrapper.in("PROJECT_ID",projectIds);
-        return this.remove(queryWrapper);
-    }
-
-
-    @Override
-    public List<ProjectWorker> selectDetailByProjectId(Long projectId,String workerType) {
-        List<ProjectWorker> projectWorkerList = this.baseMapper.selectDetailByProjectId(projectId,workerType);
-        for (ProjectWorker projectWorker : projectWorkerList) {
-            if(ObjectUtil.isNotEmpty(projectWorker.getWorkerDeptId())){
-                projectWorker.setWorkerDeptName(deptService.getDeptName(projectWorker.getWorkerDeptId()));
-            }
-        }
-        return projectWorkerList;
-    }
-
-    @Override
-    public List<WorkerLocationDTO> selectWorkerLocationDTO(Long projectId) {
-        List<WorkerLocationDTO> projectWorkerList = this.baseMapper.selectWorkerLocationList(projectId,WORKER_TYPE_NORMAL);
-        for (WorkerLocationDTO workerLocationDTO : projectWorkerList) {
-            if(ObjectUtil.isNotEmpty(workerLocationDTO.getHatId())){
-                DataHelmetLocation location = helmetSupportService.getHelmetLocation(workerLocationDTO.getHatId(),true);
-                if(ObjectUtil.isNotEmpty(location)){
-                    workerLocationDTO.setLng(location.getGdLng());
-                    workerLocationDTO.setLat(location.getGdLat());
-                    workerLocationDTO.setLocation(location.getLocation());
-                }
-
-                DataHelmetHealth health = helmetSupportService.getHelmetHealth(workerLocationDTO.getHatId());
-                if(ObjectUtil.isNotEmpty(health)){
-                    workerLocationDTO.setBloodOxygen(health.getBloodOxygen());
-                    workerLocationDTO.setHeartRate(health.getHeartRate());
-                    workerLocationDTO.setTime(DateUtil.formatDateTime(health.getTs()));
-                }
-            }
-        }
-        projectWorkerList = projectWorkerList.stream().filter(i-> StrUtil.isAllNotEmpty(i.getLng(),i.getLat())).collect(Collectors.toList());
-        return projectWorkerList;
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/impl/WorkSiteInfoServiceImpl.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/impl/WorkSiteInfoServiceImpl.java
deleted file mode 100644
index 5068da2..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/impl/WorkSiteInfoServiceImpl.java
+++ /dev/null
@@ -1,151 +0,0 @@
-package com.casic.missiles.modular.system.service.impl;
-
-import cn.hutool.core.bean.BeanUtil;
-import cn.hutool.core.collection.CollUtil;
-import cn.hutool.core.date.DateUtil;
-import cn.hutool.core.util.ObjectUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.core.application.service.AbstractDeptService;
-import com.casic.missiles.core.application.service.AbstractDictService;
-import com.casic.missiles.modular.system.dto.WorkSiteDetailDTO;
-import com.casic.missiles.modular.system.entity.ProjectWorker;
-import com.casic.missiles.modular.system.entity.WorkSiteInfo;
-import com.casic.missiles.modular.system.entity.Worker;
-import com.casic.missiles.modular.system.mapper.WorkSiteInfoMapper;
-import com.casic.missiles.modular.system.service.*;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import lombok.RequiredArgsConstructor;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.stream.Collectors;
-
-import static com.casic.missiles.modular.system.consts.ProjectConst.*;
-
-/**
- * <p>
- * 作业现场表 服务实现类
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@Service
-@RequiredArgsConstructor
-public class WorkSiteInfoServiceImpl extends ServiceImpl<WorkSiteInfoMapper, WorkSiteInfo> implements IWorkSiteInfoService {
-
-    private final IProjectWorkerService projectWorkerService;
-    private final IProjectDeviceService projectDeviceService;
-
-    private final IWorkerService workerService;
-    private final IBraceletService braceletService;
-
-    private final AbstractDeptService deptService;
-    private final AbstractDictService dictService;
-    @Override
-    @Transactional
-    public boolean addWorkSiteInfo(WorkSiteDetailDTO workSiteDetailDTO) {
-        workSiteDetailDTO.setCreateTime(new Date());
-        workSiteDetailDTO.setUpdateTime(new Date());
-        workSiteDetailDTO.setProjectState(PROJECT_STATE_PREPARE);
-        boolean res = this.save(workSiteDetailDTO);
-        if(res){
-            res = projectDeviceService.saveProjectDeviceList(workSiteDetailDTO.getId(), workSiteDetailDTO.getDeviceList());
-            res = res & projectWorkerService.saveProjectWorkerList(workSiteDetailDTO.getId(), workSiteDetailDTO.getWorkerList());
-        }
-        return res;
-    }
-
-    @Override
-    @Transactional
-    public boolean updateWorkSiteInfo(WorkSiteDetailDTO workSiteDetailDTO) {
-        workSiteDetailDTO.setUpdateTime(new Date());
-        boolean res = this.updateById(workSiteDetailDTO);
-        if(res){
-            res = projectDeviceService.updateProjectDeviceList(workSiteDetailDTO.getId(), workSiteDetailDTO.getDeviceList());
-            res = res & projectWorkerService.updateProjectWorkerList(workSiteDetailDTO.getId(), workSiteDetailDTO.getWorkerList());
-        }
-        return res;
-    }
-
-    @Override
-    public boolean deleteProjects(List<Long> projectIds) {
-        if(CollUtil.isNotEmpty(projectIds)) {
-             projectDeviceService.deleteByProjectIds(projectIds);
-             projectWorkerService.deleteByProjectIds(projectIds);
-             return this.removeByIds(projectIds);
-        }
-        return true;
-    }
-
-    @Override
-    public WorkSiteDetailDTO getWorkSiteDetail(Long projectId) {
-        WorkSiteInfo workSiteInfo = this.getById(projectId);
-        WorkSiteDetailDTO workSiteDetailDTO = new WorkSiteDetailDTO();
-        BeanUtil.copyProperties(workSiteInfo,workSiteDetailDTO,true);
-        workSiteDetailDTO.setDeviceList(projectDeviceService.selectDetailByProjectId(projectId));
-        workSiteDetailDTO.setWorkerList(projectWorkerService.selectDetailByProjectId(projectId,WORKER_TYPE_NORMAL));
-
-        Worker responseWorker = workerService.selectWorkerDetail(workSiteDetailDTO.getWorkPerson());
-        if(ObjectUtil.isNotEmpty(responseWorker)){
-            workSiteDetailDTO.setWorkPersonName(responseWorker.getWorkerName());
-            workSiteDetailDTO.setWorkPersonPhoneNumber(responseWorker.getPhoneNumber());
-            workSiteDetailDTO.setWorkPersonDeptId(responseWorker.getDeptId());
-            workSiteDetailDTO.setWorkPersonDeptName(responseWorker.getDeptName());
-        }
-        return workSiteDetailDTO;
-    }
-
-    @Override
-    public Page<WorkSiteInfo> selectListPage(Page<WorkSiteInfo> page, QueryWrapper<WorkSiteInfo> queryWrapper) {
-        page = this.baseMapper.selectListPage(page, queryWrapper);
-        for (WorkSiteInfo workSiteInfo : page.getRecords()) {
-            workSiteInfo.setProjectStateName(dictService.getDictNameByCode("projectState", workSiteInfo.getProjectState()));
-            if(ObjectUtil.isNotEmpty(workSiteInfo.getWorkPersonDeptId())){
-                workSiteInfo.setWorkPersonDeptName(deptService.getDeptName(workSiteInfo.getWorkPersonDeptId()));
-            }
-            workSiteInfo.setRegisterTime(DateUtil.formatDate(workSiteInfo.getCreateTime()));
-        }
-        return page;
-    }
-
-    @Override
-    public boolean start(Long projectId) {
-        UpdateWrapper<WorkSiteInfo> updateWrapper = new UpdateWrapper<>();
-        updateWrapper.eq("ID",projectId);
-        updateWrapper.set("PROJECT_STATE",PROJECT_STATE_WORKING);
-        updateWrapper.set("START_TIME",new Date());
-        boolean res = this.update(updateWrapper);
-        //braceletService.enableBracelet(selectProjectBracelets(projectId));
-        return res;
-    }
-
-    @Override
-    public boolean finish(Long projectId) {
-        UpdateWrapper<WorkSiteInfo> updateWrapper = new UpdateWrapper<>();
-        updateWrapper.eq("ID",projectId);
-        updateWrapper.set("PROJECT_STATE",PROJECT_STATE_FINISH);
-        updateWrapper.set("FINISH_TIME",new Date());
-        boolean res = this.update(updateWrapper);
-        //braceletService.disableBracelet(selectProjectBracelets(projectId));
-        return res;
-    }
-
-    private List<String> selectProjectBracelets(Long projectId){
-        List<String> deviceCodes = new ArrayList<>();
-        QueryWrapper<ProjectWorker> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("PROJECT_ID",projectId);
-        queryWrapper.isNotNull("BRACELET_CODE");
-        queryWrapper.select("BRACELET_CODE");
-        List<Object> res = projectWorkerService.listObjs(queryWrapper);
-        if(CollUtil.isNotEmpty(res)){
-            deviceCodes = res.stream().map(Object::toString).distinct().collect(Collectors.toList());
-        }
-        return deviceCodes;
-    }
-}
diff --git a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/impl/WorkerServiceImpl.java b/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/impl/WorkerServiceImpl.java
deleted file mode 100644
index 6859cff..0000000
--- a/casic_video_283_server/src/main/java/com/casic/missiles/modular/system/service/impl/WorkerServiceImpl.java
+++ /dev/null
@@ -1,110 +0,0 @@
-package com.casic.missiles.modular.system.service.impl;
-
-import cn.hutool.core.date.DateUtil;
-import cn.hutool.core.util.ObjectUtil;
-import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.core.application.service.AbstractDeptService;
-import com.casic.missiles.core.application.service.AbstractDictService;
-import com.casic.missiles.modular.system.entity.ProjectWorker;
-import com.casic.missiles.modular.system.entity.Worker;
-import com.casic.missiles.modular.system.mapper.WorkerMapper;
-import com.casic.missiles.modular.system.service.*;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import lombok.RequiredArgsConstructor;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-
-import static com.casic.missiles.modular.system.consts.ProjectConst.WORKER_TYPE_TEMP;
-
-/**
- * <p>
- *  服务实现类
- * </p>
- *
- * @author zyj
- * @since 2023-04-14
- */
-@Service
-@RequiredArgsConstructor
-public class WorkerServiceImpl extends ServiceImpl<WorkerMapper, Worker> implements IWorkerService {
-
-    private final IProjectWorkerService projectWorkerService;
-
-    private final IProjectDeviceService projectDeviceService;
-    private final AbstractDictService dictService;
-    private final AbstractDeptService deptService;
-    private final IDeviceExtService deviceExtService;
-
-    @Override
-    @Transactional
-    public boolean addWorker(Worker worker, Long projectId) {
-        worker.setCreateTime(new Date());
-        boolean res = this.save(worker);
-        if(res && ObjectUtil.isNotEmpty(projectId)){
-            res = projectWorkerService.save(new ProjectWorker(projectId, worker.getId()));
-            if(ObjectUtil.isNotEmpty(worker.getWorkerAvatar())){
-                // todo 向一体机推送人脸图片
-            }
-        }
-        return res;
-    }
-
-    @Override
-    public Page<Worker> selectListPage(Page<Worker> page, QueryWrapper<Worker> ew) {
-        page = this.baseMapper.selectListPage(page, ew);
-        for (Worker worker : page.getRecords()) {
-            wrapperWorker(worker);
-        }
-        return page;
-    }
-
-    private void wrapperWorker(Worker worker) {
-        if(StrUtil.isNotEmpty(worker.getGender())){
-            worker.setGenderName(dictService.getDictNameByCode("sysSex", worker.getGender()));
-        }
-        if(ObjectUtil.isNotEmpty(worker.getDeptId())){
-            worker.setDeptName(deptService.getDeptName(worker.getDeptId()));
-        }
-        worker.setRegisterTime(DateUtil.formatDate(worker.getCreateTime()));
-        if(StrUtil.isNotEmpty(worker.getStatus())){
-            worker.setStatusName(dictService.getDictNameByCode("workerStatus", worker.getStatus()));
-        }
-    }
-
-    @Override
-    public Worker selectWorkerDetail(Long workerId) {
-        Worker worker = this.getById(workerId);
-        if(ObjectUtil.isNotEmpty(worker)){
-            wrapperWorker(worker);
-        }
-        return worker;
-    }
-
-    @Override
-    public List<String> faceRegister(String cameraIp, String cameraPort) {
-        Long deviceId = deviceExtService.selectByCameraIpPort(cameraIp, cameraPort);
-        if(ObjectUtil.isNotEmpty(deviceId)){
-            Long projectId = projectDeviceService.selectProjectIdByDevice(deviceId);
-            if(ObjectUtil.isNotEmpty(projectId)){
-                return this.baseMapper.selectWorkerAvatars(projectId);
-            }
-        }
-        return null;
-    }
-
-    @Override
-    public List<Worker> projectTempWorker(Long projectId) {
-        QueryWrapper<Worker> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("WORKER_TYPE",WORKER_TYPE_TEMP);
-        queryWrapper.exists("(select ID FROM br_project_worker WHERE PROJECT_ID = "+ projectId +")");
-        List<Worker> workers = this.list(queryWrapper);
-        workers.forEach(this::wrapperWorker);
-        return workers;
-    }
-}