Merge remote-tracking branch 'origin/master'

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

@@ -405,6 +405,8 @@ public class CameraUtil {
         date = calendar.getTime();
         //时间格式化为字符串
         String formatD = sdf.format(date);
+        log.info("formatD======================================" + formatD);
+
         //遍历每个进行视频录制的摄像头
         File file = new File(transcribeFilePath);
         if (file.exists()) {
@@ -417,6 +419,7 @@ public class CameraUtil {
                 List<String> commands = new ArrayList<>();
                 for (Map<String, Object> map : maps) {
                     Object path = map.get("Path");
+                    log.info("path======================================" + path.toString());
                     //查出符合条件的视频文件，删掉
                     if (!ObjectUtils.isEmpty(path)) {
                         String commit = " rm -rf  " + transcribeFilePath + "/" + path.toString() + "/" + formatD + "*";
@@ -426,6 +429,7 @@ public class CameraUtil {
                 // 删除
                 for (String line : commands) {
                     out.println(line);
+                    log.info("line======================================" + line);
                 }
             }
         }

hazard-sdk/src/main/java/com/ozs/controller/upload/GeoHazardMonitorTokenController.java

@@ -42,7 +42,7 @@ import java.util.*;
 @RestController
 @Slf4j
 public class GeoHazardMonitorTokenController {
-    public static final String PATTERN = "^([1-9]+),([0-9]+),([0-9]+),([0-9]+),([0-9]+),([0-9]+)$";
+    public static final String PATTERN = "^([0-9]+),([0-9]+),([0-9]+),([0-9]+),([0-9]+),([0-9]+)$";
     @Resource
     private ApiTokenUtils apiTokenUtils;
     @Resource