From eb3dd00b0b7fcda477229d518d250f9c842b790b Mon Sep 17 00:00:00 2001
From: feiyu02 <risaku@163.com>
Date: 星期二, 21 十月 2025 17:45:44 +0800
Subject: [PATCH] 2025.10.21 1. 走航季度报告相关数据计算逻辑调整
---
src/main/kotlin/com/flightfeather/uav/domain/repository/SatelliteGridRep.kt | 22 ++++++++++++++++++++++
1 files changed, 22 insertions(+), 0 deletions(-)
diff --git a/src/main/kotlin/com/flightfeather/uav/domain/repository/SatelliteGridRep.kt b/src/main/kotlin/com/flightfeather/uav/domain/repository/SatelliteGridRep.kt
index 202983d..9233bcb 100644
--- a/src/main/kotlin/com/flightfeather/uav/domain/repository/SatelliteGridRep.kt
+++ b/src/main/kotlin/com/flightfeather/uav/domain/repository/SatelliteGridRep.kt
@@ -8,6 +8,7 @@
import com.flightfeather.uav.domain.mapper.GridDataMapper
import com.flightfeather.uav.domain.mapper.GridGroupMapper
import com.flightfeather.uav.lightshare.bean.AreaVo
+import com.github.pagehelper.PageHelper
import org.springframework.stereotype.Repository
import org.springframework.transaction.annotation.Transactional
import tk.mybatis.mapper.entity.Example
@@ -54,12 +55,14 @@
@Transactional
fun deleteGridGroup(groupId: Int) {
gridCellMapper.delete(GridCell().apply { this.groupId = groupId })
+ PageHelper.startPage<GridCell>(1, 1)
gridCellMapper.selectByExample(
Example(GridCell::class.java).apply { orderBy("id").desc() }
).takeIf { it.isNotEmpty() }?.get(0)?.id?.let { id ->
gridCellMapper.resetAutoIncrement(id + 1)
}
gridGroupMapper.deleteByPrimaryKey(groupId)
+ PageHelper.startPage<GridGroup>(1, 1)
gridGroupMapper.selectByExample(
Example(GridGroup::class.java).apply { orderBy("id").desc() }
).takeIf { it.isNotEmpty() }?.get(0)?.id?.let { id ->
@@ -136,6 +139,25 @@
gridDataDetailMapper.updatePM25Batch(gridDataDetails)
}
+ @Transactional
+ @Throws
+ fun deleteGridData(dataId: Int?) {
+ gridDataDetailMapper.delete(GridDataDetail().apply { this.dataId = dataId })
+ // Fixme 2025.4.16 姝ゅ鐨勯噸缃嚜澧瀒d鍙湪鍒犻櫎鏈�鏂版暟鎹殑鎯呭喌涓嬫湁鏁堬紝鍚庣画鑰冭檻涓嶉�傜敤鑷涓婚敭锛屾敼涓烘柊鐨勪富閿敓鎴愭柟寮�
+// PageHelper.startPage<GridDataDetail>(1, 1)
+// gridDataDetailMapper.selectByExample(Example(GridDataDetail::class.java).apply { orderBy("id").desc() })
+// .takeIf { it.isNotEmpty() }?.get(0)?.id?.let { id ->
+// gridDataDetailMapper.resetAutoIncrement(id + 1)
+// }
+ gridDataMapper.deleteByPrimaryKey(dataId)
+// PageHelper.startPage<GridData>(1, 1)
+// gridDataMapper.selectByExample(
+// Example(GridData::class.java).apply { orderBy("id").desc() }
+// ).takeIf { it.isNotEmpty() }?.get(0)?.id?.let { id ->
+// gridDataMapper.resetAutoIncrement(id + 1)
+// }
+ }
+
/*****************************************************************/
// aod 鐩稿叧鎿嶄綔
--
Gitblit v1.9.3