From 1a677d2b4a4bc615602f8c2a22bc07ec1356e5be Mon Sep 17 00:00:00 2001
From: feiyu02 <risaku@163.com>
Date: 星期四, 16 十月 2025 17:39:06 +0800
Subject: [PATCH] 2025.10.16 1. 根据全局响应增强器GlobalResponseAdvice，将原先的BaseResPack接口包装函数统一去除； 2. 新增三种类型的数据产品数据库实体 3. 新增典型问题场景清单中间数据产品接口
---
src/main/kotlin/cn/flightfeather/supervision/lightshare/web/TaskController.kt | 21 +++++++++++++++++----
1 files changed, 17 insertions(+), 4 deletions(-)
diff --git a/src/main/kotlin/cn/flightfeather/supervision/lightshare/web/TaskController.kt b/src/main/kotlin/cn/flightfeather/supervision/lightshare/web/TaskController.kt
index dafb2b7..5951258 100644
--- a/src/main/kotlin/cn/flightfeather/supervision/lightshare/web/TaskController.kt
+++ b/src/main/kotlin/cn/flightfeather/supervision/lightshare/web/TaskController.kt
@@ -1,5 +1,6 @@
package cn.flightfeather.supervision.lightshare.web
+import cn.flightfeather.supervision.config.IgnoreResponseAdvice
import cn.flightfeather.supervision.domain.ds1.entity.Task
import cn.flightfeather.supervision.lightshare.service.TaskService
import cn.flightfeather.supervision.lightshare.vo.AreaVo
@@ -12,33 +13,41 @@
@RequestMapping("/task")
class TaskController(val taskService: TaskService) {
+ @IgnoreResponseAdvice
@PutMapping
fun save(@RequestBody task: Task) = taskService.save(task)
@PutMapping("/create")
- fun create(@RequestBody task: Task) = resPack { taskService.create(task) }
+ fun create(@RequestBody task: Task) = taskService.create(task)
+ @IgnoreResponseAdvice
@PostMapping
fun update(@RequestBody task: Task) = taskService.update(task)
+ @IgnoreResponseAdvice
@GetMapping("/{id}")
fun getById(@PathVariable id: String) = taskService.findByID(id)
+ @IgnoreResponseAdvice
@PostMapping("/lastTask")
fun getLastTask(@RequestBody task: Task) = taskService.findLastTask(task)
+ @IgnoreResponseAdvice
@GetMapping
fun getAll() = taskService.findAll()
+ @IgnoreResponseAdvice
@DeleteMapping("/{id}")
fun deleteById(@PathVariable id: String) = taskService.delete(id)
+ @IgnoreResponseAdvice
@GetMapping("/alltask/{type}")
fun getAllbyCondition(@PathVariable type: Int) = taskService.getAllbyCondition(type)
/**
* 鏍规嵁鐢ㄦ埛鍙婄敤鎴风被鍨嬭幏鍙栨煇鏈堟墍鏈夋�讳换鍔�
*/
+ @IgnoreResponseAdvice
@GetMapping("/mothTask/{userId}")
fun getMonthTask(
@PathVariable("userId") userId: String,
@@ -49,28 +58,32 @@
/**
* 鏍规嵁椤跺眰浠诲姟id鍙婄敤鎴穒d鍜岀被鍨嬭幏鍙栨棩浠诲姟
*/
+ @IgnoreResponseAdvice
@GetMapping("/dayTask/{taskId}")
fun getDayTask(
@PathVariable("taskId") taskId: String,
- @RequestParam("userId") userId: String,
+ @RequestParam("userId", required = false) userId: String?,
@RequestParam("userType") userType: String
) = taskService.getDayTask(taskId, userId, userType)
+ @IgnoreResponseAdvice
@GetMapping("/taskprogress/{userid}")
fun getTaskProgress(@PathVariable userid: String) = taskService.getTaskProgress(userid)
+ @IgnoreResponseAdvice
@PostMapping("/getFrequency")
fun getFrequency(@RequestParam(value = "id", required = true)id: String) = taskService.getFrequency(id)
+ @IgnoreResponseAdvice
@PostMapping("/getRank")
fun getRank(@RequestParam(value = "id", required = true) id: String,
@RequestParam(value = "curSceneTypeId", required = true) sceneTypeId: String,
@RequestParam(value = "sceneId", required = false) sceneId: String?) = taskService.getRank(id, sceneTypeId, sceneId)
@PostMapping("/find")
- fun findTask(@RequestBody areaVo: AreaVo) = resPack { taskService.findTask(areaVo) }
+ fun findTask(@RequestBody areaVo: AreaVo) = taskService.findTask(areaVo)
@ApiOperation(value = "鑾峰彇鎬讳换鍔＄殑瀹屾垚鎯呭喌")
@PostMapping("/progress")
- fun findTaskProgress(@RequestBody areaVo: AreaVo) = resPack { taskService.findTaskProgress(areaVo) }
+ fun findTaskProgress(@RequestBody areaVo: AreaVo) = taskService.findTaskProgress(areaVo)
}
--
Gitblit v1.9.3