wsy182
/
wePush
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: wsy182:07be57d5cf5501d7e8d7038f350af4e5f98bd6cf
Branches Tags
wsy182:dev
wsy182:master
...
compare: wsy182:9462f5caab69d3d034d4a483246363954662f681
Branches Tags
wsy182:dev
wsy182:master

2 Commits
07be57d5cf ... 9462f5caab

Author SHA1 Message Date
wangsiyuan 9462f5caab Update MonitorService.java 2024-04-22 15:35:03 +08:00
wangsiyuan 7020497109 Update HeartBeatService.java 2024-04-22 15:34:59 +08:00
2 changed files with 8 additions and 6 deletions
Show Stats Expand all files Collapse all files

6
src/main/java/com/kimgo/wepush/service/HeartBeatService.java
View File

@ -1,4 +1,4 @@
package com.kimgo.wepush.service;
package com.kimgo.wepush.service;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
@ -102,7 +102,7 @@ public class HeartBeatService {
try {
DeviceInfoDAO deviceInfoDAO = deviceInfoDAOMapper.selectOne(queryWrapper);
if (deviceInfoDAO != null) {
logger.info("Data is queried in the database based on the SN");
//logger.info("Data is queried in the database based on the SN");
return deviceInfoDAO;
}
return null; // 数据不存在
@ -120,7 +120,7 @@ public class HeartBeatService {
* @return 转换后的 DeviceInfoDAO 对象。
*/
private DeviceInfoDAO convertToDeviceInfoDAO(DeviceInfo deviceInfo) {
logger.info("start convert to device info dao");
// logger.info("start convert to device info dao");
DeviceInfoDAO deviceInfoDAO = new DeviceInfoDAO();
deviceInfoDAO.setIsMonitored(1);

8
src/main/java/com/kimgo/wepush/service/MonitorService.java
View File

@ -70,15 +70,15 @@ public class MonitorService {
long timeDifferenceSeconds = timeDifferenceMillis / 1000;
// 如果设备超出设定的超时周期未上线，则认为设备离线，并进行相应处理
if (timeDifferenceSeconds > device.getTimeOutPeriod()) {
logger.info("Device offline. SN: {}, LastOnlineTime: {}, TimeDifference: {}, TimeoutPeriod: {}",
device.getSN(), device.getLastOnlineTime(), timeDifferenceSeconds, device.getTimeOutPeriod());
//logger.info("Device offline. SN: {}, LastOnlineTime: {}, TimeDifference: {}, TimeoutPeriod: {}",
//device.getSN(), device.getLastOnlineTime(), timeDifferenceSeconds, device.getTimeOutPeriod());
updateStatus(device, 0); // 更新设备状态为离线
logger.info("Update the device status to offline.");
sendNotification(device); // 发送设备离线通知
} else {
// 如果设备仍在设定的超时周期内上线，则认为设备在线，并更新设备状态
updateStatus(device, 1); // 更新设备状态为在线
logger.info("update the device status to online.");
//logger.info("update the device status to online.");
}
} catch (DatabaseUpdateException dbe) {
// 更新数据库出错时的处理逻辑
@ -138,6 +138,7 @@ public class MonitorService {
/**
* 构建并设置文本卡片消息的内容。
*
* @param deviceInfoDAO 设备信息数据访问对象，用于获取设备的详细信息。
* @return TextCardMessage 返回构建完成的文本卡片消息对象。
*/
@ -177,6 +178,7 @@ public class MonitorService {
/**
* 更新设备的状态信息。
*
* @param device 设备信息对象，包含需要更新的设备的SN（序列号）。
* @param status 需要更新到的新状态。
* @throws DatabaseUpdateException 如果数据库更新过程中发生异常，则抛出此异常。