配置文件修改

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

@@ -103,19 +103,19 @@ public class MsgAlarm extends BaseEntity implements Serializable {
     private String imageUrl;
 
     /**
-     * 解除人
+     * 处置人
      */
     private String releasedBy;
 
     /**
-     * 解除时间
+     * 处置时间
      */
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @Excel(name = "解除时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "处置时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
     private Date releasedTime;
 
     /**
-     * 报警是否解除 1已解除2未解除
+     * 报警是否处置 1已处置2未处置
      */
     private Integer isLock;
 
@@ -148,21 +148,21 @@ public class MsgAlarm extends BaseEntity implements Serializable {
     private String remark;
 
     /**
-     * 解除报警类型1实报2误报
+     * 处置报警类型1实报2误报
      */
     private Integer releasedType;
 
     /**
-     * 解除原因
+     * 处置原因
      */
-    @Excel(name = "解除原因")
+    @Excel(name = "处置原因")
     private String releasedReason;
 
     /**
-     * 解除报警类型名称   1实报2误报
+     * 处置报警类型名称   1实报2误报
      */
     @TableField(exist = false)
-    @Excel(name = "解除报警类型")
+    @Excel(name = "处置报警类型")
     private String releasedTypeName;
 
     /**
@@ -204,10 +204,10 @@ public class MsgAlarm extends BaseEntity implements Serializable {
     private List<String> imageUrls;
 
     /**
-     * 解除人真实姓名
+     * 处置人真实姓名
      */
     @TableField(exist = false)
-    @Excel(name = "解除人")
+    @Excel(name = "处置人")
     private String releasedByName;
 
     /**
@@ -237,9 +237,9 @@ public class MsgAlarm extends BaseEntity implements Serializable {
     private String alarmTypeName;
 
     /**
-     * 报警是否解除 1已解除2未解除
+     * 报警是否处置 1已处置2未处置
      */
-    @Excel(name = "报警是否解除")
+    @Excel(name = "报警是否处置")
     @TableField(exist = false)
     private String  isLockName;
     

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

@@ -93,19 +93,19 @@ public class MsgAlarmCloud extends BaseEntity implements Serializable {
     private String imageUrl;
 
     /**
-     * 解除人
+     * 处置人
      */
     private String releasedBy;
 
     /**
-     * 解除时间
+     * 处置时间
      */
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @Excel(name = "解除时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "处置时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
     private Date releasedTime;
 
     /**
-     * 报警是否解除 1已解除2未解除
+     * 报警是否处置 1已处置2未处置
      */
     private Integer isLock;
 
@@ -138,21 +138,21 @@ public class MsgAlarmCloud extends BaseEntity implements Serializable {
     private String remark;
 
     /**
-     * 解除报警类型1实报2误报
+     * 处置报警类型1实报2误报
      */
     private Integer releasedType;
 
     /**
-     * 解除原因
+     * 处置原因
      */
-    @Excel(name = "解除原因")
+    @Excel(name = "处置原因")
     private String releasedReason;
 
     /**
-     * 解除报警类型名称   1实报2误报
+     * 处置报警类型名称   1实报2误报
      */
     @TableField(exist = false)
-    @Excel(name = "解除报警类型")
+    @Excel(name = "处置报警类型")
     private String releasedTypeName;
 
     /**
@@ -194,10 +194,10 @@ public class MsgAlarmCloud extends BaseEntity implements Serializable {
     private List<String> imageUrls;
 
     /**
-     * 解除人真实姓名
+     * 处置人真实姓名
      */
     @TableField(exist = false)
-    @Excel(name = "解除人")
+    @Excel(name = "处置人")
     private String releasedByName;
 
     /**
@@ -227,9 +227,9 @@ public class MsgAlarmCloud extends BaseEntity implements Serializable {
     private String alarmTypeName;
 
     /**
-     * 报警是否解除 1已解除2未解除
+     * 报警是否处置 1已处置2未处置
      */
-    @Excel(name = "报警是否解除")
+    @Excel(name = "报警是否处置")
     @TableField(exist = false)
     private String  isLockName;
 

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

@@ -100,7 +100,7 @@ public class MsgAlarmFrequency extends BaseEntity implements Serializable {
     private String remark;
 
     /**
-     * 报警是否解除 1已解除2未解除
+     * 报警是否处置 1已处置2未处置
      */
     @TableField(exist = false)
     private Integer isLock;

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

@@ -89,7 +89,7 @@ public class MsgAlarmFrequencyCloud extends BaseEntity implements Serializable {
     private String remark;
 
     /**
-     * 报警是否解除 1已解除2未解除
+     * 报警是否处置 1已处置2未处置
      */
     @TableField(exist = false)
     private Integer isLock;

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

@@ -109,7 +109,7 @@ public class MsgAlarmFrequencyMatter extends BaseEntity implements Serializable
     private String remark;
 
     /**
-     * 报警是否解除 1已解除2未解除
+     * 报警是否处置 1已处置2未处置
      */
     @TableField(exist = false)
     private Integer isLock;

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

@@ -95,19 +95,19 @@ public class MsgAlarmMatter extends BaseEntity implements Serializable {
     private String alarmAttr;
 
     /**
-     * 解除人
+     * 处置人
      */
     private String releasedBy;
 
     /**
-     * 解除时间
+     * 处置时间
      */
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @Excel(name = "解除时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "处置时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
     private Date releasedTime;
 
     /**
-     * 报警是否解除 1已解除2未解除
+     * 报警是否处置 1已处置2未处置
      */
     private Integer isRelease;
 
@@ -139,9 +139,9 @@ public class MsgAlarmMatter extends BaseEntity implements Serializable {
     private String remark;
 
     /**
-     * 解除内容
+     * 处置内容
      */
-    @Excel(name = "解除内容")
+    @Excel(name = "处置内容")
     private String releaseContent;
 
     /**
@@ -187,10 +187,10 @@ public class MsgAlarmMatter extends BaseEntity implements Serializable {
     private String imageUrlStr;
 
     /**
-     * 解除人真实姓名
+     * 处置人真实姓名
      */
     @TableField(exist = false)
-    @Excel(name = "解除人")
+    @Excel(name = "处置人")
     private String releasedByName;
 
     /**
@@ -220,9 +220,9 @@ public class MsgAlarmMatter extends BaseEntity implements Serializable {
     private String alarmTypeName;
 
     /**
-     * 报警是否解除 1已解除2未解除
+     * 报警是否处置 1已处置2未处置
      */
-    @Excel(name = "报警是否解除")
+    @Excel(name = "报警是否处置")
     @TableField(exist = false)
     private String  isReleaseName;
 

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

@@ -89,38 +89,38 @@ public class AlarmStatisticDto {
     private String imageUrl;
 
     /**
-     * 解除人
+     * 处置人
      */
     private String releasedBy;
 
     /**
-     * 解除人真实姓名
+     * 处置人真实姓名
      */
-    @Excel(name = "解除人")
+    @Excel(name = "处置人")
     private String releasedByName;
 
     /**
-     * 解除时间
+     * 处置时间
      */
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @Excel(name = "解除时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "处置时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
     private Date releasedTime;
 
     /**
-     * 解除原因
+     * 处置原因
      */
-    @Excel(name = "解除原因")
+    @Excel(name = "处置原因")
     private String releasedReason;
 
     /**
-     * 解除报警类型1实报2误报
+     * 处置报警类型1实报2误报
      */
     private Integer releasedType;
 
     /**
-     * 解除报警类型名称   1实报2误报
+     * 处置报警类型名称   1实报2误报
      */
-    @Excel(name = "解除报警类型")
+    @Excel(name = "处置报警类型")
     private String releasedTypeName;
 
     /**
@@ -138,14 +138,14 @@ public class AlarmStatisticDto {
     private String alarmMiles;
 
     /**
-     * 报警是否解除 1已解除2未解除
+     * 报警是否处置 1已处置2未处置
      */
     private Integer isLock;
 
     /**
-     * 报警是否解除 1已解除2未解除
+     * 报警是否处置 1已处置2未处置
      */
-    @Excel(name = "报警是否解除")
+    @Excel(name = "报警是否处置")
     private String isLockName;
 
     /**

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

@@ -46,17 +46,17 @@ public class AlarmStatisticVo {
     private String remark;
 
     /**
-     * 解除原因
+     * 处置原因
      */
     private String releasedReason;
 
     /**
-     * 解除报警类型1实报2误报
+     * 处置报警类型1实报2误报
      */
     private Integer releasedType;
 
     /**
-     * 解除报警类型名称   1实报2误报
+     * 处置报警类型名称   1实报2误报
      */
     private String releasedTypeName;
 
@@ -105,17 +105,17 @@ public class AlarmStatisticVo {
     private String imageUrl;
 
     /**
-     * 解除人
+     * 处置人
      */
     private String releasedBy;
 
     /**
-     * 解除人
+     * 处置人
      */
     private String releasedByName;
 
     /**
-     * 解除时间
+     * 处置时间
      */
     @JsonFormat(
             pattern = "yyyy-MM-dd HH:mm:ss"
@@ -123,12 +123,12 @@ public class AlarmStatisticVo {
     private Date releasedTime;
 
     /**
-     * 报警是否解除 1已解除2未解除
+     * 报警是否处置 1已处置2未处置
      */
     private Integer isLock;
 
     /**
-     * 报警是否解除 1已解除2未解除
+     * 报警是否处置 1已处置2未处置
      */
     private String isLockName;
 

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

@@ -150,7 +150,7 @@ public class BaseCameraManagementHomeVo extends BaseEntity implements Serializab
     private Integer isDisable;
 
     /**
-     * 报警是否解除 1已解除2未解除
+     * 报警是否处置 1已处置2未处置
      */
     private Integer isLock;
 }

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

@@ -24,7 +24,7 @@ public class HistoricalAlarmVo implements Serializable {
 
 
     /**
-     * 报警是否解除 1已解除2未解除
+     * 报警是否处置 1已处置2未处置
      */
     private Integer isLock;
 }

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

@@ -93,7 +93,7 @@ public class MsgAlarmMatterVo extends PageVo implements Serializable {
     private String endAlarmTime;
 
     /**
-     * 报警是否解除 1已解除2未解除
+     * 报警是否处置 1已处置2未处置
      */
     private Integer isRelease;
     private String isReleaseName;

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

@@ -88,12 +88,12 @@ public class MsgAlarmResp implements Serializable {
     private String installLongitude;
 
     /**
-     * 报警是否解除 1已解除2未解除
+     * 报警是否处置 1已处置2未处置
      */
     private Integer isLock;
 
     /**
-     * 解除时间
+     * 处置时间
      */
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date releasedTime;
@@ -118,12 +118,12 @@ public class MsgAlarmResp implements Serializable {
     private String deptName;
 
     /**
-     * 解除报警类型1实报2误报
+     * 处置报警类型1实报2误报
      */
     private Integer releasedType;
 
     /**
-     * 解除原因
+     * 处置原因
      */
     private String releasedReason;
 
@@ -137,12 +137,12 @@ public class MsgAlarmResp implements Serializable {
      */
     private String content;
     /**
-     * 解除人真实姓名
+     * 处置人真实姓名
      */
     private String releasedByName;
 
     /**
-     * 解除报警类型名称   1实报2误报
+     * 处置报警类型名称   1实报2误报
      */
     private String releasedTypeName;
 
@@ -182,7 +182,7 @@ public class MsgAlarmResp implements Serializable {
      */
     private String versionName;
     /**
-     * 未解除报警总数
+     * 未处置报警总数
      */
     private  Long unlockNum;
     /**

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

@@ -61,7 +61,7 @@ public class MsgAlarmVo extends PageVo implements Serializable {
 
 
     /**
-     * 报警是否解除 1已解除2未解除
+     * 报警是否处置 1已处置2未处置
      */
     private Integer isLock;
 
@@ -90,7 +90,7 @@ public class MsgAlarmVo extends PageVo implements Serializable {
     private String endMiles;
 
     /**
-     * 解除报警类型1实报2误报
+     * 处置报警类型1实报2误报
      */
     private Integer releasedType;
 

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

@@ -15,15 +15,15 @@ public class ReleaseAlarmVo implements Serializable {
      */
     private String alarmId;
     /**
-     * 解除报警时间
+     * 处置报警时间
      */
     private Long releaseTime;
     /**
-     * 解除原因（内容）
+     * 处置原因（内容）
      */
     private String releaseContent;
     /**
-     * 解除人
+     * 处置人
      */
     private String operator;
 }

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

@@ -34,7 +34,7 @@ public interface MsgAlarmCloudService extends IService<MsgAlarmCloud> {
     List<AlarmStatisticDto> exportExcel(AlarmStatisticResVo alarmStatisticResVo);
 
     /**
-     * 通过相机编码查询未解除预警信息
+     * 通过相机编码查询未处置预警信息
      *
      * @param cameraCode
      * @return

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

@@ -35,7 +35,7 @@ public interface MsgAlarmService extends IService<MsgAlarm> {
     List<AlarmStatisticDto> exportExcel(AlarmStatisticResVo alarmStatisticResVo);
 
     /**
-     * 通过相机编码查询未解除预警信息
+     * 通过相机编码查询未处置预警信息
      *
      * @param cameraCode
      * @return

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

@@ -123,11 +123,11 @@ public class MsgAlarmCloudServiceImpl extends ServiceImpl<MsgAlarmCloudMapper, M
         Integer countCamera = baseCameraManagementMapper.countCamera(msgAlarmVo);
         // 累计报警次数
         Integer countMsg = msgAlarmCloudMapper.countMsg(msgAlarmVo);
-        // 解除报警
+        // 处置报警
 //        LambdaQueryWrapper<MsgAlarm> lwJC = new LambdaQueryWrapper<MsgAlarm>();
 //        lwJC.eq(MsgAlarm::getIsLock, "1");
         Integer countJC = msgAlarmCloudMapper.countJC(msgAlarmVo);
-        // 未解除报警
+        // 未处置报警
 //        LambdaQueryWrapper<MsgAlarm> lwWJC = new LambdaQueryWrapper<MsgAlarm>();
 //        lwWJC.eq(MsgAlarm::getIsLock, "2");
         Integer countWJC = msgAlarmCloudMapper.countWJC(msgAlarmVo);
@@ -247,7 +247,7 @@ public class MsgAlarmCloudServiceImpl extends ServiceImpl<MsgAlarmCloudMapper, M
         int unresolvedCount = 0;
         //找出所有报警数据
         List<MsgAlarmCloud> list = msgAlarmCloudMapper.selectMsgAlarmList(msgAlarmVo1);
-        //未解除的报警
+        //未处置的报警
         msgAlarmVo1.setIsLock(2);
         List<MsgAlarmCloud> alarmList = msgAlarmCloudMapper.selectMsgAlarmList(msgAlarmVo1);
         HashMap<String, Integer> map = new HashMap<>();
@@ -273,7 +273,7 @@ public class MsgAlarmCloudServiceImpl extends ServiceImpl<MsgAlarmCloudMapper, M
         }
         if (!ObjectUtils.isEmpty(alarmList)) {
             //获取所有报警的相机编码
-            //找出所有未解除报警数据 1=高铁的数量
+            //找出所有未处置报警数据 1=高铁的数量
             unresolvedCount = (int) alarmList.stream()
                     .map(base -> baseCameraManagementMapper.selectOne(new LambdaQueryWrapper<BaseCameraManagement>()
                             .eq(BaseCameraManagement::getCameraCode, base.getCameraCode())))

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

@@ -122,11 +122,11 @@ public class MsgAlarmServiceImpl extends ServiceImpl<MsgAlarmMapper, MsgAlarm> i
         Integer countCamera = baseCameraManagementMapper.countCamera(msgAlarmVo);
         // 累计报警次数
         Integer countMsg = msgAlarmMapper.countMsg(msgAlarmVo);
-        // 解除报警
+        // 处置报警
 //        LambdaQueryWrapper<MsgAlarm> lwJC = new LambdaQueryWrapper<MsgAlarm>();
 //        lwJC.eq(MsgAlarm::getIsLock, "1");
         Integer countJC = msgAlarmMapper.countJC(msgAlarmVo);
-        // 未解除报警
+        // 未处置报警
 //        LambdaQueryWrapper<MsgAlarm> lwWJC = new LambdaQueryWrapper<MsgAlarm>();
 //        lwWJC.eq(MsgAlarm::getIsLock, "2");
         Integer countWJC = msgAlarmMapper.countWJC(msgAlarmVo);

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

@@ -134,7 +134,7 @@ public class MsgAlarmController extends BaseController {
 
     /**
      * 首页报警信息列表
-     * 首页左侧报警默认为全部，先按照未解除、已解除排序，然后再按照时间倒序排序
+     * 首页左侧报警默认为全部，先按照未处置、已处置排序，然后再按照时间倒序排序
      *
      * @param msgAlarmVo
      * @return
@@ -360,7 +360,7 @@ public class MsgAlarmController extends BaseController {
             }
 
 
-            msgAlarm.setIsLockName(msgAlarm.getIsLock() == 1 ? "已解除" : "未解除");
+            msgAlarm.setIsLockName(msgAlarm.getIsLock() == 1 ? "已处置" : "未处置");
             LambdaQueryWrapper<SysDictData> dict = new LambdaQueryWrapper<>();
             dict.eq(SysDictData::getDictType, "sys_alarm_type");
             dict.eq(SysDictData::getDictValue, msgAlarm.getAlarmType());
@@ -494,7 +494,7 @@ public class MsgAlarmController extends BaseController {
                                    @RequestParam(value = "releasedReason", required = false) String releasedReason) {
         MsgAlarm msgAlarm = msgAlarmService.getById(id);
         if (msgAlarm.getIsLock() == 1) {
-            return AjaxResult.error("501", "报警已解除");
+            return AjaxResult.error("501", "报警已处置");
         }
         msgAlarm.setIsLock(1);
         msgAlarm.setUpdateBy(getUserId());
@@ -629,7 +629,7 @@ public class MsgAlarmController extends BaseController {
                     o.setAlarmTypeName(dictDataService.selectDictLabel("sys_alarm_type", String.valueOf(o.getAlarmType())));
                 }
                 if (!ObjectUtils.isEmpty(o.getIsLock())) {
-                    o.setIsLockName(o.getIsLock() == 1 ? "已解除" : "未解除");
+                    o.setIsLockName(o.getIsLock() == 1 ? "已处置" : "未处置");
                 }
                 if (!ObjectUtils.isEmpty(o.getAlarmAttr())) {
                     String[] split1 = o.getAlarmAttr().split(",");
@@ -739,7 +739,7 @@ public class MsgAlarmController extends BaseController {
                         l.setLineDirValue(lineDirValue);
                     }
                     if (!ObjectUtils.isEmpty(l.getIsLock())) {
-                        l.setIsLockName(l.getIsLock() == 1 ? "已解除" : "未解除");
+                        l.setIsLockName(l.getIsLock() == 1 ? "已处置" : "未处置");
                     }
                     if (!ObjectUtils.isEmpty(l.getAlarmAttr())) {
                         String[] split1 = l.getAlarmAttr().split(",");

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

@@ -110,7 +110,7 @@ public class MsgAlarmMatterController extends BaseController {
                 String mils = AppendUtils.stringAppend(o.getAlarmMile());
                 o.setAlarmMiles(mils);
                 o.setLineDirName(o.getLineDir() == 1 ? "上行" : "下行");
-                o.setIsReleaseName(o.getIsRelease() == 1 ? "已解除" : (o.getIsRelease() == 2 ? "未解除" : "未知"));
+                o.setIsReleaseName(o.getIsRelease() == 1 ? "已处置" : (o.getIsRelease() == 2 ? "未处置" : "未知"));
                 List<SysDictData> data = dictTypeService.selectDictDataByType("sys_alarm_type");
                 data.stream().forEach(sysDictData -> {
                     if (sysDictData.getDictValue().equals(o.getAlarmType().toString())) {
@@ -174,7 +174,7 @@ public class MsgAlarmMatterController extends BaseController {
             o.setAlarmMiles(mils);
             o.setLineDirName(o.getLineDir() == 1 ? "上行" : "下行");
             o.setAlarmTypeStr(o.getAlarmType() == 1 ? "泥石流" : (o.getAlarmType() == 2 ? "异物侵限" : (o.getAlarmType() == 3 ? "断轨监测" : "未知")));
-            o.setIsReleaseName(o.getIsRelease() == 1 ? "已解除" : (o.getIsRelease() == 2 ? "未解除" : "未知"));
+            o.setIsReleaseName(o.getIsRelease() == 1 ? "已处置" : (o.getIsRelease() == 2 ? "未处置" : "未知"));
             List<SysDictData> data = dictTypeService.selectDictDataByType("sys_alarm_type");
             data.stream().forEach(sysDictData -> {
                 if (sysDictData.getDictValue().equals(o.getAlarmType().toString())) {

hazard-admin/src/main/java/com/ozs/web/controller/shotschedule/ShotPictureTaskExecutors.java

@@ -103,7 +103,7 @@ public class ShotPictureTaskExecutors {
 //        // 获取分布式锁
 //        boolean lockSuccess = redisTemplate.opsForValue().setIfAbsent(LOCK_CAMELA_NORMAL_KEY, "execute", Duration.ofSeconds(60));
 //        if (lockSuccess) {
-//            // 查询未解除的报警摄像头(报警摄像头逻辑沿用wangyy代码)
+//            // 查询未处置的报警摄像头(报警摄像头逻辑沿用wangyy代码)
 //            List<String> lockedMsgAlarmCameraCodes = msgAlarmMapper.selectList(new QueryWrapper<MsgAlarm>().eq("is_lock", 2))
 //                    .stream().map(f -> f.getCameraCode()).distinct().collect(Collectors.toList());
 //            try {

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

@@ -517,7 +517,7 @@ ffmpeg -i "concat:1.ts|2.ts" -c copy output.mp4
                 mergeVideoTsFile = new HashMap<>();
             }
             if (!flay) {
-                // 如果没有解除，把生成的文件放入要删除的定时任务 redis key 中
+                // 如果没有处置，把生成的文件放入要删除的定时任务 redis key 中
                 fileTs.add(newfilePath);
             }
             mergeVideoTsFile.put(new Date().getTime() + "", fileTs);
@@ -1026,7 +1026,7 @@ ffmpeg -i "concat:1.ts|2.ts" -c copy output.mp4
         List<MsgAlarm> msgAlarms = msgAlarmService.queryAlarmInfoByAfterTenMinute();
         if (!ObjectUtils.isEmpty(msgAlarms)) {
             for (MsgAlarm msgAlarm : msgAlarms) {
-                // 表示已经超过报警时间10分钟，且没有解除报警、也没有报警Url 的可以合成视频
+                // 表示已经超过报警时间10分钟，且没有处置报警、也没有报警Url 的可以合成视频
                 Map<String, Object> map = baseCameraManagementService.getCameraChannelByAlarmId(msgAlarm.getAlarmId());
                 if (!StringUtils.isBlank(map.get("channel").toString())) {
                     log.info("报警UUID:{},相机通道：{},开始时间：{}，结束时间：{}", msgAlarm.getAlarmId(), map.get("channel").toString(), msgAlarm.getAlarmTime(), new Date());

hazard-sdk/src/main/java/com/ozs/controller/matter/MatterMonitorTokenController.java

@@ -277,7 +277,7 @@ public class MatterMonitorTokenController {
     }
 
     /**
-     * 报警解除接口
+     * 报警处置接口
      *
      * @param parameterVo
      * @param request
@@ -301,15 +301,15 @@ public class MatterMonitorTokenController {
                 return SM4Utils.encryptData_ECB(JSONObject.toJSONString(AjaxResults1), "f5408458becc8c68");
             }
             if (ObjectUtils.isEmpty(releaseAlarmVo.getReleaseTime())) {
-                AjaxResults1 = new AjaxResults(0, "解除报警时间不能为空");
+                AjaxResults1 = new AjaxResults(0, "处置报警时间不能为空");
                 return SM4Utils.encryptData_ECB(JSONObject.toJSONString(AjaxResults1), "f5408458becc8c68");
             }
             if (ObjectUtils.isEmpty(releaseAlarmVo.getReleaseContent())) {
-                AjaxResults1 = new AjaxResults(0, "解除原因不能为空");
+                AjaxResults1 = new AjaxResults(0, "处置原因不能为空");
                 return SM4Utils.encryptData_ECB(JSONObject.toJSONString(AjaxResults1), "f5408458becc8c68");
             }
             if (ObjectUtils.isEmpty(releaseAlarmVo.getOperator())) {
-                AjaxResults1 = new AjaxResults(0, "解除人不能为空");
+                AjaxResults1 = new AjaxResults(0, "处置人不能为空");
                 return SM4Utils.encryptData_ECB(JSONObject.toJSONString(AjaxResults1), "f5408458becc8c68");
             }
             LambdaQueryWrapper<MsgAlarmMatter> wrapper = new LambdaQueryWrapper<>();

hazard-sdk/src/main/java/com/ozs/vo/RespMsgAlarmVo.java

@@ -19,7 +19,7 @@ public class RespMsgAlarmVo implements Serializable {
     private String alarmId;
 
     /**
-     * 报警解除时间
+     * 报警处置时间
      */
     private Long cancelTime;
 
@@ -29,7 +29,7 @@ public class RespMsgAlarmVo implements Serializable {
     private String cameraCode;
 
     /**
-     * 报警是否解除 1已解除2未解除
+     * 报警是否处置 1已处置2未处置
      */
     private Integer isCancel;
 }