From d06ef3f44d6dc19dae223ab420165369ea13cc16 Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期三, 20 五月 2026 16:29:35 +0800
Subject: [PATCH] Merge branch 'dev_New_pro' of http://114.132.189.42:9002/r/product-inventory-management-after into dev_New_pro

---
 src/main/java/com/ruoyi/home/controller/HomeController.java |  164 +++++++++++++++++++++++++++---------------------------
 1 files changed, 82 insertions(+), 82 deletions(-)

diff --git a/src/main/java/com/ruoyi/home/controller/HomeController.java b/src/main/java/com/ruoyi/home/controller/HomeController.java
index 41ae224..8ef87a5 100644
--- a/src/main/java/com/ruoyi/home/controller/HomeController.java
+++ b/src/main/java/com/ruoyi/home/controller/HomeController.java
@@ -5,12 +5,12 @@
 import com.ruoyi.framework.aspectj.lang.annotation.Log;
 import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
 import com.ruoyi.framework.web.controller.BaseController;
-import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.framework.web.domain.R;
 import com.ruoyi.home.annotation.DefaultType;
 import com.ruoyi.home.dto.*;
 import com.ruoyi.home.service.HomeService;
-import io.swagger.v3.oas.annotations.tags.Tag;
 import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.AllArgsConstructor;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -37,288 +37,288 @@
     @GetMapping("/todos")
     @Log(title = "寰呭姙浜嬮」", businessType = BusinessType.OTHER)
     @Operation(summary = "寰呭姙浜嬮」")
