孟令鑫 1 年之前
父节点
当前提交
554ccd3a81

+ 9 - 0
amd64/kubernetes-scheduler/package/entity/project.go

@@ -0,0 +1,9 @@
+package entity
+
+type Project struct {
+	ProjectId          string `json:"projectId"`
+	AlgorithmObjectKey string `json:"algorithmObjectKey"`
+	UserId             string `json:"userId"`
+	Parallelism        int    `json:"parallelism"`
+	Tasks              []Task `json:"tasks"`
+}

+ 4 - 4
amd64/kubernetes-scheduler/package/entity/sensor.go

@@ -37,8 +37,8 @@ type SensorOgt struct {
 	SensorForHRight  float64 `json:"sensor_fovHRight"`  // 水平现场角右
 	SensorForHTop    float64 `json:"sensor_fovVTop"`    // 垂直现场角顶
 	SensorForHBottom float64 `json:"sensor_fovVBottom"` // 垂直现场角底
-	SensorFilter     float64 `json:"sensor_filter"`     // 目标物筛选
-	SensorDisplay    float64 `json:"sensor_display"`    // 显示探测锥
-	SensorMaxObjects float64 `json:"sensor_maxObjects"` // 最大目标物个数
-	SensorPort       float64 `json:"sensor_port"`       // 端口
+	SensorFilter     string  `json:"sensor_filter"`     // 目标物筛选序列(0,1,2)
+	SensorDisplay    bool    `json:"sensor_display"`    // 显示目标物
+	SensorMaxObjects int     `json:"sensor_maxObjects"` // 最大目标物个数
+	SensorPort       int     `json:"sensor_port"`       // 端口
 }

+ 26 - 0
amd64/kubernetes-scheduler/package/entity/task.go

@@ -0,0 +1,26 @@
+package entity
+
+type Task struct {
+	Info     TaskInfo     `json:"info"`
+	Scenario TaskScenario `json:"scenario"`
+	Vehicle  TaskVehicle  `json:"vehicle"`
+}
+
+type TaskInfo struct {
+	ProjectId   string `json:"project_id"`
+	TaskId      string `json:"task_id"`
+	TaskPath    string `json:"task_path"`
+	DefaultTime string `json:"default_time"`
+}
+
+type TaskScenario struct {
+	ScenarioOsc  string `json:"scenario_osc"`
+	ScenarioOdr  string `json:"scenario_odr"`
+	ScenarioOsgb string `json:"scenario_osgb"`
+}
+
+type TaskVehicle struct {
+	Model    VehicleModel    `json:"model"`
+	Dynamics VehicleDynamics `json:"dynamics"`
+	Sensors  VehicleSensors  `json:"sensors"`
+}

+ 31 - 0
amd64/kubernetes-scheduler/package/entity/vehicle.go

@@ -0,0 +1,31 @@
+package entity
+
+type VehicleModel struct {
+	ModelLabel string `json:"model_label"`
+}
+
+// VehicleDynamics 动力学配置
+type VehicleDynamics struct {
+	DynamicsMaxspeed              float64 `json:"dynamics_maxspeed"`
+	DynamicsEnginepower           float64 `json:"dynamics_enginepower"`
+	DynamicsMaxdecel              float64 `json:"dynamics_maxdecel"`
+	DynamicsMaxsteering           float64 `json:"dynamics_maxsteering"`
+	DynamicsMass                  float64 `json:"dynamics_mass"`
+	DynamicsFrontsurfaceeffective float64 `json:"dynamics_frontsurfaceeffective"`
+	DynamicsAirdragcoefficient    float64 `json:"dynamics_airdragcoefficient"`
+	DynamicsRollingresistance     float64 `json:"dynamics_rollingresistance"`
+	DynamicsWheeldiameter         float64 `json:"dynamics_wheeldiameter"`
+	DynamicsWheeldrive            string  `json:"dynamics_wheeldrive"`
+	DynamicsOverallefficiency     float64 `json:"dynamics_overallefficiency"`
+	DynamicsDistfront             float64 `json:"dynamics_distfront"`
+	DynamicsDistrear              float64 `json:"dynamics_distrear"`
+	DynamicsDistleft              float64 `json:"dynamics_distleft"`
+	DynamicsDistright             float64 `json:"dynamics_distright"`
+	DynamicsDistheight            float64 `json:"dynamics_distheight"`
+	DynamicsWheelbase             float64 `json:"dynamics_wheelbase"`
+}
+
+type VehicleSensors struct {
+	camera []SensorCamera
+	OGT    []SensorOgt
+}

