|
@@ -11,6 +11,7 @@ import com.fdkankan.common.constant.UploadFilePath;
|
|
import com.fdkankan.common.exception.BusinessException;
|
|
import com.fdkankan.common.exception.BusinessException;
|
|
import com.fdkankan.common.response.PageInfo;
|
|
import com.fdkankan.common.response.PageInfo;
|
|
import com.fdkankan.common.util.*;
|
|
import com.fdkankan.common.util.*;
|
|
|
|
+import com.fdkankan.manage.httpClient.client.FdKKClient;
|
|
import com.fdkankan.manage.httpClient.service.LaserService;
|
|
import com.fdkankan.manage.httpClient.service.LaserService;
|
|
import com.fdkankan.manage.util.CreateObjUtilSelf;
|
|
import com.fdkankan.manage.util.CreateObjUtilSelf;
|
|
import com.fdkankan.manage.util.MangerUploadToOssUtil;
|
|
import com.fdkankan.manage.util.MangerUploadToOssUtil;
|
|
@@ -28,6 +29,7 @@ import org.springframework.beans.factory.annotation.Value;
|
|
import org.springframework.stereotype.Service;
|
|
import org.springframework.stereotype.Service;
|
|
import org.springframework.util.ObjectUtils;
|
|
import org.springframework.util.ObjectUtils;
|
|
|
|
|
|
|
|
+import javax.annotation.Resource;
|
|
import java.io.File;
|
|
import java.io.File;
|
|
import java.util.*;
|
|
import java.util.*;
|
|
import java.util.concurrent.CompletableFuture;
|
|
import java.util.concurrent.CompletableFuture;
|
|
@@ -69,6 +71,8 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
|
|
IScenePlusExtService scenePlusExtService;
|
|
IScenePlusExtService scenePlusExtService;
|
|
@Autowired
|
|
@Autowired
|
|
LaserService laserService;
|
|
LaserService laserService;
|
|
|
|
+ @Resource
|
|
|
|
+ FdKKClient fdKKClient;
|
|
|
|
|
|
|
|
|
|
@Value("${main.url}")
|
|
@Value("${main.url}")
|
|
@@ -318,15 +322,17 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
|
|
if(detailEntity == null){
|
|
if(detailEntity == null){
|
|
throw new BusinessException(CameraConstant.FAILURE_CODE_6029, CameraConstant.FAILURE_MSG_6029);
|
|
throw new BusinessException(CameraConstant.FAILURE_CODE_6029, CameraConstant.FAILURE_MSG_6029);
|
|
}
|
|
}
|
|
- String newNum = scene3dNumService.generateSceneNum(detailEntity.getType());
|
|
|
|
|
|
|
|
|
|
+ HashMap<String, Object> param = new HashMap<>();
|
|
|
|
+ param.put("num",sceneNum);
|
|
|
|
+ fdKKClient.copyScene(param,"m_a_n_a_g_e");
|
|
|
|
|
|
- if(scenePro !=null){ //v3场景复制
|
|
|
|
- this.copyV3Scene(scenePro,newNum,detailEntity,camera.getSnCode());
|
|
|
|
- }
|
|
|
|
- if(scenePlus != null){ //v4场景复制
|
|
|
|
- scenePlusService.copyV4Scene(scenePlus,newNum,detailEntity,camera.getSnCode());
|
|
|
|
- }
|
|
|
|
|
|
+// if(scenePro !=null){ //v3场景复制
|
|
|
|
+// this.copyV3Scene(scenePro,newNum,detailEntity,camera.getSnCode());
|
|
|
|
+// }
|
|
|
|
+// if(scenePlus != null){ //v4场景复制
|
|
|
|
+// scenePlusService.copyV4Scene(scenePlus,newNum,detailEntity,camera.getSnCode());
|
|
|
|
+// }
|
|
}
|
|
}
|
|
|
|
|
|
@Override
|
|
@Override
|