设备，警情调整

nnnjjj123

2021-01-28 830d1772dfae2ea5eaaf41ecb7cdbcb9efffc6c5

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

@@ -29,6 +29,7 @@
        <result column="channelNumber" property="channelNumber"/>
        <result column="czTime" property="czTime"/>
        <result column="bz" property="bz"/>
        <result column="name" property="name"/>
    </resultMap>


@@ -201,7 +202,8 @@
    <update id="updateOne" parameterType="org.springblade.jfpt.alarm.entity.Alarm">
    update sys_alarm SET alarmType=#{alarmType},alarmPeople=#{alarmPeople},alarmTime=#{alarmTime},
    galarmPeople=#{galarmPeople},sex=#{sex},phoneNumber=#{phoneNumber},place=#{place},
    content=#{content},waringType=#{waringType},deviceNumber=#{deviceNumber},region=#{region},district=#{district},alarmId=#{alarmId},level=#{level},rname=#{rname},jd=#{jd},wd=#{wd},coordinate=POINT(#{jd},#{wd}),jtype=#{jtype} where id=#{id}
    content=#{content},waringType=#{waringType},deviceNumber=#{deviceNumber},region=#{region},district=#{district},alarmId=#{alarmId},level=#{level},rname=#{rname},jd=#{jd},wd=#{wd},
    coordinate=POINT(#{jd},#{wd}),jtype=#{jtype},province=#{province},city=#{city} where id=#{id}
</update>


@@ -232,12 +234,12 @@
        a.wd,
        a.jtype,
        a.rname,
        d.addvnm,
        e.serialNumber,
        e.stype,
        e.channelNumber
        e.channelNumber,
        jfpth.blade_region.`name`
        FROM
        sys_alarm a LEFT JOIN sys_district d on d.addvcds=a.district LEFT JOIN sys_equipment e on e.deviceNumber=a.deviceNumber where
        sys_alarm a LEFT JOIN sys_equipment e on e.deviceNumber=a.deviceNumber LEFT JOIN jfpth.blade_region on jfpth.blade_region.`code`=a.district where
        DATE_FORMAT(alarmTime,'%Y-%m-%d') &gt;=#{beginTime} and DATE_FORMAT(alarmTime,'%Y-%m-%d') &lt;=#{endTime} ORDER BY alarmTime desc
    </select>