报文保存位置修改

zengh

2021-04-29 5d4210f4f6dff3341c1a034857bf8da6cd7cf692

 blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/mapper/AlarmMapper.xml

@@ -34,6 +34,11 @@
        <result column="vaddress" property="vaddress"/>
        <result column="aaddress" property="aaddress"/>
        <result column="uids" property="uids"/>
        <result column="securityArr" property="securityArr"/>
        <result column="securityId" property="securityId"/>
        <result column="baname" property="baname"/>
        <result column="baid" property="baid"/>
        <result column="baphone" property="baphone"/>
    </resultMap>

    <sql id="alarmCondition">
@@ -186,6 +191,7 @@
        a.id,a.alarmType,a.alarmPeople,a.alarmTime,a.galarmPeople,a.sex,a.phoneNumber,a.content,a.waringType,a.bz,
        a.deviceNumber,a.region,a.district,a.vaddress,a.aaddress,
        a.alarmId,a.LEVEL,e.jd,e.wd,a.jtype,a.rname,a.jjTime,a.province,a.city,a.cid,
        a.securityArr,a.securityId,
        e.serialNumber,e.oneContacts,e.ThreeContacts,e.twoContacts,e.onePhone,e.twoPhone,e.ThreePhone,
        e.stype,
        e.oneId,
@@ -193,9 +199,14 @@
        e.threeId,
        e.deptId,
        e.street as place,
        e.channelNumber from sys_alarm a
        e.channelNumber,
        u.name as baname,
        u.id as baid,
        u.phone as baphone
        from sys_alarm a
        LEFT JOIN
        sys_equipment e on e.deviceNumber=a.deviceNumber
        LEFT JOIN jfpth.blade_user u ON u.id = a.securityId
        where 1=1
        <include refid="alarmCondition"></include>
        and a.waringType IN("紧急求救")
@@ -401,7 +412,11 @@


    <update id="updateJtype">
        update sys_alarm SET jtype=#{jtype},bz=#{bz}
        update sys_alarm SET jtype=#{jtype}

        <if test="bz!=null and bz!=''">
            ,bz=#{bz}
        </if>

        <if test="securityArr!=null and id!=''">
            ,securityArr =#{securityArr}