lidongyang/tvs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改

Browse Source
This commit is contained in:
daiqy88
2025-11-01 15:22:05 +08:00
parent 9a87223c4c
commit ff3ecc07df
3 changed files with 17 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
ccag-tvs-sim/ccag-tvs-sim-biz/src/main/java/com/ccag/entity/bo/system/office/OfficeProxy.java
View File

@@ -3,6 +3,7 @@ package com.ccag.entity.bo.system.office;
import com.alibaba.fastjson2.JSONArray; import com.alibaba.fastjson2.JSONArray;
import com.alibaba.fastjson2.JSONObject; import com.alibaba.fastjson2.JSONObject;
import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.ObjectMapper;
import lombok.extern.slf4j.Slf4j;
import org.apache.poi.hssf.usermodel.HSSFWorkbook; import org.apache.poi.hssf.usermodel.HSSFWorkbook;
import org.apache.poi.ss.usermodel.*; import org.apache.poi.ss.usermodel.*;
import org.apache.poi.ss.util.CellRangeAddress; import org.apache.poi.ss.util.CellRangeAddress;
@@ -14,7 +15,7 @@ import java.util.ArrayList;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
@Slf4j
public class OfficeProxy{ public class OfficeProxy{
private List<List<Object>> rows = new ArrayList<>(); private List<List<Object>> rows = new ArrayList<>();
private String[] header; private String[] header;
@@ -56,10 +57,14 @@ public class OfficeProxy{
*/ */
public String excelToJson(String excelPath,String dictPath){ public String excelToJson(String excelPath,String dictPath){
if(!loadDictionary(dictPath,false)) if(!loadDictionary(dictPath,false)) {
log.error("load dirctory error");
return ""; return "";
if(!readExcelFile(excelPath)) }
if(!readExcelFile(excelPath)) {
log.error("read excel file error");
return ""; return "";
}
return exportToJson(); return exportToJson();
} }

6
ccag-tvs-sim/ccag-tvs-sim-biz/src/main/java/com/ccag/entity/bo/system/office/SystemLoadcaseBean.java
View File

@@ -17,7 +17,7 @@ public class SystemLoadcaseBean {
public String importer; public String importer;
public String componentCode; public String componentCode;
public String patent; public String patent;
public String patentInfo; //public String patentInfo;
public String techSummary; public String techSummary;
public String inputFormTemplate; public String inputFormTemplate;
public String inputForm; public String inputForm;
@@ -31,7 +31,7 @@ public class SystemLoadcaseBean {
public String analysis; public String analysis;
public String submitter; public String submitter;
public String standard; public String standard;
public String standardInfo; //public String standardInfo[];
public String confidence; public String confidence;
public String nodeType; public String nodeType;
public String code; public String code;
@@ -45,6 +45,6 @@ public class SystemLoadcaseBean {
public String updateTime; public String updateTime;
public String updateBy; public String updateBy;
public String tenantId; public String tenantId;
public String techSummaryInfo; //public String techSummaryInfo[];
public String projectNode;// = new ArrayList<>(); public String projectNode;// = new ArrayList<>();
} }

6
ccag-tvs-sim/ccag-tvs-sim-biz/src/main/java/com/ccag/service/impl/ProjectServiceImpl.java
View File

@@ -523,7 +523,10 @@ public class ProjectServiceImpl implements ProjectService {
{ {
String excelPath = cmdParams[2]; String excelPath = cmdParams[2];
String dictPath = cmdParams[4]; String dictPath = cmdParams[4];
log.info("excelPath:" + excelPath);
log.info("dictPath:" + dictPath);
String jsonContents = officeProxy.excelToJson(excelPath,dictPath); String jsonContents = officeProxy.excelToJson(excelPath,dictPath);
log.info("jsonContents:" + jsonContents);
result.add(jsonContents); result.add(jsonContents);
} }
else if(commands.contains("jsonToExcel.py"))//json库导出excel else if(commands.contains("jsonToExcel.py"))//json库导出excel
@@ -535,6 +538,9 @@ public class ProjectServiceImpl implements ProjectService {
if(index > 0) { if(index > 0) {
String savePath = dictPath.substring(0, index); String savePath = dictPath.substring(0, index);
String excelPath = savePath + File.separator + "分析项清单.xlsx"; String excelPath = savePath + File.separator + "分析项清单.xlsx";
log.info("excelPath:" + excelPath);
log.info("dictPath:" + dictPath);
log.info("savePath:" + excelPath);
officeProxy.jsonToExcel(jsonPath, dictPath, excelPath, type); officeProxy.jsonToExcel(jsonPath, dictPath, excelPath, type);
result.add(excelPath); result.add(excelPath);
} }