From 66d31f80f22f91599cdf2c267566fdda4619bf14 Mon Sep 17 00:00:00 2001
From: joylink_zhangsai <1021828630@qq.com>
Date: Thu, 18 Jan 2024 10:08:55 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=BA=94=E7=AD=94?=
 =?UTF-8?q?=E5=99=A8=E7=A7=BB=E4=BD=8D=E6=93=8D=E4=BD=9C=E7=9A=84=E6=8A=A5?=
 =?UTF-8?q?=E9=94=99=E6=8F=90=E7=A4=BA=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/simulation.go                                          | 4 ++--
 rtss_simulation                                            | 2 +-
 ts/simulation/wayside/memory/wayside_memory_transponder.go | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/api/simulation.go b/api/simulation.go
index 326ea63..5759875 100644
--- a/api/simulation.go
+++ b/api/simulation.go
@@ -638,9 +638,9 @@ func balisePositionModify(c *gin.Context) {
 	}
 	simulation := checkDeviceDataAndReturn(req.SimulationId)
 	slog.Info("传入状态参数", req)
-	err := memory.BalisePositionModify(simulation, req)
+	var err *sys_error.BusinessError = memory.BalisePositionModify(simulation, req)
 	if err != nil {
-		panic(sys_error.New(fmt.Sprintf("应答器移位操作失败,%s", err.Error()), err))
+		panic(err)
 	}
 	c.JSON(http.StatusOK, "ok")
 }
diff --git a/rtss_simulation b/rtss_simulation
index 0203bbc..8cd0f61 160000
--- a/rtss_simulation
+++ b/rtss_simulation
@@ -1 +1 @@
-Subproject commit 0203bbcefa0797f2efae50bbaa5e9c6d0f30a84e
+Subproject commit 8cd0f61fb0aa36fe69bc55ada1ffb4397626b365
diff --git a/ts/simulation/wayside/memory/wayside_memory_transponder.go b/ts/simulation/wayside/memory/wayside_memory_transponder.go
index f014995..793d548 100644
--- a/ts/simulation/wayside/memory/wayside_memory_transponder.go
+++ b/ts/simulation/wayside/memory/wayside_memory_transponder.go
@@ -90,7 +90,7 @@ func BalisePositionModify(simulation *VerifySimulation, req *dto.BaliseMoveReqDt
 	//更新应答器公里标和Link位置
 	entry, _ := entity.GetEntityByUid(simulation.World, uid)
 	if km.Value <= minKm.Value || km.Value >= maxKm.Value {
-		return sys_error.New(fmt.Sprintf("超出可设置范围(%d:%d)", minKm.Value, maxKm.Value))
+		return sys_error.New("位置设置错误，必须在相邻的应答器/道岔/轨道边界之间")
 	}
 	component.KmType.Set(entry, km)
 	offset := number.Abs(km.Value - akm.Value)

From 1fe577c8304a665d674c1eac9ef7f748129e2f53 Mon Sep 17 00:00:00 2001
From: tiger_zhou <Shmily123@WJ>
Date: Thu, 18 Jan 2024 10:11:08 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=8A=A8=E5=8A=9B=E5=AD=A6=E5=88=97?=
 =?UTF-8?q?=E8=BD=A6=E6=95=B0=E6=8D=AE=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 bj-rtss-message | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bj-rtss-message b/bj-rtss-message
index 8469ef8..3ec969b 160000
--- a/bj-rtss-message
+++ b/bj-rtss-message
@@ -1 +1 @@
-Subproject commit 8469ef8778e98f43caa6cdf6e18a19ecb7f490de
+Subproject commit 3ec969bbd23c98ea2b32e5202f60e0cb41a23b10