CC/ruoyi-java
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1

Browse Source
This commit is contained in:
荒
2025-11-06 10:57:22 +08:00
parent 9b9aea8d40
commit 763d9985fa
6 changed files with 467 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
ruoyi-admin/src/main/java/com/ruoyi/web/controller/jarvis/TencentDocController.java
View File

@@ -566,11 +566,32 @@ public class TencentDocController extends BaseController {
}
// 读取数据行
JSONObject sheetData = tencentDocService.readSheetData(accessToken, fileId, sheetId, range);
log.info("开始读取数据行 - 范围: {}", range);
JSONObject sheetData = null;
try {
sheetData = tencentDocService.readSheetData(accessToken, fileId, sheetId, range);
log.info("数据行读取成功，响应: {}", sheetData != null ? "有数据" : "null");
} catch (Exception e) {
log.error("读取数据行失败", e);
return AjaxResult.error("读取数据行失败: " + e.getMessage());
}
if (sheetData == null) {
return AjaxResult.error("读取数据行返回null");
}
JSONArray values = sheetData.getJSONArray("values");
log.info("解析后的数据行数: {}", values != null ? values.size() : "null");
if (values == null || values.isEmpty()) {
log.info("指定范围内没有数据，可能已处理完毕");
log.warn("指定范围内没有数据，可能已处理完毕。range={}, sheetData keys={}",
range, sheetData.keySet());
// 打印前10个键值对用于调试
if (sheetData != null && !sheetData.isEmpty()) {
log.warn("sheetData内容预览: {}", sheetData.toJSONString().substring(0, Math.min(500, sheetData.toJSONString().length())));
}
JSONObject result = new JSONObject();
result.put("startRow", startRow);
result.put("endRow", endRow);
@@ -579,9 +600,14 @@ public class TencentDocController extends BaseController {
result.put("skippedCount", 0);
result.put("errorCount", 0);
result.put("message", "指定范围内没有数据");
result.put("range", range);
result.put("hasSheetData", sheetData != null);
result.put("sheetDataKeys", sheetData != null ? sheetData.keySet() : null);
return AjaxResult.success("没有需要处理的数据", result);
}
log.info("成功读取 {} 行数据，开始处理...", values.size());
// 处理数据行
int filledCount = 0;
int skippedCount = 0;
@@ -617,8 +643,8 @@ public class TencentDocController extends BaseController {
}
try {
// 根据单号查询订单
JDOrder order = jdOrderService.selectJDOrderByRemark(orderNo);
// 根据第三方单号查询订单
JDOrder order = jdOrderService.selectJDOrderByThirdPartyOrderNo(orderNo);
if (order != null && order.getLogisticsLink() != null && !order.getLogisticsLink().trim().isEmpty()) {
String logisticsLink = order.getLogisticsLink().trim();