相机修改

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

@@ -41,6 +41,12 @@ public class BaseCameraManagement extends BaseEntity implements Serializable {
     @Excel(name = "监控相机安装里程位置(单位KM)")
     private String installMiles;
 
+    /**
+     * 测点名称
+     */
+    @Excel(name = "测点名称")
+    private String measurePointName;
+
     /**
      *线路名称
      */
@@ -186,6 +192,12 @@ public class BaseCameraManagement extends BaseEntity implements Serializable {
      */
     @TableField(exist = false)
     private Integer isStartRecording;
+
+    /**
+     * 相机序列号
+     */
+    @Excel(name = "序列号")
+    private String cameraSn;
     
     @Excel(name = "备注")
     private String remark;

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

@@ -1,10 +1,6 @@
 package com.ozs.service.entity.vo;
 
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
 import com.ozs.common.annotation.Excel;
-import com.ozs.common.core.domain.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
@@ -30,7 +26,7 @@ public class BaseCameraManagementVos implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
-   
+
     /**
      * 相机编码
      */
@@ -42,7 +38,7 @@ public class BaseCameraManagementVos implements Serializable {
      */
     @Excel(name = "通道编号")
     private String channel;
-    
+
 
     /**
      * 行别(1上行2下行）
@@ -61,13 +57,13 @@ public class BaseCameraManagementVos implements Serializable {
      */
     @Excel(name = "监视相机纬度")
     private String installLatitude;
-    
+
     /**
      * 物联网卡号
      */
     @Excel(name = "物联网卡号")
     private String cardNum;
-    
+
     /**
      *所属工务段名称
      */
@@ -97,7 +93,21 @@ public class BaseCameraManagementVos implements Serializable {
      */
     @Excel(name = "线路名称")
     private String railwayName;
-    
+
+
     @Excel(name = "备注")
     private String remark;
-}
+
+    /**
+     * 相机序列号
+     */
+    @Excel(name = "序列号")
+    private String cameraSn;
+
+    /**
+     * 测点名称
+     */
+    @Excel(name = "测点名称")
+    private String measurePointName;
+
+}

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

@@ -151,7 +151,10 @@ public class MsgAlarmResp implements Serializable {
      * 1已报警2未报警
      */
     private Integer failureToAlarm;
-    
 
+    /**
+     * 测点名称
+     */
+    private String measurePointName;
 
 }

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

@@ -18,6 +18,7 @@ import java.util.Map;
  * @since 2023-02-22
  */
 public interface MsgAlarmService extends IService<MsgAlarm> {
+    //web数据统计 报警数据详情
     IPage<AlarmStatisticVo> list(AlarmStatisticResVo alarmStatisticResVo);
 
     IPage listToPage(List list, int pageNum, int pageSize);
@@ -30,7 +31,6 @@ public interface MsgAlarmService extends IService<MsgAlarm> {
 
     //报警数据详情导出数据集合
     List<AlarmStatisticDto> exportExcel(AlarmStatisticResVo alarmStatisticResVo);
-
     /**
      * 通过相机编码查询未解除预警信息
      *

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

@@ -100,18 +100,37 @@ public class BaseCameraManagementServiceImpl extends ServiceImpl<BaseCameraManag
                         }
                         BaseRailwayManagement baseRailwayManagement = baseRailwayManagementService.getOne(queryWrapper);
                         if (!ObjectUtils.isEmpty(baseRailwayManagement)) {
-                            if (!accountManagement.getBeginMiles().matches(PATTERN) || !accountManagement.getInstallMiles().matches(PATTERN) || !accountManagement.getEndMiles().matches(PATTERN)) {
+                            if (!accountManagement.getInstallMiles().matches(PATTERN)) {
                                 failureNum++;
-                                failureMsg.append(failureNum + "、相机编码为: " + accountManagement.getCameraCode() + "的数据,里程位置填写格式不正确,请填写数字");
+                                failureMsg.append(failureNum + "、相机编码为: " + accountManagement.getCameraCode() + "的数据,安装里程位置填写格式不正确,请填写数字");
                             } else {
-                                Double install =Double.valueOf(accountManagement.getInstallMiles());
-                                Double end = Double.valueOf( accountManagement.getEndMiles());
-                                Double begin = Double.valueOf(accountManagement.getBeginMiles());
+                                Double install = Double.valueOf(accountManagement.getInstallMiles());
                                 accountManagement.setRailwayCode(baseRailwayManagement.getRailwayCode());
                                 accountManagement.setInstallMile((int) (install * 1000));
-                                accountManagement.setEndMile((int) (end * 1000));
-                                accountManagement.setBeginMile((int) (begin * 1000));
-                                if (accountManagement.getBeginMile() < accountManagement.getEndMile()) {
+                                if (!ObjectUtils.isEmpty(accountManagement.getBeginMiles()) && !ObjectUtils.isEmpty(accountManagement.getEndMiles())) {
+                                    Double end = Double.valueOf(accountManagement.getEndMiles());
+                                    Double begin = Double.valueOf(accountManagement.getBeginMiles());
+                                    accountManagement.setEndMile((int) (end * 1000));
+                                    accountManagement.setBeginMile((int) (begin * 1000));
+                                    if (!accountManagement.getBeginMiles().matches(PATTERN) || !accountManagement.getEndMiles().matches(PATTERN)) {
+                                        failureNum++;
+                                        failureMsg.append(failureNum + "、相机编码为: " + accountManagement.getCameraCode() + "的数据,监控范围里程位置填写格式不正确,请填写数字");
+                                    } else {
+                                        if (accountManagement.getBeginMile() < accountManagement.getEndMile()) {
+                                            baseCameraManagementMapper.insert(accountManagement);
+                                            BaseDeviceDynamicManagement baseDeviceDynamicManagement = new BaseDeviceDynamicManagement();
+                                            baseDeviceDynamicManagement.setCameraCode(accountManagement.getCameraCode());
+                                            baseDeviceDynamicManagement.setUpdateBy(userId);
+                                            baseDeviceDynamicManagement.setCreateBy(userId);
+                                            baseDeviceDynamicManagementMapper.insert(baseDeviceDynamicManagement);
+                                            successNum++;
+                                            successMsg.append(successNum + "、相机编码 " + accountManagement.getCameraCode() + " 导入成功");
+                                        } else {
+                                            failureNum++;
+                                            failureMsg.append(failureNum + "、相机编码为: " + accountManagement.getCameraCode() + "的数据,监控范围开始里程位置不能大于监控范围结束里程位置");
+                                        }
+                                    }
+                                } else {
                                     baseCameraManagementMapper.insert(accountManagement);
                                     BaseDeviceDynamicManagement baseDeviceDynamicManagement = new BaseDeviceDynamicManagement();
                                     baseDeviceDynamicManagement.setCameraCode(accountManagement.getCameraCode());
@@ -120,9 +139,6 @@ public class BaseCameraManagementServiceImpl extends ServiceImpl<BaseCameraManag
                                     baseDeviceDynamicManagementMapper.insert(baseDeviceDynamicManagement);
                                     successNum++;
                                     successMsg.append(successNum + "、相机编码 " + accountManagement.getCameraCode() + " 导入成功");
-                                } else {
-                                    failureNum++;
-                                    failureMsg.append(failureNum + "、相机编码为: " + accountManagement.getCameraCode() + "的数据,监控范围开始里程位置不能大于监控范围结束里程位置");
                                 }
                             }
                         } else {
@@ -174,7 +190,7 @@ public class BaseCameraManagementServiceImpl extends ServiceImpl<BaseCameraManag
             }
         }
         if (failureNum > 0) {
-            failureMsg.insert(0, "很抱歉!需导入数据共有"+accountManageList.size()+"条。数据导入成功共 " + successNum + " 条。数据导入失败共 " + failureNum + " 条。错误如下：");
+            failureMsg.insert(0, "很抱歉!需导入数据共有" + accountManageList.size() + "条。数据导入成功共 " + successNum + " 条。数据导入失败共 " + failureNum + " 条。错误如下：");
             throw new ServiceException(failureMsg.toString());
         } else {
             successMsg.insert(0, "恭喜您!数据已全部导入成功！共 " + successNum + " 条。");

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

@@ -63,10 +63,14 @@ public class MsgAppPushServiceImpl extends ServiceImpl<MsgAppPushMapper, MsgAppP
                 o.setRailwayName(baseRailwayManagement.getRailwayName());
                 String mils = AppendUtils.stringAppend(cameraManagement.getInstallMile());
                 o.setAlarmMiles(mils);
-                String end = AppendUtils.stringAppend(cameraManagement.getEndMile());
-                o.setEndMile(end);
-                String begin = AppendUtils.stringAppend(cameraManagement.getBeginMile());
-                o.setBeginMile(begin);
+                if (!ObjectUtils.isEmpty(cameraManagement.getEndMile())) {
+                    String end = AppendUtils.stringAppend(cameraManagement.getEndMile());
+                    o.setEndMile(end);
+                }
+                if (!ObjectUtils.isEmpty(cameraManagement.getBeginMile())) {
+                    String begin = AppendUtils.stringAppend(cameraManagement.getBeginMile());
+                    o.setBeginMile(begin);
+                }
                 // o.setAlarmCount((int) msgAlarmFrequencyService.count()+1);
                 return o;
             }).collect(Collectors.toList());

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

@@ -69,10 +69,12 @@ public class MsgWebPushServiceImpl extends ServiceImpl<MsgWebPushMapper, MsgWebP
                 BeanUtils.copyProperties(msgAlarm, msgAlarmResp);
                 msgAlarmResp.setRailwayName(baseRailwayManagement.getRailwayName());
                 msgAlarmResp.setDeptId(baseCameraManagement.getDeptId());
-                String begin = AppendUtils.stringAppend(baseCameraManagement.getBeginMile());
-                String end = AppendUtils.stringAppend(baseCameraManagement.getEndMile());
-                String endMile = begin + "-" + end;
-                msgAlarmResp.setBeginMile(endMile);
+                if (!ObjectUtils.isEmpty(baseCameraManagement.getBeginMile())&&!ObjectUtils.isEmpty(baseCameraManagement.getEndMile())) {
+                    String begin = AppendUtils.stringAppend(baseCameraManagement.getBeginMile());
+                    String end = AppendUtils.stringAppend(baseCameraManagement.getEndMile());
+                    String endMile = begin + "-" + end;
+                    msgAlarmResp.setBeginMile(endMile);
+                }
                 String mile = AppendUtils.stringAppend(baseCameraManagement.getInstallMile());
                 msgAlarmResp.setAlarmMile(mile);
                 msgAlarmResp.setInstallLongitude(baseCameraManagement.getInstallLongitude() + "," + baseCameraManagement.getInstallLatitude());
@@ -113,10 +115,14 @@ public class MsgWebPushServiceImpl extends ServiceImpl<MsgWebPushMapper, MsgWebP
                 o.setRailwayName(baseRailwayManagement.getRailwayName());
                 String mils = AppendUtils.stringAppend(cameraManagement.getInstallMile());
                 o.setAlarmMiles(mils);
-                String end = AppendUtils.stringAppend(cameraManagement.getEndMile());
-                o.setEndMile(end);
-                String begin = AppendUtils.stringAppend(cameraManagement.getBeginMile());
-                o.setBeginMile(begin);
+                if (!ObjectUtils.isEmpty(cameraManagement.getEndMile())) {
+                    String end = AppendUtils.stringAppend(cameraManagement.getEndMile());
+                    o.setEndMile(end);
+                }
+                if (!ObjectUtils.isEmpty(cameraManagement.getBeginMile())) {
+                    String begin = AppendUtils.stringAppend(cameraManagement.getBeginMile());
+                    o.setBeginMile(begin);
+                }
                 // o.setAlarmCount((int) msgAlarmFrequencyService.count()+1);
                 return o;
             }).collect(Collectors.toList());

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

@@ -29,9 +29,9 @@ public class UserRegistrationidServiceImpl extends ServiceImpl<UserRegistrationi
         if (!ObjectUtils.isEmpty(userRegistrationid.getUserId())) {
             lw.in(UserRegistrationid::getUserId, userRegistrationid.getUserId());
         }
-        if (!ObjectUtils.isEmpty(userRegistrationid.getRegistrationId())) {
-            lw.in(UserRegistrationid::getRegistrationId, userRegistrationid.getRegistrationId());
-        }
+//        if (!ObjectUtils.isEmpty(userRegistrationid.getRegistrationId())) {
+//            lw.in(UserRegistrationid::getRegistrationId, userRegistrationid.getRegistrationId());
+//        }
         log.info("userRegistrationids111111111111111:--------" + userRegistrationid.getUserId());
         log.info("userRegistrationids222222222222222:--------" + userRegistrationid.getRegistrationId());
         List<UserRegistrationid> userRegistrationids = userRegistrationidMapper.selectList(lw);

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

@@ -130,10 +130,14 @@ public class BaseCameraManagementController extends BaseController {
             baseCameraManagement.setRailwayName(baseRailwayManagement.getRailwayName());
             String mils = AppendUtils.stringAppend(baseCameraManagement.getInstallMile());
             baseCameraManagement.setInstallMiles(mils);
-            String end = AppendUtils.stringAppend(baseCameraManagement.getEndMile());
-            baseCameraManagement.setEndMiles(end);
-            String begin = AppendUtils.stringAppend(baseCameraManagement.getBeginMile());
-            baseCameraManagement.setBeginMiles(begin);
+            if (!ObjectUtils.isEmpty(baseCameraManagement.getEndMile())) {
+                String end = AppendUtils.stringAppend(baseCameraManagement.getEndMile());
+                baseCameraManagement.setEndMiles(end);
+            }
+            if (!ObjectUtils.isEmpty(baseCameraManagement.getBeginMile())) {
+                String begin = AppendUtils.stringAppend(baseCameraManagement.getBeginMile());
+                baseCameraManagement.setBeginMiles(begin);
+            }
             return AjaxResult.success(baseCameraManagement);
         } else if (!StringUtils.isEmpty(isLock) && isLock == 2 && !StringUtils.isEmpty(cameraCode)) {
             MsgAlarm msgAlarm = msgAlarmService.selectByCameraCode(cameraCode);
@@ -151,10 +155,12 @@ public class BaseCameraManagementController extends BaseController {
             BeanUtils.copyProperties(msgAlarm, msgAlarmResp);
             msgAlarmResp.setRailwayName(baseRailwayManagement.getRailwayName());
             msgAlarmResp.setDeptId(baseCameraManagement.getDeptId());
-            String begin = AppendUtils.stringAppend(baseCameraManagement.getBeginMile());
-            String end = AppendUtils.stringAppend(baseCameraManagement.getEndMile());
-            String endMile = begin + "-" + end;
-            msgAlarmResp.setBeginMile(endMile);
+            if (!ObjectUtils.isEmpty(baseCameraManagement.getEndMile())&&!ObjectUtils.isEmpty(baseCameraManagement.getBeginMile())) {
+                String begin = AppendUtils.stringAppend(baseCameraManagement.getBeginMile());
+                String end = AppendUtils.stringAppend(baseCameraManagement.getEndMile());
+                String endMile = begin + "-" + end;
+                msgAlarmResp.setBeginMile(endMile);
+            }
             String mile = AppendUtils.stringAppend(baseCameraManagement.getInstallMile());
             msgAlarmResp.setAlarmMile(mile);
             msgAlarmResp.setInstallLongitude(baseCameraManagement.getInstallLongitude() + "," + baseCameraManagement.getInstallLatitude());
@@ -204,10 +210,14 @@ public class BaseCameraManagementController extends BaseController {
                 o.setRailwayName(baseRailwayManagement.getRailwayName());
                 String mils = AppendUtils.stringAppend(o.getInstallMile());
                 o.setInstallMiles(mils);
-                String end = AppendUtils.stringAppend(o.getEndMile());
-                o.setEndMiles(end);
-                String begin = AppendUtils.stringAppend(o.getBeginMile());
-                o.setBeginMiles(begin);
+                if (!ObjectUtils.isEmpty(o.getEndMile())) {
+                    String end = AppendUtils.stringAppend(o.getEndMile());
+                    o.setEndMiles(end);
+                }
+                if (!ObjectUtils.isEmpty(o.getBeginMile())) {
+                    String begin = AppendUtils.stringAppend(o.getBeginMile());
+                    o.setBeginMiles(begin);
+                }
                 if (roleKey.size() > 0 || "admin".equals(baseUser.getUserName())) {
                     o.setIsStartRecording(1);
                     for (String s : roleKey) {
@@ -427,9 +437,11 @@ public class BaseCameraManagementController extends BaseController {
         }
         String mils = AppendUtils.stringAppend(baseCameraManagement.getInstallMile());
         baseCameraManagement.setInstalls(mils);
-        String en = AppendUtils.stringAppend(baseCameraManagement.getEndMile());
-        String beg = AppendUtils.stringAppend(baseCameraManagement.getBeginMile());
-        baseCameraManagement.setBegins(beg + "~" + en);
+        if (!ObjectUtils.isEmpty(baseCameraManagement.getEndMile())&&!ObjectUtils.isEmpty(baseCameraManagement.getBeginMile())) {
+            String en = AppendUtils.stringAppend(baseCameraManagement.getEndMile());
+            String beg = AppendUtils.stringAppend(baseCameraManagement.getBeginMile());
+            baseCameraManagement.setBegins(beg + "~" + en);
+        }
         BaseUser baseUser = baseUserService.getUser(baseCameraManagement.getCreateBy());
         baseCameraManagement.setCreateBy(baseUser.getUserName());
         BaseUser user = baseUserService.getUser(baseCameraManagement.getUpdateBy());
@@ -474,6 +486,7 @@ public class BaseCameraManagementController extends BaseController {
         list.add(baseCameraManagement.getLineDir());
         list.add(baseCameraManagement.getCameraCode());
         list.add(baseDeviceDynamicManagement.getElectricity());
+        list.add(baseCameraManagement.getMeasurePointName());
         if (list1.size() <= 0) {
             list.add(1);
         } else {
@@ -529,10 +542,14 @@ public class BaseCameraManagementController extends BaseController {
             baseCameraManagement.setRailwayName(baseRailwayManagement.getRailwayName());
             String mils = AppendUtils.stringAppend(baseCameraManagement.getInstallMile());
             baseCameraManagement.setInstallMiles(mils);
-            String end = AppendUtils.stringAppend(baseCameraManagement.getEndMile());
-            baseCameraManagement.setEndMiles(end);
-            String begin = AppendUtils.stringAppend(baseCameraManagement.getBeginMile());
-            baseCameraManagement.setBeginMiles(begin);
+            if (!ObjectUtils.isEmpty(baseCameraManagement.getEndMile())) {
+                String end = AppendUtils.stringAppend(baseCameraManagement.getEndMile());
+                baseCameraManagement.setEndMiles(end);
+            }
+            if (!ObjectUtils.isEmpty(baseCameraManagement.getBeginMile())) {
+                String begin = AppendUtils.stringAppend(baseCameraManagement.getBeginMile());
+                baseCameraManagement.setBeginMiles(begin);
+            }
         }
         ExcelUtil<BaseCameraManagement> util = new ExcelUtil<>(BaseCameraManagement.class);
         util.exportExcel(response, baseCameraManagementList, "台账管理相机数据");
@@ -839,10 +856,12 @@ public class BaseCameraManagementController extends BaseController {
             BeanUtils.copyProperties(baseCameraManagement, msgAlarmResp);
             msgAlarmResp.setRailwayName(baseRailwayManagement.getRailwayName());
             msgAlarmResp.setDeptId(baseCameraManagement.getDeptId());
-            String begin = AppendUtils.stringAppend(baseCameraManagement.getBeginMile());
-            String end = AppendUtils.stringAppend(baseCameraManagement.getEndMile());
-            String endMile = "[" + begin + "]-[" + end + "]";
-            msgAlarmResp.setBeginMile(endMile);
+            if (!ObjectUtils.isEmpty(baseCameraManagement.getEndMile())&&!ObjectUtils.isEmpty(baseCameraManagement.getBeginMile())) {
+                String begin = AppendUtils.stringAppend(baseCameraManagement.getBeginMile());
+                String end = AppendUtils.stringAppend(baseCameraManagement.getEndMile());
+                String endMile = "[" + begin + "]-[" + end + "]";
+                msgAlarmResp.setBeginMile(endMile);
+            }
             String mile = AppendUtils.stringAppend(baseCameraManagement.getInstallMile());
             msgAlarmResp.setAlarmMile(mile);
             msgAlarmResp.setInstallLongitude(baseCameraManagement.getInstallLongitude() + "," + baseCameraManagement.getInstallLatitude());

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

@@ -211,10 +211,14 @@ public class MsgAlarmController extends BaseController {
                 }
                 String mils = AppendUtils.stringAppend(cameraManagement.getInstallMile());
                 o.setAlarmMiles(mils);
-                String end = AppendUtils.stringAppend(cameraManagement.getEndMile());
-                o.setEndMile(end);
-                String begin = AppendUtils.stringAppend(cameraManagement.getBeginMile());
-                o.setBeginMile(begin);
+                if (!ObjectUtils.isEmpty(cameraManagement.getEndMile())) {
+                    String end = AppendUtils.stringAppend(cameraManagement.getEndMile());
+                    o.setEndMile(end);
+                }
+                if (!ObjectUtils.isEmpty(cameraManagement.getBeginMile())) {
+                    String begin = AppendUtils.stringAppend(cameraManagement.getBeginMile());
+                    o.setBeginMile(begin);
+                }
                 LambdaQueryWrapper<MsgAlarmFrequency> wrapper = new LambdaQueryWrapper<MsgAlarmFrequency>();
                 if (!ObjectUtils.isEmpty(o.getAlarmId())) {
                     wrapper.eq(MsgAlarmFrequency::getAlarmId, o.getAlarmId());
@@ -276,10 +280,14 @@ public class MsgAlarmController extends BaseController {
             }
             String mils = AppendUtils.stringAppend(cameraManagement.getInstallMile());
             msgAlarm.setAlarmMiles(mils);
-            String end = AppendUtils.stringAppend(cameraManagement.getEndMile());
-            msgAlarm.setEndMile(end);
-            String begin = AppendUtils.stringAppend(cameraManagement.getBeginMile());
-            msgAlarm.setBeginMile(begin);
+            if (!ObjectUtils.isEmpty(cameraManagement.getEndMile())) {
+                String end = AppendUtils.stringAppend(cameraManagement.getEndMile());
+                msgAlarm.setEndMile(end);
+            }
+            if (!ObjectUtils.isEmpty(cameraManagement.getBeginMile())) {
+                String begin = AppendUtils.stringAppend(cameraManagement.getBeginMile());
+                msgAlarm.setBeginMile(begin);
+            }
             LambdaQueryWrapper<MsgAlarmFrequency> wrapper = new LambdaQueryWrapper<MsgAlarmFrequency>();
             if (!ObjectUtils.isEmpty(msgAlarm.getAlarmId())) {
                 wrapper.eq(MsgAlarmFrequency::getAlarmId, msgAlarm.getAlarmId());
@@ -332,10 +340,12 @@ public class MsgAlarmController extends BaseController {
             BeanUtils.copyProperties(msgAlarm, msgAlarmResp);
             msgAlarmResp.setRailwayName(baseRailwayManagement.getRailwayName());
             msgAlarmResp.setDeptId(baseCameraManagement.getDeptId());
-            String begin = AppendUtils.stringAppend(baseCameraManagement.getBeginMile());
-            String end = AppendUtils.stringAppend(baseCameraManagement.getEndMile());
-            String endMile = begin + "-" + end;
-            msgAlarmResp.setBeginMile(endMile);
+            if (!ObjectUtils.isEmpty(baseCameraManagement.getEndMile())&&!ObjectUtils.isEmpty(baseCameraManagement.getBeginMile())) {
+                String begin = AppendUtils.stringAppend(baseCameraManagement.getBeginMile());
+                String end = AppendUtils.stringAppend(baseCameraManagement.getEndMile());
+                String endMile = begin + "-" + end;
+                msgAlarmResp.setBeginMile(endMile);
+            }
             String mile = AppendUtils.stringAppend(baseCameraManagement.getInstallMile());
             msgAlarmResp.setAlarmMile(mile);
             if (!ObjectUtils.isEmpty(msgAlarm.getReleasedType())) {
@@ -378,10 +388,12 @@ public class MsgAlarmController extends BaseController {
             BeanUtils.copyProperties(msgAlarm, msgAlarmResp);
             msgAlarmResp.setRailwayName(baseRailwayManagement.getRailwayName());
             msgAlarmResp.setDeptId(baseCameraManagement.getDeptId());
-            String begin = AppendUtils.stringAppend(baseCameraManagement.getBeginMile());
-            String end = AppendUtils.stringAppend(baseCameraManagement.getEndMile());
-            String endMile = "[" + begin + "]-[" + end + "]";
-            msgAlarmResp.setBeginMile(endMile);
+            if (!ObjectUtils.isEmpty(baseCameraManagement.getEndMile())&&!ObjectUtils.isEmpty(baseCameraManagement.getBeginMile())) {
+                String begin = AppendUtils.stringAppend(baseCameraManagement.getBeginMile());
+                String end = AppendUtils.stringAppend(baseCameraManagement.getEndMile());
+                String endMile = "[" + begin + "]-[" + end + "]";
+                msgAlarmResp.setBeginMile(endMile);
+            }
             String mile = AppendUtils.stringAppend(baseCameraManagement.getInstallMile());
             msgAlarmResp.setAlarmMile(mile);
             msgAlarmResp.setInstallLongitude(baseCameraManagement.getInstallLongitude() + "," + baseCameraManagement.getInstallLatitude());
@@ -562,7 +574,7 @@ public class MsgAlarmController extends BaseController {
                 }
                 return o;
             }).collect(Collectors.toList());
-            page.setRecords(dto1);
+                        page.setRecords(dto1);
         }
         return AjaxResult.success(page);
     }

hazard-admin/src/main/java/com/ozs/web/controller/websocket/WebSocketConteoller.java

@@ -123,6 +123,7 @@ public class WebSocketConteoller extends BaseController {
     @ResponseBody
     @PostMapping("/publish")
     public Map publish(@RequestBody MsgAlarm msgAlarm) {
+        String endMile = null;
         log.info("消息推送:" + msgAlarm.toString());
         LambdaQueryWrapper<BaseCameraManagement> wrapper = new LambdaQueryWrapper<BaseCameraManagement>();
         if (!ObjectUtils.isEmpty(msgAlarm.getCameraCode())) {
@@ -137,15 +138,18 @@ public class WebSocketConteoller extends BaseController {
         String[] list = set.toArray(new String[set.size()]);
         List<String> userIdList = new ArrayList<>(set);
         MsgAlarmResp msgAlarmResp = new MsgAlarmResp();
-        String begin = AppendUtils.stringAppend(baseCameraManagement.getBeginMile());
-        String end = AppendUtils.stringAppend(baseCameraManagement.getEndMile());
-        String endMile = begin + "-" + end;
-        msgAlarmResp.setBeginMile(endMile);
+        if (!ObjectUtils.isEmpty(baseCameraManagement.getEndMile())&&!ObjectUtils.isEmpty(baseCameraManagement.getBeginMile())) {
+            String begin = AppendUtils.stringAppend(baseCameraManagement.getBeginMile());
+            String end = AppendUtils.stringAppend(baseCameraManagement.getEndMile());
+            endMile = begin + "-" + end;
+            msgAlarmResp.setBeginMile(endMile);
+        }
         msgAlarmResp.setAlarmType(msgAlarm.getAlarmType());
         String mile = AppendUtils.stringAppend(baseCameraManagement.getInstallMile());
         msgAlarmResp.setAlarmMile(mile);
         String cameraCode = baseCameraManagement.getCameraCode();
         msgAlarmResp.setCameraCode(cameraCode);
+        
         String cameraName = baseRailwayManagementService.getCameraNameByCameraCode(cameraCode);
         msgAlarmResp.setRailwayName(cameraName != null ? cameraName : "");
         msgAlarmResp.setLineDirStr(baseCameraManagement.getLineDir() == 1 ? "上行" : "下行");