Merge remote-tracking branch 'origin/master'

jiazx0107@163.com

2023-06-19 c09ce992101f0c9eaae165389a7638566ac566a9

 igds-api-phone/src/main/resources/mapper/Phone35Mapper.xml

@@ -103,7 +103,7 @@
        UPDATE_TIME_ AS updateTime
        FROM D_ENERGY
        <where>
            <if test="param.companyId != null">AND COMPANY_ID_ = #{param.companyId}</if>
            <if test="param.companyId != null and param.companyId != ''">AND COMPANY_ID_ = #{param.companyId}</if>
            <if test="param.startTime != null and param.endTime != null">AND UPDATE_TIME_ between #{param.startTime}
                and
                #{param.endTime}
@@ -121,7 +121,7 @@
        UPDATE_TIME_ AS updateTime
        FROM D_ENERGY
        <where>
            <if test="param.companyId != null">AND COMPANY_ID_ = #{param.companyId}</if>
            <if test="param.companyId != null and param.companyId != ''">AND COMPANY_ID_ = #{param.companyId}</if>
            <if test="param.depotId != null and param.depotId != ''">AND DEPOT_ID_ = #{param.depotId}</if>
            <if test="param.startTime != null">AND
                UPDATE_TIME_ <![CDATA[ > ]]>#{param.startTime,jdbcType=TIMESTAMP}
@@ -138,17 +138,38 @@
        USER_NAME_ AS userName,
        LONGITUDE_ As longitude,
        LATITUDE_ AS latitude,
        IMG_NAME_ AS base64Img,
        IMG_NAME_ AS imgName,
        CREATE_TIME_ AS createTime
        FROM D_SEC_PATROL_RECORD
        <where>
            <if test="param.companyId != null and companyId != ''">AND COMPANY_ID_ = #{param.companyId}</if>
            <if test="param.id != null and param.id != ''">AND ID_ = #{param.id}</if>
            <if test="param.companyId != null and param.companyId != ''">AND COMPANY_ID_ = #{param.companyId}</if>
            <if test="param.deptId != null and param.deptId != ''">AND DEPT_ID_ = #{param.deptId}</if>
            <if test="param.startTime != null and param.endTime != null">AND CREATE_TIME_ between #{param.startTime}
                and #{param.endTime}
            </if>
        </where>
    </select>

    <insert id="addPatrolRecord">
        INSERT INTO D_SEC_PATROL_RECORD
        (ID_,
         COMPANY_ID_,
         DEPT_ID_,
         USER_NAME_,
         CREATE_TIME_,
         LONGITUDE_,
         LATITUDE_,
         IMG_NAME_)
        VALUES (#{param.id},
                #{param.companyId},
                #{param.deptId},
                #{param.userName},
                #{param.createTime},
                #{param.longitude},
                #{param.latitude},
                #{param.imgName})
    </insert>
    <!--    监控设备列表-->
    <select id="getCamera" resultType="com.ld.igds.phone35.dto.DtoVideo">