Commit 36b0e040e31493d3e0d7cd428d808187d2db1f0c

Authored by guzijian
1 parent 68ba9862

feat: 车载设备实时获取

src/main/java/com/genersoft/iot/vmp/vehicle/service/impl/VehicleDeviceServiceImpl.java
@@ -16,6 +16,7 @@ import java.util.ArrayList; @@ -16,6 +16,7 @@ import java.util.ArrayList;
16 import java.util.Date; 16 import java.util.Date;
17 import java.util.List; 17 import java.util.List;
18 import java.util.Set; 18 import java.util.Set;
  19 +import java.util.concurrent.TimeUnit;
19 import java.util.stream.Collectors; 20 import java.util.stream.Collectors;
20 21
21 @Service 22 @Service
@@ -27,11 +28,11 @@ public class VehicleDeviceServiceImpl implements VehicleDeviceService { @@ -27,11 +28,11 @@ public class VehicleDeviceServiceImpl implements VehicleDeviceService {
27 @Override 28 @Override
28 public VehicleVo queryVehicleList(Integer pageNo, Integer pageSize) { 29 public VehicleVo queryVehicleList(Integer pageNo, Integer pageSize) {
29 String key = "vehicle"; 30 String key = "vehicle";
30 - VehicleNvrDeviceRes nvrDeviceRes = redisTool.getCacheObject(key);  
31 - if (nvrDeviceRes == null) {  
32 - nvrDeviceRes = getVehicleNvrDeviceRes();  
33 - redisTool.setCacheObject(key, nvrDeviceRes);  
34 - } 31 + VehicleNvrDeviceRes nvrDeviceRes = getVehicleNvrDeviceRes();
  32 +// if (nvrDeviceRes == null) {
  33 +//
  34 +// redisTool.setCacheObject(key, nvrDeviceRes,30, TimeUnit.MINUTES);
  35 +// }
35 List<VehicleNvrDeviceRes.ResData> list = nvrDeviceRes.getData(); 36 List<VehicleNvrDeviceRes.ResData> list = nvrDeviceRes.getData();
36 int total = list.size(); 37 int total = list.size();
37 int remainder = total % pageSize; 38 int remainder = total % pageSize;
@@ -49,7 +50,7 @@ public class VehicleDeviceServiceImpl implements VehicleDeviceService { @@ -49,7 +50,7 @@ public class VehicleDeviceServiceImpl implements VehicleDeviceService {
49 } 50 }
50 if (data.getInsideCode().contains("老")) { 51 if (data.getInsideCode().contains("老")) {
51 data.setOldDevice(true); 52 data.setOldDevice(true);
52 - }else { 53 + } else {
53 data.setOldDevice(false); 54 data.setOldDevice(false);
54 } 55 }
55 } 56 }
@@ -72,7 +73,7 @@ public class VehicleDeviceServiceImpl implements VehicleDeviceService { @@ -72,7 +73,7 @@ public class VehicleDeviceServiceImpl implements VehicleDeviceService {
72 JSONObject jsonObject = JSONObject.parseObject(str); 73 JSONObject jsonObject = JSONObject.parseObject(str);
73 JSONObject data = jsonObject.getJSONObject("data"); 74 JSONObject data = jsonObject.getJSONObject("data");
74 String rtmp = data.getString("rtmp"); 75 String rtmp = data.getString("rtmp");
75 - return rtmp.replace("rtmp://27.115.69.123:1935","http://27.115.69.123:1986") + ".flv"; 76 + return rtmp.replace("rtmp://27.115.69.123:1935", "http://27.115.69.123:1986") + ".flv";
76 } 77 }
77 78
78 79