王耀栋--自动运行添加最大仿真时间参数，任务得分未完成信息显示--

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

@@ -30,4 +30,6 @@ public class AutomaticProjectVo {
     private String parallelism;
     //是否选择GPU
     private String isChoiceGpu;
+    //最大仿真时间
+    private String maxSimulationTime;
 }

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

@@ -1803,8 +1803,16 @@ public class SimulationProjectServiceImpl implements SimulationProjectService {
             /*sublistName += ProjectConstants.SEPARATOR+sp.getReturnSceneId()+ProjectConstants.SEPARATOR+sp.getSceneType()+ProjectConstants.SEPARATOR+
                     sp.getSceneScore()+ProjectConstants.SEPARATOR+sp.getTargetEvaluate()+ProjectConstants.SEPARATOR+sp.getScoreExplain();*/
 
-            sublistName += ProjectConstants.SEPARATOR+sp.getReturnSceneId()+ProjectConstants.SEPARATOR+sp.getSceneType()+ProjectConstants.SEPARATOR+
-                    sceneScore+ProjectConstants.SEPARATOR+targetEvaluate+ProjectConstants.SEPARATOR+sp.getScoreExplain();
+            //测试得分，指标评价，得分说明 --处理
+            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();
+            }
+
+
 
             String[] split = sublistName.split(ProjectConstants.SEPARATOR);
 
@@ -4047,7 +4055,7 @@ public class SimulationProjectServiceImpl implements SimulationProjectService {
     public ResponseBodyVO selectSubProjectInfo(SimulationManualProjectParam param) {
 
         /*
-        项目名称、项目描述、算法名称、车辆、传感器、场景、运行周期、并行度、是否选择GPU、
+        项目名称、项目描述、算法名称、车辆、传感器、场景、运行周期、并行度、是否选择GPU、最大运行时间
          */
         String id = param.getId();
 
@@ -4165,6 +4173,7 @@ public class SimulationProjectServiceImpl implements SimulationProjectService {
         vo.setParallelism(po.getParallelism());
         vo.setRuleView(po.getRuleView());
         vo.setIsChoiceGpu(po.getIsChoiceGpu());
+        vo.setMaxSimulationTime(po.getMaxSimulationTime());
     }
 
     private SimulationAutomaticProjectPo convertToSimulationAutomaticProjectPo(SimulationManualProjectParam param){
@@ -4176,7 +4185,7 @@ public class SimulationProjectServiceImpl implements SimulationProjectService {
         po.setVehicle(param.getVehicle());
         po.setScene(param.getScene());
         po.setOperationCycle(param.getOperationCycle());
-//        po.setMaxSimulationTime(param.getMaxSimulationTime());
+        po.setMaxSimulationTime(param.getMaxSimulationTime());
         po.setParallelism(param.getParallelism());
         po.setRuleView(param.getRuleView());
         po.setIsChoiceGpu(param.getIsChoiceGpu());

simulation-resource-server/src/main/resources/mapper/project/SimulationAutomaticProjectMapper.xml

@@ -165,7 +165,7 @@
 
     <!--自动运行项目详细页面信息-->
     <select id="selectAutomaticProjectInfoById" parameterType="string" resultType="api.common.pojo.vo.project.AutomaticProjectVo">
-        select p.id, p.project_name, p.project_describe, p.operation_cycle, p.parallelism, p.is_choice_gpu, p.vehicle, a.algorithm_name, s.package_name as sceneName
+        select p.id, p.project_name, p.project_describe, p.operation_cycle, p.parallelism, p.is_choice_gpu, p.vehicle, a.algorithm_name, s.package_name as sceneName, p.max_simulation_time
         from simulation_automatic_project p
         left join algorithm a on p.algorithm = a.id
         left join scene_package s on p.scene = s.package_id