martin

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

@@ -78,6 +78,7 @@
         FROM relation_config_sensor r
                  INNER JOIN model_sensor_camera s ON r.sensor_id = s.id
         WHERE r.is_deleted = '0'
+          and s.is_deleted = '0'
           and r.config_id = #{id,jdbcType=VARCHAR}
         UNION
         SELECT r.id,
@@ -96,6 +97,7 @@
         FROM relation_config_sensor r
                  INNER JOIN model_sensor_ogt s ON r.sensor_id = s.id
         WHERE r.is_deleted = '0'
+          and s.is_deleted = '0'
           and r.config_id = #{id,jdbcType=VARCHAR}
         UNION
         SELECT r.id,
@@ -114,6 +116,7 @@
         FROM relation_config_sensor r
                  INNER JOIN model_sensor_lidar s ON r.sensor_id = s.id
         WHERE r.is_deleted = '0'
+          and s.is_deleted = '0'
           and r.config_id = #{id,jdbcType=VARCHAR}
         UNION
         SELECT r.id,
@@ -132,6 +135,7 @@
         FROM relation_config_sensor r
                  INNER JOIN model_sensor_gps s ON r.sensor_id = s.id
         WHERE r.is_deleted = '0'
+          and s.is_deleted = '0'
           and r.config_id = #{id,jdbcType=VARCHAR}
     </select>
 
@@ -183,6 +187,7 @@
     <update id="updateConfig" parameterType="api.common.pojo.po.model.ConfigPO">
         update model_config
         set config_name    = #{configName,jdbcType=VARCHAR},
+            is_unavailable = #{isUnavailable},
             description    = #{description,jdbcType=VARCHAR},
             vehicle_id     = #{vehicleId,jdbcType=VARCHAR},
             vehicle_array  = #{vehicleArray,jdbcType=VARCHAR},