From 351ce4526be99c24521573e6346a64cd73692ea1 Mon Sep 17 00:00:00 2001
From: zzc <1278921369@qq.com>
Date: Tue, 29 Oct 2024 22:51:43 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=BB=91=E5=AE=9A=E8=AE=BE?=
 =?UTF-8?q?=E5=A4=87=E6=97=B6=E8=BF=94=E5=9B=9E=E8=AE=BE=E5=A4=87id?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../org/dromara/web/controller/app/EqDeviceController.java    | 2 +-
 .../web/controller/show/EqShowUserEquipmentController.java    | 2 +-
 .../java/org/dromara/web/service/IEqEquipmentService.java     | 3 ++-
 .../org/dromara/web/service/impl/EqEquipmentServiceImpl.java  | 4 ++--
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/ruoyi-admin/src/main/java/org/dromara/web/controller/app/EqDeviceController.java b/ruoyi-admin/src/main/java/org/dromara/web/controller/app/EqDeviceController.java
index 87af52f65..fcf2946c4 100644
--- a/ruoyi-admin/src/main/java/org/dromara/web/controller/app/EqDeviceController.java
+++ b/ruoyi-admin/src/main/java/org/dromara/web/controller/app/EqDeviceController.java
@@ -70,7 +70,7 @@ public class EqDeviceController extends BaseController {
      * @return
      */
     @GetMapping("/bindDevice")
-    public R<Boolean> bindDevice(EqAppHomeBo bo){
+    public R<Long> bindDevice(EqAppHomeBo bo){
         String equipmentCode = bo.getEquipmentCode();
         if (equipmentCode == null) throw new ServiceException("设备编码不能为空");
         if (bo.getUserId() == null) throw new ServiceException("用户ID不能为空");//分享用户要使用家庭主体的用户id
diff --git a/ruoyi-admin/src/main/java/org/dromara/web/controller/show/EqShowUserEquipmentController.java b/ruoyi-admin/src/main/java/org/dromara/web/controller/show/EqShowUserEquipmentController.java
index bfa33f49a..69bd3ac52 100644
--- a/ruoyi-admin/src/main/java/org/dromara/web/controller/show/EqShowUserEquipmentController.java
+++ b/ruoyi-admin/src/main/java/org/dromara/web/controller/show/EqShowUserEquipmentController.java
@@ -51,7 +51,7 @@ public class EqShowUserEquipmentController extends BaseController {
         String equipmentCode = bo.getEquipmentCode();
         if (equipmentCode == null) throw new ServiceException("设备编码不能为空");
         if (bo.getUserId() == null) throw new ServiceException("用户ID不能为空");//分享用户要使用家庭主体的用户id
-        return R.ok(eqEquipmentService.bindDevice(bo));
+        return R.ok(eqEquipmentService.bindDevice(bo) != null);
     }
 
 
diff --git a/ruoyi-admin/src/main/java/org/dromara/web/service/IEqEquipmentService.java b/ruoyi-admin/src/main/java/org/dromara/web/service/IEqEquipmentService.java
index 05d520360..07c4c2371 100644
--- a/ruoyi-admin/src/main/java/org/dromara/web/service/IEqEquipmentService.java
+++ b/ruoyi-admin/src/main/java/org/dromara/web/service/IEqEquipmentService.java
@@ -80,10 +80,11 @@ public interface IEqEquipmentService {
 
     /**
      * 绑定设备
+     *
      * @param bo
      * @return
      */
-    Boolean bindDevice(EqAppHomeBo bo);
+    Long bindDevice(EqAppHomeBo bo);
 
     /**
      * 批量更新
diff --git a/ruoyi-admin/src/main/java/org/dromara/web/service/impl/EqEquipmentServiceImpl.java b/ruoyi-admin/src/main/java/org/dromara/web/service/impl/EqEquipmentServiceImpl.java
index 9c0fff530..3fcbe3495 100644
--- a/ruoyi-admin/src/main/java/org/dromara/web/service/impl/EqEquipmentServiceImpl.java
+++ b/ruoyi-admin/src/main/java/org/dromara/web/service/impl/EqEquipmentServiceImpl.java
@@ -302,7 +302,7 @@ public class EqEquipmentServiceImpl implements IEqEquipmentService {
     }
 
     @Override
-    public Boolean bindDevice(EqAppHomeBo bo) {
+    public Long bindDevice(EqAppHomeBo bo) {
 
         String equipmentCode = bo.getEquipmentCode(); //这里的设备编码改成了设备mac地址
         //通过设备mac地址查询设备编码
@@ -363,7 +363,7 @@ public class EqEquipmentServiceImpl implements IEqEquipmentService {
         }else{
             baseMapper.insert(add);
         }
-        return true;
+        return add.getEquipmentId();
     }
 
     @Override