feat(device): 集成 zt-device 服务

- 移除 DeviceController、DeviceService 相关代码
- 更新 ViidController、WvpController 使用 DeviceIntegrationService
- 修改 DeviceFactory 创建 DeviceEntity 的方式
- 更新 DeviceRepository 使用 DeviceV2DTO
-调整 CustomUploadTaskService、AppScenicServiceImpl 中的设备相关逻辑
- 移除 DeviceServiceImpl 类
- 更新 VideoPieceCleaner、VideoPieceGetter 任务类，使用 DeviceIntegrationService 获取设备信息

src/main/java/com/ycwl/basic/controller/pc/DeviceController.java

@@ -1,79 +0,0 @@
-package com.ycwl.basic.controller.pc;
-
-import com.github.pagehelper.PageInfo;
-import com.ycwl.basic.model.pc.device.entity.DeviceConfigEntity;
-import com.ycwl.basic.model.pc.device.req.DeviceAddOrUpdateReq;
-import com.ycwl.basic.model.pc.device.req.DeviceBatchSortRequest;
-import com.ycwl.basic.model.pc.device.req.DeviceReqQuery;
-import com.ycwl.basic.model.pc.device.req.DeviceSortRequest;
-import com.ycwl.basic.model.pc.device.resp.DeviceRespVO;
-import com.ycwl.basic.model.pc.template.req.TemplateSortRequest;
-import com.ycwl.basic.service.pc.DeviceService;
-import com.ycwl.basic.utils.ApiResponse;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-/**
- * @Author：longbinbin
- * @Date：2024/12/2 16:13
- */
-@RestController
-@RequestMapping("/api/device/v1")
-// 设备管理
-public class DeviceController {
-    @Autowired
-    private DeviceService deviceService;
-
-    // 设备分页查询
-    @PostMapping("/page")
-    public ApiResponse<PageInfo<DeviceRespVO>> pageQuery(@RequestBody DeviceReqQuery deviceReqQuery) {
-        return deviceService.pageQuery(deviceReqQuery);
-    }
-    // 设备列表查询
-    @PostMapping("/list")
-    public ApiResponse list(@RequestBody DeviceReqQuery deviceReqQuery) {
-        return deviceService.list(deviceReqQuery);
-    }
-    // 设备详情查询
-    @GetMapping("/getDetails/{id}")
-    public ApiResponse<DeviceRespVO> getDetails(@PathVariable("id") Long id) {
-        return deviceService.getById(id);
-    }
-    // 新增或修改设备
-    @PostMapping("/addOrUpdate")
-    public ApiResponse addOrUpdate(@RequestBody DeviceAddOrUpdateReq deviceReqQuery) {
-        return deviceService.addOrUpdate(deviceReqQuery);
-    }
-    // 删除设备
-    @DeleteMapping("/delete/{id}")
-    public ApiResponse delete(@PathVariable("id") Long id) {
-        return deviceService.deleteById(id);
-    }
-    // 修改设备状态
-    @PutMapping("/updateStatus/{id}")
-    public ApiResponse updateStatus(@PathVariable("id") Long id) {
-        return deviceService.updateStatus(id);
-    }
-
-    // 排序设备
-    @PostMapping("/sort")
-    public ApiResponse<Boolean> sortDevice(@RequestBody DeviceSortRequest request) {
-        return deviceService.sortDevice(request.getDeviceId(), request.getAfterDeviceId());
-    }
-
-    @PostMapping("/scenic/{scenicId}/sortBatch")
-    public ApiResponse<Boolean> sortDeviceBatch(@PathVariable("scenicId") Long scenicId, @RequestBody DeviceBatchSortRequest request) {
-        return deviceService.batchSort(scenicId, request);
-    }
-
-    @GetMapping("/config/{id}")
-    public ApiResponse<DeviceConfigEntity> getConfig(@PathVariable("id") Long id) {
-        return ApiResponse.success(deviceService.getConfig(id));
-    }
-
-    @PostMapping("/saveConfig/{configId}")
-    public ApiResponse saveConfig(@PathVariable("configId") Long configId, @RequestBody DeviceConfigEntity deviceConfigEntity) {
-        deviceService.saveConfig(configId, deviceConfigEntity);
-        return ApiResponse.success(null);
-    }
-}

src/main/java/com/ycwl/basic/controller/viid/ViidController.java

@@ -10,7 +10,10 @@ import com.ycwl.basic.annotation.IgnoreLogReq;
 import com.ycwl.basic.annotation.IgnoreToken;
 import com.ycwl.basic.facebody.adapter.IFaceBodyAdapter;
 import com.ycwl.basic.facebody.entity.AddFaceResp;
