查询禁用字段

api-common/src/main/java/api/common/pojo/vo/model/ConfigVO.java

@@ -7,36 +7,19 @@ import java.util.Map;
 
 @Data
 public class ConfigVO {
-
-    //主键id
-    private String id;
-    //配置编码
-    private String configCode;
-    //配置名称
-    private String configName;
-    //配置描述
-    private String configDescription;
-    //车辆id
-    private String vehicleId;
-    //车辆名称
-    private String vehicleName;
-    //车辆描述
-    private String vehicleDescription;
-    //车辆图片
-    private String vehicleTopView;
-    //glb文件地址
-    private String vehicleFrontView;
-    //是否分享
-    private String share;
-
-    //传感器数量
-    private Map<String,String> sensorCount;
-    //传感器配置列表
-    private Map<String,List<ConfigSensorVO>> configSensors;
-    //车辆（公私有）
-    private String[] vehicleArrayS;
-    //车辆（公私有）
-    private String vehicleArray;
-
-
+    private String id;                                      // 主键id
+    private String configCode;                              // 配置编码
+    private String configName;                              // 配置名称
+    private String configDescription;                       // 配置描述
+    private String vehicleId;                               // 车辆id
+    private String vehicleName;                             // 车辆名称
+    private String vehicleDescription;                      // 车辆描述
+    private String vehicleTopView;                          // 车辆图片
+    private String vehicleFrontView;                        // glb文件地址
+    private String share;                                   // 是否分享
+    private String isUnavailable;                           // 是否禁用
+    private Map<String, String> sensorCount;                 // 传感器数量
+    private Map<String, List<ConfigSensorVO>> configSensors; // 传感器配置列表
+    private String[] vehicleArrayS;                         // 车辆（公私有）
+    private String vehicleArray;                            // 车辆（公私有）
 }

simulation-resource-server/src/main/java/com/css/simulation/resource/algorithm/controller/AlgorithmController.java

