jfptManager.git

			@@ -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"/>
			@@ -27,12 +27,15 @@
			<result column="serialNumber" property="serialNumber"/>
			<result column="stype" property="stype"/>
			<result column="channelNumber" property="channelNumber"/>
			<result column="czTime" property="czTime"/>
			<result column="bz" property="bz"/>
			<result column="jjTime" property="jjTime"/>
			</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,FORMAT(a.jd,6) as jd,FORMAT(a.wd,6) as wd,a.jtype,a.rname from sys_alarm a where 1=1
			a.deviceNumber,a.region,a.district, a.alarmId,a.LEVEL,ST_ASTEXT (a.coordinate) AS coordinate,FORMAT(a.jd,6) as jd,FORMAT(a.wd,6) as wd,a.jtype,a.rname from sys_alarm a where 1=1
			<if test="alarm.jtype!=null">
			and a.jtype like concat(concat('%', #{alarm.jtype}), '%')
			</if>
			@@ -40,7 +43,7 @@
			and a.galarmPeople like concat(concat('%', #{alarm.galarmPeople}), '%')
			</if>
			<if test="alarm.addvcd!=null">
			and a.addvcd like concat(concat('%', #{alarm.addvcd}), '%')
			and a.district like concat(concat('%', #{alarm.district}), '%')
			</if>
			<if test="alarm.level!=null">
			and a.level like concat(concat('%', #{alarm.level}), '%')
			@@ -64,8 +67,11 @@
			a.waringType,
			a.deviceNumber,
			a.region,
			a.addvcd,
			a.district,
			a.alarmId,
			a.czTime,
			a.bz,
			a.jjTime,
			a.LEVEL,
			ST_ASTEXT (a.coordinate ) AS coordinate,
			a.jd,
			@@ -77,12 +83,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}
			and a.district=#{addvcd}
			</if>
			<if test="waringType!=null and waringType!=''">
			and a.waringType=#{waringType}
			@@ -106,13 +112,16 @@
			a.sex,
			a.phoneNumber,
			a.place,
			a.czTime,
			a.bz,
			a.content,
			a.waringType,
			a.deviceNumber,
			a.region,
			a.addvcd,
			a.district,
			a.alarmId,
			a.rname,
			a.jjTime,
			a.LEVEL,
			ST_ASTEXT(a.coordinate) AS coordinate,
			a.jd,
			@@ -120,7 +129,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>
			@@ -141,8 +150,9 @@
			a.waringType,
			a.deviceNumber,
			a.region,
			a.addvcd,
			a.district,
			a.alarmId,
			a.jjTime,
			a.rname,
			a.LEVEL,
			ST_ASTEXT (a.coordinate ) AS coordinate,
			@@ -154,7 +164,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>
			@@ -167,14 +177,59 @@
			<!--新增-->
			<insert id="s" parameterType="org.springblade.modules.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,czTime,bz,jjTime) VALUES
			(#{alarmType},#{alarmPeople},#{alarmTime},#{galarmPeople},#{sex},#{phoneNumber},#{place},#{content},#{waringType},#{deviceNumber},#{region},#{district},
			#{alarmId},#{level},#{rname},POINT(#{jd},#{wd}),#{jd},#{wd},#{jtype}
			,#{czTime},#{bz},#{jjTime})
			</insert>

			<update id="updateOne" parameterType="org.springblade.modules.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=#{addvcd},alarmId=#{alarmId},level=#{level},rname=#{rname},jd=#{jd},
			wd=#{wd},coordinate=POINT(#{jd},#{wd}),jtype=#{jtype},jtype=#{jtype},czTime=#{czTime},bz=#{bz},jjTime=#{jjTime} where id=#{id}
			</update>


			<select id="selectScount" resultType="java.util.HashMap">
			SELECT COUNT(*) as cou,waringType FROM `sys_alarm` WHERE alarmTime like concat(concat('%', #{time}), '%') GROUP BY waringType
			</select>


			<select id="selectListSe" 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,
			ST_ASTEXT (a.coordinate ) AS coordinate,
			a.jd,
			a.wd,
			a.jtype,
			a.rname,
			d.addvnm,
			e.serialNumber,
			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
			DATE_FORMAT(alarmTime,'%Y-%m-%d') >=#{beginTime} and DATE_FORMAT(alarmTime,'%Y-%m-%d') <=#{endTime} ORDER BY alarmTime desc
			</select>


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