v4.14.0 去除人像

src/main/java/com/fdkankan/scene/service/ISceneEditInfoService.java

@@ -114,6 +114,6 @@ public interface ISceneEditInfoService extends IService<SceneEditInfo> {
 
     ResultData listFilter(BaseSceneParamVO param) throws Exception;
 
-    void uploadPanoramaHandler(String num, String bucket, String target, String imgViewPath, List<String> uploadFileList, String targetImagesPath) throws Exception;
+    void uploadPanoramaHandler(String num, String bucket, String target, String imgViewPath, List<String> uploadFileList, String targetImagesPath, String bizType) throws Exception;
 
 }

src/main/java/com/fdkankan/scene/service/impl/RemovePortraitServiceImpl.java

@@ -109,15 +109,7 @@ public class RemovePortraitServiceImpl implements IRemovePortraitService {
             dataJson.put("skybox_type", skyboxType);
             FileUtil.writeUtf8String(dataJson.toJSONString(), target + File.separator+"data.json");
 
-            sceneEditInfoService.uploadPanoramaHandler(num,bucket,target,imgViewPath,new ArrayList<>(),targetImagesPath);
-            //上传16k图
-            String cacheImagePath = target + "/caches/images/";
-            String ossCachesImagesPath = String.format(UploadFilePath.scene_result_data_path, num) + "caches/images/";
-            List<String> cacheImageList = FileUtil.listFileNames(cacheImagePath);
-            cacheImageList.stream().forEach(fileName->{
-                fYunFileService.uploadFile(cacheImagePath + fileName, ossCachesImagesPath + fileName);
-            });
-
+            sceneEditInfoService.uploadPanoramaHandler(num,bucket,target,imgViewPath,new ArrayList<>(),targetImagesPath, "removePortrait");
             scenePlus.setRemovePortrait(CommonOperStatus.SUCCESS.code());
         }catch (Exception e){
             log.error("抹除人像失败,num:{}", num, e);

src/main/java/com/fdkankan/scene/service/impl/SceneEditInfoServiceImpl.java

@@ -1257,7 +1257,7 @@ public class SceneEditInfoServiceImpl extends ServiceImpl<ISceneEditInfoMapper,
                 }
                 sceneAsynOperLogService.save(sceneAsynOperLog);
                 try {
-                    this.uploadPanoramaHandler(num,bucket,target,imgViewPath, finalUploadFileList,targetImagesPath);
+                    this.uploadPanoramaHandler(num,bucket,target,imgViewPath, finalUploadFileList,targetImagesPath, null);
                     sceneAsynOperLog.setState(CommonOperStatus.SUCCESS.code());
                 } catch (Exception e) {
                     log.error("上传全景图报错,num:" + num, e);
@@ -1266,7 +1266,7 @@ public class SceneEditInfoServiceImpl extends ServiceImpl<ISceneEditInfoMapper,
                 sceneAsynOperLogService.updateById(sceneAsynOperLog);
             });
         }else{
-            this.uploadPanoramaHandler(num,bucket,target,imgViewPath,uploadFileList,targetImagesPath);
+            this.uploadPanoramaHandler(num,bucket,target,imgViewPath,uploadFileList,targetImagesPath, null);
             if(CollUtil.isNotEmpty(notExistFileList)){
                 uploadPanoramaVO.setSuccessCnt(uploadFileList.size());
                 uploadPanoramaVO.setFailList(notExistFileList);
@@ -1276,7 +1276,7 @@ public class SceneEditInfoServiceImpl extends ServiceImpl<ISceneEditInfoMapper,
     }
 
     @Override
-    public void uploadPanoramaHandler(String num, String bucket, String target, String imgViewPath, List<String> uploadFileList, String targetImagesPath) throws Exception {
+    public void uploadPanoramaHandler(String num, String bucket, String target, String imgViewPath, List<String> uploadFileList, String targetImagesPath, String bizType) throws Exception {
         CreateObjUtil.build3dModel(target , "1");
 
         String uploadJsonPath= target + File.separator + "results" +File.separator+"upload.json";
@@ -1341,6 +1341,14 @@ public class SceneEditInfoServiceImpl extends ServiceImpl<ISceneEditInfoMapper,
         uploadFileList.stream().forEach(srcPath->{
             map.put(srcPath, srcPath.replace(targetImagesPath, ossCachesImagesPath));
         });
+        if(StrUtil.isNotEmpty(bizType) && bizType.equals("removePortrait")){
+            //上传16k图
+            String cacheImagePath = target + "/caches/images/";
+            List<String> cacheImageList = FileUtil.listFileNames(cacheImagePath);
+            cacheImageList.stream().forEach(v->{
+                fYunFileService.uploadFile(cacheImagePath + v, ossCachesImagesPath + v);
+            });
+        }
 
         if(map.size()>0) {
             fYunFileService.uploadMulFiles(bucket, map);
@@ -1352,6 +1360,8 @@ public class SceneEditInfoServiceImpl extends ServiceImpl<ISceneEditInfoMapper,
         this.upgradeVersionAndImgVersionById(sceneEditInfo.getId());
         //更新scenejson缓存和oss文件版本号
         this.upgradeSceneJsonVersion(num, sceneEditInfo.getVersion() + 1, sceneEditInfo.getImgVersion() + 1, bucket);
+
+        FileUtil.del(target);
     }