单独导入--加载组织信息

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

@@ -1,7 +1,6 @@
 package com.sundot.airport.web.controller.ledger;
 
 import cn.hutool.core.collection.CollUtil;
-import cn.hutool.core.date.DateUtil;
 import com.sundot.airport.common.dto.ImportResultVO;
 import com.sundot.airport.common.utils.poi.ExcelUtil;
 import com.sundot.airport.common.annotation.Log;
@@ -9,10 +8,10 @@ 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;
+import com.sundot.airport.ledger.util.OrgInfoHelper;
 import com.sundot.airport.ledger.domain.LedgerDailyTraining;
 import com.sundot.airport.ledger.domain.LedgerLeaderDuty;
 import com.sundot.airport.ledger.domain.LedgerHealthSoldier;
@@ -62,6 +61,9 @@ public class LedgerImportController extends BaseController {
     @Autowired private ILedgerBannerLetterService bannerLetterService;
     @Autowired private ILedgerQualificationLevelService qualificationLevelService;
 
+    @Autowired
+    private OrgInfoHelper orgInfoHelper;
+
 
     private String generateBatchNo() {
         return DateUtils.dateTimeNow("yyyyMMddHHmmss") + UUID.randomUUID().toString().substring(0, 6).toUpperCase();
@@ -81,6 +83,13 @@ public class LedgerImportController extends BaseController {
         if (list == null || list.isEmpty()) {
             return AjaxResult.error("导入数据为空或解析失败，请检查Excel表头是否与模板一致");
         }
+        // 批量预加载组织信息
+        orgInfoHelper.batchFillOrgAndLocationInfo(list,
+                LedgerSupervisionProblem::getInspectedName,
+                LedgerSupervisionProblem::getPosition,
+                LedgerSupervisionProblem::getLocation,
+                LedgerSupervisionProblem::getChannelNo);
+
         list.forEach(item -> {
             item.setImportBatch(batchNo);
             item.setSourceType("1");
@@ -127,6 +136,9 @@ public class LedgerImportController extends BaseController {
         if (list == null || list.isEmpty()) {
             return AjaxResult.error("导入数据为空或解析失败，请检查Excel表头是否与模板一致");
         }
+        // 批量预加载组织信息（性能优化）
+        orgInfoHelper.batchFillOrgInfo(list, LedgerPatrolInspection::getInspectorName);
+
         list.forEach(item -> {
             item.setImportBatch(batchNo);
             item.setSourceType("1");
@@ -150,6 +162,15 @@ public class LedgerImportController extends BaseController {
         if (list == null || list.isEmpty()) {
             return AjaxResult.error("导入数据为空或解析失败，请检查Excel表头是否与模板一致");
         }
+        // 批量预加载组织信息和岗位/区域/通道
+        orgInfoHelper.batchFillOrgAndLocationInfo(
+                list,
+                LedgerRealtimeInterception::getInspectorName,
+                LedgerRealtimeInterception::getPosition,
+                LedgerRealtimeInterception::getLocation,
+                LedgerRealtimeInterception::getChannelNo
+        );
+
         list.forEach(item -> {
             item.setImportBatch(batchNo);
             item.setSourceType("1");
@@ -196,6 +217,15 @@ public class LedgerImportController extends BaseController {
         if (list == null || list.isEmpty()) {
             return AjaxResult.error("导入数据为空或解析失败，请检查Excel表头是否与模板一致");
         }
+        // 批量预加载组织信息和岗位/区域/通道
+        orgInfoHelper.batchFillOrgAndLocationInfo(
+                list,
+                LedgerServicePatrol::getInspectedName,
+                LedgerServicePatrol::getPosition,
+                LedgerServicePatrol::getLocation,
+                LedgerServicePatrol::getChannelNo
+        );
+
         list.forEach(item -> {
             item.setImportBatch(batchNo);
             item.setSourceType("1");
@@ -242,6 +272,9 @@ public class LedgerImportController extends BaseController {
         if (list == null || list.isEmpty()) {
             return AjaxResult.error("导入数据为空或解析失败，请检查Excel表头是否与模板一致");
         }
+        // 批量预加载组织信息（性能优化）
+        orgInfoHelper.batchFillOrgInfo(list, LedgerComplaint::getResponsibleName);
+
         list.forEach(item -> {
             item.setImportBatch(batchNo);
             item.setSourceType("1");
@@ -250,7 +283,6 @@ public class LedgerImportController extends BaseController {
         complaintService.batchInsert(list);
         return AjaxResult.success("导入成功，共" + list.size() + "条");
     }
-
     @PreAuthorize("@ss.hasPermi('ledger:import:securityTest')")
     @Log(title = "台账导入-安保测试", businessType = BusinessType.IMPORT)
     @PostMapping("/securityTest")
@@ -265,6 +297,15 @@ public class LedgerImportController extends BaseController {
         if (list == null || list.isEmpty()) {
             return AjaxResult.error("导入数据为空或解析失败，请检查Excel表头是否与模板一致");
         }
+        // 批量预加载组织信息和岗位/区域/通道
+        orgInfoHelper.batchFillOrgAndLocationInfo(
+                list,
+                LedgerSecurityTest::getTestedName,  // 被测试人员
+                LedgerSecurityTest::getTestType,    // 被测试岗位
+                LedgerSecurityTest::getRegion,      // 测试区域
+                LedgerSecurityTest::getChannel      // 测试通道
+        );
+
         list.forEach(item -> {
             item.setImportBatch(batchNo);
             item.setSourceType("1");
@@ -311,6 +352,14 @@ public class LedgerImportController extends BaseController {
         if (list == null || list.isEmpty()) {
             return AjaxResult.error("导入数据为空或解析失败，请检查Excel表头是否与模板一致");
         }
+        // 仅根据组织名称填充组织ID（无人员姓名）
+        orgInfoHelper.batchFillOrgIdByNameOnly(
+                list,
+                LedgerChannelPassRate::getDeptName,   // 部门名称
+                LedgerChannelPassRate::getTeamName,   // 队室名称
+                LedgerChannelPassRate::getGroupName   // 小组名称
+        );
+
         list.forEach(item -> {
             item.setImportBatch(batchNo);
             item.setSourceType("1");
@@ -334,6 +383,14 @@ public class LedgerImportController extends BaseController {
         if (list == null || list.isEmpty()) {
             return AjaxResult.error("导入数据为空或解析失败，请检查Excel表头是否与模板一致");
         }
+        // 批量预加载组织信息和岗位/区域/通道
+        orgInfoHelper.batchFillOrgAndLocationInfo(
+                list,
+                LedgerUnsafeEvent::getResponsibleName,
+                LedgerUnsafeEvent::getPosition,
+                LedgerUnsafeEvent::getArea,
+                LedgerUnsafeEvent::getChannelNo
+        );
         list.forEach(item -> {
             item.setImportBatch(batchNo);
             item.setSourceType("1");
@@ -380,19 +437,29 @@ public class LedgerImportController extends BaseController {
         if (list == null || list.isEmpty()) {
             return AjaxResult.error("导入数据为空或解析失败，请检查Excel表头是否与模板一致");
         }
+        // 批量预加载组织信息和岗位/区域/通道
+        orgInfoHelper.batchFillOrgAndLocationInfo(
+                list,
+                LedgerSeizureStats::getInspectorName,
+                LedgerSeizureStats::getPosition,
+                LedgerSeizureStats::getWorkArea,
+                null
+        );
         list.forEach(item -> {
             item.setImportBatch(batchNo);
             item.setSourceType("1");
             item.setCreateBy(getUsername());
-            //合并 recordDate 和 seizureTime 字段
-            java.util.Calendar cal = java.util.Calendar.getInstance();
-            cal.setTime(item.getRecordDate());
-            java.util.Calendar timeCal = java.util.Calendar.getInstance();
-            timeCal.setTime(item.getSeizureTime());
-            cal.set(java.util.Calendar.HOUR_OF_DAY, timeCal.get(java.util.Calendar.HOUR_OF_DAY));
-            cal.set(java.util.Calendar.MINUTE, timeCal.get(java.util.Calendar.MINUTE));
-            cal.set(java.util.Calendar.SECOND, timeCal.get(java.util.Calendar.SECOND));
-            item.setRecordDate(cal.getTime());
+            // 合并 recordDate 和 seizureTime 字段
+            if (item.getRecordDate() != null && item.getSeizureTime() != null) {
+                java.util.Calendar cal = java.util.Calendar.getInstance();
+                cal.setTime(item.getRecordDate());
+                java.util.Calendar timeCal = java.util.Calendar.getInstance();
+                timeCal.setTime(item.getSeizureTime());
+                cal.set(java.util.Calendar.HOUR_OF_DAY, timeCal.get(java.util.Calendar.HOUR_OF_DAY));
+                cal.set(java.util.Calendar.MINUTE, timeCal.get(java.util.Calendar.MINUTE));
+                cal.set(java.util.Calendar.SECOND, timeCal.get(java.util.Calendar.SECOND));
+                item.setRecordDate(cal.getTime());
+            }
         });
         if (CollUtil.isNotEmpty(list)) {
             List<LedgerSeizureStats> existList = seizureStatsService.selectList(new LedgerSeizureStats());
@@ -429,7 +496,7 @@ public class LedgerImportController extends BaseController {
         ExcelUtil<LedgerTerminalBonus> util = new ExcelUtil<>(LedgerTerminalBonus.class);
         // titleNum=1 表示跳过第1行标题，从第2行读取表头
         List<LedgerTerminalBonus> list = util.importExcel(file.getInputStream(), 1);
-        
+
         // 过滤null元素，避免空指针异常
         if (list != null) {
             list.removeIf(item -> item == null);
@@ -437,7 +504,9 @@ public class LedgerImportController extends BaseController {
         if (list == null || list.isEmpty()) {
             return AjaxResult.error("导入数据为空或解析失败，请检查Excel表头是否与模板一致");
         }
-        
+        // 批量预加载组织信息
+        orgInfoHelper.batchFillOrgInfo(list, LedgerTerminalBonus::getPersonName);
+
         list.forEach(item -> {
             item.setImportBatch(batchNo);
             item.setSourceType("1");
@@ -484,6 +553,9 @@ public class LedgerImportController extends BaseController {
         if (list == null || list.isEmpty()) {
             return AjaxResult.error("导入数据为空或解析失败，请检查Excel表头是否与模板一致");
         }
+        // 批量预加载组织信息
+        orgInfoHelper.batchFillOrgInfo(list, LedgerExamScore::getPersonName);
+
         list.forEach(item -> {
             item.setImportBatch(batchNo);
             item.setSourceType("1");
@@ -507,6 +579,9 @@ public class LedgerImportController extends BaseController {
         if (list == null || list.isEmpty()) {
             return AjaxResult.error("导入数据为空或解析失败，请检查Excel表头是否与模板一致");
         }
+        // 批量预加载组织信息
+        orgInfoHelper.batchFillOrgInfo(list, LedgerRewardApproval::getPersonName);
+
         list.forEach(item -> {
             item.setImportBatch(batchNo);
             item.setSourceType("1");
@@ -553,7 +628,11 @@ public class LedgerImportController extends BaseController {
         if (list == null || list.isEmpty()) {
             return AjaxResult.error("导入数据为空或解析失败，请检查Excel表头是否与模板一致");
         }
-        list.forEach(item -> { item.setImportBatch(batchNo); item.setSourceType("1"); item.setCreateBy(getUsername()); });
+        list.forEach(item -> {
+            item.setImportBatch(batchNo);
+            item.setSourceType("1");
+            item.setCreateBy(getUsername());
+        });
         dailyTrainingService.batchInsert(list);
         return AjaxResult.success("导入成功，共" + list.size() + "条");
     }
@@ -572,7 +651,12 @@ public class LedgerImportController extends BaseController {
         if (list == null || list.isEmpty()) {
             return AjaxResult.error("导入数据为空或解析失败，请检查Excel表头是否与模板一致");
         }
-        list.forEach(item -> { item.setImportBatch(batchNo); item.setSourceType("1"); item.setCreateBy(getUsername()); });
+
+        list.forEach(item -> {
+            item.setImportBatch(batchNo);
+            item.setSourceType("1");
+            item.setCreateBy(getUsername());
+        });
         leaderDutyService.batchInsert(list);
         return AjaxResult.success("导入成功，共" + list.size() + "条");
     }
@@ -591,7 +675,11 @@ public class LedgerImportController extends BaseController {
         if (list == null || list.isEmpty()) {
             return AjaxResult.error("导入数据为空或解析失败，请检查Excel表头是否与模板一致");
         }
-        list.forEach(item -> { item.setImportBatch(batchNo); item.setSourceType("1"); item.setCreateBy(getUsername()); });
+        list.forEach(item -> {
+            item.setImportBatch(batchNo);
+            item.setSourceType("1");
+            item.setCreateBy(getUsername());
+        });
         healthSoldierService.batchInsert(list);
         return AjaxResult.success("导入成功，共" + list.size() + "条");
     }
@@ -610,7 +698,12 @@ public class LedgerImportController extends BaseController {
         if (list == null || list.isEmpty()) {
             return AjaxResult.error("导入数据为空或解析失败，请检查Excel表头是否与模板一致");
         }
-        list.forEach(item -> { item.setImportBatch(batchNo); item.setSourceType("1"); item.setCreateBy(getUsername()); });
+
+        list.forEach(item -> {
+            item.setImportBatch(batchNo);
+            item.setSourceType("1");
+            item.setCreateBy(getUsername());
+        });
         dormFireSafetyService.batchInsert(list);
         return AjaxResult.success("导入成功，共" + list.size() + "条");
     }
@@ -629,7 +722,12 @@ public class LedgerImportController extends BaseController {
         if (list == null || list.isEmpty()) {
             return AjaxResult.error("导入数据为空或解析失败，请检查Excel表头是否与模板一致");
         }
-        list.forEach(item -> { item.setImportBatch(batchNo); item.setSourceType("1"); item.setCreateBy(getUsername()); });
+
+        list.forEach(item -> {
+            item.setImportBatch(batchNo);
+            item.setSourceType("1");
+            item.setCreateBy(getUsername());
+        });
         trainingIssueService.batchInsert(list);
         return AjaxResult.success("导入成功，共" + list.size() + "条");
     }
@@ -652,7 +750,12 @@ public class LedgerImportController extends BaseController {
         if (list == null || list.isEmpty()) {
             return AjaxResult.error("导入数据为空或解析失败，请检查Excel表头是否与模板一致");
         }
-        list.forEach(item -> { item.setImportBatch(batchNo); item.setSourceType("1"); item.setCreateBy(getUsername()); });
+
+        list.forEach(item -> {
+            item.setImportBatch(batchNo);
+            item.setSourceType("1");
+            item.setCreateBy(getUsername());
+        });
         rewardPenaltyService.batchInsert(list);
         return AjaxResult.success("导入成功，共" + list.size() + "条");
     }
@@ -675,6 +778,9 @@ public class LedgerImportController extends BaseController {
         if (list == null || list.isEmpty()) {
             return AjaxResult.error("导入数据为空或解析失败，请检查Excel表头是否与模板一致");
         }
+        // 批量预加载组织信息
+        orgInfoHelper.batchFillOrgInfo(list, LedgerLeaveSpecial::getPersonName);
+
         list.forEach(item -> { item.setImportBatch(batchNo); item.setSourceType("1"); item.setCreateBy(getUsername()); });
         if (CollUtil.isNotEmpty(list)) {
             List<LedgerLeaveSpecial> existList = leaveSpecialService.selectList(new LedgerLeaveSpecial());
@@ -721,7 +827,12 @@ public class LedgerImportController extends BaseController {
         if (list == null || list.isEmpty()) {
             return AjaxResult.error("导入数据为空或解析失败，请检查Excel表头是否与模板一致");
         }
-        list.forEach(item -> { item.setImportBatch(batchNo); item.setSourceType("1"); item.setCreateBy(getUsername()); });
+
+        list.forEach(item -> {
+            item.setImportBatch(batchNo);
+            item.setSourceType("1");
+            item.setCreateBy(getUsername());
+        });
         bannerLetterService.batchInsert(list);
         return AjaxResult.success("导入成功，共" + list.size() + "条");
     }
@@ -744,6 +855,9 @@ public class LedgerImportController extends BaseController {
         if (list == null || list.isEmpty()) {
             return AjaxResult.error("导入数据为空或解析失败，请检查Excel表头是否与模板一致");
         }
+        // 批量预加载组织信息（性能优化）
+        orgInfoHelper.batchFillOrgInfo(list, LedgerQualificationLevel::getPersonName);
+
         list.forEach(item -> { item.setImportBatch(batchNo); item.setSourceType("1"); item.setCreateBy(getUsername()); });
         if (CollUtil.isNotEmpty(list)) {
             List<LedgerQualificationLevel> existList = qualificationLevelService.selectQueryList(new LedgerQualificationLevel());

airport-ledger/src/main/java/com/sundot/airport/ledger/util/OrgInfoHelper.java

@@ -0,0 +1,528 @@
+package com.sundot.airport.ledger.util;
+
+import com.sundot.airport.common.core.domain.entity.SysDept;
+import com.sundot.airport.common.core.domain.entity.SysUser;
+import com.sundot.airport.common.enums.DeptType;
+import com.sundot.airport.system.domain.BasePosition;
+import com.sundot.airport.system.mapper.BasePositionMapper;
+import com.sundot.airport.system.mapper.SysDeptMapper;
+import com.sundot.airport.system.mapper.SysUserMapper;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import java.util.stream.Collectors;
+
+/**
+ * 组织信息补充工具类
+ */
+@Component
+public class OrgInfoHelper {
+
+    @Autowired
+    private SysUserMapper sysUserMapper;
+
+    @Autowired
+    private SysDeptMapper sysDeptMapper;
+    
+    @Autowired
+    private BasePositionMapper basePositionMapper;
+    
+    // 缓存
+    private volatile Map<String, SysUser> localUserCache = null;
+    private volatile Map<Long, SysDept> localDeptCache = null;
+    private volatile Map<String, Map<String, Object>> localOrgInfoCache = new HashMap<>();
+    
+    // 位置信息缓存
+    private volatile Map<String, Long> localPositionCache = null;
+    private volatile Map<String, Long> localAreaCache = null;
+    private volatile Map<String, Long> localChannelCache = null;
+    
+    // 缓存过期时间（毫秒）
+    private volatile long cacheTimestamp = 0L;
+    private static final long CACHE_EXPIRE_MILLIS = 24 * 60 * 60 * 1000; // 24小时
+
+
+    
+    /**
+     * 【关键】确保基础缓存已加载到内存（双重检查锁 + 过期检查）
+     */
+    private void ensureLocalCacheLoaded() {
+        long now = System.currentTimeMillis();
+        
+        // 检查缓存是否过期
+        boolean expired = (now - cacheTimestamp) > CACHE_EXPIRE_MILLIS;
+        
+        if (localUserCache == null || localDeptCache == null || localPositionCache == null || expired) {
+            synchronized (this) {
+                if (localUserCache == null || localDeptCache == null || localPositionCache == null || expired) {
+                    loadLocalCacheFromDB();
+                    cacheTimestamp = System.currentTimeMillis(); // 记录缓存时间
+                }
+            }
+        }
+    }
+    
+    /**
+     * 直接从数据库加载基础缓存到本地内存（纯内存，零Redis）
+     */
+    private void loadLocalCacheFromDB() {
+        // 1. 查询所有用户
+        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);
+                }
+            }
+        }
+        localUserCache = userCache;
+        
+        // 2. 查询所有部门
+        Map<Long, SysDept> deptCache = new HashMap<>();
+        List<SysDept> allDepts = sysDeptMapper.selectDeptList(new SysDept());
+        if (allDepts != null) {
+            for (SysDept dept : allDepts) {
+                deptCache.put(dept.getDeptId(), dept);
+            }
+        }
+        localDeptCache = deptCache;
+        
+        // 3. 查询所有位置并缓存
+        List<BasePosition> allPositions = basePositionMapper.selectBasePositionList(new BasePosition());
+        Map<String, Long> positionCache = new HashMap<>();
+        Map<String, Long> areaCache = new HashMap<>();
+        Map<String, Long> channelCache = new HashMap<>();
+        
+        if (allPositions != null) {
+            for (BasePosition pos : allPositions) {
+                if (pos.getName() != null && !pos.getName().trim().isEmpty()) {
+                    String name = pos.getName().trim();
+                    String type = pos.getPositionType();
+                    
+                    if ("POSITION".equals(type)) {
+                        positionCache.put(name, pos.getId());
+                    } else if ("REGIONAL".equals(type)) {
+                        areaCache.put(name, pos.getId());
+                    } else if ("CHANNEL".equals(type)) {
+                        channelCache.put(name, pos.getId());
+                    }
+                }
+            }
+        }
+        
+        localPositionCache = positionCache;
+        localAreaCache = areaCache;
+        localChannelCache = channelCache;
+    }
+    
+    /**
+     * 从内存中的基础缓存构建组织信息
+     */
+    private Map<String, Object> buildOrgInfoFromMemory(Map<String, SysUser> userCache, 
+                                                        Map<Long, SysDept> deptCache, 
+                                                        String personName) {
+        Map<String, Object> result = new HashMap<>();
+        if (personName == null || userCache == null || deptCache == null) {
+            return result;
+        }
+        
+        // 从缓存中获取用户
+        SysUser user = userCache.get(personName);
+        if (user == null || user.getDeptId() == null) {
+            return result;
+        }
+
+        result.put("userId", user.getUserId());
+
+        // 从缓存中获取部门
+        SysDept userDept = deptCache.get(user.getDeptId());
+        if (userDept == null) {
+            return result;
+        }
+
+        String deptType = userDept.getDeptType();
+
+        // 根据部门类型构建层级关系（全部从缓存获取父级部门）
+        if (DeptType.STATION.getCode().equals(deptType)) {
+            result.put("stationId", user.getDeptId());
+            result.put("stationName", userDept.getDeptName());
+        } else if (DeptType.BRIGADE.getCode().equals(deptType)) {
+            result.put("deptId", user.getDeptId());
+            result.put("deptName", userDept.getDeptName());
+            Long parentId = userDept.getParentId();
+            if (parentId != null && parentId != 0) {
+                SysDept parentDept = deptCache.get(parentId);
+                if (parentDept != null) {
+                    result.put("stationId", parentDept.getDeptId());
+                    result.put("stationName", parentDept.getDeptName());
+                }
+            }
+        } else if (DeptType.MANAGER.getCode().equals(deptType)) {
+            result.put("teamId", user.getDeptId());
+            result.put("teamName", userDept.getDeptName());
+            Long parentId = userDept.getParentId();
+            if (parentId != null && parentId != 0) {
+                SysDept parentDept = deptCache.get(parentId);
+                if (parentDept != null) {
+                    result.put("deptId", parentDept.getDeptId());
+                    result.put("deptName", parentDept.getDeptName());
+                    Long grandParentId = parentDept.getParentId();
+                    if (grandParentId != null && grandParentId != 0) {
+                        SysDept grandParentDept = deptCache.get(grandParentId);
+                        if (grandParentDept != null) {
+                            result.put("stationId", grandParentDept.getDeptId());
+                            result.put("stationName", grandParentDept.getDeptName());
+                        }
+                    }
+                }
+            }
+        } else if (DeptType.TEAMS.getCode().equals(deptType)) {
+            result.put("groupId", user.getDeptId());
+            result.put("groupName", userDept.getDeptName());
+            Long parentId = userDept.getParentId();
+            if (parentId != null && parentId != 0) {
+                SysDept parentDept = deptCache.get(parentId);
+                if (parentDept != null) {
+                    result.put("teamId", parentDept.getDeptId());
+                    result.put("teamName", parentDept.getDeptName());
+                    Long grandParentId = parentDept.getParentId();
+                    if (grandParentId != null && grandParentId != 0) {
+                        SysDept grandParentDept = deptCache.get(grandParentId);
+                        if (grandParentDept != null) {
+                            result.put("deptId", grandParentDept.getDeptId());
+                            result.put("deptName", grandParentDept.getDeptName());
+                            Long greatGrandParentId = grandParentDept.getParentId();
+                            if (greatGrandParentId != null && greatGrandParentId != 0) {
+                                SysDept greatGrandParentDept = deptCache.get(greatGrandParentId);
+                                if (greatGrandParentDept != null) {
+                                    result.put("stationId", greatGrandParentDept.getDeptId());
+                                    result.put("stationName", greatGrandParentDept.getDeptName());
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        }
+
+        return result;
+    }
+
+
+
+    /**
+     * 批量填充组织信息
+     * 【极致优化】全部使用内存缓存，零Redis查询
+     */
+    public <T> void batchFillOrgInfo(List<T> objects, java.util.function.Function<T, String> nameGetter) {
+        if (objects == null || objects.isEmpty()) {
+            return;
+        }
+        
+        // 1. 收集所有需要查询的姓名
+        List<String> names = objects.stream()
+            .map(nameGetter)
+            .filter(name -> name != null && !name.trim().isEmpty())
+            .distinct()
+            .map(String::trim)
+            .collect(Collectors.toList());
+        
+        // 2. 确保基础缓存已加载到内存
+        ensureLocalCacheLoaded();
+        
+        // 3. 【关键】从内存缓存中批量构建组织信息
+        Map<String, Map<String, Object>> orgInfoMap = new HashMap<>();
+        
+        for (String name : names) {
+            // 先从本地缓存查找
+            Map<String, Object> cached = localOrgInfoCache.get(name);
+            if (cached != null) {
+                orgInfoMap.put(name, cached);
+                continue;
+            }
+            
+            // 从基础缓存构建
+            Map<String, Object> orgInfo = buildOrgInfoFromMemory(localUserCache, localDeptCache, name);
+            if (!orgInfo.isEmpty()) {
+                orgInfoMap.put(name, orgInfo);
+                localOrgInfoCache.put(name, orgInfo); // 存入本地缓存
+            }
+        }
+        
+        // 4. 从内存快速填充（零Redis查询）
+        Map<String, Map<String, Object>> finalOrgInfoMap = orgInfoMap;
+        objects.forEach(obj -> {
+            String name = nameGetter.apply(obj);
+            if (name != null && !name.trim().isEmpty()) {
+                Map<String, Object> orgInfo = finalOrgInfoMap.get(name.trim());
+                if (orgInfo != null && !orgInfo.isEmpty()) {
+                    try {
+                        setFieldValue(obj, "userId", orgInfo.get("userId"));
+                        setFieldValue(obj, "personId", orgInfo.get("userId"));
+                        setFieldValue(obj, "personUserId", orgInfo.get("userId"));
+                        setFieldValue(obj, "deptId", orgInfo.get("deptId"));
+                        setFieldValue(obj, "deptName", orgInfo.get("deptName"));
+                        setFieldValue(obj, "teamId", orgInfo.get("teamId"));
+                        setFieldValue(obj, "teamName", orgInfo.get("teamName"));
+                        setFieldValue(obj, "groupId", orgInfo.get("groupId"));
+                        setFieldValue(obj, "groupName", orgInfo.get("groupName"));
+                    } catch (Exception e) {
+                        // 忽略异常
+                    }
+                }
+            }
+        });
+    }
+
+    /**
+     * 批量填充组织信息和位置信息（同时处理人员组织和位置）
+     */
+    public <T> void batchFillOrgAndLocationInfo(
+            List<T> objects,
+            java.util.function.Function<T, String> nameGetter,
+            java.util.function.Function<T, String> positionGetter,
+            java.util.function.Function<T, String> locationGetter,
+            java.util.function.Function<T, String> channelGetter) {
+        if (objects == null || objects.isEmpty()) {
+            return;
+        }
+        
+        // 1. 收集所有需要查询的姓名
+        List<String> names = objects.stream()
+            .map(nameGetter)
+            .filter(name -> name != null && !name.trim().isEmpty())
+            .distinct()
+            .map(String::trim)
+            .collect(Collectors.toList());
+        
+        // 2. 确保基础缓存已加载到内存（包含位置信息）
+        ensureLocalCacheLoaded();
+        
+        // 3. 从内存缓存中批量构建组织信息
+        Map<String, Map<String, Object>> orgInfoMap = new HashMap<>();
+        for (String name : names) {
+            Map<String, Object> cached = localOrgInfoCache.get(name);
+            if (cached != null) {
+                orgInfoMap.put(name, cached);
+                continue;
+            }
+            
+            Map<String, Object> orgInfo = buildOrgInfoFromMemory(localUserCache, localDeptCache, name);
+            if (!orgInfo.isEmpty()) {
+                orgInfoMap.put(name, orgInfo);
+                localOrgInfoCache.put(name, orgInfo);
+            }
+        }
+        Map<String, Map<String, Object>> finalOrgInfoMap = orgInfoMap;
+        Map<String, Long> finalPositionCache = localPositionCache;
+        Map<String, Long> finalAreaCache = localAreaCache;
+        Map<String, Long> finalChannelCache = localChannelCache;
+        
+        objects.forEach(obj -> {
+            try {
+                // 填充组织信息
+                String name = nameGetter.apply(obj);
+                if (name != null && !name.trim().isEmpty()) {
+                    Map<String, Object> orgInfo = finalOrgInfoMap.get(name.trim());
+                    if (orgInfo != null && !orgInfo.isEmpty()) {
+                        setFieldValue(obj, "userId", orgInfo.get("userId"));
+                        setFieldValue(obj, "personId", orgInfo.get("userId"));
+                        setFieldValue(obj, "personUserId", orgInfo.get("userId"));
+                        setFieldValue(obj, "deptId", orgInfo.get("deptId"));
+                        setFieldValue(obj, "deptName", orgInfo.get("deptName"));
+                        setFieldValue(obj, "teamId", orgInfo.get("teamId"));
+                        setFieldValue(obj, "teamName", orgInfo.get("teamName"));
+                        setFieldValue(obj, "groupId", orgInfo.get("groupId"));
+                        setFieldValue(obj, "groupName", orgInfo.get("groupName"));
+                    }
+                }
+                
+                // 填充位置信息
+                if (positionGetter != null) {
+                    String positionName = positionGetter.apply(obj);
+                    if (positionName != null && !positionName.trim().isEmpty()) {
+                        Long positionId = finalPositionCache.get(positionName.trim());
+                        if (positionId != null) {
+                            setFieldValue(obj, "positionId", positionId);
+                        }
+                    }
+                }
+                
+                if (locationGetter != null) {
+                    String locationName = locationGetter.apply(obj);
+                    if (locationName != null && !locationName.trim().isEmpty()) {
+                        Long areaId = finalAreaCache.get(locationName.trim());
+                        if (areaId != null) {
+                            setFieldValue(obj, "areaId", areaId);
+                        }
+                    }
+                }
+                
+                if (channelGetter != null) {
+                    String channelName = channelGetter.apply(obj);
+                    if (channelName != null && !channelName.trim().isEmpty()) {
+                        Long channelId = finalChannelCache.get(channelName.trim());
+                        if (channelId != null) {
+                            setFieldValue(obj, "channelId", channelId);
+                        }
+                    }
+                }
+            } catch (Exception e) {
+                // 忽略异常
+            }
+        });
+    }
+
+    /**
+     * 仅根据组织名称填充组织ID（不通过人员姓名）
+     * 适用于有组织名称但没有人员姓名的台账
+     */
+    public <T> void batchFillOrgIdByNameOnly(
+            List<T> objects,
+            java.util.function.Function<T, String> deptNameGetter,
+            java.util.function.Function<T, String> teamNameGetter,
+            java.util.function.Function<T, String> groupNameGetter) {
+        if (objects == null || objects.isEmpty()) {
+            return;
+        }
+        
+        // 确保部门缓存已加载到内存
+        ensureLocalCacheLoaded();
+        
+        // 从内存获取部门缓存
+        Map<Long, SysDept> deptCache = localDeptCache;
+        if (deptCache == null || deptCache.isEmpty()) {
+            return;
+        }
+        
+        // 建立部门名称→ID的映射
+        Map<String, Long> deptNameMap = new HashMap<>();
+        for (SysDept dept : deptCache.values()) {
+            if (dept.getDeptName() != null && !dept.getDeptName().trim().isEmpty()) {
+                deptNameMap.put(dept.getDeptName().trim(), dept.getDeptId());
+            }
+        }
+        
+        // 填充组织ID
+        objects.forEach(obj -> {
+            try {
+                // 填充部门ID
+                if (deptNameGetter != null) {
+                    String deptName = deptNameGetter.apply(obj);
+                    if (deptName != null && !deptName.trim().isEmpty()) {
+                        Long deptId = deptNameMap.get(deptName.trim());
+                        if (deptId != null) {
+                            setFieldValueSilently(obj, "deptId", deptId);
+                        }
+                    }
+                }
+                
+                // 填充队室ID
+                if (teamNameGetter != null) {
+                    String teamName = teamNameGetter.apply(obj);
+                    if (teamName != null && !teamName.trim().isEmpty()) {
+                        Long teamId = deptNameMap.get(teamName.trim());
+                        if (teamId != null) {
+                            setFieldValueSilently(obj, "teamId", teamId);
+                        }
+                    }
+                }
+                
+                // 填充小组ID
+                if (groupNameGetter != null) {
+                    String groupName = groupNameGetter.apply(obj);
+                    if (groupName != null && !groupName.trim().isEmpty()) {
+                        Long groupId = deptNameMap.get(groupName.trim());
+                        if (groupId != null) {
+                            setFieldValueSilently(obj, "groupId", groupId);
+                        }
+                    }
+                }
+            } catch (Exception ignored) {
+                // 忽略异常
+            }
+        });
+    }
+
+    /**
+     * 静默设置字段值（不抛异常）
+     */
+    private void setFieldValueSilently(Object obj, String fieldName, Object value) {
+        try {
+            if (value != null) {
+                java.lang.reflect.Field field = obj.getClass().getDeclaredField(fieldName);
+                field.setAccessible(true);
+                field.set(obj, value);
+            }
+        } catch (Exception ignored) {
+            // 忽略异常
+        }
+    }
+
+    /**
+     * 通过反射设置字段值
+     */
+    private void setFieldValue(Object obj, String fieldName, Object value) throws Exception {
+        if (value == null) {
+            return;
+        }
+        Class<?> clazz = obj.getClass();
+        try {
+            java.lang.reflect.Field field = clazz.getDeclaredField(fieldName);
+            field.setAccessible(true);
+            field.set(obj, value);
+        } catch (NoSuchFieldException ignored) {
+            // 字段不存在，忽略
+        }
+    }
+    
+    /**
+     * 手动触发构建完整缓存（可用于预热）
+     */
+    public void buildCompleteOrgCache() {
+        ensureLocalCacheLoaded();
+    }
+    
+    /**
+     * 【新增】立即清理所有缓存，释放内存
+     */
+    public void clearCache() {
+        synchronized (this) {
+            localUserCache = null;
+            localDeptCache = null;
+            localOrgInfoCache.clear();
+            localPositionCache = null;
+            localAreaCache = null;
+            localChannelCache = null;
+            cacheTimestamp = 0L;
+        }
+    }
+    
+    /**
+     * 【新增】获取当前缓存状态信息
+     */
+    public String getCacheStatus() {
+        if (localUserCache == null || localDeptCache == null) {
+            return "缓存未加载";
+        }
+        long now = System.currentTimeMillis();
+        long age = (now - cacheTimestamp) / 1000; // 秒
+        long remain = (CACHE_EXPIRE_MILLIS - (now - cacheTimestamp)) / 1000; // 剩余秒数
+        return String.format("缓存已加载 | 用户: %d | 部门: %d | 组织信息: %d | 岗位: %d | 区域: %d | 通道: %d | 已存在: %d秒 | 剩余: %d秒",
+            localUserCache.size(), 
+            localDeptCache.size(), 
+            localOrgInfoCache.size(),
+            localPositionCache != null ? localPositionCache.size() : 0,
+            localAreaCache != null ? localAreaCache.size() : 0,
+            localChannelCache != null ? localChannelCache.size() : 0,
+            age,
+            Math.max(0, remain)
+        );
+    }
+}