Merge remote-tracking branch 'origin/master'
This commit is contained in:
@@ -68,7 +68,11 @@ public class DeviceFtpServiceImpl implements DeviceFtpService {
|
||||
redisUtil.delete(AppRedisKey.PROJECT_INFO + nDid);
|
||||
// 请求设备文件或目录信息
|
||||
askDeviceDataFeignClient.askDeviceFileOrDir(nDid, name);
|
||||
Thread.sleep(3000);
|
||||
if (name.contains("comtrade")) {
|
||||
Thread.sleep(10000);
|
||||
} else {
|
||||
Thread.sleep(5000);
|
||||
}
|
||||
// 从 Redis 获取对象
|
||||
Object object = redisUtil.getObjectByKey(AppRedisKey.PROJECT_INFO + nDid);
|
||||
if (object != null) {
|
||||
@@ -100,7 +104,6 @@ public class DeviceFtpServiceImpl implements DeviceFtpService {
|
||||
try {
|
||||
redisUtil.delete("downloadFilePath:"+name);
|
||||
boolean file = askDeviceDataFeignClient.downloadFile(nDid,name,size,fileCheck).getData();
|
||||
Thread.sleep(5000);
|
||||
if (!file) {
|
||||
redisUtil.delete("fileDowning:"+nDid);
|
||||
redisUtil.delete("fileCheck"+name);
|
||||
|
||||
Reference in New Issue
Block a user