From 5cd4558fb1a7178653d77e1a982e6f26d06b5db5 Mon Sep 17 00:00:00 2001
From: Lius <Lius2225@163.com>
Date: 星期一, 31 三月 2025 17:39:00 +0800
Subject: [PATCH] 中心综合利用率趋势接口

---
 lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcEfficiencyReportController.java |   72 ++++++++++++++++++-----------------
 1 files changed, 37 insertions(+), 35 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 1e1fa15..60d2f43 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;
@@ -13,7 +12,6 @@
 import org.jeecg.modules.mdc.vo.*;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
@@ -34,7 +32,7 @@
 
     @ApiOperation(value = "璁惧鏁堢巼鎶ヨ〃-鍒╃敤鐜囧垪琛ㄦ煡璇�", notes = "璁惧鏁堢巼鎶ヨ〃-鍒╃敤鐜囧垪琛ㄦ煡璇�")
     @GetMapping("/efficiencyList")
-    public Result efficiencyList(MdcEfficiencyReportQueryVo vo) {
+    public Result<?> efficiencyList(MdcEfficiencyReportQueryVo vo) {
         LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
         String userId = user.getId();
         MdcEfficiencyVo result = mdcEfficiencyReportService.efficiencyList(userId, vo);
@@ -43,7 +41,7 @@
 
     @ApiOperation(value = "璁惧鏁堢巼鎶ヨ〃-寮�鍔ㄧ巼鍒楄〃鏌ヨ", notes = "璁惧鏁堢巼鎶ヨ〃-寮�鍔ㄧ巼鍒楄〃鏌ヨ")
     @GetMapping("/efficiencyPOList")
-    public Result efficiencyPOList(MdcEfficiencyReportQueryVo vo) {
+    public Result<?> efficiencyPOList(MdcEfficiencyReportQueryVo vo) {
         LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
         String userId = user.getId();
         MdcEfficiencyVo result = mdcEfficiencyReportService.efficiencyPOList(userId, vo);
@@ -52,7 +50,7 @@
 
     @ApiOperation(value = "璁惧鏁堢巼鎶ヨ〃-鐝鍒╃敤鐜囧垪琛ㄦ煡璇�", notes = "璁惧鏁堢巼鎶ヨ〃-鐝鍒╃敤鐜囧垪琛ㄦ煡璇�")
     @GetMapping("/efficiencyShiftList")
-    public Result efficiencyShiftList(MdcEfficiencyReportShiftQueryVo vo) {
+    public Result<?> efficiencyShiftList(MdcEfficiencyReportShiftQueryVo vo) {
         LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
         String userId = user.getId();
         MdcEfficiencyShiftVo result = mdcEfficiencyReportService.efficiencyShiftList(userId, vo);
@@ -61,7 +59,7 @@
 
     @ApiOperation(value = "璁惧鏁堢巼鎶ヨ〃-缁熻鍒嗘瀽鍒楄〃", notes = "璁惧鏁堢巼鎶ヨ〃-缁熻鍒嗘瀽鍒楄〃")
     @GetMapping("/dayStatisticalRate")
-    public Result dayStatisticalRate(MdcEfficiencyReportQueryVo vo) {
+    public Result<?> dayStatisticalRate(MdcEfficiencyReportQueryVo vo) {
         LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
         String userId = user.getId();
         StatisticalAnalysisVo result = mdcEfficiencyReportService.dayStatisticalRate(userId, vo);
@@ -70,7 +68,7 @@
 
     @ApiOperation(value = "璁惧鏁堢巼鎶ヨ〃-瀵规瘮鍒嗘瀽", notes = "璁惧鏁堢巼鎶ヨ〃-瀵规瘮鍒嗘瀽")
     @GetMapping("/comparativeAnalysis")
-    public Result comparativeAnalysis(ComparativeAnalysisQueryVo vo) {
+    public Result<?> comparativeAnalysis(ComparativeAnalysisQueryVo vo) {
         LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
         String userId = user.getId();
         ComparativeAnalysisDto result = mdcEfficiencyReportService.comparativeAnalysis(userId, vo);
@@ -79,7 +77,7 @@
 
     @ApiOperation(value = "璁惧鏁堢巼鎶ヨ〃-璁惧鏃ュ埄鐢ㄧ巼", notes = "璁惧鏁堢巼鎶ヨ〃-璁惧鏃ュ埄鐢ㄧ巼")
     @GetMapping("/dayUtilizationRate")
-    public Result dayUtilizationRate(DayUtilizationRateQueryVo vo) {
+    public Result<?> dayUtilizationRate(DayUtilizationRateQueryVo vo) {
         LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
         String userId = user.getId();
         DayUtilizationRateDto result = mdcEfficiencyReportService.dayUtilizationRate(userId, vo);
@@ -88,7 +86,7 @@
 
     @ApiOperation(value = "璁惧鏁堢巼鎶ヨ〃-璁惧鏃ュ埄鐢ㄧ巼瀵规瘮", notes = "璁惧鏁堢巼鎶ヨ〃-璁惧鏃ュ埄鐢ㄧ巼瀵规瘮")
     @GetMapping("/dayUtilizationRateContrast")
-    public Result dayUtilizationRateContrast(DayUtilizationRateContrastQueryVo vo) {
+    public Result<?> dayUtilizationRateContrast(DayUtilizationRateContrastQueryVo vo) {
         LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
         String userId = user.getId();
         DayUtilizationRateDto result = mdcEfficiencyReportService.dayUtilizationRateContrast(userId, vo);
@@ -97,7 +95,7 @@
 
     @ApiOperation(value = "璁惧鏁堢巼鎶ヨ〃-鍒╃敤鐜囪蛋鍔垮垎鏋愬垪琛�", notes = "璁惧鏁堢巼鎶ヨ〃-鍒╃敤鐜囪蛋鍔垮垎鏋愬垪琛�")
     @GetMapping("/utilizationRateTrendAnalyze")
-    public Result utilizationRateTrendAnalyze(DayUtilizationRateContrastQueryVo vo) {
+    public Result<?> utilizationRateTrendAnalyze(DayUtilizationRateContrastQueryVo vo) {
         LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
         String userId = user.getId();
         MdcUtilizationRateDto result = mdcEfficiencyReportService.utilizationRateTrendAnalyze(userId, vo);
@@ -106,42 +104,46 @@
 
     @ApiOperation(value = "璁惧鏁堢巼鎶ヨ〃-鍒╃敤鐜囧垎娈靛垎鏋愬垪琛�", notes = "璁惧鏁堢巼鎶ヨ〃-鍒╃敤鐜囧垎娈靛垎鏋愬垪琛�")
     @GetMapping("/utilizationRateSectionAnalyze")
-    public Result utilizationRateSectionAnalyze(DayUtilizationRateContrastQueryVo vo) {
+    public Result<?> utilizationRateSectionAnalyze(DayUtilizationRateContrastQueryVo vo) {
         LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
         String userId = user.getId();
         MdcUtilizationRateDto result = mdcEfficiencyReportService.utilizationRateSectionAnalyze(userId, vo);
         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("/comprehensiveRateAnalyze")
+    public Result<?> comprehensiveRateAnalyze(EquEffVo vo) {
+        LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+        String userId = user.getId();
+        Map<String, Object> result = mdcEfficiencyReportService.comprehensiveRateAnalyze(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("/teamEfficiencyAnalyzeByMonth")
+    public Result<?> teamEfficiencyAnalyzeByMonth(EquEffVo equEffVo) {
+        LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+        String userId = user.getId();
+        Map<String, Object> result = mdcEfficiencyReportService.teamEfficiencyAnalyzeByMonth(userId, equEffVo);
+        return Result.OK(result);
+    }
 
-//    @ApiOperation(value = "璁惧鏁堢巼鎶ヨ〃-閰嶉�佸皬缁勭淮搴﹀悇鐝粍鏈堣澶囧埄鐢ㄥ垎甯�", notes = "璁惧鏁堢巼鎶ヨ〃-閰嶉�佸皬缁勭淮搴﹀悇鐝粍鏈堣澶囧埄鐢ㄥ垎甯�")
-//    @GetMapping("/teamEquipmentEfficiencyAnalyze")
-//    public Result teamEquipmentEfficiencyAnalyze(TeamEquEffVo teamEquEffVo) {
-//        Map<String, Object> result = mdcEfficiencyReportService.teamEquipmentEfficiencyAnalyze(teamEquEffVo);
-//        return Result.OK(result);
-//    }
+    @ApiOperation(value = "璁惧鏁堢巼鎶ヨ〃-閰嶉�佸皬缁勭淮搴﹀悇鐝粍鏈堣澶囧埄鐢ㄥ垎甯�", notes = "璁惧鏁堢巼鎶ヨ〃-閰嶉�佸皬缁勭淮搴﹀悇鐝粍鏈堣澶囧埄鐢ㄥ垎甯�")
+    @GetMapping("/teamEquipmentEfficiencyAnalyze")
+    public Result<?> teamEquipmentEfficiencyAnalyze(EquEffVo equEffVo) {
+        LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+        String userId = user.getId();
+        Map<String, Object> result = mdcEfficiencyReportService.teamEquipmentEfficiencyAnalyze(userId, equEffVo);
+        return Result.OK(result);
+    }
 
     @ApiOperation(value = "璁惧鏁堢巼鎶ヨ〃-璁惧缁村害鍚勭彮缁勬湀璁惧鍒╃敤鍒嗗竷", notes = "璁惧鏁堢巼鎶ヨ〃-璁惧缁村害鍚勭彮缁勬湀璁惧鍒╃敤鍒嗗竷")
     @GetMapping("/equipmentEfficiencyAnalyze")
-    public Result<?> equipmentEfficiencyAnalyze(TeamEquEffVo teamEquEffVo) {
-        Map<String, Object> result = mdcEfficiencyReportService.teamEquipmentEfficiencyAnalyze(teamEquEffVo);
+    public Result<?> equipmentEfficiencyAnalyze(EquEffVo equEffVo) {
+        LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+        String userId = user.getId();
+        Map<String, Object> result = mdcEfficiencyReportService.equipmentEfficiencyAnalyze(userId, equEffVo);
         return Result.OK(result);
     }
 

--
Gitblit v1.9.3