diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/domain/DevInfo.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/domain/DevInfo.java index fcb39ee..394e865 100644 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/domain/DevInfo.java +++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/domain/DevInfo.java @@ -63,6 +63,9 @@ public class DevInfo extends BaseEntity { @ApiModelProperty(value = "设备数量") private Integer deviceCount; + @ApiModelProperty(value = "比例范围") + private String ratioRange; + @ApiModelProperty(value = "单位") @NotBlank(message = "单位不能为空") private String unitName; @@ -272,5 +275,4 @@ public class DevInfo extends BaseEntity { @ApiModelProperty(value = "累计租赁天数") private Integer totalLeaseDay; - } 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 296d8db..2bf35da 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 @@ -211,5 +211,7 @@ public interface DevInfoMapper { int updateTotalDevUpDay(); int updateTotalDevLeaseDay(); + + List getIdleDevRatio(); } 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 66c5161..8772404 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 @@ -4,6 +4,7 @@ import com.bonus.common.biz.utils.MathUtil; import com.bonus.common.core.web.domain.AjaxResult; import com.bonus.material.device.domain.DevInfo; import com.bonus.material.device.mapper.DevInfoMapper; +import com.bonus.material.device.service.DevInfoService; import com.bonus.material.largeScreen.entity.OrderData; import com.bonus.material.largeScreen.entity.OrderDto; import com.bonus.material.lease.mapper.MaLeaseInfoMapper; @@ -16,6 +17,7 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; +import java.util.ArrayList; import java.util.List; /** @@ -29,6 +31,10 @@ import java.util.List; public class LargeScreenController { @Resource private OrderService orderService; + + @Resource + private DevInfoService devInfoService; + @Resource private OrderMapper orderMapper; @@ -38,6 +44,13 @@ public class LargeScreenController { @Resource private MaLeaseInfoMapper leaseInfoMapper; + @ApiOperation("闲置装备分析") + @GetMapping("/getIdleDevRatio") + public AjaxResult getIdleDevRatio() { + List list = devInfoMapper.getIdleDevRatio(); + return AjaxResult.success(list); + } + @ApiOperation("订单数据") @GetMapping("/orderData") 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 6f84ded..cdf7330 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 @@ -975,4 +975,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where is_active = '1' and ma_status = '3' +