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

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

@@ -438,7 +438,7 @@ public class CameraUtil {
             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());
@@ -548,7 +548,7 @@ public class CameraUtil {
                                 }
                                 baseCameraManagementService.updateById(baseCameraManagement);
                             }
-                        }else {
+                        } else {
                             LambdaQueryWrapper<BaseCameraManagement> lw = new LambdaQueryWrapper<BaseCameraManagement>();
                             lw.eq(BaseCameraManagement::getCameraCode, substring);
                             BaseCameraManagement baseCameraManagement = baseCameraManagementService.getOne(lw);

hazard-admin/src/main/resources/banner.txt

@@ -1,4 +1,4 @@
-Application Version: ${ruoyi.version}
+Application Version: ${base.version}
 Spring Boot Version: ${spring-boot.version}
 ////////////////////////////////////////////////////////////////////
 //                          _ooOoo_                               //
@@ -21,4 +21,4 @@ Spring Boot Version: ${spring-boot.version}
 //                           `=---='                              //
 //      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^        //
 //             佛祖保佑       永不宕机      永无BUG               //
-////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////