#运营首页概况

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

@@ -7,11 +7,13 @@ import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.xy.collections.list.JArrayList;
 import com.xy.collections.map.JConcurrentHashMap;
 import com.xy.collections.map.JHashMap;
 import com.xy.collections.map.JMap;
+import com.xy.device.EnumDeviceActiveStatus;
 import com.xy.device.EnumDeviceDataType;
 import com.xy.device.EnumDeviceOnlineStatus;
 import com.xy.dto.*;
@@ -59,6 +61,7 @@ public class DeviceDataServiceImpl extends ServiceImpl<DeviceDataMapper, DeviceD
 
     private final DeviceInfoServiceImpl deviceInfoService;
     private final DeviceStatusServiceImpl deviceStatusService;
+    private final OrdersService ordersService;
 
     /**
      * 设备统计
@@ -489,6 +492,12 @@ public class DeviceDataServiceImpl extends ServiceImpl<DeviceDataMapper, DeviceD
         }
         Date now = DateUtil.date();
         Date queryDate = DateUtil.offsetDay(now, -day);
+        //新增
+        Long newAdd = deviceInfoService.count(Wrappers.<DeviceInfo>lambdaQuery()
+                .ge(DeviceInfo::getCreateTime, queryDate).eq(DeviceInfo::getActiveState, EnumDeviceActiveStatus.N_1.getCode()));
+        vo.setNewNum(newAdd.intValue());
+        //活跃 产生订单的
+        ordersService.
 
         return R.ok(vo);
     }

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

@@ -37,8 +37,21 @@ public class DeviceDataDto {
     @Data
     @Accessors(chain = true)
     public static class CountVO {
+        @ApiModelProperty(value = "新增")
+        private Integer newNum;
 
 
+        @ApiModelProperty(value = "活跃数")
+        private Integer activeNum;
+
+
+        @ApiModelProperty(value = "欠费")
+        private long debtNum;
+
+
+        @ApiModelProperty(value = "停运数量")
+        private Integer outOfServiceNum;
+
     }
 
     @Data