视频上方显示的数据

business-service/src/main/java/com/ozs/entity/BaseCameraManagement.java

@@ -55,7 +55,7 @@ public class BaseCameraManagement extends BaseEntity implements Serializable {
     private String channel;
 
     /**
-     * 所属工务段编码(单位id)
+     * 所属分公司编码(单位id)
      */
     private Long deptId;
 

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

@@ -159,6 +159,7 @@ public class MsgAlarmServiceImpl extends ServiceImpl<MsgAlarmMapper, MsgAlarm> i
     @Override
     public AjaxResult getDate(MsgAlarmVo msgAlarmVo) {
         // 查询报警信息
+        MsgAlarmVo msgAlarmVo1 = new MsgAlarmVo();
         MsgAlarm msgAlarm = msgAlarmMapper.selectById(msgAlarmVo.getId());
         if (StringUtils.isEmptySunhh(msgAlarm)) {
             return AjaxResult.error("报警信息不存在！");
@@ -182,30 +183,23 @@ public class MsgAlarmServiceImpl extends ServiceImpl<MsgAlarmMapper, MsgAlarm> i
             lw.gt(BaseCameraManagement::getEndMile, msgAlarmVo.getAlarmMile());
         }
         List<BaseCameraManagement> baseCameraManagementList = baseCameraManagementMapper.selectList(lw);
-        BaseCameraManagement baseCameraManagement = new BaseCameraManagement();
-        if (!StringUtils.isEmptySunhh(baseCameraManagementList) && baseCameraManagementList.size() > 0) {
-            baseCameraManagement = baseCameraManagementList.get(0);
-        }
-//        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());
+        if (!ObjectUtils.isEmpty(baseCameraManagementList)) {
+            BaseCameraManagement baseCameraManagement = baseCameraManagementList.get(0);
+            if (!ObjectUtils.isEmpty(baseCameraManagement.getCameraCode())) {
+                LambdaQueryWrapper<BaseDeviceDynamicManagement> queryWrapper = new LambdaQueryWrapper<>();
+                queryWrapper.eq(BaseDeviceDynamicManagement::getCameraCode, baseCameraManagement.getCameraCode());
+                BaseDeviceDynamicManagement baseDeviceDynamicManagement = baseDeviceDynamicManagementMapper.selectOne(queryWrapper);
+                if (!StringUtils.isEmptySunhh(baseDeviceDynamicManagement)) {
+                    msgAlarmVo1.setElectricity(baseDeviceDynamicManagement.getElectricity());
+                }
+            }
+            msgAlarmVo1.setLineDirStr(baseCameraManagement.getLineDir() == 1 ? "上行" : "下行");
+            msgAlarmVo1.setCameraCode(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());
         msgAlarmVo1.setIsReleaseName(msgAlarm.getIsRelease() == 1 ? "已解除" : "未解除");
         return AjaxResult.success(msgAlarmVo1);
     }