From 5286fb725037ef4d3b2d4e4fb3f862b60c4d0a05 Mon Sep 17 00:00:00 2001
From: lishuai <lishuai@qq.com>
Date: Mon, 21 Oct 2024 13:55:33 +0800
Subject: [PATCH] =?UTF-8?q?=E7=89=A9=E5=85=B3=E7=B3=BB=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E7=BB=84=E5=90=8D=E7=A7=B0=E7=BC=93=E5=AD=98=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=202024=E5=B9=B410=E6=9C=8821=E6=97=A513:55:30?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../IotThingRelationDetailController.java     |  1 -
 .../IotThingRelationDetailServiceImpl.java    |  2 +-
 .../impl/IotThingRelationRootServiceImpl.java | 21 ++++++++++++++++++-
 3 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/modules/thing/src/main/java/com/thing/thing/relation/detail/controller/IotThingRelationDetailController.java b/modules/thing/src/main/java/com/thing/thing/relation/detail/controller/IotThingRelationDetailController.java
index e5470de..bb7e7d5 100644
--- a/modules/thing/src/main/java/com/thing/thing/relation/detail/controller/IotThingRelationDetailController.java
+++ b/modules/thing/src/main/java/com/thing/thing/relation/detail/controller/IotThingRelationDetailController.java
@@ -22,7 +22,6 @@ import io.swagger.v3.oas.annotations.tags.Tag;
 import jakarta.annotation.Resource;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
-import org.apache.commons.lang3.ArrayUtils;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
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 9b54692..48eb186 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
@@ -996,7 +996,7 @@ public class IotThingRelationDetailServiceImpl extends BaseServiceImpl<IotThingR
         List<IotThingRelationDetailExcel> resList = list.stream().map(node -> {
             IotThingRelationDetailExcel excel = new IotThingRelationDetailExcel();
             excel.setFromName(node.get("fromName").asText());
-            excel.setFromCode(node.get("fromCode").asText());
+            excel.setFromCode(node.get("fromCode").isEmpty() ? "" : node.get("fromCode").asText());
             excel.setToName(node.get("toName").asText());
             excel.setToCode(node.get("toCode").asText());
             excel.setConfig(node.get("config").isEmpty() ? "" : node.get("config").asText());
diff --git a/modules/thing/src/main/java/com/thing/thing/relation/root/service/impl/IotThingRelationRootServiceImpl.java b/modules/thing/src/main/java/com/thing/thing/relation/root/service/impl/IotThingRelationRootServiceImpl.java
index 3d838d5..6921cff 100644
--- a/modules/thing/src/main/java/com/thing/thing/relation/root/service/impl/IotThingRelationRootServiceImpl.java
+++ b/modules/thing/src/main/java/com/thing/thing/relation/root/service/impl/IotThingRelationRootServiceImpl.java
@@ -200,11 +200,29 @@ public class IotThingRelationRootServiceImpl extends BaseServiceImpl<IotThingRel
                 iotThingRelationRootInsert.getGroupName()+CacheInit.KEY+ iotThingRelationRootInsert.getName()+CacheInit.KEY+ iotThingRelationRootInsert.getId(),nodes);
     }
 
+    private void updateRootAndCacheAny(IotThingRelationRootEntity iotThingRelationRootInsert) {
+        IotThingRelationRootDTO relationRootDTO = ConvertUtils.sourceToTarget(iotThingRelationRootInsert, IotThingRelationRootDTO.class);
+        ObjectNode nodes = JsonConverter.convertToJsonObjectObjectNode(relationRootDTO);
+        nodes.put("fromId", "0");
+        nodes.put("rootId", nodes.get("id").asText());
+        nodes.put("toId", nodes.get("id").asText());
+        nodes.put("toName", nodes.get("name").asText());
+        nodes.put("rootThingId", "0");
+        cache.updateAccurateKeyMap(CacheNameEnum.THING_ROOT_RELATION,
+                iotThingRelationRootInsert.getGroupName()+CacheInit.KEY+ iotThingRelationRootInsert.getName()+CacheInit.KEY+ iotThingRelationRootInsert.getId(),nodes);
+    }
+
     @Transactional(rollbackFor = Exception.class)
     @Override
     public void update(IotThingRelationRootDTO dto) {
         Long id = dto.getId();
         IotThingRelationRootEntity iotThingRelationRootEntity = mapper.selectOneById(id);
+
+         String oldKey = iotThingRelationRootEntity.getGroupName() + CacheInit.KEY + iotThingRelationRootEntity.getName() + CacheInit.KEY + iotThingRelationRootEntity.getId();
+
+
+
+
         iotThingRelationRootEntity.setName(dto.getName());
         String url = BizUtils.trimAll(dto.getUrl());
         if(StringUtils.isNotBlank(url)){
@@ -214,8 +232,9 @@ public class IotThingRelationRootServiceImpl extends BaseServiceImpl<IotThingRel
         iotThingRelationRootEntity.setUrl(url);
         iotThingRelationRootEntity.setRemark(dto.getRemark());
         iotThingRelationRootEntity.setGroupName(dto.getGroupName());
-        mapper.insertOrUpdateSelective(iotThingRelationRootEntity);
+        mapper.update(iotThingRelationRootEntity);
         //更新缓存
+        cache.deleteKeyMap(CacheNameEnum.THING_ROOT_RELATION,oldKey);
         updateRootAndCache(iotThingRelationRootEntity);
     }