From 0d7d874912d0147376826b55667a1deb6547ed91 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期四, 21 五月 2026 15:25:27 +0800
Subject: [PATCH] Merge branch 'dev_New_pro' into dev_宁夏_英泽防锈

---
 src/main/java/com/ruoyi/quality/controller/QualityReportController.java |   54 +++++++++++++++++++++++++++++++-----------------------
 1 files changed, 31 insertions(+), 23 deletions(-)

diff --git a/src/main/java/com/ruoyi/quality/controller/QualityReportController.java b/src/main/java/com/ruoyi/quality/controller/QualityReportController.java
index 228a6e2..370e8f0 100644
--- a/src/main/java/com/ruoyi/quality/controller/QualityReportController.java
+++ b/src/main/java/com/ruoyi/quality/controller/QualityReportController.java
@@ -1,10 +1,12 @@
 package com.ruoyi.quality.controller;
 
-import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.framework.aspectj.lang.annotation.Log;
+import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
+import com.ruoyi.framework.web.domain.R;
 import com.ruoyi.quality.service.QualityReportService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiModelProperty;
-import io.swagger.annotations.ApiOperation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import io.swagger.v3.oas.annotations.media.Schema;
+import io.swagger.v3.oas.annotations.Operation;
 import lombok.AllArgsConstructor;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -17,7 +19,7 @@
  * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
  * @since 2026-01-14 03:39:49
  */
-@Api(tags = "璐ㄩ噺绠＄悊")
+@Tag(name = "璐ㄩ噺绠＄悊")
 @RestController
 @RequestMapping("/qualityReport")
 @AllArgsConstructor
@@ -28,55 +30,61 @@
     /**
      * 鑾峰彇妫�楠岀粺璁℃暟鎹�
      */
-    @ApiOperation("鑾峰彇妫�楠岀粺璁℃暟鎹�")
+    @Operation(summary = "鑾峰彇妫�楠岀粺璁℃暟鎹�")
     @GetMapping("/getInspectStatistics")
-    public AjaxResult getInspectStatistics() {
-        return AjaxResult.success(qualityReportService.getInspectStatistics());
+    @Log(title = "鑾峰彇妫�楠岀粺璁℃暟鎹�", businessType = BusinessType.OTHER)
+    public R<?> getInspectStatistics() {
+        return R.ok(qualityReportService.getInspectStatistics());
     }
 
     /**
      * 鑾峰彇鍚堟牸鐜囩粺璁℃暟鎹�
      */
-    @ApiOperation("鑾峰彇鍚堟牸鐜囩粺璁℃暟鎹�")
+    @Operation(summary = "鑾峰彇鍚堟牸鐜囩粺璁℃暟鎹�")
     @GetMapping("/getPassRateStatistics")
-    public AjaxResult getPassRateStatistics() {
-        return AjaxResult.success(qualityReportService.getPassRateStatistics());
+    @Log(title = "鑾峰彇鍚堟牸鐜囩粺璁℃暟鎹�", businessType = BusinessType.OTHER)
+    public R<?> getPassRateStatistics() {
+        return R.ok(qualityReportService.getPassRateStatistics());
     }
 
     /**
      * 鑾峰彇鏈堝害鍚堟牸鐜囩粺璁℃暟鎹�
      */
-    @ApiOperation("鑾峰彇鏈堝害鍚堟牸鐜囩粺璁℃暟鎹�")
+    @Operation(summary = "鑾峰彇鏈堝害鍚堟牸鐜囩粺璁℃暟鎹�")
     @GetMapping("/getMonthlyPassRateStatistics")
-    public AjaxResult getMonthlyPassRateStatistics(@RequestParam("year") String year) {
-        return AjaxResult.success(qualityReportService.getMonthlyPassRateStatistics(year));
+    @Log(title = "鑾峰彇鏈堝害鍚堟牸鐜囩粺璁℃暟鎹�", businessType = BusinessType.OTHER)
+    public R<?> getMonthlyPassRateStatistics(@RequestParam("year") String year) {
+        return R.ok(qualityReportService.getMonthlyPassRateStatistics(year));
     }
 
     /**
      * 鑾峰彇骞村害鎬诲悎鏍肩巼缁熻鏁版嵁
      */
-    @ApiOperation("鑾峰彇骞村害鎬诲悎鏍肩巼缁熻鏁版嵁")
+    @Operation(summary = "鑾峰彇骞村害鎬诲悎鏍肩巼缁熻鏁版嵁")
     @GetMapping("/getYearlyPassRateStatistics")
-    public AjaxResult getYearlyPassRateStatistics(@RequestParam("year") String year) {
-        return AjaxResult.success(qualityReportService.getYearlyPassRateStatistics(year));
+    @Log(title = "鑾峰彇骞村害鎬诲悎鏍肩巼缁熻鏁版嵁", businessType = BusinessType.OTHER)
+    public R<?> getYearlyPassRateStatistics(@RequestParam("year") String year) {
+        return R.ok(qualityReportService.getYearlyPassRateStatistics(year));
     }
 
     /**
      * 鑾峰彇鏈堝害瀹屾垚鏄庣粏鏁版嵁
      */
-    @ApiOperation("鑾峰彇鏈堝害瀹屾垚鏄庣粏鏁版嵁")
+    @Operation(summary = "鑾峰彇鏈堝害瀹屾垚鏄庣粏鏁版嵁")
     @GetMapping("/getMonthlyCompletionDetails")
-    public AjaxResult getMonthlyCompletionDetails(@RequestParam("year") String year) {
-        return AjaxResult.success(qualityReportService.getMonthlyCompletionDetails(year));
+    @Log(title = "鑾峰彇鏈堝害瀹屾垚鏄庣粏鏁版嵁", businessType = BusinessType.OTHER)
+    public R<?> getMonthlyCompletionDetails(@RequestParam("year") String year) {
+        return R.ok(qualityReportService.getMonthlyCompletionDetails(year));
     }
 
     /**
      * 鑾峰彇鐑偣妫�娴嬫寚鏍囩粺璁�
      */
-    @ApiOperation("鑾峰彇鐑偣妫�娴嬫寚鏍囩粺璁�")
+    @Operation(summary = "鑾峰彇鐑偣妫�娴嬫寚鏍囩粺璁�")
     @GetMapping("/getTopParameters")
-    public AjaxResult getTopParameters(@RequestParam("modelType") Integer modelType) {
-        return AjaxResult.success(qualityReportService.getTopParameters(modelType));
+    @Log(title = "鑾峰彇鐑偣妫�娴嬫寚鏍囩粺璁�", businessType = BusinessType.OTHER)
+    public R<?> getTopParameters(@RequestParam("modelType") Integer modelType) {
+        return R.ok(qualityReportService.getTopParameters(modelType));
     }
 
 }

--
Gitblit v1.9.3