Merge remote-tracking branch 'origin/master'

device-api-service-merc-mini/src/main/java/com/xy/controller/MercPcDeviceController.java

@@ -58,6 +58,7 @@ public class MercPcDeviceController {
     private final MercService mercService;
     private final DeviceStatusServiceImpl deviceStatusService;
     private final DeviceEventMsgService deviceEventMsgService;
+    private final DeviceNetRecordServiceImpl deviceNetRecordService;
 
     @ApiOperation("设备分页-商户")
     @PostMapping("page")
@@ -121,6 +122,11 @@ public class MercPcDeviceController {
         deviceEventMsgService.save(deviceEventMsg);
         return R.ok();
     }
-
+    @ApiOperation("测试设备离线告警")
+    @PostMapping("testDeviceOfflineAlarm")
+    public R<?> testDeviceOfflineAlarm(@RequestBody DeviceInfoDto.Vo vo) {
+        deviceNetRecordService.deviceOfflineTimeOutPushMsg(vo.getDeviceId());
+        return R.ok();
+    }
 
 }