【删除Index】

api/trainManage.go

@@ -77,7 +77,7 @@ func pageQueryTrainInfo(c *gin.Context) {
 //	@Accept			json
 //	@Produce		json
 //	@Param			trainInfoReqDto	query		dto.TrainInfoReqDto	true	"列车查询条件"
-//	@Success		200	{object}	dto.PageDto
+//	@Success		200	{object}	model.TrainInfo
 //	@Failure		401	{object}	dto.ErrorDto
 //	@Failure		404	{object}	dto.ErrorDto
 //	@Failure		500	{object}	dto.ErrorDto

docs/swagger.yaml

@@ -215,6 +215,7 @@ definitions:
       pid:
         type: integer
       trainSizeLinks:
+        description: TODO:前端修改完成后删除
         items:
           $ref: '#/definitions/dto.TrainSizeDto'
         type: array
@@ -251,6 +252,27 @@ definitions:
     - mapId
     - simulationId
     type: object
+  dto.PublishedDto:
+    properties:
+      category:
+        type: string
+      id:
+        type: integer
+      name:
+        type: string
+      note:
+        type: string
+      proto:
+        items:
+          type: integer
+        type: array
+      publishAt:
+        type: string
+      type:
+        type: integer
+      userID:
+        type: integer
+    type: object
   dto.PublishedGiLinkDto:
     properties:
       category:
@@ -565,6 +587,23 @@ definitions:
         description: 发布用户id
         type: integer
     type: object
+  model.TrainInfo:
+    properties:
+      description:
+        description: 其他描述内容
+        type: string
+      id:
+        description: id
+        type: integer
+      name:
+        description: 列车信息
+        type: string
+      proto:
+        description: 列车参数信息
+        items:
+          type: integer
+        type: array
+    type: object
   model.TrainModel:
     properties:
       created_at:
@@ -579,38 +618,6 @@ definitions:
         description: 更新时间
         type: string
     type: object
-  model.TrainSize:
-    properties:
-      carriage_length:
-        description: 列车车厢长度
-        type: integer
-      description:
-        description: 其他描述内容
-        type: string
-      id:
-        description: 主键
-        type: integer
-      name:
-        description: 名称
-        type: string
-      total_length:
-        description: 总长度
-        type: integer
-    type: object
-  model.TrainWheel:
-    properties:
-      id:
-        type: integer
-      max_diameter:
-        description: 车轮的最大直径(mm)
-        type: integer
-      min_diameter:
-        description: 车轮的最小直径(mm)
-        type: integer
-      name:
-        description: 名称
-        type: string
-    type: object
   request_proto.Psd_Operation:
     enum:
     - 0
@@ -1830,40 +1837,6 @@ paths:
       summary: 草稿另存为
       tags:
       - 草稿Api
-  /api/v1/drafting/calculatelink:
-    post:
-      consumes:
-      - application/json
-      description: 根据地图数据新生成计算的link信息
-      parameters:
-      - collectionFormat: csv
-        in: query
-        items:
-          type: integer
-        name: proto
-        type: array
-      produces:
-      - application/json
-      responses:
-        "200":
-          description: OK
-        "401":
-          description: Unauthorized
-          schema:
-            $ref: '#/definitions/dto.ErrorDto'
-        "404":
-          description: Not Found
-          schema:
-            $ref: '#/definitions/dto.ErrorDto'
-        "500":
-          description: Internal Server Error
-          schema:
-            $ref: '#/definitions/dto.ErrorDto'
-      security:
-      - JwtAuth: []
-      summary: 根据地图数据新生成计算的link信息
-      tags:
-      - 草稿Api
   /api/v1/drafting/list:
     get:
       consumes:
@@ -2187,6 +2160,7 @@ paths:
         name: pid
         type: integer
       - collectionFormat: csv
+        description: TODO:前端修改完成后删除
         in: query
         items:
           type: integer
@@ -2366,7 +2340,7 @@ paths:
         "200":
           description: OK
           schema:
-            $ref: '#/definitions/model.PublishedGi'
+            $ref: '#/definitions/dto.PublishedDto'
         "401":
           description: Unauthorized
           schema:
@@ -2386,18 +2360,9 @@ paths:
       - application/json
       description: 可以通过名称过滤
       parameters:
-      - in: query
-        name: category
-        type: string
       - in: query
         name: name
         type: string
-      - in: query
-        name: time
-        type: string
-      - in: query
-        name: type
-        type: integer
       produces:
       - application/json
       responses:
@@ -2475,9 +2440,6 @@ paths:
         name: size
         required: true
         type: integer
-      - in: query
-        name: time
-        type: string
       produces:
       - application/json
       responses:
@@ -3373,18 +3335,39 @@ paths:
       summary: ATS测试仿真-修改列车基础信息
       tags:
       - ATS测试仿真Api
-  /api/v1/trainManage/model:
+  /api/v1/trainManage:
     post:
       consumes:
       - application/json
-      description: 创建列车型号数据
+      description: 创建列车数据
       parameters:
+      - in: query
+        name: carriage_length
+        type: integer
+      - in: query
+        name: description
+        type: string
       - in: query
         name: id
         type: integer
+      - in: query
+        name: max_diameter
+        type: integer
+      - in: query
+        name: min_diameter
+        type: integer
       - in: query
         name: name
         type: string
+      - in: query
+        name: total_length
+        type: integer
+      - in: query
+        name: train_model
+        type: integer
+      - in: query
+        name: train_sets
+        type: string
       produces:
       - application/json
       responses:
@@ -3404,16 +3387,16 @@ paths:
             $ref: '#/definitions/dto.ErrorDto'
       security:
       - JwtAuth: []
-      summary: 创建列车型号
+      summary: 创建列车
       tags:
       - 列车管理Api
-  /api/v1/trainManage/model/{id}:
+  /api/v1/trainManage/{id}:
     delete:
       consumes:
       - application/json
-      description: 删除列车型号数据
+      description: 删除列车数据
       parameters:
-      - description: 列车型号ID
+      - description: 列车ID
         in: path
         name: id
         required: true
@@ -3437,15 +3420,15 @@ paths:
             $ref: '#/definitions/dto.ErrorDto'
       security:
       - JwtAuth: []
-      summary: 删除列车型号数据
+      summary: 删除列车数据
       tags:
       - 列车管理Api
     get:
       consumes:
       - application/json
-      description: 查询列车型号详情
+      description: 查询列车详情
       parameters:
-      - description: 列车型号ID
+      - description: 列车ID
         in: path
         name: id
         required: true
@@ -3471,241 +3454,15 @@ paths:
             $ref: '#/definitions/dto.ErrorDto'
       security:
       - JwtAuth: []
-      summary: 查询列车型号详情
+      summary: 查询列车详情
       tags:
       - 列车管理Api
     put:
       consumes:
       - application/json
-      description: 修改列车型号信息
+      description: 修改列车信息
       parameters:
-      - description: 列车型号ID
+      - description: 列车ID
-        in: path
-        name: id
-        required: true
-        type: integer
-      - in: query
-        name: id
-        type: integer
-      - in: query
-        name: name
-        type: string
-      produces:
-      - application/json
-      responses:
-        "200":
-          description: OK
-        "401":
-          description: Unauthorized
-          schema:
-            $ref: '#/definitions/dto.ErrorDto'
-        "404":
-          description: Not Found
-          schema:
-            $ref: '#/definitions/dto.ErrorDto'
-        "500":
-          description: Internal Server Error
-          schema:
-            $ref: '#/definitions/dto.ErrorDto'
-      security:
-      - JwtAuth: []
-      summary: 修改列车型号信息
-      tags:
-      - 列车管理Api
-  /api/v1/trainManage/model/list:
-    get:
-      consumes:
-      - application/json
-      description: 可以通过列车型号名称过滤，查询列车型号信息列表
-      parameters:
-      - in: query
-        name: name
-        type: string
-      produces:
-      - application/json
-      responses:
-        "200":
-          description: OK
-          schema:
-            $ref: '#/definitions/dto.PageDto'
-        "401":
-          description: Unauthorized
-          schema:
-            $ref: '#/definitions/dto.ErrorDto'
-        "404":
-          description: Not Found
-          schema:
-            $ref: '#/definitions/dto.ErrorDto'
-        "500":
-          description: Internal Server Error
-          schema:
-            $ref: '#/definitions/dto.ErrorDto'
-      security:
-      - JwtAuth: []
-      summary: 查询列车型号信息列表
-      tags:
-      - 列车管理Api
-  /api/v1/trainManage/model/paging:
-    get:
-      consumes:
-      - application/json
-      description: 可以通过列车型号名称过滤，分页查询列车型号信息列表
-      parameters:
-      - in: query
-        name: name
-        type: string
-      - description: 页码
-        example: 1
-        in: query
-        name: current
-        required: true
-        type: integer
-      - description: 页面行数
-        example: 10
-        in: query
-        name: size
-        required: true
-        type: integer
-      produces:
-      - application/json
-      responses:
-        "200":
-          description: OK
-          schema:
-            $ref: '#/definitions/dto.PageDto'
-        "401":
-          description: Unauthorized
-          schema:
-            $ref: '#/definitions/dto.ErrorDto'
-        "404":
-          description: Not Found
-          schema:
-            $ref: '#/definitions/dto.ErrorDto'
-        "500":
-          description: Internal Server Error
-          schema:
-            $ref: '#/definitions/dto.ErrorDto'
-      security:
-      - JwtAuth: []
-      summary: 分页查询列车型号信息列表
-      tags:
-      - 列车管理Api
-  /api/v1/trainManage/size:
-    post:
-      consumes:
-      - application/json
-      description: 创建列车尺寸数据
-      parameters:
-      - in: query
-        name: carriage_length
-        type: integer
-      - in: query
-        name: description
-        type: string
-      - in: query
-        name: id
-        type: integer
-      - in: query
-        name: name
-        type: string
-      - in: query
-        name: total_length
-        type: integer
-      produces:
-      - application/json
-      responses:
-        "200":
-          description: OK
-        "401":
-          description: Unauthorized
-          schema:
-            $ref: '#/definitions/dto.ErrorDto'
-        "404":
-          description: Not Found
-          schema:
-            $ref: '#/definitions/dto.ErrorDto'
-        "500":
-          description: Internal Server Error
-          schema:
-            $ref: '#/definitions/dto.ErrorDto'
-      security:
-      - JwtAuth: []
-      summary: 创建列车尺寸
-      tags:
-      - 列车管理Api
-  /api/v1/trainManage/size/{id}:
-    delete:
-      consumes:
-      - application/json
-      description: 删除列车尺寸数据
-      parameters:
-      - description: 列车尺寸ID
-        in: path
-        name: id
-        required: true
-        type: integer
-      produces:
-      - application/json
-      responses:
-        "200":
-          description: OK
-        "401":
-          description: Unauthorized
-          schema:
-            $ref: '#/definitions/dto.ErrorDto'
-        "404":
-          description: Not Found
-          schema:
-            $ref: '#/definitions/dto.ErrorDto'
-        "500":
-          description: Internal Server Error
-          schema:
-            $ref: '#/definitions/dto.ErrorDto'
-      security:
-      - JwtAuth: []
-      summary: 删除列车尺寸数据
-      tags:
-      - 列车管理Api
-    get:
-      consumes:
-      - application/json
-      description: 查询列车尺寸详情
-      parameters:
-      - description: 列车尺寸ID
-        in: path
-        name: id
-        required: true
-        type: integer
-      produces:
-      - application/json
-      responses:
-        "200":
-          description: OK
-          schema:
-            $ref: '#/definitions/model.TrainSize'
-        "401":
-          description: Unauthorized
-          schema:
-            $ref: '#/definitions/dto.ErrorDto'
-        "404":
-          description: Not Found
-          schema:
-            $ref: '#/definitions/dto.ErrorDto'
-        "500":
-          description: Internal Server Error
-          schema:
-            $ref: '#/definitions/dto.ErrorDto'
-      security:
-      - JwtAuth: []
-      summary: 查询列车尺寸详情
-      tags:
-      - 列车管理Api
-    put:
-      consumes:
-      - application/json
-      description: 修改列车尺寸信息
-      parameters:
-      - description: 列车尺寸ID
         in: path
         name: id
         required: true
@@ -3719,12 +3476,24 @@ paths:
       - in: query
         name: id
         type: integer
+      - in: query
+        name: max_diameter
+        type: integer
+      - in: query
+        name: min_diameter
+        type: integer
       - in: query
         name: name
         type: string
       - in: query
         name: total_length
         type: integer
+      - in: query
+        name: train_model
+        type: integer
+      - in: query
+        name: train_sets
+        type: string
       produces:
       - application/json
       responses:
@@ -3744,14 +3513,14 @@ paths:
             $ref: '#/definitions/dto.ErrorDto'
       security:
       - JwtAuth: []
-      summary: 修改列车尺寸信息
+      summary: 修改列车信息
       tags:
       - 列车管理Api
-  /api/v1/trainManage/size/list:
+  /api/v1/trainManage/list:
     get:
       consumes:
       - application/json
-      description: 可以通过列车尺寸名称过滤，查询列车尺寸信息列表
+      description: 可以通过列车名称过滤，查询列车信息列表
       parameters:
       - in: query
         name: name
@@ -3762,7 +3531,7 @@ paths:
         "200":
           description: OK
           schema:
-            $ref: '#/definitions/dto.PageDto'
+            $ref: '#/definitions/model.TrainInfo'
         "401":
           description: Unauthorized
           schema:
@@ -3777,14 +3546,14 @@ paths:
             $ref: '#/definitions/dto.ErrorDto'
       security:
       - JwtAuth: []
-      summary: 查询列车尺寸信息列表
+      summary: 查询列车信息列表
       tags:
       - 列车管理Api
-  /api/v1/trainManage/size/paging:
+  /api/v1/trainManage/paging:
     get:
       consumes:
       - application/json
-      description: 可以通过列车尺寸名称过滤，分页查询列车尺寸信息列表
+      description: 可以通过列车名称过滤，分页查询列车信息列表
       parameters:
       - in: query
         name: name
@@ -3822,236 +3591,7 @@ paths:
             $ref: '#/definitions/dto.ErrorDto'
       security:
       - JwtAuth: []
-      summary: 分页查询列车尺寸信息列表
+      summary: 分页查询列车信息列表
-      tags:
-      - 列车管理Api
-  /api/v1/trainManage/wheelDiameter:
-    post:
-      consumes:
-      - application/json
-      description: 创建列车轮径数据
-      parameters:
-      - in: query
-        name: id
-        type: integer
-      - in: query
-        name: max_diameter
-        type: integer
-      - in: query
-        name: min_diameter
-        type: integer
-      - in: query
-        name: name
-        type: string
-      produces:
-      - application/json
-      responses:
-        "200":
-          description: OK
-        "401":
-          description: Unauthorized
-          schema:
-            $ref: '#/definitions/dto.ErrorDto'
-        "404":
-          description: Not Found
-          schema:
-            $ref: '#/definitions/dto.ErrorDto'
-        "500":
-          description: Internal Server Error
-          schema:
-            $ref: '#/definitions/dto.ErrorDto'
-      security:
-      - JwtAuth: []
-      summary: 创建列车轮径
-      tags:
-      - 列车管理Api
-  /api/v1/trainManage/wheelDiameter/{id}:
-    delete:
-      consumes:
-      - application/json
-      description: 删除列车轮径数据
-      parameters:
-      - description: 列车轮径ID
-        in: path
-        name: id
-        required: true
-        type: integer
-      produces:
-      - application/json
-      responses:
-        "200":
-          description: OK
-        "401":
-          description: Unauthorized
-          schema:
-            $ref: '#/definitions/dto.ErrorDto'
-        "404":
-          description: Not Found
-          schema:
-            $ref: '#/definitions/dto.ErrorDto'
-        "500":
-          description: Internal Server Error
-          schema:
-            $ref: '#/definitions/dto.ErrorDto'
-      security:
-      - JwtAuth: []
-      summary: 删除列车轮径数据
-      tags:
-      - 列车管理Api
-    get:
-      consumes:
-      - application/json
-      description: 查询列车轮径详情
-      parameters:
-      - description: 列车轮径ID
-        in: path
-        name: id
-        required: true
-        type: integer
-      produces:
-      - application/json
-      responses:
-        "200":
-          description: OK
-          schema:
-            $ref: '#/definitions/model.TrainWheel'
-        "401":
-          description: Unauthorized
-          schema:
-            $ref: '#/definitions/dto.ErrorDto'
-        "404":
-          description: Not Found
-          schema:
-            $ref: '#/definitions/dto.ErrorDto'
-        "500":
-          description: Internal Server Error
-          schema:
-            $ref: '#/definitions/dto.ErrorDto'
-      security:
-      - JwtAuth: []
-      summary: 查询列车轮径详情
-      tags:
-      - 列车管理Api
-    put:
-      consumes:
-      - application/json
-      description: 修改列车轮径信息
-      parameters:
-      - description: 列车轮径ID
-        in: path
-        name: id
-        required: true
-        type: integer
-      - in: query
-        name: id
-        type: integer
-      - in: query
-        name: max_diameter
-        type: integer
-      - in: query
-        name: min_diameter
-        type: integer
-      - in: query
-        name: name
-        type: string
-      produces:
-      - application/json
-      responses:
-        "200":
-          description: OK
-        "401":
-          description: Unauthorized
-          schema:
-            $ref: '#/definitions/dto.ErrorDto'
-        "404":
-          description: Not Found
-          schema:
-            $ref: '#/definitions/dto.ErrorDto'
-        "500":
-          description: Internal Server Error
-          schema:
-            $ref: '#/definitions/dto.ErrorDto'
-      security:
-      - JwtAuth: []
-      summary: 修改列车轮径信息
-      tags:
-      - 列车管理Api
-  /api/v1/trainManage/wheelDiameter/list:
-    get:
-      consumes:
-      - application/json
-      description: 可以通过列车轮径名称过滤，查询列车轮径信息列表
-      parameters:
-      - in: query
-        name: name
-        type: string
-      produces:
-      - application/json
-      responses:
-        "200":
-          description: OK
-          schema:
-            $ref: '#/definitions/dto.PageDto'
-        "401":
-          description: Unauthorized
-          schema:
-            $ref: '#/definitions/dto.ErrorDto'
-        "404":
-          description: Not Found
-          schema:
-            $ref: '#/definitions/dto.ErrorDto'
-        "500":
-          description: Internal Server Error
-          schema:
-            $ref: '#/definitions/dto.ErrorDto'
-      security:
-      - JwtAuth: []
-      summary: 查询列车轮径信息列表
-      tags:
-      - 列车管理Api
-  /api/v1/trainManage/wheelDiameter/paging:
-    get:
-      consumes:
-      - application/json
-      description: 可以通过列车轮径名称过滤，分页查询列车轮径信息列表
-      parameters:
-      - in: query
-        name: name
-        type: string
-      - description: 页码
-        example: 1
-        in: query
-        name: current
-        required: true
-        type: integer
-      - description: 页面行数
-        example: 10
-        in: query
-        name: size
-        required: true
-        type: integer
-      produces:
-      - application/json
-      responses:
-        "200":
-          description: OK
-          schema:
-            $ref: '#/definitions/dto.PageDto'
-        "401":
-          description: Unauthorized
-          schema:
-            $ref: '#/definitions/dto.ErrorDto'
-        "404":
-          description: Not Found
-          schema:
-            $ref: '#/definitions/dto.ErrorDto'
-        "500":
-          description: Internal Server Error
-          schema:
-            $ref: '#/definitions/dto.ErrorDto'
-      security:
-      - JwtAuth: []
-      summary: 分页查询列车轮径信息列表
       tags:
       - 列车管理Api
   /api/v1/user/current:

ts/simulation/wayside/memory/wayside_memory_map_init.go

@@ -13,7 +13,6 @@ var giUidMap sync.Map
 
 type elementIdStructure struct {
 	CommonId string
-	Index    int32
 	Code     string
 	Uid      string
 }
@@ -88,7 +87,6 @@ func initStationUid(data *graphicData.RtssGraphicStorage) *StationUidStructure {
 	for _, a := range data.AxleCountings {
 		gus.AxlePointIds[a.Common.Id] = &elementIdStructure{
 			CommonId: a.Common.Id,
-			Index:    a.Index,
 			Uid:      GenerateElementUid(city, lineId, a.CentralizedStations, a.Code),
 		}
 	}
@@ -96,7 +94,6 @@ func initStationUid(data *graphicData.RtssGraphicStorage) *StationUidStructure {
 	for _, t := range data.Turnouts {
 		gus.TurnoutIds[t.Common.Id] = &elementIdStructure{
 			CommonId: t.Common.Id,
-			Index:    t.Index,
 			Uid:      GenerateElementUid(city, lineId, t.CentralizedStations, t.Code),
 		}
 	}
@@ -104,7 +101,6 @@ func initStationUid(data *graphicData.RtssGraphicStorage) *StationUidStructure {
 	for _, s := range data.Section {
 		gus.PhysicalSectionIds[s.Common.Id] = &elementIdStructure{
 			CommonId: s.Common.Id,
-			Index:    s.Index,
 			Uid:      GenerateElementUid(city, lineId, s.CentralizedStations, s.Code),
 		}
 	}
@@ -112,7 +108,6 @@ func initStationUid(data *graphicData.RtssGraphicStorage) *StationUidStructure {
 	for _, s := range data.Signals {
 		gus.SignalIds[s.Common.Id] = &elementIdStructure{
 			CommonId: s.Common.Id,
-			Index:    s.Index,
 			Uid:      GenerateElementUid(city, lineId, s.CentralizedStations, s.Code),
 		}
 	}
@@ -120,7 +115,6 @@ func initStationUid(data *graphicData.RtssGraphicStorage) *StationUidStructure {
 	for _, t := range data.Transponders {
 		gus.TransponderIds[t.Common.Id] = &elementIdStructure{
 			CommonId: t.Common.Id,
-			Index:    t.Index,
 			Uid:      GenerateElementUid(city, lineId, t.CentralizedStations, t.Code),
 		}
 	}