Merge remote-tracking branch 'origin/master'

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

@@ -18,15 +18,39 @@ public class MsgAlarmVo extends PageVo implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
+    /**
+     * 报警ID
+     */
+    private Long id;
+
+    /**
+     * 相机编码
+     */
+    private String cameraCode;
+
+    /**
+     * 剩余电量
+     */
+    private Integer electricity;
+
     /**
      * 线路编码
      */
     private String railwayCode;
 
+    /**
+     * 线路编码名称
+     */
+    private String railwayCodeName;
+
     /**
      * 报警行别
      */
     private Integer lineDir;
+    /**
+     * 报警行别 字符串
+     */
+    private String lineDirStr;
     
     /**
      * 报警病害类型（目前只有1泥石流，后续可扩展使用）
@@ -86,6 +110,4 @@ public class MsgAlarmVo extends PageVo implements Serializable {
      * 监控范围结束里程位置字符串形式
      */
     private String endMiles;
-
-   
 }

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

@@ -2,6 +2,7 @@ package com.ozs.service;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.ozs.common.core.domain.AjaxResult;
 import com.ozs.entity.MsgAlarm;
 import com.ozs.entity.vo.*;
 
@@ -56,4 +57,6 @@ public interface MsgAlarmService extends IService<MsgAlarm> {
     Integer appAlarmNum(MsgAlarmVo msgAlarmVo);
 
     List<MsgAlarm> msgAlarmList(MsgAlarmVo msgAlarmVo);
+
+    AjaxResult getDate(MsgAlarmVo msgAlarmVo);
 }

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

@@ -1,16 +1,26 @@
 package com.ozs.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.github.pagehelper.PageHelper;
+import com.ozs.common.core.domain.AjaxResult;
+import com.ozs.common.utils.AppendUtils;
+import com.ozs.common.utils.StringUtils;
+import com.ozs.entity.BaseCameraManagement;
+import com.ozs.entity.BaseDeviceDynamicManagement;
+import com.ozs.entity.BaseRailwayManagement;
 import com.ozs.entity.MsgAlarm;
 import com.ozs.entity.vo.*;
 import com.ozs.mapper.BaseCameraManagementMapper;
+import com.ozs.mapper.BaseDeviceDynamicManagementMapper;
+import com.ozs.mapper.BaseRailwayManagementMapper;
 import com.ozs.mapper.MsgAlarmMapper;
 import com.ozs.service.MsgAlarmService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.util.ObjectUtils;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -31,6 +41,10 @@ public class MsgAlarmServiceImpl extends ServiceImpl<MsgAlarmMapper, MsgAlarm> i
     private MsgAlarmMapper msgAlarmMapper;
     @Autowired
     private BaseCameraManagementMapper baseCameraManagementMapper;
+    @Autowired
+    private BaseRailwayManagementMapper baseRailwayManagementMapper;
+    @Autowired
+    private BaseDeviceDynamicManagementMapper baseDeviceDynamicManagementMapper;
 
     public IPage listToPage(List list, int pageNum, int pageSize) {
         List pageList = new ArrayList<>();
@@ -84,7 +98,7 @@ public class MsgAlarmServiceImpl extends ServiceImpl<MsgAlarmMapper, MsgAlarm> i
 
     @Override
     public Long getAlarmNum() {
-        Long alarmNum =  msgAlarmMapper.getAlarmNum();
+        Long alarmNum = msgAlarmMapper.getAlarmNum();
         return alarmNum;
     }
 
@@ -141,4 +155,52 @@ public class MsgAlarmServiceImpl extends ServiceImpl<MsgAlarmMapper, MsgAlarm> i
     public List<MsgAlarm> msgAlarmList(MsgAlarmVo msgAlarmVo) {
         return msgAlarmMapper.selectMsgAlarmList(msgAlarmVo);
     }
+
+    @Override
+    public AjaxResult getDate(MsgAlarmVo msgAlarmVo) {
+        // 查询报警信息
+        MsgAlarm msgAlarm = msgAlarmMapper.selectById(msgAlarmVo.getId());
+        if (StringUtils.isEmptySunhh(msgAlarm)) {
+            return AjaxResult.error("报警信息不存在！");
+        }
+        // 查询线路
+        LambdaQueryWrapper<BaseRailwayManagement> lwBaseRailwayManagement = new LambdaQueryWrapper<>();
+        if (!StringUtils.isEmptySunhh(msgAlarmVo.getRailwayCode())) {
+            lwBaseRailwayManagement.eq(BaseRailwayManagement::getRailwayCode, msgAlarmVo.getRailwayCode());
+        }
+        BaseRailwayManagement baseRailwayManagement = baseRailwayManagementMapper.selectOne(lwBaseRailwayManagement);
+        if (StringUtils.isEmptySunhh(baseRailwayManagement)) {
+            return AjaxResult.error("线路编码：" + msgAlarmVo.getRailwayCode() + "不存在！");
+        }
+        // 查询里程位置最近的相机
+        LambdaQueryWrapper<BaseCameraManagement> lw = new LambdaQueryWrapper<>();
+        if (!StringUtils.isEmptySunhh(msgAlarmVo.getRailwayCode())) {
+            lw.eq(BaseCameraManagement::getRailwayCode, msgAlarmVo.getRailwayCode());
+        }
+        if (!StringUtils.isEmptySunhh(msgAlarmVo.getAlarmMile())) {
+            lw.le(BaseCameraManagement::getBeginMile, msgAlarmVo.getAlarmMile());
+            lw.gt(BaseCameraManagement::getEndMile, msgAlarmVo.getAlarmMile());
+        }
+        BaseCameraManagement baseCameraManagement = baseCameraManagementMapper.selectOne(lw);
+        if (StringUtils.isEmptySunhh(baseCameraManagement)) {
+            return AjaxResult.error("线路编码：" + msgAlarmVo.getRailwayCode() + "不存在对应里程范围为："+ msgAlarmVo.getAlarmMile() +"的相机！");
+        }
+        LambdaQueryWrapper<BaseDeviceDynamicManagement> queryWrapper = new LambdaQueryWrapper<>();
+        if (!ObjectUtils.isEmpty(baseCameraManagement.getCameraCode())) {
+            queryWrapper.eq(BaseDeviceDynamicManagement::getCameraCode, baseCameraManagement.getCameraCode());
+        }
+        BaseDeviceDynamicManagement baseDeviceDynamicManagement = baseDeviceDynamicManagementMapper.selectOne(queryWrapper);
+        if (StringUtils.isEmptySunhh(baseDeviceDynamicManagement)) {
+            return AjaxResult.error("设备动态管理表中没有该相机编码:" + baseCameraManagement.getCameraCode() + "的数据");
+        }
+        MsgAlarmVo msgAlarmVo1 = new MsgAlarmVo();
+        // BeanUtils.copyProperties(msgAlarm, msgAlarmVo1);
+        msgAlarmVo1.setRailwayCode(msgAlarm.getRailwayCode());
+        msgAlarmVo1.setRailwayCodeName(baseRailwayManagement.getRailwayName());
+        msgAlarmVo1.setAlarmMiles(AppendUtils.stringAppend(msgAlarmVo.getAlarmMile()));
+        msgAlarmVo1.setLineDirStr(baseCameraManagement.getLineDir() == 1 ? "上行" : "下行");
+        msgAlarmVo1.setCameraCode(baseCameraManagement.getCameraCode());
+        msgAlarmVo1.setElectricity(baseDeviceDynamicManagement.getElectricity());
+        return AjaxResult.success(msgAlarmVo1);
+    }
 }

