定时任务状态bug修复

2024年9月27日16:52:20

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)){

modules/thing/src/main/java/com/thing/thing/model/service/impl/IotThingModelServiceImpl.java

@@ -308,7 +308,7 @@ public class IotThingModelServiceImpl extends BaseServiceImpl<IotThingModelMappe
             mapper.insert(modelEntity);
             //更新物模型的缓存
             cache.updateAccurateKeyEntity(CacheNameEnum.THING_MODEL,
-                    modelEntity.getCode()+CacheInit.KEY+modelEntity.getId(),ConvertUtils.sourceToTarget(modelEntity, ModelDetailDTO.class));
+                    modelEntity.getCode()+CacheInit.KEY+modelEntity.getId(),ConvertUtils.sourceToTarget(modelEntity, IotThingModelDTO.class));
             //分配属性信息
             shareThingsToTenantCode(Collections.singletonList(code), dto.getTenantCodes());
             updateModelAuthNumByCodes(Collections.singletonList(code));
@@ -334,7 +334,7 @@ public class IotThingModelServiceImpl extends BaseServiceImpl<IotThingModelMappe
         mapper.update(iotThingModelEntity, true);
         //更新物模型的缓存
         cache.updateAccurateKeyEntity(CacheNameEnum.THING_MODEL,
-                iotThingModelEntity.getCode()+CacheInit.KEY+iotThingModelEntity.getId(),ConvertUtils.sourceToTarget(iotThingModelEntity, ModelDetailDTO.class));
+                iotThingModelEntity.getCode()+CacheInit.KEY+iotThingModelEntity.getId(),ConvertUtils.sourceToTarget(iotThingModelEntity, IotThingModelDTO.class));
         return true;
     }
 
@@ -370,7 +370,7 @@ public class IotThingModelServiceImpl extends BaseServiceImpl<IotThingModelMappe
                     mapper.insertOrUpdateSelective(entity);
                     //更新缓存
                     cache.updateAccurateKeyEntity(CacheNameEnum.THING_MODEL,
-                            entity.getCode()+CacheInit.KEY+entity.getId(),ConvertUtils.sourceToTarget(entity, ModelDetailDTO.class));
+                            entity.getCode()+CacheInit.KEY+entity.getId(),ConvertUtils.sourceToTarget(entity, IotThingModelDTO.class));
                 }
         );
 
@@ -382,7 +382,7 @@ public class IotThingModelServiceImpl extends BaseServiceImpl<IotThingModelMappe
         modelEntities.forEach(model -> {
             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));
         });
     }