jfpt-BladeX.git

			@@ -35,13 +35,15 @@


			<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.district, a.alarmId,a.LEVEL,e.jd,e.wd,a.jtype,a.rname,a.jjTime,a.province,a.city,a.cid,
			e.serialNumber,
			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,e.jd,e.wd,a.jtype,a.rname,a.jjTime,a.province,a.city,a.cid,
			e.serialNumber,e.oneContacts,e.ThreeContacts,e.twoContacts,onePhone,twoPhone,ThreePhone,
			e.stype,
			e.channelNumber from sys_alarm a
			LEFT JOIN sys_equipment e on e.deviceNumber=a.deviceNumber
			where 1=1
			where 1=1
			<if test="alarm.jtype!=null">
			and a.jtype like concat('%',#{alarm.jtype},'%')
			</if>
			@@ -72,6 +74,9 @@
			<if test="alarm.endTime!=null and alarm.endTime!=''">
			and a.alarmTime<=#{alarm.endTime}
			</if>

			and a.waringType NOT IN("系统测试","主机重新上电")

			ORDER BY
			a.jtype ASC,
			a.alarmTime DESC
			@@ -113,7 +118,8 @@
			e.stype,
			e.channelNumber
			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 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>
			@@ -169,7 +175,7 @@
			</if>
			</select>

			<!--实时提醒-->
			<!--实时提醒-->
			<select id="selecttx" resultMap="alarmResultMap">
			SELECT
			a.id,
			@@ -185,6 +191,8 @@
			a.deviceNumber,
			a.region,
			a.district,
			a.province,
			a.city,
			a.alarmId,
			a.rname,
			a.LEVEL,
			@@ -197,7 +205,8 @@
			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_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>
			@@ -275,4 +284,85 @@
			and
			to_days(alarmTime) = to_days(curdate())
			</select>


			<!--查询警情7天内每天的数据-->
			<select id="selectAlarmData" resultType="java.lang.Integer">
			select ifnull(b.count,0) as count from
			(
			SELECT DATE_FORMAT(date_sub(curdate(), interval 6 day),'%Y-%m-%d') as click_date
			union all
			SELECT DATE_FORMAT(date_sub(curdate(), interval 5 day),'%Y-%m-%d') as click_date
			union all
			SELECT DATE_FORMAT(date_sub(curdate(), interval 4 day),'%Y-%m-%d') as click_date
			union all
			SELECT DATE_FORMAT(date_sub(curdate(), interval 3 day),'%Y-%m-%d') as click_date
			union all
			SELECT DATE_FORMAT(date_sub(curdate(), interval 2 day),'%Y-%m-%d') as click_date
			union all
			SELECT DATE_FORMAT(date_sub(curdate(), interval 1 day),'%Y-%m-%d') as click_date
			union all
			SELECT DATE_FORMAT(curdate(),'%Y-%m-%d') as click_date
			) a
			left join
			(
			select DATE_FORMAT(alarmTime,'%Y-%m-%d') as datetime, count(*) as count from sys_alarm
			group by DATE_FORMAT(alarmTime,'%Y-%m-%d')
			) b
			on
			a.click_date = b.datetime
			</select>


			<!-- <!–查询本日，本周，本月主动报警的数量–>-->
			<!-- <select id="selectAlarmSum" resultType="java.util.HashMap">-->
			<!-- select sa.alarmType name,IFNULL(sb.count, 0) value from (select alarmType from sys_alarm GROUP BY alarmType) sa-->
			<!-- left join-->
			<!-- ( select alarmType,count(*) count from sys_alarm-->
			<!-- where 1=1-->
			<!-- <if test="conditionVo.status==0">-->
			<!-- and to_days(alarmTime) = to_days(now())-->
			<!-- </if>-->
			<!-- <if test="conditionVo.status==1">-->
			<!-- and YEARWEEK(date_format(alarmTime,'%Y-%m-%d'),1) = YEARWEEK(now(),1)-->
			<!-- </if>-->
			<!-- <if test="conditionVo.status==2">-->
			<!-- and date_format(alarmTime,'%Y%m') = date_format(now(),'%Y%m')-->
			<!-- </if>-->
			<!-- group by alarmType-->
			<!-- ) sb-->
			<!-- on-->
			<!-- sa.alarmType = sb.alarmType-->
			<!-- </select>-->

			<!--查询本日，本周，本月主动报警的数量-->
			<select id="selectAlarmSum" resultType="java.util.HashMap">
			select '一键求助' name,ifnull(count(*),0 ) value from sys_alarm
			where alarmType = '一键求助'
			<if test="conditionVo.status==0">
			and to_days(alarmTime) = to_days(now())
			</if>
			<if test="conditionVo.status==1">
			and YEARWEEK(date_format(alarmTime,'%Y-%m-%d'),1) = YEARWEEK(now(),1)
			</if>
			<if test="conditionVo.status==2">
			and date_format(alarmTime,'%Y%m') = date_format(now(),'%Y%m')
			</if>
			union all
			select '电话报警' name,ifnull(count(*),0 ) value from sys_alarm
			where alarmType = '电话报警'
			<if test="conditionVo.status==0">
			and to_days(alarmTime) = to_days(now())
			</if>
			<if test="conditionVo.status==1">
			and YEARWEEK(date_format(alarmTime,'%Y-%m-%d'),1) = YEARWEEK(now(),1)
			</if>
			<if test="conditionVo.status==2">
			and date_format(alarmTime,'%Y%m') = date_format(now(),'%Y%m')
			</if>

			</select>

			<select id="queryPolice" resultType="java.util.List">
			SELECT * FROM jfpth.blade_user WHERE is_deleted != '1' and role_id ="1370562810882502657"</select>
			</mapper>