vehicle-admin/src/main/java/com/ozs/web/controller/accountmanagment/BaseCameraManagementController.java

@@ -385,6 +385,11 @@ public class BaseCameraManagementController extends BaseController {
         return AjaxResult.success(baseCameraManagement);
     }
 
+    /**
+     * ***********************   弃用   ***********************
+     * @param cameraCode
+     * @return
+     */
     @GetMapping("/getDate/{cameraCode}")
     @ApiOperation("视频上方显示的数据")
     @Log(title = "相机台账管理", businessType = BusinessType.OTHER)

vehicle-admin/src/main/java/com/ozs/web/controller/accountmanagment/MsgAlarmController.java

@@ -338,6 +338,28 @@ public class MsgAlarmController extends BaseController {
         }
     }
 
+    /**
+     * 视频上方显示的数据
+     * @param msgAlarmVo
+     * @return
+     */
+    @PostMapping("/getDate")
+    @ApiOperation("视频上方显示的数据")
+    @Log(title = "报警信息管理", businessType = BusinessType.OTHER)
+    public AjaxResult getDate(@RequestBody MsgAlarmVo msgAlarmVo) {
+        if (StringUtils.isEmptySunhh(msgAlarmVo) || StringUtils.isEmptySunhh(msgAlarmVo.getId())) {
+            return error("报警id不能为空！");
+        }
+        if (StringUtils.isEmptySunhh(msgAlarmVo) || StringUtils.isEmptySunhh(msgAlarmVo.getRailwayCode())) {
+            return error("报警线路编码不能为空！");
+        }
+        if (StringUtils.isEmptySunhh(msgAlarmVo) || StringUtils.isEmptySunhh(msgAlarmVo.getAlarmMile())) {
+            return error("报警里程位置不能为空！");
+        }
+//        MsgAlarmVo msgAlarmVo1 = msgAlarmService.getDate(msgAlarmVo);
+        return msgAlarmService.getDate(msgAlarmVo);
+    }
+
     @PutMapping(value = "/updateIsRelease")
     @ApiOperation("根据报警信息ID解除报警")
     @Log(title = "报警信息管理", businessType = BusinessType.UPDATE)

vehicle-admin/src/main/java/com/ozs/web/core/util/CameraUtil.java

@@ -230,7 +230,7 @@ ffmpeg -i "concat:1.ts|2.ts" -c copy output.mp4
      * @return
      */
     public static String startRecording(String cameraCode, String channel) {
-        return historyUrl + "/api/record/flv/start?streamPath=" + channel + "/" + cameraCode;
+        return historyUrl + "/recordpro/api/start?streamPath=" + channel + "/" + cameraCode;
     }
 
     /**
@@ -240,7 +240,7 @@ ffmpeg -i "concat:1.ts|2.ts" -c copy output.mp4
      * @return
      */
     public static String endRecording(String taskId) {
-        return historyUrl + "/api/record/flv/stop?id=" + taskId;
+        return historyUrl + "/recordpro/api/stop?id=" + taskId;
     }
 
 

vehicle-admin/src/main/resources/application.yml

@@ -18,6 +18,7 @@ base:
   dbname: vehicle #数据库名
   #图片路径前缀
   imgUrl: http://124.71.171.71:18801/picbucket
+  historyUrl: http://124.70.58.209:18812
 
 server:
   # 服务器的HTTP端口，默认为8080