From 2eb3fc97d61b3a4e125a7efa03408c059f2d1d30 Mon Sep 17 00:00:00 2001
From: xiachao <xiachao@qq.com>
Date: Thu, 26 Dec 2024 14:29:09 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=84=E6=80=81=E8=AE=BE=E8=AE=A1bug?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/IotVisualManageServiceImpl.java      |  5 ++++-
 .../service/impl/IotVisualDesignServiceImpl.java      | 11 +++++------
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/modules/visual-design/src/main/java/com/thing/visual/board/service/impl/IotVisualManageServiceImpl.java b/modules/visual-design/src/main/java/com/thing/visual/board/service/impl/IotVisualManageServiceImpl.java
index 6c3a8c7..511b2a7 100644
--- a/modules/visual-design/src/main/java/com/thing/visual/board/service/impl/IotVisualManageServiceImpl.java
+++ b/modules/visual-design/src/main/java/com/thing/visual/board/service/impl/IotVisualManageServiceImpl.java
@@ -17,6 +17,7 @@ import com.thing.common.core.utils.JsonProcessingUtils;
 import com.thing.common.core.web.response.PageData;
 import com.thing.common.core.web.response.Result;
 import com.thing.common.orm.service.impl.BaseServiceImpl;
+import com.thing.common.orm.utils.IdGenerator;
 import com.thing.sys.biz.dto.SysMenuDTO;
 import com.thing.sys.biz.dto.SysRoleDTO;
 import com.thing.sys.biz.entity.SysLanguageEntity;
@@ -116,6 +117,7 @@ public class IotVisualManageServiceImpl extends BaseServiceImpl<IotVisualManageM
             wrapper.in( "id", idList,CollectionUtils.isNotEmpty(idList));
         }
         wrapper.and(IOT_VISUAL_MANAGE_ENTITY.TENANT_CODE.eq(tenantCode).or(IOT_VISUAL_MANAGE_ENTITY.IS_DEFAULT.eq(0)));
+        wrapper.orderBy(IOT_VISUAL_MANAGE_ENTITY.CREATE_DATE,false);
         return wrapper;
     }
 
@@ -334,8 +336,9 @@ public class IotVisualManageServiceImpl extends BaseServiceImpl<IotVisualManageM
     public Result copy(Long id) {
         IotVisualManageDTO data =this.getByIdAs(id, IotVisualManageDTO.class);
         String name = data.getName()+"_COPY"+UUID.randomUUID().toString().substring(1,5);
-        data.setId(null);
+        data.setId(IdGenerator.nextId());
         data.setName(name);
+        data.setCreateDate(System.currentTimeMillis());
         this.saveDto(data);
         IotVisualDesignDTO desigDTO = iotVisualDesignService.getDetailByBoardManageId(String.valueOf(id));
         if(ObjectUtil.isNotNull(desigDTO)){
diff --git a/modules/visual-design/src/main/java/com/thing/visual/configuration/service/impl/IotVisualDesignServiceImpl.java b/modules/visual-design/src/main/java/com/thing/visual/configuration/service/impl/IotVisualDesignServiceImpl.java
index e033d07..d6aa5cb 100644
--- a/modules/visual-design/src/main/java/com/thing/visual/configuration/service/impl/IotVisualDesignServiceImpl.java
+++ b/modules/visual-design/src/main/java/com/thing/visual/configuration/service/impl/IotVisualDesignServiceImpl.java
@@ -113,12 +113,11 @@ public class IotVisualDesignServiceImpl extends BaseServiceImpl<IotVisualDesignM
         QueryWrapper wrapper = new QueryWrapper();
         wrapper.eq("board_manage_id",id);
         IotVisualDesignDTO data = this.getOneAs(wrapper, IotVisualDesignDTO.class);
-
-        IotVisualManageEntity manageEntity = iotVisualManageService.getById(id);
-        data.setThumbnailUrl(manageEntity.getThumbnailUrl());
-        data.setPageName(manageEntity.getName());
-        data.setPreviewUrl(manageEntity.getPreviewUrl());
         if(ObjectUtil.isNotEmpty(data)){
+            IotVisualManageEntity manageEntity = iotVisualManageService.getById(id);
+            data.setThumbnailUrl(manageEntity.getThumbnailUrl());
+            data.setPageName(manageEntity.getName());
+            data.setPreviewUrl(manageEntity.getPreviewUrl());
             if(StringUtils.isNotBlank(data.getApiSetIds())){
                 List<Long> apiIds = Arrays.stream(data.getApiSetIds().split(","))
                         .map(String::trim) // 去掉可能的空格
@@ -130,7 +129,7 @@ public class IotVisualDesignServiceImpl extends BaseServiceImpl<IotVisualDesignM
             }
 
         }
-         return data;
+        return data;
     }