From aed297a5fbc8df9dab01b28da21f872ee546b43c Mon Sep 17 00:00:00 2001
From: feiyu02 <risaku@163.com>
Date: 星期一, 13 十月 2025 16:15:11 +0800
Subject: [PATCH] 2025.10.13 1. 统一调整controller层的返回类型,通过添加全局响应增强器GlobalResponseAdvice来管理返回结果; 2. 新增mybatis-generator自定义插件,实现给数据库实体entity自动添加swagger注解@ApiModel和@ApiModelProperty

---
 src/main/kotlin/cn/flightfeather/supervision/domain/ds1/mapper/SubtaskMapper.kt |   17 ++++++++++++++---
 1 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/src/main/kotlin/cn/flightfeather/supervision/domain/ds1/mapper/SubtaskMapper.kt b/src/main/kotlin/cn/flightfeather/supervision/domain/ds1/mapper/SubtaskMapper.kt
index 5f7d351..390cc08 100644
--- a/src/main/kotlin/cn/flightfeather/supervision/domain/ds1/mapper/SubtaskMapper.kt
+++ b/src/main/kotlin/cn/flightfeather/supervision/domain/ds1/mapper/SubtaskMapper.kt
@@ -1,11 +1,11 @@
 package cn.flightfeather.supervision.domain.ds1.mapper
 
+import cn.flightfeather.supervision.domain.ds1.entity.Scense
 import cn.flightfeather.supervision.domain.ds1.entity.Subtask
 import cn.flightfeather.supervision.domain.util.MyMapper
-import cn.flightfeather.supervision.lightshare.vo.SubTaskSearchResultVo2
-import cn.flightfeather.supervision.lightshare.vo.SubtaskSearchResultVo
-import cn.flightfeather.supervision.lightshare.vo.SubtaskVo
+import cn.flightfeather.supervision.lightshare.vo.*
 import org.apache.ibatis.annotations.Mapper
+import java.time.LocalDateTime
 import java.util.*
 
 @Mapper
@@ -16,4 +16,15 @@
     fun getSubtask2(updateTime: Date?, updateTime2: Date?, districtCode: String, scenseTypeId: Byte?, planStartTime: Date?, planEndTime: Date?): List<SubTaskSearchResultVo2>
 
     fun selectByTopTask(topTaskId: String, startTime: String, endTime: String, sceneTypeId: Int? = null): List<SubtaskVo>
+
+    fun selectByTopTask2(topTaskId: String, sceneTypeId: Int? = null): List<Subtask>
+
+    fun getSummary(topTaskId: String, sceneTypeId: Int?): List<SubTaskSummary>
+
+    // 鏍规嵁鍖哄煙鑼冨洿绛涢��
+    fun getSummaryByArea(areaVo: AreaVo): List<SubTaskSummary>
+
+    fun getSummaryByScene(sceneId: String, startTime: LocalDateTime?, endTime: LocalDateTime?): List<SubTaskSummary>
+
+    fun findSubTasksByProType(topTaskId: String, sceneTypeId: String, proType: String): List<Subtask>
 }
\ No newline at end of file

--
Gitblit v1.9.3