浏览代码

独立部署设备注册bug修复

lijin 2 周之前
父节点
当前提交
12cda5e755
共有 1 个文件被更改,包括 3 次插入4 次删除
  1. 3 4
      device-api-service/src/main/java/com/xy/service/DeviceAnnualFeeServiceImpl.java

+ 3 - 4
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();
         //设备年费信息
@@ -340,9 +340,8 @@ public class DeviceAnnualFeeServiceImpl extends ServiceImpl<DeviceAnnualFeeMappe
                                     mqttService.senCommand(Collections.singletonList(commandMqtt));
                                 }
                             })
-                            .error(e -> log.error("", e))
-                            .end()
             );
+            execute.end();
         };
         Map<Long, JSONObject> jsonObjects = getJsonObjects.run();
         sendPost.run(jsonObjects);
@@ -454,7 +453,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");