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

@@ -55,6 +55,9 @@ public class LedgerRealtimeInterception extends BaseEntity {
     @Excel(name = "工作点")
     private String channelNo;
 
+    //通道id
+    private Long channelId;
+
     @Excel(name = "实时质控拦截物品")
     private String itemName;
 
@@ -170,4 +173,7 @@ public class LedgerRealtimeInterception extends BaseEntity {
 
     public String getSyncFlag() { return syncFlag; }
     public void setSyncFlag(String syncFlag) { this.syncFlag = syncFlag; }
+
+    public Long getChannelId() { return channelId; }
+    public void setChannelId(Long channelId) { this.channelId = channelId; }
 }

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

@@ -30,6 +30,9 @@ public class LedgerSecurityTest extends BaseEntity {
     @Excel(name = "测试通道")
     private String channel;
 
+    // 通道id
+    private Long channelId;
+
     @Excel(name = "部门名称")
     private String deptName;
 
@@ -193,4 +196,12 @@ public class LedgerSecurityTest extends BaseEntity {
 
     public String getSyncFlag() { return syncFlag; }
     public void setSyncFlag(String syncFlag) { this.syncFlag = syncFlag; }
+
+    public Long getChannelId() {
+        return channelId;
+    }
+
+    public void setChannelId(Long channelId) {
+        this.channelId = channelId;
+    }
 }

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

@@ -45,6 +45,9 @@ public class LedgerServicePatrol extends BaseEntity {
     @Excel(name = "工作点")
     private String channelNo;
 
+    // 通道id
+    private Long channelId;
+
     @Excel(name = "岗位")
     private String position;
 
@@ -188,4 +191,7 @@ public class LedgerServicePatrol extends BaseEntity {
 
     public String getSyncFlag() { return syncFlag; }
     public void setSyncFlag(String syncFlag) { this.syncFlag = syncFlag; }
+
+    public Long getChannelId() { return channelId; }
+    public void setChannelId(Long channelId) { this.channelId = channelId; }
 }

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

@@ -62,6 +62,9 @@ public class LedgerSupervisionProblem extends BaseEntity {
     @Excel(name = "工作点")
     private String channelNo;
 
+    //通道id
+    private Long channelId;
+
     @Excel(name = "岗位")
     private String position;
 
@@ -200,4 +203,12 @@ public class LedgerSupervisionProblem extends BaseEntity {
 
     public String getSyncFlag() { return syncFlag; }
     public void setSyncFlag(String syncFlag) { this.syncFlag = syncFlag; }
+
+    public Long getChannelId() {
+        return channelId;
+    }
+
+    public void setChannelId(Long channelId) {
+        this.channelId = channelId;
+    }
 }

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

@@ -64,6 +64,9 @@ public class LedgerUnsafeEvent extends BaseEntity {
     @Excel(name = "通道号")
     private String channelNo;
 
+    //通道id
+    private Long channelId;
+
     @Excel(name = "附件")
     private String image;
 
@@ -158,4 +161,7 @@ public class LedgerUnsafeEvent extends BaseEntity {
 
     public String getSyncFlag() { return syncFlag; }
     public void setSyncFlag(String syncFlag) { this.syncFlag = syncFlag; }
+
+    public Long getChannelId() { return channelId; }
+    public void setChannelId(Long channelId) { this.channelId = channelId; }
 }

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

@@ -36,6 +36,7 @@ import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
+import java.util.stream.Collectors;
 
 /**
  * 台账合并Excel一键全量导入实现
@@ -230,6 +231,13 @@ public class LedgerCombinedImportServiceImpl implements ILedgerCombinedImportSer
                         o.setAreaId(areaId);
                     }
                 }
+                String channelNo = o.getChannelNo();
+                if (channelNo != null && !channelNo.trim().isEmpty()) {
+                    Long channelId = importCache.getChannelIdByName(channelNo.trim());
+                    if (channelId != null) {
+                        o.setChannelId(channelId);
+                    }
+                }
             }
 
             o.setImportBatch(batchNo);
@@ -373,6 +381,15 @@ public class LedgerCombinedImportServiceImpl implements ILedgerCombinedImportSer
                         o.setAreaId(areaId);
                     }
                 }
+
+                String channelNo = o.getChannelNo();
+                if (channelNo != null && !channelNo.trim().isEmpty()) {
+                    Long channelId = importCache.getChannelIdByName(channelNo.trim());
+                    if (channelId != null) {
+                        o.setChannelId(channelId);
+                    }
+                }
+
             }
             
             o.setImportBatch(batchNo);
@@ -442,6 +459,14 @@ public class LedgerCombinedImportServiceImpl implements ILedgerCombinedImportSer
                         o.setAreaId(areaId);
                     }
                 }
+                //通道
+                String channelNo = o.getChannelNo();
+                if (channelNo != null && !channelNo.trim().isEmpty()) {
+                    Long channelId = importCache.getChannelIdByName(channelNo.trim());
+                    if (channelId != null) {
+                        o.setChannelId(channelId);
+                    }
+                }
             }
             
             o.setImportBatch(batchNo);
@@ -553,6 +578,16 @@ public class LedgerCombinedImportServiceImpl implements ILedgerCombinedImportSer
                         o.setAreaId(areaId);
                     }
                 }
+
+                //通道
+                String channelNo = o.getChannel();
+                if (channelNo != null && !channelNo.trim().isEmpty()) {
+                    Long channelId = importCache.getChannelIdByName(channelNo.trim());
+                    if (channelId != null) {
+                        o.setChannelId(channelId);
+                    }
+                }
+
             }
             
             o.setImportBatch(batchNo);
@@ -734,6 +769,16 @@ public class LedgerCombinedImportServiceImpl implements ILedgerCombinedImportSer
                         o.setAreaId(areaId);
                     }
                 }
+
+                //通道
+                String channelNo = o.getChannelNo();
+                if (channelNo != null && !channelNo.trim().isEmpty()) {
+                    Long channelId = importCache.getChannelIdByName(channelNo.trim());
+                    if (channelId != null) {
+                        o.setChannelId(channelId);
+                    }
+                }
+
             }
             
             o.setImportBatch(batchNo);
@@ -1239,7 +1284,19 @@ public class LedgerCombinedImportServiceImpl implements ILedgerCombinedImportSer
 
     private String str(Object[] c, int idx) {
         if (idx >= c.length || c[idx] == null) return null;
-        String s = c[idx].toString().trim();
+        Object value = c[idx];
+        String s;
+        // 处理数字类型，去除 .0 后缀
+        if (value instanceof Double) {
+            Double d = (Double) value;
+            if (d == d.longValue()) {
+                s = String.valueOf(d.longValue());
+            } else {
+                s = d.toString();
+            }
+        } else {
+            s = value.toString().trim();
+        }
         return s.isEmpty() ? null : s;
     }
 
@@ -1372,13 +1429,16 @@ public class LedgerCombinedImportServiceImpl implements ILedgerCombinedImportSer
         private final Map<Long, SysDept> deptCache;        // Map<部门ID, 部门>
         private final Map<String, Long> positionCache;     // Map<岗位名称, 岗位ID>
         private final Map<String, Long> areaCache;         // Map<区域名称, 区域ID>
+        private final Map<String, Long> channelCache;      // Map<渠道名称, 渠道ID>
 
         public ImportCache(Map<String, SysUser> userCache, Map<Long, SysDept> deptCache,
-                          Map<String, Long> positionCache, Map<String, Long> areaCache) {
+                          Map<String, Long> positionCache, Map<String, Long> areaCache, Map<String, Long> channelCache
+        ) {
             this.userCache = userCache;
             this.deptCache = deptCache;
             this.positionCache = positionCache;
             this.areaCache = areaCache;
+            this.channelCache = channelCache;
         }
 
         public SysUser getUserByNickName(String nickName) {
@@ -1397,6 +1457,10 @@ public class LedgerCombinedImportServiceImpl implements ILedgerCombinedImportSer
             return areaCache.get(areaName);
         }
 
+        public Long getChannelIdByName(String channelName) {
+            return channelCache.get(channelName);
+        }
+
         public SysDept getDeptByNameAndType(String deptName, String deptType) {
             for (SysDept dept : deptCache.values()) {
                 if (deptName.equals(dept.getDeptName()) && deptType.equals(dept.getDeptType())) {
@@ -1537,19 +1601,26 @@ public class LedgerCombinedImportServiceImpl implements ILedgerCombinedImportSer
         // 构建区域缓存：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);
+
+        Map<String, Long> channelCache = new HashMap<>();
+        List<BasePosition> allAreas = basePositionMapper.selectBasePositionList(new BasePosition());
         if (allAreas != null) {
-            for (BasePosition area : allAreas) {
+            List<BasePosition> collect = allAreas.stream().filter(area -> "REGIONAL".equals(area.getPositionType())).collect(Collectors.toList());
+            for (BasePosition area : collect) {
                 if (area.getName() != null && !area.getName().trim().isEmpty()) {
                     areaCache.put(area.getName().trim(), area.getId());
                 }
             }
+            List<BasePosition> channel = allAreas.stream().filter(area -> "CHANNEL".equals(area.getPositionType())).collect(Collectors.toList());
+            for (BasePosition post : channel) {
+                if (post.getName() != null && !post.getName().trim().isEmpty()) {
+                    channelCache.put(post.getName().trim(), post.getId());
+                }
+            }
         }
 
         // 创建统一缓存对象
-        this.importCache = new ImportCache(userCache, deptCache, positionCache, areaCache);
+        this.importCache = new ImportCache(userCache, deptCache, positionCache, areaCache,channelCache);
     }
 
     /**