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
720f98c5
Commit
720f98c5
authored
May 16, 2023
by
chenzhao
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
增加 批量修改alarmlog状态
parent
4859f9b7
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
38 additions
and
3 deletions
+38
-3
EquipmentSpecificAlarmLogController.java
...anage/controller/EquipmentSpecificAlarmLogController.java
+13
-0
EquipmentSpecificAlarmLogMapper.java
...n/equipmanage/mapper/EquipmentSpecificAlarmLogMapper.java
+2
-0
IEquipmentSpecificAlarmLogService.java
...quipmanage/service/IEquipmentSpecificAlarmLogService.java
+2
-0
EquipmentSpecificAlarmLogServiceImpl.java
...ge/service/impl/EquipmentSpecificAlarmLogServiceImpl.java
+7
-3
EquipmentSpecificAlarmLogMapper.xml
...main/resources/mapper/EquipmentSpecificAlarmLogMapper.xml
+14
-0
No files found.
amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/controller/EquipmentSpecificAlarmLogController.java
View file @
720f98c5
...
@@ -69,6 +69,19 @@ public class EquipmentSpecificAlarmLogController extends AbstractBaseController
...
@@ -69,6 +69,19 @@ public class EquipmentSpecificAlarmLogController extends AbstractBaseController
return
CommonResponseUtil
.
success
();
return
CommonResponseUtil
.
success
();
}
}
@RequestMapping
(
value
=
"/updateStatusByAlarm"
,
method
=
RequestMethod
.
GET
)
@TycloudOperation
(
ApiLevel
=
UserType
.
AGENCY
)
@ApiOperation
(
httpMethod
=
"GET"
,
value
=
"批量消除log表所有设备告警及归位"
,
notes
=
"批量消除log表所有设备告警及归位"
)
public
ResponseModel
updateStatusByAlarm
()
{
equipmentSpecificAlarmLogService
.
updateStatusByAlarm
();
return
CommonResponseUtil
.
success
();
}
}
}
...
...
amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/mapper/EquipmentSpecificAlarmLogMapper.java
View file @
720f98c5
...
@@ -44,4 +44,6 @@ public interface EquipmentSpecificAlarmLogMapper extends BaseMapper<EquipmentSpe
...
@@ -44,4 +44,6 @@ public interface EquipmentSpecificAlarmLogMapper extends BaseMapper<EquipmentSpe
Map
<
String
,
Object
>
unCleanAlarmEquipLink
(
String
date
,
String
pattern
,
String
cleanFlag
);
Map
<
String
,
Object
>
unCleanAlarmEquipLink
(
String
date
,
String
pattern
,
String
cleanFlag
);
List
<
EquipmentSpecificAlarmLog
>
getAlarmLogInfoList
(
String
equipmentCode
,
String
nameKeys
,
String
value
,
String
isCleanTime
,
String
bizOrgCode
);
List
<
EquipmentSpecificAlarmLog
>
getAlarmLogInfoList
(
String
equipmentCode
,
String
nameKeys
,
String
value
,
String
isCleanTime
,
String
bizOrgCode
);
void
updateStatusByAlarm
(
String
confirmUserName
,
String
resolveResult
,
String
confirmTypeName
);
}
}
amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/IEquipmentSpecificAlarmLogService.java
View file @
720f98c5
...
@@ -67,4 +67,6 @@ public interface IEquipmentSpecificAlarmLogService extends IService<EquipmentSpe
...
@@ -67,4 +67,6 @@ public interface IEquipmentSpecificAlarmLogService extends IService<EquipmentSpe
void
pressurePumpDisposeAlarm
(
Long
equipmentSpecificId
,
String
body
);
void
pressurePumpDisposeAlarm
(
Long
equipmentSpecificId
,
String
body
);
void
pressurePumpRestore
(
Long
equipmentSpecificId
);
void
pressurePumpRestore
(
Long
equipmentSpecificId
);
void
updateStatusByAlarm
();
}
}
amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/EquipmentSpecificAlarmLogServiceImpl.java
View file @
720f98c5
...
@@ -142,10 +142,14 @@ public class EquipmentSpecificAlarmLogServiceImpl extends ServiceImpl<EquipmentS
...
@@ -142,10 +142,14 @@ public class EquipmentSpecificAlarmLogServiceImpl extends ServiceImpl<EquipmentS
return
pageBean
;
return
pageBean
;
}
}
@Override
public
void
updateStatusByAlarm
()
{
String
confirmUserName
=
"系统自动处理"
;
String
resolveResult
=
DateUtils
.
getDateNowString
()+
"系统收到设备复归(已消除)信号,系统自动处理。"
;
String
confirmTypeName
=
"故障"
;
equipmentSpecificAlarmLogMapper
.
updateStatusByAlarm
(
confirmUserName
,
resolveResult
,
confirmTypeName
);
}
public
void
getEquiplistBySystemIdList
(
String
id
,
Map
<
String
,
EquiplistSpecificBySystemVO
>
map
,
List
<
String
>
iotCodes
)
{
public
void
getEquiplistBySystemIdList
(
String
id
,
Map
<
String
,
EquiplistSpecificBySystemVO
>
map
,
List
<
String
>
iotCodes
)
{
...
...
amos-boot-system-equip/src/main/resources/mapper/EquipmentSpecificAlarmLogMapper.xml
View file @
720f98c5
...
@@ -273,4 +273,17 @@
...
@@ -273,4 +273,17 @@
</where>
</where>
ORDER BY wesal.create_date DESC
ORDER BY wesal.create_date DESC
</select>
</select>
<update
id=
"updateStatusByAlarm"
>
update wl_equipment_specific_alarm_log
set confirm_type = 'BREAKDOWN',
clean_time = now() ,
confirm_date = IFNULL(wl_equipment_specific_alarm_log.confirm_date,now()),
resolve_result = #{resolveResult},
confirm_user_name = #{confirmUserName},
confirm_type_name = #{confirmTypeName},
alarm_reason = concat((select name from wl_equipment_specific WHERE id = wl_equipment_specific_alarm_log.equipment_specific_id) ,'故障引起设备报警')
WHERE
confirm_type is null or clean_time is null
</update>
</mapper>
</mapper>
\ No newline at end of file
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