优化csv文件拆分。

Author: xwintop

src/main/java/com/xwintop/xJavaFxTool/controller/littleTools/ExcelSplitToolController.java

@@ -38,7 +38,7 @@ private void initView() {
     }
 
     private void initEvent() {
-        selectFileTextField.setText("C:\\Users\\Administrator\\Desktop\\file.csv");
+        selectFileTextField.setText("C:\\Users\\5FDSJ068\\Desktop\\test\\file.csv");
         FileChooserUtil.setOnDrag(selectFileTextField, FileChooserUtil.FileType.FILE);
         FileChooserUtil.setOnDrag(saveFilePathTextField, FileChooserUtil.FileType.FOLDER);
     }

src/main/java/com/xwintop/xJavaFxTool/services/littleTools/ExcelSplitToolService.java

@@ -65,7 +65,7 @@ public void splitExcel() throws Exception { //拆分Excel表格
             newFilePath = StringUtils.appendIfMissing(excelSplitToolController.getSaveFilePathTextField().getText(), "/", "/", "\\") + Paths.get(newFilePath).getFileName();
         }
         if (excelSplitToolController.getSplitType1RadioButton().isSelected()) {
-            splitNumber = lastRowIndex / (excelSplitToolController.getSplitType1Spinner().getValue() - 1);
+            splitNumber = (int) Math.ceil((double) lastRowIndex / excelSplitToolController.getSplitType1Spinner().getValue());
             saveSplitWorkbook(sheet, splitNumber, newFilePath);
         } else if (excelSplitToolController.getSplitType2RadioButton().isSelected()) {
             splitNumber = excelSplitToolController.getSplitType2Spinner().getValue();
@@ -93,7 +93,7 @@ public void splitCsv() throws Exception {
         int splitNumber = 0;
         if (excelSplitToolController.getSplitType1RadioButton().isSelected()) {
             List<CSVRecord> csvRecordList = parser.getRecords();
-            splitNumber = csvRecordList.size() / (excelSplitToolController.getSplitType1Spinner().getValue() - 1);
+            splitNumber = (int) Math.ceil((double) csvRecordList.size() / excelSplitToolController.getSplitType1Spinner().getValue());
             saveSplitCsv(csvRecordList.iterator(), splitNumber, newFilePath);
         } else if (excelSplitToolController.getSplitType2RadioButton().isSelected()) {
             splitNumber = excelSplitToolController.getSplitType2Spinner().getValue();
@@ -209,17 +209,19 @@ private void saveSplitCsv(Iterator<CSVRecord> iterator, int splitNumber, String
         CSVRecord firstRecord = null;
         while (iterator.hasNext()) {
             CSVRecord record = iterator.next();
-            if (isAddHead && addRowIndex == 0 && saveFileIndex == 0) {
+            if (isAddHead && firstRecord == null) {
                 firstRecord = record;
             }
             if (printer == null) {
                 printer = CSVFormat.DEFAULT.print(new PrintWriter(newFilePath + "-" + (saveFileIndex++) + ".csv"));
-                if (isAddHead && saveFileIndex != 0) {
-                    printer.printRecord(IteratorUtils.toList(record.iterator()).toArray());
+                if (isAddHead && saveFileIndex != 1) {
+                    printer.printRecord(IteratorUtils.toList(firstRecord.iterator()).toArray());
+                    addRowIndex++;
                 }
             }
             printer.printRecord(IteratorUtils.toList(record.iterator()).toArray());
-            if ((addRowIndex++ - splitNumber) == (isAddHead ? 1 : 0)) {
+            addRowIndex++;
+            if ((addRowIndex - splitNumber) == (isAddHead ? 1 : 0)) {
                 printer.flush();
                 printer.close();
                 printer = null;
@@ -239,6 +241,9 @@ private void saveSplitCsv(Iterator<CSVRecord> iterator, String newFilePath, Stri
             CSVRecord record = iterator.next();
             if (firstRecord == null) {
                 firstRecord = record;
+                if (excelSplitToolController.getIncludeHandCheckBox().isSelected()) {
+                    continue;
+                }
             }
             String rowString = "";
             for (String cellIndex : splitCellIndex) {

src/main/resources/com/xwintop/xJavaFxTool/fxmlView/littleTools/ExcelSplitTool.fxml

@@ -17,7 +17,7 @@
       <TextField fx:id="selectFileTextField" layoutX="99.0" layoutY="20.0" />
       <Button fx:id="selectFileButton" layoutX="256.0" layoutY="20.0" mnemonicParsing="false" onAction="#selectFileAction" text="选择" />
       <Label layoutX="31.0" layoutY="82.0" text="文件分隔方式：" />
-      <CheckBox fx:id="includeHandCheckBox" layoutX="31.0" layoutY="107.0" mnemonicParsing="false" selected="true" text="Excel包含标题行" />
+      <CheckBox fx:id="includeHandCheckBox" layoutX="31.0" layoutY="107.0" mnemonicParsing="false" selected="true" text="包含标题行" />
       <RadioButton fx:id="splitType1RadioButton" layoutX="33.0" layoutY="132.0" mnemonicParsing="false" selected="true" text="按平均分成">
          <toggleGroup>
             <ToggleGroup fx:id="splitTypeToggleGroup" />