Microservice/govern
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

设备补召优化

Browse Source
This commit is contained in:
xy
2024-10-08 09:54:04 +08:00
parent e6e6790ee2
commit 867176d8a0
5 changed files with 42 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsEquipmentDeliveryServiceImpl.java
View File

@@ -240,8 +240,6 @@ public class CsEquipmentDeliveryServiceImpl extends ServiceImpl<CsEquipmentDeliv
queryWrapper.orderBy(true, false, "create_time");
}
}
System.out.println(StrUtil.isNotBlank(queryParam.getDevType()));
System.out.println(!Objects.isNull(queryParam.getDevType()));
if (StrUtil.isNotBlank(queryParam.getDevType()) && !Objects.isNull(queryParam.getDevType())){
queryWrapper.eq("cs_equipment_delivery.dev_type", queryParam.getDevType());
}

6
cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/DeviceFtpServiceImpl.java
View File

@@ -68,11 +68,7 @@ public class DeviceFtpServiceImpl implements DeviceFtpService {
redisUtil.delete(AppRedisKey.PROJECT_INFO + nDid);
// 请求设备文件或目录信息
askDeviceDataFeignClient.askDeviceFileOrDir(nDid, name);
if (name.contains("comtrade")) {
Thread.sleep(10000);
} else {
Thread.sleep(5000);
}
Thread.sleep(10000);
// 从 Redis 获取对象
Object object = redisUtil.getObjectByKey(AppRedisKey.PROJECT_INFO + nDid);
if (object != null) {