项目详情BUG

api-common/src/main/java/api/common/pojo/vo/project/AlgorithmScoreVo.java → api-common/src/main/java/api/common/pojo/vo/project/AlgorithmScoreVO.java

@@ -8,7 +8,7 @@ import lombok.Setter;
  */
 @Getter
 @Setter
-public class AlgorithmScoreVo {
+public class AlgorithmScoreVO {
 
     //项目名称
     private String projectName;

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

@@ -8,7 +8,7 @@ import lombok.Setter;
  */
 @Getter
 @Setter
-public class AutomaticProjectVo {
+public class AutomaticProjectVO {
 
     //id
     private String id;

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

@@ -0,0 +1,40 @@
+package api.common.pojo.vo.project;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * 项目详情
+ */
+@Data
+public class ProjectDetailsVO {
+    private String projectId; //项目id
+    private String projectName; //项目名称
+    private String projectDescribe; //项目描述
+    private String startTime; //开始时间
+    private String finishTime; //完成时间
+    private String nowRunState; //当前运行状态（进度）
+    private String nowRunStateName; //当前运行状态（进度）
+    private String evaluationLevel; //评测等级
+    private String algorithmName; //算法名称
+    private String algorithmDescribe; //算法描述
+    private String vehicleName; //车辆名称
+    private String vehicleDescribe; //车辆描述
+    private String vehicleTopView; //车辆图片地址
+    private List<SensorBaseInfoVo> sensorCameraList; //摄像头
+    private List<SensorBaseInfoVo> sensorOgtList; //完美传感器
+    private List<SensorBaseInfoVo> sensorLidarList; //激光雷达
+    private List<SensorBaseInfoVo> sensorRadarList; //毫米波雷达
+    private List<SensorBaseInfoVo> sensorGpsList; //gps
+    private List<ManualProjectTaskVo> taskList; //任务列表信息
+    private List<ProjectRunStateNumVo> stateList; //运行状态统计
+    private List<ProjectRunResultRatioNumVo> resultList; //运行结果统计
+    private List<ProjectRunResultRatioNumVo> resultScoreList; //运行得分统计
+    private String parallelism; //并行度
+    private Long maxSimulationTime; //最大仿真时间
+    private String isChoiceGpu; //是否选择gpu
+    private boolean createReport; //是否生成报告
+    private String packageName; //场景包名
+    private List<AlgorithmScoreVO> algorithmScoreList; //算法测试得分
+}

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

@@ -1,99 +0,0 @@
-package api.common.pojo.vo.project;
-
-import lombok.Getter;
-import lombok.Setter;
-
-import java.util.List;
-
-/**
- * 项目详情vo
- */
-@Getter
-@Setter
-public class ProjectDetailsVo {
-
-    //项目id
-    private String projectId;
-
-    //项目名称
-    private String projectName;
-
-    //项目描述
-    private String projectDescribe;
-
-    //开始时间
-    private String startTime;
-
-    //完成时间
-    private String finishTime;
-
-    //当前运行状态（进度）
-    private String nowRunState;
-
-    //当前运行状态（进度）
-    private String nowRunStateName;
-
-    //评测等级
-    private String evaluationLevel;
-
-    //算法名称
-    private String algorithmName;
-
-    //算法描述
-    private String algorithmDescribe;
-
-    //车辆名称
-    private String vehicleName;
-
-    //车辆描述
-    private String vehicleDescribe;
-
-    //车辆图片地址
-    private String vehicleTopView;
-
-    //摄像头
-    private List<SensorBaseInfoVo> sensorCameraList;
-
-    //完美传感器
-    private List<SensorBaseInfoVo> sensorOgtList;
-
-    //激光雷达
-    private List<SensorBaseInfoVo> sensorLidarList;
-
-    //毫米波雷达
-    private List<SensorBaseInfoVo> sensorRadarList;
-
-    //gps
-    private List<SensorBaseInfoVo> sensorGpsList;
-
-    //任务列表信息
-    private List<ManualProjectTaskVo> taskList;
-
-    //运行状态统计
-    private List<ProjectRunStateNumVo> stateList;
-
-    //运行结果统计
-    private List<ProjectRunResultRatioNumVo> resultList;
-
-    //运行得分统计
-    private List<ProjectRunResultRatioNumVo> resultScoreList;
-
-    //并行度
-    private String parallelism;
-
-    //最大仿真时间
-    private Long maxSimulationTime;
-
-    //是否选择gpu
-    private String isChoiceGpu;
-
-    //是否生成报告
-    private boolean createReport;
-
-    //场景包名
-    private String packageName;
-
-    //算法测试得分
-    private List<AlgorithmScoreVo> algorithmScoreList;
-
-}

api-common/src/main/java/api/common/pojo/vo/project/ProjectReportVo.java → api-common/src/main/java/api/common/pojo/vo/project/ProjectReportVO.java

@@ -11,7 +11,7 @@ import java.util.Map;
  */
 @Getter
 @Setter
-public class ProjectReportVo {
+public class ProjectReportVO {
 
     //项目名称
     private String projectName;
@@ -41,7 +41,7 @@ public class ProjectReportVo {
     private String algorithmEvaluation;
 
     //算法测试得分
-    private List<AlgorithmScoreVo> algorithmScoreList;
+    private List<AlgorithmScoreVO> algorithmScoreList;
 
     private String evaluationGrade;
 

api-common/src/main/java/api/common/pojo/vo/project/SimulationManualProjectVo.java → api-common/src/main/java/api/common/pojo/vo/project/SimulationManualProjectVO.java

@@ -9,7 +9,7 @@ import java.util.Date;
 @NoArgsConstructor
 @AllArgsConstructor
 @Builder
-public class SimulationManualProjectVo {
+public class SimulationManualProjectVO {
     private String id;
     private String projectId;//项目id
     private String projectName;//项目名称

simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/configuration/feign/WebServerClient.java

@@ -0,0 +1,19 @@
+package com.css.simulation.resource.scheduler.configuration.feign;
+
+import api.common.pojo.common.ResponseBodyVO;
+import api.common.pojo.param.project.SimulationManualProjectParam;
+import api.common.pojo.vo.project.ProjectDetailsVO;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
+
+@FeignClient(
+        contextId = "server",
+        value = "simulation-resource-server",
+        path = "/simulation/resource/server",
+        fallback = WebServerClient.class
+)
+public interface WebServerClient {
+
+    @GetMapping(value = "/simulationProject/selectProjectDetailsByIdForScheduler")
+    ResponseBodyVO<ProjectDetailsVO> selectProjectDetailsByIdForScheduler(SimulationManualProjectParam simulationManualProjectParam);
+}

simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/configuration/feign/fallback/WebServerClientFallBack.java

@@ -0,0 +1,15 @@
+package com.css.simulation.resource.scheduler.configuration.feign.fallback;
+
+import api.common.pojo.common.ResponseBodyVO;
+import api.common.pojo.param.project.SimulationManualProjectParam;
+import api.common.pojo.vo.project.ProjectDetailsVO;
+import com.css.simulation.resource.scheduler.configuration.feign.WebServerClient;
+
+
+public class WebServerClientFallBack implements WebServerClient {
+
+    @Override
+    public ResponseBodyVO<ProjectDetailsVO> selectProjectDetailsByIdForScheduler(SimulationManualProjectParam param) {
+        return null;
+    }
+}

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

@@ -56,4 +56,9 @@ public interface AutoSubProjectMapper {
             "         left join simulation_automatic_subproject t4 on t3.id = t4.parent_id\n" +
             "where t4.id = #{projectId}\n")
     String selectModelTypeByProjectId(String projectId);
+
+    @Update("update simulation_automatic_subproject\n" +
+            "set details  = #{details}\n" +
+            "where id = #{id}")
+    void updateProjectDetails(@Param("id") String id, @Param("details") String details);
 }

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

@@ -53,4 +53,9 @@ public interface ManualProjectMapper {
             "         left join simulation_manual_project t3 on t2.id = t3.vehicle\n" +
             "where t3.id = #{projectId}")
     String selectModelTypeByProjectId(String projectId);
+
+    @Update("update simulation_manual_project\n" +
+            "set details = #{details}\n" +
+            "where id = #{id}")
+    void updateProjectDetails(@Param("id") String id,@Param("details") String details);
 }

simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/util/ProjectUtil.java

@@ -2,7 +2,9 @@ package com.css.simulation.resource.scheduler.util;
 
 import api.common.pojo.constants.DictConstants;
 import api.common.pojo.dto.ProjectMessageDTO;
+import api.common.pojo.param.project.SimulationManualProjectParam;
 import api.common.util.*;
+import com.css.simulation.resource.scheduler.configuration.feign.WebServerClient;
 import com.css.simulation.resource.scheduler.configuration.kubernetes.KubernetesConfiguration;
 import com.css.simulation.resource.scheduler.configuration.redis.CustomRedisClient;
 import com.css.simulation.resource.scheduler.data.entity.NodeEntity;
@@ -21,6 +23,7 @@ import lombok.Synchronized;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.data.redis.core.StringRedisTemplate;
+import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Component;
 
 import javax.annotation.Resource;
@@ -55,6 +58,8 @@ public class ProjectUtil {
     private StringRedisTemplate stringRedisTemplate;
     @Resource
     private CustomRedisClient customRedisClient;
+    @Resource
+    private WebServerClient webServerClient;
 
     public String getIsChoiceGpuByProjectId(String projectId) {
         return getProjectByProjectId(projectId).getIsChoiceGpu();
@@ -644,7 +649,6 @@ public class ProjectUtil {
     }
 
 
-
     public Integer getUsingLicenseNumber(String userId, String modelType) {
         String key;
         if (DictConstants.MODEL_TYPE_VTD.equals(modelType)) {
@@ -732,4 +736,17 @@ public class ProjectUtil {
         }
     }
 
+    @Async("pool1")
+    @SneakyThrows
+    public void selectProjectDetailsById(String projectType, String projectId) {
+        TimeUnit.SECONDS.sleep(10);
+        final String projectDetailsVOJson = JsonUtil.beanToJson( webServerClient.selectProjectDetailsByIdForScheduler(SimulationManualProjectParam.builder().projectType(projectType).projectId(projectId).build()).getInfo());
+        if (DictConstants.PROJECT_TYPE_MANUAL.equals(projectType)) {
+            manualProjectMapper.updateProjectDetails(projectId,projectDetailsVOJson);
+        } else if (DictConstants.PROJECT_TYPE_AUTO_SUB.equals(projectType)) {
+            autoSubProjectMapper.updateProjectDetails(projectId,projectDetailsVOJson);
+        } else {
+            throw new RuntimeException("未知项目类型：" + projectType);
+        }
+    }
 }

simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/util/TaskUtil.java

@@ -469,7 +469,8 @@ public class TaskUtil {
         RedisUtil.deleteByPrefix(stringRedisTemplate, "project:" + projectId);
         // 删除剩余 yaml
         projectUtil.deleteYamlByProjectId(projectId);
-        //
+        // 查询项目详情
+        projectUtil.selectProjectDetailsById(projectType, projectId);
     }
 
 

simulation-resource-server/src/main/java/com/css/simulation/resource/open/ctrl/ReportCtrl.java

@@ -2,7 +2,7 @@ package com.css.simulation.resource.open.ctrl;
 
 import api.common.pojo.common.ResponseBodyVO;
 import api.common.pojo.param.project.SimulationManualProjectParam;
-import api.common.pojo.vo.project.ProjectReportVo;
+import api.common.pojo.vo.project.ProjectReportVO;
 import api.common.util.ObjectUtil;
 import api.common.util.StringUtil;
 import com.css.simulation.resource.open.service.ReportService;
@@ -34,7 +34,7 @@ public class ReportCtrl {
      */
     @RequestMapping("getSimulationReportById")
     @ResponseBody
-    public ResponseBodyVO<ProjectReportVo> getSimulationReportById(@RequestBody Map<String,String> paramMap){
+    public ResponseBodyVO<ProjectReportVO> getSimulationReportById(@RequestBody Map<String,String> paramMap){
         if(ObjectUtil.isNull(paramMap) || ObjectUtil.isNull(paramMap.get("algorithmId"))){
             return new ResponseBodyVO(false, 500, "参数必传！",null);
         }
@@ -48,10 +48,10 @@ public class ReportCtrl {
         //获取报告详情
         SimulationManualProjectParam projectParam = new SimulationManualProjectParam();
         projectParam.setId(projectId);
-        ResponseBodyVO<ProjectReportVo> vo = simulationProjectService.selectProjectReportById(projectParam);
+        ResponseBodyVO<ProjectReportVO> vo = simulationProjectService.selectProjectReportById(projectParam);
 
         //ProjectReportVo reportVo = reportService.getSimulationReportById(paramMap);
-        ResponseBodyVO<ProjectReportVo> response = new ResponseBodyVO<>(ResponseBodyVO.Response.SUCCESS);
+        ResponseBodyVO<ProjectReportVO> response = new ResponseBodyVO<>(ResponseBodyVO.Response.SUCCESS);
         response.setInfo(vo.getInfo());
         return response;
     }

simulation-resource-server/src/main/java/com/css/simulation/resource/open/service/ReportService.java

@@ -1,16 +1,14 @@
 package com.css.simulation.resource.open.service;
 
-import api.common.pojo.vo.project.ProjectReportVo;
+import api.common.pojo.vo.project.ProjectReportVO;
 import org.springframework.stereotype.Service;
 
-import java.util.ArrayList;
-import java.util.List;
 import java.util.Map;
 
 @Service
 public class ReportService {
-    public ProjectReportVo getSimulationReportById(Map<String, String> paramMap) {
-        ProjectReportVo vo = new ProjectReportVo();
+    public ProjectReportVO getSimulationReportById(Map<String, String> paramMap) {
+        ProjectReportVO vo = new ProjectReportVO();
         vo.setAlgorithmName("test");
         vo.setAlgorithmScore(26.2);
         return vo;

simulation-resource-server/src/main/java/com/css/simulation/resource/project/controller/SimulationProjectController.java

@@ -25,7 +25,7 @@ import java.util.List;
 public class SimulationProjectController {
 
   @Resource
-  private SimulationProjectService service;
+  private SimulationProjectService simulationProjectService;
   @Resource
   private ClusterService clusterService;
 
@@ -38,19 +38,19 @@ public class SimulationProjectController {
    */
   @RequestMapping("updateProjectNowRunState")
   public ResponseBodyVO<String> updateProjectNowRunState(@RequestBody SimulationManualProjectParam param) {
-    return service.updateProjectNowRunState(param);
+    return simulationProjectService.updateProjectNowRunState(param);
   }
 
 
   @RequestMapping("updateAutomaticRunState")
   public ResponseBodyVO<String> updateAutomaticRunState(@RequestBody SimulationManualProjectParam param) {
-    return service.updateAutomaticRunState(param);
+    return simulationProjectService.updateAutomaticRunState(param);
   }
 
 
   @RequestMapping("createAutomaticSubProject")
   public ResponseBodyVO<String> createAutomaticSubProject(@RequestBody SimulationManualProjectParam param) {
-    return service.createAutomaticSubProject(param);
+    return simulationProjectService.createAutomaticSubProject(param);
   }
 
   //* -------------------------------- Comment --------------------------------
@@ -61,7 +61,7 @@ public class SimulationProjectController {
    */
   @RequestMapping("exportProjectReportById")
   public void exportProjectReportById(@RequestBody SimulationManualProjectParam param) {
-    service.exportProjectReport(param);
+    simulationProjectService.exportProjectReport(param);
   }
 
   //* -------------------------------- Comment --------------------------------
@@ -69,58 +69,66 @@ public class SimulationProjectController {
   /**
    * 创建/修改工作
    */
-  @RequestMapping("addOrUpdateProject")
+  @RequestMapping("/addOrUpdateProject")
   public ResponseBodyVO<String> addOrUpdateProject(@RequestBody SimulationManualProjectParam param) {
-    return service.addOrUpdateProject(param);
+    return simulationProjectService.addOrUpdateProject(param);
   }
 
   /**
    * 查询项目列表
    */
-  @RequestMapping("selectProject")
-  public ResponseBodyVO<PageInfo<SimulationManualProjectVo>> selectProject(@RequestBody SimulationManualProjectParam param) {
-    return service.selectProject(param);
+  @RequestMapping("/selectProject")
+  public ResponseBodyVO<PageInfo<SimulationManualProjectVO>> selectProject(@RequestBody SimulationManualProjectParam param) {
+    return simulationProjectService.selectProject(param);
   }
 
   /**
    * 根据id查询
    */
-  @RequestMapping("selectProjectById")
+  @RequestMapping("/selectProjectById")
   public ResponseBodyVO<SimulationManualProjectSingleVo> selectProjectById(@RequestBody SimulationManualProjectParam param) {
-    return service.selectProjectById(param);
+    return simulationProjectService.selectProjectById(param);
   }
 
   /**
    * 删除工作（支持批量删除）
    */
-  @RequestMapping("deleteProjectByids")
+  @RequestMapping("/deleteProjectByids")
   public ResponseBodyVO<String> deleteProjectByids(@RequestBody SimulationManualProjectParam param) {
-    return service.deleteProjectByids(param);
+    return simulationProjectService.deleteProjectByids(param);
   }
 
 
   /**
    * 获取工作详情
    */
-  @RequestMapping("selectProjectDetailsById")
-  public ResponseBodyVO<ProjectDetailsVo> selectProjectDetailsById(@RequestBody SimulationManualProjectParam param) {
-    return service.selectProjectDetailsById(param);
+  @RequestMapping("/selectProjectDetailsById")
+  public ResponseBodyVO<ProjectDetailsVO> selectProjectDetailsById(@RequestBody SimulationManualProjectParam param) {
+    return simulationProjectService.selectProjectDetailsById(param);
+  }
+
+  /**
+   * 获取工作详情
+   */
+  @RequestMapping("/selectProjectDetailsByIdForScheduler")
+  public ResponseBodyVO<ProjectDetailsVO> selectProjectDetailsByIdForScheduler(@RequestBody SimulationManualProjectParam param) {
+    return simulationProjectService.selectProjectDetailsByIdForScheduler(param);
   }
 
   /**
    * 获取测试报告详情
    */
-  @RequestMapping("selectProjectReportById")
-  public ResponseBodyVO<ProjectReportVo> selectProjectReportById(@RequestBody SimulationManualProjectParam param) {
-    return service.selectProjectReportById(param);
+  @RequestMapping("/selectProjectReportById")
+  public ResponseBodyVO<ProjectReportVO> selectProjectReportById(@RequestBody SimulationManualProjectParam param) {
+    return simulationProjectService.selectProjectReportById(param);
   }
 
   /**
    * 获取任务详情信息
    */
-  @RequestMapping("selectProjectTaskById")
+  @RequestMapping("/selectProjectTaskById")
   public ResponseBodyVO<ProjectTaskDetailsVo> selectProjectTaskById(@RequestBody SimulationManualProjectParam param) {
-    return service.selectProjectTaskById(param);
+    return simulationProjectService.selectProjectTaskById(param);
   }
 
   /**
@@ -129,9 +137,9 @@ public class SimulationProjectController {
    * 1. 车辆列表
    * 2. 场景列表
    */
-  @RequestMapping("selectDropDownByType")
+  @RequestMapping("/selectDropDownByType")
   public ResponseBodyVO<List<DropDownTypeVo>> selectDropDownByType(@RequestBody SimulationManualProjectParam param) {
-    return service.selectDropDownByType(param);
+    return simulationProjectService.selectDropDownByType(param);
   }
 
   /**
@@ -140,16 +148,16 @@ public class SimulationProjectController {
    * 1. 车辆列表
    * 2. 场景列表
    */
-  @RequestMapping("selectDropDownByTypeNew")
+  @RequestMapping("/selectDropDownByTypeNew")
   public ResponseBodyVO<List<DropDownTypeNewVo>> selectDropDownByTypeNew(@RequestBody SimulationManualProjectParam param) {
-    return service.selectDropDownByTypeNew(param);
+    return simulationProjectService.selectDropDownByTypeNew(param);
   }
 
 
   /**
    * @return 人员可用最大并行度
    */
-  @RequestMapping("selectMaxParallelism")
+  @RequestMapping("/selectMaxParallelism")
   public ResponseBodyVO<String> selectMaxParallelism() {
     Integer licenseNum = clusterService.getLicenseNum();
     return new ResponseBodyVO<>(ResponseBodyVO.Response.SUCCESS, null, licenseNum + "");
@@ -160,9 +168,9 @@ public class SimulationProjectController {
    *
    * @param param 参数
    */
-  @PostMapping("getDictName")
+  @PostMapping("/getDictName")
   public ResponseBodyVO<String> getDictName(@RequestBody DictParam param) {
-    String dictName = service.getDictName(param.getType(), param.getCode());
+    String dictName = simulationProjectService.getDictName(param.getType(), param.getCode());
     return new ResponseBodyVO<>(ResponseBodyVO.Response.SUCCESS, null, dictName);
 
   }
@@ -171,18 +179,18 @@ public class SimulationProjectController {
   /**
    * 解析车辆坐标文件
    */
-  @RequestMapping("analysisVehicleCoord")
+  @RequestMapping("/analysisVehicleCoord")
   public ResponseBodyVO<String> analysisVehicleCoord() {
-    return service.analysisVehicleCoord();
+    return simulationProjectService.analysisVehicleCoord();
   }
 
 
   /**
    * 查询工作任务列表
    */
-  @RequestMapping("selectProjectTaskList")
+  @RequestMapping("/selectProjectTaskList")
   public ResponseBodyVO<PageInfo<ManualProjectTaskVo>> selectProjectTaskList(@RequestBody SimulationManualProjectParam param) {
-    return service.selectProjectTaskList(param);
+    return simulationProjectService.selectProjectTaskList(param);
   }
 
 
@@ -191,55 +199,55 @@ public class SimulationProjectController {
    *
    * @return 响应对象
    */
-  @RequestMapping("saveEvaluationLevel")
+  @RequestMapping("/saveEvaluationLevel")
   public ResponseBodyVO<String> saveEvaluationLevel(@RequestBody SimulationManualProjectParam simulationManualProjectParam) {
     String id = simulationManualProjectParam.getId();
     if (StringUtil.isEmpty(id)) {
       return new ResponseBodyVO<>(ResponseBodyVO.Response.CLIENT_FAILURE, "id 不能为空", "");
     } else {
-      return service.saveEvaluationLevel(id);
+      return simulationProjectService.saveEvaluationLevel(id);
     }
   }
 
   /**
    * 保存仿真结果到数据库（任务结果返回时调用）
    */
-  @RequestMapping("saveTaskResult")
-  public ResponseBodyVO saveTaskResult(@RequestBody SimulationManualProjectParam param) {
-    return service.saveTaskResult(param);
+  @RequestMapping("/saveTaskResult")
+  public ResponseBodyVO<Object> saveTaskResult(@RequestBody SimulationManualProjectParam param) {
+    return simulationProjectService.saveTaskResult(param);
   }
 
   /**
    * 导出工作任务文件包
    */
-  @RequestMapping("exportProjectTaskFileById")
+  @RequestMapping("/exportProjectTaskFileById")
   public void exportProjectTaskFileById(@RequestBody SimulationManualProjectParam param) {
-    service.exportProjectTaskFileById(param);
+    simulationProjectService.exportProjectTaskFileById(param);
   }
 
   /**
    * 同时导出工作报告和任务包
    */
-  @RequestMapping("exportProjectReportAndTaskFileById")
+  @RequestMapping("/exportProjectReportAndTaskFileById")
   public void exportProjectReportAndTaskFileById(@RequestBody SimulationManualProjectParam param) {
-    service.exportProjectReportAndTaskFileById(param);
+    simulationProjectService.exportProjectReportAndTaskFileById(param);
   }
 
   /**
    * 添加编辑自动项目
    */
-  @RequestMapping("addOrUpdateAutomaticProject")
+  @RequestMapping("/addOrUpdateAutomaticProject")
   public ResponseBodyVO addOrUpdateAutomaticProject(@RequestBody SimulationManualProjectParam param) {
-    return service.addOrUpdateAutomaticProject(param);
+    return simulationProjectService.addOrUpdateAutomaticProject(param);
   }
 
 
   /**
    * 删除自动运行工作（支持批量删除）
    */
-  @RequestMapping("deleteAutomaticProjectByids")
+  @RequestMapping("/deleteAutomaticProjectByids")
   public ResponseBodyVO<String> deleteAutomaticProjectByids(@RequestBody SimulationManualProjectParam param) {
-    return service.deleteAutomaticProjectByids(param);
+    return simulationProjectService.deleteAutomaticProjectByids(param);
   }
 
 
@@ -248,52 +256,52 @@ public class SimulationProjectController {
   /**
    * 查询自动运行项目列表
    */
-  @RequestMapping("selectAutomaticProject")
-  public ResponseBodyVO<PageInfo<SimulationManualProjectVo>> selectAutomaticProject(@RequestBody SimulationManualProjectParam param) {
-    return service.selectAutomaticProject(param);
+  @RequestMapping("/selectAutomaticProject")
+  public ResponseBodyVO<PageInfo<SimulationManualProjectVO>> selectAutomaticProject(@RequestBody SimulationManualProjectParam param) {
+    return simulationProjectService.selectAutomaticProject(param);
   }
 
 
   /**
    * 删除自动运行子项目（支持批量删除）
    */
-  @RequestMapping("deleteAutomaticSubProjectByIds")
+  @RequestMapping("/deleteAutomaticSubProjectByIds")
   public ResponseBodyVO deleteAutomaticSubProjectByIds(@RequestBody SimulationManualProjectParam param) {
 
-    return service.deleteAutomaticSubProjectByIds(param);
+    return simulationProjectService.deleteAutomaticSubProjectByIds(param);
   }
 
   /**
    * 查询自动运行子工作信息
    */
-  @RequestMapping("selectSubProjectInfo")
-  public ResponseBodyVO<AutomaticProjectVo> selectSubProjectInfo(@RequestBody SimulationManualProjectParam param) {
-    return service.selectSubProjectInfo(param);
+  @RequestMapping("/selectSubProjectInfo")
+  public ResponseBodyVO<AutomaticProjectVO> selectSubProjectInfo(@RequestBody SimulationManualProjectParam param) {
+    return simulationProjectService.selectSubProjectInfo(param);
   }
 
 
   /**
    * 查询自动运行子工作列表
    */
-  @RequestMapping("selectSubProjectList")
-  public ResponseBodyVO<PageInfo<SimulationManualProjectVo>> selectSubProjectList(@RequestBody SimulationManualProjectParam param) {
-    return service.selectSubProjectList(param);
+  @RequestMapping("/selectSubProjectList")
+  public ResponseBodyVO<PageInfo<SimulationManualProjectVO>> selectSubProjectList(@RequestBody SimulationManualProjectParam param) {
+    return simulationProjectService.selectSubProjectList(param);
   }
 
   /**
    * 根据id查询自动运行项目信息
    */
-  @RequestMapping("selectAutomaticProjectById")
+  @RequestMapping("/selectAutomaticProjectById")
   public ResponseBodyVO<SimulationManualProjectSingleVo> selectAutomaticProjectById(@RequestBody SimulationManualProjectParam param) {
-    return service.selectAutomaticProjectById(param);
+    return simulationProjectService.selectAutomaticProjectById(param);
   }
 
   /**
    * 修改自动运行子工作运行状态
    */
-  @RequestMapping("updateAutoProjectNowRunState")
+  @RequestMapping("/updateAutoProjectNowRunState")
   public ResponseBodyVO<String> updateAutoProjectNowRunState(@RequestBody SimulationManualProjectParam param) {
-    return service.updateAutoProjectNowRunState(param);
+    return simulationProjectService.updateAutoProjectNowRunState(param);
   }
 
 

simulation-resource-server/src/main/java/com/css/simulation/resource/project/mapper/SimulationAutomaticProjectMapper.java

@@ -20,7 +20,7 @@ public interface SimulationAutomaticProjectMapper {
 
      SimulationAutomaticProjectPO selectLastProjectId(Integer nowRq);
 
-     List<SimulationManualProjectVo> selectAutomaticProjectList(SimulationManualProjectParam param);
+     List<SimulationManualProjectVO> selectAutomaticProjectList(SimulationManualProjectParam param);
 
      int add(SimulationAutomaticProjectPO po);
 
@@ -32,7 +32,7 @@ public interface SimulationAutomaticProjectMapper {
 
      int updateAutomaticRunState(SimulationManualProjectParam param);
 
-     AutomaticProjectVo selectAutomaticProjectInfoById(String id);
+     AutomaticProjectVO selectAutomaticProjectInfoById(String id);
 
      int updateAlgorithmGitVersion(AlgorithmParameter algorithmParameter);
 

simulation-resource-server/src/main/java/com/css/simulation/resource/project/mapper/SimulationAutomaticSubProjectMapper.java

@@ -2,7 +2,7 @@ package com.css.simulation.resource.project.mapper;
 
 import api.common.pojo.param.project.SimulationManualProjectParam;
 import api.common.pojo.po.project.SimulationAutomaticSubProjectPO;
-import api.common.pojo.vo.project.SimulationManualProjectVo;
+import api.common.pojo.vo.project.SimulationManualProjectVO;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
@@ -30,11 +30,11 @@ public interface SimulationAutomaticSubProjectMapper {
 
      int deleteProject(String[] ids);
 
-     List<SimulationManualProjectVo> selectList(SimulationManualProjectParam param);
+     List<SimulationManualProjectVO> selectList(SimulationManualProjectParam param);
 
 
 
-     SimulationManualProjectVo selectProjectInfo(SimulationManualProjectParam param);
+     SimulationManualProjectVO selectProjectInfo(SimulationManualProjectParam param);
 
      int updateNowRunState(SimulationManualProjectParam param);
 

simulation-resource-server/src/main/java/com/css/simulation/resource/project/mapper/SimulationProjectMapper.java

@@ -37,7 +37,7 @@ public interface SimulationProjectMapper {
 
     List<SimulationManualProjectPO> selectProject(SimulationManualProjectParam param);
 
-    List<SimulationManualProjectVo> selectProjectList(SimulationManualProjectParam param);
+    List<SimulationManualProjectVO> selectProjectList(SimulationManualProjectParam param);
 
     SimulationManualProjectPO selectProjectById(SimulationManualProjectParam param);
 

simulation-resource-server/src/main/java/com/css/simulation/resource/project/service/SimulationProjectService.java

@@ -13,7 +13,7 @@ public interface SimulationProjectService {
 
   ResponseBodyVO<String> addOrUpdateProject(SimulationManualProjectParam param);
 
-  ResponseBodyVO<PageInfo<SimulationManualProjectVo>> selectProject(SimulationManualProjectParam param);
+  ResponseBodyVO<PageInfo<SimulationManualProjectVO>> selectProject(SimulationManualProjectParam param);
 
   ResponseBodyVO<SimulationManualProjectSingleVo> selectProjectById(SimulationManualProjectParam param);
 
@@ -21,9 +21,11 @@ public interface SimulationProjectService {
 
   ResponseBodyVO<String> updateProjectNowRunState(SimulationManualProjectParam param);
 
-  ResponseBodyVO<ProjectDetailsVo> selectProjectDetailsById(SimulationManualProjectParam param);
+  ResponseBodyVO<ProjectDetailsVO> selectProjectDetailsById(SimulationManualProjectParam param);
 
-  ResponseBodyVO<ProjectReportVo> selectProjectReportById(SimulationManualProjectParam param);
+  ResponseBodyVO<ProjectDetailsVO> selectProjectDetailsByIdForScheduler(SimulationManualProjectParam param);
+
+  ResponseBodyVO<ProjectReportVO> selectProjectReportById(SimulationManualProjectParam param);
 
   ResponseBodyVO<List<DropDownTypeVo>> selectDropDownByType(SimulationManualProjectParam param);
 
@@ -49,7 +51,7 @@ public interface SimulationProjectService {
 
   ResponseBodyVO<String> saveEvaluationLevel(String id);
 
-  ResponseBodyVO saveTaskResult(SimulationManualProjectParam param);
+  ResponseBodyVO<Object> saveTaskResult(SimulationManualProjectParam param);
 
   void exportProjectTaskFileById(SimulationManualProjectParam param);
 
@@ -61,15 +63,15 @@ public interface SimulationProjectService {
 
   ResponseBodyVO<String> updateAutomaticRunState(SimulationManualProjectParam param);
 
-  ResponseBodyVO<PageInfo<SimulationManualProjectVo>> selectAutomaticProject(SimulationManualProjectParam param);
+  ResponseBodyVO<PageInfo<SimulationManualProjectVO>> selectAutomaticProject(SimulationManualProjectParam param);
 
   ResponseBodyVO<String> createAutomaticSubProject(SimulationManualProjectParam param);
 
   ResponseBodyVO<String> deleteAutomaticSubProjectByIds(SimulationManualProjectParam param);
 
-  ResponseBodyVO<AutomaticProjectVo> selectSubProjectInfo(SimulationManualProjectParam param);
+  ResponseBodyVO<AutomaticProjectVO> selectSubProjectInfo(SimulationManualProjectParam param);
 
-  ResponseBodyVO<PageInfo<SimulationManualProjectVo>> selectSubProjectList(SimulationManualProjectParam param);
+  ResponseBodyVO<PageInfo<SimulationManualProjectVO>> selectSubProjectList(SimulationManualProjectParam param);
 
   ResponseBodyVO<SimulationManualProjectSingleVo> selectAutomaticProjectById(SimulationManualProjectParam param);
 

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

@@ -151,7 +151,7 @@ public class SimulationProjectServiceImpl implements SimulationProjectService {
     }
 
     @Override
-    public ResponseBodyVO<PageInfo<SimulationManualProjectVo>> selectProject(SimulationManualProjectParam param) {
+    public ResponseBodyVO<PageInfo<SimulationManualProjectVO>> selectProject(SimulationManualProjectParam param) {
 
         // 设置当前用户id
         param.setCreateUserId(AuthUtil.getCurrentUserId());
@@ -193,11 +193,11 @@ public class SimulationProjectServiceImpl implements SimulationProjectService {
         // 查询有效数据
         param.setIsDeleted("0");
         setPage(param.getCurrentPage() == null ? 1 : param.getCurrentPage(), param.getPageSize() == null ? 10 : param.getPageSize());
-        List<SimulationManualProjectVo> vos = simulationProjectMapper.selectProjectList(param); // 查出来的 algorithm
+        List<SimulationManualProjectVO> vos = simulationProjectMapper.selectProjectList(param); // 查出来的 algorithm
         // 字段内容是算法 id
-        PageInfo<SimulationManualProjectVo> pageInfo = new PageInfo<>(vos);
+        PageInfo<SimulationManualProjectVO> pageInfo = new PageInfo<>(vos);
 
-        for (SimulationManualProjectVo simulationManualProjectVo : pageInfo.getList()) {
+        for (SimulationManualProjectVO simulationManualProjectVo : pageInfo.getList()) {
             convertPoToVo(simulationManualProjectVo, false); // 同时将算法 id 转换成算法名称
         }
 
@@ -290,7 +290,7 @@ public class SimulationProjectServiceImpl implements SimulationProjectService {
             } else { //4 创建新的项目或者重新运行被终止的项目
                 // 查询项目详情信息并保存
                 String projectId = param.getId();
-                ProjectDetailsVo info = selectProjectDetailsByIdBeforeRunning(SimulationManualProjectParam.builder().id(projectId).projectType(DictConstants.PROJECT_TYPE_MANUAL).build()).getInfo();
+                ProjectDetailsVO info = selectProjectDetailsByIdBeforeRunning(SimulationManualProjectParam.builder().id(projectId).projectType(DictConstants.PROJECT_TYPE_MANUAL).build()).getInfo();
                 String infoJson = JsonUtil.beanToJson(info);
                 log.info("项目 " + projectId + " 的详情信息为：" + infoJson);
                 // 保存项目详情信息
@@ -386,25 +386,42 @@ public class SimulationProjectServiceImpl implements SimulationProjectService {
     /**
      * 查询项目详情，不使用详情字段中的某些字段，例如项目运行状态，并查询任务列表
      *
-     * @param param
-     * @return
      */
     @Override
     @SneakyThrows
-    public ResponseBodyVO<ProjectDetailsVo> selectProjectDetailsById(SimulationManualProjectParam param) {
+    public ResponseBodyVO<ProjectDetailsVO> selectProjectDetailsById(SimulationManualProjectParam param) {
+
+        ProjectDetailsVO projectDetailsVO = null;
+        if (DictConstants.PROJECT_TYPE_MANUAL.equals(param.getProjectType())) { // 手动运行任务
+            SimulationManualProjectPO simulationManualProjectPO = simulationProjectMapper.selectProjectById(param);
+            projectDetailsVO = JsonUtil.jsonToBean(simulationManualProjectPO.getDetails(),ProjectDetailsVO.class);
+        } else if (DictConstants.PROJECT_TYPE_AUTO_SUB.equals(param.getProjectType())) {
+            SimulationManualProjectVO simulationManualProjectVO = simulationAutomaticSubProjectMapper.selectProjectInfo(param);
+            projectDetailsVO = JsonUtil.jsonToBean(simulationManualProjectVO.getDetails(),ProjectDetailsVO.class);
+        }
+        return new ResponseBodyVO<>(ResponseBodyVO.Response.SUCCESS, projectDetailsVO);
+    }
+
+    /**
+     * 查询项目详情，不使用详情字段中的某些字段，例如项目运行状态，并查询任务列表
+     *
+     */
+    @Override
+    @SneakyThrows
+    public ResponseBodyVO<ProjectDetailsVO> selectProjectDetailsByIdForScheduler(SimulationManualProjectParam param) {
 
-        ProjectDetailsVo projectDetailsVo = null;
+        ProjectDetailsVO projectDetailsVo = null;
         if (DictConstants.PROJECT_TYPE_MANUAL.equals(param.getProjectType())) { // 手动运行任务
             SimulationManualProjectPO po = simulationProjectMapper.selectProjectById(param);
-            projectDetailsVo = JsonUtil.jsonToBean(po.getDetails(), ProjectDetailsVo.class);
+            projectDetailsVo = JsonUtil.jsonToBean(po.getDetails(), ProjectDetailsVO.class);
             projectDetailsVo.setEvaluationLevel(getDictName(DictConstants.EVALUATION_LEVEL, po.getEvaluationLevel()));
             projectDetailsVo.setStartTime(getRqStr(po.getStartTime(), 1));
             projectDetailsVo.setFinishTime(getRqStr(po.getFinishTime(), 1));
             projectDetailsVo.setNowRunState(po.getNowRunState());
             projectDetailsVo.setNowRunStateName(getDictName(DictConstants.PROJECT_RUN_STATE, po.getNowRunState()));
         } else if (DictConstants.PROJECT_TYPE_AUTO_SUB.equals(param.getProjectType())) {
-            SimulationManualProjectVo po = simulationAutomaticSubProjectMapper.selectProjectInfo(param);
-            projectDetailsVo = JsonUtil.jsonToBean(po.getDetails(), ProjectDetailsVo.class);
+            SimulationManualProjectVO po = simulationAutomaticSubProjectMapper.selectProjectInfo(param);
+            projectDetailsVo = JsonUtil.jsonToBean(po.getDetails(), ProjectDetailsVO.class);
             projectDetailsVo.setEvaluationLevel(getDictName(DictConstants.EVALUATION_LEVEL, po.getEvaluationLevel()));
             projectDetailsVo.setStartTime(getRqStr(po.getStartTime(), 1));
             projectDetailsVo.setFinishTime(getRqStr(po.getFinishTime(), 1));
@@ -413,7 +430,7 @@ public class SimulationProjectServiceImpl implements SimulationProjectService {
 
         }
         // 获取测试得分列表
-        List<AlgorithmScoreVo> firstTargetScore = getFirstTargetScore(param.getId());
+        List<AlgorithmScoreVO> firstTargetScore = getFirstTargetScore(param.getId());
         projectDetailsVo.setAlgorithmScoreList(firstTargetScore);
         // 任务运行状态统计
         List<ProjectRunStateNumVo> states = null;
@@ -477,8 +494,9 @@ public class SimulationProjectServiceImpl implements SimulationProjectService {
         return new ResponseBodyVO<>(ResponseBodyVO.Response.SUCCESS, projectDetailsVo);
     }
 
+
     @SneakyThrows
-    private ResponseBodyVO<ProjectDetailsVo> selectProjectDetailsByIdBeforeRunning(SimulationManualProjectParam param) {
+    private ResponseBodyVO<ProjectDetailsVO> selectProjectDetailsByIdBeforeRunning(SimulationManualProjectParam param) {
 
         if (isEmpty(param.getId())) {
             return new ResponseBodyVO<>(ResponseBodyVO.Response.CLIENT_FAILURE);
@@ -488,7 +506,7 @@ public class SimulationProjectServiceImpl implements SimulationProjectService {
             param.setProjectType("1");// 默认
         }
 
-        ProjectDetailsVo projectDetailsVo = new ProjectDetailsVo();
+        ProjectDetailsVO projectDetailsVo = new ProjectDetailsVO();
 
         // 封装要使用到的数据
         SimulationManualProjectPO poParam = new SimulationManualProjectPO();
@@ -501,7 +519,7 @@ public class SimulationProjectServiceImpl implements SimulationProjectService {
             }
             poParam = po;
         } else if (DictConstants.PROJECT_TYPE_AUTO_SUB.equals(param.getProjectType())) {
-            SimulationManualProjectVo po = simulationAutomaticSubProjectMapper.selectProjectInfo(param);
+            SimulationManualProjectVO po = simulationAutomaticSubProjectMapper.selectProjectInfo(param);
             if (po == null) {
                 return new ResponseBodyVO<>(ResponseBodyVO.Response.SERVER_FAILURE, "没有获取到数据");
             }
@@ -517,7 +535,7 @@ public class SimulationProjectServiceImpl implements SimulationProjectService {
         // 算法配置
         AlgorithmPO algorithmBaseInfoVo = getAlgorithmInfo(poParam);
         // 获取测试得分列表
-        List<AlgorithmScoreVo> firstTargetScore = getFirstTargetScore(param.getId());
+        List<AlgorithmScoreVO> firstTargetScore = getFirstTargetScore(param.getId());
         projectDetailsVo.setAlgorithmScoreList(firstTargetScore);
 
         // 车辆配置
@@ -790,7 +808,7 @@ public class SimulationProjectServiceImpl implements SimulationProjectService {
     }
 
     @Override
-    public ResponseBodyVO<ProjectReportVo> selectProjectReportById(SimulationManualProjectParam param) {
+    public ResponseBodyVO<ProjectReportVO> selectProjectReportById(SimulationManualProjectParam param) {
         String projectType = param.getProjectType();
         // 封装要使用到的数据
         SimulationManualProjectPO poParam = new SimulationManualProjectPO();
@@ -799,13 +817,13 @@ public class SimulationProjectServiceImpl implements SimulationProjectService {
             // 项目基本信息
             poParam = simulationProjectMapper.selectProjectBaseById(param);
         } else if (DictConstants.PROJECT_TYPE_AUTO_SUB.equals(projectType)) {
-            SimulationManualProjectVo po = simulationAutomaticSubProjectMapper.selectProjectInfo(param);
+            SimulationManualProjectVO po = simulationAutomaticSubProjectMapper.selectProjectInfo(param);
             BeanUtils.copyProperties(po, poParam);
         }
 
         // 算法配置
         AlgorithmPO algorithmBaseInfoVo = getAlgorithmInfo(poParam);
-        ProjectReportVo projectReportVo = new ProjectReportVo();
+        ProjectReportVO projectReportVo = new ProjectReportVO();
         projectReportVo.setProjectId(poParam.getProjectId());
         projectReportVo.setProjectName(poParam.getProjectName());
         projectReportVo.setAlgorithmName(algorithmBaseInfoVo.getAlgorithmName());
@@ -831,7 +849,7 @@ public class SimulationProjectServiceImpl implements SimulationProjectService {
         par.setPId(poParam.getId());
         List<SimulationMptFirstTargetScorePO> pos = simulationMptFirstTargetScoreMapper.selectFirstTargetByPid(par);
 
-        List<AlgorithmScoreVo> algorithmScoreVoList = new ArrayList<>();
+        List<AlgorithmScoreVO> algorithmScoreVOList = new ArrayList<>();
         String evaluationLevelReport;
 
         StringBuilder stringBuilder = new StringBuilder();
@@ -857,21 +875,21 @@ public class SimulationProjectServiceImpl implements SimulationProjectService {
 
             totalScoreRatio += Double.valueOf(scoreNum) / Double.valueOf(sceneNum) * 100;
 
-            AlgorithmScoreVo algorithmScoreVo = new AlgorithmScoreVo();
+            AlgorithmScoreVO algorithmScoreVo = new AlgorithmScoreVO();
             algorithmScoreVo.setProjectName(firstTargetScorePo.getSublistName());
             algorithmScoreVo.setSceneNum(sceneNum);
             algorithmScoreVo.setWeight(weight);
             algorithmScoreVo.setScore(saveTwoDecimalPlaces(score));
             algorithmScoreVo.setScoreRatio(saveTwoDecimalPlaces(Double.valueOf(scoreNum) / Double.valueOf(sceneNum) * 100));
 
-            algorithmScoreVoList.add(algorithmScoreVo);
+            algorithmScoreVOList.add(algorithmScoreVo);
 
             // 其他操作
             stringBuilder.append(firstTargetScorePo.getSublistName()).append("、");
             totalSceneNum += sceneNum;
         }
         // 汇总
-        AlgorithmScoreVo algorithmScoreVo = new AlgorithmScoreVo();
+        AlgorithmScoreVO algorithmScoreVo = new AlgorithmScoreVO();
         algorithmScoreVo.setProjectName("汇总");
         algorithmScoreVo.setSceneNum(totalSceneNum);
         // 指标权重总和默认是100%
@@ -882,7 +900,7 @@ public class SimulationProjectServiceImpl implements SimulationProjectService {
         // 汇总得分率计算方式修改
         // algorithmScoreVo.setScoreRatio(saveTwoDecimalPlaces(totalScoreRatio));
         algorithmScoreVo.setScoreRatio(NumberUtil.cut(totalScoreRatio, 2));
-        algorithmScoreVoList.add(algorithmScoreVo);
+        algorithmScoreVOList.add(algorithmScoreVo);
         projectReportVo.setScoreRatio(saveTwoDecimalPlaces(totalScoreRatio));
         projectReportVo.setAlgorithmScore(saveTwoDecimalPlaces(totalScore));
         evaluationLevelReport = poParam.getEvaluationLevel();
@@ -902,7 +920,7 @@ public class SimulationProjectServiceImpl implements SimulationProjectService {
 
         sceneNames = stringBuilder.substring(0, stringBuilder.lastIndexOf("、"));
         projectReportVo.setAlgorithmEvaluation(algorithmBaseInfoVo.getAlgorithmName() + "经测试获得" + projectReportVo.getEvaluationLevel() + "级评价，" + "（" + sceneNames + "）得分率达到了" + projectReportVo.getScoreRatio() + "%。");
-        projectReportVo.setAlgorithmScoreList(algorithmScoreVoList);
+        projectReportVo.setAlgorithmScoreList(algorithmScoreVOList);
         // 指标得分列表
         Map<String, Object> stringObjectMap = selectScenePackageSubListAndSetScore(poParam.getScene(), poParam.getId());
         projectReportVo.setSubListScoreLiTitle((List<Map>) stringObjectMap.get("headerList"));
@@ -1026,7 +1044,7 @@ public class SimulationProjectServiceImpl implements SimulationProjectService {
             Optional.ofNullable(spo).orElseThrow(() -> new RuntimeException("没有获取到数据。"));
             poParam = spo;
         } else if (DictConstants.PROJECT_TYPE_AUTO_SUB.equals(projectType)) {
-            SimulationManualProjectVo spo = simulationAutomaticSubProjectMapper.selectProjectInfo(param);
+            SimulationManualProjectVO spo = simulationAutomaticSubProjectMapper.selectProjectInfo(param);
             Optional.ofNullable(spo).orElseThrow(() -> new RuntimeException("没有获取到数据。"));
             BeanUtils.copyProperties(spo, poParam);
         }
@@ -1599,7 +1617,7 @@ public class SimulationProjectServiceImpl implements SimulationProjectService {
 
     }
 
-    private void convertPoToVo(SimulationManualProjectVo simulationManualProjectVo, boolean isAuto) {
+    private void convertPoToVo(SimulationManualProjectVO simulationManualProjectVo, boolean isAuto) {
         // 1 查询算法名称
         String algorithmId = simulationManualProjectVo.getAlgorithm();
         String algorithmType = simulationManualProjectVo.getAlgorithmType();
@@ -1968,7 +1986,7 @@ public class SimulationProjectServiceImpl implements SimulationProjectService {
         return hashMap;
     }
 
-    private Map<String, Object> selectSceneScore2(String scenePackageId, String projectId, String taskId, ProjectReportVo projectReportVo) {
+    private Map<String, Object> selectSceneScore2(String scenePackageId, String projectId, String taskId, ProjectReportVO projectReportVo) {
 
         // 1 查询指定项目的所有指标得分结果
         SimulationManualProjectParam query = new SimulationManualProjectParam();
@@ -2751,8 +2769,8 @@ public class SimulationProjectServiceImpl implements SimulationProjectService {
             HttpServletResponse response = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getResponse();
 
             // 获取要生成的数据
-            ResponseBodyVO<ProjectReportVo> bodyVO = selectProjectReportById(param);
-            ProjectReportVo vo = bodyVO.getInfo();
+            ResponseBodyVO<ProjectReportVO> bodyVO = selectProjectReportById(param);
+            ProjectReportVO vo = bodyVO.getInfo();
 
             // 下载 or 保存本地
             if (param.getIsCreateLocalPdfFile() != null && param.getIsCreateLocalPdfFile()) {
@@ -2835,10 +2853,10 @@ public class SimulationProjectServiceImpl implements SimulationProjectService {
 
             addElement(document, "2. 测试得分说明", null, bf4, 16, false, 40, false);
 
-            List<AlgorithmScoreVo> algorithmScoreList = vo.getAlgorithmScoreList();
+            List<AlgorithmScoreVO> algorithmScoreList = vo.getAlgorithmScoreList();
 
             StringBuilder stringBuilder = new StringBuilder("       " + vo.getAlgorithmName() + "在");
-            for (AlgorithmScoreVo v : algorithmScoreList) {
+            for (AlgorithmScoreVO v : algorithmScoreList) {
                 if ("汇总".equals(v.getProjectName())) {
                     continue;
                 }
@@ -2856,7 +2874,7 @@ public class SimulationProjectServiceImpl implements SimulationProjectService {
             addTitleList(pdfPTable, font, new String[]{"测试项目", "场景数量", "测试权重（%）", "测试得分", "得分率（%）"}, true, 30);
 
             // 数据
-            for (AlgorithmScoreVo asv : algorithmScoreList) {
+            for (AlgorithmScoreVO asv : algorithmScoreList) {
                 String[] data = new String[]{asv.getProjectName(), String.valueOf(asv.getSceneNum()), asv.getWeight(), String.valueOf(asv.getScore()), String.valueOf(asv.getScoreRatio())};
 
                 addDataList(pdfPTable, font, data, true, 20);
@@ -4035,20 +4053,20 @@ public class SimulationProjectServiceImpl implements SimulationProjectService {
     // }
 
     @Override
-    public ResponseBodyVO saveTaskResult(SimulationManualProjectParam param) {
+    public ResponseBodyVO<Object> saveTaskResult(SimulationManualProjectParam param) {
 
         String projectId = param.getProjectId();
         String taskId = param.getTaskId();
         String runResultFilePath = param.getRunResultFilePath();
 
         if (StringUtil.isEmpty(projectId)) {
-            return new ResponseBodyVO(ResponseBodyVO.Response.CLIENT_FAILURE, "工作id不能为空");
+            return new ResponseBodyVO<>(ResponseBodyVO.Response.CLIENT_FAILURE, "工作id不能为空");
         }
         if (StringUtil.isEmpty(taskId)) {
-            return new ResponseBodyVO(ResponseBodyVO.Response.CLIENT_FAILURE, "任务id不能为空");
+            return new ResponseBodyVO<>(ResponseBodyVO.Response.CLIENT_FAILURE, "任务id不能为空");
         }
         if (StringUtil.isEmpty(runResultFilePath)) {
-            return new ResponseBodyVO(ResponseBodyVO.Response.CLIENT_FAILURE, "地址不能为空");
+            return new ResponseBodyVO<>(ResponseBodyVO.Response.CLIENT_FAILURE, "地址不能为空");
         }
 
         InputStream fileInputStream = null;
@@ -4588,7 +4606,7 @@ public class SimulationProjectServiceImpl implements SimulationProjectService {
     }
 
     @Override
-    public ResponseBodyVO<PageInfo<SimulationManualProjectVo>> selectAutomaticProject(SimulationManualProjectParam param) {
+    public ResponseBodyVO<PageInfo<SimulationManualProjectVO>> selectAutomaticProject(SimulationManualProjectParam param) {
 
         // 1 获取当前用户id
         param.setCreateUserId(AuthUtil.getCurrentUserId());
@@ -4612,10 +4630,10 @@ public class SimulationProjectServiceImpl implements SimulationProjectService {
         }
 
         setPage(param.getCurrentPage() == null ? 1 : param.getCurrentPage(), param.getPageSize() == null ? 10 : param.getPageSize());
-        List<SimulationManualProjectVo> simulationManualProjectVoList = simulationAutomaticProjectMapper.selectAutomaticProjectList(param);
-        PageInfo<SimulationManualProjectVo> pageInfo = new PageInfo<>(simulationManualProjectVoList);
+        List<SimulationManualProjectVO> simulationManualProjectVOList = simulationAutomaticProjectMapper.selectAutomaticProjectList(param);
+        PageInfo<SimulationManualProjectVO> pageInfo = new PageInfo<>(simulationManualProjectVOList);
 
-        for (SimulationManualProjectVo simulationManualProjectVo : pageInfo.getList()) {
+        for (SimulationManualProjectVO simulationManualProjectVo : pageInfo.getList()) {
             convertPoToVo(simulationManualProjectVo, true);
         }
 
@@ -4661,7 +4679,7 @@ public class SimulationProjectServiceImpl implements SimulationProjectService {
         int i = simulationAutomaticSubProjectMapper.addAutomaticSubProject(subprojectPo);
         // 查询详情信息并保存
         String projectId = subprojectPo.getId();
-        ProjectDetailsVo info = selectProjectDetailsByIdBeforeRunning(SimulationManualProjectParam.builder().id(projectId).projectType(DictConstants.PROJECT_TYPE_AUTO_SUB).build()).getInfo();
+        ProjectDetailsVO info = selectProjectDetailsByIdBeforeRunning(SimulationManualProjectParam.builder().id(projectId).projectType(DictConstants.PROJECT_TYPE_AUTO_SUB).build()).getInfo();
         String infoJson = JsonUtil.beanToJson(info);
         log.info("项目 " + projectId + " 的详情信息为：" + infoJson);
         autoSubProjectMapper.updateDetailsById(projectId, infoJson);
@@ -4729,7 +4747,7 @@ public class SimulationProjectServiceImpl implements SimulationProjectService {
      * 自动项目父项目信息
      */
     @Override
-    public ResponseBodyVO<AutomaticProjectVo> selectSubProjectInfo(SimulationManualProjectParam param) {
+    public ResponseBodyVO<AutomaticProjectVO> selectSubProjectInfo(SimulationManualProjectParam param) {
         /*
          * 项目名称、项目描述、算法名称、车辆、传感器、场景、运行周期、并行度、是否选择GPU、最大运行时间
          */
@@ -4737,7 +4755,7 @@ public class SimulationProjectServiceImpl implements SimulationProjectService {
         if (StringUtil.isEmpty(id)) {
             return new ResponseBodyVO<>(ResponseBodyVO.Response.CLIENT_FAILURE, "id不能为空");
         }
-        AutomaticProjectVo automaticProjectVo = simulationAutomaticProjectMapper.selectAutomaticProjectInfoById(id);
+        AutomaticProjectVO automaticProjectVo = simulationAutomaticProjectMapper.selectAutomaticProjectInfoById(id);
         if (StringUtil.isEmpty(automaticProjectVo)) {
             return new ResponseBodyVO<>(ResponseBodyVO.Response.SERVER_FAILURE, "没有查询到数据");
         }
@@ -4771,7 +4789,7 @@ public class SimulationProjectServiceImpl implements SimulationProjectService {
     }
 
     @Override
-    public ResponseBodyVO<PageInfo<SimulationManualProjectVo>> selectSubProjectList(SimulationManualProjectParam param) {
+    public ResponseBodyVO<PageInfo<SimulationManualProjectVO>> selectSubProjectList(SimulationManualProjectParam param) {
 
         String id = param.getParentId();
 
@@ -4781,12 +4799,12 @@ public class SimulationProjectServiceImpl implements SimulationProjectService {
 
         setPage(param.getCurrentPage() == null ? 1 : param.getCurrentPage(), param.getPageSize() == null ? 10 : param.getPageSize());
 
-        List<SimulationManualProjectVo> simulationManualProjectVoList = simulationAutomaticSubProjectMapper.selectList(param);
-        simulationManualProjectVoList.forEach(simulationManualProjectVo -> {
+        List<SimulationManualProjectVO> simulationManualProjectVOList = simulationAutomaticSubProjectMapper.selectList(param);
+        simulationManualProjectVOList.forEach(simulationManualProjectVo -> {
             simulationManualProjectVo.setNowRunStateDict(getDictName(DictConstants.PROJECT_RUN_STATE, simulationManualProjectVo.getNowRunState()));
             simulationManualProjectVo.setEvaluationLevelDict(getDictName(DictConstants.EVALUATION_LEVEL, simulationManualProjectVo.getEvaluationLevel()));
         });
-        return new ResponseBodyVO<>(ResponseBodyVO.Response.SUCCESS, new PageInfo<>(simulationManualProjectVoList));
+        return new ResponseBodyVO<>(ResponseBodyVO.Response.SUCCESS, new PageInfo<>(simulationManualProjectVOList));
     }
 
     @Override
@@ -5092,7 +5110,7 @@ public class SimulationProjectServiceImpl implements SimulationProjectService {
      *
      * @return
      */
-    private List<AlgorithmScoreVo> getFirstTargetScore(String id) {
+    private List<AlgorithmScoreVO> getFirstTargetScore(String id) {
         // 算法测试得分表
         /*
          * 汇总测试得分计算方法：（每一项一级指标的测试得分*测试权重）累加
@@ -5103,7 +5121,7 @@ public class SimulationProjectServiceImpl implements SimulationProjectService {
         SimulationMptFirstTargetScorePO simulationMptFirstTargetScorePo = new SimulationMptFirstTargetScorePO();
         simulationMptFirstTargetScorePo.setPId(id);
         List<SimulationMptFirstTargetScorePO> pos = simulationMptFirstTargetScoreMapper.selectFirstTargetByPid(simulationMptFirstTargetScorePo);
-        List<AlgorithmScoreVo> algorithmScoreVoList = new ArrayList<>();
+        List<AlgorithmScoreVO> algorithmScoreVOList = new ArrayList<>();
         if (!isEmpty(pos)) {
             // StringBuilder stringBuilder = new StringBuilder();
             // 汇总数据初始化
@@ -5113,7 +5131,7 @@ public class SimulationProjectServiceImpl implements SimulationProjectService {
             Integer totalSceneScoreNum = 0;
             for (SimulationMptFirstTargetScorePO v : pos) {
                 // stringBuilder.append(v.getSublistName()).append("、");
-                AlgorithmScoreVo algorithmScoreVo = new AlgorithmScoreVo();
+                AlgorithmScoreVO algorithmScoreVo = new AlgorithmScoreVO();
                 algorithmScoreVo.setProjectName(v.getSublistName());
                 Integer sceneNum = v.getSceneNum();
                 totalSceneNum += sceneNum;
@@ -5130,11 +5148,11 @@ public class SimulationProjectServiceImpl implements SimulationProjectService {
                 totalSceneScoreNum += scoreNum;
                 double tempScoreRatio = Double.valueOf(scoreNum) / Double.valueOf(sceneNum) * 100;
                 algorithmScoreVo.setScoreRatio(saveTwoDecimalPlaces(tempScoreRatio));
-                algorithmScoreVoList.add(algorithmScoreVo);
+                algorithmScoreVOList.add(algorithmScoreVo);
                 totalScoreRatio += tempScoreRatio;
             }
             // 汇总
-            AlgorithmScoreVo algorithmScoreVo = new AlgorithmScoreVo();
+            AlgorithmScoreVO algorithmScoreVo = new AlgorithmScoreVO();
             algorithmScoreVo.setProjectName("汇总");
             algorithmScoreVo.setSceneNum(totalSceneNum);
             // 指标权重总和默认是100%
@@ -5142,10 +5160,10 @@ public class SimulationProjectServiceImpl implements SimulationProjectService {
             algorithmScoreVo.setScore(saveTwoDecimalPlaces(totalScore));
             totalScoreRatio = Double.valueOf(totalSceneScoreNum) / Double.valueOf(totalSceneNum) * 100;
             algorithmScoreVo.setScoreRatio(saveTwoDecimalPlaces(totalScoreRatio));
-            algorithmScoreVoList.add(algorithmScoreVo);
+            algorithmScoreVOList.add(algorithmScoreVo);
         }
 
-        return algorithmScoreVoList;
+        return algorithmScoreVOList;
 
     }
 

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

@@ -32,7 +32,7 @@
 
     <!--查询自动项目列表-->
     <select id="selectAutomaticProjectList" parameterType="api.common.pojo.param.project.SimulationManualProjectParam"
-            resultType="api.common.pojo.vo.project.SimulationManualProjectVo">
+            resultType="api.common.pojo.vo.project.SimulationManualProjectVO">
         select id,
         project_date,
         project_num,
@@ -200,7 +200,7 @@
 
     <!--自动运行项目详细页面信息-->
     <select id="selectAutomaticProjectInfoById" parameterType="string"
-            resultType="api.common.pojo.vo.project.AutomaticProjectVo">
+            resultType="api.common.pojo.vo.project.AutomaticProjectVO">
         select p.id,
                p.project_name,
                p.project_describe,

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

@@ -77,7 +77,7 @@
     </update>
 
     <!--查询列表-->
-    <select id="selectList" parameterType="api.common.pojo.param.project.SimulationManualProjectParam" resultType="api.common.pojo.vo.project.SimulationManualProjectVo" >
+    <select id="selectList" parameterType="api.common.pojo.param.project.SimulationManualProjectParam" resultType="api.common.pojo.vo.project.SimulationManualProjectVO" >
         select id,
                parent_id,
                parent_project_id,
@@ -112,7 +112,7 @@
     </select>
 
     <!--关联主表查询-->
-    <select id="selectProjectInfo" parameterType="api.common.pojo.param.project.SimulationManualProjectParam" resultType="api.common.pojo.vo.project.SimulationManualProjectVo">
+    <select id="selectProjectInfo" parameterType="api.common.pojo.param.project.SimulationManualProjectParam" resultType="api.common.pojo.vo.project.SimulationManualProjectVO">
         select s.id,
                p.scene,
                s.project_id,

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

@@ -139,7 +139,7 @@
 
     <!--查询项目列表-->
     <select id="selectProjectList" parameterType="api.common.pojo.param.project.SimulationManualProjectParam"
-            resultType="api.common.pojo.vo.project.SimulationManualProjectVo">
+            resultType="api.common.pojo.vo.project.SimulationManualProjectVO">
         select * from simulation_manual_project
         <where>
             is_deleted = '0'