From b517031534b96e4191c7d710c9f7ccf8c5fbc8d8 Mon Sep 17 00:00:00 2001 From: sxu <602087911@qq.com> Date: Mon, 6 Jan 2025 17:15:39 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A4=A7=E5=B1=8F=EF=BC=9A=E5=87=BA=E7=A7=9F?= =?UTF-8?q?=E8=A3=85=E5=A4=87=E5=88=86=E6=9E=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/bonus/material/device/domain/DevInfo.java | 5 ++++- .../bonus/material/device/mapper/DevInfoMapper.java | 2 ++ .../controller/LargeScreenController.java | 13 +++++++++++++ .../mapper/material/device/DevInfoMapper.xml | 9 +++++++++ 4 files changed, 28 insertions(+), 1 deletion(-) 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 394e865..486af11 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,9 +63,12 @@ public class DevInfo extends BaseEntity { @ApiModelProperty(value = "设备数量") private Integer deviceCount; - @ApiModelProperty(value = "比例范围") + @ApiModelProperty(value = "比率的范围,比如: x%-y%") private String ratioRange; + @ApiModelProperty(value = "比率,比如: 80%") + private double ratio; + @ApiModelProperty(value = "单位") @NotBlank(message = "单位不能为空") private String unitName; 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 2bf35da..cffd44c 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 @@ -213,5 +213,7 @@ public interface DevInfoMapper { int updateTotalDevLeaseDay(); List getIdleDevRatio(); + + List getLeaseCountByTypeName(); } 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 8772404..ce0f093 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 @@ -51,6 +51,19 @@ public class LargeScreenController { return AjaxResult.success(list); } + @ApiOperation("出租装备分类占比") + @GetMapping("/getLeaseCountByTypeName") + public AjaxResult getLeaseCountByTypeName() { + List list = devInfoMapper.getLeaseCountByTypeName(); + Integer total = list.stream().mapToInt(DevInfo::getDeviceCount).sum(); + list.forEach(item -> { + double ratio = total == 0 ? 0 : (double) item.getDeviceCount() / total; + double ratioPercent = ratio * 100; + item.setRatio(ratioPercent); + }); + 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 cdf7330..9163445 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 @@ -990,4 +990,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ORDER BY ratio_range + +