车载心跳监测接口定义修改

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

@@ -359,37 +359,37 @@ public class GeoHazardMonitorTokenController {
 
                 log.info("alarmJSON ：{}", JSON.toJSONString(msgAlarm));
                 log.info("->>>>>>>>>>>>>>>>>>>>>>>>>>" + msgAlarm);
-                String result = HttpClientUtil.postJson(sdkUrl, JSON.toJSONString(msgAlarm));
-                log.info("->>>>>>>>>>>>>>>>>>>>>>>>>>>>" + result);
-                log.info("result：{}", result);
-                if (!ObjectUtils.isEmpty(baseCameraManagementList)) {
-
-                    // 获取当前时间的前5分钟
-                    List<SysDictData> frontValue = dictTypeService.selectDictDataByType("alarm_time");
-                    Date fiveMinutesAgo = Date.from(Instant.now().minus(Long.valueOf(frontValue.get(0).getDictValue()), ChronoUnit.MINUTES));
-                    SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-                    String formattedDate = sdf.format(fiveMinutesAgo);
-                    LambdaQueryWrapper<MsgAlarm> wrapper1 = new LambdaQueryWrapper<MsgAlarm>();
-                    wrapper1.eq(MsgAlarm::getAlarmMile, alarm.getAlarmMile());
-                    wrapper1.ge(MsgAlarm::getAlarmTime,formattedDate);
-                    List<MsgAlarm> list = msgAlarmService.list(lw);
-                    if (list.size() < 0) {
-                        CompletableFuture.runAsync(() -> {
-                            String records = CameraUtil.getPlayFlvRtsp(baseCameraManagementList.get(0).getCameraCode(), baseCameraManagementList.get(0).getChannel(), true);
-                            log.info("-----records-----------" + records);
-                            MsgAlarm alarm1 = msgAlarmService.getById(msgAlarm.getId());
-                            alarm1.setReleasedUrl(records);
-                            msgAlarmService.updateById(alarm1);
-                        });
-                    }
-//                    String url = future.get();
-//                    if (url.contains("无视频")) {
-//                        jsonObject.put("resultCode", 0);
-//                        jsonObject.put("message", url);
-//                        return SM4Utils.encryptData_ECB(JSONObject.toJSONString(jsonObject), key);
-//                    }else {
+//                String result = HttpClientUtil.postJson(sdkUrl, JSON.toJSONString(msgAlarm));
+//                log.info("->>>>>>>>>>>>>>>>>>>>>>>>>>>>" + result);
+//                log.info("result：{}", result);
+//                if (!ObjectUtils.isEmpty(baseCameraManagementList)) {
+//
+//                    // 获取当前时间的前5分钟
+//                    List<SysDictData> frontValue = dictTypeService.selectDictDataByType("alarm_time");
+//                    Date fiveMinutesAgo = Date.from(Instant.now().minus(Long.valueOf(frontValue.get(0).getDictValue()), ChronoUnit.MINUTES));
+//                    SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+//                    String formattedDate = sdf.format(fiveMinutesAgo);
+//                    LambdaQueryWrapper<MsgAlarm> wrapper1 = new LambdaQueryWrapper<MsgAlarm>();
+//                    wrapper1.eq(MsgAlarm::getAlarmMile, alarm.getAlarmMile());
+//                    wrapper1.ge(MsgAlarm::getAlarmTime,formattedDate);
+//                    List<MsgAlarm> list = msgAlarmService.list(lw);
+//                    if (list.size() < 0) {
+//                        CompletableFuture.runAsync(() -> {
+//                            String records = CameraUtil.getPlayFlvRtsp(baseCameraManagementList.get(0).getCameraCode(), baseCameraManagementList.get(0).getChannel(), true);
+//                            log.info("-----records-----------" + records);
+//                            MsgAlarm alarm1 = msgAlarmService.getById(msgAlarm.getId());
+//                            alarm1.setReleasedUrl(records);
+//                            msgAlarmService.updateById(alarm1);
+//                        });
 //                    }
-                }
+////                    String url = future.get();
+////                    if (url.contains("无视频")) {
+////                        jsonObject.put("resultCode", 0);
+////                        jsonObject.put("message", url);
+////                        return SM4Utils.encryptData_ECB(JSONObject.toJSONString(jsonObject), key);
+////                    }else {
+////                    }
+//                }
             } else {
                 BeanUtils.copyProperties(reqMsgAlarmVo, msgAlarmVice);
                 msgAlarmVice.setCreateBy(admin.getUserId());