Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
P
pingshan-ranqi
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
yaqizhang
pingshan-ranqi
Commits
6b5d3c51
Commit
6b5d3c51
authored
Dec 18, 2021
by
王晓倩
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
实时数据和历史数据列表过滤已删除的设备的数据
parent
b9843619
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
4 deletions
+4
-4
TDeviceReportDataMapper.xml
.../main/resources/mapper/system/TDeviceReportDataMapper.xml
+4
-4
No files found.
gassafety-system/src/main/resources/mapper/system/TDeviceReportDataMapper.xml
View file @
6b5d3c51
...
@@ -73,8 +73,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
...
@@ -73,8 +73,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
ELSE '报警'
ELSE '报警'
END as device_status
END as device_status
from t_device_report_data t
from t_device_report_data t
left
join t_device_info d on t.device_num = d.iot_no
join t_device_info d on t.device_num = d.iot_no
<where>
<where>
d.is_del = '0'
<if
test=
"deviceCode != null and deviceCode != ''"
>
and d.device_code like concat('%',#{deviceCode},'%')
</if>
<if
test=
"deviceCode != null and deviceCode != ''"
>
and d.device_code like concat('%',#{deviceCode},'%')
</if>
<if
test=
"deviceType != null and deviceType != ''"
>
and d.device_type = #{deviceType}
</if>
<if
test=
"deviceType != null and deviceType != ''"
>
and d.device_type = #{deviceType}
</if>
<if
test=
"startReportTime != null "
>
and t.report_time
>
= #{startReportTime}
</if>
<if
test=
"startReportTime != null "
>
and t.report_time
>
= #{startReportTime}
</if>
...
@@ -125,12 +125,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
...
@@ -125,12 +125,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
END AS device_status
END AS device_status
FROM
FROM
t_device_report_data t
t_device_report_data t
LEFT
JOIN t_device_info d ON t.device_num = d.iot_no
JOIN t_device_info d ON t.device_num = d.iot_no
WHERE
WHERE
(
(
d.device_type = '3'
d.device_type = '3'
OR d.device_type = '4'
OR d.device_type = '4'
)
)
and d.is_del = '0'
ORDER BY t.create_time DESC
ORDER BY t.create_time DESC
)data
)data
<where>
<where>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment