jfptManager.git

			@@ -3,7 +3,7 @@
			<mapper namespace="org.springblade.modules.equipment.mapper.EquipmentMapper">

			<!-- 通用查询映射结果 -->
			<resultMap id="equipmentResultMap" type="org.springblade.modules.equipment.entity.Equipment">
			<resultMap id="equipmentResultMap" type="org.springblade.modules.equipment.vo.EquipmentVO">
			<id column="id" property="id"/>
			<result column="deviceName" property="deviceName"/>
			<result column="deviceNumber" property="deviceNumber"/>
			@@ -21,6 +21,9 @@
			<result column="serialNumber" property="serialNumber"/>
			<result column="stype" property="stype"/>
			<result column="channelNumber" property="channelNumber"/>
			<result column="pay" property="pay"/>
			<result column="expireTime" property="expireTime"/>
			<result column="heartbeat" property="heartbeat"/>
			</resultMap>

			<resultMap id="treeNodeResultMap" type="org.springblade.core.tool.node.TreeNode">
			@@ -56,12 +59,12 @@

			<select id="selectEquipmentPage" resultMap="equipmentResultMap">
			select id,deviceName,deviceNumber,deviceType,ownership,ownerId,devicestate,stime,ST_ASTEXT (coordinate ) AS
			coordinate,dtype,
			coordinate,dtype,heartbeat,expireTime,pay,
			parent_id,
			FORMAT( jd, 6 ) AS jd,
			FORMAT( wd, 6 ) AS wd,
			street,
			addvcd from sys_equipment where 1=1
			addvcd,pay,expireTime from sys_equipment where 1=1
			<if test="deviceName!=null">
			and (deviceName like concat('%',#{deviceName},'%') or deviceNumber like
			concat('%',#{deviceName},'%'))
			@@ -76,7 +79,6 @@
			<if test="dtype!=null">
			and dtype=#{dtype}
			</if>
			and parent_id!=0
			</select>

			<!--新增-->
			@@ -92,7 +94,8 @@
			<select id="lazyList" resultMap="deptVOResultMap">
			SELECT dept.id,dept.deviceName,dept.deviceNumber,dept.deviceType,dept.ownership,
			dept.ownerId,dept.devicestate,dept.stime,
			ST_ASTEXT(dept.coordinate) as coordinate,dept.dtype,
			ST_ASTEXT(dept.coordinate) as
			coordinate,dept.dtype,dept.serialNumber,dept.stype,dept.channelNumber,dept.pay,dept.expireTime,dept.heartbeat,
			dept.parent_id,FORMAT(dept.jd,6) as jd,FORMAT(dept.wd,6) as wd,dept.street as
			streeName,u.yname,d.addvnm,dept.addvcd,
			(
			@@ -131,7 +134,51 @@
			update sys_equipment SET deviceName=#{deviceName},deviceNumber=#{deviceNumber},deviceType=#{deviceType},
			ownership=#{ownership},ownerId=#{yname},devicestate=#{devicestate},stime=#{stime},
			coordinate=POINT(#{jd},#{wd}),parent_id=#{parentId},jd=#{jd},wd=#{wd},addvcd=#{addvnm},street=#{streeName},dtype=#{dtype} where id=#{id}
			</update>
			</update>

			<update id="updateClinent" parameterType="org.springblade.modules.equipment.entity.Equipment">
			update sys_equipment SET deviceName=#{deviceName},deviceNumber=#{deviceNumber},deviceType=#{deviceType},
			ownership=#{ownership},devicestate=#{devicestate},
			addvcd=#{addvcd},street=#{street},dtype=#{dtype},pay=#{pay}

			<choose>
			<when test="expireTime!=null and expireTime!=''">
			,expireTime=#{expireTime}
			</when>
			<otherwise>
			,expireTime= null
			</otherwise>
			</choose>

			<choose>
			<when test="heartbeat!=null and heartbeat!=''">
			,heartbeat=#{heartbeat}
			</when>
			<otherwise>
			,heartbeat= null
			</otherwise>
			</choose>

			<choose>
			<when test="stime!=null and stime!=''">
			,stime=#{stime}
			</when>
			<otherwise>
			,stime= null
			</otherwise>
			</choose>

			where id=#{id}
			</update>


			<update id="updataType">
			update sys_equipment SET devicestate = 1 where id in (${arr})
			</update>

			<update id="updataTypeC">
			update sys_equipment SET devicestate = 0 where id in (${arr})
			</update>

			<update id="updateOnes" parameterType="org.springblade.modules.equipment.entity.Equipment">
			update sys_equipment SET deviceName=#{deviceName},deviceNumber=#{deviceNumber},deviceType=#{deviceType},
			@@ -145,7 +192,7 @@
			SELECT
			dept.id,dept.deviceName,dept.deviceNumber,dept.deviceType,dept.ownership,
			dept.ownerId,dept.devicestate,dept.stime,
			ST_ASTEXT(dept.coordinate) as coordinate,dept.dtype,
			ST_ASTEXT(dept.coordinate) as coordinate,dept.dtype,dept.expireTime,dept.heartbeat,
			dept.parent_id,dept.jd,dept.wd,dept.street as streeName,u.yname,d.addvnm,dept.addvcd,
			(
			SELECT
			@@ -175,4 +222,34 @@
			</if>
			</select>

			<select id="selectInfos" resultType="java.util.HashMap">
			SELECT
			dept.id,
			dept.deviceName,
			dept.deviceNumber,
			dept.deviceType,
			dept.ownership,
			dept.ownerId,
			dept.devicestate,
			dept.stime,
			ST_ASTEXT ( dept.coordinate ) AS coordinate,
			dept.dtype,
			dept.parent_id,
			dept.jd,
			dept.wd,
			dept.street AS streeName,
			u.yname,
			d.addvnm,
			dept.addvcd
			FROM
			sys_equipment dept
			LEFT JOIN sys_suser u ON u.ynumber = dept.ownerId
			LEFT JOIN sys_district d ON d.addvcds = dept.addvcd
			LEFT JOIN sys_street s ON s.id = dept.street WHERE dept.deviceNumber=#{deviceNumber}
			</select>

			<update id="updateChannel">
			update sys_equipment SET heartbeat=#{heartbeat} where deviceNumber=#{deviceNumber}
			</update>

			</mapper>