From 3172f37090980c327f991214df85501997f54b29 Mon Sep 17 00:00:00 2001 From: kerwincui <164770707@qq.com> Date: Sun, 15 May 2022 17:40:22 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9A=82=E6=97=B6=E6=B3=A8=E9=87=8A=E6=8E=88?= =?UTF-8?q?=E6=9D=83=E7=A0=81=E7=9A=84=E5=88=A4=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ruoyi/iot/controller/ToolController.java | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/springboot/wumei-iot/src/main/java/com/ruoyi/iot/controller/ToolController.java b/springboot/wumei-iot/src/main/java/com/ruoyi/iot/controller/ToolController.java index c0004c76..13cc123f 100644 --- a/springboot/wumei-iot/src/main/java/com/ruoyi/iot/controller/ToolController.java +++ b/springboot/wumei-iot/src/main/java/com/ruoyi/iot/controller/ToolController.java @@ -138,13 +138,13 @@ public class ToolController extends BaseController { // 设备端 String[] clientInfo = clientid.split("&"); if (clientInfo.length != 2) { - // 设备未加密认证 + // 设备简单认证 String deviceNum = clientInfo[0]; Device device = deviceService.selectShortDeviceBySerialNumber(deviceNum); if (device !=null && mqttConfig.getusername().equals(username) && mqttConfig.getpassword().equals(password)) { System.out.println("-----------认证成功,clientId:" + clientid + "---------------"); - ProductAuthorize authorize = new ProductAuthorize(null, device.getProductId(), device.getDeviceId(), device.getSerialNumber(), 1L, "admin"); - authorizeService.boundProductAuthorize(authorize); +// ProductAuthorize authorize = new ProductAuthorize(null, device.getProductId(), device.getDeviceId(), device.getSerialNumber(), 1L, "admin"); +// authorizeService.boundProductAuthorize(authorize); return ResponseEntity.ok().body("ok"); } return returnUnauthorized(clientid, username, password, "认证信息有误"); @@ -178,16 +178,16 @@ public class ToolController extends BaseController { // 设备状态验证 （1-未激活，2-禁用，3-在线，4-离线） if (model.getDeviceId() != null && model.getDeviceId() != 0 && model.getStatus() != 2) { System.out.println("-----------认证成功,clientId:" + clientid + "---------------"); - ProductAuthorize authorize = new ProductAuthorize(null, model.getProductId(), model.getDeviceId(), model.getSerialNumber(), 1L, "admin"); - authorizeService.boundProductAuthorize(authorize); +// ProductAuthorize authorize = new ProductAuthorize(null, model.getProductId(), model.getDeviceId(), model.getSerialNumber(), 1L, "admin"); +// authorizeService.boundProductAuthorize(authorize); return ResponseEntity.ok().body("ok"); } else { // 自动添加设备 int result = deviceService.insertDeviceAuto(deviceNum, userId, productId); if (result == 1) { System.out.println("-----------认证成功,clientId:" + clientid + "---------------"); - ProductAuthorize authorize = new ProductAuthorize(null, model.getProductId(), model.getDeviceId(), model.getSerialNumber(), 1L, "admin"); - authorizeService.boundProductAuthorize(authorize); +// ProductAuthorize authorize = new ProductAuthorize(null, model.getProductId(), model.getDeviceId(), model.getSerialNumber(), 1L, "admin"); +// authorizeService.boundProductAuthorize(authorize); return ResponseEntity.ok().body("ok"); } }