里程位置修改

business-service/src/main/java/com/ozs/service/TerminalHeartbeatLogService.java

@@ -9,5 +9,5 @@ import com.ozs.entity.TerminalHeartbeatLog;
  */
 public interface TerminalHeartbeatLogService extends IService<TerminalHeartbeatLog> {
 
-     void add(String code,String channel);
+     int add(String code,String channel);
 }

business-service/src/main/java/com/ozs/service/impl/TerminalHeartbeatLogServiceImpl.java

@@ -19,12 +19,12 @@ public class TerminalHeartbeatLogServiceImpl extends ServiceImpl<TerminalHeartbe
     
     
     @Override
-    public void add(String code,String channel){
+    public int add(String code,String channel){
         TerminalHeartbeatLog terminalHeartbeatLog=new TerminalHeartbeatLog();
         terminalHeartbeatLog.setId((long) (baseMapper.selectCount(new QueryWrapper<>()) + 1));
         terminalHeartbeatLog.setCameraCode(code);
         terminalHeartbeatLog.setChannel(channel);
         terminalHeartbeatLog.setCreateTime(new Date());
-        baseMapper.insert(terminalHeartbeatLog);
+        return baseMapper.insert(terminalHeartbeatLog);
     }
 }

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

@@ -579,8 +579,10 @@ public class GeoHazardMonitorTokenController {
                     .orderByDesc(TerminalHeartbeatLog::getCreateTime)
                     .last("limit 2"));
             List<String> codeList = new ArrayList<>();
+            log.info("-----heartbeatLogList----->" + heartbeatLogList);
             if (!ObjectUtils.isEmpty(heartbeatLogList)) {
                 codeList = heartbeatLogList.stream().map(TerminalHeartbeatLog::getCameraCode).collect(Collectors.toList());
+                log.info("-----codeList----->" + codeList);
             }
 
             //目视距离和里程位置
@@ -636,9 +638,9 @@ public class GeoHazardMonitorTokenController {
                     }
                     List<MsgAlarm> list = msgAlarmService.list(queryWrapper2);
                     //有报警信息的时候
