From 32be453ce79ce4e9efbeb3ab4ef6db501a6f0230 Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期一, 31 三月 2025 09:19:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcEfficiencyReportController.java | 43 +++++++++++++++++++++++++++++++++----------
1 files changed, 33 insertions(+), 10 deletions(-)
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcEfficiencyReportController.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcEfficiencyReportController.java
index 96ef9b8..5b0b596 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcEfficiencyReportController.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcEfficiencyReportController.java
@@ -5,7 +5,6 @@
import lombok.extern.slf4j.Slf4j;
import org.apache.shiro.SecurityUtils;
import org.jeecg.common.api.vo.Result;
-import org.jeecg.common.aspect.annotation.AutoLog;
import org.jeecg.common.system.vo.LoginUser;
import org.jeecg.modules.mdc.dto.ComparativeAnalysisDto;
import org.jeecg.modules.mdc.dto.DayUtilizationRateDto;
@@ -16,6 +15,7 @@
import org.springframework.web.bind.annotation.RestController;
import javax.annotation.Resource;
+import java.util.Map;
/**
* @author: LiuS
@@ -30,7 +30,6 @@
@Resource
private MdcEfficiencyReportService mdcEfficiencyReportService;
- @AutoLog(value = "璁惧鏁堢巼鎶ヨ〃-鍒╃敤鐜囧垪琛ㄦ煡璇�")
@ApiOperation(value = "璁惧鏁堢巼鎶ヨ〃-鍒╃敤鐜囧垪琛ㄦ煡璇�", notes = "璁惧鏁堢巼鎶ヨ〃-鍒╃敤鐜囧垪琛ㄦ煡璇�")
@GetMapping("/efficiencyList")
public Result efficiencyList(MdcEfficiencyReportQueryVo vo) {
@@ -40,7 +39,6 @@
return Result.OK(result);
}
- @AutoLog(value = "璁惧鏁堢巼鎶ヨ〃-寮�鍔ㄧ巼鍒楄〃鏌ヨ")
@ApiOperation(value = "璁惧鏁堢巼鎶ヨ〃-寮�鍔ㄧ巼鍒楄〃鏌ヨ", notes = "璁惧鏁堢巼鎶ヨ〃-寮�鍔ㄧ巼鍒楄〃鏌ヨ")
@GetMapping("/efficiencyPOList")
public Result efficiencyPOList(MdcEfficiencyReportQueryVo vo) {
@@ -50,7 +48,6 @@
return Result.OK(result);
}
- @AutoLog(value = "璁惧鏁堢巼鎶ヨ〃-鐝鍒╃敤鐜囧垪琛ㄦ煡璇�")
@ApiOperation(value = "璁惧鏁堢巼鎶ヨ〃-鐝鍒╃敤鐜囧垪琛ㄦ煡璇�", notes = "璁惧鏁堢巼鎶ヨ〃-鐝鍒╃敤鐜囧垪琛ㄦ煡璇�")
@GetMapping("/efficiencyShiftList")
public Result efficiencyShiftList(MdcEfficiencyReportShiftQueryVo vo) {
@@ -60,7 +57,6 @@
return Result.OK(result);
}
- @AutoLog(value = "璁惧鏁堢巼鎶ヨ〃-缁熻鍒嗘瀽鍒楄〃")
@ApiOperation(value = "璁惧鏁堢巼鎶ヨ〃-缁熻鍒嗘瀽鍒楄〃", notes = "璁惧鏁堢巼鎶ヨ〃-缁熻鍒嗘瀽鍒楄〃")
@GetMapping("/dayStatisticalRate")
public Result dayStatisticalRate(MdcEfficiencyReportQueryVo vo) {
@@ -70,7 +66,6 @@
return Result.OK(result);
}
- @AutoLog(value = "璁惧鏁堢巼鎶ヨ〃-瀵规瘮鍒嗘瀽")
@ApiOperation(value = "璁惧鏁堢巼鎶ヨ〃-瀵规瘮鍒嗘瀽", notes = "璁惧鏁堢巼鎶ヨ〃-瀵规瘮鍒嗘瀽")
@GetMapping("/comparativeAnalysis")
public Result comparativeAnalysis(ComparativeAnalysisQueryVo vo) {
@@ -80,7 +75,6 @@
return Result.OK(result);
}
- @AutoLog(value = "璁惧鏁堢巼鎶ヨ〃-璁惧鏃ュ埄鐢ㄧ巼")
@ApiOperation(value = "璁惧鏁堢巼鎶ヨ〃-璁惧鏃ュ埄鐢ㄧ巼", notes = "璁惧鏁堢巼鎶ヨ〃-璁惧鏃ュ埄鐢ㄧ巼")
@GetMapping("/dayUtilizationRate")
public Result dayUtilizationRate(DayUtilizationRateQueryVo vo) {
@@ -90,7 +84,6 @@
return Result.OK(result);
}
- @AutoLog(value = "璁惧鏁堢巼鎶ヨ〃-璁惧鏃ュ埄鐢ㄧ巼瀵规瘮")
@ApiOperation(value = "璁惧鏁堢巼鎶ヨ〃-璁惧鏃ュ埄鐢ㄧ巼瀵规瘮", notes = "璁惧鏁堢巼鎶ヨ〃-璁惧鏃ュ埄鐢ㄧ巼瀵规瘮")
@GetMapping("/dayUtilizationRateContrast")
public Result dayUtilizationRateContrast(DayUtilizationRateContrastQueryVo vo) {
@@ -100,7 +93,6 @@
return Result.OK(result);
}
- @AutoLog(value = "璁惧鏁堢巼鎶ヨ〃-鍒╃敤鐜囪蛋鍔垮垎鏋愬垪琛�")
@ApiOperation(value = "璁惧鏁堢巼鎶ヨ〃-鍒╃敤鐜囪蛋鍔垮垎鏋愬垪琛�", notes = "璁惧鏁堢巼鎶ヨ〃-鍒╃敤鐜囪蛋鍔垮垎鏋愬垪琛�")
@GetMapping("/utilizationRateTrendAnalyze")
public Result utilizationRateTrendAnalyze(DayUtilizationRateContrastQueryVo vo) {
@@ -110,7 +102,6 @@
return Result.OK(result);
}
- @AutoLog(value = "璁惧鏁堢巼鎶ヨ〃-鍒╃敤鐜囧垎娈靛垎鏋愬垪琛�")
@ApiOperation(value = "璁惧鏁堢巼鎶ヨ〃-鍒╃敤鐜囧垎娈靛垎鏋愬垪琛�", notes = "璁惧鏁堢巼鎶ヨ〃-鍒╃敤鐜囧垎娈靛垎鏋愬垪琛�")
@GetMapping("/utilizationRateSectionAnalyze")
public Result utilizationRateSectionAnalyze(DayUtilizationRateContrastQueryVo vo) {
@@ -120,4 +111,36 @@
return Result.OK(result);
}
+// @ApiOperation(value = "璁惧鏁堢巼鎶ヨ〃-缁煎悎鍒╃敤鐜囩粺璁″垎鏋�", notes = "璁惧鏁堢巼鎶ヨ〃-缁煎悎鍒╃敤鐜囩粺璁″垎鏋�")
+// @GetMapping("/comprehensiveRayeAnalyze")
+// public Result comprehensiveRayeAnalyze(DayUtilizationRateContrastQueryVo vo) {
+// LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+// String userId = user.getId();
+// MdcUtilizationRateDto result = mdcEfficiencyReportService.comprehensiveRayeAnalyze(userId, vo);
+// return Result.OK(result);
+// }
+
+// @ApiOperation(value = "璁惧鏁堢巼鎶ヨ〃-鐝粍缁煎悎鍒╃敤鐜囩粺璁″垎鏋�", notes = "璁惧鏁堢巼鎶ヨ〃-缁煎悎鍒╃敤鐜囩粺璁″垎鏋�")
+// @GetMapping("/teamComprehensiveRateAnalyze")
+// public Result teamComprehensiveRateAnalyze(DayUtilizationRateContrastQueryVo vo) {
+// LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+// String userId = user.getId();
+// MdcUtilizationRateDto result = mdcEfficiencyReportService.teamComprehensiveRateAnalyze(userId, vo);
+// return Result.OK(result);Equipment utilization distribution of each team
+// }
+
+ @ApiOperation(value = "璁惧鏁堢巼鎶ヨ〃-閰嶉�佸皬缁勭淮搴﹀悇鐝粍鏈堣澶囧埄鐢ㄥ垎甯�", notes = "璁惧鏁堢巼鎶ヨ〃-閰嶉�佸皬缁勭淮搴﹀悇鐝粍鏈堣澶囧埄鐢ㄥ垎甯�")
+ @GetMapping("/teamEquipmentEfficiencyAnalyze")
+ public Result<?> teamEquipmentEfficiencyAnalyze(EquEffVo equEffVo) {
+ Map<String, Object> result = mdcEfficiencyReportService.teamEquipmentEfficiencyAnalyze(equEffVo);
+ return Result.OK(result);
+ }
+
+ @ApiOperation(value = "璁惧鏁堢巼鎶ヨ〃-璁惧缁村害鍚勭彮缁勬湀璁惧鍒╃敤鍒嗗竷", notes = "璁惧鏁堢巼鎶ヨ〃-璁惧缁村害鍚勭彮缁勬湀璁惧鍒╃敤鍒嗗竷")
+ @GetMapping("/equipmentEfficiencyAnalyze")
+ public Result<?> equipmentEfficiencyAnalyze(EquEffVo equEffVo) {
+ Map<String, Object> result = mdcEfficiencyReportService.equipmentEfficiencyAnalyze(equEffVo);
+ return Result.OK(result);
+ }
+
}
--
Gitblit v1.9.3