jfpt-BladeX.git

			@@ -31,16 +31,22 @@
			<result column="bz" property="bz"/>
			<result column="name" property="name"/>
			<result column="cid" property="cid"/>
			<result column="vaddress" property="vaddress"/>
			<result column="aaddress" property="aaddress"/>
			</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.bz,
			a.deviceNumber,a.region,a.district,
			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,
			e.stype,
			e.oneId,
			e.twoId,
			e.threeId,
			e.deptId,
			e.channelNumber from sys_alarm a
			LEFT JOIN sys_equipment e on e.deviceNumber=a.deviceNumber
			where 1=1
			@@ -84,7 +90,7 @@

			<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,e.jd,e.wd,a.jtype,a.rname,a.jjTime,a.province,a.city,a.cid
			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,a.vaddress
			from sys_alarm a LEFT JOIN sys_equipment e on e.deviceNumber=a.deviceNumber

			</select>
			@@ -102,6 +108,7 @@
			a.content,
			a.waringType,
			a.deviceNumber,
			a.vaddress,
			a.region,
			a.district,
			a.alarmId,
			@@ -139,7 +146,7 @@
			</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,
			select a.id,a.alarmType,a.alarmPeople,a.alarmTime,a.galarmPeople,a.sex,a.phoneNumber,a.place,a.content,a.waringType,a.vaddress,
			a.deviceNumber,a.region,a.district, a.alarmId,a.LEVEL,a.jd,a.wd,a.jtype,a.rname,a.jjTime,a.province,a.city,a.cid from sys_alarm a ORDER BY id DESC LIMIT 1
			</select>

			@@ -161,6 +168,7 @@
			a.region,
			a.district,
			a.alarmId,
			a.vaddress,
			a.rname,
			a.LEVEL,
			a.cid,
			@@ -223,10 +231,10 @@
			</delete>

			<!--新增-->
			<insert id="s" parameterType="org.springblade.jfpt.alarm.entity.Alarm">
			INSERT INTO sys_alarm (alarmType,alarmPeople,alarmTime,galarmPeople,sex,phoneNumber,place,content,waringType,deviceNumber,
			<insert id="s" parameterType="org.springblade.jfpt.alarm.entity.Alarm" useGeneratedKeys="true" keyProperty="id">
			INSERT INTO sys_alarm (alarmType,jjTime,alarmPeople,alarmTime,galarmPeople,sex,phoneNumber,place,content,waringType,deviceNumber,
			region,district,alarmId,level,rname,coordinate,jd,wd,jtype,province,city,cid) VALUES
			(#{alarmType},#{alarmPeople},#{alarmTime},#{galarmPeople},#{sex},#{phoneNumber},#{place},#{content},#{waringType},
			(#{alarmType},#{jjTime},#{alarmPeople},#{alarmTime},#{galarmPeople},#{sex},#{phoneNumber},#{place},#{content},#{waringType},
			#{deviceNumber},#{region},#{district},#{alarmId},#{level},#{rname},POINT(#{jd},#{wd}),
			#{jd},#{wd},#{jtype},#{province},#{city},#{cid})
			</insert>
			@@ -277,7 +285,7 @@


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

			<update id="updatePoliceStatus">
			@@ -320,6 +328,7 @@
			) b
			on
			a.click_date = b.datetime
			order by a.click_date asc
			</select>


			@@ -402,4 +411,32 @@
			LIMIT 1

			</select>

			<select id="queryBa" resultType="java.util.HashMap">
			SELECT
			s.id,
			s.CODE,
			s.NAME,
			s.real_name,
			s.phone,
			p.jd,
			p.wd,
			ST_ASTEXT ( e.coordinate )
			FROM
			jfpth.blade_user s
			LEFT JOIN sys_position p ON p.snumber = s.
			CODE LEFT JOIN sys_enclosure e ON e.anumber = s.CODE
			WHERE
			is_deleted != '1'
			AND role_id = "1370562810882502657"
			</select>

			<update id="updateVaddress">
			update sys_alarm SET vaddress=#{vaddress} where id=#{jid}
			</update>


			<select id="selectEq" resultType="java.util.HashMap">
			SELECT COUNT(deviceNumber) as cou,deviceNumber FROM `sys_alarm` WHERE alarmTime like concat(concat('%', #{time}), '%') and waringType NOT IN("系统测试","主机重新上电") group by deviceNumber
			</select>
			</mapper>