jfpt-BladeX.git

			@@ -30,12 +30,13 @@
			<result column="czTime" property="czTime"/>
			<result column="bz" property="bz"/>
			<result column="name" property="name"/>
			<result column="cid" property="cid"/>
			</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.district, a.alarmId,a.LEVEL,a.jd,a.wd,a.jtype,a.rname,a.jjTime,a.province,a.city,
			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,
			e.serialNumber,
			e.stype,
			e.channelNumber from sys_alarm a
			@@ -78,7 +79,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,a.jd,a.wd,a.jtype,a.rname,a.jjTime,a.province,a.city
			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
			</select>

			@@ -104,6 +105,7 @@
			a.jd,
			a.wd,
			a.jtype,
			a.cid,
			a.rname,
			jfpth.blade_region.name as addvnm,
			e.serialNumber,
			@@ -131,7 +133,7 @@

			<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
			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>

			<select id="selectInfo" resultMap="alarmResultMap">
			@@ -154,6 +156,7 @@
			a.alarmId,
			a.rname,
			a.LEVEL,
			a.cid,
			a.jd,
			a.wd,
			a.jtype,
			@@ -184,6 +187,7 @@
			a.alarmId,
			a.rname,
			a.LEVEL,
			a.cid,
			a.jd,
			a.wd,
			a.jtype,
			@@ -205,17 +209,17 @@
			<!--新增-->
			<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,province,city) VALUES
			region,district,alarmId,level,rname,coordinate,jd,wd,jtype,province,city,cid) VALUES
			(#{alarmType},#{alarmPeople},#{alarmTime},#{galarmPeople},#{sex},#{phoneNumber},#{place},#{content},#{waringType},
			#{deviceNumber},#{region},#{district},#{alarmId},#{level},#{rname},POINT(#{jd},#{wd}),
			#{jd},#{wd},#{jtype},#{province},#{city})
			#{jd},#{wd},#{jtype},#{province},#{city},#{cid})
			</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},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}
			coordinate=POINT(#{jd},#{wd}),jtype=#{jtype},province=#{province},city=#{city},cid=#{cid} where id=#{id}
			</update>


			@@ -242,6 +246,7 @@
			a.alarmId,
			a.LEVEL,
			a.jd,
			a.cid,
			a.wd,
			a.jtype,
			a.rname,