-import com.ycwl.basic.mapper.DeviceMapper;
+import com.ycwl.basic.integration.device.service.DeviceIntegrationService;
+import com.ycwl.basic.integration.device.dto.device.CreateDeviceRequest;
+import com.ycwl.basic.integration.device.dto.device.UpdateDeviceRequest;
+import com.ycwl.basic.integration.device.dto.device.DeviceV2DTO;
 import com.ycwl.basic.mapper.FaceSampleMapper;
 import com.ycwl.basic.mapper.SourceMapper;
 import com.ycwl.basic.model.pc.device.entity.DeviceConfigEntity;
@@ -80,7 +83,7 @@ import static com.ycwl.basic.constant.StorageConstant.VIID_FACE;
 @Slf4j
 public class ViidController {
     @Autowired
-    private DeviceMapper deviceMapper;
+    private DeviceIntegrationService deviceIntegrationService;
     private static final String serverId = "00000000000000000001";
     @Autowired
     private SourceMapper sourceMapper;
@@ -127,12 +130,21 @@ public class ViidController {
         }
         device.setKeepaliveAt(new Date());
         device.setIpAddr(IpUtils.getIpAddr(request));
-        if (device.getId() != null) {
-            deviceMapper.updateEntity(device);
-        } else {
-            device.setId(SnowFlakeUtil.getLongId());
-            deviceMapper.addEntity(device);
-            deviceRepository.clearDeviceCache(deviceId);
+        if (device.getId() == null) {
+            // 通过zt-device服务创建新设备
+            CreateDeviceRequest createRequest = new CreateDeviceRequest();
+            createRequest.setName(device.getName());
+            createRequest.setNo(device.getNo());
+            createRequest.setType("IPC"); // 默认类型为IPC
+            createRequest.setIsActive(0);
+            createRequest.setScenicId(0L);
+            createRequest.setSort(0);
+            try {
+                DeviceV2DTO createdDevice = deviceIntegrationService.createDevice(createRequest);
+                device.setId(createdDevice.getId());
+            } catch (Exception e) {
+                log.warn("创建设备失败，设备编号: {}, 错误: {}", deviceId, e.getMessage());
+            }
         }
         return new VIIDBaseResp(
                 new ResponseStatusObject(serverId, "/VIID/System/Register", "0", "注册成功", sdfTime.format(new Date()))
@@ -164,9 +176,20 @@ public class ViidController {
             device.setOnline(1);
             device.setKeepaliveAt(new Date());
             device.setIpAddr(IpUtils.getIpAddr(request));
-            device.setId(SnowFlakeUtil.getLongId());
-            deviceMapper.addEntity(device);
-            deviceRepository.clearDeviceCache(deviceId);
+            // 通过zt-device服务创建新设备
+            CreateDeviceRequest createRequest = new CreateDeviceRequest();
+            createRequest.setName(device.getName());
+            createRequest.setNo(device.getNo());
+            createRequest.setType("IPC"); // 默认类型为IPC
+            createRequest.setIsActive(0);
+            createRequest.setScenicId(0L);
+            createRequest.setSort(0);
+            try {
+                DeviceV2DTO createdDevice = deviceIntegrationService.createDevice(createRequest);
+                device.setId(createdDevice.getId());
+            } catch (Exception e) {
+                log.warn("创建设备失败，设备编号: {}, 错误: {}", deviceId, e.getMessage());
+            }
         } else {
             deviceRepository.updateOnlineStatus(device.getId(), IpUtils.getIpAddr(request), 1, new Date());
         }

src/main/java/com/ycwl/basic/controller/wvp/WvpController.java

@@ -6,7 +6,6 @@ import com.ycwl.basic.constant.StorageConstant;
 import com.ycwl.basic.device.entity.common.FileObject;
 import com.ycwl.basic.device.operator.WvpPassiveStorageOperator;
 import com.ycwl.basic.model.wvp.WvpSyncReqVo;
-import com.ycwl.basic.service.pc.DeviceService;
 import com.ycwl.basic.service.pc.ScenicService;
 import com.ycwl.basic.storage.adapters.IStorageAdapter;
 import com.ycwl.basic.storage.enums.StorageAcl;
@@ -30,15 +29,12 @@ import java.util.List;
 @RequestMapping("/wvp/v1/")
 public class WvpController {
 
-    @Autowired
-    private DeviceService deviceService;
     @Autowired
     private ScenicService scenicService;
 
     @IgnoreLogReq
     @PostMapping("/scenic/{scenicId}/sync")
     public ApiResponse<List<WvpPassiveStorageOperator.Task>> sync(@PathVariable("scenicId") Long scenicId, @RequestBody WvpSyncReqVo reqVo) {
-        deviceService.updateDevices(scenicId, reqVo);
         return ApiResponse.success(WvpPassiveStorageOperator.getTaskListByScenicId(scenicId));
     }