From de3832e6560ead526d2ad86dd1feea39a39e3aef Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期六, 15 三月 2025 17:54:09 +0800
Subject: [PATCH] 报告调整2.0
---
inspect-server/src/main/java/com/yuanchu/mom/utils/FuSheUtils.java | 198 +++++++++++++++++++++++++------------------------
1 files changed, 101 insertions(+), 97 deletions(-)
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/utils/FuSheUtils.java b/inspect-server/src/main/java/com/yuanchu/mom/utils/FuSheUtils.java
index c969664..e764498 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/utils/FuSheUtils.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/utils/FuSheUtils.java
@@ -60,6 +60,7 @@
Exceldata exceldata = new Exceldata();
Map<Integer, Object> project = new HashMap<>();
HashMap<String, Object> datas1 = new HashMap<>();
+ HashMap<String, Object> biaozhun = new HashMap<>();
Boolean exitLoop = false;
for (int i = 0; i < workbook.getNumberOfSheets(); i++) {
String s = "";
@@ -90,26 +91,55 @@
default:
System.out.print("NULL\t");
}
- } else {
+ }
+ else {
switch (cell.getCellType()) {
case STRING:
if (cell.getColumnIndex() == 1) {
+ if (cell.getStringCellValue().equals("鎸囨爣")) {
+ for (Cell cell1 : row) {
+ switch (cell1.getCellType()) {
+ case STRING:
+ biaozhun.put(project.get(cell1.getColumnIndex()).toString(), cell1.getStringCellValue());
+ break;
+ case NUMERIC:
+ System.out.print(cell1.getNumericCellValue() + "\t");
+ break;
+ case BOOLEAN:
+ System.out.print(cell1.getBooleanCellValue() + "\t");
+ break;
+ case FORMULA:
+ System.out.print(cell1.getCellFormula() + "\t");
+ break;
+ default:
+ System.out.print("NULL\t");
+ }
+ }
+ }
exitLoop = true;
break;
}
- if (StringUtils.isNotEmpty(s)) {
- datas.put(s, list);
+ String value = "zss";
+ switch (row.getCell(1).getCellType()){
+ case STRING:
+ value = cell.getStringCellValue();
+ break;
}
- list = new ArrayList<>();
- s = cell.getStringCellValue();
- datas.put(s, cell.getStringCellValue());
- System.out.print(cell.getStringCellValue() + "\t");
+ if (value.equals("zss")){
+ if (StringUtils.isNotEmpty(s)) {
+ datas.put(s, list);
+ }
+ list = new ArrayList<>();
+ s = cell.getStringCellValue();
+ datas.put(s, cell.getStringCellValue());
+ System.out.print(cell.getStringCellValue() + "\t");
+ }
break;
case NUMERIC:
- int columnIndex = cell.getColumnIndex();
- Object o = project.get(columnIndex);
- map.put(o.toString(), cell.getNumericCellValue());
- System.out.print(cell.getNumericCellValue() + "\t");
+ int columnIndex = cell.getColumnIndex();
+ Object o = project.get(columnIndex);
+ map.put(o.toString(), cell.getNumericCellValue());
+ System.out.print(cell.getNumericCellValue() + "\t");
break;
case BOOLEAN:
System.out.print(cell.getBooleanCellValue() + "\t");
@@ -131,6 +161,7 @@
}
}
}
+ list=list.stream().filter(map -> !map.isEmpty()).collect(Collectors.toList());
datas.put(s, list);
map1.put(sheetName, datas);
datas1.putAll(map1);
@@ -162,7 +193,6 @@
}
}
System.out.println(map);
- int size = map.size();
for (String s1 : map.keySet()) {
String o = map.get(s1).toString();
List<String> collect = Arrays.stream(o.split(",")).collect(Collectors.toList());
@@ -183,7 +213,7 @@
}
}
System.out.println(map);
- createWord(sonLaboratory, document, exceldata, map, insOrderFile);
+ createWord(sonLaboratory, document, exceldata, map, biaozhun, insOrderFile);
} catch (IOException e) {
e.printStackTrace();
} finally {
@@ -212,8 +242,6 @@
fileInputStream = new FileInputStream(new File(excelFilePath));
workbook = new XSSFWorkbook(fileInputStream); // 瀵逛簬 .xlsx 鏂囦欢
XWPFDocument document = new XWPFDocument();
-
- Boolean exitLoop = false;
for (int i = 0; i < workbook.getNumberOfSheets(); i++) {
Exceldata exceldata = new Exceldata();
HashMap<Integer, Object> project = new HashMap<>();
@@ -229,14 +257,10 @@
Boolean biaoji = false;
int lastRowNum = sheet.getLastRowNum();
for (Row row : sheet) {
-
count++;
HashMap<String, Object> map1 = new HashMap<>();
HashMap<String, Object> pingjun = new HashMap<>();
-
- HashMap<String, Object> map = new HashMap<>();
for (Cell cell : row) {
-
if (row.getRowNum() == 0) {
switch (cell.getCellType()) {
case STRING:
@@ -255,28 +279,8 @@
default:
System.out.print("NULL\t");
}
- } else if (row.getRowNum() == 1) {
-
- switch (cell.getCellType()) {
- case STRING:
- biaozhun.put(project.get(cell.getColumnIndex()).toString(), cell.getStringCellValue());
- break;
- case NUMERIC:
- System.out.print(cell.getNumericCellValue() + "\t");
- break;
- case BOOLEAN:
- System.out.print(cell.getBooleanCellValue() + "\t");
- break;
- case FORMULA:
- System.out.print(cell.getCellFormula() + "\t");
- break;
- default:
- System.out.print("NULL\t");
- }
} else if (row.getRowNum() > 2) {
-
if (cell.getColumnIndex() == 0 && StringUtils.isNotEmpty(cell.getStringCellValue())) {
-
if (map2.size() != 0) {
map2.put(port, list);
datas1.put(jiaodu, map2);
@@ -320,6 +324,25 @@
}
}
+ } else if (value.equals("鎸囨爣")) {
+ for (Cell cell1 : row) {
+ switch (cell1.getCellType()) {
+ case STRING:
+ biaozhun.put(project.get(cell1.getColumnIndex()).toString(), cell1.getStringCellValue());
+ break;
+ case NUMERIC:
+ System.out.print(cell1.getNumericCellValue() + "\t");
+ break;
+ case BOOLEAN:
+ System.out.print(cell1.getBooleanCellValue() + "\t");
+ break;
+ case FORMULA:
+ System.out.print(cell1.getCellFormula() + "\t");
+ break;
+ default:
+ System.out.print("NULL\t");
+ }
+ }
} else {
biaoji = true;
}
@@ -337,7 +360,6 @@
default:
System.out.print("NULL\t");
}
-
}
}
if (biaoji) {
@@ -345,7 +367,6 @@
break;
}
}
-
if (map1.size() != 0) {
list.add(map1);
}
@@ -369,7 +390,6 @@
Map<String, List<HashMap<String, Object>>> numbers = (Map<String, List<HashMap<String, Object>>>) datas1.get(s);
for (String s1 : numbers.keySet()) {
List<HashMap<String, Object>> hashMaps = numbers.get(s1);
-
List<Integer> floatList = new ArrayList<>();
for (Map<String, Object> number : hashMaps) {
number.put("绔彛", s1);
@@ -388,17 +408,12 @@
}
}
-
System.out.println(map);
-
- int size = map.size();
for (String s1 : map.keySet()) {
String o = map.get(s1).toString();
-
List<String> collect = Arrays.stream(o.split(",")).collect(Collectors.toList());
int size1 = -1;
-
for (String s : datas1.keySet()) {
Map<String, List<HashMap<String, Object>>> o1 = (Map<String, List<HashMap<String, Object>>>) datas1.get(s);
for (String s3 : o1.keySet()) {
@@ -425,7 +440,7 @@
String[] split = insOrderFile.getFileName().split("\\.");
String name = insOrderFile.getFileName().replace("#", "&").substring(0, (insOrderFile.getFileName().length() - split[split.length - 1].length()));
String url = UUID.randomUUID() + "_" + insSample.getSampleCode() + "_" + sonLaboratory + name + "瑙ｆ瀽鐨勮緪灏勭珯鐐规姤鍛�.docx";
- url=url.replace("#", "&");
+ url = url.replace("#", "&");
FileOutputStream out = new FileOutputStream(wordUrl + "/" + url);
document.write(out);
out.close();
@@ -458,7 +473,7 @@
}
//杩戝満
- public void createWord(String sonLaboratory, XWPFDocument document, Exceldata exceldata, HashMap<String, Object> map, InsOrderFile insOrderFile) throws IOException {
+ public void createWord(String sonLaboratory, XWPFDocument document, Exceldata exceldata, HashMap<String, Object> map, HashMap<String, Object> bz, InsOrderFile insOrderFile) throws IOException {
int size = 1;
XWPFParagraph paragraphs = document.createParagraph();
XWPFRun runs = paragraphs.createRun();
@@ -510,7 +525,7 @@
XWPFParagraph paragraph18 = table1.getRow(1).getCell(0).getParagraphArray(0);
paragraph18.setAlignment(ParagraphAlignment.CENTER);
XWPFRun run18 = paragraph18.createRun();
- run18.setText("棰戞锛� " + result1 + "MHz " + "涓嬪�捐" + result);
+ run18.setText("涓嬪�捐" + result);
List<String> collect = Arrays.stream(split).collect(Collectors.toList());
List<Map<String, Object>> list = new ArrayList<>();
// 瀵规墍鏈夌殑閿仛鍚�
@@ -567,20 +582,26 @@
paragraph1.setAlignment(ParagraphAlignment.CENTER);
XWPFRun run1 = paragraph1.createRun();
run1.setText(s2);
- // 璋冪敤鏂规硶鎻愬彇绗竴涓嫭鍙峰唴鐨勫唴瀹�
- String firstContent = extractFirstContentFromBrackets(s2);
- if (firstContent != null) {
- XWPFParagraph paragraph2 = table.getRow(0).getCell(2).getParagraphArray(0);
- paragraph2.setAlignment(ParagraphAlignment.CENTER);
- XWPFRun run2 = paragraph2.createRun();
- run2.setText(firstContent);
+ // 鍗曚綅
+ XWPFParagraph paragraph2 = table.getRow(0).getCell(2).getParagraphArray(0);
+ XWPFRun run2 = paragraph2.createRun();
+ if (s2.contains("澧炵泭")) {
+ run2.setText("dBi");
+ } else if (s2.contains("娉㈢摚瀹藉害") || s2.contains("娉㈡潫瀹藉害") || s2.contains("涓嬪�捐")) {
+ run2.setText("掳");
+ } else if (s2.contains("鍓嶅悗姣�") || s2.contains("浜ゅ弶鏋佸寲") || s2.contains("鏃佺摚鎶戝埗") || s2.contains("涓嬮檷") || s2.contains("闆剁偣濉厖") || s2.contains("鍓摚鐢靛钩")) {
+ run2.setText("dB");
+ } else if (s2.contains("鏁堢巼") || s2.contains("鎵囧尯鍗犳瘮")) {
+ run2.setText("%");
} else {
- System.out.println("娌℃湁鎵惧埌鎷彿鍐呯殑鍐呭銆�");
+ run2.setText("");
}
XWPFParagraph paragraph3 = table.getRow(0).getCell(3).getParagraphArray(0);
paragraph3.setAlignment(ParagraphAlignment.CENTER);
XWPFRun run3 = paragraph3.createRun();
- run3.setText("/");
+ if (bz.get(s2) != null) {
+ run3.setText(bz.get(s2).toString());
+ } else run3.setText("");
XWPFParagraph paragraph4 = table.getRow(0).getCell(4).getParagraphArray(0);
paragraph4.setAlignment(ParagraphAlignment.CENTER);
XWPFRun run4 = paragraph4.createRun();
@@ -592,7 +613,7 @@
XWPFParagraph paragraph6 = table.getRow(0).getCell(cell - 1).getParagraphArray(0);
paragraph6.setAlignment(ParagraphAlignment.CENTER);
XWPFRun run6 = paragraph6.createRun();
- run6.setText("/");
+ run6.setText("鍒ゅ畾");
XWPFParagraph paragraph7 = table.getRow(2).getCell(cell - 1).getParagraphArray(0);
paragraph7.setAlignment(ParagraphAlignment.CENTER);
XWPFRun run7 = paragraph7.createRun();
@@ -604,7 +625,7 @@
XWPFParagraph paragraph9 = table.getRow(row - 1).getCell(cell - 1).getParagraphArray(0);
paragraph9.setAlignment(ParagraphAlignment.CENTER);
XWPFRun run9 = paragraph9.createRun();
- run9.setText("/");
+ run9.setText("");
for (int i = 0; i < collect.size(); i++) {
String s3 = collect.get(i);
if (s3.contains("绔彛")) {
@@ -719,13 +740,11 @@
XWPFParagraph paragraph18 = table1.getRow(1).getCell(0).getParagraphArray(0);
XWPFRun run18 = paragraph18.createRun();
- run18.setText("棰戞锛� " + result1 + "MHz " + "涓嬪�捐" + result);
+ run18.setText("涓嬪�捐" + result);
List<String> collect = Arrays.stream(split).collect(Collectors.toList());
collect.sort((o1, o21) -> Integer.parseInt(o1.substring((o1.length() - 1))) - Integer.parseInt(o21.substring(o21.length() - 1)));
-
- int size1 = 0;
List<Map<String, Object>> list = new ArrayList<>();
@@ -762,14 +781,6 @@
XWPFTable table = document.createTable(row, cell);
table.setWidth("100%");
-
-
-
-
- /* // 鍚堝苟鍗曞厓鏍�
- mergeCellsHorizontally(table, 0, 0, 7);*/
-
-
//鍨傜洿
mergeCellsVertically(table, 0, 0, row - 1);
mergeCellsVertically(table, 1, 0, row - 1);
@@ -792,22 +803,28 @@
XWPFRun run1 = paragraph1.createRun();
run1.setText(s2);
- // 璋冪敤鏂规硶鎻愬彇绗竴涓嫭鍙峰唴鐨勫唴瀹�
- String firstContent = extractFirstContentFromBrackets(s2);
- if (firstContent != null) {
- XWPFParagraph paragraph2 = table.getRow(0).getCell(2).getParagraphArray(0);
- XWPFRun run2 = paragraph2.createRun();
- run2.setText(firstContent);
+ // 鍗曚綅
+ XWPFParagraph paragraph2 = table.getRow(0).getCell(2).getParagraphArray(0);
+ XWPFRun run2 = paragraph2.createRun();
+ if (s2.contains("澧炵泭")) {
+ run2.setText("dBi");
+ } else if (s2.contains("娉㈢摚瀹藉害") || s2.contains("娉㈡潫瀹藉害") || s2.contains("涓嬪�捐")) {
+ run2.setText("掳");
+ } else if (s2.contains("鍓嶅悗姣�") || s2.contains("浜ゅ弶鏋佸寲") || s2.contains("鏃佺摚鎶戝埗") || s2.contains("涓嬮檷") || s2.contains("闆剁偣濉厖") || s2.contains("鍓摚鐢靛钩")) {
+ run2.setText("dB");
+ } else if (s2.contains("鏁堢巼") || s2.contains("鎵囧尯鍗犳瘮")) {
+ run2.setText("%");
} else {
- System.out.println("娌℃湁鎵惧埌鎷彿鍐呯殑鍐呭銆�");
+ run2.setText("");
}
XWPFParagraph paragraph3 = table.getRow(0).getCell(3).getParagraphArray(0);
+ paragraph3.setAlignment(ParagraphAlignment.CENTER);
XWPFRun run3 = paragraph3.createRun();
if (bz.get(s2) != null) {
run3.setText(bz.get(s2).toString());
- }
+ } else run3.setText("");
XWPFParagraph paragraph4 = table.getRow(0).getCell(4).getParagraphArray(0);
@@ -815,12 +832,13 @@
run4.setText("棰戠巼锛圡Hz锛�");
XWPFParagraph paragraph5 = table.getRow(0).getCell(5).getParagraphArray(0);
+ paragraph5.setAlignment(ParagraphAlignment.CENTER);
XWPFRun run5 = paragraph5.createRun();
run5.setText("绔彛");
XWPFParagraph paragraph6 = table.getRow(0).getCell(cell - 1).getParagraphArray(0);
XWPFRun run6 = paragraph6.createRun();
- run6.setText("/");
+ run6.setText("鍒ゅ畾");
XWPFParagraph paragraph7 = table.getRow(1).getCell(cell - 1).getParagraphArray(0);
XWPFRun run7 = paragraph7.createRun();
@@ -833,7 +851,7 @@
XWPFParagraph paragraph9 = table.getRow(row - 1).getCell(cell - 1).getParagraphArray(0);
XWPFRun run9 = paragraph9.createRun();
- run9.setText("/");
+ run9.setText("");
for (int i = 0; i < collect.size(); i++) {
String s3 = collect.get(i);
@@ -879,7 +897,7 @@
XWPFParagraph paragraph11 = table.getRow(row - 1).getCell(5).getParagraphArray(0);
XWPFRun run11 = paragraph11.createRun();
double v = count / (Double.parseDouble(s1.toString()) * Double.parseDouble(i1.toString()));
- run11.setText(o2.get(s2).toString());
+ run11.setText(String.format("%.2f",(double)o2.get(s2)));
size++;
}
@@ -909,20 +927,6 @@
table.getRow(i).getCell(col).getCTTc().addNewTcPr().addNewVMerge().setVal(STMerge.CONTINUE);
}
}
- }
-
- // 鎻愬彇绗竴涓嫭鍙峰唴鐨勫唴瀹�
- public static String extractFirstContentFromBrackets(String str) {
- // 瀹氫箟姝ｅ垯琛ㄨ揪寮忥紝鍖归厤鎷彿鍐呯殑鍐呭锛屽悓鏃舵敮鎸佷腑鏂囧拰鑻辨枃鎷彿
- Pattern pattern = Pattern.compile("\\锛�(.*?)\\锛墊\\((.*?)\\)");
- Matcher matcher = pattern.matcher(str);
-
- // 鏌ユ壘绗竴涓尮閰嶇殑鍐呭
- if (matcher.find()) {
- // 鑾峰彇鎷彿鍐呯殑鍐呭锛屽垽鏂槸涓枃鎷彿杩樻槸鑻辨枃鎷彿
- return matcher.group(1) != null ? matcher.group(1) : matcher.group(2);
- }
- return null; // 濡傛灉娌℃湁鎵惧埌鍖归厤椤癸紝鍒欒繑鍥瀗ull
}
}
--
Gitblit v1.9.3