[fix]：statistics

alwayssuper
1 parent 8e7bbfe0
Showing 15 changed files with 368 additions and 5 deletions
yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/statistics/IotStatisticsController.java
yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/statistics/vo/IotStatisticsRespVO.java
yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/dal/mysql/device/IotDeviceMapper.java
yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/dal/mysql/product/IotProductCategoryMapper.java
yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/dal/mysql/product/IotProductMapper.java
yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/dal/mysql/thingmodel/IotThingModelMapper.java
yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/device/IotDeviceService.java
yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/device/IotDeviceServiceImpl.java
yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/product/IotProductCategoryService.java
yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/product/IotProductCategoryServiceImpl.java
yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/product/IotProductService.java
yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/product/IotProductServiceImpl.java
yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/thingmodel/IotThingModelService.java
yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/thingmodel/IotThingModelServiceImpl.java
yudao-server/src/main/resources/application-local.yaml
+package cn.iocoder.yudao.module.iot.controller.admin.statistics;
+
+import cn.iocoder.yudao.framework.common.pojo.CommonResult;
+import cn.iocoder.yudao.module.iot.controller.admin.product.vo.product.IotProductRespVO;
+import cn.iocoder.yudao.module.iot.controller.admin.statistics.vo.IotStatisticsRespVO;
+import cn.iocoder.yudao.module.iot.service.device.IotDeviceService;
+import cn.iocoder.yudao.module.iot.service.product.IotProductCategoryService;
+import cn.iocoder.yudao.module.iot.service.product.IotProductService;
+import cn.iocoder.yudao.module.iot.service.thingmodel.IotThingModelService;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.annotation.Resource;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.time.LocalDateTime;
+import java.util.List;
+
+
+@Tag(name = "管理后台 - IoT 数据统计")
+@RestController
+@RequestMapping("/iot/statistics")
+@Validated
+public class IotStatisticsController {
+
+    @Resource
+    private IotDeviceService iotDeviceService;
+
+    @Resource
+    private IotProductCategoryService iotProductCategoryService;
+
+    @Resource
+    private IotProductService iotProductService;
+
+
+    @GetMapping("/count")
+    @Operation(summary = "获取IOT首页的数据统计", description = "主要用于IOT首页的数据统计")
+    public CommonResult<IotStatisticsRespVO> getSimpleProductList(){
+        IotStatisticsRespVO iotStatisticsRespVO = new IotStatisticsRespVO();
+        // 获取总数
+        iotStatisticsRespVO.setCategoryTotal(iotProductCategoryService.getProductCategoryCount(null));
+        iotStatisticsRespVO.setProductTotal(iotProductService.getProductCount(null));
+        iotStatisticsRespVO.setDeviceTotal(iotDeviceService.getDeviceCount(null));
+
+        // 获取今日新增数量
+        LocalDateTime todayStart = LocalDateTime.now().withHour(0).withMinute(0).withSecond(0);
+        iotStatisticsRespVO.setCategoryTodayTotal(iotProductCategoryService.getProductCategoryCount(todayStart));
+        iotStatisticsRespVO.setProductTodayTotal(iotProductService.getProductCount(todayStart));
+        iotStatisticsRespVO.setDeviceTodayTotal(iotDeviceService.getDeviceCount(todayStart));
+
+        return CommonResult.success(iotStatisticsRespVO);
+    }
+}
+package cn.iocoder.yudao.module.iot.controller.admin.statistics.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.util.List;
+
+@Schema(description = "管理后台 - Iot统计 Response VO")
+@Data
+public class IotStatisticsRespVO {
+
+    @Schema(description = "品类数量", requiredMode = Schema.RequiredMode.REQUIRED, example = "10")
+    private long categoryTotal;
+
+    @Schema(description = "产品数量", requiredMode = Schema.RequiredMode.REQUIRED, example = "20")
+    private long productTotal;
+
+    @Schema(description = "设备数量", requiredMode = Schema.RequiredMode.REQUIRED, example = "100")
+    private long deviceTotal;
+
+    @Schema(description = "上报数量", requiredMode = Schema.RequiredMode.REQUIRED, example = "1000")
+    private long reportTotal;
+
+    @Schema(description = "今日新增品类数量", requiredMode = Schema.RequiredMode.REQUIRED, example = "10")
+    private long categoryTodayTotal;
+
+    @Schema(description = "今日新增产品数量", requiredMode = Schema.RequiredMode.REQUIRED, example = "20")
+    private long productTodayTotal;
+
+    @Schema(description = "今日新增设备数量", requiredMode = Schema.RequiredMode.REQUIRED, example = "100")
+    private long deviceTodayTotal;
+
+    @Schema(description = "今日新增上报数量", requiredMode = Schema.RequiredMode.REQUIRED, example = "1000")
+    private long reportTodayTotal;
+
+    @Schema(description = "在线数量", requiredMode = Schema.RequiredMode.REQUIRED, example = "80")
+    private long onlineTotal;
+
+    @Schema(description = "离线数量", requiredMode = Schema.RequiredMode.REQUIRED, example = "15")
+    private long offlineTotal;
+
+    @Schema(description = "待激活设备数量", requiredMode = Schema.RequiredMode.REQUIRED, example = "5")
+    private long neverOnlineTotal;
+
+    @Schema(description = "上报数据数量统计")
+    private List<TimeData> reportDataStats;
+
+    @Schema(description = "上行数据数量统计")
+    private List<TimeData> deviceUpMessageStats;
+
+    @Schema(description = "下行数据数量统计")
+    private List<TimeData> deviceDownMessageStats;
+
+    @Schema(description = "按品类统计的设备数量")
+    private List<DataItem> deviceStatsOfCategory;
+
+    @Schema(description = "时间数据")
+    @Data
+    public static class TimeData {
+
+        @Schema(description = "时间", requiredMode = Schema.RequiredMode.REQUIRED, example = "1646092800000")
+        private long time;
+
+        @Schema(description = "数据值", requiredMode = Schema.RequiredMode.REQUIRED, example = "100")
+        private Object data;
+    }
+
+    @Schema(description = "数据项")
+    @Data
+    public static class DataItem {
+
+        @Schema(description = "数据项名", requiredMode = Schema.RequiredMode.REQUIRED, example = "智能家居")
+        private String name;
+
+        @Schema(description = "数据项值", requiredMode = Schema.RequiredMode.REQUIRED, example = "50")
+        private Object value;
+    }
+}
@@ -9,6 +9,7 @@ import cn.iocoder.yudao.module.iot.dal.dataobject.device.IotDeviceDO;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import org.apache.ibatis.annotations.Mapper;
  
