From fcefe41e05439f548a58c7e5b6aa6e58f7b80ada Mon Sep 17 00:00:00 2001 From: hcong <1050828145@qq.com> Date: 星期一, 23 十二月 2024 11:57:46 +0800 Subject: [PATCH] 1. 新增接口网格数据excel模板、网格数据excel导入 2. 接口解析网格数据抛出相关excel报错信息 3. FileExchange.kt新增excel转换到GridDataDetail列表方法 4. 新增导入excel的单元测试代码 --- src/main/kotlin/com/flightfeather/uav/lightshare/service/RealTimeDataService.kt | 11 +++++++++-- 1 files changed, 9 insertions(+), 2 deletions(-) diff --git a/src/main/kotlin/com/flightfeather/uav/lightshare/service/RealTimeDataService.kt b/src/main/kotlin/com/flightfeather/uav/lightshare/service/RealTimeDataService.kt index a9627b1..af71e21 100644 --- a/src/main/kotlin/com/flightfeather/uav/lightshare/service/RealTimeDataService.kt +++ b/src/main/kotlin/com/flightfeather/uav/lightshare/service/RealTimeDataService.kt @@ -10,13 +10,20 @@ interface RealTimeDataService { - fun getSecondData(deviceCode: String?, startTime: String?, endTime: String?, type: Int?, page: Int?, perPage: Int?): BaseResponse<List<DataVo>> + fun getSecondData( + deviceType: String?, deviceCode: String?, startTime: String?, endTime: String?, type: Int?, + page: Int?, perPage: Int?, + ): BaseResponse<List<DataVo>> fun getNextData(deviceCode: String, updateTime: String, page: Int?, perPage: Int?): BaseResponse<List<DataVo>> + fun getSegmentData(missionCode: String): List<List<DataVo>> + fun importData(file: MultipartFile): BaseResponse<DataImportResult> - fun importJinanData(file: MultipartFile): BaseResponse<DataImportResult> + fun importJinanData(code:String, file: MultipartFile): DataImportResult + + fun downloadTemplate(response: HttpServletResponse): Boolean fun outToWorkbook(deviceCode: String, startTime: String, endTime: String): SXSSFWorkbook -- Gitblit v1.9.3