From 60f81ce58ccb481db36337dd744f15bd96f9141e Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Mon, 26 Apr 2021 10:54:45 +0800
Subject: [PATCH] 设备列表接口修改，根据部门id查询时修改为模糊查询
---
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/mapper/EquipmentMapper.xml | 60 ++++++++++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 46 insertions(+), 14 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 b467021..442e7b7 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
@@ -76,7 +76,19 @@
equipment.deptId,
equipment.addvcd,equipment.pay,equipment.expireTime from sys_equipment equipment
left join sys_catalog catalog on catalog.eqid = equipment.deviceNumber
-
+ LEFT JOIN (
+ SELECT
+ count( id ) AS jtype,
+ deviceNumber as deviceN
+ FROM
+ sys_alarm
+ WHERE
+ waringType = "紧急求救"
+ AND jtype = 0
+ OR jtype = 1
+ GROUP BY
+ deviceNumber
+ ) alarm ON alarm.deviceN = equipment.deviceNumber
where 1=1
<if test="equipment.deviceName!=null">
@@ -119,7 +131,8 @@
</select>
<select id="selectDeptPages" resultMap="equipmentResultMap">
- select equipment.id,equipment.deviceName,equipment.deviceNumber,equipment.deviceType,equipment.ownership
+ select IF
+ ( alarm.jtype IS NULL, 0, 1 ) AS jtype,equipment.id,equipment.deviceName,equipment.deviceNumber,equipment.deviceType,equipment.ownership
,equipment.ownerId,equipment.devicestate,equipment.stime,equipment.dtype,equipment.heartbeat,equipment.expireTime,
equipment.parent_id,equipment.district,equipment.province,equipment.city,equipment.serialNumber,equipment.channelNumber,
equipment.jd ,
@@ -132,7 +145,19 @@
equipment.deptId,
equipment.addvcd,equipment.pay,equipment.expireTime from sys_equipment equipment
left join sys_catalog catalog on catalog.eqid = equipment.deviceNumber
-
+ LEFT JOIN (
+ SELECT
+ count( id ) AS jtype,
+ deviceNumber as deviceN
+ FROM
+ sys_alarm
+ WHERE
+ waringType = "紧急求救"
+ AND jtype = 0
+ OR jtype = 1
+ GROUP BY
+ deviceNumber
+ ) alarm ON alarm.deviceN = equipment.deviceNumber
where 1=1
<if test="equipment.deviceName!=null">
@@ -165,18 +190,20 @@
and dtype=#{equipment.dtype}
</if>
- <if test="dxtype!=null and dxtype == 1">
- and heartbeat >= DATE_SUB(NOW(),INTERVAL 1 DAY)
- </if>
<if test="dxtype!=null and dxtype == 0">
and heartbeat < DATE_SUB(NOW(),INTERVAL 1 DAY)
</if>
-
- <if test="childList!=null and childList.size>0">
- and deptId in
- <foreach collection="childList" index="index" item="item" open="(" separator="," close=")">
- #{item}
- </foreach>
+ <if test="dxtype!=null and dxtype == 1">
+ and heartbeat >= DATE_SUB(NOW(),INTERVAL 1 DAY)
+ </if>
+ <if test="dxtype!=null and dxtype == 2">
+ and alarm.jtype IS NOT NULL
+ </if>
+ <if test="dxtype!=null and dxtype == 3">
+ and heartbeat >= DATE_SUB(NOW(),INTERVAL 1 DAY) and state!=null
+ </if>
+ <if test="pid!=null and pid!=''">
+ and deptId like concat('%',#{pid},'%')
</if>
</select>
@@ -184,6 +211,11 @@
<!--新增-->
<insert id="s" parameterType="org.springblade.jfpt.equipment.entity.Equipment">
INSERT INTO sys_equipment (deviceName,deviceNumber,deviceType,ownership,ownerId,devicestate,stime,coordinate,parent_id,jd,wd,addvcd,street,dtype) VALUES (#{deviceName},#{deviceNumber},#{deviceType},#{ownership},#{yname},#{devicestate},#{stime},POINT(#{jd},#{wd}),#{parentId},#{jd},#{wd},#{addvcd},#{streeName},#{dtype})
+ </insert>
+
+ <!--新增-->
+ <insert id="saveImg" parameterType="org.springblade.jfpt.equipment.entity.Equipment">
+ INSERT INTO sys_depl (deviceName,deviceNumber,contacts,calls,paddress,deploymentTime) VALUES (#{deviceName},#{deviceNumber},#{contacts},#{call},#{paddress},#{deploymentTime})
</insert>
<select id="tree" resultMap="treeNodeResultMap">
@@ -236,7 +268,7 @@
LEFT JOIN (
SELECT
count( id ) AS jtype,
- deviceNumber
+ deviceNumber as deviceN
FROM
sys_alarm
WHERE
@@ -245,7 +277,7 @@
OR jtype = 1
GROUP BY
deviceNumber
- ) alarm ON alarm.deviceNumber = equipment.deviceNumber
+ ) alarm ON alarm.deviceN = equipment.deviceNumber
WHERE
1 =1
--
Gitblit v1.9.3