修改报警器端口

zengh

2021-03-10 fa9ffa9012d7b1df7692bb99e71be6592f48cd4b

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

@@ -71,7 +71,15 @@
        <if test="alarm.endTime!=null and alarm.endTime!=''">
            and a.alarmTime&lt;=#{alarm.endTime}
        </if>
        ORDER BY a.alarmTime desc
        ORDER BY
        a.jtype ASC,
        a.alarmTime DESC
    </select>

    <select id="listAll" resultMap="alarmResultMap">
       select a.id,a.alarmType,a.alarmPeople,a.alarmTime,a.galarmPeople,a.sex,a.phoneNumber,a.place,a.content,a.waringType,
        a.deviceNumber,a.region,a.district, a.alarmId,a.LEVEL,a.jd,a.wd,a.jtype,a.rname,a.jjTime,a.province,a.city
         from sys_alarm a
    </select>

    <select id="selectList" resultMap="alarmResultMap">
@@ -93,17 +101,16 @@
        a.czTime,
        a.bz,
        a.LEVEL,
        ST_ASTEXT (a.coordinate ) AS coordinate,
        a.jd,
        a.wd,
        a.jtype,
        a.rname,
        d.addvnm,
        jfpth.blade_region.name as addvnm,
        e.serialNumber,
        e.stype,
        e.channelNumber
        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 1=1
        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 1=1
        <if test="jtype!=null and jtype!=''">
            and a.jtype=#{jtype}
        </if>
@@ -120,6 +127,11 @@
            and a.alarmTime&lt;=#{endTime}
        </if>
        ORDER BY id ASC
    </select>

    <select id="getLimit" resultMap="alarmResultMap">
       select a.id,a.alarmType,a.alarmPeople,a.alarmTime,a.galarmPeople,a.sex,a.phoneNumber,a.place,a.content,a.waringType,
        a.deviceNumber,a.region,a.district, a.alarmId,a.LEVEL,a.jd,a.wd,a.jtype,a.rname,a.jjTime,a.province,a.city from sys_alarm a ORDER BY id DESC LIMIT 1
    </select>

    <select id="selectInfo" resultMap="alarmResultMap">
@@ -142,7 +154,6 @@
        a.alarmId,
        a.rname,
        a.LEVEL,
        ST_ASTEXT(a.coordinate) AS coordinate,
        a.jd,
        a.wd,
        a.jtype,
@@ -173,7 +184,6 @@
        a.alarmId,
        a.rname,
        a.LEVEL,
        ST_ASTEXT (a.coordinate ) AS coordinate,
        a.jd,
        a.wd,
        a.jtype,
@@ -195,8 +205,10 @@
    <!--新增-->
    <insert id="s" parameterType="org.springblade.jfpt.alarm.entity.Alarm">
       INSERT INTO sys_alarm (alarmType,alarmPeople,alarmTime,galarmPeople,sex,phoneNumber,place,content,waringType,deviceNumber,
       region,district,alarmId,level,rname,coordinate,jd,wd,jtype) VALUES
        (#{alarmType},#{alarmPeople},#{alarmTime},#{galarmPeople},#{sex},#{phoneNumber},#{place},#{content},#{waringType},#{deviceNumber},#{region},#{district},#{alarmId},#{level},#{rname},POINT(#{jd},#{wd}),#{jd},#{wd},#{jtype})
       region,district,alarmId,level,rname,coordinate,jd,wd,jtype,province,city) VALUES
        (#{alarmType},#{alarmPeople},#{alarmTime},#{galarmPeople},#{sex},#{phoneNumber},#{place},#{content},#{waringType},
        #{deviceNumber},#{region},#{district},#{alarmId},#{level},#{rname},POINT(#{jd},#{wd}),
        #{jd},#{wd},#{jtype},#{province},#{city})
    </insert>

    <update id="updateOne" parameterType="org.springblade.jfpt.alarm.entity.Alarm">
@@ -229,7 +241,6 @@
        a.district,
        a.alarmId,
        a.LEVEL,
        ST_ASTEXT (a.coordinate ) AS coordinate,
        a.jd,
        a.wd,
        a.jtype,
@@ -237,7 +248,7 @@
        e.serialNumber,
        e.stype,
        e.channelNumber,
        jfpth.blade_region.`name`
        jfpth.blade_region.`name` as addvnm
        FROM
        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