diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/broad/BoxBroadController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/broad/BoxBroadController.java index 0641a28..a5248ad 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/broad/BoxBroadController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/broad/BoxBroadController.java @@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.ruoyi.system.domain.*; import com.ruoyi.system.service.IBroadDataService; +import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; @@ -44,6 +45,11 @@ public class BoxBroadController { return JSONObject.toJSONString(new EchartsDTO(xAxisInfo, seriesInfo)); } + @PostMapping("/selectStockOccupancy") + @ApiOperation("库存占有率") + public String selectStockOccupancy(){ + return JSONArray.toJSONString(service.xk_selectStockOccupancy()); + } @PostMapping("/selectOutputByType") diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/BroadDataMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/BroadDataMapper.java index 5e79247..6d94a47 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/BroadDataMapper.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/BroadDataMapper.java @@ -42,6 +42,8 @@ public interface BroadDataMapper { List fp_selectDeviceStation(); List fp_selectStationHourInfo(); + List xk_selectStockOccupancy(); + /////////////////////////////////////////////////////////////////////////// // 6 diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/IBroadDataService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/IBroadDataService.java index c10b7e2..aa57364 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/IBroadDataService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/IBroadDataService.java @@ -41,4 +41,6 @@ public interface IBroadDataService { List fp_selectDeviceStation(); List fp_selectStationHourInfo(); + + List xk_selectStockOccupancy(); } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/BroadDataServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/BroadDataServiceImpl.java index 7c99148..912f0c8 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/BroadDataServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/BroadDataServiceImpl.java @@ -48,9 +48,10 @@ public class BroadDataServiceImpl implements IBroadDataService return mapper.selectOutputByTime(); } - - - + @Override + public List xk_selectStockOccupancy() { + return mapper.xk_selectStockOccupancy(); + } /////////////////////////////////////////////////////////////////////////// // 发泡线 diff --git a/ruoyi-system/src/main/resources/mapper/system/BroadDataMapper.xml b/ruoyi-system/src/main/resources/mapper/system/BroadDataMapper.xml index ead3c14..f47f857 100644 --- a/ruoyi-system/src/main/resources/mapper/system/BroadDataMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/BroadDataMapper.xml @@ -84,6 +84,13 @@ group by MATERIAL_NAME +