车辆配置-列表查询

api-common/src/main/java/api/common/pojo/param/model/ConfigPageParam.java

@@ -10,8 +10,8 @@ public class ConfigPageParam extends PageVO {
 
     //主键id
     private String id;
-    //配置id
-    private String configId;
+    //配置编码
+    private String configCode;
     //配置名称
     private String configName;
     //配置描述

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

@@ -115,7 +115,6 @@
 
     <update id="update" parameterType="api.common.pojo.po.model.CameraPO">
         update model_sensor_camera set
-            sensor_code = #{sensorCode,jdbcType=VARCHAR},
             sensor_name = #{sensorName,jdbcType=VARCHAR},
             description = #{description,jdbcType=VARCHAR},
             near_distance = #{nearDistance,jdbcType=DECIMAL},

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

@@ -23,8 +23,8 @@
         from model_config c
         LEFT JOIN model_vehicle v on c.vehicle_id = v.id
         WHERE c.is_deleted = '0' and c.share = #{share,jdbcType=VARCHAR}
-        <if test="configId != null and configId != ''">
-            and c.config_id like CONCAT('%',#{configId,jdbcType=VARCHAR},'%')
+        <if test="configCode != null and configCode != ''">
+            and c.config_code like CONCAT('%',#{configCode,jdbcType=VARCHAR},'%')
         </if>
         <if test="configName != null and configName != ''">
             and c.config_name like CONCAT('%',#{configName,jdbcType=VARCHAR},'%')
@@ -32,6 +32,15 @@
         <if test="configDescription != null and configDescription != ''">
             and c.description like CONCAT('%',#{configDescription,jdbcType=VARCHAR},'%')
         </if>
+        <if test="vehicleName != null and vehicleName != ''">
+            and v.vehicle_name like CONCAT('%',#{vehicleName,jdbcType=VARCHAR},'%')
+        </if>
+        <if test="vehicleDescription != null and vehicleDescription != ''">
+            and v.description like CONCAT('%',#{vehicleDescription,jdbcType=VARCHAR},'%')
+        </if>
+        <if test="share != null and share != ''">
+            and c.share = #{share,jdbcType=VARCHAR}
+        </if>
         <if test="createUserId != null and createUserId != ''">
             and c.create_user_id = #{createUserId,jdbcType=VARCHAR}
         </if>
@@ -135,7 +144,6 @@
 
     <update id="updateConfig" parameterType="api.common.pojo.po.model.ConfigPO">
         update model_config set
-            config_code = #{configCode,jdbcType=VARCHAR},
             config_name = #{configName,jdbcType=VARCHAR},
             description = #{description,jdbcType=VARCHAR},
             vehicle_id = #{vehicleId,jdbcType=VARCHAR},

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

@@ -91,7 +91,6 @@
 
     <update id="update" parameterType="api.common.pojo.po.model.GpsPO">
         update model_sensor_gps set
-            sensor_code = #{sensorCode,jdbcType=VARCHAR},
             sensor_name = #{sensorName,jdbcType=VARCHAR},
             description = #{description,jdbcType=VARCHAR},
             longitude_offset = #{longitudeOffset,jdbcType=DECIMAL},

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

@@ -106,7 +106,6 @@
 
     <update id="update" parameterType="api.common.pojo.po.model.LidarPO">
         update model_sensor_lidar set
-            sensor_code = #{sensorCode,jdbcType=VARCHAR},
             sensor_name = #{sensorName,jdbcType=VARCHAR},
             description = #{description,jdbcType=VARCHAR},
             near_distance = #{nearDistance,jdbcType=DECIMAL},

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

@@ -113,7 +113,6 @@
 
     <update id="update" parameterType="api.common.pojo.po.model.OgtPO">
         update model_sensor_ogt set
-            sensor_code = #{sensorCode,jdbcType=VARCHAR},
             sensor_name = #{sensorName,jdbcType=VARCHAR},
             description = #{description,jdbcType=VARCHAR},
             near_distance = #{nearDistance,jdbcType=DECIMAL},