From af96a913031d5336e5fb739bc6a4dd168e6b0875 Mon Sep 17 00:00:00 2001
From: xy <748613696@qq.com>
Date: Fri, 20 Dec 2024 11:26:36 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/njcn/access/runner/AccessApplicationRunner.java | 5 +++--
 .../main/java/com/njcn/access/runner/AutoAccessTimer.java    | 5 +++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/iot-access/access-boot/src/main/java/com/njcn/access/runner/AccessApplicationRunner.java b/iot-access/access-boot/src/main/java/com/njcn/access/runner/AccessApplicationRunner.java
index 2d53b76..3b1fda2 100644
--- a/iot-access/access-boot/src/main/java/com/njcn/access/runner/AccessApplicationRunner.java
+++ b/iot-access/access-boot/src/main/java/com/njcn/access/runner/AccessApplicationRunner.java
@@ -8,6 +8,7 @@ import com.njcn.csdevice.pojo.po.CsEquipmentDeliveryPO;
 import com.njcn.redis.pojo.enums.AppRedisKey;
 import com.njcn.redis.utils.RedisUtil;
 import com.njcn.system.api.DictTreeFeignClient;
+import com.njcn.system.enums.DicDataEnum;
 import com.njcn.system.enums.DicTreeEnum;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -92,8 +93,8 @@ public class AccessApplicationRunner implements ApplicationRunner {
             String version = csTopicService.getVersion(item.getNdid());
             if (!Objects.isNull(version)){
                 //判断设备类型 便携式设备需要特殊处理 未注册的要先注册、再接入;已注册的直接重新接入
-                String code = dictTreeFeignClient.queryById(item.getDevModel()).getData().getCode();
-                if (Objects.equals(code,DicTreeEnum.PQV_520.getCode()) && Objects.equals(item.getStatus(),1)) {
+                String code = dictTreeFeignClient.queryById(item.getDevType()).getData().getCode();
+                if (Objects.equals(code, DicDataEnum.PORTABLE.getCode()) && Objects.equals(item.getStatus(),1)) {
                     csDeviceService.wlDevRegister(item.getNdid());
                 } else {
                     csDeviceService.devAccessAskTemplate(item.getNdid(),version,1);
diff --git a/iot-access/access-boot/src/main/java/com/njcn/access/runner/AutoAccessTimer.java b/iot-access/access-boot/src/main/java/com/njcn/access/runner/AutoAccessTimer.java
index 870ca66..c44aab6 100644
--- a/iot-access/access-boot/src/main/java/com/njcn/access/runner/AutoAccessTimer.java
+++ b/iot-access/access-boot/src/main/java/com/njcn/access/runner/AutoAccessTimer.java
@@ -8,6 +8,7 @@ import com.njcn.csdevice.pojo.po.CsEquipmentDeliveryPO;
 import com.njcn.redis.pojo.enums.AppRedisKey;
 import com.njcn.redis.utils.RedisUtil;
 import com.njcn.system.api.DictTreeFeignClient;
+import com.njcn.system.enums.DicDataEnum;
 import com.njcn.system.enums.DicTreeEnum;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -87,8 +88,8 @@ public class AutoAccessTimer implements ApplicationRunner {
             String version = csTopicService.getVersion(item.getNdid());
             if (!Objects.isNull(version)){
                 //判断设备类型 便携式设备需要特殊处理 未注册的要先注册、再接入;已注册的直接重新接入
-                String code = dictTreeFeignClient.queryById(item.getDevModel()).getData().getCode();
-                if (Objects.equals(code, DicTreeEnum.PQV_520.getCode()) && Objects.equals(item.getStatus(),1)) {
+                String code = dictTreeFeignClient.queryById(item.getDevType()).getData().getCode();
+                if (Objects.equals(code, DicDataEnum.PORTABLE.getCode()) && Objects.equals(item.getStatus(),1)) {
                     csDeviceService.wlDevRegister(item.getNdid());
                 } else {
                     csDeviceService.devAccessAskTemplate(item.getNdid(),version,1);