设备管理

airport-equipment/src/main/java/com/sundot/airport/equipment/service/impl/EquipmentLedgerServiceImpl.java

@@ -307,6 +307,9 @@ public class EquipmentLedgerServiceImpl extends ServiceImpl<EquipmentLedgerMappe
         List<SysUser> sysUserListAll = sysUserService.selectUserAll();
         Map<String, Long> sysUserMap = sysUserListAll.stream().collect(Collectors.toMap(SysUser::getNickName, SysUser::getUserId, (oldValue, newValue) -> newValue));
 
+        // 航站楼+区域+通道
+        List<BasePosition> basePositionList = basePositionService.selectBasePositionListTree(new BasePosition());
+
         // 航站楼
         BasePosition terminlQuery = new BasePosition();
         terminlQuery.setLevel(1);
@@ -338,7 +341,7 @@ public class EquipmentLedgerServiceImpl extends ServiceImpl<EquipmentLedgerMappe
 
         for (EquipmentLedger data : list) {
             // 根据名称填充ID字段
-            fillIdsByName(data, sysUserMap, terminlMap, regionalMap, channelMap, equipmentUsageStatusMap);
+            fillIdsByName(data, sysUserMap, basePositionList, terminlMap, regionalMap, channelMap, equipmentUsageStatusMap);
             try {
                 if (ObjUtil.isNull(data.getEquipmentSerialNumber())) {
                     failureNum++;
@@ -397,7 +400,7 @@ public class EquipmentLedgerServiceImpl extends ServiceImpl<EquipmentLedgerMappe
      *
      * @param data 速率数据
      */
-    private void fillIdsByName(EquipmentLedger data, Map<String, Long> sysUserMap, Map<String, String> terminlMap, Map<String, String> regionalMap, Map<String, String> channelMap, Map<String, String> equipmentUsageStatusMap) {
+    private void fillIdsByName(EquipmentLedger data, Map<String, Long> sysUserMap, List<BasePosition> basePositionList, Map<String, String> terminlMap, Map<String, String> regionalMap, Map<String, String> channelMap, Map<String, String> equipmentUsageStatusMap) {
         // 定/自检小组组长
         if (ObjUtil.isNotNull(data.getInspectionTeamLeaderName())) {
             data.setInspectionTeamLeaderId(sysUserMap.get(data.getInspectionTeamLeaderName()));
@@ -410,18 +413,35 @@ public class EquipmentLedgerServiceImpl extends ServiceImpl<EquipmentLedgerMappe
         if (ObjUtil.isNotNull(data.getInspectionTeamMember2Name())) {
             data.setInspectionTeamMember2Id(sysUserMap.get(data.getInspectionTeamMember2Name()));
         }
-        // 航站楼
+        // 航站楼+区域+通道
         if (ObjUtil.isNotNull(data.getTerminlName())) {
-            data.setTerminlCode(terminlMap.get(data.getTerminlName()));
-        }
-        // 区域
-        if (ObjUtil.isNotNull(data.getRegionalName())) {
-            data.setRegionalCode(regionalMap.get(data.getRegionalName()));
-        }
-        // 通道
-        if (ObjUtil.isNotNull(data.getChannelName())) {
-            data.setChannelCode(channelMap.get(data.getChannelName()));
+            BasePosition terminl = basePositionList.stream().filter(basePosition -> StrUtil.equals(basePosition.getName(), data.getTerminlCode())).findFirst().orElse(null);
+            if (ObjUtil.isNotNull(terminl)) {
+                data.setTerminlCode(terminl.getCode());
+                List<BasePosition> regionalList = (List<BasePosition>) terminl.getChildren();
+                BasePosition regional = regionalList.stream().filter(basePosition -> StrUtil.equals(basePosition.getName(), data.getRegionalName())).findFirst().orElse(null);
+                if (ObjUtil.isNotNull(regional)) {
+                    data.setRegionalCode(regional.getCode());
+                    List<BasePosition> channelList = (List<BasePosition>) regional.getChildren();
+                    BasePosition channel = channelList.stream().filter(basePosition -> StrUtil.equals(basePosition.getName(), data.getChannelName())).findFirst().orElse(null);
+                    if (ObjUtil.isNotNull(channel)) {
+                        data.setChannelCode(channel.getCode());
+                    }
+                }
+            }
         }
+//        // 航站楼
+//        if (ObjUtil.isNotNull(data.getTerminlName())) {
+//            data.setTerminlCode(terminlMap.get(data.getTerminlName()));
+//        }
+//        // 区域
+//        if (ObjUtil.isNotNull(data.getRegionalName())) {
+//            data.setRegionalCode(regionalMap.get(data.getRegionalName()));
+//        }
+//        // 通道
+//        if (ObjUtil.isNotNull(data.getChannelName())) {
+//            data.setChannelCode(channelMap.get(data.getChannelName()));
+//        }
     }
 
     /**