mlx

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

@@ -68,9 +68,11 @@ public class ManualProjectConsumer {
         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);
+//    @KafkaListener(groupId = "simulation-resource-scheduler", topics = "${scheduler.manual-project.topic}")
+//    public void parseProject(ConsumerRecord<String, String> projectRecord) throws IOException, ApiException {
+    public void parseProject(String projectJson) throws IOException, ApiException {
+//        System.out.println("------- 接收到消息为：" + projectRecord);
+        System.out.println("------- 接收到消息为：" + projectJson);
         //1 读取 kafka 的 project 信息
         /*
             {
@@ -82,10 +84,10 @@ public class ManualProjectConsumer {
                 "parallelism": 30		// 并行度
             }
          */
-        String projectJson = projectRecord.value();
+//        String projectJson = projectRecord.value();
         ProjectMessageDTO projectMessageDTO = JsonUtil.jsonToBean(projectJson, ProjectMessageDTO.class);
         String projectId = projectMessageDTO.getProjectId();    // 项目 id
-        projectMapper.updateProjectState(projectId, "2");   // 修改该 project 的状态为执行中
+        projectMapper.updateProjectState(projectId, "20");   // 修改该 project 的状态为执行中
 
 
         // -------------------------------- 1 场景 --------------------------------

simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/controller/TestConsumerController.java

@@ -0,0 +1,27 @@
+package com.css.simulation.resource.scheduler.controller;
+
+import api.common.pojo.dto.ProjectMessageDTO;
+import api.common.util.JsonUtil;
+import com.css.simulation.resource.scheduler.consumer.ManualProjectConsumer;
+import io.kubernetes.client.openapi.ApiException;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.io.IOException;
+
+@RequestMapping("/test")
+@RestController
+public class TestConsumerController {
+
+    @Autowired
+    ManualProjectConsumer manualProjectConsumer;
+
+    @PostMapping("/consumer")
+    public void hello(@RequestBody ProjectMessageDTO projectMessageDTO) throws IOException, ApiException {
+
+        manualProjectConsumer.parseProject(JsonUtil.beanToJson(projectMessageDTO));
+    }
+}

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

@@ -15,7 +15,7 @@ public interface SensorCameraMapper {
             @Result(column = "fov_v", property = "sensor_fovV", jdbcType = JdbcType.DECIMAL),
             @Result(column = "near_distance", property = "sensor_near", jdbcType = JdbcType.DECIMAL),
             @Result(column = "far_distance", property = "sensor_far", jdbcType = JdbcType.DECIMAL),
-            @Result(column = "resolution", property = "sensor_resolution", jdbcType = JdbcType.DECIMAL),
+            @Result(column = "resolution", property = "sensor_resolution", jdbcType = JdbcType.VARCHAR),
             @Result(column = "frame_rate", property = "sensor_frameRate", jdbcType = JdbcType.DECIMAL),
             @Result(column = "sensor_x", property = "sensor_x", jdbcType = JdbcType.DECIMAL),
             @Result(column = "sensor_y", property = "sensor_y", jdbcType = JdbcType.DECIMAL),

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

@@ -47,5 +47,5 @@ public interface SensorOgtMapper {
             "from model_sensor_ogt mso left join relation_config_sensor rcs on mso.id = rcs.sensor_id\n" +
             "where mso.is_deleted = '0' and rcs.is_deleted = '0'\n" +
             "   and rcs.config_id = #{vehicleConfigId}")
-    List<OgtPO> selectOgtByVehicleId(@Param("vehicleId") String vehicleId);
+    List<OgtPO> selectOgtByVehicleId(@Param("vehicleConfigId") String vehicleConfigId);
 }

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

@@ -4,7 +4,6 @@ package com.css.simulation.resource.scheduler.mapper;
 import com.css.simulation.resource.scheduler.pojo.po.TaskPO;
 import org.apache.ibatis.annotations.*;
 import org.apache.ibatis.type.JdbcType;
-import org.springframework.web.bind.annotation.RequestParam;
 
 import java.util.List;
 
@@ -48,8 +47,8 @@ public interface TaskMapper {
             "                                           run_state, run_result, create_time, create_user_id, modify_time,\n" +
             "                                           modify_user_id, is_deleted)\n" +
             "values (#{task.id},#{task.pId},#{task.sceneId},#{task.sceneName},#{task.sceneType},#{task.runState},\n" +
-            "#{task.runResult},#{task.createTime},#{task.createUserId},#{task.modifyTime},#{modifyUserId},#{task.isDeleted})")
-    void insert(@RequestParam("task") TaskPO task);
+            "#{task.runResult},#{task.createTime},#{task.createUserId},#{task.modifyTime},#{task.modifyUserId},#{task.isDeleted})")
+    void insert(@Param("task") TaskPO task);
 
     @Select("select run_state\n" +
             "from simulation_manual_project_task\n" +

simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/pojo/po/CameraPO.java

@@ -31,7 +31,7 @@ public class CameraPO {
     private BigDecimal sensor_fovV;
     private BigDecimal sensor_near;
     private BigDecimal sensor_far;
-    private BigDecimal sensor_resolution;
+    private String sensor_resolution;
     private BigDecimal sensor_frameRate;
     private BigDecimal sensor_x;
     private BigDecimal sensor_y;