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();
+    }
 
 }

device-api-service/src/main/java/com/xy/service/DeviceAnnualFeeServiceImpl.java

@@ -186,7 +186,7 @@ public class DeviceAnnualFeeServiceImpl extends ServiceImpl<DeviceAnnualFeeMappe
     }
 
     @PostMapping("sendDeviceInfo")
-    @ApiOperation("推送设备到商家平台")
+    @ApiOperation("推送设备到商家平台（无token）")
     public R sendDeviceInfo(@RequestBody @Validated DeviceAnnualFeeDto.SendDeviceInfo sendDeviceInfo) {
         List<Long> deviceIds = sendDeviceInfo.getDeviceIds();
         //设备年费信息
@@ -454,7 +454,7 @@ public class DeviceAnnualFeeServiceImpl extends ServiceImpl<DeviceAnnualFeeMappe
     }
 
     @PostMapping("evn")
-    @ApiOperation("切换环境")
+    @ApiOperation("切换环境（无token）")
     public R evn(@RequestBody @Validated DeviceAnnualFeeDto.Evn evn) {
         DeviceInfo deviceInfo = deviceInfoService.getById(evn.getDeviceId());
         Map<String, SysDictRedis> stringSysDictRedisMap = SysDictUtils.get("merc_device_annual_fee");