From 46872a311da9480d3edb19223aca2e0833fb1e31 Mon Sep 17 00:00:00 2001 From: hcong <1050828145@qq.com> Date: 星期二, 17 十二月 2024 11:41:00 +0800 Subject: [PATCH] 1. 完成数据产品中间结果基本信息和具体信息入库 2. 修改ColInspectionInfo.kt 监管时间格式修改为yyyy-mm-dd 3. 新增数据产品类型枚举类 DataProductType 4. 修改BaseTemplate实现类通过重写genData方法生成Template相关数据 5. TODO 其他未涉及到的产品对象的中间结果对象 --- src/main/kotlin/cn/flightfeather/supervision/lightshare/web/ScenseController.kt | 28 ++++++++++++++++++++++++++++ 1 files changed, 28 insertions(+), 0 deletions(-) diff --git a/src/main/kotlin/cn/flightfeather/supervision/lightshare/web/ScenseController.kt b/src/main/kotlin/cn/flightfeather/supervision/lightshare/web/ScenseController.kt index f367981..90d5434 100644 --- a/src/main/kotlin/cn/flightfeather/supervision/lightshare/web/ScenseController.kt +++ b/src/main/kotlin/cn/flightfeather/supervision/lightshare/web/ScenseController.kt @@ -3,12 +3,14 @@ import cn.flightfeather.supervision.domain.ds1.entity.Scense import cn.flightfeather.supervision.domain.ds1.entity.Task import cn.flightfeather.supervision.lightshare.service.ScenseService +import cn.flightfeather.supervision.lightshare.vo.AreaVo import cn.flightfeather.supervision.lightshare.vo.BaseResponse import cn.flightfeather.supervision.lightshare.vo.SceneDetailStr import io.swagger.annotations.Api import io.swagger.annotations.ApiImplicitParam import io.swagger.annotations.ApiOperation import org.springframework.web.bind.annotation.* +import org.springframework.web.multipart.MultipartFile @Api(tags = ["ScenseController"], description = "鐩戠鍦烘櫙API鎺ュ彛") @RestController @@ -73,4 +75,30 @@ @RequestBody sceneDetailStr: SceneDetailStr ) = scenseService.updateSceneDetail(typeId, sceneDetailStr) + @PostMapping("/find") + fun searchScene( + @RequestBody areaVo: AreaVo, + @RequestParam("page", required = false) page: Int?, + @RequestParam("per_page", required = false) perPage: Int? + ) = scenseService.searchScene(areaVo, page, perPage) + + @ApiOperation(value = "鏍规嵁鍦嗗績鍜屽崐寰勬壘鍒拌寖鍥村唴鐨勫満鏅�") + @PostMapping("/find/coor") + fun searchByCoordinate( + @RequestParam("lng") lng: Double, + @RequestParam("lat") lat: Double, + @RequestParam("radius") radius: Double, + ) = resPack { scenseService.searchByCoordinate(lng, lat, radius) } + + @ApiOperation(value = "閫氳繃鏂囦欢瀵煎叆鍦烘櫙淇℃伅") + @PostMapping("/import") + fun importSceneInfo( + @RequestPart("file") file: MultipartFile, + ) = resPack { scenseService.importSceneInfo(file) } + + @ApiOperation(value = "鍒涘缓鍦烘櫙淇℃伅") + @PutMapping("/create") + fun createScene( + @RequestBody scense: Scense + ) = resPack { scenseService.createScene(scense) } } \ No newline at end of file -- Gitblit v1.9.3