diff --git a/casic-common/src/main/java/com/casic/missiles/enums/ExportEnum.java b/casic-common/src/main/java/com/casic/missiles/enums/ExportEnum.java index 02d043b..17e9fcb 100644 --- a/casic-common/src/main/java/com/casic/missiles/enums/ExportEnum.java +++ b/casic-common/src/main/java/com/casic/missiles/enums/ExportEnum.java @@ -8,7 +8,7 @@ public enum ExportEnum { ALARM_EXPORT("alarmRecordData", "alarmRecordData", "报警记录"), DEVICE_EXPORT("monitorDeviceInfo", "monitorDeviceInfo", "设备信息"), - BUSPATROL_LOG_EXPORT("BusPatrolLog", "BusPatrolLog", "巡检日志"); + BUSPATROL_LOG_EXPORT("BusPatrolLogResponse", "BusPatrolLogResponse", "巡检日志"); ExportEnum(String fileName, String sheetName, String description) { this.fileName = fileName; diff --git a/casic-common/src/main/java/com/casic/missiles/enums/ExportEnum.java b/casic-common/src/main/java/com/casic/missiles/enums/ExportEnum.java index 02d043b..17e9fcb 100644 --- a/casic-common/src/main/java/com/casic/missiles/enums/ExportEnum.java +++ b/casic-common/src/main/java/com/casic/missiles/enums/ExportEnum.java @@ -8,7 +8,7 @@ public enum ExportEnum { ALARM_EXPORT("alarmRecordData", "alarmRecordData", "报警记录"), DEVICE_EXPORT("monitorDeviceInfo", "monitorDeviceInfo", "设备信息"), - BUSPATROL_LOG_EXPORT("BusPatrolLog", "BusPatrolLog", "巡检日志"); + BUSPATROL_LOG_EXPORT("BusPatrolLogResponse", "BusPatrolLogResponse", "巡检日志"); ExportEnum(String fileName, String sheetName, String description) { this.fileName = fileName; diff --git a/casic-data/src/main/java/com/casic/missiles/modular/system/controller/BusPatrolLogController.java b/casic-data/src/main/java/com/casic/missiles/modular/system/controller/BusPatrolLogController.java index defff59..a0a18d5 100644 --- a/casic-data/src/main/java/com/casic/missiles/modular/system/controller/BusPatrolLogController.java +++ b/casic-data/src/main/java/com/casic/missiles/modular/system/controller/BusPatrolLogController.java @@ -1,6 +1,7 @@ package com.casic.missiles.modular.system.controller; import cn.hutool.core.lang.Assert; +import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.page.PageFactory; @@ -44,7 +45,7 @@ Assert.isFalse(bindingResult.hasErrors(), () -> { throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); }); - Page page = PageFactory.defaultPage(); + Page page = PageFactory.defaultPage(); return ResponseData.success(super.packForBT(busPatrolLogService.patrolLogListPage(page, busPatrolLogDTO.getMonitorId(), busPatrolLogDTO.getStartTime(), busPatrolLogDTO.getEndTime()))); } diff --git a/casic-common/src/main/java/com/casic/missiles/enums/ExportEnum.java b/casic-common/src/main/java/com/casic/missiles/enums/ExportEnum.java index 02d043b..17e9fcb 100644 --- a/casic-common/src/main/java/com/casic/missiles/enums/ExportEnum.java +++ b/casic-common/src/main/java/com/casic/missiles/enums/ExportEnum.java @@ -8,7 +8,7 @@ public enum ExportEnum { ALARM_EXPORT("alarmRecordData", "alarmRecordData", "报警记录"), DEVICE_EXPORT("monitorDeviceInfo", "monitorDeviceInfo", "设备信息"), - BUSPATROL_LOG_EXPORT("BusPatrolLog", "BusPatrolLog", "巡检日志"); + BUSPATROL_LOG_EXPORT("BusPatrolLogResponse", "BusPatrolLogResponse", "巡检日志"); ExportEnum(String fileName, String sheetName, String description) { this.fileName = fileName; diff --git a/casic-data/src/main/java/com/casic/missiles/modular/system/controller/BusPatrolLogController.java b/casic-data/src/main/java/com/casic/missiles/modular/system/controller/BusPatrolLogController.java index defff59..a0a18d5 100644 --- a/casic-data/src/main/java/com/casic/missiles/modular/system/controller/BusPatrolLogController.java +++ b/casic-data/src/main/java/com/casic/missiles/modular/system/controller/BusPatrolLogController.java @@ -1,6 +1,7 @@ package com.casic.missiles.modular.system.controller; import cn.hutool.core.lang.Assert; +import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.page.PageFactory; @@ -44,7 +45,7 @@ Assert.isFalse(bindingResult.hasErrors(), () -> { throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); }); - Page page = PageFactory.defaultPage(); + Page page = PageFactory.defaultPage(); return ResponseData.success(super.packForBT(busPatrolLogService.patrolLogListPage(page, busPatrolLogDTO.getMonitorId(), busPatrolLogDTO.getStartTime(), busPatrolLogDTO.getEndTime()))); } diff --git a/casic-data/src/main/java/com/casic/missiles/modular/system/dto/BusPatrolLogResponse.java b/casic-data/src/main/java/com/casic/missiles/modular/system/dto/BusPatrolLogResponse.java index 73244f2..d69fdbe 100644 --- a/casic-data/src/main/java/com/casic/missiles/modular/system/dto/BusPatrolLogResponse.java +++ b/casic-data/src/main/java/com/casic/missiles/modular/system/dto/BusPatrolLogResponse.java @@ -28,15 +28,15 @@ private String devcode; @ExcelProperty(value = "设备名称", order = 0) private String monitorName; - @ExcelProperty(value = "浓度", order = 4) + @ExcelProperty(value = "浓度值", order = 4) private String concentration; - @ExcelProperty(value = "场站名称", order = 1) + @ExcelProperty(value = "所在场站", order = 1) private String stationName; @ExcelProperty(value = "报警阈值", order =5 ) private String threshold; @ExcelProperty(value = "俯仰角", order = 3) private String pitch; - @ExcelProperty(value = "方位角", order = 2) + @ExcelProperty(value = "水平角", order = 2) private String direction; @ExcelProperty(value = "创建时间", order =6 ) private String logTime; diff --git a/casic-common/src/main/java/com/casic/missiles/enums/ExportEnum.java b/casic-common/src/main/java/com/casic/missiles/enums/ExportEnum.java index 02d043b..17e9fcb 100644 --- a/casic-common/src/main/java/com/casic/missiles/enums/ExportEnum.java +++ b/casic-common/src/main/java/com/casic/missiles/enums/ExportEnum.java @@ -8,7 +8,7 @@ public enum ExportEnum { ALARM_EXPORT("alarmRecordData", "alarmRecordData", "报警记录"), DEVICE_EXPORT("monitorDeviceInfo", "monitorDeviceInfo", "设备信息"), - BUSPATROL_LOG_EXPORT("BusPatrolLog", "BusPatrolLog", "巡检日志"); + BUSPATROL_LOG_EXPORT("BusPatrolLogResponse", "BusPatrolLogResponse", "巡检日志"); ExportEnum(String fileName, String sheetName, String description) { this.fileName = fileName; diff --git a/casic-data/src/main/java/com/casic/missiles/modular/system/controller/BusPatrolLogController.java b/casic-data/src/main/java/com/casic/missiles/modular/system/controller/BusPatrolLogController.java index defff59..a0a18d5 100644 --- a/casic-data/src/main/java/com/casic/missiles/modular/system/controller/BusPatrolLogController.java +++ b/casic-data/src/main/java/com/casic/missiles/modular/system/controller/BusPatrolLogController.java @@ -1,6 +1,7 @@ package com.casic.missiles.modular.system.controller; import cn.hutool.core.lang.Assert; +import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.page.PageFactory; @@ -44,7 +45,7 @@ Assert.isFalse(bindingResult.hasErrors(), () -> { throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); }); - Page page = PageFactory.defaultPage(); + Page page = PageFactory.defaultPage(); return ResponseData.success(super.packForBT(busPatrolLogService.patrolLogListPage(page, busPatrolLogDTO.getMonitorId(), busPatrolLogDTO.getStartTime(), busPatrolLogDTO.getEndTime()))); } diff --git a/casic-data/src/main/java/com/casic/missiles/modular/system/dto/BusPatrolLogResponse.java b/casic-data/src/main/java/com/casic/missiles/modular/system/dto/BusPatrolLogResponse.java index 73244f2..d69fdbe 100644 --- a/casic-data/src/main/java/com/casic/missiles/modular/system/dto/BusPatrolLogResponse.java +++ b/casic-data/src/main/java/com/casic/missiles/modular/system/dto/BusPatrolLogResponse.java @@ -28,15 +28,15 @@ private String devcode; @ExcelProperty(value = "设备名称", order = 0) private String monitorName; - @ExcelProperty(value = "浓度", order = 4) + @ExcelProperty(value = "浓度值", order = 4) private String concentration; - @ExcelProperty(value = "场站名称", order = 1) + @ExcelProperty(value = "所在场站", order = 1) private String stationName; @ExcelProperty(value = "报警阈值", order =5 ) private String threshold; @ExcelProperty(value = "俯仰角", order = 3) private String pitch; - @ExcelProperty(value = "方位角", order = 2) + @ExcelProperty(value = "水平角", order = 2) private String direction; @ExcelProperty(value = "创建时间", order =6 ) private String logTime; diff --git a/casic-data/src/main/java/com/casic/missiles/modular/system/service/IBusPatrolLogService.java b/casic-data/src/main/java/com/casic/missiles/modular/system/service/IBusPatrolLogService.java index 0870181..8d25b9b 100644 --- a/casic-data/src/main/java/com/casic/missiles/modular/system/service/IBusPatrolLogService.java +++ b/casic-data/src/main/java/com/casic/missiles/modular/system/service/IBusPatrolLogService.java @@ -1,5 +1,6 @@ package com.casic.missiles.modular.system.service; +import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.system.dto.BusPatrolLogDTO; @@ -24,7 +25,7 @@ */ public interface IBusPatrolLogService extends IService { - Page patrolLogListPage(Page page, Long monitorId, String startTime, String endTime) throws IOException; + Page patrolLogListPage(Page< JSONObject> page, Long monitorId, String startTime, String endTime) throws IOException; void export(BusPatrolLogDTO busPatrolLogDTO, HttpServletResponse response); diff --git a/casic-common/src/main/java/com/casic/missiles/enums/ExportEnum.java b/casic-common/src/main/java/com/casic/missiles/enums/ExportEnum.java index 02d043b..17e9fcb 100644 --- a/casic-common/src/main/java/com/casic/missiles/enums/ExportEnum.java +++ b/casic-common/src/main/java/com/casic/missiles/enums/ExportEnum.java @@ -8,7 +8,7 @@ public enum ExportEnum { ALARM_EXPORT("alarmRecordData", "alarmRecordData", "报警记录"), DEVICE_EXPORT("monitorDeviceInfo", "monitorDeviceInfo", "设备信息"), - BUSPATROL_LOG_EXPORT("BusPatrolLog", "BusPatrolLog", "巡检日志"); + BUSPATROL_LOG_EXPORT("BusPatrolLogResponse", "BusPatrolLogResponse", "巡检日志"); ExportEnum(String fileName, String sheetName, String description) { this.fileName = fileName; diff --git a/casic-data/src/main/java/com/casic/missiles/modular/system/controller/BusPatrolLogController.java b/casic-data/src/main/java/com/casic/missiles/modular/system/controller/BusPatrolLogController.java index defff59..a0a18d5 100644 --- a/casic-data/src/main/java/com/casic/missiles/modular/system/controller/BusPatrolLogController.java +++ b/casic-data/src/main/java/com/casic/missiles/modular/system/controller/BusPatrolLogController.java @@ -1,6 +1,7 @@ package com.casic.missiles.modular.system.controller; import cn.hutool.core.lang.Assert; +import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.page.PageFactory; @@ -44,7 +45,7 @@ Assert.isFalse(bindingResult.hasErrors(), () -> { throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); }); - Page page = PageFactory.defaultPage(); + Page page = PageFactory.defaultPage(); return ResponseData.success(super.packForBT(busPatrolLogService.patrolLogListPage(page, busPatrolLogDTO.getMonitorId(), busPatrolLogDTO.getStartTime(), busPatrolLogDTO.getEndTime()))); } diff --git a/casic-data/src/main/java/com/casic/missiles/modular/system/dto/BusPatrolLogResponse.java b/casic-data/src/main/java/com/casic/missiles/modular/system/dto/BusPatrolLogResponse.java index 73244f2..d69fdbe 100644 --- a/casic-data/src/main/java/com/casic/missiles/modular/system/dto/BusPatrolLogResponse.java +++ b/casic-data/src/main/java/com/casic/missiles/modular/system/dto/BusPatrolLogResponse.java @@ -28,15 +28,15 @@ private String devcode; @ExcelProperty(value = "设备名称", order = 0) private String monitorName; - @ExcelProperty(value = "浓度", order = 4) + @ExcelProperty(value = "浓度值", order = 4) private String concentration; - @ExcelProperty(value = "场站名称", order = 1) + @ExcelProperty(value = "所在场站", order = 1) private String stationName; @ExcelProperty(value = "报警阈值", order =5 ) private String threshold; @ExcelProperty(value = "俯仰角", order = 3) private String pitch; - @ExcelProperty(value = "方位角", order = 2) + @ExcelProperty(value = "水平角", order = 2) private String direction; @ExcelProperty(value = "创建时间", order =6 ) private String logTime; diff --git a/casic-data/src/main/java/com/casic/missiles/modular/system/service/IBusPatrolLogService.java b/casic-data/src/main/java/com/casic/missiles/modular/system/service/IBusPatrolLogService.java index 0870181..8d25b9b 100644 --- a/casic-data/src/main/java/com/casic/missiles/modular/system/service/IBusPatrolLogService.java +++ b/casic-data/src/main/java/com/casic/missiles/modular/system/service/IBusPatrolLogService.java @@ -1,5 +1,6 @@ package com.casic.missiles.modular.system.service; +import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.system.dto.BusPatrolLogDTO; @@ -24,7 +25,7 @@ */ public interface IBusPatrolLogService extends IService { - Page patrolLogListPage(Page page, Long monitorId, String startTime, String endTime) throws IOException; + Page patrolLogListPage(Page< JSONObject> page, Long monitorId, String startTime, String endTime) throws IOException; void export(BusPatrolLogDTO busPatrolLogDTO, HttpServletResponse response); diff --git a/casic-data/src/main/java/com/casic/missiles/modular/system/service/impl/BusPatrolLogServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/system/service/impl/BusPatrolLogServiceImpl.java index 0233d29..e2a3af0 100644 --- a/casic-data/src/main/java/com/casic/missiles/modular/system/service/impl/BusPatrolLogServiceImpl.java +++ b/casic-data/src/main/java/com/casic/missiles/modular/system/service/impl/BusPatrolLogServiceImpl.java @@ -1,5 +1,6 @@ package com.casic.missiles.modular.system.service.impl; +import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.CollectionUtils; import com.baomidou.mybatisplus.core.toolkit.ObjectUtils; @@ -27,6 +28,7 @@ import javax.servlet.http.HttpServletResponse; import java.io.IOException; +import java.util.ArrayList; import java.util.List; /** @@ -50,7 +52,7 @@ private final IBaseExportService iBaseExportService; @Override - public Page patrolLogListPage(Page page, Long monitorId, String startTime, String endTime) throws IOException { + public Page patrolLogListPage(Page page, Long monitorId, String startTime, String endTime) throws IOException { DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); dataScope.setScopeName("DEPT_ID"); List obserpoiInfoList = getObserpoiList(monitorId); @@ -75,13 +77,27 @@ @Override public void export(BusPatrolLogDTO busPatrolLogDTO, HttpServletResponse response) { - Page page = PageFactory.defaultPage(); + Page page = PageFactory.defaultPage(); page.setCurrent(1); page.setSearchCount(false); page.setSize(10000); try { page = patrolLogListPage(page, busPatrolLogDTO.getMonitorId(), busPatrolLogDTO.getStartTime(), busPatrolLogDTO.getEndTime()); - iBaseExportService.exportExcel(response, BusPatrolLogResponse.class, page.getRecords(), ExportEnum.BUSPATROL_LOG_EXPORT.getSheetName()); + + List expResponseList = new ArrayList<>(); + List responseList = page.getRecords(); + responseList.forEach(busPatrolLogResponse->{ + BusPatrolLogResponse busPatrolLogResponse1 = new BusPatrolLogResponse(); + busPatrolLogResponse1.setStationName(busPatrolLogResponse.getString("stationName")); + busPatrolLogResponse1.setMonitorName(busPatrolLogResponse.getString("monitorName")); + busPatrolLogResponse1.setConcentration(busPatrolLogResponse.getString("concentration")); + busPatrolLogResponse1.setDirection(busPatrolLogResponse.getString("direction")); + busPatrolLogResponse1.setPitch(busPatrolLogResponse.getString("pitch")); + busPatrolLogResponse1.setThreshold(busPatrolLogResponse.getString("threshold")); + busPatrolLogResponse1.setLogTime(busPatrolLogResponse.getString("logTime")); + expResponseList.add(busPatrolLogResponse1); + }); + iBaseExportService.exportExcel(response, BusPatrolLogResponse.class, expResponseList, ExportEnum.BUSPATROL_LOG_EXPORT.getSheetName()); } catch (Exception e) { log.error("巡检日志导出异常,异常信息为{}", e); }