update

internal/app/ami/action/index.go

@@ -37,7 +37,7 @@ func HandleAMI(event map[string]string) {
 				//lfshook.NewLogger().Infof("===PA interrupt PAD====== ")
 
 				InterruptRunningTask("PA")
-				time.Sleep(time.Millisecond * 100) //wait endpoimt release
+				time.Sleep(time.Millisecond * 200) //wait endpoimt release
 			case "*": //Cab cab interrupt PAD
 				//lfshook.NewLogger().Infof("===Cab cab interrupt PAD====== ")
 
@@ -177,14 +177,17 @@ func HandleAMI(event map[string]string) {
 					//切割&加密之后发送生成的文件名到STC;
 					alstatus.SendRecordFile(DstFile, event["RecordType"])
 
-					trainInfo = fmt.Sprintf("Train Number %s     CabNumber %s", active.TrainNum, active.ActivedCab)
+					trainInfo = fmt.Sprintf("TrainNumber %s  ", active.TrainNum)
 
 					if strings.Contains(event["FILENAME"], "PAD") {
 						_, caller, callee := utils.GetPadInfo(event["FILENAME"])
+						trainInfo = fmt.Sprintf("TrainNumber %s  CarNumber %s ", active.TrainNum, active.TrainInfoMap[active.TrainNum][int(caller[2])])
+						lfshook.NewLogger().Infof("Train info=============%s===============", trainInfo)
+
 						if len(caller) == 4 && len(caller) > 0 {
-							utils.Logger.Printf("Train Information: CabNumber %s, MessageType: PAD , CabNumber: %c , LocationCode: %c, Connected: %s, RecordFileName:%s", trainInfo, caller[2], caller[3], callee, DstFile)
+							utils.Logger.Printf("Train Information: %s, MessageType: PAD , LocationCode: %c, Connected: %s, RecordFileName:%s", trainInfo, caller[3], callee, DstFile)
 						} else {
-							utils.Logger.Printf("Train Information: CabNumber %s, MessageType: PAD , RecordFileName:%s . Can not get caller and callee  !", trainInfo, DstFile)
+							utils.Logger.Printf("Train Information: %s, MessageType: PAD , RecordFileName:%s . Can not get caller and callee  !", trainInfo, DstFile)
 						}
 					} else if strings.Contains(event["FILENAME"], "PA") {
 						_, caller, _ := utils.GetPadInfo(event["FILENAME"])

internal/app/stc/active/index.go

@@ -15,7 +15,7 @@ var ActivedCab = "1"
 var PADTimeout = 30
 var Master = false
 
-var trainInfoMap = make(map[string]map[int]string)
+var TrainInfoMap = make(map[string]map[int]string)
 
 // 初始化所有列车号
 var TrainNumGr = []string{"TS1", "TS2", "TS3", "TS4", "TS5", "TS6", "TS7", "TS8", "TS9", "TS10", "TS11", "TS12", "TS13"}
@@ -142,9 +142,9 @@ func GenerateXML(pt string) error {
 func InitTrainInfoMap() {
 
 	for i, train := range TrainNumGr {
-		trainInfoMap[train] = make(map[int]string)
+		TrainInfoMap[train] = make(map[int]string)
 		for j, car := range data[i] {
-			trainInfoMap[train][j+1] = car //位置从1开始
+			TrainInfoMap[train][j+1] = car //位置从1开始
 		}
 	}
 }

pkg/utils/file.go

@@ -165,5 +165,5 @@ func GetPadInfo(base string) (padType, padNum, connectedCab string) {
 		return
 	}
 
-	return ret[1], ret[2], ret[3]
+	return ret[0], ret[1], ret[2]
 }