From cda945ea566aa92410001e4940eabe309627cd5f Mon Sep 17 00:00:00 2001
From: "hong.yang" <hong.yang@ustcinfo.com>
Date: Fri, 22 Sep 2023 11:40:03 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BC=98=E5=8C=96=E5=A4=A7=E5=B1=8F?=
 =?UTF-8?q?=E3=80=81=E7=BB=84=E4=BB=B6=E7=9A=84=E5=A4=8D=E5=88=B6=E5=91=BD?=
 =?UTF-8?q?=E5=90=8D=EF=BC=8C=E9=81=BF=E5=85=8D=E5=A4=9A=E6=AC=A1=E5=A4=8D?=
 =?UTF-8?q?=E5=88=B6=E5=90=8E=E5=90=8D=E7=A7=B0=E8=BF=87=E9=95=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

优化大屏、组件的复制命名，避免多次复制后名称过长
---
 .../service/impl/BizComponentServiceImpl.java    | 16 ++++++++++++++--
 .../service/impl/DataRoomPageServiceImpl.java    | 16 ++++++++++++++--
 2 files changed, 28 insertions(+), 4 deletions(-)

diff --git a/DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/module/biz/component/service/impl/BizComponentServiceImpl.java b/DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/module/biz/component/service/impl/BizComponentServiceImpl.java
index 2f4294a8..abe2503c 100644
--- a/DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/module/biz/component/service/impl/BizComponentServiceImpl.java
+++ b/DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/module/biz/component/service/impl/BizComponentServiceImpl.java
@@ -173,6 +173,8 @@ public class BizComponentServiceImpl extends ServiceImpl<DataRoomBizComponentDao
         return fileUrl;
     }
 
+    public static final String COPY_SUFFIX = "-副本";
+
     @Override
     public String copy(String code) {
         BizComponentEntity copyFrom = this.getInfoByCode(code);
@@ -181,9 +183,19 @@ public class BizComponentServiceImpl extends ServiceImpl<DataRoomBizComponentDao
         }
         String oldCode = copyFrom.getCode();
         copyFrom.setId(null);
-        copyFrom.setName(copyFrom.getName() + "_复制");
+        String oldName = copyFrom.getName();
+        // 检查是否有 -副本，有的话从-副本开始，后面全部去掉
+        if (oldName.contains(COPY_SUFFIX)) {
+            oldName = oldName.substring(0, oldName.indexOf(COPY_SUFFIX));
+            if (StringUtils.isBlank(oldName)) {
+                oldName = "组件";
+            }
+        }
+        copyFrom.setName(oldName + COPY_SUFFIX);
+        int i = 1;
         while(this.checkName(null, copyFrom.getName())) {
-            copyFrom.setName(copyFrom.getName() + "_复制");
+            copyFrom.setName(oldName + COPY_SUFFIX + i);
+            i++;
         }
         copyFrom.setCode(CodeGenerateUtils.generate("bizComponent"));
         boolean copy = this.copyCoverPicture(oldCode, copyFrom.getCode());
diff --git a/DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/module/manage/service/impl/DataRoomPageServiceImpl.java b/DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/module/manage/service/impl/DataRoomPageServiceImpl.java
index 6f46b870..2b7d5151 100644
--- a/DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/module/manage/service/impl/DataRoomPageServiceImpl.java
+++ b/DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/module/manage/service/impl/DataRoomPageServiceImpl.java
@@ -296,6 +296,9 @@ public class DataRoomPageServiceImpl extends ServiceImpl<DataRoomPageDao, PageEn
         PAGE_ENTITY_CACHE.invalidate(bigScreenEntity.getCode());
     }
 
+
+    public static final String COPY_SUFFIX = "-副本";
+
     @Override
     public String copy(PageEntity screenEntity) {
         DataRoomPageDTO config = (DataRoomPageDTO) screenEntity.getConfig();
@@ -304,9 +307,18 @@ public class DataRoomPageServiceImpl extends ServiceImpl<DataRoomPageDao, PageEn
         screenEntity.setCode(CodeGenerateUtils.generate(screenEntity.getType()));
         int i = 1;
         String oldName = screenEntity.getName();
-        screenEntity.setName(oldName + "_复制");
+        // 检查是否有 -副本，有的话从-副本开始，后面全部去掉
+        if (oldName.contains(COPY_SUFFIX)) {
+            oldName = oldName.substring(0, oldName.indexOf(COPY_SUFFIX));
+            if (StringUtils.isBlank(oldName)) {
+                oldName = "大屏";
+            }
+        }
+        screenEntity.setName(oldName + COPY_SUFFIX);
         while (checkNameRepeat(screenEntity)) {
-            screenEntity.setName(oldName + "_复制" + i++);
+           // 如果重复，采取 -副本1，-副本2的方式
+            screenEntity.setName(oldName + COPY_SUFFIX + i);
+            i++;
         }
         config.setName(screenEntity.getName());
         config.setCode(screenEntity.getCode());