From ed90cf57f98151c770412edf78b71f9169005314 Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期二, 03 二月 2026 11:31:52 +0800
Subject: [PATCH] fix: 根据接口类型进行拆分
---
src/main/java/com/ruoyi/home/controller/HomeController.java | 186 +++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 165 insertions(+), 21 deletions(-)
diff --git a/src/main/java/com/ruoyi/home/controller/HomeController.java b/src/main/java/com/ruoyi/home/controller/HomeController.java
index d6fe834..54fde04 100644
--- a/src/main/java/com/ruoyi/home/controller/HomeController.java
+++ b/src/main/java/com/ruoyi/home/controller/HomeController.java
@@ -7,6 +7,7 @@
import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.home.dto.*;
import com.ruoyi.home.service.HomeService;
+import com.ruoyi.dto.MapDto;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
@@ -68,24 +69,18 @@
return AjaxResult.success(homeSummaryDto);
}
+ /********************************************************钀ラ攢閲囪喘绫�**************************************************/
@GetMapping("/supplierPurchaseRanking")
@ApiOperation("渚涘簲鍟嗛噰璐帓鍚�")
- public AjaxResult supplierPurchaseRanking(@RequestParam(value = "type", defaultValue = "0") Integer type) {
+ public AjaxResult supplierPurchaseRanking(@RequestParam(value = "type", defaultValue = "1") Integer type) {
List<SupplierPurchaseRankingDto> list = homeService.supplierPurchaseRanking(type);
return AjaxResult.success(list);
}
@GetMapping("/customerRevenueAnalysis")
@ApiOperation("瀹㈡埛钀ユ敹璐＄尞鏁板�煎垎鏋�")
- public AjaxResult customerRevenueAnalysis(@RequestParam("customerId") Long customerId, @RequestParam(value = "type", defaultValue = "0") Integer type) {
+ public AjaxResult customerRevenueAnalysis(@RequestParam("customerId") Long customerId, @RequestParam(value = "type", defaultValue = "1") Integer type) {
CustomerRevenueAnalysisDto dto = homeService.customerRevenueAnalysis(customerId, type);
- return AjaxResult.success(dto);
- }
-
- @GetMapping("/productCategoryDistribution")
- @ApiOperation("浜у搧澶х被鍒嗗竷")
- public AjaxResult productCategoryDistribution() {
- ProductCategoryDistributionDto dto = homeService.productCategoryDistribution();
return AjaxResult.success(dto);
}
@@ -96,7 +91,20 @@
return AjaxResult.success(list);
}
- /********************************************************钀ラ攢閲囪喘绫�**************************************************/
+ @GetMapping("/productSalesAnalysis")
+ @ApiOperation("鍚勪骇鍝侀攢鍞噾棰濆垎鏋�")
+ public AjaxResult productSalesAnalysis() {
+ List<MapDto> list = homeService.productSalesAnalysis();
+ return AjaxResult.success(list);
+ }
+
+ @GetMapping("/rawMaterialPurchaseAmountRatio")
+ @ApiOperation("鍘熸潗鏂欓噰璐噾棰濆崰姣�")
+ public AjaxResult rawMaterialPurchaseAmountRatio(){
+ List<MapDto> list = homeService.rawMaterialPurchaseAmountRatio();
+ return AjaxResult.success(list);
+ }
+
@GetMapping("/business")
@Log(title = "閿�鍞�-閲囪喘-搴撳瓨鏁版嵁", businessType = BusinessType.OTHER)
@ApiOperation("閿�鍞�-閲囪喘-搴撳瓨鏁版嵁")
@@ -104,7 +112,6 @@
HomeBusinessDto homeBusinessDto = homeService.business();
return AjaxResult.success(homeBusinessDto);
}
-
@GetMapping("/analysisCustomerContractAmounts")
@Log(title = "瀹㈡埛鍚堝悓閲戦鍒嗘瀽", businessType = BusinessType.OTHER)
@@ -114,14 +121,48 @@
return AjaxResult.success(analysisCustomerContractAmounts);
}
-
/********************************************************鐢熶骇绫�*****************************************************/
+ @GetMapping("/inputOutputAnalysis")
+ @ApiOperation("鎶曞叆浜у嚭鍒嗘瀽")
+ public AjaxResult inputOutputAnalysis(@RequestParam(value = "type", defaultValue = "1") Integer type){
+ List<InputOutputAnalysisDto> list = homeService.inputOutputAnalysis(type);
+ return AjaxResult.success(list);
+ }
+
+ @GetMapping("/processOutputAnalysis")
+ @ApiOperation("宸ュ簭浜у嚭鍒嗘瀽")
+ public AjaxResult processOutputAnalysis(@RequestParam(value = "type", defaultValue = "1") Integer type){
+ List<MapDto> list = homeService.processOutputAnalysis(type);
+ return AjaxResult.success(list);
+ }
+
+ @GetMapping("/workOrderEfficiencyAnalysis")
+ @ApiOperation("宸ュ崟鎵ц鏁堢巼鍒嗘瀽")
+ public AjaxResult workOrderEfficiencyAnalysis(@RequestParam(value = "type", defaultValue = "1") Integer type){
+ List<WorkOrderEfficiencyDto> list = homeService.workOrderEfficiencyAnalysis(type);
+ return AjaxResult.success(list);
+ }
+
+ @GetMapping("/productionAccountingAnalysis")
+ @ApiOperation("鐢熶骇鏍哥畻鍒嗘瀽")
+ public AjaxResult productionAccountingAnalysis(@RequestParam(value = "type", defaultValue = "1") Integer type){
+ List<ProductionAccountingDto> list = homeService.productionAccountingAnalysis(type);
+ return AjaxResult.success(list);
+ }
+
+ @GetMapping("/orderCount")
+ @ApiOperation("璁㈠崟鏁�")
+ public AjaxResult orderCount(){
+ return AjaxResult.success(homeService.orderCount());
+ }
+
@GetMapping("/progressStatistics")
@ApiOperation("鍚勭敓浜ц鍗曠殑瀹屾垚杩涘害缁熻")
public AjaxResult progressStatistics(){
ProductionProgressDto productionProgressDto = homeService.productionProgress();
return AjaxResult.success(productionProgressDto);
}
+
@GetMapping("/workInProcessTurnover")
@ApiOperation("鍦ㄥ埗鍝佸懆杞儏鍐�")
public AjaxResult workInProcessTurnover(){
@@ -129,8 +170,60 @@
return AjaxResult.success(productionTurnoverDto);
}
-
/********************************************************璐ㄩ噺绫�*****************************************************/
+ @GetMapping("/rawMaterialDetection")
+ @ApiOperation("鍘熸潗鏂欐娴�")
+ public AjaxResult rawMaterialDetection(@RequestParam(value = "type", defaultValue = "1") Integer type){
+ return AjaxResult.success(homeService.rawMaterialDetection(type));
+ }
+
+ @GetMapping("/processDetection")
+ @ApiOperation("杩囩▼妫�娴�")
+ public AjaxResult processDetection(@RequestParam(value = "type", defaultValue = "1") Integer type){
+ return AjaxResult.success(homeService.processDetection(type));
+ }
+
+ @GetMapping("/factoryDetection")
+ @ApiOperation("鎴愬搧鍑哄巶妫�娴�")
+ public AjaxResult factoryDetection(@RequestParam(value = "type", defaultValue = "1") Integer type){
+ return AjaxResult.success(homeService.factoryDetection(type));
+ }
+
+ @GetMapping("/qualityInspectionCount")
+ @ApiOperation("璐ㄩ噺妫�楠屾暟閲�")
+ public AjaxResult qualityInspectionCount(){
+ QualityInspectionCountDto qualityInspectionCountDto = homeService.qualityInspectionCount();
+ return AjaxResult.success(qualityInspectionCountDto);
+ }
+
+ @GetMapping("/nonComplianceWarning")
+ @ApiOperation("涓嶅悎鏍奸璀�")
+ public AjaxResult nonComplianceWarning(){
+ NonComplianceWarningDto nonComplianceWarningDto = homeService.nonComplianceWarning();
+ return AjaxResult.success(nonComplianceWarningDto);
+ }
+
+ @GetMapping("/completedInspectionCount")
+ @ApiOperation("瀹屾垚妫�楠屾暟")
+ public AjaxResult completedInspectionCount(){
+ List<CompletedInspectionCountDto> list = homeService.completedInspectionCount();
+ return AjaxResult.success(list);
+ }
+
+ @GetMapping("/unqualifiedProductRanking")
+ @ApiOperation("涓嶅悎鏍间骇鍝佹帓鍚�")
+ public AjaxResult unqualifiedProductRanking(){
+ List<UnqualifiedProductRankDto> list = homeService.unqualifiedProductRanking();
+ return AjaxResult.success(list);
+ }
+
+ @GetMapping("/unqualifiedProductProcessingAnalysis")
+ @ApiOperation("涓嶅悎鏍兼鍝佸鐞嗗垎鏋�")
+ public AjaxResult unqualifiedProductProcessingAnalysis(){
+ List<MapDto> list = homeService.unqualifiedProductProcessingAnalysis();
+ return AjaxResult.success(list);
+ }
+
@GetMapping("/qualityStatistics")
@Log(title = "璐ㄩ噺鍒嗘瀽", businessType = BusinessType.OTHER)
@ApiOperation("璐ㄩ噺鍒嗘瀽")
@@ -139,8 +232,42 @@
return AjaxResult.success(qualityStatisticsDto);
}
-
/********************************************************璐㈠姟绫�*****************************************************/
+ @GetMapping("/incomeExpenseAnalysis")
+ @ApiOperation("鏀敹瀵规瘮鍒嗘瀽")
+ public AjaxResult incomeExpenseAnalysis(@RequestParam(value = "type", defaultValue = "1") Integer type) {
+ List<Map<String, Object>> result = homeService.incomeExpenseAnalysis(type);
+ return AjaxResult.success(result);
+ }
+
+ @GetMapping("/profitTrendAnalysis")
+ @ApiOperation("鍒╂鼎瓒嬪娍鍒嗘瀽")
+ public AjaxResult profitTrendAnalysis(){
+ List<MapDto> list = homeService.profitTrendAnalysis();
+ return AjaxResult.success(list);
+ }
+
+ @GetMapping("/expenseCompositionAnalysis")
+ @ApiOperation("鏋勬垚鍒嗘瀽")
+ public AjaxResult expenseCompositionAnalysis(@RequestParam(value = "type", defaultValue = "1") Integer type) {
+ List<MapDto> list = homeService.expenseCompositionAnalysis(type);
+ return AjaxResult.success(list);
+ }
+
+ @GetMapping("/monthlyIncome")
+ @ApiOperation("鏈堝害鏀跺叆")
+ public AjaxResult monthlyIncome(){
+ MonthlyIncomeDto dto = homeService.monthlyIncome();
+ return AjaxResult.success(dto);
+ }
+
+ @GetMapping("/monthlyExpenditure")
+ @ApiOperation("鏈堝害鏀嚭")
+ public AjaxResult monthlyExpenditure(){
+ MonthlyExpenditureDto dto = homeService.monthlyExpenditure();
+ return AjaxResult.success(dto);
+ }
+
@GetMapping("/statisticsReceivablePayable")
@Log(title = "搴旀敹搴斾粯缁熻", businessType = BusinessType.OTHER)
@ApiOperation("搴旀敹搴斾粯缁熻")
@@ -149,17 +276,34 @@
return AjaxResult.success(statisticsReceivablePayable);
}
-
/********************************************************浠撳偍绫�*****************************************************/
+ @GetMapping("/productCategoryDistribution")
+ @ApiOperation("浜у搧澶х被鍒嗗竷")
+ public AjaxResult productCategoryDistribution() {
+ ProductCategoryDistributionDto dto = homeService.productCategoryDistribution();
+ return AjaxResult.success(dto);
+ }
+ @GetMapping("/salesPurchaseStorageProductCount")
+ @ApiOperation("閿�鍞�-閲囪喘-鍌ㄥ瓨浜у搧鏁�")
+ public AjaxResult salesPurchaseStorageProductCount(){
+ List<MapDto> list = homeService.salesPurchaseStorageProductCount();
+ return AjaxResult.success(list);
+ }
+ @GetMapping("/productInOutAnalysis")
+ @ApiOperation("浜у搧鍑哄叆搴撳垎鏋�")
+ public AjaxResult productInOutAnalysis(@RequestParam(value = "type", defaultValue = "1") Integer type){
+ List<Map<String, Object>> result = homeService.productInOutAnalysis(type);
+ return AjaxResult.success(result);
+ }
-
-
-
-
-
-
+ @GetMapping("/productTurnoverDays")
+ @ApiOperation("浜у搧鍛ㄨ浆澶╂暟")
+ public AjaxResult productTurnoverDays(){
+ List<MapDto> list = homeService.productTurnoverDays();
+ return AjaxResult.success(list);
+ }
}
--
Gitblit v1.9.3