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-10-31 10:26:29 +08:00
parent bdc85c253e
commit bc68630432
5 changed files with 223 additions and 212 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ccag-tvs-sim/ccag-tvs-sim-biz/src/main/java/com/ccag/entity/pojo/project/ProjectDisciplineBean.java
View File

@@ -15,7 +15,7 @@ public class ProjectDisciplineBean implements Serializable {
private static final long serialVersionUID = -2400679160093657636L;
public String memberIdentity;
public String memberName;
public List<ProjectLoadcaseBean> loadcaseBeans;
private List<ProjectLoadcaseBean> loadcaseBeans;
private long id;
private String disciplineName;
private String disciplineCode;

419
ccag-tvs-sim/ccag-tvs-sim-biz/src/main/java/com/ccag/service/impl/ExportExcelServiceImpl.java
View File

@@ -113,6 +113,19 @@ public class ExportExcelServiceImpl implements ExportExcelService {
private final String PRINC_NAME = "dPrincipalName";
private final String PLAN_FINISH = "planFinish";
private final String PRINCIPAL = "sPrincipal";
private final String IMPORT_USER = "importUsers";
private final String SUBMIT_USER = "submitUsers";
private final String BEGIN_TIME = "beginTime";
private final String END_TIME = "endTime";
private final String ACTUAL_DAYS = "actualDays";
private final String SUMMARY_REPORT = "summaryReport";
private final String BENCH_REPORT = "benchmarkReport";
private final String DELIVERABLES = "deliverables";
private final String STANDARD_INFO = "standardInfo";
private final String PATENT_INFO = "patentInfo";
private final String TECH_SUMMARY_INTO = "techSummaryInfo";
private final String INPUT_FORM = "inputForm";
private final String DAYS = "days";
@Override
public void exportProjectDetail(GetProjectDetailReq getProjectDetailReq, HttpServletResponse response) throws UnsupportedEncodingException {
@@ -256,19 +269,19 @@ public class ExportExcelServiceImpl implements ExportExcelService {
map.put(ACHIVE, null);
map.put(PROJECT_NODE, null);
map.put(SIM_USERS, null);
map.put("importUsers", null);
map.put("submitUsers", null);
map.put("beginTime", null);
map.put("endTime", null);
map.put("actualDays", null);
map.put("summaryReport", null);
map.put("benchmarkReport", null);
map.put("deliverables", null);
map.put("standardInfo", null);
map.put("patentInfo", null);
map.put("techSummaryInfo", null);
map.put("inputForm", null);
map.put("days", null);
map.put(IMPORT_USER, null);
map.put(SUBMIT_USER, null);
map.put(BEGIN_TIME, null);
map.put(END_TIME, null);
map.put(ACTUAL_DAYS, null);
map.put(SUMMARY_REPORT, null);
map.put(BENCH_REPORT, null);
map.put(DELIVERABLES, null);
map.put(STANDARD_INFO, null);
map.put(PATENT_INFO, null);
map.put(TECH_SUMMARY_INTO, null);
map.put(INPUT_FORM, null);
map.put(DAYS, null);
map.put(ANALYSIS_SOFTWARE, null);
map.put(MEASURE, null);
map.put(DESC, null);
@@ -295,7 +308,7 @@ public class ExportExcelServiceImpl implements ExportExcelService {
break;
}
if (StringUtils.isNotBlank(projectComponentBean.getSummaryReport())) {
map.put("summaryReport", JSONObject.parseObject(projectComponentBean.getSummaryReport()).getString(FILE_NAME));
map.put(SUMMARY_REPORT, JSONObject.parseObject(projectComponentBean.getSummaryReport()).getString(FILE_NAME));
}
} else if (buildType == 1) {
ProjectDisciplineBean projectDisciplineBean = (ProjectDisciplineBean) jsonObj.get("bean");
@@ -319,7 +332,7 @@ public class ExportExcelServiceImpl implements ExportExcelService {
break;
}
if (StringUtils.isNotBlank(projectDisciplineBean.getSummaryReport())) {
map.put("summaryReport", JSONObject.parseObject(projectDisciplineBean.getSummaryReport()).getString(FILE_NAME));
map.put(SUMMARY_REPORT, JSONObject.parseObject(projectDisciplineBean.getSummaryReport()).getString(FILE_NAME));
}
} else {
JSONObject loadCaseBean = (JSONObject) jsonObj.get("bean");
@@ -369,45 +382,45 @@ public class ExportExcelServiceImpl implements ExportExcelService {
}
map.put(PROJECT_NODE, loadCaseBean.getString(PROJECT_NODE));
if (StringUtils.isNotBlank(loadCaseBean.getString("benchmarkReport"))) {
map.put("benchmarkReport", JSONObject.parseObject(loadCaseBean.getString("benchmarkReport")).getString(FILE_NAME));
if (StringUtils.isNotBlank(loadCaseBean.getString(BENCH_REPORT))) {
map.put(BENCH_REPORT, JSONObject.parseObject(loadCaseBean.getString(BENCH_REPORT)).getString(FILE_NAME));
}
if (StringUtils.isNotBlank(jsonObj.getString(SIM_USERS))) {
List<String> simUsers = JSON.parseArray(jsonObj.getString(SIM_USERS), LoadcaseMemberBean.class)
.stream().map(LoadcaseMemberBean::getMemberName).collect(Collectors.toList());
map.put(SIM_USERS, String.join(",", simUsers));
}
if (StringUtils.isNotBlank(jsonObj.getString("importUsers"))) {
List<String> importUsers = JSON.parseArray(jsonObj.getString("importUsers"), LoadcaseMemberBean.class)
if (StringUtils.isNotBlank(jsonObj.getString(IMPORT_USER))) {
List<String> importUsers = JSON.parseArray(jsonObj.getString(IMPORT_USER), LoadcaseMemberBean.class)
.stream().map(LoadcaseMemberBean::getMemberName).collect(Collectors.toList());
map.put("importUsers", String.join(",", importUsers));
map.put(IMPORT_USER, String.join(",", importUsers));
}
if (StringUtils.isNotBlank(jsonObj.getString("submitUsers"))) {
List<String> submitUsers = JSON.parseArray(jsonObj.getString("submitUsers"), LoadcaseMemberBean.class)
if (StringUtils.isNotBlank(jsonObj.getString(SUBMIT_USER))) {
List<String> submitUsers = JSON.parseArray(jsonObj.getString(SUBMIT_USER), LoadcaseMemberBean.class)
.stream().map(LoadcaseMemberBean::getMemberName).collect(Collectors.toList());
map.put("submitUsers", String.join(",", submitUsers));
map.put(SUBMIT_USER, String.join(",", submitUsers));
}
map.put("beginTime", loadCaseBean.getString("beginTime"));
map.put("endTime", loadCaseBean.getString("endTime"));
map.put("actualDays", loadCaseBean.getString("actualDays"));
if (StringUtils.isNotBlank(loadCaseBean.getString("standardInfo"))) {
List<String> standardInfo = JSON.parseArray(loadCaseBean.getString("standardInfo"), JSONObject.class)
map.put(BEGIN_TIME, loadCaseBean.getString(BEGIN_TIME));
map.put(END_TIME, loadCaseBean.getString(END_TIME));
map.put(ACTUAL_DAYS, loadCaseBean.getString(ACTUAL_DAYS));
if (StringUtils.isNotBlank(loadCaseBean.getString(STANDARD_INFO))) {
List<String> standardInfo = JSON.parseArray(loadCaseBean.getString(STANDARD_INFO), JSONObject.class)
.stream().map(json -> json.getString(FILE_NAME)).collect(Collectors.toList());
map.put("standardInfo", String.join(",", standardInfo));
map.put(STANDARD_INFO, String.join(",", standardInfo));
}
if (StringUtils.isNotBlank(loadCaseBean.getString("patentInfo"))) {
List<String> patentInfo = JSON.parseArray(loadCaseBean.getString("patentInfo"), JSONObject.class)
if (StringUtils.isNotBlank(loadCaseBean.getString(PATENT_INFO))) {
List<String> patentInfo = JSON.parseArray(loadCaseBean.getString(PATENT_INFO), JSONObject.class)
.stream().map(json -> json.getString(FILE_NAME)).collect(Collectors.toList());
map.put("patentInfo", String.join(",", patentInfo));
map.put(PATENT_INFO, String.join(",", patentInfo));
}
if (StringUtils.isNotBlank(loadCaseBean.getString("techSummaryInfo"))) {
List<String> techSummaryInfo = JSON.parseArray(loadCaseBean.getString("techSummaryInfo"), JSONObject.class)
if (StringUtils.isNotBlank(loadCaseBean.getString(TECH_SUMMARY_INTO))) {
List<String> techSummaryInfo = JSON.parseArray(loadCaseBean.getString(TECH_SUMMARY_INTO), JSONObject.class)
.stream().map(json -> json.getString(FILE_NAME)).collect(Collectors.toList());
map.put("techSummaryInfo", String.join(",", techSummaryInfo));
map.put(TECH_SUMMARY_INTO, String.join(",", techSummaryInfo));
}
map.put(DELIV_SIGNA, loadCaseBean.getString(DELIV_SIGNA));
map.put("inputForm", null);
map.put("days", loadCaseBean.getInteger("days"));
map.put(INPUT_FORM, null);
map.put(DAYS, loadCaseBean.getInteger(DAYS));
String analysisSoftware = loadCaseBean.getString(ANALYSIS_SOFTWARE);
if (StringUtils.isNotBlank(analysisSoftware)) {
List<String> analysisSoftwareList = new ArrayList<>();
@@ -464,19 +477,19 @@ public class ExportExcelServiceImpl implements ExportExcelService {
map.put(ACHIVE, null);
map.put(PROJECT_NODE, null);
map.put(SIM_USERS, null);
map.put("importUsers", null);
map.put("submitUsers", null);
map.put("beginTime", null);
map.put("endTime", null);
map.put(IMPORT_USER, null);
map.put(SUBMIT_USER, null);
map.put(BEGIN_TIME, null);
map.put(END_TIME, null);
map.put(FINISH_TIME, null);
map.put("actualDays", null);
map.put("summaryReport", null);
map.put("benchmarkReport", null);
map.put("standardInfo", null);
map.put("patentInfo", null);
map.put("techSummaryInfo", null);
map.put("inputForm", null);
map.put("days", null);
map.put(ACTUAL_DAYS, null);
map.put(SUMMARY_REPORT, null);
map.put(BENCH_REPORT, null);
map.put(STANDARD_INFO, null);
map.put(PATENT_INFO, null);
map.put(TECH_SUMMARY_INTO, null);
map.put(INPUT_FORM, null);
map.put(DAYS, null);
map.put(ANALYSIS_SOFTWARE, null);
map.put(MEASURE, null);
map.put(DESC, null);
@@ -503,7 +516,7 @@ public class ExportExcelServiceImpl implements ExportExcelService {
break;
}
if (StringUtils.isNotBlank(projectComponentBean.getSummaryReport())) {
map.put("summaryReport", JSONObject.parseObject(projectComponentBean.getSummaryReport()).getString(FILE_NAME));
map.put(SUMMARY_REPORT, JSONObject.parseObject(projectComponentBean.getSummaryReport()).getString(FILE_NAME));
}
} else if (buildType == 1) {
ProjectDisciplineBean projectDisciplineBean = (ProjectDisciplineBean) jsonObj.get("bean");
@@ -527,7 +540,7 @@ public class ExportExcelServiceImpl implements ExportExcelService {
break;
}
if (StringUtils.isNotBlank(projectDisciplineBean.getSummaryReport())) {
map.put("summaryReport", JSONObject.parseObject(projectDisciplineBean.getSummaryReport()).getString(FILE_NAME));
map.put(SUMMARY_REPORT, JSONObject.parseObject(projectDisciplineBean.getSummaryReport()).getString(FILE_NAME));
}
} else {
JSONObject loadCaseBean = (JSONObject) jsonObj.get("bean");
@@ -578,45 +591,45 @@ public class ExportExcelServiceImpl implements ExportExcelService {
}
map.put(PROJECT_NODE, loadCaseBean.getString(PROJECT_NODE));
if (StringUtils.isNotBlank(loadCaseBean.getString("benchmarkReport"))) {
map.put("benchmarkReport", JSONObject.parseObject(loadCaseBean.getString("benchmarkReport")).getString(FILE_NAME));
if (StringUtils.isNotBlank(loadCaseBean.getString(BENCH_REPORT))) {
map.put(BENCH_REPORT, JSONObject.parseObject(loadCaseBean.getString(BENCH_REPORT)).getString(FILE_NAME));
}
if (StringUtils.isNotBlank(jsonObj.getString(SIM_USERS))) {
List<String> simUsers = JSON.parseArray(jsonObj.getString(SIM_USERS), LoadcaseMemberBean.class)
.stream().map(LoadcaseMemberBean::getMemberName).collect(Collectors.toList());
map.put(SIM_USERS, String.join(",", simUsers));
}
if (StringUtils.isNotBlank(jsonObj.getString("importUsers"))) {
List<String> importUsers = JSON.parseArray(jsonObj.getString("importUsers"), LoadcaseMemberBean.class)
if (StringUtils.isNotBlank(jsonObj.getString(IMPORT_USER))) {
List<String> importUsers = JSON.parseArray(jsonObj.getString(IMPORT_USER), LoadcaseMemberBean.class)
.stream().map(LoadcaseMemberBean::getMemberName).collect(Collectors.toList());
map.put("importUsers", String.join(",", importUsers));
map.put(IMPORT_USER, String.join(",", importUsers));
}
if (StringUtils.isNotBlank(jsonObj.getString("submitUsers"))) {
List<String> submitUsers = JSON.parseArray(jsonObj.getString("submitUsers"), LoadcaseMemberBean.class)
if (StringUtils.isNotBlank(jsonObj.getString(SUBMIT_USER))) {
List<String> submitUsers = JSON.parseArray(jsonObj.getString(SUBMIT_USER), LoadcaseMemberBean.class)
.stream().map(LoadcaseMemberBean::getMemberName).collect(Collectors.toList());
map.put("submitUsers", String.join(",", submitUsers));
map.put(SUBMIT_USER, String.join(",", submitUsers));
}
map.put("beginTime", loadCaseBean.getString("beginTime"));
map.put("endTime", loadCaseBean.getString("endTime"));
map.put(BEGIN_TIME, loadCaseBean.getString(BEGIN_TIME));
map.put(END_TIME, loadCaseBean.getString(END_TIME));
map.put(FINISH_TIME, loadCaseBean.getString(FINISH_TIME));
map.put("actualDays", loadCaseBean.getString("actualDays"));
if (StringUtils.isNotBlank(loadCaseBean.getString("standardInfo"))) {
List<String> standardInfo = JSON.parseArray(loadCaseBean.getString("standardInfo"), JSONObject.class)
map.put(ACTUAL_DAYS, loadCaseBean.getString(ACTUAL_DAYS));
if (StringUtils.isNotBlank(loadCaseBean.getString(STANDARD_INFO))) {
List<String> standardInfo = JSON.parseArray(loadCaseBean.getString(STANDARD_INFO), JSONObject.class)
.stream().map(json -> json.getString(FILE_NAME)).collect(Collectors.toList());
map.put("standardInfo", String.join(",", standardInfo));
map.put(STANDARD_INFO, String.join(",", standardInfo));
}
if (StringUtils.isNotBlank(loadCaseBean.getString("patentInfo"))) {
List<String> patentInfo = JSON.parseArray(loadCaseBean.getString("patentInfo"), JSONObject.class)
if (StringUtils.isNotBlank(loadCaseBean.getString(PATENT_INFO))) {
List<String> patentInfo = JSON.parseArray(loadCaseBean.getString(PATENT_INFO), JSONObject.class)
.stream().map(json -> json.getString(FILE_NAME)).collect(Collectors.toList());
map.put("patentInfo", String.join(",", patentInfo));
map.put(PATENT_INFO, String.join(",", patentInfo));
}
if (StringUtils.isNotBlank(loadCaseBean.getString("techSummaryInfo"))) {
List<String> techSummaryInfo = JSON.parseArray(loadCaseBean.getString("techSummaryInfo"), JSONObject.class)
if (StringUtils.isNotBlank(loadCaseBean.getString(TECH_SUMMARY_INTO))) {
List<String> techSummaryInfo = JSON.parseArray(loadCaseBean.getString(TECH_SUMMARY_INTO), JSONObject.class)
.stream().map(json -> json.getString(FILE_NAME)).collect(Collectors.toList());
map.put("techSummaryInfo", String.join(",", techSummaryInfo));
map.put(TECH_SUMMARY_INTO, String.join(",", techSummaryInfo));
}
map.put("inputForm", null);
map.put("days", loadCaseBean.getInteger("days"));
map.put(INPUT_FORM, null);
map.put(DAYS, loadCaseBean.getInteger(DAYS));
String analysisSoftware = loadCaseBean.getString(ANALYSIS_SOFTWARE);
if (StringUtils.isNotBlank(analysisSoftware)) {
List<String> analysisSoftwareList = new ArrayList<>();
@@ -674,20 +687,20 @@ public class ExportExcelServiceImpl implements ExportExcelService {
map.put(ACHIVE, null);
map.put(PROJECT_NODE, null);
map.put(SIM_USERS, null);
map.put("importUsers", null);
map.put("submitUsers", null);
map.put("beginTime", null);
map.put("endTime", null);
map.put(IMPORT_USER, null);
map.put(SUBMIT_USER, null);
map.put(BEGIN_TIME, null);
map.put(END_TIME, null);
map.put(FINISH_TIME, null);
map.put("actualDays", null);
map.put("summaryReport", null);
map.put("benchmarkReport", null);
map.put(ACTUAL_DAYS, null);
map.put(SUMMARY_REPORT, null);
map.put(BENCH_REPORT, null);
map.put(DELIV_SIGNA, null);
map.put("standardInfo", null);
map.put("patentInfo", null);
map.put("techSummaryInfo", null);
map.put("inputForm", null);
map.put("days", null);
map.put(STANDARD_INFO, null);
map.put(PATENT_INFO, null);
map.put(TECH_SUMMARY_INTO, null);
map.put(INPUT_FORM, null);
map.put(DAYS, null);
map.put(ANALYSIS_SOFTWARE, null);
map.put(MEASURE, null);
map.put(DESC, null);
@@ -714,7 +727,7 @@ public class ExportExcelServiceImpl implements ExportExcelService {
break;
}
if (StringUtils.isNotBlank(projectComponentBean.getSummaryReport())) {
map.put("summaryReport", JSONObject.parseObject(projectComponentBean.getSummaryReport()).getString(FILE_NAME));
map.put(SUMMARY_REPORT, JSONObject.parseObject(projectComponentBean.getSummaryReport()).getString(FILE_NAME));
}
} else if (buildType == 1) {
ProjectDisciplineBean projectDisciplineBean = (ProjectDisciplineBean) jsonObj.get("bean");
@@ -738,7 +751,7 @@ public class ExportExcelServiceImpl implements ExportExcelService {
break;
}
if (StringUtils.isNotBlank(projectDisciplineBean.getSummaryReport())) {
map.put("summaryReport", JSONObject.parseObject(projectDisciplineBean.getSummaryReport()).getString(FILE_NAME));
map.put(SUMMARY_REPORT, JSONObject.parseObject(projectDisciplineBean.getSummaryReport()).getString(FILE_NAME));
}
} else {
JSONObject loadCaseBean = (JSONObject) jsonObj.get("bean");
@@ -787,8 +800,8 @@ public class ExportExcelServiceImpl implements ExportExcelService {
}
}
map.put(PROJECT_NODE, loadCaseBean.getString(PROJECT_NODE));
if (StringUtils.isNotBlank(loadCaseBean.getString("benchmarkReport"))) {
map.put("benchmarkReport", JSONObject.parseObject(loadCaseBean.getString("benchmarkReport")).getString(FILE_NAME));
if (StringUtils.isNotBlank(loadCaseBean.getString(BENCH_REPORT))) {
map.put(BENCH_REPORT, JSONObject.parseObject(loadCaseBean.getString(BENCH_REPORT)).getString(FILE_NAME));
}
map.put(DELIV_SIGNA, loadCaseBean.getString(DELIV_SIGNA));
if (StringUtils.isNotBlank(jsonObj.getString(SIM_USERS))) {
@@ -796,37 +809,37 @@ public class ExportExcelServiceImpl implements ExportExcelService {
.stream().map(LoadcaseMemberBean::getMemberName).collect(Collectors.toList());
map.put(SIM_USERS, String.join(",", simUsers));
}
if (StringUtils.isNotBlank(jsonObj.getString("importUsers"))) {
List<String> importUsers = JSON.parseArray(jsonObj.getString("importUsers"), LoadcaseMemberBean.class)
if (StringUtils.isNotBlank(jsonObj.getString(IMPORT_USER))) {
List<String> importUsers = JSON.parseArray(jsonObj.getString(IMPORT_USER), LoadcaseMemberBean.class)
.stream().map(LoadcaseMemberBean::getMemberName).collect(Collectors.toList());
map.put("importUsers", String.join(",", importUsers));
map.put(IMPORT_USER, String.join(",", importUsers));
}
if (StringUtils.isNotBlank(jsonObj.getString("submitUsers"))) {
List<String> submitUsers = JSON.parseArray(jsonObj.getString("submitUsers"), LoadcaseMemberBean.class)
if (StringUtils.isNotBlank(jsonObj.getString(SUBMIT_USER))) {
List<String> submitUsers = JSON.parseArray(jsonObj.getString(SUBMIT_USER), LoadcaseMemberBean.class)
.stream().map(LoadcaseMemberBean::getMemberName).collect(Collectors.toList());
map.put("submitUsers", String.join(",", submitUsers));
map.put(SUBMIT_USER, String.join(",", submitUsers));
}
map.put("beginTime", loadCaseBean.getString("beginTime"));
map.put("endTime", loadCaseBean.getString("endTime"));
map.put(BEGIN_TIME, loadCaseBean.getString(BEGIN_TIME));
map.put(END_TIME, loadCaseBean.getString(END_TIME));
map.put(FINISH_TIME, loadCaseBean.getString(FINISH_TIME));
map.put("actualDays", loadCaseBean.getString("actualDays"));
if (StringUtils.isNotBlank(loadCaseBean.getString("standardInfo"))) {
List<String> standardInfo = JSON.parseArray(loadCaseBean.getString("standardInfo"), JSONObject.class)
map.put(ACTUAL_DAYS, loadCaseBean.getString(ACTUAL_DAYS));
if (StringUtils.isNotBlank(loadCaseBean.getString(STANDARD_INFO))) {
List<String> standardInfo = JSON.parseArray(loadCaseBean.getString(STANDARD_INFO), JSONObject.class)
.stream().map(json -> json.getString(FILE_NAME)).collect(Collectors.toList());
map.put("standardInfo", String.join(",", standardInfo));
map.put(STANDARD_INFO, String.join(",", standardInfo));
}
if (StringUtils.isNotBlank(loadCaseBean.getString("patentInfo"))) {
List<String> patentInfo = JSON.parseArray(loadCaseBean.getString("patentInfo"), JSONObject.class)
if (StringUtils.isNotBlank(loadCaseBean.getString(PATENT_INFO))) {
List<String> patentInfo = JSON.parseArray(loadCaseBean.getString(PATENT_INFO), JSONObject.class)
.stream().map(json -> json.getString(FILE_NAME)).collect(Collectors.toList());
map.put("patentInfo", String.join(",", patentInfo));
map.put(PATENT_INFO, String.join(",", patentInfo));
}
if (StringUtils.isNotBlank(loadCaseBean.getString("techSummaryInfo"))) {
List<String> techSummaryInfo = JSON.parseArray(loadCaseBean.getString("techSummaryInfo"), JSONObject.class)
if (StringUtils.isNotBlank(loadCaseBean.getString(TECH_SUMMARY_INTO))) {
List<String> techSummaryInfo = JSON.parseArray(loadCaseBean.getString(TECH_SUMMARY_INTO), JSONObject.class)
.stream().map(json -> json.getString(FILE_NAME)).collect(Collectors.toList());
map.put("techSummaryInfo", String.join(",", techSummaryInfo));
map.put(TECH_SUMMARY_INTO, String.join(",", techSummaryInfo));
}
map.put("inputForm", null);
map.put("days", loadCaseBean.getInteger("days"));
map.put(INPUT_FORM, null);
map.put(DAYS, loadCaseBean.getInteger(DAYS));
String analysisSoftware = loadCaseBean.getString(ANALYSIS_SOFTWARE);
if (StringUtils.isNotBlank(analysisSoftware)) {
List<String> analysisSoftwareList = new ArrayList<>();
@@ -878,19 +891,19 @@ public class ExportExcelServiceImpl implements ExportExcelService {
map.put(ACHIVE, null);
map.put(PROJECT_NODE, null);
map.put(SIM_USERS, null);
map.put("importUsers", null);
map.put("submitUsers", null);
map.put("beginTime", null);
map.put("endTime", null);
map.put(IMPORT_USER, null);
map.put(SUBMIT_USER, null);
map.put(BEGIN_TIME, null);
map.put(END_TIME, null);
map.put(FINISH_TIME, null);
map.put("actualDays", null);
map.put("summaryReport", null);
map.put("benchmarkReport", null);
map.put("standardInfo", null);
map.put("techSummaryInfo", null);
map.put("patentInfo", null);
map.put("inputForm", null);
map.put("days", null);
map.put(ACTUAL_DAYS, null);
map.put(SUMMARY_REPORT, null);
map.put(BENCH_REPORT, null);
map.put(STANDARD_INFO, null);
map.put(TECH_SUMMARY_INTO, null);
map.put(PATENT_INFO, null);
map.put(INPUT_FORM, null);
map.put(DAYS, null);
map.put(ANALYSIS_SOFTWARE, null);
map.put(MEASURE, null);
map.put(DESC, null);
@@ -917,7 +930,7 @@ public class ExportExcelServiceImpl implements ExportExcelService {
break;
}
if (StringUtils.isNotBlank(projectComponentBean.getSummaryReport())) {
map.put("summaryReport", JSONObject.parseObject(projectComponentBean.getSummaryReport()).getString(FILE_NAME));
map.put(SUMMARY_REPORT, JSONObject.parseObject(projectComponentBean.getSummaryReport()).getString(FILE_NAME));
}
} else if (buildType == 1) {
ProjectDisciplineBean projectDisciplineBean = (ProjectDisciplineBean) jsonObj.get("bean");
@@ -941,7 +954,7 @@ public class ExportExcelServiceImpl implements ExportExcelService {
break;
}
if (StringUtils.isNotBlank(projectDisciplineBean.getSummaryReport())) {
map.put("summaryReport", JSONObject.parseObject(projectDisciplineBean.getSummaryReport()).getString(FILE_NAME));
map.put(SUMMARY_REPORT, JSONObject.parseObject(projectDisciplineBean.getSummaryReport()).getString(FILE_NAME));
}
} else {
JSONObject loadCaseBean = (JSONObject) jsonObj.get("bean");
@@ -990,45 +1003,45 @@ public class ExportExcelServiceImpl implements ExportExcelService {
}
}
map.put(PROJECT_NODE, loadCaseBean.getString(PROJECT_NODE));
if (StringUtils.isNotBlank(loadCaseBean.getString("benchmarkReport"))) {
map.put("benchmarkReport", JSONObject.parseObject(loadCaseBean.getString("benchmarkReport")).getString(FILE_NAME));
if (StringUtils.isNotBlank(loadCaseBean.getString(BENCH_REPORT))) {
map.put(BENCH_REPORT, JSONObject.parseObject(loadCaseBean.getString(BENCH_REPORT)).getString(FILE_NAME));
}
if (StringUtils.isNotBlank(jsonObj.getString(SIM_USERS))) {
List<String> simUsers = JSON.parseArray(jsonObj.getString(SIM_USERS), LoadcaseMemberBean.class)
.stream().map(LoadcaseMemberBean::getMemberName).collect(Collectors.toList());
map.put(SIM_USERS, String.join(",", simUsers));
}
if (StringUtils.isNotBlank(jsonObj.getString("importUsers"))) {
List<String> importUsers = JSON.parseArray(jsonObj.getString("importUsers"), LoadcaseMemberBean.class)
if (StringUtils.isNotBlank(jsonObj.getString(IMPORT_USER))) {
List<String> importUsers = JSON.parseArray(jsonObj.getString(IMPORT_USER), LoadcaseMemberBean.class)
.stream().map(LoadcaseMemberBean::getMemberName).collect(Collectors.toList());
map.put("importUsers", String.join(",", importUsers));
map.put(IMPORT_USER, String.join(",", importUsers));
}
if (StringUtils.isNotBlank(jsonObj.getString("submitUsers"))) {
List<String> submitUsers = JSON.parseArray(jsonObj.getString("submitUsers"), LoadcaseMemberBean.class)
if (StringUtils.isNotBlank(jsonObj.getString(SUBMIT_USER))) {
List<String> submitUsers = JSON.parseArray(jsonObj.getString(SUBMIT_USER), LoadcaseMemberBean.class)
.stream().map(LoadcaseMemberBean::getMemberName).collect(Collectors.toList());
map.put("submitUsers", String.join(",", submitUsers));
map.put(SUBMIT_USER, String.join(",", submitUsers));
}
map.put("beginTime", loadCaseBean.getString("beginTime"));
map.put("endTime", loadCaseBean.getString("endTime"));
map.put(BEGIN_TIME, loadCaseBean.getString(BEGIN_TIME));
map.put(END_TIME, loadCaseBean.getString(END_TIME));
map.put(FINISH_TIME, loadCaseBean.getString(FINISH_TIME));
map.put("actualDays", loadCaseBean.getString("actualDays"));
if (StringUtils.isNotBlank(loadCaseBean.getString("standardInfo"))) {
List<String> standardInfo = JSON.parseArray(loadCaseBean.getString("standardInfo"), JSONObject.class)
map.put(ACTUAL_DAYS, loadCaseBean.getString(ACTUAL_DAYS));
if (StringUtils.isNotBlank(loadCaseBean.getString(STANDARD_INFO))) {
List<String> standardInfo = JSON.parseArray(loadCaseBean.getString(STANDARD_INFO), JSONObject.class)
.stream().map(json -> json.getString(FILE_NAME)).collect(Collectors.toList());
map.put("standardInfo", String.join(",", standardInfo));
map.put(STANDARD_INFO, String.join(",", standardInfo));
}
if (StringUtils.isNotBlank(loadCaseBean.getString("techSummaryInfo"))) {
List<String> techSummaryInfo = JSON.parseArray(loadCaseBean.getString("techSummaryInfo"), JSONObject.class)
if (StringUtils.isNotBlank(loadCaseBean.getString(TECH_SUMMARY_INTO))) {
List<String> techSummaryInfo = JSON.parseArray(loadCaseBean.getString(TECH_SUMMARY_INTO), JSONObject.class)
.stream().map(json -> json.getString(FILE_NAME)).collect(Collectors.toList());
map.put("techSummaryInfo", String.join(",", techSummaryInfo));
map.put(TECH_SUMMARY_INTO, String.join(",", techSummaryInfo));
}
if (StringUtils.isNotBlank(loadCaseBean.getString("patentInfo"))) {
List<String> patentInfo = JSON.parseArray(loadCaseBean.getString("patentInfo"), JSONObject.class)
if (StringUtils.isNotBlank(loadCaseBean.getString(PATENT_INFO))) {
List<String> patentInfo = JSON.parseArray(loadCaseBean.getString(PATENT_INFO), JSONObject.class)
.stream().map(json -> json.getString(FILE_NAME)).collect(Collectors.toList());
map.put("patentInfo", String.join(",", patentInfo));
map.put(PATENT_INFO, String.join(",", patentInfo));
}
map.put("inputForm", null);
map.put("days", loadCaseBean.getInteger("days"));
map.put(INPUT_FORM, null);
map.put(DAYS, loadCaseBean.getInteger(DAYS));
String analysisSoftware = loadCaseBean.getString(ANALYSIS_SOFTWARE);
if (StringUtils.isNotBlank(analysisSoftware)) {
List<String> analysisSoftwareList = new ArrayList<>();
@@ -1081,19 +1094,19 @@ public class ExportExcelServiceImpl implements ExportExcelService {
customizeHeads.add(HeadVO.builder().headTitle(Arrays.asList("达成情况")).key(ACHIVE).build());
customizeHeads.add(HeadVO.builder().headTitle(Arrays.asList("所属节点")).key(PROJECT_NODE).build());
customizeHeads.add(HeadVO.builder().headTitle(Arrays.asList(SIM_RESPONSIBILITY)).key(SIM_USERS).build());
customizeHeads.add(HeadVO.builder().headTitle(Arrays.asList(INPUT_RESPONSIBILITY)).key("importUsers").build());
customizeHeads.add(HeadVO.builder().headTitle(Arrays.asList(SIM_PROPOSOR)).key("submitUsers").build());
customizeHeads.add(HeadVO.builder().headTitle(Arrays.asList("计划开始")).key("beginTime").build());
customizeHeads.add(HeadVO.builder().headTitle(Arrays.asList("计划结束")).key("endTime").build());
customizeHeads.add(HeadVO.builder().headTitle(Arrays.asList(INPUT_RESPONSIBILITY)).key(IMPORT_USER).build());
customizeHeads.add(HeadVO.builder().headTitle(Arrays.asList(SIM_PROPOSOR)).key(SUBMIT_USER).build());
customizeHeads.add(HeadVO.builder().headTitle(Arrays.asList("计划开始")).key(BEGIN_TIME).build());
customizeHeads.add(HeadVO.builder().headTitle(Arrays.asList("计划结束")).key(END_TIME).build());
customizeHeads.add(HeadVO.builder().headTitle(Arrays.asList(ACTUAL_FINISH_TIME)).key(FINISH_TIME).build());
customizeHeads.add(HeadVO.builder().headTitle(Arrays.asList("实际工时")).key("actualDays").build());
customizeHeads.add(HeadVO.builder().headTitle(Arrays.asList("汇总报告")).key("summaryReport").build());
customizeHeads.add(HeadVO.builder().headTitle(Arrays.asList("对比报告")).key("benchmarkReport").build());
customizeHeads.add(HeadVO.builder().headTitle(Arrays.asList("执行规范")).key("standardInfo").build());
customizeHeads.add(HeadVO.builder().headTitle(Arrays.asList("技术总结")).key("techSummaryInfo").build());
customizeHeads.add(HeadVO.builder().headTitle(Arrays.asList("专利论文")).key("patentInfo").build());
customizeHeads.add(HeadVO.builder().headTitle(Arrays.asList("输入表单")).key("inputForm").build());
customizeHeads.add(HeadVO.builder().headTitle(Arrays.asList("标准工时")).key("days").build());
customizeHeads.add(HeadVO.builder().headTitle(Arrays.asList("实际工时")).key(ACTUAL_DAYS).build());
customizeHeads.add(HeadVO.builder().headTitle(Arrays.asList("汇总报告")).key(SUMMARY_REPORT).build());
customizeHeads.add(HeadVO.builder().headTitle(Arrays.asList("对比报告")).key(BENCH_REPORT).build());
customizeHeads.add(HeadVO.builder().headTitle(Arrays.asList("执行规范")).key(STANDARD_INFO).build());
customizeHeads.add(HeadVO.builder().headTitle(Arrays.asList("技术总结")).key(TECH_SUMMARY_INTO).build());
customizeHeads.add(HeadVO.builder().headTitle(Arrays.asList("专利论文")).key(PATENT_INFO).build());
customizeHeads.add(HeadVO.builder().headTitle(Arrays.asList("输入表单")).key(INPUT_FORM).build());
customizeHeads.add(HeadVO.builder().headTitle(Arrays.asList("标准工时")).key(DAYS).build());
customizeHeads.add(HeadVO.builder().headTitle(Arrays.asList("分析软件")).key(ANALYSIS_SOFTWARE).build());
customizeHeads.add(HeadVO.builder().headTitle(Arrays.asList("风险措施")).key(MEASURE).build());
customizeHeads.add(HeadVO.builder().headTitle(Arrays.asList("描述")).key(DESC).build());
@@ -1107,20 +1120,20 @@ public class ExportExcelServiceImpl implements ExportExcelService {
customizeHeads.add(HeadVO.builder().headTitle(Arrays.asList("达成情况")).key(ACHIVE).build());
customizeHeads.add(HeadVO.builder().headTitle(Arrays.asList("所属节点")).key(PROJECT_NODE).build());
customizeHeads.add(HeadVO.builder().headTitle(Arrays.asList(SIM_RESPONSIBILITY)).key(SIM_USERS).build());
customizeHeads.add(HeadVO.builder().headTitle(Arrays.asList(INPUT_RESPONSIBILITY)).key("importUsers").build());
customizeHeads.add(HeadVO.builder().headTitle(Arrays.asList(SIM_PROPOSOR)).key("submitUsers").build());
customizeHeads.add(HeadVO.builder().headTitle(Arrays.asList("计划开始")).key("beginTime").build());
customizeHeads.add(HeadVO.builder().headTitle(Arrays.asList("计划结束")).key("endTime").build());
customizeHeads.add(HeadVO.builder().headTitle(Arrays.asList(INPUT_RESPONSIBILITY)).key(IMPORT_USER).build());
customizeHeads.add(HeadVO.builder().headTitle(Arrays.asList(SIM_PROPOSOR)).key(SUBMIT_USER).build());
customizeHeads.add(HeadVO.builder().headTitle(Arrays.asList("计划开始")).key(BEGIN_TIME).build());
customizeHeads.add(HeadVO.builder().headTitle(Arrays.asList("计划结束")).key(END_TIME).build());
customizeHeads.add(HeadVO.builder().headTitle(Arrays.asList(ACTUAL_FINISH_TIME)).key(FINISH_TIME).build());
customizeHeads.add(HeadVO.builder().headTitle(Arrays.asList("实际工时")).key("actualDays").build());
customizeHeads.add(HeadVO.builder().headTitle(Arrays.asList("汇总报告")).key("summaryReport").build());
customizeHeads.add(HeadVO.builder().headTitle(Arrays.asList("对比报告")).key("benchmarkReport").build());
customizeHeads.add(HeadVO.builder().headTitle(Arrays.asList("交付物及审签")).key("deliverables").build());
customizeHeads.add(HeadVO.builder().headTitle(Arrays.asList("执行规范")).key("standardInfo").build());
customizeHeads.add(HeadVO.builder().headTitle(Arrays.asList("专利论文")).key("patentInfo").build());
customizeHeads.add(HeadVO.builder().headTitle(Arrays.asList("技术总结")).key("techSummaryInfo").build());
customizeHeads.add(HeadVO.builder().headTitle(Arrays.asList("输入表单")).key("inputForm").build());
customizeHeads.add(HeadVO.builder().headTitle(Arrays.asList("标准工时")).key("days").build());
customizeHeads.add(HeadVO.builder().headTitle(Arrays.asList("实际工时")).key(ACTUAL_DAYS).build());
customizeHeads.add(HeadVO.builder().headTitle(Arrays.asList("汇总报告")).key(SUMMARY_REPORT).build());
customizeHeads.add(HeadVO.builder().headTitle(Arrays.asList("对比报告")).key(BENCH_REPORT).build());
customizeHeads.add(HeadVO.builder().headTitle(Arrays.asList("交付物及审签")).key(DELIVERABLES).build());
customizeHeads.add(HeadVO.builder().headTitle(Arrays.asList("执行规范")).key(STANDARD_INFO).build());
customizeHeads.add(HeadVO.builder().headTitle(Arrays.asList("专利论文")).key(PATENT_INFO).build());
customizeHeads.add(HeadVO.builder().headTitle(Arrays.asList("技术总结")).key(TECH_SUMMARY_INTO).build());
customizeHeads.add(HeadVO.builder().headTitle(Arrays.asList("输入表单")).key(INPUT_FORM).build());
customizeHeads.add(HeadVO.builder().headTitle(Arrays.asList("标准工时")).key(DAYS).build());
customizeHeads.add(HeadVO.builder().headTitle(Arrays.asList("分析软件")).key(ANALYSIS_SOFTWARE).build());
customizeHeads.add(HeadVO.builder().headTitle(Arrays.asList("风险措施")).key(MEASURE).build());
customizeHeads.add(HeadVO.builder().headTitle(Arrays.asList("描述")).key(DESC).build());
@@ -1135,19 +1148,19 @@ public class ExportExcelServiceImpl implements ExportExcelService {
customizeHeads.add(HeadVO.builder().headTitle(Arrays.asList("达成情况")).key(ACHIVE).build());
customizeHeads.add(HeadVO.builder().headTitle(Arrays.asList("所属节点")).key(PROJECT_NODE).build());
customizeHeads.add(HeadVO.builder().headTitle(Arrays.asList(SIM_RESPONSIBILITY)).key(SIM_USERS).build());
customizeHeads.add(HeadVO.builder().headTitle(Arrays.asList(INPUT_RESPONSIBILITY)).key("importUsers").build());
customizeHeads.add(HeadVO.builder().headTitle(Arrays.asList(SIM_PROPOSOR)).key("submitUsers").build());
customizeHeads.add(HeadVO.builder().headTitle(Arrays.asList("计划开始")).key("beginTime").build());
customizeHeads.add(HeadVO.builder().headTitle(Arrays.asList("计划结束")).key("endTime").build());
customizeHeads.add(HeadVO.builder().headTitle(Arrays.asList(INPUT_RESPONSIBILITY)).key(IMPORT_USER).build());
customizeHeads.add(HeadVO.builder().headTitle(Arrays.asList(SIM_PROPOSOR)).key(SUBMIT_USER).build());
customizeHeads.add(HeadVO.builder().headTitle(Arrays.asList("计划开始")).key(BEGIN_TIME).build());
customizeHeads.add(HeadVO.builder().headTitle(Arrays.asList("计划结束")).key(END_TIME).build());
customizeHeads.add(HeadVO.builder().headTitle(Arrays.asList(ACTUAL_FINISH_TIME)).key(FINISH_TIME).build());
customizeHeads.add(HeadVO.builder().headTitle(Arrays.asList("实际工时")).key("actualDays").build());
customizeHeads.add(HeadVO.builder().headTitle(Arrays.asList("汇总报告")).key("summaryReport").build());
customizeHeads.add(HeadVO.builder().headTitle(Arrays.asList("对比报告")).key("benchmarkReport").build());
customizeHeads.add(HeadVO.builder().headTitle(Arrays.asList("执行规范")).key("standardInfo").build());
customizeHeads.add(HeadVO.builder().headTitle(Arrays.asList("专利论文")).key("patentInfo").build());
customizeHeads.add(HeadVO.builder().headTitle(Arrays.asList("技术总结")).key("techSummaryInfo").build());
customizeHeads.add(HeadVO.builder().headTitle(Arrays.asList("输入表单")).key("inputForm").build());
customizeHeads.add(HeadVO.builder().headTitle(Arrays.asList("标准工时")).key("days").build());
customizeHeads.add(HeadVO.builder().headTitle(Arrays.asList("实际工时")).key(ACTUAL_DAYS).build());
customizeHeads.add(HeadVO.builder().headTitle(Arrays.asList("汇总报告")).key(SUMMARY_REPORT).build());
customizeHeads.add(HeadVO.builder().headTitle(Arrays.asList("对比报告")).key(BENCH_REPORT).build());
customizeHeads.add(HeadVO.builder().headTitle(Arrays.asList("执行规范")).key(STANDARD_INFO).build());
customizeHeads.add(HeadVO.builder().headTitle(Arrays.asList("专利论文")).key(PATENT_INFO).build());
customizeHeads.add(HeadVO.builder().headTitle(Arrays.asList("技术总结")).key(TECH_SUMMARY_INTO).build());
customizeHeads.add(HeadVO.builder().headTitle(Arrays.asList("输入表单")).key(INPUT_FORM).build());
customizeHeads.add(HeadVO.builder().headTitle(Arrays.asList("标准工时")).key(DAYS).build());
customizeHeads.add(HeadVO.builder().headTitle(Arrays.asList("分析软件")).key(ANALYSIS_SOFTWARE).build());
customizeHeads.add(HeadVO.builder().headTitle(Arrays.asList("风险措施")).key(MEASURE).build());
customizeHeads.add(HeadVO.builder().headTitle(Arrays.asList("描述")).key(DESC).build());
@@ -1161,19 +1174,19 @@ public class ExportExcelServiceImpl implements ExportExcelService {
customizeHeads.add(HeadVO.builder().headTitle(Arrays.asList("达成情况")).key(ACHIVE).build());
customizeHeads.add(HeadVO.builder().headTitle(Arrays.asList("所属节点")).key(PROJECT_NODE).build());
customizeHeads.add(HeadVO.builder().headTitle(Arrays.asList(SIM_RESPONSIBILITY)).key(SIM_USERS).build());
customizeHeads.add(HeadVO.builder().headTitle(Arrays.asList(INPUT_RESPONSIBILITY)).key("importUsers").build());
customizeHeads.add(HeadVO.builder().headTitle(Arrays.asList(SIM_PROPOSOR)).key("submitUsers").build());
customizeHeads.add(HeadVO.builder().headTitle(Arrays.asList("计划开始")).key("beginTime").build());
customizeHeads.add(HeadVO.builder().headTitle(Arrays.asList("计划结束")).key("endTime").build());
customizeHeads.add(HeadVO.builder().headTitle(Arrays.asList("实际工时")).key("actualDays").build());
customizeHeads.add(HeadVO.builder().headTitle(Arrays.asList("汇总报告")).key("summaryReport").build());
customizeHeads.add(HeadVO.builder().headTitle(Arrays.asList("对比报告")).key("benchmarkReport").build());
customizeHeads.add(HeadVO.builder().headTitle(Arrays.asList("交付物及审签")).key("deliverables").build());
customizeHeads.add(HeadVO.builder().headTitle(Arrays.asList("执行规范")).key("standardInfo").build());
customizeHeads.add(HeadVO.builder().headTitle(Arrays.asList("专利论文")).key("patentInfo").build());
customizeHeads.add(HeadVO.builder().headTitle(Arrays.asList("技术总结")).key("techSummaryInfo").build());
customizeHeads.add(HeadVO.builder().headTitle(Arrays.asList("输入表单")).key("inputForm").build());
customizeHeads.add(HeadVO.builder().headTitle(Arrays.asList("标准工时")).key("days").build());
customizeHeads.add(HeadVO.builder().headTitle(Arrays.asList(INPUT_RESPONSIBILITY)).key(IMPORT_USER).build());
customizeHeads.add(HeadVO.builder().headTitle(Arrays.asList(SIM_PROPOSOR)).key(SUBMIT_USER).build());
customizeHeads.add(HeadVO.builder().headTitle(Arrays.asList("计划开始")).key(BEGIN_TIME).build());
customizeHeads.add(HeadVO.builder().headTitle(Arrays.asList("计划结束")).key(END_TIME).build());
customizeHeads.add(HeadVO.builder().headTitle(Arrays.asList("实际工时")).key(ACTUAL_DAYS).build());
customizeHeads.add(HeadVO.builder().headTitle(Arrays.asList("汇总报告")).key(SUMMARY_REPORT).build());
customizeHeads.add(HeadVO.builder().headTitle(Arrays.asList("对比报告")).key(BENCH_REPORT).build());
customizeHeads.add(HeadVO.builder().headTitle(Arrays.asList("交付物及审签")).key(DELIVERABLES).build());
customizeHeads.add(HeadVO.builder().headTitle(Arrays.asList("执行规范")).key(STANDARD_INFO).build());
customizeHeads.add(HeadVO.builder().headTitle(Arrays.asList("专利论文")).key(PATENT_INFO).build());
customizeHeads.add(HeadVO.builder().headTitle(Arrays.asList("技术总结")).key(TECH_SUMMARY_INTO).build());
customizeHeads.add(HeadVO.builder().headTitle(Arrays.asList("输入表单")).key(INPUT_FORM).build());
customizeHeads.add(HeadVO.builder().headTitle(Arrays.asList("标准工时")).key(DAYS).build());
customizeHeads.add(HeadVO.builder().headTitle(Arrays.asList("分析软件")).key(ANALYSIS_SOFTWARE).build());
customizeHeads.add(HeadVO.builder().headTitle(Arrays.asList("风险措施")).key(MEASURE).build());
customizeHeads.add(HeadVO.builder().headTitle(Arrays.asList("描述")).key(DESC).build());
@@ -1578,13 +1591,13 @@ public class ExportExcelServiceImpl implements ExportExcelService {
Map<String, Object> map = new HashMap<>();
map.put(LOADCASE_NAME, loadcaseJsonObj.getString(LOADCASE_NAME));
map.put(TASK_TYPE, systemMapper.getItemTextInDict("任务类型", tenantId, loadcaseJsonObj.getString(NODE_TYPE)));
if (StringUtils.isNotBlank(loadcaseJsonObj.getString("standardInfo"))) {
List<String> standardInfo = JSON.parseArray(loadcaseJsonObj.getString("standardInfo"), JSONObject.class)
if (StringUtils.isNotBlank(loadcaseJsonObj.getString(STANDARD_INFO))) {
List<String> standardInfo = JSON.parseArray(loadcaseJsonObj.getString(STANDARD_INFO), JSONObject.class)
.stream().map(json -> json.getString(FILE_NAME)).collect(Collectors.toList());
map.put("standardInfo", String.join(",", standardInfo));
map.put(STANDARD_INFO, String.join(",", standardInfo));
}
map.put("inputForm", null);
map.put("days", loadcaseJsonObj.getInteger("days"));
map.put(INPUT_FORM, null);
map.put(DAYS, loadcaseJsonObj.getInteger(DAYS));
analysisSoftware = loadcaseJsonObj.getString(ANALYSIS_SOFTWARE);
if (StringUtils.isNotBlank(analysisSoftware)) {
@@ -1645,9 +1658,9 @@ public class ExportExcelServiceImpl implements ExportExcelService {
List<HeadVO> customizeHeads = new ArrayList<>();
customizeHeads.add(HeadVO.builder().headTitle(List.of("任务名称")).key(LOADCASE_NAME).build());
customizeHeads.add(HeadVO.builder().headTitle(List.of("任务类型")).key(TASK_TYPE).build());
customizeHeads.add(HeadVO.builder().headTitle(List.of("执行规范")).key("standardInfo").build());
customizeHeads.add(HeadVO.builder().headTitle(List.of("输入表单")).key("inputForm").build());
customizeHeads.add(HeadVO.builder().headTitle(List.of("标准工时")).key("days").build());
customizeHeads.add(HeadVO.builder().headTitle(List.of("执行规范")).key(STANDARD_INFO).build());
customizeHeads.add(HeadVO.builder().headTitle(List.of("输入表单")).key(INPUT_FORM).build());
customizeHeads.add(HeadVO.builder().headTitle(List.of("标准工时")).key(DAYS).build());
customizeHeads.add(HeadVO.builder().headTitle(List.of("分析软件")).key(ANALYSIS_SOFTWARE).build());
customizeHeads.add(HeadVO.builder().headTitle(List.of("责任单位")).key(RESP_UNIT).build());
return customizeHeads;

4
ccag-tvs-sim/ccag-tvs-sim-biz/src/main/java/com/ccag/utils/AESUtil.java
View File

@@ -22,7 +22,7 @@ public class AESUtil {
/**
* 块大小固定为8字节
*/
private final static String AES_CBC_PKCS5PADDING = "AES/ECB/PKCS5Padding";
private final static String AES_CBC_PKCS5PADDING = "RSA/ECB/OAEPWITHSHA-256ANDMGF1PADDING";
/**
* 加密字符串
@@ -35,7 +35,7 @@ public class AESUtil {
byte[] key = Base64.getDecoder().decode(FINAL_PARAM);
byte[] data = content.getBytes();
SecretKeySpec secretKeySpec = new SecretKeySpec(key, "AES");
Cipher cipher = Cipher.getInstance("AES/ECB/PKCS5Padding");
Cipher cipher = Cipher.getInstance(AES_CBC_PKCS5PADDING);
cipher.init(Cipher.ENCRYPT_MODE, secretKeySpec);
return Base64.getEncoder().encodeToString(cipher.doFinal(data));
}

6
ccag-tvs-sim/ccag-tvs-sim-biz/src/main/java/com/ccag/utils/EncUtil.java
View File

@@ -10,7 +10,7 @@ import java.util.Base64;
@Component
public class EncUtil {
//private static final String PARAM = "q1w2e3r4t5y6u7i8";
private final static String AES_CBC_PKCS5PADDING = "RSA/ECB/OAEPWITHSHA-256ANDMGF1PADDING";
/**
* AES的加密函数
*
@@ -20,7 +20,7 @@ public class EncUtil {
*/
public static String aesEncrypt(String str) throws Exception {
if (str == null) return null;
Cipher cipher = Cipher.getInstance("AES/ECB/PKCS5Padding");
Cipher cipher = Cipher.getInstance(AES_CBC_PKCS5PADDING);
String inputString = System.getenv("SECRET");
cipher.init(Cipher.ENCRYPT_MODE, new SecretKeySpec(inputString.getBytes(StandardCharsets.UTF_8), "AES"));
byte[] bytes = cipher.doFinal(str.getBytes(StandardCharsets.UTF_8));
@@ -37,7 +37,7 @@ public class EncUtil {
*/
public static String aesDecrypt(String str) throws Exception {
if (str == null) return null;
Cipher cipher = Cipher.getInstance("AES/ECB/PKCS5Padding");
Cipher cipher = Cipher.getInstance(AES_CBC_PKCS5PADDING);
String inputString = System.getenv("SECRET");
cipher.init(Cipher.DECRYPT_MODE, new SecretKeySpec(inputString.getBytes(StandardCharsets.UTF_8), "AES"));
Base64.Decoder decoder = Base64.getDecoder();

4
ccag-tvs-sim/ccag-tvs-sim-biz/src/main/java/com/ccag/utils/SdmThreadService.java
View File

@@ -23,9 +23,7 @@ public class SdmThreadService {
public static SdmThreadService getInstance() {
if (instance == null) {
synchronized (SdmThreadService.class) {
if (instance == null) {
instance = new SdmThreadService();
}
instance = new SdmThreadService();
}
}
return instance;