dyf/fys-Multi-tenant
1
0
Fork 2
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

设备在线状态

Browse Source
This commit is contained in:
daiyongfei
2025-10-08 13:38:07 +08:00
parent d701a834b3
commit dc0fe96652
4 changed files with 15 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/Device.java
View File

@ -163,6 +163,8 @@ public class Device extends TenantEntity {
/** /**
* 在线状态(0离线，1在线,2异常) * 在线状态(0离线，1在线,2异常)
* online_status
*/ */
private Integer onlineStatus; private Integer onlineStatus;
} }

3
fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/query/DeviceQueryCriteria.java
View File

@ -117,7 +117,8 @@ public class DeviceQueryCriteria extends BaseEntity {
/** /**
* 设备在线状态 * 设备在线状态
* 0:离线;1:在线 * 0:离线;1:在线；2:故障
* online_status
*/ */
private Integer onlineStatus; private Integer onlineStatus;

14
fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/service/impl/DeviceServiceImpl.java
View File

@ -342,6 +342,9 @@ public class DeviceServiceImpl extends ServiceImpl<DeviceMapper, Device> impleme
for (Long id : ids) { for (Long id : ids) {
DeviceAssignments deviceAssignment = deviceAssignmentsMapper.selectById(id); DeviceAssignments deviceAssignment = deviceAssignmentsMapper.selectById(id);
if (deviceAssignment == null) {
continue;
}
Device device = deviceMapper.selectById(deviceAssignment.getDeviceId()); Device device = deviceMapper.selectById(deviceAssignment.getDeviceId());
if (StringUtils.isNotEmpty(deviceAssignment.getAssigneeName())) { if (StringUtils.isNotEmpty(deviceAssignment.getAssigneeName())) {
@ -814,11 +817,11 @@ public class DeviceServiceImpl extends ServiceImpl<DeviceMapper, Device> impleme
if (StringUtils.isNotBlank(device.getDeviceImei())) { if (StringUtils.isNotBlank(device.getDeviceImei())) {
DeviceAlarmVo latestAlarm = deviceAlarmMapper.selectLatestByDeviceImei(device.getDeviceImei()); DeviceAlarmVo latestAlarm = deviceAlarmMapper.selectLatestByDeviceImei(device.getDeviceImei());
// 判断是否正在告警：未处理的告警(treatmentState=1)且不是电子围栏告警(deviceAction!=3) // 判断是否正在告警：未处理的告警(treatmentState=1)且不是电子围栏告警(deviceAction!=3)
if (latestAlarm != null && if (latestAlarm != null &&
latestAlarm.getTreatmentState() != null && latestAlarm.getTreatmentState() != null &&
latestAlarm.getTreatmentState() == 1 && latestAlarm.getTreatmentState() == 1 &&
latestAlarm.getDeviceAction() != null && latestAlarm.getDeviceAction() != null &&
latestAlarm.getDeviceAction() != 3) { latestAlarm.getDeviceAction() != 3) {
vo.setIsAlarming(true); vo.setIsAlarming(true);
} else { } else {
vo.setIsAlarming(false); vo.setIsAlarming(false);
@ -834,5 +837,4 @@ public class DeviceServiceImpl extends ServiceImpl<DeviceMapper, Device> impleme
} }
} }

3
fys-modules/fys-equipment/src/main/resources/mapper/equipment/DeviceMapper.xml
View File

@ -71,6 +71,9 @@
<if test="criteria.deviceStatus != null"> <if test="criteria.deviceStatus != null">
and da.active = #{criteria.deviceStatus} and da.active = #{criteria.deviceStatus}
</if> </if>
<if test="criteria.onlineStatus != null">
and d.online_status = #{criteria.onlineStatus}
</if>
<if test="criteria.groupId != null"> <if test="criteria.groupId != null">
and d.group_id = #{criteria.groupId} and d.group_id = #{criteria.groupId}
</if> </if>