diff --git a/modules/quartz/src/main/java/com/thing/quartz/timetask/task/ThingStatusTask.java b/modules/quartz/src/main/java/com/thing/quartz/timetask/task/ThingStatusTask.java index d59febe..bc8e54a 100644 --- a/modules/quartz/src/main/java/com/thing/quartz/timetask/task/ThingStatusTask.java +++ b/modules/quartz/src/main/java/com/thing/quartz/timetask/task/ThingStatusTask.java @@ -4,11 +4,13 @@ import com.fasterxml.jackson.databind.node.ObjectNode; import com.thing.common.cache.constants.CacheNameEnum; import com.thing.common.core.enumeration.GateWayStatus; import com.thing.common.core.enumeration.ThingStatus; +import com.thing.common.core.utils.ConvertUtils; import com.thing.common.core.utils.JacksonUtil; import com.thing.common.data.tskv.TsKvDTO; import com.thing.common.tskv.service.TsKvService; import com.thing.thing.cache.service.ThingCache; import com.thing.thing.context.service.ThingManageContextService; +import com.thing.thing.model.dto.IotThingModelDTO; import com.thing.thing.model.entity.IotThingModelEntity; import com.thing.thing.model.service.IotThingModelService; import lombok.RequiredArgsConstructor; @@ -95,9 +97,10 @@ public class ThingStatusTask implements ITask { } } //更新物模型 - cache.updateAccurateKeyMap(CacheNameEnum.THING_MODEL + IotThingModelDTO iotThingModelDTO = ConvertUtils.sourceToTarget(item, IotThingModelDTO.class); + cache.updateAccurateKeyEntity(CacheNameEnum.THING_MODEL , item.get(CacheNameEnum.ModelField.THING_MODEL_CODE.getField()).asText() - + KEY + item.get(CacheNameEnum.ModelField.THING_MODEL_ID.getField()).asText(),item); + + KEY + item.get(CacheNameEnum.ModelField.THING_MODEL_ID.getField()).asText(), iotThingModelDTO); return JacksonUtil.convertValue(item, IotThingModelEntity.class); }).collect(Collectors.toList()); if(CollectionUtils.isNotEmpty(statusList)){ 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 5d9acb1..f05063a 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 @@ -308,7 +308,7 @@ public class IotThingModelServiceImpl extends BaseServiceImpl { mapper.insertOrUpdate(model); cache.updateAccurateKeyEntity(CacheNameEnum.THING_MODEL, - model.getCode()+CacheInit.KEY+model.getId(),ConvertUtils.sourceToTarget(model, ModelDetailDTO.class)); + model.getCode()+CacheInit.KEY+model.getId(),ConvertUtils.sourceToTarget(model, IotThingModelDTO.class)); }); }