设备管理

airport-equipment/src/main/java/com/sundot/airport/equipment/domain/EquipmentLedger.java

@@ -103,6 +103,30 @@ public class EquipmentLedger extends BaseEntity {
     @Excel(name = "安装位置")
     private String installationLocation;
 
+    /** 航站楼编码 */
+    @Excel(name = "航站楼编码", type = Excel.Type.EXPORT)
+    private String terminlCode;
+
+    /** 航站楼名称 */
+    @Excel(name = "航站楼名称")
+    private String terminlName;
+
+    /** 区域编码 */
+    @Excel(name = "区域编码", type = Excel.Type.EXPORT)
+    private String regionalCode;
+
+    /** 区域名称 */
+    @Excel(name = "区域名称")
+    private String regionalName;
+
+    /** 通道编码 */
+    @Excel(name = "通道编码", type = Excel.Type.EXPORT)
+    private String channelCode;
+
+    /** 通道名称 */
+    @Excel(name = "通道名称")
+    private String channelName;
+
     /** 定/自检日期 */
     @JsonFormat(pattern = "yyyy-MM-dd")
     @DateTimeFormat(pattern = "yyyy-MM-dd")
@@ -319,6 +343,54 @@ public class EquipmentLedger extends BaseEntity {
         return installationLocation;
     }
 
+    public String getTerminlCode() {
+        return terminlCode;
+    }
+
+    public void setTerminlCode(String terminlCode) {
+        this.terminlCode = terminlCode;
+    }
+
+    public String getTerminlName() {
+        return terminlName;
+    }
+
+    public void setTerminlName(String terminlName) {
+        this.terminlName = terminlName;
+    }
+
+    public String getRegionalCode() {
+        return regionalCode;
+    }
+
+    public void setRegionalCode(String regionalCode) {
+        this.regionalCode = regionalCode;
+    }
+
+    public String getRegionalName() {
+        return regionalName;
+    }
+
+    public void setRegionalName(String regionalName) {
+        this.regionalName = regionalName;
+    }
+
+    public String getChannelCode() {
+        return channelCode;
+    }
+
+    public void setChannelCode(String channelCode) {
+        this.channelCode = channelCode;
+    }
+
+    public String getChannelName() {
+        return channelName;
+    }
+
+    public void setChannelName(String channelName) {
+        this.channelName = channelName;
+    }
+
     public void setInspectionSelfCheckDate(Date inspectionSelfCheckDate) {
         this.inspectionSelfCheckDate = inspectionSelfCheckDate;
     }
@@ -473,6 +545,12 @@ public class EquipmentLedger extends BaseEntity {
                 .append("usageStatus", getUsageStatus())
                 .append("scrappingDate", getScrappingDate())
                 .append("installationLocation", getInstallationLocation())
+                .append("terminlCode", getTerminlCode())
+                .append("terminlName", getTerminlName())
+                .append("regionalCode", getRegionalCode())
+                .append("regionalName", getRegionalName())
+                .append("channelCode", getChannelCode())
+                .append("channelName", getChannelName())
                 .append("inspectionSelfCheckDate", getInspectionSelfCheckDate())
                 .append("inspectionSelfCheckCycle", getInspectionSelfCheckCycle())
                 .append("nextInspectionDueDate", getNextInspectionDueDate())

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

@@ -26,6 +26,8 @@ import com.sundot.airport.common.utils.EquipmentDateUtils;
 import com.sundot.airport.common.utils.SecurityUtils;
 import com.sundot.airport.equipment.domain.EquipmentInspectionRecord;
 import com.sundot.airport.equipment.service.IEquipmentInspectionRecordService;
+import com.sundot.airport.system.domain.BasePosition;
+import com.sundot.airport.system.service.IBasePositionService;
 import com.sundot.airport.system.service.ISysDeptService;
 import com.sundot.airport.system.service.ISysDictDataService;
 import com.sundot.airport.system.service.ISysUserService;
@@ -55,6 +57,8 @@ public class EquipmentLedgerServiceImpl extends ServiceImpl<EquipmentLedgerMappe
     @Autowired
     private ISysDictDataService sysDictDataService;
     @Autowired
+    private IBasePositionService basePositionService;
+    @Autowired
     private ISysUserService sysUserService;
     @Autowired
     private ISysDeptService sysDeptService;
@@ -299,9 +303,29 @@ public class EquipmentLedgerServiceImpl extends ServiceImpl<EquipmentLedgerMappe
             throw new ServiceException("导入设备台账数据不能为空！");
         }
 
+        // 用户
         List<SysUser> sysUserListAll = sysUserService.selectUserAll();
         Map<String, Long> sysUserMap = sysUserListAll.stream().collect(Collectors.toMap(SysUser::getNickName, SysUser::getUserId, (oldValue, newValue) -> newValue));
 
+        // 航站楼
+        BasePosition terminlQuery = new BasePosition();
+        terminlQuery.setLevel(1);
+        List<BasePosition> terminlList = basePositionService.selectBasePositionList(terminlQuery);
+        Map<String, String> terminlMap = terminlList.stream().collect(Collectors.toMap(BasePosition::getName, BasePosition::getCode, (oldValue, newValue) -> newValue));
+
+        // 区域
+        BasePosition regionalQuery = new BasePosition();
+        regionalQuery.setLevel(2);
+        List<BasePosition> regionalList = basePositionService.selectBasePositionList(regionalQuery);
+        Map<String, String> regionalMap = regionalList.stream().collect(Collectors.toMap(BasePosition::getName, BasePosition::getCode, (oldValue, newValue) -> newValue));
+
+        // 通道
+        BasePosition channelQuery = new BasePosition();
+        channelQuery.setLevel(3);
+        List<BasePosition> channelList = basePositionService.selectBasePositionList(channelQuery);
+        Map<String, String> channelMap = channelList.stream().collect(Collectors.toMap(BasePosition::getName, BasePosition::getCode, (oldValue, newValue) -> newValue));
+
+        // 使用状态
         SysDictData equipmentUsageStatusQuery = new SysDictData();
         equipmentUsageStatusQuery.setDictType("equipment_usage_status");
         List<SysDictData> equipmentUsageStatusList = sysDictDataService.selectDictDataList(equipmentUsageStatusQuery);
@@ -314,7 +338,7 @@ public class EquipmentLedgerServiceImpl extends ServiceImpl<EquipmentLedgerMappe
 
         for (EquipmentLedger data : list) {
             // 根据名称填充ID字段
-            fillIdsByName(data, sysUserMap, equipmentUsageStatusMap);
+            fillIdsByName(data, sysUserMap, terminlMap, regionalMap, channelMap, equipmentUsageStatusMap);
             try {
                 if (ObjUtil.isNull(data.getEquipmentSerialNumber())) {
                     failureNum++;
@@ -373,7 +397,7 @@ public class EquipmentLedgerServiceImpl extends ServiceImpl<EquipmentLedgerMappe
      *
      * @param data 速率数据
      */
-    private void fillIdsByName(EquipmentLedger data, Map<String, Long> sysUserMap, Map<String, String> equipmentUsageStatusMap) {
+    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) {
         // 定/自检小组组长
         if (ObjUtil.isNotNull(data.getInspectionTeamLeaderName())) {
             data.setInspectionTeamLeaderId(sysUserMap.get(data.getInspectionTeamLeaderName()));
@@ -386,6 +410,18 @@ 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()));
+        }
     }
 
     /**

airport-equipment/src/main/resources/mapper/equipment/EquipmentLedgerMapper.xml

@@ -28,6 +28,12 @@
         <result property="usageStatus" column="usage_status"/>
         <result property="scrappingDate" column="scrapping_date"/>
         <result property="installationLocation" column="installation_location"/>
+        <result property="terminlCode" column="terminl_code"/>
+        <result property="terminlName" column="terminl_name"/>
+        <result property="regionalCode" column="regional_code"/>
+        <result property="regionalName" column="regional_name"/>
+        <result property="channelCode" column="channel_code"/>
+        <result property="channelName" column="channel_name"/>
         <result property="inspectionSelfCheckDate" column="inspection_self_check_date"/>
         <result property="inspectionSelfCheckCycle" column="inspection_self_check_cycle"/>
         <result property="nextInspectionDueDate" column="next_inspection_due_date"/>
@@ -63,6 +69,12 @@
                usage_status,
                scrapping_date,
                installation_location,
+               terminl_code,
+               terminl_name,
+               regional_code,
+               regional_name,
+               channel_code,
+               channel_name,
                inspection_self_check_date,
                inspection_self_check_cycle,
                next_inspection_due_date,
@@ -105,6 +117,24 @@
             <if test="installationLocation != null  and installationLocation != ''">and installation_location =
                 #{installationLocation}
             </if>
+            <if test="terminlCode != null  and terminlCode != ''">and terminl_code =
+                #{terminlCode}
+            </if>
+            <if test="terminlName != null  and terminlName != ''">and
+                terminl_name like concat('%', #{terminlName}, '%')
+            </if>
+            <if test="regionalCode != null  and regionalCode != ''">and regional_code =
+                #{regionalCode}
+            </if>
+            <if test="regionalName != null  and regionalName != ''">and
+                regional_name like concat('%', #{regionalName}, '%')
+            </if>
+            <if test="channelCode != null  and channelCode != ''">and channel_code =
+                #{channelCode}
+            </if>
+            <if test="channelName != null  and channelName != ''">and
+                channel_name like concat('%', #{channelName}, '%')
+            </if>
             <if test="inspectionSelfCheckDate != null ">and inspection_self_check_date = #{inspectionSelfCheckDate}</if>
             <if test="inspectionSelfCheckCycle != null ">and inspection_self_check_cycle = #{inspectionSelfCheckCycle}
             </if>
@@ -211,6 +241,12 @@
             <if test="usageStatus != null">usage_status,</if>
             <if test="scrappingDate != null">scrapping_date,</if>
             <if test="installationLocation != null">installation_location,</if>
+            <if test="terminlCode != null">terminl_code,</if>
+            <if test="terminlName != null">terminl_name,</if>
+            <if test="regionalCode != null">regional_code,</if>
+            <if test="regionalName != null">regional_name,</if>
+            <if test="channelCode != null">channel_code,</if>
+            <if test="channelName != null">channel_name,</if>
             <if test="inspectionSelfCheckDate != null">inspection_self_check_date,</if>
             <if test="inspectionSelfCheckCycle != null">inspection_self_check_cycle,</if>
             <if test="nextInspectionDueDate != null">next_inspection_due_date,</if>
@@ -244,6 +280,12 @@
             <if test="usageStatus != null">#{usageStatus},</if>
             <if test="scrappingDate != null">#{scrappingDate},</if>
             <if test="installationLocation != null">#{installationLocation},</if>
+            <if test="terminlCode != null">#{terminlCode},</if>
+            <if test="terminlName != null">#{terminlName},</if>
+            <if test="regionalCode != null">#{regionalCode},</if>
+            <if test="regionalName != null">#{regionalName},</if>
+            <if test="channelCode != null">#{channelCode},</if>
+            <if test="channelName != null">#{channelName},</if>
             <if test="inspectionSelfCheckDate != null">#{inspectionSelfCheckDate},</if>
             <if test="inspectionSelfCheckCycle != null">#{inspectionSelfCheckCycle},</if>
             <if test="nextInspectionDueDate != null">#{nextInspectionDueDate},</if>
@@ -283,6 +325,12 @@
             <if test="usageStatus != null">usage_status = #{usageStatus},</if>
             <if test="scrappingDate != null">scrapping_date = #{scrappingDate},</if>
             <if test="installationLocation != null">installation_location = #{installationLocation},</if>
+            <if test="terminlCode != null">terminl_code = #{terminlCode},</if>
+            <if test="terminlName != null">terminl_name = #{terminlName},</if>
+            <if test="regionalCode != null">regional_code = #{regionalCode},</if>
+            <if test="regionalName != null">regional_name = #{regionalName},</if>
+            <if test="channelCode != null">channel_code = #{channelCode},</if>
+            <if test="channelName != null">channel_name = #{channelName},</if>
             <if test="inspectionSelfCheckDate != null">inspection_self_check_date = #{inspectionSelfCheckDate},</if>
             <if test="inspectionSelfCheckCycle != null">inspection_self_check_cycle = #{inspectionSelfCheckCycle},</if>
             <if test="nextInspectionDueDate != null">next_inspection_due_date = #{nextInspectionDueDate},</if>