From 7d74f3fd087d4a8192ed556a6c2e3a2ea3c81cff Mon Sep 17 00:00:00 2001
From: feiyu02 <risaku@163.com>
Date: 星期五, 28 三月 2025 17:43:48 +0800
Subject: [PATCH] 1. 新增扬尘监测数据上传功能

---
 src/main/kotlin/cn/flightfeather/supervision/lightshare/web/EvaluationsubruleController.kt |   18 +++++++++++++++---
 1 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/src/main/kotlin/cn/flightfeather/supervision/lightshare/web/EvaluationsubruleController.kt b/src/main/kotlin/cn/flightfeather/supervision/lightshare/web/EvaluationsubruleController.kt
index 668cd6d..8fc1806 100644
--- a/src/main/kotlin/cn/flightfeather/supervision/lightshare/web/EvaluationsubruleController.kt
+++ b/src/main/kotlin/cn/flightfeather/supervision/lightshare/web/EvaluationsubruleController.kt
@@ -1,6 +1,6 @@
 package cn.flightfeather.supervision.lightshare.web
 
-import cn.flightfeather.supervision.domain.ds1.entity.Evaluationsubrule
+import cn.flightfeather.supervision.domain.ds1.entity.Evaluationsubrule2
 import cn.flightfeather.supervision.lightshare.service.EvaluationsubruleService
 import io.swagger.annotations.Api
 import io.swagger.annotations.ApiOperation
@@ -15,16 +15,22 @@
     fun getAll() = evaluationsubruleService.findAll()
 
     @PutMapping
-    fun add(@RequestBody evaluationsubrule: Evaluationsubrule) = evaluationsubruleService.save(evaluationsubrule)
+    fun add(@RequestBody evaluationsubrule: Evaluationsubrule2) = evaluationsubruleService.save(evaluationsubrule)
 
     @PostMapping
-    fun update(@RequestBody evaluationsubrule: Evaluationsubrule) = evaluationsubruleService.update(evaluationsubrule)
+    fun update(@RequestBody evaluationsubrule: Evaluationsubrule2) = evaluationsubruleService.update(evaluationsubrule)
 
     @GetMapping("/{id}")
     fun getById(@PathVariable id: String) = evaluationsubruleService.findOne(id)
 
     @DeleteMapping("/{id}")
     fun delete(@PathVariable id: String) = evaluationsubruleService.delete(id)
+
+    @ApiOperation("鏍规嵁璇勪及鎬昏鍒欐煡璇笅灞炵殑瀛愯鍒�")
+    @GetMapping("/byRule")
+    fun getByBaseRule(
+        @ApiParam("璇勪及鎬昏鍒欎富閿甶d") @RequestParam id: String
+    ) = resPack { evaluationsubruleService.findByRuleId(id) }
 
     @ApiOperation("鏍规嵁鍖哄幙鍜屽満鏅被鍨嬫煡璇㈣瘎鍒嗗瓙瑙勫垯")
     @GetMapping("/search")
@@ -33,4 +39,10 @@
             @ApiParam("鍦烘櫙绫诲瀷id") @RequestParam("sceneTypeId") sceneTypeId: String,
             @ApiParam(value = "璇勫垎琛ㄧ増鏈紝 鏍煎紡 yyyy-MM, 榛樿鑾峰彇鏈�鏂扮増鏈�") @RequestParam("version") version: String?
     ) = evaluationsubruleService.search(districtCode, sceneTypeId, version)
+
+    @ApiOperation(value = "鏌ユ壘宸℃煡浠诲姟鑷姩璇勪及鐨勮瘎鍒嗙粏鑺�")
+    @GetMapping("/score")
+    fun getAutoScore(
+        @ApiParam(value = "宸℃煡浠诲姟id") @RequestParam subTaskId: String,
+    ) = resPack { evaluationsubruleService.getAutoScore(subTaskId) }
 }
\ No newline at end of file

--
Gitblit v1.9.3