diff --git a/api/drafting.go b/api/drafting.go index d3b7454..6ff0b38 100644 --- a/api/drafting.go +++ b/api/drafting.go @@ -7,13 +7,13 @@ import ( jwt "github.com/appleboy/gin-jwt/v2" "github.com/gin-gonic/gin" "google.golang.org/protobuf/proto" - "joylink.club/bj-rtsts-server/ats/verify/protos/graphicData" - "joylink.club/bj-rtsts-server/ats/verify/simulation/wayside/memory" "joylink.club/bj-rtsts-server/db/model" "joylink.club/bj-rtsts-server/dto" "joylink.club/bj-rtsts-server/middleware" "joylink.club/bj-rtsts-server/service" "joylink.club/bj-rtsts-server/sys_error" + "joylink.club/bj-rtsts-server/ts/protos/graphicData" + "joylink.club/bj-rtsts-server/ts/simulation/wayside/memory" ) func InitDraftingRouter(api *gin.RouterGroup, authMiddleware *jwt.GinJWTMiddleware) { diff --git a/api/simulation.go b/api/simulation.go index 9e9af7c..69cdfdf 100644 --- a/api/simulation.go +++ b/api/simulation.go @@ -10,15 +10,15 @@ import ( jwt "github.com/appleboy/gin-jwt/v2" "github.com/gin-gonic/gin" "github.com/golang/protobuf/proto" - "joylink.club/bj-rtsts-server/ats/verify/protos/graphicData" - "joylink.club/bj-rtsts-server/ats/verify/protos/state" - "joylink.club/bj-rtsts-server/ats/verify/simulation" - "joylink.club/bj-rtsts-server/ats/verify/simulation/wayside/memory" "joylink.club/bj-rtsts-server/dto" "joylink.club/bj-rtsts-server/dto/request_proto" "joylink.club/bj-rtsts-server/middleware" "joylink.club/bj-rtsts-server/service" "joylink.club/bj-rtsts-server/sys_error" + "joylink.club/bj-rtsts-server/ts" + "joylink.club/bj-rtsts-server/ts/protos/graphicData" + "joylink.club/bj-rtsts-server/ts/protos/state" + "joylink.club/bj-rtsts-server/ts/simulation/wayside/memory" ) func InitSimulationRouter(api *gin.RouterGroup, authMiddleware *jwt.GinJWTMiddleware) { @@ -94,7 +94,7 @@ func createByProjectId(c *gin.Context) { if runConfig != nil { runConfigStr = runConfig.ConfigContent } - simulationId, err := simulation.CreateSimulation(req.ProjectId, mapIds, runConfigStr) + simulationId, err := ts.CreateSimulation(req.ProjectId, mapIds, runConfigStr) if err != nil { panic(sys_error.New("测试启动失败", err)) } @@ -121,7 +121,7 @@ func createByProjectId(c *gin.Context) { func destroy(c *gin.Context) { simId := c.Param("id") slog.Debug("ATS测试仿真-ATS仿真销毁 请求:", simId) - simulation.DestroySimulation(simId) + ts.DestroySimulation(simId) c.JSON(http.StatusOK, "ok") } @@ -140,7 +140,7 @@ func destroy(c *gin.Context) { // @Failure 500 {object} dto.ErrorDto // @Router /api/v1/simulation/list [get] func findAllSimulations(c *gin.Context) { - c.JSON(http.StatusOK, simulation.ListAllSimulations()) + c.JSON(http.StatusOK, ts.ListAllSimulations()) } // ATS测试仿真地图数据校验 @@ -501,7 +501,7 @@ func relayOperation(c *gin.Context) { // 获取仿真设备数据并返回 func checkDeviceDataAndReturn(simId string) *memory.VerifySimulation { - deviceMemory := simulation.FindSimulation(simId) + deviceMemory := ts.FindSimulation(simId) if deviceMemory == nil { panic(sys_error.New(fmt.Sprintf("仿真[%s]不存在", simId))) } diff --git a/ats/verify/ats_verify.go b/ats/verify/ats_verify.go deleted file mode 100644 index 32897b4..0000000 --- a/ats/verify/ats_verify.go +++ /dev/null @@ -1,5 +0,0 @@ -package atsVerify - -//ats 测试 -type Context struct { -} diff --git a/dto/drafting.go b/dto/drafting.go index d94d0c3..699f378 100644 --- a/dto/drafting.go +++ b/dto/drafting.go @@ -1,6 +1,6 @@ package dto -import "joylink.club/bj-rtsts-server/ats/verify/protos/graphicData" +import "joylink.club/bj-rtsts-server/ts/protos/graphicData" type PageDraftingReqDto struct { PageQueryDto diff --git a/dto/simulation.go b/dto/simulation.go index aa36087..028c83e 100644 --- a/dto/simulation.go +++ b/dto/simulation.go @@ -1,8 +1,8 @@ package dto import ( - "joylink.club/bj-rtsts-server/ats/verify/protos/state" "joylink.club/bj-rtsts-server/dto/request_proto" + "joylink.club/bj-rtsts-server/ts/protos/state" ) // 创建仿真请求 diff --git a/grpcproto/depricated/memory_change_server.go b/grpcproto/depricated/memory_change_server.go index ab4c42a..bc910f7 100644 --- a/grpcproto/depricated/memory_change_server.go +++ b/grpcproto/depricated/memory_change_server.go @@ -4,10 +4,10 @@ import ( "time" "google.golang.org/protobuf/proto" - "joylink.club/bj-rtsts-server/ats/verify/protos/state" - "joylink.club/bj-rtsts-server/ats/verify/simulation" "joylink.club/bj-rtsts-server/config" "joylink.club/bj-rtsts-server/dto" + "joylink.club/bj-rtsts-server/ts" + "joylink.club/bj-rtsts-server/ts/protos/state" ) var MemoryChangeServerSuffix = "serve-data" @@ -28,7 +28,7 @@ func (t *MemoryChangeServer) getInterval() time.Duration { // 定时发送数据 func (t *MemoryChangeServer) onTick() []TopicMsg { - simArr := simulation.GetSimulationArr() + simArr := ts.GetSimulationArr() addArr, delArr := []*state.SimulationStatus{}, []*state.SimulationStatus{} // 增加的仿真 allSim := make(map[string]bool) diff --git a/grpcproto/depricated/simulation_ibp_server.go b/grpcproto/depricated/simulation_ibp_server.go index c1d59c0..051ad1d 100644 --- a/grpcproto/depricated/simulation_ibp_server.go +++ b/grpcproto/depricated/simulation_ibp_server.go @@ -6,10 +6,10 @@ import ( "time" "google.golang.org/protobuf/proto" - "joylink.club/bj-rtsts-server/ats/verify/protos/graphicData" - "joylink.club/bj-rtsts-server/ats/verify/simulation" - "joylink.club/bj-rtsts-server/ats/verify/simulation/wayside/memory" "joylink.club/bj-rtsts-server/dto" + "joylink.club/bj-rtsts-server/ts" + "joylink.club/bj-rtsts-server/ts/protos/graphicData" + "joylink.club/bj-rtsts-server/ts/simulation/wayside/memory" ) type SimulationIBPServer struct{} @@ -26,7 +26,7 @@ func (t *SimulationIBPServer) getInterval() time.Duration { // 定时发送数据 func (t *SimulationIBPServer) onTick() []TopicMsg { - simArr := simulation.GetSimulationArr() + simArr := ts.GetSimulationArr() var msgArr []TopicMsg for _, v := range simArr { for _, mapId := range v.MapIds { diff --git a/grpcproto/depricated/simulation_psl_server.go b/grpcproto/depricated/simulation_psl_server.go index c4e2fdf..c8a46b3 100644 --- a/grpcproto/depricated/simulation_psl_server.go +++ b/grpcproto/depricated/simulation_psl_server.go @@ -6,10 +6,10 @@ import ( "time" "google.golang.org/protobuf/proto" - "joylink.club/bj-rtsts-server/ats/verify/protos/graphicData" - "joylink.club/bj-rtsts-server/ats/verify/simulation" - "joylink.club/bj-rtsts-server/ats/verify/simulation/wayside/memory" "joylink.club/bj-rtsts-server/dto" + "joylink.club/bj-rtsts-server/ts" + "joylink.club/bj-rtsts-server/ts/protos/graphicData" + "joylink.club/bj-rtsts-server/ts/simulation/wayside/memory" ) type SimulationPSLServer struct{} @@ -26,7 +26,7 @@ func (t *SimulationPSLServer) getInterval() time.Duration { // 定时发送数据 func (t *SimulationPSLServer) onTick() []TopicMsg { - simArr := simulation.GetSimulationArr() + simArr := ts.GetSimulationArr() var msgArr []TopicMsg for _, v := range simArr { for _, mapId := range v.MapIds { diff --git a/grpcproto/depricated/simulation_server.go b/grpcproto/depricated/simulation_server.go index b4991ce..95eaa8f 100644 --- a/grpcproto/depricated/simulation_server.go +++ b/grpcproto/depricated/simulation_server.go @@ -6,8 +6,8 @@ import ( "time" "google.golang.org/protobuf/proto" - "joylink.club/bj-rtsts-server/ats/verify/simulation" "joylink.club/bj-rtsts-server/dto" + "joylink.club/bj-rtsts-server/ts" ) type SimulationServer struct{} @@ -24,7 +24,7 @@ func (t *SimulationServer) getInterval() time.Duration { // 定时发送数据 func (t *SimulationServer) onTick() []TopicMsg { - simArr := simulation.GetSimulationArr() + simArr := ts.GetSimulationArr() var msgArr []TopicMsg for _, v := range simArr { for _, mapId := range v.MapIds { diff --git a/message_server/ibp_ms.go b/message_server/ibp_ms.go index 8e5d492..b6e1d0d 100644 --- a/message_server/ibp_ms.go +++ b/message_server/ibp_ms.go @@ -7,10 +7,10 @@ import ( "time" "google.golang.org/protobuf/proto" - "joylink.club/bj-rtsts-server/ats/verify/protos/graphicData" - "joylink.club/bj-rtsts-server/ats/verify/protos/state" - "joylink.club/bj-rtsts-server/ats/verify/simulation/wayside/memory" "joylink.club/bj-rtsts-server/message_server/ms_api" + "joylink.club/bj-rtsts-server/ts/protos/graphicData" + "joylink.club/bj-rtsts-server/ts/protos/state" + "joylink.club/bj-rtsts-server/ts/simulation/wayside/memory" ) // 综合后备盘IBP消息服务 diff --git a/message_server/sfp_ms.go b/message_server/sfp_ms.go index bfe5857..98dfc65 100644 --- a/message_server/sfp_ms.go +++ b/message_server/sfp_ms.go @@ -5,10 +5,10 @@ import ( "time" "google.golang.org/protobuf/proto" - "joylink.club/bj-rtsts-server/ats/verify/protos/graphicData" - "joylink.club/bj-rtsts-server/ats/verify/protos/state" - "joylink.club/bj-rtsts-server/ats/verify/simulation/wayside/memory" "joylink.club/bj-rtsts-server/message_server/ms_api" + "joylink.club/bj-rtsts-server/ts/protos/graphicData" + "joylink.club/bj-rtsts-server/ts/protos/state" + "joylink.club/bj-rtsts-server/ts/simulation/wayside/memory" "joylink.club/ecs" "joylink.club/rtsssimulation/component" "joylink.club/rtsssimulation/entity" diff --git a/message_server/simulation.go b/message_server/simulation.go index 2e38591..8433d2f 100644 --- a/message_server/simulation.go +++ b/message_server/simulation.go @@ -4,9 +4,9 @@ import ( "sync" "time" - "joylink.club/bj-rtsts-server/ats/verify/simulation/wayside/memory" "joylink.club/bj-rtsts-server/message_server/ms_api" "joylink.club/bj-rtsts-server/message_server/ms_manage" + "joylink.club/bj-rtsts-server/ts/simulation/wayside/memory" ) var smsMap sync.Map diff --git a/protobuf/main_test.go b/protobuf/main_test.go index d864071..b8e86ac 100644 --- a/protobuf/main_test.go +++ b/protobuf/main_test.go @@ -6,7 +6,7 @@ import ( "testing" "google.golang.org/protobuf/proto" - "joylink.club/bj-rtsts-server/ats/verify/protos/graphicData" + "joylink.club/bj-rtsts-server/ts/protos/graphicData" proto2 "joylink.club/rtsssimulation/repository/model/proto" ) diff --git a/service/publishedGi.go b/service/publishedGi.go index 070f835..2a63a9b 100644 --- a/service/publishedGi.go +++ b/service/publishedGi.go @@ -5,11 +5,11 @@ import ( "sync" "time" - "joylink.club/bj-rtsts-server/ats/verify/simulation/wayside/memory" "joylink.club/bj-rtsts-server/db/dbquery" "joylink.club/bj-rtsts-server/db/model" "joylink.club/bj-rtsts-server/dto" "joylink.club/bj-rtsts-server/dto/publishedGi" + "joylink.club/bj-rtsts-server/ts/simulation/wayside/memory" ) var publishMapMutex sync.Mutex diff --git a/third_party/message/train_control.go b/third_party/message/train_control.go index 9a626a1..9d54a1a 100644 --- a/third_party/message/train_control.go +++ b/third_party/message/train_control.go @@ -5,7 +5,7 @@ import ( "math" "time" - "joylink.club/bj-rtsts-server/ats/verify/protos/state" + "joylink.club/bj-rtsts-server/ts/protos/state" ) // 接收到的列车控制信息 diff --git a/ats/verify/protos/graphicData/ibpGraphics.pb.go b/ts/protos/graphicData/ibpGraphics.pb.go similarity index 100% rename from ats/verify/protos/graphicData/ibpGraphics.pb.go rename to ts/protos/graphicData/ibpGraphics.pb.go diff --git a/ats/verify/protos/graphicData/picture.pb.go b/ts/protos/graphicData/picture.pb.go similarity index 100% rename from ats/verify/protos/graphicData/picture.pb.go rename to ts/protos/graphicData/picture.pb.go diff --git a/ats/verify/protos/graphicData/pslGraphics.pb.go b/ts/protos/graphicData/pslGraphics.pb.go similarity index 100% rename from ats/verify/protos/graphicData/pslGraphics.pb.go rename to ts/protos/graphicData/pslGraphics.pb.go diff --git a/ats/verify/protos/graphicData/relayCabinetLayoutGraphics.pb.go b/ts/protos/graphicData/relayCabinetLayoutGraphics.pb.go similarity index 100% rename from ats/verify/protos/graphicData/relayCabinetLayoutGraphics.pb.go rename to ts/protos/graphicData/relayCabinetLayoutGraphics.pb.go diff --git a/ats/verify/protos/graphicData/stationLayoutGraphics.pb.go b/ts/protos/graphicData/stationLayoutGraphics.pb.go similarity index 100% rename from ats/verify/protos/graphicData/stationLayoutGraphics.pb.go rename to ts/protos/graphicData/stationLayoutGraphics.pb.go diff --git a/ats/verify/protos/state/device_state.pb.go b/ts/protos/state/device_state.pb.go similarity index 100% rename from ats/verify/protos/state/device_state.pb.go rename to ts/protos/state/device_state.pb.go diff --git a/ats/verify/simulation/wayside/memory/wayside_memory_generate.go b/ts/simulation/wayside/memory/wayside_memory_generate.go similarity index 99% rename from ats/verify/simulation/wayside/memory/wayside_memory_generate.go rename to ts/simulation/wayside/memory/wayside_memory_generate.go index a9c5c62..f59c65f 100644 --- a/ats/verify/simulation/wayside/memory/wayside_memory_generate.go +++ b/ts/simulation/wayside/memory/wayside_memory_generate.go @@ -9,8 +9,8 @@ import ( "sort" "strings" - "joylink.club/bj-rtsts-server/ats/verify/protos/graphicData" "joylink.club/bj-rtsts-server/dto" + "joylink.club/bj-rtsts-server/ts/protos/graphicData" ) // 参与计算的坡度与曲度均为正线公里标，如果有其他坐标系需要转换 diff --git a/ats/verify/simulation/wayside/memory/wayside_memory_ibp.go b/ts/simulation/wayside/memory/wayside_memory_ibp.go similarity index 96% rename from ats/verify/simulation/wayside/memory/wayside_memory_ibp.go rename to ts/simulation/wayside/memory/wayside_memory_ibp.go index 759061e..9afca06 100644 --- a/ats/verify/simulation/wayside/memory/wayside_memory_ibp.go +++ b/ts/simulation/wayside/memory/wayside_memory_ibp.go @@ -1,8 +1,8 @@ package memory import ( - "joylink.club/bj-rtsts-server/ats/verify/protos/graphicData" - "joylink.club/bj-rtsts-server/ats/verify/protos/state" + "joylink.club/bj-rtsts-server/ts/protos/graphicData" + "joylink.club/bj-rtsts-server/ts/protos/state" "joylink.club/ecs" "joylink.club/rtsssimulation/component" "joylink.club/rtsssimulation/entity" diff --git a/ats/verify/simulation/wayside/memory/wayside_memory_map.go b/ts/simulation/wayside/memory/wayside_memory_map.go similarity index 99% rename from ats/verify/simulation/wayside/memory/wayside_memory_map.go rename to ts/simulation/wayside/memory/wayside_memory_map.go index a3b1478..17c6e20 100644 --- a/ats/verify/simulation/wayside/memory/wayside_memory_map.go +++ b/ts/simulation/wayside/memory/wayside_memory_map.go @@ -12,12 +12,12 @@ import ( proto2 "joylink.club/rtsssimulation/repository/model/proto" "google.golang.org/protobuf/proto" - "joylink.club/bj-rtsts-server/ats/verify/protos/graphicData" - "joylink.club/bj-rtsts-server/ats/verify/protos/state" "joylink.club/bj-rtsts-server/db/dbquery" "joylink.club/bj-rtsts-server/db/model" "joylink.club/bj-rtsts-server/dto" "joylink.club/bj-rtsts-server/sys_error" + "joylink.club/bj-rtsts-server/ts/protos/graphicData" + "joylink.club/bj-rtsts-server/ts/protos/state" ) var ( diff --git a/ats/verify/simulation/wayside/memory/wayside_memory_map_init.go b/ts/simulation/wayside/memory/wayside_memory_map_init.go similarity index 99% rename from ats/verify/simulation/wayside/memory/wayside_memory_map_init.go rename to ts/simulation/wayside/memory/wayside_memory_map_init.go index 2ae2670..05e5bde 100644 --- a/ats/verify/simulation/wayside/memory/wayside_memory_map_init.go +++ b/ts/simulation/wayside/memory/wayside_memory_map_init.go @@ -4,8 +4,8 @@ import ( "fmt" "sync" - "joylink.club/bj-rtsts-server/ats/verify/protos/graphicData" "joylink.club/bj-rtsts-server/dto" + "joylink.club/bj-rtsts-server/ts/protos/graphicData" "joylink.club/rtsssimulation/repository" ) diff --git a/ats/verify/simulation/wayside/memory/wayside_memory_psd.go b/ts/simulation/wayside/memory/wayside_memory_psd.go similarity index 91% rename from ats/verify/simulation/wayside/memory/wayside_memory_psd.go rename to ts/simulation/wayside/memory/wayside_memory_psd.go index 7f5215a..54e149c 100644 --- a/ats/verify/simulation/wayside/memory/wayside_memory_psd.go +++ b/ts/simulation/wayside/memory/wayside_memory_psd.go @@ -1,8 +1,8 @@ package memory import ( - "joylink.club/bj-rtsts-server/ats/verify/protos/graphicData" - "joylink.club/bj-rtsts-server/ats/verify/protos/state" + "joylink.club/bj-rtsts-server/ts/protos/graphicData" + "joylink.club/bj-rtsts-server/ts/protos/state" "joylink.club/rtsssimulation/component" "joylink.club/rtsssimulation/entity" ) diff --git a/ats/verify/simulation/wayside/memory/wayside_memory_psl.go b/ts/simulation/wayside/memory/wayside_memory_psl.go similarity index 100% rename from ats/verify/simulation/wayside/memory/wayside_memory_psl.go rename to ts/simulation/wayside/memory/wayside_memory_psl.go diff --git a/ats/verify/simulation/wayside/memory/wayside_memory_relay.go b/ts/simulation/wayside/memory/wayside_memory_relay.go similarity index 89% rename from ats/verify/simulation/wayside/memory/wayside_memory_relay.go rename to ts/simulation/wayside/memory/wayside_memory_relay.go index d43b8e1..e807b4d 100644 --- a/ats/verify/simulation/wayside/memory/wayside_memory_relay.go +++ b/ts/simulation/wayside/memory/wayside_memory_relay.go @@ -1,8 +1,8 @@ package memory import ( - "joylink.club/bj-rtsts-server/ats/verify/protos/graphicData" - "joylink.club/bj-rtsts-server/ats/verify/protos/state" + "joylink.club/bj-rtsts-server/ts/protos/graphicData" + "joylink.club/bj-rtsts-server/ts/protos/state" "joylink.club/rtsssimulation/component" "joylink.club/rtsssimulation/entity" "joylink.club/rtsssimulation/fi" diff --git a/ats/verify/simulation/wayside/memory/wayside_memory_section.go b/ts/simulation/wayside/memory/wayside_memory_section.go similarity index 93% rename from ats/verify/simulation/wayside/memory/wayside_memory_section.go rename to ts/simulation/wayside/memory/wayside_memory_section.go index 5a545f7..0d0a25c 100644 --- a/ats/verify/simulation/wayside/memory/wayside_memory_section.go +++ b/ts/simulation/wayside/memory/wayside_memory_section.go @@ -1,15 +1,16 @@ package memory import ( - "joylink.club/bj-rtsts-server/ats/verify/protos/graphicData" - "joylink.club/bj-rtsts-server/ats/verify/protos/state" + "log/slog" + "joylink.club/bj-rtsts-server/dto" "joylink.club/bj-rtsts-server/dto/request_proto" + "joylink.club/bj-rtsts-server/ts/protos/graphicData" + "joylink.club/bj-rtsts-server/ts/protos/state" "joylink.club/ecs" "joylink.club/rtsssimulation/component" "joylink.club/rtsssimulation/entity" "joylink.club/rtsssimulation/fi" - "log/slog" ) func GetMapAllSectionState(sim *VerifySimulation, mapId int32) []*state.SectionState { diff --git a/ats/verify/simulation/wayside/memory/wayside_memory_signal.go b/ts/simulation/wayside/memory/wayside_memory_signal.go similarity index 98% rename from ats/verify/simulation/wayside/memory/wayside_memory_signal.go rename to ts/simulation/wayside/memory/wayside_memory_signal.go index e359c16..c77e60e 100644 --- a/ats/verify/simulation/wayside/memory/wayside_memory_signal.go +++ b/ts/simulation/wayside/memory/wayside_memory_signal.go @@ -2,10 +2,12 @@ package memory import ( "fmt" - "joylink.club/bj-rtsts-server/ats/verify/protos/graphicData" - "joylink.club/bj-rtsts-server/ats/verify/protos/state" + "log/slog" + "joylink.club/bj-rtsts-server/dto" "joylink.club/bj-rtsts-server/dto/request_proto" + "joylink.club/bj-rtsts-server/ts/protos/graphicData" + "joylink.club/bj-rtsts-server/ts/protos/state" "joylink.club/ecs" "joylink.club/rtsssimulation/component" "joylink.club/rtsssimulation/component/component_proto" @@ -14,7 +16,6 @@ import ( "joylink.club/rtsssimulation/fi" "joylink.club/rtsssimulation/repository" "joylink.club/rtsssimulation/repository/model/proto" - "log/slog" ) func ChangeSignalState(simulation *VerifySimulation, req *dto.SignalOperationReqDto) { diff --git a/ats/verify/simulation/wayside/memory/wayside_memory_station.go b/ts/simulation/wayside/memory/wayside_memory_station.go similarity index 89% rename from ats/verify/simulation/wayside/memory/wayside_memory_station.go rename to ts/simulation/wayside/memory/wayside_memory_station.go index c121f7e..063d179 100644 --- a/ats/verify/simulation/wayside/memory/wayside_memory_station.go +++ b/ts/simulation/wayside/memory/wayside_memory_station.go @@ -1,8 +1,8 @@ package memory import ( - "joylink.club/bj-rtsts-server/ats/verify/protos/graphicData" - "joylink.club/bj-rtsts-server/ats/verify/protos/state" + "joylink.club/bj-rtsts-server/ts/protos/graphicData" + "joylink.club/bj-rtsts-server/ts/protos/state" "joylink.club/rtsssimulation/component" "joylink.club/rtsssimulation/entity" "joylink.club/rtsssimulation/fi" diff --git a/ats/verify/simulation/wayside/memory/wayside_memory_train.go b/ts/simulation/wayside/memory/wayside_memory_train.go similarity index 98% rename from ats/verify/simulation/wayside/memory/wayside_memory_train.go rename to ts/simulation/wayside/memory/wayside_memory_train.go index 4f3572d..4810cd4 100644 --- a/ats/verify/simulation/wayside/memory/wayside_memory_train.go +++ b/ts/simulation/wayside/memory/wayside_memory_train.go @@ -11,7 +11,7 @@ import ( "joylink.club/bj-rtsts-server/third_party/message" "google.golang.org/protobuf/proto" - "joylink.club/bj-rtsts-server/ats/verify/protos/state" + "joylink.club/bj-rtsts-server/ts/protos/state" ) // 增加列车状态 diff --git a/ats/verify/simulation/wayside/memory/wayside_memory_turnout.go b/ts/simulation/wayside/memory/wayside_memory_turnout.go similarity index 95% rename from ats/verify/simulation/wayside/memory/wayside_memory_turnout.go rename to ts/simulation/wayside/memory/wayside_memory_turnout.go index 77c99ba..d6be015 100644 --- a/ats/verify/simulation/wayside/memory/wayside_memory_turnout.go +++ b/ts/simulation/wayside/memory/wayside_memory_turnout.go @@ -9,9 +9,9 @@ import ( "joylink.club/rtsssimulation/entity" "joylink.club/rtsssimulation/fi" - "joylink.club/bj-rtsts-server/ats/verify/protos/graphicData" - "joylink.club/bj-rtsts-server/ats/verify/protos/state" "joylink.club/bj-rtsts-server/dto/request_proto" + "joylink.club/bj-rtsts-server/ts/protos/graphicData" + "joylink.club/bj-rtsts-server/ts/protos/state" ) // 处理道岔操作 diff --git a/ats/verify/simulation/wayside/memory/wayside_simulation.go b/ts/simulation/wayside/memory/wayside_simulation.go similarity index 99% rename from ats/verify/simulation/wayside/memory/wayside_simulation.go rename to ts/simulation/wayside/memory/wayside_simulation.go index 76fecbf..7ecdeef 100644 --- a/ats/verify/simulation/wayside/memory/wayside_simulation.go +++ b/ts/simulation/wayside/memory/wayside_simulation.go @@ -14,8 +14,6 @@ import ( rtss_simulation "joylink.club/rtsssimulation" - "joylink.club/bj-rtsts-server/ats/verify/protos/graphicData" - "joylink.club/bj-rtsts-server/ats/verify/protos/state" "joylink.club/bj-rtsts-server/config" "joylink.club/bj-rtsts-server/dto" "joylink.club/bj-rtsts-server/sys_error" @@ -23,6 +21,8 @@ import ( "joylink.club/bj-rtsts-server/third_party/interlock" "joylink.club/bj-rtsts-server/third_party/message" "joylink.club/bj-rtsts-server/third_party/semi_physical_train" + "joylink.club/bj-rtsts-server/ts/protos/graphicData" + "joylink.club/bj-rtsts-server/ts/protos/state" "joylink.club/ecs" "joylink.club/rtsssimulation/fi" "joylink.club/rtsssimulation/repository" diff --git a/ats/verify/simulation/simulation_manage.go b/ts/test_simulation_manage.go similarity index 96% rename from ats/verify/simulation/simulation_manage.go rename to ts/test_simulation_manage.go index a6a37fc..e007972 100644 --- a/ats/verify/simulation/simulation_manage.go +++ b/ts/test_simulation_manage.go @@ -1,13 +1,13 @@ -package simulation +package ts import ( "strconv" "sync" - "joylink.club/bj-rtsts-server/ats/verify/simulation/wayside/memory" "joylink.club/bj-rtsts-server/config" "joylink.club/bj-rtsts-server/message_server" "joylink.club/bj-rtsts-server/sys_error" + "joylink.club/bj-rtsts-server/ts/simulation/wayside/memory" "joylink.club/bj-rtsts-server/dto" )