1.优化广播状态上报机制

internal/app/ami/action/index.go

@@ -8,6 +8,7 @@ import (
 	"pbx-api-gin/pkg/lfshook"
 	"pbx-api-gin/pkg/utils"
 	"strconv"
+	"strings"
 	"time"
 
 	"github.com/sirupsen/logrus"
@@ -99,93 +100,16 @@ func HandleAMI(event map[string]string) {
 			alstatus.AlarmStatus(event["CallerIDNum"], "dial")
 		}
 
-	case "SoftHangupRequest": //pre-recored broadcast end
-		//lfshook.NewLogger().Infof("=========%s", event["Event"])
-		if event["CallerIDName"] == "EMG" && event["Exten"] == "0502" { // EMG broadcast hangup
-			priority.CleanPriorityTag()
-			alstatus.PaStatus(event["CallerIDName"], "EMG", "end")
-			priority.ResumeEmgPara = priority.BroadcastResumeParas{}
-
-		} else if event["CallerIDName"] == "STN" && event["Exten"] == "0503" {
-			priority.CleanPriorityTag()
-			alstatus.PaStatus(event["CallerIDName"], "STN", "end")
-			if priority.ResumeEmgPara.FileName != "" {
-				CheckEmgResume()
-			}
-
-		} else if event["CallerIDName"] == "DCS" && event["Exten"] == "0504" {
-			priority.CleanPriorityTag()
-			alstatus.PaStatus(event["CallerIDName"], "DCS", "end")
-			if priority.ResumeEmgPara.FileName != "" {
-				CheckEmgResume()
-			}
-
-		} else if event["CallerIDName"] == "SPC" && event["Exten"] == "0505" {
-			priority.CleanPriorityTag()
-			alstatus.PaStatus(event["CallerIDName"], "SPC", "end")
-			if priority.ResumeEmgPara.FileName != "" {
-				CheckEmgResume()
-			}
-
-		} else if event["CallerIDName"] == "CHK" && event["Exten"] == "0510" {
-			priority.CleanPriorityTag()
-			alstatus.PaStatus(event["CallerIDName"], "CHK", "end")
-			if priority.ResumeEmgPara.FileName != "" {
-				CheckEmgResume()
-			}
-
-		} else if event["CallerIDName"] == "VOL" && event["Exten"] == "0513" {
-			priority.CleanPriorityTag()
-			alstatus.PaStatus(event["CallerIDName"], "VOL", "end")
-			if priority.ResumeEmgPara.FileName != "" {
-				CheckEmgResume()
-			}
-
-		}
-
 	case "Hangup":
 
-		//lfshook.NewLogger().Infof("=========%s", event["Event"])
-		if utils.IsPACU(event["CallerIDNum"]) && utils.IsICP(event["ConnectedLineNum"]) { // TMS-ICP answer PAD, hangup
-			HangupAllLocalChan()
-			res, _ := QueueStatus("0300", "") // check ICP queue ,if empty PAD end
-			if res.Calls == "0" {
-				priority.CleanPriorityTag()
-				if priority.PADStart == 1 && utils.IsPAIU(event["CallerIDNum"]) {
-					alstatus.PaStatus(event["CallerIDNum"], "PAD", "end")
-					priority.PADStart = 0
-				}
-				if priority.ResumeEmgPara.FileName != "" {
-					CheckEmgResume()
-				}
-				//priority.ICPAnswer = 0
-				break
-			}
-		}
-
-		if utils.IsPAIU(event["CallerIDNum"]) && utils.IsICP(event["ConnectedLineNum"]) { // TMS-ICP answer PAD(PACU not availabe), hangup
-			HangupAllLocalChan()
-			res, _ := QueueStatus("0300", "") // check ICP queue ,if empty PAD end
-			if res.Calls == "0" {
-				priority.CleanPriorityTag()
-				if priority.PADStart == 1 && utils.IsPAIU(event["CallerIDNum"]) {
-					alstatus.PaStatus(event["CallerIDNum"], "PAD", "end")
-					priority.PADStart = 0
-				}
-				if priority.ResumeEmgPara.FileName != "" {
-					CheckEmgResume()
-				}
-				//priority.ICPAnswer = 0
-				break
-			}
-		}
+		lfshook.NewLogger().Infof("=========%s", event["Event"])
+		if utils.IsPAIU(event["CallerIDNum"]) && !strings.Contains(event["Channel"], "Local") { // PAD hangup ， check if PAD all end
 
-		if (event["CallerIDNum"] == "ani1" || event["CallerIDNum"] == "ani8") && utils.IsICP(event["ConnectedLineNum"]) { // ICP answer PAD, hangup
-			HangupAllLocalChan()
 			res, _ := QueueStatus("0300", "") // check ICP queue ,if empty PAD end
 			if res.Calls == "0" {
 				priority.CleanPriorityTag()
-				if priority.PADStart == 1 && utils.IsPAIU(event["CallerIDNum"]) {
+				HangupAllLocalChan()
+				if priority.PADStart == 1 {
 					alstatus.PaStatus(event["CallerIDNum"], "PAD", "end")
 					priority.PADStart = 0
 				}
@@ -204,10 +128,11 @@ func HandleAMI(event map[string]string) {
 			if res.Calls == "0" {             //OCC queue is empty
 				priority.CleanPriorityTag()
 				alstatus.OccPad("end")
+
 				if priority.ResumeEmgPara.FileName != "" {
 					CheckEmgResume()
 				}
-				//priority.OCCAnswer = 0
+
 				break
 			} else { //OCC queue is not empty
 				HangupAllLocalChan()
@@ -267,11 +192,17 @@ func HandleAMI(event map[string]string) {
 				priority.OCCAnswer = 1
 
 				if active.CabNum == "1" && active.Actived && ExtenStatus("1411") == "Idle" { //check active and OCC status
-					alstatus.OccPad("start")
+					if priority.PADOccStart == 0 {
+						alstatus.OccPad("start")
+						priority.PADOccStart = 1
+					}
 					Dial("0401", "0512", "pad-rule-pacus-occ", "ano1", event["CallerIDNum"], "1") // PACUs dial OCC1
 					//Goto event=ConfbridgeJoin;OCC answer PAD
 				} else if active.CabNum == "8" && active.Actived && ExtenStatus("1481") == "Idle" {
-					alstatus.OccPad("start")
+					if priority.PADOccStart == 0 {
+						alstatus.OccPad("start")
+						priority.PADOccStart = 1
+					}
 					Dial("0401", "0512", "pad-rule-pacus-occ", "ano8", event["CallerIDNum"], "8") // PACUs dial OCC8
 					//Goto event=ConfbridgeJoin;OCC answer PAD
 				}
@@ -280,6 +211,65 @@ func HandleAMI(event map[string]string) {
 
 	case "ConfbridgeJoin":
 		lfshook.NewLogger().Infof("=========%s", event["Event"])
+
+		//set priority and send PA status msg
+		switch event["CallerIDName"] {
+		case "EMG":
+			if event["Exten"] == "0502" {
+				priority.RunningPATaskChan = event["Channel"]
+				priority.RunningType = "EMG"
+				//Pa status report
+				priority.RunningTypePriority, _ = strconv.Atoi(priority.Priority.EMG)
+				alstatus.PaStatus("", "EMG", "start")
+				return
+			}
+		case "SPC":
+			if event["Exten"] == "0505" {
+				priority.RunningPATaskChan = event["Channel"]
+				priority.RunningType = "SPC"
+				//Pa status report
+				priority.RunningTypePriority, _ = strconv.Atoi(priority.Priority.SPC)
+				alstatus.PaStatus("", "SPC", "start")
+				return
+			}
+		case "DCS":
+			if event["Exten"] == "0504" {
+				priority.RunningPATaskChan = event["Channel"]
+				priority.RunningType = "DCS"
+				//Pa status report
+				priority.RunningTypePriority, _ = strconv.Atoi(priority.Priority.DCS)
+				alstatus.PaStatus("", "DCS", "start")
+				return
+			}
+		case "STN":
+			if event["Exten"] == "0503" {
+				priority.RunningPATaskChan = event["Channel"]
+				priority.RunningType = "STN"
+				//Pa status report
+				priority.RunningTypePriority, _ = strconv.Atoi(priority.Priority.STN)
+				alstatus.PaStatus("", "STN", "start")
+				return
+			}
+		case "CHK":
+			if event["Exten"] == "0510" {
+				priority.RunningPATaskChan = event["Channel"]
+				priority.RunningType = "CHK"
+				//Pa status report
+				priority.RunningTypePriority, _ = strconv.Atoi(priority.Priority.CHK)
+				alstatus.PaStatus("", "CHK", "start")
+				return
+			}
+		case "VOL": // tone-test
+			if event["Exten"] == "0513" {
+				priority.RunningPATaskChan = event["Channel"]
+				priority.RunningType = "VOL"
+				//Pa status report
+				priority.RunningTypePriority, _ = strconv.Atoi(priority.Priority.VOL)
+				alstatus.PaStatus("", "VOL", "start")
+				return
+			}
+		}
+
 		//Send PA start msg to STC
 		if utils.IsICP(event["CallerIDNum"]) && event["Exten"] == "0500" { // PA start
 			lfshook.NewLogger().Infof("====PA status:%s=====", "start")
@@ -297,51 +287,6 @@ func HandleAMI(event map[string]string) {
 			break
 		}
 
-		//set priority and send PA status msg
-		switch event["CallerIDName"] {
-		case "EMG":
-			priority.RunningPATaskChan = event["Channel"]
-			priority.RunningType = "EMG"
-			//Pa status report
-			priority.RunningTypePriority, _ = strconv.Atoi(priority.Priority.EMG)
-			alstatus.PaStatus("", "EMG", "start")
-
-		case "SPC":
-			priority.RunningPATaskChan = event["Channel"]
-			priority.RunningType = "SPC"
-			//Pa status report
-			priority.RunningTypePriority, _ = strconv.Atoi(priority.Priority.SPC)
-			alstatus.PaStatus("", "SPC", "start")
-
-		case "DCS":
-			priority.RunningPATaskChan = event["Channel"]
-			priority.RunningType = "DCS"
-			//Pa status report
-			priority.RunningTypePriority, _ = strconv.Atoi(priority.Priority.DCS)
-			alstatus.PaStatus("", "DCS", "start")
-
-		case "STN":
-			priority.RunningPATaskChan = event["Channel"]
-			priority.RunningType = "STN"
-			//Pa status report
-			priority.RunningTypePriority, _ = strconv.Atoi(priority.Priority.STN)
-			alstatus.PaStatus("", "STN", "start")
-
-		case "CHK":
-			priority.RunningPATaskChan = event["Channel"]
-			priority.RunningType = "CHK"
-			//Pa status report
-			priority.RunningTypePriority, _ = strconv.Atoi(priority.Priority.CHK)
-			alstatus.PaStatus("", "CHK", "start")
-
-		case "VOL": // tone-test
-			priority.RunningPATaskChan = event["Channel"]
-			priority.RunningType = "VOL"
-			//Pa status report
-			priority.RunningTypePriority, _ = strconv.Atoi(priority.Priority.VOL)
-			alstatus.PaStatus("", "VOL", "start")
-		}
-
 		//ICP answer PAD;
 		if event["ConnectedLineNum"] == "ani1" && event["Exten"] == "0511" { //PAD answered by ICP; PACUs connected ICP1
 			lfshook.NewLogger().Infof("====PAD answered by ICP1:%s=====", event["ConnectedLineName"])
@@ -409,8 +354,7 @@ func HandleAMI(event map[string]string) {
 				CheckEmgResume()
 			}
 
-		}
-		if utils.IsIO(event["CallerIDNum"]) && event["Exten"] == "0501" { //CPA end
+		} else if utils.IsIO(event["CallerIDNum"]) && event["Exten"] == "0501" { //CPA end
 			lfshook.NewLogger().Infof("====CPA  status =====%s", "end")
 			priority.CleanPriorityTag()
 			alstatus.PaStatus(event["CallerIDNum"], "CPA", "end")
@@ -418,6 +362,47 @@ func HandleAMI(event map[string]string) {
 				CheckEmgResume()
 			}
 
+			//lfshook.NewLogger().Infof("=========%s", event["Event"])
+		} else if event["CallerIDName"] == "EMG" && event["Exten"] == "0502" { // EMG broadcast hangup
+			priority.CleanPriorityTag()
+			alstatus.PaStatus(event["CallerIDName"], "EMG", "end")
+			priority.ResumeEmgPara = priority.BroadcastResumeParas{}
+
+		} else if event["CallerIDName"] == "STN" && event["Exten"] == "0503" {
+			priority.CleanPriorityTag()
+			alstatus.PaStatus(event["CallerIDName"], "STN", "end")
+			if priority.ResumeEmgPara.FileName != "" {
+				CheckEmgResume()
+			}
+
+		} else if event["CallerIDName"] == "DCS" && event["Exten"] == "0504" {
+			priority.CleanPriorityTag()
+			alstatus.PaStatus(event["CallerIDName"], "DCS", "end")
+			if priority.ResumeEmgPara.FileName != "" {
+				CheckEmgResume()
+			}
+
+		} else if event["CallerIDName"] == "SPC" && event["Exten"] == "0505" {
+			priority.CleanPriorityTag()
+			alstatus.PaStatus(event["CallerIDName"], "SPC", "end")
+			if priority.ResumeEmgPara.FileName != "" {
+				CheckEmgResume()
+			}
+
+		} else if event["CallerIDName"] == "CHK" && event["Exten"] == "0510" {
+			priority.CleanPriorityTag()
+			alstatus.PaStatus(event["CallerIDName"], "CHK", "end")
+			if priority.ResumeEmgPara.FileName != "" {
+				CheckEmgResume()
+			}
+
+		} else if event["CallerIDName"] == "VOL" && event["Exten"] == "0513" {
+			priority.CleanPriorityTag()
+			alstatus.PaStatus(event["CallerIDName"], "VOL", "end")
+			if priority.ResumeEmgPara.FileName != "" {
+				CheckEmgResume()
+			}
+
 		}
 
 	case "DialEnd":

internal/app/stc/priority/index.go

@@ -16,6 +16,7 @@ var RunningType = ""
 var SpecialVoice = 0
 var RunningPATaskChan = ""
 var PADStart = 0
+var PADOccStart = 0
 
 type BroadcastResumeParas struct {
 	FileName      string `json:"filename"`