From d82c67102b3748924a6bc1c088be17d009c01b10 Mon Sep 17 00:00:00 2001
From: lishuai <lishuai@qq.com>
Date: Sun, 29 Sep 2024 13:42:37 +0800
Subject: [PATCH] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=8E=A5=E5=85=A5=202024?=
 =?UTF-8?q?=E5=B9=B49=E6=9C=8829=E6=97=A513:42:34?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/thing/listener/QueueDeviceEventListener.java     | 4 ++--
 .../thing/thing/model/controller/IotThingModelController.java | 2 +-
 .../thing/model/service/impl/IotThingModelServiceImpl.java    | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/modules/thing/src/main/java/com/thing/listener/QueueDeviceEventListener.java b/modules/thing/src/main/java/com/thing/listener/QueueDeviceEventListener.java
index b493052..2e2370f 100644
--- a/modules/thing/src/main/java/com/thing/listener/QueueDeviceEventListener.java
+++ b/modules/thing/src/main/java/com/thing/listener/QueueDeviceEventListener.java
@@ -36,7 +36,7 @@ import java.util.stream.Collectors;
 import static com.thing.thing.cache.service.CacheInit.KEY;
 
 @Slf4j
-//@Component
+@Component
 @RequiredArgsConstructor
 public class QueueDeviceEventListener {
 
@@ -49,7 +49,7 @@ public class QueueDeviceEventListener {
 
     private final ReentrantLock lock = new ReentrantLock();
 
-   // @EventListener(QueueDeviceEvent.class)
+    @EventListener(QueueDeviceEvent.class)
     public void onDeviceEvent(QueueDeviceEvent event) {
         List<QueueMsgDTO> msgList = event.getList();
         if(CollectionUtils.isEmpty(msgList)){
diff --git a/modules/thing/src/main/java/com/thing/thing/model/controller/IotThingModelController.java b/modules/thing/src/main/java/com/thing/thing/model/controller/IotThingModelController.java
index 83879a7..9819187 100644
--- a/modules/thing/src/main/java/com/thing/thing/model/controller/IotThingModelController.java
+++ b/modules/thing/src/main/java/com/thing/thing/model/controller/IotThingModelController.java
@@ -69,7 +69,7 @@ public class IotThingModelController {
             @Parameter(name = "gateway", description = "网关") @RequestParam(required = false) String gateway,
             @Parameter(name = "startTime", description = "开始时间") @RequestParam(required = false)  Long startTime,
             @Parameter(name = "endTime", description = "结束时间") @RequestParam(required = false)  Long endTime) {
-        List<ObjectNode> list = service.findList1(orderField, order, code, token, origin, status, realType,gateway,startTime, endTime);
+        List<ObjectNode> list = service.findList(orderField, order, code, token, origin, status, realType,gateway,startTime, endTime);
         return new Result<List<ObjectNode>>().ok(list);
     }
 
diff --git a/modules/thing/src/main/java/com/thing/thing/model/service/impl/IotThingModelServiceImpl.java b/modules/thing/src/main/java/com/thing/thing/model/service/impl/IotThingModelServiceImpl.java
index 6bd4515..e23b347 100644
--- a/modules/thing/src/main/java/com/thing/thing/model/service/impl/IotThingModelServiceImpl.java
+++ b/modules/thing/src/main/java/com/thing/thing/model/service/impl/IotThingModelServiceImpl.java
@@ -117,7 +117,7 @@ public class IotThingModelServiceImpl extends BaseServiceImpl<IotThingModelMappe
                                          String gateway,
                                          Long startTime,
                                          Long endTime) {
-        List<ObjectNode> list = findList1(orderField, order, code, token, origin, status, realType,gateway, startTime, endTime);
+        List<ObjectNode> list = findList(orderField, order, code, token, origin, status, realType,gateway, startTime, endTime);
         if (CollectionUtils.isEmpty(list)) {
             return PageData.empty();
         }