+import java.time.LocalDateTime;
 import java.util.List;
  
 /**
@@ -66,4 +67,26 @@ public interface IotDeviceMapper extends BaseMapperX&lt;IotDeviceDO&gt; {
                 .orderByDesc(IotDeviceDO::getId));
     }
  
+    /**
+     * 统计设备数量
+     *
+     * @param createTime 创建时间，如果为空，则统计所有设备数量
+     * @return 设备数量
+     */
+    default Long selectCountByCreateTime(LocalDateTime createTime) {
+        return selectCount(new LambdaQueryWrapperX<IotDeviceDO>()
+                .geIfPresent(IotDeviceDO::getCreateTime, createTime));
+    }
+
+    /**
+     * 统计指定状态的设备数量
+     *
+     * @param state 状态
+     * @return 设备数量
+     */
+    default Long selectCountByState(Integer state) {
+        return selectCount(new LambdaQueryWrapperX<IotDeviceDO>()
+                .eqIfPresent(IotDeviceDO::getState, state));
+    }
+
 }
 \ No newline at end of file
@@ -6,7 +6,9 @@ import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
 import cn.iocoder.yudao.module.iot.controller.admin.product.vo.category.IotProductCategoryPageReqVO;
 import cn.iocoder.yudao.module.iot.dal.dataobject.product.IotProductCategoryDO;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
  
+import java.time.LocalDateTime;
 import java.util.List;
  
 /**
@@ -28,4 +30,15 @@ public interface IotProductCategoryMapper extends BaseMapperX&lt;IotProductCategory
         return selectList(IotProductCategoryDO::getStatus, status);
     }
  
+    /**
+     * 统计产品分类数量
+     *
+     * @param createTime 创建时间，如果为空，则统计所有分类数量
+     * @return 产品分类数量
+     */
+    default Long selectCountByCreateTime(LocalDateTime createTime) {
+        return selectCount(new LambdaQueryWrapperX<IotProductCategoryDO>()
+                .geIfPresent(IotProductCategoryDO::getCreateTime, createTime));
+    }
+
 }
 \ No newline at end of file
