Merge remote-tracking branch 'origin/feature/dev' into feature/dev

airport-admin/src/main/java/com/sundot/airport/web/controller/equipment/EquipmentLedgerController.java

@@ -21,6 +21,7 @@ import com.sundot.airport.equipment.domain.EquipmentLedger;
 import com.sundot.airport.equipment.service.IEquipmentLedgerService;
 import com.sundot.airport.common.utils.poi.ExcelUtil;
 import com.sundot.airport.common.core.page.TableDataInfo;
+import org.springframework.web.multipart.MultipartFile;
 
 /**
  * 设备台账Controller
@@ -107,4 +108,35 @@ public class EquipmentLedgerController extends BaseController {
     public AjaxResult remove(@PathVariable Long[] ids) {
         return toAjax(equipmentLedgerService.deleteEquipmentLedgerByIds(ids));
     }
+
+    /**
+     * 导入设备台账列表
+     */
+    @PreAuthorize("@ss.hasPermi('equipment:ledger:import')")
+    @Log(title = "导入设备台账列表", businessType = BusinessType.IMPORT)
+    @PostMapping("/importData")
+    public AjaxResult importData(MultipartFile file, boolean updateSupport) throws Exception {
+        ExcelUtil<EquipmentLedger> util = new ExcelUtil<>(EquipmentLedger.class);
+        List<EquipmentLedger> list = util.importExcel(file.getInputStream());
+        String message = equipmentLedgerService.importData(list, updateSupport);
+        return success(message);
+    }
+
+    /**
+     * 获取导入模板
+     */
+    @PostMapping("/importTemplate")
+    public void importTemplate(HttpServletResponse response) {
+        ExcelUtil<EquipmentLedger> util = new ExcelUtil<>(EquipmentLedger.class);
+        util.importTemplateExcel(response, "设备台账数据导入模板");
+    }
+
+    /**
+     * 设备台账通知
+     */
+    @GetMapping("/notice")
+    public AjaxResult notice(EquipmentLedger equipmentLedger) {
+        List<EquipmentLedger> list = equipmentLedgerService.notice(equipmentLedger);
+        return success(list);
+    }
 }

airport-admin/src/main/java/com/sundot/airport/web/controller/item/HkOperationDataController.java

@@ -74,8 +74,14 @@ public class HkOperationDataController extends BaseController {
     }
 
     /**
-     * 导入客户原始格式的每日运行数据统计表
-     * Excel结构：前4行为标题/分组表头，第5行起为数据，列按固定位置映射
+     * 导入每日运行数据（按导入模板格式）
+     * Excel结构：第1行为表头，第2行起为数据，共24列
+     * col0=日期  col1=A区  col2=B区  col3=贵宾  col4=国内旅检  col5=国际旅检
+     * col6=贵宾通道  col7=T1回流通道  col8=T1行检  col9=一楼员工
+     * col10=T2回流通道  col11=T2行检  col12=三楼东区员工  col13=一楼中心区员工
+     * col14=负一楼西区员工  col15=三楼西区员工  col16=国内货站  col17=道口(国内货站)
+     * col18=南侧车检  col19=防爆(国内货站)  col20=国际货站  col21=道口(国际货站)
+     * col22=北侧车检  col23=防爆(国际货站)
      */
     @Log(title = "每日运行数据", businessType = BusinessType.IMPORT)
     @PostMapping("/importData")
