Merge remote-tracking branch 'origin/master'

airport-ledger/src/main/java/com/sundot/airport/ledger/domain/LedgerSeizureStats.java

@@ -27,36 +27,83 @@ public class LedgerSeizureStats extends BaseEntity {
     @Excel(name = "部门名称")
     private String deptName;
 
+    private Long deptId;
+
     @Excel(name = "队室/班组")
     private String teamName;
 
+    private Long teamId;
+
+    @Excel(name = "工作区域")
+    private String workArea;
+
+    @Excel(name = "安检资格证书等级")
+    private String qualificationLevel;
+
+    @Excel(name = "岗位")
+    private String position;
+
     @Excel(name = "小组")
     private String groupName;
 
+    private Long groupId;
+
     @Excel(name = "查获人")
     private String inspectorName;
 
+    private Long inspectorId;
+
     @Excel(name = "通道号")
     private String channelNo;
 
     @Excel(name = "旅客姓名")
     private String passengerName;
 
+    @Excel(name = "旅客性别")
+    private String passengerGender;
+
+    @Excel(name = "旅客民族")
+    private String passengerEthnicity;
+
+    @Excel(name = "旅客年龄")
+    private Integer passengerAge;
+
     @Excel(name = "航班号")
     private String flightNo;
 
+    @Excel(name = "目的地")
+    private String destination;
+
+    @Excel(name = "进/出港")
+    private String inOutPort;
+
+    @Excel(name = "违规主体")
+    private String violationSubject;
+
     @Excel(name = "违规品类别")
     private String itemCategory;
 
+    @Excel(name = "二级分类")
+    private String secondaryCategory;
+
     @Excel(name = "违规品名称")
     private String itemName;
 
     @Excel(name = "数量")
     private Integer itemQuantity;
 
+    @Excel(name = "查获数量")
+    private Integer seizureQuantity;
+
     @Excel(name = "藏匿部位")
     private String concealmentPart;
 
+    @Excel(name = "事件简况")
+    private String eventBrief;
+
+    @Excel(name = "队室内勤")
+    private String teamInternalDuty;
+
     @Excel(name = "检查方式")
     private String checkMethod;
 
@@ -95,36 +142,87 @@ public class LedgerSeizureStats extends BaseEntity {
     public String getDeptName() { return deptName; }
     public void setDeptName(String deptName) { this.deptName = deptName; }
 
+    public Long getDeptId() { return deptId; }
+    public void setDeptId(Long deptId) { this.deptId = deptId; }
+
     public String getTeamName() { return teamName; }
     public void setTeamName(String teamName) { this.teamName = teamName; }
 
+    public Long getTeamId() { return teamId; }
+    public void setTeamId(Long teamId) { this.teamId = teamId; }
+
+    public String getWorkArea() { return workArea; }
+    public void setWorkArea(String workArea) { this.workArea = workArea; }
+
+    public String getQualificationLevel() { return qualificationLevel; }
+    public void setQualificationLevel(String qualificationLevel) { this.qualificationLevel = qualificationLevel; }
+
+    public String getPosition() { return position; }
+    public void setPosition(String position) { this.position = position; }
+
     public String getGroupName() { return groupName; }
     public void setGroupName(String groupName) { this.groupName = groupName; }
 
+    public Long getGroupId() { return groupId; }
+    public void setGroupId(Long groupId) { this.groupId = groupId; }
+
     public String getInspectorName() { return inspectorName; }
     public void setInspectorName(String inspectorName) { this.inspectorName = inspectorName; }
 
+    public Long getInspectorId() { return inspectorId; }
+    public void setInspectorId(Long inspectorId) { this.inspectorId = inspectorId; }
+
     public String getChannelNo() { return channelNo; }
     public void setChannelNo(String channelNo) { this.channelNo = channelNo; }
 
     public String getPassengerName() { return passengerName; }
     public void setPassengerName(String passengerName) { this.passengerName = passengerName; }
 
+    public String getPassengerGender() { return passengerGender; }
+    public void setPassengerGender(String passengerGender) { this.passengerGender = passengerGender; }
+
+    public String getPassengerEthnicity() { return passengerEthnicity; }
+    public void setPassengerEthnicity(String passengerEthnicity) { this.passengerEthnicity = passengerEthnicity; }
+
+    public Integer getPassengerAge() { return passengerAge; }
+    public void setPassengerAge(Integer passengerAge) { this.passengerAge = passengerAge; }
+
     public String getFlightNo() { return flightNo; }
     public void setFlightNo(String flightNo) { this.flightNo = flightNo; }
 
+    public String getDestination() { return destination; }
+    public void setDestination(String destination) { this.destination = destination; }
+
+    public String getInOutPort() { return inOutPort; }
+    public void setInOutPort(String inOutPort) { this.inOutPort = inOutPort; }
+
+    public String getViolationSubject() { return violationSubject; }
+    public void setViolationSubject(String violationSubject) { this.violationSubject = violationSubject; }
+
     public String getItemCategory() { return itemCategory; }
     public void setItemCategory(String itemCategory) { this.itemCategory = itemCategory; }
 
+    public String getSecondaryCategory() { return secondaryCategory; }
+    public void setSecondaryCategory(String secondaryCategory) { this.secondaryCategory = secondaryCategory; }
+
     public String getItemName() { return itemName; }
     public void setItemName(String itemName) { this.itemName = itemName; }
 
     public Integer getItemQuantity() { return itemQuantity; }
     public void setItemQuantity(Integer itemQuantity) { this.itemQuantity = itemQuantity; }
 
+    public Integer getSeizureQuantity() { return seizureQuantity; }
+    public void setSeizureQuantity(Integer seizureQuantity) { this.seizureQuantity = seizureQuantity; }
+
     public String getConcealmentPart() { return concealmentPart; }
     public void setConcealmentPart(String concealmentPart) { this.concealmentPart = concealmentPart; }
 
+    public String getEventBrief() { return eventBrief; }
+    public void setEventBrief(String eventBrief) { this.eventBrief = eventBrief; }
+
+    public String getTeamInternalDuty() { return teamInternalDuty; }
+    public void setTeamInternalDuty(String teamInternalDuty) { this.teamInternalDuty = teamInternalDuty; }
+
     public String getCheckMethod() { return checkMethod; }
     public void setCheckMethod(String checkMethod) { this.checkMethod = checkMethod; }
 

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

@@ -2,6 +2,8 @@ package com.sundot.airport.ledger.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.sundot.airport.common.core.domain.entity.SysDept;
+import com.sundot.airport.common.core.domain.entity.SysUser;
 import com.sundot.airport.ledger.domain.*;
 import com.sundot.airport.ledger.domain.LedgerDailyTraining;
 import com.sundot.airport.ledger.domain.LedgerLeaderDuty;
@@ -14,6 +16,8 @@ import com.sundot.airport.ledger.service.ILedgerLeaderDutyService;
 import com.sundot.airport.ledger.service.ILedgerHealthSoldierService;
 import com.sundot.airport.ledger.service.ILedgerDormFireSafetyService;
 import com.sundot.airport.ledger.service.ILedgerTrainingIssueService;
+import com.sundot.airport.system.mapper.SysDeptMapper;
+import com.sundot.airport.system.mapper.SysUserMapper;
 import org.apache.poi.ss.usermodel.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -54,6 +58,11 @@ public class LedgerCombinedImportServiceImpl implements ILedgerCombinedImportSer
     @Autowired private ILedgerDormFireSafetyService dormFireSafetyService;
     @Autowired private ILedgerTrainingIssueService trainingIssueService;
     @Autowired private IScoreEventService scoreEventService;
+    @Autowired private SysUserMapper sysUserMapper;
+    @Autowired private SysDeptMapper sysDeptMapper;
+
+    // 导入缓存（在导入开始时构建，导入结束后释放）
+    private ImportCache importCache;
 
     // ── Sheet 名称 → 处理方法路由表 ──────────────────────────────────
     private static final Map<String, String> SHEET_ROUTE = new LinkedHashMap<>();
@@ -91,6 +100,9 @@ public class LedgerCombinedImportServiceImpl implements ILedgerCombinedImportSer
     public Map<String, String> importAll(MultipartFile file, String batchNo, String username) throws Exception {
         Map<String, String> result = new LinkedHashMap<>();
         try (Workbook wb = WorkbookFactory.create(file.getInputStream())) {
+            // 构建导入缓存
+            buildImportCache();
+            
             for (Map.Entry<String, String> entry : SHEET_ROUTE.entrySet()) {
                 String sheetName = entry.getKey();
                 String handler   = entry.getValue();
@@ -106,6 +118,9 @@ public class LedgerCombinedImportServiceImpl implements ILedgerCombinedImportSer
                     result.put(sheetName, "错误: " + e.getMessage());
                 }
             }
+        } finally {
+            // 导入完成后释放缓存
+            clearImportCache();
         }
         return result;
     }
@@ -389,8 +404,11 @@ public class LedgerCombinedImportServiceImpl implements ILedgerCombinedImportSer
     }
 
     /** 9. 2026查获违规品统计 → ledger_seizure_stats
-     * R2: 查获时间(0) ...(1,2) 部门/队室(3) 区域(4) 安检员(5) ...
-     *     航班号(8) ... 旅客姓名(12) ... 违规类别(16) 物品种类(17) ...(18) 数量(19)
+     * R2: 查获时间(0) 信息提取(1) 信息提取2(2) 部门/队室(3) 工作区域(4) 安检员(5)
+     *     安检资格证书等级(6) 岗位(7) 航班号(8) 目的地(9) 进/出港(10) 违规主体(11)
+     *     旅客姓名(12) 旅客性别(13) 旅客民族(14) 旅客年龄(15) 违规类别(16)
+     *     违规物品种类(17) 二级分类(18) 数量(19) 事件简况(20) 查获位置(21)
+     *     处理结果(22) 班组(23) 队室内勤(24) 备注(25) 查获数量(26)
      */
     private int doSeizureStats(Sheet sheet, String batchNo, String username) {
         List<LedgerSeizureStats> list = new ArrayList<>();
@@ -398,12 +416,39 @@ public class LedgerCombinedImportServiceImpl implements ILedgerCombinedImportSer
             LedgerSeizureStats o = new LedgerSeizureStats();
             o.setRecordDate(date(c, 0));
             o.setTeamName(str(c, 3));
-            o.setInspectorName(str(c, 5));
+            o.setWorkArea(str(c, 4));
+            String inspectorName = str(c, 5);
+            o.setInspectorName(inspectorName);
+            o.setQualificationLevel(str(c, 6));
+            o.setPosition(str(c, 7));
             o.setFlightNo(str(c, 8));
+            o.setDestination(str(c, 9));
+            o.setInOutPort(str(c, 10));
+            o.setViolationSubject(str(c, 11));
             o.setPassengerName(str(c, 12));
+            o.setPassengerGender(str(c, 13));
+            o.setPassengerEthnicity(str(c, 14));
+            o.setPassengerAge(integer(c, 15));
             o.setItemCategory(str(c, 16));
-            o.setItemName(str(c, 17));
+            o.setItemName(str(c, 17));  // 违规物品种类
+            o.setSecondaryCategory(str(c, 18));
             o.setItemQuantity(integer(c, 19));
+            o.setEventBrief(str(c, 20));
+            o.setConcealmentPart(str(c, 21));   // 查获位置
+            o.setHandlingMethod(str(c, 22));  // 处理结果
+            o.setTeamInternalDuty(str(c, 24));
+            o.setRemark(str(c, 25));
+            o.setSeizureQuantity(integer(c, 26));  // 查获数量
+                
+            // 使用缓存查找组织信息
+            Map<String, Long> orgInfo = resolveOrgInfoByNameWithCache(inspectorName);
+            if (!orgInfo.isEmpty()) {
+                o.setInspectorId(orgInfo.get("userId"));
+                o.setDeptId(orgInfo.get("deptId"));
+                o.setTeamId(orgInfo.get("teamId"));
+                o.setGroupId(orgInfo.get("groupId"));
+            }
+                
             o.setImportBatch(batchNo);
             o.setSourceType("1");
             o.setCreateBy(username);
@@ -864,4 +909,124 @@ public class LedgerCombinedImportServiceImpl implements ILedgerCombinedImportSer
         }
         return count;
     }
