|
|
@@ -583,10 +583,16 @@ public class GeoHazardMonitorTokenController {
|
|
|
//目视距离和里程位置
|
|
|
if (save && update) {
|
|
|
LambdaQueryWrapper<MsgAlarm> queryWrapper = new LambdaQueryWrapper<>();
|
|
|
- queryWrapper.ge(MsgAlarm::getAlarmMile, heartbeatVo.getCurrentMile());
|
|
|
- queryWrapper.le(MsgAlarm::getAlarmMile, (heartbeatVo.getCurrentMile() + 10000));
|
|
|
+ if (heartbeatVo.getLineDir() == 1) {
|
|
|
+ queryWrapper.ge(MsgAlarm::getAlarmMile, heartbeatVo.getCurrentMile());
|
|
|
+ queryWrapper.le(MsgAlarm::getAlarmMile, (heartbeatVo.getCurrentMile() + 10000));
|
|
|
+ queryWrapper.orderByAsc(MsgAlarm::getAlarmMile);
|
|
|
+ } else if (heartbeatVo.getLineDir() == 2) {
|
|
|
+ queryWrapper.le(MsgAlarm::getAlarmMile, heartbeatVo.getCurrentMile());
|
|
|
+ queryWrapper.ge(MsgAlarm::getAlarmMile, (heartbeatVo.getCurrentMile() - 10000));
|
|
|
+ queryWrapper.orderByDesc(MsgAlarm::getAlarmMile);
|
|
|
+ }
|
|
|
queryWrapper.eq(MsgAlarm::getRailwayCode, heartbeatVo.getRailwayCode());
|
|
|
- queryWrapper.orderByAsc(MsgAlarm::getAlarmMile);
|
|
|
queryWrapper.eq(MsgAlarm::getIsRelease, 2);
|
|
|
List<MsgAlarm> alarmsList = msgAlarmService.list(queryWrapper);
|
|
|
//根据终端编码 判断终端忽略报警信息记录表中的是否有忽略的报警
|
|
|
@@ -634,16 +640,17 @@ public class GeoHazardMonitorTokenController {
|
|
|
camera.ge(BaseCameraManagement::getEndMile, list.get(0).getAlarmMile());
|
|
|
camera.le(BaseCameraManagement::getBeginMile, list.get(0).getAlarmMile());
|
|
|
camera.in(BaseCameraManagement::getMonitoringDirection, 1, 3);
|
|
|
+ camera.orderByAsc(BaseCameraManagement::getInstallMile);
|
|
|
}
|
|
|
if (heartbeatVo.getLineDir() == 2) {
|
|
|
camera.le(BaseCameraManagement::getEndMile, list.get(0).getAlarmMile());
|
|
|
camera.ge(BaseCameraManagement::getBeginMile, list.get(0).getAlarmMile());
|
|
|
camera.in(BaseCameraManagement::getMonitoringDirection, 2, 3);
|
|
|
+ camera.orderByDesc(BaseCameraManagement::getInstallMile);
|
|
|
}
|
|
|
camera.eq(BaseCameraManagement::getRailwayCode, heartbeatVo.getRailwayCode());
|
|
|
camera.eq(BaseCameraManagement::getOnline, 2);
|
|
|
camera.eq(BaseCameraManagement::getEnableOrNot, 1);
|
|
|
- camera.orderByAsc(BaseCameraManagement::getInstallMile);
|
|
|
List<BaseCameraManagement> baseCameraManagementList = baseCameraManagementService.list(camera);
|
|
|
List<AlarmListVo> listVos = new ArrayList<>();
|
|
|
if (baseCameraManagementList.size() > 0) {
|
|
|
@@ -652,7 +659,7 @@ public class GeoHazardMonitorTokenController {
|
|
|
if (!codeList.contains(baseCameraManagementList.get(0).getCameraCode())) {
|
|
|
//如果不包含此相机编码
|
|
|
for (TerminalHeartbeatLog terminalHeartbeatLog : heartbeatLogList) {
|
|
|
- cameraUtil.stopStream(terminalHeartbeatLog.getCameraCode(),terminalHeartbeatLog.getChannel());
|
|
|
+ cameraUtil.stopStream(terminalHeartbeatLog.getCameraCode(), terminalHeartbeatLog.getChannel());
|
|
|
}
|
|
|
}
|
|
|
//添加心跳相机日志信息
|
|
|
@@ -704,12 +711,13 @@ public class GeoHazardMonitorTokenController {
|
|
|
ment.ge(BaseCameraManagement::getEndMile, list.get(i).getAlarmMile());
|
|
|
ment.le(BaseCameraManagement::getBeginMile, list.get(i).getAlarmMile());
|
|
|
ment.in(BaseCameraManagement::getMonitoringDirection, 1, 3);
|
|
|
+ ment.orderByAsc(BaseCameraManagement::getInstallMile);
|
|
|
} else if (heartbeatVo.getLineDir() == 2) {
|
|
|
ment.le(BaseCameraManagement::getEndMile, list.get(i).getAlarmMile());
|
|
|
ment.ge(BaseCameraManagement::getBeginMile, list.get(i).getAlarmMile());
|
|
|
ment.in(BaseCameraManagement::getMonitoringDirection, 2, 3);
|
|
|
+ ment.orderByDesc(BaseCameraManagement::getInstallMile);
|
|
|
}
|
|
|
- ment.orderByAsc(BaseCameraManagement::getInstallMile);
|
|
|
if (i == 0) {
|
|
|
ment.last("limit 1,1000000");
|
|
|
}
|
|
|
@@ -723,7 +731,7 @@ public class GeoHazardMonitorTokenController {
|
|
|
if (!codeList.contains(baseList.get(o).getCameraCode())) {
|
|
|
//如果不包含此相机编码
|
|
|
for (TerminalHeartbeatLog terminalHeartbeatLog : heartbeatLogList) {
|
|
|
- cameraUtil.stopStream(terminalHeartbeatLog.getCameraCode(),terminalHeartbeatLog.getChannel());
|
|
|
+ cameraUtil.stopStream(terminalHeartbeatLog.getCameraCode(), terminalHeartbeatLog.getChannel());
|
|
|
}
|
|
|
}
|
|
|
//添加心跳相机日志信息
|
|
|
@@ -763,13 +771,14 @@ public class GeoHazardMonitorTokenController {
|
|
|
int mile = heartbeatVo.getVisualDistance() + heartbeatVo.getCurrentMile();
|
|
|
LambdaQueryWrapper<BaseCameraManagement> base = new LambdaQueryWrapper<>();
|
|
|
if (heartbeatVo.getLineDir() == 1) {
|
|
|
+ base.orderByAsc(BaseCameraManagement::getInstallMile);
|
|
|
base.gt(BaseCameraManagement::getInstallMile, mile);
|
|
|
}
|
|
|
if (heartbeatVo.getLineDir() == 2) {
|
|
|
+ base.orderByDesc(BaseCameraManagement::getInstallMile);
|
|
|
base.lt(BaseCameraManagement::getInstallMile, mile);
|
|
|
}
|
|
|
base.eq(BaseCameraManagement::getRailwayCode, heartbeatVo.getRailwayCode());
|
|
|
- base.orderByAsc(BaseCameraManagement::getInstallMile);
|
|
|
base.eq(BaseCameraManagement::getOnline, 2);
|
|
|
base.last("limit 2");
|
|
|
List<BaseCameraManagement> list1 = baseCameraManagementService.list(base);
|
|
|
@@ -779,7 +788,7 @@ public class GeoHazardMonitorTokenController {
|
|
|
if (!codeList.contains(baseCameraManagement.getCameraCode())) {
|
|
|
//如果不包含此相机编码
|
|
|
for (TerminalHeartbeatLog terminalHeartbeatLog : heartbeatLogList) {
|
|
|
- cameraUtil.stopStream(terminalHeartbeatLog.getCameraCode(),terminalHeartbeatLog.getChannel());
|
|
|
+ cameraUtil.stopStream(terminalHeartbeatLog.getCameraCode(), terminalHeartbeatLog.getChannel());
|
|
|
}
|
|
|
}
|
|
|
//添加心跳相机日志信息
|
|
|
@@ -792,13 +801,14 @@ public class GeoHazardMonitorTokenController {
|
|
|
if (heartbeatVo.getLineDir() == 1) {
|
|
|
base.gt(BaseCameraManagement::getInstallMile, distance);
|
|
|
base.in(BaseCameraManagement::getMonitoringDirection, 1, 3);
|
|
|
+ base.orderByAsc(BaseCameraManagement::getInstallMile);
|
|
|
}
|
|
|
if (heartbeatVo.getLineDir() == 2) {
|
|
|
base.lt(BaseCameraManagement::getInstallMile, distance);
|
|
|
base.in(BaseCameraManagement::getMonitoringDirection, 2, 3);
|
|
|
+ base.orderByDesc(BaseCameraManagement::getInstallMile);
|
|
|
}
|
|
|
base.eq(BaseCameraManagement::getRailwayCode, heartbeatVo.getRailwayCode());
|
|
|
- base.orderByAsc(BaseCameraManagement::getInstallMile);
|
|
|
base.eq(BaseCameraManagement::getOnline, 2);
|
|
|
base.last("limit 2");
|
|
|
List<BaseCameraManagement> list1 = baseCameraManagementService.list(base);
|
|
|
@@ -823,7 +833,7 @@ public class GeoHazardMonitorTokenController {
|
|
|
if (!codeList.contains(baseCameraManagement.getCameraCode())) {
|
|
|
//如果不包含此相机编码
|
|
|
for (TerminalHeartbeatLog terminalHeartbeatLog : heartbeatLogList) {
|
|
|
- cameraUtil.stopStream(terminalHeartbeatLog.getCameraCode(),terminalHeartbeatLog.getChannel());
|
|
|
+ cameraUtil.stopStream(terminalHeartbeatLog.getCameraCode(), terminalHeartbeatLog.getChannel());
|
|
|
}
|
|
|
}
|
|
|
//添加心跳相机日志信息
|
|
|
@@ -842,7 +852,7 @@ public class GeoHazardMonitorTokenController {
|
|
|
if (!codeList.contains(baseCameraManagement.getCameraCode())) {
|
|
|
//如果不包含此相机编码
|
|
|
for (TerminalHeartbeatLog terminalHeartbeatLog : heartbeatLogList) {
|
|
|
- cameraUtil.stopStream(terminalHeartbeatLog.getCameraCode(),terminalHeartbeatLog.getChannel());
|
|
|
+ cameraUtil.stopStream(terminalHeartbeatLog.getCameraCode(), terminalHeartbeatLog.getChannel());
|
|
|
}
|
|
|
}
|
|
|
//添加心跳相机日志信息
|
|
|
@@ -865,13 +875,14 @@ public class GeoHazardMonitorTokenController {
|
|
|
if (heartbeatVo.getLineDir() == 1) {
|
|
|
base.gt(BaseCameraManagement::getInstallMile, distance);
|
|
|
base.in(BaseCameraManagement::getMonitoringDirection, 1, 3);
|
|
|
+ base.orderByAsc(BaseCameraManagement::getInstallMile);
|
|
|
}
|
|
|
if (heartbeatVo.getLineDir() == 2) {
|
|
|
base.lt(BaseCameraManagement::getInstallMile, distance);
|
|
|
base.in(BaseCameraManagement::getMonitoringDirection, 2, 3);
|
|
|
+ base.orderByDesc(BaseCameraManagement::getInstallMile);
|
|
|
}
|
|
|
base.eq(BaseCameraManagement::getRailwayCode, heartbeatVo.getRailwayCode());
|
|
|
- base.orderByAsc(BaseCameraManagement::getInstallMile);
|
|
|
base.eq(BaseCameraManagement::getOnline, 2);
|
|
|
base.last("limit 2");
|
|
|
List<BaseCameraManagement> list1 = baseCameraManagementService.list(base);
|
|
|
@@ -896,7 +907,7 @@ public class GeoHazardMonitorTokenController {
|
|
|
if (!codeList.contains(baseCameraManagement.getCameraCode())) {
|
|
|
//如果不包含此相机编码
|
|
|
for (TerminalHeartbeatLog terminalHeartbeatLog : heartbeatLogList) {
|
|
|
- cameraUtil.stopStream(terminalHeartbeatLog.getCameraCode(),terminalHeartbeatLog.getChannel());
|
|
|
+ cameraUtil.stopStream(terminalHeartbeatLog.getCameraCode(), terminalHeartbeatLog.getChannel());
|
|
|
}
|
|
|
}
|
|
|
//添加心跳相机日志信息
|
|
|
@@ -915,7 +926,7 @@ public class GeoHazardMonitorTokenController {
|
|
|
if (!codeList.contains(baseCameraManagement.getCameraCode())) {
|
|
|
//如果不包含此相机编码
|
|
|
for (TerminalHeartbeatLog terminalHeartbeatLog : heartbeatLogList) {
|
|
|
- cameraUtil.stopStream(terminalHeartbeatLog.getCameraCode(),terminalHeartbeatLog.getChannel());
|
|
|
+ cameraUtil.stopStream(terminalHeartbeatLog.getCameraCode(), terminalHeartbeatLog.getChannel());
|
|
|
}
|
|
|
}
|
|
|
//添加心跳相机日志信息
|
|
|
@@ -1339,10 +1350,17 @@ public class GeoHazardMonitorTokenController {
|
|
|
if (ObjectUtils.isEmpty(one.getReleasedUrl())) {
|
|
|
//获取报警里程所监控的所有相机
|
|
|
LambdaQueryWrapper<BaseCameraManagement> camera = new LambdaQueryWrapper<BaseCameraManagement>();
|
|
|
- camera.le(BaseCameraManagement::getBeginMile, one.getAlarmMile());
|
|
|
- camera.ge(BaseCameraManagement::getEndMile, one.getAlarmMile());
|
|
|
- camera.eq(BaseCameraManagement::getLineDir, one.getLineDir());
|
|
|
- camera.orderByAsc(BaseCameraManagement::getInstallMile);
|
|
|
+ if (one.getLineDir()==1){
|
|
|
+ camera.ge(BaseCameraManagement::getBeginMile, one.getAlarmMile());
|
|
|
+ camera.le(BaseCameraManagement::getEndMile, one.getAlarmMile());
|
|
|
+ camera.in(BaseCameraManagement::getMonitoringDirection, 1, 3);
|
|
|
+ camera.orderByAsc(BaseCameraManagement::getInstallMile);
|
|
|
+ }else if (one.getLineDir()==2){
|
|
|
+ camera.le(BaseCameraManagement::getBeginMile, one.getAlarmMile());
|
|
|
+ camera.ge(BaseCameraManagement::getEndMile, one.getAlarmMile());
|
|
|
+ camera.in(BaseCameraManagement::getMonitoringDirection, 2, 3);
|
|
|
+ camera.orderByDesc(BaseCameraManagement::getInstallMile);
|
|
|
+ }
|
|
|
camera.eq(BaseCameraManagement::getOnline, 2);
|
|
|
List<BaseCameraManagement> baseCameraManagementList = baseCameraManagementService.list(camera);
|
|
|
if (baseCameraManagementList.size() > 0) {
|
gao.qiang