feat: gb28181 support update channel name,channelid

Author: pggiroro

plugin/gb28181/api.go

@@ -84,11 +84,16 @@ func (gb *GB28181Plugin) List(ctx context.Context, req *pb.GetDevicesRequest) (*
 
 		// 从设备的内存通道集合中获取通道信息
 		d.channels.Range(func(channel *Channel) bool {
+			if channel.ID == "34020000001320000109_34020000001310000109" {
+				gb.Info("channel", "id", channel.ID)
+				d.Info("channel", "id", channel.ID)
+			}
 			pbChannels = append(pbChannels, &pb.Channel{
-				DeviceId:     channel.ChannelId,
-				ChannelId:    channel.ChannelId,
+				Id:           channel.ID,
+				DeviceId:     channel.CustomChannelId,
+				ChannelId:    channel.CustomChannelId,
 				ParentId:     d.DeviceId,
-				Name:         channel.Name,
+				Name:         channel.CustomName,
 				Manufacturer: channel.Manufacturer,
 				Model:        channel.Model,
 				Owner:        channel.Owner,
@@ -109,7 +114,7 @@ func (gb *GB28181Plugin) List(ctx context.Context, req *pb.GetDevicesRequest) (*
 
 		pbDevices = append(pbDevices, &pb.Device{
 			DeviceId:      d.DeviceId,
-			Name:          d.Name,
+			Name:          d.CustomName,
 			Manufacturer:  d.Manufacturer,
 			Model:         d.Model,
 			Status:        string(d.Status),
@@ -499,7 +504,7 @@ func (gb *GB28181Plugin) UpdateDevice(ctx context.Context, req *pb.Device) (*pb.
 
 		// 更新基本字段
 		if req.Name != "" {
-			d.Name = req.Name
+			d.CustomName = req.Name
 		}
 		if req.Manufacturer != "" {
 			d.Manufacturer = req.Manufacturer
@@ -2944,3 +2949,85 @@ func (gb *GB28181Plugin) ReceiveAlarm(ctx context.Context, req *pb.AlarmInfoRequ
 	resp.Message = "告警信息接收成功"
 	return resp, nil
 }
+
+// UpdateChannel 实现更新通道信息
+func (gb *GB28181Plugin) UpdateChannel(ctx context.Context, req *pb.UpdateChannelRequest) (*pb.BaseResponse, error) {
+	resp := &pb.BaseResponse{}
+
+	// 参数校验
+	if req.Id == "" {
+		resp.Code = 400
+		resp.Message = "通道复合ID不能为空"
+		return resp, nil
+	}
+
+	if req.Channel == nil {
+		resp.Code = 400
+		resp.Message = "通道信息不能为空"
+		return resp, nil
+	}
+
+	// 直接使用 id 查找通道
+	parts := strings.Split(req.Id, "_")
+	if len(parts) != 2 {
+		resp.Code = 400
+		resp.Message = "通道复合ID格式错误，应为 deviceId_channelId"
+		return resp, nil
+	}
+
+	// 查找通道
+	channel, ok := gb.channels.Get(req.Id)
+	if !ok {
+		resp.Code = 404
+		resp.Message = "通道不存在"
+		return resp, nil
+	}
+
+	// 从请求中获取自定义通道ID
+	customChannelId := req.Channel.ChannelId
+	if customChannelId != "" && customChannelId != channel.DeviceChannel.CustomChannelId {
+		// 检查自定义通道ID是否已存在（全局唯一性检查）
+		hasConflict := false
+
+		// 遍历所有通道检查是否有重复的 customChannelId
+		gb.channels.Range(func(ch *Channel) bool {
+			// 跳过当前正在更新的通道
+			if ch.DeviceChannel.ID == req.Id {
+				return true
+			}
+
+			// 检查其他通道是否已使用该自定义ID
+			if ch.DeviceChannel.CustomChannelId == customChannelId {
+				hasConflict = true
+				return false
+			}
+			return true
+		})
+
+		// 如果有冲突，返回错误
+		if hasConflict {
+			resp.Code = 409
+			resp.Message = "自定义通道ID已存在，请使用其他ID"
+			return resp, nil
+		}
+
+		// 更新自定义通道ID
+		channel.DeviceChannel.CustomChannelId = customChannelId
+	}
+
+	// 从请求中获取自定义名称
+	if req.Channel.Name != "" {
+		channel.DeviceChannel.CustomName = req.Channel.Name
+	}
+
+	// 记录日志
+	gb.Info("通道信息已更新",
+		"通道ID", req.Id,
+		"自定义通道ID", channel.DeviceChannel.CustomChannelId,
+		"自定义名称", channel.DeviceChannel.CustomName)
+
+	// 返回成功响应
+	resp.Code = 0
+	resp.Message = "通道信息更新成功"
+	return resp, nil
+}

plugin/gb28181/device.go

@@ -62,6 +62,7 @@ type Device struct {
 	task.Job              `gorm:"-:all"`
 	DeviceId              string         `gorm:"primaryKey"` // 设备国标编号
 	Name                  string         // 设备名
+	CustomName            string         // 自定义名称
 	Manufacturer          string         // 生产厂商
 	Model                 string         // 型号
 	Firmware              string         // 固件版本
@@ -136,6 +137,7 @@ func (d *Device) Dispose() {
 				if channel.PullProxyTask != nil {
 					channel.PullProxyTask.ChangeStatus(m7s.PullProxyStatusOffline)
 				}
+				d.channels.RemoveByKey(channel.ID)
 				d.plugin.channels.RemoveByKey(channel.ID)
 				return true
 			})
@@ -199,6 +201,9 @@ func (d *Device) onMessage(req *sip.Request, tx sip.ServerTransaction, msg *gb28
 	switch msg.CmdType {
 	case "Keepalive":
 		d.KeepaliveInterval = int(time.Since(d.KeepaliveTime).Seconds())
+		if d.KeepaliveInterval < 60 {
+			d.KeepaliveInterval = 60
+		}
 		d.KeepaliveTime = time.Now()
 		d.Debug("into keeplive,deviceid is ", d.DeviceId, "d.KeepaliveTime is", d.KeepaliveTime, "d.KeepaliveInterval is", d.KeepaliveInterval)
 		if d.plugin.DB != nil {
@@ -227,30 +232,46 @@ func (d *Device) onMessage(req *sip.Request, tx sip.ServerTransaction, msg *gb28
 		isFirst := catalogReq.AddResponse()
 
 		// 更新设备信息到数据库
-		if d.plugin.DB != nil {
-			// 如果是第一个响应，先清空现有通道
-			if isFirst {
-				d.Trace("清空现有通道", "deviceId", d.DeviceId)
-				// 清空内存中的通道缓存
-				d.channels.Clear()
-			}
+		// 如果是第一个响应，将所有通道状态标记为OFF
+		if isFirst {
+			d.Trace("将所有通道状态标记为OFF", "deviceId", d.DeviceId)
+			// 标记所有通道为OFF状态
+			d.channels.Range(func(channel *Channel) bool {
+				if channel.DeviceChannel != nil {
+					channel.DeviceChannel.Status = gb28181.ChannelOffStatus
+				}
+				return true
+			})
+		}
 
-			// 更新通道信息
-			for _, c := range msg.DeviceChannelList {
-				// 设置关联的设备数据库ID
-				c.ChannelId = c.DeviceId
-				c.DeviceId = d.DeviceId
-				c.ID = d.DeviceId + "_" + c.ChannelId
-				// 使用 Save 进行 upsert 操作
-				d.addOrUpdateChannel(c)
+		// 更新通道信息
+		for _, c := range msg.DeviceChannelList {
+			// 设置关联的设备数据库ID
+			c.ChannelId = c.DeviceId
+			c.DeviceId = d.DeviceId
+			c.ID = d.DeviceId + "_" + c.ChannelId
+			if c.CustomChannelId == "" {
+				c.CustomChannelId = c.ChannelId
 			}
-
-			// 更新当前设备的通道数
-			d.ChannelCount = msg.SumNum
-			d.UpdateTime = time.Now()
-			d.Debug("save channel", "deviceid", d.DeviceId, " d.channels.Length", d.channels.Length, "d.ChannelCount", d.ChannelCount, "d.UpdateTime", d.UpdateTime)
+			// 使用 Save 进行 upsert 操作
+			d.addOrUpdateChannel(c)
 		}
 
+		// 更新当前设备的通道数
+		d.ChannelCount = msg.SumNum
+		d.UpdateTime = time.Now()
+		d.Debug("save channel", "deviceid", d.DeviceId, " d.channels.Length", d.channels.Length, "d.ChannelCount", d.ChannelCount, "d.UpdateTime", d.UpdateTime)
+
+		// 删除所有状态为OFF的通道
+		// d.channels.Range(func(channel *Channel) bool {
+		// 	if channel.DeviceChannel != nil && channel.DeviceChannel.Status == gb28181.ChannelOffStatus {
+		// 		d.Debug("删除不存在的通道", "channelId", channel.ID)
+		// 		d.channels.RemoveByKey(channel.ID)
+		// 		d.plugin.channels.RemoveByKey(channel.ID)
+		// 	}
+		// 	return true
+		// })
+
 		// 在所有通道都添加完成后，检查是否完成接收
 		if catalogReq.IsComplete(d.channels.Length) {
 			catalogReq.Resolve()
@@ -344,8 +365,11 @@ func (d *Device) onMessage(req *sip.Request, tx sip.ServerTransaction, msg *gb28
 	case "DeviceInfo":
 		// 主设备信息
 		d.Info("DeviceInfo message", "body", req.Body(), "d.Name", d.Name, "d.DeviceId", d.DeviceId, "msg.DeviceName", msg.DeviceName)
-		if d.Name == "" && msg.DeviceName != "" {
+		if msg.DeviceName != "" {
 			d.Name = msg.DeviceName
+			if d.CustomName == "" {
+				d.CustomName = msg.DeviceName
+			}
 		}
 		d.Manufacturer = msg.Manufacturer
 		d.Model = msg.Model
@@ -569,9 +593,28 @@ func (d *Device) frontEndCmdString(cmdCode int32, parameter1 int32, parameter2 i
 }
 
 func (d *Device) addOrUpdateChannel(c gb28181.DeviceChannel) {
+	// 设置通道状态为在线
+	c.Status = gb28181.ChannelOnStatus
+
 	if channel, ok := d.channels.Get(c.ID); ok {
+		// 通道已存在，保留自定义字段
+		if channel.DeviceChannel != nil {
+			// 保存原有的自定义字段
+			customName := channel.DeviceChannel.CustomName
+			customChannelId := channel.DeviceChannel.CustomChannelId
+
+			// 如果原有字段有值，则保留
+			if customName != "" {
+				c.CustomName = customName
+			}
+			if customChannelId != "" {
+				c.CustomChannelId = customChannelId
+			}
+		}
+		// 更新通道信息
 		channel.DeviceChannel = &c
 	} else {
+		// 创建新通道
 		channel = &Channel{
 			Device:        d,
 			Logger:        d.Logger.With("channel", c.ID),

plugin/gb28181/dialog.go

@@ -88,9 +88,14 @@ func (d *Dialog) Start() (err error) {
 	var device *Device
 	if deviceTmp, ok := d.gb.devices.Get(deviceId); ok {
 		device = deviceTmp
+		d.StreamMode = device.StreamMode
 		if channel, ok := deviceTmp.channels.Get(deviceId + "_" + channelId); ok {
 			d.Channel = channel
-			d.StreamMode = device.StreamMode
+		} else if channel, ok := deviceTmp.channels.Find(func(c *Channel) bool {
+			return c.CustomChannelId == channelId
+		}); ok {
+			channelId = channel.ChannelId
+			d.Channel = channel
 		} else {
 			return fmt.Errorf("channel %s not found", channelId)
 		}

plugin/gb28181/index.go

@@ -6,6 +6,7 @@ import (
 	"net"
 	"net/http"
 	"os"
+	"regexp"
 	"slices"
 	"strconv"
 	"strings"
@@ -486,7 +487,13 @@ func (gb *GB28181Plugin) RegisterHandler() map[string]http.HandlerFunc {
 func (gb *GB28181Plugin) OnRegister(req *sip.Request, tx sip.ServerTransaction) {
 	from := req.From()
 	if from == nil || from.Address.User == "" {
-		gb.Error("OnRegister", "error", "no user")
+		gb.Error("OnRegister", "invaliad from", from)
+		return
+	}
+	// 验证设备ID是否为20位数字
+	matched, err := regexp.MatchString("^\\d{20}$", from.Address.User)
+	if err != nil || !matched {
+		gb.Error("OnRegister", "invalid deviceId", from.Address.User)
 		return
 	}
 	deviceId := from.Address.User