commit

src/package/handler/start_project.go

@@ -137,7 +137,7 @@ func StartProject(c *gin.Context) {
 		c.JSON(http.StatusOK, entity.HttpResult{Status: false, Code: "400", Message: "请求参数格式错误。"})
 		return
 	}
-	if !checkEquipmentType(projectStartParam.EquipmentType) {
+	if !checkEquipmentType(projectStartParam.EquipmentType, *projectStartParam) {
 		c.JSON(http.StatusOK, entity.HttpResult{Status: true, Code: "400", Message: "设备类型错误。"})
 	}
 	// ------------ 维护一个运行任务队列，绑定用户id和节点名称，供下面两个判断同时使用（使用redis的队列）
@@ -171,7 +171,7 @@ func StartProject(c *gin.Context) {
 	c.JSON(http.StatusOK, entity.HttpResult{Status: true, Code: "2000", Message: "项目启动请求已被成功接收，等待调度处理。"})
 }
 
-func checkEquipmentType(equipmentType string) bool {
+func checkEquipmentType(equipmentType string, project entity.Project) bool {
 	/*
 		JIN_LONG_BA_SHI // "金龙中巴"
 		    PEI_SONG_JI_QI_REN // "智能配送机器人",
@@ -181,17 +181,17 @@ func checkEquipmentType(equipmentType string) bool {
 		    AN_FANG_JI_QI_REN // " "安防巡检机器人";
 	*/
 	if equipmentType == "JIN_LONG_BA_SHI" {
-		infra.GlobalLogger.Infof("接收到【金龙中巴】的仿真测试项目。")
+		infra.GlobalLogger.Infof("接收到【金龙中巴】的仿真测试项目：%v", project)
 	} else if equipmentType == "PEI_SONG_JI_QI_REN" {
-		infra.GlobalLogger.Infof("接收到【智能配送机器人】的仿真测试项目。")
+		infra.GlobalLogger.Infof("接收到【智能配送机器人】的仿真测试项目：%v", project)
 	} else if equipmentType == "SAO_DI_JI_QI_REN" {
-		infra.GlobalLogger.Infof("接收到【室内清洁机器人】的仿真测试项目。")
+		infra.GlobalLogger.Infof("接收到【室内清洁机器人】的仿真测试项目：%v", project)
 	} else if equipmentType == "YI_DAO_JI_QI_REN" {
-		infra.GlobalLogger.Infof("接收到【引导服务机器人】的仿真测试项目。")
+		infra.GlobalLogger.Infof("接收到【引导服务机器人】的仿真测试项目：%v", project)
 	} else if equipmentType == "PU_JIN_DUO_GONG_NENG_CHE" {
-		infra.GlobalLogger.Infof("接收到【朴津多功能车】的仿真测试项目。")
+		infra.GlobalLogger.Infof("接收到【朴津多功能车】的仿真测试项目：%v", project)
 	} else if equipmentType == "AN_FANG_JI_QI_REN" {
-		infra.GlobalLogger.Infof("接收到【安防巡检机器人】的仿真测试项目。")
+		infra.GlobalLogger.Infof("接收到【安防巡检机器人】的仿真测试项目：%v", project)
 	} else {
 		infra.GlobalLogger.Infof("接收到未知的设备类型【%v】", equipmentType)
 		return false