|
@@ -868,13 +868,13 @@ public class GeoHazardMonitorTokenController {
|
|
} else {
|
|
} else {
|
|
log.info("-------------->>已进入拉三路路视频");
|
|
log.info("-------------->>已进入拉三路路视频");
|
|
log.info("list1-------------->>" + list1.size());
|
|
log.info("list1-------------->>" + list1.size());
|
|
- for (BaseCameraManagement baseCameraManagement : list1) {
|
|
|
|
- cameraUtil.heartbeatgetUrl(baseCameraManagement.getCameraCode(), baseCameraManagement.getChannel(), type);
|
|
|
|
|
|
+ for (int i = 1; i < list1.size(); i++) {
|
|
|
|
+ cameraUtil.heartbeatgetUrl(list1.get(i).getCameraCode(), list1.get(i).getChannel(), type);
|
|
log.info("-------------->>finalCodeList5-------"+ codeList);
|
|
log.info("-------------->>finalCodeList5-------"+ codeList);
|
|
if (!ObjectUtils.isEmpty(codeList)) {
|
|
if (!ObjectUtils.isEmpty(codeList)) {
|
|
//判断心跳相机日志表后两条数据是否包含该相机编码
|
|
//判断心跳相机日志表后两条数据是否包含该相机编码
|
|
- log.info("-------------->>baseCameraManagement.getCameraCode()-------"+baseCameraManagement.getCameraCode());
|
|
|
|
- if (!codeList.contains(baseCameraManagement.getCameraCode())) {
|
|
|
|
|
|
+ log.info("-------------->>baseCameraManagement.getCameraCode()-------"+list1.get(i).getCameraCode());
|
|
|
|
+ if (!codeList.contains(list1.get(i).getCameraCode())) {
|
|
//如果不包含此相机编码
|
|
//如果不包含此相机编码
|
|
log.info("-------------->>heartbeatLogList-------"+heartbeatLogList);
|
|
log.info("-------------->>heartbeatLogList-------"+heartbeatLogList);
|
|
for (TerminalHeartbeatLog terminalHeartbeatLog : heartbeatLogList) {
|
|
for (TerminalHeartbeatLog terminalHeartbeatLog : heartbeatLogList) {
|
|
@@ -884,7 +884,7 @@ public class GeoHazardMonitorTokenController {
|
|
}
|
|
}
|
|
}
|
|
}
|
|
//添加心跳相机日志信息
|
|
//添加心跳相机日志信息
|
|
- int add4 = terminalHeartbeatLogService.add(baseCameraManagement.getCameraCode(), baseCameraManagement.getChannel());
|
|
|
|
|
|
+ int add4 = terminalHeartbeatLogService.add(list1.get(i).getCameraCode(), list1.get(i).getChannel());
|
|
log.info("-----add4----" + add4);
|
|
log.info("-----add4----" + add4);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
@@ -953,14 +953,14 @@ public class GeoHazardMonitorTokenController {
|
|
} else {
|
|
} else {
|
|
log.info("-------------->>已进入拉三路路视频");
|
|
log.info("-------------->>已进入拉三路路视频");
|
|
log.info("list1-------------->>" + list1.size());
|
|
log.info("list1-------------->>" + list1.size());
|
|
- for (BaseCameraManagement baseCameraManagement : list1) {
|
|
|
|
|
|
+ for (int i = 1; i < list1.size(); i++) {
|
|
boolean finalType3 = type;
|
|
boolean finalType3 = type;
|
|
- cameraUtil.heartbeatgetUrl(baseCameraManagement.getCameraCode(), baseCameraManagement.getChannel(), finalType3);
|
|
|
|
|
|
+ cameraUtil.heartbeatgetUrl(list1.get(i).getCameraCode(), list1.get(i).getChannel(), finalType3);
|
|
log.info("-------------->>codeList-------"+ codeList);
|
|
log.info("-------------->>codeList-------"+ codeList);
|
|
if (!ObjectUtils.isEmpty(codeList)) {
|
|
if (!ObjectUtils.isEmpty(codeList)) {
|
|
//判断心跳相机日志表后两条数据是否包含该相机编码
|
|
//判断心跳相机日志表后两条数据是否包含该相机编码
|
|
- log.info("-------------->>baseCameraManagement.getCameraCode()-------"+ baseCameraManagement.getCameraCode());
|
|
|
|
- if (!codeList.contains(baseCameraManagement.getCameraCode())) {
|
|
|
|
|
|
+ log.info("-------------->>baseCameraManagement.getCameraCode()-------"+ list1.get(i).getCameraCode());
|
|
|
|
+ if (!codeList.contains(list1.get(i).getCameraCode())) {
|
|
//如果不包含此相机编码
|
|
//如果不包含此相机编码
|
|
log.info("-------------->>heartbeatLogList-------"+ heartbeatLogList);
|
|
log.info("-------------->>heartbeatLogList-------"+ heartbeatLogList);
|
|
for (TerminalHeartbeatLog terminalHeartbeatLog : heartbeatLogList) {
|
|
for (TerminalHeartbeatLog terminalHeartbeatLog : heartbeatLogList) {
|
|
@@ -970,7 +970,7 @@ public class GeoHazardMonitorTokenController {
|
|
}
|
|
}
|
|
}
|
|
}
|
|
//添加心跳相机日志信息
|
|
//添加心跳相机日志信息
|
|
- int add6 = terminalHeartbeatLogService.add(baseCameraManagement.getCameraCode(), baseCameraManagement.getChannel());
|
|
|
|
|
|
+ int add6 = terminalHeartbeatLogService.add(list1.get(i).getCameraCode(), list1.get(i).getChannel());
|
|
log.info("-----add6----" + add6);
|
|
log.info("-----add6----" + add6);
|
|
}
|
|
}
|
|
}
|
|
}
|