1

src/main/java/com/fdkankan/manage/service/impl/SceneProServiceImpl.java

@@ -959,6 +959,9 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
         if (sceneStatus == 0){
             //去目录检查project.json
             File projectJson = FileUtil.file(dataSource + File.separator + "project.json");
+            if(isObj(num)){
+                projectJson = FileUtil.file(dataSource+"_laser_obj" + File.separator + "project.json");
+            }
             if (FileUtil.exist(projectJson)) {
                 FileReader reader = new FileReader(projectJson);
                 String data = reader.readString();
@@ -980,6 +983,7 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
             }
         }else if (sceneStatus == -2){
             buildSceneVO.setProgress(100);
+            delRedisKey(num);
         }else if (sceneStatus == -1){
             buildSceneVO.setProgress(0);
         }
@@ -987,4 +991,14 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
         buildSceneVO.setNum(num);
         return buildSceneVO;
     }
+
+
+    static  String redisKey = "ucenter:generatePlusObjFile:%s";
+    private void delRedisKey(String num) {
+         redisUtil.del(String.format(redisKey,num));
+    }
+
+    private boolean isObj(String num) {
+        return redisUtil.hasKey(String.format(redisKey,num));
+    }
 }