222

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

@@ -82,6 +82,14 @@ public class SceneUpgradeToV4Service implements ISceneUpgradeToV4Service {
     private String sceneProNewUrl;
     @Value("${fyun.host}")
     private String ossUrlPrefix;
+    @Autowired
+    private RedisUtil redisUtil;
+    @Value("${fyun.bucket:4dkankan}")
+    private String bucket;
+    @Value("${upgrade.caches-images:yes}")
+    private String copyCachesImages;
+    @Value("${upgrade.houseType:yes}")
+    private String createHouseType;
 
     @Autowired
     private RedisLockUtil redisLockUtil;
@@ -95,18 +103,12 @@ public class SceneUpgradeToV4Service implements ISceneUpgradeToV4Service {
     private ISceneEditControlsService sceneEditControlsService;
     @Autowired
     private ISceneRepairLogService sceneRepairLogService;
-    @Value("${fyun.bucket:4dkankan}")
-    private String bucket;
     @Autowired
     private ISceneProService sceneProService;
     @Autowired
     private IScenePlusExtService scenePlusExtService;
     @Resource
     private FYunFileServiceInterface fYunFileService;
-    @Autowired
-    private RedisUtil redisUtil;
-    @Value("${upgrade.caches-images:yes}")
-    private String copyCachesImages;
 
     @Override
     public void upgrade(long sceneProId, boolean reUpgrade)  throws Exception{
@@ -414,11 +416,18 @@ public class SceneUpgradeToV4Service implements ISceneUpgradeToV4Service {
             }
 
             //生成houseType并上传
-            JSONObject houseTypeJsonByCad =
-                CreateHouseJsonUtil.createHouseTypeJsonByCad(scenePlusExt.getDataSource() + "/results/floorplan_cad.json");
-            if(Objects.nonNull(houseTypeJsonByCad)){
-                fYunFileService.uploadFile(houseTypeJsonByCad.toJSONString().getBytes(StandardCharsets.UTF_8), userEditPath);
-                fYunFileService.uploadFile(houseTypeJsonByCad.toJSONString().getBytes(StandardCharsets.UTF_8), userViewPath);
+            try {
+                JSONObject houseTypeJsonByCad =
+                    CreateHouseJsonUtil.createHouseTypeJsonByCad(scenePlusExt.getDataSource() + "/results/floorplan_cad.json");
+                if(Objects.nonNull(houseTypeJsonByCad)){
+                    fYunFileService.uploadFile(houseTypeJsonByCad.toJSONString().getBytes(StandardCharsets.UTF_8), userEditPath);
+                    fYunFileService.uploadFile(houseTypeJsonByCad.toJSONString().getBytes(StandardCharsets.UTF_8), userViewPath);
+                }
+            }catch (Exception e){
+                log.error("生成houseType.json失败，num="+num, e);
+                if("yes".equals(createHouseType)){
+                    throw e;
+                }
             }
 
             //生成scene.json