老邓写的代码

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

@@ -26,7 +26,6 @@ import com.fdkankan.model.utils.ComputerUtil;
 import com.fdkankan.model.utils.CreateHouseJsonUtil;
 import com.fdkankan.model.utils.CreateObjUtil;
 import com.fdkankan.common.util.FileMd5Util;
-import com.fdkankan.common.util.FileUtil;
 import com.fdkankan.common.util.FileUtils;
 import com.fdkankan.model.utils.SceneUtil;
 import com.fdkankan.fyun.constant.FYunTypeEnum;
@@ -103,6 +102,7 @@ import java.util.Set;
 import java.util.UUID;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.stream.Collectors;
+import javax.annotation.Resource;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
@@ -137,7 +137,7 @@ public class SceneEditInfoServiceImpl extends ServiceImpl<ISceneEditInfoMapper,
     private ISceneEditControlsService sceneEditControlsService;
     @Autowired
     private ISceneProService sceneProService;
-    @Autowired
+    @Resource
     private FYunFileServiceInterface fYunFileService;
     @Autowired
     RedisUtil redisUtil;
@@ -583,7 +583,7 @@ public class SceneEditInfoServiceImpl extends ServiceImpl<ISceneEditInfoMapper,
         //户型图上传
         String  userEditPath = UploadFilePath.USER_EDIT_PATH + "floor-cad-%s.%s";
         String floorCadPath = path + "/results/floorplan_cad";
-        List<String> floorCadList = FileUtil.getFileList(floorCadPath);
+        List<String> floorCadList = FileUtils.getFileList(floorCadPath);
         if(CollUtil.isNotEmpty(floorCadList)){
             floorCadList.stream().forEach(str->{
                 String substring = str.substring(str.lastIndexOf(File.separator) + 1);
@@ -870,9 +870,9 @@ public class SceneEditInfoServiceImpl extends ServiceImpl<ISceneEditInfoMapper,
         //如果是压缩包上传，需要解压缩
         if(file.getOriginalFilename().endsWith(".zip")){
             //解压zip包
-            FileUtil.unZip(zipTargetFilePath, targetImagesPath);
+            FileUtils.unZip(zipTargetFilePath, targetImagesPath);
             //删除压缩包
-            FileUtil.delFile(zipTargetFilePath);
+            FileUtils.delFile(zipTargetFilePath);
         }
 
         //判断文件夹目录结构，图片必须放在压缩包根目录下，不支持空文件夹或其他格式文件上传
@@ -884,7 +884,7 @@ public class SceneEditInfoServiceImpl extends ServiceImpl<ISceneEditInfoMapper,
         });
 
         //获取解压后的文件列表
-        List<String> uploadFileList = FileUtil.getFileList(targetImagesPath);
+        List<String> uploadFileList = FileUtils.getFileList(targetImagesPath);
         if(CollUtil.isEmpty(uploadFileList)){
             throw new BusinessException(ErrorCode.FAILURE_CODE_5062);
         }
@@ -925,7 +925,7 @@ public class SceneEditInfoServiceImpl extends ServiceImpl<ISceneEditInfoMapper,
         }
 
         //判断成功的图片，如果成功图片为0，就直接返回，不需要执行算法
-        uploadFileList = FileUtil.getFileList(targetImagesPath);
+        uploadFileList = FileUtils.getFileList(targetImagesPath);
         if(CollUtil.isEmpty(uploadFileList)){
             if(CollUtil.isNotEmpty(notExistFileList)){
                 notExistFileList = notExistFileList.stream().map(filePath -> {

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

@@ -8,11 +8,11 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fdkankan.common.constant.ErrorCode;
 import com.fdkankan.common.constant.RecStatus;
 import com.fdkankan.common.constant.ServerCode;
+import com.fdkankan.common.util.FileUtils;
 import com.fdkankan.model.constants.UploadFilePath;
 import com.fdkankan.common.exception.BusinessException;
 import com.fdkankan.common.response.ResultData;
 import com.fdkankan.common.util.BASE64DecodedMultipartFile;
-import com.fdkankan.common.util.FileUtil;
 import com.fdkankan.fyun.face.FYunFileServiceInterface;
 import com.fdkankan.scene.entity.ScenePlus;
 import com.fdkankan.scene.entity.ScenePlusExt;
@@ -55,7 +55,7 @@ public class SceneUploadServiceImpl extends ServiceImpl<ISceneUploadMapper, Scen
     @Value("${fyun.host}")
     private String ossUrlPrefix;
 
-    @Autowired
+    @Resource
     private FYunFileServiceInterface fYunFileService;
     @Autowired
     private SSOLoginHelper ssoLoginHelper;
@@ -153,7 +153,7 @@ public class SceneUploadServiceImpl extends ServiceImpl<ISceneUploadMapper, Scen
             }
             urlList.add(realFileName);
 
-            FileUtil.delFile(newFile.getPath());
+            FileUtils.delFile(newFile.getPath());
             //添加记录
             this.saveData(num,ossPath,bizType,userId);
         }