diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppController.java b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppController.java
index de7f569..9f42224 100644
--- a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppController.java
+++ b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppController.java
@@ -19,7 +19,7 @@
     private  final IAlarmRecordsService iAlarmRecordsService;
     //alarmId   报警id、realAlarm(1:是，0：否)、processStatus(5：已确认，6：待处置，7：已处置)、处理人、处理时间、备注
 
-    @ApiOperation("接收app处置结果")
+    @ApiOperation("XX")
     @PostMapping("/receiveProcessResult")
     @ResponseBody
     public Object getProcessResult(@RequestBody Map resultParams) {

diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppController.java b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppController.java
index de7f569..9f42224 100644
--- a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppController.java
+++ b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppController.java
@@ -19,7 +19,7 @@
     private  final IAlarmRecordsService iAlarmRecordsService;
     //alarmId   报警id、realAlarm(1:是，0：否)、processStatus(5：已确认，6：待处置，7：已处置)、处理人、处理时间、备注
 
-    @ApiOperation("接收app处置结果")
+    @ApiOperation("XX")
     @PostMapping("/receiveProcessResult")
     @ResponseBody
     public Object getProcessResult(@RequestBody Map resultParams) {
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusRepairLogController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusRepairLogController.java
index 37013b9..7c4cbcc 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusRepairLogController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusRepairLogController.java
@@ -1,9 +1,22 @@
 package com.casic.missiles.modular.device.controller;
 
 
-import org.springframework.web.bind.annotation.RequestMapping;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.base.controller.ExportController;
+import com.casic.missiles.core.base.service.IBaseExportService;
+import com.casic.missiles.core.page.PageFactory;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.enums.ExportEnum;
+import com.casic.missiles.modular.device.dto.BusRepairLogRequestDTO;
+import com.casic.missiles.modular.device.entity.BusRepairLog;
+import com.casic.missiles.modular.device.service.IBusRepairLogService;
+import com.casic.missiles.util.ReturnUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.*;
 
-import org.springframework.web.bind.annotation.RestController;
+import javax.servlet.http.HttpServletResponse;
 
 /**
  * <p>
@@ -13,9 +26,35 @@
  * @author zt
  * @since 2024-07-16
  */
+@Api(tags = "厂商运维记录")
+@RequiredArgsConstructor
 @RestController
-@RequestMapping("/system/busRepairLog")
-public class BusRepairLogController {
+@RequestMapping("/device/busRepairLog")
+public class BusRepairLogController extends ExportController {
 
+    final IBusRepairLogService iBusRepairLogService;
+    private final IBaseExportService iBaseExportService;
+
+    @ApiOperation("查询分页接口")
+    @PostMapping("/listPage")
+    @ResponseBody
+    public ReturnDTO<BusRepairLog> listPage(@RequestBody BusRepairLogRequestDTO requestDTO) {
+        Page<BusRepairLog> page = PageFactory.defaultPage();
+        return ReturnUtil.success(super.packForBT(iBusRepairLogService.listPage(page, requestDTO)));
+    }
+
+    @ApiOperation("导出")
+    @RequestMapping(value = "/batchExport", method = RequestMethod.GET)
+    public void batchExport(@RequestBody BusRepairLogRequestDTO request, HttpServletResponse response) {
+
+        Page<BusRepairLog> page = PageFactory.defaultPage();
+        page.setSize(Integer.MAX_VALUE);
+        page = iBusRepairLogService.listPage(page, request);
+        try {
+            iBaseExportService.exportExcel(response, BusRepairLog.class, page.getRecords(), ExportEnum.DEVICE_EXPORT.getSheetName());
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
 }
 

diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppController.java b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppController.java
index de7f569..9f42224 100644
--- a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppController.java
+++ b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppController.java
@@ -19,7 +19,7 @@
     private  final IAlarmRecordsService iAlarmRecordsService;
     //alarmId   报警id、realAlarm(1:是，0：否)、processStatus(5：已确认，6：待处置，7：已处置)、处理人、处理时间、备注
 
-    @ApiOperation("接收app处置结果")
+    @ApiOperation("XX")
     @PostMapping("/receiveProcessResult")
     @ResponseBody
     public Object getProcessResult(@RequestBody Map resultParams) {
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusRepairLogController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusRepairLogController.java
index 37013b9..7c4cbcc 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusRepairLogController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusRepairLogController.java
@@ -1,9 +1,22 @@
 package com.casic.missiles.modular.device.controller;
 
 
-import org.springframework.web.bind.annotation.RequestMapping;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.base.controller.ExportController;
+import com.casic.missiles.core.base.service.IBaseExportService;
+import com.casic.missiles.core.page.PageFactory;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.enums.ExportEnum;
+import com.casic.missiles.modular.device.dto.BusRepairLogRequestDTO;
+import com.casic.missiles.modular.device.entity.BusRepairLog;
+import com.casic.missiles.modular.device.service.IBusRepairLogService;
+import com.casic.missiles.util.ReturnUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.*;
 
-import org.springframework.web.bind.annotation.RestController;
+import javax.servlet.http.HttpServletResponse;
 
 /**
  * <p>
@@ -13,9 +26,35 @@
  * @author zt
  * @since 2024-07-16
  */
+@Api(tags = "厂商运维记录")
+@RequiredArgsConstructor
 @RestController
-@RequestMapping("/system/busRepairLog")
-public class BusRepairLogController {
+@RequestMapping("/device/busRepairLog")
+public class BusRepairLogController extends ExportController {
 
+    final IBusRepairLogService iBusRepairLogService;
+    private final IBaseExportService iBaseExportService;
+
+    @ApiOperation("查询分页接口")
+    @PostMapping("/listPage")
+    @ResponseBody
+    public ReturnDTO<BusRepairLog> listPage(@RequestBody BusRepairLogRequestDTO requestDTO) {
+        Page<BusRepairLog> page = PageFactory.defaultPage();
+        return ReturnUtil.success(super.packForBT(iBusRepairLogService.listPage(page, requestDTO)));
+    }
+
+    @ApiOperation("导出")
+    @RequestMapping(value = "/batchExport", method = RequestMethod.GET)
+    public void batchExport(@RequestBody BusRepairLogRequestDTO request, HttpServletResponse response) {
+
+        Page<BusRepairLog> page = PageFactory.defaultPage();
+        page.setSize(Integer.MAX_VALUE);
+        page = iBusRepairLogService.listPage(page, request);
+        try {
+            iBaseExportService.exportExcel(response, BusRepairLog.class, page.getRecords(), ExportEnum.DEVICE_EXPORT.getSheetName());
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
 }
 
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dto/BusRepairLogRequestDTO.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/BusRepairLogRequestDTO.java
new file mode 100644
index 0000000..66f6f57
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/BusRepairLogRequestDTO.java
@@ -0,0 +1,43 @@
+package com.casic.missiles.modular.device.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 运维管理DTO
+ * </p>
+ *
+ * @author zt
+ * @since 2024-07-16
+ */
+@Data
+public class BusRepairLogRequestDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+
+    @ApiModelProperty("设备编号")
+    private String devcode;
+
+    @ApiModelProperty("设备类型id")
+    private Long deviceType;
+
+    @ApiModelProperty("运维类型，字典值")
+    private String repairType;
+
+    @ApiModelProperty("运维内容")
+    private String repairContent;
+
+    @ApiModelProperty("运维人员")
+    private String repairPerson;
+
+    @ApiModelProperty("开始时间")
+    private String begTime;
+
+    @ApiModelProperty("结束时间")
+    private String endTime;
+
+}

diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppController.java b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppController.java
index de7f569..9f42224 100644
--- a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppController.java
+++ b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppController.java
@@ -19,7 +19,7 @@
     private  final IAlarmRecordsService iAlarmRecordsService;
     //alarmId   报警id、realAlarm(1:是，0：否)、processStatus(5：已确认，6：待处置，7：已处置)、处理人、处理时间、备注
 
-    @ApiOperation("接收app处置结果")
+    @ApiOperation("XX")
     @PostMapping("/receiveProcessResult")
     @ResponseBody
     public Object getProcessResult(@RequestBody Map resultParams) {
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusRepairLogController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusRepairLogController.java
index 37013b9..7c4cbcc 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusRepairLogController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusRepairLogController.java
@@ -1,9 +1,22 @@
 package com.casic.missiles.modular.device.controller;
 
 
-import org.springframework.web.bind.annotation.RequestMapping;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.base.controller.ExportController;
+import com.casic.missiles.core.base.service.IBaseExportService;
+import com.casic.missiles.core.page.PageFactory;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.enums.ExportEnum;
+import com.casic.missiles.modular.device.dto.BusRepairLogRequestDTO;
+import com.casic.missiles.modular.device.entity.BusRepairLog;
+import com.casic.missiles.modular.device.service.IBusRepairLogService;
+import com.casic.missiles.util.ReturnUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.*;
 
-import org.springframework.web.bind.annotation.RestController;
+import javax.servlet.http.HttpServletResponse;
 
 /**
  * <p>
@@ -13,9 +26,35 @@
  * @author zt
  * @since 2024-07-16
  */
+@Api(tags = "厂商运维记录")
+@RequiredArgsConstructor
 @RestController
-@RequestMapping("/system/busRepairLog")
-public class BusRepairLogController {
+@RequestMapping("/device/busRepairLog")
+public class BusRepairLogController extends ExportController {
 
+    final IBusRepairLogService iBusRepairLogService;
+    private final IBaseExportService iBaseExportService;
+
+    @ApiOperation("查询分页接口")
+    @PostMapping("/listPage")
+    @ResponseBody
+    public ReturnDTO<BusRepairLog> listPage(@RequestBody BusRepairLogRequestDTO requestDTO) {
+        Page<BusRepairLog> page = PageFactory.defaultPage();
+        return ReturnUtil.success(super.packForBT(iBusRepairLogService.listPage(page, requestDTO)));
+    }
+
+    @ApiOperation("导出")
+    @RequestMapping(value = "/batchExport", method = RequestMethod.GET)
+    public void batchExport(@RequestBody BusRepairLogRequestDTO request, HttpServletResponse response) {
+
+        Page<BusRepairLog> page = PageFactory.defaultPage();
+        page.setSize(Integer.MAX_VALUE);
+        page = iBusRepairLogService.listPage(page, request);
+        try {
+            iBaseExportService.exportExcel(response, BusRepairLog.class, page.getRecords(), ExportEnum.DEVICE_EXPORT.getSheetName());
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
 }
 
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dto/BusRepairLogRequestDTO.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/BusRepairLogRequestDTO.java
new file mode 100644
index 0000000..66f6f57
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/BusRepairLogRequestDTO.java
@@ -0,0 +1,43 @@
+package com.casic.missiles.modular.device.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 运维管理DTO
+ * </p>
+ *
+ * @author zt
+ * @since 2024-07-16
+ */
+@Data
+public class BusRepairLogRequestDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+
+    @ApiModelProperty("设备编号")
+    private String devcode;
+
+    @ApiModelProperty("设备类型id")
+    private Long deviceType;
+
+    @ApiModelProperty("运维类型，字典值")
+    private String repairType;
+
+    @ApiModelProperty("运维内容")
+    private String repairContent;
+
+    @ApiModelProperty("运维人员")
+    private String repairPerson;
+
+    @ApiModelProperty("开始时间")
+    private String begTime;
+
+    @ApiModelProperty("结束时间")
+    private String endTime;
+
+}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BusRepairLog.java b/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BusRepairLog.java
index 2f58296..6612456 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BusRepairLog.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BusRepairLog.java
@@ -1,5 +1,6 @@
 package com.casic.missiles.modular.device.entity;
 
+import com.alibaba.excel.annotation.ExcelProperty;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
@@ -32,26 +33,42 @@
     @TableId(value = "ID", type = IdType.AUTO)
     private Long id;
 
+    @ExcelProperty(value = "设备编号", order = 1)
     @ApiModelProperty("设备编号")
     @TableField("DEVCODE")
     private String devcode;
 
+    @ExcelProperty(value = "设备类型", order = 2)
     @ApiModelProperty("设备类型id")
     @TableField("DEVICE_TYPE")
     private Long deviceType;
 
+    @ExcelProperty(value = "运维类型", order = 3)
     @ApiModelProperty("运维类型，字典值")
     @TableField("REPAIR_TYPE")
     private String repairType;
 
+    @ExcelProperty(value = "运维内容", order = 4)
     @ApiModelProperty("运维内容")
     @TableField("REPAIR_CONTENT")
     private String repairContent;
 
+    @ExcelProperty(value = "安装位号", order = 5)
+    @ApiModelProperty("安装位号")
+    @TableField("LEDGER_NUMBER")
+    private String ledgerNumber;
+
+    @ExcelProperty(value = "详细位置", order = 6)
+    @ApiModelProperty("详细位置")
+    @TableField("POSITION")
+    private String position;
+
+    @ExcelProperty(value = "运维人员", order = 7)
     @ApiModelProperty("运维人员")
     @TableField("REPAIR_PERSON")
     private String repairPerson;
 
+    @ExcelProperty(value = "维护时间", order = 8)
     @ApiModelProperty("维护时间")
     @TableField("REPAIR_TIME")
     private Date repairTime;

diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppController.java b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppController.java
index de7f569..9f42224 100644
--- a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppController.java
+++ b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppController.java
@@ -19,7 +19,7 @@
     private  final IAlarmRecordsService iAlarmRecordsService;
     //alarmId   报警id、realAlarm(1:是，0：否)、processStatus(5：已确认，6：待处置，7：已处置)、处理人、处理时间、备注
 
-    @ApiOperation("接收app处置结果")
+    @ApiOperation("XX")
     @PostMapping("/receiveProcessResult")
     @ResponseBody
     public Object getProcessResult(@RequestBody Map resultParams) {
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusRepairLogController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusRepairLogController.java
index 37013b9..7c4cbcc 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusRepairLogController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusRepairLogController.java
@@ -1,9 +1,22 @@
 package com.casic.missiles.modular.device.controller;
 
 
-import org.springframework.web.bind.annotation.RequestMapping;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.base.controller.ExportController;
+import com.casic.missiles.core.base.service.IBaseExportService;
+import com.casic.missiles.core.page.PageFactory;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.enums.ExportEnum;
+import com.casic.missiles.modular.device.dto.BusRepairLogRequestDTO;
+import com.casic.missiles.modular.device.entity.BusRepairLog;
+import com.casic.missiles.modular.device.service.IBusRepairLogService;
+import com.casic.missiles.util.ReturnUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.*;
 
-import org.springframework.web.bind.annotation.RestController;
+import javax.servlet.http.HttpServletResponse;
 
 /**
  * <p>
@@ -13,9 +26,35 @@
  * @author zt
  * @since 2024-07-16
  */
+@Api(tags = "厂商运维记录")
+@RequiredArgsConstructor
 @RestController
-@RequestMapping("/system/busRepairLog")
-public class BusRepairLogController {
+@RequestMapping("/device/busRepairLog")
+public class BusRepairLogController extends ExportController {
 
+    final IBusRepairLogService iBusRepairLogService;
+    private final IBaseExportService iBaseExportService;
+
+    @ApiOperation("查询分页接口")
+    @PostMapping("/listPage")
+    @ResponseBody
+    public ReturnDTO<BusRepairLog> listPage(@RequestBody BusRepairLogRequestDTO requestDTO) {
+        Page<BusRepairLog> page = PageFactory.defaultPage();
+        return ReturnUtil.success(super.packForBT(iBusRepairLogService.listPage(page, requestDTO)));
+    }
+
+    @ApiOperation("导出")
+    @RequestMapping(value = "/batchExport", method = RequestMethod.GET)
+    public void batchExport(@RequestBody BusRepairLogRequestDTO request, HttpServletResponse response) {
+
+        Page<BusRepairLog> page = PageFactory.defaultPage();
+        page.setSize(Integer.MAX_VALUE);
+        page = iBusRepairLogService.listPage(page, request);
+        try {
+            iBaseExportService.exportExcel(response, BusRepairLog.class, page.getRecords(), ExportEnum.DEVICE_EXPORT.getSheetName());
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
 }
 
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dto/BusRepairLogRequestDTO.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/BusRepairLogRequestDTO.java
new file mode 100644
index 0000000..66f6f57
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/BusRepairLogRequestDTO.java
@@ -0,0 +1,43 @@
+package com.casic.missiles.modular.device.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 运维管理DTO
+ * </p>
+ *
+ * @author zt
+ * @since 2024-07-16
+ */
+@Data
+public class BusRepairLogRequestDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+
+    @ApiModelProperty("设备编号")
+    private String devcode;
+
+    @ApiModelProperty("设备类型id")
+    private Long deviceType;
+
+    @ApiModelProperty("运维类型，字典值")
+    private String repairType;
+
+    @ApiModelProperty("运维内容")
+    private String repairContent;
+
+    @ApiModelProperty("运维人员")
+    private String repairPerson;
+
+    @ApiModelProperty("开始时间")
+    private String begTime;
+
+    @ApiModelProperty("结束时间")
+    private String endTime;
+
+}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BusRepairLog.java b/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BusRepairLog.java
index 2f58296..6612456 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BusRepairLog.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BusRepairLog.java
@@ -1,5 +1,6 @@
 package com.casic.missiles.modular.device.entity;
 
+import com.alibaba.excel.annotation.ExcelProperty;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
@@ -32,26 +33,42 @@
     @TableId(value = "ID", type = IdType.AUTO)
     private Long id;
 
+    @ExcelProperty(value = "设备编号", order = 1)
     @ApiModelProperty("设备编号")
     @TableField("DEVCODE")
     private String devcode;
 
+    @ExcelProperty(value = "设备类型", order = 2)
     @ApiModelProperty("设备类型id")
     @TableField("DEVICE_TYPE")
     private Long deviceType;
 
+    @ExcelProperty(value = "运维类型", order = 3)
     @ApiModelProperty("运维类型，字典值")
     @TableField("REPAIR_TYPE")
     private String repairType;
 
+    @ExcelProperty(value = "运维内容", order = 4)
     @ApiModelProperty("运维内容")
     @TableField("REPAIR_CONTENT")
     private String repairContent;
 
+    @ExcelProperty(value = "安装位号", order = 5)
+    @ApiModelProperty("安装位号")
+    @TableField("LEDGER_NUMBER")
+    private String ledgerNumber;
+
+    @ExcelProperty(value = "详细位置", order = 6)
+    @ApiModelProperty("详细位置")
+    @TableField("POSITION")
+    private String position;
+
+    @ExcelProperty(value = "运维人员", order = 7)
     @ApiModelProperty("运维人员")
     @TableField("REPAIR_PERSON")
     private String repairPerson;
 
+    @ExcelProperty(value = "维护时间", order = 8)
     @ApiModelProperty("维护时间")
     @TableField("REPAIR_TIME")
     private Date repairTime;
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusRepairLogService.java b/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusRepairLogService.java
index c1ef496..05b9d9f 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusRepairLogService.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusRepairLogService.java
@@ -1,8 +1,12 @@
 package com.casic.missiles.modular.device.service;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.modular.device.dto.BusRepairLogRequestDTO;
 import com.casic.missiles.modular.device.entity.BusRepairLog;
 import com.baomidou.mybatisplus.extension.service.IService;
 
+import java.util.List;
+
 /**
  * <p>
  * 运维管理	 服务类
@@ -13,4 +17,6 @@
  */
 public interface IBusRepairLogService extends IService<BusRepairLog> {
 
+    Page<BusRepairLog> listPage(Page<BusRepairLog> page, BusRepairLogRequestDTO requestDTO);
+
 }

diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppController.java b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppController.java
index de7f569..9f42224 100644
--- a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppController.java
+++ b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppController.java
@@ -19,7 +19,7 @@
     private  final IAlarmRecordsService iAlarmRecordsService;
     //alarmId   报警id、realAlarm(1:是，0：否)、processStatus(5：已确认，6：待处置，7：已处置)、处理人、处理时间、备注
 
-    @ApiOperation("接收app处置结果")
+    @ApiOperation("XX")
     @PostMapping("/receiveProcessResult")
     @ResponseBody
     public Object getProcessResult(@RequestBody Map resultParams) {
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusRepairLogController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusRepairLogController.java
index 37013b9..7c4cbcc 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusRepairLogController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusRepairLogController.java
@@ -1,9 +1,22 @@
 package com.casic.missiles.modular.device.controller;
 
 
-import org.springframework.web.bind.annotation.RequestMapping;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.base.controller.ExportController;
+import com.casic.missiles.core.base.service.IBaseExportService;
+import com.casic.missiles.core.page.PageFactory;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.enums.ExportEnum;
+import com.casic.missiles.modular.device.dto.BusRepairLogRequestDTO;
+import com.casic.missiles.modular.device.entity.BusRepairLog;
+import com.casic.missiles.modular.device.service.IBusRepairLogService;
+import com.casic.missiles.util.ReturnUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.*;
 
-import org.springframework.web.bind.annotation.RestController;
+import javax.servlet.http.HttpServletResponse;
 
 /**
  * <p>
@@ -13,9 +26,35 @@
  * @author zt
  * @since 2024-07-16
  */
+@Api(tags = "厂商运维记录")
+@RequiredArgsConstructor
 @RestController
-@RequestMapping("/system/busRepairLog")
-public class BusRepairLogController {
+@RequestMapping("/device/busRepairLog")
+public class BusRepairLogController extends ExportController {
 
+    final IBusRepairLogService iBusRepairLogService;
+    private final IBaseExportService iBaseExportService;
+
+    @ApiOperation("查询分页接口")
+    @PostMapping("/listPage")
+    @ResponseBody
+    public ReturnDTO<BusRepairLog> listPage(@RequestBody BusRepairLogRequestDTO requestDTO) {
+        Page<BusRepairLog> page = PageFactory.defaultPage();
+        return ReturnUtil.success(super.packForBT(iBusRepairLogService.listPage(page, requestDTO)));
+    }
+
+    @ApiOperation("导出")
+    @RequestMapping(value = "/batchExport", method = RequestMethod.GET)
+    public void batchExport(@RequestBody BusRepairLogRequestDTO request, HttpServletResponse response) {
+
+        Page<BusRepairLog> page = PageFactory.defaultPage();
+        page.setSize(Integer.MAX_VALUE);
+        page = iBusRepairLogService.listPage(page, request);
+        try {
+            iBaseExportService.exportExcel(response, BusRepairLog.class, page.getRecords(), ExportEnum.DEVICE_EXPORT.getSheetName());
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
 }
 
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dto/BusRepairLogRequestDTO.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/BusRepairLogRequestDTO.java
new file mode 100644
index 0000000..66f6f57
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/BusRepairLogRequestDTO.java
@@ -0,0 +1,43 @@
+package com.casic.missiles.modular.device.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 运维管理DTO
+ * </p>
+ *
+ * @author zt
+ * @since 2024-07-16
+ */
+@Data
+public class BusRepairLogRequestDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+
+    @ApiModelProperty("设备编号")
+    private String devcode;
+
+    @ApiModelProperty("设备类型id")
+    private Long deviceType;
+
+    @ApiModelProperty("运维类型，字典值")
+    private String repairType;
+
+    @ApiModelProperty("运维内容")
+    private String repairContent;
+
+    @ApiModelProperty("运维人员")
+    private String repairPerson;
+
+    @ApiModelProperty("开始时间")
+    private String begTime;
+
+    @ApiModelProperty("结束时间")
+    private String endTime;
+
+}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BusRepairLog.java b/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BusRepairLog.java
index 2f58296..6612456 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BusRepairLog.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BusRepairLog.java
@@ -1,5 +1,6 @@
 package com.casic.missiles.modular.device.entity;
 
+import com.alibaba.excel.annotation.ExcelProperty;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
@@ -32,26 +33,42 @@
     @TableId(value = "ID", type = IdType.AUTO)
     private Long id;
 
+    @ExcelProperty(value = "设备编号", order = 1)
     @ApiModelProperty("设备编号")
     @TableField("DEVCODE")
     private String devcode;
 
+    @ExcelProperty(value = "设备类型", order = 2)
     @ApiModelProperty("设备类型id")
     @TableField("DEVICE_TYPE")
     private Long deviceType;
 
+    @ExcelProperty(value = "运维类型", order = 3)
     @ApiModelProperty("运维类型，字典值")
     @TableField("REPAIR_TYPE")
     private String repairType;
 
+    @ExcelProperty(value = "运维内容", order = 4)
     @ApiModelProperty("运维内容")
     @TableField("REPAIR_CONTENT")
     private String repairContent;
 
+    @ExcelProperty(value = "安装位号", order = 5)
+    @ApiModelProperty("安装位号")
+    @TableField("LEDGER_NUMBER")
+    private String ledgerNumber;
+
+    @ExcelProperty(value = "详细位置", order = 6)
+    @ApiModelProperty("详细位置")
+    @TableField("POSITION")
+    private String position;
+
+    @ExcelProperty(value = "运维人员", order = 7)
     @ApiModelProperty("运维人员")
     @TableField("REPAIR_PERSON")
     private String repairPerson;
 
+    @ExcelProperty(value = "维护时间", order = 8)
     @ApiModelProperty("维护时间")
     @TableField("REPAIR_TIME")
     private Date repairTime;
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusRepairLogService.java b/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusRepairLogService.java
index c1ef496..05b9d9f 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusRepairLogService.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusRepairLogService.java
@@ -1,8 +1,12 @@
 package com.casic.missiles.modular.device.service;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.modular.device.dto.BusRepairLogRequestDTO;
 import com.casic.missiles.modular.device.entity.BusRepairLog;
 import com.baomidou.mybatisplus.extension.service.IService;
 
+import java.util.List;
+
 /**
  * <p>
  * 运维管理	 服务类
@@ -13,4 +17,6 @@
  */
 public interface IBusRepairLogService extends IService<BusRepairLog> {
 
+    Page<BusRepairLog> listPage(Page<BusRepairLog> page, BusRepairLogRequestDTO requestDTO);
+
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusRepairLogServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusRepairLogServiceImpl.java
index 5328ae8..1c48c49 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusRepairLogServiceImpl.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusRepairLogServiceImpl.java
@@ -1,11 +1,17 @@
 package com.casic.missiles.modular.device.service.impl;
 
+import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.modular.device.dto.BusRepairLogRequestDTO;
 import com.casic.missiles.modular.device.entity.BusRepairLog;
 import com.casic.missiles.modular.device.dao.BusRepairLogMapper;
 import com.casic.missiles.modular.device.service.IBusRepairLogService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
  * <p>
  * 运维管理	 服务实现类
@@ -17,4 +23,19 @@
 @Service
 public class BusRepairLogServiceImpl extends ServiceImpl<BusRepairLogMapper, BusRepairLog> implements IBusRepairLogService {
 
+
+    @Override
+    public Page<BusRepairLog> listPage(Page<BusRepairLog> page, BusRepairLogRequestDTO requestDTO) {
+        //todo:安装位置和权限
+        QueryWrapper<BusRepairLog> queryWrapper = new QueryWrapper<>();
+        queryWrapper.like(ObjectUtil.isNotEmpty(requestDTO.getDevcode()), "DEVCODE", requestDTO.getDevcode());
+        queryWrapper.eq(ObjectUtil.isNotEmpty(requestDTO.getDeviceType()), "DEVICE_TYPE", requestDTO.getDeviceType());
+        queryWrapper.eq(ObjectUtil.isNotEmpty(requestDTO.getRepairType()), "REPAIR_TYPE", requestDTO.getRepairType());
+        queryWrapper.like(ObjectUtil.isNotEmpty(requestDTO.getRepairContent()), "REPAIR_CONTENT", requestDTO.getRepairContent());
+        queryWrapper.like(ObjectUtil.isNotEmpty(requestDTO.getRepairPerson()), "REPAIR_PERSON", requestDTO.getRepairPerson());
+        queryWrapper.ge(ObjectUtil.isNotEmpty(requestDTO.getBegTime()), "REPAIR_TIME", requestDTO.getBegTime());
+        queryWrapper.le(ObjectUtil.isNotEmpty(requestDTO.getEndTime()), "REPAIR_TIME", requestDTO.getEndTime());
+        Page<BusRepairLog> ListPage = this.page(page, queryWrapper);
+        return ListPage;
+    }
 }

diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppController.java b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppController.java
index de7f569..9f42224 100644
--- a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppController.java
+++ b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppController.java
@@ -19,7 +19,7 @@
     private  final IAlarmRecordsService iAlarmRecordsService;
     //alarmId   报警id、realAlarm(1:是，0：否)、processStatus(5：已确认，6：待处置，7：已处置)、处理人、处理时间、备注
 
-    @ApiOperation("接收app处置结果")
+    @ApiOperation("XX")
     @PostMapping("/receiveProcessResult")
     @ResponseBody
     public Object getProcessResult(@RequestBody Map resultParams) {
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusRepairLogController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusRepairLogController.java
index 37013b9..7c4cbcc 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusRepairLogController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusRepairLogController.java
@@ -1,9 +1,22 @@
 package com.casic.missiles.modular.device.controller;
 
 
-import org.springframework.web.bind.annotation.RequestMapping;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.base.controller.ExportController;
+import com.casic.missiles.core.base.service.IBaseExportService;
+import com.casic.missiles.core.page.PageFactory;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.enums.ExportEnum;
+import com.casic.missiles.modular.device.dto.BusRepairLogRequestDTO;
+import com.casic.missiles.modular.device.entity.BusRepairLog;
+import com.casic.missiles.modular.device.service.IBusRepairLogService;
+import com.casic.missiles.util.ReturnUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.*;
 
-import org.springframework.web.bind.annotation.RestController;
+import javax.servlet.http.HttpServletResponse;
 
 /**
  * <p>
@@ -13,9 +26,35 @@
  * @author zt
  * @since 2024-07-16
  */
+@Api(tags = "厂商运维记录")
+@RequiredArgsConstructor
 @RestController
-@RequestMapping("/system/busRepairLog")
-public class BusRepairLogController {
+@RequestMapping("/device/busRepairLog")
+public class BusRepairLogController extends ExportController {
 
+    final IBusRepairLogService iBusRepairLogService;
+    private final IBaseExportService iBaseExportService;
+
+    @ApiOperation("查询分页接口")
+    @PostMapping("/listPage")
+    @ResponseBody
+    public ReturnDTO<BusRepairLog> listPage(@RequestBody BusRepairLogRequestDTO requestDTO) {
+        Page<BusRepairLog> page = PageFactory.defaultPage();
+        return ReturnUtil.success(super.packForBT(iBusRepairLogService.listPage(page, requestDTO)));
+    }
+
+    @ApiOperation("导出")
+    @RequestMapping(value = "/batchExport", method = RequestMethod.GET)
+    public void batchExport(@RequestBody BusRepairLogRequestDTO request, HttpServletResponse response) {
+
+        Page<BusRepairLog> page = PageFactory.defaultPage();
+        page.setSize(Integer.MAX_VALUE);
+        page = iBusRepairLogService.listPage(page, request);
+        try {
+            iBaseExportService.exportExcel(response, BusRepairLog.class, page.getRecords(), ExportEnum.DEVICE_EXPORT.getSheetName());
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
 }
 
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dto/BusRepairLogRequestDTO.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/BusRepairLogRequestDTO.java
new file mode 100644
index 0000000..66f6f57
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/BusRepairLogRequestDTO.java
@@ -0,0 +1,43 @@
+package com.casic.missiles.modular.device.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 运维管理DTO
+ * </p>
+ *
+ * @author zt
+ * @since 2024-07-16
+ */
+@Data
+public class BusRepairLogRequestDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+
+    @ApiModelProperty("设备编号")
+    private String devcode;
+
+    @ApiModelProperty("设备类型id")
+    private Long deviceType;
+
+    @ApiModelProperty("运维类型，字典值")
+    private String repairType;
+
+    @ApiModelProperty("运维内容")
+    private String repairContent;
+
+    @ApiModelProperty("运维人员")
+    private String repairPerson;
+
+    @ApiModelProperty("开始时间")
+    private String begTime;
+
+    @ApiModelProperty("结束时间")
+    private String endTime;
+
+}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BusRepairLog.java b/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BusRepairLog.java
index 2f58296..6612456 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BusRepairLog.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BusRepairLog.java
@@ -1,5 +1,6 @@
 package com.casic.missiles.modular.device.entity;
 
+import com.alibaba.excel.annotation.ExcelProperty;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
@@ -32,26 +33,42 @@
     @TableId(value = "ID", type = IdType.AUTO)
     private Long id;
 
+    @ExcelProperty(value = "设备编号", order = 1)
     @ApiModelProperty("设备编号")
     @TableField("DEVCODE")
     private String devcode;
 
+    @ExcelProperty(value = "设备类型", order = 2)
     @ApiModelProperty("设备类型id")
     @TableField("DEVICE_TYPE")
     private Long deviceType;
 
+    @ExcelProperty(value = "运维类型", order = 3)
     @ApiModelProperty("运维类型，字典值")
     @TableField("REPAIR_TYPE")
     private String repairType;
 
+    @ExcelProperty(value = "运维内容", order = 4)
     @ApiModelProperty("运维内容")
     @TableField("REPAIR_CONTENT")
     private String repairContent;
 
+    @ExcelProperty(value = "安装位号", order = 5)
+    @ApiModelProperty("安装位号")
+    @TableField("LEDGER_NUMBER")
+    private String ledgerNumber;
+
+    @ExcelProperty(value = "详细位置", order = 6)
+    @ApiModelProperty("详细位置")
+    @TableField("POSITION")
+    private String position;
+
+    @ExcelProperty(value = "运维人员", order = 7)
     @ApiModelProperty("运维人员")
     @TableField("REPAIR_PERSON")
     private String repairPerson;
 
+    @ExcelProperty(value = "维护时间", order = 8)
     @ApiModelProperty("维护时间")
     @TableField("REPAIR_TIME")
     private Date repairTime;
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusRepairLogService.java b/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusRepairLogService.java
index c1ef496..05b9d9f 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusRepairLogService.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusRepairLogService.java
@@ -1,8 +1,12 @@
 package com.casic.missiles.modular.device.service;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.modular.device.dto.BusRepairLogRequestDTO;
 import com.casic.missiles.modular.device.entity.BusRepairLog;
 import com.baomidou.mybatisplus.extension.service.IService;
 
+import java.util.List;
+
 /**
  * <p>
  * 运维管理	 服务类
@@ -13,4 +17,6 @@
  */
 public interface IBusRepairLogService extends IService<BusRepairLog> {
 
+    Page<BusRepairLog> listPage(Page<BusRepairLog> page, BusRepairLogRequestDTO requestDTO);
+
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusRepairLogServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusRepairLogServiceImpl.java
index 5328ae8..1c48c49 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusRepairLogServiceImpl.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusRepairLogServiceImpl.java
@@ -1,11 +1,17 @@
 package com.casic.missiles.modular.device.service.impl;
 
+import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.modular.device.dto.BusRepairLogRequestDTO;
 import com.casic.missiles.modular.device.entity.BusRepairLog;
 import com.casic.missiles.modular.device.dao.BusRepairLogMapper;
 import com.casic.missiles.modular.device.service.IBusRepairLogService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
  * <p>
  * 运维管理	 服务实现类
@@ -17,4 +23,19 @@
 @Service
 public class BusRepairLogServiceImpl extends ServiceImpl<BusRepairLogMapper, BusRepairLog> implements IBusRepairLogService {
 
+
+    @Override
+    public Page<BusRepairLog> listPage(Page<BusRepairLog> page, BusRepairLogRequestDTO requestDTO) {
+        //todo:安装位置和权限
+        QueryWrapper<BusRepairLog> queryWrapper = new QueryWrapper<>();
+        queryWrapper.like(ObjectUtil.isNotEmpty(requestDTO.getDevcode()), "DEVCODE", requestDTO.getDevcode());
+        queryWrapper.eq(ObjectUtil.isNotEmpty(requestDTO.getDeviceType()), "DEVICE_TYPE", requestDTO.getDeviceType());
+        queryWrapper.eq(ObjectUtil.isNotEmpty(requestDTO.getRepairType()), "REPAIR_TYPE", requestDTO.getRepairType());
+        queryWrapper.like(ObjectUtil.isNotEmpty(requestDTO.getRepairContent()), "REPAIR_CONTENT", requestDTO.getRepairContent());
+        queryWrapper.like(ObjectUtil.isNotEmpty(requestDTO.getRepairPerson()), "REPAIR_PERSON", requestDTO.getRepairPerson());
+        queryWrapper.ge(ObjectUtil.isNotEmpty(requestDTO.getBegTime()), "REPAIR_TIME", requestDTO.getBegTime());
+        queryWrapper.le(ObjectUtil.isNotEmpty(requestDTO.getEndTime()), "REPAIR_TIME", requestDTO.getEndTime());
+        Page<BusRepairLog> ListPage = this.page(page, queryWrapper);
+        return ListPage;
+    }
 }
diff --git a/casic-public/src/main/java/com/casic/missiles/enums/ExportEnum.java b/casic-public/src/main/java/com/casic/missiles/enums/ExportEnum.java
index 21c2703..189faea 100644
--- a/casic-public/src/main/java/com/casic/missiles/enums/ExportEnum.java
+++ b/casic-public/src/main/java/com/casic/missiles/enums/ExportEnum.java
@@ -9,6 +9,7 @@
     ALARM_EXPORT("alarmRecordData", "alarmRecordData", "报警记录"),
     DEVICE_EXPORT("deviceInfo", "deviceInfo", "设备信息"),
     LIFE_CYCLE_RECORD_EXPORT("lifeCycleRecord", "lifeCycleRecord", "全生命周期记录"),
+    REPAIR_LOG_EXPORT("repairLog", "repairLog", "厂商运维记录"),
     BUSPATROL_LOG_EXPORT("BusPatrolLogResponse", "BusPatrolLogResponse", "巡检日志");
 
     ExportEnum(String fileName, String sheetName, String description) {

diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppController.java b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppController.java
index de7f569..9f42224 100644
--- a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppController.java
+++ b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppController.java
@@ -19,7 +19,7 @@
     private  final IAlarmRecordsService iAlarmRecordsService;
     //alarmId   报警id、realAlarm(1:是，0：否)、processStatus(5：已确认，6：待处置，7：已处置)、处理人、处理时间、备注
 
-    @ApiOperation("接收app处置结果")
+    @ApiOperation("XX")
     @PostMapping("/receiveProcessResult")
     @ResponseBody
     public Object getProcessResult(@RequestBody Map resultParams) {
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusRepairLogController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusRepairLogController.java
index 37013b9..7c4cbcc 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusRepairLogController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusRepairLogController.java
@@ -1,9 +1,22 @@
 package com.casic.missiles.modular.device.controller;
 
 
-import org.springframework.web.bind.annotation.RequestMapping;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.base.controller.ExportController;
+import com.casic.missiles.core.base.service.IBaseExportService;
+import com.casic.missiles.core.page.PageFactory;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.enums.ExportEnum;
+import com.casic.missiles.modular.device.dto.BusRepairLogRequestDTO;
+import com.casic.missiles.modular.device.entity.BusRepairLog;
+import com.casic.missiles.modular.device.service.IBusRepairLogService;
+import com.casic.missiles.util.ReturnUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.*;
 
-import org.springframework.web.bind.annotation.RestController;
+import javax.servlet.http.HttpServletResponse;
 
 /**
  * <p>
@@ -13,9 +26,35 @@
  * @author zt
  * @since 2024-07-16
  */
+@Api(tags = "厂商运维记录")
+@RequiredArgsConstructor
 @RestController
-@RequestMapping("/system/busRepairLog")
-public class BusRepairLogController {
+@RequestMapping("/device/busRepairLog")
+public class BusRepairLogController extends ExportController {
 
+    final IBusRepairLogService iBusRepairLogService;
+    private final IBaseExportService iBaseExportService;
+
+    @ApiOperation("查询分页接口")
+    @PostMapping("/listPage")
+    @ResponseBody
+    public ReturnDTO<BusRepairLog> listPage(@RequestBody BusRepairLogRequestDTO requestDTO) {
+        Page<BusRepairLog> page = PageFactory.defaultPage();
+        return ReturnUtil.success(super.packForBT(iBusRepairLogService.listPage(page, requestDTO)));
+    }
+
+    @ApiOperation("导出")
+    @RequestMapping(value = "/batchExport", method = RequestMethod.GET)
+    public void batchExport(@RequestBody BusRepairLogRequestDTO request, HttpServletResponse response) {
+
+        Page<BusRepairLog> page = PageFactory.defaultPage();
+        page.setSize(Integer.MAX_VALUE);
+        page = iBusRepairLogService.listPage(page, request);
+        try {
+            iBaseExportService.exportExcel(response, BusRepairLog.class, page.getRecords(), ExportEnum.DEVICE_EXPORT.getSheetName());
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
 }
 
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dto/BusRepairLogRequestDTO.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/BusRepairLogRequestDTO.java
new file mode 100644
index 0000000..66f6f57
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/BusRepairLogRequestDTO.java
@@ -0,0 +1,43 @@
+package com.casic.missiles.modular.device.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 运维管理DTO
+ * </p>
+ *
+ * @author zt
+ * @since 2024-07-16
+ */
+@Data
+public class BusRepairLogRequestDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+
+    @ApiModelProperty("设备编号")
+    private String devcode;
+
+    @ApiModelProperty("设备类型id")
+    private Long deviceType;
+
+    @ApiModelProperty("运维类型，字典值")
+    private String repairType;
+
+    @ApiModelProperty("运维内容")
+    private String repairContent;
+
+    @ApiModelProperty("运维人员")
+    private String repairPerson;
+
+    @ApiModelProperty("开始时间")
+    private String begTime;
+
+    @ApiModelProperty("结束时间")
+    private String endTime;
+
+}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BusRepairLog.java b/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BusRepairLog.java
index 2f58296..6612456 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BusRepairLog.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BusRepairLog.java
@@ -1,5 +1,6 @@
 package com.casic.missiles.modular.device.entity;
 
+import com.alibaba.excel.annotation.ExcelProperty;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
@@ -32,26 +33,42 @@
     @TableId(value = "ID", type = IdType.AUTO)
     private Long id;
 
+    @ExcelProperty(value = "设备编号", order = 1)
     @ApiModelProperty("设备编号")
     @TableField("DEVCODE")
     private String devcode;
 
+    @ExcelProperty(value = "设备类型", order = 2)
     @ApiModelProperty("设备类型id")
     @TableField("DEVICE_TYPE")
     private Long deviceType;
 
+    @ExcelProperty(value = "运维类型", order = 3)
     @ApiModelProperty("运维类型，字典值")
     @TableField("REPAIR_TYPE")
     private String repairType;
 
+    @ExcelProperty(value = "运维内容", order = 4)
     @ApiModelProperty("运维内容")
     @TableField("REPAIR_CONTENT")
     private String repairContent;
 
+    @ExcelProperty(value = "安装位号", order = 5)
+    @ApiModelProperty("安装位号")
+    @TableField("LEDGER_NUMBER")
+    private String ledgerNumber;
+
+    @ExcelProperty(value = "详细位置", order = 6)
+    @ApiModelProperty("详细位置")
+    @TableField("POSITION")
+    private String position;
+
+    @ExcelProperty(value = "运维人员", order = 7)
     @ApiModelProperty("运维人员")
     @TableField("REPAIR_PERSON")
     private String repairPerson;
 
+    @ExcelProperty(value = "维护时间", order = 8)
     @ApiModelProperty("维护时间")
     @TableField("REPAIR_TIME")
     private Date repairTime;
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusRepairLogService.java b/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusRepairLogService.java
index c1ef496..05b9d9f 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusRepairLogService.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusRepairLogService.java
@@ -1,8 +1,12 @@
 package com.casic.missiles.modular.device.service;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.modular.device.dto.BusRepairLogRequestDTO;
 import com.casic.missiles.modular.device.entity.BusRepairLog;
 import com.baomidou.mybatisplus.extension.service.IService;
 
+import java.util.List;
+
 /**
  * <p>
  * 运维管理	 服务类
@@ -13,4 +17,6 @@
  */
 public interface IBusRepairLogService extends IService<BusRepairLog> {
 
+    Page<BusRepairLog> listPage(Page<BusRepairLog> page, BusRepairLogRequestDTO requestDTO);
+
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusRepairLogServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusRepairLogServiceImpl.java
index 5328ae8..1c48c49 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusRepairLogServiceImpl.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusRepairLogServiceImpl.java
@@ -1,11 +1,17 @@
 package com.casic.missiles.modular.device.service.impl;
 
+import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.modular.device.dto.BusRepairLogRequestDTO;
 import com.casic.missiles.modular.device.entity.BusRepairLog;
 import com.casic.missiles.modular.device.dao.BusRepairLogMapper;
 import com.casic.missiles.modular.device.service.IBusRepairLogService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
  * <p>
  * 运维管理	 服务实现类
@@ -17,4 +23,19 @@
 @Service
 public class BusRepairLogServiceImpl extends ServiceImpl<BusRepairLogMapper, BusRepairLog> implements IBusRepairLogService {
 
+
+    @Override
+    public Page<BusRepairLog> listPage(Page<BusRepairLog> page, BusRepairLogRequestDTO requestDTO) {
+        //todo:安装位置和权限
+        QueryWrapper<BusRepairLog> queryWrapper = new QueryWrapper<>();
+        queryWrapper.like(ObjectUtil.isNotEmpty(requestDTO.getDevcode()), "DEVCODE", requestDTO.getDevcode());
+        queryWrapper.eq(ObjectUtil.isNotEmpty(requestDTO.getDeviceType()), "DEVICE_TYPE", requestDTO.getDeviceType());
+        queryWrapper.eq(ObjectUtil.isNotEmpty(requestDTO.getRepairType()), "REPAIR_TYPE", requestDTO.getRepairType());
+        queryWrapper.like(ObjectUtil.isNotEmpty(requestDTO.getRepairContent()), "REPAIR_CONTENT", requestDTO.getRepairContent());
+        queryWrapper.like(ObjectUtil.isNotEmpty(requestDTO.getRepairPerson()), "REPAIR_PERSON", requestDTO.getRepairPerson());
+        queryWrapper.ge(ObjectUtil.isNotEmpty(requestDTO.getBegTime()), "REPAIR_TIME", requestDTO.getBegTime());
+        queryWrapper.le(ObjectUtil.isNotEmpty(requestDTO.getEndTime()), "REPAIR_TIME", requestDTO.getEndTime());
+        Page<BusRepairLog> ListPage = this.page(page, queryWrapper);
+        return ListPage;
+    }
 }
diff --git a/casic-public/src/main/java/com/casic/missiles/enums/ExportEnum.java b/casic-public/src/main/java/com/casic/missiles/enums/ExportEnum.java
index 21c2703..189faea 100644
--- a/casic-public/src/main/java/com/casic/missiles/enums/ExportEnum.java
+++ b/casic-public/src/main/java/com/casic/missiles/enums/ExportEnum.java
@@ -9,6 +9,7 @@
     ALARM_EXPORT("alarmRecordData", "alarmRecordData", "报警记录"),
     DEVICE_EXPORT("deviceInfo", "deviceInfo", "设备信息"),
     LIFE_CYCLE_RECORD_EXPORT("lifeCycleRecord", "lifeCycleRecord", "全生命周期记录"),
+    REPAIR_LOG_EXPORT("repairLog", "repairLog", "厂商运维记录"),
     BUSPATROL_LOG_EXPORT("BusPatrolLogResponse", "BusPatrolLogResponse", "巡检日志");
 
     ExportEnum(String fileName, String sheetName, String description) {
diff --git a/casic-web/src/main/resources/config/application.yml b/casic-web/src/main/resources/config/application.yml
index bb92ad2..281f5c1 100644
--- a/casic-web/src/main/resources/config/application.yml
+++ b/casic-web/src/main/resources/config/application.yml
@@ -31,7 +31,7 @@
     export-path: D:\java\boot\guns-web-1.0.0-SNAPSHOT\export\
     config-path: E:\Develop\IdeaProject\smartcity\casic-smartcity-dcms\casic-web\src\main\resources\config\
   knife4j:
-    groups: 物联网平台业务包:com.casic.missiles.modular.device,基础业务包:com.casic.missiles.modular.system,报警业务包:com.casic.missiles.modular.alarm
+    groups: 设备、台账基础信息相关包:com.casic.missiles.modular.device,基础业务包:com.casic.missiles.modular.system,报警业务包:com.casic.missiles.modular.alarm,app端业务包:com.casic.missiles.modular.app,sensorHub端业务包:com.casic.missiles.modular.sensorHub,第三方app端对接业务包:com.casic.missiles.modular.appOther
   device:
     redis:
       invalid-time: 86400