git

simulation-resource-server/src/main/java/com/css/simulation/resource/server/app/impl/MultiSimulationProjectServiceImpl.java

@@ -34,6 +34,7 @@ import com.github.pagehelper.PageInfo;
 import feign.Response;
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.http.client.utils.DateUtils;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.kafka.core.KafkaTemplate;
 import org.springframework.stereotype.Service;
@@ -49,6 +50,7 @@ import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
 import java.net.URLEncoder;
+import java.sql.Timestamp;
 import java.util.*;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipOutputStream;
@@ -361,12 +363,12 @@ public class MultiSimulationProjectServiceImpl implements MultiSimulationProject
         MultiSimulationProjectVO projectVO = multiSimulationProjectMapper.selectMultiSimulationProjectById(projectId);
         Integer status = projectVO.getProjectStatus();
         boolean isNeedStatus = status == MultiSimulationStatusEnum.INIT_STATUS.getProjectStatus() ? false : true;
-        Map<String, Integer> sceneIdStatusMap = new HashMap<>();
+        Map<String, MultiSimulationProjectTaskRecordPO> sceneIdStatusMap = new HashMap<>();
         if (isNeedStatus){
             List<MultiSimulationProjectTaskRecordPO> recordPOList = taskRecordMapper.selectMultiSimulationProjectTaskRecordList(projectId);
             if (!CollectionUtils.isEmpty(recordPOList)){
                 for (MultiSimulationProjectTaskRecordPO taskRecord: recordPOList) {
-                    sceneIdStatusMap.put(taskRecord.getSceneId(), taskRecord.getStatus());
+                    sceneIdStatusMap.put(taskRecord.getSceneId(), taskRecord);
                 }
             }
         }
@@ -393,8 +395,13 @@ public class MultiSimulationProjectServiceImpl implements MultiSimulationProject
                     continue;
                 }
                 scene.setMapName(simulationMapVO.getMapName());
-                if (isNeedStatus){
-                    scene.setTaskStatus(sceneIdStatusMap.get(sceneId));
+                MultiSimulationProjectTaskRecordPO taskRecordPO = sceneIdStatusMap.get(sceneId);
+                if (isNeedStatus && taskRecordPO != null){
+                    scene.setTaskStatus(taskRecordPO.getStatus());
+                    scene.setStartTime(taskRecordPO.getStartTime());
+                    scene.setEndTime(taskRecordPO.getEndTime());
+                    scene.setStartTimeStr(TimeUtil.dateToString(new Date(taskRecordPO.getStartTime())));
+                    scene.setEndTimeStr(TimeUtil.dateToString(new Date(taskRecordPO.getEndTime())));
                 }
             }
         }

simulation-resource-server/src/main/java/com/css/simulation/resource/server/infra/db/mysql/mapper/MultiSimulationProjectTaskRecordMapper.java

@@ -8,7 +8,7 @@ import java.util.List;
 @Mapper
 public interface MultiSimulationProjectTaskRecordMapper {
 
-    @Select("select id,project_id,scene_id,status,task_body from multi_simulation_project_task_record where project_id = #{projectId} and deleted = 0")
+    @Select("select id,project_id,scene_id,status,task_body,start_time,end_time from multi_simulation_project_task_record where project_id = #{projectId} and deleted = 0")
     List<MultiSimulationProjectTaskRecordPO> selectMultiSimulationProjectTaskRecordList(@Param("projectId") String projectId);
 
 }