From d2038a623e02c2d7bb6b95a908832c0432adf2f0 Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期四, 21 五月 2026 13:46:21 +0800
Subject: [PATCH] 增加日志
---
src/main/java/com/ruoyi/home/controller/HomeController.java | 78 ++++++++++++++++++++++++++++++++-------
1 files changed, 64 insertions(+), 14 deletions(-)
diff --git a/src/main/java/com/ruoyi/home/controller/HomeController.java b/src/main/java/com/ruoyi/home/controller/HomeController.java
index 54fde04..de31ac6 100644
--- a/src/main/java/com/ruoyi/home/controller/HomeController.java
+++ b/src/main/java/com/ruoyi/home/controller/HomeController.java
@@ -5,6 +5,7 @@
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.home.annotation.DefaultType;
import com.ruoyi.home.dto.*;
import com.ruoyi.home.service.HomeService;
import com.ruoyi.dto.MapDto;
@@ -43,6 +44,7 @@
@GetMapping("/approveAndDeviceTodos")
@ApiOperation("瀹℃壒鍗忓悓锛岃澶囨姤淇緟鍔炰簨椤�")
+ @Log(title = "瀹℃壒鍗忓悓锛岃澶囨姤淇緟鍔炰簨椤�", businessType = BusinessType.OTHER)
public AjaxResult approveAndDeviceTodos(){
Map<String, Object> map = homeService.approveAndDeviceTodos();
return AjaxResult.success(map);
@@ -50,6 +52,7 @@
@GetMapping("/noticesCount")
@ApiOperation("鏈繃鏈熺殑鍏憡鏁伴噺")
+ @Log(title = "鏈繃鏈熺殑鍏憡鏁伴噺", businessType = BusinessType.OTHER)
public AjaxResult noticesCount(){
Long count = homeService.noticesCount();
return AjaxResult.success(count);
@@ -57,6 +60,7 @@
@GetMapping("/deptStaffDistribution")
@ApiOperation("鍚勯儴闂ㄤ汉鍛樺垎甯�")
+ @Log(title = "鍚勯儴闂ㄤ汉鍛樺垎甯�", businessType = BusinessType.OTHER)
public AjaxResult deptStaffDistribution() {
DeptStaffDistributionDto dto = homeService.deptStaffDistribution();
return AjaxResult.success(dto);
@@ -64,6 +68,7 @@
@GetMapping("/summaryStatistics")
@ApiOperation("鍛樺伐-瀹㈡埛-渚涘簲鍟嗘�绘暟")
+ @Log(title = "鍛樺伐-瀹㈡埛-渚涘簲鍟嗘�绘暟", businessType = BusinessType.OTHER)
public AjaxResult summaryStatistics() {
HomeSummaryDto homeSummaryDto = homeService.summaryStatistics();
return AjaxResult.success(homeSummaryDto);
@@ -72,27 +77,31 @@
/********************************************************钀ラ攢閲囪喘绫�**************************************************/
@GetMapping("/supplierPurchaseRanking")
@ApiOperation("渚涘簲鍟嗛噰璐帓鍚�")
- public AjaxResult supplierPurchaseRanking(@RequestParam(value = "type", defaultValue = "1") Integer type) {
+ @Log(title = "渚涘簲鍟嗛噰璐帓鍚�", businessType = BusinessType.OTHER)
+ public AjaxResult supplierPurchaseRanking(@DefaultType 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 = "1") Integer type) {
+ @Log(title = "瀹㈡埛钀ユ敹璐＄尞鏁板�煎垎鏋�", businessType = BusinessType.OTHER)
+ public AjaxResult customerRevenueAnalysis(Long customerId, @DefaultType Integer type) {
CustomerRevenueAnalysisDto dto = homeService.customerRevenueAnalysis(customerId, type);
return AjaxResult.success(dto);
}
@GetMapping("/customerContributionRanking")
@ApiOperation("瀹㈡埛閲戦璐＄尞鎺掑悕")
- public AjaxResult customerContributionRanking(@RequestParam(value = "type", defaultValue = "1") Integer type) {
+ @Log(title = "瀹㈡埛閲戦璐＄尞鎺掑悕", businessType = BusinessType.OTHER)
+ public AjaxResult customerContributionRanking(@DefaultType Integer type) {
List<CustomerContributionRankingDto> list = homeService.customerContributionRanking(type);
return AjaxResult.success(list);
}
@GetMapping("/productSalesAnalysis")
@ApiOperation("鍚勪骇鍝侀攢鍞噾棰濆垎鏋�")
+ @Log(title = "鍚勪骇鍝侀攢鍞噾棰濆垎鏋�", businessType = BusinessType.OTHER)
public AjaxResult productSalesAnalysis() {
List<MapDto> list = homeService.productSalesAnalysis();
return AjaxResult.success(list);
@@ -100,6 +109,7 @@
@GetMapping("/rawMaterialPurchaseAmountRatio")
@ApiOperation("鍘熸潗鏂欓噰璐噾棰濆崰姣�")
+ @Log(title = "鍘熸潗鏂欓噰璐噾棰濆崰姣�", businessType = BusinessType.OTHER)
public AjaxResult rawMaterialPurchaseAmountRatio(){
List<MapDto> list = homeService.rawMaterialPurchaseAmountRatio();
return AjaxResult.success(list);
@@ -124,40 +134,46 @@
/********************************************************鐢熶骇绫�*****************************************************/
@GetMapping("/inputOutputAnalysis")
@ApiOperation("鎶曞叆浜у嚭鍒嗘瀽")
- public AjaxResult inputOutputAnalysis(@RequestParam(value = "type", defaultValue = "1") Integer type){
+ @Log(title = "鎶曞叆浜у嚭鍒嗘瀽", businessType = BusinessType.OTHER)
+ public AjaxResult inputOutputAnalysis(@DefaultType 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){
+ @Log(title = "宸ュ簭浜у嚭鍒嗘瀽", businessType = BusinessType.OTHER)
+ public AjaxResult processOutputAnalysis(@DefaultType 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){
+ @Log(title = "宸ュ崟鎵ц鏁堢巼鍒嗘瀽", businessType = BusinessType.OTHER)
+ public AjaxResult workOrderEfficiencyAnalysis(@DefaultType 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){
+ @Log(title = "鐢熶骇鏍哥畻鍒嗘瀽", businessType = BusinessType.OTHER)
+ public AjaxResult productionAccountingAnalysis(@DefaultType Integer type){
List<ProductionAccountingDto> list = homeService.productionAccountingAnalysis(type);
return AjaxResult.success(list);
}
@GetMapping("/orderCount")
@ApiOperation("璁㈠崟鏁�")
+ @Log(title = "璁㈠崟鏁�", businessType = BusinessType.OTHER)
public AjaxResult orderCount(){
return AjaxResult.success(homeService.orderCount());
}
@GetMapping("/progressStatistics")
@ApiOperation("鍚勭敓浜ц鍗曠殑瀹屾垚杩涘害缁熻")
+ @Log(title = "鍚勭敓浜ц鍗曠殑瀹屾垚杩涘害缁熻", businessType = BusinessType.OTHER)
public AjaxResult progressStatistics(){
ProductionProgressDto productionProgressDto = homeService.productionProgress();
return AjaxResult.success(productionProgressDto);
@@ -165,32 +181,45 @@
@GetMapping("/workInProcessTurnover")
@ApiOperation("鍦ㄥ埗鍝佸懆杞儏鍐�")
+ @Log(title = "鍦ㄥ埗鍝佸懆杞儏鍐�", businessType = BusinessType.OTHER)
public AjaxResult workInProcessTurnover(){
ProductionTurnoverDto productionTurnoverDto = homeService.workInProcessTurnover();
return AjaxResult.success(productionTurnoverDto);
}
+ @GetMapping("/processDataProductionStatistics")
+ @ApiOperation("宸ュ簭鏁版嵁鐢熶骇缁熻鏁版嵁")
+ @Log(title = "宸ュ簭鏁版嵁鐢熶骇缁熻鏁版嵁", businessType = BusinessType.OTHER)
+ public AjaxResult processDataProductionStatistics(@DefaultType Integer type,@RequestParam(required = false) List<Long> processIds) {
+ List<processDataProductionStatisticsDto> list = homeService.processDataProductionStatistics(type, processIds);
+ return AjaxResult.success(list);
+ }
+
/********************************************************璐ㄩ噺绫�*****************************************************/
@GetMapping("/rawMaterialDetection")
@ApiOperation("鍘熸潗鏂欐娴�")
- public AjaxResult rawMaterialDetection(@RequestParam(value = "type", defaultValue = "1") Integer type){
+ @Log(title = "鍘熸潗鏂欐娴�", businessType = BusinessType.OTHER)
+ public AjaxResult rawMaterialDetection(@DefaultType Integer type){
return AjaxResult.success(homeService.rawMaterialDetection(type));
}
@GetMapping("/processDetection")
@ApiOperation("杩囩▼妫�娴�")
- public AjaxResult processDetection(@RequestParam(value = "type", defaultValue = "1") Integer type){
+ @Log(title = "杩囩▼妫�娴�", businessType = BusinessType.OTHER)
+ public AjaxResult processDetection(@DefaultType Integer type){
return AjaxResult.success(homeService.processDetection(type));
}
@GetMapping("/factoryDetection")
@ApiOperation("鎴愬搧鍑哄巶妫�娴�")
- public AjaxResult factoryDetection(@RequestParam(value = "type", defaultValue = "1") Integer type){
+ @Log(title = "鎴愬搧鍑哄巶妫�娴�", businessType = BusinessType.OTHER)
+ public AjaxResult factoryDetection(@DefaultType Integer type){
return AjaxResult.success(homeService.factoryDetection(type));
}
@GetMapping("/qualityInspectionCount")
@ApiOperation("璐ㄩ噺妫�楠屾暟閲�")
+ @Log(title = "璐ㄩ噺妫�楠屾暟閲�", businessType = BusinessType.OTHER)
public AjaxResult qualityInspectionCount(){
QualityInspectionCountDto qualityInspectionCountDto = homeService.qualityInspectionCount();
return AjaxResult.success(qualityInspectionCountDto);
@@ -198,6 +227,7 @@
@GetMapping("/nonComplianceWarning")
@ApiOperation("涓嶅悎鏍奸璀�")
+ @Log(title = "涓嶅悎鏍奸璀�", businessType = BusinessType.OTHER)
public AjaxResult nonComplianceWarning(){
NonComplianceWarningDto nonComplianceWarningDto = homeService.nonComplianceWarning();
return AjaxResult.success(nonComplianceWarningDto);
@@ -205,6 +235,7 @@
@GetMapping("/completedInspectionCount")
@ApiOperation("瀹屾垚妫�楠屾暟")
+ @Log(title = "瀹屾垚妫�楠屾暟", businessType = BusinessType.OTHER)
public AjaxResult completedInspectionCount(){
List<CompletedInspectionCountDto> list = homeService.completedInspectionCount();
return AjaxResult.success(list);
@@ -212,6 +243,7 @@
@GetMapping("/unqualifiedProductRanking")
@ApiOperation("涓嶅悎鏍间骇鍝佹帓鍚�")
+ @Log(title = "涓嶅悎鏍间骇鍝佹帓鍚�", businessType = BusinessType.OTHER)
public AjaxResult unqualifiedProductRanking(){
List<UnqualifiedProductRankDto> list = homeService.unqualifiedProductRanking();
return AjaxResult.success(list);
@@ -219,6 +251,7 @@
@GetMapping("/unqualifiedProductProcessingAnalysis")
@ApiOperation("涓嶅悎鏍兼鍝佸鐞嗗垎鏋�")
+ @Log(title = "涓嶅悎鏍兼鍝佸鐞嗗垎鏋�", businessType = BusinessType.OTHER)
public AjaxResult unqualifiedProductProcessingAnalysis(){
List<MapDto> list = homeService.unqualifiedProductProcessingAnalysis();
return AjaxResult.success(list);
@@ -232,16 +265,26 @@
return AjaxResult.success(qualityStatisticsDto);
}
+ @GetMapping("/qualityInspectionStatistics")
+ @ApiOperation("璐ㄩ噺缁熻")
+ @Log(title = "璐ㄩ噺缁熻", businessType = BusinessType.OTHER)
+ public AjaxResult qualityInspectionStatistics(@DefaultType Integer type) {
+ QualityStatisticsDto dto = homeService.qualityInspectionStatistics(type);
+ return AjaxResult.success(dto);
+ }
+
/********************************************************璐㈠姟绫�*****************************************************/
@GetMapping("/incomeExpenseAnalysis")
@ApiOperation("鏀敹瀵规瘮鍒嗘瀽")
- public AjaxResult incomeExpenseAnalysis(@RequestParam(value = "type", defaultValue = "1") Integer type) {
+ @Log(title = "鏀敹瀵规瘮鍒嗘瀽", businessType = BusinessType.OTHER)
+ public AjaxResult incomeExpenseAnalysis(@DefaultType Integer type) {
List<Map<String, Object>> result = homeService.incomeExpenseAnalysis(type);
return AjaxResult.success(result);
}
@GetMapping("/profitTrendAnalysis")
@ApiOperation("鍒╂鼎瓒嬪娍鍒嗘瀽")
+ @Log(title = "鍒╂鼎瓒嬪娍鍒嗘瀽", businessType = BusinessType.OTHER)
public AjaxResult profitTrendAnalysis(){
List<MapDto> list = homeService.profitTrendAnalysis();
return AjaxResult.success(list);
@@ -249,13 +292,15 @@
@GetMapping("/expenseCompositionAnalysis")
@ApiOperation("鏋勬垚鍒嗘瀽")
- public AjaxResult expenseCompositionAnalysis(@RequestParam(value = "type", defaultValue = "1") Integer type) {
+ @Log(title = "鏋勬垚鍒嗘瀽", businessType = BusinessType.OTHER)
+ public AjaxResult expenseCompositionAnalysis(@DefaultType Integer type) {
List<MapDto> list = homeService.expenseCompositionAnalysis(type);
return AjaxResult.success(list);
}
@GetMapping("/monthlyIncome")
@ApiOperation("鏈堝害鏀跺叆")
+ @Log(title = "鏈堝害鏀跺叆", businessType = BusinessType.OTHER)
public AjaxResult monthlyIncome(){
MonthlyIncomeDto dto = homeService.monthlyIncome();
return AjaxResult.success(dto);
@@ -263,6 +308,7 @@
@GetMapping("/monthlyExpenditure")
@ApiOperation("鏈堝害鏀嚭")
+ @Log(title = "鏈堝害鏀嚭", businessType = BusinessType.OTHER)
public AjaxResult monthlyExpenditure(){
MonthlyExpenditureDto dto = homeService.monthlyExpenditure();
return AjaxResult.success(dto);
@@ -271,7 +317,7 @@
@GetMapping("/statisticsReceivablePayable")
@Log(title = "搴旀敹搴斾粯缁熻", businessType = BusinessType.OTHER)
@ApiOperation("搴旀敹搴斾粯缁熻")
- public AjaxResult statisticsReceivablePayable(StatisticsReceivablePayableDto req, @RequestParam(value = "type", defaultValue = "1") Integer type ) {
+ public AjaxResult statisticsReceivablePayable(StatisticsReceivablePayableDto req, @DefaultType Integer type ) {
StatisticsReceivablePayableDto statisticsReceivablePayable = homeService.statisticsReceivablePayable(type);
return AjaxResult.success(statisticsReceivablePayable);
}
@@ -280,6 +326,7 @@
@GetMapping("/productCategoryDistribution")
@ApiOperation("浜у搧澶х被鍒嗗竷")
+ @Log(title = "浜у搧澶х被鍒嗗竷", businessType = BusinessType.OTHER)
public AjaxResult productCategoryDistribution() {
ProductCategoryDistributionDto dto = homeService.productCategoryDistribution();
return AjaxResult.success(dto);
@@ -287,6 +334,7 @@
@GetMapping("/salesPurchaseStorageProductCount")
@ApiOperation("閿�鍞�-閲囪喘-鍌ㄥ瓨浜у搧鏁�")
+ @Log(title = "閿�鍞�-閲囪喘-鍌ㄥ瓨浜у搧鏁�", businessType = BusinessType.OTHER)
public AjaxResult salesPurchaseStorageProductCount(){
List<MapDto> list = homeService.salesPurchaseStorageProductCount();
return AjaxResult.success(list);
@@ -294,13 +342,15 @@
@GetMapping("/productInOutAnalysis")
@ApiOperation("浜у搧鍑哄叆搴撳垎鏋�")
- public AjaxResult productInOutAnalysis(@RequestParam(value = "type", defaultValue = "1") Integer type){
+ @Log(title = "浜у搧鍑哄叆搴撳垎鏋�", businessType = BusinessType.OTHER)
+ public AjaxResult productInOutAnalysis(@DefaultType Integer type){
List<Map<String, Object>> result = homeService.productInOutAnalysis(type);
return AjaxResult.success(result);
}
@GetMapping("/productTurnoverDays")
@ApiOperation("浜у搧鍛ㄨ浆澶╂暟")
+ @Log(title = "浜у搧鍛ㄨ浆澶╂暟", businessType = BusinessType.OTHER)
public AjaxResult productTurnoverDays(){
List<MapDto> list = homeService.productTurnoverDays();
return AjaxResult.success(list);
--
Gitblit v1.9.3