diff --git a/modules/thing/src/main/java/com/thing/thing/relation/detail/service/impl/IotThingRelationDetailServiceImpl.java b/modules/thing/src/main/java/com/thing/thing/relation/detail/service/impl/IotThingRelationDetailServiceImpl.java index 976618f..06e11d0 100644 --- a/modules/thing/src/main/java/com/thing/thing/relation/detail/service/impl/IotThingRelationDetailServiceImpl.java +++ b/modules/thing/src/main/java/com/thing/thing/relation/detail/service/impl/IotThingRelationDetailServiceImpl.java @@ -281,7 +281,7 @@ public class IotThingRelationDetailServiceImpl extends BaseServiceImpl mapAccurateKey = cache.findMapAccurateKey(CacheNameEnum.THING_MODEL, item.getToCode()); if (CollectionUtils.isNotEmpty(mapAccurateKey)) { String status = mapAccurateKey.get(0).get(CacheNameEnum.ModelField.THING_MODEL_STATUS.getField()).asText(); @@ -324,7 +324,7 @@ public class IotThingRelationDetailServiceImpl extends BaseServiceImpl { - ObjectNode node = JsonConverter.convertToJsonObjectObjectNode(entity); + ObjectNode node = JsonConverter.convertToJsonObjectObjectNode(ConvertUtils.sourceToTarget(entity, IotThingRelationDetailDTO.class)); List mapAccurateKey = cache.findMapAccurateKey(CacheNameEnum.THING_MODEL, entity.getToCode()); if (CollectionUtils.isNotEmpty(mapAccurateKey)) { String status = mapAccurateKey.get(0).get(CacheNameEnum.ModelField.THING_MODEL_STATUS.getField()).asText(); @@ -385,7 +385,7 @@ public class IotThingRelationDetailServiceImpl extends BaseServiceImpl mapAccurateKey = cache.findMapAccurateKey(CacheNameEnum.THING_MODEL, sourceEntity.getToCode()); if(CollectionUtils.isNotEmpty(mapAccurateKey)){ String status = mapAccurateKey.get(0).get(CacheNameEnum.ModelField.THING_MODEL_STATUS.getField()).asText(); @@ -403,7 +403,7 @@ public class IotThingRelationDetailServiceImpl extends BaseServiceImpl mapAccurateKey = cache.findMapAccurateKey(CacheNameEnum.THING_MODEL, sourceEntity.getToCode()); if(CollectionUtils.isNotEmpty(mapAccurateKey)){ String status = mapAccurateKey.get(0).get(CacheNameEnum.ModelField.THING_MODEL_STATUS.getField()).asText(); @@ -455,7 +455,7 @@ public class IotThingRelationDetailServiceImpl extends BaseServiceImpl mapAccurateKey = cache.findMapAccurateKey(CacheNameEnum.THING_MODEL, sourceEntity.getToCode()); if(CollectionUtils.isNotEmpty(mapAccurateKey)){ String status = mapAccurateKey.get(0).get(CacheNameEnum.ModelField.THING_MODEL_STATUS.getField()).asText(); @@ -577,7 +577,7 @@ public class IotThingRelationDetailServiceImpl extends BaseServiceImpl { - ObjectNode node = JsonConverter.convertToJsonObjectObjectNode(s); + ObjectNode node = JsonConverter.convertToJsonObjectObjectNode(ConvertUtils.sourceToTarget(s, IotThingRelationDetailDTO.class)); List mapAccurateKey = cache.findMapAccurateKey(CacheNameEnum.THING_MODEL, s.getToCode()); if (CollectionUtils.isNotEmpty(mapAccurateKey)) { String status = mapAccurateKey.get(0).get(CacheNameEnum.ModelField.THING_MODEL_STATUS.getField()).asText(); @@ -620,7 +620,7 @@ public class IotThingRelationDetailServiceImpl extends BaseServiceImpl { - ObjectNode node = JsonConverter.convertToJsonObjectObjectNode(s); + ObjectNode node = JsonConverter.convertToJsonObjectObjectNode(ConvertUtils.sourceToTarget(s, IotThingRelationDetailDTO.class)); List mapAccurateKey = cache.findMapAccurateKey(CacheNameEnum.THING_MODEL, s.getToCode()); if (CollectionUtils.isNotEmpty(mapAccurateKey)) { String status = mapAccurateKey.get(0).get(CacheNameEnum.ModelField.THING_MODEL_STATUS.getField()).asText(); @@ -659,7 +659,7 @@ public class IotThingRelationDetailServiceImpl extends BaseServiceImpl mapAccurateKey = cache.findMapAccurateKey(CacheNameEnum.THING_MODEL, s.getToCode()); if (CollectionUtils.isNotEmpty(mapAccurateKey)) { String status = mapAccurateKey.get(0).get(CacheNameEnum.ModelField.THING_MODEL_STATUS.getField()).asText();