mlx

simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/consumer/ManualProjectConsumer.java

@@ -62,20 +62,21 @@ public class ManualProjectConsumer {
     @Value("${scheduler.linux-temp-path}")
     String linuxTempPath;
 
-//
-//    @KafkaListener(groupId = "simulation-resource-scheduler", topics = "${scheduler.manual-project.topic}")
-//    public void testConsumer(ConsumerRecord<String, String> projectRecord) {
-//        System.out.println("------- 消费成功：" + projectRecord.value());
-//    }
+
+    @KafkaListener(groupId = "simulation-resource-scheduler", topics = "hello")
+    public void testConsumer(ConsumerRecord<String, String> projectRecord) {
+        System.out.println("------- 消费成功：" + projectRecord.value());
+    }
 
     @KafkaListener(groupId = "simulation-resource-scheduler", topics = "${scheduler.manual-project.topic}")
     public void parseProject(ConsumerRecord<String, String> projectRecord) throws IOException, ApiException {
+        System.out.println("------- 接收到消息为：" + projectRecord);
         //1 读取 kafka 的 project 信息
         /*
             {
                 "projectId": "sadfasdfs",	// 项目 id
                 "algorithmId": "sadfasdfs",	// 算法 id
-                "vehicleId": "sadfasdfs",	// 车辆 id
+                "vehicleConfigId": "sadfasdfs",	// 车辆 id
                 "scenePackageId": "sadfasdfs",	// 场景包 id
                 "maxSimulationTime": 11111,	// 最大仿真时间
                 "parallelism": 30		// 并行度

simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/mapper/ProjectMapper.java

@@ -20,13 +20,13 @@ public interface ProjectMapper {
     ProjectPO selectById(@Param("taskId")String taskId);
 
     @Update("update simulation_manual_project\n" +
-            "set state = #{state}\n" +
+            "set now_run_state = #{state}\n" +
             "where id = #{id}")
     void updateProjectState(@Param("id") String id, @Param("state") String state);
 
 
     @Update("update simulation_manual_project\n" +
-            "set task_number = {taskNumber}\n" +
+            "set task_number = #{taskNumber}\n" +
             "where id = #{id}")
     void updateTaskNumber(@Param("id") String id, @Param("taskNumber") int taskNumber);
 

simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/mapper/VehicleMapper.java

@@ -50,7 +50,7 @@ public interface VehicleMapper {
             "  and id = (\n" +
             "    select mc.vehicle_id\n" +
             "    from model_config mc\n" +
-            "    where mcv.id = #{vehicleConfigId}\n" +
+            "    where mc.id = #{vehicleConfigId}\n" +
             ")")
     VehiclePO selectByVehicleConfigId(@Param("vehicleConfigId") String vehicleConfigId);
 }

simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/service/TaskService.java

@@ -35,29 +35,29 @@ public class TaskService {
     private final String USER_ID = "simulation-resource-scheduler";
 
     @Autowired
-    private CommonService commonService;
+    CommonService commonService;
     @Autowired
-    private ProjectMapper projectMapper;
+    ProjectMapper projectMapper;
     @Autowired
-    private TaskManager taskManager;
+    TaskManager taskManager;
     @Autowired
-    private TaskMapper taskMapper;
+    TaskMapper taskMapper;
     @Autowired
-    private TaskIndexManager taskIndexManager;
+    TaskIndexManager taskIndexManager;
     @Autowired
-    private TaskIndexMapper taskIndexMapper;
+    TaskIndexMapper taskIndexMapper;
     @Autowired
-    private IndexTemplateMapper indexTemplateMapper;
+    IndexTemplateMapper indexTemplateMapper;
     @Value("${scheduler.manual-project.topic}")
-    private String manualProjectTopic;
+    String manualProjectTopic;
     @Value("${scheduler.score.hostname}")
-    static String hostname;
+    String hostname;
     @Value("${scheduler.score.username}")
-    static String username;
+    String username;
     @Value("${scheduler.score.password}")
-    static String password;
+    String password;
     @Value("${scheduler.score.py-path}")
-    static String pyPath;
+    String pyPath;
     @Value("${scheduler.linux-temp-path}")
     String linuxTempPath;
 

simulation-resource-scheduler/src/test/java/com/css/simulation/resource/scheduler/SchedulerTest.java

@@ -3,12 +3,11 @@ package com.css.simulation.resource.scheduler;
 
 import org.junit.Test;
 
-import java.io.IOException;
 
 public class SchedulerTest {
 
     @Test
-    public void test() throws IOException {
+    public void test() {
 
     }