+                    LambdaQueryWrapper<BaseCameraManagement> camera = new LambdaQueryWrapper<BaseCameraManagement>();
                     if (!ObjectUtils.isEmpty(list)) {
                         //获取报警里程所监控的所有相机
-                        LambdaQueryWrapper<BaseCameraManagement> camera = new LambdaQueryWrapper<BaseCameraManagement>();
                         if (heartbeatVo.getLineDir() == 1) {
                             camera.ge(BaseCameraManagement::getEndMile, list.get(0).getAlarmMile());
                             camera.le(BaseCameraManagement::getBeginMile, list.get(0).getAlarmMile());
@@ -663,12 +665,14 @@ public class GeoHazardMonitorTokenController {
                                 if (!codeList.contains(baseCameraManagementList.get(0).getCameraCode())) {
                                     //如果不包含此相机编码
                                     for (TerminalHeartbeatLog terminalHeartbeatLog : heartbeatLogList) {
+                                        log.info("-----11111----" );
                                         cameraUtil.stopStream(terminalHeartbeatLog.getCameraCode(), terminalHeartbeatLog.getChannel());
                                     }
                                 }
                             }
                             //添加心跳相机日志信息
-                            terminalHeartbeatLogService.add(baseCameraManagementList.get(0).getCameraCode(), baseCameraManagementList.get(0).getChannel());
+                            int add = terminalHeartbeatLogService.add(baseCameraManagementList.get(0).getCameraCode(), baseCameraManagementList.get(0).getChannel());
+                            log.info("-----add----" + add);
                             respHeartbeatVo.setCurrentStream(playFlv);
                             respHeartbeatVo.setIsAlarm(1);
                             respHeartbeatVo.setCameraCode(baseCameraManagementList.get(0).getCameraCode());
@@ -738,12 +742,14 @@ public class GeoHazardMonitorTokenController {
                                         if (!codeList.contains(baseList.get(o).getCameraCode())) {
                                             //如果不包含此相机编码
                                             for (TerminalHeartbeatLog terminalHeartbeatLog : heartbeatLogList) {
+                                                log.info("-----22222----" );
                                                 cameraUtil.stopStream(terminalHeartbeatLog.getCameraCode(), terminalHeartbeatLog.getChannel());
                                             }
                                         }
                                     }
                                     //添加心跳相机日志信息
-                                    terminalHeartbeatLogService.add(baseList.get(o).getCameraCode(), baseList.get(o).getChannel());
+                                    int add1 = terminalHeartbeatLogService.add(baseList.get(o).getCameraCode(), baseList.get(o).getChannel());
+                                    log.info("-----add1----" + add1);
                                     AlarmListVo alarmListVo = new AlarmListVo();
                                     //alarmList对象
                                     alarmListVo.setCameraStream(playFlv);
@@ -798,33 +804,34 @@ public class GeoHazardMonitorTokenController {
                                 if (!codeList.contains(baseCameraManagement.getCameraCode())) {
                                     //如果不包含此相机编码
                                     for (TerminalHeartbeatLog terminalHeartbeatLog : heartbeatLogList) {
+                                        log.info("-----3333333----" );
                                         cameraUtil.stopStream(terminalHeartbeatLog.getCameraCode(), terminalHeartbeatLog.getChannel());
                                     }
                                 }
                             }
                             //添加心跳相机日志信息
-                            terminalHeartbeatLogService.add(baseCameraManagement.getCameraCode(), baseCameraManagement.getChannel());
+                            int add2 = terminalHeartbeatLogService.add(baseCameraManagement.getCameraCode(), baseCameraManagement.getChannel());
+                            log.info("-----add2----" + add2);
                         }
                     } else {
                         //没有报警信息的时候
-                        LambdaQueryWrapper<BaseCameraManagement> base = new LambdaQueryWrapper<>();
                         if (heartbeatVo.getLineDir() == 1) {
                             distance = heartbeatVo.getVisualDistance() + heartbeatVo.getCurrentMile();
-                            base.gt(BaseCameraManagement::getInstallMile, distance);
-                            base.in(BaseCameraManagement::getMonitoringDirection, 1, 3);
-                            base.orderByAsc(BaseCameraManagement::getInstallMile);
+                            camera.gt(BaseCameraManagement::getInstallMile, distance);
+                            camera.in(BaseCameraManagement::getMonitoringDirection, 1, 3);
+                            camera.orderByAsc(BaseCameraManagement::getInstallMile);
                         }
                         if (heartbeatVo.getLineDir() == 2) {
                             distance = heartbeatVo.getCurrentMile() - heartbeatVo.getVisualDistance();
-                            base.lt(BaseCameraManagement::getInstallMile, distance);
-                            base.in(BaseCameraManagement::getMonitoringDirection, 2, 3);
-                            base.orderByDesc(BaseCameraManagement::getInstallMile);
+                            camera.lt(BaseCameraManagement::getInstallMile, distance);
+                            camera.in(BaseCameraManagement::getMonitoringDirection, 2, 3);
+                            camera.orderByDesc(BaseCameraManagement::getInstallMile);
                         }
-                        base.eq(BaseCameraManagement::getRailwayCode, heartbeatVo.getRailwayCode());
-                        base.eq(BaseCameraManagement::getOnline, 2);
-                        base.eq(BaseCameraManagement::getEnableOrNot, 1);
-                        base.last("limit 2");
-                        List<BaseCameraManagement> list1 = baseCameraManagementService.list(base);
+                        camera.eq(BaseCameraManagement::getRailwayCode, heartbeatVo.getRailwayCode());
+                        camera.eq(BaseCameraManagement::getOnline, 2);
+                        camera.eq(BaseCameraManagement::getEnableOrNot, 1);
+                        camera.last("limit 2");
+                        List<BaseCameraManagement> list1 = baseCameraManagementService.list(camera);
                         if (list1.size() <= 0) {
                             jsonObject.put("resultCode", 0);
                             jsonObject.put("message", "失败");
@@ -848,13 +855,15 @@ public class GeoHazardMonitorTokenController {
                                         if (!finalCodeList4.contains(baseCameraManagement.getCameraCode())) {
                                             //如果不包含此相机编码
                                             for (TerminalHeartbeatLog terminalHeartbeatLog : heartbeatLogList) {
+                                                log.info("-----44444444----" );
                                                 cameraUtil.stopStream(terminalHeartbeatLog.getCameraCode(), terminalHeartbeatLog.getChannel());
                                             }
                                         }
                                     }
-                                    //添加心跳相机日志信息
-                                    terminalHeartbeatLogService.add(baseCameraManagement.getCameraCode(), baseCameraManagement.getChannel());
                                 });
