From a0400e48a2e8f50c457e1c4d4ba19bab2a0d1301 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期四, 02 四月 2026 08:58:10 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_宁夏_中盛建材' into dev_宁夏_中盛建材
---
src/main/java/com/ruoyi/home/controller/HomeController.java | 50 +++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 47 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/ruoyi/home/controller/HomeController.java b/src/main/java/com/ruoyi/home/controller/HomeController.java
index e1bee4a..19a649a 100644
--- a/src/main/java/com/ruoyi/home/controller/HomeController.java
+++ b/src/main/java/com/ruoyi/home/controller/HomeController.java
@@ -325,9 +325,6 @@
}
-
-
-
/*******************************************瀹佸涓洓寤烘潗鐨勫ぇ灞忕粺璁�***************************************************/
@GetMapping("/total")
@@ -354,4 +351,51 @@
return AjaxResult.success(homeService.customerTrends(salesDeliveryDto));
}
+
+ @GetMapping("/productionStatistics/materialProductionAnalysis")
+ @ApiOperation("鐢熶骇缁熻鐪嬫澘-鐗╂枡鐢熶骇閲忓垎鏋�")
+ public AjaxResult materialProductionAnalysis(productionStatisticsDto dto) {
+ Map<String, List<MaterialProductionAnalysisDto>> map = homeService.materialProductionAnalysis(dto);
+ return AjaxResult.success(map);
+ }
+
+ @GetMapping("/productionStatistics/materials")
+ @ApiOperation("鐢熶骇缁熻鐪嬫澘-鑾峰彇鐢熶骇鎴愭湰鍗曡�楃粺璁′骇鍝佸垪琛�")
+ public AjaxResult getMaterials(Integer materialType) {
+ List<String> list = homeService.getMaterials(materialType);
+ return AjaxResult.success(list);
+ }
+
+ @GetMapping("/productionStatistics/blocks")
+ @ApiOperation("鐢熶骇缁熻鐪嬫澘-鐢熶骇鎴愭湰鍗曡�楃粺璁�(鐮屽潡)")
+ public AjaxResult blocks(productionStatisticsDto dto) {
+ return AjaxResult.success(homeService.productionCostAnalysis(dto, 1));
+ }
+
+ @GetMapping("/productionStatistics/plates")
+ @ApiOperation("鐢熶骇缁熻鐪嬫澘-鐢熶骇鎴愭湰鍗曡�楃粺璁�(鏉挎潗)")
+ public AjaxResult plates(productionStatisticsDto dto) {
+ return AjaxResult.success(homeService.productionCostAnalysis(dto, 2));
+ }
+
+ @GetMapping("/productionStatistics/middle")
+ @ApiOperation("鐢熶骇缁熻鐪嬫澘-椤圭洰浜ч噺涓庡浐搴熷鐞嗛噺")
+ public AjaxResult middle() {
+ ProductionStatisticsMiddleDto middle = homeService.middle();
+ return AjaxResult.success(middle);
+ }
+
+ @GetMapping("/productionStatistics/solidWaste")
+ @ApiOperation("鐢熶骇缁熻鐪嬫澘-鍥哄簾澶勭悊閲�")
+ public AjaxResult solidWaste(productionStatisticsDto dto) {
+ return AjaxResult.success(homeService.solidWaste(dto));
+ }
+
+ @GetMapping("/productionStatistics/energy")
+ @ApiOperation("鐢熶骇缁熻鐪嬫澘-鑳借�楃粺璁�")
+ public AjaxResult energy(productionStatisticsDto dto) {
+ return AjaxResult.success(homeService.energy(dto));
+ }
+
+
}
--
Gitblit v1.9.3