Merge remote-tracking branch 'origin/dev' into dev

无关风月

2025-04-23 ccbfaf4700422eda488f5807ee9a0f3ce3a94b2c

 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 = "添加回收数据分析")