bug修复

airport-admin/src/main/java/com/sundot/airport/web/controller/score/ScoreEventController.java

@@ -3,6 +3,7 @@ package com.sundot.airport.web.controller.score;
 import com.alibaba.excel.EasyExcel;
 import com.alibaba.excel.context.AnalysisContext;
 import com.alibaba.excel.event.AnalysisEventListener;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.sundot.airport.common.annotation.Log;
 import com.sundot.airport.common.core.controller.BaseController;
 import com.sundot.airport.common.core.domain.AjaxResult;
@@ -11,7 +12,10 @@ 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.ScoreEvent;
+import com.sundot.airport.ledger.domain.ScoreIndicator;
+import com.sundot.airport.ledger.mapper.ScoreIndicatorMapper;
 import com.sundot.airport.ledger.service.IScoreEventService;
+import com.sundot.airport.ledger.service.IScoreIndicatorService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
@@ -34,6 +38,9 @@ public class ScoreEventController extends BaseController {
     @Autowired
     private IScoreEventService service;
 
+    @Autowired
+    private IScoreIndicatorService indicatorService;
+
     @PreAuthorize("@ss.hasPermi('score:event:list')")
     @GetMapping("/list")
     public TableDataInfo list(ScoreEvent query) {
@@ -62,6 +69,10 @@ public class ScoreEventController extends BaseController {
         entity.setSourceType("1");
         entity.setCreateBy(getUsername());
         entity.setCreateTime(DateUtils.getNowDate());
+        
+        // 通过指标名称查找并设置ID
+        resolveIndicatorIds(entity);
+        
         // 计算 totalScore
         BigDecimal score = entity.getScoreValue() != null ? entity.getScoreValue() : BigDecimal.ZERO;
         BigDecimal cascade = entity.getCascadeScore() != null ? entity.getCascadeScore() : BigDecimal.ZERO;
@@ -75,6 +86,10 @@ public class ScoreEventController extends BaseController {
     public AjaxResult edit(@Validated @RequestBody ScoreEvent entity) {
         entity.setUpdateBy(getUsername());
         entity.setUpdateTime(DateUtils.getNowDate());
+        
+        // 通过指标名称查找并设置ID
+        resolveIndicatorIds(entity);
+        
         BigDecimal score = entity.getScoreValue() != null ? entity.getScoreValue() : BigDecimal.ZERO;
         BigDecimal cascade = entity.getCascadeScore() != null ? entity.getCascadeScore() : BigDecimal.ZERO;
         entity.setTotalScore(score.add(cascade));
@@ -109,4 +124,46 @@ public class ScoreEventController extends BaseController {
         service.batchInsert(list);
         return AjaxResult.success("导入成功，共" + list.size() + "条");
     }
+
+    /**
+     * 通过指标名称查找并设置ID
+     */
+    private void resolveIndicatorIds(ScoreEvent entity) {
+        // 通过二级指标名称查找ID
+        if (entity.getLevel2Name() != null && !entity.getLevel2Name().trim().isEmpty()) {
+            Long level2Id = findIndicatorIdByName(entity.getLevel2Name().trim());
+            if (level2Id != null) {
+                entity.setLevel2Id(level2Id);
+            }
+        }
+        
+        // 通过三级指标名称查找ID
+        if (entity.getLevel3Name() != null && !entity.getLevel3Name().trim().isEmpty()) {
+            Long level3Id = findIndicatorIdByName(entity.getLevel3Name().trim());
+            if (level3Id != null) {
+                entity.setLevel3Id(level3Id);
+            }
+        }
+        
+        // 通过四级指标名称查找ID
+        if (entity.getLevel4Name() != null && !entity.getLevel4Name().trim().isEmpty()) {
+            Long level4Id = findIndicatorIdByName(entity.getLevel4Name().trim());
+            if (level4Id != null) {
+                entity.setLevel4Id(level4Id);
+            }
+        }
+    }
+
+    /**
+     * 通过名称查找指标ID
+     */
+    private Long findIndicatorIdByName(String name) {
+        if (name == null || name.trim().isEmpty()) {
+            return null;
+        }
+        LambdaQueryWrapper<ScoreIndicator> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(ScoreIndicator::getName, name.trim());
+        ScoreIndicator indicator = indicatorService.getOne(wrapper);
+        return indicator != null ? indicator.getId() : null;
+    }
 }

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

@@ -201,14 +201,17 @@ public class LedgerCombinedImportServiceImpl implements ILedgerCombinedImportSer
             o.setTeamInternalDuty(str(c, 23));  // 队室内勤
             o.setTeamLeader(str(c, 24));        // 队室负责人
             
-            // 根据责任人名称查找组织ID
+            // 根据责任人名称查找组织ID和名称
             if (inspectedName != null && !inspectedName.trim().isEmpty()) {
-                Map<String, Long> orgInfo = resolveOrgInfoByNameWithCache(inspectedName);
+                Map<String, Object> orgInfo = resolveOrgInfoByNameWithCache(inspectedName);
                 if (!orgInfo.isEmpty()) {
-                    o.setInspectedId(orgInfo.get("userId"));
-                    o.setDeptId(orgInfo.get("deptId"));
-                    o.setTeamId(orgInfo.get("teamId"));
-                    o.setGroupId(orgInfo.get("groupId"));
+                    o.setInspectedId((Long) orgInfo.get("userId"));
+                    o.setDeptId((Long) orgInfo.get("deptId"));
+                    o.setDeptName((String) orgInfo.get("deptName"));
+                    o.setTeamId((Long) orgInfo.get("teamId"));
+                    o.setTeamName((String) orgInfo.get("teamName"));
+                    o.setGroupId((Long) orgInfo.get("groupId"));
+                    o.setGroupName((String) orgInfo.get("groupName"));
                 }
             }
             
@@ -315,14 +318,17 @@ public class LedgerCombinedImportServiceImpl implements ILedgerCombinedImportSer
             o.setRemark(str(c, 27));            // 备注
             o.setTeamLeader(str(c, 28));        // 队室负责人
             
-            // 根据责任人名称查找组织ID
+            // 根据责任人名称查找组织ID和名称
             if (inspectorName != null && !inspectorName.trim().isEmpty()) {
-                Map<String, Long> orgInfo = resolveOrgInfoByNameWithCache(inspectorName);
+                Map<String, Object> 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.setInspectorId((Long) orgInfo.get("userId"));
+                    o.setDeptId((Long) orgInfo.get("deptId"));
+                    o.setDeptName((String) orgInfo.get("deptName"));
+                    o.setTeamId((Long) orgInfo.get("teamId"));
+                    o.setTeamName((String) orgInfo.get("teamName"));
+                    o.setGroupId((Long) orgInfo.get("groupId"));
+                    o.setGroupName((String) orgInfo.get("groupName"));
                 }
             }
             
@@ -473,12 +479,15 @@ public class LedgerCombinedImportServiceImpl implements ILedgerCombinedImportSer
             
             // 使用缓存查找组织信息（根据被测人名称）
             if (testedName != null && !testedName.trim().isEmpty()) {
-                Map<String, Long> orgInfo = resolveOrgInfoByNameWithCache(testedName);
+                Map<String, Object> orgInfo = resolveOrgInfoByNameWithCache(testedName);
                 if (!orgInfo.isEmpty()) {
-                    o.setTestedId(orgInfo.get("userId"));
-                    o.setDeptId(orgInfo.get("deptId"));
-                    o.setTeamId(orgInfo.get("teamId"));
-                    o.setGroupId(orgInfo.get("groupId"));
+                    o.setTestedId((Long) orgInfo.get("userId"));
+                    o.setDeptId((Long) orgInfo.get("deptId"));
+                    o.setDeptName((String) orgInfo.get("deptName"));
+                    o.setTeamId((Long) orgInfo.get("teamId"));
+                    o.setTeamName((String) orgInfo.get("teamName"));
+                    o.setGroupId((Long) orgInfo.get("groupId"));
+                    o.setGroupName((String) orgInfo.get("groupName"));
                 }
             }
             
@@ -583,13 +592,16 @@ public class LedgerCombinedImportServiceImpl implements ILedgerCombinedImportSer
             o.setChannelNo(str(c, 9));
             o.setImage(str(c, 10));
             
-            // 使用缓存查找组织信息
-            Map<String, Long> orgInfo = resolveOrgInfoByNameWithCache(responsibleName);
+            // 使用缓存查找组织信息和名称
+            Map<String, Object> orgInfo = resolveOrgInfoByNameWithCache(responsibleName);
             if (!orgInfo.isEmpty()) {
-                o.setResponsibleId(orgInfo.get("userId"));
-                o.setDeptId(orgInfo.get("deptId"));
-                o.setTeamId(orgInfo.get("teamId"));
-                o.setGroupId(orgInfo.get("groupId"));
+                o.setResponsibleId((Long) orgInfo.get("userId"));
+                o.setDeptId((Long) orgInfo.get("deptId"));
+                o.setDeptName((String) orgInfo.get("deptName"));
+                o.setTeamId((Long) orgInfo.get("teamId"));
+                o.setTeamName((String) orgInfo.get("teamName"));
+                o.setGroupId((Long) orgInfo.get("groupId"));
+                o.setGroupName((String) orgInfo.get("groupName"));
             }
             
             // 根据岗位名称和区域名称查找ID
@@ -657,13 +669,16 @@ public class LedgerCombinedImportServiceImpl implements ILedgerCombinedImportSer
             o.setRemark(str(c, 25));
             o.setSeizureQuantity(integer(c, 26));  // 查获数量
                 
-            // 使用缓存查找组织信息
-            Map<String, Long> orgInfo = resolveOrgInfoByNameWithCache(inspectorName);
+            // 使用缓存查找组织信息和名称
+            Map<String, Object> 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.setInspectorId((Long) orgInfo.get("userId"));
+                o.setDeptId((Long) orgInfo.get("deptId"));
+                o.setDeptName((String) orgInfo.get("deptName"));
+                o.setTeamId((Long) orgInfo.get("teamId"));
+                o.setTeamName((String) orgInfo.get("teamName"));
+                o.setGroupId((Long) orgInfo.get("groupId"));
+                o.setGroupName((String) orgInfo.get("groupName"));
             }
             
             // 根据岗位名称和工作区域名称查找ID
@@ -1193,8 +1208,8 @@ public class LedgerCombinedImportServiceImpl implements ILedgerCombinedImportSer
      * @param personName 人员名称
      * @return Map包含: userId, deptId(BRIGADE), teamId(MANAGER), groupId(TEAMS)
      */
-    private Map<String, Long> resolveOrgInfoByNameWithCache(String personName) {
-        Map<String, Long> result = new HashMap<>();
+    private Map<String, Object> resolveOrgInfoByNameWithCache(String personName) {
+        Map<String, Object> result = new HashMap<>();
         if (personName == null || personName.trim().isEmpty() || importCache == null) {
             return result;
         }
@@ -1217,25 +1232,41 @@ public class LedgerCombinedImportServiceImpl implements ILedgerCombinedImportSer
 
         String deptType = userDept.getDeptType();
 
-        // 3. 根据部门类型递归获取各级组织ID
+        // 3. 根据部门类型递归获取各级组织ID和名称
         if ("BRIGADE".equals(deptType)) {
             // 用户部门是大队
             result.put("deptId", user.getDeptId());
+            result.put("deptName", userDept.getDeptName());
         } else if ("MANAGER".equals(deptType)) {
             // 用户部门是队室/班组，向上找大队
             result.put("teamId", user.getDeptId());
+            result.put("teamName", userDept.getDeptName());
             if (userDept.getParentId() != null && userDept.getParentId() != 0) {
                 result.put("deptId", userDept.getParentId());
+                // 从缓存中获取父级部门（大队）
+                SysDept parentDept = importCache.getDeptById(userDept.getParentId());
+                if (parentDept != null) {
+                    result.put("deptName", parentDept.getDeptName());
+                }
             }
         } else if ("TEAMS".equals(deptType)) {
             // 用户部门是小组，向上找队室和大队
             result.put("groupId", user.getDeptId());
+            result.put("groupName", userDept.getDeptName());
             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());
+                if (parentDept != null) {
+                    result.put("teamName", parentDept.getDeptName());
+                    if (parentDept.getParentId() != null && parentDept.getParentId() != 0) {
+                        result.put("deptId", parentDept.getParentId());
+                        // 从缓存中获取祖父级部门（大队）
+                        SysDept grandParentDept = importCache.getDeptById(parentDept.getParentId());
+                        if (grandParentDept != null) {
+                            result.put("deptName", grandParentDept.getDeptName());
+                        }
+                    }
                 }
             }
         }

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

@@ -121,31 +121,41 @@ public class LedgerSyncServiceImpl implements ILedgerSyncService {
     @Override
     @Transactional(rollbackFor = Exception.class)
     public SyncResult syncAll() {
-        loadDimCache();
-        loadDeptCache();
-        loadUserCache();
-        StringBuilder sb = new StringBuilder();
-        int totalIns = 0, totalSkip = 0;
-        for (String type : Arrays.asList(
-                "supervision_problem", "realtime_interception", "security_test",
-                "unsafe_event", "seizure_stats", "reward_approval",
-                "service_patrol", "complaint", "terminal_bonus", "exam_score")) {
-            SyncResult r = doSync(type);
-            sb.append(type).append(":+").append(r.getTotalInserted())
-              .append("/skip").append(r.getTotalSkipped()).append("  ");
-            totalIns += r.getTotalInserted();
-            totalSkip += r.getTotalSkipped();
+        try {
+            loadDimCache();
+            loadDeptCache();
+            loadUserCache();
+            StringBuilder sb = new StringBuilder();
+            int totalIns = 0, totalSkip = 0;
+            for (String type : Arrays.asList(
+                    "supervision_problem", "realtime_interception", "security_test",
+                    "unsafe_event", "seizure_stats", "reward_approval",
+                    "service_patrol", "complaint", "terminal_bonus", "exam_score")) {
+                SyncResult r = doSync(type);
+                sb.append(type).append(":+").append(r.getTotalInserted())
+                  .append("/skip").append(r.getTotalSkipped()).append("  ");
+                totalIns += r.getTotalInserted();
+                totalSkip += r.getTotalSkipped();
+            }
+            return new SyncResult(totalIns, totalSkip, sb.toString());
+        } finally {
+            // 同步完成后清除缓存
+            clearCaches();
         }
-        return new SyncResult(totalIns, totalSkip, sb.toString());
     }
 
     @Override
     @Transactional(rollbackFor = Exception.class)
     public SyncResult syncByType(String ledgerType) {
-        loadDimCache();
-        loadDeptCache();
-        loadUserCache();
-        return doSync(ledgerType);
+        try {
+            loadDimCache();
+            loadDeptCache();
+            loadUserCache();
+            return doSync(ledgerType);
+        } finally {
+            // 同步完成后清除缓存
+            clearCaches();
+        }
     }
 
     // ═════════════════════════════════════════════════════════
@@ -182,7 +192,7 @@ public class LedgerSyncServiceImpl implements ILedgerSyncService {
             String src = "supervision_problem:" + row.getId();
             if (existsBySrc(src)) { skip++; continue; }
             if (!hasName(row.getInspectedName())) { skip++; continue; }
-            // 按问题层级选取L3指标和默认分值（修正：取problemLevel字段）
+            // 按问题层级选取L3指标和默认分值
             String level = row.getProblemLevel() != null ? row.getProblemLevel() : "";
             long l3Id; BigDecimal defaultSv;
             if (level.contains("上级")) { l3Id = IND_SUPERVISION_L3_LEADER; defaultSv = BigDecimal.valueOf(-1.20); }
@@ -213,10 +223,10 @@ public class LedgerSyncServiceImpl implements ILedgerSyncService {
             // 取【问题层级】字段，站层级扣1分，部门层级扣0.8分，其它层级跳过
             String level = row.getProblemLevel() != null ? row.getProblemLevel() : "";
             long l3Id; BigDecimal sv;
-            if (level.contains("站层级")) {
+            if (level.contains("站")) {
                 l3Id = IND_INTERCEPT_L3_STATION;
                 sv = row.getDeductScore() != null ? row.getDeductScore().negate() : NEG_ONE;
-            } else if (level.contains("部门层级")) {
+            } else if (level.contains("部门")) {
                 l3Id = IND_INTERCEPT_L3_DEPT;
                 sv = row.getDeductScore() != null ? row.getDeductScore().negate() : NEG_08;
             } else {
@@ -463,7 +473,96 @@ public class LedgerSyncServiceImpl implements ILedgerSyncService {
         sysUserMapper.selectUserList(new SysUser()).forEach(d -> userCache.put(d.getNickName(), d.getUserId()));
     }
 
+    /**
+     * 清除所有缓存
+     */
+    private void clearCaches() {
+        dimCache.clear();
+        deptCache.clear();
+        userCache.clear();
+        indCache.clear();
+        indicatorNameToIdCache.clear();
+    }
+
+    /**
+     * 通过用户名称解析组织信息（ID和名称）
+     * @param personName 人员名称
+     * @return Map包含: userId, deptId, deptName, teamId, teamName, groupId, groupName
+     */
+    private Map<String, Object> resolveOrgInfoByName(String personName) {
+        Map<String, Object> result = new HashMap<>();
+        if (personName == null || personName.trim().isEmpty()) {
+            return result;
+        }
+
+        String name = personName.trim();
+        
+        // 1. 从缓存中查找用户
+        Long userId = userCache.get(name);
+        if (userId == null) {
+            return result;
+        }
+        result.put("userId", userId);
+
+        // 2. 查询用户详情获取部门ID
+        SysUser user = sysUserMapper.selectUserById(userId);
+        if (user == null || user.getDeptId() == null) {
+            return result;
+        }
+
+        // 3. 从缓存中获取用户部门信息
+        SysDept userDept = sysDeptMapper.selectDeptById(user.getDeptId());
+        if (userDept == null) {
+            return result;
+        }
+
+        String deptType = userDept.getDeptType();
+
+        // 4. 根据部门类型递归获取各级组织ID和名称
+        if ("BRIGADE".equals(deptType)) {
+            // 用户部门是大队
+            result.put("deptId", user.getDeptId());
+            result.put("deptName", userDept.getDeptName());
+        } else if ("MANAGER".equals(deptType)) {
+            // 用户部门是队室/班组，向上找大队
+            result.put("teamId", user.getDeptId());
+            result.put("teamName", userDept.getDeptName());
+            if (userDept.getParentId() != null && userDept.getParentId() != 0) {
+                result.put("deptId", userDept.getParentId());
+                // 获取父级部门（大队）
+                SysDept parentDept = sysDeptMapper.selectDeptById(userDept.getParentId());
+                if (parentDept != null) {
+                    result.put("deptName", parentDept.getDeptName());
+                }
+            }
+        } else if ("TEAMS".equals(deptType)) {
+            // 用户部门是小组，向上找队室和大队
+            result.put("groupId", user.getDeptId());
+            result.put("groupName", userDept.getDeptName());
+            if (userDept.getParentId() != null && userDept.getParentId() != 0) {
+                result.put("teamId", userDept.getParentId());
+                // 获取父级部门（队室）
+                SysDept parentDept = sysDeptMapper.selectDeptById(userDept.getParentId());
+                if (parentDept != null) {
+                    result.put("teamName", parentDept.getDeptName());
+                    if (parentDept.getParentId() != null && parentDept.getParentId() != 0) {
+                        result.put("deptId", parentDept.getParentId());
+                        // 获取祖父级部门（大队）
+                        SysDept grandParentDept = sysDeptMapper.selectDeptById(parentDept.getParentId());
+                        if (grandParentDept != null) {
+                            result.put("deptName", grandParentDept.getDeptName());
+                        }
+                    }
+                }
+            }
+        }
+
+        return result;
+    }
+
     private final Map<Long, ScoreIndicator> indCache = new HashMap<>();
+    private final Map<String, Long> indicatorNameToIdCache = new HashMap<>(); // 指标名称到ID的映射
+    
     private ScoreIndicator getIndicator(long id) {
         return indCache.computeIfAbsent(id, indicatorMapper::selectById);
     }
@@ -488,12 +587,24 @@ public class LedgerSyncServiceImpl implements ILedgerSyncService {
                 .filter(x -> x.getValue().equals(dimId)).map(Map.Entry::getKey).findFirst().orElse("") : "");
         if (lv2 != null) {
             e.setIndicatorId(lv2.getId());
+            e.setLevel2Id(lv2.getId());
             e.setLevel2Name(lv2.getName());
         }
         if (lv3 != null) {
             e.setIndicatorId(lv3.getId());
             e.setLevel3Id(lv3.getId());
             e.setLevel3Name(lv3.getName());
+            // 如果lv3有父级（即lv2），确保level2Id也被设置
+            if (lv3.getParentId() != null && lv3.getParentId() != 0) {
+                e.setLevel2Id(lv3.getParentId());
+                // 通过ID获取lv2的名称（如果之前没设置）
+                if (e.getLevel2Name() == null) {
+                    ScoreIndicator parentLv2 = getIndicator(lv3.getParentId());
+                    if (parentLv2 != null) {
+                        e.setLevel2Name(parentLv2.getName());
+                    }
+                }
+            }
         } else if (lv2 != null) {
             e.setIndicatorId(lv2.getId());
         }
@@ -511,18 +622,21 @@ public class LedgerSyncServiceImpl implements ILedgerSyncService {
         e.setEvidenceFile(evidenceFile);
         e.setCreateBy("system");
         e.setCreateTime(DateUtils.getNowDate());
+        
+        // 通过人员名称解析组织信息（ID和名称）
         if (StrUtil.isNotEmpty(e.getPersonName())) {
-            e.setPersonId(userCache.get(e.getPersonName()));
-        }
-        if (StrUtil.isNotEmpty(e.getGroupName())) {
-            e.setGroupId(deptCache.get(e.getGroupName()));
-        }
-        if (StrUtil.isNotEmpty(e.getTeamName())) {
-            e.setTeamId(deptCache.get(e.getTeamName()));
-        }
-        if (StrUtil.isNotEmpty(e.getDeptName())) {
-            e.setDeptId(deptCache.get(e.getDeptName()));
+            Map<String, Object> orgInfo = resolveOrgInfoByName(e.getPersonName());
+            if (!orgInfo.isEmpty()) {
+                e.setPersonId((Long) orgInfo.get("userId"));
+                e.setDeptId((Long) orgInfo.get("deptId"));
+                e.setDeptName((String) orgInfo.get("deptName"));
+                e.setTeamId((Long) orgInfo.get("teamId"));
+                e.setTeamName((String) orgInfo.get("teamName"));
+                e.setGroupId((Long) orgInfo.get("groupId"));
+                e.setGroupName((String) orgInfo.get("groupName"));
+            }
         }
+        
         return e;
     }
 }