设备状态和设备状态列表首页开发

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

@@ -1008,10 +1008,12 @@ public class BaseCameraManagementController extends BaseController {
      *
      * @return
      */
-    @GetMapping("/removePrice/{number}")
-    public AjaxResult removePrice(@PathVariable Integer number) {
+    @GetMapping("/removePrice")
+    public AjaxResult removePrice(@RequestParam("number") Integer number,@RequestParam("path") String path) {
         log.info("-----------------------removePrice");
-        cameraUtil.removePrice();
+        log.info("-----------------------removePrice"+"--number-----"+number);
+        log.info("-----------------------removePrice"+"--path-----"+path);
+        cameraUtil.removePrice(number,path);
         return success();
     }
 

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

@@ -1198,8 +1198,10 @@ ffmpeg -i "concat:1.ts|2.ts" -c copy output.mp4
     }
 
 
-    public void removePrice() {
+    public void removePrice(Integer number,String path) {
         log.info("removePrice-----------开始调用");
+        log.info("removePrice------number-----"+number);
+        log.info("removePrice-------path----"+path);
         try {
             // 创建MinioClient对象
             MinioClient minioClient = MinioClient.builder()
@@ -1209,10 +1211,10 @@ ffmpeg -i "concat:1.ts|2.ts" -c copy output.mp4
 
             // 指定要删除文件的桶名和目录名
             String bucketName = this.bucketName;
-            String prefix = "camera_picture/normal/";
-
+            String prefix = "camera_picture/normal/"+path;
+            log.info("removePrice-------prefix----"+prefix);
             // 指定要删除的时间点（此处为当前时间之前的时间）
-            ZonedDateTime deleteTime = ZonedDateTime.now().minusDays(120); // 删除30天前的文件
+            ZonedDateTime deleteTime = ZonedDateTime.now().minusDays(number); // 删除90天前的文件
 
             // 删除指定目录下的所有文件和文件夹
             deleteObjectsAndEmptyDirectoriesRecursively(minioClient, bucketName, prefix, deleteTime);
@@ -1222,14 +1224,12 @@ ffmpeg -i "concat:1.ts|2.ts" -c copy output.mp4
     }
 
     private static void deleteObjectsAndEmptyDirectoriesRecursively(MinioClient minioClient, String bucketName, String prefix, ZonedDateTime deleteTime) throws Exception {
-        log.info("deleteObjectsAndEmptyDirectoriesRecursively-----------进入方法");
         Iterable<Result<Item>> results = minioClient.listObjects(ListObjectsArgs.builder().bucket(bucketName).prefix(prefix).recursive(true).build());
-        log.info("deleteObjectsAndEmptyDirectoriesRecursively-----------获取数据完毕");
         for (Result<Item> result : results) {
-            log.info("deleteObjectsAndEmptyDirectoriesRecursively-----------进入循环");
             Item item = result.get();
             ZonedDateTime itemLastModified = item.lastModified();
             log.info("删除的时间:" + deleteTime);
+            log.info("文件名称: " + item.objectName());
             log.info("文件夹的时间:" + itemLastModified);
             if (itemLastModified.isBefore(deleteTime)) {
                 // 删除文件或文件夹