ledger_unsafe_event表新增字段和导入功能字段数据新增

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

@@ -37,12 +37,16 @@ public class LedgerSeizureStats extends BaseEntity {
     @Excel(name = "工作区域")
     private String workArea;
 
+    private Long areaId;
+
     @Excel(name = "安检资格证书等级")
     private String qualificationLevel;
 
     @Excel(name = "岗位")
     private String position;
 
+    private Long positionId;
+
     @Excel(name = "小组")
     private String groupName;
 
@@ -154,12 +158,18 @@ public class LedgerSeizureStats extends BaseEntity {
     public String getWorkArea() { return workArea; }
     public void setWorkArea(String workArea) { this.workArea = workArea; }
 
+    public Long getAreaId() { return areaId; }
+    public void setAreaId(Long areaId) { this.areaId = areaId; }
+
     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 Long getPositionId() { return positionId; }
+    public void setPositionId(Long positionId) { this.positionId = positionId; }
+
     public String getGroupName() { return groupName; }
     public void setGroupName(String groupName) { this.groupName = groupName; }
 

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

@@ -24,18 +24,54 @@ public class LedgerUnsafeEvent extends BaseEntity {
     @Excel(name = "事件日期", width = 20, dateFormat = "yyyy-MM-dd")
     private Date recordDate;
 
+    @Excel(name = "航班号")
+    private String flightNo;
+
     @Excel(name = "部门名称")
     private String deptName;
 
     @Excel(name = "队室/班组")
     private String teamName;
 
+    @Excel(name = "队室内勤")
+    private String teamInternalDuty;
+
+    @Excel(name = "小组")
+    private String groupName;
+
+    private Long groupId;
+
+    private Long deptId;
+
+    private Long teamId;
+
     @Excel(name = "责任人")
     private String responsibleName;
 
+    private Long responsibleId;
+
     @Excel(name = "事件类型")
     private String eventType;
 
+    @Excel(name = "涉及物品")
+    private String involvedItems;
+
+    @Excel(name = "岗位")
+    private String position;
+
+    private Long positionId;
+
+    @Excel(name = "区域")
+    private String area;
+
+    private Long areaId;
+
+    @Excel(name = "通道号")
+    private String channelNo;
+
+    @Excel(name = "图像")
+    private String image;
+
     @Excel(name = "事件描述")
     private String eventDesc;
 
@@ -62,18 +98,60 @@ public class LedgerUnsafeEvent extends BaseEntity {
     public Date getRecordDate() { return recordDate; }
     public void setRecordDate(Date recordDate) { this.recordDate = recordDate; }
 
+    public String getFlightNo() { return flightNo; }
+    public void setFlightNo(String flightNo) { this.flightNo = flightNo; }
+
     public String getDeptName() { return deptName; }
     public void setDeptName(String deptName) { this.deptName = deptName; }
 
     public String getTeamName() { return teamName; }
     public void setTeamName(String teamName) { this.teamName = teamName; }
 
+    public String getTeamInternalDuty() { return teamInternalDuty; }
+    public void setTeamInternalDuty(String teamInternalDuty) { this.teamInternalDuty = teamInternalDuty; }
+
+    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 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 String getResponsibleName() { return responsibleName; }
     public void setResponsibleName(String responsibleName) { this.responsibleName = responsibleName; }
 
+    public Long getResponsibleId() { return responsibleId; }
+    public void setResponsibleId(Long responsibleId) { this.responsibleId = responsibleId; }
+
     public String getEventType() { return eventType; }
     public void setEventType(String eventType) { this.eventType = eventType; }
 
+    public String getInvolvedItems() { return involvedItems; }
+    public void setInvolvedItems(String involvedItems) { this.involvedItems = involvedItems; }
+
+    public String getPosition() { return position; }
+    public void setPosition(String position) { this.position = position; }
+
+    public Long getPositionId() { return positionId; }
+    public void setPositionId(Long positionId) { this.positionId = positionId; }
+
+    public String getArea() { return area; }
+    public void setArea(String area) { this.area = area; }
+
+    public Long getAreaId() { return areaId; }
+    public void setAreaId(Long areaId) { this.areaId = areaId; }
+
+    public String getChannelNo() { return channelNo; }
+    public void setChannelNo(String channelNo) { this.channelNo = channelNo; }
+
+    public String getImage() { return image; }
+    public void setImage(String image) { this.image = image; }
+
     public String getEventDesc() { return eventDesc; }
     public void setEventDesc(String eventDesc) { this.eventDesc = eventDesc; }
 

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

@@ -4,6 +4,8 @@ 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.system.domain.SysPost;
+import com.sundot.airport.system.domain.BasePosition;
 import com.sundot.airport.ledger.domain.*;
 import com.sundot.airport.ledger.domain.LedgerDailyTraining;
 import com.sundot.airport.ledger.domain.LedgerLeaderDuty;
@@ -18,6 +20,8 @@ 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 com.sundot.airport.system.mapper.SysPostMapper;
+import com.sundot.airport.system.mapper.BasePositionMapper;
 import org.apache.poi.ss.usermodel.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -60,6 +64,8 @@ public class LedgerCombinedImportServiceImpl implements ILedgerCombinedImportSer
     @Autowired private IScoreEventService scoreEventService;
     @Autowired private SysUserMapper sysUserMapper;
     @Autowired private SysDeptMapper sysDeptMapper;
+    @Autowired private SysPostMapper sysPostMapper;
+    @Autowired private BasePositionMapper basePositionMapper;
 
     // 导入缓存（在导入开始时构建，导入结束后释放）
     private ImportCache importCache;
@@ -390,10 +396,44 @@ public class LedgerCombinedImportServiceImpl implements ILedgerCombinedImportSer
             o.setRecordDate(date(c, 0));
             o.setEventDesc(str(c, 1));
             o.setEventType(str(c, 2));
-            o.setResponsibleName(str(c, 4));
+            o.setFlightNo(str(c, 3));
+            String responsibleName = str(c, 4);
+            o.setResponsibleName(responsibleName);
             o.setTeamName(str(c, 5));
-            o.setEvidenceFile(str(c, 10));
-            o.setRemark(str(c, 8));
+            o.setInvolvedItems(str(c, 6));
+            o.setPosition(str(c, 7));
+            o.setArea(str(c, 8));
+            o.setChannelNo(str(c, 9));
+            o.setImage(str(c, 10));
+            
+            // 使用缓存查找组织信息
+            Map<String, Long> 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"));
+            }
+            
+            // 根据岗位名称和区域名称查找ID
+            if (importCache != null) {
+                String positionName = str(c, 7);
+                if (positionName != null && !positionName.trim().isEmpty()) {
+                    Long positionId = importCache.getPositionIdByName(positionName.trim());
+                    if (positionId != null) {
+                        o.setPositionId(positionId);
+                    }
+                }
+                
+                String areaName = str(c, 8);
+                if (areaName != null && !areaName.trim().isEmpty()) {
+                    Long areaId = importCache.getAreaIdByName(areaName.trim());
+                    if (areaId != null) {
+                        o.setAreaId(areaId);
+                    }
+                }
+            }
+            
             o.setImportBatch(batchNo);
             o.setSourceType("1");
             o.setCreateBy(username);
@@ -448,6 +488,25 @@ public class LedgerCombinedImportServiceImpl implements ILedgerCombinedImportSer
                 o.setTeamId(orgInfo.get("teamId"));
                 o.setGroupId(orgInfo.get("groupId"));
             }
+            
+            // 根据岗位名称和工作区域名称查找ID
+            if (importCache != null) {
+                String positionName = str(c, 7);
+                if (positionName != null && !positionName.trim().isEmpty()) {
+                    Long positionId = importCache.getPositionIdByName(positionName.trim());
+                    if (positionId != null) {
+                        o.setPositionId(positionId);
+                    }
+                }
+                
+                String areaName = str(c, 4);
+                if (areaName != null && !areaName.trim().isEmpty()) {
+                    Long areaId = importCache.getAreaIdByName(areaName.trim());
+                    if (areaId != null) {
+                        o.setAreaId(areaId);
+                    }
+                }
+            }
                 
             o.setImportBatch(batchNo);
             o.setSourceType("1");
@@ -920,10 +979,15 @@ public class LedgerCombinedImportServiceImpl implements ILedgerCombinedImportSer
     private static class ImportCache {
         private final Map<String, SysUser> userCache;      // Map<昵称, 用户>
         private final Map<Long, SysDept> deptCache;        // Map<部门ID, 部门>
+        private final Map<String, Long> positionCache;     // Map<岗位名称, 岗位ID>
+        private final Map<String, Long> areaCache;         // Map<区域名称, 区域ID>
 
-        public ImportCache(Map<String, SysUser> userCache, Map<Long, SysDept> deptCache) {
+        public ImportCache(Map<String, SysUser> userCache, Map<Long, SysDept> deptCache,
+                          Map<String, Long> positionCache, Map<String, Long> areaCache) {
             this.userCache = userCache;
             this.deptCache = deptCache;
+            this.positionCache = positionCache;
+            this.areaCache = areaCache;
         }
 
         public SysUser getUserByNickName(String nickName) {
@@ -933,6 +997,14 @@ public class LedgerCombinedImportServiceImpl implements ILedgerCombinedImportSer
         public SysDept getDeptById(Long deptId) {
             return deptCache.get(deptId);
         }
+
+        public Long getPositionIdByName(String positionName) {
+            return positionCache.get(positionName);
+        }
+
+        public Long getAreaIdByName(String areaName) {
+            return areaCache.get(areaName);
+        }
     }
 
     // ════════════════════════════════════════════════════════════════
@@ -1019,8 +1091,33 @@ public class LedgerCombinedImportServiceImpl implements ILedgerCombinedImportSer
             }
         }
 
+        // 构建岗位缓存：Map<岗位名称, 岗位ID>
+        Map<String, Long> positionCache = new HashMap<>();
+        List<SysPost> allPosts = sysPostMapper.selectPostAll();
+        if (allPosts != null) {
+            for (SysPost post : allPosts) {
+                if (post.getPostName() != null && !post.getPostName().trim().isEmpty()) {
+                    positionCache.put(post.getPostName().trim(), post.getPostId());
+                }
+            }
+        }
+
+        // 构建区域缓存：Map<区域名称, 区域ID>
+        // 从base_position表查询position_type='REGIONAL'的区域
+        Map<String, Long> areaCache = new HashMap<>();
+        BasePosition queryPosition = new BasePosition();
+        queryPosition.setPositionType("REGIONAL");
+        List<BasePosition> allAreas = basePositionMapper.selectBasePositionList(queryPosition);
+        if (allAreas != null) {
+            for (BasePosition area : allAreas) {
+                if (area.getName() != null && !area.getName().trim().isEmpty()) {
+                    areaCache.put(area.getName().trim(), area.getId());
+                }
+            }
+        }
+
         // 创建统一缓存对象
-        this.importCache = new ImportCache(userCache, deptCache);
+        this.importCache = new ImportCache(userCache, deptCache, positionCache, areaCache);
     }
 
     /**

airport-ledger/src/main/resources/mapper/ledger/LedgerUnsafeEventMapper.xml

@@ -5,24 +5,39 @@
     <resultMap id="BaseResultMap" type="com.sundot.airport.ledger.domain.LedgerUnsafeEvent">
         <id property="id" column="id" />
         <result property="recordDate" column="record_date" />
+        <result property="flightNo" column="flight_no" />
         <result property="deptName" column="dept_name" />
+        <result property="deptId" column="dept_id" />
         <result property="teamName" column="team_name" />
+        <result property="teamInternalDuty" column="team_internal_duty" />
+        <result property="teamId" column="team_id" />
+        <result property="groupName" column="group_name" />
+        <result property="groupId" column="group_id" />
         <result property="responsibleName" column="responsible_name" />
+        <result property="responsibleId" column="responsible_id" />
         <result property="eventType" column="event_type" />
+        <result property="involvedItems" column="involved_items" />
+        <result property="position" column="position" />
+        <result property="positionId" column="position_id" />
+        <result property="area" column="area" />
+        <result property="areaId" column="area_id" />
+        <result property="channelNo" column="channel_no" />
+        <result property="image" column="image" />
         <result property="eventDesc" column="event_desc" />
         <result property="resultHandling" column="result_handling" />
         <result property="deductScore" column="deduct_score" />
         <result property="evidenceFile" column="evidence_file" />
         <result property="remark" column="remark" />
         <result property="importBatch" column="import_batch" />
-        <result property="sourceType" column="source_type" />        <result property="createBy"   column="create_by"   />
+        <result property="sourceType" column="source_type" />
+        <result property="createBy"   column="create_by"   />
         <result property="createTime" column="create_time" />
         <result property="updateBy"   column="update_by"   />
         <result property="updateTime" column="update_time" />
     </resultMap>
 
     <sql id="selectVo">
-        SELECT id, record_date,dept_name,team_name,responsible_name,event_type,event_desc,result_handling,deduct_score,evidence_file,remark,import_batch,source_type, create_by, create_time, update_by, update_time
+        SELECT id, record_date, flight_no, dept_name, dept_id, team_name, team_internal_duty, team_id, group_name, group_id, responsible_name, responsible_id, event_type, involved_items, position, position_id, area, area_id, channel_no, image, event_desc, result_handling, deduct_score, evidence_file, remark, import_batch, source_type, create_by, create_time, update_by, update_time
         FROM ledger_unsafe_event
         WHERE del_flag = '0'
     </sql>