@@ -8,6 +8,9 @@ import cn.iocoder.yudao.module.iot.dal.dataobject.product.IotProductDO;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import org.apache.ibatis.annotations.Mapper;
  
+import java.time.LocalDateTime;
+import java.util.List;
+
 /**
  * IoT 产品 Mapper
  *
@@ -28,4 +31,27 @@ public interface IotProductMapper extends BaseMapperX&lt;IotProductDO&gt; {
                 .apply("LOWER(product_key) = {0}", productKey.toLowerCase()));
     }
  
+    /**
+     * 统计产品数量
+     *
+     * @param createTime 创建时间，如果为空，则统计所有产品数量
+     * @return 产品数量
+     */
+    default Long selectCountByCreateTime(LocalDateTime createTime) {
+        return selectCount(new LambdaQueryWrapperX<IotProductDO>()
+                .geIfPresent(IotProductDO::getCreateTime, createTime));
+    }
+
+    /**
+     * 获得产品列表，基于分类编号
+     *
+     * @param categoryId 分类编号
+     * @return 产品列表
+     */
+    default List<IotProductDO> selectListByCategoryId(Long categoryId) {
+        return selectList(new LambdaQueryWrapperX<IotProductDO>()
+                .eq(IotProductDO::getCategoryId, categoryId)
+                .orderByDesc(IotProductDO::getId));
+    }
+
 }
 \ No newline at end of file
@@ -8,6 +8,7 @@ import cn.iocoder.yudao.module.iot.controller.admin.thingmodel.vo.IotThingModelP
 import cn.iocoder.yudao.module.iot.dal.dataobject.thingmodel.IotThingModelDO;
 import org.apache.ibatis.annotations.Mapper;
  
+import java.time.LocalDateTime;
 import java.util.List;
  
 /**
@@ -72,4 +73,15 @@ public interface IotThingModelMapper extends BaseMapperX&lt;IotThingModelDO&gt; {
                 IotThingModelDO::getName, name);
     }
  
+    /**
+     * 统计物模型数量
+     *
+     * @param createTime 创建时间，如果为空，则统计所有物模型数量
+     * @return 物模型数量
+     */
+    default Long selectCountByCreateTime(LocalDateTime createTime) {
+        return selectCount(new LambdaQueryWrapperX<IotThingModelDO>()
+                .geIfPresent(IotThingModelDO::getCreateTime, createTime));
+    }
+
 }
 \ No newline at end of file
@@ -7,6 +7,7 @@ import jakarta.validation.Valid;
 import jakarta.validation.constraints.NotEmpty;
  
 import javax.annotation.Nullable;
+import java.time.LocalDateTime;
 import java.util.Collection;
 import java.util.List;
  
@@ -109,7 +110,7 @@ public interface IotDeviceService {
     IotDeviceDO getDeviceByDeviceKey(String deviceKey);
  
     /**
-     * ��得设备分页
+     * 获得设备分页
      *
      * @param pageReqVO 分页查询
      * @return IoT 设备分页
@@ -168,4 +169,27 @@ public interface IotDeviceService {
      */
     IotDeviceImportRespVO importDevice(List<IotDeviceImportExcelVO> importDevices, boolean updateSupport);
  
+    /**
+     * 获得设备数量
+     *
+     * @param createTime 创建时间，如果为空，则统计所有设备数量
+     * @return 设备数量
+     */
+    Long getDeviceCount(LocalDateTime createTime);
+
+    /**
+     * 获得设备数量，基于状态
+     *
+     * @param state 状态
+     * @return 设备数量
+     */
+    Long getDeviceCountByState(Integer state);
+
+    /**
+     * 获得所有设备列表
+     *
+     * @return 设备列表
+     */
+    List<IotDeviceDO> getDeviceList();
+
 }
 \ No newline at end of file
@@ -434,4 +434,19 @@ public class IotDeviceServiceImpl implements IotDeviceService {
         return SpringUtil.getBean(getClass());
     }
  