+ 0 - 2
amd64/kubernetes-scheduler/package/handler/start_project.go

@@ -117,8 +117,6 @@ import (
  */
 
 type StartProjectParam struct {
-	ProjectId          int `json:"projectId"`
-	AlgorithmObjectKey int `json:"algorithmObjectKey"`
 }
 
 func StartProject(c *gin.Context) {

+ 81 - 0
test/main/main.go

@@ -0,0 +1,81 @@
+package main
+
+import (
+	"cicv-data-closedloop/amd64/kubernetes-scheduler/package/entity"
+	"encoding/json"
+	"fmt"
+)
+
+func main() {
+
+	jsonData, _ := json.Marshal(
+		&entity.Project{
+			ProjectId:          "项目ID",
+			AlgorithmObjectKey: "算法在阿里云的存储路径",
+			UserId:             "用户ID",
+			Parallelism:        10,
+			Tasks: []entity.Task{
+				{
+					Info: entity.TaskInfo{
+						ProjectId:   "项目ID",
+						TaskId:      "任务ID",
+						TaskPath:    "任务结果路径",
+						DefaultTime: "最大仿真时间",
+					},
+					Scenario: entity.TaskScenario{
+						ScenarioOsc:  "xosc或xml路径",
+						ScenarioOdr:  "xodr路径",
+						ScenarioOsgb: "osgb路径",
+					},
+					Vehicle: entity.TaskVehicle{
+						Model: entity.VehicleModel{ModelLabel: "模型标签"},
+						Dynamics: entity.VehicleDynamics{
+							DynamicsMaxspeed:              0,
+							DynamicsEnginepower:           0,
+							DynamicsMaxdecel:              0,
+							DynamicsMaxsteering:           0,
+							DynamicsMass:                  0,
+							DynamicsFrontsurfaceeffective: 0,
+							DynamicsAirdragcoefficient:    0,
+							DynamicsRollingresistance:     0,
+							DynamicsWheeldiameter:         0,
+							DynamicsWheeldrive:            "",
+							DynamicsOverallefficiency:     0,
+							DynamicsDistfront:             0,
+							DynamicsDistrear:              0,
+							DynamicsDistleft:              0,
+							DynamicsDistright:             0,
+							DynamicsDistheight:            0,
+							DynamicsWheelbase:             0,
+						},
+						Sensors: entity.VehicleSensors{OGT: []entity.SensorOgt{
+							{
+								Sensor:           entity.Sensor{},
+								SensorForHLeft:   0,
+								SensorForHRight:  0,
+								SensorForHTop:    0,
+								SensorForHBottom: 0,
+								SensorFilter:     "",
+								SensorDisplay:    false,
+								SensorMaxObjects: 0,
+								SensorPort:       0,
+							}, {
+								Sensor:           entity.Sensor{},
+								SensorForHLeft:   0,
+								SensorForHRight:  0,
+								SensorForHTop:    0,
+								SensorForHBottom: 0,
+								SensorFilter:     "",
+								SensorDisplay:    false,
+								SensorMaxObjects: 0,
+								SensorPort:       0,
+							},
+						},
+						},
+					},
+				},
+			},
+		},
+	)
+	fmt.Println(string(jsonData))
+}