Merge remote-tracking branch 'origin/master'

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

@@ -1,23 +0,0 @@
-package api.common.pojo.vo.project;
-
-import lombok.Getter;
-import lombok.Setter;
-
-/**
- * 算法基本信息
- */
-@Getter
-@Setter
-public class AlgorithmBaseInfoVo {
-
-    ///TODO 一下参数有待确认
-
-    //id
-    private String id;
-
-    //算法名称
-    private String algorithmName;
-
-    //算法描述
-    private String description;
-}

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

@@ -1,15 +0,0 @@
-package api.common.pojo.vo.project;
-
-import lombok.Getter;
-import lombok.Setter;
-
-/**
- * 车辆配置传感器
- */
-@Getter
-@Setter
-public class ConfigSensorVo {
-
-    private String sensorType;
-
-}

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

@@ -1,21 +0,0 @@
-package api.common.pojo.vo.project;
-
-import lombok.Getter;
-import lombok.Setter;
-
-/**
- * 车辆配置ov
- */
-@Getter
-@Setter
-public class ConfigVehicleVO {
-
-    private String id;
-
-    private String configName;
-
-    //传感器
-    private String sensor;
-
-    private String vehicleId;
-}

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

@@ -1,25 +0,0 @@
-package api.common.pojo.vo.project;
-
-import lombok.Getter;
-import lombok.Setter;
-
-/**
- * 车辆基本信息
- */
-@Getter
-@Setter
-public class VehicleBaseInfoVo {
-
-    //id
-    private String id;
-
-    //车辆名称
-    private String vehicleName;
-
-    //车辆描述
-    private String description;
-
-    //车辆图片地址
-    private String vehicleImage;
-
-}

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

@@ -10,7 +10,11 @@ import api.common.pojo.param.project.SimulationManualProjectKafkaParam;
 import api.common.pojo.param.project.SimulationManualProjectParam;
 import api.common.pojo.param.system.DictParam;
 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.*;
+import api.common.pojo.po.scene.ScenePackagePO;
 import api.common.pojo.po.scene.ScenePackageSublistPO;
 import api.common.pojo.vo.project.*;
 import api.common.pojo.vo.scene.RunProjectVO;
@@ -24,7 +28,10 @@ import com.css.simulation.resource.project.constants.ProjectConstants;
 import com.css.simulation.resource.project.enums.ProjectRunStateEnum;
 import com.css.simulation.resource.project.enums.SceneTypeEnum;
 import com.css.simulation.resource.project.feign.KafkaService;
+import com.css.simulation.resource.project.mapper.SimulationMptFirstTargetScoreMapper;
+import com.css.simulation.resource.project.mapper.SimulationMptLastTargetScoreMapper;
 import com.css.simulation.resource.project.mapper.SimulationProjectMapper;
+import com.css.simulation.resource.project.mapper.SimulationProjectTaskMapper;
 import com.css.simulation.resource.project.service.SimulationProjectService;
 import com.css.simulation.resource.system.service.DictService;
 import com.fasterxml.jackson.core.JsonProcessingException;
