修改bug

supervision-admin/src/main/java/com/supervision/RuoYiApplication.java

@@ -11,9 +11,8 @@ import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
  * @author ruoyi
  */
 @SpringBootApplication(exclude = { DataSourceAutoConfiguration.class })
-@MapperScan("com.supervision.web.peopleGateManage.mapper")
-@MapperScan("com.supervision.web.carGateManage.Mapper")
-@MapperScan("com.supervision.web.noticeManage.mapper")
+//@MapperScan("com.supervision.*.mapper") // 只扫描一次
+//@MapperScan("com.supervision.**.mapper") // 扫描所有 mapper 包
 public class RuoYiApplication
 {
     public static void main(String[] args)

supervision-admin/src/main/java/com/supervision/web/ConnectSDK/peopleDoor/PeopleDoorDeviceManager.java

@@ -56,6 +56,9 @@ public class PeopleDoorDeviceManager {
         return deviceMap;
     }
 
+    public void getLoginDeviceSession() {
+    }
+
     @PostConstruct
     public void init() {
         try {

supervision-admin/src/main/java/com/supervision/web/carGateManage/config/HkCameraProperty.java

@@ -1,6 +1,6 @@
 package com.supervision.web.carGateManage.config;
 
-import com.supervision.web.carGateManage.Entity.HkCameraParam;
+import com.supervision.web.carGateManage.entity.HkCameraParam;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import org.springframework.boot.context.properties.ConfigurationProperties;

supervision-admin/src/main/java/com/supervision/web/carGateManage/Controller/CarEventLogController.java → supervision-admin/src/main/java/com/supervision/web/carGateManage/controller/CarEventLogController.java

@@ -1,6 +1,6 @@
-package com.supervision.web.carGateManage.Controller;
+package com.supervision.web.carGateManage.controller;
 
-import com.supervision.web.carGateManage.Service.CarEventLogService;
+import com.supervision.web.carGateManage.service.CarEventLogService;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;

supervision-admin/src/main/java/com/supervision/web/carGateManage/Controller/CarInfoController.java → supervision-admin/src/main/java/com/supervision/web/carGateManage/controller/CarInfoController.java

@@ -1,6 +1,6 @@
-package com.supervision.web.carGateManage.Controller;
-import com.supervision.web.carGateManage.Service.CarInfoService;
-import com.supervision.web.carGateManage.Entity.CarInfo;
+package com.supervision.web.carGateManage.controller;
+import com.supervision.web.carGateManage.service.CarInfoService;
+import com.supervision.web.carGateManage.entity.CarInfo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 

supervision-admin/src/main/java/com/supervision/web/carGateManage/Entity/CarEvent.java → supervision-admin/src/main/java/com/supervision/web/carGateManage/entity/CarEvent.java

@@ -1,4 +1,4 @@
-package com.supervision.web.carGateManage.Entity;
+package com.supervision.web.carGateManage.entity;
 
 import lombok.Data;
 import java.time.LocalDateTime;

supervision-admin/src/main/java/com/supervision/web/carGateManage/Entity/CarEventQuery.java → supervision-admin/src/main/java/com/supervision/web/carGateManage/entity/CarEventQuery.java

@@ -1,4 +1,4 @@
-package com.supervision.web.carGateManage.Entity;
+package com.supervision.web.carGateManage.entity;
 
 public class CarEventQuery {
     private String plateNumber;

supervision-admin/src/main/java/com/supervision/web/carGateManage/Entity/CarInfo.java → supervision-admin/src/main/java/com/supervision/web/carGateManage/entity/CarInfo.java

@@ -1,4 +1,4 @@
-package com.supervision.web.carGateManage.Entity;
+package com.supervision.web.carGateManage.entity;
 
 import lombok.Data;
 

supervision-admin/src/main/java/com/supervision/web/carGateManage/Entity/HkCameraParam.java → supervision-admin/src/main/java/com/supervision/web/carGateManage/entity/HkCameraParam.java

@@ -1,4 +1,4 @@
-package com.supervision.web.carGateManage.Entity;
+package com.supervision.web.carGateManage.entity;
 
 
 import io.swagger.annotations.ApiModelProperty;

supervision-admin/src/main/java/com/supervision/web/carGateManage/Mapper/CarEventLogMapper.java → supervision-admin/src/main/java/com/supervision/web/carGateManage/mapper/CarEventLogMapper.java

@@ -1,6 +1,6 @@
-package com.supervision.web.carGateManage.Mapper;
+package com.supervision.web.carGateManage.mapper;
 
-import com.supervision.web.carGateManage.Entity.CarEvent;
+import com.supervision.web.carGateManage.entity.CarEvent;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 

supervision-admin/src/main/java/com/supervision/web/carGateManage/Mapper/CarInfoMapper.java → supervision-admin/src/main/java/com/supervision/web/carGateManage/mapper/CarInfoMapper.java

@@ -1,8 +1,7 @@
-package com.supervision.web.carGateManage.Mapper;
+package com.supervision.web.carGateManage.mapper;
 
-import com.supervision.web.carGateManage.Entity.CarInfo;
+import com.supervision.web.carGateManage.entity.CarInfo;
 import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 

supervision-admin/src/main/java/com/supervision/web/carGateManage/Service/CarEventLogService.java → supervision-admin/src/main/java/com/supervision/web/carGateManage/service/CarEventLogService.java

@@ -1,4 +1,4 @@
-package com.supervision.web.carGateManage.Service;
+package com.supervision.web.carGateManage.service;
 
 import java.util.Map;
 

supervision-admin/src/main/java/com/supervision/web/carGateManage/Service/CarInfoService.java → supervision-admin/src/main/java/com/supervision/web/carGateManage/service/CarInfoService.java

@@ -1,6 +1,6 @@
-package com.supervision.web.carGateManage.Service;
+package com.supervision.web.carGateManage.service;
 
-import com.supervision.web.carGateManage.Entity.CarInfo;
+import com.supervision.web.carGateManage.entity.CarInfo;
 
 import java.util.List;
 

supervision-admin/src/main/java/com/supervision/web/carGateManage/Service/Impl/CarEventLogServiceImpl.java → supervision-admin/src/main/java/com/supervision/web/carGateManage/service/Impl/CarEventLogServiceImpl.java

@@ -1,8 +1,8 @@
-package com.supervision.web.carGateManage.Service.impl;
+package com.supervision.web.carGateManage.service.impl;
 
-import com.supervision.web.carGateManage.Entity.CarEvent;
-import com.supervision.web.carGateManage.Mapper.CarEventLogMapper;
-import com.supervision.web.carGateManage.Service.CarEventLogService;
+import com.supervision.web.carGateManage.entity.CarEvent;
+import com.supervision.web.carGateManage.mapper.CarEventLogMapper;
+import com.supervision.web.carGateManage.service.CarEventLogService;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;

supervision-admin/src/main/java/com/supervision/web/carGateManage/Service/Impl/CarInfoServiceImpl.java → supervision-admin/src/main/java/com/supervision/web/carGateManage/service/Impl/CarInfoServiceImpl.java

@@ -1,7 +1,7 @@
-package com.supervision.web.carGateManage.Service.impl;
-import com.supervision.web.carGateManage.Entity.CarInfo;
-import com.supervision.web.carGateManage.Mapper.CarInfoMapper;
-import com.supervision.web.carGateManage.Service.CarInfoService;
+package com.supervision.web.carGateManage.service.impl;
+import com.supervision.web.carGateManage.entity.CarInfo;
+import com.supervision.web.carGateManage.mapper.CarInfoMapper;
+import com.supervision.web.carGateManage.service.CarInfoService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 

supervision-admin/src/main/java/com/supervision/web/noticeManage/mapper/NoticeMapper.java

@@ -9,7 +9,6 @@ import java.time.LocalDateTime;
 import java.util.List;
 
 @Mapper
-
 public interface NoticeMapper {
     int insertNotice(com.supervision.web.noticeManage.entity.Notice notice);
 

supervision-admin/src/main/java/com/supervision/web/peopleGateManage/Service/DeviceService.java

@@ -1,17 +0,0 @@
-package com.supervision.web.peopleGateManage.Service;
-
-import com.supervision.web.peopleGateManage.enity.Device;
-
-import java.util.List;
-
-public interface DeviceService {
-    List<Device> getAll();
-
-    Device getById(Long id);
-
-    void add(Device device);
-
-    void update(Device device);
-
-    void delete(Long id);
-}

supervision-admin/src/main/java/com/supervision/web/peopleGateManage/Service/EventLogService.java

@@ -1,9 +0,0 @@
-package com.supervision.web.peopleGateManage.Service;
-
-import com.supervision.web.peopleGateManage.enity.EventLog;
-import java.util.List;
-import java.util.Map;
-
-public interface EventLogService {
-    Map<String, Object> getEventLogs(Map<String, Object> params);
-}

supervision-admin/src/main/java/com/supervision/web/peopleGateManage/Service/PeopleDeviceService.java

@@ -1,19 +0,0 @@
-package com.supervision.web.peopleGateManage.Service;
-
-import java.util.List;
-
-public interface PeopleDeviceService {
-
-    void addRelation(String personId, Long deviceId);
-
-    void bindPersonToDevice(String personId, Long deviceId);
-
-    void bindPersonToDevices(String personId, List<Long> deviceIds);
-
-    void unbindPersonFromDevice(String personId, Long deviceId);
-
-    List<Long> getDevicesByPerson(String personId);
-
-    List<String> getPersonsByDevice(Long deviceId);
-
-}

supervision-admin/src/main/java/com/supervision/web/peopleGateManage/Service/impl/DeviceServiceImpl.java

@@ -1,45 +0,0 @@
-package com.supervision.web.peopleGateManage.Service.impl;
-
-import com.supervision.web.peopleGateManage.mapper.DeviceMapper;
-import com.supervision.web.peopleGateManage.Service.DeviceService;
-import com.supervision.web.peopleGateManage.enity.Device;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.time.LocalDateTime;
-import java.util.List;
-
-@Service
-public class DeviceServiceImpl implements DeviceService {
-
-    @Autowired
-    private DeviceMapper deviceMapper;
-
-    @Override
-    public List<Device> getAll() {
-        return deviceMapper.selectAll();
-    }
-
-    @Override
-    public Device getById(Long id) {
-        return deviceMapper.selectById(id);
-    }
-
-    @Override
-    public void add(Device device) {
-        device.setCreateTime(LocalDateTime.now());
-        device.setUpdateTime(LocalDateTime.now());
-        deviceMapper.insert(device);
-    }
-
-    @Override
-    public void update(Device device) {
-        device.setUpdateTime(LocalDateTime.now());
-        deviceMapper.update(device);
-    }
-
-    @Override
-    public void delete(Long id) {
-        deviceMapper.delete(id);
-    }
-}

supervision-admin/src/main/java/com/supervision/web/peopleGateManage/Service/impl/PeopleDeviceServiceImpl.java

@@ -1,61 +0,0 @@
-package com.supervision.web.peopleGateManage.Service.impl;
-
-import com.supervision.web.peopleGateManage.mapper.PeopleDeviceMapper;
-import com.supervision.web.peopleGateManage.Service.PeopleDeviceService;
-import com.supervision.web.peopleGateManage.enity.PeopleDevice;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.time.LocalDateTime;
-import java.util.List;
-
-@Service
-public class PeopleDeviceServiceImpl implements PeopleDeviceService {
-
-    @Autowired
-    private PeopleDeviceMapper peopleDeviceMapper;
-
-    @Override
-    public void bindPersonToDevice(String personId, Long deviceId) {
-        PeopleDevice pd = new PeopleDevice();
-        pd.setPersonId(personId);
-        pd.setDeviceId(deviceId);
-        pd.setCreateTime(LocalDateTime.now());
-        pd.setUpdateTime(LocalDateTime.now());
-        peopleDeviceMapper.insert(pd);
-    }
-
-    @Override
-    public void bindPersonToDevices(String personId, List<Long> deviceIds) {
-        for (Long deviceId : deviceIds) {
-            bindPersonToDevice(personId, deviceId);
-        }
-    }
-
-    @Override
-    public void unbindPersonFromDevice(String personId, Long deviceId) {
-        peopleDeviceMapper.delete(personId, deviceId);
-    }
-
-    @Override
-    public List<Long> getDevicesByPerson(String personId) {
-        return peopleDeviceMapper.selectDevicesByPerson(personId);
-    }
-
-    @Override
-    public List<String> getPersonsByDevice(Long deviceId) {
-        return peopleDeviceMapper.selectPersonsByDevice(deviceId);
-    }
-
-
-    public void addRelation(String personId, Long deviceId) {
-        PeopleDevice relation = new PeopleDevice();
-        relation.setPersonId(personId);
-        relation.setDeviceId(deviceId);
-        relation.setCreateTime(LocalDateTime.now());
-        relation.setUpdateTime(LocalDateTime.now());
-        peopleDeviceMapper.insertRelation(relation);
-    }
-
-
-}

supervision-admin/src/main/java/com/supervision/web/peopleGateManage/Controller/DeviceManageController.java → supervision-admin/src/main/java/com/supervision/web/peopleGateManage/controller/DeviceManageController.java

@@ -1,20 +1,27 @@
-package com.supervision.web.peopleGateManage.Controller;
-
-import com.supervision.web.peopleGateManage.Service.DeviceService;
-import com.supervision.web.peopleGateManage.Service.PeopleDeviceService;
-import com.supervision.web.peopleGateManage.Service.PeopleInfoService;
-import com.supervision.web.peopleGateManage.enity.Device;
-import com.supervision.web.peopleGateManage.enity.DeviceAddRequest;
-import com.supervision.web.peopleGateManage.enity.PeopleInfo;
+package com.supervision.web.peopleGateManage.controller;
+
+import com.github.pagehelper.PageInfo;
+import com.supervision.web.peopleGateManage.service.DeviceService;
+import com.supervision.web.peopleGateManage.service.PeopleDeviceService;
+import com.supervision.web.peopleGateManage.service.PeopleInfoService;
+import com.supervision.web.peopleGateManage.entity.Device;
+import com.supervision.web.peopleGateManage.entity.DeviceAddRequest;
+import com.supervision.web.peopleGateManage.entity.PeopleInfo;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 @RestController
 @RequestMapping("/device")
 public class DeviceManageController {
 
+    private static final Logger logger = LoggerFactory.getLogger(DeviceManageController.class);
+
     @Autowired
     private DeviceService deviceService;
 
@@ -25,11 +32,29 @@ public class DeviceManageController {
     private PeopleDeviceService peopleDeviceService;
 
     /**
-     * 获取所有设备
+     * 获取所有设备列表
      */
-    @GetMapping("/list")
-    public List<Device> listDevices() {
-        return deviceService.getAll();
+    @PostMapping("/list")
+    public Map<String, Object> listDevices(@RequestBody Map<String, Object> params) {
+        PageInfo<Device> pageInfo = deviceService.searchByCondition(params);
+        Map<String, Object> result = new HashMap<>();
+        result.put("total", pageInfo.getTotal());
+        result.put("list", pageInfo.getList());
+        result.put("pageNum", pageInfo.getPageNum());
+        result.put("pageSize", pageInfo.getPageSize());
+        return result;
+    }
+
+    /**
+     * 获取所有设备列表
+     */
+    @GetMapping("/listDeviceName")
+    public Map<String, Object> listDeviceName() {
+        List<Device> pageInfo = deviceService.searchAllDeviceNames();
+        Map<String, Object> result = new HashMap<>();
+        result.put("total", pageInfo.size());
+        result.put("list", pageInfo);
+        return result;
     }
 
     /**
@@ -39,7 +64,7 @@ public class DeviceManageController {
     public String addDevice(@RequestBody DeviceAddRequest request) {
         // 1. 保存新设备
         Device device = new Device();
-        device.setModel(request.getModel());
+        device.setType(request.getModel());
         device.setLocation(request.getLocation());
         device.setIp(request.getIp());
         device.setPort(request.getPort());
@@ -92,5 +117,6 @@ public class DeviceManageController {
     public Device getDevice(@PathVariable Long id) {
         return deviceService.getById(id);
     }
+
 }
 

supervision-admin/src/main/java/com/supervision/web/peopleGateManage/Controller/EventLogController.java → supervision-admin/src/main/java/com/supervision/web/peopleGateManage/controller/EventLogController.java

@@ -1,6 +1,6 @@
-package com.supervision.web.peopleGateManage.Controller;
+package com.supervision.web.peopleGateManage.controller;
 
-import com.supervision.web.peopleGateManage.Service.EventLogService;
+import com.supervision.web.peopleGateManage.service.EventLogService;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;

supervision-admin/src/main/java/com/supervision/web/peopleGateManage/Controller/PeopleManageController.java → supervision-admin/src/main/java/com/supervision/web/peopleGateManage/controller/PeopleManageController.java

@@ -1,19 +1,17 @@
-package com.supervision.web.peopleGateManage.Controller;
-
-import com.supervision.web.peopleGateManage.Service.DeviceService;
-import com.supervision.web.peopleGateManage.Service.PeopleDeviceService;
-import com.supervision.web.peopleGateManage.Service.PeopleFaceService;
-import com.supervision.web.peopleGateManage.Service.PeopleInfoService;
-import com.supervision.web.peopleGateManage.enity.PeopleFace;
-import com.supervision.web.peopleGateManage.enity.PeopleInfo;
+package com.supervision.web.peopleGateManage.controller;
+
+import com.github.pagehelper.PageInfo;
+import com.supervision.web.peopleGateManage.service.DeviceService;
+import com.supervision.web.peopleGateManage.service.PeopleDeviceService;
+import com.supervision.web.peopleGateManage.service.PeopleFaceService;
+import com.supervision.web.peopleGateManage.service.PeopleInfoService;
+import com.supervision.web.peopleGateManage.entity.PeopleFace;
+import com.supervision.web.peopleGateManage.entity.PeopleInfo;
 import com.supervision.web.peopleGateManage.mapper.PeopleFaceMapper;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
 import org.springframework.util.StringUtils;
 import org.springframework.web.bind.annotation.*;
@@ -23,9 +21,10 @@ import java.io.File;
 import java.io.IOException;
 import java.nio.file.Files;
 import java.util.*;
+import java.util.function.Function;
 
 @RestController
-@RequestMapping("/person")
+@RequestMapping("/peopleDoor")
 public class PeopleManageController {
 
     public static final Logger logger = LoggerFactory.getLogger(PeopleManageController.class);
@@ -42,7 +41,88 @@ public class PeopleManageController {
     @Autowired
     private PeopleDeviceService peopleDeviceService;
 
-    // ------------------- 人员管理 -------------------
+
+    @PostMapping("/listPeopleInfo")
+    public Map<String, Object> listPeopleInfo(@RequestBody Map<String, Object> request) {
+        return handleDevicePeople(request, "listPeopleInfo");
+    }
+
+    @PostMapping("/addPeopleInfo")
+    public Map<String, Object> addPeopleInfo(@RequestBody Map<String, Object> request) {
+        return handleDevicePeople(request, "addPeopleInfo");
+    }
+
+    @PostMapping("/updatePeopleInfo")
+    public Map<String, Object> updatePeopleInfo(@RequestBody Map<String, Object> request) {
+        return handleDevicePeople(request, "updatePeopleInfo");
+    }
+
+    @PostMapping("/deletePeopleInfo")
+    public Map<String, Object> deletePeopleInfo(@RequestBody Map<String, Object> request) {
+        return handleDevicePeople(request, "deletePeopleInfo");
+    }
+
+
+    /**
+     * 通用方法，处理设备下人员信息的增删改查
+     *
+     * @param request 请求参数，必须包含 deviceId
+     * @param action  功能类型："list", "add", "update", "delete"
+     * @return 返回封装后的结果
+     */
+    private Map<String, Object> handleDevicePeople(Map<String, Object> request, String action) {
+        Map<String, Object> result = new HashMap<>();
+        try {
+            // 解析 deviceId
+            Object deviceIdObj = request.get("deviceId");
+            Long deviceId = null;
+            if (deviceIdObj != null) {
+                if (deviceIdObj instanceof Number) {
+                    deviceId = ((Number) deviceIdObj).longValue();
+                } else {
+                    deviceId = Long.parseLong(deviceIdObj.toString());
+                }
+            }
+
+            if (deviceId == null) {
+                result.put("message", "获取设备下的人员信息失败，deviceId 为空");
+                result.put("total", 0);
+                result.put("list", Collections.emptyList());
+                result.put("pageNum", 0);
+                result.put("pageSize", 0);
+                return result;
+            }
+
+            // 根据 action 调用不同 Service 方法
+            PageInfo<Map<String, Object>> pageInfo = null;
+            if ("list".equals(action)) {
+                pageInfo = peopleDeviceService.searchByCondition(request);
+            } else if ("add".equals(action)) {
+                pageInfo = peopleDeviceService.addByCondition(request);
+            } else if ("update".equals(action)) {
+                pageInfo = peopleDeviceService.updateByCondition(request);
+            } else if ("delete".equals(action)) {
+                pageInfo = peopleDeviceService.deleteByCondition(request);
+            } else {
+                throw new IllegalArgumentException("不支持的操作类型: " + action);
+            }
+
+            // 封装返回结果
+            result.put("total", pageInfo != null ? pageInfo.getTotal() : 0);
+            result.put("list", pageInfo != null ? pageInfo.getList() : Collections.emptyList());
+            result.put("pageNum", pageInfo != null ? pageInfo.getPageNum() : 0);
+            result.put("pageSize", pageInfo != null ? pageInfo.getPageSize() : 0);
+            result.put("message", "操作成功：" + action);
+
+        } catch (Exception e) {
+            result.put("message", "操作异常：" + e.getMessage());
+            result.put("total", 0);
+            result.put("list", Collections.emptyList());
+            result.put("pageNum", 0);
+            result.put("pageSize", 0);
+        }
+        return result;
+    }
 
     /** 获取设备下的人员 */
     @GetMapping("/info/list/{deviceId}")

supervision-admin/src/main/java/com/supervision/web/peopleGateManage/enity/Device.java

@@ -1,19 +0,0 @@
-package com.supervision.web.peopleGateManage.enity;
-
-import lombok.Data;
-
-import java.time.LocalDateTime;
-
-@Data
-public class Device {
-    private Long id;          // 主键
-//    private String deviceId;  // 设备编号（唯一）
-    private String model;     // 型号
-    private String location;  // 位置
-    private String ip;        // IP
-    private Integer port;     // 端口
-    private String account;   // 登录账号
-    private String password;  // 登录密码
-    private LocalDateTime createTime;
-    private LocalDateTime updateTime;
-}

supervision-admin/src/main/java/com/supervision/web/peopleGateManage/entity/Device.java

@@ -0,0 +1,29 @@
+package com.supervision.web.peopleGateManage.entity;
+
+import lombok.Data;
+
+import java.time.LocalDateTime;
+import java.util.Date;
+
+@Data
+public class Device {
+
+    private Long id;                   // 系统内部设备ID
+    private String serialNumber;       // 设备序列号（唯一）
+    private String name;               // 设备名称
+    private String type;               // 设备类型：carDoor, peopleDoor
+    private String location;           // 设备位置描述
+    private String ip;                 // 设备IP
+    private Integer port;              // 端口
+    private String account;            // 登录账号
+    private String password;           // 登录密码
+    private Boolean isConnect;         // 是否已连接
+    private String status;             // 在线状态：online/offline
+    private String firmwareVersion;    // 固件版本
+    private String doors;              // 门体信息JSON字符串
+    private String channels;           // 摄像头信息JSON字符串
+    private String notes;              // 备注信息
+    private Date createTime;           // 创建时间
+    private Date updateTime;           // 更新时间
+
+}

supervision-admin/src/main/java/com/supervision/web/peopleGateManage/enity/DeviceAddRequest.java → supervision-admin/src/main/java/com/supervision/web/peopleGateManage/entity/DeviceAddRequest.java

@@ -1,4 +1,4 @@
-package com.supervision.web.peopleGateManage.enity;
+package com.supervision.web.peopleGateManage.entity;
 
 import lombok.Data;
 

supervision-admin/src/main/java/com/supervision/web/peopleGateManage/enity/EventLog.java → supervision-admin/src/main/java/com/supervision/web/peopleGateManage/entity/EventLog.java

@@ -1,4 +1,4 @@
-package com.supervision.web.peopleGateManage.enity;
+package com.supervision.web.peopleGateManage.entity;
 
 import lombok.Data;
 import java.time.LocalDateTime;

supervision-admin/src/main/java/com/supervision/web/peopleGateManage/enity/PeopleDevice.java → supervision-admin/src/main/java/com/supervision/web/peopleGateManage/entity/PeopleDevice.java

@@ -1,4 +1,4 @@
-package com.supervision.web.peopleGateManage.enity;
+package com.supervision.web.peopleGateManage.entity;
 
 import lombok.Data;
 

supervision-admin/src/main/java/com/supervision/web/peopleGateManage/enity/PeopleFace.java → supervision-admin/src/main/java/com/supervision/web/peopleGateManage/entity/PeopleFace.java

@@ -1,4 +1,4 @@
-package com.supervision.web.peopleGateManage.enity;
+package com.supervision.web.peopleGateManage.entity;
 
 import lombok.Data;
 import java.time.LocalDateTime;

supervision-admin/src/main/java/com/supervision/web/peopleGateManage/enity/PeopleInfo.java → supervision-admin/src/main/java/com/supervision/web/peopleGateManage/entity/PeopleInfo.java

@@ -1,4 +1,4 @@
-package com.supervision.web.peopleGateManage.enity;
+package com.supervision.web.peopleGateManage.entity;
 
 
 import lombok.Data;

supervision-admin/src/main/java/com/supervision/web/peopleGateManage/mapper/DeviceMapper.java

@@ -1,20 +1,71 @@
 package com.supervision.web.peopleGateManage.mapper;
 
-import com.supervision.web.peopleGateManage.enity.Device;
-import org.mybatis.spring.annotation.MapperScan;
+
+import com.github.pagehelper.PageInfo;
+import com.supervision.web.peopleGateManage.entity.Device;
+import com.supervision.web.videoManage.domain.Video;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
-@MapperScan("com.supervision.web.peopleGateManage.mapper.xml.DeviceMapper")
+
+/**
+ * DeviceMapper
+ * 海康设备信息的 MyBatis Mapper 接口
+ * 提供设备的增删改查以及条件查询方法
+ */
+@Mapper
 public interface DeviceMapper {
-    List<Device> selectAll();
 
-    Device selectById(Long id);
+    /**
+     * 按条件查询设备（可模糊匹配设备名称）
+     * @param name 设备名称，可为空
+     * @return 符合条件的设备列表
+     */
+    List<Device> searchByCondition(@Param("name") String name);
+
+    /**
+     * 查询所有设备名称（用于下拉框等）
+     * 仅返回 id 和 name
+     * @return 设备列表
+     */
+    List<Device> searchAllDeviceNames();
+
+    /**
+     * 查询所有设备，按创建时间倒序
+     * @return 设备列表
+     */
+    List<Device> searchAllDevices();
 
-    int insert(Device device);
+    /**
+     * 根据设备ID查询设备信息
+     * @param id 设备ID
+     * @return 设备实体
+     */
+    Device searchDeviceById(Long id);
 
-    int update(Device device);
+    /**
+     * 插入设备信息
+     * @param device 设备实体
+     * @return 影响行数
+     */
+    int insertDevice(Device device);
+
+    /**
+     * 更新设备信息
+     * @param device 设备实体
+     * @return 影响行数
+     */
+    int updateDevice(Device device);
+
+    /**
+     * 删除设备信息
+     * @param id 设备ID
+     * @return 影响行数
+     */
+    int deleteDevice(Long id);
 
-    int delete(Long id);
 }
 
+

supervision-admin/src/main/java/com/supervision/web/peopleGateManage/mapper/EventLogMapper.java

@@ -1,5 +1,5 @@
 package com.supervision.web.peopleGateManage.mapper;
-import com.supervision.web.peopleGateManage.enity.EventLog;
+import com.supervision.web.peopleGateManage.entity.EventLog;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 

supervision-admin/src/main/java/com/supervision/web/peopleGateManage/mapper/PeopleDeviceMapper.java

@@ -1,6 +1,8 @@
 package com.supervision.web.peopleGateManage.mapper;
 
-import com.supervision.web.peopleGateManage.enity.PeopleDevice;
+import com.supervision.web.peopleGateManage.entity.Device;
+import com.supervision.web.peopleGateManage.entity.PeopleDevice;
+import com.supervision.web.peopleGateManage.entity.PeopleInfo;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
@@ -19,4 +21,7 @@ public interface PeopleDeviceMapper {
 
     void insertRelation(PeopleDevice peopleDevice);
 
+
+    Device getPeopleDeviceById(Long deviceId);
+
 }

supervision-admin/src/main/java/com/supervision/web/peopleGateManage/mapper/PeopleFaceMapper.java

@@ -1,6 +1,6 @@
 package com.supervision.web.peopleGateManage.mapper;
 
-import com.supervision.web.peopleGateManage.enity.PeopleFace;
+import com.supervision.web.peopleGateManage.entity.PeopleFace;
 import org.apache.ibatis.annotations.Mapper;
 
 import java.util.List;

supervision-admin/src/main/java/com/supervision/web/peopleGateManage/mapper/PeopleInfoMapper.java

@@ -1,11 +1,12 @@
 package com.supervision.web.peopleGateManage.mapper;
 
-import com.supervision.web.peopleGateManage.enity.PeopleInfo;
+import com.supervision.web.peopleGateManage.entity.PeopleInfo;
+import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
-import org.apache.ibatis.annotations.Select;
 
 import java.util.List;
 
+@Mapper
 public interface PeopleInfoMapper {
     PeopleInfo selectById(Long id);
 

supervision-admin/src/main/java/com/supervision/web/peopleGateManage/mapper/PersonMapper.java

@@ -1,9 +1,8 @@
 package com.supervision.web.peopleGateManage.mapper;
 
 
-import com.supervision.web.peopleGateManage.enity.PeopleInfo;
+import com.supervision.web.peopleGateManage.entity.PeopleInfo;
 import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 

supervision-admin/src/main/java/com/supervision/web/peopleGateManage/mapper/xml/DeviceMapper.xml

@@ -1,55 +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.supervision.web.peopleGateManage.mapper.DeviceMapper">
-
-    <resultMap id="DeviceResultMap" type="com.supervision.web.peopleGateManage.enity.Device">
-        <id property="id" column="id"/>
-        <result property="model" column="model"/>
-        <result property="location" column="location"/>
-        <result property="ip" column="ip"/>
-        <result property="port" column="port"/>
-        <result property="account" column="account"/>
-        <result property="password" column="password"/>
-        <result property="createTime" column="create_time"/>
-        <result property="updateTime" column="update_time"/>
-    </resultMap>
-
-    <!-- 查询所有设备 -->
-    <select id="selectAll" resultMap="DeviceResultMap">
-        SELECT * FROM new_device ORDER BY id DESC
-    </select>
-
-    <!-- 根据ID查询 -->
-    <select id="selectById" resultMap="DeviceResultMap">
-        SELECT * FROM new_device WHERE id = #{id}
-    </select>
-
-    <!-- 插入设备 -->
-    <insert id="insert" parameterType="com.supervision.web.peopleGateManage.enity.Device" useGeneratedKeys="true" keyProperty="id">
-        INSERT INTO new_device (model, location, ip, port, account, password, create_time, update_time)
-        VALUES (#{model}, #{location}, #{ip}, #{port}, #{account}, #{password}, #{createTime}, #{updateTime})
-    </insert>
-
-    <!-- 更新设备 -->
-    <update id="update" parameterType="com.supervision.web.peopleGateManage.enity.Device">
-        UPDATE new_device
-        SET id = #{id},
-            model = #{model},
-            location = #{location},
-            ip = #{ip},
-            port = #{port},
-            account = #{account},
-            password = #{password},
-            update_time = #{updateTime}
-        WHERE id = #{id}
-    </update>
-
-    <!-- 删除设备 -->
-    <delete id="delete" parameterType="long">
-        DELETE FROM new_device WHERE id = #{id}
-    </delete>
-
-</mapper>

supervision-admin/src/main/java/com/supervision/web/peopleGateManage/service/DeviceService.java

@@ -0,0 +1,73 @@
+package com.supervision.web.peopleGateManage.service;
+
+import com.github.pagehelper.PageInfo;
+import com.supervision.web.peopleGateManage.entity.Device;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * DeviceService
+ * 海康设备管理服务接口
+ */
+public interface DeviceService {
+
+//    /**
+//     * 按条件分页查询设备
+//     *
+//     * @param name 设备名称，可为空
+//     * @param pageNum 当前页
+//     * @param pageSize 页大小
+//     * @return 分页结果
+//     */
+//    PageInfo<Device> searchByCondition(String name, int pageNum, int pageSize);
+
+    PageInfo<Device> searchByCondition(Map<String, Object> params);
+
+    /**
+     * 查询所有设备名称（下拉框用，仅返回 id 和 name）
+     *
+     * @return 设备列表
+     */
+    List<Device> searchAllDeviceNames();
+
+    /**
+     * 查询所有设备信息
+     *
+     * @return 设备列表
+     */
+    List<Device> searchAllDevices();
+
+    /**
+     * 根据ID查询设备
+     *
+     * @param id 设备ID
+     * @return 设备实体
+     */
+    Device getById(Long id);
+
+    /**
+     * 插入设备
+     *
+     * @param device 设备实体
+     * @return 插入后的ID
+     */
+    Long add(Device device);
+
+    /**
+     * 更新设备信息
+     *
+     * @param device 设备实体
+     * @return 影响行数
+     */
+    int update(Device device);
+
+    /**
+     * 删除设备
+     *
+     * @param id 设备ID
+     * @return 影响行数
+     */
+    int delete(Long id);
+
+}

supervision-admin/src/main/java/com/supervision/web/peopleGateManage/service/EventLogService.java

@@ -0,0 +1,7 @@
+package com.supervision.web.peopleGateManage.service;
+
+import java.util.Map;
+
+public interface EventLogService {
+    Map<String, Object> getEventLogs(Map<String, Object> params);
+}

supervision-admin/src/main/java/com/supervision/web/peopleGateManage/service/PeopleDeviceService.java

@@ -0,0 +1,33 @@
+package com.supervision.web.peopleGateManage.service;
+
+import com.github.pagehelper.PageInfo;
+import com.supervision.web.peopleGateManage.entity.Device;
+import com.supervision.web.peopleGateManage.entity.PeopleInfo;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+public interface PeopleDeviceService {
+
+    void addRelation(String personId, Long deviceId);
+
+    void bindPersonToDevice(String personId, Long deviceId);
+
+    void bindPersonToDevices(String personId, List<Long> deviceIds);
+
+    void unbindPersonFromDevice(String personId, Long deviceId);
+
+    List<Long> getDevicesByPerson(String personId);
+
+    List<String> getPersonsByDevice(Long deviceId);
+
+    PageInfo<Map<String, Object>> searchByCondition(Map<String, Object> params);
+
+    PageInfo<Map<String, Object>> addByCondition(Map<String, Object> request);
+
+    PageInfo<Map<String, Object>> updateByCondition(Map<String, Object> request);
+
+    PageInfo<Map<String, Object>> deleteByCondition(Map<String, Object> request);
+
+}

supervision-admin/src/main/java/com/supervision/web/peopleGateManage/Service/PeopleFaceService.java → supervision-admin/src/main/java/com/supervision/web/peopleGateManage/service/PeopleFaceService.java

@@ -1,6 +1,6 @@
-package com.supervision.web.peopleGateManage.Service;
+package com.supervision.web.peopleGateManage.service;
 
-import com.supervision.web.peopleGateManage.enity.PeopleFace;
+import com.supervision.web.peopleGateManage.entity.PeopleFace;
 
 import java.util.List;
 

supervision-admin/src/main/java/com/supervision/web/peopleGateManage/Service/PeopleInfoService.java → supervision-admin/src/main/java/com/supervision/web/peopleGateManage/service/PeopleInfoService.java

@@ -1,6 +1,6 @@
-package com.supervision.web.peopleGateManage.Service;
+package com.supervision.web.peopleGateManage.service;
 
-import com.supervision.web.peopleGateManage.enity.PeopleInfo;
+import com.supervision.web.peopleGateManage.entity.PeopleInfo;
 
 import java.util.List;
 

supervision-admin/src/main/java/com/supervision/web/peopleGateManage/Service/PersonService.java → supervision-admin/src/main/java/com/supervision/web/peopleGateManage/service/PersonService.java

@@ -1,7 +1,7 @@
-package com.supervision.web.peopleGateManage.Service;
+package com.supervision.web.peopleGateManage.service;
 
 
-import com.supervision.web.peopleGateManage.enity.PeopleInfo;
+import com.supervision.web.peopleGateManage.entity.PeopleInfo;
 import java.util.List;
 public interface PersonService {
     List<PeopleInfo> getAllPersons();

supervision-admin/src/main/java/com/supervision/web/peopleGateManage/service/impl/DeviceServiceImpl.java

@@ -0,0 +1,164 @@
+package com.supervision.web.peopleGateManage.service.impl;
+
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
+import com.supervision.web.peopleGateManage.mapper.DeviceMapper;
+import com.supervision.web.peopleGateManage.service.DeviceService;
+import com.supervision.web.peopleGateManage.entity.Device;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * DeviceServiceImpl
+ * 海康设备管理服务实现
+ */
+@Service
+public class DeviceServiceImpl implements DeviceService {
+
+    @Autowired
+    private DeviceMapper deviceMapper;
+
+//    /**
+//     * 按条件分页查询设备
+//     *
+//     * @param name 设备名称，可为空
+//     * @param pageNum 当前页
+//     * @param pageSize 页大小
+//     * @return 分页结果
+//     */
+//    @Override
+//    public PageInfo<Device> searchByCondition(String name, int pageNum, int pageSize) {
+//        PageHelper.startPage(pageNum, pageSize);
+//        List<Device> list = deviceMapper.searchByCondition(name);
+//        return new PageInfo<>(list);
+//    }
+
+    @Override
+    public PageInfo<Device> searchByCondition(Map<String, Object> params){
+        int page = (int) params.getOrDefault("page", 1);
+        int size = (int) params.getOrDefault("size", 10);
+        String deviceName = (String) params.getOrDefault("deviceName", null);
+
+        PageHelper.startPage(page, size);
+
+        List<Device> list = deviceMapper.searchByCondition(deviceName);
+
+        return new PageInfo<>(list);
+    };
+
+    /**
+     * 查询所有设备名称（下拉框用）
+     *
+     * @return 设备列表，仅包含 id 和 name
+     */
+    @Override
+    public List<Device> searchAllDeviceNames() {
+        return deviceMapper.searchAllDeviceNames();
+    }
+
+    /**
+     * 查询所有设备
+     *
+     * @return 设备列表
+     */
+    @Override
+    public List<Device> searchAllDevices() {
+        return deviceMapper.searchAllDevices();
+    }
+
+    /**
+     * 根据ID查询设备
+     *
+     * @param id 设备ID
+     * @return 设备实体
+     */
+    @Override
+    public Device getById(Long id) {
+        return deviceMapper.searchDeviceById(id);
+    }
+
+    /**
+     * 插入设备
+     *
+     * @param device 设备实体
+     * @return 插入成功后的ID
+     */
+    @Override
+    public Long add(Device device) {
+        deviceMapper.insertDevice(device);
+        return device.getId();
+    }
+
+    /**
+     * 更新设备信息
+     *
+     * @param device 设备实体
+     * @return 影响行数
+     */
+    @Override
+    public int update(Device device) {
+        return deviceMapper.updateDevice(device);
+    }
+
+    /**
+     * 删除设备
+     *
+     * @param id 设备ID
+     * @return 影响行数
+     */
+    @Override
+    public int delete(Long id) {
+        return deviceMapper.deleteDevice(id);
+    }
+}
+
+//    @Override
+//    public List<Device> getAll() {
+//        return deviceMapper.selectAll();
+//    }
+//
+//    @Override
+//    public PageInfo<Device> searchByCondition(Map<String, Object> params){
+//        int page = (int) params.getOrDefault("page", 1);
+//        int size = (int) params.getOrDefault("size", 10);
+//        String deviceName = (String) params.getOrDefault("deviceName", null);
+//        String deviceCode = (String) params.getOrDefault("deviceCode", null);
+//
+//        PageHelper.startPage(page, size);
+//
+//        List<Device> list = deviceMapper.searchByCondition(deviceName, deviceCode);
+//
+//        return new PageInfo<>(list);
+//    };
+//
+//    @Override
+//    public List<Device> searchAllDeviceNames(){
+//        return deviceMapper.searchAllDeviceNames();
+//    };
+//
+//    @Override
+//    public Device getById(Long id) {
+//        return deviceMapper.selectById(id);
+//    }
+//
+//    @Override
+//    public void add(Device device) {
+//        device.setCreateTime(LocalDateTime.now());
+//        device.setUpdateTime(LocalDateTime.now());
+//        deviceMapper.insert(device);
+//    }
+//
+//    @Override
+//    public void update(Device device) {
+//        device.setUpdateTime(LocalDateTime.now());
+//        deviceMapper.update(device);
+//    }
+//
+//    @Override
+//    public void delete(Long id) {
+//        deviceMapper.delete(id);
+//    }
+//}

supervision-admin/src/main/java/com/supervision/web/peopleGateManage/Service/impl/EventLogServiceImpl.java → supervision-admin/src/main/java/com/supervision/web/peopleGateManage/service/impl/EventLogServiceImpl.java

@@ -1,8 +1,8 @@
-package com.supervision.web.peopleGateManage.Service.impl;
+package com.supervision.web.peopleGateManage.service.impl;
 
-import com.supervision.web.peopleGateManage.enity.EventLog;
+import com.supervision.web.peopleGateManage.entity.EventLog;
 import com.supervision.web.peopleGateManage.mapper.EventLogMapper;
-import com.supervision.web.peopleGateManage.Service.EventLogService;
+import com.supervision.web.peopleGateManage.service.EventLogService;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;

supervision-admin/src/main/java/com/supervision/web/peopleGateManage/service/impl/PeopleDeviceServiceImpl.java

@@ -0,0 +1,204 @@
+package com.supervision.web.peopleGateManage.service.impl;
+
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
+import com.supervision.web.ConnectSDK.carDoor.CarDoorDeviceManager;
+import com.supervision.web.ConnectSDK.peopleDoor.PeopleDoorDeviceManager;
+import com.supervision.web.ConnectSDK.util.DeviceSession;
+import com.supervision.web.peopleGateManage.entity.Device;
+import com.supervision.web.peopleGateManage.entity.PeopleInfo;
+import com.supervision.web.peopleGateManage.mapper.PeopleDeviceMapper;
+import com.supervision.web.peopleGateManage.service.DeviceService;
+import com.supervision.web.peopleGateManage.service.PeopleDeviceService;
+import com.supervision.web.peopleGateManage.entity.PeopleDevice;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.io.*;
+import java.time.LocalDateTime;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+@Service
+public class PeopleDeviceServiceImpl implements PeopleDeviceService {
+
+    private static final Logger logger = LoggerFactory.getLogger(PeopleDeviceServiceImpl.class);
+
+    @Autowired
+    private DeviceService deviceService;
+
+    @Autowired
+    private PeopleDeviceMapper peopleDeviceMapper;
+
+    @Autowired
+    private PeopleDoorDeviceManager peopleDoorDeviceManager;
+
+    @Override
+    public void bindPersonToDevice(String personId, Long deviceId) {
+        PeopleDevice pd = new PeopleDevice();
+        pd.setPersonId(personId);
+        pd.setDeviceId(deviceId);
+        pd.setCreateTime(LocalDateTime.now());
+        pd.setUpdateTime(LocalDateTime.now());
+        peopleDeviceMapper.insert(pd);
+    }
+
+    @Override
+    public void bindPersonToDevices(String personId, List<Long> deviceIds) {
+        for (Long deviceId : deviceIds) {
+            bindPersonToDevice(personId, deviceId);
+        }
+    }
+
+    @Override
+    public void unbindPersonFromDevice(String personId, Long deviceId) {
+        peopleDeviceMapper.delete(personId, deviceId);
+    }
+
+    @Override
+    public List<Long> getDevicesByPerson(String personId) {
+        return peopleDeviceMapper.selectDevicesByPerson(personId);
+    }
+
+    @Override
+    public List<String> getPersonsByDevice(Long deviceId) {
+        return peopleDeviceMapper.selectPersonsByDevice(deviceId);
+    }
+
+    public void addRelation(String personId, Long deviceId) {
+        PeopleDevice relation = new PeopleDevice();
+        relation.setPersonId(personId);
+        relation.setDeviceId(deviceId);
+        relation.setCreateTime(LocalDateTime.now());
+        relation.setUpdateTime(LocalDateTime.now());
+        peopleDeviceMapper.insertRelation(relation);
+    }
+
+    @Override
+    public PageInfo<Map<String, Object>> searchByCondition(Map<String, Object> params){
+        //        try {
+        Object idObj = params.get("deviceId");
+        Long deviceId = idObj == null ? null : Long.parseLong(idObj.toString());
+
+        Device device = deviceService.getById(deviceId);
+        if (device == null || device.getIp() == null) {
+            logger.error("设备不存在");
+            return null;
+        }
+
+        DeviceSession deviceSession = peopleDoorDeviceManager.getDeviceSession(device.getIp());
+
+        if(deviceSession == null) {
+            logger.error("设备未登录");
+            return null;
+        }
+
+
+        int userID = deviceSession.getUserID();
+
+//            peopleDoorDeviceManager.handleCase(userID, (HashMap<String, Object>) params);
+
+        return null;
+//        } catch (UnsupportedEncodingException | InterruptedException e) {
+////            throw new RuntimeException(e);
+//            return null;
+//        }
+    }
+
+    @Override
+    public PageInfo<Map<String, Object>> addByCondition(Map<String, Object> params) {
+        //        try {
+        Object idObj = params.get("deviceId");
+        Long deviceId = idObj == null ? null : Long.parseLong(idObj.toString());
+
+        Device device = deviceService.getById(deviceId);
+        if (device == null || device.getIp() == null) {
+            logger.error("设备不存在");
+            return null;
+        }
+
+        DeviceSession deviceSession = peopleDoorDeviceManager.getDeviceSession(device.getIp());
+
+        if(deviceSession == null) {
+            logger.error("设备未登录");
+            return null;
+        }
+
+
+        int userID = deviceSession.getUserID();
+
+//            peopleDoorDeviceManager.handleCase(userID, (HashMap<String, Object>) params);
+
+        return null;
+//        } catch (UnsupportedEncodingException | InterruptedException e) {
+////            throw new RuntimeException(e);
+//            return null;
+//        }
+    }
+
+    @Override
+    public PageInfo<Map<String, Object>> updateByCondition(Map<String, Object> params) {
+        //        try {
+        Object idObj = params.get("deviceId");
+        Long deviceId = idObj == null ? null : Long.parseLong(idObj.toString());
+
+        Device device = deviceService.getById(deviceId);
+        if (device == null || device.getIp() == null) {
+            logger.error("设备不存在");
+            return null;
+        }
+
+        DeviceSession deviceSession = peopleDoorDeviceManager.getDeviceSession(device.getIp());
+
+        if(deviceSession == null) {
+            logger.error("设备未登录");
+            return null;
+        }
+
+
+        int userID = deviceSession.getUserID();
+
+//            peopleDoorDeviceManager.handleCase(userID, (HashMap<String, Object>) params);
+
+        return null;
+//        } catch (UnsupportedEncodingException | InterruptedException e) {
+////            throw new RuntimeException(e);
+//            return null;
+//        }
+    }
+
+    @Override
+    public PageInfo<Map<String, Object>> deleteByCondition(Map<String, Object> params) {
+//        try {
+            Object idObj = params.get("deviceId");
+            Long deviceId = idObj == null ? null : Long.parseLong(idObj.toString());
+
+            Device device = deviceService.getById(deviceId);
+            if (device == null || device.getIp() == null) {
+                logger.error("设备不存在");
+                return null;
+            }
+
+            DeviceSession deviceSession = peopleDoorDeviceManager.getDeviceSession(device.getIp());
+
+            if(deviceSession == null) {
+                logger.error("设备未登录");
+                return null;
+            }
+
+
+            int userID = deviceSession.getUserID();
+
+//            peopleDoorDeviceManager.handleCase(userID, (HashMap<String, Object>) params);
+
+            return null;
+//        } catch (UnsupportedEncodingException | InterruptedException e) {
+////            throw new RuntimeException(e);
+//            return null;
+//        }
+    }
+
+}

supervision-admin/src/main/java/com/supervision/web/peopleGateManage/Service/impl/PeopleFaceServiceImpl.java → supervision-admin/src/main/java/com/supervision/web/peopleGateManage/service/impl/PeopleFaceServiceImpl.java

@@ -1,10 +1,9 @@
-package com.supervision.web.peopleGateManage.Service.impl;
+package com.supervision.web.peopleGateManage.service.impl;
 
 import com.supervision.web.peopleGateManage.mapper.PeopleFaceMapper;
-import com.supervision.web.peopleGateManage.Service.PeopleFaceService;
-import com.supervision.web.peopleGateManage.enity.PeopleFace;
+import com.supervision.web.peopleGateManage.service.PeopleFaceService;
+import com.supervision.web.peopleGateManage.entity.PeopleFace;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
 import java.util.List;

supervision-admin/src/main/java/com/supervision/web/peopleGateManage/Service/impl/PeopleInfoServiceImpl.java → supervision-admin/src/main/java/com/supervision/web/peopleGateManage/service/impl/PeopleInfoServiceImpl.java

@@ -1,8 +1,8 @@
-package com.supervision.web.peopleGateManage.Service.impl;
+package com.supervision.web.peopleGateManage.service.impl;
 
 import com.supervision.web.peopleGateManage.mapper.PeopleInfoMapper;
-import com.supervision.web.peopleGateManage.Service.PeopleInfoService;
-import com.supervision.web.peopleGateManage.enity.PeopleInfo;
+import com.supervision.web.peopleGateManage.service.PeopleInfoService;
+import com.supervision.web.peopleGateManage.entity.PeopleInfo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 

supervision-admin/src/main/java/com/supervision/web/peopleGateManage/Service/impl/PersonServiceImpl.java → supervision-admin/src/main/java/com/supervision/web/peopleGateManage/service/impl/PersonServiceImpl.java

@@ -1,9 +1,9 @@
-package com.supervision.web.peopleGateManage.Service.impl;
+package com.supervision.web.peopleGateManage.service.impl;
 
 
 import com.supervision.web.peopleGateManage.mapper.PersonMapper;
-import com.supervision.web.peopleGateManage.Service.PersonService;
-import com.supervision.web.peopleGateManage.enity.PeopleInfo;
+import com.supervision.web.peopleGateManage.service.PersonService;
+import com.supervision.web.peopleGateManage.entity.PeopleInfo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 

supervision-admin/src/main/java/com/supervision/web/videoManage/controller/VideoController.java

@@ -140,16 +140,13 @@ public class VideoController {
     @ApiOperation("分页查询视频列表（支持视频名称模糊查询）")
     @PostMapping("/list")
     public Map<String, Object> listVideos(@RequestBody Map<String, Object> params) {
-        int page = (int) params.getOrDefault("page", 1);
-        int size = (int) params.getOrDefault("size", 10);
-        String name = (String) params.getOrDefault("name", "");
-
-        List<Video> list = videoService.listAllPaged(page, size, name);
-        PageInfo<Video> pageInfo = new PageInfo<>(list);
+        PageInfo<Video> pageInfo = videoService.listAllPaged(params);
 
         Map<String, Object> result = new HashMap<>();
         result.put("total", pageInfo.getTotal());
-        result.put("list", list);
+        result.put("list", pageInfo.getList());
+        result.put("pageNum", pageInfo.getPageNum());
+        result.put("pageSize", pageInfo.getPageSize());
         return result;
     }
 
@@ -190,7 +187,7 @@ public class VideoController {
     }
 
     @ApiOperation("更新视频")
-    @PutMapping("/update")
+    @PostMapping("/update")
     public ResponseResult<String> update(@RequestBody Video video) {
         videoService.update(video);
         return ResponseResult.success("更新成功");

supervision-admin/src/main/java/com/supervision/web/videoManage/mapper/VideoMapper.java

@@ -3,6 +3,7 @@ package com.supervision.web.videoManage.mapper;
 
 import com.supervision.web.videoManage.domain.Video;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -50,4 +51,7 @@ public interface VideoMapper {
     int deleteById(Long id);
 
     List<Video> searchByParentDeviceId(Long parentDeviceId);
+
+    List<Video> searchByCondition(@Param("name") String name, @Param("deviceType") String deviceType);
+
 }

supervision-admin/src/main/java/com/supervision/web/videoManage/service/VideoService.java

@@ -1,10 +1,12 @@
 package com.supervision.web.videoManage.service;
 
 
+import com.github.pagehelper.PageInfo;
 import com.supervision.web.videoManage.domain.Video;
 import com.supervision.web.videoManage.vo.VideoVo;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * 视频管理服务接口层
@@ -18,7 +20,7 @@ public interface VideoService {
      */
     List<Video> listAll();
 
-    List<Video> listAllPaged(int pageNum, int pageSize, String name);
+    PageInfo<Video> listAllPaged(Map<String, Object> params);
 
     List<Video> listVideoAllPaged(int pageNum, int pageSize, String name);
 

supervision-admin/src/main/java/com/supervision/web/videoManage/service/VideoServiceImpl.java

@@ -2,6 +2,7 @@ package com.supervision.web.videoManage.service;
 
 
 import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
 import com.supervision.web.videoManage.domain.Video;
 import com.supervision.web.videoManage.mapper.VideoMapper;
 import com.supervision.web.videoManage.other.FFmpegManager;
@@ -56,15 +57,28 @@ public class VideoServiceImpl implements VideoService {
 
     /**
      * 分页查询所有视频，并在需要时生成 m3u8 播放流文件
-     * @param pageNum 页码（从1开始）
-     * @param pageSize 每页数量
+     * @param page 页码（从1开始）
+     * @param size 每页数量
      * @param name 视频名称（模糊查询）
      * @return 当前页的视频列表（含播放URL）
      */
     @Override
-    public List<Video> listAllPaged(int pageNum, int pageSize, String name) {
-        PageHelper.startPage(pageNum, pageSize);
-        return videoMapper.searchByName(name);
+    public PageInfo<Video> listAllPaged(Map<String, Object> params) {
+        int page = (int) params.getOrDefault("page", 1);
+        int size = (int) params.getOrDefault("size", 10);
+        String name = (String) params.getOrDefault("name", null);
+        String deviceType = (String) params.getOrDefault("deviceType", null);
+
+        PageHelper.startPage(page, size);
+
+        List<Video> list = videoMapper.searchByCondition(name, deviceType);
+
+        for (Video video : list) {
+            String cameraId = video.getId() + "_" + video.getChannel();
+            video.setPlayUrl(ffmpegManager.getPlayUrl(cameraId));
+        }
+
+        return new PageInfo<>(list);
     }
 
     /**

supervision-admin/src/main/resources/application.yml

@@ -90,11 +90,8 @@ token:
 
 # MyBatis配置
 mybatis:
-  # 扫描所有 mapper.xml 文件（无论放在哪个子包）
-  mapperLocations: classpath*:**/*Mapper.xml
-  # 搜索指定包别名
-  typeAliasesPackage: com.supervision.**.domain
-  # 加载全局的配置文件
+  mapperLocations: classpath*:/mapper/**/*.xml
+  typeAliasesPackage: com.supervision.**.entity,com.supervision.**.domain
   configLocation: classpath:mybatis/mybatis-config.xml
 
 # PageHelper分页插件

supervision-admin/src/main/java/com/supervision/web/carGateManage/Mapper/xml/CarEventLogMapper.xml → supervision-admin/src/main/resources/mapper/carGateManage/CarEventLogMapper.xml

@@ -2,10 +2,10 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
-<mapper namespace="com.supervision.web.carGateManage.Mapper.CarEventLogMapper">
+<mapper namespace="com.supervision.web.carGateManage.mapper.CarEventLogMapper">
 
     <!-- 查询车辆进出记录 -->
-    <select id="selectByCondition" resultType="com.supervision.web.carGateManage.Entity.CarEvent">
+    <select id="selectByCondition" resultType="com.supervision.web.carGateManage.entity.CarEvent">
         SELECT
         id,
         owner_name AS ownerName,

supervision-admin/src/main/java/com/supervision/web/carGateManage/Mapper/xml/CarInfoMapper.xml → supervision-admin/src/main/resources/mapper/carGateManage/CarInfoMapper.xml

@@ -3,10 +3,10 @@
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
-<mapper namespace="com.supervision.web.carGateManage.Mapper.CarInfoMapper">
+<mapper namespace="com.supervision.web.carGateManage.mapper.CarInfoMapper">
 
     <!-- CarInfo 实体映射 -->
-    <resultMap id="CarInfoResultMap" type="com.supervision.web.carGateManage.Entity.CarInfo">
+    <resultMap id="CarInfoResultMap" type="com.supervision.web.carGateManage.entity.CarInfo">
         <id column="id" property="id"/>
         <result column="plate_number" property="plateNumber"/>
         <result column="owner_name" property="ownerName"/>
@@ -43,14 +43,14 @@
     </select>
 
     <!-- 添加 -->
-    <insert id="insertCar" parameterType="com.supervision.web.carGateManage.Entity.CarInfo"
+    <insert id="insertCar" parameterType="com.supervision.web.carGateManage.entity.CarInfo"
             useGeneratedKeys="true" keyProperty="id">
         INSERT INTO new_car_info (plate_number, owner_name, org_name, car_group, valid_until, create_time,is_temporary)
         VALUES (#{plateNumber}, #{ownerName}, #{orgName}, #{carGroup}, #{validUntil}, #{createTime}, #{isTemporary})
     </insert>
 
     <!-- 修改 -->
-    <update id="updateCar" parameterType="com.supervision.web.carGateManage.Entity.CarInfo">
+    <update id="updateCar" parameterType="com.supervision.web.carGateManage.entity.CarInfo">
         UPDATE new_car_info
         SET plate_number = #{plateNumber},
             owner_name = #{ownerName},

supervision-admin/src/main/resources/mapper/peopleGateManage/DeviceMapper.xml

@@ -0,0 +1,101 @@
+<?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.supervision.web.peopleGateManage.mapper.DeviceMapper">
+    <!-- 结果映射 -->
+    <resultMap id="DeviceResultMap" type="com.supervision.web.peopleGateManage.entity.Device">
+        <id property="id" column="id"/>
+        <result property="serialNumber" column="serial_number"/>
+        <result property="name" column="name"/>
+        <result property="type" column="type"/>
+        <result property="location" column="location"/>
+        <result property="ip" column="ip"/>
+        <result property="port" column="port"/>
+        <result property="account" column="account"/>
+        <result property="password" column="password"/>
+        <result property="isConnect" column="is_connect"/>
+        <result property="status" column="status"/>
+        <result property="firmwareVersion" column="firmware_version"/>
+        <result property="doors" column="doors"/>
+        <result property="channels" column="channels"/>
+        <result property="notes" column="notes"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updateTime" column="update_time"/>
+    </resultMap>
+
+    <!-- 按条件模糊查询（deviceName 和 deviceCode 均可为空） -->
+    <select id="searchByCondition" resultMap="DeviceResultMap">
+        SELECT *
+        FROM new_device_info
+        WHERE 1=1
+        <if test="name != null and name != ''">
+            AND name LIKE CONCAT('%', #{name}, '%')
+        </if>
+        ORDER BY id DESC
+    </select>
+
+    <!-- 查询所有设备名称 -->
+    <select id="searchAllDeviceNames" resultType="com.supervision.web.peopleGateManage.entity.Device">
+        SELECT
+            id,
+            name
+        FROM new_device_info
+        ORDER BY name ASC
+    </select>
+
+    <!-- 查询所有设备 -->
+    <select id="searchAllDevices" resultMap="DeviceResultMap">
+        SELECT *
+        FROM new_device_info
+        ORDER BY create_time DESC
+    </select>
+
+    <!-- 根据ID查询设备 -->
+    <select id="searchDeviceById" parameterType="long" resultMap="DeviceResultMap">
+        SELECT *
+        FROM new_device_info
+        WHERE id = #{id}
+    </select>
+
+    <!-- 插入设备 -->
+    <insert id="insertDevice" parameterType="com.supervision.web.peopleGateManage.entity.Device" useGeneratedKeys="true" keyProperty="id">
+        INSERT INTO new_device_info (
+            serial_number, name, type, location, ip, port, account, password,
+            is_connect, status, firmware_version, doors, channels, notes, create_time, update_time
+        )
+        VALUES (
+                   #{serialNumber}, #{name}, #{type}, #{location}, #{ip}, #{port}, #{account}, #{password},
+                   #{isConnect}, #{status}, #{firmwareVersion}, #{doors}, #{channels}, #{notes}, #{createTime}, #{updateTime}
+               )
+    </insert>
+
+    <!-- 更新设备 -->
+    <update id="updateDevice" parameterType="com.supervision.web.peopleGateManage.entity.Device">
+        UPDATE new_device_info
+        SET
+            serial_number = #{serialNumber},
+            name = #{name},
+            type = #{type},
+            location = #{location},
+            ip = #{ip},
+            port = #{port},
+            account = #{account},
+            password = #{password},
+            is_connect = #{isConnect},
+            status = #{status},
+            firmware_version = #{firmwareVersion},
+            doors = #{doors},
+            channels = #{channels},
+            notes = #{notes},
+            update_time = #{updateTime}
+        WHERE id = #{id}
+    </update>
+
+    <!-- 删除设备 -->
+    <delete id="deleteDevice" parameterType="long">
+        DELETE FROM new_device_info WHERE id = #{id}
+    </delete>
+
+</mapper>

supervision-admin/src/main/java/com/supervision/web/peopleGateManage/mapper/xml/PeopleDeviceMapper.xml → supervision-admin/src/main/resources/mapper/peopleGateManage/PeopleDeviceMapper.xml

@@ -5,7 +5,7 @@
 
 <mapper namespace="com.supervision.web.peopleGateManage.mapper.PeopleDeviceMapper">
 
-    <resultMap id="PeopleDeviceResultMap" type="com.supervision.web.peopleGateManage.enity.PeopleDevice">
+    <resultMap id="PeopleDeviceResultMap" type="com.supervision.web.peopleGateManage.entity.PeopleDevice">
         <id property="id" column="id"/>
         <result property="personId" column="person_id"/>
         <result property="deviceId" column="device_id"/>
@@ -16,7 +16,7 @@
 
 
     <!-- 插入绑定关系 -->
-    <insert id="insertRelation" parameterType="com.supervision.web.peopleGateManage.enity.PeopleDevice" useGeneratedKeys="true" keyProperty="id">
+    <insert id="insertRelation" parameterType="com.supervision.web.peopleGateManage.entity.PeopleDevice" useGeneratedKeys="true" keyProperty="id">
         INSERT INTO new_people_device (person_id, device_id, create_time, update_time)
         VALUES (#{personId}, #{deviceId}, #{createTime}, #{updateTime})
             ON DUPLICATE KEY UPDATE update_time = VALUES(update_time)
@@ -32,9 +32,4 @@
         SELECT device_id FROM new_people_device WHERE person_id = #{personId}
     </select>
 
-    <!-- 查询某设备下的所有人员 -->
-    <select id="selectPersonsByDevice" resultType="string">
-        SELECT person_id FROM new_people_device WHERE device_id = #{deviceId}
-    </select>
-
 </mapper>

supervision-admin/src/main/java/com/supervision/web/peopleGateManage/mapper/xml/PeopleFaceMapper.xml → supervision-admin/src/main/resources/mapper/peopleGateManage/PeopleFaceMapper.xml

@@ -5,7 +5,7 @@
 
 <mapper namespace="com.supervision.web.peopleGateManage.mapper.PeopleFaceMapper">
 
-    <resultMap id="PeopleFaceResultMap" type="com.supervision.web.peopleGateManage.enity.PeopleFace">
+    <resultMap id="PeopleFaceResultMap" type="com.supervision.web.peopleGateManage.entity.PeopleFace">
         <id property="id" column="id"/>
         <result property="personId" column="person_id"/>
         <result property="jobNumber" column="job_number"/>
@@ -23,12 +23,12 @@
         SELECT * FROM new_people_face
     </select>
 
-    <insert id="insert" parameterType="com.supervision.web.peopleGateManage.enity.PeopleFace" useGeneratedKeys="true" keyProperty="id">
+    <insert id="insert" parameterType="com.supervision.web.peopleGateManage.entity.PeopleFace" useGeneratedKeys="true" keyProperty="id">
         INSERT INTO new_people_face(person_id, job_number, name, face_img_url, create_time, update_time)
         VALUES(#{personId}, #{jobNumber}, #{name}, #{faceImgUrl}, NOW(), NOW())
     </insert>
 
-    <update id="update" parameterType="com.supervision.web.peopleGateManage.enity.PeopleFace">
+    <update id="update" parameterType="com.supervision.web.peopleGateManage.entity.PeopleFace">
         UPDATE new_people_face
         SET person_id=#{personId},
         job_number=#{jobNumber},

supervision-admin/src/main/java/com/supervision/web/peopleGateManage/mapper/xml/PeopleInfoMapper.xml → supervision-admin/src/main/resources/mapper/peopleGateManage/PeopleInfoMapper.xml

@@ -5,7 +5,7 @@
 
 <mapper namespace="com.supervision.web.peopleGateManage.mapper.PeopleInfoMapper">
 
-    <resultMap id="PeopleInfoResultMap" type="com.supervision.web.peopleGateManage.enity.PeopleInfo">
+    <resultMap id="PeopleInfoResultMap" type="com.supervision.web.peopleGateManage.entity.PeopleInfo">
         <id property="id" column="id"/>
         <result property="personId" column="person_id"/>
         <result property="deviceId" column="device_id"/>
@@ -40,7 +40,7 @@
     </select>
 
 
-    <insert id="insert" parameterType="com.supervision.web.peopleGateManage.enity.PeopleInfo" useGeneratedKeys="true" keyProperty="id">
+    <insert id="insert" parameterType="com.supervision.web.peopleGateManage.entity.PeopleInfo" useGeneratedKeys="true" keyProperty="id">
         INSERT INTO new_people_info(person_id, name, device_id, is_temporary, long_term, valid_period, door_permission, plan_template_id, auth_method, create_time, update_time)
         VALUES(#{personId}, #{name}, #{deviceId}, #{isTemporary}, #{longTerm}, #{validPeriod}, #{doorPermission}, #{planTemplateId}, #{authMethod}, NOW(), NOW())
     </insert>
@@ -49,7 +49,7 @@
         UPDATE new_people_info SET person_id = #{personId} WHERE id = #{id}
     </update>
 
-    <update id="update" parameterType="com.supervision.web.peopleGateManage.enity.PeopleInfo">
+    <update id="update" parameterType="com.supervision.web.peopleGateManage.entity.PeopleInfo">
         UPDATE new_people_info
         SET person_id=#{personId},
         device_id=#{deviceId},

supervision-admin/src/main/java/com/supervision/web/peopleGateManage/mapper/xml/PersonMapper.xml → supervision-admin/src/main/resources/mapper/peopleGateManage/PersonMapper.xml

@@ -5,7 +5,7 @@
 
 <mapper namespace="com.supervision.web.peopleGateManage.mapper.PersonMapper">
 
-    <select id="getAllPersons" resultType="com.supervision.web.peopleGateManage.enity.PeopleInfo">
+    <select id="getAllPersons" resultType="com.supervision.web.peopleGateManage.entity.PeopleInfo">
         SELECT
         id,
         person_id AS personId,
@@ -22,7 +22,7 @@
     </select>
 
     <!-- 根据设备ID获取人员完整信息 -->
-<!--    <select id="getPersonsByDeviceId" resultType="com.supervision.web.peopleGateManage.enity.PeopleInfo">-->
+<!--    <select id="getPersonsByDeviceId" resultType="com.supervision.web.peopleGateManage.entity.PeopleInfo">-->
 <!--        SELECT-->
 <!--            p.id,-->
 <!--            p.person_id AS personId,-->
@@ -41,7 +41,7 @@
 <!--    </select>-->
 
 
-    <insert id="insertPerson" parameterType="com.supervision.web.peopleGateManage.enity.PeopleInfo"
+    <insert id="insertPerson" parameterType="com.supervision.web.peopleGateManage.entity.PeopleInfo"
             useGeneratedKeys="true" keyProperty="id">
         INSERT INTO new_people_manage (
         person_id,
@@ -68,7 +68,7 @@
         )
     </insert>
 
-    <update id="updatePerson" parameterType="com.supervision.web.peopleGateManage.enity.PeopleInfo">
+    <update id="updatePerson" parameterType="com.supervision.web.peopleGateManage.entity.PeopleInfo">
         UPDATE new_people_manage
         SET
         job_number = #{jobNumber},

supervision-admin/src/main/java/com/supervision/web/peopleGateManage/mapper/xml/EventLogMapper.xml → supervision-admin/src/main/resources/mapper/peopleGateManage/peopleEventLogMapper.xml

@@ -3,7 +3,7 @@
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
 <mapper namespace="com.supervision.web.peopleGateManage.mapper.EventLogMapper">
-    <resultMap id="EventLogResultMap" type="com.supervision.web.peopleGateManage.enity.EventLog">
+    <resultMap id="EventLogResultMap" type="com.supervision.web.peopleGateManage.entity.EventLog">
         <id property="id" column="id"/>
         <result property="personId" column="person_id"/>
         <result property="jobNumber" column="job_number"/>

supervision-admin/src/main/java/com/supervision/web/videoManage/mapper/VideoMapper.xml → supervision-admin/src/main/resources/mapper/videoManage/VideoMapper.xml

@@ -24,6 +24,20 @@
         <result property="updateTime" column="update_time"/>
     </resultMap>
 
+    <!-- 按条件模糊查询（name 和 deviceType 均可为空） -->
+    <select id="searchByCondition" resultMap="VideoResultMap">
+        SELECT *
+        FROM new_video_info
+        WHERE 1=1
+        <if test="name != null and name != ''">
+            AND name LIKE CONCAT('%', #{name}, '%')
+        </if>
+        <if test="deviceType != null and deviceType != ''">
+            AND device_type = #{deviceType}
+        </if>
+        ORDER BY id DESC
+    </select>
+
     <!-- 查询所有视频设备 -->
     <select id="searchAll" resultMap="VideoResultMap">
         SELECT * FROM new_video_info

supervision-quartz/src/main/java/com/supervision/quartz/mapper/SysJobMapper.java

@@ -2,12 +2,14 @@ package com.supervision.quartz.mapper;
 
 import java.util.List;
 import com.supervision.quartz.domain.SysJob;
+import org.apache.ibatis.annotations.Mapper;
 
 /**
  * 调度任务信息 数据层
  * 
  * @author ruoyi
  */
+@Mapper
 public interface SysJobMapper
 {
     /**

supervision-system/src/main/java/com/supervision/system/mapper/SysConfigMapper.java

@@ -3,12 +3,14 @@ package com.supervision.system.mapper;
 import java.util.List;
 
 import com.supervision.system.domain.SysConfig;
+import org.apache.ibatis.annotations.Mapper;
 
 /**
  * 参数配置 数据层
  *
  * @author supervision
  */
+@Mapper
 public interface SysConfigMapper {
     /**
      * 查询参数配置信息

supervision-system/src/main/java/com/supervision/system/service/impl/SysConfigServiceImpl.java

@@ -25,6 +25,7 @@ import java.util.List;
  */
 @Service
 public class SysConfigServiceImpl implements ISysConfigService {
+
     @Autowired
     private SysConfigMapper configMapper;