|
@@ -1056,9 +1056,7 @@ public class GeoHazardMonitorTokenController {
|
|
base.eq(BaseCameraManagement::getRailwayCode, heartbeatVo.getRailwayCode());
|
|
base.eq(BaseCameraManagement::getRailwayCode, heartbeatVo.getRailwayCode());
|
|
base.eq(BaseCameraManagement::getOnline, 2);
|
|
base.eq(BaseCameraManagement::getOnline, 2);
|
|
base.eq(BaseCameraManagement::getEnableOrNot, 1);
|
|
base.eq(BaseCameraManagement::getEnableOrNot, 1);
|
|
- if (respHeartbeatVo.getCameraList().get(0).getCurrentStream().equals("")) {
|
|
|
|
- base.last("limit 2");
|
|
|
|
- }
|
|
|
|
|
|
+ base.last("limit 2");
|
|
List<BaseCameraManagement> list1 = baseCameraManagementService.list(base);
|
|
List<BaseCameraManagement> list1 = baseCameraManagementService.list(base);
|
|
//根据相机ID找出分组并排序
|
|
//根据相机ID找出分组并排序
|
|
if (!ObjectUtils.isEmpty(list1)) {
|
|
if (!ObjectUtils.isEmpty(list1)) {
|
|
@@ -1373,9 +1371,7 @@ public class GeoHazardMonitorTokenController {
|
|
base.eq(BaseCameraManagement::getRailwayCode, heartbeatVo.getRailwayCode());
|
|
base.eq(BaseCameraManagement::getRailwayCode, heartbeatVo.getRailwayCode());
|
|
base.eq(BaseCameraManagement::getOnline, 2);
|
|
base.eq(BaseCameraManagement::getOnline, 2);
|
|
base.eq(BaseCameraManagement::getEnableOrNot, 1);
|
|
base.eq(BaseCameraManagement::getEnableOrNot, 1);
|
|
- if (respHeartbeatVo.getCameraList().get(0).getCurrentStream().equals("")) {
|
|
|
|
- base.last("limit 2");
|
|
|
|
- }
|
|
|
|
|
|
+ base.last("limit 2");
|
|
List<BaseCameraManagement> list = baseCameraManagementService.list(base);
|
|
List<BaseCameraManagement> list = baseCameraManagementService.list(base);
|
|
//根据相机ID找出分组并排序
|
|
//根据相机ID找出分组并排序
|
|
if (!ObjectUtils.isEmpty(list)) {
|
|
if (!ObjectUtils.isEmpty(list)) {
|