|
@@ -963,7 +963,7 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
|
|
|
FileReader reader = new FileReader(projectJson);
|
|
FileReader reader = new FileReader(projectJson);
|
|
|
String data = reader.readString();
|
|
String data = reader.readString();
|
|
|
JSONObject data_project = JSONObject.parseObject(data);
|
|
JSONObject data_project = JSONObject.parseObject(data);
|
|
|
- if (data_project.containsKey("progress")) {
|
|
|
|
|
|
|
+ if (data_project.containsKey("state")) {
|
|
|
JSONObject state = data_project.getJSONObject("state");
|
|
JSONObject state = data_project.getJSONObject("state");
|
|
|
Double progress = state.getDouble("progress");
|
|
Double progress = state.getDouble("progress");
|
|
|
if (ObjectUtil.isNotNull(progress)) {
|
|
if (ObjectUtil.isNotNull(progress)) {
|
|
@@ -983,7 +983,7 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
|
|
|
}else if (sceneStatus == -1){
|
|
}else if (sceneStatus == -1){
|
|
|
buildSceneVO.setProgress(0);
|
|
buildSceneVO.setProgress(0);
|
|
|
}
|
|
}
|
|
|
- buildSceneVO.setProgress(sceneStatus);
|
|
|
|
|
|
|
+ buildSceneVO.setStatus(sceneStatus);
|
|
|
buildSceneVO.setNum(num);
|
|
buildSceneVO.setNum(num);
|
|
|
return buildSceneVO;
|
|
return buildSceneVO;
|
|
|
}
|
|
}
|