导入修改

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

@@ -1,13 +1,12 @@
 package com.sundot.airport.web.controller.ledger;
 
-import com.alibaba.excel.EasyExcel;
-import com.alibaba.excel.context.AnalysisContext;
-import com.alibaba.excel.event.AnalysisEventListener;
+import com.sundot.airport.common.utils.poi.ExcelUtil;
 import com.sundot.airport.common.annotation.Log;
 import com.sundot.airport.common.core.controller.BaseController;
 import com.sundot.airport.common.core.domain.AjaxResult;
 import com.sundot.airport.common.enums.BusinessType;
 import com.sundot.airport.common.utils.DateUtils;
+import com.sundot.airport.common.utils.poi.ExcelUtil;
 import com.sundot.airport.ledger.domain.*;
 import com.sundot.airport.ledger.service.*;
 import com.sundot.airport.ledger.service.ILedgerCombinedImportService;
@@ -66,9 +65,8 @@ public class LedgerImportController extends BaseController {
     @PostMapping("/supervisionProblem")
     public AjaxResult importSupervisionProblem(@RequestParam("file") MultipartFile file) throws Exception {
         String batchNo = generateBatchNo();
-        List<LedgerSupervisionProblem> list = new ArrayList<>();
-        EasyExcel.read(file.getInputStream(), LedgerSupervisionProblem.class,
-                new SimpleListener<>(list)).sheet().doRead();
+        ExcelUtil<LedgerSupervisionProblem> util = new ExcelUtil<>(LedgerSupervisionProblem.class);
+        List<LedgerSupervisionProblem> list = util.importExcel(file.getInputStream());
         list.forEach(item -> {
             item.setImportBatch(batchNo);
             item.setSourceType("1");
@@ -83,9 +81,8 @@ public class LedgerImportController extends BaseController {
     @PostMapping("/patrolInspection")
     public AjaxResult importPatrolInspection(@RequestParam("file") MultipartFile file) throws Exception {
         String batchNo = generateBatchNo();
-        List<LedgerPatrolInspection> list = new ArrayList<>();
-        EasyExcel.read(file.getInputStream(), LedgerPatrolInspection.class,
-                new SimpleListener<>(list)).sheet().doRead();
+        ExcelUtil<LedgerPatrolInspection> util = new ExcelUtil<>(LedgerPatrolInspection.class);
+        List<LedgerPatrolInspection> list = util.importExcel(file.getInputStream());
         list.forEach(item -> {
             item.setImportBatch(batchNo);
             item.setSourceType("1");
@@ -100,9 +97,8 @@ public class LedgerImportController extends BaseController {
     @PostMapping("/realtimeInterception")
     public AjaxResult importRealtimeInterception(@RequestParam("file") MultipartFile file) throws Exception {
         String batchNo = generateBatchNo();
-        List<LedgerRealtimeInterception> list = new ArrayList<>();
-        EasyExcel.read(file.getInputStream(), LedgerRealtimeInterception.class,
-                new SimpleListener<>(list)).sheet().doRead();
+        ExcelUtil<LedgerRealtimeInterception> util = new ExcelUtil<>(LedgerRealtimeInterception.class);
+        List<LedgerRealtimeInterception> list = util.importExcel(file.getInputStream());
         list.forEach(item -> {
             item.setImportBatch(batchNo);
             item.setSourceType("1");
@@ -117,9 +113,8 @@ public class LedgerImportController extends BaseController {
     @PostMapping("/servicePatrol")
     public AjaxResult importServicePatrol(@RequestParam("file") MultipartFile file) throws Exception {
         String batchNo = generateBatchNo();
-        List<LedgerServicePatrol> list = new ArrayList<>();
-        EasyExcel.read(file.getInputStream(), LedgerServicePatrol.class,
-                new SimpleListener<>(list)).sheet().doRead();
+        ExcelUtil<LedgerServicePatrol> util = new ExcelUtil<>(LedgerServicePatrol.class);
+        List<LedgerServicePatrol> list = util.importExcel(file.getInputStream());
         list.forEach(item -> {
             item.setImportBatch(batchNo);
             item.setSourceType("1");
@@ -134,9 +129,8 @@ public class LedgerImportController extends BaseController {
     @PostMapping("/complaint")
     public AjaxResult importComplaint(@RequestParam("file") MultipartFile file) throws Exception {
         String batchNo = generateBatchNo();
-        List<LedgerComplaint> list = new ArrayList<>();
-        EasyExcel.read(file.getInputStream(), LedgerComplaint.class,
-                new SimpleListener<>(list)).sheet().doRead();
+        ExcelUtil<LedgerComplaint> util = new ExcelUtil<>(LedgerComplaint.class);
+        List<LedgerComplaint> list = util.importExcel(file.getInputStream());
         list.forEach(item -> {
             item.setImportBatch(batchNo);
             item.setSourceType("1");
@@ -151,9 +145,8 @@ public class LedgerImportController extends BaseController {
     @PostMapping("/securityTest")
     public AjaxResult importSecurityTest(@RequestParam("file") MultipartFile file) throws Exception {
         String batchNo = generateBatchNo();
-        List<LedgerSecurityTest> list = new ArrayList<>();
-        EasyExcel.read(file.getInputStream(), LedgerSecurityTest.class,
-                new SimpleListener<>(list)).sheet().doRead();
+        ExcelUtil<LedgerSecurityTest> util = new ExcelUtil<>(LedgerSecurityTest.class);
+        List<LedgerSecurityTest> list = util.importExcel(file.getInputStream());
         list.forEach(item -> {
             item.setImportBatch(batchNo);
             item.setSourceType("1");
@@ -168,9 +161,8 @@ public class LedgerImportController extends BaseController {
     @PostMapping("/channelPassRate")
     public AjaxResult importChannelPassRate(@RequestParam("file") MultipartFile file) throws Exception {
         String batchNo = generateBatchNo();
-        List<LedgerChannelPassRate> list = new ArrayList<>();
-        EasyExcel.read(file.getInputStream(), LedgerChannelPassRate.class,
-                new SimpleListener<>(list)).sheet().doRead();
+        ExcelUtil<LedgerChannelPassRate> util = new ExcelUtil<>(LedgerChannelPassRate.class);
+        List<LedgerChannelPassRate> list = util.importExcel(file.getInputStream());
         list.forEach(item -> {
             item.setImportBatch(batchNo);
             item.setSourceType("1");
@@ -185,9 +177,8 @@ public class LedgerImportController extends BaseController {
     @PostMapping("/unsafeEvent")
     public AjaxResult importUnsafeEvent(@RequestParam("file") MultipartFile file) throws Exception {
         String batchNo = generateBatchNo();
-        List<LedgerUnsafeEvent> list = new ArrayList<>();
-        EasyExcel.read(file.getInputStream(), LedgerUnsafeEvent.class,
-                new SimpleListener<>(list)).sheet().doRead();
+        ExcelUtil<LedgerUnsafeEvent> util = new ExcelUtil<>(LedgerUnsafeEvent.class);
+        List<LedgerUnsafeEvent> list = util.importExcel(file.getInputStream());
         list.forEach(item -> {
             item.setImportBatch(batchNo);
             item.setSourceType("1");
@@ -202,9 +193,8 @@ public class LedgerImportController extends BaseController {
     @PostMapping("/seizureStats")
     public AjaxResult importSeizureStats(@RequestParam("file") MultipartFile file) throws Exception {
         String batchNo = generateBatchNo();
-        List<LedgerSeizureStats> list = new ArrayList<>();
-        EasyExcel.read(file.getInputStream(), LedgerSeizureStats.class,
-                new SimpleListener<>(list)).sheet().doRead();
+        ExcelUtil<LedgerSeizureStats> util = new ExcelUtil<>(LedgerSeizureStats.class);
+        List<LedgerSeizureStats> list = util.importExcel(file.getInputStream());
         list.forEach(item -> {
             item.setImportBatch(batchNo);
             item.setSourceType("1");
@@ -219,9 +209,8 @@ public class LedgerImportController extends BaseController {
     @PostMapping("/terminalBonus")
     public AjaxResult importTerminalBonus(@RequestParam("file") MultipartFile file) throws Exception {
         String batchNo = generateBatchNo();
-        List<LedgerTerminalBonus> list = new ArrayList<>();
-        EasyExcel.read(file.getInputStream(), LedgerTerminalBonus.class,
-                new SimpleListener<>(list)).sheet().doRead();
+        ExcelUtil<LedgerTerminalBonus> util = new ExcelUtil<>(LedgerTerminalBonus.class);
+        List<LedgerTerminalBonus> list = util.importExcel(file.getInputStream());
         list.forEach(item -> {
             item.setImportBatch(batchNo);
             item.setSourceType("1");
@@ -236,9 +225,8 @@ public class LedgerImportController extends BaseController {
     @PostMapping("/examScore")
     public AjaxResult importExamScore(@RequestParam("file") MultipartFile file) throws Exception {
         String batchNo = generateBatchNo();
-        List<LedgerExamScore> list = new ArrayList<>();
-        EasyExcel.read(file.getInputStream(), LedgerExamScore.class,
-                new SimpleListener<>(list)).sheet().doRead();
+        ExcelUtil<LedgerExamScore> util = new ExcelUtil<>(LedgerExamScore.class);
+        List<LedgerExamScore> list = util.importExcel(file.getInputStream());
         list.forEach(item -> {
             item.setImportBatch(batchNo);
             item.setSourceType("1");
@@ -253,9 +241,9 @@ public class LedgerImportController extends BaseController {
     @PostMapping("/rewardApproval")
     public AjaxResult importRewardApproval(@RequestParam("file") MultipartFile file) throws Exception {
         String batchNo = generateBatchNo();
-        List<LedgerRewardApproval> list = new ArrayList<>();
-        EasyExcel.read(file.getInputStream(), LedgerRewardApproval.class,
-                new SimpleListener<>(list)).sheet().doRead();
+        ExcelUtil<LedgerRewardApproval> util =
+            new ExcelUtil<>(LedgerRewardApproval.class);
+        List<LedgerRewardApproval> list = util.importExcel(file.getInputStream());
         list.forEach(item -> {
             item.setImportBatch(batchNo);
             item.setSourceType("1");
@@ -270,9 +258,8 @@ public class LedgerImportController extends BaseController {
     @PostMapping("/dailyTraining")
     public AjaxResult importDailyTraining(@RequestParam("file") MultipartFile file) throws Exception {
         String batchNo = generateBatchNo();
-        List<LedgerDailyTraining> list = new ArrayList<>();
-        EasyExcel.read(file.getInputStream(), LedgerDailyTraining.class,
-                new SimpleListener<>(list)).headRowNumber(2).sheet().doRead();
+        ExcelUtil<LedgerDailyTraining> util = new ExcelUtil<>(LedgerDailyTraining.class);
+        List<LedgerDailyTraining> list = util.importExcel(file.getInputStream());
         list.forEach(item -> { item.setImportBatch(batchNo); item.setSourceType("1"); item.setCreateBy(getUsername()); });
         dailyTrainingService.batchInsert(list);
         return AjaxResult.success("导入成功，共" + list.size() + "条");
@@ -283,9 +270,8 @@ public class LedgerImportController extends BaseController {
     @PostMapping("/leaderDuty")
     public AjaxResult importLeaderDuty(@RequestParam("file") MultipartFile file) throws Exception {
         String batchNo = generateBatchNo();
-        List<LedgerLeaderDuty> list = new ArrayList<>();
-        EasyExcel.read(file.getInputStream(), LedgerLeaderDuty.class,
-                new SimpleListener<>(list)).headRowNumber(2).sheet().doRead();
+        ExcelUtil<LedgerLeaderDuty> util = new ExcelUtil<>(LedgerLeaderDuty.class);
+        List<LedgerLeaderDuty> list = util.importExcel(file.getInputStream());
         list.forEach(item -> { item.setImportBatch(batchNo); item.setSourceType("1"); item.setCreateBy(getUsername()); });
         leaderDutyService.batchInsert(list);
         return AjaxResult.success("导入成功，共" + list.size() + "条");
@@ -296,9 +282,8 @@ public class LedgerImportController extends BaseController {
     @PostMapping("/healthSoldier")
     public AjaxResult importHealthSoldier(@RequestParam("file") MultipartFile file) throws Exception {
         String batchNo = generateBatchNo();
-        List<LedgerHealthSoldier> list = new ArrayList<>();
-        EasyExcel.read(file.getInputStream(), LedgerHealthSoldier.class,
-                new SimpleListener<>(list)).headRowNumber(2).sheet().doRead();
+        ExcelUtil<LedgerHealthSoldier> util = new ExcelUtil<>(LedgerHealthSoldier.class);
+        List<LedgerHealthSoldier> list = util.importExcel(file.getInputStream());
         list.forEach(item -> { item.setImportBatch(batchNo); item.setSourceType("1"); item.setCreateBy(getUsername()); });
         healthSoldierService.batchInsert(list);
         return AjaxResult.success("导入成功，共" + list.size() + "条");
@@ -309,9 +294,8 @@ public class LedgerImportController extends BaseController {
     @PostMapping("/dormFireSafety")
     public AjaxResult importDormFireSafety(@RequestParam("file") MultipartFile file) throws Exception {
         String batchNo = generateBatchNo();
-        List<LedgerDormFireSafety> list = new ArrayList<>();
-        EasyExcel.read(file.getInputStream(), LedgerDormFireSafety.class,
-                new SimpleListener<>(list)).headRowNumber(2).sheet().doRead();
+        ExcelUtil<LedgerDormFireSafety> util = new ExcelUtil<>(LedgerDormFireSafety.class);
+        List<LedgerDormFireSafety> list = util.importExcel(file.getInputStream());
         list.forEach(item -> { item.setImportBatch(batchNo); item.setSourceType("1"); item.setCreateBy(getUsername()); });
         dormFireSafetyService.batchInsert(list);
         return AjaxResult.success("导入成功，共" + list.size() + "条");
@@ -322,9 +306,8 @@ public class LedgerImportController extends BaseController {
     @PostMapping("/trainingIssue")
     public AjaxResult importTrainingIssue(@RequestParam("file") MultipartFile file) throws Exception {
         String batchNo = generateBatchNo();
-        List<LedgerTrainingIssue> list = new ArrayList<>();
-        EasyExcel.read(file.getInputStream(), LedgerTrainingIssue.class,
-                new SimpleListener<>(list)).headRowNumber(2).sheet().doRead();
+        ExcelUtil<LedgerTrainingIssue> util = new ExcelUtil<>(LedgerTrainingIssue.class);
+        List<LedgerTrainingIssue> list = util.importExcel(file.getInputStream());
         list.forEach(item -> { item.setImportBatch(batchNo); item.setSourceType("1"); item.setCreateBy(getUsername()); });
         trainingIssueService.batchInsert(list);
         return AjaxResult.success("导入成功，共" + list.size() + "条");
@@ -339,9 +322,8 @@ public class LedgerImportController extends BaseController {
     @PostMapping("/rewardPenalty")
     public AjaxResult importRewardPenalty(@RequestParam("file") MultipartFile file) throws Exception {
         String batchNo = generateBatchNo();
-        List<LedgerRewardPenalty> list = new ArrayList<>();
-        EasyExcel.read(file.getInputStream(), LedgerRewardPenalty.class,
-                new SimpleListener<>(list)).headRowNumber(2).sheet().doRead();
+        ExcelUtil<LedgerRewardPenalty> util = new ExcelUtil<>(LedgerRewardPenalty.class);
+        List<LedgerRewardPenalty> list = util.importExcel(file.getInputStream());
         list.forEach(item -> { item.setImportBatch(batchNo); item.setSourceType("1"); item.setCreateBy(getUsername()); });
         rewardPenaltyService.batchInsert(list);
         return AjaxResult.success("导入成功，共" + list.size() + "条");
@@ -356,9 +338,8 @@ public class LedgerImportController extends BaseController {
     @PostMapping("/leaveSpecial")
     public AjaxResult importLeaveSpecial(@RequestParam("file") MultipartFile file) throws Exception {
         String batchNo = generateBatchNo();
-        List<LedgerLeaveSpecial> list = new ArrayList<>();
-        EasyExcel.read(file.getInputStream(), LedgerLeaveSpecial.class,
-                new SimpleListener<>(list)).headRowNumber(2).sheet().doRead();
+        ExcelUtil<LedgerLeaveSpecial> util = new ExcelUtil<>(LedgerLeaveSpecial.class);
+        List<LedgerLeaveSpecial> list = util.importExcel(file.getInputStream());
         list.forEach(item -> { item.setImportBatch(batchNo); item.setSourceType("1"); item.setCreateBy(getUsername()); });
         leaveSpecialService.batchInsert(list);
         return AjaxResult.success("导入成功，共" + list.size() + "条");
@@ -373,9 +354,8 @@ public class LedgerImportController extends BaseController {
     @PostMapping("/bannerLetter")
     public AjaxResult importBannerLetter(@RequestParam("file") MultipartFile file) throws Exception {
         String batchNo = generateBatchNo();
-        List<LedgerBannerLetter> list = new ArrayList<>();
-        EasyExcel.read(file.getInputStream(), LedgerBannerLetter.class,
-                new SimpleListener<>(list)).headRowNumber(2).sheet().doRead();
+        ExcelUtil<LedgerBannerLetter> util = new ExcelUtil<>(LedgerBannerLetter.class);
+        List<LedgerBannerLetter> list = util.importExcel(file.getInputStream());
         list.forEach(item -> { item.setImportBatch(batchNo); item.setSourceType("1"); item.setCreateBy(getUsername()); });
         bannerLetterService.batchInsert(list);
         return AjaxResult.success("导入成功，共" + list.size() + "条");
@@ -414,19 +394,5 @@ public class LedgerImportController extends BaseController {
         return AjaxResult.success("清理完成，共删除 " + total + " 条记录", result);
     }
 
-    /**
-     * 通用 EasyExcel 监听器 - 简单收集行到列表
-     */
-    private static class SimpleListener<T> extends AnalysisEventListener<T> {
-        private final List<T> list;
-        SimpleListener(List<T> list) { this.list = list; }
 
-        @Override
-        public void invoke(T data, AnalysisContext context) {
-            list.add(data);
-        }
-
-        @Override
-        public void doAfterAllAnalysed(AnalysisContext context) {}
-    }
 }

airport-ledger/src/main/java/com/sundot/airport/ledger/service/impl/DeptPortraitServiceImpl.java

@@ -4,6 +4,7 @@ import com.sundot.airport.common.core.domain.entity.SysRole;
 import com.sundot.airport.common.core.domain.entity.SysUser;
 import com.sundot.airport.common.core.domain.entity.SysDept;
 import com.sundot.airport.common.enums.DeptTypeEnum;
+import com.sundot.airport.common.enums.ScoreLevelEnum;
 import com.sundot.airport.common.exception.ServiceException;
 import com.sundot.airport.ledger.domain.ScoreDimension;
 import com.sundot.airport.ledger.domain.ScoreEvent;
@@ -381,6 +382,7 @@ public class DeptPortraitServiceImpl implements IDeptPortraitService {
 
         ScoreDimension dq = new ScoreDimension();
         dq.setStatus("0");
+        dq.setOrg(ScoreLevelEnum.PERSON.getCode());
         List<ScoreDimension> dims = scoreDimensionMapper.selectList(dq);
         dims.sort(Comparator.comparing(d -> d.getSortOrder() == null ? 999 : d.getSortOrder()));