|
@@ -447,7 +447,7 @@ public class CaseDownService {
|
|
|
|
|
|
JSONObject jsonObject = getSceneInfo(num);
|
|
JSONObject jsonObject = getSceneInfo(num);
|
|
Integer sceneId = jsonObject.getInteger("id");
|
|
Integer sceneId = jsonObject.getInteger("id");
|
|
- laserService.rebuildOffline(offPath,isLaser,sceneId);
|
|
|
|
|
|
+ laserService.rebuildOffline( isLaser ? swssPath : swkkPath,isLaser,sceneId);
|
|
|
|
|
|
while (wita){
|
|
while (wita){
|
|
Long nowTime = new Date().getTime();
|
|
Long nowTime = new Date().getTime();
|
|
@@ -498,7 +498,7 @@ public class CaseDownService {
|
|
* @param buildOfflineStatus //1 生成成功,0:正在生成 1,初次生成 2,下载失败
|
|
* @param buildOfflineStatus //1 生成成功,0:正在生成 1,初次生成 2,下载失败
|
|
*/
|
|
*/
|
|
private Boolean downSceneOffline(String num,Integer sceneId, Boolean isLaser, String offPath, Boolean rebuildOffline, String offlineFolder, Integer buildOfflineStatus) {
|
|
private Boolean downSceneOffline(String num,Integer sceneId, Boolean isLaser, String offPath, Boolean rebuildOffline, String offlineFolder, Integer buildOfflineStatus) {
|
|
- if(buildOfflineStatus == null || buildOfflineStatus == -1 || buildOfflineStatus ==2){
|
|
|
|
|
|
+ if(buildOfflineStatus == null|| buildOfflineStatus == 1 || buildOfflineStatus == -1 || buildOfflineStatus ==2){
|
|
return false;
|
|
return false;
|
|
}
|
|
}
|
|
return true;
|
|
return true;
|