commit

api-common/src/main/java/api/common/pojo/po/project/BasePo.java → api-common/src/main/java/api/common/pojo/po/project/BasePO.java

@@ -6,14 +6,13 @@ import lombok.Getter;
 import lombok.Setter;
 
 import java.sql.Timestamp;
-import java.util.Date;
 
 /**
  * 数据表公共字段
  */
 @Getter
 @Setter
-public class BasePo {
+public class BasePO {
 
     //id
     private String id;

api-common/src/main/java/api/common/pojo/po/project/ManualProjectTaskPo.java → api-common/src/main/java/api/common/pojo/po/project/ManualProjectTaskPO.java

@@ -9,7 +9,7 @@ import java.util.Date;
 @NoArgsConstructor
 @AllArgsConstructor
 @Builder
-public class ManualProjectTaskPo extends BasePo {
+public class ManualProjectTaskPO extends BasePO {
     private String pId; //项目主表id
     private String sceneId; //场景id
     private String sceneName;   //场景名称

api-common/src/main/java/api/common/pojo/po/project/SimulationAutomaticProjectPo.java → api-common/src/main/java/api/common/pojo/po/project/SimulationAutomaticProjectPO.java

@@ -10,7 +10,7 @@ import java.util.Date;
  */
 @Getter
 @Setter
-public class SimulationAutomaticProjectPo extends BasePo {
+public class SimulationAutomaticProjectPO extends BasePO {
 
     //项目日期
     private Integer projectDate;

api-common/src/main/java/api/common/pojo/po/project/SimulationAutomaticSubProjectPo.java → api-common/src/main/java/api/common/pojo/po/project/SimulationAutomaticSubProjectPO.java

@@ -10,7 +10,7 @@ import java.util.Date;
  */
 @Getter
 @Setter
-public class SimulationAutomaticSubProjectPo extends BasePo {
+public class SimulationAutomaticSubProjectPO extends BasePO {
 
     //主项目表id
     private String parentId;

api-common/src/main/java/api/common/pojo/po/project/SimulationManualProjectPO.java

@@ -0,0 +1,43 @@
+package api.common.pojo.po.project;
+
+import lombok.Getter;
+import lombok.Setter;
+import lombok.ToString;
+
+import java.util.Date;
+
+/**
+ * 运行项目数据
+ */
+@ToString
+@Getter
+@Setter
+public class SimulationManualProjectPO extends BasePO {
+    private Integer projectDate;    //项目日期
+    private Integer projectNum; //项目序号
+    private String projectId;   //项目id
+    private String projectName; //项目名称
+    private String projectDescribe; //项目描述
+    private String algorithm;   //算法
+    private String vehicle; //车辆 id
+    private String scene;    //场景（包）
+    private String operationCycle;  //运行周期
+    private String parallelism; //并行度
+    private String ruleView;     //规则查看
+    private String isChoiceGpu; //是否选择gpu(0:是，1：否)
+    private Long automaticRunTimes; //自动运行次数
+    private Date lastRunTime;   //最近运行时间
+    private String automaticRunState;   //自动运行状态(0：开启，1：关闭)
+    private String nowRunState; //当前运行状态
+    private String evaluationLevel; //评测等级
+    private Date startTime; //开始时间
+    private Date finishTime;     //完成时间
+    private Long maxSimulationTime; //最大仿真时间
+    private Double algorithmScore;  //算法得分
+    private String algorithmType;   //算法类型
+    private String details;
+    private String algorithmArray;  //算法数组（公私有）
+    private String vehicleArray;    //车辆模型数组（公私有）
+    private String sceneArray;  //场景测试包数组（公私有）
+    private String newId;  // 用于重新运行时修改项目id
+}

api-common/src/main/java/api/common/pojo/po/project/SimulationManualProjectPo.java

@@ -1,92 +0,0 @@
-package api.common.pojo.po.project;
-
-import lombok.Getter;
-import lombok.Setter;
-import lombok.ToString;
-
-import java.util.Date;
-
-/**
- * 运行项目数据
- */
-@ToString
-@Getter
-@Setter
-public class SimulationManualProjectPo extends BasePo {
-
-    //项目日期
-    private Integer projectDate;
-
-    //项目序号
-    private Integer projectNum;
-
-    //项目id
-    private String projectId;
-
-    //项目名称
-    private String projectName;
-
-    //项目描述
-    private String projectDescribe;
-
-    //算法
-    private String algorithm;
-
-    //车辆 id
-    private String vehicle;
-
-    //场景（包）
-    private String scene;
-
-    //运行周期
-    private String operationCycle;
-
-    //并行度
-    private String parallelism;
-
-    //规则查看
-    private String ruleView;
-
-    //是否选择gpu(0:是，1：否)
-    private String isChoiceGpu;
-
-    //自动运行次数
-    private Long automaticRunTimes;
-
-    //最近运行时间
-    private Date lastRunTime;
-
-    //自动运行状态(0：开启，1：关闭)
-    private String automaticRunState;
-
-    //当前运行状态
-    private String nowRunState;
-
-    //评测等级
-    private String evaluationLevel;
-
-    //开始时间
-    private Date startTime;
-
-    //完成时间
-    private Date finishTime;
-
-    //最大仿真时间
-    private Long maxSimulationTime;
-
-    //算法得分
-    private Double algorithmScore;
-
-    //算法类型
-    private String algorithmType;
-    private String details;
-
-    //算法数组（公私有）
-    private String algorithmArray;
-    //车辆模型数组（公私有）
-    private String vehicleArray;
-    //场景测试包数组（公私有）
-    private String sceneArray;
-
-
-}

api-common/src/main/java/api/common/pojo/po/project/SimulationMptFirstTargetScorePo.java → api-common/src/main/java/api/common/pojo/po/project/SimulationMptFirstTargetScorePO.java

@@ -8,7 +8,7 @@ import lombok.Setter;
  */
 @Getter
 @Setter
-public class SimulationMptFirstTargetScorePo extends BasePo {
+public class SimulationMptFirstTargetScorePO extends BasePO {
 
     //项目id(id)
     private String pId;

api-common/src/main/java/api/common/pojo/po/project/SimulationMptLastTargetScorePo.java → api-common/src/main/java/api/common/pojo/po/project/SimulationMptLastTargetScorePO.java

@@ -8,7 +8,7 @@ import lombok.Setter;
  */
 @Getter
 @Setter
-public class SimulationMptLastTargetScorePo extends BasePo {
+public class SimulationMptLastTargetScorePO extends BasePO {
 
 
     //项目id（id）

api-common/src/main/java/api/common/pojo/po/project/SimulationMptSceneScorePo.java → api-common/src/main/java/api/common/pojo/po/project/SimulationMptSceneScorePO.java

@@ -8,7 +8,7 @@ import lombok.Setter;
  */
 @Getter
 @Setter
-public class SimulationMptSceneScorePo extends BasePo {
+public class SimulationMptSceneScorePO extends BasePO {
 
     //id
     private String id;

simulation-resource-server/src/main/java/com/css/simulation/resource/feign/fallback/MonitorServiceFallback.java

@@ -2,7 +2,6 @@ package com.css.simulation.resource.feign.fallback;
 
 import api.common.pojo.common.ResponseBodyVO;
 import api.common.pojo.param.project.SimulationManualProjectParam;
-import api.common.pojo.po.project.SimulationManualProjectPo;
 import com.css.simulation.resource.feign.MonitorService;
 import org.springframework.stereotype.Service;
 

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

@@ -32,8 +32,9 @@ public class SimulationProjectController {
   //* -------------------------------- 项目运行 --------------------------------
 
   /**
-   * 1. 手动项目：第一次运行项目
-   * 2. 手动项目：重新运行项目
+   * 1. 手动项目：第一次运行项目 10 -> 20
+   * 2. 手动项目：终止项目 20 -> 40
+   * 3. 手动项目：重新运行项目 40 -> 20
    */
   @RequestMapping("updateProjectNowRunState")
   public ResponseBodyVO<String> updateProjectNowRunState(@RequestBody SimulationManualProjectParam param) {

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

@@ -14,19 +14,19 @@ import java.util.List;
 public interface SimulationAutomaticProjectMapper {
 
 
-     SimulationAutomaticProjectPo selectById(String id);
+     SimulationAutomaticProjectPO selectById(String id);
 
-     List<SimulationAutomaticProjectPo> selectAutomaticProjectByQuery(SimulationManualProjectParam param);
+     List<SimulationAutomaticProjectPO> selectAutomaticProjectByQuery(SimulationManualProjectParam param);
 
-     SimulationAutomaticProjectPo selectLastProjectId(Integer nowRq);
+     SimulationAutomaticProjectPO selectLastProjectId(Integer nowRq);
 
      List<SimulationManualProjectVo> selectAutomaticProjectList(SimulationManualProjectParam param);
 
-     int add(SimulationAutomaticProjectPo po);
+     int add(SimulationAutomaticProjectPO po);
 
-     int updateById(SimulationAutomaticProjectPo po);
+     int updateById(SimulationAutomaticProjectPO po);
 
-     List<SimulationAutomaticProjectPo> selectProjectNowRunState(String[] ids);
+     List<SimulationAutomaticProjectPO> selectProjectNowRunState(String[] ids);
 
      int deleteProject(String[] ids);
 
@@ -36,7 +36,7 @@ public interface SimulationAutomaticProjectMapper {
 
      int updateAlgorithmGitVersion(AlgorithmParameter algorithmParameter);
 
-     int updateAutomaticRunTimes(SimulationAutomaticProjectPo po);
+     int updateAutomaticRunTimes(SimulationAutomaticProjectPO po);
 
 
 }

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

@@ -1,7 +1,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.po.project.SimulationAutomaticSubProjectPO;
 import api.common.pojo.vo.project.SimulationManualProjectVo;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -14,7 +14,7 @@ import java.util.List;
 @Repository
 public interface SimulationAutomaticSubProjectMapper {
 
-     SimulationAutomaticSubProjectPo selectById(SimulationManualProjectParam param);
+     SimulationAutomaticSubProjectPO selectById(SimulationManualProjectParam param);
 
      @Select("        select p.scene\n" +
              "        from simulation_automatic_subproject s\n" +
@@ -22,11 +22,11 @@ public interface SimulationAutomaticSubProjectMapper {
              "        where s.id = #{id}")
      String selectSceneById(@Param("id") String id);
 
-     SimulationAutomaticSubProjectPo selectLastProjectId(String id);
+     SimulationAutomaticSubProjectPO selectLastProjectId(String id);
 
-     int addAutomaticSubProject(SimulationAutomaticSubProjectPo po);
+     int addAutomaticSubProject(SimulationAutomaticSubProjectPO po);
 
-     List<SimulationAutomaticSubProjectPo> selectProjectNowRunState(String[] ids);
+     List<SimulationAutomaticSubProjectPO> selectProjectNowRunState(String[] ids);
 
      int deleteProject(String[] ids);
 

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

@@ -1,6 +1,6 @@
 package com.css.simulation.resource.project.mapper;
 
-import api.common.pojo.po.project.SimulationMptFirstTargetScorePo;
+import api.common.pojo.po.project.SimulationMptFirstTargetScorePO;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Select;
 import org.springframework.stereotype.Repository;
@@ -11,7 +11,7 @@ import java.util.List;
 @Repository
 public interface SimulationMptFirstTargetScoreMapper {
 
-    SimulationMptFirstTargetScorePo selectFirstTargetScore(SimulationMptFirstTargetScorePo po);
+    SimulationMptFirstTargetScorePO selectFirstTargetScore(SimulationMptFirstTargetScorePO po);
 
     @Select("select sum(score * weight / 100.0)\n" +
             "from simulation_mpt_first_target_score\n" +
@@ -19,7 +19,7 @@ public interface SimulationMptFirstTargetScoreMapper {
             "  and p_id = #{pId,jdbcType=VARCHAR}")
     Double selectScoreOfProject(String projectId);
 
-    List<SimulationMptFirstTargetScorePo> selectFirstTargetByPid(SimulationMptFirstTargetScorePo po);
+    List<SimulationMptFirstTargetScorePO> selectFirstTargetByPid(SimulationMptFirstTargetScorePO po);
 
 
 }

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

@@ -1,6 +1,6 @@
 package com.css.simulation.resource.project.mapper;
 
-import api.common.pojo.po.project.SimulationMptLastTargetScorePo;
+import api.common.pojo.po.project.SimulationMptLastTargetScorePO;
 import org.apache.ibatis.annotations.Mapper;
 import org.springframework.stereotype.Repository;
 
@@ -8,7 +8,7 @@ import org.springframework.stereotype.Repository;
 @Repository
 public interface SimulationMptLastTargetScoreMapper {
 
-    SimulationMptLastTargetScorePo selectLastTargetScore(SimulationMptLastTargetScorePo po);
+    SimulationMptLastTargetScorePO selectLastTargetScore(SimulationMptLastTargetScorePO po);
 
 
 }

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

@@ -5,10 +5,10 @@ import api.common.pojo.po.algorithm.AlgorithmPO;
 import api.common.pojo.po.model.ConfigPO;
 import api.common.pojo.po.model.ConfigSensorPO;
 import api.common.pojo.po.model.VehiclePO;
-import api.common.pojo.po.project.SimulationManualProjectPo;
-import api.common.pojo.po.project.SimulationMptFirstTargetScorePo;
-import api.common.pojo.po.project.SimulationMptLastTargetScorePo;
-import api.common.pojo.po.project.SimulationMptSceneScorePo;
+import api.common.pojo.po.project.SimulationManualProjectPO;
+import api.common.pojo.po.project.SimulationMptFirstTargetScorePO;
+import api.common.pojo.po.project.SimulationMptLastTargetScorePO;
+import api.common.pojo.po.project.SimulationMptSceneScorePO;
 import api.common.pojo.po.scene.ScenePackagePO;
 import api.common.pojo.vo.project.*;
 import org.apache.ibatis.annotations.Mapper;
@@ -30,21 +30,21 @@ public interface SimulationProjectMapper {
             "          and id = #{id,jdbcType=VARCHAR}")
     String selectSceneById(@Param("id") String id);
 
-    int add(SimulationManualProjectPo po);
+    int add(SimulationManualProjectPO po);
 
-    int update(SimulationManualProjectPo po);
+    int update(SimulationManualProjectPO po);
 
-    SimulationManualProjectPo selectLastProjectId(Integer nowRq);
+    SimulationManualProjectPO selectLastProjectId(Integer nowRq);
 
-    List<SimulationManualProjectPo> selectProject(SimulationManualProjectParam param);
+    List<SimulationManualProjectPO> selectProject(SimulationManualProjectParam param);
 
     List<SimulationManualProjectVo> selectProjectList(SimulationManualProjectParam param);
 
-    SimulationManualProjectPo selectProjectById(SimulationManualProjectParam param);
+    SimulationManualProjectPO selectProjectById(SimulationManualProjectParam param);
 
-    List<SimulationManualProjectPo> selectProjectByName(SimulationManualProjectParam param);
+    List<SimulationManualProjectPO> selectProjectByName(SimulationManualProjectParam param);
 
-    SimulationManualProjectPo selectProjectBaseById(SimulationManualProjectParam param);
+    SimulationManualProjectPO selectProjectBaseById(SimulationManualProjectParam param);
 
 
     int deleteProject(String[] ids);
@@ -100,11 +100,11 @@ public interface SimulationProjectMapper {
 
     List<SublistScoreVo> selectsublistByRootId(SimulationManualProjectParam param);
 
-    int insertSimulationMptLastTargetScorePo(SimulationMptLastTargetScorePo po);
+    int insertSimulationMptLastTargetScorePo(SimulationMptLastTargetScorePO po);
 
-    int insertSimulationMptFirstTargetScorePo(SimulationMptFirstTargetScorePo po);
+    int insertSimulationMptFirstTargetScorePo(SimulationMptFirstTargetScorePO po);
 
-    List<SimulationMptSceneScorePo> selectSceneScore(SimulationMptSceneScorePo po);
+    List<SimulationMptSceneScorePO> selectSceneScore(SimulationMptSceneScorePO po);
 
     SystemUserVo selectUserById(String id);
 
@@ -118,7 +118,7 @@ public interface SimulationProjectMapper {
 
     List<ConfigSensorPO> selectConfigSensor(String id);
 
-    List<SimulationManualProjectPo> selectProjectNowRunState(String[] ids);
+    List<SimulationManualProjectPO> selectProjectNowRunState(String[] ids);
 
     List<SublistScoreVo> selectSubScore(SimulationManualProjectParam param);
 
@@ -132,9 +132,9 @@ public interface SimulationProjectMapper {
 
     int updateOtherAlgorithm(AlgorithmPO po);
 
-    AlgorithmPO selectalgorithmByQuery(AlgorithmPO po);
+    AlgorithmPO selectAlgorithmByQuery(AlgorithmPO po);
 
-    SimulationManualProjectPo selectProjectReportIdByAlgorithmId(String algorithmId);
+    SimulationManualProjectPO selectProjectReportIdByAlgorithmId(String algorithmId);
 
 
     @Update("update simulation_manual_project\n" +
@@ -142,4 +142,9 @@ public interface SimulationProjectMapper {
             "where id = #{projectId}")
     void updateDetailsById(@Param("projectId") String projectId, @Param("details") String details);
 
+    @Update("update simulation_manual_project\n" +
+            "set id = #{newId}\n" +
+            "where id = #{id}")
+    void updateIdById(SimulationManualProjectPO simulationManualProjectPo);
+
 }

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

@@ -2,8 +2,8 @@ package com.css.simulation.resource.project.mapper;
 
 import api.common.pojo.param.project.ProjectTaskParam;
 import api.common.pojo.param.project.SceneScoreParam;
-import api.common.pojo.po.project.ManualProjectTaskPo;
-import api.common.pojo.po.project.SimulationMptSceneScorePo;
+import api.common.pojo.po.project.ManualProjectTaskPO;
+import api.common.pojo.po.project.SimulationMptSceneScorePO;
 import api.common.pojo.vo.project.ManualProjectTaskVo;
 import api.common.pojo.vo.project.ProjectRunResultRatioNumVo;
 import api.common.pojo.vo.project.ProjectRunStateNumVo;
@@ -19,7 +19,7 @@ import java.util.Map;
 @Repository
 public interface SimulationProjectTaskMapper {
 
-    List<ManualProjectTaskPo> selectProjectTask(ProjectTaskParam vo);
+    List<ManualProjectTaskPO> selectProjectTask(ProjectTaskParam vo);
 
     List<ManualProjectTaskVo> selectProjectTaskByProjectId(ProjectTaskParam vo);
 
@@ -33,14 +33,14 @@ public interface SimulationProjectTaskMapper {
 
     List<SceneScoreVo> selectSceneScoreByIds(SceneScoreParam param);
 
-    SceneScoreVo selectSceneScoreNumQuery(SimulationMptSceneScorePo po);
+    SceneScoreVo selectSceneScoreNumQuery(SimulationMptSceneScorePO po);
 
     List<Map<String, Object>> selectRunTaskByState(Map map);
 
     //更新仿真结果到数据库
-    int updateTaksResult(ManualProjectTaskPo po);
+    int updateTaksResult(ManualProjectTaskPO po);
 
-    SceneScoreVo selectRunStateByAborted(SimulationMptSceneScorePo po);
+    SceneScoreVo selectRunStateByAborted(SimulationMptSceneScorePO po);
 
 
     List<ManualProjectTaskVo> selectProjectTaskById(String id);

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

@@ -118,12 +118,12 @@ public class SimulationProjectServiceImpl implements SimulationProjectService {
         if (isEmpty(param.getProjectName())) {
             return new ResponseBodyVO<>(ResponseBodyVO.Response.CLIENT_FAILURE, "工作名称不能为空。");
         }
-        SimulationManualProjectPo po = convertParamToPo(param);
+        SimulationManualProjectPO po = convertParamToPo(param);
 
         if (isEmpty(param.getId())) {
             // 工作名称一样的的不能创建
-            List<SimulationManualProjectPo> simulationManualProjectPos = simulationProjectMapper.selectProjectByName(param);
-            if (!isEmpty(simulationManualProjectPos)) {
+            List<SimulationManualProjectPO> simulationManualProjectPOS = simulationProjectMapper.selectProjectByName(param);
+            if (!isEmpty(simulationManualProjectPOS)) {
                 return new ResponseBodyVO<>(ResponseBodyVO.Response.CLIENT_FAILURE, "工作名称已经存在，请修改后再保存。");
             }
             po.createPo(AuthUtil.getCurrentUserId());
@@ -136,7 +136,7 @@ public class SimulationProjectServiceImpl implements SimulationProjectService {
             return new ResponseBodyVO<>(ResponseBodyVO.Response.SERVER_FAILURE, "添加失败");
         } else {
             // 取工作状态，仅未开始的才可以修改信息
-            SimulationManualProjectPo simulationManualProjectPo = simulationProjectMapper.selectProjectById(param);
+            SimulationManualProjectPO simulationManualProjectPo = simulationProjectMapper.selectProjectById(param);
             if (!ProjectRunStateEnum.NOT_START.getCode().equals(simulationManualProjectPo.getNowRunState())) {
                 return new ResponseBodyVO<>(ResponseBodyVO.Response.SERVER_FAILURE, "当前状态不支持修改。");
             }
@@ -209,7 +209,7 @@ public class SimulationProjectServiceImpl implements SimulationProjectService {
         if (isEmpty(param.getId())) {
             return new ResponseBodyVO<>(ResponseBodyVO.Response.CLIENT_FAILURE);
         }
-        SimulationManualProjectPo po = simulationProjectMapper.selectProjectById(param);
+        SimulationManualProjectPO po = simulationProjectMapper.selectProjectById(param);
         if (po == null) {
             return new ResponseBodyVO<>(ResponseBodyVO.Response.SERVER_FAILURE, "没有获取到数据。");
         }
@@ -240,8 +240,8 @@ public class SimulationProjectServiceImpl implements SimulationProjectService {
         String[] idArr = ids.split(",");
 
         // 仅有执行中的不能删除
-        List<SimulationManualProjectPo> pos = simulationProjectMapper.selectProjectNowRunState(idArr);
-        for (SimulationManualProjectPo p : pos) {
+        List<SimulationManualProjectPO> pos = simulationProjectMapper.selectProjectNowRunState(idArr);
+        for (SimulationManualProjectPO p : pos) {
             if (ProjectRunStateEnum.EXECUTION.getCode().equals(p.getNowRunState())) {
                 return new ResponseBodyVO<>(ResponseBodyVO.Response.SERVER_FAILURE, "数据不支持删除。");
             }
@@ -255,14 +255,16 @@ public class SimulationProjectServiceImpl implements SimulationProjectService {
     }
 
     /**
-     * 修改手动运行项目状态
+     * 1. 手动项目：第一次运行项目 10 -> 20
+     * 2. 手动项目：终止项目 20 -> 40
+     * 3. 手动项目：重新运行项目 40 -> 20
      */
     @SneakyThrows
     @Override
     public ResponseBodyVO<String> updateProjectNowRunState(SimulationManualProjectParam param) {
 
         // 1 查询项目详细信息
-        SimulationManualProjectPo po = projectUtil.getProjectInfo(param);
+        SimulationManualProjectPO po = projectUtil.getProjectInfo(param);
         // 2 项目终止信息直接推送
         if (DictConstants.PROJECT_TERMINATED.equals(param.getNowRunState())) {
             projectStopToKafka(po);
@@ -300,15 +302,21 @@ public class SimulationProjectServiceImpl implements SimulationProjectService {
                 log.info("项目 " + projectId + " 的详情信息为：" + infoJson);
                 // 保存项目详情信息
                 simulationProjectMapper.updateDetailsById(projectId, infoJson);
-//                if (DictConstants.PROJECT_TERMINATED.equals(info.getNowRunState())) {
-//
-//                }
-                if ("20".equals(param.getNowRunState())) {
+                if (DictConstants.PROJECT_RUNNING.equals(param.getNowRunState())) {
+                    if (DictConstants.PROJECT_TERMINATED.equals(info.getNowRunState())) {
+                        // 如果是重新运行的项目，修改项目ID
+                        SimulationManualProjectPO simulationManualProjectPO = new SimulationManualProjectPO();
+                        simulationManualProjectPO.setId(projectId);
+                        final String newId = StringUtil.getRandomUUID();
+                        simulationManualProjectPO.setNewId(newId);
+                        po.setId(newId);
+                        simulationProjectMapper.updateIdById(simulationManualProjectPO);    //此处注意事务
+                    }
                     // 设置开始时间
                     param.setStartTime(new Date());
                     // Kafka推送消息
                     projectRunToKafka(po);
-                } else if ("30".equals(param.getNowRunState())) {
+                } else if (DictConstants.PROJECT_COMPLETED.equals(param.getNowRunState())) {
                     // 设置完成时间
                     param.setFinishTime(new Date());
                 }
@@ -318,7 +326,7 @@ public class SimulationProjectServiceImpl implements SimulationProjectService {
         return new ResponseBodyVO<>(ResponseBodyVO.Response.SUCCESS);
     }
 
-    private void projectRunToKafka(SimulationManualProjectPo po) {
+    private void projectRunToKafka(SimulationManualProjectPO po) {
         try {
             log.info("准备发送项目消息：" + po);
             SimulationManualProjectKafkaParam kafkaParam = new SimulationManualProjectKafkaParam();
@@ -349,7 +357,7 @@ public class SimulationProjectServiceImpl implements SimulationProjectService {
         }
     }
 
-    private void projectStopToKafka(SimulationManualProjectPo po) {
+    private void projectStopToKafka(SimulationManualProjectPO po) {
         SimulationManualProjectKafkaParam kafkaParam = new SimulationManualProjectKafkaParam();
         kafkaParam.setProjectId(po.getId());
         kafkaParam.setType(DictConstants.PROJECT_TYPE_MANUAL);
@@ -369,7 +377,7 @@ public class SimulationProjectServiceImpl implements SimulationProjectService {
         }, failure -> log.error("发送消息失败:" + failure.getMessage()));
     }
 
-    private void autoProjectStopToKafka(SimulationAutomaticSubProjectPo po) {
+    private void autoProjectStopToKafka(SimulationAutomaticSubProjectPO po) {
         SimulationManualProjectKafkaParam kafkaParam = new SimulationManualProjectKafkaParam();
         kafkaParam.setProjectId(po.getId());
         kafkaParam.setType(DictConstants.PROJECT_TYPE_AUTO_SUB);
@@ -396,7 +404,7 @@ public class SimulationProjectServiceImpl implements SimulationProjectService {
 
         ProjectDetailsVo projectDetailsVo = null;
         if (DictConstants.PROJECT_TYPE_MANUAL.equals(param.getProjectType())) { // 手动运行任务
-            SimulationManualProjectPo po = simulationProjectMapper.selectProjectById(param);
+            SimulationManualProjectPO po = simulationProjectMapper.selectProjectById(param);
             projectDetailsVo = JsonUtil.jsonToBean(po.getDetails(), ProjectDetailsVo.class);
             projectDetailsVo.setEvaluationLevel(getDictName(DictConstants.EVALUATION_LEVEL, po.getEvaluationLevel()));
             projectDetailsVo.setStartTime(getRqStr(po.getStartTime(), 1));
@@ -491,11 +499,11 @@ public class SimulationProjectServiceImpl implements SimulationProjectService {
         ProjectDetailsVo projectDetailsVo = new ProjectDetailsVo();
 
         // 封装要使用到的数据
-        SimulationManualProjectPo poParam = new SimulationManualProjectPo();
+        SimulationManualProjectPO poParam = new SimulationManualProjectPO();
 
         if (DictConstants.PROJECT_TYPE_MANUAL.equals(param.getProjectType())) { // 手动运行任务
             // 项目基本信息
-            SimulationManualProjectPo po = simulationProjectMapper.selectProjectById(param);
+            SimulationManualProjectPO po = simulationProjectMapper.selectProjectById(param);
             if (po == null) {
                 return new ResponseBodyVO<>(ResponseBodyVO.Response.SERVER_FAILURE, "没有获取到数据");
             }
@@ -793,7 +801,7 @@ public class SimulationProjectServiceImpl implements SimulationProjectService {
     public ResponseBodyVO<ProjectReportVo> selectProjectReportById(SimulationManualProjectParam param) {
         String projectType = param.getProjectType();
         // 封装要使用到的数据
-        SimulationManualProjectPo poParam = new SimulationManualProjectPo();
+        SimulationManualProjectPO poParam = new SimulationManualProjectPO();
 
         if (DictConstants.PROJECT_TYPE_MANUAL.equals(projectType)) {
             // 项目基本信息
@@ -827,9 +835,9 @@ public class SimulationProjectServiceImpl implements SimulationProjectService {
          */
 
         // 获取得分表一级指标信息
-        SimulationMptFirstTargetScorePo par = new SimulationMptFirstTargetScorePo();
+        SimulationMptFirstTargetScorePO par = new SimulationMptFirstTargetScorePO();
         par.setPId(poParam.getId());
-        List<SimulationMptFirstTargetScorePo> pos = simulationMptFirstTargetScoreMapper.selectFirstTargetByPid(par);
+        List<SimulationMptFirstTargetScorePO> pos = simulationMptFirstTargetScoreMapper.selectFirstTargetByPid(par);
 
         List<AlgorithmScoreVo> algorithmScoreVoList = new ArrayList<>();
         String evaluationLevelReport;
@@ -843,7 +851,7 @@ public class SimulationProjectServiceImpl implements SimulationProjectService {
         int totalSceneScoreNum = 0;
 
         // 根据一级指标表结果获取平分细则
-        for (SimulationMptFirstTargetScorePo firstTargetScorePo : pos) {
+        for (SimulationMptFirstTargetScorePO firstTargetScorePo : pos) {
             // 获取指标信息
             int sceneNum = firstTargetScorePo.getSceneNum(); // 一级指标包含场景数量
             String weight = firstTargetScorePo.getWeight(); // 一级指标权重
@@ -916,7 +924,7 @@ public class SimulationProjectServiceImpl implements SimulationProjectService {
         return new ResponseBodyVO<>(ResponseBodyVO.Response.SUCCESS, projectReportVo);
     }
 
-    private AlgorithmPO getAlgorithmInfo(SimulationManualProjectPo po) {
+    private AlgorithmPO getAlgorithmInfo(SimulationManualProjectPO po) {
         AlgorithmPO algorithmBaseInfoVo = null;
         String algorithmId = po.getAlgorithm();
         String algorithmType = po.getAlgorithmType();
@@ -1004,11 +1012,11 @@ public class SimulationProjectServiceImpl implements SimulationProjectService {
         ProjectTaskParam projectTaskParam = new ProjectTaskParam();
         projectTaskParam.setPId(id);
         projectTaskParam.setId(taskId);
-        List<ManualProjectTaskPo> pos = simulationProjectTaskMapper.selectProjectTask(projectTaskParam);
+        List<ManualProjectTaskPO> pos = simulationProjectTaskMapper.selectProjectTask(projectTaskParam);
         if (CollectionUtil.isEmpty(pos)) {
             return new ResponseBodyVO<>(ResponseBodyVO.Response.SERVER_FAILURE, "没有获取到任务信息。");
         }
-        ManualProjectTaskPo po = pos.get(0);
+        ManualProjectTaskPO po = pos.get(0);
         resultVo.setTaskId(po.getId());
         String sceneId = po.getSceneId();
         String sceneType = po.getSceneType(); // 4
@@ -1020,9 +1028,9 @@ public class SimulationProjectServiceImpl implements SimulationProjectService {
         resultVo.setFinishState(po.getRunResult()); // Completed
         resultVo.setSceneDescribe(""); // 场景描述设置为空
         // -------------------------------- 获取任务得分详情 --------------------------------
-        SimulationManualProjectPo poParam = new SimulationManualProjectPo();
+        SimulationManualProjectPO poParam = new SimulationManualProjectPO();
         if (DictConstants.PROJECT_TYPE_MANUAL.equals(projectType)) {
-            SimulationManualProjectPo spo = simulationProjectMapper.selectProjectBaseById(param);
+            SimulationManualProjectPO spo = simulationProjectMapper.selectProjectBaseById(param);
             Optional.ofNullable(spo).orElseThrow(() -> new RuntimeException("没有获取到数据。"));
             poParam = spo;
         } else if (DictConstants.PROJECT_TYPE_AUTO_SUB.equals(projectType)) {
@@ -1570,8 +1578,8 @@ public class SimulationProjectServiceImpl implements SimulationProjectService {
         result.add(scenePackageDropDown);
     }
 
-    private SimulationManualProjectPo convertParamToPo(SimulationManualProjectParam param) {
-        SimulationManualProjectPo po = new SimulationManualProjectPo();
+    private SimulationManualProjectPO convertParamToPo(SimulationManualProjectParam param) {
+        SimulationManualProjectPO po = new SimulationManualProjectPO();
         po.setId(param.getId());
         po.setProjectName(param.getProjectName());
         po.setProjectDescribe(param.getProjectDescribe());
@@ -1631,7 +1639,7 @@ public class SimulationProjectServiceImpl implements SimulationProjectService {
         simulationManualProjectVo.setCreateTimeFmt(getRqStr(simulationManualProjectVo.getCreateTime(), 1));
     }
 
-    private void convertPoToVo(SimulationManualProjectPo po, SimulationManualProjectSingleVo vo) {
+    private void convertPoToVo(SimulationManualProjectPO po, SimulationManualProjectSingleVo vo) {
         vo.setId(po.getId());
         vo.setProjectName(po.getProjectName());
         vo.setProjectDescribe(po.getProjectDescribe());
@@ -1645,10 +1653,10 @@ public class SimulationProjectServiceImpl implements SimulationProjectService {
 
     }
 
-    private void createProjectId(SimulationManualProjectPo po) {
+    private void createProjectId(SimulationManualProjectPO po) {
         Integer nowRq = getRq(null, 0);
         po.setProjectDate(nowRq);
-        SimulationManualProjectPo po1 = simulationProjectMapper.selectLastProjectId(nowRq);
+        SimulationManualProjectPO po1 = simulationProjectMapper.selectLastProjectId(nowRq);
         if (po1 == null) {
             // 生成新id
             po.setProjectNum(1);
@@ -1659,10 +1667,10 @@ public class SimulationProjectServiceImpl implements SimulationProjectService {
 
     }
 
-    private void createProjectId(SimulationAutomaticProjectPo po) {
+    private void createProjectId(SimulationAutomaticProjectPO po) {
         Integer nowRq = getRq(null, 0);
         po.setProjectDate(nowRq);
-        SimulationAutomaticProjectPo po1 = simulationAutomaticProjectMapper.selectLastProjectId(nowRq);
+        SimulationAutomaticProjectPO po1 = simulationAutomaticProjectMapper.selectLastProjectId(nowRq);
         if (po1 == null) {
             // 生成新id
             po.setProjectNum(1);
@@ -1769,7 +1777,7 @@ public class SimulationProjectServiceImpl implements SimulationProjectService {
         }
     }
 
-    private ManualProjectTaskVo convertManualProjectTaskPoToVo(ManualProjectTaskPo po) {
+    private ManualProjectTaskVo convertManualProjectTaskPoToVo(ManualProjectTaskPO po) {
         ManualProjectTaskVo manualProjectTaskVo = new ManualProjectTaskVo();
         manualProjectTaskVo.setId(po.getId());
         manualProjectTaskVo.setPId(po.getPId());
@@ -2459,10 +2467,10 @@ public class SimulationProjectServiceImpl implements SimulationProjectService {
     }
 
     private void setLastTargetScore(ScenePackageSubListVO vo, String pId) {
-        SimulationMptLastTargetScorePo poParam = new SimulationMptLastTargetScorePo();
+        SimulationMptLastTargetScorePO poParam = new SimulationMptLastTargetScorePO();
         poParam.setPId(pId);
         poParam.setTarget(vo.getSublistId());
-        SimulationMptLastTargetScorePo po = simulationMptLastTargetScoreMapper.selectLastTargetScore(poParam);
+        SimulationMptLastTargetScorePO po = simulationMptLastTargetScoreMapper.selectLastTargetScore(poParam);
         if (po != null) {
             vo.setNotStandardSceneNum(po.getNotStandardSceneNum());
             vo.setScore(po.getScore());
@@ -2472,10 +2480,10 @@ public class SimulationProjectServiceImpl implements SimulationProjectService {
     }
 
     private void setFirstTargetScore(ScenePackageSubListVO vo, String pId) {
-        SimulationMptFirstTargetScorePo poParam = new SimulationMptFirstTargetScorePo();
+        SimulationMptFirstTargetScorePO poParam = new SimulationMptFirstTargetScorePO();
         poParam.setPId(pId);
         poParam.setTarget(vo.getSublistId());
-        SimulationMptFirstTargetScorePo po = simulationMptFirstTargetScoreMapper.selectFirstTargetScore(poParam);
+        SimulationMptFirstTargetScorePO po = simulationMptFirstTargetScoreMapper.selectFirstTargetScore(poParam);
         if (po != null) {
             vo.setScore(po.getScore());
         }
@@ -2587,7 +2595,7 @@ public class SimulationProjectServiceImpl implements SimulationProjectService {
     }
 
     private void setScoreNum(String sublistId, String pId, SceneScoreVo resultVo) {
-        SimulationMptSceneScorePo po = new SimulationMptSceneScorePo();
+        SimulationMptSceneScorePO po = new SimulationMptSceneScorePO();
         po.setPId(pId);
         po.setLastTargerId(sublistId);
         SceneScoreVo sceneScoreVo = simulationProjectTaskMapper.selectSceneScoreNumQuery(po);
@@ -2599,7 +2607,7 @@ public class SimulationProjectServiceImpl implements SimulationProjectService {
      *
      * @return
      */
-    private String getEvaluationLevel(SimulationManualProjectPo po) {
+    private String getEvaluationLevel(SimulationManualProjectPO po) {
         /*
          * 汇总测试得分(计算评级)计算方法：（每一项一级指标的测试得分*测试权重）累加
          */
@@ -2611,11 +2619,11 @@ public class SimulationProjectServiceImpl implements SimulationProjectService {
             double totalScore = 0.0;
             for (ScenePackageSubListVO scenePackageSubListVO : scenePackageSubListVOS) {
                 double weightDouble = Double.parseDouble(scenePackageSubListVO.getWeight());
-                SimulationMptFirstTargetScorePo simulationMptFirstTargetScorePo = new SimulationMptFirstTargetScorePo();
+                SimulationMptFirstTargetScorePO simulationMptFirstTargetScorePo = new SimulationMptFirstTargetScorePO();
                 simulationMptFirstTargetScorePo.setPId(po.getId());
                 simulationMptFirstTargetScorePo.setTarget(scenePackageSubListVO.getSublistId());
                 // 单个二级指标得分
-                SimulationMptFirstTargetScorePo simulationMptFirstTargetScorePo1 = simulationMptFirstTargetScoreMapper.selectFirstTargetScore(simulationMptFirstTargetScorePo);
+                SimulationMptFirstTargetScorePO simulationMptFirstTargetScorePo1 = simulationMptFirstTargetScoreMapper.selectFirstTargetScore(simulationMptFirstTargetScorePo);
                 if (simulationMptFirstTargetScorePo1 == null) {
                     return evaluationLevelReport;
                 }
@@ -3944,7 +3952,7 @@ public class SimulationProjectServiceImpl implements SimulationProjectService {
 
     @Override
     public String selectProjectReportIdByAlgorithmId(String algorithmId) {
-        SimulationManualProjectPo po = simulationProjectMapper.selectProjectReportIdByAlgorithmId(algorithmId);
+        SimulationManualProjectPO po = simulationProjectMapper.selectProjectReportIdByAlgorithmId(algorithmId);
         if (StringUtil.isNotEmpty(po)) {
             return po.getId();
         }
@@ -4253,7 +4261,7 @@ public class SimulationProjectServiceImpl implements SimulationProjectService {
             }
 
             // 将数据保存到库
-            ManualProjectTaskPo manualProjectTaskPo = new ManualProjectTaskPo();
+            ManualProjectTaskPO manualProjectTaskPo = new ManualProjectTaskPO();
             manualProjectTaskPo.setId(taskId);
             manualProjectTaskPo.setPId(projectId);
             manualProjectTaskPo.setMileage(lc.toString());
@@ -4335,7 +4343,7 @@ public class SimulationProjectServiceImpl implements SimulationProjectService {
         // 压缩包根路径
         SimulationManualProjectParam sp = new SimulationManualProjectParam();
         sp.setId(id);
-        SimulationManualProjectPo spo = simulationProjectMapper.selectProjectBaseById(sp);
+        SimulationManualProjectPO spo = simulationProjectMapper.selectProjectBaseById(sp);
         String rootPath = spo.getProjectName();
         // FileUtil.createDirectory(rootPath);
 
@@ -4427,7 +4435,7 @@ public class SimulationProjectServiceImpl implements SimulationProjectService {
             // 打包pdf
             if (param.getIsPagePdf() != null && param.getIsPagePdf()) {
                 // 获取工作信息
-                SimulationManualProjectPo p = simulationProjectMapper.selectProjectBaseById(param);
+                SimulationManualProjectPO p = simulationProjectMapper.selectProjectBaseById(param);
                 final String algorithmName = algorithmMapper.selectAlgorithmNameByAlgorithmId(param.getAlgorithm());
 
                 pdfFile = new File(param.getLocalPdfFilePath());
@@ -4490,11 +4498,11 @@ public class SimulationProjectServiceImpl implements SimulationProjectService {
         // 创建自动运行任务时自动运行状态默认为关闭（1）
         param.setAutomaticRunState("1");
 
-        SimulationAutomaticProjectPo po = convertToSimulationAutomaticProjectPo(param);
+        SimulationAutomaticProjectPO po = convertToSimulationAutomaticProjectPo(param);
 
         if (isEmpty(param.getId())) {
             // 工作名称一样的的不能创建
-            List<SimulationAutomaticProjectPo> simulationManualProjectPos = simulationAutomaticProjectMapper.selectAutomaticProjectByQuery(param);
+            List<SimulationAutomaticProjectPO> simulationManualProjectPos = simulationAutomaticProjectMapper.selectAutomaticProjectByQuery(param);
             if (!isEmpty(simulationManualProjectPos)) {
                 return new ResponseBodyVO(ResponseBodyVO.Response.CLIENT_FAILURE, "工作名称已经存在，请修改后再保存");
             }
@@ -4508,7 +4516,7 @@ public class SimulationProjectServiceImpl implements SimulationProjectService {
             return new ResponseBodyVO(ResponseBodyVO.Response.SERVER_FAILURE, "添加失败");
         } else {
 
-            SimulationAutomaticProjectPo saPo = simulationAutomaticProjectMapper.selectById(param.getId());
+            SimulationAutomaticProjectPO saPo = simulationAutomaticProjectMapper.selectById(param.getId());
 
             // 自动运行状态为关闭的才可以修改
             if ("0".equals(saPo.getAutomaticRunState())) {
@@ -4531,10 +4539,10 @@ public class SimulationProjectServiceImpl implements SimulationProjectService {
         String ids = param.getIds();
         String[] idArr = ids.split(",");
 
-        List<SimulationAutomaticProjectPo> pos = simulationAutomaticProjectMapper.selectProjectNowRunState(idArr);
+        List<SimulationAutomaticProjectPO> pos = simulationAutomaticProjectMapper.selectProjectNowRunState(idArr);
 
         // 已经启动定时任务的项目不可以删除
-        for (SimulationAutomaticProjectPo p : pos) {
+        for (SimulationAutomaticProjectPO p : pos) {
             if ("0".equals(p.getAutomaticRunState())) {
                 return new ResponseBodyVO<>(ResponseBodyVO.Response.SERVER_FAILURE, "自动任务开启状态不支持删除");
             }
@@ -4556,7 +4564,7 @@ public class SimulationProjectServiceImpl implements SimulationProjectService {
         Optional.ofNullable(automaticRunState).orElseThrow(() -> new RuntimeException("自动运行状态不能为空。"));
 
         // 1 修改父项目停用状态
-        SimulationAutomaticProjectPo po = simulationAutomaticProjectMapper.selectById(id); // 查询父项目信息
+        SimulationAutomaticProjectPO po = simulationAutomaticProjectMapper.selectById(id); // 查询父项目信息
         if ("0".equals(param.getAutomaticRunState())) { // 启动
             // 1 判断算法是否已经被删除
             projectUtil.checkProject(po.getAlgorithm(), po.getVehicle(), po.getScene());
@@ -4574,7 +4582,7 @@ public class SimulationProjectServiceImpl implements SimulationProjectService {
         return new ResponseBodyVO<>(ResponseBodyVO.Response.SUCCESS);
     }
 
-    private void runProject(AlgorithmParameter algorithmParam, SimulationManualProjectParam simulationManualProjectParam, SimulationAutomaticProjectPo simulationAutomaticProjectPo) {
+    private void runProject(AlgorithmParameter algorithmParam, SimulationManualProjectParam simulationManualProjectParam, SimulationAutomaticProjectPO simulationAutomaticProjectPo) {
 
         // 更新算法版本
         simulationAutomaticProjectMapper.updateAlgorithmGitVersion(algorithmParam);
@@ -4629,19 +4637,19 @@ public class SimulationProjectServiceImpl implements SimulationProjectService {
         if (StringUtil.isEmpty(param.getId())) {
             throw new RuntimeException("id 不能为空。");
         }
-        SimulationAutomaticProjectPo po = simulationAutomaticProjectMapper.selectById(param.getId());
+        SimulationAutomaticProjectPO po = simulationAutomaticProjectMapper.selectById(param.getId());
         // 校验项目信息
         projectUtil.checkProject(po.getAlgorithm(), po.getVehicle(), po.getScene());
         // 组装数据
         String projectName = po.getProjectName();
-        SimulationAutomaticSubProjectPo subprojectPo = new SimulationAutomaticSubProjectPo();
+        SimulationAutomaticSubProjectPO subprojectPo = new SimulationAutomaticSubProjectPO();
         subprojectPo.createPo(po.getCreateUserId());
         subprojectPo.setParentId(po.getId());
         subprojectPo.setParentProjectId(po.getProjectId());
         subprojectPo.setProjectName(projectName);
         subprojectPo.setStartTime(new Date());
         subprojectPo.setNowRunState(ProjectRunStateEnum.EXECUTION.getCode());// 执行中
-        SimulationAutomaticSubProjectPo sPo = simulationAutomaticSubProjectMapper.selectLastProjectId(param.getId());
+        SimulationAutomaticSubProjectPO sPo = simulationAutomaticSubProjectMapper.selectLastProjectId(param.getId());
         if (StringUtil.isEmpty(sPo)) {
             subprojectPo.setProjectNum(1);
             subprojectPo.setProjectId(po.getProjectId() + "-1");
@@ -4673,7 +4681,7 @@ public class SimulationProjectServiceImpl implements SimulationProjectService {
         return new ResponseBodyVO<>(ResponseBodyVO.Response.SUCCESS, null);
     }
 
-    private void autoProjectRunToKafka(SimulationAutomaticProjectPo po, String subId) {
+    private void autoProjectRunToKafka(SimulationAutomaticProjectPO po, String subId) {
         SimulationManualProjectKafkaParam kafkaParam = new SimulationManualProjectKafkaParam();
         kafkaParam.setProjectId(subId); // 子任务id
         kafkaParam.setAlgorithmId(po.getAlgorithm());
@@ -4710,8 +4718,8 @@ public class SimulationProjectServiceImpl implements SimulationProjectService {
         }
         String[] idArr = ids.split(",");
         // 仅有执行中的不能删除
-        List<SimulationAutomaticSubProjectPo> pos = simulationAutomaticSubProjectMapper.selectProjectNowRunState(idArr);
-        for (SimulationAutomaticSubProjectPo p : pos) {
+        List<SimulationAutomaticSubProjectPO> pos = simulationAutomaticSubProjectMapper.selectProjectNowRunState(idArr);
+        for (SimulationAutomaticSubProjectPO p : pos) {
             if (ProjectRunStateEnum.EXECUTION.getCode().equals(p.getNowRunState())) {
                 return new ResponseBodyVO<>(ResponseBodyVO.Response.SERVER_FAILURE, "数据不支持删除");
             }
@@ -4795,7 +4803,7 @@ public class SimulationProjectServiceImpl implements SimulationProjectService {
         if (isEmpty(param.getId())) {
             return new ResponseBodyVO<>(ResponseBodyVO.Response.CLIENT_FAILURE, "id不能为空");
         }
-        SimulationAutomaticProjectPo po = simulationAutomaticProjectMapper.selectById(param.getId());
+        SimulationAutomaticProjectPO po = simulationAutomaticProjectMapper.selectById(param.getId());
         if (po == null) {
             return new ResponseBodyVO<>(ResponseBodyVO.Response.SERVER_FAILURE, "没有获取到数据");
         }
@@ -4828,7 +4836,7 @@ public class SimulationProjectServiceImpl implements SimulationProjectService {
             return new ResponseBodyVO<>(ResponseBodyVO.Response.CLIENT_FAILURE, "id或状态值不能为空");
         }
 
-        SimulationAutomaticSubProjectPo po = simulationAutomaticSubProjectMapper.selectById(param);
+        SimulationAutomaticSubProjectPO po = simulationAutomaticSubProjectMapper.selectById(param);
 
         if (po == null) {
             return new ResponseBodyVO<>(ResponseBodyVO.Response.SERVER_FAILURE, "数据没有找到");
@@ -4848,7 +4856,7 @@ public class SimulationProjectServiceImpl implements SimulationProjectService {
         return new ResponseBodyVO<>(ResponseBodyVO.Response.SERVER_FAILURE, "操作失败");
     }
 
-    private void convertPoToVo(SimulationAutomaticProjectPo po, SimulationManualProjectSingleVo vo) {
+    private void convertPoToVo(SimulationAutomaticProjectPO po, SimulationManualProjectSingleVo vo) {
         vo.setId(po.getId());
         vo.setProjectName(po.getProjectName());
         vo.setProjectDescribe(po.getProjectDescribe());
@@ -4863,8 +4871,8 @@ public class SimulationProjectServiceImpl implements SimulationProjectService {
         vo.setMaxSimulationTime(po.getMaxSimulationTime());
     }
 
-    private SimulationAutomaticProjectPo convertToSimulationAutomaticProjectPo(SimulationManualProjectParam param) {
-        SimulationAutomaticProjectPo po = new SimulationAutomaticProjectPo();
+    private SimulationAutomaticProjectPO convertToSimulationAutomaticProjectPo(SimulationManualProjectParam param) {
+        SimulationAutomaticProjectPO po = new SimulationAutomaticProjectPO();
         po.setId(param.getId());
         po.setProjectName(param.getProjectName());
         po.setProjectDescribe(param.getProjectDescribe());
@@ -5047,7 +5055,7 @@ public class SimulationProjectServiceImpl implements SimulationProjectService {
             po.setAlgorithmName(param.getAlgorithmName());
             po.setUploadMode(DictConstants.PLATFORM);
             po.setIsDeleted("0");
-            AlgorithmPO po1 = simulationProjectMapper.selectalgorithmByQuery(po);
+            AlgorithmPO po1 = simulationProjectMapper.selectAlgorithmByQuery(po);
             if (po1 == null) {
                 simulationProjectMapper.insertOtherAlgorithm(po);
             } else {
@@ -5060,7 +5068,7 @@ public class SimulationProjectServiceImpl implements SimulationProjectService {
 
     }
 
-    private void projectTaskStart(SimulationAutomaticProjectPo po) {
+    private void projectTaskStart(SimulationAutomaticProjectPO po) {
         SimulationManualProjectParam p = new SimulationManualProjectParam();
         p.setProjectId(po.getId());
         p.setCron(po.getOperationCycle());
@@ -5073,7 +5081,7 @@ public class SimulationProjectServiceImpl implements SimulationProjectService {
         }
     }
 
-    private void projectTaskStop(SimulationAutomaticProjectPo po) {
+    private void projectTaskStop(SimulationAutomaticProjectPO po) {
 
         SimulationManualProjectParam p = new SimulationManualProjectParam();
         p.setProjectId(po.getId());
@@ -5100,9 +5108,9 @@ public class SimulationProjectServiceImpl implements SimulationProjectService {
          * 汇总得分率计算方法：（每一项一级指标的所有场景得分不为0的数量_累加/每一项一级指标的场景数量_累加）换成（得分累加取平均值）
          */
         // 获取得分表一级指标信息
-        SimulationMptFirstTargetScorePo simulationMptFirstTargetScorePo = new SimulationMptFirstTargetScorePo();
+        SimulationMptFirstTargetScorePO simulationMptFirstTargetScorePo = new SimulationMptFirstTargetScorePO();
         simulationMptFirstTargetScorePo.setPId(id);
-        List<SimulationMptFirstTargetScorePo> pos = simulationMptFirstTargetScoreMapper.selectFirstTargetByPid(simulationMptFirstTargetScorePo);
+        List<SimulationMptFirstTargetScorePO> pos = simulationMptFirstTargetScoreMapper.selectFirstTargetByPid(simulationMptFirstTargetScorePo);
         List<AlgorithmScoreVo> algorithmScoreVoList = new ArrayList<>();
         if (!isEmpty(pos)) {
             // StringBuilder stringBuilder = new StringBuilder();
@@ -5111,7 +5119,7 @@ public class SimulationProjectServiceImpl implements SimulationProjectService {
             double totalScore = 0D;
             double totalScoreRatio = 0D;
             Integer totalSceneScoreNum = 0;
-            for (SimulationMptFirstTargetScorePo v : pos) {
+            for (SimulationMptFirstTargetScorePO v : pos) {
                 // stringBuilder.append(v.getSublistName()).append("、");
                 AlgorithmScoreVo algorithmScoreVo = new AlgorithmScoreVo();
                 algorithmScoreVo.setProjectName(v.getSublistName());

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

@@ -3,7 +3,7 @@ package com.css.simulation.resource.util;
 import api.common.pojo.constants.DictConstants;
 import api.common.pojo.param.project.SimulationManualProjectParam;
 import api.common.pojo.po.scheduler.SchedulerProjectPO;
-import api.common.pojo.po.project.SimulationManualProjectPo;
+import api.common.pojo.po.project.SimulationManualProjectPO;
 import api.common.util.StringUtil;
 import com.css.simulation.resource.algorithm.mapper.AlgorithmMapper;
 import com.css.simulation.resource.model.mapper.ModelConfigMapper;
@@ -70,11 +70,11 @@ public class ProjectUtil {
     }
 
 
-    public SimulationManualProjectPo getProjectInfo(SimulationManualProjectParam param) {
+    public SimulationManualProjectPO getProjectInfo(SimulationManualProjectParam param) {
         if (StringUtil.isEmpty(param.getId()) || StringUtil.isEmpty(param.getNowRunState())) {
             throw new RuntimeException("参数为空。");
         } else {
-            SimulationManualProjectPo po = simulationProjectMapper.selectProjectById(param);
+            SimulationManualProjectPO po = simulationProjectMapper.selectProjectById(param);
             if (po == null) {
                 throw new RuntimeException("手动项目" + param.getId() + "不存在。");
             }

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

@@ -4,7 +4,7 @@
 
 
     <!--根据id查询工作信息-->
-    <select id="selectById" parameterType="string" resultType="api.common.pojo.po.project.SimulationAutomaticProjectPo">
+    <select id="selectById" parameterType="string" resultType="api.common.pojo.po.project.SimulationAutomaticProjectPO">
         select *
         from simulation_automatic_project
         where id = #{id,jdbcType=VARCHAR}
@@ -13,7 +13,7 @@
     <!--根据条件查询工作信息-->
     <select id="selectAutomaticProjectByQuery"
             parameterType="api.common.pojo.param.project.SimulationManualProjectParam"
-            resultType="api.common.pojo.po.project.SimulationAutomaticProjectPo">
+            resultType="api.common.pojo.po.project.SimulationAutomaticProjectPO">
         select * from simulation_automatic_project
         where is_deleted = '0'
         <if test="projectName != null and projectName != ''">
@@ -22,7 +22,7 @@
     </select>
 
     <!--查询最新项目id-->
-    <select id="selectLastProjectId" resultType="api.common.pojo.po.project.SimulationAutomaticProjectPo">
+    <select id="selectLastProjectId" resultType="api.common.pojo.po.project.SimulationAutomaticProjectPO">
         select project_date, project_num, project_id
         from simulation_automatic_project
         where project_date = #{nowRq,jdbcType=INTEGER}
@@ -81,7 +81,7 @@
     </select>
 
     <!--创建项目信息-->
-    <insert id="add" parameterType="api.common.pojo.po.project.SimulationAutomaticProjectPo">
+    <insert id="add" parameterType="api.common.pojo.po.project.SimulationAutomaticProjectPO">
         insert into simulation_automatic_project
         (id,
          project_date,
@@ -138,7 +138,7 @@
     </insert>
 
     <!--修改项目信息-->
-    <update id="updateById" parameterType="api.common.pojo.po.project.SimulationAutomaticProjectPo">
+    <update id="updateById" parameterType="api.common.pojo.po.project.SimulationAutomaticProjectPO">
         update simulation_automatic_project
         set project_name        = #{projectName,jdbcType=VARCHAR},
             project_describe    = #{projectDescribe,jdbcType=VARCHAR},
@@ -162,7 +162,7 @@
 
 
     <!--查询项目自动运行状态-->
-    <select id="selectProjectNowRunState" resultType="api.common.pojo.po.project.SimulationAutomaticProjectPo">
+    <select id="selectProjectNowRunState" resultType="api.common.pojo.po.project.SimulationAutomaticProjectPO">
         select automatic_run_state
         from simulation_automatic_project
         where
@@ -192,7 +192,7 @@
     </update>
 
     <!--修改自动运行次数-->
-    <update id="updateAutomaticRunTimes" parameterType="api.common.pojo.po.project.SimulationAutomaticProjectPo">
+    <update id="updateAutomaticRunTimes" parameterType="api.common.pojo.po.project.SimulationAutomaticProjectPO">
         update simulation_automatic_project
         set automatic_Run_Times=#{automaticRunTimes,jdbcType=BIGINT}
         where id = #{id,jdbcType=VARCHAR}
@@ -229,4 +229,4 @@
     </update>
 
 
-</mapper>
+</mapper>

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

@@ -5,7 +5,7 @@
 
 
     <!--查询最新项目id-->
-    <select id="selectLastProjectId" parameterType="string" resultType="api.common.pojo.po.project.SimulationAutomaticSubProjectPo">
+    <select id="selectLastProjectId" parameterType="string" resultType="api.common.pojo.po.project.SimulationAutomaticSubProjectPO">
         select project_date, project_num, project_id, parent_project_id
         from simulation_automatic_subproject
         where parent_id=#{id,jdbcType=VARCHAR} and is_deleted = '0'
@@ -14,7 +14,7 @@
     </select>
 
     <!--添加自动运行子项目-->
-    <insert id="addAutomaticSubProject" parameterType="api.common.pojo.po.project.SimulationAutomaticSubProjectPo">
+    <insert id="addAutomaticSubProject" parameterType="api.common.pojo.po.project.SimulationAutomaticSubProjectPO">
         insert into simulation_automatic_subproject
         (
         id,
@@ -54,7 +54,7 @@
     </insert>
 
     <!--查询项目状态-->
-    <select id="selectProjectNowRunState" resultType="api.common.pojo.po.project.SimulationAutomaticSubProjectPo">
+    <select id="selectProjectNowRunState" resultType="api.common.pojo.po.project.SimulationAutomaticSubProjectPO">
         select now_run_state
         from simulation_automatic_subproject
         where
@@ -107,7 +107,7 @@
     </select>
 
     <!--根据id查询-->
-    <select id="selectById" parameterType="api.common.pojo.param.project.SimulationManualProjectParam" resultType="api.common.pojo.po.project.SimulationAutomaticSubProjectPo">
+    <select id="selectById" parameterType="api.common.pojo.param.project.SimulationManualProjectParam" resultType="api.common.pojo.po.project.SimulationAutomaticSubProjectPO">
         select * from simulation_automatic_subproject where id = #{id,jdbcType=VARCHAR} and is_deleted='0'
     </select>
 
@@ -143,4 +143,4 @@
 
 
 
-</mapper>
+</mapper>

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

@@ -3,14 +3,14 @@
 <mapper namespace="com.css.simulation.resource.project.mapper.SimulationMptFirstTargetScoreMapper" >
 
     <!--查询第一级指标得分-->
-    <select id="selectFirstTargetScore" parameterType="api.common.pojo.po.project.SimulationMptFirstTargetScorePo" resultType="api.common.pojo.po.project.SimulationMptFirstTargetScorePo">
+    <select id="selectFirstTargetScore" parameterType="api.common.pojo.po.project.SimulationMptFirstTargetScorePO" resultType="api.common.pojo.po.project.SimulationMptFirstTargetScorePO">
         select score
         from simulation_mpt_first_target_score
         where p_id = #{pId,jdbcType=VARCHAR} and target = #{target,jdbcType=VARCHAR} and is_deleted = '0'
     </select>
 
     <!--查询项目下所有一级指标-->
-    <select id="selectFirstTargetByPid" parameterType="api.common.pojo.po.project.SimulationMptFirstTargetScorePo" resultType="api.common.pojo.po.project.SimulationMptFirstTargetScorePo">
+    <select id="selectFirstTargetByPid" parameterType="api.common.pojo.po.project.SimulationMptFirstTargetScorePO" resultType="api.common.pojo.po.project.SimulationMptFirstTargetScorePO">
         select smfts.id,
                smfts.p_id,
                smfts.target,
@@ -31,4 +31,4 @@
         order by sps.seq
     </select>
 
-</mapper>
+</mapper>

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

@@ -4,10 +4,10 @@
 
 
     <!--查询最后一级指标得分-->
-    <select id="selectLastTargetScore" parameterType="api.common.pojo.po.project.SimulationMptLastTargetScorePo" resultType="api.common.pojo.po.project.SimulationMptLastTargetScorePo">
+    <select id="selectLastTargetScore" parameterType="api.common.pojo.po.project.SimulationMptLastTargetScorePO" resultType="api.common.pojo.po.project.SimulationMptLastTargetScorePO">
         select not_standard_scene_num, score, score_explain
         from simulation_mpt_last_target_score
         where p_id = #{pId,jdbcType=VARCHAR} and target = #{target,jdbcType=VARCHAR} and is_deleted = '0'
     </select>
 
-</mapper>
+</mapper>

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

@@ -4,7 +4,7 @@
 
 
     <!--添加-->
-    <insert id="add" parameterType="api.common.pojo.po.project.SimulationManualProjectPo">
+    <insert id="add" parameterType="api.common.pojo.po.project.SimulationManualProjectPO">
         insert into simulation_manual_project
         (id,
          project_date,
@@ -69,7 +69,7 @@
     </insert>
 
     <!--修改-->
-    <update id="update" parameterType="api.common.pojo.po.project.SimulationManualProjectPo">
+    <update id="update" parameterType="api.common.pojo.po.project.SimulationManualProjectPO">
         update simulation_manual_project
         set project_name        = #{projectName,jdbcType=VARCHAR},
             project_describe    = #{projectDescribe,jdbcType=VARCHAR},
@@ -89,7 +89,7 @@
 
 
     <!--查询项目最新id-->
-    <select id="selectLastProjectId" resultType="api.common.pojo.po.project.SimulationManualProjectPo">
+    <select id="selectLastProjectId" resultType="api.common.pojo.po.project.SimulationManualProjectPO">
         select project_date, project_num, project_id
         from simulation_manual_project
         where project_date = #{nowRq,jdbcType=INTEGER}
@@ -99,7 +99,7 @@
 
     <!--查询项目列表-->
     <select id="selectProject" parameterType="api.common.pojo.param.project.SimulationManualProjectParam"
-            resultType="api.common.pojo.po.project.SimulationManualProjectPo">
+            resultType="api.common.pojo.po.project.SimulationManualProjectPO">
         select * from simulation_manual_project
         <where>
             is_deleted = '0'
@@ -176,7 +176,7 @@
 
     <!--根据id查询-->
     <select id="selectProjectById" parameterType="api.common.pojo.param.project.SimulationManualProjectParam"
-            resultType="api.common.pojo.po.project.SimulationManualProjectPo">
+            resultType="api.common.pojo.po.project.SimulationManualProjectPO">
         select id,
                project_date,
                project_num,
@@ -218,7 +218,7 @@
 
     <!--根据项目名查询工作信息-->
     <select id="selectProjectByName" parameterType="api.common.pojo.param.project.SimulationManualProjectParam"
-            resultType="api.common.pojo.po.project.SimulationManualProjectPo">
+            resultType="api.common.pojo.po.project.SimulationManualProjectPO">
         select *
         from simulation_manual_project
         where project_name = #{projectName,jdbcType=VARCHAR}
@@ -227,7 +227,7 @@
 
     <!--根据id查询基本信息-->
     <select id="selectProjectBaseById" parameterType="api.common.pojo.param.project.SimulationManualProjectParam"
-            resultType="api.common.pojo.po.project.SimulationManualProjectPo">
+            resultType="api.common.pojo.po.project.SimulationManualProjectPO">
         select id,
                algorithm,
                scene,
@@ -254,7 +254,7 @@
     </update>
 
     <!--查询项目状态-->
-    <select id="selectProjectNowRunState" resultType="api.common.pojo.po.project.SimulationManualProjectPo">
+    <select id="selectProjectNowRunState" resultType="api.common.pojo.po.project.SimulationManualProjectPO">
         select now_run_state
         from simulation_manual_project
         where
@@ -520,7 +520,7 @@
 
     <!--保存项目最后一级指标信息-->
     <insert id="insertSimulationMptLastTargetScorePo"
-            parameterType="api.common.pojo.po.project.SimulationMptLastTargetScorePo">
+            parameterType="api.common.pojo.po.project.SimulationMptLastTargetScorePO">
         insert into simulation_mpt_last_target_score
         (id,
          p_id,
@@ -542,7 +542,7 @@
 
     <!--保存第一级指标信息-->
     <insert id="insertSimulationMptFirstTargetScorePo"
-            parameterType="api.common.pojo.po.project.SimulationMptFirstTargetScorePo">
+            parameterType="api.common.pojo.po.project.SimulationMptFirstTargetScorePO">
         insert into simulation_mpt_first_target_score
         (id,
          p_id,
@@ -563,8 +563,8 @@
     </insert>
 
     <!--查询场景得分-->
-    <select id="selectSceneScore" parameterType="api.common.pojo.po.project.SimulationMptSceneScorePo"
-            resultType="api.common.pojo.po.project.SimulationMptSceneScorePo">
+    <select id="selectSceneScore" parameterType="api.common.pojo.po.project.SimulationMptSceneScorePO"
+            resultType="api.common.pojo.po.project.SimulationMptSceneScorePO">
         select score, target_evaluate
         from simulation_mpt_scene_score
         where p_id = #{pId,jdbcType=VARCHAR} and is_deleted = '0'
@@ -677,7 +677,7 @@
     </update>
 
     <!--查询第三方算法信息是否已经存在-->
-    <select id="selectalgorithmByQuery" parameterType="api.common.pojo.po.algorithm.AlgorithmPO"
+    <select id="selectAlgorithmByQuery" parameterType="api.common.pojo.po.algorithm.AlgorithmPO"
             resultType="api.common.pojo.po.algorithm.AlgorithmPO">
         select id, algorithmName
         from algorithm
@@ -687,7 +687,7 @@
 
     <!--根据算法id获取最新的一条报告id-->
     <select id="selectProjectReportIdByAlgorithmId" parameterType="string"
-            resultType="api.common.pojo.po.project.SimulationManualProjectPo">
+            resultType="api.common.pojo.po.project.SimulationManualProjectPO">
         select id
         from simulation_manual_project
         where algorithm = #{algorithmId,jdbcType=VARCHAR}
@@ -771,4 +771,4 @@
         </if>
         order by modify_time desc
     </select>
-</mapper>
+</mapper>

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

@@ -5,7 +5,7 @@
 
     <!--查询任务列表-->
     <select id="selectProjectTask" parameterType="api.common.pojo.param.project.ProjectTaskParam"
-            resultType="api.common.pojo.po.project.ManualProjectTaskPo">
+            resultType="api.common.pojo.po.project.ManualProjectTaskPO">
         select id,
         p_id,
         last_targer_id,
@@ -169,7 +169,7 @@
     </select>
 
     <!--查询场景不等于0的得分的数量-->
-    <select id="selectSceneScoreNumQuery" parameterType="api.common.pojo.po.project.SimulationMptSceneScorePo"
+    <select id="selectSceneScoreNumQuery" parameterType="api.common.pojo.po.project.SimulationMptSceneScorePO"
             resultType="api.common.pojo.vo.project.SceneScoreVo">
         select count(*) as num
         from simulation_manual_project_task
@@ -192,7 +192,7 @@
     </select>
 
     <!--更新仿真结果到数据库-->
-    <update id="updateTaksResult" parameterType="api.common.pojo.po.project.ManualProjectTaskPo">
+    <update id="updateTaksResult" parameterType="api.common.pojo.po.project.ManualProjectTaskPO">
         update simulation_manual_project_task
         set mileage                      = #{mileage, jdbcType=VARCHAR},
             average_velocity             = #{averageVelocity, jdbcType=VARCHAR},
@@ -220,7 +220,7 @@
 
 
     <!--查询Aborted的数量-->
-    <select id="selectRunStateByAborted" parameterType="api.common.pojo.po.project.SimulationMptSceneScorePo"
+    <select id="selectRunStateByAborted" parameterType="api.common.pojo.po.project.SimulationMptSceneScorePO"
             resultType="api.common.pojo.vo.project.SceneScoreVo">
         select count(*) as num
         from simulation_manual_project_task
@@ -237,4 +237,4 @@
     </select>
 
 
-</mapper>
+</mapper>