Merge branch 'master' of http://124.70.58.209:3000/ytrd-project-management/GeoHazardMonitor

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

@@ -792,6 +792,7 @@ public class BaseCameraManagementController extends BaseController {
                 msgAlarmResp.setAlarmAttr(msgAlarm.getAlarmAttr());
                 msgAlarmResp.setContent(msgAlarm.getContent());
                 msgAlarmResp.setReleasedByName(msgAlarm.getReleasedByName());
+                msgAlarmResp.setReleasedReason(msgAlarm.getReleasedReason());
                 if (!StringUtils.isEmpty(msgAlarm.getImageUrl())) {
                     String[] split = msgAlarm.getImageUrl().split(";");
                     ArrayList<String> objects = new ArrayList<>(Arrays.asList(split));

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

@@ -377,10 +377,10 @@ public class MsgAlarmController extends BaseController {
         msgAlarm.setUpdateBy(getUserId());
         msgAlarm.setReleasedBy(getUserId());
         msgAlarm.setReleasedTime(new Date());
-        if (!ObjectUtils.isEmpty(msgAlarm.getReleasedReason())) {
+        if (!ObjectUtils.isEmpty(releasedReason)) {
             msgAlarm.setReleasedReason(releasedReason);
         }
-        if (!ObjectUtils.isEmpty(msgAlarm.getReleasedType())) {
+        if (!ObjectUtils.isEmpty(releasedType)) {
             msgAlarm.setReleasedType(releasedType);
         }
         return AjaxResult.success(msgAlarmService.updateById(msgAlarm));

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

@@ -479,8 +479,9 @@ ffmpeg -i "concat:1.ts|2.ts" -c copy output.flv
 
         SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMdd");
         Date date = new Date();
+        String format = sdf.format(date);
         Calendar calendar = new GregorianCalendar();
-        calendar.setTime(date);
+        calendar.setTime(sdf.parse(format));
         //正数，日期天数加
         //负数，日期天数减                         提前45天
         if (!ObjectUtils.isEmpty(sysCameraRecordTime)) {
@@ -490,18 +491,15 @@ ffmpeg -i "concat:1.ts|2.ts" -c copy output.flv
             calendar.add(Calendar.DAY_OF_YEAR, -45);
         }
         date = calendar.getTime();
-
+        log.info("过期date======================================" + sdf.format(date));
         //遍历每个进行视频录制的摄像头
         File file = new File(transcribeFilePath);
-        log.info("file.Name()======================================" + file.getName());
-        log.info("file.exists()======================================" + file.exists());
         if (file.exists() && file.isDirectory()) {
             //获取文件夹中所有的子文件夹和文件
             File[] files = file.listFiles();
             if (!ObjectUtils.isEmpty(files) && files.length > 0) {
                 for (File file1 : files) {
                     //   file1=/opt/streams/record/flv/34020000001320000167
-                    log.info("file1.Name()======================================" + file1.getName());
                     if (file1.exists() && file1.isDirectory()) {
                         //相机文件
                         File[] fs = file1.listFiles();
@@ -510,9 +508,9 @@ ffmpeg -i "concat:1.ts|2.ts" -c copy output.flv
                                 //    f=/opt/streams/record/flv/34020000001320000167/20230328_192033_192037-91509173-cd5a-11ed-8a42-fa163e4e1e9f.flv
                                 //fName=20230328_192033_192037-91509173-cd5a-11ed-8a42-fa163e4e1e9f.flv
                                 String fName = f.getName();
-                                log.info("fName======================================" + fName);
                                 String[] split = fName.split("_");
-                                if (split.length > 0) {
+                                //没有进行分割长度就是1
+                                if (split.length > 1) {
                                     //20230328
                                     String s = split[0];
                                     Date parse = sdf.parse(s);
@@ -520,7 +518,10 @@ ffmpeg -i "concat:1.ts|2.ts" -c copy output.flv
                                     long dateTime = date.getTime();
                                     //删除过期文件
                                     if (fTime < dateTime) {
+                                        log.info("文件过期时间===========================" + dateTime);
+                                        log.info("该文件保存时间===========================" + fTime);
                                         f.delete();
+                                        log.info("删除过期视频文件===========================" + fName);
                                     }
                                 }
                             }