1

src/main/java/com/fdkankan/manage/httpClient/service/OverallService.java

@@ -1,14 +1,8 @@
 package com.fdkankan.manage.httpClient.service;
 
-import cn.hutool.core.bean.BeanUtil;
-import cn.hutool.core.thread.ThreadUtil;
-import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
-import com.fdkankan.common.util.JwtUtil;
 import com.fdkankan.manage.common.RedisKeyUtil;
-import com.fdkankan.manage.common.Result;
 import com.fdkankan.manage.common.ResultCode;
-import com.fdkankan.manage.common.ShellUtil;
 import com.fdkankan.manage.config.FyunConfig;
 import com.fdkankan.manage.exception.BusinessException;
 import com.fdkankan.manage.httpClient.client.OverallClient;
@@ -16,16 +10,12 @@ import com.fdkankan.manage.httpClient.param.WorkOfflineDTO;
 import com.fdkankan.manage.httpClient.vo.OverallParam;
 import com.fdkankan.manage.httpClient.vo.OverallVo;
 import com.fdkankan.manage.service.IDownService;
-import com.fdkankan.manage.task.ThreadService;
-import com.fdkankan.manage.vo.response.DownVo;
-import com.fdkankan.manage.vo.response.DownloadProcessVo;
+import com.fdkankan.manage.task.ThreadBussService;
 import com.fdkankan.rabbitmq.util.RabbitMqProducer;
 import com.fdkankan.redis.util.RedisUtil;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Lazy;
-import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
 
 @Service
@@ -43,7 +33,7 @@ public class OverallService {
     RedisUtil redisUtil;
     @Autowired
     @Lazy
-    ThreadService threadService;
+    ThreadBussService threadBussService;
 
     private static String appId ="BDA385EC848C1A425F746869011C8D23";
     private static String key ="appId";
@@ -74,7 +64,7 @@ public class OverallService {
             String jsonString = JSONObject.toJSONString(data);
             WorkOfflineDTO dto = JSONObject.parseObject(jsonString,WorkOfflineDTO.class);
             redisUtil.set(redisKey,jsonString,RedisKeyUtil.overallDownOfflineProgressKeyTime);
-            threadService.overallDownScene(dto,redisKey);
+            threadBussService.overallDownScene(dto,redisKey);
             return dto;
         }catch (Exception e){
             log.info("全景看看访问失败：{}",e);

src/main/java/com/fdkankan/manage/task/ThreadService.java

@@ -7,7 +7,6 @@ import com.fdkankan.manage.common.ResultCode;
 import com.fdkankan.manage.common.ShellUtil;
 import com.fdkankan.manage.config.FyunConfig;
 import com.fdkankan.manage.exception.BusinessException;
-import com.fdkankan.manage.httpClient.client.OverallClient;
 import com.fdkankan.manage.httpClient.param.WorkOfflineDTO;
 import com.fdkankan.manage.service.IDownService;
 import com.fdkankan.manage.vo.response.DownVo;
@@ -23,7 +22,7 @@ import org.springframework.stereotype.Service;
 
 @Service
 @Slf4j
-public class ThreadService {
+public class ThreadBussService {
 
     @Autowired
     @Lazy

src/main/java/com/fdkankan/manage/thread/ThreadService.java

@@ -41,7 +41,6 @@ public class ThreadService {
         scheduledThreadPoolExecutor.scheduleWithFixedDelay(()->{
             try {
                 Integer process = fYunFileServiceInterface.getRestoreFolderProcess(cloudBucket, folderName);
-                System.out.println(process);
                 log.info("ThreadService-cloudBucket:{},bucket:{},folderName:{},process:{}",cloudBucket,bucket,folderName,process);
                 if(process == 100){
                     fYunFileServiceInterface.copyFileBetweenBucket(cloudBucket,folderName,bucket,folderName);