合并代码

src/main/java/com/fdkankan/scene/listener/RabbitMqListener.java

@@ -76,23 +76,23 @@ public class RabbitMqListener {
         log.info("结束消费消息,id:{}", messageId);
     }
 
-    /**
-     * 开启了手动确认模式，如果没有手动确认，消费者不会重试，当服务重启时会再次消费，因为rabbitmq认为你还没有处理完你的业务
-     * queuesToDeclare = @Queue("${queue.modeling.modeling-test}"),  如果队列不不存在会自动创建队列
-     * concurrency = "3"    设置消费线程数，每个线程每次只拉取一条消息消费
-     */
-    @RabbitListener(
-        queuesToDeclare = @Queue("test_dsx")
-    )
-    public void test(Channel channel, Message message) throws Exception {
-        String messageId = message.getMessageProperties().getMessageId();
-        String msg = new String(message.getBody(), StandardCharsets.UTF_8);
-        channel.basicAck(message.getMessageProperties().getDeliveryTag(), false);
-        log.info("开始消费消息,id:{},queue:{},content:{}", messageId, "test_dsx", msg);
-        Thread.sleep(10000L);
-        log.info("deliverTag:" + message.getMessageProperties().getDeliveryTag());
-        log.info("结束消费消息,id:{}", messageId);
-    }
+//    /**
+//     * 开启了手动确认模式，如果没有手动确认，消费者不会重试，当服务重启时会再次消费，因为rabbitmq认为你还没有处理完你的业务
+//     * queuesToDeclare = @Queue("${queue.modeling.modeling-test}"),  如果队列不不存在会自动创建队列
+//     * concurrency = "3"    设置消费线程数，每个线程每次只拉取一条消息消费
+//     */
+//    @RabbitListener(
+//        queuesToDeclare = @Queue("test_dsx")
+//    )
+//    public void test(Channel channel, Message message) throws Exception {
+//        String messageId = message.getMessageProperties().getMessageId();
+//        String msg = new String(message.getBody(), StandardCharsets.UTF_8);
+//        channel.basicAck(message.getMessageProperties().getDeliveryTag(), false);
+//        log.info("开始消费消息,id:{},queue:{},content:{}", messageId, "test_dsx", msg);
+//        Thread.sleep(10000L);
+//        log.info("deliverTag:" + message.getMessageProperties().getDeliveryTag());
+//        log.info("结束消费消息,id:{}", messageId);
+//    }
 
 
 }

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

@@ -28,15 +28,15 @@ public class ScheduleJob {
     @Autowired
     private RedisLockUtil redisLockUtil;
 
-    /**
-     * 每天凌晨一点执行
-     */
-    @Scheduled(cron="0 0 1 * * ?")
-    public void cleanDownloadPanorama() {
-        log.info("定时清除全景图压缩包开始");
-        sceneAsynOperLogService.cleanDownloadPanorama();
-        log.info("定时清除全景图压缩包完毕");
-    }
+//    /**
+//     * 每天凌晨一点执行
+//     */
+//    @Scheduled(cron="0 0 1 * * ?")
+//    public void cleanDownloadPanorama() {
+//        log.info("定时清除全景图压缩包开始");
+//        sceneAsynOperLogService.cleanDownloadPanorama();
+//        log.info("定时清除全景图压缩包完毕");
+//    }
 
 //    /**
 //     * 删除场景原始资源
@@ -78,46 +78,46 @@ public class ScheduleJob {
 //        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 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 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
@@ -148,43 +148,43 @@ public class ScheduleJob {
 //        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 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场景原始资源结束");
-    }
+//    /**
+//     * 删除场景原始资源
+//     * 每天凌晨执行
+//     */
+//    @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场景原始资源结束");
+//    }
 }