+
+    // ════════════════════════════════════════════════════════════════
+    //  导入缓存类
+    // ════════════════════════════════════════════════════════════════
+
+    /**
+     * 导入时的统一缓存，避免重复查询数据库
+     */
+    private static class ImportCache {
+        private final Map<String, SysUser> userCache;      // Map<昵称, 用户>
+        private final Map<Long, SysDept> deptCache;        // Map<部门ID, 部门>
+
+        public ImportCache(Map<String, SysUser> userCache, Map<Long, SysDept> deptCache) {
+            this.userCache = userCache;
+            this.deptCache = deptCache;
+        }
+
+        public SysUser getUserByNickName(String nickName) {
+            return userCache.get(nickName);
+        }
+
+        public SysDept getDeptById(Long deptId) {
+            return deptCache.get(deptId);
+        }
+    }
+
+    // ════════════════════════════════════════════════════════════════
+    //  辅助方法：根据人员名称补充组织信息
+    // ════════════════════════════════════════════════════════════════
+
+    /**
+     * 根据人员名称查找用户，并补充组织架构ID
+     * @param personName 人员名称
+     * @return Map包含: userId, deptId(BRIGADE), teamId(MANAGER), groupId(TEAMS)
+     */
+    private Map<String, Long> resolveOrgInfoByNameWithCache(String personName) {
+        Map<String, Long> result = new HashMap<>();
+        if (personName == null || personName.trim().isEmpty() || importCache == null) {
+            return result;
+        }
+
+        String name = personName.trim();
+        
+        // 1. 从缓存中查找用户
+        SysUser user = importCache.getUserByNickName(name);
+        if (user == null || user.getDeptId() == null) {
+            return result;
+        }
+
+        result.put("userId", user.getUserId());
+
+        // 2. 从缓存中获取用户部门信息
+        SysDept userDept = importCache.getDeptById(user.getDeptId());
+        if (userDept == null) {
+            return result;
+        }
+
+        String deptType = userDept.getDeptType();
+
+        // 3. 根据部门类型递归获取各级组织ID
+        if ("BRIGADE".equals(deptType)) {
+            // 用户部门是大队
+            result.put("deptId", user.getDeptId());
+        } else if ("MANAGER".equals(deptType)) {
+            // 用户部门是队室/班组，向上找大队
+            result.put("teamId", user.getDeptId());
+            if (userDept.getParentId() != null && userDept.getParentId() != 0) {
+                result.put("deptId", userDept.getParentId());
+            }
+        } else if ("TEAMS".equals(deptType)) {
+            // 用户部门是小组，向上找队室和大队
+            result.put("groupId", user.getDeptId());
+            if (userDept.getParentId() != null && userDept.getParentId() != 0) {
+                result.put("teamId", userDept.getParentId());
+                // 从缓存中获取父级部门
+                SysDept parentDept = importCache.getDeptById(userDept.getParentId());
+                if (parentDept != null && parentDept.getParentId() != null && parentDept.getParentId() != 0) {
+                    result.put("deptId", parentDept.getParentId());
+                }
+            }
+        }
+
+        return result;
+    }
+
+    /**
+     * 构建导入缓存
+     */
+    private void buildImportCache() {
+        // 构建用户缓存：Map<昵称, SysUser>
+        Map<String, SysUser> userCache = new HashMap<>();
+        List<SysUser> allUsers = sysUserMapper.selectUserList(new SysUser());
+        if (allUsers != null) {
+            for (SysUser user : allUsers) {
+                if (user.getNickName() != null && !user.getNickName().trim().isEmpty()) {
+                    userCache.put(user.getNickName().trim(), user);
+                }
+            }
+        }
+
+        // 构建部门缓存：Map<部门ID, SysDept>
+        Map<Long, SysDept> deptCache = new HashMap<>();
+        SysDept queryDept = new SysDept();
+        List<SysDept> allDepts = sysDeptMapper.selectDeptList(queryDept);
+        if (allDepts != null) {
+            for (SysDept dept : allDepts) {
+                deptCache.put(dept.getDeptId(), dept);
+            }
+        }
+
+        // 创建统一缓存对象
+        this.importCache = new ImportCache(userCache, deptCache);
+    }
+
+    /**
+     * 释放导入缓存
+     */
+    private void clearImportCache() {
+        this.importCache = null;
+    }
 }