1

src/main/java/com/fdkankan/manage_jp/service/impl/ScenePlusServiceImpl.java

@@ -82,6 +82,7 @@ public class ScenePlusServiceImpl extends ServiceImpl<IScenePlusMapper, ScenePlu
         }
         String oldNum = scenePlus.getNum();
         String newNum = sceneCommonService.getNewNum(oldNum);
+        scenePlus.setNum(newNum);
         Long plusId = scenePlus.getId();
         String oldSceneName = scenePlus.getTitle();
 
@@ -89,6 +90,10 @@ public class ScenePlusServiceImpl extends ServiceImpl<IScenePlusMapper, ScenePlu
         if(plusExt == null){
             throw new BusinessException(ResultCode.NOT_RECORD);
         }
+
+
+        ExecutorService executor = ThreadUtil.newSingleExecutor();
+        CompletableFuture.runAsync(() -> {
         String oldDataSource = plusExt.getDataSource();
 
         String newDataSource = sceneCommonService.getNewDataSource(oldDataSource);
@@ -96,7 +101,6 @@ public class ScenePlusServiceImpl extends ServiceImpl<IScenePlusMapper, ScenePlu
         log.info("sceneCopy-V4-oldNum:{},oldDataSource:{},newNum:{},newDataSource:{}",
                 oldNum,oldDataSource,newNum,newDataSource);
 
-        scenePlus.setNum(newNum);
         scenePlus.setTitle(scenePlus.getTitle() +"(copy)");
         scenePlus.setSceneStatus(0);
         scenePlus.setId(null);
@@ -152,8 +156,6 @@ public class ScenePlusServiceImpl extends ServiceImpl<IScenePlusMapper, ScenePlu
             laserService.cloudPointBuild(oldNum,newNum);
         }
 
-        ExecutorService executor = ThreadUtil.newSingleExecutor();
-        CompletableFuture.runAsync(() -> {
             try {
                 //重新生成编辑页基础设置二维码
                 sceneCommonService.createNewQrCode(SceneVersionType.V4.code(),sceneEditInfoExt.getShareLogoImg(),newNum,plusExt.getWebSite());

src/main/java/com/fdkankan/manage_jp/service/impl/SceneProServiceImpl.java

@@ -202,11 +202,15 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
 
     @Override
     public ScenePro copyScene(ScenePro scenePro) {
+
         if(scenePro.getStatus() !=-2){
             throw new BusinessException(ResultCode.SCENE_ERROR);
         }
         String oldNum = scenePro.getNum();
         String newNum = sceneCommonService.getNewNum(oldNum);
+        scenePro.setNum(newNum);
+        ExecutorService executor = ThreadUtil.newSingleExecutor();
+        CompletableFuture.runAsync(() -> {
 
         String oldDataSource = scenePro.getDataSource();
         String newDataSource = sceneCommonService.getNewDataSource(oldDataSource);
@@ -218,7 +222,6 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
         Long sceneProId = scenePro.getId();
         String oldSceneName = scenePro.getSceneName();
         scenePro.setId(null);
-        scenePro.setNum(newNum);
         scenePro.setSceneName(scenePro.getSceneName() +"(copy)");
         scenePro.setViewCount(0);
         scenePro.setThumb(scenePro.getThumb().replaceAll(oldNum,scenePro.getNum()));
@@ -250,8 +253,7 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
          * video/video{SceneNum}
          * voice/voice{SceneNum}
          */
-        ExecutorService executor = ThreadUtil.newSingleExecutor();
-        CompletableFuture.runAsync(() -> {
+
             try {
                 //重新生成编辑页基础设置二维码
                 sceneCommonService.createNewQrCode(SceneVersionType.V3.code(),oldEditScene.getShareLogo(),newNum,scenePro.getWebSite());