From bb78ea38792502cbff36c9a4486b7b12e1940615 Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期二, 03 二月 2026 10:59:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New' into dev_New
---
src/main/java/com/ruoyi/home/controller/HomeController.java | 55 ++++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 54 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/ruoyi/home/controller/HomeController.java b/src/main/java/com/ruoyi/home/controller/HomeController.java
index e4d29f7..7cf3f95 100644
--- a/src/main/java/com/ruoyi/home/controller/HomeController.java
+++ b/src/main/java/com/ruoyi/home/controller/HomeController.java
@@ -192,7 +192,7 @@
@GetMapping("/productionAccountingAnalysis")
@ApiOperation("鐢熶骇鏍哥畻鍒嗘瀽")
public AjaxResult productionAccountingAnalysis(@RequestParam(value = "type", defaultValue = "1") Integer type){
- List<MapDto> list = homeService.productionAccountingAnalysis(type);
+ List<ProductionAccountingDto> list = homeService.productionAccountingAnalysis(type);
return AjaxResult.success(list);
}
@@ -202,6 +202,59 @@
return AjaxResult.success(homeService.orderCount());
}
+ @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("/business")
@Log(title = "閿�鍞�-閲囪喘-搴撳瓨鏁版嵁", businessType = BusinessType.OTHER)
--
Gitblit v1.9.3