From a29e0df3c165dfe2ddd825bb340ed480a64865db Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期四, 02 四月 2026 15:02:30 +0800
Subject: [PATCH] 解决冲突
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/DeviceService.java | 19 ++++++++++++++-----
1 files changed, 14 insertions(+), 5 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 f752fd9..8c1ed4a 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,11 +1,12 @@
package com.doumee.service.business;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.doumee.core.haikang.model.param.request.AcsDeviceListRequest;
import com.doumee.core.haikang.model.param.request.TransparentChannelSingleRequest;
+import com.doumee.core.model.LoginUserInfo;
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.dao.business.model.Device;
+import org.eclipse.paho.client.mqttv3.MqttMessage;
+
import java.util.List;
/**
@@ -15,9 +16,10 @@
*/
public interface DeviceService {
+
/**
* 鍒涘缓
- *
+ *
* @param device 瀹炰綋瀵硅薄
* @return Integer
*/
@@ -28,7 +30,7 @@
*
* @param id 涓婚敭
*/
- void deleteById(Integer id);
+ void deleteById(Integer id, LoginUserInfo userInfo);
/**
* 鍒犻櫎
@@ -42,7 +44,7 @@
*
* @param ids 涓婚敭闆�
*/
- void deleteByIdInBatch(List<Integer> ids);
+ void deleteByIdInBatch(List<Integer> ids, LoginUserInfo userInfo);
/**
* 涓婚敭鏇存柊
@@ -106,4 +108,11 @@
long count(Device device);
void setLedContent(TransparentChannelSingleRequest body);
+
+ void setBroadcaseBobao(Device body);
+
+ void updateUsedById(Device d);
+
+ void dianbaoCmd(Device param);
+ void dianbiaoData(Device param);
}
--
Gitblit v1.9.3