|
@@ -570,6 +570,7 @@ public class DeviceInfoServiceImpl extends ServiceImpl<DeviceInfoMapper, DeviceI
|
|
public R<Integer> activationCount(DeviceInfoDto.ActivationCount activationCount) {
|
|
public R<Integer> activationCount(DeviceInfoDto.ActivationCount activationCount) {
|
|
LambdaQueryWrapper<DeviceInfo> lambdaQueryWrapper = new LambdaQueryWrapper<DeviceInfo>()
|
|
LambdaQueryWrapper<DeviceInfo> lambdaQueryWrapper = new LambdaQueryWrapper<DeviceInfo>()
|
|
.eq(DeviceInfo::getMercId, activationCount.getMercId())
|
|
.eq(DeviceInfo::getMercId, activationCount.getMercId())
|
|
|
|
+ .eq(DeviceInfo::getActiveState, 1)
|
|
.between(Emptys.check(activationCount.getBeginTime()), DeviceInfo::getActiveTime, activationCount.getBeginTime(), activationCount.getEndTime());
|
|
.between(Emptys.check(activationCount.getBeginTime()), DeviceInfo::getActiveTime, activationCount.getBeginTime(), activationCount.getEndTime());
|
|
long count = count(lambdaQueryWrapper);
|
|
long count = count(lambdaQueryWrapper);
|
|
return R.ok((int) count);
|
|
return R.ok((int) count);
|