From 856303c2c1644ce74725202d1536eeca2fbdc45e Mon Sep 17 00:00:00 2001
From: anthonywj <yewenjie20@vip.qq.com>
Date: Wed, 24 May 2023 09:00:20 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E5=A4=87=E4=BB=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/glxp/udidl/admin/controller/device/TestController.java | 3 +++
 src/main/java/com/glxp/udidl/admin/req/UdiCompanyRequest.java  | 3 +++
 .../udidl/admin/service/dataSync/DeviceDownloadService.java    | 1 +
 3 files changed, 7 insertions(+)

diff --git a/src/main/java/com/glxp/udidl/admin/controller/device/TestController.java b/src/main/java/com/glxp/udidl/admin/controller/device/TestController.java
index 7c46a7e..784a898 100644
--- a/src/main/java/com/glxp/udidl/admin/controller/device/TestController.java
+++ b/src/main/java/com/glxp/udidl/admin/controller/device/TestController.java
@@ -1,5 +1,6 @@
 package com.glxp.udidl.admin.controller.device;
 
+import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.glxp.udidl.admin.constant.Constant;
@@ -208,4 +209,6 @@ public class TestController {
         return ResultVOUtils.success("总数=" + keys.size() + "\n");
     }
 
+
+
 }
diff --git a/src/main/java/com/glxp/udidl/admin/req/UdiCompanyRequest.java b/src/main/java/com/glxp/udidl/admin/req/UdiCompanyRequest.java
index 6d47a61..be7d52d 100644
--- a/src/main/java/com/glxp/udidl/admin/req/UdiCompanyRequest.java
+++ b/src/main/java/com/glxp/udidl/admin/req/UdiCompanyRequest.java
@@ -25,4 +25,7 @@ public class UdiCompanyRequest extends ListPageRequest {
 
     @ApiModelProperty(value = "更新时间")
     private String updateTime;
+
+    //    产品DI当前页
+    private Integer diPage;
 }
diff --git a/src/main/java/com/glxp/udidl/admin/service/dataSync/DeviceDownloadService.java b/src/main/java/com/glxp/udidl/admin/service/dataSync/DeviceDownloadService.java
index 2c3b8fb..f55fdf1 100644
--- a/src/main/java/com/glxp/udidl/admin/service/dataSync/DeviceDownloadService.java
+++ b/src/main/java/com/glxp/udidl/admin/service/dataSync/DeviceDownloadService.java
@@ -292,6 +292,7 @@ public class DeviceDownloadService {
         }
         boolean hasData = true; //是否还有数据，如无退出
         while (hasData) {
+            redisUtil.set("allUpdatePage", page);
             DataSetResult dataSetResult = getData(deviceRequest, page);
             if (dataSetResult.getReturnCode() != 1 && reCount == 0) {
                 token = "";