dsx 2 年之前
父节点
当前提交
2b068524f6

+ 12 - 2
src/main/java/com/fdkankan/scene/controller/SceneController.java

@@ -106,10 +106,20 @@ public class SceneController extends BaseController {
 
     @GetMapping("/jd")
     public ResultData jd(String path){
-        fYunFileService.restoreFolder("4dkk-bak", path, 1);
-//        fYunFileService.copyFileBetweenBucket("4dkk-bak", path, "4dkk-bak", path);
+        fYunFileService.restoreFolder("test-4dkk-bak", path, 1);
         return ResultData.ok();
     }
 
+    @GetMapping("/dj")
+    public ResultData dj(String path){
+        fYunFileService.copyFileToArchive("test-4dkankan", path, "test-4dkk-bak", path);
+        return ResultData.ok();
+    }
+
+    @GetMapping("/checkGd")
+    public ResultData checkGd(String path){
+        return ResultData.ok(fYunFileService.checkStore("test-4dkk-bak", path));
+    }
+
 }
 

+ 77 - 77
src/main/java/com/fdkankan/scene/schedule/ScheduleJob.java

@@ -83,42 +83,42 @@ public class ScheduleJob {
      * 删除已删除场景原始资源及caches
      * 每天凌晨执行
      */
-    @Scheduled(cron="0 0 1 * * ?")
-    public void cleanOss4DeletedSceneV3() {
-        log.info("删除已删除V3场景原始资源开始");
-        String lockKey = RedisLockKey.LOCK_CLEAN_SCENE_DELETED_ORIG_V3;
-        try {
-            boolean lock = redisLockUtil.lock(lockKey, 24*60*60);
-            if(!lock){
-                return;
-            }
-            sceneCleanOrigService.cleanOss4DeletedSceneV3();
-        }finally {
-            redisLockUtil.unlockLua(lockKey);
-        }
-        log.info("删除已删除V3场景原始资源结束");
-    }
-
-
-    /**
-     * 删除已删除场景原始资源及caches
-     * 每天凌晨执行
-     */
-    @Scheduled(cron="0 0 1 * * ?")
-    public void cleanOss4DeletedSceneV4() {
-        log.info("删除已删除V4场景原始资源开始");
-        String lockKey = RedisLockKey.LOCK_CLEAN_SCENE_DELETED_ORIG_V4;
-        try {
-            boolean lock = redisLockUtil.lock(lockKey, 24*60*60);
-            if(!lock){
-                return;
-            }
-            sceneCleanOrigService.cleanOss4DeletedSceneV4();
-        }finally {
-            redisLockUtil.unlockLua(lockKey);
-        }
-        log.info("删除已删除V4场景原始资源结束");
-    }
+//    @Scheduled(cron="0 0 1 * * ?")
+//    public void cleanOss4DeletedSceneV3() {
+//        log.info("删除已删除V3场景原始资源开始");
+//        String lockKey = RedisLockKey.LOCK_CLEAN_SCENE_DELETED_ORIG_V3;
+//        try {
+//            boolean lock = redisLockUtil.lock(lockKey, 24*60*60);
+//            if(!lock){
+//                return;
+//            }
+//            sceneCleanOrigService.cleanOss4DeletedSceneV3();
+//        }finally {
+//            redisLockUtil.unlockLua(lockKey);
+//        }
+//        log.info("删除已删除V3场景原始资源结束");
+//    }
+//
+//
+//    /**
+//     * 删除已删除场景原始资源及caches
+//     * 每天凌晨执行
+//     */
+//    @Scheduled(cron="0 0 1 * * ?")
+//    public void cleanOss4DeletedSceneV4() {
+//        log.info("删除已删除V4场景原始资源开始");
+//        String lockKey = RedisLockKey.LOCK_CLEAN_SCENE_DELETED_ORIG_V4;
+//        try {
+//            boolean lock = redisLockUtil.lock(lockKey, 24*60*60);
+//            if(!lock){
+//                return;
+//            }
+//            sceneCleanOrigService.cleanOss4DeletedSceneV4();
+//        }finally {
+//            redisLockUtil.unlockLua(lockKey);
+//        }
+//        log.info("删除已删除V4场景原始资源结束");
+//    }
 
 //    /**
 //     * 删除测试相机场景原始资源及caches
@@ -149,45 +149,45 @@ public class ScheduleJob {
 //        log.info("删除已删除V4场景原始资源结束");
 //    }
 
-    /**
-     * 删除场景原始资源
-     * 每天凌晨执行
-     */
-    @Scheduled(cron="0 0/10 * * * ?")
-//    @Scheduled(cron="0 0 1 * * ?")
-    public void coldStorageHomeV3() {
-        log.info("冻结v3场景原始资源开始");
-        String lockKey = RedisLockKey.LOCK_CLEAN_SCENE_ORIG_V3;
-        try {
-            boolean lock = redisLockUtil.lock(lockKey, 24*60*60);
-            if(!lock){
-                return;
-            }
-            sceneCleanOrigService.coldStorageHomeV3();
-        }finally {
-            redisLockUtil.unlockLua(lockKey);
-        }
-        log.info("冻结v3场景原始资源结束");
-    }
-
-    /**
-     * 删除场景原始资源
-     * 每天凌晨执行
-     */
-    @Scheduled(cron="0 0/10 * * * ?")
-//    @Scheduled(cron="0 0 1 * * ?")
-    public void coldStorageHomeV4() {
-        log.info("冻结v4场景原始资源开始");
-        String lockKey = RedisLockKey.LOCK_CLEAN_SCENE_ORIG_V4;
-        try {
-            boolean lock = redisLockUtil.lock(lockKey, 24*60*60);
-            if(!lock){
-                return;
-            }
-            sceneCleanOrigService.coldStorageHomeV4();
-        }finally {
-            redisLockUtil.unlockLua(lockKey);
-        }
-        log.info("冻结v4场景原始资源结束");
-    }
+//    /**
+//     * 删除场景原始资源
+//     * 每天凌晨执行
+//     */
+//    @Scheduled(cron="0 0/10 * * * ?")
+////    @Scheduled(cron="0 0 1 * * ?")
+//    public void coldStorageHomeV3() {
+//        log.info("冻结v3场景原始资源开始");
+//        String lockKey = RedisLockKey.LOCK_CLEAN_SCENE_ORIG_V3;
+//        try {
+//            boolean lock = redisLockUtil.lock(lockKey, 24*60*60);
+//            if(!lock){
+//                return;
+//            }
+//            sceneCleanOrigService.coldStorageHomeV3();
+//        }finally {
+//            redisLockUtil.unlockLua(lockKey);
+//        }
+//        log.info("冻结v3场景原始资源结束");
+//    }
+//
+//    /**
+//     * 删除场景原始资源
+//     * 每天凌晨执行
+//     */
+//    @Scheduled(cron="0 0/10 * * * ?")
+////    @Scheduled(cron="0 0 1 * * ?")
+//    public void coldStorageHomeV4() {
+//        log.info("冻结v4场景原始资源开始");
+//        String lockKey = RedisLockKey.LOCK_CLEAN_SCENE_ORIG_V4;
+//        try {
+//            boolean lock = redisLockUtil.lock(lockKey, 24*60*60);
+//            if(!lock){
+//                return;
+//            }
+//            sceneCleanOrigService.coldStorageHomeV4();
+//        }finally {
+//            redisLockUtil.unlockLua(lockKey);
+//        }
+//        log.info("冻结v4场景原始资源结束");
+//    }
 }