From bc1fb750627b475aff37eb0078b580c7002c4730 Mon Sep 17 00:00:00 2001
From: lishuai <lishuai@qq.com>
Date: Mon, 30 Sep 2024 11:26:54 +0800
Subject: [PATCH] =?UTF-8?q?=E7=89=A9=E5=85=B3=E7=B3=BB=E6=A0=87=E7=AD=BE?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=202024=E5=B9=B49=E6=9C=8830=E6=97=A511:10:04?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../IotThingRelationDetailServiceImpl.java     | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

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<IotThingR
             } else {
                 mapper.updateByQuery(item, QueryWrapper.create().eq(IotThingRelationDetailEntity::getId, item.getId()));
             }
-            ObjectNode node = JsonConverter.convertToJsonObjectObjectNode(item);
+            ObjectNode node = JsonConverter.convertToJsonObjectObjectNode(ConvertUtils.sourceToTarget(item, IotThingRelationDetailDTO.class));
             List<ObjectNode> 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<IotThingR
         root.setConfig(request.getConfig());
         relationRootsService.updateById(root);
         //更新缓存
-        ObjectNode nodes = JsonConverter.convertToJsonObjectObjectNode(root);
+        ObjectNode nodes = JsonConverter.convertToJsonObjectObjectNode(ConvertUtils.sourceToTarget(root, IotThingRelationRootDTO.class));
         nodes.put("fromId", "0");
         nodes.put("rootId", nodes.get("id").asText());
         nodes.put("toId", nodes.get("id").asText());
@@ -363,7 +363,7 @@ public class IotThingRelationDetailServiceImpl extends BaseServiceImpl<IotThingR
         //更新缓存
         list.forEach(entity ->
                 {
-                    ObjectNode node = JsonConverter.convertToJsonObjectObjectNode(entity);
+                    ObjectNode node = JsonConverter.convertToJsonObjectObjectNode(ConvertUtils.sourceToTarget(entity, IotThingRelationDetailDTO.class));
                     List<ObjectNode> 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<IotThingR
         sourceEntity.setTag(StringUtils.isBlank(dto.getTag()) ? dto.getToName() : dto.getTag());
         if(Objects.isNull(dto.getPid()) || Objects.equals(dto.getPid(), 0L)){
             mapper.update(sourceEntity);
-            ObjectNode node = JsonConverter.convertToJsonObjectObjectNode(sourceEntity);
+            ObjectNode node = JsonConverter.convertToJsonObjectObjectNode(ConvertUtils.sourceToTarget(sourceEntity, IotThingRelationDetailDTO.class));
             List<ObjectNode> 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<IotThingR
             }
             if(sourceEntity.getFromId().equals(targetEntity.getToId())){
                 mapper.update(sourceEntity);
-                ObjectNode node = JsonConverter.convertToJsonObjectObjectNode(sourceEntity);
+                ObjectNode node = JsonConverter.convertToJsonObjectObjectNode(ConvertUtils.sourceToTarget(sourceEntity, IotThingRelationDetailDTO.class));
                 List<ObjectNode> 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<IotThingR
                         {
                             item.setSort(sort.incrementAndGet());
                             mapper.updateByQuery(item, QueryWrapper.create().eq(IotThingRelationDetailEntity::getId, item.getId()));
-                            ObjectNode node = JsonConverter.convertToJsonObjectObjectNode(sourceEntity);
+                            ObjectNode node = JsonConverter.convertToJsonObjectObjectNode(ConvertUtils.sourceToTarget(sourceEntity, IotThingRelationDetailDTO.class));
                             List<ObjectNode> 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<IotThingR
         //更新缓存
         resultList.forEach(s ->
         {
-            ObjectNode node = JsonConverter.convertToJsonObjectObjectNode(s);
+            ObjectNode node = JsonConverter.convertToJsonObjectObjectNode(ConvertUtils.sourceToTarget(s, IotThingRelationDetailDTO.class));
             List<ObjectNode> 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<IotThingR
         //更新缓存
         reslutList.forEach(s ->
                 {
-                    ObjectNode node = JsonConverter.convertToJsonObjectObjectNode(s);
+                    ObjectNode node = JsonConverter.convertToJsonObjectObjectNode(ConvertUtils.sourceToTarget(s, IotThingRelationDetailDTO.class));
                     List<ObjectNode> 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<IotThingR
             mapper.insertOrUpdateSelective(s);
             //更新缓存
 
-            ObjectNode node = JsonConverter.convertToJsonObjectObjectNode(s);
+            ObjectNode node = JsonConverter.convertToJsonObjectObjectNode(ConvertUtils.sourceToTarget(s, IotThingRelationDetailDTO.class));
             List<ObjectNode> 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();