diff --git a/iot-common/iot-data/src/main/java/com/qiuguo/iot/data/service/device/DeviceUserBindService.java b/iot-common/iot-data/src/main/java/com/qiuguo/iot/data/service/device/DeviceUserBindService.java index 06524ad..5ebcc8e 100644 --- a/iot-common/iot-data/src/main/java/com/qiuguo/iot/data/service/device/DeviceUserBindService.java +++ b/iot-common/iot-data/src/main/java/com/qiuguo/iot/data/service/device/DeviceUserBindService.java @@ -380,13 +380,13 @@ public class DeviceUserBindService extends GenericReactiveCrudService UnbindingBox(Long userId, Long deviceId, Integer code) { + public Mono UnbindingDevice(Long userId, Long deviceId) { return createUpdate() .set("is_delete", 1) .set("modify_time", new Date()) .where("user_id", userId) .and("is_delete", 0) - .and("device_type", code) + //.and("device_type", code) .and("device_id", deviceId) .execute(); } diff --git a/iot-modules/iot-box-user-api/src/main/java/com/qiuguo/iot/user/api/controller/device/DeviceController.java b/iot-modules/iot-box-user-api/src/main/java/com/qiuguo/iot/user/api/controller/device/DeviceController.java index 4e97606..8175060 100644 --- a/iot-modules/iot-box-user-api/src/main/java/com/qiuguo/iot/user/api/controller/device/DeviceController.java +++ b/iot-modules/iot-box-user-api/src/main/java/com/qiuguo/iot/user/api/controller/device/DeviceController.java @@ -186,11 +186,11 @@ public class DeviceController { }); } - @GetMapping("/UnbindingBox") - public Mono UnbindingBox(@RequestParam Long deviceId, + @GetMapping("/UnbindingDevice") + public Mono UnbindingDevice(@RequestParam Long deviceId, @RequestParam Long userId){ - return deviceUserBindService.UnbindingBox(userId, deviceId, DeviceTypeEnum.GUO_BOX.getCode()); + return deviceUserBindService.UnbindingDevice(userId, deviceId); }