소스 검색

feigin 接口时间类型

tanbin 1 년 전
부모
커밋
5240630ad7
1개의 변경된 파일2개의 추가작업 그리고 1개의 파일을 삭제
  1. 2 1
      device-api-service/src/main/java/com/xy/service/DeviceDataServiceImpl.java

+ 2 - 1
device-api-service/src/main/java/com/xy/service/DeviceDataServiceImpl.java

@@ -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.DatePattern;
 import cn.hutool.core.date.DateTime;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.StrUtil;
@@ -497,7 +498,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(queryDate)));
+        Integer activeNum = R.feignCheckData(ordersService.deviceActiveCount(new CountDto.MercCountDTO().setStartTime(DateUtil.format(queryDate, DatePattern.NORM_DATETIME_PATTERN))));
         vo.setActiveNum(activeNum);
         //设备管理费
         Long debtNum = deviceChargingService.count(Wrappers.<DeviceCharging>lambdaQuery().lt(DeviceCharging::getTimeout, DateUtil.now()));