diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/entity/DeviceEntity.java b/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/entity/DeviceEntity.java index 9884769..21bb2e1 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/entity/DeviceEntity.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/entity/DeviceEntity.java @@ -89,10 +89,4 @@ public class DeviceEntity implements Serializable { @TableField(value = "login_time") private LocalDateTime loginTime; - /** - * 租户ID - */ - @TableField(value = "tenant_id") - private String tenantId; - } diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/entity/DeviceFirmwareEntity.java b/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/entity/DeviceFirmwareEntity.java index e1006f1..ead30ad 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/entity/DeviceFirmwareEntity.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/entity/DeviceFirmwareEntity.java @@ -68,7 +68,5 @@ public class DeviceFirmwareEntity implements Serializable { @TableField(value = "update_time", fill = FieldFill.INSERT_UPDATE) private Date updateTime; - @TableField(value = "tenant_id") - private String tenantId; } diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/entity/DevicePayloadEntity.java b/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/entity/DevicePayloadEntity.java index a1056f3..8794f19 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/entity/DevicePayloadEntity.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/entity/DevicePayloadEntity.java @@ -56,6 +56,4 @@ public class DevicePayloadEntity implements Serializable { @TableField(value = "control_source") private String controlSource; - @TableField(value = "tenant_id") - private String tenantId; } diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/entity/FirmwareModelEntity.java b/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/entity/FirmwareModelEntity.java index 2f9427a..167d674 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/entity/FirmwareModelEntity.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/entity/FirmwareModelEntity.java @@ -34,7 +34,4 @@ public class FirmwareModelEntity implements Serializable { @TableField(value = "update_time", fill = FieldFill.INSERT_UPDATE) private Long updateTime; - - @TableField(value = "tenant_id", fill = FieldFill.INSERT_UPDATE) - private String tenantId; } diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/manage/service/impl/SDKDeviceService.java b/dk-modules/sample/src/main/java/org/dromara/sample/manage/service/impl/SDKDeviceService.java index a7f48d1..033ee0f 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/manage/service/impl/SDKDeviceService.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/manage/service/impl/SDKDeviceService.java @@ -23,6 +23,7 @@ import org.springframework.messaging.MessageHeaders; import org.springframework.stereotype.Service; import org.springframework.util.StringUtils; +import java.sql.SQLException; import java.time.LocalDateTime; import java.util.List; import java.util.Objects; @@ -157,7 +158,11 @@ public class SDKDeviceService extends AbstractDeviceService { executor.execute(new Runnable() { @Override public void run() { - deviceQrtzService.getDeviceQrtzFileEntity(device); + try { + deviceQrtzService.getDeviceQrtzFileEntity(device); + } catch (SQLException e) { + throw new RuntimeException(e); + } } }); } diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/media/model/MediaFileEntity.java b/dk-modules/sample/src/main/java/org/dromara/sample/media/model/MediaFileEntity.java index d24b1bf..ac9b1b0 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/media/model/MediaFileEntity.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/media/model/MediaFileEntity.java @@ -109,6 +109,7 @@ public class MediaFileEntity implements Serializable { @TableField("file_status") private String fileStatus; + @TableField("file_index") private Integer fileIndex; } diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/wayline/controller/WaylineFileController.java b/dk-modules/sample/src/main/java/org/dromara/sample/wayline/controller/WaylineFileController.java index 543e794..4ae1ae6 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/wayline/controller/WaylineFileController.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/wayline/controller/WaylineFileController.java @@ -63,9 +63,9 @@ public class WaylineFileController implements IHttpWaylineService { * @param file * @return */ - @PostMapping("${url.wayline.prefix}${url.wayline.version}/workspaces/{workspace_id}/waylines/file/upload") + @PostMapping("${url.wayline.prefix}${url.wayline.version}/workspaces/{workspace_id}/waylines/file/{deviceSn}/upload") @Operation(summary = "导入kmz航路文件。", description = "导入kmz航路文件。") - public HttpResultResponse importKmzFile(@PathVariable(name = "workspace_id") String workspaceId,HttpServletRequest request, MultipartFile file,String deviceSn) { + public HttpResultResponse importKmzFile(@PathVariable(name = "workspace_id") String workspaceId,HttpServletRequest request, MultipartFile file,@PathVariable(name = "deviceSn") String deviceSn) { if (Objects.isNull(file)) { return HttpResultResponse.error("未收到文件。"); }