Browse Source

test redirect

dujunchen 2 weeks ago
parent
commit
766f617501

+ 2 - 0
internal/app/ami/action/channel.go

@@ -71,6 +71,8 @@ func GetChannelByExtenNotBridged(exten string) (channel string, err error) {
 	_, events, err := AminInstance.Send(map[string]string{
 		"Action": "CoreShowChannels",
 	})
+
+	lfshook.NewLogger().Infof("GetChannelByExtenNotBridged ================%s", exten)
 	if err != nil {
 		lfshook.NewLogger().Errorf("core show channels error %+v", err)
 		return "", err

+ 27 - 24
internal/app/ami/action/index.go

@@ -77,30 +77,33 @@ func HandleAMI(event map[string]string, conn net.Conn) {
 			}
 		}
 	case "BridgeEnter":
-		lfshook.NewLogger().Infof("====BridgeEnter=====%s====%s", event["Event"], event["CallerIDNum"])
-		if utils.IsPAIU(event["CallerIDNum"]) {
-			lfshook.NewLogger().Infof("====BridgeEnter=====%s====%s", event["Event"], event["CallerIDNum"])
-			alstatus.AlarmStatus(event["CallerIDNum"], "connect", conn) // Alarm connected
-
-			switch string(event["CallerIDNum"][2]) { // connect the pacu to pad acording to the pad number
-			case "1":
-				ChanSpy(event["CallerIDNum"], pacu1, false, true) //connect pacu to pad
-			case "2":
-				ChanSpy(event["CallerIDNum"], pacu2, false, true) //connect pacu to pad
-			case "3":
-				ChanSpy(event["CallerIDNum"], pacu3, false, true) //connect pacu to pad
-			case "4":
-				ChanSpy(event["CallerIDNum"], pacu4, false, true) //connect pacu to pad
-			case "5":
-				ChanSpy(event["CallerIDNum"], pacu5, false, true) //connect pacu to pad
-			case "6":
-				ChanSpy(event["CallerIDNum"], pacu6, false, true) //connect pacu to pad
-			case "7":
-				ChanSpy(event["CallerIDNum"], pacu7, false, true) //connect pacu to pad
-			case "8":
-				ChanSpy(event["CallerIDNum"], pacu8, false, true) //connect pacu to pad
-			}
-
+		lfshook.NewLogger().Infof("====BridgeEnter=====%s===ID:%s   Name:%s", event["Event"], event["CallerIDNum"], event["CallerIDName"])
+		//if utils.IsPAIU(event["CallerIDNum"]) {
+		if utils.IsPACU(event["CallerIDNum"]) {
+			lfshook.NewLogger().Infof("====BridgeEnter==IN action===%s===ID:%s   Name:%s", event["Event"], event["CallerIDNum"], event["CallerIDName"])
+			alstatus.AlarmStatus(event["CallerIDName"], "connect", conn) // Alarm connected
+
+			RedirectInQueue(event["CallerIDName"], "000", "chanspy-rule", "1") // 1车ICP接听PAIU
+			/*
+				switch string(event["CallerIDNum"][2]) { // connect the pacu to pad acording to the pad number
+				case "1":
+					ChanSpy(event["CallerIDNum"], pacu1, false, true) //connect pacu to pad
+				case "2":
+					ChanSpy(event["CallerIDNum"], pacu2, false, true) //connect pacu to pad
+				case "3":
+					ChanSpy(event["CallerIDNum"], pacu3, false, true) //connect pacu to pad
+				case "4":
+					ChanSpy(event["CallerIDNum"], pacu4, false, true) //connect pacu to pad
+				case "5":
+					ChanSpy(event["CallerIDNum"], pacu5, false, true) //connect pacu to pad
+				case "6":
+					ChanSpy(event["CallerIDNum"], pacu6, false, true) //connect pacu to pad
+				case "7":
+					ChanSpy(event["CallerIDNum"], pacu7, false, true) //connect pacu to pad
+				case "8":
+					ChanSpy(event["CallerIDNum"], pacu8, false, true) //connect pacu to pad
+				}
+			*/
 		}
 
 	}

+ 6 - 3
internal/app/stc/broadcast/stc-broadcast.go

@@ -260,6 +260,7 @@ func AlarmHandle(data []byte) {
 	carr := data[12]
 	pos := data[13]
 	exten := fmt.Sprintf("24%c%c", carr, pos)
+	PacuNum := fmt.Sprintf("21%c%c", carr, pos)
 
 	lfshook.NewLogger().Logger.Infof("================ICP Answer PAD================:%s ", exten)
 	key := suppressKey(exten, handler)
@@ -287,10 +288,12 @@ func AlarmHandle(data []byte) {
 	switch handler {
 	case 0x01: //answer(ICP+Alarm+PACU)
 		//NotifyPaiu(exten, "answer")
-		err := action.RedirectInQueue(exten, "0402", "ani-rule", "1") // 1车ICP接听PAIU
-		if err != nil {
+
+		action.Dial(PacuNum, "0402", "ani-rule", PacuNum, exten, "PJSIP") // PACU dial ICP
+		//err := action.RedirectInQueue(exten, "0402", "ani-rule", "1") // 1车ICP接听PAIU
+		/*if err != nil {
 			lfshook.NewLogger().Logger.Infof("================ICP Answer PAD====ERR============ : %+v", err.Error())
-		}
+		}*/
 		//invite PACU join in
 		//action.Hangup("PACU")
 		//action.ChanSpy("PACU", exten, false, true)