@@ -50,6 +57,15 @@ public class SimulationProjectServiceImpl implements SimulationProjectService {
     @Autowired
     private SimulationProjectMapper simulationProjectMapper;
 
+    @Autowired
+    private SimulationProjectTaskMapper simulationProjectTaskMapper;
+
+    @Autowired
+    private SimulationMptFirstTargetScoreMapper simulationMptFirstTargetScoreMapper;
+
+    @Autowired
+    private SimulationMptLastTargetScoreMapper simulationMptLastTargetScoreMapper;
+
     @Resource
     private KafkaService kafkaService;
 
@@ -280,27 +296,29 @@ public class SimulationProjectServiceImpl implements SimulationProjectService {
 
         //算法配置
         String algorithmId = po.getAlgorithm();
-        AlgorithmBaseInfoVo algorithmBaseInfoVo = simulationProjectMapper.selectAlgorithmBaseInfoById(algorithmId).get(0);
+        AlgorithmPO algorithmBaseInfoVo = simulationProjectMapper.selectAlgorithmBaseInfoById(algorithmId).get(0);
 
         //车辆配置
-        VehicleBaseInfoVo vehicleBaseInfoVo = null;
+        VehiclePO vehicleBaseInfoVo = null;
         String vehicleConfigId = po.getVehicle();
-        List<ConfigVehicleVO> configVehicleVOS = simulationProjectMapper.selectConfigVehicle(vehicleConfigId);
+        List<ConfigPO> configVehicleVOS = simulationProjectMapper.selectConfigVehicle(vehicleConfigId);
         if(!isEmpty(configVehicleVOS)){
-            ConfigVehicleVO configVehicleVO = configVehicleVOS.get(0);
+            ConfigPO configVehicleVO = configVehicleVOS.get(0);
             vehicleBaseInfoVo = simulationProjectMapper.selectVehicleBaseInfoById(configVehicleVO.getVehicleId()).get(0);
         }
         String vehicleImage = vehicleBaseInfoVo.getVehicleImage();
-        vehicleBaseInfoVo.setVehicleImage(vehicleImage.replaceFirst("Front side","Top"));
+        if(!isEmpty(vehicleImage)){
+            vehicleBaseInfoVo.setVehicleImage(vehicleImage.replaceFirst("Front side","Top"));
+        }
 
-        List<VehicleSensorVo> vehicleSensorVos = simulationProjectMapper.selectVehicleSensor(vehicleConfigId);
+        List<ConfigSensorPO> vehicleSensorVos = simulationProjectMapper.selectVehicleSensor(vehicleConfigId);
 
         List<SensorBaseInfoVo> sensorCameraList = new ArrayList<>();
         List<SensorBaseInfoVo> sensorOgtList = new ArrayList<>();
         List<SensorBaseInfoVo> sensorLidarList = new ArrayList<>();
         List<SensorBaseInfoVo> sensorRadarList = new ArrayList<>();
         List<SensorBaseInfoVo> sensorGpsList = new ArrayList<>();
-        for(VehicleSensorVo vs : vehicleSensorVos){
+        for(ConfigSensorPO vs : vehicleSensorVos){
             String sensorType = vs.getSensorType();
             String sensorId = vs.getSensorId();
             if(DictConstants.SENSOR_CAMERA.equals(sensorType)){
@@ -346,9 +364,9 @@ public class SimulationProjectServiceImpl implements SimulationProjectService {
 //            }
 
             //任务运行状态统计
-            Integer size = simulationProjectMapper.selectProjectTaskNumByProjectId(projectTaskParam);
+            Integer size = simulationProjectTaskMapper.selectProjectTaskNumByProjectId(projectTaskParam);
 //            List<ProjectRunStateNumVo> projectRunStateNumVos = simulationProjectMapper.selectRunStateCount(po.getId());
-            projectRunStateNumVoList = simulationProjectMapper.selectRunStateCount(po.getId());
+            projectRunStateNumVoList = simulationProjectTaskMapper.selectRunStateCount(po.getId());
 
             /*状态统计统计数字，不统计比率
             for(ProjectRunStateNumVo pv : projectRunStateNumVos){
@@ -360,7 +378,7 @@ public class SimulationProjectServiceImpl implements SimulationProjectService {
             }*/
 
             //结果状态统计
-            List<ProjectRunResultRatioNumVo> projectRunResultRatioNumVos = simulationProjectMapper.selectRunResultCount(po.getId());
+            List<ProjectRunResultRatioNumVo> projectRunResultRatioNumVos = simulationProjectTaskMapper.selectRunResultCount(po.getId());
             for(ProjectRunResultRatioNumVo rv : projectRunResultRatioNumVos){
                 Integer num = rv.getNum();
                 Double d = (double)num/size;
@@ -404,16 +422,16 @@ public class SimulationProjectServiceImpl implements SimulationProjectService {
         return new ResponseBodyVO(ResponseBodyVO.Response.SUCCESS, projectDetailsVo);
     }
 
-    private void setVehicleConfig(SensorBaseInfoVo vo, VehicleSensorVo vs){
+    private void setVehicleConfig(SensorBaseInfoVo vo, ConfigSensorPO vs){
         vo.setConfigId(vs.getConfigId());
         vo.setSensorId(vs.getSensorId());
         vo.setSensorType(vs.getSensorType());
-        vo.setSensorX(saveTwoDecimalPlaces(vs.getSensorX()));
-        vo.setSensorY(saveTwoDecimalPlaces(vs.getSensorY()));
-        vo.setSensorZ(saveTwoDecimalPlaces(vs.getSensorZ()));
-        vo.setSensorH(saveTwoDecimalPlaces(vs.getSensorH()));
-        vo.setSensorP(saveTwoDecimalPlaces(vs.getSensorP()));
-        vo.setSensorR(saveTwoDecimalPlaces(vs.getSensorR()));
+        vo.setSensorX(saveTwoDecimalPlaces(vs.getSensorX().doubleValue()));
+        vo.setSensorY(saveTwoDecimalPlaces(vs.getSensorY().doubleValue()));
+        vo.setSensorZ(saveTwoDecimalPlaces(vs.getSensorZ().doubleValue()));
+        vo.setSensorH(saveTwoDecimalPlaces(vs.getSensorH().doubleValue()));
+        vo.setSensorP(saveTwoDecimalPlaces(vs.getSensorP().doubleValue()));
+        vo.setSensorR(saveTwoDecimalPlaces(vs.getSensorR().doubleValue()));
         vo.setSensorPort(vs.getSensorPort());
     }
 
@@ -431,7 +449,7 @@ public class SimulationProjectServiceImpl implements SimulationProjectService {
         }
         //算法配置
         String algorithmId = po.getAlgorithm();
-        AlgorithmBaseInfoVo algorithmBaseInfoVo = simulationProjectMapper.selectAlgorithmBaseInfoById(algorithmId).get(0);
+        AlgorithmPO algorithmBaseInfoVo = simulationProjectMapper.selectAlgorithmBaseInfoById(algorithmId).get(0);
 
 
         ProjectReportVo projectReportVo = new ProjectReportVo();
@@ -480,7 +498,7 @@ public class SimulationProjectServiceImpl implements SimulationProjectService {
                 simulationMptFirstTargetScorePo.setPId(po.getId());
                 simulationMptFirstTargetScorePo.setTarget(v.getSublistId());
                 //单个二级指标得分
-                SimulationMptFirstTargetScorePo simulationMptFirstTargetScorePo1 = simulationProjectMapper.selectFirstTargetScore(simulationMptFirstTargetScorePo);
+                SimulationMptFirstTargetScorePo simulationMptFirstTargetScorePo1 = simulationMptFirstTargetScoreMapper.selectFirstTargetScore(simulationMptFirstTargetScorePo);
                 Double score = simulationMptFirstTargetScorePo1.getScore();
                 totalScore += score*(weightDouble/100);
                 algorithmScoreVo.setScore(saveTwoDecimalPlaces(score));
@@ -577,7 +595,7 @@ public class SimulationProjectServiceImpl implements SimulationProjectService {
         ProjectTaskParam projectTaskParam = new ProjectTaskParam();
         projectTaskParam.setPId(id);
         projectTaskParam.setId(taskId);
-        List<ManualProjectTaskPo> pos = simulationProjectMapper.selectprojectTaskByQuery(projectTaskParam);
+        List<ManualProjectTaskPo> pos = simulationProjectTaskMapper.selectprojectTaskByQuery(projectTaskParam);
         if(isEmpty(pos)){
             return new ResponseBodyVO(ResponseBodyVO.Response.SERVER_FAILURE,"没有获取到任务信息");
         }
@@ -656,7 +674,7 @@ public class SimulationProjectServiceImpl implements SimulationProjectService {
         ProjectTaskParam projectTaskParam = new ProjectTaskParam();
         projectTaskParam.setPId(param.getId());
         setPage(param.getCurrentPage()==null?1:param.getCurrentPage(), param.getPageSize()==null?10:param.getPageSize());
-        List<ManualProjectTaskVo> manualProjectTaskVos = simulationProjectMapper.selectProjectTaskByProjectId(projectTaskParam);
+        List<ManualProjectTaskVo> manualProjectTaskVos = simulationProjectTaskMapper.selectProjectTaskByProjectId(projectTaskParam);
 
         PageInfo<ManualProjectTaskVo> pageInfo = new PageInfo(manualProjectTaskVos);
 
@@ -718,9 +736,9 @@ public class SimulationProjectServiceImpl implements SimulationProjectService {
     }
 
     private void setAlgorithmDropDown(List<DropDownTypeVo> result){
-        List<AlgorithmBaseInfoVo> algorithmBaseInfoVo = simulationProjectMapper.selectAlgorithmBaseInfoById(null);
+        List<AlgorithmPO> algorithmBaseInfoVo = simulationProjectMapper.selectAlgorithmBaseInfoById(null);
         List<DropDownVo> algorithmList = new ArrayList<>();
-        for(AlgorithmBaseInfoVo v : algorithmBaseInfoVo){
+        for(AlgorithmPO v : algorithmBaseInfoVo){
             DropDownVo dropDownVo = new DropDownVo();
             dropDownVo.setId(v.getId());
             dropDownVo.setName(v.getAlgorithmName());
@@ -732,19 +750,19 @@ public class SimulationProjectServiceImpl implements SimulationProjectService {
         result.add(algorithmDropDown);
     }
     private void setVehicleDropDown(List<DropDownTypeVo> result){
-        List<ConfigVehicleVO> vehicleBaseInfoVo = simulationProjectMapper.selectConfigVehicle(null);
+        List<ConfigPO> vehicleBaseInfoVo = simulationProjectMapper.selectConfigVehicle(null);
         List<DropDownVo> vehicleList = new ArrayList<>();
-        for(ConfigVehicleVO v : vehicleBaseInfoVo){
+        for(ConfigPO v : vehicleBaseInfoVo){
             DropDownVo dropDownVo = new DropDownVo();
             dropDownVo.setId(v.getId());
             dropDownVo.setName(v.getConfigName());
 
             //获取传感器信息
-            List<ConfigSensorVo> configSensorVos = simulationProjectMapper.selectConfigSensor(v.getId());
+            List<ConfigSensorPO> configSensorVos = simulationProjectMapper.selectConfigSensor(v.getId());
             String sensor = "";
             if(!isEmpty(configSensorVos) && configSensorVos.get(0) != null){
                 StringBuffer stringBuffer = new StringBuffer();
-                for(ConfigSensorVo cv : configSensorVos){
+                for(ConfigSensorPO cv : configSensorVos){
                     stringBuffer.append(cv.getSensorType()+",");
                 }
                 sensor = stringBuffer.substring(0,stringBuffer.lastIndexOf(","));
@@ -761,13 +779,13 @@ public class SimulationProjectServiceImpl implements SimulationProjectService {
         result.add(vehicleDropDown);
     }
     private void setScenePackageDropDown(List<DropDownTypeVo> result){
-        List<ScenePackageBaseVo> scenePackageBaseVo = simulationProjectMapper.selectScenePackageBaseById(null);
+        List<ScenePackagePO> scenePackageBaseVo = simulationProjectMapper.selectScenePackageBaseById(null);
         List<DropDownVo> scenePackageList = new ArrayList<>();
-        for(ScenePackageBaseVo v : scenePackageBaseVo){
+        for(ScenePackagePO v : scenePackageBaseVo){
             DropDownVo dropDownVo = new DropDownVo();
             dropDownVo.setId(v.getPackageId());
             dropDownVo.setName(v.getPackageName());
-            dropDownVo.setSceneNum(v.getSceneNum());
+            dropDownVo.setSceneNum(String.valueOf(v.getSceneNum()));
             scenePackageList.add(dropDownVo);
         }
         DropDownTypeVo scenePackageDropDown = new DropDownTypeVo();
@@ -800,9 +818,9 @@ public class SimulationProjectServiceImpl implements SimulationProjectService {
         Date createTime = vo.getCreateTime();
         vo.setCreateTimeFmt(getRqStr(createTime, 2));
         String algorithm = vo.getAlgorithm();
-        List<AlgorithmBaseInfoVo> algorithmBaseInfoVos = simulationProjectMapper.selectAlgorithmBaseInfoById(algorithm);
+        List<AlgorithmPO> algorithmBaseInfoVos = simulationProjectMapper.selectAlgorithmBaseInfoById(algorithm);
         if(!isEmpty(algorithmBaseInfoVos)){
-            AlgorithmBaseInfoVo algorithmBaseInfoVo = algorithmBaseInfoVos.get(0);
+            AlgorithmPO algorithmBaseInfoVo = algorithmBaseInfoVos.get(0);
             vo.setAlgorithm(algorithmBaseInfoVo.getAlgorithmName());
         }
         vo.setNowRunStateDict(getDictName(DictConstants.PROJECT_RUN_STATE, vo.getNowRunState()));
@@ -1063,7 +1081,7 @@ public class SimulationProjectServiceImpl implements SimulationProjectService {
         //1.获取项目下所有场景得分
         ProjectTaskParam param = new ProjectTaskParam();
         param.setPId(projectId);
-        List<ManualProjectTaskVo> manualProjectTaskVos = simulationProjectMapper.selectProjectTaskByProjectId(param);
+        List<ManualProjectTaskVo> manualProjectTaskVos = simulationProjectTaskMapper.selectProjectTaskByProjectId(param);
 
         List<SublistScoreVo> lastSubList = new ArrayList<>();
         //2.拼接场景得分信息
@@ -1604,7 +1622,7 @@ public class SimulationProjectServiceImpl implements SimulationProjectService {
         SimulationMptLastTargetScorePo poParam = new SimulationMptLastTargetScorePo();
         poParam.setPId(pId);
         poParam.setTarget(vo.getSublistId());
-        SimulationMptLastTargetScorePo po = simulationProjectMapper.selectLastTargetScore(poParam);
+        SimulationMptLastTargetScorePo po = simulationMptLastTargetScoreMapper.selectLastTargetScore(poParam);
         if(po != null){
             vo.setNotStandardSceneNum(po.getNotStandardSceneNum());
             vo.setScore(po.getScore());
@@ -1617,7 +1635,7 @@ public class SimulationProjectServiceImpl implements SimulationProjectService {
         SimulationMptFirstTargetScorePo poParam = new SimulationMptFirstTargetScorePo();
         poParam.setPId(pId);
         poParam.setTarget(vo.getSublistId());
-        SimulationMptFirstTargetScorePo po = simulationProjectMapper.selectFirstTargetScore(poParam);
+        SimulationMptFirstTargetScorePo po = simulationMptFirstTargetScoreMapper.selectFirstTargetScore(poParam);
         if(po != null){
             vo.setScore(po.getScore());
         }
@@ -1634,7 +1652,7 @@ public class SimulationProjectServiceImpl implements SimulationProjectService {
         sceneScoreParam.setLastTargerId(vo.getSublistId());
         sceneScoreParam.setSceneType(sceneType);
         sceneScoreParam.setSceneIds(Arrays.asList(sceneIdArr));
-        List<SceneScoreVo> sceneScoreVos = simulationProjectMapper.selectSceneScoreByIds(sceneScoreParam);
+        List<SceneScoreVo> sceneScoreVos = simulationProjectTaskMapper.selectSceneScoreByIds(sceneScoreParam);
 
         for(SceneScoreVo s : sceneScoreVos){
             /*if(SceneTypeEnum.SCENE_NATURAL.getCode().equals(sceneType)){
@@ -1743,7 +1761,7 @@ public class SimulationProjectServiceImpl implements SimulationProjectService {
         po.setPId(pId);
 //        po.setLastTargerId(scenePackageSubListVO.getSublistId());
         po.setLastTargerId(sublistId);
-        SceneScoreVo sceneScoreVo = simulationProjectMapper.selectSceneScoreNumQuery(po);
+        SceneScoreVo sceneScoreVo = simulationProjectTaskMapper.selectSceneScoreNumQuery(po);
         resultVo.setNum(resultVo.getNum()+sceneScoreVo.getNum());
     }
 
@@ -1770,7 +1788,7 @@ public class SimulationProjectServiceImpl implements SimulationProjectService {
                 simulationMptFirstTargetScorePo.setPId(po.getId());
                 simulationMptFirstTargetScorePo.setTarget(v.getSublistId());
                 //单个二级指标得分
-                SimulationMptFirstTargetScorePo simulationMptFirstTargetScorePo1 = simulationProjectMapper.selectFirstTargetScore(simulationMptFirstTargetScorePo);
+                SimulationMptFirstTargetScorePo simulationMptFirstTargetScorePo1 = simulationMptFirstTargetScoreMapper.selectFirstTargetScore(simulationMptFirstTargetScorePo);
                 if(simulationMptFirstTargetScorePo1 == null){
                     return evaluationLevelReport;
                 }
@@ -1842,7 +1860,7 @@ public class SimulationProjectServiceImpl implements SimulationProjectService {
             RunProjectVO vo=new RunProjectVO();
             Map<String,Object> params = TimeUtil.getPastTime(i);
             params.put("createUserId", AuthUtil.getCurrentUserId());
-            Integer num = simulationProjectMapper.selectRunTaskBySy(params);
+            Integer num = simulationProjectTaskMapper.selectRunTaskBySy(params);
             vo.setToDate(params.get("toDate").toString());
             vo.setNum(num);
             list.add(vo);
@@ -1854,7 +1872,7 @@ public class SimulationProjectServiceImpl implements SimulationProjectService {
     public ResponseBodyVO selectRunTaskByState() {
             Map<String,Object> params =new HashMap<>();
             params.put("createUserId", AuthUtil.getCurrentUserId());
-        return new ResponseBodyVO(ResponseBodyVO.Response.SUCCESS, simulationProjectMapper.selectRunTaskByState(params));
+        return new ResponseBodyVO(ResponseBodyVO.Response.SUCCESS, simulationProjectTaskMapper.selectRunTaskByState(params));
     }
     //项目运行状态统计-饼图
     @Override

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

@@ -0,0 +1,25 @@
+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.SimulationMptFirstTargetScorePo;
+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;
+import api.common.pojo.vo.project.SceneScoreVo;
+import org.apache.ibatis.annotations.Mapper;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+import java.util.Map;
+
+@Mapper
+@Repository
+public interface SimulationMptFirstTargetScoreMapper {
+
+    SimulationMptFirstTargetScorePo selectFirstTargetScore(SimulationMptFirstTargetScorePo po);
+
+
+}

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

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

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

@@ -4,7 +4,11 @@ import api.common.pojo.param.project.ProjectTaskParam;
 import api.common.pojo.param.project.SceneScoreParam;
 import api.common.pojo.param.project.SimulationManualProjectParam;
 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.*;
+import api.common.pojo.po.scene.ScenePackagePO;
 import api.common.pojo.po.scene.ScenePackageSublistPO;
 import api.common.pojo.vo.project.*;
 import org.apache.ibatis.annotations.Mapper;
@@ -37,13 +41,13 @@ public interface SimulationProjectMapper {
 
     int updateProjectNowRunState(SimulationManualProjectParam param);
 
-    List<AlgorithmBaseInfoVo> selectAlgorithmBaseInfoById(String id);
+    List<AlgorithmPO> selectAlgorithmBaseInfoById(String id);
 
-    List<VehicleBaseInfoVo> selectVehicleBaseInfoById(String id);
+    List<VehiclePO> selectVehicleBaseInfoById(String id);
 
-    List<ScenePackageBaseVo> selectScenePackageBaseById(String id);
+    List<ScenePackagePO> selectScenePackageBaseById(String id);
 
-    List<VehicleSensorVo> selectVehicleSensor(String id);
+    List<ConfigSensorPO> selectVehicleSensor(String id);
 
     SensorBaseInfoVo selectSensorCamera(String id);
 
@@ -61,16 +65,6 @@ public interface SimulationProjectMapper {
 
     SceneBaseInfoVo selectSceneStandardsRegulations(String id);
 
-    List<ManualProjectTaskPo> selectprojectTaskByQuery(ProjectTaskParam vo);
-
-    List<ManualProjectTaskVo>  selectProjectTaskByProjectId(ProjectTaskParam vo);
-
-    Integer selectProjectTaskNumByProjectId(ProjectTaskParam vo);
-
-    List<ProjectRunStateNumVo> selectRunStateCount(String id);
-
-    List<ProjectRunResultRatioNumVo> selectRunResultCount(String id);
-
     List<ScenePackageSubListVO> selectSubSceneByPid(String id);
 
     ScenePackageSubListVO selectsublistBySublistId(String id);
@@ -83,31 +77,22 @@ public interface SimulationProjectMapper {
 
     int insertSimulationMptFirstTargetScorePo(SimulationMptFirstTargetScorePo po);
 
-    SimulationMptLastTargetScorePo selectLastTargetScore(SimulationMptLastTargetScorePo po);
-
-    SimulationMptFirstTargetScorePo selectFirstTargetScore(SimulationMptFirstTargetScorePo po);
-
     List<SimulationMptSceneScorePo> selectSceneScore(SimulationMptSceneScorePo po);
 
-    List<SceneScoreVo> selectSceneScoreByIds(SceneScoreParam param);
-
-    SceneScoreVo selectSceneScoreNumQuery(SimulationMptSceneScorePo po);
-
     SystemUserVo selectUserById(String id);
 
-    List<ConfigVehicleVO> selectConfigVehicle(String id);
+    List<ConfigPO> selectConfigVehicle(String id);
 
-    List<ConfigSensorVo> selectConfigSensor(String id);
+    List<ConfigSensorPO> selectConfigSensor(String id);
 
     List<SimulationManualProjectPo> selectProjectNowRunState(String[] ids);
 
     List<SublistScoreVo> selectSubScore(String id);
 
     Integer selectRunProjectBySy(Map map);
-    Integer selectRunTaskBySy(Map map);
 
-    List<Map> selectRunTaskByState(Map map);
     List<Map> selectRunProjectByState(Map map);
+
     List<Map> selectEvaluationLevel(Map map);
 
     int insertOtherAlgorithm(AlgorithmPO po);

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

@@ -0,0 +1,41 @@
+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.param.project.SimulationManualProjectParam;
+import api.common.pojo.po.algorithm.AlgorithmPO;
+import api.common.pojo.po.project.*;
+import api.common.pojo.vo.project.*;
+import org.apache.ibatis.annotations.Mapper;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+import java.util.Map;
+
+@Mapper
+@Repository
+public interface SimulationProjectTaskMapper {
+
+    List<ManualProjectTaskPo> selectprojectTaskByQuery(ProjectTaskParam vo);
+
+    List<ManualProjectTaskVo>  selectProjectTaskByProjectId(ProjectTaskParam vo);
+
+    Integer selectProjectTaskNumByProjectId(ProjectTaskParam vo);
+
+    List<ProjectRunStateNumVo> selectRunStateCount(String id);
+
+    List<ProjectRunResultRatioNumVo> selectRunResultCount(String id);
+
+    List<SceneScoreVo> selectSceneScoreByIds(SceneScoreParam param);
+
+    SceneScoreVo selectSceneScoreNumQuery(SimulationMptSceneScorePo po);
+
+    Integer selectRunTaskBySy(Map map);
+
+    List<Map> selectRunTaskByState(Map map);
+
+
+
+
+
+}

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

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<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 score
+        from simulation_mpt_first_target_score
+        where p_id = #{pId,jdbcType=VARCHAR} and target = #{target,jdbcType=VARCHAR} and is_deleted = '0'
+    </select>
+
+</mapper>

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

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.css.simulation.resource.project.mapper.SimulationMptLastTargetScoreMapper" >
+
+
+    <!--查询最后一级指标得分-->
+    <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>

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

@@ -222,7 +222,7 @@
     </update>
 
     <!--获取算法基本信息 /*where a.share = '0' and a.is_deleted = '0'*/-->
-    <select id="selectAlgorithmBaseInfoById" parameterType="string" resultType="api.common.pojo.vo.project.AlgorithmBaseInfoVo">
+    <select id="selectAlgorithmBaseInfoById" parameterType="string" resultType="api.common.pojo.po.algorithm.AlgorithmPO">
         select a.id, a.algorithm_name, a.description
         from algorithm a
         where a.is_deleted = '0'
@@ -232,7 +232,7 @@
     </select>
 
     <!--获取车辆基本信息-->
-    <select id="selectVehicleBaseInfoById" parameterType="string" resultType="api.common.pojo.vo.project.VehicleBaseInfoVo">
+    <select id="selectVehicleBaseInfoById" parameterType="string" resultType="api.common.pojo.po.model.VehiclePO">
         select a.id, a.vehicle_name, a.description, a.vehicle_image
         from model_vehicle a
         where is_deleted = '0'
@@ -242,7 +242,7 @@
     </select>
 
     <!--获取车辆配置信息-->
-    <select id="selectConfigVehicle" parameterType="string" resultType="api.common.pojo.vo.project.ConfigVehicleVO">
+    <select id="selectConfigVehicle" parameterType="string" resultType="api.common.pojo.po.model.ConfigPO">
         select id, config_name, vehicle_id
         from model_config
         where share = '0' and is_deleted = '0'
@@ -252,7 +252,7 @@
     </select>
 
     <!--查询车辆配置传感器信息-->
-    <select id="selectConfigSensor" parameterType="string" resultType="api.common.pojo.vo.project.ConfigSensorVo">
+    <select id="selectConfigSensor" parameterType="string" resultType="api.common.pojo.po.model.ConfigSensorPO">
         select sensor_type
         from relation_config_sensor
         where is_deleted = '0'
@@ -263,7 +263,7 @@
     </select>
 
     <!--获取场景包基本信息-->
-    <select id="selectScenePackageBaseById" parameterType="string" resultType="api.common.pojo.vo.project.ScenePackageBaseVo">
+    <select id="selectScenePackageBaseById" parameterType="string" resultType="api.common.pojo.po.scene.ScenePackagePO">
         select a.package_id,a.package_name, a.scene_num
         from scene_package a
         where a.share = '0' and a.is_deleted = '0'
@@ -273,10 +273,11 @@
     </select>
 
     <!--查询车辆与传感器关联信息-->
-    <select id="selectVehicleSensor" parameterType="string" resultType="api.common.pojo.vo.project.VehicleSensorVo">
-        select sensor_id, sensor_type,
-        config_id,
+    <select id="selectVehicleSensor" parameterType="string" resultType="api.common.pojo.po.model.ConfigSensorPO">
+        select
         sensor_id,
+        sensor_type,
+        config_id,
         sensor_x,
         sensor_y,
         sensor_z,
@@ -340,53 +341,6 @@
         from scene_standards_regulations
         where regulations_id = #{id,jdbcType=VARCHAR} and is_deleted = '0'
     </select>
-    <!--查询任务列表-->
-    <select id="selectprojectTaskByQuery" parameterType="api.common.pojo.param.project.ProjectTaskParam" resultType="api.common.pojo.po.project.ManualProjectTaskPo">
-        select *
-        from simulation_manual_project_task
-        <where>
-            is_deleted = '0'
-            <if test="id != null and id != ''">
-                and id = #{id,jdbcType=VARCHAR}
-            </if>
-            <if test="pId != null and pId != ''">
-                and p_id = #{pId,jdbcType=VARCHAR}
-            </if>
-            <if test="sceneId != null and sceneId != ''">
-                and scene_id = #{sceneId,jdbcType=VARCHAR}
-            </if>
-        </where>
-    </select>
-
-    <!--根据项目id查询任务列表-->
-    <select id="selectProjectTaskByProjectId" parameterType="api.common.pojo.param.project.ProjectTaskParam" resultType="api.common.pojo.vo.project.ManualProjectTaskVo">
-        select *
-        from simulation_manual_project_task
-        where is_deleted = '0' and p_id = #{pId,jdbcType=VARCHAR}
-    </select>
-
-    <!--根据项目id查询任务列表总数-->
-    <select id="selectProjectTaskNumByProjectId" parameterType="api.common.pojo.param.project.ProjectTaskParam" resultType="int">
-        select count(*) as num
-        from simulation_manual_project_task
-        where is_deleted = '0' and p_id = #{pId,jdbcType=VARCHAR}
-    </select>
-
-    <!--根据任务运行状态分组查询统计数量-->
-    <select id="selectRunStateCount" parameterType="string" resultType="api.common.pojo.vo.project.ProjectRunStateNumVo">
-        select run_state as stateName, count(*) as num
-        from simulation_manual_project_task
-        where p_id = #{id,jdbcType=VARCHAR} and is_deleted = '0'
-        group by run_state
-    </select>
-
-    <!--根据任务运行状态分组查询统计数量-->
-    <select id="selectRunResultCount" parameterType="string" resultType="api.common.pojo.vo.project.ProjectRunResultRatioNumVo">
-        select run_result as resultName, count(*) as num
-        from simulation_manual_project_task
-        where p_id = #{id,jdbcType=VARCHAR} and is_deleted = '0'
-        group by run_result
-    </select>
 
     <!--根据场景包id获取场景子集-->
     <select id="selectSubSceneByPid" parameterType="string" resultType="api.common.pojo.vo.project.ScenePackageSubListVO">
@@ -504,20 +458,6 @@
         )
     </insert>
 
-    <!--查询最后一级指标得分-->
-    <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>
-
-    <!--查询第一级指标得分-->
-    <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="selectSceneScore" parameterType="api.common.pojo.po.project.SimulationMptSceneScorePo" resultType="api.common.pojo.po.project.SimulationMptSceneScorePo">
         select score, target_evaluate
@@ -528,25 +468,6 @@
         </if>
     </select>
 
-    <!--查询场景不等于0的得分的数量-->
-    <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
-        where p_id = #{pId,jdbcType=VARCHAR} and last_targer_id = #{lastTargerId}
-        and score != 0 and is_deleted = '0'
-    </select>
-
-    <!--批量查询场景得分-->
-    <select id="selectSceneScoreByIds" parameterType="api.common.pojo.param.project.SceneScoreParam" resultType="api.common.pojo.vo.project.SceneScoreVo">
-        select id, scene_id, scene_type,score, target_evaluate, return_scene_id, score_explain
-        from simulation_manual_project_task
-        where p_id = #{pId,jdbcType=VARCHAR} and  scene_type = #{sceneType,jdbcType=VARCHAR}
-        and last_targer_id = #{lastTargerId,jdbcType=VARCHAR} and is_deleted = '0'
-        and scene_id in
-        <foreach collection="sceneIds" open="(" separator="," close=")" item="id">
-            #{id,jdbcType=VARCHAR}
-        </foreach>
-    </select>
 
     <!--获取人员信息-->
     <select id="selectUserById" resultType="api.common.pojo.vo.project.SystemUserVo">
@@ -582,32 +503,7 @@
         </if>
     </select>
 
-    <!--查询某天运行任务数量-->
-    <select id="selectRunTaskBySy" parameterType="java.util.Map" resultType="java.lang.Integer">
-        select count(id) from simulation_manual_project_task
-        where
-        is_deleted = '0'
-        <if test="createUserId != null and createUserId != ''">
-            and create_user_id=#{createUserId,jdbcType=VARCHAR}
-        </if>
-        <if test="startDate != null">
-            and run_start_time &gt;= #{startDate}
-        </if>
-        <if test="endDate != null">
-            and run_start_time &lt;= #{endDate}
-        </if>
-    </select>
 
-    <!--运行任务状态-->
-    <select id="selectRunTaskByState" parameterType="java.util.Map" resultType="java.util.Map">
-        select count(run_state) num,run_state runState from simulation_manual_project_task
-        where
-        is_deleted = '0'
-        <if test="createUserId != null and createUserId != ''">
-            and create_user_id=#{createUserId,jdbcType=VARCHAR}
-        </if>
-        group by run_state
-    </select>
     <!--运行项目状态-->
     <select id="selectRunProjectByState" parameterType="java.util.Map" resultType="java.util.Map">
         select count(now_run_state) num,now_run_state nowRunState from simulation_manual_project

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

@@ -0,0 +1,101 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.css.simulation.resource.project.mapper.SimulationProjectTaskMapper" >
+
+
+    <!--查询任务列表-->
+    <select id="selectprojectTaskByQuery" parameterType="api.common.pojo.param.project.ProjectTaskParam" resultType="api.common.pojo.po.project.ManualProjectTaskPo">
+        select *
+        from simulation_manual_project_task
+        <where>
+            is_deleted = '0'
+            <if test="id != null and id != ''">
+                and id = #{id,jdbcType=VARCHAR}
+            </if>
+            <if test="pId != null and pId != ''">
+                and p_id = #{pId,jdbcType=VARCHAR}
+            </if>
+            <if test="sceneId != null and sceneId != ''">
+                and scene_id = #{sceneId,jdbcType=VARCHAR}
+            </if>
+        </where>
+    </select>
+    <!--根据项目id查询任务列表-->
+    <select id="selectProjectTaskByProjectId" parameterType="api.common.pojo.param.project.ProjectTaskParam" resultType="api.common.pojo.vo.project.ManualProjectTaskVo">
+        select *
+        from simulation_manual_project_task
+        where is_deleted = '0' and p_id = #{pId,jdbcType=VARCHAR}
+    </select>
+
+    <!--根据项目id查询任务列表总数-->
+    <select id="selectProjectTaskNumByProjectId" parameterType="api.common.pojo.param.project.ProjectTaskParam" resultType="int">
+        select count(*) as num
+        from simulation_manual_project_task
+        where is_deleted = '0' and p_id = #{pId,jdbcType=VARCHAR}
+    </select>
+
+    <!--根据任务运行状态分组查询统计数量-->
+    <select id="selectRunStateCount" parameterType="string" resultType="api.common.pojo.vo.project.ProjectRunStateNumVo">
+        select run_state as stateName, count(*) as num
+        from simulation_manual_project_task
+        where p_id = #{id,jdbcType=VARCHAR} and is_deleted = '0'
+        group by run_state
+    </select>
+
+    <!--根据任务运行状态分组查询统计数量-->
+    <select id="selectRunResultCount" parameterType="string" resultType="api.common.pojo.vo.project.ProjectRunResultRatioNumVo">
+        select run_result as resultName, count(*) as num
+        from simulation_manual_project_task
+        where p_id = #{id,jdbcType=VARCHAR} and is_deleted = '0'
+        group by run_result
+    </select>
+
+    <!--运行任务状态-->
+    <select id="selectRunTaskByState" parameterType="java.util.Map" resultType="java.util.Map">
+        select count(run_state) num,run_state runState from simulation_manual_project_task
+        where
+        is_deleted = '0'
+        <if test="createUserId != null and createUserId != ''">
+            and create_user_id=#{createUserId,jdbcType=VARCHAR}
+        </if>
+        group by run_state
+    </select>
+
+    <!--查询某天运行任务数量-->
+    <select id="selectRunTaskBySy" parameterType="java.util.Map" resultType="java.lang.Integer">
+        select count(id) from simulation_manual_project_task
+        where
+        is_deleted = '0'
+        <if test="createUserId != null and createUserId != ''">
+            and create_user_id=#{createUserId,jdbcType=VARCHAR}
+        </if>
+        <if test="startDate != null">
+            and run_start_time &gt;= #{startDate}
+        </if>
+        <if test="endDate != null">
+            and run_start_time &lt;= #{endDate}
+        </if>
+    </select>
+
+    <!--查询场景不等于0的得分的数量-->
+    <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
+        where p_id = #{pId,jdbcType=VARCHAR} and last_targer_id = #{lastTargerId}
+        and score != 0 and is_deleted = '0'
+    </select>
+
+    <!--批量查询场景得分-->
+    <select id="selectSceneScoreByIds" parameterType="api.common.pojo.param.project.SceneScoreParam" resultType="api.common.pojo.vo.project.SceneScoreVo">
+        select id, scene_id, scene_type,score, target_evaluate, return_scene_id, score_explain
+        from simulation_manual_project_task
+        where p_id = #{pId,jdbcType=VARCHAR} and  scene_type = #{sceneType,jdbcType=VARCHAR}
+        and last_targer_id = #{lastTargerId,jdbcType=VARCHAR} and is_deleted = '0'
+        and scene_id in
+        <foreach collection="sceneIds" open="(" separator="," close=")" item="id">
+            #{id,jdbcType=VARCHAR}
+        </foreach>
+    </select>
+
+
+</mapper>