巡查记录添加视频字段

guoshilong

2023-04-05 fe7dc409ff0c7655167c9d17662d39ed779e9637

巡查记录添加视频字段

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/controller/PatrolRecordController.java

@@ -130,7 +130,7 @@
    }

    /**
     * 通过itemIds查询
     * 通过itemIds查询(用于巡查上报时的回显)
     *
     * @return
     */

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/entity/PatrolRecord.java

@@ -1,5 +1,6 @@
package cn.gistack.sm.patrol.entity;

import com.baomidou.mybatisplus.annotation.FieldStrategy;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler;
@@ -47,10 +48,17 @@
     * 巡查现场图片
     */
    @ApiModelProperty("巡查现场图片")
    @TableField(value = "images",typeHandler = FastjsonTypeHandler.class)
    @TableField(value = "images",typeHandler = FastjsonTypeHandler.class,updateStrategy = FieldStrategy.IGNORED)
    private Object[] images;

    /**
     * 巡查现场视频
     */
    @ApiModelProperty("巡查现场视频")
    @TableField(value = "videos",typeHandler = FastjsonTypeHandler.class,updateStrategy = FieldStrategy.IGNORED)
    private Object[] videos;

    /**
     * 巡查内容
     */
    @ApiModelProperty("巡查内容")

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/mapper/PatrolRecordMapper.xml

@@ -8,6 +8,8 @@
        <result column="device_ids" property="deviceIds"/>
        <result column="images" property="images"
                typeHandler="com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler"/>
        <result column="videos" property="videos"
                typeHandler="com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler"/>
        <result column="content" property="content"/>
        <result column="status" property="status"/>
        <result column="item_id" property="itemId"/>
@@ -31,7 +33,8 @@
    </resultMap>

    <select id="selectPatrolRecord" resultMap="selectPatrolRecordList">
        SELECT record.id,record.patrol_type,record.device_ids,record.images,record.content,record.status,record.item_id,record.task_id,record.patrol_route,record.update_time,
        SELECT
        record.id,record.patrol_type,record.device_ids,record.images,record.videos,record.content,record.status,record.item_id,record.task_id,record.patrol_route,record.update_time,
        dmgeo.ST_AsGeoJSON(task.route_coordinates) taskRoute,item.items_name itemsName,item.description
        FROM SM_PATROL_RECORD record
        LEFT JOIN sm_patrol_type type ON type.id = record.patrol_type
@@ -50,7 +53,7 @@
    </select>
    <select id="getDetail" resultMap="selectPatrolRecordList">
        SELECT
            record.id,record.patrol_type,record.images,record.content,record.status,record.item_id,record.content,record.task_id,record.patrol_route,record.create_user,
            record.id,record.patrol_type,record.images,record.videos,record.content,record.status,record.item_id,record.content,record.task_id,record.patrol_route,record.create_user,
            item.description,
            u.phone
        FROM SM_PATROL_RECORD record
@@ -66,9 +69,9 @@
    </select>

    <select id="getByTaskIdAndItemId" resultMap="selectPatrolRecordList">
        SELECT r.id,r.patrol_type,r.device_ids,r.images,r.content,r.status,r.item_id,r.task_id,r.update_time,
                    c.name groupName,c.id groupId,c.items_name itemsName,c.description,
                    u.real_name
        SELECT r.id,r.patrol_type,r.device_ids,r.images,r.videos,r.content,r.status,r.item_id,r.task_id,r.update_time,
        c.name groupName,c.id groupId,c.items_name itemsName,c.description,
        u.real_name
        FROM BLADEX.SM_PATROL_RECORD r
        LEFT JOIN
        (SELECT g.ID,g.NAME,a.id itemId, a.items_name,description FROM
@@ -86,7 +89,7 @@
        where r.task_id = #{taskId}
    </select>
    <select id="getPatrolRecordVO" resultMap="selectPatrolRecordList">
        SELECT r.id,r.patrol_type,r.device_ids,r.images,r.content,r.status,r.item_id,r.task_id,r.create_user,r.create_dept,
        SELECT r.id,r.patrol_type,r.device_ids,r.images,r.videos,r.content,r.status,r.item_id,r.task_id,r.create_user,r.create_dept,
        i.items_name itemsName,i.description
        FROM sm_patrol_record r
        LEFT JOIN sm_patrol_group_item i ON i.id = r.item_id