From cd2cfd37366002f790a2ed1435962d4eff7d5cec Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Tue, 01 Jun 2021 09:39:30 +0800
Subject: [PATCH] 版本合并
---
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/mapper/EquipmentMapper.xml | 95 +++++++++++++++++++++++++++++++++++++++++------
1 files changed, 83 insertions(+), 12 deletions(-)
diff --git a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/mapper/EquipmentMapper.xml b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/mapper/EquipmentMapper.xml
index 7b8816d..dcc2a4e 100644
--- a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/mapper/EquipmentMapper.xml
+++ b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/mapper/EquipmentMapper.xml
@@ -31,6 +31,10 @@
<result column="reason" property="reason"/>
<result column="jtype" property="jtype"/>
<result column="manufacturers" property="manufacturers"/>
+ <result column="eqModel" property="eqModel"/>
+ <result column="proId" property="proId"/>
+ <result column="eqSecret" property="eqSecret"/>
+ <result column="eqName" property="eqName"/>
</resultMap>
<resultMap id="treeNodeResultMap" type="org.springblade.core.tool.node.TreeNode">
@@ -160,19 +164,16 @@
deviceNumber
) alarm ON alarm.deviceN = equipment.deviceNumber
where 1=1
-
<if test="equipment.deviceName!=null">
and (deviceName like concat('%',#{equipment.deviceName},'%') or deviceNumber like
concat('%',#{equipment.deviceName},'%'))
</if>
-
<if test="equipment.beginTime!=null and equipment.beginTime!=''">
and expireTime>=#{equipment.beginTime}
</if>
<if test="equipment.endTime!=null and equipment.endTime!=''">
and expireTime<=#{equipment.endTime}
</if>
-
<if test="equipment.district!=null">
and district like concat('%',#{equipment.district},'%')
</if>
@@ -185,31 +186,37 @@
<if test="equipment.manufacturers!=null and equipment.manufacturers!=''">
and manufacturers = #{equipment.manufacturers}
</if>
-
<if test="equipment.devicestate!=null">
and devicestate =#{equipment.devicestate}
</if>
-
<if test="equipment.dtype!=null">
and dtype=#{equipment.dtype}
</if>
-
<if test="dxtype!=null and dxtype == 0">
- and heartbeat < DATE_SUB(NOW(),INTERVAL 1 DAY)
+ and heartbeat < DATE_SUB(NOW(),INTERVAL 1 DAY) and dtype=0
</if>
<if test="dxtype!=null and dxtype == 1">
- and heartbeat >= DATE_SUB(NOW(),INTERVAL 1 DAY)
+ and heartbeat >= DATE_SUB(NOW(),INTERVAL 1 DAY) and dtype=1
</if>
<if test="dxtype!=null and dxtype == 2">
- and alarm.jtype IS NOT NULL
+ and heartbeat >= DATE_SUB(NOW(),INTERVAL 1 DAY) and dtype=2
</if>
<if test="dxtype!=null and dxtype == 3">
- and heartbeat >= DATE_SUB(NOW(),INTERVAL 1 DAY) and state!=null
+ and dtype=3
+ </if>
+ <if test="dxtype!=null and dxtype == 4">
+ and dtype!=0
</if>
<if test="pid!=null and pid!=''">
and deptId like concat('%',#{pid},'%')
</if>
-
+ order by (
+ case
+ when dtype=2 then 1
+ when dtype=3 then 2
+ when dtype=0 then 3
+ when dtype=1 then 4
+ END)
</select>
<!--新增-->
@@ -408,6 +415,8 @@
dept.id,
dept.deviceName,
dept.deviceNumber,
+ dept.serialNumber,
+ dept.channelNumber,
dept.deviceType,
dept.ownership,
dept.ownerId,
@@ -476,6 +485,68 @@
<!--查询设故障数量-->
<select id="selectEqCg" resultType="Integer">
- select COUNT(*) from sys_equipment where heartbeat >= DATE_SUB(NOW(),INTERVAL 1 DAY) and dtype=3
+ select COUNT(*) from sys_equipment where dtype=3
</select>
+
+ <!--查询所有的设备,不包含故障和警情状态-->
+ <select id="selAllEq" resultType="org.springblade.jfpt.equipment.entity.Equipment">
+ select id,dtype,heartbeat from sys_equipment where dtype!=2 and dtype!=3
+ </select>
+
+ <!--批量更新设备状态改为在线-->
+ <update id="updateEqListz" parameterType="java.util.Map">
+ UPDATE sys_equipment
+ SET dtype = 1
+ WHERE id IN
+ <foreach collection="equipmentListz" index="index" item="id" open="(" separator="," close=")">
+ #{id}
+ </foreach>
+ </update>
+
+ <!--批量更新设备状态改为离线-->
+ <update id="updateEqListl" parameterType="java.util.Map">
+ UPDATE sys_equipment
+ SET dtype = 0
+ WHERE id IN
+ <foreach collection="equipmentListl" index="index" item="id" open="(" separator="," close=")">
+ #{id}
+ </foreach>
+ </update>
+
+ <!--查询在线设备数量-->
+ <select id="selectOnlineEqNum" resultType="java.lang.Integer">
+ select COUNT(*) from sys_equipment where dtype=1 or dtype=2 or dtype=3
+ </select>
+
+ <!--获取设备视频播放的信息-->
+ <select id="selectEquimentPlayInfo" resultType="org.springblade.jfpt.equipment.entity.EquipmentPlayInfo">
+ select * from equipment_play_info
+ where
+ bmp=#{bmp}
+ and
+ number=#{number}
+ and
+ manufacturer =#{manufacturer}
+ </select>
+
+<!-- select id,number,serial_number serialNumber,bmp,address from equipment_play_info-->
+
+ <!--新增设备视频播放的信息-->
+ <insert id="saveEquipmentPlayInfo">
+ INSERT INTO equipment_play_info
+ (number, serial_number, manufacturer, bmp, address, create_time)
+ VALUES
+ (#{number}, #{serialNumber}, #{manufacturer}, #{bmp}, #{address}, #{createTime});
+ </insert>
+
+ <!--修改设备视频播放的信息-->
+ <update id="updateEquipmentPlayInfo">
+ update equipment_play_info
+ set
+ bmp=#{bmp},address=#{address}
+
+ where
+ id=#{id}
+ </update>
+
</mapper>
--
Gitblit v1.9.3