From baf2cc2ce3dfd1235c012a3750132769fcd9ad2f Mon Sep 17 00:00:00 2001
From: feiyu02 <risaku@163.com>
Date: 星期四, 18 九月 2025 17:02:05 +0800
Subject: [PATCH] 2025.9.18 1. 联合前端调试数据产品接口(待完成)
---
src/main/kotlin/cn/flightfeather/supervision/lightshare/web/SubtaskController.kt | 32 +++++++++++++++++++++++++++-----
1 files changed, 27 insertions(+), 5 deletions(-)
diff --git a/src/main/kotlin/cn/flightfeather/supervision/lightshare/web/SubtaskController.kt b/src/main/kotlin/cn/flightfeather/supervision/lightshare/web/SubtaskController.kt
index 8bb3c96..46d2217 100644
--- a/src/main/kotlin/cn/flightfeather/supervision/lightshare/web/SubtaskController.kt
+++ b/src/main/kotlin/cn/flightfeather/supervision/lightshare/web/SubtaskController.kt
@@ -1,10 +1,12 @@
package cn.flightfeather.supervision.lightshare.web
+import cn.flightfeather.supervision.common.log.BizLog
+import cn.flightfeather.supervision.common.log.WorkStreamLogInfo
+import cn.flightfeather.supervision.common.utils.Constant
import cn.flightfeather.supervision.domain.ds1.entity.Subtask
import cn.flightfeather.supervision.lightshare.service.SubtaskService
import cn.flightfeather.supervision.lightshare.vo.AreaVo
import cn.flightfeather.supervision.lightshare.vo.TaskVo
-import com.fasterxml.jackson.annotation.JsonFormat
import io.swagger.annotations.Api
import io.swagger.annotations.ApiOperation
import org.springframework.format.annotation.DateTimeFormat
@@ -14,7 +16,7 @@
@Api(tags = ["SubtaskController"], description = "宸℃煡瀛愪换鍔PI鎺ュ彛")
@RestController
@RequestMapping("/subtask")
-class SubtaskController(val subtaskService: SubtaskService) {
+class SubtaskController(val subtaskService: SubtaskService, private val bizLog: BizLog) {
@GetMapping
fun getAll() = subtaskService.findAll()
@@ -25,7 +27,21 @@
fun addList(@RequestBody subtasklist: List<Subtask>) = subtaskService.saveList(subtasklist)
@PostMapping
- fun update(@RequestBody subtask: Subtask) = subtaskService.update(subtask)
+ fun update(@RequestBody subtask: Subtask): Int {
+ val res = subtaskService.changeStatus(subtask)
+ if (subtask.status == Constant.TaskProgress.RUNINGSTATUS3.text) {
+ val event = "鍦�${subtask.scensename}缁撴潫宸℃煡"
+ bizLog.info(WorkStreamLogInfo(subtask.executorguids, subtask.executorrealtimes, event))
+ }else if (subtask.status == Constant.TaskProgress.RUNINGSTATUS2.text) {
+ val event = "鍦�${subtask.scensename}寮�濮嬪贰鏌�"
+ bizLog.info(WorkStreamLogInfo(subtask.executorguids, subtask.executorrealtimes, event))
+ }
+ return res
+ }
+
+ @ApiOperation("璋冩暣宸℃煡浠诲姟淇℃伅")
+ @PostMapping("/adjust")
+ fun adjust(@RequestBody subtask: Subtask) = resPack { subtaskService.update(subtask) }
@GetMapping("/{id}")
fun getById(@PathVariable id: String) = subtaskService.findByID(id)
@@ -76,9 +92,9 @@
@ApiOperation("鑾峰彇鏌愮被鍦烘櫙鐨勫贰鏌ヤ换鍔＄粺璁′俊鎭�")
@PostMapping("/summary/area")
- fun getSummaryByArea(
+ fun getTaskProgressByArea(
@RequestBody areaVo: AreaVo,
- ) = subtaskService.getSummaryByArea(areaVo)
+ ) = subtaskService.getTaskProgressByArea(areaVo)
@ApiOperation("鑾峰彇鏌愪釜鍦烘櫙鐨勫贰鏌ヤ换鍔�")
@GetMapping("/byScene")
@@ -87,4 +103,10 @@
@RequestParam(required = false) @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") startTime: LocalDateTime?,
@RequestParam(required = false) @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") endTime: LocalDateTime?,
) = subtaskService.getByScene(sceneId, startTime, endTime)
+
+ @ApiOperation("鑾峰彇鏌愮被鍦烘櫙鐨勫贰鏌ヤ换鍔＄粺璁′俊鎭�")
+ @PostMapping("/summary/area/problem")
+ fun getSummaryByArea(
+ @RequestBody areaVo: AreaVo,
+ ) = resPack { subtaskService.getSummaryByArea(areaVo) }
}
\ No newline at end of file
--
Gitblit v1.9.3