2025.7.16 1. 修改动态溯源异常判断逻辑

feiyu02

2025-07-16 8fc27dba6719041402e3e3c099e2f3e01d9d52c7

 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
@@ -28,13 +29,14 @@
    private val gridAodDetailMapper: GridAodDetailMapper,
) {

    fun fetchGridGroup(areaVo: AreaVo): List<GridGroup?> {
    fun fetchGridGroup(areaVo: AreaVo, type: String?): List<GridGroup?> {
        return gridGroupMapper.selectByExample(Example(GridGroup::class.java).apply {
            createCriteria()
                .andEqualTo("provinceCode", areaVo.provinceCode).andEqualTo("provinceName", areaVo.provinceName)
                .andEqualTo("cityCode", areaVo.cityCode).andEqualTo("cityName", areaVo.cityName)
                .andEqualTo("districtCode", areaVo.districtCode).andEqualTo("districtName", areaVo.districtName)
                .andEqualTo("townCode", areaVo.townCode).andEqualTo("townName", areaVo.townName)
                .andEqualTo("type", type)
        })
    }

@@ -46,12 +48,42 @@
        return gridGroupMapper.select(gridGroup)
    }

    fun insertGridGroup(gridGroup: GridGroup): Int {
        return gridGroupMapper.insert(gridGroup)
    }

    @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 ->
            gridGroupMapper.resetAutoIncrement(id + 1)
        }
    }

    /*****************************************************************/

    fun fetchGridCell(groupId: Int): List<GridCell?> {
        return gridCellMapper.selectByExample(Example(GridCell::class.java).apply {
            createCriteria().andEqualTo("groupId", groupId)
            orderBy("id")
        })
    }

    fun insertGridCell(gridCellList: List<GridCell?>): Int {
        return gridCellMapper.insertList(gridCellList)
    }

    /*****************************************************************/

    fun fetchGridData(groupId: Int, dataTime: LocalDateTime?, type: Int?): List<GridData?> {
        return gridDataMapper.selectByExample(Example(GridData::class.java).apply {
@@ -65,7 +97,27 @@
        return gridDataMapper.select(gridData)
    }

    fun fetchGridDataDetail(dataId: Int, groupId: Int?, cellId: Int?): List<GridDataDetail?> {
    fun fetchGridData(id: Int): GridData? {
        return gridDataMapper.selectByPrimaryKey(id)
    }

    fun insertGridData(gridData: GridData): Int {
        return gridDataMapper.insert(gridData)
    }

    fun insertGridDataDetail(gridDataDetails: List<GridDataDetail?>): Int {
        return gridDataDetailMapper.insertList(gridDataDetails)
    }

    fun updateGridDataDetail(gridDataDetails: List<GridDataDetail?>): Int {
        var res = 0
        gridDataDetails.forEach {
            res += gridDataDetailMapper.updateByPrimaryKey(it)
        }
        return res
    }

    fun fetchGridDataDetail(dataId: Int? = null, groupId: Int? = null, cellId: Int? = null): List<GridDataDetail?> {
        return gridDataDetailMapper.selectByExample(Example(GridDataDetail::class.java).apply {
            createCriteria().andEqualTo("dataId", dataId)
                .andEqualTo("groupId", groupId)
@@ -87,6 +139,26 @@
        gridDataDetailMapper.updatePM25Batch(gridDataDetails)
    }

    @Transactional
    @Throws
    fun deleteGridData(dataId: Int?) {
        gridDataDetailMapper.delete(GridDataDetail().apply { this.dataId = dataId })
        // Fixme 2025.4.16 此处的重置自增id只在删除最新数据的情况下有效，后续考虑不适用自增主键，改为新的主键生成方式
//        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 相关操作
    fun fetchGridAod(groupId: Int, dataTime: LocalDateTime?): List<GridAod?> {