|
|
@ -29,7 +29,6 @@ import java.util.ArrayList;
|
|
|
|
import java.util.Date;
|
|
|
|
import java.util.Date;
|
|
|
|
import java.util.List;
|
|
|
|
import java.util.List;
|
|
|
|
import java.util.Map;
|
|
|
|
import java.util.Map;
|
|
|
|
import java.util.concurrent.TimeUnit;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
/**
|
|
|
|
* 设备柜清单
|
|
|
|
* 设备柜清单
|
|
|
@ -269,8 +268,7 @@ public class RecycleDeviceController {
|
|
|
|
UserInfo userInfo = userProvider.get();
|
|
|
|
UserInfo userInfo = userProvider.get();
|
|
|
|
Date nowDate = DateUtil.getNowDate();
|
|
|
|
Date nowDate = DateUtil.getNowDate();
|
|
|
|
boolean exists = redisUtil.exists("online_" + command.getDeviceCode());
|
|
|
|
boolean exists = redisUtil.exists("online_" + command.getDeviceCode());
|
|
|
|
Long liveTime = redisUtil.getLiveTime("online_" + command.getDeviceCode());
|
|
|
|
if (!exists ) {
|
|
|
|
if (!exists || liveTime < 0) {
|
|
|
|
|
|
|
|
return ActionResult.fail("设备不在线!");
|
|
|
|
return ActionResult.fail("设备不在线!");
|
|
|
|
}
|
|
|
|
}
|
|
|
|
String deviceCode = command.getDeviceCode();
|
|
|
|
String deviceCode = command.getDeviceCode();
|
|
|
@ -306,6 +304,7 @@ public class RecycleDeviceController {
|
|
|
|
String organizeId = userInfo.getOrganizeId();
|
|
|
|
String organizeId = userInfo.getOrganizeId();
|
|
|
|
QueryWrapper<RecycleDeviceEntity> wrapper = new QueryWrapper<>();
|
|
|
|
QueryWrapper<RecycleDeviceEntity> wrapper = new QueryWrapper<>();
|
|
|
|
LambdaQueryWrapper<RecycleDeviceEntity> lambda = wrapper.lambda();
|
|
|
|
LambdaQueryWrapper<RecycleDeviceEntity> lambda = wrapper.lambda();
|
|
|
|
|
|
|
|
lambda.isNull(RecycleDeviceEntity::getDeleteMark);
|
|
|
|
if (!isAdministrator) {
|
|
|
|
if (!isAdministrator) {
|
|
|
|
lambda.eq(RecycleDeviceEntity::getBeLongCompanyId, organizeId);
|
|
|
|
lambda.eq(RecycleDeviceEntity::getBeLongCompanyId, organizeId);
|
|
|
|
}
|
|
|
|
}
|
|
|
|