车辆配置

simulation-resource-server/src/main/resources/mapper/model/ConfigMapper.xml

@@ -47,12 +47,14 @@
         order by c.create_time desc
     </select>
 
-    <select id="getConfigInfo" parameterType="api.common.pojo.param.model.ConfigPageParam" resultMap="ConfigVOMap">
+    <select id="getConfigInfo" parameterType="api.common.pojo.vo.model.ConfigVO" resultMap="ConfigVOMap">
         SELECT
             c.id,
             c.config_code,
             c.config_name,
             c.description as configDescription,
+            c.vehicle_id,
+            c.share,
             v.vehicle_name,
             v.description as vehicleDescription
         FROM model_config c
@@ -61,7 +63,7 @@
         and c.id = #{id,jdbcType=VARCHAR}
     </select>
 
-    <select id="getConfigSensors" parameterType="api.common.pojo.param.model.ConfigPageParam" resultMap="ConfigSensorVOMap">
+    <select id="getConfigSensors" parameterType="api.common.pojo.vo.model.ConfigVO" resultMap="ConfigSensorVOMap">
         <!--摄像头-->
         SELECT
             r.id,r.config_id,r.sensor_id,
@@ -70,7 +72,7 @@
             r.sensor_x, r.sensor_y, r.sensor_z, r.sensor_h, r.sensor_p, r.sensor_r, r.sensor_port
         FROM relation_config_sensor r
         INNER JOIN model_sensor_camera s ON r.sensor_id = s.id
-        WHERE r.config_id = #{id,jdbcType=VARCHAR}
+        WHERE r.is_deleted = '0' and r.config_id = #{id,jdbcType=VARCHAR}
         UNION
         <!--完美传感器-->
         SELECT
@@ -80,7 +82,7 @@
             r.sensor_x, r.sensor_y, r.sensor_z, r.sensor_h, r.sensor_p, r.sensor_r, r.sensor_port
         FROM relation_config_sensor r
         INNER JOIN model_sensor_ogt s ON r.sensor_id = s.id
-        WHERE r.config_id = #{id,jdbcType=VARCHAR}
+        WHERE r.is_deleted = '0' and r.config_id = #{id,jdbcType=VARCHAR}
         UNION
         <!--激光雷达-->
         SELECT
@@ -90,7 +92,7 @@
             r.sensor_x, r.sensor_y, r.sensor_z, r.sensor_h, r.sensor_p, r.sensor_r, r.sensor_port
         FROM relation_config_sensor r
         INNER JOIN model_sensor_lidar s ON r.sensor_id = s.id
-        WHERE r.config_id = #{id,jdbcType=VARCHAR}
+        WHERE r.is_deleted = '0' and r.config_id = #{id,jdbcType=VARCHAR}
         UNION
         <!--GPS-->
         SELECT
@@ -100,7 +102,7 @@
             r.sensor_x, r.sensor_y, r.sensor_z, r.sensor_h, r.sensor_p, r.sensor_r, r.sensor_port
         FROM relation_config_sensor r
         INNER JOIN model_sensor_gps s ON r.sensor_id = s.id
-        WHERE r.config_id = #{id,jdbcType=VARCHAR}
+        WHERE r.is_deleted = '0' and r.config_id = #{id,jdbcType=VARCHAR}
     </select>
 
     <select id="checkConfigName" parameterType="api.common.pojo.po.model.ConfigPO" resultMap="ConfigVOMap">

simulation-resource-server/src/main/resources/mapper/model/VehicleMapper.xml

@@ -34,6 +34,7 @@
         select
           id,
           vehicle_name,
+          description,
           share
         from model_vehicle v
         where v.is_deleted = '0'