|
|
@@ -10,6 +10,7 @@ import com.fdkankan.common.constant.CommonOperStatus;
|
|
|
import com.fdkankan.common.constant.ModelingBuildStatus;
|
|
|
import com.fdkankan.common.util.FileUtils;
|
|
|
import com.fdkankan.model.utils.ComputerUtil;
|
|
|
+import com.fdkankan.model.utils.CreateObjUtil;
|
|
|
import com.fdkankan.modeling.bean.BuildSceneResultBean;
|
|
|
import com.fdkankan.modeling.constants.SysConstants;
|
|
|
import com.fdkankan.modeling.entity.BuildLog;
|
|
|
@@ -41,10 +42,7 @@ import java.io.File;
|
|
|
import java.nio.charset.StandardCharsets;
|
|
|
import java.nio.file.Path;
|
|
|
import java.nio.file.WatchEvent;
|
|
|
-import java.util.Date;
|
|
|
-import java.util.HashMap;
|
|
|
-import java.util.Map;
|
|
|
-import java.util.Objects;
|
|
|
+import java.util.*;
|
|
|
import java.util.concurrent.Future;
|
|
|
import java.util.concurrent.TimeUnit;
|
|
|
import java.util.concurrent.TimeoutException;
|
|
|
@@ -263,7 +261,23 @@ public class RabbitMqListener {
|
|
|
log.error("未检测到计算结果文件：upload.json");
|
|
|
return ModelingBuildStatus.FAILED;
|
|
|
}
|
|
|
- log.info("八目上完oss结束修改数据："+num);
|
|
|
+
|
|
|
+ Object linkPanTargetListObj = message.getExt().get("linkPanTargetList");
|
|
|
+ if(Objects.nonNull(linkPanTargetListObj)){
|
|
|
+ List<String> linkPanTargetList = (List<String>) linkPanTargetListObj;
|
|
|
+ for (String target : linkPanTargetList) {
|
|
|
+ CreateObjUtil.build3dModel(target,null);
|
|
|
+
|
|
|
+ // 检测计算结果文件是否有生成
|
|
|
+ String linkPanoResultsPath = target + File.separator + "results" + File.separator;
|
|
|
+ Thread.sleep(2000L);
|
|
|
+ if (!new File(linkPanoResultsPath + "upload.json").exists()) {
|
|
|
+ log.error("未检测到场景关联计算结果文件：upload.json, linkPanoResultsPath:{}", linkPanoResultsPath);
|
|
|
+ return ModelingBuildStatus.FAILED;
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
return ModelingBuildStatus.SUCCESS;
|
|
|
}
|
|
|
|
dengsixing