场景迁移写hot.json 更换为v4目录

src/main/java/com/fdkankan/repair/controller/SceneRepairController.java

@@ -5,33 +5,20 @@ import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.fdkankan.common.constant.ConstantFilePath;
-import com.fdkankan.common.constant.UploadFilePath;
 import com.fdkankan.common.response.ResultData;
-import com.fdkankan.common.util.FileUtil;
 import com.fdkankan.common.util.FileUtils;
 import com.fdkankan.fyun.oss.UploadToOssUtil;
 import com.fdkankan.rabbitmq.util.RabbitMqProducer;
 import com.fdkankan.redis.constant.RedisKey;
 import com.fdkankan.redis.util.RedisUtil;
-import com.fdkankan.repair.bean.RequestSceneProV4;
 import com.fdkankan.repair.bean.SceneRepairParamVO;
 import com.fdkankan.repair.bean.SceneUpgradeProgressBean;
-import com.fdkankan.repair.constant.ProgressStatus;
 import com.fdkankan.repair.entity.ScenePro;
 import com.fdkankan.repair.httpclient.FdkankanMiniClient;
 import com.fdkankan.repair.service.ISceneProService;
 import com.fdkankan.repair.service.ISceneResourceService;
 import com.fdkankan.repair.service.impl.SceneRepairService;
-import java.io.File;
-import java.io.IOException;
-import java.math.BigDecimal;
-import java.math.RoundingMode;
-import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.concurrent.atomic.AtomicInteger;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
@@ -58,6 +45,8 @@ public class SceneRepairController {
     private String upgradeToV4;
     @Value("${oss.prefix.url}")
     private String ossUrlPrefix;
+    @Value("${oss.bucket:4dkankan}")
+    private String bucket;
 
     @Autowired
     ISceneProService sceneProService;
@@ -100,10 +89,10 @@ public class SceneRepairController {
             "KK-t-KTUZz7QdX6 "
         };
         for (String num : arr) {
-            String ossPath = String.format(ConstantFilePath.DATA_PATH_FORMAT, num);
-            String localPath = String.format(ConstantFilePath.DATABUFFER_FORMAT, num);
-            String url = ossUrlPrefix + ossPath + "hot.json" + "?t=" + System.currentTimeMillis();
-            FileUtils.downLoadFromUrl(url, "hot.json", localPath);
+            String localPath = String.format(ConstantFilePath.DATABUFFER_FORMAT, num) + "hot.json";
+            String ossPath = String.format(ConstantFilePath.DATA_PATH_FORMAT, num) + "hot.json";
+            String objectContent = uploadToOssUtil.getObjectContent(bucket, ossPath);
+            FileUtils.writeFile(localPath, objectContent);
         }
         //17264
         return ResultData.ok();