设备统计概况

device-api-service-merc-mini/src/main/java/com/xy/controller/MercMiniDeviceController.java

@@ -352,7 +352,7 @@ public class MercMiniDeviceController {
     @PostMapping("updateInfo")
     public R updateInfo(@RequestBody @Validated MercMiniDeviceDto.UpdateInfo dto) {
         DeviceInfo deviceInfo = deviceInfoService.getById(dto.getDeviceId());
-        if (!Emptys.check(deviceInfo) || Objects.equals(deviceInfo.getDeviceId(), MercAuthUtils.getMercId())) {
+        if (!Emptys.check(deviceInfo) || !Objects.equals(deviceInfo.getMercId(), MercAuthUtils.getMercId())) {
             return R.fail("设备不存在");
         }
         DeviceInfoDto.Update update = copy(DeviceInfoDto.Update.class, dto);

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

@@ -2,6 +2,7 @@ package com.xy.service;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -13,8 +14,7 @@ import com.xy.collections.map.JHashMap;
 import com.xy.collections.map.JMap;
 import com.xy.device.EnumDeviceDataType;
 import com.xy.device.EnumDeviceOnlineStatus;
-import com.xy.dto.DeviceDataDto;
-import com.xy.dto.DeviceInfoDto;
+import com.xy.dto.*;
 import com.xy.entity.DeviceData;
 import com.xy.entity.DeviceInfo;
 import com.xy.entity.DeviceStatus;
@@ -34,6 +34,7 @@ import javax.validation.Valid;
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
@@ -468,4 +469,27 @@ public class DeviceDataServiceImpl extends ServiceImpl<DeviceDataMapper, DeviceD
             return R.ok();
         }
     }
+
+
+    @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);
+    }
 }

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

@@ -24,6 +24,22 @@ import java.util.List;
  * @since 2023-01-11
  */
 public class DeviceDataDto {
+    @Data
+    @Accessors(chain = true)
+    public static class CountDTO {
+
+        @ApiModelProperty(value = "天=1，周=2，月=3")
+        private Integer timeType;
+
+
+    }
+
+    @Data
+    @Accessors(chain = true)
+    public static class CountVO {
+
+
+    }
 
     @Data
     @Accessors(chain = true)