From 308bc8e5c0db7298a127f3478995ddc6167328e9 Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期四, 25 十二月 2025 16:43:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wuhuyancao' into wuhuyancao

---
 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/DeviceService.java |   18 ++++++++++++++++--
 1 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/DeviceService.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/DeviceService.java
index b447ed3..3aef46e 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/DeviceService.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/DeviceService.java
@@ -1,9 +1,12 @@
 package com.doumee.service.business;
 
 import com.doumee.core.haikang.model.param.request.TransparentChannelSingleRequest;
+import com.doumee.service.business.third.model.LoginUserInfo;
 import com.doumee.service.business.third.model.PageData;
 import com.doumee.service.business.third.model.PageWrap;
 import com.doumee.dao.business.model.Device;
+import org.eclipse.paho.client.mqttv3.MqttMessage;
+
 import java.util.List;
 
 /**
@@ -12,6 +15,7 @@
  * @date 2023/11/30 15:33
  */
 public interface DeviceService {
+
 
     /**
      * 鍒涘缓
@@ -26,7 +30,7 @@
      *
      * @param id 涓婚敭
      */
-    void deleteById(Integer id);
+    void deleteById(Integer id, LoginUserInfo userInfo);
 
     /**
      * 鍒犻櫎
@@ -40,7 +44,7 @@
      *
      * @param ids 涓婚敭闆�
      */
-    void deleteByIdInBatch(List<Integer> ids);
+    void deleteByIdInBatch(List<Integer> ids, LoginUserInfo userInfo);
 
     /**
      * 涓婚敭鏇存柊
@@ -105,4 +109,14 @@
 
     void setLedContent(TransparentChannelSingleRequest body);
     void allLedDefualtContent();
+
+    void setBroadcaseBobao(Device body);
+    String setBroadcaseBobaoHttp(Device body);
+
+    void duanluqiCmd(Device param);
+
+    void updateUsedById(Device d);
+
+    void autoCloseCmdTimer();
+    void startCheckDuanluqiSubjob();
 }

--
Gitblit v1.9.3