解冻，计算时间网前推11个月

src/main/java/com/fdkankan/manage/mq/consumer/SceneRestStoreConsumer.java

@@ -8,6 +8,7 @@ import com.fdkankan.manage.exception.BusinessException;
 import com.fdkankan.manage.mq.param.SceneRestStoreVo;
 import com.fdkankan.manage.service.ISceneColdStorageLogService;
 import com.fdkankan.manage.service.ISceneColdStorageService;
+import com.fdkankan.manage.service.ISceneProService;
 import com.fdkankan.manage.thread.ThreadService;
 import com.fdkankan.redis.util.RedisUtil;
 import com.rabbitmq.client.Channel;
@@ -41,6 +42,8 @@ public class SceneRestStoreConsumer {
     ISceneColdStorageService sceneColdStorageService;
     @Autowired
     ISceneColdStorageLogService sceneColdStorageLogService;
+    @Autowired
+    ISceneProService sceneProService;
 
     @RabbitListener(
             queuesToDeclare = @Queue("${queue.scene.rest-store:scene-rest-store}"),
@@ -72,7 +75,7 @@ public class SceneRestStoreConsumer {
             log.info("scene-restStore-mq-cloudBucket:{},bucket:{},folderName:{},process:{}",cloudBucket,bucket,folderName,process);
             while (process != 100 ){
                 Long time = new Date().getTime();
-                if(time - startTime >1000 * 60){
+                if(time - startTime >1000 * 60 * 10){
                     startTime = time;
                     process = fYunFileServiceInterface.getRestoreFolderProcess(cloudBucket, folderName);
                     log.info("scene-restStore-mq-cloudBucket:{},bucket:{},folderName:{},process:{}",cloudBucket,bucket,folderName,process);
@@ -82,6 +85,7 @@ public class SceneRestStoreConsumer {
             log.info("Tscene-restStore-mq-copy-bucket");
             sceneColdStorageService.updateStatus(num,2);
             sceneColdStorageLogService.saveLog(num,folderName);
+            sceneProService.restStoreSuccess(num);
             redisUtil.del(redisKey);
 
         }catch (Exception e){

src/main/java/com/fdkankan/manage/service/ISceneProService.java

@@ -62,4 +62,6 @@ public interface ISceneProService extends IService<ScenePro> {
     void restStore(String num);
 
     Object getRestStoreProcess(String num);
+
+    void restStoreSuccess(String num);
 }

src/main/java/com/fdkankan/manage/service/impl/SceneProServiceImpl.java

@@ -730,6 +730,28 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
     }
 
     @Override
+    public void restStoreSuccess(String num) {
+        ScenePro scenePro = this.getByNum(num);
+        Date time = Dateutils.dateAddOneMonth(new Date(),-11);
+        if(scenePro!=null ){
+            LambdaUpdateWrapper<ScenePro> wrapper = new LambdaUpdateWrapper<>();
+            wrapper.eq(ScenePro::getId,scenePro.getId());
+            wrapper.set(ScenePro::getCreateTime,Dateutils.getDate(time));
+            this.update(wrapper);
+        }
+        ScenePlus scenePlus = scenePlusService.getByNum(num);
+        if(scenePlus != null ){
+            ScenePlusExt scenePlusExt = scenePlusExtService.getByPlusId(scenePlus.getId());
+            if(scenePlusExt != null){
+                LambdaUpdateWrapper<ScenePlusExt> wrapper = new LambdaUpdateWrapper<>();
+                wrapper.eq(ScenePlusExt::getId,scenePlusExt.getId());
+                wrapper.set(ScenePlusExt::getAlgorithmTime,Dateutils.getDate(time));
+                scenePlusExtService.update(wrapper);
+            }
+        }
+    }
+
+    @Override
     public Object getRestStoreProcess(String num) {
         if(StringUtils.isBlank(num)){
             throw new BusinessException(ResultCode.MISSING_REQUIRED_PARAMETERS);

src/main/java/com/fdkankan/manage/util/Dateutils.java

@@ -190,7 +190,7 @@ public class Dateutils {
         return simpleDateFormat.format(date);
     }
 
-    /*日期加+1天*/
+    /*日期加+1年*/
     public static Date dateAddOneYear(Date date,Integer i) {
         Calendar  calendar = new GregorianCalendar();
         calendar.setTime(date);
@@ -199,6 +199,14 @@ public class Dateutils {
         return date;
 
     }
+    /*日期加+1月*/
+    public static Date dateAddOneMonth(Date date,Integer i) {
+        Calendar  calendar = new GregorianCalendar();
+        calendar.setTime(date);
+        calendar.add(Calendar.MONTH,i); //把日期往后增加一天,整数  往后推,负数往前移动
+        date=calendar.getTime(); //这个时间就是日期往后推一天的结果
+        return date;
+    }
 
     /*日期加+1天*/
     public static Date dateAddOne(Date date,Integer i) {