增加欠费消息卡包判断

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

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

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

@@ -365,6 +365,9 @@ public class DeviceInfoDto {
         @ApiModelProperty("商户id")
         private Long mercId;
 
+        @ApiModelProperty("不等于设备类型")
+        private Integer notDeviceType;
+
         @ApiModelProperty("开始时间")
         @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
         private LocalDateTime beginTime;