From ff3ecc07df5f4c684eebdf51eeddfb333f7e2813 Mon Sep 17 00:00:00 2001 From: daiqy88 Date: Sat, 1 Nov 2025 15:22:05 +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 --- .../com/ccag/entity/bo/system/office/OfficeProxy.java | 11 ++++++++--- .../entity/bo/system/office/SystemLoadcaseBean.java | 6 +++--- .../com/ccag/service/impl/ProjectServiceImpl.java | 6 ++++++ 3 files changed, 17 insertions(+), 6 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 4728f0e..c67f5cf 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 @@ -3,6 +3,7 @@ package com.ccag.entity.bo.system.office; import com.alibaba.fastjson2.JSONArray; import com.alibaba.fastjson2.JSONObject; import com.fasterxml.jackson.databind.ObjectMapper; +import lombok.extern.slf4j.Slf4j; import org.apache.poi.hssf.usermodel.HSSFWorkbook; import org.apache.poi.ss.usermodel.*; import org.apache.poi.ss.util.CellRangeAddress; @@ -14,7 +15,7 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; - +@Slf4j public class OfficeProxy{ private List> rows = new ArrayList<>(); private String[] header; @@ -56,10 +57,14 @@ public class OfficeProxy{ */ public String excelToJson(String excelPath,String dictPath){ - if(!loadDictionary(dictPath,false)) + if(!loadDictionary(dictPath,false)) { + log.error("load dirctory error"); return ""; - if(!readExcelFile(excelPath)) + } + if(!readExcelFile(excelPath)) { + log.error("read excel file error"); return ""; + } return exportToJson(); } diff --git a/ccag-tvs-sim/ccag-tvs-sim-biz/src/main/java/com/ccag/entity/bo/system/office/SystemLoadcaseBean.java b/ccag-tvs-sim/ccag-tvs-sim-biz/src/main/java/com/ccag/entity/bo/system/office/SystemLoadcaseBean.java index 5eace16..284046e 100644 --- a/ccag-tvs-sim/ccag-tvs-sim-biz/src/main/java/com/ccag/entity/bo/system/office/SystemLoadcaseBean.java +++ b/ccag-tvs-sim/ccag-tvs-sim-biz/src/main/java/com/ccag/entity/bo/system/office/SystemLoadcaseBean.java @@ -17,7 +17,7 @@ public class SystemLoadcaseBean { public String importer; public String componentCode; public String patent; - public String patentInfo; + //public String patentInfo; public String techSummary; public String inputFormTemplate; public String inputForm; @@ -31,7 +31,7 @@ public class SystemLoadcaseBean { public String analysis; public String submitter; public String standard; - public String standardInfo; + //public String standardInfo[]; public String confidence; public String nodeType; public String code; @@ -45,6 +45,6 @@ public class SystemLoadcaseBean { public String updateTime; public String updateBy; public String tenantId; - public String techSummaryInfo; + //public String techSummaryInfo[]; public String projectNode;// = new ArrayList<>(); } 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 5bc3e5c..3036df1 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 @@ -523,7 +523,10 @@ public class ProjectServiceImpl implements ProjectService { { String excelPath = cmdParams[2]; String dictPath = cmdParams[4]; + log.info("excelPath:" + excelPath); + log.info("dictPath:" + dictPath); String jsonContents = officeProxy.excelToJson(excelPath,dictPath); + log.info("jsonContents:" + jsonContents); result.add(jsonContents); } else if(commands.contains("jsonToExcel.py"))//json库导出excel @@ -535,6 +538,9 @@ public class ProjectServiceImpl implements ProjectService { if(index > 0) { String savePath = dictPath.substring(0, index); String excelPath = savePath + File.separator + "分析项清单.xlsx"; + log.info("excelPath:" + excelPath); + log.info("dictPath:" + dictPath); + log.info("savePath:" + excelPath); officeProxy.jsonToExcel(jsonPath, dictPath, excelPath, type); result.add(excelPath); }