|
|
@@ -122,32 +122,32 @@ public class CaseFusionServiceImpl extends ServiceImpl<ICaseFusionMapper, CaseFu
|
|
|
BeanUtils.copyProperties(model,sceneVo);
|
|
|
if(model.getNum() != null ){
|
|
|
Scene scene = map.get(model.getNum());
|
|
|
- if(scene != null){
|
|
|
- BeanUtils.copyProperties(scene,sceneVo);
|
|
|
- if( model.getIsObj() == 1){
|
|
|
- if( scene.getBuildObjStatus() != null){
|
|
|
- switch (scene.getBuildObjStatus()){
|
|
|
- case -1: sceneVo.setStatus(1); break;
|
|
|
- case 0: sceneVo.setStatus(3); break;
|
|
|
- case 1: sceneVo.setStatus(2); break;
|
|
|
- case 2: sceneVo.setStatus(0); break;
|
|
|
- case 3: sceneVo.setStatus(6); break;
|
|
|
- case 4: sceneVo.setStatus(5); break;
|
|
|
- default: sceneVo.setStatus(scene.getStatus() );
|
|
|
- }
|
|
|
+ if(scene == null){
|
|
|
+ continue;
|
|
|
+ }
|
|
|
+ BeanUtils.copyProperties(scene,sceneVo);
|
|
|
+ if( model.getIsObj() == 1){
|
|
|
+ if( scene.getBuildObjStatus() != null){
|
|
|
+ switch (scene.getBuildObjStatus()){
|
|
|
+ case -1: sceneVo.setStatus(1); break;
|
|
|
+ case 0: sceneVo.setStatus(3); break;
|
|
|
+ case 1: sceneVo.setStatus(2); break;
|
|
|
+ case 2: sceneVo.setStatus(0); break;
|
|
|
+ case 3: sceneVo.setStatus(6); break;
|
|
|
+ case 4: sceneVo.setStatus(5); break;
|
|
|
+ default: sceneVo.setStatus(scene.getStatus() );
|
|
|
}
|
|
|
- }else {
|
|
|
- sceneVo.setStatus(scene.getStatus() );
|
|
|
- }
|
|
|
- sceneVo.setName(scene.getTitle());
|
|
|
- sceneVo.setSceneName(scene.getTitle());
|
|
|
- sceneVo.setCreateTime(scene.getShootStartTime());
|
|
|
- SceneLocation sceneLocation = locationMap.get(scene.getSceneCode());
|
|
|
- if(sceneLocation != null){
|
|
|
- sceneVo.setRtkLocation(sceneLocation.getRtkLocation());
|
|
|
- sceneVo.setOrientation(sceneLocation.getOrientation());
|
|
|
}
|
|
|
-
|
|
|
+ }else {
|
|
|
+ sceneVo.setStatus(scene.getStatus() );
|
|
|
+ }
|
|
|
+ sceneVo.setName(scene.getTitle());
|
|
|
+ sceneVo.setSceneName(scene.getTitle());
|
|
|
+ sceneVo.setCreateTime(scene.getShootStartTime());
|
|
|
+ SceneLocation sceneLocation = locationMap.get(scene.getSceneCode());
|
|
|
+ if(sceneLocation != null){
|
|
|
+ sceneVo.setRtkLocation(sceneLocation.getRtkLocation());
|
|
|
+ sceneVo.setOrientation(sceneLocation.getOrientation());
|
|
|
}
|
|
|
}else {
|
|
|
sceneVo.setStatus(2);
|
lyhzzz