From c1becf4cbd2e99601ce011c14b8742427249cfb4 Mon Sep 17 00:00:00 2001 From: feiyu02 <risaku@163.com> Date: 星期二, 09 一月 2024 17:25:05 +0800 Subject: [PATCH] 1. 多项调整 --- src/main/kotlin/cn/flightfeather/supervision/lightshare/web/EvaluationController.kt | 35 ++++++++++++++++++++++++++--------- 1 files changed, 26 insertions(+), 9 deletions(-) diff --git a/src/main/kotlin/cn/flightfeather/supervision/lightshare/web/EvaluationController.kt b/src/main/kotlin/cn/flightfeather/supervision/lightshare/web/EvaluationController.kt index 1bc358c..c857357 100644 --- a/src/main/kotlin/cn/flightfeather/supervision/lightshare/web/EvaluationController.kt +++ b/src/main/kotlin/cn/flightfeather/supervision/lightshare/web/EvaluationController.kt @@ -2,7 +2,9 @@ import cn.flightfeather.supervision.domain.ds1.entity.Evaluation import cn.flightfeather.supervision.lightshare.service.EvaluationService +import cn.flightfeather.supervision.lightshare.vo.AreaVo import io.swagger.annotations.Api +import io.swagger.annotations.ApiOperation import org.springframework.web.bind.annotation.* @Api(tags = ["EvaluationController"], description = "璇勪及鎬诲垎API鎺ュ彛") @@ -25,27 +27,42 @@ fun delete(@PathVariable id: String) = evaluationService.delete(id) @GetMapping("/rankofscense") - fun getRankOfScense(@RequestParam(value = "tguid", required = true) tguid: String, - @RequestParam(value = "scensetypeid", required = false) scensetypeid: String?, - @RequestParam(value = "ruletypeid", required = false) ruletypeid: ByteArray?) = evaluationService.getRankOfSense(tguid, scensetypeid, ruletypeid) + fun getRankOfScense( + @RequestParam(value = "tguid", required = true) tguid: String, + @RequestParam(value = "scensetypeid", required = false) scensetypeid: String?, + @RequestParam(value = "ruletypeid", required = false) ruletypeid: ByteArray?, + ) = evaluationService.getRankOfSense(tguid, scensetypeid, ruletypeid) @GetMapping("/rankoftown") - fun getRankOfTown(@RequestParam(value = "tguid", required = true) tguid: String, - @RequestParam(value = "scensetypeid", required = false) scensetypeid: String?) = evaluationService.getRankOfTown(tguid, scensetypeid) + fun getRankOfTown( + @RequestParam(value = "tguid", required = true) tguid: String, + @RequestParam(value = "scensetypeid", required = false) scensetypeid: String?, + ) = evaluationService.getRankOfTown(tguid, scensetypeid) @GetMapping("/autoScore") - fun autoScore(@RequestParam(value = "districtCode") districtCode: String, - @RequestParam(value = "time") time: String) = evaluationService.autoScore(districtCode, time) + fun autoScore( + @RequestParam(value = "districtCode") districtCode: String, + @RequestParam(value = "time") time: String, + ) = evaluationService.autoScore(districtCode, time) @GetMapping("/autoScore3") fun autoScore3( @RequestParam(value = "topTaskId") tGuid: String, - @RequestParam(value = "sceneTypeId") sceneTypeId: String + @RequestParam(value = "sceneTypeId") sceneTypeId: String, ) = evaluationService.autoScore3(tGuid, sceneTypeId) @PostMapping("/autoScore") fun autoScore2(@RequestParam(value = "subTaskId") subTaskId: String) = evaluationService.autoScore2(subTaskId) @GetMapping("/byInspection") - fun findByInspectionId(@RequestParam("inspectionId") inspectionId: String) = evaluationService.findByInspectionId(inspectionId) + fun findByInspectionId(@RequestParam("inspectionId") inspectionId: String) = + evaluationService.findByInspectionId(inspectionId) + + @ApiOperation(value = "鏍规嵁鍖哄煙鑼冨洿鑷姩璇勪及") + @PostMapping("/auto") + fun autoEvaluate(@RequestBody areaVo: AreaVo) = resPack { evaluationService.autoEvaluate(areaVo) } + + @ApiOperation(value = "鏍规嵁鍖哄煙鑼冨洿鑾峰彇鑷姩璇勪及鍘嗗彶璁板綍") + @PostMapping("/auto/record") + fun findAutoEvaluation(@RequestBody areaVo: AreaVo) = resPack { evaluationService.findAutoEvaluation(areaVo) } } \ No newline at end of file -- Gitblit v1.9.3