+    @Override
+    public Long getDeviceCount(LocalDateTime createTime) {
+        return deviceMapper.selectCountByCreateTime(createTime);
+    }
+
+    @Override
+    public Long getDeviceCountByState(Integer state) {
+        return deviceMapper.selectCountByState(state);
+    }
+
+    @Override
+    public List<IotDeviceDO> getDeviceList() {
+        return deviceMapper.selectList();
+    }
+
 }
 \ No newline at end of file
@@ -6,6 +6,7 @@ import cn.iocoder.yudao.module.iot.controller.admin.product.vo.category.IotProdu
 import cn.iocoder.yudao.module.iot.dal.dataobject.product.IotProductCategoryDO;
 import jakarta.validation.Valid;
  
+import java.time.LocalDateTime;
 import java.util.Collection;
 import java.util.List;
 import java.util.Map;
@@ -83,4 +84,20 @@ public interface IotProductCategoryService {
      */
     List<IotProductCategoryDO> getProductCategoryListByStatus(Integer status);
  
+    /**
+     * 获得产品分类数量
+     *
+     * @param createTime 创建时间，如果为空，则统计所有分类数量
+     * @return 产品分类数量
+     */
+    Long getProductCategoryCount(LocalDateTime createTime);
+
+
+    /**
+     * 获得各产品分类下属的设备总数
+     *
+     * @return 产品分类名称和各产品分类下属的设备总数
+     */
+    Map<String,Integer> getDeviceCountsOfProductCategoryMap();
+
 }
 \ No newline at end of file
@@ -5,14 +5,20 @@ import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
 import cn.iocoder.yudao.module.iot.controller.admin.product.vo.category.IotProductCategoryPageReqVO;
 import cn.iocoder.yudao.module.iot.controller.admin.product.vo.category.IotProductCategorySaveReqVO;
+import cn.iocoder.yudao.module.iot.dal.dataobject.device.IotDeviceDO;
 import cn.iocoder.yudao.module.iot.dal.dataobject.product.IotProductCategoryDO;
+import cn.iocoder.yudao.module.iot.dal.dataobject.product.IotProductDO;
 import cn.iocoder.yudao.module.iot.dal.mysql.product.IotProductCategoryMapper;
+import cn.iocoder.yudao.module.iot.service.device.IotDeviceService;
 import jakarta.annotation.Resource;
 import org.springframework.stereotype.Service;
 import org.springframework.validation.annotation.Validated;
  
+import java.time.LocalDateTime;
 import java.util.Collection;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
  
 import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
 import static cn.iocoder.yudao.module.iot.enums.ErrorCodeConstants.PRODUCT_CATEGORY_NOT_EXISTS;
@@ -29,7 +35,12 @@ public class IotProductCategoryServiceImpl implements IotProductCategoryService 
     @Resource
     private IotProductCategoryMapper productCategoryMapper;
  
-    @Override
+    @Resource
+    private IotProductService productService;
+
+    @Resource
+    private IotDeviceService deviceService;
+
     public Long createProductCategory(IotProductCategorySaveReqVO createReqVO) {
         // 插入
         IotProductCategoryDO productCategory = BeanUtils.toBean(createReqVO, IotProductCategoryDO.class);
@@ -84,4 +95,50 @@ public class IotProductCategoryServiceImpl implements IotProductCategoryService 
         return productCategoryMapper.selectListByStatus(status);
     }
  
+    @Override
+    public Long getProductCategoryCount(LocalDateTime createTime) {
+        return productCategoryMapper.selectCountByCreateTime(createTime);
+    }
+
+    @Override
+    public Map<String, Integer> getDeviceCountsOfProductCategoryMap() {
+        // 1. 获取所有数据
+        List<IotProductCategoryDO> categoryList = productCategoryMapper.selectList();
+        List<IotProductDO> productList = productService.getProductList();
+        List<IotDeviceDO> deviceList = deviceService.getDeviceList();
+
+        // 2. 统计每个分类下的设备数量
+        Map<String, Integer> categoryDeviceCountMap = new HashMap<>();
+        
+        // 2.1 初始化所有分类的计数为0
+        for (IotProductCategoryDO category : categoryList) {
+            categoryDeviceCountMap.put(category.getName(), 0);
+        }
+        
+        // 2.2 构建产品ID到分类的映射
+        Map<Long, IotProductCategoryDO> productCategoryMap = new HashMap<>();
+        for (IotProductDO product : productList) {
+            Long categoryId = product.getCategoryId();
+            IotProductCategoryDO category = categoryList.stream()
+                    .filter(c -> c.getId().equals(categoryId))
+                    .findFirst()
+                    .orElse(null);
+            if (category != null) {
+                productCategoryMap.put(product.getId(), category);
+            }
+        }
+        
+        // 2.3 统计每个分类下的设备数量
+        for (IotDeviceDO device : deviceList) {
+            Long productId = device.getProductId();
+            IotProductCategoryDO category = productCategoryMap.get(productId);
+            if (category != null) {
+                String categoryName = category.getName();
+                categoryDeviceCountMap.merge(categoryName, 1, Integer::sum);
+            }
+        }
+        
+        return categoryDeviceCountMap;
+    }
+
 }
 \ No newline at end of file
