心跳接口修改

vehicle-sdk/src/main/java/com/ozs/controller/upload/GeoHazardMonitorTokenController.java

@@ -636,20 +636,20 @@ public class GeoHazardMonitorTokenController {
                         queryWrapper2.in(MsgAlarm::getAlarmId, collect);
                     }
                     List<MsgAlarm> list = msgAlarmService.list(queryWrapper2);
-                    log.info("--------List<MsgAlarm>--------"+list);
+                    log.info("--------List<MsgAlarm>--------" + list);
                     //有报警信息的时候
                     LambdaQueryWrapper<BaseCameraManagement> camera = new LambdaQueryWrapper<BaseCameraManagement>();
                     if (!ObjectUtils.isEmpty(list)) {
                         //获取报警里程所监控的所有相机
                         if (heartbeatVo.getLineDir() == 1) {
-                            log.info("-------getLineDir() == 1--------"+list.get(0).getAlarmMile());
+                            log.info("-------getLineDir() == 1--------" + list.get(0).getAlarmMile());
                             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) {
-                            log.info("-------getLineDir() == 2--------"+list.get(0).getAlarmMile());
+                            log.info("-------getLineDir() == 2--------" + list.get(0).getAlarmMile());
                             camera.le(BaseCameraManagement::getEndMile, list.get(0).getAlarmMile());
                             camera.ge(BaseCameraManagement::getBeginMile, list.get(0).getAlarmMile());
                             camera.in(BaseCameraManagement::getMonitoringDirection, 2, 3);
@@ -659,7 +659,7 @@ public class GeoHazardMonitorTokenController {
                         camera.eq(BaseCameraManagement::getOnline, 2);
                         camera.eq(BaseCameraManagement::getEnableOrNot, 1);
                         List<BaseCameraManagement> baseCameraManagementList = baseCameraManagementService.list(camera);
-                        log.info("-------baseCameraManagementList123111--------"+baseCameraManagementList);
+                        log.info("-------baseCameraManagementList123111--------" + baseCameraManagementList);
                         List<AlarmListVo> listVos = new ArrayList<>();
                         if (baseCameraManagementList.size() > 0) {
                             String playFlv1 = null;
@@ -667,7 +667,7 @@ public class GeoHazardMonitorTokenController {
                             if (StringUtils.isEmpty(playFlv1)) {
                                 playFlv1 = cameraUtil.heartbeatgetUrl(baseCameraManagementList.get(0).getCameraCode(), baseCameraManagementList.get(0).getChannel(), type);
                             }
-                            log.info("-------playFlv--------"+playFlv1);
+                            log.info("-------playFlv--------" + playFlv1);
 //                            //判断心跳相机日志表后两条数据是否包含该相机编码
 //                            if (!ObjectUtils.isEmpty(codeList)) {
 //                                if (!codeList.contains(baseCameraManagementList.get(0).getCameraCode())) {
@@ -831,7 +831,7 @@ public class GeoHazardMonitorTokenController {
                                     String code = baseCameraManagement.getCameraCode() + "/" + baseCameraManagement.getChannel();
                                     list3.add(code);
                                 }
-                                if (!ObjectUtils.isEmpty(stringList)){
+                                if (!ObjectUtils.isEmpty(stringList)) {
                                     list3.addAll(stringList);
                                 }
                                 log.info("--------------heartbeat--------------:" + list3);
@@ -906,7 +906,7 @@ public class GeoHazardMonitorTokenController {
                             String code = baseCameraManagement.getCameraCode() + "/" + baseCameraManagement.getChannel();
                             list3.add(code);
                         }
-                        if (!ObjectUtils.isEmpty(stringList)){
+                        if (!ObjectUtils.isEmpty(stringList)) {
                             list3.addAll(stringList);
                         }
                         log.info("--------------heartbeat--------------:" + list3);
@@ -1337,9 +1337,11 @@ public class GeoHazardMonitorTokenController {
                 return SM4Utils.encryptData_ECB(JSONObject.toJSONString(jsonObject), key);
             }
             LambdaQueryWrapper<BaseCameraManagement> wrapper = new LambdaQueryWrapper<>();
-            wrapper.eq(BaseCameraManagement::getRailwayCode, cameraVo.getRailwayCode())
-                    .and(w1 -> w1.eq(BaseCameraManagement::getMonitoringDirection, cameraVo.getLineDir())
-                            .or(w2 -> w2.eq(BaseCameraManagement::getMonitoringDirection, 3)));
+            if (!ObjectUtils.isEmpty(cameraVo.getLineDir())) {
+                wrapper.eq(BaseCameraManagement::getRailwayCode, cameraVo.getRailwayCode())
+                        .and(w1 -> w1.eq(BaseCameraManagement::getMonitoringDirection, cameraVo.getLineDir())
+                                .or(w2 -> w2.eq(BaseCameraManagement::getMonitoringDirection, 3)));
+            }
             wrapper.eq(BaseCameraManagement::getEnableOrNot, 1);
             wrapper.orderByAsc(BaseCameraManagement::getInstallMile);
             List<BaseCameraManagement> list = baseCameraManagementService.list(wrapper);