单独导入修改

airport-admin/src/main/java/com/sundot/airport/web/controller/ledger/LedgerImportController.java

@@ -66,7 +66,14 @@ public class LedgerImportController extends BaseController {
     public AjaxResult importSupervisionProblem(@RequestParam("file") MultipartFile file) throws Exception {
         String batchNo = generateBatchNo();
         ExcelUtil<LedgerSupervisionProblem> util = new ExcelUtil<>(LedgerSupervisionProblem.class);
-        List<LedgerSupervisionProblem> list = util.importExcel(file.getInputStream());
+        List<LedgerSupervisionProblem> list = util.importExcel(file.getInputStream(), 1);
+        // 过滤null元素，避免空指针异常
+        if (list != null) {
+            list.removeIf(item -> item == null);
+        }
+        if (list == null || list.isEmpty()) {
+            return AjaxResult.error("导入数据为空或解析失败，请检查Excel表头是否与模板一致");
+        }
         list.forEach(item -> {
             item.setImportBatch(batchNo);
             item.setSourceType("1");
@@ -82,7 +89,14 @@ public class LedgerImportController extends BaseController {
     public AjaxResult importPatrolInspection(@RequestParam("file") MultipartFile file) throws Exception {
         String batchNo = generateBatchNo();
         ExcelUtil<LedgerPatrolInspection> util = new ExcelUtil<>(LedgerPatrolInspection.class);
-        List<LedgerPatrolInspection> list = util.importExcel(file.getInputStream());
+        List<LedgerPatrolInspection> list = util.importExcel(file.getInputStream(), 1);
+        // 过滤null元素，避免空指针异常
+        if (list != null) {
+            list.removeIf(item -> item == null);
+        }
+        if (list == null || list.isEmpty()) {
+            return AjaxResult.error("导入数据为空或解析失败，请检查Excel表头是否与模板一致");
+        }
         list.forEach(item -> {
             item.setImportBatch(batchNo);
             item.setSourceType("1");
@@ -98,7 +112,14 @@ public class LedgerImportController extends BaseController {
     public AjaxResult importRealtimeInterception(@RequestParam("file") MultipartFile file) throws Exception {
         String batchNo = generateBatchNo();
         ExcelUtil<LedgerRealtimeInterception> util = new ExcelUtil<>(LedgerRealtimeInterception.class);
-        List<LedgerRealtimeInterception> list = util.importExcel(file.getInputStream());
+        List<LedgerRealtimeInterception> list = util.importExcel(file.getInputStream(), 1);
+        // 过滤null元素，避免空指针异常
+        if (list != null) {
+            list.removeIf(item -> item == null);
+        }
+        if (list == null || list.isEmpty()) {
+            return AjaxResult.error("导入数据为空或解析失败，请检查Excel表头是否与模板一致");
+        }
         list.forEach(item -> {
             item.setImportBatch(batchNo);
             item.setSourceType("1");
@@ -114,7 +135,14 @@ public class LedgerImportController extends BaseController {
     public AjaxResult importServicePatrol(@RequestParam("file") MultipartFile file) throws Exception {
         String batchNo = generateBatchNo();
         ExcelUtil<LedgerServicePatrol> util = new ExcelUtil<>(LedgerServicePatrol.class);
-        List<LedgerServicePatrol> list = util.importExcel(file.getInputStream());
+        List<LedgerServicePatrol> list = util.importExcel(file.getInputStream(), 1);
+        // 过滤null元素，避免空指针异常
+        if (list != null) {
+            list.removeIf(item -> item == null);
+        }
+        if (list == null || list.isEmpty()) {
+            return AjaxResult.error("导入数据为空或解析失败，请检查Excel表头是否与模板一致");
+        }
         list.forEach(item -> {
             item.setImportBatch(batchNo);
             item.setSourceType("1");
@@ -130,7 +158,14 @@ public class LedgerImportController extends BaseController {
     public AjaxResult importComplaint(@RequestParam("file") MultipartFile file) throws Exception {
         String batchNo = generateBatchNo();
         ExcelUtil<LedgerComplaint> util = new ExcelUtil<>(LedgerComplaint.class);
-        List<LedgerComplaint> list = util.importExcel(file.getInputStream());
+        List<LedgerComplaint> list = util.importExcel(file.getInputStream(), 1);
+        // 过滤null元素，避免空指针异常
+        if (list != null) {
+            list.removeIf(item -> item == null);
+        }
+        if (list == null || list.isEmpty()) {
+            return AjaxResult.error("导入数据为空或解析失败，请检查Excel表头是否与模板一致");
+        }
         list.forEach(item -> {
             item.setImportBatch(batchNo);
             item.setSourceType("1");
@@ -146,7 +181,14 @@ public class LedgerImportController extends BaseController {
     public AjaxResult importSecurityTest(@RequestParam("file") MultipartFile file) throws Exception {
         String batchNo = generateBatchNo();
         ExcelUtil<LedgerSecurityTest> util = new ExcelUtil<>(LedgerSecurityTest.class);
-        List<LedgerSecurityTest> list = util.importExcel(file.getInputStream());
+        List<LedgerSecurityTest> list = util.importExcel(file.getInputStream(), 1);
+        // 过滤null元素，避免空指针异常
+        if (list != null) {
+            list.removeIf(item -> item == null);
+        }
+        if (list == null || list.isEmpty()) {
+            return AjaxResult.error("导入数据为空或解析失败，请检查Excel表头是否与模板一致");
+        }
         list.forEach(item -> {
             item.setImportBatch(batchNo);
             item.setSourceType("1");
@@ -162,7 +204,14 @@ public class LedgerImportController extends BaseController {
     public AjaxResult importChannelPassRate(@RequestParam("file") MultipartFile file) throws Exception {
         String batchNo = generateBatchNo();
         ExcelUtil<LedgerChannelPassRate> util = new ExcelUtil<>(LedgerChannelPassRate.class);
-        List<LedgerChannelPassRate> list = util.importExcel(file.getInputStream());
+        List<LedgerChannelPassRate> list = util.importExcel(file.getInputStream(), 1);
+        // 过滤null元素，避免空指针异常
+        if (list != null) {
+            list.removeIf(item -> item == null);
+        }
+        if (list == null || list.isEmpty()) {
+            return AjaxResult.error("导入数据为空或解析失败，请检查Excel表头是否与模板一致");
+        }
         list.forEach(item -> {
             item.setImportBatch(batchNo);
             item.setSourceType("1");
@@ -178,7 +227,14 @@ public class LedgerImportController extends BaseController {
     public AjaxResult importUnsafeEvent(@RequestParam("file") MultipartFile file) throws Exception {
         String batchNo = generateBatchNo();
         ExcelUtil<LedgerUnsafeEvent> util = new ExcelUtil<>(LedgerUnsafeEvent.class);
-        List<LedgerUnsafeEvent> list = util.importExcel(file.getInputStream());
+        List<LedgerUnsafeEvent> list = util.importExcel(file.getInputStream(), 1);
+        // 过滤null元素，避免空指针异常
+        if (list != null) {
+            list.removeIf(item -> item == null);
+        }
+        if (list == null || list.isEmpty()) {
+            return AjaxResult.error("导入数据为空或解析失败，请检查Excel表头是否与模板一致");
+        }
         list.forEach(item -> {
             item.setImportBatch(batchNo);
             item.setSourceType("1");
@@ -194,7 +250,14 @@ public class LedgerImportController extends BaseController {
     public AjaxResult importSeizureStats(@RequestParam("file") MultipartFile file) throws Exception {
         String batchNo = generateBatchNo();
         ExcelUtil<LedgerSeizureStats> util = new ExcelUtil<>(LedgerSeizureStats.class);
-        List<LedgerSeizureStats> list = util.importExcel(file.getInputStream());
+        List<LedgerSeizureStats> list = util.importExcel(file.getInputStream(), 1);
+        // 过滤null元素，避免空指针异常
+        if (list != null) {
+            list.removeIf(item -> item == null);
+        }
+        if (list == null || list.isEmpty()) {
+            return AjaxResult.error("导入数据为空或解析失败，请检查Excel表头是否与模板一致");
+        }
         list.forEach(item -> {
             item.setImportBatch(batchNo);
             item.setSourceType("1");
@@ -210,7 +273,17 @@ public class LedgerImportController extends BaseController {
     public AjaxResult importTerminalBonus(@RequestParam("file") MultipartFile file) throws Exception {
         String batchNo = generateBatchNo();
         ExcelUtil<LedgerTerminalBonus> util = new ExcelUtil<>(LedgerTerminalBonus.class);
-        List<LedgerTerminalBonus> list = util.importExcel(file.getInputStream());
+        // titleNum=1 表示跳过第1行标题，从第2行读取表头
+        List<LedgerTerminalBonus> list = util.importExcel(file.getInputStream(), 1);
+        
+        // 过滤null元素，避免空指针异常
+        if (list != null) {
+            list.removeIf(item -> item == null);
+        }
+        if (list == null || list.isEmpty()) {
+            return AjaxResult.error("导入数据为空或解析失败，请检查Excel表头是否与模板一致");
+        }
+        
         list.forEach(item -> {
             item.setImportBatch(batchNo);
             item.setSourceType("1");
@@ -226,7 +299,14 @@ public class LedgerImportController extends BaseController {
     public AjaxResult importExamScore(@RequestParam("file") MultipartFile file) throws Exception {
         String batchNo = generateBatchNo();
         ExcelUtil<LedgerExamScore> util = new ExcelUtil<>(LedgerExamScore.class);
-        List<LedgerExamScore> list = util.importExcel(file.getInputStream());
+        List<LedgerExamScore> list = util.importExcel(file.getInputStream(), 1);
+        // 过滤null元素，避免空指针异常
+        if (list != null) {
+            list.removeIf(item -> item == null);
+        }
+        if (list == null || list.isEmpty()) {
+            return AjaxResult.error("导入数据为空或解析失败，请检查Excel表头是否与模板一致");
+        }
         list.forEach(item -> {
             item.setImportBatch(batchNo);
             item.setSourceType("1");
@@ -241,9 +321,15 @@ public class LedgerImportController extends BaseController {
     @PostMapping("/rewardApproval")
     public AjaxResult importRewardApproval(@RequestParam("file") MultipartFile file) throws Exception {
         String batchNo = generateBatchNo();
-        ExcelUtil<LedgerRewardApproval> util =
-            new ExcelUtil<>(LedgerRewardApproval.class);
-        List<LedgerRewardApproval> list = util.importExcel(file.getInputStream());
+        ExcelUtil<LedgerRewardApproval> util = new ExcelUtil<>(LedgerRewardApproval.class);
+        List<LedgerRewardApproval> list = util.importExcel(file.getInputStream(), 1);
+        // 过滤null元素，避免空指针异常
+        if (list != null) {
+            list.removeIf(item -> item == null);
+        }
+        if (list == null || list.isEmpty()) {
+            return AjaxResult.error("导入数据为空或解析失败，请检查Excel表头是否与模板一致");
+        }
         list.forEach(item -> {
             item.setImportBatch(batchNo);
             item.setSourceType("1");
@@ -259,7 +345,14 @@ public class LedgerImportController extends BaseController {
     public AjaxResult importDailyTraining(@RequestParam("file") MultipartFile file) throws Exception {
         String batchNo = generateBatchNo();
         ExcelUtil<LedgerDailyTraining> util = new ExcelUtil<>(LedgerDailyTraining.class);
-        List<LedgerDailyTraining> list = util.importExcel(file.getInputStream());
+        List<LedgerDailyTraining> list = util.importExcel(file.getInputStream(), 1);
+        // 过滤null元素，避免空指针异常
+        if (list != null) {
+            list.removeIf(item -> item == null);
+        }
+        if (list == null || list.isEmpty()) {
+            return AjaxResult.error("导入数据为空或解析失败，请检查Excel表头是否与模板一致");
+        }
         list.forEach(item -> { item.setImportBatch(batchNo); item.setSourceType("1"); item.setCreateBy(getUsername()); });
         dailyTrainingService.batchInsert(list);
         return AjaxResult.success("导入成功，共" + list.size() + "条");
@@ -271,7 +364,14 @@ public class LedgerImportController extends BaseController {
     public AjaxResult importLeaderDuty(@RequestParam("file") MultipartFile file) throws Exception {
         String batchNo = generateBatchNo();
         ExcelUtil<LedgerLeaderDuty> util = new ExcelUtil<>(LedgerLeaderDuty.class);
-        List<LedgerLeaderDuty> list = util.importExcel(file.getInputStream());
+        List<LedgerLeaderDuty> list = util.importExcel(file.getInputStream(), 1);
+        // 过滤null元素，避免空指针异常
+        if (list != null) {
+            list.removeIf(item -> item == null);
+        }
+        if (list == null || list.isEmpty()) {
+            return AjaxResult.error("导入数据为空或解析失败，请检查Excel表头是否与模板一致");
+        }
         list.forEach(item -> { item.setImportBatch(batchNo); item.setSourceType("1"); item.setCreateBy(getUsername()); });
         leaderDutyService.batchInsert(list);
         return AjaxResult.success("导入成功，共" + list.size() + "条");
@@ -283,7 +383,14 @@ public class LedgerImportController extends BaseController {
     public AjaxResult importHealthSoldier(@RequestParam("file") MultipartFile file) throws Exception {
         String batchNo = generateBatchNo();
         ExcelUtil<LedgerHealthSoldier> util = new ExcelUtil<>(LedgerHealthSoldier.class);
-        List<LedgerHealthSoldier> list = util.importExcel(file.getInputStream());
+        List<LedgerHealthSoldier> list = util.importExcel(file.getInputStream(), 1);
+        // 过滤null元素，避免空指针异常
+        if (list != null) {
+            list.removeIf(item -> item == null);
+        }
+        if (list == null || list.isEmpty()) {
+            return AjaxResult.error("导入数据为空或解析失败，请检查Excel表头是否与模板一致");
+        }
         list.forEach(item -> { item.setImportBatch(batchNo); item.setSourceType("1"); item.setCreateBy(getUsername()); });
         healthSoldierService.batchInsert(list);
         return AjaxResult.success("导入成功，共" + list.size() + "条");
@@ -295,7 +402,14 @@ public class LedgerImportController extends BaseController {
     public AjaxResult importDormFireSafety(@RequestParam("file") MultipartFile file) throws Exception {
         String batchNo = generateBatchNo();
         ExcelUtil<LedgerDormFireSafety> util = new ExcelUtil<>(LedgerDormFireSafety.class);
-        List<LedgerDormFireSafety> list = util.importExcel(file.getInputStream());
+        List<LedgerDormFireSafety> list = util.importExcel(file.getInputStream(), 1);
+        // 过滤null元素，避免空指针异常
+        if (list != null) {
+            list.removeIf(item -> item == null);
+        }
+        if (list == null || list.isEmpty()) {
+            return AjaxResult.error("导入数据为空或解析失败，请检查Excel表头是否与模板一致");
+        }
         list.forEach(item -> { item.setImportBatch(batchNo); item.setSourceType("1"); item.setCreateBy(getUsername()); });
         dormFireSafetyService.batchInsert(list);
         return AjaxResult.success("导入成功，共" + list.size() + "条");
@@ -307,7 +421,14 @@ public class LedgerImportController extends BaseController {
     public AjaxResult importTrainingIssue(@RequestParam("file") MultipartFile file) throws Exception {
         String batchNo = generateBatchNo();
         ExcelUtil<LedgerTrainingIssue> util = new ExcelUtil<>(LedgerTrainingIssue.class);
-        List<LedgerTrainingIssue> list = util.importExcel(file.getInputStream());
+        List<LedgerTrainingIssue> list = util.importExcel(file.getInputStream(), 1);
+        // 过滤null元素，避免空指针异常
+        if (list != null) {
+            list.removeIf(item -> item == null);
+        }
+        if (list == null || list.isEmpty()) {
+            return AjaxResult.error("导入数据为空或解析失败，请检查Excel表头是否与模板一致");
+        }
         list.forEach(item -> { item.setImportBatch(batchNo); item.setSourceType("1"); item.setCreateBy(getUsername()); });
         trainingIssueService.batchInsert(list);
         return AjaxResult.success("导入成功，共" + list.size() + "条");
@@ -323,7 +444,14 @@ public class LedgerImportController extends BaseController {
     public AjaxResult importRewardPenalty(@RequestParam("file") MultipartFile file) throws Exception {
         String batchNo = generateBatchNo();
         ExcelUtil<LedgerRewardPenalty> util = new ExcelUtil<>(LedgerRewardPenalty.class);
-        List<LedgerRewardPenalty> list = util.importExcel(file.getInputStream());
+        List<LedgerRewardPenalty> list = util.importExcel(file.getInputStream(), 1);
+        // 过滤null元素，避免空指针异常
+        if (list != null) {
+            list.removeIf(item -> item == null);
+        }
+        if (list == null || list.isEmpty()) {
+            return AjaxResult.error("导入数据为空或解析失败，请检查Excel表头是否与模板一致");
+        }
         list.forEach(item -> { item.setImportBatch(batchNo); item.setSourceType("1"); item.setCreateBy(getUsername()); });
         rewardPenaltyService.batchInsert(list);
         return AjaxResult.success("导入成功，共" + list.size() + "条");
@@ -339,7 +467,14 @@ public class LedgerImportController extends BaseController {
     public AjaxResult importLeaveSpecial(@RequestParam("file") MultipartFile file) throws Exception {
         String batchNo = generateBatchNo();
         ExcelUtil<LedgerLeaveSpecial> util = new ExcelUtil<>(LedgerLeaveSpecial.class);
-        List<LedgerLeaveSpecial> list = util.importExcel(file.getInputStream());
+        List<LedgerLeaveSpecial> list = util.importExcel(file.getInputStream(), 1);
+        // 过滤null元素，避免空指针异常
+        if (list != null) {
+            list.removeIf(item -> item == null);
+        }
+        if (list == null || list.isEmpty()) {
+            return AjaxResult.error("导入数据为空或解析失败，请检查Excel表头是否与模板一致");
+        }
         list.forEach(item -> { item.setImportBatch(batchNo); item.setSourceType("1"); item.setCreateBy(getUsername()); });
         leaveSpecialService.batchInsert(list);
         return AjaxResult.success("导入成功，共" + list.size() + "条");
@@ -355,7 +490,14 @@ public class LedgerImportController extends BaseController {
     public AjaxResult importBannerLetter(@RequestParam("file") MultipartFile file) throws Exception {
         String batchNo = generateBatchNo();
         ExcelUtil<LedgerBannerLetter> util = new ExcelUtil<>(LedgerBannerLetter.class);
-        List<LedgerBannerLetter> list = util.importExcel(file.getInputStream());
+        List<LedgerBannerLetter> list = util.importExcel(file.getInputStream(), 1);
+        // 过滤null元素，避免空指针异常
+        if (list != null) {
+            list.removeIf(item -> item == null);
+        }
+        if (list == null || list.isEmpty()) {
+            return AjaxResult.error("导入数据为空或解析失败，请检查Excel表头是否与模板一致");
+        }
         list.forEach(item -> { item.setImportBatch(batchNo); item.setSourceType("1"); item.setCreateBy(getUsername()); });
         bannerLetterService.batchInsert(list);
         return AjaxResult.success("导入成功，共" + list.size() + "条");