diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/media/service/impl/FileServiceImpl.java b/dk-modules/sample/src/main/java/org/dromara/sample/media/service/impl/FileServiceImpl.java index a150e93..adaf4d8 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/media/service/impl/FileServiceImpl.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/media/service/impl/FileServiceImpl.java @@ -73,11 +73,14 @@ public class FileServiceImpl implements IFileService { fileEntity.setWorkspaceId(workspaceId); fileEntity.setFileId(UUID.randomUUID().toString()); fileEntity.setFileType(fileEntity.getFileName().substring( fileEntity.getFileName().lastIndexOf(".")+1)); - fileEntity.setFileStatus(fileEntity.getFileName().substring( fileEntity.getFileName().lastIndexOf("_")+1, fileEntity.getFileName().lastIndexOf("."))); - int firstUnderscore = fileEntity.getFileName().indexOf("_"); - int secondUnderscore = fileEntity.getFileName().indexOf("_", firstUnderscore + 1); - int thirdUnderscore = fileEntity.getFileName().indexOf("_", secondUnderscore + 1); - fileEntity.setFileIndex(Integer.parseInt(fileEntity.getFileName().substring(secondUnderscore+1,thirdUnderscore))); + if(!fileEntity.getFileType().equals("DAT")){ + fileEntity.setFileStatus(fileEntity.getFileName().substring( fileEntity.getFileName().lastIndexOf("_")+1, fileEntity.getFileName().lastIndexOf("."))); + int firstUnderscore = fileEntity.getFileName().indexOf("_"); + int secondUnderscore = fileEntity.getFileName().indexOf("_", firstUnderscore + 1); + int thirdUnderscore = fileEntity.getFileName().indexOf("_", secondUnderscore + 1); + fileEntity.setFileIndex(Integer.parseInt(fileEntity.getFileName().substring(secondUnderscore+1,thirdUnderscore))); + } + return mapper.insert(fileEntity); } @@ -148,7 +151,7 @@ public class FileServiceImpl implements IFileService { .gimbalYawDegree(file.getMetadata().getGimbalYawDegree()) .absoluteAltitude(file.getMetadata().getAbsoluteAltitude()) .relativeAltitude(file.getMetadata().getRelativeAltitude()) - .shootTime(file.getMetadata().getCreatedTime()) + .shootTime(file.getMetadata().getCreatedTime() != null ? file.getMetadata().getCreatedTime() : new Date()) .cloudToCloudId(file.getCloudToCloudId()) .flightType(flightTask.getFlightType().getType()) .uploadedFileCount(flightTask != null ? flightTask.getUploadedFileCount() : null) diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/wayline/mapper/IWaylineDeviceMapper.java b/dk-modules/sample/src/main/java/org/dromara/sample/wayline/mapper/IWaylineDeviceMapper.java deleted file mode 100644 index ed5f1b0..0000000 --- a/dk-modules/sample/src/main/java/org/dromara/sample/wayline/mapper/IWaylineDeviceMapper.java +++ /dev/null @@ -1,13 +0,0 @@ -package org.dromara.sample.wayline.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import org.dromara.sample.wayline.model.entity.WaylineDeviceEntity; -import org.dromara.sample.wayline.model.entity.WaylineFileEntity; - -/** - * @author sean - * @version 0.3 - * @date 2021/12/22 - */ -public interface IWaylineDeviceMapper extends BaseMapper { -} diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/wayline/model/entity/WaylineDeviceEntity.java b/dk-modules/sample/src/main/java/org/dromara/sample/wayline/model/entity/WaylineDeviceEntity.java deleted file mode 100644 index 33d95a5..0000000 --- a/dk-modules/sample/src/main/java/org/dromara/sample/wayline/model/entity/WaylineDeviceEntity.java +++ /dev/null @@ -1,39 +0,0 @@ -package org.dromara.sample.wayline.model.entity; - -import com.baomidou.mybatisplus.annotation.*; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; - -import java.io.Serializable; -import java.util.Date; - -/** - * @author sean - * @version 0.3 - * @date 2021/12/22 - */ -@Data -@TableName("wayline_device") -@Builder -@AllArgsConstructor -@NoArgsConstructor -public class WaylineDeviceEntity implements Serializable { - - @TableId(type = IdType.AUTO) - private Integer id; - - @TableField("wayline_id") - private String waylineId; - - @TableField("device_sn") - private String deviceSn; - - @TableField(value = "create_time", fill = FieldFill.INSERT) - private Date createTime; - - @TableField(value = "update_time", fill = FieldFill.INSERT_UPDATE) - private Date updateTime; - -} diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/wayline/service/impl/WaylineFileServiceImpl.java b/dk-modules/sample/src/main/java/org/dromara/sample/wayline/service/impl/WaylineFileServiceImpl.java index 9a6783b..631773f 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/wayline/service/impl/WaylineFileServiceImpl.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/wayline/service/impl/WaylineFileServiceImpl.java @@ -21,11 +21,9 @@ import org.dromara.common.sdk.cloudapi.wayline.GetWaylineListResponse; import org.dromara.common.sdk.cloudapi.wayline.WaylineTypeEnum; import org.dromara.common.sdk.common.Pagination; import org.dromara.common.sdk.common.PaginationData; -import org.dromara.sample.wayline.mapper.IWaylineDeviceMapper; import org.dromara.sample.wayline.mapper.IWaylineFileMapper; import org.dromara.sample.wayline.model.dto.KmzFileProperties; import org.dromara.sample.wayline.model.dto.WaylineFileDTO; -import org.dromara.sample.wayline.model.entity.WaylineDeviceEntity; import org.dromara.sample.wayline.model.entity.WaylineFileEntity; import org.dromara.sample.wayline.service.IWaylineFileService; import org.springframework.beans.factory.annotation.Autowired; @@ -60,9 +58,6 @@ public class WaylineFileServiceImpl implements IWaylineFileService { @Autowired private IWaylineFileMapper mapper; - @Autowired - private IWaylineDeviceMapper deviceMapper; - @Override public PaginationData getWaylinesByParam(String workspaceId, GetWaylineListRequest param) { // Paging Query @@ -139,17 +134,6 @@ public class WaylineFileServiceImpl implements IWaylineFileService { } } int insertId = mapper.insert(file); - //插入航线和设备关联表 - if (CollectionUtils.isNotEmpty(metadata.getDeviceSns())){ - for (String sn : metadata.getDeviceSns()){ - WaylineDeviceEntity entity = new WaylineDeviceEntity(); - entity.setWaylineId(file.getWaylineId()); - entity.setDeviceSn(sn); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); - insertId = deviceMapper.insert(entity); - } - } return insertId > 0 ? file.getId() : insertId; }