From 01eae19a4870033e879a3faa6749eece92926cab Mon Sep 17 00:00:00 2001 From: feiyu02 <risaku@163.com> Date: 星期五, 26 一月 2024 17:10:55 +0800 Subject: [PATCH] 1. 新增多项yml配置文件 2. 新增导入静安监测数据功能模块(未完成) --- src/main/kotlin/com/flightfeather/uav/lightshare/web/RealTimeDataController.kt | 11 ++++++++++- 1 files changed, 10 insertions(+), 1 deletions(-) diff --git a/src/main/kotlin/com/flightfeather/uav/lightshare/web/RealTimeDataController.kt b/src/main/kotlin/com/flightfeather/uav/lightshare/web/RealTimeDataController.kt index cc05b83..6831444 100644 --- a/src/main/kotlin/com/flightfeather/uav/lightshare/web/RealTimeDataController.kt +++ b/src/main/kotlin/com/flightfeather/uav/lightshare/web/RealTimeDataController.kt @@ -2,6 +2,8 @@ import com.flightfeather.uav.lightshare.service.RealTimeDataService import io.swagger.annotations.Api +import io.swagger.annotations.ApiOperation +import io.swagger.annotations.ApiParam import org.springframework.web.bind.annotation.* import org.springframework.web.multipart.MultipartFile @@ -15,9 +17,10 @@ @RequestParam(value = "deviceCode", required = false) deviceCode: String?, @RequestParam(value = "startTime", required = false) startTime: String?, @RequestParam(value = "endTime", required = false) endTime: String?, + @ApiParam(value = "0: 绉掔骇鍊�; 1:鍒嗛挓鍊�", defaultValue = "0") @RequestParam(value = "type", required = false) type: Int?, @RequestParam(value = "page", required = false) page: Int?, @RequestParam(value = "perPage", required = false) perPage: Int? - ) = realTimeDataService.getSecondData(deviceCode, startTime, endTime, page, perPage) + ) = realTimeDataService.getSecondData(deviceCode, startTime, endTime, type, page, perPage) @GetMapping("/sec/next") fun getNextData( @@ -31,4 +34,10 @@ fun importData( @RequestPart("excel") file: MultipartFile ) = realTimeDataService.importData(file) + + @ApiOperation(value = "瀵煎叆闈欏畨鍖虹敓鎬佺幆澧冪洃娴嬬珯鐨勮蛋琛屾暟鎹�") + @PostMapping("/import/jinan") + fun importJinanData( + @RequestPart("excel") file: MultipartFile + ) = realTimeDataService.importJinanData(file) } \ No newline at end of file -- Gitblit v1.9.3