From 68cc3531443aad6196fa491665becea823be1470 Mon Sep 17 00:00:00 2001 From: lishuai Date: Wed, 21 Aug 2024 14:33:01 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BC=93=E5=AD=98=E6=9B=B4=E6=96=B0=202024?= =?UTF-8?q?=E5=B9=B48=E6=9C=8821=E6=97=A514:32:58?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../thing/listener/QueueDeviceEventListener.java | 15 +++++++++++++-- .../service/impl/IotThingModelServiceImpl.java | 1 + 2 files changed, 14 insertions(+), 2 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 181a776..4c3d62b 100644 --- a/modules/thing/src/main/java/com/thing/listener/QueueDeviceEventListener.java +++ b/modules/thing/src/main/java/com/thing/listener/QueueDeviceEventListener.java @@ -87,7 +87,13 @@ public class QueueDeviceEventListener { //更新物模板缓存 List iotThingModelDTOS = ConvertUtils.sourceToTarget(insertModelList, IotThingModelDTO.class); List modelList = JsonConverter.convertToJsonObjectListObjectNode(iotThingModelDTOS); - CacheInit.modelMap(modelList,thingCache); + + for (ObjectNode item : modelList) { + //更新物模型 + thingCache.updateKeyMap(CacheNameEnum.THING_MODEL + , item.get(CacheNameEnum.ModelField.THING_MODEL_CODE.getField()).asText() + + ":" + item.get(CacheNameEnum.ModelField.THING_MODEL_ID.getField()).asText(),item); + } if(CollectionUtils.isNotEmpty(insertEntityList)){ List distinctStudentFile = insertEntityList.stream() @@ -122,7 +128,12 @@ public class QueueDeviceEventListener { .setCreateDate(e.getCreateDate()); }).toList(); List entityJsonList = JsonConverter.convertToJsonObjectListObjectNode(entityList); - CacheInit.entityMap(entityJsonList,thingCache); + for (ObjectNode entityNode : entityJsonList) { + thingCache.updateKeyMap(CacheNameEnum.THING_ENTITY + ,entityNode.get(CacheNameEnum.EntityField.THING_ENTITY_TENANT_CODE.getField()).asText() + + ":" + entityNode.get(CacheNameEnum.EntityField.THING_ENTITY_CODE.getField()).asText() + + ":" + entityNode.get(CacheNameEnum.EntityField.THING_ENTITY_ID.getField()).asText(),entityNode); + } } } } catch (Exception e) { diff --git a/modules/thing/src/main/java/com/thing/thing/model/service/impl/IotThingModelServiceImpl.java b/modules/thing/src/main/java/com/thing/thing/model/service/impl/IotThingModelServiceImpl.java index d065851..dd859bf 100644 --- a/modules/thing/src/main/java/com/thing/thing/model/service/impl/IotThingModelServiceImpl.java +++ b/modules/thing/src/main/java/com/thing/thing/model/service/impl/IotThingModelServiceImpl.java @@ -137,6 +137,7 @@ public class IotThingModelServiceImpl extends BaseServiceImpl modelList = cache.getTopicMap(CacheNameEnum.THING_MODEL); + log.info("modelList缓存数据个数:{},modelList缓存数据:{}", modelList.size(),modelList.toString()); if (CollectionUtils.isEmpty(modelList)) { List list = mapper.selectListByQueryAs(getWrapper(orderField, order, null, null, null, null, null,null,null, null), IotThingModelDTO.class);