From dc9c6c612cde7b938c6851383b9da99abab025a4 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期四, 21 五月 2026 15:02:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New_pro' into dev_New_pro
---
src/main/java/com/ruoyi/quality/controller/QualityReportController.java | 34 +++++++++++++++++++++-------------
1 files changed, 21 insertions(+), 13 deletions(-)
diff --git a/src/main/java/com/ruoyi/quality/controller/QualityReportController.java b/src/main/java/com/ruoyi/quality/controller/QualityReportController.java
index 4d005b0..370e8f0 100644
--- a/src/main/java/com/ruoyi/quality/controller/QualityReportController.java
+++ b/src/main/java/com/ruoyi/quality/controller/QualityReportController.java
@@ -1,6 +1,8 @@
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.v3.oas.annotations.tags.Tag;
import io.swagger.v3.oas.annotations.media.Schema;
@@ -30,8 +32,9 @@
*/
@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());
}
/**
@@ -39,8 +42,9 @@
*/
@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());
}
/**
@@ -48,8 +52,9 @@
*/
@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));
}
/**
@@ -57,8 +62,9 @@
*/
@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));
}
/**
@@ -66,8 +72,9 @@
*/
@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));
}
/**
@@ -75,8 +82,9 @@
*/
@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