@@ -42,8 +42,6 @@ public class AlgorithmController {
 
     /**
      * 查询算法列表-私有导入和私有仓库页面
-     * @param param
-     * @return
      */
     @RequestMapping("selectAlgorithmList")
     public ResponseBodyVO selectAlgorithmList(@RequestBody AlgorithmParameter param){
@@ -61,8 +59,6 @@ public class AlgorithmController {
 
     /**
      * 查询算法列表-公有页面
-     * @param param
-     * @return
      */
     @RequestMapping("selectSharedAlgorithmList")
     public ResponseBodyVO selectSharedAlgorithmList(@RequestBody AlgorithmParameter param){
@@ -81,7 +77,6 @@ public class AlgorithmController {
 
     /**
      * 分享算法
-     * @return
      */
     @RequestMapping("shareAlgorithm")
     public ResponseBodyVO shareAlgorithm(@RequestBody AlgorithmParameter param){
@@ -91,8 +86,6 @@ public class AlgorithmController {
 
     /**
      * 查看算法详情
-     * @param param
-     * @return
      */
     @RequestMapping("selectDetailsById")
     public ResponseBodyVO selectDetailsById(@RequestBody AlgorithmParameter param){

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

@@ -1,25 +1,19 @@
 <?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.model.mapper.ConfigMapper" >
+<mapper namespace="com.css.simulation.resource.model.mapper.ConfigMapper">
 
-    <resultMap id="ConfigVOMap" type="api.common.pojo.vo.model.ConfigVO">
-        <id column="ID" property="id" jdbcType="VARCHAR" />
-    </resultMap>
-
-    <resultMap id="ConfigSensorVOMap" type="api.common.pojo.vo.model.ConfigSensorVO">
-        <id column="ID" property="id" jdbcType="VARCHAR" />
-    </resultMap>
-
-    <select id="getConfigPageList" parameterType="api.common.pojo.param.model.ConfigPageParam" resultMap="ConfigVOMap">
+    <select id="getConfigPageList" parameterType="api.common.pojo.param.model.ConfigPageParam"
+            resultType="api.common.pojo.vo.model.ConfigVO">
         select
-            c.id,
-            c.config_code,
-            c.config_name,
-            c.description as configDescription,
-            v.id as vehicleId,
-            v.vehicle_name,
-            v.description as vehicleDescription,
-            c.share
+        c.id,
+        c.config_code,
+        c.config_name,
+        c.description as configDescription,
+        v.id as vehicleId,
+        v.vehicle_name,
+        v.description as vehicleDescription,
+        c.share,
+        c.is_unavailable
         from model_config c
         LEFT JOIN model_vehicle v on c.vehicle_id = v.id
         WHERE c.is_deleted = '0'
@@ -47,69 +41,107 @@
         order by c.create_time desc
     </select>
 
-    <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,
-            c.vehicle_array,
-            v.vehicle_name,
-            v.description as vehicleDescription,
-            v.vehicle_front_view,
-            v.vehicle_top_view
+    <select id="getConfigInfo" parameterType="api.common.pojo.vo.model.ConfigVO"
+            resultType="api.common.pojo.vo.model.ConfigVO">
+        SELECT c.id,
+               c.config_code,
+               c.config_name,
+               c.description as configDescription,
+               c.vehicle_id,
+               c.share,
+               c.is_unavailable,
+               c.vehicle_array,
+               v.vehicle_name,
+               v.description as vehicleDescription,
+               v.vehicle_front_view,
+               v.vehicle_top_view
         FROM model_config c
-        LEFT JOIN model_vehicle v ON v.id = c.vehicle_id
+                 LEFT JOIN model_vehicle v ON v.id = c.vehicle_id
         WHERE c.is_deleted = '0'
-        and c.id = #{id,jdbcType=VARCHAR}
+          and c.id = #{id,jdbcType=VARCHAR}
     </select>
 
-    <select id="getConfigSensors" parameterType="api.common.pojo.vo.model.ConfigVO" resultMap="ConfigSensorVOMap">
-        SELECT
-            r.id,r.config_id,r.sensor_id,
-            s.sensor_name, s.description as sensorDescription,
-            r.sensor_type,
-            r.sensor_x, r.sensor_y, r.sensor_z, r.sensor_h, r.sensor_p, r.sensor_r, r.sensor_port
+    <select id="getConfigSensors" parameterType="api.common.pojo.vo.model.ConfigVO" resultType="api.common.pojo.vo.model.ConfigSensorVO">
+        SELECT r.id,
+               r.config_id,
+               r.sensor_id,
+               s.sensor_name,
+               s.description as sensorDescription,
+               r.sensor_type,
+               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.is_deleted = '0' and r.config_id = #{id,jdbcType=VARCHAR}
+                 INNER JOIN model_sensor_camera s ON r.sensor_id = s.id
+        WHERE r.is_deleted = '0'
+          and r.config_id = #{id,jdbcType=VARCHAR}
         UNION
-        SELECT
-            r.id,r.config_id,r.sensor_id,
-            s.sensor_name, s.description as sensorDescription,
-            r.sensor_type,
-            r.sensor_x, r.sensor_y, r.sensor_z, r.sensor_h, r.sensor_p, r.sensor_r, r.sensor_port
+        SELECT r.id,
+               r.config_id,
+               r.sensor_id,
+               s.sensor_name,
+               s.description as sensorDescription,
+               r.sensor_type,
+               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.is_deleted = '0' and r.config_id = #{id,jdbcType=VARCHAR}
+                 INNER JOIN model_sensor_ogt s ON r.sensor_id = s.id
+        WHERE r.is_deleted = '0'
+          and r.config_id = #{id,jdbcType=VARCHAR}
         UNION
-        SELECT
-            r.id,r.config_id,r.sensor_id,
-            s.sensor_name, s.description as sensorDescription,
-            r.sensor_type,
-            r.sensor_x, r.sensor_y, r.sensor_z, r.sensor_h, r.sensor_p, r.sensor_r, r.sensor_port
+        SELECT r.id,
+               r.config_id,
+               r.sensor_id,
+               s.sensor_name,
+               s.description as sensorDescription,
+               r.sensor_type,
+               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.is_deleted = '0' and r.config_id = #{id,jdbcType=VARCHAR}
+                 INNER JOIN model_sensor_lidar s ON r.sensor_id = s.id
+        WHERE r.is_deleted = '0'
+          and r.config_id = #{id,jdbcType=VARCHAR}
         UNION
-        SELECT
-            r.id,r.config_id,r.sensor_id,
-            s.sensor_name, s.description as sensorDescription,
-            r.sensor_type,
-            r.sensor_x, r.sensor_y, r.sensor_z, r.sensor_h, r.sensor_p, r.sensor_r, r.sensor_port
+        SELECT r.id,
+               r.config_id,
+               r.sensor_id,
+               s.sensor_name,
+               s.description as sensorDescription,
+               r.sensor_type,
+               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.is_deleted = '0' and r.config_id = #{id,jdbcType=VARCHAR}
+                 INNER JOIN model_sensor_gps s ON r.sensor_id = s.id
+        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">
+    <select id="checkConfigName" parameterType="api.common.pojo.po.model.ConfigPO"
+            resultType="api.common.pojo.vo.model.ConfigVO">
         select id,
-               description as configDescription
+        description as configDescription
         from model_config
         where is_deleted = '0'
-          and config_name = #{configName,jdbcType=VARCHAR}
+        and config_name = #{configName,jdbcType=VARCHAR}
         <if test="share != null and share != ''">
             and share = #{share,jdbcType=VARCHAR}
         </if>
@@ -120,73 +152,69 @@
     </select>
 
     <insert id="insertConfig" parameterType="api.common.pojo.po.model.ConfigPO">
-        insert into model_config(
-            id,
-            config_code,
-            config_name,
-            description,
-            vehicle_id,
-            share,
-            create_time,
-            modify_time,
-            create_user_id,
-            modify_user_id,
-            is_deleted,
-            vehicle_array
-        )
-        values(
-            #{id,jdbcType=VARCHAR},
-            #{configCode,jdbcType=VARCHAR},
-            #{configName,jdbcType=VARCHAR},
-            #{description,jdbcType=VARCHAR},
-            #{vehicleId,jdbcType=VARCHAR},
-            #{share,jdbcType=VARCHAR},
-            #{createTime,jdbcType=TIMESTAMP},
-            #{modifyTime,jdbcType=TIMESTAMP},
-            #{createUserId,jdbcType=VARCHAR},
-            #{modifyUserId,jdbcType=VARCHAR},
-            #{isDeleted,jdbcType=VARCHAR},
-            #{vehicleArray,jdbcType=VARCHAR}
-        )
+        insert into model_config(id,
+                                 config_code,
+                                 config_name,
+                                 description,
+                                 vehicle_id,
+                                 share,
+                                 create_time,
+                                 modify_time,
+                                 create_user_id,
+                                 modify_user_id,
+                                 is_deleted,
+                                 vehicle_array)
+        values (#{id,jdbcType=VARCHAR},
+                #{configCode,jdbcType=VARCHAR},
+                #{configName,jdbcType=VARCHAR},
+                #{description,jdbcType=VARCHAR},
+                #{vehicleId,jdbcType=VARCHAR},
+                #{share,jdbcType=VARCHAR},
+                #{createTime,jdbcType=TIMESTAMP},
+                #{modifyTime,jdbcType=TIMESTAMP},
+                #{createUserId,jdbcType=VARCHAR},
+                #{modifyUserId,jdbcType=VARCHAR},
+                #{isDeleted,jdbcType=VARCHAR},
+                #{vehicleArray,jdbcType=VARCHAR})
     </insert>
 
     <update id="updateConfig" parameterType="api.common.pojo.po.model.ConfigPO">
-        update model_config set
-            config_name = #{configName,jdbcType=VARCHAR},
-            description = #{description,jdbcType=VARCHAR},
-            vehicle_id = #{vehicleId,jdbcType=VARCHAR},
-            vehicle_array = #{vehicleArray,jdbcType=VARCHAR},
-            modify_time = #{modifyTime,jdbcType=TIMESTAMP},
+        update model_config
+        set config_name    = #{configName,jdbcType=VARCHAR},
+            description    = #{description,jdbcType=VARCHAR},
+            vehicle_id     = #{vehicleId,jdbcType=VARCHAR},
+            vehicle_array  = #{vehicleArray,jdbcType=VARCHAR},
+            modify_time    = #{modifyTime,jdbcType=TIMESTAMP},
             modify_user_id = #{modifyUserId,jdbcType=VARCHAR}
         where id = #{id,jdbcType=VARCHAR}
     </update>
 
     <update id="delConfigSensors" parameterType="api.common.pojo.po.model.ConfigPO">
-        update relation_config_sensor set
-            modify_time = #{modifyTime,jdbcType=TIMESTAMP},
+        update relation_config_sensor
+        set modify_time    = #{modifyTime,jdbcType=TIMESTAMP},
             modify_user_id = #{modifyUserId,jdbcType=VARCHAR},
-            is_deleted = '1'
+            is_deleted     = '1'
         where config_id = #{id,jdbcType=VARCHAR}
     </update>
 
     <insert id="insertConfigSensors">
         insert into relation_config_sensor(
-            id,
-            config_id,
-            sensor_id,
-            sensor_type,
-            sensor_x,
-            sensor_y,
-            sensor_z,
-            sensor_h,
-            sensor_p,
-            sensor_r,
-            sensor_port,
-            create_time,
-            modify_time,
-            create_user_id,
-            modify_user_id,
-            is_deleted
+        id,
+        config_id,
+        sensor_id,
+        sensor_type,
+        sensor_x,
+        sensor_y,
+        sensor_z,
+        sensor_h,
+        sensor_p,
+        sensor_r,
+        sensor_port,
+        create_time,
+        modify_time,
+        create_user_id,
+        modify_user_id,
+        is_deleted
         ) values
         <foreach collection="list" item="item" separator=",">
             (
@@ -211,14 +239,18 @@
     </insert>
 
     <update id="delConfigById" parameterType="api.common.pojo.po.model.ConfigPO">
-        update model_config set
-          modify_time = #{modifyTime,jdbcType=TIMESTAMP},
-          modify_user_id = #{modifyUserId,jdbcType=VARCHAR},
-          is_deleted = #{isDeleted,jdbcType=VARCHAR}
+        update model_config
+        set modify_time    = #{modifyTime,jdbcType=TIMESTAMP},
+            modify_user_id = #{modifyUserId,jdbcType=VARCHAR},
+            is_deleted     = #{isDeleted,jdbcType=VARCHAR}
         where id = #{id,jdbcType=VARCHAR}
     </update>
 
     <select id="getConfigTotal" parameterType="java.lang.String" resultType="java.lang.Integer">
-        select COUNT(1) from model_config where is_deleted = '0' and share = '0' and create_user_id = #{createUserId,jdbcType=VARCHAR}
+        select COUNT(1)
+        from model_config
+        where is_deleted = '0'
+          and share = '0'
+          and create_user_id = #{createUserId,jdbcType=VARCHAR}
     </select>
 </mapper>