From ae866f079126f67b0ed4b72bb7f0fb2bb6c4108b Mon Sep 17 00:00:00 2001
From: lianlonggang <lianlonggang@qq.com>
Date: Fri, 10 Apr 2026 10:27:36 +0800
Subject: [PATCH] =?UTF-8?q?fix(controller):=20=E7=A6=81=E6=AD=A2=E7=A7=BB?=
 =?UTF-8?q?=E5=8A=A8=E7=AB=AF=E8=A7=A3=E7=BB=91=E6=89=8B=E8=A1=A8=E8=AE=BE?=
 =?UTF-8?q?=E5=A4=87=E5=B9=B6=E4=BC=98=E5=8C=96=E5=BC=82=E6=AD=A5=E5=A4=84?=
 =?UTF-8?q?=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 移动端解绑设备接口返回错误提示，需联系健康管理员解绑
- 设备绑定流程中的警告开关设置改为异步执行
- 防止外部系统异常影响主业务流程
- 解绑操作中移除对数据中心的通知调用
---
 .../controller/WatchDeviceController.java     |  4 +++-
 .../service/impl/WatchDeviceServiceImpl.java  | 21 +++++++++++--------
 2 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/health-watch/health-watch-biz/src/main/java/com/renkang/watch/controller/WatchDeviceController.java b/health-watch/health-watch-biz/src/main/java/com/renkang/watch/controller/WatchDeviceController.java
index 40e64d5..eb173c6 100644
--- a/health-watch/health-watch-biz/src/main/java/com/renkang/watch/controller/WatchDeviceController.java
+++ b/health-watch/health-watch-biz/src/main/java/com/renkang/watch/controller/WatchDeviceController.java
@@ -207,7 +207,9 @@ public class WatchDeviceController extends JeecgController<WatchDevice, IWatchDe
     @Operation(summary = "移动端解绑设备(手表)", description = "移动端解绑设备(手表)")
     @GetMapping("/app/unbundleDevice")
     public Result unbundleDevice(@RequestParam(name = "watchNo") String watchNo) {
-        return watchDeviceService.unbundleDevice(watchNo);
+        //移动端暂不允许解绑手表
+        return Result.error("请联系健康管理员解绑");
+//        return watchDeviceService.unbundleDevice(watchNo);
     }
 
     /**
diff --git a/health-watch/health-watch-biz/src/main/java/com/renkang/watch/service/impl/WatchDeviceServiceImpl.java b/health-watch/health-watch-biz/src/main/java/com/renkang/watch/service/impl/WatchDeviceServiceImpl.java
index 6a84a9b..498b224 100644
--- a/health-watch/health-watch-biz/src/main/java/com/renkang/watch/service/impl/WatchDeviceServiceImpl.java
+++ b/health-watch/health-watch-biz/src/main/java/com/renkang/watch/service/impl/WatchDeviceServiceImpl.java
@@ -507,15 +507,18 @@ public class WatchDeviceServiceImpl extends ServiceImpl<WatchDeviceMapper, Watch
         switchUpdateWrapper.eq(WatchDeviceSwitch::getWatchNo, dto.getWatchNo());
         watchDeviceSwitchService.update(switchUpdateWrapper);
         String[] wdTypes = {"heart_rate", "spo2", "stress", "temperature"};
-        for (int i = 0; i < wdTypes.length; i++) {
-            WarnSwitch warnSwitch = new WarnSwitch();
-            warnSwitch.setWatchNo(dto.getWatchNo());
-            warnSwitch.setWdType(wdTypes[i]);
-            warnSwitch.setSwitchFlag("1");
-            dataCenterExecutor.saveWarnSwitch(warnSwitch);
-        }
-        //通知更新
-        dataCenterExecutor.cmdUpdateSwitch(dto.getWatchNo());
+        // 异步调用外部系统，防止外部系统异常导致功能异常，解绑这里非必要
+        asyncTaskExecutor.execute(() -> {
+            for (int i = 0; i < wdTypes.length; i++) {
+                WarnSwitch warnSwitch = new WarnSwitch();
+                warnSwitch.setWatchNo(dto.getWatchNo());
+                warnSwitch.setWdType(wdTypes[i]);
+                warnSwitch.setSwitchFlag("1");
+                dataCenterExecutor.saveWarnSwitch(warnSwitch);
+            }
+            //通知更新
+            dataCenterExecutor.cmdUpdateSwitch(dto.getWatchNo());
+        });
     }
 
     /**