From b14531e3b850fe6d2fa916ba7b88b3e2bd2ff30a Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期三, 11 九月 2024 16:47:48 +0800
Subject: [PATCH] OSD加标签

---
 ycl-server/src/main/java/com/ycl/task/DeviceSynTask.java |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/ycl-server/src/main/java/com/ycl/task/DeviceSynTask.java b/ycl-server/src/main/java/com/ycl/task/DeviceSynTask.java
index acc1753..0c28b73 100644
--- a/ycl-server/src/main/java/com/ycl/task/DeviceSynTask.java
+++ b/ycl-server/src/main/java/com/ycl/task/DeviceSynTask.java
@@ -1,6 +1,7 @@
 package com.ycl.task;
 
 import com.alibaba.fastjson2.JSON;
+import com.alibaba.fastjson2.JSONObject;
 import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
 import com.github.pagehelper.PageInfo;
 import com.ycl.platform.domain.entity.DeviceInfo;
@@ -9,7 +10,6 @@
 import com.ycl.platform.wvp.WVPResult;
 import com.ycl.utils.http.HttpUtils;
 import lombok.RequiredArgsConstructor;
-import org.json.JSONObject;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 import org.springframework.util.CollectionUtils;
@@ -38,8 +38,8 @@
         String result = HttpUtils.sendGet(rtspServer + "/api/device/query/devices?page=1&count=15");
         WVPResult wvpResult = JSON.parseObject(result, WVPResult.class);
         if (0 == wvpResult.getCode()) {
-            PageInfo<Device> page = (PageInfo) wvpResult.getData();
-            List<Device> list = page.getList();
+            JSONObject data = (JSONObject) wvpResult.getData();
+            List<Device> list = data.getList("list", Device.class);
             if (! CollectionUtils.isEmpty(list)) {
                 list.stream().forEach(item -> {
                     DeviceInfo device = new LambdaQueryChainWrapper<>(deviceInfoMapper)

--
Gitblit v1.8.0