设备统计-运营概况

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

@@ -7,18 +7,18 @@ 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.EnumDeviceBusyStatus;
 import com.xy.device.EnumDeviceDataType;
 import com.xy.device.EnumDeviceOnlineStatus;
 import com.xy.dto.*;
-import com.xy.entity.DeviceData;
-import com.xy.entity.DeviceInfo;
-import com.xy.entity.DeviceStatus;
-import com.xy.entity.SysDictRedis;
+import com.xy.entity.*;
 import com.xy.mapper.DeviceDataMapper;
 import com.xy.utils.*;
 import io.swagger.annotations.Api;
@@ -59,6 +59,8 @@ public class DeviceDataServiceImpl extends ServiceImpl<DeviceDataMapper, DeviceD
 
     private final DeviceInfoServiceImpl deviceInfoService;
     private final DeviceStatusServiceImpl deviceStatusService;
+    private final OrdersService ordersService;
+    private final DeviceChargingServiceImpl deviceChargingService;
 
     /**
      * 设备统计
@@ -471,29 +473,6 @@ public class DeviceDataServiceImpl extends ServiceImpl<DeviceDataMapper, DeviceD
     }
 
 
-    @ApiOperation("设备统计-运营概况")
-    @PostMapping("countDevice")
-    R<DeviceDataDto.CountVO> countDevice(@RequestBody DeviceDataDto.CountDTO dto) {
-        DeviceDataDto.CountVO vo = new DeviceDataDto.CountVO();
-        Integer timeType = dto.getTimeType();
-        int day = 0;
-        if (timeType == 1) {
-            //天
-            day = 1;
-        } else if (timeType == 2) {
-            //周
-            day = 7;
-        } else if (timeType == 3) {
-            //月
-            day = 30;
-        }
-        Date now = DateUtil.date();
-        Date queryDate = DateUtil.offsetDay(now, -day);
-
-        return R.ok(vo);
-    }
-
-
     @ApiOperation("设备统计-运营概况")
     @PostMapping("countDevice")
     R<DeviceDataDto.CountVO> countDevice(@RequestBody DeviceDataDto.CountDTO dto) {

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

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

@@ -77,7 +77,7 @@ public class DeviceFaultMonitorConfigDto {
 
         @ApiModelProperty(value = "故障级别-字典：device_fault_level")
         private Integer faultLevel;
-        
+
         @ApiModelProperty(value = "是否转售后")
         private Boolean toAfterSale;
     }