王耀栋--工作台模块代码,工作详情获取车辆配置信息修改

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

@@ -11,4 +11,28 @@ import lombok.Setter;
 public class SensorBaseInfoVo {
     //名称
     private String sensorName;
+
+    private String configId;
+
+    private String sensorId;
+
+    private String sensorDescription;
+
+    private String sensorType;
+
+    private Double sensorX;
+
+    private Double sensorY;
+
+    private Double sensorZ;
+
+    private Double sensorH;
+
+    private Double sensorP;
+
+    private Double sensorR;
+
+    private Integer sensorPort;
+
+
 }

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

@@ -16,4 +16,20 @@ public class VehicleSensorVo {
     //传感器类型
     private String sensorType;
 
+    private String configId;
+
+    private Double sensorX;
+
+    private Double sensorY;
+
+    private Double sensorZ;
+
+    private Double sensorH;
+
+    private Double sensorP;
+
+    private Double sensorR;
+
+    private Integer sensorPort;
+
 }

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

@@ -304,22 +304,27 @@ public class SimulationProjectServiceImpl implements SimulationProjectService {
             if(DictConstants.SENSOR_CAMERA.equals(sensorType)){
                 //摄像头
                 SensorBaseInfoVo sensorBaseInfoVo = simulationProjectMapper.selectSensorCamera(sensorId);
+                setVehicleConfig(sensorBaseInfoVo,vs);
                 sensorCameraList.add(sensorBaseInfoVo);
             }else if(DictConstants.SENSOR_OGT.equals(sensorType)){
                 //完美传感器
                 SensorBaseInfoVo sensorBaseInfoVo = simulationProjectMapper.selectSensorOgt(sensorId);
+                setVehicleConfig(sensorBaseInfoVo,vs);
                 sensorOgtList.add(sensorBaseInfoVo);
             }else if(DictConstants.SENSOR_LIDAR.equals(sensorType)){
                 //激光雷达
                 SensorBaseInfoVo sensorBaseInfoVo = simulationProjectMapper.selectSensorLidar(sensorId);
+                setVehicleConfig(sensorBaseInfoVo,vs);
                 sensorLidarList.add(sensorBaseInfoVo);
             }else if(DictConstants.SENSOR_RADAR.equals(sensorType)){
                 //毫米波雷达
                 SensorBaseInfoVo sensorBaseInfoVo = simulationProjectMapper.selectSensorRadar(sensorId);
+                setVehicleConfig(sensorBaseInfoVo,vs);
                 sensorRadarList.add(sensorBaseInfoVo);
             }else if(DictConstants.SENSOR_GPS.equals(sensorType)){
                 //gps
                 SensorBaseInfoVo sensorBaseInfoVo = simulationProjectMapper.selectSensorGps(sensorId);
+                setVehicleConfig(sensorBaseInfoVo,vs);
                 sensorGpsList.add(sensorBaseInfoVo);
             }
         }
@@ -396,6 +401,19 @@ public class SimulationProjectServiceImpl implements SimulationProjectService {
         return new ResponseBodyVO(ResponseBodyVO.Response.SUCCESS, projectDetailsVo);
     }
 
+    private void setVehicleConfig(SensorBaseInfoVo vo, VehicleSensorVo 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.setSensorPort(vs.getSensorPort());
+    }
+
 
 
     @Override
@@ -1858,6 +1876,8 @@ public class SimulationProjectServiceImpl implements SimulationProjectService {
             AlgorithmPO po = new AlgorithmPO();
             po.setId(param.getAlgorithm());
             po.setAlgorithmName(param.getAlgorithmName());
+            po.setUploadMode(ProjectConstants.SY_ALGORITHM_TYPE);
+            po.setIsDeleted("0");
             AlgorithmPO po1 = simulationProjectMapper.selectalgorithmByQuery(po);
             if(po1 == null){
                 simulationProjectMapper.insertOtherAlgorithm(po);

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

@@ -274,40 +274,49 @@
 
     <!--查询车辆与传感器关联信息-->
     <select id="selectVehicleSensor" parameterType="string" resultType="api.common.pojo.vo.project.VehicleSensorVo">
-        select sensor_id, sensor_type
+        select sensor_id, sensor_type,
+        config_id,
+        sensor_id,
+        sensor_x,
+        sensor_y,
+        sensor_z,
+        sensor_h,
+        sensor_p,
+        sensor_r,
+        sensor_port
         from relation_config_sensor
         where config_id = #{id,jdbcType=VARCHAR} and is_deleted = '0'
     </select>
 
     <!--摄像头基本信息-->
     <select id="selectSensorCamera" parameterType="string" resultType="api.common.pojo.vo.project.SensorBaseInfoVo">
-        select a.sensor_name
+        select a.sensor_name, description as sensorDescription
         from model_sensor_camera a
         where a.id = #{id,jdbcType=VARCHAR}
     </select>
 
     <!--完美传感器基本信息-->
     <select id="selectSensorOgt" parameterType="string" resultType="api.common.pojo.vo.project.SensorBaseInfoVo">
-        select a.sensor_name
+        select a.sensor_name, description as sensorDescription
         from model_sensor_ogt a
         where a.id = #{id,jdbcType=VARCHAR}
     </select>
 
     <!--激光雷达基本信息-->
     <select id="selectSensorLidar" parameterType="string" resultType="api.common.pojo.vo.project.SensorBaseInfoVo">
-        select a.sensor_name
+        select a.sensor_name, description as sensorDescription
         from model_sensor_lidar a
         where a.id = #{id,jdbcType=VARCHAR}
     </select>
     <!--毫米波雷达基本信息-->
     <select id="selectSensorRadar" parameterType="string" resultType="api.common.pojo.vo.project.SensorBaseInfoVo">
-        select a.name as sensor_name
+        select a.name as sensor_name, description as sensorDescription
         from model_sensor_radar a
         where a.id = #{id,jdbcType=VARCHAR}
     </select>
     <!--gps基本信息-->
     <select id="selectSensorGps" parameterType="string" resultType="api.common.pojo.vo.project.SensorBaseInfoVo">
-        select a.sensor_name
+        select a.sensor_name, description as sensorDescription
         from model_sensor_gps a
         where a.id = #{id,jdbcType=VARCHAR}
     </select>
@@ -625,12 +634,16 @@
         insert into algorithm
         (
         id,
-        algorithm_name
+        algorithm_name,
+        upload_mode,
+        is_deleted
         )
         values
         (
         id=#{id,jdbcType=VARCHAR},
-        algorithm_name=#{algorithmName,jdbcType=VARCHAR}
+        algorithm_name=#{algorithmName,jdbcType=VARCHAR},
+        upload_mode=#{uploadMode,jdbcType=VARCHAR},
+        is_deleted=#{isDeleted,jdbcType=VARCHAR},
         )
     </insert>