Merge remote-tracking branch 'origin/master'

# Conflicts:
#	simulation-resource-server/src/main/java/com/css/simulation/resource/server/application/service/job_manage/JobManageApplicationService.java

api-common/src/main/java/api/common/pojo/vo/project/SceneScListVo.java

@@ -1,11 +1,14 @@
 package api.common.pojo.vo.project;
 
 
-import lombok.Getter;
-import lombok.Setter;
+import lombok.*;
 
-@Getter
-@Setter
+import javax.validation.constraints.NegativeOrZero;
+
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
 public class SceneScListVo {
 
     private String sublistName1;
@@ -19,9 +22,9 @@ public class SceneScListVo {
     private String sceneScore;
     private String targetEvaluate;
     private String scoreExplain;
-    //运行状态
-    private String runState;
+    private String runState; //运行状态
     private String eachMaxIndex;
-
+    private String timeActual; // 完成时间
+    private String timeCorrection; // 修正时间
 
 }

simulation-resource-server/src/main/java/com/css/simulation/resource/server/api/controller/job_manage/AlgorithmPlatformResultController.java

@@ -62,8 +62,11 @@ public class AlgorithmPlatformResultController {
         }
         String algorithmId = projectParam.getAlgorithmId();
         ProjectReportVO projectReportVO = jobManageApplicationService.getLastProjectReportByAlgorithmId(algorithmId);
-
-        return new ResponseBodyVO<>(ResponseBodyVO.Response.SUCCESS, projectReportVO);
+        if (projectReportVO == null) {
+            return new ResponseBodyVO<>(ResponseBodyVO.Response.SERVER_FAILURE, "该算法还未执行过项目。", null);
+        } else {
+            return new ResponseBodyVO<>(ResponseBodyVO.Response.SUCCESS, projectReportVO);
+        }
     }
 
 }

simulation-resource-server/src/main/java/com/css/simulation/resource/server/application/impl/SimulationProjectServiceImpl.java

@@ -2131,7 +2131,7 @@ public class SimulationProjectServiceImpl implements SimulationProjectService {
             if (isEmpty(targetEvaluate) || isEmpty(sp.getScoreExplain())) {
                 sublistName += ProjectConstants.SEPARATOR + sp.getReturnSceneId() + ProjectConstants.SEPARATOR + sp.getSceneType() + ProjectConstants.SEPARATOR + "--" + ProjectConstants.SEPARATOR + "--" + ProjectConstants.SEPARATOR + "--";
             } else {
-                sublistName += ProjectConstants.SEPARATOR + sp.getReturnSceneId() + ProjectConstants.SEPARATOR + sp.getSceneType() + ProjectConstants.SEPARATOR + sceneScore + ProjectConstants.SEPARATOR + targetEvaluate + ProjectConstants.SEPARATOR + sp.getScoreExplain();
+                sublistName += ProjectConstants.SEPARATOR + sp.getReturnSceneId() + ProjectConstants.SEPARATOR + sp.getSceneType() + ProjectConstants.SEPARATOR + sceneScore + ProjectConstants.SEPARATOR + targetEvaluate + ProjectConstants.SEPARATOR + sp.getScoreExplain()+ ProjectConstants.SEPARATOR + sp.getTimeActual()+ ProjectConstants.SEPARATOR + sp.getTimeCorrection();
             }
             String[] split = sublistName.split(ProjectConstants.SEPARATOR);
             List<String> strings = new LinkedList<>(Arrays.asList(split));
@@ -2191,6 +2191,8 @@ public class SimulationProjectServiceImpl implements SimulationProjectService {
             sceneScListVo.setSceneScore(list.get(start + 2));
             sceneScListVo.setTargetEvaluate(list.get(start + 3));
             sceneScListVo.setScoreExplain(list.get(start + 4));
+            sceneScListVo.setTimeActual(list.get(start + 5));
+            sceneScListVo.setTimeCorrection(list.get(start + 6));
             sceneScListVo.setRunState(runStateList.get(r));
             objects.add(sceneScListVo);
             r++;

simulation-resource-server/src/main/java/com/css/simulation/resource/server/application/service/job_manage/JobManageApplicationService.java

@@ -4,11 +4,13 @@ import api.common.pojo.param.project.SimulationManualProjectParam;
 import api.common.pojo.vo.project.ProjectReportVO;
 import api.common.util.StringUtil;
 import com.css.simulation.resource.server.domain.service.ProjectDomainService;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
 import java.util.List;
 
+@Slf4j
 @Service
 public class JobManageApplicationService {
 
@@ -19,6 +21,7 @@ public class JobManageApplicationService {
         //1 获取最新的项目ID
         String projectId = projectDomainService.getLastProjectIdByAlgorithmId(algorithmId);
         if (StringUtil.isEmpty(projectId)) {
+            log.warn("算法 "+ algorithmId+"还未执行过项目。");
             return null;
         }
         String projectType = projectDomainService.getProjectTypeByProjectId(projectId);