qixiaoning
2025-08-28 eac932eb827c93e2e998ac1210c3f5e548af0dbf
推送回显地址bug,实时监控接口摄像机名称直接取video_point_name,
4个文件已修改
16 ■■■■ 已修改文件
camera-common/models/Record.go 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
camera-service/controllers/camera.go 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
chanmanage-service/models/camera.go 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
push-service/service/eventPushService.go 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
camera-common/models/Record.go
@@ -250,6 +250,11 @@
                if len(VideoPointIdColumn) > 0 {
                    record.VideoPointId = VideoPointIdColumn[i]
                }
            case "video_point_name":
                VideoPointColumn := field.(*entity.ColumnVarChar).Data()
                if len(VideoPointColumn) > 0 {
                    record.CameraName = VideoPointColumn[i]
                }
            case "detect_id":
                DetectIdColumn := field.(*entity.ColumnInt64Array).Data()
                if len(DetectIdColumn) > 0 {
camera-service/controllers/camera.go
@@ -1139,6 +1139,8 @@
            Content:         v.CameraName,
            PicDate:         v.PicDate,
            LikeDate:        v.LikeDate,
            VideoName:       v.CameraName,
            CameraAddr:      v.CameraName,
        }
        //任务名称
@@ -1146,9 +1148,9 @@
        temp.TaskNames = items
        //视频内容
        items4, _ := models.GetVideoById(v.VideoPointId)
        temp.VideoName = items4.Name
        temp.CameraAddr = items4.Addr
        // items4, _ := models.GetVideoById(v.VideoPointId)
        // temp.VideoName = items4.Name
        // temp.CameraAddr = items4.Addr
        //检查内容
        items2, _ := models.GetCheckByIds(v.DetectId)
chanmanage-service/models/camera.go
@@ -35,7 +35,6 @@
        FROM mal_warning_rule a
        LEFT JOIN mal_task_rule_link b ON a.rule_id = b.rule_id
        WHERE task_id>0
        group BY a.rule_id
    `
    if err := db2.Raw(sqlStr).Scan(&items).Error; err != nil {
        fmt.Println(err.Error())
push-service/service/eventPushService.go
@@ -278,6 +278,8 @@
                    resultVo.Urls = append(resultVo.Urls, vo.EventUrlVo{
                        Enable: pushServer.Enable,
                        Url:    pushServer.Url,
                        ServerIp: pushServer.ServerIp,
                        Port:     pushServer.Port,
                    })
                }
            }