-    public AjaxResult todos(ApproveProcess req) throws ParseException {
+    public R todos(ApproveProcess req) throws ParseException {
         List<ApproveProcess> approveProcessList = homeService.todos();
-        return AjaxResult.success(approveProcessList);
+        return R.ok(approveProcessList);
     }
 
     @GetMapping("/approveAndDeviceTodos")
     @Operation(summary = "瀹℃壒鍗忓悓锛岃澶囨姤淇緟鍔炰簨椤�")
-    public AjaxResult approveAndDeviceTodos(){
+    public R approveAndDeviceTodos(){
         Map<String, Object> map = homeService.approveAndDeviceTodos();
-        return AjaxResult.success(map);
+        return R.ok(map);
     }
 
     @GetMapping("/noticesCount")
     @Operation(summary = "鏈繃鏈熺殑鍏憡鏁伴噺")
-    public AjaxResult noticesCount(){
+    public R noticesCount(){
         Long count = homeService.noticesCount();
-        return AjaxResult.success(count);
+        return R.ok(count);
     }
 
     @GetMapping("/deptStaffDistribution")
     @Operation(summary = "鍚勯儴闂ㄤ汉鍛樺垎甯�")
-    public AjaxResult deptStaffDistribution() {
+    public R deptStaffDistribution() {
         DeptStaffDistributionDto dto = homeService.deptStaffDistribution();
-        return AjaxResult.success(dto);
+        return R.ok(dto);
     }
 
     @GetMapping("/summaryStatistics")
     @Operation(summary = "鍛樺伐-瀹㈡埛-渚涘簲鍟嗘�绘暟")
-    public AjaxResult summaryStatistics() {
+    public R summaryStatistics() {
         HomeSummaryDto homeSummaryDto = homeService.summaryStatistics();
-        return AjaxResult.success(homeSummaryDto);
+        return R.ok(homeSummaryDto);
     }
 
     /********************************************************钀ラ攢閲囪喘绫�**************************************************/
     @GetMapping("/supplierPurchaseRanking")
     @Operation(summary = "渚涘簲鍟嗛噰璐帓鍚�")
-    public AjaxResult supplierPurchaseRanking(@DefaultType Integer type) {
+    public R supplierPurchaseRanking(@DefaultType Integer type) {
         List<SupplierPurchaseRankingDto> list = homeService.supplierPurchaseRanking(type);
-        return AjaxResult.success(list);
+        return R.ok(list);
     }
 
     @GetMapping("/customerRevenueAnalysis")
     @Operation(summary = "瀹㈡埛钀ユ敹璐＄尞鏁板�煎垎鏋�")
-    public AjaxResult customerRevenueAnalysis(Long customerId, @DefaultType Integer type) {
+    public R customerRevenueAnalysis(Long customerId, @DefaultType Integer type) {
         CustomerRevenueAnalysisDto dto = homeService.customerRevenueAnalysis(customerId, type);
-        return AjaxResult.success(dto);
+        return R.ok(dto);
     }
 
     @GetMapping("/customerContributionRanking")
     @Operation(summary = "瀹㈡埛閲戦璐＄尞鎺掑悕")
-    public AjaxResult customerContributionRanking(@DefaultType Integer type) {
+    public R customerContributionRanking(@DefaultType Integer type) {
         List<CustomerContributionRankingDto> list = homeService.customerContributionRanking(type);
-        return AjaxResult.success(list);
+        return R.ok(list);
     }
 
     @GetMapping("/productSalesAnalysis")
     @Operation(summary = "鍚勪骇鍝侀攢鍞噾棰濆垎鏋�")
-    public AjaxResult productSalesAnalysis() {
+    public R productSalesAnalysis() {
         List<MapDto> list = homeService.productSalesAnalysis();
-        return AjaxResult.success(list);
+        return R.ok(list);
     }
 
     @GetMapping("/rawMaterialPurchaseAmountRatio")
     @Operation(summary = "鍘熸潗鏂欓噰璐噾棰濆崰姣�")
-    public AjaxResult rawMaterialPurchaseAmountRatio(){
+    public R rawMaterialPurchaseAmountRatio(){
         List<MapDto> list = homeService.rawMaterialPurchaseAmountRatio();
-        return AjaxResult.success(list);
+        return R.ok(list);
     }
 
     @GetMapping("/business")
     @Log(title = "閿�鍞�-閲囪喘-搴撳瓨鏁版嵁", businessType = BusinessType.OTHER)
     @Operation(summary = "閿�鍞�-閲囪喘-搴撳瓨鏁版嵁")
-    public AjaxResult business(HomeBusinessDto req) {
+    public R business(HomeBusinessDto req) {
         HomeBusinessDto homeBusinessDto = homeService.business();
-        return AjaxResult.success(homeBusinessDto);
+        return R.ok(homeBusinessDto);
     }
 
     @GetMapping("/analysisCustomerContractAmounts")
     @Log(title = "瀹㈡埛鍚堝悓閲戦鍒嗘瀽", businessType = BusinessType.OTHER)
     @Operation(summary = "瀹㈡埛鍚堝悓閲戦鍒嗘瀽")
-    public AjaxResult analysisCustomerContractAmounts(AnalysisCustomerContractAmountsDto req) {
+    public R analysisCustomerContractAmounts(AnalysisCustomerContractAmountsDto req) {
         AnalysisCustomerContractAmountsDto analysisCustomerContractAmounts = homeService.analysisCustomerContractAmounts();
-        return AjaxResult.success(analysisCustomerContractAmounts);
+        return R.ok(analysisCustomerContractAmounts);
     }
 
     /********************************************************鐢熶骇绫�*****************************************************/
     @GetMapping("/inputOutputAnalysis")
     @Operation(summary = "鎶曞叆浜у嚭鍒嗘瀽")
-    public AjaxResult inputOutputAnalysis(@DefaultType Integer type){
+    public R inputOutputAnalysis(@DefaultType Integer type){
       List<InputOutputAnalysisDto> list = homeService.inputOutputAnalysis(type);
-        return AjaxResult.success(list);
+        return R.ok(list);
     }
 
     @GetMapping("/processOutputAnalysis")
     @Operation(summary = "宸ュ簭浜у嚭鍒嗘瀽")
-    public AjaxResult processOutputAnalysis(@DefaultType Integer type){
+    public R processOutputAnalysis(@DefaultType Integer type){
         List<MapDto> list = homeService.processOutputAnalysis(type);
-        return AjaxResult.success(list);
+        return R.ok(list);
     }
 
     @GetMapping("/workOrderEfficiencyAnalysis")
     @Operation(summary = "宸ュ崟鎵ц鏁堢巼鍒嗘瀽")
-    public AjaxResult workOrderEfficiencyAnalysis(@DefaultType Integer type){
+    public R workOrderEfficiencyAnalysis(@DefaultType Integer type){
         List<WorkOrderEfficiencyDto> list = homeService.workOrderEfficiencyAnalysis(type);
-        return AjaxResult.success(list);
+        return R.ok(list);
     }
 
     @GetMapping("/productionAccountingAnalysis")
     @Operation(summary = "鐢熶骇鏍哥畻鍒嗘瀽")
-    public AjaxResult productionAccountingAnalysis(@DefaultType Integer type){
+    public R productionAccountingAnalysis(@DefaultType Integer type){
         List<ProductionAccountingDto> list   = homeService.productionAccountingAnalysis(type);
-        return AjaxResult.success(list);
+        return R.ok(list);
     }
 
     @GetMapping("/orderCount")
     @Operation(summary = "璁㈠崟鏁�")
-    public AjaxResult orderCount(){
-        return AjaxResult.success(homeService.orderCount());
+    public R orderCount(){
+        return R.ok(homeService.orderCount());
     }
 
     @GetMapping("/progressStatistics")
     @Operation(summary = "鍚勭敓浜ц鍗曠殑瀹屾垚杩涘害缁熻")
-    public AjaxResult progressStatistics(){
+    public R progressStatistics(){
         ProductionProgressDto productionProgressDto = homeService.productionProgress();
-        return AjaxResult.success(productionProgressDto);
+        return R.ok(productionProgressDto);
     }
 
     @GetMapping("/workInProcessTurnover")
     @Operation(summary = "鍦ㄥ埗鍝佸懆杞儏鍐�")
-    public AjaxResult workInProcessTurnover(){
+    public R workInProcessTurnover(){
         ProductionTurnoverDto productionTurnoverDto = homeService.workInProcessTurnover();
-        return AjaxResult.success(productionTurnoverDto);
+        return R.ok(productionTurnoverDto);
     }
 
     @GetMapping("/processDataProductionStatistics")
     @Operation(summary = "宸ュ簭鏁版嵁鐢熶骇缁熻鏁版嵁")
-    public AjaxResult processDataProductionStatistics(@DefaultType Integer type,@RequestParam(required = false) List<Long> processIds) {
+    public R processDataProductionStatistics(@DefaultType Integer type,@RequestParam(required = false) List<Long> processIds) {
         List<processDataProductionStatisticsDto> list = homeService.processDataProductionStatistics(type, processIds);
-        return AjaxResult.success(list);
+        return R.ok(list);
     }
 
     /********************************************************璐ㄩ噺绫�*****************************************************/
     @GetMapping("/rawMaterialDetection")
     @Operation(summary = "鍘熸潗鏂欐娴�")
-    public AjaxResult rawMaterialDetection(@DefaultType Integer type){
-        return AjaxResult.success(homeService.rawMaterialDetection(type));
+    public R rawMaterialDetection(@DefaultType Integer type){
+        return R.ok(homeService.rawMaterialDetection(type));
     }
 
     @GetMapping("/processDetection")
     @Operation(summary = "杩囩▼妫�娴�")
-    public AjaxResult processDetection(@DefaultType Integer type){
-        return AjaxResult.success(homeService.processDetection(type));
+    public R processDetection(@DefaultType Integer type){
+        return R.ok(homeService.processDetection(type));
     }
 
     @GetMapping("/factoryDetection")
     @Operation(summary = "鎴愬搧鍑哄巶妫�娴�")
-    public AjaxResult factoryDetection(@DefaultType Integer type){
-        return AjaxResult.success(homeService.factoryDetection(type));
+    public R factoryDetection(@DefaultType Integer type){
+        return R.ok(homeService.factoryDetection(type));
     }
 
     @GetMapping("/qualityInspectionCount")
     @Operation(summary = "璐ㄩ噺妫�楠屾暟閲�")
-    public AjaxResult qualityInspectionCount(){
+    public R qualityInspectionCount(){
         QualityInspectionCountDto qualityInspectionCountDto = homeService.qualityInspectionCount();
-        return AjaxResult.success(qualityInspectionCountDto);
+        return R.ok(qualityInspectionCountDto);
     }
 
     @GetMapping("/nonComplianceWarning")
     @Operation(summary = "涓嶅悎鏍奸璀�")
-    public AjaxResult nonComplianceWarning(){
+    public R nonComplianceWarning(){
         NonComplianceWarningDto nonComplianceWarningDto = homeService.nonComplianceWarning();
-        return AjaxResult.success(nonComplianceWarningDto);
+        return R.ok(nonComplianceWarningDto);
     }
 
     @GetMapping("/completedInspectionCount")
     @Operation(summary = "瀹屾垚妫�楠屾暟")
-    public AjaxResult completedInspectionCount(){
+    public R completedInspectionCount(){
         List<CompletedInspectionCountDto> list = homeService.completedInspectionCount();
-        return AjaxResult.success(list);
+        return R.ok(list);
     }
 
     @GetMapping("/unqualifiedProductRanking")
     @Operation(summary = "涓嶅悎鏍间骇鍝佹帓鍚�")
-    public AjaxResult unqualifiedProductRanking(){
+    public R unqualifiedProductRanking(){
         List<UnqualifiedProductRankDto> list = homeService.unqualifiedProductRanking();
-        return AjaxResult.success(list);
+        return R.ok(list);
     }
 
     @GetMapping("/unqualifiedProductProcessingAnalysis")
     @Operation(summary = "涓嶅悎鏍兼鍝佸鐞嗗垎鏋�")
-    public AjaxResult unqualifiedProductProcessingAnalysis(){
+    public R unqualifiedProductProcessingAnalysis(){
         List<MapDto> list = homeService.unqualifiedProductProcessingAnalysis();
-        return AjaxResult.success(list);
+        return R.ok(list);
     }
 
     @GetMapping("/qualityStatistics")
     @Log(title = "璐ㄩ噺鍒嗘瀽", businessType = BusinessType.OTHER)
     @Operation(summary = "璐ㄩ噺鍒嗘瀽")
-    public AjaxResult qualityStatistics(QualityStatisticsDto req) {
+    public R qualityStatistics(QualityStatisticsDto req) {
         QualityStatisticsDto qualityStatisticsDto = homeService.qualityStatistics();
-        return AjaxResult.success(qualityStatisticsDto);
+        return R.ok(qualityStatisticsDto);
     }
 
     @GetMapping("/qualityInspectionStatistics")
     @Operation(summary = "璐ㄩ噺缁熻")
-    public AjaxResult qualityInspectionStatistics(@DefaultType Integer type) {
+    public R qualityInspectionStatistics(@DefaultType Integer type) {
        QualityStatisticsDto  dto = homeService.qualityInspectionStatistics(type);
-        return AjaxResult.success(dto);
+        return R.ok(dto);
     }
 
     /********************************************************璐㈠姟绫�*****************************************************/
     @GetMapping("/incomeExpenseAnalysis")
     @Operation(summary = "鏀敹瀵规瘮鍒嗘瀽")
-    public AjaxResult incomeExpenseAnalysis(@DefaultType Integer type) {
+    public R incomeExpenseAnalysis(@DefaultType Integer type) {
         List<Map<String, Object>> result = homeService.incomeExpenseAnalysis(type);
-        return AjaxResult.success(result);
+        return R.ok(result);
     }
 
     @GetMapping("/profitTrendAnalysis")
     @Operation(summary = "鍒╂鼎瓒嬪娍鍒嗘瀽")
-    public AjaxResult profitTrendAnalysis(){
+    public R profitTrendAnalysis(){
         List<MapDto> list = homeService.profitTrendAnalysis();
-        return AjaxResult.success(list);
+        return R.ok(list);
     }
 
     @GetMapping("/expenseCompositionAnalysis")
     @Operation(summary = "鏋勬垚鍒嗘瀽")
-    public AjaxResult expenseCompositionAnalysis(@DefaultType Integer type) {
+    public R expenseCompositionAnalysis(@DefaultType Integer type) {
         List<MapDto> list = homeService.expenseCompositionAnalysis(type);
-        return AjaxResult.success(list);
+        return R.ok(list);
     }
 
     @GetMapping("/monthlyIncome")
     @Operation(summary = "鏈堝害鏀跺叆")
-    public AjaxResult monthlyIncome(){
+    public R monthlyIncome(){
         MonthlyIncomeDto dto = homeService.monthlyIncome();
-        return AjaxResult.success(dto);
+        return R.ok(dto);
     }
 
     @GetMapping("/monthlyExpenditure")
     @Operation(summary = "鏈堝害鏀嚭")
-    public AjaxResult monthlyExpenditure(){
+    public R monthlyExpenditure(){
         MonthlyExpenditureDto dto = homeService.monthlyExpenditure();
-        return AjaxResult.success(dto);
+        return R.ok(dto);
     }
 
     @GetMapping("/statisticsReceivablePayable")
     @Log(title = "搴旀敹搴斾粯缁熻", businessType = BusinessType.OTHER)
     @Operation(summary = "搴旀敹搴斾粯缁熻")
-    public AjaxResult statisticsReceivablePayable(StatisticsReceivablePayableDto req, @DefaultType Integer type ) {
+    public R statisticsReceivablePayable(StatisticsReceivablePayableDto req, @DefaultType Integer type ) {
         StatisticsReceivablePayableDto statisticsReceivablePayable = homeService.statisticsReceivablePayable(type);
-        return AjaxResult.success(statisticsReceivablePayable);
+        return R.ok(statisticsReceivablePayable);
     }
 
     /********************************************************浠撳偍绫�*****************************************************/
 
     @GetMapping("/productCategoryDistribution")
     @Operation(summary = "浜у搧澶х被鍒嗗竷")
-    public AjaxResult productCategoryDistribution() {
+    public R productCategoryDistribution() {
         ProductCategoryDistributionDto dto = homeService.productCategoryDistribution();
-        return AjaxResult.success(dto);
+        return R.ok(dto);
     }
 
     @GetMapping("/salesPurchaseStorageProductCount")
     @Operation(summary = "閿�鍞�-閲囪喘-鍌ㄥ瓨浜у搧鏁�")
-    public AjaxResult salesPurchaseStorageProductCount(){
+    public R salesPurchaseStorageProductCount(){
         List<MapDto> list = homeService.salesPurchaseStorageProductCount();
-        return AjaxResult.success(list);
+        return R.ok(list);
     }
 
     @GetMapping("/productInOutAnalysis")
     @Operation(summary = "浜у搧鍑哄叆搴撳垎鏋�")
-    public AjaxResult productInOutAnalysis(@DefaultType Integer type){
+    public R productInOutAnalysis(@DefaultType Integer type){
         List<Map<String, Object>> result = homeService.productInOutAnalysis(type);
-        return AjaxResult.success(result);
+        return R.ok(result);
     }
 
     @GetMapping("/productTurnoverDays")
     @Operation(summary = "浜у搧鍛ㄨ浆澶╂暟")
-    public AjaxResult productTurnoverDays(){
+    public R productTurnoverDays(){
         List<MapDto> list = homeService.productTurnoverDays();
-        return AjaxResult.success(list);
+        return R.ok(list);
     }
 
 }

--
Gitblit v1.9.3