代码优化
This commit is contained in:
@@ -2,7 +2,10 @@ package com.rj.controller;
|
||||
|
||||
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
import com.rj.common.DataEnrichmentUtil;
|
||||
import com.rj.entity.CustomerManagement;
|
||||
import com.rj.entity.DeviceManagement;
|
||||
import com.rj.entity.SalesManagement;
|
||||
import com.rj.service.IDeviceManagementService;
|
||||
import io.swagger.v3.oas.annotations.Operation;
|
||||
import io.swagger.v3.oas.annotations.Parameter;
|
||||
@@ -115,6 +118,8 @@ public class DeviceManagementController {
|
||||
}
|
||||
}
|
||||
|
||||
@Autowired
|
||||
private DataEnrichmentUtil dataEnrichmentUtil;
|
||||
/**
|
||||
* 分页查询设备列表
|
||||
*/
|
||||
@@ -156,7 +161,23 @@ public class DeviceManagementController {
|
||||
queryWrapper.orderByDesc(DeviceManagement::getUpdateTime);
|
||||
|
||||
Page<DeviceManagement> devicePage = deviceManagementService.page(page, queryWrapper);
|
||||
|
||||
|
||||
// 使用工具类提取ID列表
|
||||
List<String> dealershipIds = DataEnrichmentUtil.extractIds(devicePage.getRecords(), DeviceManagement::getDealershipId);
|
||||
List<String> projectIds = DataEnrichmentUtil.extractIds(devicePage.getRecords(), DeviceManagement::getProjectId);
|
||||
List<String> saleIds = DataEnrichmentUtil.extractIds(devicePage.getRecords(), DeviceManagement::getBindUserId);
|
||||
|
||||
// 使用工具类批量获取关联数据
|
||||
Map<String, String> saleNameMap = dataEnrichmentUtil.getSalesIdNameMap(saleIds);
|
||||
Map<String, String> dealershipNameMap = dataEnrichmentUtil.getDealershipIdNameMap(dealershipIds);
|
||||
Map<String, String> projectNameMap = dataEnrichmentUtil.getProjectIdNameMap(projectIds);
|
||||
|
||||
for (DeviceManagement deviceManagement : devicePage.getRecords()) {
|
||||
deviceManagement.setDealershipName(dealershipNameMap.get(deviceManagement.getDealershipId()));
|
||||
deviceManagement.setProjectName(projectNameMap.get(deviceManagement.getProjectId()));
|
||||
deviceManagement.setBindUserName(saleNameMap.get(deviceManagement.getBindUserId()));
|
||||
}
|
||||
|
||||
result.put("success", true);
|
||||
result.put("message", "查询成功");
|
||||
result.put("data", devicePage.getRecords());
|
||||
|
||||
Reference in New Issue
Block a user