Merge remote-tracking branch 'origin/master'

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

@@ -54,6 +54,18 @@ public class ScoreEvent extends BaseEntity {
     @Excel(name = "位置")
     private String location;
 
+    @Excel(name = "责任人ID")
+    private Long personId;
+
+    @Excel(name = "部门ID")
+    private Long deptId;
+
+    @Excel(name = "队室ID/班组ID")
+    private Long teamId;
+
+    @Excel(name = "小组ID")
+    private Long groupId;
+
     @Excel(name = "责任人")
     private String personName;
 
@@ -129,6 +141,18 @@ public class ScoreEvent extends BaseEntity {
     public String getLocation() { return location; }
     public void setLocation(String location) { this.location = location; }
 
+    public Long getPersonId() { return personId; }
+    public void setPersonId(Long personId) { this.personId = personId; }
+
+    public Long getDeptId() { return deptId; }
+    public void setDeptId(Long deptId) { this.deptId = deptId; }
+
+    public Long getTeamId() { return teamId; }
+    public void setTeamId(Long teamId) { this.teamId = teamId; }
+
+    public Long getGroupId() { return groupId; }
+    public void setGroupId(Long groupId) { this.groupId = groupId; }
+
     public String getPersonName() { return personName; }
     public void setPersonName(String personName) { this.personName = personName; }
 

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

@@ -1,10 +1,15 @@
 package com.sundot.airport.ledger.service.impl;
 
+import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.sundot.airport.common.core.domain.entity.SysDept;
+import com.sundot.airport.common.core.domain.entity.SysUser;
 import com.sundot.airport.common.utils.DateUtils;
 import com.sundot.airport.ledger.domain.*;
 import com.sundot.airport.ledger.mapper.*;
 import com.sundot.airport.ledger.service.ILedgerSyncService;
+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.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -53,9 +58,13 @@ public class LedgerSyncServiceImpl implements ILedgerSyncService {
     @Autowired private ScoreEventMapper scoreEventMapper;
     @Autowired private ScoreDimensionMapper dimensionMapper;
     @Autowired private ScoreIndicatorMapper indicatorMapper;
+    @Autowired private SysDeptMapper sysDeptMapper;
+    @Autowired private SysUserMapper sysUserMapper;
 
     // ── Dimension ID cache (loaded once) ─────────────────────
     private final Map<String, Long> dimCache = new HashMap<>();
+    private final Map<String, Long> deptCache = new HashMap<>();
+    private final Map<String, Long> userCache = new HashMap<>();
 
     // ── Constants: Indicator IDs（与 score.sql 中的显式 ID 对应）─
     // dim1 安全防控能力
@@ -113,6 +122,8 @@ public class LedgerSyncServiceImpl implements ILedgerSyncService {
     @Transactional(rollbackFor = Exception.class)
     public SyncResult syncAll() {
         loadDimCache();
+        loadDeptCache();
+        loadUserCache();
         StringBuilder sb = new StringBuilder();
         int totalIns = 0, totalSkip = 0;
         for (String type : Arrays.asList(
@@ -132,6 +143,8 @@ public class LedgerSyncServiceImpl implements ILedgerSyncService {
     @Transactional(rollbackFor = Exception.class)
     public SyncResult syncByType(String ledgerType) {
         loadDimCache();
+        loadDeptCache();
+        loadUserCache();
         return doSync(ledgerType);
     }
 
@@ -427,6 +440,16 @@ public class LedgerSyncServiceImpl implements ILedgerSyncService {
         dimensionMapper.selectList(new ScoreDimension()).forEach(d -> dimCache.put(d.getName(), d.getId()));
     }
 
+    private void loadDeptCache() {
+        if (!deptCache.isEmpty()) return;
+        sysDeptMapper.selectDeptList(new SysDept()).forEach(d -> deptCache.put(d.getDeptName(), d.getDeptId()));
+    }
+
+    private void loadUserCache() {
+        if (!userCache.isEmpty()) return;
+        sysUserMapper.selectUserList(new SysUser()).forEach(d -> userCache.put(d.getNickName(), d.getUserId()));
+    }
+
     private final Map<Long, ScoreIndicator> indCache = new HashMap<>();
     private ScoreIndicator getIndicator(long id) {
         return indCache.computeIfAbsent(id, indicatorMapper::selectById);
@@ -475,6 +498,18 @@ public class LedgerSyncServiceImpl implements ILedgerSyncService {
         e.setEvidenceFile(evidenceFile);
         e.setCreateBy("system");
         e.setCreateTime(DateUtils.getNowDate());
+        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()));
+        }
         return e;
     }
 }