Bläddra i källkod

fix send data to MC1 and MC8

dujunchen 1 vecka sedan
förälder
incheckning
f7c56f9639

+ 0 - 15
internal/app/ami/action/index.go

@@ -1,12 +1,10 @@
 package action
 
 import (
-	"net"
 	"pbx-api-gin/internal/app/ami/model"
 	"pbx-api-gin/internal/app/mysql"
 	"pbx-api-gin/internal/app/stc/active"
 	alstatus "pbx-api-gin/internal/app/stc/sendstatus"
-	"pbx-api-gin/internal/app/stc/socket"
 	"pbx-api-gin/internal/pkg/configs"
 	"pbx-api-gin/pkg/lfshook"
 	"pbx-api-gin/pkg/utils"
@@ -27,19 +25,6 @@ func HandleAMI(event map[string]string) {
 		return
 	}
 
-	// MC1 conn or MC8 conn
-	var conn net.Conn
-	if active.CabNum == "1" && active.Actived {
-		conn = socket.Conn
-	} else if active.CabNum == "8" && active.Actived {
-		conn = socket.Conn8
-	}
-
-	if conn == nil {
-		lfshook.NewLogger().Infof("===HandleAMI===conn==nil=")
-		return
-	}
-
 	switch event["Event"] {
 	/*case "DialBegin":
 	lfshook.NewLogger().Infof("=========%s", event["Event"])

+ 1 - 1
internal/app/index.go

@@ -36,7 +36,7 @@ func StartApp() {
 	go stc.StartStcConnection(socket.Conn, "1")
 
 	// 启动带有重连机制的连接管理协程MC8
-	go stc.StartStcConnection(socket.Conn, "8")
+	go stc.StartStcConnection(socket.Conn8, "8")
 	// 启动其他服务...
 	// 启动 AMI
 	go func() {

+ 7 - 3
internal/app/stc/index.go

@@ -32,7 +32,11 @@ func StartStcConnection(conn net.Conn, cab string) {
 
 		connMux.Lock()
 		oldConn := conn
-		socket.Conn = conn1
+		if cab == "1" {
+			socket.Conn = conn1
+		} else {
+			socket.Conn8 = conn1
+		}
 		connMux.Unlock()
 
 		// 关闭旧连接(如果存在)
@@ -49,7 +53,7 @@ func StartStcConnection(conn net.Conn, cab string) {
 			defer func() {
 				cancel() // 一旦任一协程退出,取消所有
 			}()
-			broadcast.HandleStcCmd(ctx, socket.Conn) // 改造 HandleStcCmd 接收 ctx
+			broadcast.HandleStcCmd(ctx, conn1) // 改造 HandleStcCmd 接收 ctx
 		}()
 
 		// 启动心跳MC1
@@ -57,7 +61,7 @@ func StartStcConnection(conn net.Conn, cab string) {
 			defer func() {
 				cancel()
 			}()
-			Sendheartbeat(ctx, socket.Conn) // 改造 Sendheartbeat 接收 ctx
+			Sendheartbeat(ctx, conn1) // 改造 Sendheartbeat 接收 ctx
 		}()
 
 		// 等待连接断开(监听连接状态)

+ 2 - 4
internal/app/stc/sendstatus/status.go

@@ -76,9 +76,8 @@ func AlarmStatus(exten string, status string) {
 	}
 	//check if actived
 	lfshook.NewLogger().Logger.Infof("===AlarmStatus=ext:%s===carr:%x==========pos:%x=========status:%x", exten, protocol.Data[0], protocol.Data[1], protocol.Data[2])
-	if active.Actived && active.CabNum == "1" {
+	if active.Actived {
 		SendToStc(socket.Conn, encoded)
-	} else if active.Actived && active.CabNum == "8" {
 		SendToStc(socket.Conn8, encoded)
 	}
 }
@@ -143,9 +142,8 @@ func PaStatus(src string, patype string, operation string) {
 		return
 	}
 
-	if active.Actived && active.CabNum == "1" {
+	if active.Actived {
 		SendToStc(socket.Conn, encoded)
-	} else if active.Actived && active.CabNum == "8" {
 		SendToStc(socket.Conn8, encoded)
 	}
 }