Merge remote-tracking branch 'origin/master'

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

@@ -2,6 +2,8 @@ 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;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -491,17 +493,21 @@ public class DeviceDataServiceImpl extends ServiceImpl<DeviceDataMapper, DeviceD
         }
         Date now = DateUtil.date();
         Date queryDate = DateUtil.offsetDay(now, -day);
+        //总数 ，只查激活的
+        Long totalNum = deviceInfoService.count(Wrappers.<DeviceInfo>lambdaQuery().eq(DeviceInfo::getActiveState, EnumDeviceActiveStatus.N_1.getCode()));
+        vo.setTotalNum(totalNum.intValue());
+
         //新增
         Long newAdd = deviceInfoService.count(Wrappers.<DeviceInfo>lambdaQuery()
                 .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()));
         vo.setDebtNum(debtNum);
-        Long outOfServiceNum = deviceInfoService.count(Wrappers.<DeviceInfo>lambdaQuery().eq(DeviceInfo::getBusyState, EnumDeviceBusyStatus.N_2.getCode()));
+        Long outOfServiceNum = deviceInfoService.count(Wrappers.<DeviceInfo>lambdaQuery().eq(DeviceInfo::getBusyState, EnumDeviceBusyStatus.N_2.getCode()).eq(DeviceInfo::getActiveState, EnumDeviceActiveStatus.N_1.getCode()));
         vo.setOutOfServiceNum(outOfServiceNum.intValue());
         return R.ok(vo);
     }

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

@@ -75,13 +75,36 @@ public class DeviceFaultInfoServiceImpl extends ServiceImpl<DeviceFaultInfoMappe
     @PostMapping("countByDevice")
     @ApiOperation("按故障类型统计设备数")
     public R<List<DeviceFaultInfoDto.CountByDeviceVO>> countByDevice() {
+        List<DeviceFaultInfoDto.CountByDeviceVO> list = countDeviceByType();
+        return R.ok(list);
+    }
+
+    public List<DeviceFaultInfoDto.CountByDeviceVO> countDeviceByType() {
         List<DeviceFaultInfoDto.CountByDeviceVO> list = deviceDataMapper.deviceFaultInfoCount();
+        if (CollUtil.isEmpty(list)) {
+            return list;
+        }
         list.forEach(d -> {
             SysCodeConfigureRedis s = SysCodeConfigureUtils.get(d.getEventCode());
             if (s != null) {
                 d.setEventName(s.getTitle());
             }
         });
+
+        return list;
+    }
+
+    @PostMapping("countByDeviceHomePage")
+    @ApiOperation("按故障类型统计设备数-运营首页")
+    public R<List<DeviceFaultInfoDto.CountByDeviceVO>> countByDeviceHomePage() {
+        List<DeviceFaultInfoDto.CountByDeviceVO> list = countDeviceByType();
+        if (CollUtil.isEmpty(list)) {
+            return R.ok(list);
+        }
+        //最多只取5个
+        if (list.size() > 5) {
+            list = CollUtil.sub(list, 0, 5);
+        }
         return R.ok(list);
     }
 

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

@@ -37,6 +37,10 @@ public class DeviceDataDto {
     @Data
     @Accessors(chain = true)
     public static class CountVO {
+
+        @ApiModelProperty(value = "总数")
+        private Integer totalNum;
+
         @ApiModelProperty(value = "新增")
         private Integer newNum;