From ccbfaf4700422eda488f5807ee9a0f3ce3a94b2c Mon Sep 17 00:00:00 2001 From: 无关风月 <443237572@qq.com> Date: 星期三, 23 四月 2025 17:26:36 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev --- ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/large/controller/AnalysisRecycleDataController.java | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/large/controller/AnalysisRecycleDataController.java b/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/large/controller/AnalysisRecycleDataController.java index a7841ea..bcfa232 100644 --- a/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/large/controller/AnalysisRecycleDataController.java +++ b/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/large/controller/AnalysisRecycleDataController.java @@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.ruoyi.admin.entity.SysUser; import com.ruoyi.admin.large.model.AnalysisRecycleData; +import com.ruoyi.admin.large.model.vo.RecycleLargeVO; import com.ruoyi.admin.large.service.AnalysisRecycleDataService; import com.ruoyi.admin.service.SysUserService; import com.ruoyi.common.core.domain.R; @@ -18,6 +19,7 @@ import java.time.LocalDateTime; import java.util.List; +import java.util.Map; import java.util.Objects; /** @@ -58,6 +60,16 @@ } /** + * 查询回收数据分析大屏 + */ + @ApiOperation( value = "查询回收数据分析-大屏") + @GetMapping(value = "/recycleLarge") + public R<Map<String,Long>> recycleLarge(@RequestParam(value = "analysisType",required = false) Integer analysisType) { + Map<String,Long> map = analysisRecycleDataService.recycleLarge(analysisType); + return R.ok(map); + } + + /** * 添加回收数据分析管理 */ @ApiOperation( value = "添加回收数据分析") -- Gitblit v1.7.1