无关风月
2025-04-27 008db77fd439915711b1916efd3c2789fcd96cd2
大屏接口
1个文件已修改
2个文件已添加
101 ■■■■■ 已修改文件
ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/large/AnalysisOrderDataController.java 62 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/vo/SiteLargeeVO.java 21 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/vo/WorkersLargeeVO.java 18 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/large/AnalysisOrderDataController.java
@@ -9,12 +9,16 @@
import cn.hutool.core.io.resource.ClassPathResource;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.admin.entity.MasterWorker;
import com.ruoyi.admin.large.model.AnalysisOrderData;
import com.ruoyi.admin.large.model.query.OrderDataQuery;
import com.ruoyi.admin.large.service.AnalysisOrderDataService;
import com.ruoyi.admin.service.MasterWorkerService;
import com.ruoyi.admin.service.SysUserService;
import com.ruoyi.admin.utils.ImportExcelUtil;
import com.ruoyi.admin.utils.WebUtils;
import com.ruoyi.admin.vo.SiteLargeeVO;
import com.ruoyi.admin.vo.WorkersLargeeVO;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.utils.StringUtils;
import com.ruoyi.common.security.service.TokenService;
@@ -36,6 +40,7 @@
import java.net.URLEncoder;
import java.text.SimpleDateFormat;
import java.util.*;
import java.util.stream.Collectors;
/**
 * <p>
@@ -53,16 +58,71 @@
    private final TokenService tokenService;
    private final SysUserService sysUserService;
    private final OrderClient orderClient;
    private final MasterWorkerService masterWorkerService;
    @Autowired
    public AnalysisOrderDataController(AnalysisOrderDataService analysisOrderDataService, TokenService tokenService, SysUserService sysUserService, OrderClient orderClient) {
    public AnalysisOrderDataController(AnalysisOrderDataService analysisOrderDataService, TokenService tokenService, SysUserService sysUserService, OrderClient orderClient,MasterWorkerService masterWorkerService) {
        this.analysisOrderDataService = analysisOrderDataService;
        this.tokenService = tokenService;
        this.sysUserService = sysUserService;
        this.orderClient = orderClient;
        this.masterWorkerService = masterWorkerService;
    }
    /**
     * 大屏-站点分布
     */
    @ApiOperation( value = "大屏-站点分布")
    @GetMapping(value = "/listSiteLarge")
    public R<SiteLargeeVO> listSiteLarge() {
        SiteLargeeVO siteLargeeVO = new SiteLargeeVO();
        // 回收订单数量
        Map<String, Integer> orderMap = new HashMap<>();
        // 回收人员数量
        Map<String, Integer> userMap = new HashMap<>();
        // 根据city为键,值为对应city的订单数量
        List<AnalysisOrderData> list1 = analysisOrderDataService.list();
        for (AnalysisOrderData analysisOrderData : list1) {
            if (orderMap.containsKey(analysisOrderData.getCity())) {
                orderMap.put(analysisOrderData.getCity(), orderMap.get(analysisOrderData.getCity()) + 1);
            } else {
                orderMap.put(analysisOrderData.getCity(), 1);
            }
            if (userMap.containsKey(analysisOrderData.getCity())) {
                userMap.put(analysisOrderData.getCity(), userMap.get(analysisOrderData.getCity()) + 1);
            } else {
                userMap.put(analysisOrderData.getCity(), 1);
            }
        }
        siteLargeeVO.setOrderMap(orderMap);
        siteLargeeVO.setUserMap(userMap);
        return R.ok(siteLargeeVO);
    }
    /**
     * 大屏-师傅定位分布
     */
    @ApiOperation( value = "大屏-师傅定位分布")
    @GetMapping(value = "/listWorkersLarge")
    public R<WorkersLargeeVO> listWorkersLarge() {
        WorkersLargeeVO siteLargeeVO = new WorkersLargeeVO();
        // 查询师傅经纬度
        List<MasterWorker> list = masterWorkerService.lambdaQuery().isNotNull(MasterWorker::getWorkerLat).isNotNull(MasterWorker::getWorkerLon)
                .list();
        siteLargeeVO.setWorkers(list);
        // 师傅数量
        Map<String, Integer> userMap = new HashMap<>();
        for (MasterWorker masterWorker : list) {
            if (userMap.containsKey(masterWorker.getCity())) {
                userMap.put(masterWorker.getCity(), userMap.get(masterWorker.getCity()) + 1);
            } else {
                userMap.put(masterWorker.getCity(), 1);
            }
        }
//        siteLargeeVO.setSiteMap();
        siteLargeeVO.setUserMap(userMap);
        return R.ok(siteLargeeVO);
    }
    /**
     * 查询上门回收订单列表
     */
    @ApiOperation( value = "查询上门回收订单列表")
ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/vo/SiteLargeeVO.java
New file
@@ -0,0 +1,21 @@
package com.ruoyi.admin.vo;
import com.ruoyi.admin.entity.Franchisee;
import com.ruoyi.admin.entity.Region;
import com.ruoyi.admin.entity.Site;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.List;
import java.util.Map;
@Data
@ApiModel("大屏-站点分布返回VO")
public class SiteLargeeVO {
    @ApiModelProperty("订单数据")
    private Map<String, Integer> orderMap;
    @ApiModelProperty("人员数据")
    private Map<String, Integer> userMap;
}
ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/vo/WorkersLargeeVO.java
New file
@@ -0,0 +1,18 @@
package com.ruoyi.admin.vo;
import com.ruoyi.admin.entity.MasterWorker;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.List;
import java.util.Map;
@Data
@ApiModel("大屏-师傅定位点分布返回VO")
public class WorkersLargeeVO {
    @ApiModelProperty("师傅数据")
    private Map<String, Integer> userMap;
    @ApiModelProperty("师傅经纬度")
    private List<MasterWorker> workers;
}