From 830d1772dfae2ea5eaaf41ecb7cdbcb9efffc6c5 Mon Sep 17 00:00:00 2001
From: nnnjjj123 <494715143@qq.com>
Date: Thu, 28 Jan 2021 16:09:42 +0800
Subject: [PATCH] 设备，警情调整
---
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/mapper/AlarmMapper.xml | 61 +++++++++++++++++++++---------
1 files changed, 42 insertions(+), 19 deletions(-)
diff --git a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/mapper/AlarmMapper.xml b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/mapper/AlarmMapper.xml
index 20d5502..630c430 100644
--- a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/mapper/AlarmMapper.xml
+++ b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/mapper/AlarmMapper.xml
@@ -16,7 +16,7 @@
<result column="waringType" property="waringType"/>
<result column="deviceNumber" property="deviceNumber"/>
<result column="region" property="region"/>
- <result column="addvcd" property="addvcd"/>
+ <result column="district" property="district"/>
<result column="alarmId" property="alarmId"/>
<result column="level" property="level"/>
<result column="coordinate" property="coordinate"/>
@@ -29,20 +29,35 @@
<result column="channelNumber" property="channelNumber"/>
<result column="czTime" property="czTime"/>
<result column="bz" property="bz"/>
+ <result column="name" property="name"/>
</resultMap>
<select id="selectAlarmPage" 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.addvcd, a.alarmId,a.LEVEL,ST_ASTEXT (a.coordinate) AS coordinate,jd,wd,a.jtype,a.rname from sys_alarm a where 1=1
+ a.deviceNumber,a.region,a.district, a.alarmId,a.LEVEL,a.jd,a.wd,a.jtype,a.rname,a.jjTime,a.province,a.city,
+ e.serialNumber,
+ e.stype,
+ e.channelNumber from sys_alarm a
+ LEFT JOIN sys_equipment e on e.deviceNumber=a.deviceNumber
+ where 1=1
<if test="alarm.jtype!=null">
and a.jtype like concat('%',#{alarm.jtype},'%')
+ </if>
+ <if test="alarm.deviceNumber!=null">
+ and a.deviceNumber like concat('%',#{alarm.deviceNumber},'%')
</if>
<if test="alarm.galarmPeople!=null">
and a.galarmPeople like concat('%',#{alarm.galarmPeople},'%')
</if>
- <if test="alarm.addvcd!=null">
- and a.addvcd like concat('%',#{alarm.addvcd},'%')
+ <if test="alarm.district!=null">
+ and a.district like concat('%',#{alarm.district},'%')
+ </if>
+ <if test="alarm.province!=null">
+ and a.province like concat('%',#{alarm.province},'%')
+ </if>
+ <if test="alarm.city!=null">
+ and a.city like concat('%',#{alarm.city},'%')
</if>
<if test="alarm.level!=null">
and a.level like concat('%',#{alarm.level},'%')
@@ -50,6 +65,13 @@
<if test="alarm.waringType!=null">
and a.waringType like concat('%',#{alarm.waringType},'%')
</if>
+ <if test="alarm.beginTime!=null and alarm.beginTime!=''">
+ and a.alarmTime>=#{alarm.beginTime}
+ </if>
+ <if test="alarm.endTime!=null and alarm.endTime!=''">
+ and a.alarmTime<=#{alarm.endTime}
+ </if>
+ ORDER BY a.alarmTime desc
</select>
<select id="selectList" resultMap="alarmResultMap">
@@ -66,7 +88,7 @@
a.waringType,
a.deviceNumber,
a.region,
- a.addvcd,
+ a.district,
a.alarmId,
a.czTime,
a.bz,
@@ -81,12 +103,12 @@
e.stype,
e.channelNumber
FROM
- sys_alarm a LEFT JOIN sys_district d on d.addvcds=a.addvcd LEFT JOIN sys_equipment e on e.deviceNumber=a.deviceNumber where 1=1
+ 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
<if test="jtype!=null and jtype!=''">
and a.jtype=#{jtype}
</if>
- <if test="addvcd!=null and addvcd!=''">
- and a.addvcd=#{addvcd}
+ <if test="district!=null and district!=''">
+ and a.district=#{district}
</if>
<if test="waringType!=null and waringType!=''">
and a.waringType=#{waringType}
@@ -116,7 +138,7 @@
a.waringType,
a.deviceNumber,
a.region,
- a.addvcd,
+ a.district,
a.alarmId,
a.rname,
a.LEVEL,
@@ -126,7 +148,7 @@
a.jtype,
d.addvnm
FROM
- sys_alarm a LEFT JOIN sys_district d on d.addvcds=a.addvcd where 1=1
+ sys_alarm a LEFT JOIN sys_district d on d.addvcds=a.district where 1=1
<if test="id!=null and id!=''">
and a.id=#{id}
</if>
@@ -147,7 +169,7 @@
a.waringType,
a.deviceNumber,
a.region,
- a.addvcd,
+ a.district,
a.alarmId,
a.rname,
a.LEVEL,
@@ -160,7 +182,7 @@
e.stype,
e.channelNumber
FROM
- sys_alarm a LEFT JOIN sys_district d on d.addvcds=a.addvcd LEFT JOIN sys_equipment e on e.deviceNumber=a.deviceNumber where 1=1
+ 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
<if test="id!=null and id!=''">
and a.id >#{id}
</if>
@@ -173,14 +195,15 @@
<!--新增-->
<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,addvcd,alarmId,level,rname,coordinate,jd,wd,jtype) VALUES
- (#{alarmType},#{alarmPeople},#{alarmTime},#{galarmPeople},#{sex},#{phoneNumber},#{place},#{content},#{waringType},#{deviceNumber},#{region},#{addvcd},#{alarmId},#{level},#{rname},POINT(#{jd},#{wd}),#{jd},#{wd},#{jtype})
+ 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})
</insert>
<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},addvcd=#{addvcd},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>
@@ -203,7 +226,7 @@
a.waringType,
a.deviceNumber,
a.region,
- a.addvcd,
+ a.district,
a.alarmId,
a.LEVEL,
ST_ASTEXT (a.coordinate ) AS coordinate,
@@ -211,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.addvcd 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') >=#{beginTime} and DATE_FORMAT(alarmTime,'%Y-%m-%d') <=#{endTime} ORDER BY alarmTime desc
</select>
--
Gitblit v1.9.3