2025.9.12 1. 新增监测设备和巡查场景信息的匹配功能

feiyu02

2025-09-12 dc4f12f66685260ac357997680e5f3fe723c3c4a

 src/main/kotlin/cn/flightfeather/supervision/domain/ds2/repository/ComplaintAndPunishmentRep.kt

@@ -17,7 +17,6 @@
class ComplaintAndPunishmentRep(
    private val complaintMapper: ComplaintMapper,
    private val punishmentMapper: PunishmentMapper,
    private val dateUtil: DateUtil,
){


@@ -27,8 +26,8 @@
     * @param tzUserIdList 飞羽环境系统下的用户id列表
     */
    fun findComplaint(tzUserIdList: List<String?>, sTime: Date?, eTime: Date?): List<ComplaintVo?> {
        val s = dateUtil.DateToString(sTime, DateUtil.DateStyle.YYYY_MM_DD_HH_MM_SS)
        val e = dateUtil.DateToString(eTime, DateUtil.DateStyle.YYYY_MM_DD_HH_MM_SS)
        val s = DateUtil.DateToString(sTime, DateUtil.DateStyle.YYYY_MM_DD_HH_MM_SS)
        val e = DateUtil.DateToString(eTime, DateUtil.DateStyle.YYYY_MM_DD_HH_MM_SS)
        return findComplaint(tzUserIdList, s, e)
    }

@@ -47,8 +46,8 @@
     * @param tzUserIdList 飞羽环境系统下的用户id列表
     */
    fun findPunishment(tzUserIdList: List<String?>, sTime: Date?, eTime: Date?): List<PunishmentVo?> {
        val s = dateUtil.DateToString(sTime, DateUtil.DateStyle.YYYY_MM_DD_HH_MM_SS)
        val e = dateUtil.DateToString(eTime, DateUtil.DateStyle.YYYY_MM_DD_HH_MM_SS)
        val s = DateUtil.DateToString(sTime, DateUtil.DateStyle.YYYY_MM_DD_HH_MM_SS)
        val e = DateUtil.DateToString(eTime, DateUtil.DateStyle.YYYY_MM_DD_HH_MM_SS)
        return findPunishment(tzUserIdList, s, e)
    }