From 275ad59f206d9bc1801b28daeb31b4207f609ce3 Mon Sep 17 00:00:00 2001
From: hcong <1050828145@qq.com>
Date: 星期四, 02 一月 2025 09:10:09 +0800
Subject: [PATCH] 1. 修改网格组数据导入接口返回值为bool 2. 修改网格组数据批量更新 使用Transactional注解
---
src/main/kotlin/com/flightfeather/uav/domain/repository/SatelliteGridRep.kt | 65 ++++++++++++++++++++++++++++++--
1 files changed, 60 insertions(+), 5 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 b88bc35..3293a6f 100644
--- a/src/main/kotlin/com/flightfeather/uav/domain/repository/SatelliteGridRep.kt
+++ b/src/main/kotlin/com/flightfeather/uav/domain/repository/SatelliteGridRep.kt
@@ -9,6 +9,7 @@
import com.flightfeather.uav.domain.mapper.GridGroupMapper
import com.flightfeather.uav.lightshare.bean.AreaVo
import org.springframework.stereotype.Repository
+import org.springframework.transaction.annotation.Transactional
import tk.mybatis.mapper.entity.Example
import java.time.LocalDateTime
@@ -61,6 +62,14 @@
})
}
+ /**
+ * 鎻掑叆缃戞牸缁凱M2.5鏁版嵁绱㈠紩鍜岃缁嗘暟鎹��
+ *
+ * @param data 缃戞牸缁凱M2.5鏁版嵁绱㈠紩銆�
+ * @param gridDataDetails 缃戞牸缁凱M2.5璇︾粏鏁版嵁鍒楄〃銆�
+ * @author hc
+ * @date 2024-12-29
+ */
fun insertGridDataAndDetail(data: GridData, gridDataDetails: List<GridDataDetail>) {
gridDataMapper.insert(data)
gridDataDetails.forEach {
@@ -70,12 +79,33 @@
gridDataDetailMapper.insertList(gridDataDetails)
}
+ /**
+ * 鏇存柊缃戞牸缁勮缁嗘暟鎹��
+ *
+ * @param gridDataDetails 闇�瑕佹洿鏂扮殑缃戞牸缁勮缁嗘暟鎹垪琛ㄣ��
+ * @author hc
+ * @date 2024-12-29
+ */
+ @Transactional(rollbackFor = [Exception::class])
fun updatePM25Batch(gridDataDetails: List<GridDataDetail>) {
- gridDataDetailMapper.updatePM25Batch(gridDataDetails)
+ gridDataDetails.forEach {
+ gridDataDetailMapper.updateByExample(it, Example(GridDataDetail::class.java).apply {
+ createCriteria().andEqualTo("dataId", it.dataId)
+ .andEqualTo("groupId", it.groupId)
+ .andEqualTo("cellId", it.cellId)
+ })
+ }
}
-
- // aod 鐩稿叧鎿嶄綔
+ /**
+ * 鏍规嵁缁処D鍜屾暟鎹椂闂磋幏鍙栫綉鏍肩粍aod鏁版嵁绱㈠紩銆�
+ *
+ * @param groupId 缃戞牸缁処D銆�
+ * @param dataTime 鏁版嵁鏃堕棿銆�
+ * @return 缃戞牸缁刟od鏁版嵁绱㈠紩鍒楄〃銆�
+ * @author hc
+ * @date 2024-12-29
+ */
fun fetchGridAod(groupId: Int, dataTime: LocalDateTime?): List<GridAod?> {
return gridAodMapper.selectByExample(Example(GridAod::class.java).apply {
createCriteria().andEqualTo("groupId", groupId)
@@ -83,6 +113,16 @@
})
}
+ /**
+ * 鑾峰彇缃戞牸缁刟od鏁版嵁璇︽儏銆�
+ *
+ * @param aodId aod鏁版嵁ID銆�
+ * @param groupId 缃戞牸缁処D銆�
+ * @param cellId 鍗曞厓鏍糏D銆�
+ * @return 缃戞牸缁刟od鏁版嵁璇︽儏鍒楄〃銆�
+ * @author hc
+ * @date 2024-12-29
+ */
fun fetchGridAodDetail(aodId: Int, groupId: Int?, cellId: Int?): List<GridAodDetail?> {
return gridAodDetailMapper.selectByExample(Example(GridAodDetail::class.java).apply {
createCriteria().andEqualTo("aodId", aodId)
@@ -92,6 +132,14 @@
})
}
+ /**
+ * 鎻掑叆缃戞牸缁刟od鏁版嵁绱㈠紩鍜岃缁嗘暟鎹��
+ *
+ * @param aod 缃戞牸缁刟od鏁版嵁绱㈠紩銆�
+ * @param gridAodDetails 缃戞牸缁刟od璇︾粏鏁版嵁鍒楄〃銆�
+ * @author hc
+ * @date 2024-12-29
+ */
fun insertGridAodAndDetail(aod: GridAod, gridAodDetails: List<GridAodDetail>) {
gridAodMapper.insert(aod)
gridAodDetails.forEach {
@@ -101,6 +149,14 @@
gridAodDetailMapper.insertList(gridAodDetails)
}
+ /**
+ * 鏇存柊缃戞牸缁刟od鏁版嵁璇︽儏銆�
+ *
+ * @param gridDataDetails 闇�瑕佹洿鏂扮殑缃戞牸缁刟od璇︾粏鏁版嵁鍒楄〃銆�
+ * @author hc
+ * @date 2024-12-29
+ */
+ @Transactional(rollbackFor = [Exception::class])
fun updateGridAodBatch(gridDataDetails: List<GridAodDetail>) {
gridDataDetails.forEach {
gridAodDetailMapper.updateByExample(it, Example(GridAodDetail::class.java).apply {
@@ -109,7 +165,6 @@
.andEqualTo("cellId", it.cellId)
})
}
-
}
-}
\ No newline at end of file
+}
--
Gitblit v1.9.3