diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/mapper/DevInfoMapper.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/mapper/DevInfoMapper.java index 22f897b..dd7c7f9 100644 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/mapper/DevInfoMapper.java +++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/mapper/DevInfoMapper.java @@ -197,5 +197,9 @@ public interface DevInfoMapper { Integer getDevNum(); Integer getDevUpNum(); + + Integer getDevTypeNum(); + + Integer getDevQcWarningNum(); } diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/largeScreen/controller/LargeScreenController.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/largeScreen/controller/LargeScreenController.java index a861d13..786b4dd 100644 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/largeScreen/controller/LargeScreenController.java +++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/largeScreen/controller/LargeScreenController.java @@ -69,15 +69,18 @@ public class LargeScreenController { return AjaxResult.success(orderData); } - @ApiOperation("装备上架") + @ApiOperation("装备上架统计") @GetMapping("/devCount") public AjaxResult devCount() { - //今日装备入驻数 Integer devNum = devInfoMapper.getDevNum(); Integer devUpNum = devInfoMapper.getDevUpNum(); + Integer devTypeNum = devInfoMapper.getDevTypeNum(); + Integer devQcWarningNum = devInfoMapper.getDevQcWarningNum(); OrderData orderData = new OrderData(); orderData.setDevNum(devNum); orderData.setDevUpNum(devUpNum); + orderData.setDevTypeNum(devTypeNum); + orderData.setDevQcWaningNum(devQcWarningNum); return AjaxResult.success(orderData); } } diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/largeScreen/entity/OrderData.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/largeScreen/entity/OrderData.java index 3c3ca7a..a7056a7 100644 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/largeScreen/entity/OrderData.java +++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/largeScreen/entity/OrderData.java @@ -41,4 +41,13 @@ public class OrderData { @ApiModelProperty(value = "装备总上架数") private Integer devUpNum; + + @ApiModelProperty(value = "装备总类型数") + private Integer devTypeNum; + + @ApiModelProperty(value = "装备总报警数") + private Integer devQcWaningNum; + + + } diff --git a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/device/DevInfoMapper.xml b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/device/DevInfoMapper.xml index f14969b..f6f700c 100644 --- a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/device/DevInfoMapper.xml +++ b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/device/DevInfoMapper.xml @@ -909,4 +909,23 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" AND ma_status = '2' + + + +