Merge branch 'dev'
commit
25285b6cb7
|
|
@ -29,6 +29,7 @@ public class HeartBeatService {
|
||||||
logger.info("deviceInfoDAO: {}",deviceInfoDAO);
|
logger.info("deviceInfoDAO: {}",deviceInfoDAO);
|
||||||
if (deviceInfoDAO == null) {
|
if (deviceInfoDAO == null) {
|
||||||
// 设备信息不存在,可能是无效的设备
|
// 设备信息不存在,可能是无效的设备
|
||||||
|
logger.info("device not find,start add device to mysql.");
|
||||||
boolean isSuccess = addDeviceInfo(deviceInfo);
|
boolean isSuccess = addDeviceInfo(deviceInfo);
|
||||||
if (isSuccess){
|
if (isSuccess){
|
||||||
return ServerResponseEntity.success();
|
return ServerResponseEntity.success();
|
||||||
|
|
@ -104,6 +105,7 @@ public class HeartBeatService {
|
||||||
* @return 转换后的 DeviceInfoDAO 对象。
|
* @return 转换后的 DeviceInfoDAO 对象。
|
||||||
*/
|
*/
|
||||||
private DeviceInfoDAO convertToDeviceInfoDAO(DeviceInfo deviceInfo) {
|
private DeviceInfoDAO convertToDeviceInfoDAO(DeviceInfo deviceInfo) {
|
||||||
|
logger.info("start convert to device info dao");
|
||||||
// 这里需要实现将 DeviceInfo 转换为 DeviceInfoDAO 的逻辑
|
// 这里需要实现将 DeviceInfo 转换为 DeviceInfoDAO 的逻辑
|
||||||
// 示例代码(根据实际字段调整):
|
// 示例代码(根据实际字段调整):
|
||||||
DeviceInfoDAO deviceInfoDAO = new DeviceInfoDAO();
|
DeviceInfoDAO deviceInfoDAO = new DeviceInfoDAO();
|
||||||
|
|
|
||||||
|
|
@ -11,7 +11,6 @@ class MonitorServiceTest {
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
void monitorOnlineDevices() {
|
void monitorOnlineDevices() {
|
||||||
|
|
||||||
monitorService.monitorOnlineDevices();
|
monitorService.monitorOnlineDevices();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
Loading…
Reference in New Issue