四川日报项目需求

pom.xml

@@ -82,13 +82,7 @@
 
         <dependency>
             <groupId>com.fdkankan</groupId>
-            <artifactId>4dkankan-utils-fyun-oss</artifactId>
-            <version>3.0.0-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>com.fdkankan</groupId>
-            <artifactId>4dkankan-utils-fyun-s3</artifactId>
+            <artifactId>4dkankan-utils-fyun-obs</artifactId>
             <version>3.0.0-SNAPSHOT</version>
         </dependency>
 

src/main/java/com/fdkankan/scene/schedule/ScheduleJob.java

@@ -1,201 +1,201 @@
-package com.fdkankan.scene.schedule;
-
-import com.fdkankan.common.constant.SceneAsynFuncType;
-import com.fdkankan.redis.constant.RedisLockKey;
-import com.fdkankan.redis.util.RedisLockUtil;
-import com.fdkankan.scene.service.ISceneAsynOperLogService;
-import com.fdkankan.scene.service.ISceneCleanOrigService;
-import lombok.extern.log4j.Log4j2;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.cloud.context.config.annotation.RefreshScope;
-import org.springframework.scheduling.annotation.Scheduled;
-import org.springframework.stereotype.Component;
-
-import javax.annotation.PostConstruct;
-
-@RefreshScope
-@Log4j2
-@Component
-public class ScheduleJob {
-
-    @Value("${environment:#{null}}")
-    private String environment;
-
-    @Autowired
-    private ISceneAsynOperLogService sceneAsynOperLogService;
-    @Autowired
-    private ISceneCleanOrigService sceneCleanOrigService;
-    @Autowired
-    private RedisLockUtil redisLockUtil;
-
-    /**
-     * 清除异步批量下载全景图OSS压缩包
-     */
-    @Scheduled(cron="0 0 1 * * ?")
-    public void cleanDownloadPanorama() {
-        log.info("定时清除全景图压缩包开始");
-        sceneAsynOperLogService.cleanDownloadOssPage(SceneAsynFuncType.PANORAMIC_IMAGE.code(), 1);
-        log.info("定时清除全景图压缩包完毕");
-    }
-
-    /**
-     * 清除异步批量下载全景图OSS压缩包
-     */
-    @Scheduled(cron="0 0 1 * * ?")
-    public void cleanDownloadModel() {
-        log.info("定时清除模型压缩包开始");
-        sceneAsynOperLogService.cleanDownloadOssPage(SceneAsynFuncType.MODEL.code(), 1);
-        log.info("定时清除模型压缩包完毕");
-    }
-
+//package com.fdkankan.scene.schedule;
+//
+//import com.fdkankan.common.constant.SceneAsynFuncType;
+//import com.fdkankan.redis.constant.RedisLockKey;
+//import com.fdkankan.redis.util.RedisLockUtil;
+//import com.fdkankan.scene.service.ISceneAsynOperLogService;
+//import com.fdkankan.scene.service.ISceneCleanOrigService;
+//import lombok.extern.log4j.Log4j2;
+//import org.springframework.beans.factory.annotation.Autowired;
+//import org.springframework.beans.factory.annotation.Value;
+//import org.springframework.cloud.context.config.annotation.RefreshScope;
+//import org.springframework.scheduling.annotation.Scheduled;
+//import org.springframework.stereotype.Component;
+//
+//import javax.annotation.PostConstruct;
+//
+//@RefreshScope
+//@Log4j2
+//@Component
+//public class ScheduleJob {
+//
+//    @Value("${environment:#{null}}")
+//    private String environment;
+//
+//    @Autowired
+//    private ISceneAsynOperLogService sceneAsynOperLogService;
+//    @Autowired
+//    private ISceneCleanOrigService sceneCleanOrigService;
+//    @Autowired
+//    private RedisLockUtil redisLockUtil;
+//
 //    /**
-//     * 删除场景原始资源
+//     * 清除异步批量下载全景图OSS压缩包
+//     */
+//    @Scheduled(cron="0 0 1 * * ?")
+//    public void cleanDownloadPanorama() {
+//        log.info("定时清除全景图压缩包开始");
+//        sceneAsynOperLogService.cleanDownloadOssPage(SceneAsynFuncType.PANORAMIC_IMAGE.code(), 1);
+//        log.info("定时清除全景图压缩包完毕");
+//    }
+//
+//    /**
+//     * 清除异步批量下载全景图OSS压缩包
+//     */
+//    @Scheduled(cron="0 0 1 * * ?")
+//    public void cleanDownloadModel() {
+//        log.info("定时清除模型压缩包开始");
+//        sceneAsynOperLogService.cleanDownloadOssPage(SceneAsynFuncType.MODEL.code(), 1);
+//        log.info("定时清除模型压缩包完毕");
+//    }
+//
+////    /**
+////     * 删除场景原始资源
+////     * 每天凌晨执行
+////     */
+////    @Scheduled(cron="0 0 1 * * ?")
+////    public void cleanOssHomeV3() {
+////        log.info("删除v3场景原始资源开始");
+////        String lockKey = RedisLockKey.LOCK_CLEAN_SCENE_ORIG_V3;
+////        try {
+////            boolean lock = redisLockUtil.lock(lockKey, 24*60*60);
+////            if(!lock){
+////                return;
+////            }
+////            sceneCleanOrigService.cleanOrigV3();
+////        }finally {
+////            redisLockUtil.unlockLua(lockKey);
+////        }
+////        log.info("删除v3场景原始资源结束");
+////    }
+////
+////    /**
+////     * 删除场景原始资源
+////     * 每天凌晨执行
+////     */
+////    @Scheduled(cron="0 0 1 * * ?")
+////    public void cleanOssHomeV4() {
+////        log.info("删除v4场景原始资源开始");
+////        String lockKey = RedisLockKey.LOCK_CLEAN_SCENE_ORIG_V4;
+////        try {
+////            boolean lock = redisLockUtil.lock(lockKey, 24*60*60);
+////            if(!lock){
+////                return;
+////            }
+////            sceneCleanOrigService.cleanOrigV4();
+////        }finally {
+////            redisLockUtil.unlockLua(lockKey);
+////        }
+////        log.info("删除v4场景原始资源结束");
+////    }
+//
+//    /**
+//     * 删除已删除场景原始资源及caches
 //     * 每天凌晨执行
 //     */
 //    @Scheduled(cron="0 0 1 * * ?")
-//    public void cleanOssHomeV3() {
-//        log.info("删除v3场景原始资源开始");
-//        String lockKey = RedisLockKey.LOCK_CLEAN_SCENE_ORIG_V3;
+//    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.cleanOrigV3();
+//            sceneCleanOrigService.cleanOss4DeletedSceneV3();
 //        }finally {
 //            redisLockUtil.unlockLua(lockKey);
 //        }
-//        log.info("删除v3场景原始资源结束");
+//        log.info("删除已删除V3场景原始资源结束");
 //    }
 //
+//
 //    /**
-//     * 删除场景原始资源
+//     * 删除已删除场景原始资源及caches
 //     * 每天凌晨执行
 //     */
 //    @Scheduled(cron="0 0 1 * * ?")
-//    public void cleanOssHomeV4() {
-//        log.info("删除v4场景原始资源开始");
-//        String lockKey = RedisLockKey.LOCK_CLEAN_SCENE_ORIG_V4;
+//    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.cleanOrigV4();
+//            sceneCleanOrigService.cleanOss4DeletedSceneV4();
 //        }finally {
 //            redisLockUtil.unlockLua(lockKey);
 //        }
-//        log.info("删除v4场景原始资源结束");
+//        log.info("删除已删除V4场景原始资源结束");
 //    }
-
-    /**
-     * 删除已删除场景原始资源及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场景原始资源结束");
-    }
-
+//
+////    /**
+////     * 删除测试相机场景原始资源及caches
+////     * 每天凌晨执行
+////     */
+////    @Scheduled(cron="0 0 1 * * ?")
+////    public void cleanOss4TestCameraV3() {
+////        if(StrUtil.isEmpty(environment) || !environment.equals("dev")){
+////            return;
+////        }
+////        log.info("删除已删除V4场景原始资源开始");
+////        sceneCleanOrigService.cleanOss4TestCameraV3();
+////        log.info("删除已删除V4场景原始资源结束");
+////    }
+////
+////
+////    /**
+////     * 删除测试相机场景原始资源及caches
+////     * 每天凌晨执行
+////     */
+////    @Scheduled(cron="0 0 1 * * ?")
+////    public void cleanOss4TestCameraV4() {
+////        if(StrUtil.isEmpty(environment) || !environment.equals("dev")){
+////            return;
+////        }
+////        log.info("删除已删除V4场景原始资源开始");
+////        sceneCleanOrigService.cleanOss4TestCameraV4();
+////        log.info("删除已删除V4场景原始资源结束");
+////    }
+//
 //    /**
-//     * 删除测试相机场景原始资源及caches
+//     * 删除场景原始资源
 //     * 每天凌晨执行
 //     */
 //    @Scheduled(cron="0 0 1 * * ?")
-//    public void cleanOss4TestCameraV3() {
-//        if(StrUtil.isEmpty(environment) || !environment.equals("dev")){
-//            return;
+//    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("删除已删除V4场景原始资源开始");
-//        sceneCleanOrigService.cleanOss4TestCameraV3();
-//        log.info("删除已删除V4场景原始资源结束");
+//        log.info("冻结v3场景原始资源结束");
 //    }
 //
-//
 //    /**
-//     * 删除测试相机场景原始资源及caches
+//     * 删除场景原始资源
 //     * 每天凌晨执行
 //     */
 //    @Scheduled(cron="0 0 1 * * ?")
-//    public void cleanOss4TestCameraV4() {
-//        if(StrUtil.isEmpty(environment) || !environment.equals("dev")){
-//            return;
+//    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场景原始资源开始");
-//        sceneCleanOrigService.cleanOss4TestCameraV4();
-//        log.info("删除已删除V4场景原始资源结束");
+//        log.info("冻结v4场景原始资源结束");
 //    }
-
-    /**
-     * 删除场景原始资源
-     * 每天凌晨执行
-     */
-    @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 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场景原始资源结束");
-    }
-}
+//}