From 2e43b5b9407bcf0433f335b633cde5d18a542db1 Mon Sep 17 00:00:00 2001 From: like <1025687351@qq.com> Date: Thu, 27 Mar 2025 08:41:47 +0800 Subject: [PATCH] =?UTF-8?q?=E8=88=AA=E7=BA=BF=E7=AD=9B=E9=80=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../wayline/GetWaylineListRequest.java | 11 +++++++++ .../wayline/GetWaylineListResponse.java | 15 ++++++++++++ .../wayline/mapper/IWaylineFileMapper.java | 8 +++++++ .../model/entity/WaylineFileEntity.java | 3 +++ .../service/impl/WaylineFileServiceImpl.java | 13 +++++++++-- .../resources/mapper/WaylineDeviceMapper.xml | 23 +++++++++++++++++++ 6 files changed, 71 insertions(+), 2 deletions(-) create mode 100644 dk-modules/sample/src/main/resources/mapper/WaylineDeviceMapper.xml diff --git a/dk-common/common-cloudsdk/src/main/java/org/dromara/common/sdk/cloudapi/wayline/GetWaylineListRequest.java b/dk-common/common-cloudsdk/src/main/java/org/dromara/common/sdk/cloudapi/wayline/GetWaylineListRequest.java index d37f755..58af518 100644 --- a/dk-common/common-cloudsdk/src/main/java/org/dromara/common/sdk/cloudapi/wayline/GetWaylineListRequest.java +++ b/dk-common/common-cloudsdk/src/main/java/org/dromara/common/sdk/cloudapi/wayline/GetWaylineListRequest.java @@ -25,6 +25,7 @@ public class GetWaylineListRequest { @Parameter(name = "favorited", description = "路线文件是否已加为收藏?") private Boolean favorited; + @JsonProperty("device_sn") @Parameter(name = "deviceSn", description = "设备sn") private String deviceSn; @@ -105,6 +106,7 @@ public class GetWaylineListRequest { ", actionType=" + actionType + ", droneModelKeys=" + droneModelKeys + ", payloadModelKey=" + payloadModelKey + + ", deviceSn=" + deviceSn + ", key='" + key + '\'' + '}'; } @@ -189,4 +191,13 @@ public class GetWaylineListRequest { this.key = key; return this; } + + public String getDeviceSn() { + return deviceSn; + } + + public GetWaylineListRequest setDeviceSn(String deviceSn) { + this.deviceSn = deviceSn; + return this; + } } diff --git a/dk-common/common-cloudsdk/src/main/java/org/dromara/common/sdk/cloudapi/wayline/GetWaylineListResponse.java b/dk-common/common-cloudsdk/src/main/java/org/dromara/common/sdk/cloudapi/wayline/GetWaylineListResponse.java index 0f677ca..3866e98 100644 --- a/dk-common/common-cloudsdk/src/main/java/org/dromara/common/sdk/cloudapi/wayline/GetWaylineListResponse.java +++ b/dk-common/common-cloudsdk/src/main/java/org/dromara/common/sdk/cloudapi/wayline/GetWaylineListResponse.java @@ -109,6 +109,10 @@ public class GetWaylineListResponse extends BaseModel { public GetWaylineListResponse() { } + @JsonProperty("device_name") + @Parameter(name = "device_name", description = "设备名称", example = "1") + private String deviceName; + @Override public String toString() { return "GetWaylineListResponse{" + @@ -124,6 +128,7 @@ public class GetWaylineListResponse extends BaseModel { ", updateTime=" + updateTime + ", createTime=" + createTime + ", actionType=" + actionType + + ", deviceName=" + deviceName + '}'; } @@ -234,4 +239,14 @@ public class GetWaylineListResponse extends BaseModel { this.actionType = actionType; return this; } + + + public String getDeviceName() { + return deviceName; + } + + public GetWaylineListResponse setDeviceName(String deviceName) { + this.deviceName = deviceName; + return this; + } } diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/wayline/mapper/IWaylineFileMapper.java b/dk-modules/sample/src/main/java/org/dromara/sample/wayline/mapper/IWaylineFileMapper.java index 9562c24..a35ada5 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/wayline/mapper/IWaylineFileMapper.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/wayline/mapper/IWaylineFileMapper.java @@ -1,6 +1,12 @@ package org.dromara.sample.wayline.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import org.apache.ibatis.annotations.Param; +import org.dromara.common.sdk.cloudapi.wayline.GetWaylineListRequest; +import org.dromara.sample.wayline.model.dto.AiCompareQueueDTO; +import org.dromara.sample.wayline.model.entity.AiCompareQueueEntity; import org.dromara.sample.wayline.model.entity.WaylineFileEntity; /** @@ -9,4 +15,6 @@ import org.dromara.sample.wayline.model.entity.WaylineFileEntity; * @date 2021/12/22 */ public interface IWaylineFileMapper extends BaseMapper { + + Page getPage(@Param("param") GetWaylineListRequest param, @Param("page") Page page); } diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/wayline/model/entity/WaylineFileEntity.java b/dk-modules/sample/src/main/java/org/dromara/sample/wayline/model/entity/WaylineFileEntity.java index 81b6221..dfce95c 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/wayline/model/entity/WaylineFileEntity.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/wayline/model/entity/WaylineFileEntity.java @@ -60,4 +60,7 @@ public class WaylineFileEntity implements Serializable { @TableField(value = "update_time", fill = FieldFill.INSERT_UPDATE) private Date updateTime; + @TableField(exist = false) + private String deviceName; + } 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 5a1f452..938c67d 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 @@ -95,7 +95,6 @@ public class WaylineFileServiceImpl implements IWaylineFileService { .stream() .map(this::entityConvertToDTO) .collect(Collectors.toList()); - return new PaginationData<>(records, new Pagination(page.getCurrent(), page.getSize(), page.getTotal())); } @@ -227,7 +226,16 @@ public class WaylineFileServiceImpl implements IWaylineFileService { @Override public PaginationData getWaylinesByParamNew(String workspaceId, GetWaylineListRequest param) { - return null; + Page waylineFileEntityPage = new Page<>(param.getPage(), param.getPageSize()); + Page page = mapper.getPage(param,waylineFileEntityPage); + + // Wrap the results of a paging query into a custom paging object. + List records = page.getRecords() + .stream() + .map(this::entityConvertToDTO) + .collect(Collectors.toList()); + + return new PaginationData<>(records, new Pagination(page.getCurrent(), page.getSize(), page.getTotal())); } private Optional validKmzFile(MultipartFile file) { @@ -298,6 +306,7 @@ public class WaylineFileServiceImpl implements IWaylineFileService { .setUsername(entity.getUsername()) .setObjectKey(entity.getObjectKey()) .setSign(entity.getSign()) + .setDeviceName(entity.getDeviceName()) .setUpdateTime(entity.getUpdateTime()) .setCreateTime(entity.getCreateTime()) .setId(entity.getWaylineId()); diff --git a/dk-modules/sample/src/main/resources/mapper/WaylineDeviceMapper.xml b/dk-modules/sample/src/main/resources/mapper/WaylineDeviceMapper.xml new file mode 100644 index 0000000..e133548 --- /dev/null +++ b/dk-modules/sample/src/main/resources/mapper/WaylineDeviceMapper.xml @@ -0,0 +1,23 @@ + + + + + + + +