|
|
@@ -2,6 +2,7 @@ package com.xy.service;
|
|
|
|
|
|
import cn.hutool.core.bean.BeanUtil;
|
|
|
import cn.hutool.core.collection.CollUtil;
|
|
|
+import cn.hutool.core.date.DateTime;
|
|
|
import cn.hutool.core.date.DateUtil;
|
|
|
import cn.hutool.core.util.StrUtil;
|
|
|
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
|
|
@@ -496,7 +497,7 @@ public class DeviceDataServiceImpl extends ServiceImpl<DeviceDataMapper, DeviceD
|
|
|
.ge(DeviceInfo::getCreateTime, queryDate).eq(DeviceInfo::getActiveState, EnumDeviceActiveStatus.N_1.getCode()));
|
|
|
vo.setNewNum(newAdd.intValue());
|
|
|
//活跃 产生订单的
|
|
|
- Integer activeNum = R.feignCheckData(ordersService.deviceActiveCount(new CountDto.MercCountDTO().setStartTime(DateUtil.date(queryDate))));
|
|
|
+ Integer activeNum = R.feignCheckData(ordersService.deviceActiveCount(new CountDto.MercCountDTO().setStartTime(queryDate)));
|
|
|
vo.setActiveNum(activeNum);
|
|
|
//设备管理费
|
|
|
Long debtNum = deviceChargingService.count(Wrappers.<DeviceCharging>lambdaQuery().lt(DeviceCharging::getTimeout, DateUtil.now()));
|
|
|
@@ -505,4 +506,5 @@ public class DeviceDataServiceImpl extends ServiceImpl<DeviceDataMapper, DeviceD
|
|
|
vo.setOutOfServiceNum(outOfServiceNum.intValue());
|
|
|
return R.ok(vo);
|
|
|
}
|
|
|
+
|
|
|
}
|
