You've already forked FrameTour-BE
feat(device): 集成 zt-device 服务
- 移除 DeviceController、DeviceService 相关代码 - 更新 ViidController、WvpController 使用 DeviceIntegrationService - 修改 DeviceFactory 创建 DeviceEntity 的方式 - 更新 DeviceRepository 使用 DeviceV2DTO -调整 CustomUploadTaskService、AppScenicServiceImpl 中的设备相关逻辑 - 移除 DeviceServiceImpl 类 - 更新 VideoPieceCleaner、VideoPieceGetter 任务类,使用 DeviceIntegrationService 获取设备信息
This commit is contained in:
@@ -1,7 +1,5 @@
|
||||
package com.ycwl.basic.service.custom;
|
||||
|
||||
import com.aliyun.credentials.Client;
|
||||
import com.aliyun.credentials.models.Config;
|
||||
import com.aliyun.mts20140618.models.QuerySmarttagJobRequest;
|
||||
import com.aliyun.mts20140618.models.QuerySmarttagJobResponse;
|
||||
import com.aliyun.mts20140618.models.QuerySmarttagJobResponseBody;
|
||||
@@ -10,11 +8,11 @@ import com.aliyun.mts20140618.models.SubmitSmarttagJobResponse;
|
||||
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
||||
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.DeviceV2DTO;
|
||||
import com.ycwl.basic.mapper.CustomUploadTaskMapper;
|
||||
import com.ycwl.basic.mapper.FaceSampleMapper;
|
||||
import com.ycwl.basic.mapper.SourceMapper;
|
||||
import com.ycwl.basic.model.pc.device.entity.DeviceEntity;
|
||||
import com.ycwl.basic.model.custom.entity.CustomUploadTaskEntity;
|
||||
import com.ycwl.basic.model.custom.entity.FaceData;
|
||||
import com.ycwl.basic.model.custom.req.CreateUploadTaskReq;
|
||||
@@ -30,20 +28,15 @@ import lombok.extern.slf4j.Slf4j;
|
||||
import org.apache.commons.lang3.StringUtils;
|
||||
import org.apache.commons.lang3.Strings;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.beans.factory.annotation.Value;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
import java.util.Date;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.Objects;
|
||||
import java.util.UUID;
|
||||
import java.util.concurrent.ArrayBlockingQueue;
|
||||
import java.util.concurrent.ThreadPoolExecutor;
|
||||
import java.util.concurrent.TimeUnit;
|
||||
|
||||
import static com.ycwl.basic.constant.StorageConstant.VIID_FACE;
|
||||
|
||||
@Slf4j
|
||||
@Service
|
||||
public class CustomUploadTaskService {
|
||||
@@ -52,7 +45,7 @@ public class CustomUploadTaskService {
|
||||
private CustomUploadTaskMapper customUploadTaskMapper;
|
||||
|
||||
@Autowired
|
||||
private DeviceMapper deviceMapper;
|
||||
private DeviceIntegrationService deviceIntegrationService;
|
||||
|
||||
@Autowired
|
||||
private ScenicService scenicService;
|
||||
@@ -80,7 +73,7 @@ public class CustomUploadTaskService {
|
||||
}
|
||||
|
||||
// 验证设备访问权限
|
||||
DeviceEntity device = validateDeviceAccess(req.getAccessKey(), req.getType());
|
||||
DeviceV2DTO device = validateDeviceAccess(req.getAccessKey(), req.getType());
|
||||
|
||||
long taskId = SnowFlakeUtil.getLongId();
|
||||
String savePath = generateSavePath(device.getScenicId(), req.getFileName());
|
||||
@@ -108,7 +101,7 @@ public class CustomUploadTaskService {
|
||||
|
||||
public void completeUpload(String accessKey, Long taskId) {
|
||||
// 验证设备访问权限
|
||||
DeviceEntity device = validateDeviceAccess(accessKey, null);
|
||||
DeviceV2DTO device = validateDeviceAccess(accessKey, null);
|
||||
|
||||
CustomUploadTaskEntity task = customUploadTaskMapper.selectById(taskId);
|
||||
if (task == null) {
|
||||
@@ -146,7 +139,7 @@ public class CustomUploadTaskService {
|
||||
|
||||
public void markTaskFailed(String accessKey, Long taskId, String errorMsg) {
|
||||
// 验证设备访问权限
|
||||
DeviceEntity device = validateDeviceAccess(accessKey, null);
|
||||
DeviceV2DTO device = validateDeviceAccess(accessKey, null);
|
||||
|
||||
CustomUploadTaskEntity task = customUploadTaskMapper.selectById(taskId);
|
||||
if (task == null) {
|
||||
@@ -214,17 +207,18 @@ public class CustomUploadTaskService {
|
||||
}
|
||||
}
|
||||
|
||||
private DeviceEntity validateDeviceAccess(String accessKey, String type) {
|
||||
private DeviceV2DTO validateDeviceAccess(String accessKey, String type) {
|
||||
if (StringUtils.isBlank(accessKey)) {
|
||||
throw new RuntimeException("设备访问密钥不能为空");
|
||||
}
|
||||
|
||||
DeviceEntity device = deviceMapper.getByDeviceNo(accessKey);
|
||||
if (device == null || device.getStatus() != 1) {
|
||||
// 通过zt-device服务获取设备信息
|
||||
DeviceV2DTO deviceV2DTO = deviceIntegrationService.getDeviceByNo(accessKey);
|
||||
if (deviceV2DTO == null || deviceV2DTO.getIsActive() != 1) {
|
||||
throw new RuntimeException("无效的设备访问密钥或设备已被禁用");
|
||||
}
|
||||
|
||||
return device;
|
||||
return deviceV2DTO;
|
||||
}
|
||||
|
||||
private String createAliyunMtsTask(String inputPath) {
|
||||
|
||||
Reference in New Issue
Block a user