数据接入

2024年9月29日13:42:34

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)){

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);
     }
 

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();
         }