Commit 914f0551e69ce08a33999d1b44471ac04d48ced0
1 parent
e78d94e4
update...
Showing
1 changed file
with
1 additions
and
7 deletions
src/main/java/com/bsth/service/gps/GpsServiceImpl.java
| @@ -231,16 +231,10 @@ public class GpsServiceImpl implements GpsService { | @@ -231,16 +231,10 @@ public class GpsServiceImpl implements GpsService { | ||
| 231 | Map<String, Object> map = null; | 231 | Map<String, Object> map = null; |
| 232 | for(Map<String, Object> rs : dataList){ | 232 | for(Map<String, Object> rs : dataList){ |
| 233 | serviceState = map_get_long(rs, "SERVICE_STATE"); | 233 | serviceState = map_get_long(rs, "SERVICE_STATE"); |
| 234 | - | ||
| 235 | - if(getGpsValid(serviceState) == 1) | ||
| 236 | - continue; | ||
| 237 | - | ||
| 238 | - map = new HashMap<>(); | ||
| 239 | if(getGpsValid(serviceState) == 1) | 234 | if(getGpsValid(serviceState) == 1) |
| 240 | continue; | 235 | continue; |
| 241 | 236 | ||
| 242 | map = new HashMap<>(); | 237 | map = new HashMap<>(); |
| 243 | - | ||
| 244 | lon = map_get_float(rs, "LON"); | 238 | lon = map_get_float(rs, "LON"); |
| 245 | lat = map_get_float(rs, "LAT"); | 239 | lat = map_get_float(rs, "LAT"); |
| 246 | // 高德坐标 | 240 | // 高德坐标 |
| @@ -273,7 +267,7 @@ public class GpsServiceImpl implements GpsService { | @@ -273,7 +267,7 @@ public class GpsServiceImpl implements GpsService { | ||
| 273 | map.put("inout_stop", arrival.getInOut()); | 267 | map.put("inout_stop", arrival.getInOut()); |
| 274 | } | 268 | } |
| 275 | 269 | ||
| 276 | - map.put("nbbm", BasicData.deviceId2NbbmMap.get(map_get_str(rs,"DEVICE_ID"))); | 270 | + //map.put("nbbm", nbbm); |
| 277 | map.put("state", getService(serviceState)); | 271 | map.put("state", getService(serviceState)); |
| 278 | // 上下行 | 272 | // 上下行 |
| 279 | map.put("upDown", getUpOrDown(serviceState)); | 273 | map.put("upDown", getUpOrDown(serviceState)); |