diff --git a/src/main/java/cn/isliu/FsHelper.java b/src/main/java/cn/isliu/FsHelper.java index a2146ef..46379f3 100644 --- a/src/main/java/cn/isliu/FsHelper.java +++ b/src/main/java/cn/isliu/FsHelper.java @@ -350,7 +350,7 @@ public class FsHelper { int rowTotal = sheet.getGridProperties().getRowCount(); int rowNum = rowCount.get(); if (rowNum >= rowTotal) { - FsApiUtil.addRowColumns(sheetId, spreadsheetToken, "ROWS", Math.abs(rowTotal - rowNum), client); + FsApiUtil.addRowColumns(sheetId, spreadsheetToken, FsUtil.ROWS, Math.abs(rowTotal - rowNum), client); } Object resp = FsApiUtil.batchPutValues(sheetId, spreadsheetToken, resultValuesBuilder.build(), client); diff --git a/src/main/java/cn/isliu/core/builder/MapWriteBuilder.java b/src/main/java/cn/isliu/core/builder/MapWriteBuilder.java index 85c68aa..d8ae1e1 100644 --- a/src/main/java/cn/isliu/core/builder/MapWriteBuilder.java +++ b/src/main/java/cn/isliu/core/builder/MapWriteBuilder.java @@ -559,7 +559,7 @@ public class MapWriteBuilder { private void ensureSufficientRows(Sheet sheet, int requiredRows, FeishuClient client) { int rowTotal = sheet.getGridProperties().getRowCount(); if (requiredRows >= rowTotal) { - FsApiUtil.addRowColumns(sheetId, spreadsheetToken, "ROWS", Math.abs(requiredRows - rowTotal), client); + FsApiUtil.addRowColumns(sheetId, spreadsheetToken, FsUtil.ROWS, Math.abs(requiredRows - rowTotal), client); } } diff --git a/src/main/java/cn/isliu/core/builder/WriteBuilder.java b/src/main/java/cn/isliu/core/builder/WriteBuilder.java index f1ed952..fd57eae 100644 --- a/src/main/java/cn/isliu/core/builder/WriteBuilder.java +++ b/src/main/java/cn/isliu/core/builder/WriteBuilder.java @@ -298,7 +298,7 @@ public class WriteBuilder { int rowTotal = sheet.getGridProperties().getRowCount(); int rowNum = rowCount.get(); if (rowNum >= rowTotal) { - FsApiUtil.addRowColumns(sheetId, spreadsheetToken, "ROWS", Math.abs(rowTotal - rowNum), client); + FsApiUtil.addRowColumns(sheetId, spreadsheetToken, FsUtil.ROWS, Math.abs(rowTotal - rowNum), client); } fileDataList.forEach(fileData -> { diff --git a/src/main/java/cn/isliu/core/utils/FsApiUtil.java b/src/main/java/cn/isliu/core/utils/FsApiUtil.java index 1f5cfd9..4cd4949 100644 --- a/src/main/java/cn/isliu/core/utils/FsApiUtil.java +++ b/src/main/java/cn/isliu/core/utils/FsApiUtil.java @@ -435,15 +435,33 @@ public class FsApiUtil { /** * 写入表头 */ - public static Object writeTableHeaders(String sheetId, String spreadsheetToken, List headers, int titleRow, FeishuClient client) { - CustomValueService.ValueRequest.BatchPutValuesBuilder batchPutValuesBuilder = CustomValueService.ValueRequest.batchPutValues(); + public static Object writeTableHeaders(String sheetId, String spreadsheetToken, List headers, + int titleRow, FeishuClient client) { + if (headers == null || headers.isEmpty()) { + return null; + } + + CustomValueService.ValueRequest.BatchPutValuesBuilder builder = + CustomValueService.ValueRequest.batchPutValues(); + + int fromColumnIndex = 1; + int index = 0; + while (index < headers.size()) { + int end = Math.min(index + FsUtil.FS_MAX_COLUMNS_PER_REQUEST, headers.size()); + List slice = headers.subList(index, end); + + String startColumn = FsTableUtil.getColumnNameByNuNumber(fromColumnIndex); + String endColumn = FsTableUtil.getColumnNameByNuNumber(fromColumnIndex + slice.size() - 1); + builder.addRange(sheetId + "!" + startColumn + "1:" + endColumn + "1"); + builder.addRow(slice.toArray()); + + index = end; + fromColumnIndex += slice.size(); + } + + Object putValues = FsApiUtil.putValues(spreadsheetToken, builder.build(), client); String position = FsTableUtil.getColumnNameByNuNumber(headers.size()); - batchPutValuesBuilder.addRange(sheetId + "!A" + titleRow + ":" + position + titleRow); - batchPutValuesBuilder.addRow(headers.toArray()); - - Object putValues = FsApiUtil.putValues(spreadsheetToken, batchPutValuesBuilder.build(), client); - String[] positionArr = {"A" + titleRow, position + titleRow}; MapSheetConfig config = MapSheetConfig.createDefault(); @@ -509,25 +527,40 @@ public class FsApiUtil { public static Object addRowColumns(String sheetId, String spreadsheetToken, String type, int length,FeishuClient client) { - CustomDimensionService.DimensionBatchUpdateRequest batchRequest = CustomDimensionService.DimensionBatchUpdateRequest.newBuilder() - .addRequest(CustomDimensionService.DimensionRequest.addDimension() - .sheetId(sheetId) - .majorDimension(type) - .length(length).build()) - .build(); - - try { - ApiResponse batchResp = client.customDimensions().dimensionsBatchUpdate(spreadsheetToken, batchRequest); - if (batchResp.success()) { - return batchResp.getData(); - } else { - FsLogger.warn("【飞书表格】 添加行列失败！参数：{}，错误信息：{}", sheetId, gson.toJson(batchResp)); - throw new FsHelperException("【飞书表格】 添加行列失败！"); - } - } catch (IOException e) { - FsLogger.warn("【飞书表格】 添加行列异常！参数：{}，错误信息：{}", sheetId, e.getMessage()); - throw new FsHelperException("【飞书表格】 添加行列异常！"); + if (length <= 0) { + return null; } + + Object lastRespData = null; + int remaining = length; + + while (remaining > 0) { + int batchLength = Math.min(remaining, FsUtil.FS_MAX_DIMENSION_LENGTH); + + CustomDimensionService.DimensionBatchUpdateRequest batchRequest = + CustomDimensionService.DimensionBatchUpdateRequest.newBuilder() + .addRequest(CustomDimensionService.DimensionRequest.addDimension() + .sheetId(sheetId) + .majorDimension(type) + .length(batchLength).build()) + .build(); + + try { + ApiResponse batchResp = client.customDimensions().dimensionsBatchUpdate(spreadsheetToken, batchRequest); + if (batchResp.success()) { + lastRespData = batchResp.getData(); + } else { + FsLogger.warn("【飞书表格】 添加行列失败！参数：{}，长度：{}，错误信息：{}", sheetId, batchLength, gson.toJson(batchResp)); + throw new FsHelperException("【飞书表格】 添加行列失败！"); + } + } catch (IOException e) { + FsLogger.warn("【飞书表格】 添加行列异常！参数：{}，长度：{}，错误信息：{}", sheetId, batchLength, e.getMessage()); + throw new FsHelperException("【飞书表格】 添加行列异常！"); + } + + remaining -= batchLength; + } + return lastRespData; } public static Object getTableInfo(String sheetId, String spreadsheetToken, FeishuClient client) { diff --git a/src/main/java/cn/isliu/core/utils/FsUtil.java b/src/main/java/cn/isliu/core/utils/FsUtil.java new file mode 100644 index 0000000..3e485f7 --- /dev/null +++ b/src/main/java/cn/isliu/core/utils/FsUtil.java @@ -0,0 +1,25 @@ +package cn.isliu.core.utils; + +import java.net.MalformedURLException; +import java.net.URL; + +public class FsUtil { + + public static final int FS_MAX_COLUMNS_PER_REQUEST = 100; + public static final int FS_MAX_DIMENSION_LENGTH = 5000; + public static final String ROWS = "ROWS"; + + public static String getSheetTokenByFsLink(String fsLink) { + if (fsLink == null) { + return null; + } + // 获取url 最后一个斜杆后的数据，不包含url参数 + String path; + try { + path = new URL(fsLink).getPath(); + } catch (MalformedURLException e) { + throw new RuntimeException(e); + } + return path.substring(path.lastIndexOf('/') + 1); + } +}