diff --git a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/device/controller/DeviceInfoController.java b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/device/controller/DeviceInfoController.java index 133d4cd..cc6deb4 100644 --- a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/device/controller/DeviceInfoController.java +++ b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/device/controller/DeviceInfoController.java @@ -120,7 +120,7 @@ public class DeviceInfoController { } /** - * 上报1 + * 上报1,识别时调用 */ @PostMapping("/report1") public Map report1(@RequestBody JSONObject data) { @@ -128,7 +128,7 @@ public class DeviceInfoController { } /** - * 上报2 + * 上报2,称重完调用 */ @PostMapping("/report2") public Map report2(@RequestBody JSONObject data) { diff --git a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/device/service/DeviceInfoService.java b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/device/service/DeviceInfoService.java index 46a35b7..7a8cc11 100644 --- a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/device/service/DeviceInfoService.java +++ b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/device/service/DeviceInfoService.java @@ -202,10 +202,20 @@ public class DeviceInfoService extends ServiceImpl paging(PageParam pageParam, DeviceInfoEntity deviceInfoEntity) { return PageResult.of(this.page(pageParam.toPage(), Wrappers.query(deviceInfoEntity))); } + private void open(String sn, String cid) { + log.info("开门: {} {}", sn, cid); + Mqtt.publish(cid + "/1/barrier", MapUtil.builder() + .put("deviceNo", sn) + .build()); + } + + + @Transactional(rollbackFor = Exception.class) public Map report1(JSONObject data) { MapBuilder resBuilder = MapUtil.builder() @@ -336,13 +346,6 @@ public class DeviceInfoService extends ServiceImpl report2(JSONObject data) { MapBuilder resBuilder = MapUtil.builder() @@ -513,6 +516,7 @@ public class DeviceInfoService extends ServiceImpl