流量卡完善

device-api-service/src/main/java/com/xy/mapper/mapper/DeviceSimMapper.xml

@@ -2,6 +2,7 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.xy.mapper.DeviceSimMapper">
     <resultMap id="queryPageMap" type="com.xy.dto.DeviceSimDto$PageVo">
+        <result column="device_id" property="deviceId"/>
         <result column="sim_iccid" property="simIccid"/>
         <association property="deviceInfo" javaType="com.xy.dto.DeviceInfoDto$Vo">
             <id column="device_id" property="deviceId"/>

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

@@ -502,8 +502,8 @@ 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.format(queryDate, DatePattern.NORM_DATETIME_PATTERN))));
-        vo.setActiveNum(activeNum);
+        //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()));
         vo.setDebtNum(debtNum);

device-api/src/main/java/com/xy/dto/DeviceSimDto.java

@@ -295,6 +295,8 @@ public class DeviceSimDto {
 
         @ApiModelProperty(value = "系统表流量卡号")
         private String simIccid;
+
+        private Long deviceId;
     }
 
     @Data