+                                //添加心跳相机日志信息
+                                int add3 = terminalHeartbeatLogService.add(baseCameraManagement.getCameraCode(), baseCameraManagement.getChannel());
+                                log.info("-----add3----" + add3);
                             }
                         } else {
                             log.info("-------------->>已进入拉三路路视频");
@@ -870,13 +879,15 @@ public class GeoHazardMonitorTokenController {
                                         if (!finalCodeList5.contains(baseCameraManagement.getCameraCode())) {
                                             //如果不包含此相机编码
                                             for (TerminalHeartbeatLog terminalHeartbeatLog : heartbeatLogList) {
+                                                log.info("-----5555555----" );
                                                 cameraUtil.stopStream(terminalHeartbeatLog.getCameraCode(), terminalHeartbeatLog.getChannel());
                                             }
                                         }
                                     }
                                     //添加心跳相机日志信息
-                                    terminalHeartbeatLogService.add(baseCameraManagement.getCameraCode(), baseCameraManagement.getChannel());
                                 });
+                                int add4 = terminalHeartbeatLogService.add(baseCameraManagement.getCameraCode(), baseCameraManagement.getChannel());
+                                log.info("-----add4----" + add4);
                             }
                         }
                         twoMap.put("currentStream", playFlv);
@@ -930,13 +941,15 @@ public class GeoHazardMonitorTokenController {
                                     if (!finalCodeList2.contains(baseCameraManagement.getCameraCode())) {
                                         //如果不包含此相机编码
                                         for (TerminalHeartbeatLog terminalHeartbeatLog : heartbeatLogList) {
+                                            log.info("-----6666666----" );
                                             cameraUtil.stopStream(terminalHeartbeatLog.getCameraCode(), terminalHeartbeatLog.getChannel());
                                         }
                                     }
                                 }
                                 //添加心跳相机日志信息
-                                terminalHeartbeatLogService.add(baseCameraManagement.getCameraCode(), baseCameraManagement.getChannel());
                             });
+                            int add5 = terminalHeartbeatLogService.add(baseCameraManagement.getCameraCode(), baseCameraManagement.getChannel());
+                            log.info("-----add5----" + add5);
                         }
                     } else {
                         log.info("-------------->>已进入拉三路路视频");
@@ -952,13 +965,15 @@ public class GeoHazardMonitorTokenController {
                                     if (!finalCodeList3.contains(baseCameraManagement.getCameraCode())) {
                                         //如果不包含此相机编码
                                         for (TerminalHeartbeatLog terminalHeartbeatLog : heartbeatLogList) {
+                                            log.info("-----77777----" );
                                             cameraUtil.stopStream(terminalHeartbeatLog.getCameraCode(), terminalHeartbeatLog.getChannel());
                                         }
                                     }
                                 }
                                 //添加心跳相机日志信息
-                                terminalHeartbeatLogService.add(baseCameraManagement.getCameraCode(), baseCameraManagement.getChannel());
                             });
+                            int add6 = terminalHeartbeatLogService.add(baseCameraManagement.getCameraCode(), baseCameraManagement.getChannel());
+                            log.info("-----add6----" + add6);
                         }
                     }
                     twoMap.put("currentStream", playFlv);