相机，报警，线路

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

@@ -42,6 +42,11 @@ public class BaseCameraManagement extends BaseEntity implements Serializable {
     @Excel(name = "相机编码")
     private String cameraCode;
 
+    /**
+     * 线路编码
+     */
+    private String railwayCode;
+
     /**
      * 通道编号
      */
@@ -86,28 +91,6 @@ public class BaseCameraManagement extends BaseEntity implements Serializable {
     @Excel(name = "监视相机纬度")
     private String installLatitude;
 
-    /**
-     * 线路编码
-     */
-    private String railwayCode;
-
-    /**
-     * 物联网卡号
-     */
-    @Excel(name = "物联网卡号")
-    private String cardNum;
-
-    /**
-     * 是否开启录像(1开启2不开启)
-     */
-    private Integer startRecording;
-
-    /**
-     * 录像接口返回的任务ID
-     */
-    private String taskId;
-
-
     /**
      * 监控相机安装里程位置字符串形式
      */

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

@@ -43,9 +43,9 @@ public class BaseRailwayManagement extends BaseEntity implements Serializable {
     private String railwayCode;
 
     /**
-     * 线路类型（普铁/高铁 ）
+     * 线路类型(1普铁2高铁3重载铁路)
      */
-    @Excel(name = "线路类型",readConverterExp = "1=高铁,2=普快")
+    @Excel(name = "线路类型",readConverterExp = "1=高铁,2=普快,3=重载铁路")
     private Integer railwayType;
 
     /**
@@ -53,11 +53,13 @@ public class BaseRailwayManagement extends BaseEntity implements Serializable {
      */
     @Excel(name = "线路名称")
     private String railwayName;
+
     /**
      *线路类型名称
      */
     @TableField(exist = false)
     private String railwayTypeName;
+
     /**
      * 备注
      */

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

@@ -45,12 +45,6 @@ public class MsgAlarm extends BaseEntity implements Serializable {
     @Excel(name = "报警唯一标识")
     private String alarmId;
 
-    /**
-     * 相机编码
-     */
-    @Excel(name = "相机编码")
-    private String cameraCode;
-
     /**
      * 报警时间
      */
@@ -58,6 +52,12 @@ public class MsgAlarm extends BaseEntity implements Serializable {
     @Excel(name = "报警时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
     private Date alarmTime;
 
+    /**
+     * 报警线路
+     */
+    @Excel(name = "报警线路")
+    private String railwayCode;
+
     /**
      * 报警里程位置
      */
@@ -89,8 +89,11 @@ public class MsgAlarm extends BaseEntity implements Serializable {
      * 报警病害类型（1泥石流2异物侵线 3断轨监测）
      */
     private Integer alarmType;
-    
-    
+
+    /**
+     * 框定范围
+     */
+    private String alarmAttr;
 
     /**
      * 解除人

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

@@ -26,6 +26,7 @@ public class BaseCameraManagementDto extends BaseEntity implements Serializable
      */
     @Excel(name = "相机编码")
     private String cameraCode;
+
     /**
      * 所属工务段
      */
@@ -43,15 +44,16 @@ public class BaseCameraManagementDto extends BaseEntity implements Serializable
      */
     @Excel(name = "监控相机安装里程位置")
     private Integer installMile;
+
     /**
      * 线路名称
      */
     @Excel(name = "线路名称")
     private String railwayName;
+
     /**
      * 线路编码（四位数字）
      */
     @Excel(name = "线路编码")
     private String railwayCode;
-    
 }

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

@@ -96,25 +96,6 @@ public class BaseCameraManagementHomeVo extends BaseEntity implements Serializab
     @Excel(name = "线路编码")
     private String railwayCode;
 
-    /**
-     * 物联网卡号
-     */
-    @Excel(name = "物联网卡号")
-    private String cardNum;
-
-    /**
-     * 是否开启录像(1开启2不开启)
-     */
-    @Excel(name = "是否开启录像")
-    private Integer startRecording;
-
-    /**
-     * 录像接口返回的任务ID
-     */
-    @Excel(name = "录像接口返回的任务ID")
-    private String taskId;
-
-
     /**
      * 监控相机安装里程位置字符串形式
      */

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

@@ -28,7 +28,6 @@ public class BaseCameraManagementVo extends PageVo implements Serializable {
      */
     private Integer lineDir;
 
-
     /**
      * 线路编码
      */

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

@@ -25,7 +25,7 @@ import java.io.Serializable;
 public class BaseCameraManagementVos implements Serializable {
 
     private static final long serialVersionUID = 1L;
-   
+
     /**
      * 相机编码
      */
@@ -41,7 +41,7 @@ public class BaseCameraManagementVos implements Serializable {
     /**
      * 行别(1上行2下行）
      */
-    @Excel(name = "行别",readConverterExp = "1=上行,2=下行")
+    @Excel(name = "行别", readConverterExp = "1=上行,2=下行")
     private Integer lineDir;
 
     /**
@@ -55,15 +55,9 @@ public class BaseCameraManagementVos implements Serializable {
      */
     @Excel(name = "监视相机纬度")
     private String installLatitude;
-    
-    /**
-     * 物联网卡号
-     */
-    @Excel(name = "物联网卡号")
-    private String cardNum;
-    
+
     /**
-     *所属工务段名称
+     * 所属工务段名称
      */
     @Excel(name = "所属工务段名称")
     private String deptName;
@@ -87,7 +81,7 @@ public class BaseCameraManagementVos implements Serializable {
     private Integer endMile;
 
     /**
-     *线路名称
+     * 线路名称
      */
     @Excel(name = "线路名称")
     private String railwayName;

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

@@ -20,7 +20,7 @@ public class BaseRailwayManagementVo extends PageVo implements Serializable {
     private static final long serialVersionUID = 1L;
     
     /**
-     * 线路类型（普铁/高铁 ）
+     * 线路类型(1普铁2高铁3重载铁路)
      */
     private Integer railwayType;
 

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

@@ -1,13 +1,9 @@
 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.service.impl.ServiceImpl;
 import com.github.pagehelper.Page;
 import com.github.pagehelper.PageHelper;
-import com.ozs.common.utils.AppendUtils;
-import com.ozs.entity.BaseCameraManagement;
-import com.ozs.entity.BaseRailwayManagement;
 import com.ozs.entity.MsgAlarm;
 import com.ozs.entity.MsgAppPush;
 import com.ozs.entity.vo.MsgAlarmVo;
@@ -19,8 +15,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.util.ObjectUtils;
 
-import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -48,27 +42,27 @@ public class MsgAppPushServiceImpl extends ServiceImpl<MsgAppPushMapper, MsgAppP
         pageR.setTotal(page.getTotal());
         if (!ObjectUtils.isEmpty(page) && !ObjectUtils.isEmpty(page.getResult())) {
             List<MsgAlarm> dto1 = page.getResult().stream().map(o -> {
-                String[] split = o.getImageUrl().split(";");
-                ArrayList<String> objects = new ArrayList<>(Arrays.asList(split));
-                o.setImageUrls(objects);
-                LambdaQueryWrapper<BaseCameraManagement> cameraManagementLambdaQueryWrapper = new LambdaQueryWrapper<BaseCameraManagement>();
-                if (!ObjectUtils.isEmpty(o.getCameraCode())) {
-                    cameraManagementLambdaQueryWrapper.eq(BaseCameraManagement::getCameraCode, o.getCameraCode());
-                }
-                BaseCameraManagement cameraManagement = baseCameraManagementService.getOne(cameraManagementLambdaQueryWrapper);
-                LambdaQueryWrapper<BaseRailwayManagement> queryWrapper = new LambdaQueryWrapper<BaseRailwayManagement>();
-                if (!ObjectUtils.isEmpty(cameraManagement.getRailwayCode())) {
-                    queryWrapper.eq(BaseRailwayManagement::getRailwayCode, cameraManagement.getRailwayCode());
-                }
-                BaseRailwayManagement baseRailwayManagement = baseRailwayManagementService.getOne(queryWrapper);
-                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);
-                // o.setAlarmCount((int) msgAlarmFrequencyService.count()+1);
+//                String[] split = o.getImageUrl().split(";");
+//                ArrayList<String> objects = new ArrayList<>(Arrays.asList(split));
+//                o.setImageUrls(objects);
+//                LambdaQueryWrapper<BaseCameraManagement> cameraManagementLambdaQueryWrapper = new LambdaQueryWrapper<BaseCameraManagement>();
+//                if (!ObjectUtils.isEmpty(o.getCameraCode())) {
+//                    cameraManagementLambdaQueryWrapper.eq(BaseCameraManagement::getCameraCode, o.getCameraCode());
+//                }
+//                BaseCameraManagement cameraManagement = baseCameraManagementService.getOne(cameraManagementLambdaQueryWrapper);
+//                LambdaQueryWrapper<BaseRailwayManagement> queryWrapper = new LambdaQueryWrapper<BaseRailwayManagement>();
+//                if (!ObjectUtils.isEmpty(cameraManagement.getRailwayCode())) {
+//                    queryWrapper.eq(BaseRailwayManagement::getRailwayCode, cameraManagement.getRailwayCode());
+//                }
+//                BaseRailwayManagement baseRailwayManagement = baseRailwayManagementService.getOne(queryWrapper);
+//                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);
+//                // o.setAlarmCount((int) msgAlarmFrequencyService.count()+1);
                 return o;
             }).collect(Collectors.toList());
             pageR.setRecords(dto1);

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

@@ -1,14 +1,10 @@
 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.service.impl.ServiceImpl;
 import com.github.pagehelper.Page;
 import com.github.pagehelper.PageHelper;
-import com.ozs.common.utils.AppendUtils;
 import com.ozs.common.utils.StringUtils;
-import com.ozs.entity.BaseCameraManagement;
-import com.ozs.entity.BaseRailwayManagement;
 import com.ozs.entity.MsgAlarm;
 import com.ozs.entity.MsgWebPush;
 import com.ozs.entity.vo.MsgAlarmResp;
@@ -17,12 +13,14 @@ import com.ozs.mapper.MsgWebPushMapper;
 import com.ozs.service.BaseCameraManagementService;
 import com.ozs.service.BaseRailwayManagementService;
 import com.ozs.service.MsgWebPushService;
-import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.util.ObjectUtils;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 import java.util.stream.Collectors;
 
 /**
@@ -54,28 +52,28 @@ public class MsgWebPushServiceImpl extends ServiceImpl<MsgWebPushMapper, MsgWebP
         List<MsgAlarm> webAlarm = msgWebPushMapper.webAlarm(userId);
         if (!StringUtils.isEmpty(webAlarm) && webAlarm.size() > 0) {
             for (MsgAlarm msgAlarm : webAlarm) {
-                LambdaQueryWrapper<BaseCameraManagement> lw = new LambdaQueryWrapper<BaseCameraManagement>();
-                if (!ObjectUtils.isEmpty(msgAlarm.getCameraCode())) {
-                    lw.eq(BaseCameraManagement::getCameraCode, msgAlarm.getCameraCode());
-                }
-                BaseCameraManagement baseCameraManagement = baseCameraManagementService.getOne(lw);
-                LambdaQueryWrapper<BaseRailwayManagement> wrapper = new LambdaQueryWrapper<BaseRailwayManagement>();
-                if (!ObjectUtils.isEmpty(baseCameraManagement.getRailwayCode())) {
-                    wrapper.eq(BaseRailwayManagement::getRailwayCode, baseCameraManagement.getRailwayCode());
-                }
-                BaseRailwayManagement baseRailwayManagement = baseRailwayManagementService.getOne(wrapper);
+//                LambdaQueryWrapper<BaseCameraManagement> lw = new LambdaQueryWrapper<BaseCameraManagement>();
+//                if (!ObjectUtils.isEmpty(msgAlarm.getCameraCode())) {
+//                    lw.eq(BaseCameraManagement::getCameraCode, msgAlarm.getCameraCode());
+//                }
+//                BaseCameraManagement baseCameraManagement = baseCameraManagementService.getOne(lw);
+//                LambdaQueryWrapper<BaseRailwayManagement> wrapper = new LambdaQueryWrapper<BaseRailwayManagement>();
+//                if (!ObjectUtils.isEmpty(baseCameraManagement.getRailwayCode())) {
+//                    wrapper.eq(BaseRailwayManagement::getRailwayCode, baseCameraManagement.getRailwayCode());
+//                }
+//                BaseRailwayManagement baseRailwayManagement = baseRailwayManagementService.getOne(wrapper);
                 MsgAlarmResp msgAlarmResp = new MsgAlarmResp();
-                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);
-                String mile = AppendUtils.stringAppend(baseCameraManagement.getInstallMile());
-                msgAlarmResp.setAlarmMile(mile);
-                msgAlarmResp.setInstallLongitude(baseCameraManagement.getInstallLongitude() + "," + baseCameraManagement.getInstallLatitude());
-                msgAlarmResp.setPushId(msgAlarm.getMsgId());
+//                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);
+//                String mile = AppendUtils.stringAppend(baseCameraManagement.getInstallMile());
+//                msgAlarmResp.setAlarmMile(mile);
+//                msgAlarmResp.setInstallLongitude(baseCameraManagement.getInstallLongitude() + "," + baseCameraManagement.getInstallLatitude());
+//                msgAlarmResp.setPushId(msgAlarm.getMsgId());
                 msgAlarmRespList.add(msgAlarmResp);
             }
         }
@@ -95,28 +93,28 @@ public class MsgWebPushServiceImpl extends ServiceImpl<MsgWebPushMapper, MsgWebP
         // Page<MsgAlarm> page = PageUtils.getPages(msgAlarmVo.getPageNum().intValue(), msgAlarmVo.getPageSize().intValue(), webAlarm);
         if (!ObjectUtils.isEmpty(page) && !ObjectUtils.isEmpty(page.getResult())) {
             List<MsgAlarm> dto1 = page.getResult().stream().map(o -> {
-                String[] split = o.getImageUrl().split(";");
-                ArrayList<String> objects = new ArrayList<>(Arrays.asList(split));
-                o.setImageUrls(objects);
-                LambdaQueryWrapper<BaseCameraManagement> cameraManagementLambdaQueryWrapper = new LambdaQueryWrapper<BaseCameraManagement>();
-                if (!ObjectUtils.isEmpty(o.getCameraCode())) {
-                    cameraManagementLambdaQueryWrapper.eq(BaseCameraManagement::getCameraCode, o.getCameraCode());
-                }
-                BaseCameraManagement cameraManagement = baseCameraManagementService.getOne(cameraManagementLambdaQueryWrapper);
-                LambdaQueryWrapper<BaseRailwayManagement> queryWrapper = new LambdaQueryWrapper<BaseRailwayManagement>();
-                if (!ObjectUtils.isEmpty(cameraManagement.getRailwayCode())) {
-                    queryWrapper.eq(BaseRailwayManagement::getRailwayCode, cameraManagement.getRailwayCode());
-                }
-                BaseRailwayManagement baseRailwayManagement = baseRailwayManagementService.getOne(queryWrapper);
-
-                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);
-                // o.setAlarmCount((int) msgAlarmFrequencyService.count()+1);
+//                String[] split = o.getImageUrl().split(";");
+//                ArrayList<String> objects = new ArrayList<>(Arrays.asList(split));
+//                o.setImageUrls(objects);
+//                LambdaQueryWrapper<BaseCameraManagement> cameraManagementLambdaQueryWrapper = new LambdaQueryWrapper<BaseCameraManagement>();
+//                if (!ObjectUtils.isEmpty(o.getCameraCode())) {
+//                    cameraManagementLambdaQueryWrapper.eq(BaseCameraManagement::getCameraCode, o.getCameraCode());
+//                }
+//                BaseCameraManagement cameraManagement = baseCameraManagementService.getOne(cameraManagementLambdaQueryWrapper);
+//                LambdaQueryWrapper<BaseRailwayManagement> queryWrapper = new LambdaQueryWrapper<BaseRailwayManagement>();
+//                if (!ObjectUtils.isEmpty(cameraManagement.getRailwayCode())) {
+//                    queryWrapper.eq(BaseRailwayManagement::getRailwayCode, cameraManagement.getRailwayCode());
+//                }
+//                BaseRailwayManagement baseRailwayManagement = baseRailwayManagementService.getOne(queryWrapper);
+//
+//                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);
+//                // o.setAlarmCount((int) msgAlarmFrequencyService.count()+1);
                 return o;
             }).collect(Collectors.toList());
             pageR.setRecords(dto1);

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

@@ -13,16 +13,15 @@ import com.ozs.common.utils.ChineseToPingyin;
 import com.ozs.common.utils.IdempotenceUtils;
 import com.ozs.common.utils.StringUtils;
 import com.ozs.common.utils.file.FileUtils;
-import com.ozs.common.utils.http.HttpUtils;
 import com.ozs.common.utils.poi.ExcelUtil;
-import com.ozs.web.core.config.CaneraConfig;
-import com.ozs.web.core.util.CameraUtil;
 import com.ozs.entity.*;
 import com.ozs.entity.vo.*;
 import com.ozs.framework.config.ServerConfig;
 import com.ozs.service.*;
 import com.ozs.system.service.DataScoreUtil;
 import com.ozs.system.service.ISysDeptService;
+import com.ozs.web.core.config.CaneraConfig;
+import com.ozs.web.core.util.CameraUtil;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.BeanUtils;
@@ -39,7 +38,6 @@ import javax.servlet.http.HttpServletResponse;
 import javax.validation.constraints.NotNull;
 import java.io.InputStream;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Comparator;
 import java.util.List;
 import java.util.stream.Collectors;
@@ -117,27 +115,27 @@ public class BaseCameraManagementController extends BaseController {
             return AjaxResult.success(baseCameraManagement);
         } else if (!StringUtils.isEmpty(isRelease) && isRelease == 2 && !StringUtils.isEmpty(cameraCode)) {
             MsgAlarm msgAlarm = msgAlarmService.selectByCameraCode(cameraCode);
-            LambdaQueryWrapper<BaseCameraManagement> lw = new LambdaQueryWrapper<BaseCameraManagement>();
-            if (!ObjectUtils.isEmpty(msgAlarm.getCameraCode())) {
-                lw.eq(BaseCameraManagement::getCameraCode, msgAlarm.getCameraCode());
-            }
-            BaseCameraManagement baseCameraManagement = baseCameraManagementService.getOne(lw);
-            LambdaQueryWrapper<BaseRailwayManagement> wrapper = new LambdaQueryWrapper<BaseRailwayManagement>();
-            if (!ObjectUtils.isEmpty(baseCameraManagement.getRailwayCode())) {
-                wrapper.eq(BaseRailwayManagement::getRailwayCode, baseCameraManagement.getRailwayCode());
-            }
-            BaseRailwayManagement baseRailwayManagement = baseRailwayManagementService.getOne(wrapper);
+//            LambdaQueryWrapper<BaseCameraManagement> lw = new LambdaQueryWrapper<BaseCameraManagement>();
+//            if (!ObjectUtils.isEmpty(msgAlarm.getCameraCode())) {
+//                lw.eq(BaseCameraManagement::getCameraCode, msgAlarm.getCameraCode());
+//            }
+//            BaseCameraManagement baseCameraManagement = baseCameraManagementService.getOne(lw);
+//            LambdaQueryWrapper<BaseRailwayManagement> wrapper = new LambdaQueryWrapper<BaseRailwayManagement>();
+//            if (!ObjectUtils.isEmpty(baseCameraManagement.getRailwayCode())) {
+//                wrapper.eq(BaseRailwayManagement::getRailwayCode, baseCameraManagement.getRailwayCode());
+//            }
+//            BaseRailwayManagement baseRailwayManagement = baseRailwayManagementService.getOne(wrapper);
             MsgAlarmResp msgAlarmResp = new MsgAlarmResp();
-            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);
-            String mile = AppendUtils.stringAppend(baseCameraManagement.getInstallMile());
-            msgAlarmResp.setAlarmMile(mile);
-            msgAlarmResp.setInstallLongitude(baseCameraManagement.getInstallLongitude() + "," + baseCameraManagement.getInstallLatitude());
+//            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);
+//            String mile = AppendUtils.stringAppend(baseCameraManagement.getInstallMile());
+//            msgAlarmResp.setAlarmMile(mile);
+//            msgAlarmResp.setInstallLongitude(baseCameraManagement.getInstallLongitude() + "," + baseCameraManagement.getInstallLatitude());
 //            String[] split = msgAlarm.getImageUrl().split(";");
 //            ArrayList<String> objects = new ArrayList<>(Arrays.asList(split));
 //            msgAlarmResp.setImageUrls(objects);
@@ -292,13 +290,13 @@ public class BaseCameraManagementController extends BaseController {
         baseDynamicManagement.setCameraCode(baseCameraManagement.getCameraCode());
         baseDynamicManagement.setUpdateBy(getUserId());
         baseDynamicManagement.setCreateBy(getUserId());
-        String start = HttpUtils.sendGet(CameraUtil.startRecording(baseCameraManagement.getCameraCode(), baseCameraManagement.getChannel()));
-        if (start.startsWith(baseCameraManagement.getCameraCode() + "/" + baseCameraManagement.getChannel())) {
-            baseCameraManagement.setStartRecording(1);
-            baseCameraManagement.setTaskId(start);
-        } else {
-            baseCameraManagement.setStartRecording(2);
-        }
+//        String start = HttpUtils.sendGet(CameraUtil.startRecording(baseCameraManagement.getCameraCode(), baseCameraManagement.getChannel()));
+//        if (start.startsWith(baseCameraManagement.getCameraCode() + "/" + baseCameraManagement.getChannel())) {
+//            baseCameraManagement.setStartRecording(1);
+//            baseCameraManagement.setTaskId(start);
+//        } else {
+//            baseCameraManagement.setStartRecording(2);
+//        }
         if (baseCameraManagementService.save(baseCameraManagement) && baseDeviceDynamicManagementService.save(baseDynamicManagement)) {
             idempotenceUtils.deleteIdempotence(baseCameraManagement.getCameraCode());
             return AjaxResult.success();
@@ -403,7 +401,7 @@ public class BaseCameraManagementController extends BaseController {
         }
         LambdaQueryWrapper<MsgAlarm> wrapper1 = new LambdaQueryWrapper<MsgAlarm>();
         if (!ObjectUtils.isEmpty(baseCameraManagement.getCameraCode())) {
-            wrapper1.eq(MsgAlarm::getCameraCode, baseCameraManagement.getCameraCode());
+//            wrapper1.eq(MsgAlarm::getCameraCode, baseCameraManagement.getCameraCode());
             wrapper1.orderByDesc(MsgAlarm::getAlarmTime);
         }
         List<MsgAlarm> list1 = msgAlarmService.list(wrapper1);
@@ -648,57 +646,56 @@ public class BaseCameraManagementController extends BaseController {
         return success(cameraTree);
     }
 
-    @ApiOperation("关闭视频录制")
-    @GetMapping("/endRecording/{id}")
-    @Log(title = "相机台账管理", businessType = BusinessType.OTHER)
-    public AjaxResult endRecording(@PathVariable Long id) {
-        BaseCameraManagement baseCameraManagement = baseCameraManagementService.getById(id);
-        if (ObjectUtils.isEmpty(baseCameraManagement)) {
-            return error("查不到该ID的相机台账数据!!!");
-        }
-        log.info("endRecording------------" + baseCameraManagement.getTaskId());
-        String start = HttpUtils.sendGet(CameraUtil.endRecording(baseCameraManagement.getTaskId()));
-        log.info("endRecording------------" + start);
-        if ("success".equals(start)) {
-            baseCameraManagement.setStartRecording(2);
-            baseCameraManagement.setTaskId("");
-            baseCameraManagement.setUpdateBy(getUserId());
-        } else {
-            baseCameraManagement.setStartRecording(2);
-            baseCameraManagement.setTaskId("");
-            baseCameraManagement.setUpdateBy(getUserId());
-            log.error("关闭视频录制异常日志如下:" + start);
-        }
-        if (baseCameraManagementService.updateById(baseCameraManagement)) {
-            return success();
-        }
-        return error();
-    }
+//    @ApiOperation("关闭视频录制")
+//    @GetMapping("/endRecording/{id}")
+//    @Log(title = "相机台账管理", businessType = BusinessType.OTHER)
+//    public AjaxResult endRecording(@PathVariable Long id) {
+//        BaseCameraManagement baseCameraManagement = baseCameraManagementService.getById(id);
+//        if (ObjectUtils.isEmpty(baseCameraManagement)) {
+//            return error("查不到该ID的相机台账数据!!!");
+//        }
+//        log.info("endRecording------------" + baseCameraManagement.getTaskId());
+//        String start = HttpUtils.sendGet(CameraUtil.endRecording(baseCameraManagement.getTaskId()));
+//        log.info("endRecording------------" + start);
+//        if ("success".equals(start)) {
+//            baseCameraManagement.setStartRecording(2);
+//            baseCameraManagement.setTaskId("");
+//            baseCameraManagement.setUpdateBy(getUserId());
+//        } else {
+//            baseCameraManagement.setStartRecording(2);
+//            baseCameraManagement.setTaskId("");
+//            baseCameraManagement.setUpdateBy(getUserId());
+//            log.error("关闭视频录制异常日志如下:" + start);
+//        }
+//        if (baseCameraManagementService.updateById(baseCameraManagement)) {
+//            return success();
+//        }
+//        return error();
+//    }
 
-
-    @ApiOperation("开启视频录制")
-    @GetMapping("/startRecording/{id}")
-    @Log(title = "相机台账管理", businessType = BusinessType.OTHER)
-    public AjaxResult startRecording(@PathVariable Long id) {
-        BaseCameraManagement baseCameraManagement = baseCameraManagementService.getById(id);
-        log.info("startRecording------CameraCode------" + baseCameraManagement.getCameraCode());
-        log.info("startRecording------Channel------" + baseCameraManagement.getChannel());
-        String start = HttpUtils.sendGet(CameraUtil.startRecording(baseCameraManagement.getCameraCode(), baseCameraManagement.getChannel()));
-        log.info("startRecording------------" + start);
-        if (start.startsWith(baseCameraManagement.getCameraCode() + "/" + baseCameraManagement.getChannel())) {
-            log.info("startRecording 返回成功！！1");
-            baseCameraManagement.setStartRecording(1);
-            baseCameraManagement.setTaskId(start);
-            baseCameraManagement.setUpdateBy(getUserId());
-        } else {
-            return success("开启视频录制失败:请确认流是否存在或流是否开启");
-        }
-        if (baseCameraManagementService.updateById(baseCameraManagement)) {
-            return success();
-        } else {
-            return error("开启视频录制失败");
-        }
-    }
+//    @ApiOperation("开启视频录制")
+//    @GetMapping("/startRecording/{id}")
+//    @Log(title = "相机台账管理", businessType = BusinessType.OTHER)
+//    public AjaxResult startRecording(@PathVariable Long id) {
+//        BaseCameraManagement baseCameraManagement = baseCameraManagementService.getById(id);
+//        log.info("startRecording------CameraCode------" + baseCameraManagement.getCameraCode());
+//        log.info("startRecording------Channel------" + baseCameraManagement.getChannel());
+//        String start = HttpUtils.sendGet(CameraUtil.startRecording(baseCameraManagement.getCameraCode(), baseCameraManagement.getChannel()));
+//        log.info("startRecording------------" + start);
+//        if (start.startsWith(baseCameraManagement.getCameraCode() + "/" + baseCameraManagement.getChannel())) {
+//            log.info("startRecording 返回成功！！1");
+//            baseCameraManagement.setStartRecording(1);
+//            baseCameraManagement.setTaskId(start);
+//            baseCameraManagement.setUpdateBy(getUserId());
+//        } else {
+//            return success("开启视频录制失败:请确认流是否存在或流是否开启");
+//        }
+//        if (baseCameraManagementService.updateById(baseCameraManagement)) {
+//            return success();
+//        } else {
+//            return error("开启视频录制失败");
+//        }
+//    }
 
     @GetMapping(value = "/getAlarm/{cameraCode}")
     @ApiOperation("根据视频ID获取详细信息")
@@ -718,7 +715,7 @@ public class BaseCameraManagementController extends BaseController {
             MsgAlarmResp msgAlarmResp = new MsgAlarmResp();
             LambdaQueryWrapper<MsgAlarm> wrapper1 = new LambdaQueryWrapper<MsgAlarm>();
             if (!ObjectUtils.isEmpty(baseCameraManagement.getCameraCode())) {
-                wrapper1.eq(MsgAlarm::getCameraCode, baseCameraManagement.getCameraCode());
+//                wrapper1.eq(MsgAlarm::getCameraCode, baseCameraManagement.getCameraCode());
                 wrapper1.orderByDesc(MsgAlarm::getCreateTime);
             }
             List<MsgAlarm> list = msgAlarmService.list(wrapper1);

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

@@ -1,18 +1,19 @@
 package com.ozs.web.controller.accountmanagment;
 
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.ozs.common.annotation.Log;
 import com.ozs.common.core.controller.BaseController;
 import com.ozs.common.core.domain.AjaxResult;
-import com.ozs.common.core.domain.entity.SysDept;
 import com.ozs.common.core.domain.entity.SysUser;
 import com.ozs.common.enums.BusinessType;
 import com.ozs.common.utils.AppendUtils;
 import com.ozs.common.utils.StringUtils;
 import com.ozs.common.utils.poi.ExcelUtil;
-import com.ozs.entity.*;
+import com.ozs.entity.BaseUser;
+import com.ozs.entity.MsgAlarm;
+import com.ozs.entity.MsgAlarmFrequency;
+import com.ozs.entity.MsgWebPush;
 import com.ozs.entity.vo.*;
 import com.ozs.mapper.MsgAlarmMapper;
 import com.ozs.service.*;
@@ -24,7 +25,6 @@ import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.CollectionUtils;
 import org.springframework.util.ObjectUtils;
@@ -161,32 +161,32 @@ public class MsgAlarmController extends BaseController {
 //                String[] split = o.getImageUrl().split(";");
 //                ArrayList<String> objects = new ArrayList<>(Arrays.asList(split));
 //                o.setImageUrls(objects);
-                LambdaQueryWrapper<BaseCameraManagement> cameraManagementLambdaQueryWrapper = new LambdaQueryWrapper<BaseCameraManagement>();
-                if (!ObjectUtils.isEmpty(o.getCameraCode())) {
-                    cameraManagementLambdaQueryWrapper.eq(BaseCameraManagement::getCameraCode, o.getCameraCode());
-                }
-                BaseCameraManagement cameraManagement = baseCameraManagementService.getOne(cameraManagementLambdaQueryWrapper);
-                LambdaQueryWrapper<BaseRailwayManagement> queryWrapper = new LambdaQueryWrapper<BaseRailwayManagement>();
-                if (!ObjectUtils.isEmpty(cameraManagement.getRailwayCode())) {
-                    queryWrapper.eq(BaseRailwayManagement::getRailwayCode, cameraManagement.getRailwayCode());
-                }
-                BaseRailwayManagement baseRailwayManagement = baseRailwayManagementService.getOne(queryWrapper);
-                o.setRailwayName(baseRailwayManagement.getRailwayName());
-                if (StringUtils.isNotEmpty(o.getReleasedBy())) {
-                    BaseUser user = baseUserService.getUser(o.getReleasedBy());
-                    o.setReleasedByName(user.getNickName());
-                }
-                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);
-                LambdaQueryWrapper<MsgAlarmFrequency> wrapper = new LambdaQueryWrapper<MsgAlarmFrequency>();
-                if (!ObjectUtils.isEmpty(o.getAlarmId())) {
-                    wrapper.eq(MsgAlarmFrequency::getAlarmId, o.getAlarmId());
-                }
-                o.setAlarmCount((int) msgAlarmFrequencyService.count(wrapper));
+//                LambdaQueryWrapper<BaseCameraManagement> cameraManagementLambdaQueryWrapper = new LambdaQueryWrapper<BaseCameraManagement>();
+//                if (!ObjectUtils.isEmpty(o.getCameraCode())) {
+//                    cameraManagementLambdaQueryWrapper.eq(BaseCameraManagement::getCameraCode, o.getCameraCode());
+//                }
+//                BaseCameraManagement cameraManagement = baseCameraManagementService.getOne(cameraManagementLambdaQueryWrapper);
+//                LambdaQueryWrapper<BaseRailwayManagement> queryWrapper = new LambdaQueryWrapper<BaseRailwayManagement>();
+//                if (!ObjectUtils.isEmpty(cameraManagement.getRailwayCode())) {
+//                    queryWrapper.eq(BaseRailwayManagement::getRailwayCode, cameraManagement.getRailwayCode());
+//                }
+//                BaseRailwayManagement baseRailwayManagement = baseRailwayManagementService.getOne(queryWrapper);
+//                o.setRailwayName(baseRailwayManagement.getRailwayName());
+//                if (StringUtils.isNotEmpty(o.getReleasedBy())) {
+//                    BaseUser user = baseUserService.getUser(o.getReleasedBy());
+//                    o.setReleasedByName(user.getNickName());
+//                }
+//                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);
+//                LambdaQueryWrapper<MsgAlarmFrequency> wrapper = new LambdaQueryWrapper<MsgAlarmFrequency>();
+//                if (!ObjectUtils.isEmpty(o.getAlarmId())) {
+//                    wrapper.eq(MsgAlarmFrequency::getAlarmId, o.getAlarmId());
+//                }
+//                o.setAlarmCount((int) msgAlarmFrequencyService.count(wrapper));
                 return o;
             }).collect(Collectors.toList());
             page.setRecords(dto1);
@@ -218,35 +218,35 @@ public class MsgAlarmController extends BaseController {
 //            String[] split = msgAlarm.getImageUrl().split(";");
 //            ArrayList<String> objects = new ArrayList<>(Arrays.asList(split));
 //            msgAlarm.setImageUrls(objects);
-            LambdaQueryWrapper<BaseCameraManagement> cameraManagementLambdaQueryWrapper = new LambdaQueryWrapper<BaseCameraManagement>();
-            if (!ObjectUtils.isEmpty(msgAlarm.getCameraCode())) {
-                cameraManagementLambdaQueryWrapper.eq(BaseCameraManagement::getCameraCode, msgAlarm.getCameraCode());
-            }
-            BaseCameraManagement cameraManagement = baseCameraManagementService.getOne(cameraManagementLambdaQueryWrapper);
-            LambdaQueryWrapper<BaseRailwayManagement> queryWrapper = new LambdaQueryWrapper<BaseRailwayManagement>();
-            if (!ObjectUtils.isEmpty(cameraManagement.getRailwayCode())) {
-                queryWrapper.eq(BaseRailwayManagement::getRailwayCode, cameraManagement.getRailwayCode());
-            }
-            BaseRailwayManagement baseRailwayManagement = baseRailwayManagementService.getOne(queryWrapper);
-            msgAlarm.setRailwayName(baseRailwayManagement.getRailwayName());
-            if (StringUtils.isNotEmpty(msgAlarm.getReleasedBy())) {
-                BaseUser user = baseUserService.getUser(msgAlarm.getReleasedBy());
-                msgAlarm.setReleasedByName(user.getNickName());
-            }
-            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);
-            LambdaQueryWrapper<MsgAlarmFrequency> wrapper = new LambdaQueryWrapper<MsgAlarmFrequency>();
-            if (!ObjectUtils.isEmpty(msgAlarm.getAlarmId())) {
-                wrapper.eq(MsgAlarmFrequency::getAlarmId, msgAlarm.getAlarmId());
-            }
-            msgAlarm.setAlarmCount((int) msgAlarmFrequencyService.count(wrapper));
-            msgAlarm.setLineDirName(msgAlarm.getLineDir() == 1 ? "上行" : "下行");
-            msgAlarm.setIsReleaseName(msgAlarm.getIsRelease() == 1 ? "已解除" : "未解除");
-            msgAlarm.setAlarmTypeName("泥石流");
+//            LambdaQueryWrapper<BaseCameraManagement> cameraManagementLambdaQueryWrapper = new LambdaQueryWrapper<BaseCameraManagement>();
+//            if (!ObjectUtils.isEmpty(msgAlarm.getCameraCode())) {
+//                cameraManagementLambdaQueryWrapper.eq(BaseCameraManagement::getCameraCode, msgAlarm.getCameraCode());
+//            }
+//            BaseCameraManagement cameraManagement = baseCameraManagementService.getOne(cameraManagementLambdaQueryWrapper);
+//            LambdaQueryWrapper<BaseRailwayManagement> queryWrapper = new LambdaQueryWrapper<BaseRailwayManagement>();
+//            if (!ObjectUtils.isEmpty(cameraManagement.getRailwayCode())) {
+//                queryWrapper.eq(BaseRailwayManagement::getRailwayCode, cameraManagement.getRailwayCode());
+//            }
+//            BaseRailwayManagement baseRailwayManagement = baseRailwayManagementService.getOne(queryWrapper);
+//            msgAlarm.setRailwayName(baseRailwayManagement.getRailwayName());
+//            if (StringUtils.isNotEmpty(msgAlarm.getReleasedBy())) {
+//                BaseUser user = baseUserService.getUser(msgAlarm.getReleasedBy());
+//                msgAlarm.setReleasedByName(user.getNickName());
+//            }
+//            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);
+//            LambdaQueryWrapper<MsgAlarmFrequency> wrapper = new LambdaQueryWrapper<MsgAlarmFrequency>();
+//            if (!ObjectUtils.isEmpty(msgAlarm.getAlarmId())) {
+//                wrapper.eq(MsgAlarmFrequency::getAlarmId, msgAlarm.getAlarmId());
+//            }
+//            msgAlarm.setAlarmCount((int) msgAlarmFrequencyService.count(wrapper));
+//            msgAlarm.setLineDirName(msgAlarm.getLineDir() == 1 ? "上行" : "下行");
+//            msgAlarm.setIsReleaseName(msgAlarm.getIsRelease() == 1 ? "已解除" : "未解除");
+//            msgAlarm.setAlarmTypeName("泥石流");
         }
         ExcelUtil<MsgAlarm> util = new ExcelUtil<>(MsgAlarm.class);
         util.exportExcel(response, msgAlarmList, "报警信息管理");
@@ -258,34 +258,34 @@ public class MsgAlarmController extends BaseController {
     public AjaxResult getByAlarmId(@PathVariable String alarmId) {
         MsgAlarm msgAlarm = msgAlarmService.getByAlarmId(alarmId);
         if (!ObjectUtils.isEmpty(msgAlarm)) {
-            LambdaQueryWrapper<BaseCameraManagement> lw = new LambdaQueryWrapper<BaseCameraManagement>();
-            if (!ObjectUtils.isEmpty(msgAlarm.getCameraCode())) {
-                lw.eq(BaseCameraManagement::getCameraCode, msgAlarm.getCameraCode());
-            }
-            BaseCameraManagement baseCameraManagement = baseCameraManagementService.getOne(lw);
-            LambdaQueryWrapper<BaseRailwayManagement> wrapper = new LambdaQueryWrapper<BaseRailwayManagement>();
-            if (!ObjectUtils.isEmpty(baseCameraManagement.getRailwayCode())) {
-                wrapper.eq(BaseRailwayManagement::getRailwayCode, baseCameraManagement.getRailwayCode());
-            }
-            BaseRailwayManagement baseRailwayManagement = baseRailwayManagementService.getOne(wrapper);
+//            LambdaQueryWrapper<BaseCameraManagement> lw = new LambdaQueryWrapper<BaseCameraManagement>();
+//            if (!ObjectUtils.isEmpty(msgAlarm.getCameraCode())) {
+//                lw.eq(BaseCameraManagement::getCameraCode, msgAlarm.getCameraCode());
+//            }
+//            BaseCameraManagement baseCameraManagement = baseCameraManagementService.getOne(lw);
+//            LambdaQueryWrapper<BaseRailwayManagement> wrapper = new LambdaQueryWrapper<BaseRailwayManagement>();
+//            if (!ObjectUtils.isEmpty(baseCameraManagement.getRailwayCode())) {
+//                wrapper.eq(BaseRailwayManagement::getRailwayCode, baseCameraManagement.getRailwayCode());
+//            }
+//            BaseRailwayManagement baseRailwayManagement = baseRailwayManagementService.getOne(wrapper);
             MsgAlarmResp msgAlarmResp = new MsgAlarmResp();
 //            String[] split = msgAlarm.getImageUrl().split(";");
 //            ArrayList<String> objects = new ArrayList<>(Arrays.asList(split));
 //            msgAlarm.setImageUrls(objects);
-            if (StringUtils.isNotEmpty(msgAlarm.getReleasedBy())) {
-                BaseUser user = baseUserService.getUser(msgAlarm.getReleasedBy());
-                msgAlarm.setReleasedByName(user.getNickName());
-            }
-            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);
-            String mile = AppendUtils.stringAppend(baseCameraManagement.getInstallMile());
-            msgAlarmResp.setAlarmMile(mile);
-            msgAlarmResp.setInstallLongitude(baseCameraManagement.getInstallLongitude() + "," + baseCameraManagement.getInstallLatitude());
+//            if (StringUtils.isNotEmpty(msgAlarm.getReleasedBy())) {
+//                BaseUser user = baseUserService.getUser(msgAlarm.getReleasedBy());
+//                msgAlarm.setReleasedByName(user.getNickName());
+//            }
+//            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);
+//            String mile = AppendUtils.stringAppend(baseCameraManagement.getInstallMile());
+//            msgAlarmResp.setAlarmMile(mile);
+//            msgAlarmResp.setInstallLongitude(baseCameraManagement.getInstallLongitude() + "," + baseCameraManagement.getInstallLatitude());
             return AjaxResult.success(msgAlarmResp);
         } else {
             return success("无报警信息数据");
@@ -298,36 +298,36 @@ public class MsgAlarmController extends BaseController {
     public AjaxResult getInfo(@PathVariable Long id) {
         MsgAlarm msgAlarm = msgAlarmService.getById(id);
         if (!ObjectUtils.isEmpty(msgAlarm)) {
-            LambdaQueryWrapper<BaseCameraManagement> lw = new LambdaQueryWrapper<BaseCameraManagement>();
-            if (!ObjectUtils.isEmpty(msgAlarm.getCameraCode())) {
-                lw.eq(BaseCameraManagement::getCameraCode, msgAlarm.getCameraCode());
-            }
-            BaseCameraManagement baseCameraManagement = baseCameraManagementService.getOne(lw);
-            LambdaQueryWrapper<BaseRailwayManagement> wrapper = new LambdaQueryWrapper<BaseRailwayManagement>();
-            if (!ObjectUtils.isEmpty(baseCameraManagement.getRailwayCode())) {
-                wrapper.eq(BaseRailwayManagement::getRailwayCode, baseCameraManagement.getRailwayCode());
-            }
-            BaseRailwayManagement baseRailwayManagement = baseRailwayManagementService.getOne(wrapper);
+//            LambdaQueryWrapper<BaseCameraManagement> lw = new LambdaQueryWrapper<BaseCameraManagement>();
+//            if (!ObjectUtils.isEmpty(msgAlarm.getCameraCode())) {
+//                lw.eq(BaseCameraManagement::getCameraCode, msgAlarm.getCameraCode());
+//            }
+//            BaseCameraManagement baseCameraManagement = baseCameraManagementService.getOne(lw);
+//            LambdaQueryWrapper<BaseRailwayManagement> wrapper = new LambdaQueryWrapper<BaseRailwayManagement>();
+//            if (!ObjectUtils.isEmpty(baseCameraManagement.getRailwayCode())) {
+//                wrapper.eq(BaseRailwayManagement::getRailwayCode, baseCameraManagement.getRailwayCode());
+//            }
+//            BaseRailwayManagement baseRailwayManagement = baseRailwayManagementService.getOne(wrapper);
             MsgAlarmResp msgAlarmResp = new MsgAlarmResp();
 //            String[] split = msgAlarm.getImageUrl().split(";");
 //            ArrayList<String> objects = new ArrayList<>(Arrays.asList(split));
 //            msgAlarm.setImageUrls(objects);
-            if (StringUtils.isNotEmpty(msgAlarm.getReleasedBy())) {
-                BaseUser user = baseUserService.getUser(msgAlarm.getReleasedBy());
-                msgAlarm.setReleasedByName(user.getNickName());
-            }
-            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);
-            String mile = AppendUtils.stringAppend(baseCameraManagement.getInstallMile());
-            msgAlarmResp.setAlarmMile(mile);
-            msgAlarmResp.setInstallLongitude(baseCameraManagement.getInstallLongitude() + "," + baseCameraManagement.getInstallLatitude());
-            SysDept sysDept = deptService.selectDeptById(baseCameraManagement.getDeptId());
-            msgAlarmResp.setDeptName(sysDept.getDeptName());
+//            if (StringUtils.isNotEmpty(msgAlarm.getReleasedBy())) {
+//                BaseUser user = baseUserService.getUser(msgAlarm.getReleasedBy());
+//                msgAlarm.setReleasedByName(user.getNickName());
+//            }
+//            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);
+//            String mile = AppendUtils.stringAppend(baseCameraManagement.getInstallMile());
+//            msgAlarmResp.setAlarmMile(mile);
+//            msgAlarmResp.setInstallLongitude(baseCameraManagement.getInstallLongitude() + "," + baseCameraManagement.getInstallLatitude());
+//            SysDept sysDept = deptService.selectDeptById(baseCameraManagement.getDeptId());
+//            msgAlarmResp.setDeptName(sysDept.getDeptName());
             return AjaxResult.success(msgAlarmResp);
         } else {
             return success("无报警信息数据");

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

@@ -1,17 +1,15 @@
 package com.ozs.web.core.util;
 
 import com.alibaba.fastjson2.JSON;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.ozs.web.core.config.CaneraConfig;
 import com.ozs.common.config.BaseConfig;
 import com.ozs.common.constant.Constants;
 import com.ozs.common.core.domain.entity.SysDictData;
 import com.ozs.common.exception.base.BaseException;
 import com.ozs.common.utils.DateUtils;
 import com.ozs.common.utils.http.HttpUtils;
-import com.ozs.entity.BaseCameraManagement;
 import com.ozs.service.BaseCameraManagementService;
 import com.ozs.system.mapper.SysDictDataMapper;
+import com.ozs.web.core.config.CaneraConfig;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -471,81 +469,81 @@ public class CameraUtil {
         }
     }
 
-    /**
-     * 定时任务：关闭录制视频
-     *
-     * @throws IOException
-     * @throws InterruptedException
-     */
-    public void closeRecording() throws IOException, InterruptedException, ParseException {
-        LambdaQueryWrapper<BaseCameraManagement> wrapper = new LambdaQueryWrapper<>();
-        wrapper.eq(BaseCameraManagement::getStartRecording, 1);
-        wrapper.isNotNull(BaseCameraManagement::getTaskId);
-        List<BaseCameraManagement> list = baseCameraManagementService.list(wrapper);
-        log.info("list======================================" + list);
-        List<String> collect = list.stream().map(BaseCameraManagement::getCameraCode).collect(Collectors.toList());
-//        List<String> collect = new ArrayList<>();
-//        collect.add("42010001541320001116");
-        //遍历每个进行视频录制的摄像头
-        File file = new File(transcribeFilePath);
-        log.info("closeRecording-file.Name()======================================" + file.getName());
-        log.info("closeRecording-file.exists()======================================" + file.exists());
-        if (file.exists() && file.isDirectory()) {
-            //获取文件夹中所有的子文件夹和文件
-            File[] files = file.listFiles();
-            if (!ObjectUtils.isEmpty(files) && files.length > 0) {
-                for (File file1 : files) {
-                    log.info("closeRecording-file1---------------" + file1);
-                    log.info("closeRecording-cameraCode---------------" + collect);
-                    String substring = file1.toString().substring(file1.toString().lastIndexOf("\\") + 1);
-                    if (collect.contains(substring)) {
-                        File[] files1 = CameraUtil.getCurFilesList(file1.toString());
-                        if (!ObjectUtils.isEmpty(files1) && files1.length > 0) {
-                            int length = files1.length;
-                            File file2 = files1[length - 1];
-                            log.info("closeRecording-file2---------------" + file2);
-                            String time = file2.toString().substring(file2.toString().lastIndexOf("\\") + 1);
-                            String substring1 = time.substring(0, 15);
-                            String substring2 = substring1.substring(0, 4);
-                            String substring3 = substring1.substring(4, 6);
-                            String substring4 = substring1.substring(6, 8);
-                            String substring5 = substring1.substring(9, 11);
-                            String substring6 = substring1.substring(11, 13);
-                            String substring7 = substring1.substring(13, 15);
-                            String date = substring2 + "-" + substring3 + "-" + substring4 + " " + substring5 + ":" + substring6 + ":" + substring7;
-                            System.out.println(date);
-                            SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-                            Date parse = sdf.parse(date);
-                            //当前时间戳
-                            long dades = System.currentTimeMillis();
-                            //文件的时间戳
-                            long time1 = parse.getTime();
-                            //当前时间10分钟之前的时间戳
-                            long time2 = dades - 600000L;
-                            if (time2 <= time1 && time1 < dades) {
-                            } else {
-                                LambdaQueryWrapper<BaseCameraManagement> lw = new LambdaQueryWrapper<BaseCameraManagement>();
-                                lw.eq(BaseCameraManagement::getCameraCode, substring);
-                                BaseCameraManagement baseCameraManagement = baseCameraManagementService.getOne(lw);
-                                log.info("closeRecording-endRecording------------" + baseCameraManagement.getTaskId());
-                                String start = HttpUtils.sendGet(CameraUtil.endRecording(baseCameraManagement.getTaskId()));
-                                log.info("closeRecording-endRecording------------" + start);
-                                if ("success".equals(start)) {
-                                    baseCameraManagement.setStartRecording(2);
-                                    baseCameraManagement.setTaskId("");
-                                } else {
-                                    baseCameraManagement.setStartRecording(2);
-                                    baseCameraManagement.setTaskId("");
-                                    log.error("关闭视频录制异常日志如下:" + start);
-                                }
-                                baseCameraManagementService.updateById(baseCameraManagement);
-                            }
-                        }
-                    }
-                }
-            }
-        }
-    }
+//    /**
+//     * 定时任务：关闭录制视频
+//     *
+//     * @throws IOException
+//     * @throws InterruptedException
+//     */
+//    public void closeRecording() throws IOException, InterruptedException, ParseException {
+//        LambdaQueryWrapper<BaseCameraManagement> wrapper = new LambdaQueryWrapper<>();
+//        wrapper.eq(BaseCameraManagement::getStartRecording, 1);
+//        wrapper.isNotNull(BaseCameraManagement::getTaskId);
+//        List<BaseCameraManagement> list = baseCameraManagementService.list(wrapper);
+//        log.info("list======================================" + list);
+//        List<String> collect = list.stream().map(BaseCameraManagement::getCameraCode).collect(Collectors.toList());
+////        List<String> collect = new ArrayList<>();
+////        collect.add("42010001541320001116");
+//        //遍历每个进行视频录制的摄像头
+//        File file = new File(transcribeFilePath);
+//        log.info("closeRecording-file.Name()======================================" + file.getName());
+//        log.info("closeRecording-file.exists()======================================" + file.exists());
+//        if (file.exists() && file.isDirectory()) {
+//            //获取文件夹中所有的子文件夹和文件
+//            File[] files = file.listFiles();
+//            if (!ObjectUtils.isEmpty(files) && files.length > 0) {
+//                for (File file1 : files) {
+//                    log.info("closeRecording-file1---------------" + file1);
+//                    log.info("closeRecording-cameraCode---------------" + collect);
+//                    String substring = file1.toString().substring(file1.toString().lastIndexOf("\\") + 1);
+//                    if (collect.contains(substring)) {
+//                        File[] files1 = CameraUtil.getCurFilesList(file1.toString());
+//                        if (!ObjectUtils.isEmpty(files1) && files1.length > 0) {
+//                            int length = files1.length;
+//                            File file2 = files1[length - 1];
+//                            log.info("closeRecording-file2---------------" + file2);
+//                            String time = file2.toString().substring(file2.toString().lastIndexOf("\\") + 1);
+//                            String substring1 = time.substring(0, 15);
+//                            String substring2 = substring1.substring(0, 4);
+//                            String substring3 = substring1.substring(4, 6);
+//                            String substring4 = substring1.substring(6, 8);
+//                            String substring5 = substring1.substring(9, 11);
+//                            String substring6 = substring1.substring(11, 13);
+//                            String substring7 = substring1.substring(13, 15);
+//                            String date = substring2 + "-" + substring3 + "-" + substring4 + " " + substring5 + ":" + substring6 + ":" + substring7;
+//                            System.out.println(date);
+//                            SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+//                            Date parse = sdf.parse(date);
+//                            //当前时间戳
+//                            long dades = System.currentTimeMillis();
+//                            //文件的时间戳
+//                            long time1 = parse.getTime();
+//                            //当前时间10分钟之前的时间戳
+//                            long time2 = dades - 600000L;
+//                            if (time2 <= time1 && time1 < dades) {
+//                            } else {
+//                                LambdaQueryWrapper<BaseCameraManagement> lw = new LambdaQueryWrapper<BaseCameraManagement>();
+//                                lw.eq(BaseCameraManagement::getCameraCode, substring);
+//                                BaseCameraManagement baseCameraManagement = baseCameraManagementService.getOne(lw);
+//                                log.info("closeRecording-endRecording------------" + baseCameraManagement.getTaskId());
+//                                String start = HttpUtils.sendGet(CameraUtil.endRecording(baseCameraManagement.getTaskId()));
+//                                log.info("closeRecording-endRecording------------" + start);
+//                                if ("success".equals(start)) {
+//                                    baseCameraManagement.setStartRecording(2);
+//                                    baseCameraManagement.setTaskId("");
+//                                } else {
+//                                    baseCameraManagement.setStartRecording(2);
+//                                    baseCameraManagement.setTaskId("");
+//                                    log.error("关闭视频录制异常日志如下:" + start);
+//                                }
+//                                baseCameraManagementService.updateById(baseCameraManagement);
+//                            }
+//                        }
+//                    }
+//                }
+//            }
+//        }
+//    }
 
     public static File[] getCurFilesList(String filePath) {
         File path = new File(filePath);