Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
A
amos-boot-biz
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
项目统一框架
amos-boot-biz
Commits
a1ea72b9
Commit
a1ea72b9
authored
May 26, 2023
by
KeYong
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
更新
parent
24389bb3
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
1 deletion
+3
-1
EquipmentSpecificAlarmMapper.xml
...rc/main/resources/mapper/EquipmentSpecificAlarmMapper.xml
+2
-1
FireFightingSystemMapper.xml
...ip/src/main/resources/mapper/FireFightingSystemMapper.xml
+1
-0
No files found.
amos-boot-system-equip/src/main/resources/mapper/EquipmentSpecificAlarmMapper.xml
View file @
a1ea72b9
...
@@ -1372,7 +1372,7 @@
...
@@ -1372,7 +1372,7 @@
<select
id=
"fireAlarmLogPage"
resultType=
"java.util.HashMap"
>
<select
id=
"fireAlarmLogPage"
resultType=
"java.util.HashMap"
>
SELECT
SELECT
`wlesal`.id as alarmLogId,
`wlesal`.id as alarmLogId,
`w
lesal`.
equipment_specific_index_name,
`w
esi`.equipment_index_name AS
equipment_specific_index_name,
`wlesal`.equipment_specific_name,
`wlesal`.equipment_specific_name,
DATE_FORMAT(`wlesal`.`create_date`,'%m-%d %H:%i:%s') alarm_time,
DATE_FORMAT(`wlesal`.`create_date`,'%m-%d %H:%i:%s') alarm_time,
wlesal.location,
wlesal.location,
...
@@ -1384,6 +1384,7 @@
...
@@ -1384,6 +1384,7 @@
`wl_equipment_specific_alarm_log` `wlesal`
`wl_equipment_specific_alarm_log` `wlesal`
LEFT JOIN `wl_equipment_specific_alarm` wesa ON wesa.id = wlesal.equipment_specific_alarm_id
LEFT JOIN `wl_equipment_specific_alarm` wesa ON wesa.id = wlesal.equipment_specific_alarm_id
LEFT JOIN `wl_equipment_specific` `wles` ON `wlesal`.`equipment_specific_id` = `wles`.`id`
LEFT JOIN `wl_equipment_specific` `wles` ON `wlesal`.`equipment_specific_id` = `wles`.`id`
LEFT JOIN `wl_equipment_specific_index` `wesi` ON `wesi`.equipment_specific_id = `wles`.`id`
<where>
<where>
wesa.`status` = 1 AND wlesal.clean_time IS NULL
wesa.`status` = 1 AND wlesal.clean_time IS NULL
<if
test=
"param.system != null and param.system != ''"
>
<if
test=
"param.system != null and param.system != ''"
>
...
...
amos-boot-system-equip/src/main/resources/mapper/FireFightingSystemMapper.xml
View file @
a1ea72b9
...
@@ -5809,6 +5809,7 @@
...
@@ -5809,6 +5809,7 @@
WHERE
WHERE
wes.id = #{id}
wes.id = #{id}
AND wei.is_iot = true
AND wei.is_iot = true
limit 1
</select>
</select>
<select
id=
"getSpeIndex"
resultType=
"com.yeejoin.equipmanage.common.vo.SpeIndexVo"
>
<select
id=
"getSpeIndex"
resultType=
"com.yeejoin.equipmanage.common.vo.SpeIndexVo"
>
...
...
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