update

internal/app/index.go

@@ -30,6 +30,9 @@ func StartApp() {
 	//get priority
 	priority.GetPriority()
 
+	//初始化列车信息map 列车号+车厢号
+	active.InitTrainInfoMap()
+
 	// 启动带有重连机制的连接管理协程MC1
 	go stc.StartStcConnection(socket.Conn, "1")
 

internal/app/stc/active/index.go

@@ -15,27 +15,28 @@ var ActivedCab = "1"
 var PADTimeout = 30
 var Master = false
 
-trainMap := make(map[string]map[int]string)
+var trainInfoMap = make(map[string]map[int]string)
+
 // 初始化所有列车号
-	trains := []string{"TS1", "TS2", "TS3", "TS4", "TS5", "TS6", "TS7", "TS8", "TS9", "TS10", "TS11", "TS12", "TS13"}
-
-	data := [][]string{
-		{"D433", "P433", "M433", "K433", "C434", "M434", "P434", "D434"},
-		{"D435", "P435", "M435", "K435", "C436", "M436", "P436", "D436"},
-		{"D437", "P437", "M437", "K437", "C438", "M438", "P438", "D438"},
-		{"D439", "P439", "M439", "K439", "C440", "M440", "P440", "D440"},
-		{"D441", "P441", "M441", "K441", "C442", "M442", "P442", "D442"},
-		{"D443", "P443", "M443", "K443", "C444", "M444", "P444", "D444"},
-		{"D445", "P445", "M445", "K445", "C446", "M446", "P446", "D446"},
-		{"D447", "P447", "M447", "K447", "C448", "M448", "P448", "D448"},
-		{"D449", "P449", "M449", "K449", "C450", "M450", "P450", "D450"},
-		{"D451", "P451", "M451", "K451", "C452", "M452", "P452", "D452"},
-		{"D453", "P653", "M453", "K453", "C454", "M454", "P454", "D454"},
-		{"D455", "P455", "M455", "K455", "C456", "M456", "P456", "D456"},
-		{"D457", "P457", "M457", "K457", "C458", "M458", "P458", "D458"},
-	}
-	
-var TrainNum = ""
+var TrainNumGr = []string{"TS1", "TS2", "TS3", "TS4", "TS5", "TS6", "TS7", "TS8", "TS9", "TS10", "TS11", "TS12", "TS13"}
+var TrainNum = "" //STC 设置该变量，可对应取车厢号
+
+// 初始化所有车厢号
+var data = [][]string{
+	{"D433", "P433", "M433", "K433", "C434", "M434", "P434", "D434"},
+	{"D435", "P435", "M435", "K435", "C436", "M436", "P436", "D436"},
+	{"D437", "P437", "M437", "K437", "C438", "M438", "P438", "D438"},
+	{"D439", "P439", "M439", "K439", "C440", "M440", "P440", "D440"},
+	{"D441", "P441", "M441", "K441", "C442", "M442", "P442", "D442"},
+	{"D443", "P443", "M443", "K443", "C444", "M444", "P444", "D444"},
+	{"D445", "P445", "M445", "K445", "C446", "M446", "P446", "D446"},
+	{"D447", "P447", "M447", "K447", "C448", "M448", "P448", "D448"},
+	{"D449", "P449", "M449", "K449", "C450", "M450", "P450", "D450"},
+	{"D451", "P451", "M451", "K451", "C452", "M452", "P452", "D452"},
+	{"D453", "P653", "M453", "K453", "C454", "M454", "P454", "D454"},
+	{"D455", "P455", "M455", "K455", "C456", "M456", "P456", "D456"},
+	{"D457", "P457", "M457", "K457", "C458", "M458", "P458", "D458"},
+}
 
 // Pacu 表示单个 pacu 节点
 type Pacu struct {
@@ -137,3 +138,13 @@ func GenerateXML(pt string) error {
 	}
 	return err
 }
+
+func InitTrainInfoMap() {
+
+	for i, train := range TrainNumGr {
+		trainInfoMap[train] = make(map[int]string)
+		for j, car := range data[i] {
+			trainInfoMap[train][j+1] = car //位置从1开始
+		}
+	}
+}

internal/app/stc/broadcast/stc-broadcast.go

@@ -100,7 +100,7 @@ func processHeartbeat(info []byte) {
 			active.DeviceEndpoint.PacuInfo[i].Status = "abnormal"
 		}
 		active.DeviceEndpoint.PacuInfo[i].Volume = strconv.Itoa(int(pacuVolBit))
-		lfshook.NewLogger().Logger.Infof("PACU INFO===ID:%s===Mute:%s===Stat:%s===Vol:%s", active.DeviceEndpoint.PacuInfo[i].ID, active.DeviceEndpoint.PacuInfo[i].Mute, active.DeviceEndpoint.PacuInfo[i].Status, active.DeviceEndpoint.PacuInfo[i].Volume)
+		lfshook.NewLogger().Logger.Infof("PACU INFO===ID:%s===Mute:%+v===Stat:%s===Vol:%s", active.DeviceEndpoint.PacuInfo[i].ID, active.DeviceEndpoint.PacuInfo[i].Mute, active.DeviceEndpoint.PacuInfo[i].Status, active.DeviceEndpoint.PacuInfo[i].Volume)
 	}
 }