x用户-fixedAll

This commit is contained in:
2025-09-28 16:52:35 +08:00
parent 1226992c78
commit 3d2e6d9cfd
4 changed files with 43 additions and 25 deletions

View File

@@ -24,6 +24,7 @@ import java.io.IOException;
import java.net.URLEncoder;
import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
/**
@@ -47,9 +48,12 @@ public class ChargeUserXDetailAdminController extends BaseController {
@GetMapping(value = "/list")
public BusiResult<IPage<ChargeUserXDetailVo>> listPage(Long erbanNo, String ip,
String device, Integer identity, Integer pageNo, Integer pageSize) {
String device, Integer identity, Integer pageNo, Integer pageSize, Integer partitionId) {
List<Integer> allPartitionId = adminPartitionService.getAllPartitionId(getAdminId());
IPage<ChargeUserXDetailVo> ipage = chargeUserXDetailService.listPage(allPartitionId, erbanNo, ip, device, identity, pageNo, pageSize);
if (!allPartitionId.contains(partitionId)) {
throw new AdminServiceException(5001, "无权查看该区数据权限");
}
IPage<ChargeUserXDetailVo> ipage = chargeUserXDetailService.listPage(Arrays.asList(partitionId), erbanNo, ip, device, identity, pageNo, pageSize);
return BusiResult.success(ipage);
}
@@ -84,9 +88,12 @@ public class ChargeUserXDetailAdminController extends BaseController {
@ApiOperation(value = "导出", httpMethod = "POST")
@PostMapping("/export")
public void export(Long erbanNo, String ip, String device, Integer identity, HttpServletResponse response) throws IOException {
public void export(Long erbanNo, String ip, String device, Integer identity, Integer partitionId, HttpServletResponse response) throws IOException {
List<Integer> allPartitionId = adminPartitionService.getAllPartitionId(getAdminId());
IPage<ChargeUserXDetailVo> ipage = chargeUserXDetailService.listPage(allPartitionId, erbanNo, ip, device, identity, -1, -1);
if (!allPartitionId.contains(partitionId)) {
throw new AdminServiceException(5001, "无权查看该区数据权限");
}
IPage<ChargeUserXDetailVo> ipage = chargeUserXDetailService.listPage(Arrays.asList(partitionId), erbanNo, ip, device, identity, -1, -1);
response.setContentType("application/vnd.ms-excel");
response.setCharacterEncoding("utf-8");
// 这里URLEncoder.encode可以防止中文乱码