|
|
@@ -7,6 +7,7 @@ import cn.hutool.extra.qrcode.QrCodeUtil;
|
|
|
import cn.hutool.extra.qrcode.QrConfig;
|
|
|
import com.alibaba.fastjson.JSONObject;
|
|
|
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
|
|
+import com.fdkankan.common.constant.CommonStatus;
|
|
|
import com.fdkankan.common.constant.SceneSource;
|
|
|
import com.fdkankan.common.constant.SceneVersionType;
|
|
|
import com.fdkankan.common.exception.BusinessException;
|
|
|
@@ -147,7 +148,7 @@ public class SceneCopyServiceImpl implements ISceneCopyService {
|
|
|
}
|
|
|
|
|
|
if(scenePlus.getSceneSource() == 4 || scenePlus.getSceneSource() == 5 || scenePlus.getSceneSource() == 7){ //深时复制
|
|
|
- laserService.copy(oldNum,newNum,newDataSource,true);
|
|
|
+ laserService.copy(oldNum,newNum,newDataSource,true, userId, scenePlus.getDemo());
|
|
|
}else {
|
|
|
laserService.cloudPointBuild(oldNum,newNum);
|
|
|
}
|
|
|
@@ -168,7 +169,7 @@ public class SceneCopyServiceImpl implements ISceneCopyService {
|
|
|
this.updateNasSceneJson(targetData,oldNum,newNum,scenePlus.getTitle(),"v4","scene.json");
|
|
|
|
|
|
if(scenePlus.getSceneSource() == 4 || scenePlus.getSceneSource() == 5 || scenePlus.getSceneSource() == 7){ //深时复制
|
|
|
- laserService.copy(oldNum,newNum,newDataSource,false);
|
|
|
+ laserService.copy(oldNum,newNum,newDataSource,false, userId, scenePlus.getDemo());
|
|
|
}else {
|
|
|
scenePlus.setSceneStatus(-2);
|
|
|
scenePlusService.updateById(scenePlus);
|
|
|
@@ -231,7 +232,7 @@ public class SceneCopyServiceImpl implements ISceneCopyService {
|
|
|
sceneProEditService.save(oldEditScene);
|
|
|
|
|
|
if(scenePro.getSceneSource() == 4 || scenePro.getSceneSource() == 5) { //深时复制
|
|
|
- laserService.copy(oldNum,newNum,newDataSource,true);
|
|
|
+ laserService.copy(oldNum,newNum,newDataSource,true, null, CommonStatus.NO.code().intValue());
|
|
|
}
|
|
|
//重新生成编辑页基础设置二维码
|
|
|
this.createNewQrCode(SceneVersionType.V3.code(),oldEditScene.getShareLogo(),newNum,scenePro.getWebSite());
|
|
|
@@ -259,7 +260,7 @@ public class SceneCopyServiceImpl implements ISceneCopyService {
|
|
|
this.copyOssAndNasV3(oldNum,scenePro.getNum(),sourceVoice,targetVoice);
|
|
|
|
|
|
if(scenePro.getSceneSource() == 4 || scenePro.getSceneSource() == 5){ //深时复制
|
|
|
- laserService.copy(oldNum,newNum,newDataSource,false);
|
|
|
+ laserService.copy(oldNum,newNum,newDataSource,false, null, CommonStatus.NO.code().intValue());
|
|
|
}else {
|
|
|
scenePro.setStatus(-2);
|
|
|
sceneProService.updateById(scenePro);
|