@@ -95,8 +101,8 @@ public class HkOperationDataController extends BaseController {
         List<HkOperationData> list = new ArrayList<>();
         try (Workbook workbook = WorkbookFactory.create(is)) {
             Sheet sheet = workbook.getSheetAt(0);
-            // 前4行：标题、分组表头、子表头、列标题，数据从第5行（索引4）开始
-            for (int i = 4; i <= sheet.getLastRowNum(); i++) {
+            // 第1行（index=0）为表头，数据从第2行（index=1）开始
+            for (int i = 1; i <= sheet.getLastRowNum(); i++) {
                 Row row = sheet.getRow(i);
                 if (row == null) continue;
                 Cell dateCell = row.getCell(0);
@@ -104,36 +110,34 @@ public class HkOperationDataController extends BaseController {
                 if (dateCell.getCellType() != CellType.NUMERIC) continue;
 
                 HkOperationData data = new HkOperationData();
-                // col 0: 日期（Excel序列数或日期格式均支持）
                 if (DateUtil.isCellDateFormatted(dateCell)) {
                     data.setRecordDate(dateCell.getDateCellValue());
                 } else {
                     data.setRecordDate(DateUtil.getJavaDate(dateCell.getNumericCellValue()));
                 }
-                data.setAZone(intVal(row, 1));           // A区
-                data.setBZone(intVal(row, 2));           // B区
-                data.setVip(intVal(row, 3));             // 贵宾
-                data.setDomesticPassenger(intVal(row, 4)); // 国内旅检
-                data.setIntlPassenger(intVal(row, 5));   // 国际旅检
-                data.setVipChannel(intVal(row, 6));      // 贵宾通道
-                data.setT1ReturnChannel(intVal(row, 7)); // T1回流通道
-                data.setT1LuggageCheck(intVal(row, 8)); // T1行检
-                data.setFloor1Staff(intVal(row, 9));     // 一楼员工
-                data.setT2ReturnChannel(intVal(row, 10));// T2回流通道
-                data.setT2LuggageCheck(intVal(row, 11));// T2行检
-                data.setFloor3EastStaff(intVal(row, 12));    // 三楼东区员工
-                data.setFloor1CenterStaff(intVal(row, 13));  // 一楼中心区员工
-                data.setFloorB1WestStaff(intVal(row, 14));   // 负一楼西区员工
-                data.setFloor3WestStaff(intVal(row, 15));    // 三楼西区员工
-                data.setDomesticCargo(intVal(row, 16));  // 国内货站
-                data.setDomesticGate(intVal(row, 17));   // 道口(国内货站)
-                data.setSouthVehicleCheck(intVal(row, 18));  // 南侧车检
-                data.setDomesticBomb(intVal(row, 19));   // 防爆(国内货站)
-                data.setIntlCargo(intVal(row, 20));      // 国际货站
-                data.setIntlGate(intVal(row, 21));       // 道口(国际货站)
-                data.setNorthVehicleCheck(intVal(row, 22)); // 北侧车检
-                data.setIntlBomb(intVal(row, 23));       // 防爆(国际货站)
-                // col 24: 车检总数（公式列，不导入）
+                data.setAZone(intVal(row, 1));
+                data.setBZone(intVal(row, 2));
+                data.setVip(intVal(row, 3));
+                data.setDomesticPassenger(intVal(row, 4));
+                data.setIntlPassenger(intVal(row, 5));
+                data.setVipChannel(intVal(row, 6));
+                data.setT1ReturnChannel(intVal(row, 7));
+                data.setT1LuggageCheck(intVal(row, 8));
+                data.setFloor1Staff(intVal(row, 9));
+                data.setT2ReturnChannel(intVal(row, 10));
+                data.setT2LuggageCheck(intVal(row, 11));
+                data.setFloor3EastStaff(intVal(row, 12));
+                data.setFloor1CenterStaff(intVal(row, 13));
+                data.setFloorB1WestStaff(intVal(row, 14));
+                data.setFloor3WestStaff(intVal(row, 15));
+                data.setDomesticCargo(intVal(row, 16));
+                data.setDomesticGate(intVal(row, 17));
+                data.setSouthVehicleCheck(intVal(row, 18));
+                data.setDomesticBomb(intVal(row, 19));
+                data.setIntlCargo(intVal(row, 20));
+                data.setIntlGate(intVal(row, 21));
+                data.setNorthVehicleCheck(intVal(row, 22));
+                data.setIntlBomb(intVal(row, 23));
                 list.add(data);
             }
         }

airport-admin/src/main/java/com/sundot/airport/web/controller/item/HkPendingConfiscateController.java

@@ -75,13 +75,12 @@ public class HkPendingConfiscateController extends BaseController {
     }
 
     /**
-     * 导入客户原始格式的待检区收缴数据
-     * Excel结构：
-     *   Row1: 分组表头（T1航站楼A区/B区, T2国内/国际/中转, 每日收缴总数）
-     *   Row2: 子列表头（火种/液态物品/其他）
-     *   Row3+: 数据，每天3个时间段（00:00-08:00 / 08:00-17:00 / 17:00-24:00）
-     *   日期列A跨行合并，需向下传递
-     *   col17-19（每日收缴总数）为公式列，跳过
+     * 导入待检区收缴数据（按导入模板格式）
+     * Excel结构：第1行为表头，第2行起为数据，每天3个时间段，日期列跨行合并
+     * col0=日期  col1=时间段
+     * col2-4=T1 A区(火种/液态物品/其他)  col5-7=T1 B区(火种/液态物品/其他)
+     * col8-10=T2国内(火种/液态物品/其他)  col11-13=T2国际(火种/液态物品/其他)
+     * col14-16=T2中转(火种/液态物品/其他)
      */
     @Log(title = "待检区收缴数据", businessType = BusinessType.IMPORT)
     @PostMapping("/importData")
@@ -102,8 +101,8 @@ public class HkPendingConfiscateController extends BaseController {
         try (Workbook workbook = WorkbookFactory.create(is)) {
             Sheet sheet = workbook.getSheetAt(0);
             Date lastDate = null;
-            // 前2行为表头，数据从第3行（index=2）开始
-            for (int i = 2; i <= sheet.getLastRowNum(); i++) {
+            // 第1行（index=0）为表头，数据从第2行（index=1）开始
+            for (int i = 1; i <= sheet.getLastRowNum(); i++) {
                 Row row = sheet.getRow(i);
                 if (row == null) continue;
 
@@ -142,7 +141,6 @@ public class HkPendingConfiscateController extends BaseController {
                 data.setT2TransitFireSource(intVal(row, 14));
                 data.setT2TransitLiquid(intVal(row, 15));
                 data.setT2TransitOther(intVal(row, 16));
-                // col17-19: 每日收缴总数（公式，跳过）
                 list.add(data);
             }
         }

airport-admin/src/main/java/com/sundot/airport/web/controller/item/HkPersuadePowerBankController.java

@@ -75,12 +75,11 @@ public class HkPersuadePowerBankController extends BaseController {
     }
 
     /**
-     * 导入客户原始格式的劝阻充电宝数据
-     * Excel结构：
-     *   Row1: 分组表头（T1航站楼 / T2航站楼 / 每日劝阻总数）
-     *   Row2: 子列表头（召回充电宝/无3C标识/标识不清/超规数量/邮寄/自弃/暂存/总数）
-     *   Row3+: 数据，每天3个时间段，日期列A跨行合并需向下传递
-     *   col9=T1总数(公式)  col17=T2总数(公式)  col18-20=汇总(公式)  均跳过
+     * 导入劝阻充电宝数据（按导入模板格式）
+     * Excel结构：第1行为表头，第2行起为数据，每天3个时间段，日期列跨行合并
+     * col0=日期  col1=时间段
+     * col2-8=T1(召回充电宝/无3C标识/标识不清/超规数量/邮寄/自弃/暂存)
+     * col9-15=T2(召回充电宝/无3C标识/标识不清/超规数量/邮寄/自弃/暂存)
      */
     @Log(title = "劝阻充电宝数据", businessType = BusinessType.IMPORT)
     @PostMapping("/importData")
@@ -101,8 +100,8 @@ public class HkPersuadePowerBankController extends BaseController {
         try (Workbook workbook = WorkbookFactory.create(is)) {
             Sheet sheet = workbook.getSheetAt(0);
             Date lastDate = null;
-            // 前2行为表头，数据从第3行（index=2）开始
-            for (int i = 2; i <= sheet.getLastRowNum(); i++) {
+            // 第1行（index=0）为表头，数据从第2行（index=1）开始
+            for (int i = 1; i <= sheet.getLastRowNum(); i++) {
                 Row row = sheet.getRow(i);
                 if (row == null) continue;
 
@@ -129,16 +128,14 @@ public class HkPersuadePowerBankController extends BaseController {
                 data.setT1Mail(intVal(row, 6));
                 data.setT1Abandon(intVal(row, 7));
                 data.setT1TempStore(intVal(row, 8));
-                // col9: T1总数（公式，跳过）
-                // T2
-                data.setT2Recall(intVal(row, 10));
-                data.setT2No3c(intVal(row, 11));
-                data.setT2UnclearMark(intVal(row, 12));
-                data.setT2ExcessQty(intVal(row, 13));
-                data.setT2Mail(intVal(row, 14));
-                data.setT2Abandon(intVal(row, 15));
-                data.setT2TempStore(intVal(row, 16));
-                // col17: T2总数  col18-20: 汇总（公式，跳过）
+                // T2（模板无公式列，col9直接接T2）
+                data.setT2Recall(intVal(row, 9));
+                data.setT2No3c(intVal(row, 10));
+                data.setT2UnclearMark(intVal(row, 11));
+                data.setT2ExcessQty(intVal(row, 12));
+                data.setT2Mail(intVal(row, 13));
+                data.setT2Abandon(intVal(row, 14));
+                data.setT2TempStore(intVal(row, 15));
                 list.add(data);
             }
         }

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

@@ -36,7 +36,7 @@ public class EquipmentLedger extends BaseEntity {
     private Long id;
 
     /** 设备编号 */
-    @Excel(name = "设备编号")
+    @Excel(name = "设备编号", type = Excel.Type.EXPORT)
     private String equipmentCode;
 
     /** 设备名称 */
@@ -90,7 +90,7 @@ public class EquipmentLedger extends BaseEntity {
     private String initialAcceptanceStatus;
 
     /** 使用状态 */
-    @Excel(name = "使用状态")
+    @Excel(name = "使用状态", readConverterExp = "IN_USE=在用,SEND_FOR_REPAIR=寄修,LEND=借出,DEACTIVATE=停用,NOT_ENABLED=未启用,SUSPEND_USE=暂停使用", combo = "在用,寄修,借出,停用,未启用,暂停使用")
     private String usageStatus;
 
     /** 报废日期 */
@@ -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")
@@ -120,7 +144,7 @@ public class EquipmentLedger extends BaseEntity {
     private Date nextInspectionDueDate;
 
     /** 定/自检小组组长ID */
-    @Excel(name = "定/自检小组组长ID")
+    @Excel(name = "定/自检小组组长ID", type = Excel.Type.EXPORT)
     private Long inspectionTeamLeaderId;
 
     /** 定/自检小组组长名称 */
@@ -128,7 +152,7 @@ public class EquipmentLedger extends BaseEntity {
     private String inspectionTeamLeaderName;
 
     /** 定/自检小组组员1ID */
-    @Excel(name = "定/自检小组组员1ID")
+    @Excel(name = "定/自检小组组员1ID", type = Excel.Type.EXPORT)
     private Long inspectionTeamMember1Id;
 
     /** 定/自检小组组员1名称 */
@@ -136,7 +160,7 @@ public class EquipmentLedger extends BaseEntity {
     private String inspectionTeamMember1Name;
 
     /** 定/自检小组组员2ID */
-    @Excel(name = "定/自检小组组员2ID")
+    @Excel(name = "定/自检小组组员2ID", type = Excel.Type.EXPORT)
     private Long inspectionTeamMember2Id;
 
     /** 定/自检小组组员2名称 */
@@ -163,6 +187,18 @@ public class EquipmentLedger extends BaseEntity {
     @TableField(exist = false)
     private String colorType;
 
+    /** 查询最近定/自检到期日期开始日期 */
+    @TableField(exist = false)
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private Date startDate;
+
+    /** 查询最近定/自检到期日期结束日期 */
+    @TableField(exist = false)
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private Date endDate;
+
     public void setTenantId(String tenantId) {
         this.tenantId = tenantId;
     }
@@ -307,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;
     }
@@ -419,6 +503,22 @@ public class EquipmentLedger extends BaseEntity {
         this.colorType = colorType;
     }
 
+    public Date getStartDate() {
+        return startDate;
+    }
+
+    public void setStartDate(Date startDate) {
+        this.startDate = startDate;
+    }
+
+    public Date getEndDate() {
+        return endDate;
+    }
+
+    public void setEndDate(Date endDate) {
+        this.endDate = endDate;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
@@ -445,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/IEquipmentLedgerService.java

@@ -80,4 +80,21 @@ public interface IEquipmentLedgerService extends IService<EquipmentLedger> {
      * @return 设备台账集合
      */
     public List<EquipmentLedger> selectTwoWeeksUpcomingInspectionList();
+
+    /**
+     * 导入设备台账列表
+     *
+     * @param list          数据列表
+     * @param updateSupport 是否更新支持
+     * @return 导入结果信息
+     */
+    public String importData(List<EquipmentLedger> list, boolean updateSupport);
+
+    /**
+     * 设备台账通知
+     *
+     * @param equipmentLedger 设备台账
+     * @return 设备台账集合
+     */
+    public List<EquipmentLedger> notice(EquipmentLedger equipmentLedger);
 }

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

@@ -1,6 +1,9 @@
 package com.sundot.airport.equipment.service.impl;
 
+import java.util.Collections;
 import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
 
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.ObjUtil;
@@ -8,6 +11,9 @@ import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.sundot.airport.common.constant.Constants;
+import com.sundot.airport.common.core.domain.entity.SysDept;
+import com.sundot.airport.common.core.domain.entity.SysDictData;
+import com.sundot.airport.common.core.domain.entity.SysUser;
 import com.sundot.airport.common.core.redis.RedisSerialGenerator;
 import com.sundot.airport.common.domain.BaseAttachment;
 import com.sundot.airport.common.enums.BaseAttachmentSourceTypeEnum;
@@ -17,8 +23,14 @@ import com.sundot.airport.common.exception.ServiceException;
 import com.sundot.airport.common.service.IBaseAttachmentService;
 import com.sundot.airport.common.utils.DateUtils;
 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;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.sundot.airport.equipment.mapper.EquipmentLedgerMapper;
@@ -42,6 +54,14 @@ public class EquipmentLedgerServiceImpl extends ServiceImpl<EquipmentLedgerMappe
     private IBaseAttachmentService baseAttachmentService;
     @Autowired
     private RedisSerialGenerator redisSerialGenerator;
+    @Autowired
+    private ISysDictDataService sysDictDataService;
+    @Autowired
+    private IBasePositionService basePositionService;
+    @Autowired
+    private ISysUserService sysUserService;
+    @Autowired
+    private ISysDeptService sysDeptService;
 
     /**
      * 查询设备台账
@@ -268,4 +288,157 @@ public class EquipmentLedgerServiceImpl extends ServiceImpl<EquipmentLedgerMappe
     public List<EquipmentLedger> selectTwoWeeksUpcomingInspectionList() {
         return equipmentLedgerMapper.selectTwoWeeksUpcomingInspectionList();
     }
+
+    /**
+     * 导入设备台账数据
+     *
+     * @param list            数据列表
+     * @param isUpdateSupport 是否更新支持，如果已存在，则进行更新数据
+     * @return 结果
+     */
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public String importData(List<EquipmentLedger> list, boolean isUpdateSupport) {
+        if (CollUtil.isEmpty(list)) {
+            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);
+        Map<String, String> equipmentUsageStatusMap = equipmentUsageStatusList.stream().collect(Collectors.toMap(SysDictData::getDictLabel, SysDictData::getDictValue));
+
+        int successNum = 0;
+        int failureNum = 0;
+        StringBuilder successMsg = new StringBuilder();
+        StringBuilder failureMsg = new StringBuilder();
+
+        for (EquipmentLedger data : list) {
+            // 根据名称填充ID字段
+            fillIdsByName(data, sysUserMap, terminlMap, regionalMap, channelMap, equipmentUsageStatusMap);
+            try {
+                if (ObjUtil.isNull(data.getEquipmentSerialNumber())) {
+                    failureNum++;
+                    failureMsg.append("<br/>" + failureNum + "、设备序列号【" + data.getEquipmentSerialNumber() + "】、设备名称【" + data.getEquipmentName() + "】设备序列号不能为空");
+                    continue;
+                }
+                if (ObjUtil.isNull(data.getEquipmentName())) {
+                    failureNum++;
+                    failureMsg.append("<br/>" + failureNum + "、设备序列号【" + data.getEquipmentSerialNumber() + "】、设备名称【" + data.getEquipmentName() + "】设备名称不能为空");
+                    continue;
+                }
+
+                // 查询是否已存在（根据【设备序列号】唯一）
+                EquipmentLedger queryParam = new EquipmentLedger();
+                queryParam.setEquipmentSerialNumber(data.getEquipmentSerialNumber());
+                List<EquipmentLedger> existingList = equipmentLedgerMapper.selectEquipmentLedgerList(queryParam);
+
+                if (CollUtil.isEmpty(existingList)) {
+                    // 新增
+                    data.setEquipmentCode(redisSerialGenerator.generate(Constants.EQUIPMENT_LEDGER));
+                    data.setCreateTime(DateUtils.getNowDate());
+                    equipmentLedgerMapper.insertEquipmentLedger(data);
+                    successNum++;
+                    successMsg.append("<br/>" + successNum + "、设备序列号【" + data.getEquipmentSerialNumber() + "】、设备名称【" + data.getEquipmentName() + "】导入成功");
+                } else if (isUpdateSupport) {
+                    // 更新
+                    EquipmentLedger old = existingList.get(0);
+                    data.setId(old.getId());
+                    data.setEquipmentCode(old.getEquipmentCode());
+                    data.setUpdateTime(DateUtils.getNowDate());
+                    equipmentLedgerMapper.updateEquipmentLedger(data);
+                    successNum++;
+                    successMsg.append("<br/>" + successNum + "、设备序列号【" + data.getEquipmentSerialNumber() + "】、设备名称【" + data.getEquipmentName() + "】更新成功");
+                } else {
+                    failureNum++;
+                    failureMsg.append("<br/>" + failureNum + "、设备序列号【" + data.getEquipmentSerialNumber() + "】、设备名称【" + data.getEquipmentName() + "】已存在");
+                }
+            } catch (Exception e) {
+                failureNum++;
+                String msg = "<br/>" + failureNum + "、设备序列号【" + data.getEquipmentSerialNumber() + "】、设备名称【" + data.getEquipmentName() + "】导入失败：";
+                failureMsg.append(msg + e.getMessage());
+            }
+        }
+
+        if (failureNum > 0) {
+            failureMsg.insert(0, "很抱歉，导入失败！共 " + failureNum + " 条数据格式不正确，错误如下：");
+            throw new ServiceException(failureMsg.toString());
+        } else {
+            successMsg.insert(0, "恭喜您，数据已全部导入成功！共 " + successNum + " 条，数据如下：");
+        }
+        return successMsg.toString();
+    }
+
+    /**
+     * 根据名称填充ID字段
+     *
+     * @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) {
+        // 定/自检小组组长
+        if (ObjUtil.isNotNull(data.getInspectionTeamLeaderName())) {
+            data.setInspectionTeamLeaderId(sysUserMap.get(data.getInspectionTeamLeaderName()));
+        }
+        // 定/自检小组组员1
+        if (ObjUtil.isNotNull(data.getInspectionTeamMember1Name())) {
+            data.setInspectionTeamMember1Id(sysUserMap.get(data.getInspectionTeamMember1Name()));
+        }
+        // 定/自检小组组员2
+        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()));
+        }
+    }
+
+    /**
+     * 设备台账通知
+     *
+     * @param equipmentLedger 设备台账
+     * @return 设备台账
+     */
+    @Override
+    public List<EquipmentLedger> notice(EquipmentLedger equipmentLedger) {
+        if (ObjUtil.isNull(SecurityUtils.getDeptId())) {
+            return Collections.emptyList();
+        }
+        SysDept sysDept = sysDeptService.selectDeptById(SecurityUtils.getDeptId());
+        if (!StrUtil.equals("设备维修中心", sysDept.getDeptName())) {
+            return Collections.emptyList();
+        }
+        return selectEquipmentLedgerList(equipmentLedger);
+    }
 }

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>
@@ -133,6 +163,10 @@
                 inspection_team_member2_name like concat('%', #{inspectionTeamUserName}, '%')
                 )
             </if>
+            <if test="startDate != null and endDate != null">
+                and (next_inspection_due_date >= #{startDate}
+                and next_inspection_due_date <![CDATA[ < ]]> date_add(#{endDate} , interval 1 day))
+            </if>
             <choose>
                 <!-- 使用状态=在用 + 早于今天 -->
                 <when test="'RED'.equals(colorType)">
@@ -207,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>
@@ -240,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>
@@ -279,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>