diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/bean/CommonGBChannel.java b/src/main/java/com/genersoft/iot/vmp/gb28181/bean/CommonGBChannel.java index d9d2e0c4..6bd2fad6 100644 --- a/src/main/java/com/genersoft/iot/vmp/gb28181/bean/CommonGBChannel.java +++ b/src/main/java/com/genersoft/iot/vmp/gb28181/bean/CommonGBChannel.java @@ -87,7 +87,7 @@ public class CommonGBChannel { @Schema(description = "国标-经度 WGS-84坐标系") private Double gbLongitude; - @Schema(description = "国标-,纬度 WGS-84坐标系") + @Schema(description = "国标-纬度 WGS-84坐标系") private Double gbLatitude; @Schema(description = "国标-虚拟组织所属的业务分组ID") diff --git a/src/main/java/com/genersoft/iot/vmp/streamPush/bean/StreamPushExcelDto.java b/src/main/java/com/genersoft/iot/vmp/streamPush/bean/StreamPushExcelDto.java index bfaaade0..4ccc7514 100755 --- a/src/main/java/com/genersoft/iot/vmp/streamPush/bean/StreamPushExcelDto.java +++ b/src/main/java/com/genersoft/iot/vmp/streamPush/bean/StreamPushExcelDto.java @@ -1,6 +1,7 @@ package com.genersoft.iot.vmp.streamPush.bean; import com.alibaba.excel.annotation.ExcelProperty; +import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; @Data @@ -16,14 +17,14 @@ public class StreamPushExcelDto { private String stream; @ExcelProperty("国标ID") - private String gbId; - -// @ExcelProperty("平台ID") -// private String platformId; -// -// @ExcelProperty("目录ID") -// private String catalogId; + private String gbDeviceId; @ExcelProperty("在线状态") private boolean status; + + @Schema(description = "经度 WGS-84坐标系") + private Double longitude; + + @Schema(description = "纬度 WGS-84坐标系") + private Double latitude; } diff --git a/src/main/java/com/genersoft/iot/vmp/streamPush/enent/StreamPushUploadFileHandler.java b/src/main/java/com/genersoft/iot/vmp/streamPush/enent/StreamPushUploadFileHandler.java index 2dbd6c33..306c75e8 100755 --- a/src/main/java/com/genersoft/iot/vmp/streamPush/enent/StreamPushUploadFileHandler.java +++ b/src/main/java/com/genersoft/iot/vmp/streamPush/enent/StreamPushUploadFileHandler.java @@ -81,21 +81,21 @@ public class StreamPushUploadFileHandler extends AnalysisEventListener