From 5e8e822632d3adad7214caf6d2601dac3c488ec5 Mon Sep 17 00:00:00 2001 From: daiqy88 Date: Fri, 31 Oct 2025 17:02:38 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ccag/entity/bo/system/office/OfficeProxy.java | 2 +- .../com/ccag/service/impl/ProjectServiceImpl.java | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/ccag-tvs-sim/ccag-tvs-sim-biz/src/main/java/com/ccag/entity/bo/system/office/OfficeProxy.java b/ccag-tvs-sim/ccag-tvs-sim-biz/src/main/java/com/ccag/entity/bo/system/office/OfficeProxy.java index 97d43d6..63ebc71 100644 --- a/ccag-tvs-sim/ccag-tvs-sim-biz/src/main/java/com/ccag/entity/bo/system/office/OfficeProxy.java +++ b/ccag-tvs-sim/ccag-tvs-sim-biz/src/main/java/com/ccag/entity/bo/system/office/OfficeProxy.java @@ -342,7 +342,7 @@ public class OfficeProxy{ { try { - if(files == null || files.size() < 2) + if(files == null ) return false; File file = new File(files.get(0)); if(!file.exists()) diff --git a/ccag-tvs-sim/ccag-tvs-sim-biz/src/main/java/com/ccag/service/impl/ProjectServiceImpl.java b/ccag-tvs-sim/ccag-tvs-sim-biz/src/main/java/com/ccag/service/impl/ProjectServiceImpl.java index 3caf86b..5bc3e5c 100644 --- a/ccag-tvs-sim/ccag-tvs-sim-biz/src/main/java/com/ccag/service/impl/ProjectServiceImpl.java +++ b/ccag-tvs-sim/ccag-tvs-sim-biz/src/main/java/com/ccag/service/impl/ProjectServiceImpl.java @@ -514,23 +514,23 @@ public class ProjectServiceImpl implements ProjectService { } List result = new ArrayList<>(); String[] cmdParams = commands.split(" "); - if(cmdParams.length != 4) + if(cmdParams.length != 5) { return SdmResponse.failed("param size error"); } OfficeProxy officeProxy = new OfficeProxy(); if(commands.contains("excelToJson.py")) //excel转为json库 { - String excelPath = cmdParams[1]; - String dictPath = cmdParams[3]; + String excelPath = cmdParams[2]; + String dictPath = cmdParams[4]; String jsonContents = officeProxy.excelToJson(excelPath,dictPath); result.add(jsonContents); } else if(commands.contains("jsonToExcel.py"))//json库导出excel { - String jsonPath = cmdParams[1]; - int type = Integer.parseInt(cmdParams[2]); - String dictPath = cmdParams[3]; + String jsonPath = cmdParams[2]; + int type = Integer.parseInt(cmdParams[3]); + String dictPath = cmdParams[4]; int index = dictPath.lastIndexOf(File.separator); if(index > 0) { String savePath = dictPath.substring(0, index);