第三方接口修改

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

@@ -282,11 +282,11 @@ public class GeoHazardMonitorTokenController {
             }
             log.info("reqMsgAlarmVo:{}", reqMsgAlarmVo);
 
-            RespMsgAlarmVo respMsgAlarmVo = new RespMsgAlarmVo();
             LambdaQueryWrapper<BaseCameraManagement> wrapper = new LambdaQueryWrapper<BaseCameraManagement>();
             if (!ObjectUtils.isEmpty(reqMsgAlarmVo.getAlarmMile())) {
                 wrapper.le(BaseCameraManagement::getBeginMile, reqMsgAlarmVo.getAlarmMile());
                 wrapper.ge(BaseCameraManagement::getEndMile, reqMsgAlarmVo.getAlarmMile());
+                wrapper.eq(BaseCameraManagement::getLineDir,reqMsgAlarmVo.getLineDir());
             }
             List<BaseCameraManagement> baseCameraManagementList = baseCameraManagementService.list(wrapper);
             log.info("baseCameraManagement:{}", baseCameraManagementList);
@@ -716,7 +716,12 @@ public class GeoHazardMonitorTokenController {
                     //没有报警信息的时候
                     distance = heartbeatVo.getVisualDistance() + heartbeatVo.getCurrentMile();
                     LambdaQueryWrapper<BaseCameraManagement> base = new LambdaQueryWrapper<>();
-                    base.gt(BaseCameraManagement::getInstallMile, distance);
+                    if (heartbeatVo.getLineDir() == 1) {
+                        base.gt(BaseCameraManagement::getInstallMile, distance);
+                    }
+                    if (heartbeatVo.getLineDir() == 2) {
+                        base.lt(BaseCameraManagement::getInstallMile, distance);
+                    }
                     base.eq(BaseCameraManagement::getLineDir, heartbeatVo.getLineDir());
                     base.orderByAsc(BaseCameraManagement::getInstallMile);
                     base.last("limit 4");
@@ -736,7 +741,7 @@ public class GeoHazardMonitorTokenController {
                     respHeartbeatVo.setAlarmInfo(null);
                 }
                 String string = JSON.toJSONString(twoMap);
-                heartbeatUtils.createHeartbeat(Constant.HERTBEA_KEY+heartbeatVo.getTerminalCode(), string);
+                heartbeatUtils.createHeartbeat(Constant.HERTBEA_KEY + heartbeatVo.getTerminalCode(), string);
                 jsonObject.put("resultCode", 1);
                 jsonObject.put("message", "ok");
                 jsonObject.put("data", respHeartbeatVo);
@@ -1081,8 +1086,8 @@ public class GeoHazardMonitorTokenController {
                 if (ObjectUtils.isEmpty(one.getReleasedUrl())) {
                     //获取报警里程所监控的所有相机
                     LambdaQueryWrapper<BaseCameraManagement> camera = new LambdaQueryWrapper<BaseCameraManagement>();
-                    camera.ge(BaseCameraManagement::getBeginMile, one.getAlarmMile());
-                    camera.le(BaseCameraManagement::getEndMile, one.getAlarmMile());
+                    camera.le(BaseCameraManagement::getBeginMile, one.getAlarmMile());
+                    camera.ge(BaseCameraManagement::getEndMile, one.getAlarmMile());
                     camera.eq(BaseCameraManagement::getLineDir, one.getLineDir());
                     camera.orderByAsc(BaseCameraManagement::getInstallMile);
                     List<BaseCameraManagement> baseCameraManagementList = baseCameraManagementService.list(camera);
@@ -1097,7 +1102,7 @@ public class GeoHazardMonitorTokenController {
                                     one.getAlarmTime(),
                                     one.getReleasedTime(),
                                     true);
-                        }else {
+                        } else {
                             url = CameraUtil.historyPlayListStr(baseCameraManagement.getChannel(),
                                     one.getAlarmTime(),
                                     new Date(),
@@ -1125,22 +1130,22 @@ public class GeoHazardMonitorTokenController {
             return SM4Utils.encryptData_ECB(JSONObject.toJSONString(jsonObject), "4370780c9a8c43e5");
         }
     }
-    
+
     @GetMapping("/test/{key}")
-    public void test(@PathVariable String key){
+    public void test(@PathVariable String key) {
         String heartbeat = heartbeatUtils.getHeartbeat(key);
-        Map maps2 = JSON.parseObject(heartbeat,Map.class);
+        Map maps2 = JSON.parseObject(heartbeat, Map.class);
         System.out.println(maps2);
     }
 
     @GetMapping("/testi")
-    public void testi(){
-        Map<String,String> map = new HashMap<>();
-        map.put("age","18");
-        map.put("name","小明");
-        map.put("gender","男");
+    public void testi() {
+        Map<String, String> map = new HashMap<>();
+        map.put("age", "18");
+        map.put("name", "小明");
+        map.put("gender", "男");
         String string = JSON.toJSONString(map);
-        heartbeatUtils.createHeartbeat("key",string);
+        heartbeatUtils.createHeartbeat("key", string);
     }
 
     private String objStr(HeartbeatVo heartbeatVoCH) {