diff --git a/dk-api/api-business/src/main/java/org/dromara/business/api/RemoteBusinessTaskService.java b/dk-api/api-business/src/main/java/org/dromara/business/api/RemoteBusinessTaskService.java index c0780ec..be0bc47 100644 --- a/dk-api/api-business/src/main/java/org/dromara/business/api/RemoteBusinessTaskService.java +++ b/dk-api/api-business/src/main/java/org/dromara/business/api/RemoteBusinessTaskService.java @@ -9,9 +9,11 @@ public interface RemoteBusinessTaskService { /** * 更新预约工单状态 - * @param fileId 航线id - * @param jobId 飞行记录id - * @param isJobStatus 飞行状态 + * @param waylineId 航线id + * @param status 状态 0预约中 1 等待中，2执行中 3已完结 4 未完成 + * @param jobId 任务id@ 完结需要上传任务id + * @param jobName 任务名称 完结需要上传任务名称 */ - void updateTaskStatus(String fileId, String jobId,Boolean isJobStatus); + void updateTaskStatus(String waylineId,String status,String jobId,String jobName); + } diff --git a/dk-common/common-core/src/main/java/org/dromara/common/core/constant/BusinessConstants.java b/dk-common/common-core/src/main/java/org/dromara/common/core/constant/BusinessConstants.java index 9274916..f5d6539 100644 --- a/dk-common/common-core/src/main/java/org/dromara/common/core/constant/BusinessConstants.java +++ b/dk-common/common-core/src/main/java/org/dromara/common/core/constant/BusinessConstants.java @@ -11,11 +11,13 @@ public interface BusinessConstants { * 1-队列中 * 2-执行中 * 3-已完结 + * 4-未完成 * */ String TASK_STATUS_0 = String.valueOf(0); String TASK_STATUS_1 = String.valueOf(1); String TASK_STATUS_2 = String.valueOf(2); String TASK_STATUS_3 = String.valueOf(3); + String TASK_STATUS_4 = String.valueOf(4); /** 工单类型 diff --git a/dk-modules/business/src/main/java/org/dromara/business/dubbo/RemoteBusinessTaskServiceImpl.java b/dk-modules/business/src/main/java/org/dromara/business/dubbo/RemoteBusinessTaskServiceImpl.java index 724abc3..80502b3 100644 --- a/dk-modules/business/src/main/java/org/dromara/business/dubbo/RemoteBusinessTaskServiceImpl.java +++ b/dk-modules/business/src/main/java/org/dromara/business/dubbo/RemoteBusinessTaskServiceImpl.java @@ -3,9 +3,14 @@ package org.dromara.business.dubbo; import lombok.RequiredArgsConstructor; import org.apache.dubbo.config.annotation.DubboService; import org.dromara.business.api.RemoteBusinessTaskService; +import org.dromara.business.domain.BusinessTask; +import org.dromara.business.domain.vo.BusinessTaskVo; import org.dromara.business.service.IBusinessTaskService; +import org.dromara.common.core.constant.BusinessConstants; import org.springframework.stereotype.Service; +import java.util.Date; + /** * @auther yq * @data 2025/3/18 @@ -18,7 +23,19 @@ public class RemoteBusinessTaskServiceImpl implements RemoteBusinessTaskService @Override - public void updateTaskStatus(String fileId, String jobId, Boolean isJobStatus) { + public void updateTaskStatus(String waylineId,String status,String jobId,String jobName) { + BusinessTaskVo businessTaskVo = businessTaskService.queryBusinessTask(waylineId); + if(businessTaskVo != null){ + BusinessTask businessTask = new BusinessTask(); + businessTask.setId(businessTaskVo.getId()); + businessTask.setStatus(status); + if(BusinessConstants.TASK_STATUS_3.equals(status)){ + businessTask.setJobId(jobId); + businessTask.setJobName(jobName); + businessTask.setCompleteTime(new Date()); + } + businessTaskService.update(businessTask); + } } } diff --git a/dk-modules/business/src/main/java/org/dromara/business/mapper/BusinessTaskMapper.java b/dk-modules/business/src/main/java/org/dromara/business/mapper/BusinessTaskMapper.java index ee4c0be..47f9458 100644 --- a/dk-modules/business/src/main/java/org/dromara/business/mapper/BusinessTaskMapper.java +++ b/dk-modules/business/src/main/java/org/dromara/business/mapper/BusinessTaskMapper.java @@ -24,4 +24,6 @@ public interface BusinessTaskMapper extends BaseMapperPlus queryPageList(@Param("page") Page page, @Param("bo") BusinessTaskBo bo); + + BusinessTaskVo queryBusinessTask(@Param("waylineId") String waylineId); } diff --git a/dk-modules/business/src/main/java/org/dromara/business/service/IBusinessTaskService.java b/dk-modules/business/src/main/java/org/dromara/business/service/IBusinessTaskService.java index f4aab8d..8fa0321 100644 --- a/dk-modules/business/src/main/java/org/dromara/business/service/IBusinessTaskService.java +++ b/dk-modules/business/src/main/java/org/dromara/business/service/IBusinessTaskService.java @@ -68,4 +68,6 @@ public interface IBusinessTaskService { * @return 是否删除成功 */ Boolean deleteWithValidByIds(Collection ids, Boolean isValid); + + BusinessTaskVo queryBusinessTask(String waylineId); } diff --git a/dk-modules/business/src/main/java/org/dromara/business/service/impl/BusinessTaskServiceImpl.java b/dk-modules/business/src/main/java/org/dromara/business/service/impl/BusinessTaskServiceImpl.java index b25cdff..fa8fd63 100644 --- a/dk-modules/business/src/main/java/org/dromara/business/service/impl/BusinessTaskServiceImpl.java +++ b/dk-modules/business/src/main/java/org/dromara/business/service/impl/BusinessTaskServiceImpl.java @@ -150,4 +150,9 @@ public class BusinessTaskServiceImpl implements IBusinessTaskService { } return baseMapper.deleteByIds(ids) > 0; } + + @Override + public BusinessTaskVo queryBusinessTask(String waylineId) { + return baseMapper.queryBusinessTask(waylineId); + } } diff --git a/dk-modules/business/src/main/resources/mapper/business/BusinessTaskMapper.xml b/dk-modules/business/src/main/resources/mapper/business/BusinessTaskMapper.xml index 85ab44e..61ae721 100644 --- a/dk-modules/business/src/main/resources/mapper/business/BusinessTaskMapper.xml +++ b/dk-modules/business/src/main/resources/mapper/business/BusinessTaskMapper.xml @@ -83,4 +83,29 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" order by t.status + diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/entity/DeviceQrtzDateEntity.java b/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/entity/DeviceQrtzDateEntity.java index fc6dbe1..272cb86 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/entity/DeviceQrtzDateEntity.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/entity/DeviceQrtzDateEntity.java @@ -51,31 +51,6 @@ public class DeviceQrtzDateEntity implements Serializable { - - /** - * 创建人 - */ - - - private String createBy; - - /** - * 创建时间 - */ - private Date createTime; - - /** - * 更新人 - */ - - private String updateBy; - - /** - * 更新时间 - */ - - private Date updateTime; - /** * 删除 0 正常 1已删除 */ 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 f140aee..d228af7 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 @@ -138,17 +133,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; }