root 2 lat temu
rodzic
commit
80a9baf3c7

+ 16 - 0
simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/pojo/to/PartitionTO.java

@@ -0,0 +1,16 @@
+package com.css.simulation.resource.scheduler.pojo.to;
+
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@Builder
+public class PartitionTO {
+    Integer partition;
+    Integer offset;
+}

+ 2 - 1
simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/service/ProjectService.java

@@ -231,7 +231,7 @@ public class ProjectService {
                     String osgbPathOfLinux = linuxTempPath + "video/" + projectId + "/" + taskId + "/" + osgbName;
                     String osgbPathOfMinio = projectResultPathOfMinio + projectId + "/" + taskId + "/" + taskId+".osgb";
                     MinioUtil.downloadToFile(minioClient, bucketName, scenarioOdr, xodrPathOfLinux);
-                    MinioUtil.downloadToFile(minioClient, bucketName, scenarioOdr, osgbPathOfLinux);
+                    MinioUtil.downloadToFile(minioClient, bucketName, scenarioOsgb, osgbPathOfLinux);
                     MinioUtil.uploadFromFile(minioClient, xodrPathOfLinux, bucketName, xodrPathOfMinio);
                     MinioUtil.uploadFromFile(minioClient, osgbPathOfLinux, bucketName, osgbPathOfMinio);
                     log.info("ProjectService--sendTaskMessage 已经将 xodr 上传到 minio 的结果文件目录:" + xodrPathOfMinio);
@@ -295,6 +295,7 @@ public class ProjectService {
                 //4-5 将 projectId 作为 topic 名称,根据 parallelism 分散发送 task 信息到 kafka
                 String finalTaskJson = taskJson;
                 stringRedisTemplate.opsForValue().set(taskMessagePrefix, finalTaskJson);
+                List<PartitionTO> partitionDTOList = new ArrayList<>();
                 kafkaTemplate.send(projectId, messageNumber[0] % parallelism, "", taskJson).addCallback(success -> {
                     // 消息发送到的topic
                     String topic = success.getRecordMetadata().topic();