@@ -6,6 +6,7 @@ import cn.iocoder.yudao.module.iot.controller.admin.product.vo.product.IotProduc
 import cn.iocoder.yudao.module.iot.dal.dataobject.product.IotProductDO;
 import jakarta.validation.Valid;
  
+import java.time.LocalDateTime;
 import java.util.List;
  
 /**
@@ -92,4 +93,20 @@ public interface IotProductService {
      */
     List<IotProductDO> getProductList();
  
+    /**
+     * 获得产品数量
+     *
+     * @param createTime 创建时间，如果为空，则统计所有产品数量
+     * @return 产品数量
+     */
+    Long getProductCount(LocalDateTime createTime);
+
+    /**
+     * 获得产品列表，基于分类编号
+     *
+     * @param categoryId 分类编号
+     * @return 产品列表
+     */
+    List<IotProductDO> getProductListByCategoryId(Long categoryId);
+
 }
 \ No newline at end of file
@@ -15,6 +15,7 @@ import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
 import org.springframework.validation.annotation.Validated;
  
+import java.time.LocalDateTime;
 import java.util.List;
 import java.util.Objects;
  
@@ -137,4 +138,14 @@ public class IotProductServiceImpl implements IotProductService {
         return productMapper.selectList();
     }
  
+    @Override
+    public Long getProductCount(LocalDateTime createTime) {
+        return productMapper.selectCountByCreateTime(createTime);
+    }
+
+    @Override
+    public List<IotProductDO> getProductListByCategoryId(Long categoryId) {
+        return productMapper.selectListByCategoryId(categoryId);
+    }
+
 }
 \ No newline at end of file
@@ -7,6 +7,7 @@ import cn.iocoder.yudao.module.iot.controller.admin.thingmodel.vo.IotThingModelS
 import cn.iocoder.yudao.module.iot.dal.dataobject.thingmodel.IotThingModelDO;
 import jakarta.validation.Valid;
  
+import java.time.LocalDateTime;
 import java.util.List;
  
 /**
@@ -80,4 +81,12 @@ public interface IotThingModelService {
      */
     List<IotThingModelDO> getThingModelList(IotThingModelListReqVO reqVO);
  
+    /**
+     * 获得物模型数量
+     *
+     * @param createTime 创建时间，如果为空，则统计所有物模型数量
+     * @return 物模型数量
+     */
+    Long getThingModelCount(LocalDateTime createTime);
+
 }
 \ No newline at end of file
@@ -29,6 +29,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.validation.annotation.Validated;
  
+import java.time.LocalDateTime;
 import java.util.*;
  
 import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
@@ -363,4 +364,9 @@ public class IotThingModelServiceImpl implements IotThingModelService {
         return SpringUtil.getBean(getClass());
     }
  
+    @Override
+    public Long getThingModelCount(LocalDateTime createTime) {
+        return thingModelMapper.selectCountByCreateTime(createTime);
+    }
+
 }
@@ -78,10 +78,10 @@ spring:
   # Redis 配置。Redisson 默认的配置足够使用，一般不需要进行调优
   data:
     redis:
-      host: 127.0.0.1 # 地址
+      host: chaojiniu.top # 地址
       port: 6379 # 端口
-      database: 1 # 数据库索引
-  #    password: 123456 # 密码，建议生产环境开启
+      database: 15 # 数据库索引
+      password: fsknKD7UvQYZsyf2hXXn # 密码，建议生产环境开启
  
 --- #################### 定时任务相关配置 ####################