From 8edba80513a7f3d1a2722de7fef8d6c2726cdce3 Mon Sep 17 00:00:00 2001 From: lishuai Date: Sat, 14 Sep 2024 11:38:27 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E9=98=85=E6=8E=A5=E5=85=A5=E5=8A=9F?= =?UTF-8?q?=E8=83=BDbug=202024=E5=B9=B49=E6=9C=8812=E6=97=A517:19:26?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../thing/listener/QueueDeviceEventListener.java | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 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 9382788..f66d52d 100644 --- a/modules/thing/src/main/java/com/thing/listener/QueueDeviceEventListener.java +++ b/modules/thing/src/main/java/com/thing/listener/QueueDeviceEventListener.java @@ -3,6 +3,7 @@ package com.thing.listener; import cn.hutool.core.collection.CollectionUtil; import com.fasterxml.jackson.databind.node.ObjectNode; import com.thing.common.cache.constants.CacheNameEnum; +import com.thing.common.core.constants.Constant; import com.thing.common.core.enumeration.GateWayStatus; import com.thing.common.core.enumeration.QueueOriginType; import com.thing.common.core.enumeration.TemplateMark; @@ -18,6 +19,7 @@ import com.thing.thing.entity.dto.IotThingViewDTO; import com.thing.thing.entity.entity.IotThingEntity; import com.thing.thing.entity.service.IotThingEntityService; import com.thing.thing.model.dto.IotThingModelDTO; +import com.thing.thing.model.dto.ModelDetailDTO; import com.thing.thing.model.entity.IotThingModelEntity; import com.thing.thing.model.service.IotThingModelService; import com.thing.transport.api.adaptor.JsonConverter; @@ -72,10 +74,11 @@ public class QueueDeviceEventListener { Long tenantCode = thingEntry.getKey(); QueueMsgDTO queueMsgDTO = thingEntry.getValue().get(0); //物模型缓存查询 - ObjectNode jsonObject = thingCache.findAccurateObjectNode(CacheNameEnum.THING_MODEL, thingCode); + List list = thingModelService.findList(CacheNameEnum.ModelField.THING_MODEL_CREATE_DATE.getField(), + Constant.DESC, thingCode, null, null, null, null, null, null, null); //缓存存在，更新，否则插入 - if (null != jsonObject && !jsonObject.isEmpty()) { - IotThingModelEntity modelEntity = JacksonUtil.convertValue(jsonObject, IotThingModelEntity.class); + if (CollectionUtils.isNotEmpty(list)) { + IotThingModelEntity modelEntity = JacksonUtil.convertValue(list.get(0), IotThingModelEntity.class); updateModelList.add(modelEntity); } else { String origin = QueueOriginType.AUTO_DATA_SYNC.name().equals(queueMsgDTO.getOrigin()) @@ -96,8 +99,9 @@ public class QueueDeviceEventListener { } //物实体的构建 if (!Objects.equals(queueMsgDTO.getTenantCode(), 1001L)) { - ObjectNode entityNode = thingCache.findObjectNode(CacheNameEnum.THING_ENTITY, tenantCode + ":" + thingCode); - if (null == entityNode || entityNode.isEmpty()) { + List entityServiceList = entityService.findList(CacheNameEnum.EntityField.THING_ENTITY_CREATE_DATE.getField(), Constant.DESC, thingCode, null, tenantCode, + null, null, null, null, null, null); + if (CollectionUtils.isNotEmpty(entityServiceList)) { IotThingEntity newThingEntity = createThingEntity(thingCode, queueMsgDTO.getTenantCode(), queueMsgDTO.getCompanyId(), queueMsgDTO.getDeptId()); insertEntityList.add(newThingEntity); }