国际版本指定算法改造

src/main/java/com/fdkankan/repair/DataRepairApplication.java

@@ -10,6 +10,7 @@ import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.ComponentScans;
 import org.springframework.scheduling.annotation.EnableAsync;
+import org.springframework.transaction.annotation.EnableTransactionManagement;
 
 @SpringBootApplication
 @ComponentScan(basePackages = {"com.fdkankan"})

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

@@ -42,6 +42,7 @@ import java.util.Objects;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -293,14 +294,18 @@ public class SceneRepairController {
             //修复scene.json
             String sceneJsonPath = String.format(UploadFilePath.DATA_VIEW_PATH, scenePlus.getNum()) + "scene.json";
             String sceneJsonStr = uploadToOssUtil.getObjectContent(this.bucket, sceneJsonPath);
-            JSONObject sceneJsonObject = JSON.parseObject(sceneJsonStr);
-            sceneJsonObject.put("sceneResolution", scenePlusExt.getSceneResolution());
-            sceneJsonObject.put("sceneKind", scenePlusExt.getSceneKind());
-            sceneJsonObject.put("version", sceneEditInfo.getVersion());
-            uploadToOssUtil.upload(sceneJsonObject.toJSONString().getBytes(StandardCharsets.UTF_8), sceneJsonPath);
+            if(StrUtil.isNotEmpty(sceneJsonStr)){
+                JSONObject sceneJsonObject = JSON.parseObject(sceneJsonStr);
+                sceneJsonObject.put("sceneResolution", scenePlusExt.getSceneResolution());
+                sceneJsonObject.put("sceneKind", scenePlusExt.getSceneKind());
+                sceneJsonObject.put("version", sceneEditInfo.getVersion());
+                uploadToOssUtil.upload(sceneJsonObject.toJSONString().getBytes(StandardCharsets.UTF_8), sceneJsonPath);
+            }else{
+                log.error("没有找到scene.json，路径=" + sceneJsonPath);
+            }
 
             //清除scene.json缓存
-            redisUtil.del(String.format(RedisKey.SCENE_JSON, num));
+            redisUtil.del(String.format(RedisKey.SCENE_JSON, scenePlus.getNum()));
 
         }