From a7aaeabc7873a0eafb4a7ecad7f65b018b7a9bc9 Mon Sep 17 00:00:00 2001
From: sean.zhou <sean.zhou@dji.com>
Date: Fri, 24 Feb 2023 19:31:23 +0800
Subject: [PATCH] What's new? 1. Add license for dock. 2. Modify the logic corresponding to the firmware file and device type. 3. Add multiple mqtt clients options. 4. Modify the structure of the interface for obtaining the device list. 5. Fixed some issues.
---
src/main/java/com/dji/sample/manage/service/impl/CameraVideoServiceImpl.java | 84 ++++--------------------------------------
1 files changed, 8 insertions(+), 76 deletions(-)
diff --git a/src/main/java/com/dji/sample/manage/service/impl/CameraVideoServiceImpl.java b/src/main/java/com/dji/sample/manage/service/impl/CameraVideoServiceImpl.java
index a2196e4..bfe6de9 100644
--- a/src/main/java/com/dji/sample/manage/service/impl/CameraVideoServiceImpl.java
+++ b/src/main/java/com/dji/sample/manage/service/impl/CameraVideoServiceImpl.java
@@ -1,17 +1,11 @@
package com.dji.sample.manage.service.impl;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.dji.sample.manage.dao.ICameraVideoMapper;
import com.dji.sample.manage.model.dto.CapacityVideoDTO;
-import com.dji.sample.manage.model.entity.CameraVideoEntity;
import com.dji.sample.manage.model.receiver.CapacityVideoReceiver;
import com.dji.sample.manage.service.ICameraVideoService;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-import java.util.List;
-import java.util.stream.Collectors;
+import java.util.UUID;
/**
* @author sean.zhou
@@ -19,80 +13,18 @@
* @date 2021/11/19
*/
@Service
-@Transactional
+//@Transactional
public class CameraVideoServiceImpl implements ICameraVideoService {
- @Autowired
- private ICameraVideoMapper mapper;
-
@Override
- public List<CapacityVideoDTO> getCameraVideosByCameraId(Integer cameraId) {
- return mapper.selectList(
- new LambdaQueryWrapper<CameraVideoEntity>()
- .eq(CameraVideoEntity::getCameraId, cameraId))
- .stream()
- .map(this::entityConvertToDto)
- .collect(Collectors.toList());
- }
-
- @Override
- public Boolean deleteCameraVideosById(List<Integer> ids) {
- if (ids.isEmpty()) {
- return true;
- }
- return mapper.deleteBatchIds(ids) > 0;
- }
-
- @Override
- public Boolean saveCameraVideoDTOList(List<CapacityVideoReceiver> capacityVideoReceivers, Integer cameraId) {
- for (CapacityVideoReceiver videoDTO : capacityVideoReceivers) {
- CameraVideoEntity videoEntity = videoDTOConvertToEntity(videoDTO);
- videoEntity.setCameraId(cameraId);
- int saveId = this.saveOneCameraVideoEntity(videoEntity);
- if (saveId <= 0) {
- return false;
- }
- }
- return true;
- }
-
- /**
- * Save the live capability of the lens of this camera.
- * @param entity lens data
- * @return
- */
- private Integer saveOneCameraVideoEntity(CameraVideoEntity entity) {
- return mapper.insert(entity) > 0 ? entity.getId() : 0;
- }
-
- /**
- * Convert the received lens capability object into a database entity object.
- * @param dto received lens object
- * @return entity
- */
- private CameraVideoEntity videoDTOConvertToEntity(CapacityVideoReceiver dto) {
- CameraVideoEntity.CameraVideoEntityBuilder builder = CameraVideoEntity.builder();
- if (dto != null) {
- builder
- .videoIndex(dto.getVideoIndex())
- .videoType(dto.getVideoType());
- }
- return builder.build();
- }
-
- /**
- * Convert database entity objects into lens data transfer object.
- * @param entity
- * @return data transfer object
- */
- private CapacityVideoDTO entityConvertToDto(CameraVideoEntity entity) {
+ public CapacityVideoDTO receiver2Dto(CapacityVideoReceiver receiver) {
CapacityVideoDTO.CapacityVideoDTOBuilder builder = CapacityVideoDTO.builder();
- if (entity != null) {
- builder
- .id(entity.getId())
- .index(entity.getVideoIndex())
- .type(entity.getVideoType());
+ if (receiver != null) {
+ builder.id(UUID.randomUUID().toString())
+ .index(receiver.getVideoIndex())
+ .type(receiver.getVideoType())
+ .switchVideoTypes(receiver.getSwitchableVideoTypes());
}
return builder.build();
}
--
Gitblit v1.9.3