1

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

@@ -82,7 +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();
 
@@ -90,7 +90,11 @@ public class ScenePlusServiceImpl extends ServiceImpl<IScenePlusMapper, ScenePlu
         if(plusExt == null){
             throw new BusinessException(ResultCode.NOT_RECORD);
         }
-
+        scenePlus.setNum(newNum);
+        scenePlus.setTitle(scenePlus.getTitle() +"(copy)");
+        scenePlus.setSceneStatus(0);
+        scenePlus.setId(null);
+        this.save(scenePlus);
 
         ExecutorService executor = ThreadUtil.newSingleExecutor();
         CompletableFuture.runAsync(() -> {
@@ -101,10 +105,7 @@ public class ScenePlusServiceImpl extends ServiceImpl<IScenePlusMapper, ScenePlu
         log.info("sceneCopy-V4-oldNum:{},oldDataSource:{},newNum:{},newDataSource:{}",
                 oldNum,oldDataSource,newNum,newDataSource);
 
-        scenePlus.setTitle(scenePlus.getTitle() +"(copy)");
-        scenePlus.setSceneStatus(0);
-        scenePlus.setId(null);
-        this.save(scenePlus);
+
 
         String newVideos = plusExt.getVideos();
         if(StrUtil.isNotEmpty(newVideos)){

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

@@ -208,7 +208,19 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
         }
         String oldNum = scenePro.getNum();
         String newNum = sceneCommonService.getNewNum(oldNum);
+
+        Long sceneProId = scenePro.getId();
+        String oldSceneName = scenePro.getSceneName();
+
         scenePro.setNum(newNum);
+        scenePro.setId(null);
+        scenePro.setSceneName(scenePro.getSceneName() +"(copy)");
+        scenePro.setViewCount(0);
+        scenePro.setThumb(scenePro.getThumb().replaceAll(oldNum,scenePro.getNum()));
+        scenePro.setWebSite(scenePro.getWebSite().replaceAll(oldNum,scenePro.getNum()));
+        scenePro.setStatus(0);
+        this.save(scenePro);
+
         ExecutorService executor = ThreadUtil.newSingleExecutor();
         CompletableFuture.runAsync(() -> {
 
@@ -218,17 +230,8 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
         log.info("sceneCopy--oldNum:{},oldDataSource:{},newNum:{},newDataSource:{}",
                 oldNum,oldDataSource,newNum,newDataSource);
 
-
-        Long sceneProId = scenePro.getId();
-        String oldSceneName = scenePro.getSceneName();
-        scenePro.setId(null);
-        scenePro.setSceneName(scenePro.getSceneName() +"(copy)");
-        scenePro.setViewCount(0);
-        scenePro.setThumb(scenePro.getThumb().replaceAll(oldNum,scenePro.getNum()));
-        scenePro.setWebSite(scenePro.getWebSite().replaceAll(oldNum,scenePro.getNum()));
-        scenePro.setStatus(0);
         scenePro.setDataSource(newDataSource);
-        this.save(scenePro);
+        this.updateById(scenePro);
 
         SceneProEdit oldEditScene = sceneProEditService.getByProId(sceneProId);
         oldEditScene.setId(null);