lyhzzz преди 2 години
родител
ревизия
16a6db20af
променени са 1 файла, в които са добавени 2 реда и са изтрити 1 реда
  1. 2 1
      src/main/java/com/fdkankan/manage/mq/consumer/SceneRestStoreConsumer.java

+ 2 - 1
src/main/java/com/fdkankan/manage/mq/consumer/SceneRestStoreConsumer.java

@@ -65,7 +65,7 @@ public class SceneRestStoreConsumer {
             try {
             try {
                 fYunFileServiceInterface.restoreFolder(cloudBucket,folderName,1);
                 fYunFileServiceInterface.restoreFolder(cloudBucket,folderName,1);
             }catch (Exception e){
             }catch (Exception e){
-                return;
+                log.info("scene-restStore-mq-error:",e);
             }
             }
             Long startTime = new Date().getTime();
             Long startTime = new Date().getTime();
             Integer process = fYunFileServiceInterface.getRestoreFolderProcess(cloudBucket, folderName);
             Integer process = fYunFileServiceInterface.getRestoreFolderProcess(cloudBucket, folderName);
@@ -73,6 +73,7 @@ public class SceneRestStoreConsumer {
             while (process != 100 ){
             while (process != 100 ){
                 Long time = new Date().getTime();
                 Long time = new Date().getTime();
                 if(time - startTime >1000 * 60){
                 if(time - startTime >1000 * 60){
+                    startTime = time;
                     process = fYunFileServiceInterface.getRestoreFolderProcess(cloudBucket, folderName);
                     process = fYunFileServiceInterface.getRestoreFolderProcess(cloudBucket, folderName);
                     log.info("scene-restStore-mq-cloudBucket:{},bucket:{},folderName:{},process:{}",cloudBucket,bucket,folderName,process);
                     log.info("scene-restStore-mq-cloudBucket:{},bucket:{},folderName:{},process:{}",cloudBucket,bucket,folderName,process);
                 }
                 }