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
0ff9649b
Commit
0ff9649b
authored
Aug 23, 2023
by
KeYong
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改bug
parent
88f31704
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
3 deletions
+4
-3
EquipmentSpecificAlarmLogMapper.xml
...main/resources/mapper/EquipmentSpecificAlarmLogMapper.xml
+2
-1
EquipmentSpecificAlarmMapper.xml
...rc/main/resources/mapper/EquipmentSpecificAlarmMapper.xml
+1
-1
EquipmentSpecificMapper.xml
...uip/src/main/resources/mapper/EquipmentSpecificMapper.xml
+1
-1
No files found.
amos-boot-system-equip/src/main/resources/mapper/EquipmentSpecificAlarmLogMapper.xml
View file @
0ff9649b
...
@@ -260,7 +260,8 @@
...
@@ -260,7 +260,8 @@
resolve_result = #{resolveResult},
resolve_result = #{resolveResult},
confirm_user_name = #{confirmUserName},
confirm_user_name = #{confirmUserName},
confirm_type_name = #{confirmTypeName},
confirm_type_name = #{confirmTypeName},
alarm_reason = concat((select name from wl_equipment_specific WHERE id = wl_equipment_specific_alarm_log.equipment_specific_id) ,'故障引起设备报警')
alarm_reason = concat((select name from wl_equipment_specific WHERE id = wl_equipment_specific_alarm_log.equipment_specific_id) ,'故障引起设备报警'),
equipment_specific_index_value = false
WHERE
WHERE
confirm_type is null or clean_time is null
confirm_type is null or clean_time is null
</update>
</update>
...
...
amos-boot-system-equip/src/main/resources/mapper/EquipmentSpecificAlarmMapper.xml
View file @
0ff9649b
...
@@ -14,7 +14,7 @@
...
@@ -14,7 +14,7 @@
</resultMap>
</resultMap>
<update
id=
"updateStatusByAlarm"
>
<update
id=
"updateStatusByAlarm"
>
update wl_equipment_specific_alarm set status = 0,recovery_date = now() where status = 1
update wl_equipment_specific_alarm set status = 0,recovery_date = now()
,equipment_specific_index_value = false
where status = 1
</update>
</update>
<select
id=
"getEquipmentSpecAlarmByIotCode"
<select
id=
"getEquipmentSpecAlarmByIotCode"
...
...
amos-boot-system-equip/src/main/resources/mapper/EquipmentSpecificMapper.xml
View file @
0ff9649b
...
@@ -344,7 +344,7 @@
...
@@ -344,7 +344,7 @@
es.realtime_iot_index_name AS 'indexName',
es.realtime_iot_index_name AS 'indexName',
es.qr_code AS 'qrCode',
es.qr_code AS 'qrCode',
es.iot_code AS 'iotCode',
es.iot_code AS 'iotCode',
(SELECT IF(SUM( IF ( wesa.
equipment_specific_index_value = 'true'
, 1, 0 ) ) > 0, 'true', 'false' ) AS indexValue FROM wl_equipment_specific_alarm wesa WHERE wesa.equipment_specific_id = es.id) AS 'value',
(SELECT IF(SUM( IF ( wesa.
`status` = 1
, 1, 0 ) ) > 0, 'true', 'false' ) AS indexValue FROM wl_equipment_specific_alarm wesa WHERE wesa.equipment_specific_id = es.id) AS 'value',
ei.is_alarm AS isAlarm,
ei.is_alarm AS isAlarm,
ei.emergency_level_color AS 'emergencyLevelColor'
ei.emergency_level_color AS 'emergencyLevelColor'
FROM
FROM
...
...
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