jfpt-BladeX.git

			@@ -180,7 +180,7 @@

			<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.bz,
			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,
			e.serialNumber,e.oneContacts,e.ThreeContacts,e.twoContacts,e.onePhone,e.twoPhone,e.ThreePhone,
			@@ -189,6 +189,7 @@
			e.twoId,
			e.threeId,
			e.deptId,
			e.street as place,
			e.channelNumber from sys_alarm a
			LEFT JOIN
			sys_equipment e on e.deviceNumber=a.deviceNumber
			@@ -397,7 +398,13 @@


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

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

			where id=#{id}
			</update>

			<update id="updatePoliceStatus">
			@@ -546,6 +553,17 @@
			AND role_id = "1370562810882502657"
			</select>

			<select id="getAlarm" resultType="java.util.HashMap">
			SELECT
			*
			FROM
			sys_alarm
			WHERE
			securityId IS NULL
			AND securityArr LIKE concat('%',#{alarm.securityArr},'%')

			</select>

			<update id="updateVaddress">
			update sys_alarm SET vaddress=#{vaddress},uids=#{uids} where id=#{jid}
			</update>
			@@ -627,7 +645,7 @@
			from sys_alarm a
			LEFT JOIN sys_equipment e on e.deviceNumber=a.deviceNumber
			where 1=1
			<include refid="alarmCondition"></include>
			<include refid="alarmCondition"></include>
			and a.waringType IN("紧急求救")
			ORDER BY
			a.jtype ASC,
			@@ -637,7 +655,7 @@
			<!--获取实时警情图表统计数据-->
			<select id="getAlarmPie" resultType="org.springblade.common.entity.ReportReturnData">
			select if(1=1,"紧急求救",0) type,ifnull(count(*),0) count from sys_alarm
			where waringType="紧急求救"
			where waringType="紧急求救"
			<include refid="alarmConditionPie"></include>
			</select>