From 6e1095e946997e406926c204ceeb5c820dbd07c1 Mon Sep 17 00:00:00 2001
From: Riku <risaku@163.com>
Date: 星期二, 13 八月 2024 23:51:47 +0800
Subject: [PATCH] 1. 修复文件扩展名获取错误问题 2. 调试完善设备信息相关接口
---
src/main/kotlin/cn/flightfeather/supervision/lightshare/web/EvaluationController.kt | 48 ++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 40 insertions(+), 8 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 ef2e02c..00c861d 100644
--- a/src/main/kotlin/cn/flightfeather/supervision/lightshare/web/EvaluationController.kt
+++ b/src/main/kotlin/cn/flightfeather/supervision/lightshare/web/EvaluationController.kt
@@ -2,8 +2,12 @@
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.*
+import springfox.documentation.annotations.ApiIgnore
+import javax.servlet.http.HttpServletResponse
@Api(tags = ["EvaluationController"], description = "璇勪及鎬诲垎API鎺ュ彛")
@RestController
@@ -25,21 +29,49 @@
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,
+ ) = 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) }
+
+ @ApiOperation(value = "涓嬭浇鑷姩璇勪及缁撴灉")
+ @PostMapping("/auto/record/download")
+ fun downloadAutoEvaluation(
+ @RequestBody areaVo: AreaVo, @RequestParam forceUpdate: Boolean,
+ @ApiIgnore response: HttpServletResponse,
+ ) = resPack { evaluationService.downloadAutoEvaluation(areaVo, forceUpdate, response) }
}
\ No newline at end of file
--
Gitblit v1.9.3