报警接口修改

business-service/src/main/java/com/ozs/entity/vo/AlarmInfoVo.java

@@ -1,5 +1,6 @@
 package com.ozs.entity.vo;
 
+import com.ozs.common.annotation.Excel;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -34,6 +35,15 @@ public class AlarmInfoVo implements Serializable {
      * 当前报警级别
      */
     private Integer alarmLevel;
+    /**
+     * 行别(1上行2下行）
+     */
+    private String lineDirStr;
+
+    /**
+     * 报警是否解除 1已解除2未解除
+     */
+    private Integer isRelease;
     /**
      * 报警附件（集合）
      */

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

@@ -277,7 +277,7 @@ public class GeoHazardMonitorTokenController {
                 jsonObject.put("data", "报警时间不能为空");
                 return SM4Utils.encryptData_ECB(JSONObject.toJSONString(jsonObject), key);
             }
-            if (reqMsgAlarmVo.getAlarmType() < 1 || reqMsgAlarmVo.getAlarmType() > 3) {
+            if (reqMsgAlarmVo.getAlarmType() < 1 || reqMsgAlarmVo.getAlarmType() > 4) {
                 jsonObject.put("resultCode", 0);
                 jsonObject.put("message", "失败");
                 jsonObject.put("data", "报警病害类型填写错误");
@@ -302,13 +302,6 @@ public class GeoHazardMonitorTokenController {
                 wrapper.eq(BaseCameraManagement::getEnableOrNot, 1);
             }
             List<BaseCameraManagement> baseCameraManagementList = baseCameraManagementService.list(wrapper);
-            log.info("baseCameraManagement:{}", baseCameraManagementList);
-            if (baseCameraManagementList.size() <= 0) {
-                jsonObject.put("resultCode", 0);
-                jsonObject.put("message", "失败");
-                jsonObject.put("data", "报警里程位置没有可用的相机!!!");
-                return SM4Utils.encryptData_ECB(JSONObject.toJSONString(jsonObject), key);
-            }
             LambdaQueryWrapper<MsgAlarm> lw = new LambdaQueryWrapper<MsgAlarm>();
             if (!ObjectUtils.isEmpty(reqMsgAlarmVo.getAlarmId())) {
                 lw.eq(MsgAlarm::getAlarmId, reqMsgAlarmVo.getAlarmId());
@@ -363,10 +356,11 @@ public class GeoHazardMonitorTokenController {
                 String result = HttpClientUtil.postJson(sdkUrl, JSON.toJSONString(msgAlarm));
                 log.info("->>>>>>>>>>>>>>>>>>>>>>>>>>>>" + result);
                 log.info("result：{}", result);
-
-                List<String> collect = baseCameraManagementList.stream().map(BaseCameraManagement::getCameraCode).collect(Collectors.toList());
-                List<SysDictData> data = dictTypeService.selectDictDataByType("alarm_play_time_value");
-                CompletableFuture.runAsync(() -> cameraUtil.playbackURLs(collect, data.get(0).getDictValue()));
+                if (!ObjectUtils.isEmpty(baseCameraManagementList)) {
+                    List<String> collect = baseCameraManagementList.stream().map(BaseCameraManagement::getCameraCode).collect(Collectors.toList());
+                    List<SysDictData> data = dictTypeService.selectDictDataByType("alarm_play_time_value");
+                    CompletableFuture.runAsync(() -> cameraUtil.playbackURLs(collect, data.get(0).getDictValue()));
+                }
             } else {
                 BeanUtils.copyProperties(reqMsgAlarmVo, msgAlarmVice);
                 msgAlarmVice.setCreateBy(admin.getUserId());
@@ -873,7 +867,9 @@ public class GeoHazardMonitorTokenController {
                                         log.info("--------------str--------------:" + str);
                                         String[] parts = str.split("/");
                                         log.info("--------------parts--------------:" + parts);
-                                        cameraUtil.stopStream(parts[0], parts[1]);
+                                        if (parts.length==2) {
+                                            cameraUtil.stopStream(parts[0], parts[1]);
+                                        }
                                     }
                                 }
                             }
@@ -909,7 +905,9 @@ public class GeoHazardMonitorTokenController {
                                         log.info("--------------str--------------:" + str);
                                         String[] parts = str.split("/");
                                         log.info("--------------parts--------------:" + parts);
-                                        cameraUtil.stopStream(parts[0], parts[1]);
+                                        if (parts.length==2) {
+                                            cameraUtil.stopStream(parts[0], parts[1]);
+                                        }
                                     }
                                 }
                             }
@@ -987,7 +985,9 @@ public class GeoHazardMonitorTokenController {
                                     log.info("--------------str--------------:" + str);
                                     String[] parts = str.split("/");
                                     log.info("--------------parts--------------:" + parts);
-                                    cameraUtil.stopStream(parts[0], parts[1]);
+                                    if (parts.length==2) {
+                                        cameraUtil.stopStream(parts[0], parts[1]);
+                                    }
                                 }
                             }
                         }
@@ -1382,6 +1382,7 @@ public class GeoHazardMonitorTokenController {
             if (!ObjectUtils.isEmpty(cameraVo.getLineDir())) {
                 wrapper.eq(MsgAlarm::getLineDir, cameraVo.getLineDir());
             }
+            wrapper.orderByDesc(MsgAlarm::getAlarmTime);
             List<MsgAlarm> list = msgAlarmService.list(wrapper);
             if (list.size() <= 0) {
                 jsonObject.put("resultCode", 0);
@@ -1399,6 +1400,8 @@ public class GeoHazardMonitorTokenController {
                 alarmInfoVo1.setAlarmTime(msgAlarm.getAlarmTime().getTime());
                 alarmInfoVo1.setAlarmType(msgAlarm.getAlarmType());
                 alarmInfoVo1.setAlarmLevel(msgAlarm.getAlarmLevel());
+                alarmInfoVo1.setLineDirStr(msgAlarm.getLineDir() == 1 ? "上行" : "下行");
+                alarmInfoVo1.setIsRelease(msgAlarm.getIsRelease());
                 LambdaQueryWrapper<MsgAlarmExt> alarm = new LambdaQueryWrapper<>();
                 alarm.eq(MsgAlarmExt::getAlarmId, msgAlarm.getAlarmId());
                 List<MsgAlarmExt> list1 = msgAlarmExtService.list(alarm);