微调

detection/src/main/java/com/njcn/gather/report/service/impl/PqReportServiceImpl.java

@@ -71,7 +71,6 @@ import com.njcn.gather.type.service.IDevTypeService;
 import com.njcn.http.util.RestTemplateUtil;
 import com.njcn.web.factory.PageFactory;
 import io.netty.channel.Channel;
-import java.util.concurrent.CompletableFuture;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.net.ftp.FTPClient;
@@ -85,7 +84,6 @@ import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.core.io.ClassPathResource;
-import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -104,6 +102,7 @@ import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.List;
 import java.util.*;
+import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.LinkedBlockingQueue;
 import java.util.concurrent.ThreadPoolExecutor;
 import java.util.concurrent.TimeUnit;
@@ -676,12 +675,12 @@ public class PqReportServiceImpl extends ServiceImpl<PqReportMapper, PqReport> i
 
             // 组装业务数据
             JSONObject data = new JSONObject();
-            if (testFTPConnection(cloudUrl, devPort, devName, devPsd)) {
+            if (testFTPConnection(devIp, devPort, devName, devPsd)) {
                 data.set("name", devName);
                 data.set("password", devPsd);
                 data.set("port", devPort);
                 data.set("path", "ftp://" + devIp + devPath);
-            } else if (testFTPConnection(cloudUrl, gcDevPort, gcDevName, gcDevPsd)) {
+            } else if (testFTPConnection(devIp, gcDevPort, gcDevName, gcDevPsd)) {
                 data.set("name", gcDevName);
                 data.set("password", gcDevPsd);
                 data.set("port", gcDevPort);