心跳添加监视方向判断

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

@@ -626,6 +626,11 @@ public class GeoHazardMonitorTokenController {
                         camera.le(BaseCameraManagement::getBeginMile, list.get(0).getAlarmMile());
                         camera.eq(BaseCameraManagement::getRailwayCode, heartbeatVo.getRailwayCode());
 //                    camera.eq(BaseCameraManagement::getOnline,2);
+                        if (heartbeatVo.getLineDir() == 1) {
+                            camera.in(BaseCameraManagement::getMonitoringDirection, 1, 3);
+                        } else if (heartbeatVo.getLineDir() == 2) {
+                            camera.in(BaseCameraManagement::getMonitoringDirection, 2, 3);
+                        }
                         camera.eq(BaseCameraManagement::getEnableOrNot, 1);
                         camera.orderByAsc(BaseCameraManagement::getInstallMile);
                         List<BaseCameraManagement> baseCameraManagementList = baseCameraManagementService.list(camera);
@@ -678,6 +683,11 @@ public class GeoHazardMonitorTokenController {
                             ment.le(BaseCameraManagement::getBeginMile, list.get(i).getAlarmMile());
                             ment.eq(BaseCameraManagement::getRailwayCode, heartbeatVo.getRailwayCode());
                             ment.eq(BaseCameraManagement::getEnableOrNot, 1);
+                            if (heartbeatVo.getLineDir() == 1) {
+                                ment.in(BaseCameraManagement::getMonitoringDirection, 1, 3);
+                            } else if (heartbeatVo.getLineDir() == 2) {
+                                ment.in(BaseCameraManagement::getMonitoringDirection, 2, 3);
+                            }
                             ment.orderByAsc(BaseCameraManagement::getInstallMile);
                             if (i == 0) {
                                 ment.last("limit 1,1000000");
@@ -746,6 +756,11 @@ public class GeoHazardMonitorTokenController {
                         if (heartbeatVo.getLineDir() == 2) {
                             base.lt(BaseCameraManagement::getInstallMile, distance);
                         }
+                        if (heartbeatVo.getLineDir() == 1) {
+                            base.in(BaseCameraManagement::getMonitoringDirection, 1, 3);
+                        } else if (heartbeatVo.getLineDir() == 2) {
+                            base.in(BaseCameraManagement::getMonitoringDirection, 2, 3);
+                        }
                         base.eq(BaseCameraManagement::getRailwayCode, heartbeatVo.getRailwayCode());
                         base.orderByAsc(BaseCameraManagement::getInstallMile);
                         base.eq(BaseCameraManagement::getEnableOrNot, 1);
@@ -797,6 +812,11 @@ public class GeoHazardMonitorTokenController {
                     if (heartbeatVo.getLineDir() == 2) {
                         base.lt(BaseCameraManagement::getInstallMile, distance);
                     }
+                    if (heartbeatVo.getLineDir() == 1) {
+                        base.in(BaseCameraManagement::getMonitoringDirection, 1, 3);
+                    } else if (heartbeatVo.getLineDir() == 2) {
+                        base.in(BaseCameraManagement::getMonitoringDirection, 2, 3);
+                    }
                     base.eq(BaseCameraManagement::getRailwayCode, heartbeatVo.getRailwayCode());
                     base.orderByAsc(BaseCameraManagement::getInstallMile);
                     base.eq(BaseCameraManagement::getEnableOrNot, 1);
@@ -1078,6 +1098,7 @@ public class GeoHazardMonitorTokenController {
 
     /**
      * 关闭点播功能接口
+     *
      * @param parameterVo
      * @param request
      * @return
@@ -1102,7 +1123,7 @@ public class GeoHazardMonitorTokenController {
             LambdaQueryWrapper<BaseCameraManagement> lw = new LambdaQueryWrapper<BaseCameraManagement>();
             lw.eq(BaseCameraManagement::getCameraCode, cameraPlayVo.getCameraCode());
             lw.eq(BaseCameraManagement::getEnableOrNot, 1);
-            lw.eq(BaseCameraManagement::getOnline,2);
+            lw.eq(BaseCameraManagement::getOnline, 2);
             BaseCameraManagement one = baseCameraManagementService.getOne(lw);
             if (ObjectUtils.isEmpty(one)) {
                 jsonObject.put("resultCode", 0);
@@ -1111,7 +1132,7 @@ public class GeoHazardMonitorTokenController {
                 return SM4Utils.encryptData_ECB(JSONObject.toJSONString(jsonObject), key);
             }
             String code = cameraUtil.stopStream(one.getCameraCode(), one.getChannel());
-            log.info("---------------code------------->"+code);
+            log.info("---------------code------------->" + code);
             jsonObject.put("resultCode", 1);
             jsonObject.put("message", "ok");
             return SM4Utils.encryptData_ECB(JSONObject.toJSONString(jsonObject), key);