|
@@ -123,19 +123,19 @@ public class LaserService {
|
|
|
|
|
|
|
|
|
|
private void getLaserSceneGps(SceneVo vo) {
|
|
private void getLaserSceneGps(SceneVo vo) {
|
|
- String redisKey = String.format(RedisKeyUtil.numGpsKey, vo.getNum());
|
|
|
|
- String redisKey2 = String.format(RedisKeyUtil.numShootKey, vo.getNum());
|
|
|
|
- if(redisUtil.hasKey(redisKey) && redisUtil.hasKey(redisKey2)){
|
|
|
|
- String gps = redisUtil.get(redisKey);
|
|
|
|
- String shootNum = redisUtil.get(redisKey2);
|
|
|
|
- vo.setGps(gps);
|
|
|
|
- vo.setShootCount(Integer.valueOf(shootNum));
|
|
|
|
- return;
|
|
|
|
- }
|
|
|
|
|
|
+// String redisKey = String.format(RedisKeyUtil.numGpsKey, vo.getNum());
|
|
|
|
+// String redisKey2 = String.format(RedisKeyUtil.numShootKey, vo.getNum());
|
|
|
|
+// if(redisUtil.hasKey(redisKey) && redisUtil.hasKey(redisKey2)){
|
|
|
|
+// String gps = redisUtil.get(redisKey);
|
|
|
|
+// String shootNum = redisUtil.get(redisKey2);
|
|
|
|
+// vo.setGps(gps);
|
|
|
|
+// vo.setShootCount(Integer.valueOf(shootNum));
|
|
|
|
+// return;
|
|
|
|
+// }
|
|
ScenePro pro = sceneProService.getByNum(vo.getNum());
|
|
ScenePro pro = sceneProService.getByNum(vo.getNum());
|
|
if(pro != null){
|
|
if(pro != null){
|
|
- redisUtil.set(redisKey,pro.getGps()== null ?"":pro.getGps());
|
|
|
|
- redisUtil.set(redisKey2,String.valueOf(pro.getShootCount()== null ? 0 :pro.getShootCount()));
|
|
|
|
|
|
+ //redisUtil.set(redisKey,pro.getGps()== null ?"":pro.getGps());
|
|
|
|
+ //redisUtil.set(redisKey2,String.valueOf(pro.getShootCount()== null ? 0 :pro.getShootCount()));
|
|
vo.setGps(pro.getGps());
|
|
vo.setGps(pro.getGps());
|
|
vo.setShootCount(pro.getShootCount());
|
|
vo.setShootCount(pro.getShootCount());
|
|
}
|
|
}
|
|
@@ -143,8 +143,8 @@ public class LaserService {
|
|
if(plus != null){
|
|
if(plus != null){
|
|
ScenePlusExt ext = scenePlusExtService.getByPlusId(plus.getId());
|
|
ScenePlusExt ext = scenePlusExtService.getByPlusId(plus.getId());
|
|
if(ext != null){
|
|
if(ext != null){
|
|
- redisUtil.set(redisKey,ext.getGps()== null?"":ext.getGps());
|
|
|
|
- redisUtil.set(redisKey2,String.valueOf(ext.getShootCount()== null ? 0 :ext.getShootCount()));
|
|
|
|
|
|
+ //redisUtil.set(redisKey,ext.getGps()== null?"":ext.getGps());
|
|
|
|
+ // redisUtil.set(redisKey2,String.valueOf(ext.getShootCount()== null ? 0 :ext.getShootCount()));
|
|
vo.setGps(ext.getGps());
|
|
vo.setGps(ext.getGps());
|
|
vo.setShootCount(ext.getShootCount());
|
|
vo.setShootCount(ext.getShootCount());
|
|
}
|
|
}
|