|
@@ -138,16 +138,18 @@ public class LaserService {
|
|
}
|
|
}
|
|
ScenePro pro = sceneProService.getByNum(num);
|
|
ScenePro pro = sceneProService.getByNum(num);
|
|
if(pro != null){
|
|
if(pro != null){
|
|
- redisUtil.set(redisKey,pro.getGps());
|
|
|
|
|
|
+ redisUtil.set(redisKey,pro.getGps()== null ?"":pro.getGps());
|
|
redisUtil.set(redisKey2,String.valueOf(pro.getShootCount()== null ? 0 :pro.getShootCount()));
|
|
redisUtil.set(redisKey2,String.valueOf(pro.getShootCount()== null ? 0 :pro.getShootCount()));
|
|
return pro.getGps();
|
|
return pro.getGps();
|
|
}
|
|
}
|
|
ScenePlus plus = scenePlusService.getByNum(num);
|
|
ScenePlus plus = scenePlusService.getByNum(num);
|
|
if(plus != null){
|
|
if(plus != null){
|
|
ScenePlusExt ext = scenePlusExtService.getByPlusId(plus.getId());
|
|
ScenePlusExt ext = scenePlusExtService.getByPlusId(plus.getId());
|
|
- redisUtil.set(redisKey,ext.getGps());
|
|
|
|
- redisUtil.set(redisKey2,String.valueOf(ext.getShootCount()== null ? 0 :ext.getShootCount()));
|
|
|
|
- return ext.getGps();
|
|
|
|
|
|
+ if(ext != null){
|
|
|
|
+ redisUtil.set(redisKey,ext.getGps()== null?"":ext.getGps());
|
|
|
|
+ redisUtil.set(redisKey2,String.valueOf(ext.getShootCount()== null ? 0 :ext.getShootCount()));
|
|
|
|
+ return ext.getGps();
|
|
|
|
+ }
|
|
}
|
|
}
|
|
return null;
|
|
return null;
|
|
}
|
|
}
|