第三方接口修改

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

@@ -582,27 +582,27 @@ public class GeoHazardMonitorTokenController {
             LambdaQueryWrapper<BaseVehicleTerminal> terminal = new LambdaQueryWrapper<>();
             terminal.eq(BaseVehicleTerminal::getTerminalCode, vehiclePosition.getTerminalCode());
             boolean update = baseVehicleTerminalService.update(baseVehicleTerminal, terminal);
-            //*******获取终端经度纬度，将车载终端code改为机车的code，便是机车的位置
-            HeartbeatVo heartbeatVoCH = new HeartbeatVo();
-            BeanUtils.copyProperties(heartbeatVo, heartbeatVoCH);
-            //*******将终端关联的机车编码赋值给推送信息对象
-            heartbeatVoCH.setVehicleCode(baseTerminal.getVehicleCode());
-            String content = objStr(heartbeatVoCH);
-            //获取在线用户
-            List<SysUserOnline> rows = (List<SysUserOnline>) sysUserOnlineController.list(null, null).getRows();
-            if (!ObjectUtils.isEmpty(rows)) {
-                //拿到用户userNameList
-                List<String> userNameList = rows.stream().map(SysUserOnline::getUserName).collect(Collectors.toList());
-                LambdaQueryWrapper<SysUser> userWrapper = new LambdaQueryWrapper<>();
-                userWrapper.in(SysUser::getUserName, userNameList);
-                List<SysUser> sysUsers = sysUserMapper.selectList(userWrapper);
-                //拿到用户userIdList
-                List<Long> userIdList = sysUsers.stream().map(SysUser::getId).collect(Collectors.toList());
-                for (Long userid : userIdList) {
-                    //推送给在线用户
-                    webSocketServer.sendOneMessage(String.valueOf(userid), content);
-                }
-            }
+//            //*******获取终端经度纬度，将车载终端code改为机车的code，便是机车的位置
+//            HeartbeatVo heartbeatVoCH = new HeartbeatVo();
+//            BeanUtils.copyProperties(heartbeatVo, heartbeatVoCH);
+//            //*******将终端关联的机车编码赋值给推送信息对象
+//            heartbeatVoCH.setVehicleCode(baseTerminal.getVehicleCode());
+//            String content = objStr(heartbeatVoCH);
+//            //获取在线用户
+//            List<SysUserOnline> rows = (List<SysUserOnline>) sysUserOnlineController.list(null, null).getRows();
+//            if (!ObjectUtils.isEmpty(rows)) {
+//                //拿到用户userNameList
+//                List<String> userNameList = rows.stream().map(SysUserOnline::getUserName).collect(Collectors.toList());
+//                LambdaQueryWrapper<SysUser> userWrapper = new LambdaQueryWrapper<>();
+//                userWrapper.in(SysUser::getUserName, userNameList);
+//                List<SysUser> sysUsers = sysUserMapper.selectList(userWrapper);
+//                //拿到用户userIdList
+//                List<Long> userIdList = sysUsers.stream().map(SysUser::getId).collect(Collectors.toList());
+//                for (Long userid : userIdList) {
+//                    //推送给在线用户
+//                    webSocketServer.sendOneMessage(String.valueOf(userid), content);
+//                }
+//            }
 
             //目视距离和里程位置
             if (save && update) {
@@ -616,8 +616,8 @@ public class GeoHazardMonitorTokenController {
                 if (list.size() > 0) {
                     //获取报警里程所监控的所有相机
                     LambdaQueryWrapper<BaseCameraManagement> camera = new LambdaQueryWrapper<BaseCameraManagement>();
-                    camera.ge(BaseCameraManagement::getBeginMile, list.get(0).getAlarmMile());
-                    camera.le(BaseCameraManagement::getEndMile, list.get(0).getAlarmMile());
+                    camera.ge(BaseCameraManagement::getEndMile, list.get(0).getAlarmMile());
+                    camera.le(BaseCameraManagement::getBeginMile, list.get(0).getAlarmMile());
                     camera.eq(BaseCameraManagement::getLineDir, heartbeatVo.getLineDir());
                     camera.eq(BaseCameraManagement::getRailwayCode, heartbeatVo.getRailwayCode());
                     camera.orderByAsc(BaseCameraManagement::getInstallMile);
@@ -642,17 +642,13 @@ public class GeoHazardMonitorTokenController {
                         LambdaQueryWrapper<MsgAlarmExt> ext = new LambdaQueryWrapper<>();
                         ext.eq(MsgAlarmExt::getAlarmId, list.get(0).getAlarmId());
                         MsgAlarmExt one = msgAlarmExtService.getOne(ext);
-                        if (ObjectUtils.isEmpty(one)) {
-                            jsonObject.put("resultCode", 0);
-                            jsonObject.put("message", "失败");
-                            jsonObject.put("data", "没有该报警ID的关联信息");
-                            return SM4Utils.encryptData_ECB(JSONObject.toJSONString(jsonObject), "4370780c9a8c43e5");
+                        if (!ObjectUtils.isEmpty(one)) {
+                            files[0] = new AlarmFilesVo();
+                            files[0].setAlarmAttType(one.getAlarmAttType());
+                            files[0].setAlarmAttPath(one.getAlarmAttPath());
+                            //返回结果
+                            alarmInfoVo.setAlarmFiles(files);
                         }
-                        files[0] = new AlarmFilesVo();
-                        files[0].setAlarmAttType(one.getAlarmAttType());
-                        files[0].setAlarmAttPath(one.getAlarmAttPath());
-                        //返回结果
-                        alarmInfoVo.setAlarmFiles(files);
                         respHeartbeatVo.setAlarmInfo(alarmInfoVo);
                     } else {
                         jsonObject.put("resultCode", 0);
@@ -692,13 +688,15 @@ public class GeoHazardMonitorTokenController {
                                 LambdaQueryWrapper<MsgAlarmExt> alarm = new LambdaQueryWrapper<>();
                                 alarm.eq(MsgAlarmExt::getAlarmId, list.get(0).getAlarmId());
                                 List<MsgAlarmExt> list1 = msgAlarmExtService.list(alarm);
-                                AlarmFilesVo[] vo = new AlarmFilesVo[list1.size()];
-                                for (int i1 = 0; i1 < list1.size(); i1++) {
-                                    vo[i1] = new AlarmFilesVo();
-                                    vo[i1].setAlarmAttType(list1.get(i1).getAlarmAttType());
-                                    vo[i1].setAlarmAttPath(list1.get(i1).getAlarmAttPath());
+                                if (list1.size() > 0) {
+                                    AlarmFilesVo[] vo = new AlarmFilesVo[list1.size()];
+                                    for (int i1 = 0; i1 < list1.size(); i1++) {
+                                        vo[i1] = new AlarmFilesVo();
+                                        vo[i1].setAlarmAttType(list1.get(i1).getAlarmAttType());
+                                        vo[i1].setAlarmAttPath(list1.get(i1).getAlarmAttPath());
+                                    }
+                                    alarmInfoVo1.setAlarmFiles(vo);
                                 }
-                                alarmInfoVo1.setAlarmFiles(vo);
                                 alarmListVo.setAlarmInfo(alarmInfoVo1);
                                 listVos.add(alarmListVo);
                             }