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 d6dd6e8..02d043b 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 @@ -7,7 +7,8 @@ */ public enum ExportEnum { ALARM_EXPORT("alarmRecordData", "alarmRecordData", "报警记录"), - DEVICE_EXPORT("monitorDeviceInfo", "monitorDeviceInfo", "设备信息"); + DEVICE_EXPORT("monitorDeviceInfo", "monitorDeviceInfo", "设备信息"), + BUSPATROL_LOG_EXPORT("BusPatrolLog", "BusPatrolLog", "巡检日志"); 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 d6dd6e8..02d043b 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 @@ -7,7 +7,8 @@ */ public enum ExportEnum { ALARM_EXPORT("alarmRecordData", "alarmRecordData", "报警记录"), - DEVICE_EXPORT("monitorDeviceInfo", "monitorDeviceInfo", "设备信息"); + DEVICE_EXPORT("monitorDeviceInfo", "monitorDeviceInfo", "设备信息"), + BUSPATROL_LOG_EXPORT("BusPatrolLog", "BusPatrolLog", "巡检日志"); ExportEnum(String fileName, String sheetName, String description) { this.fileName = fileName; diff --git a/casic-common/src/main/java/com/casic/missiles/es/ElasticSearchUtil.java b/casic-common/src/main/java/com/casic/missiles/es/ElasticSearchUtil.java index cf7c98c..cf1ac24 100644 --- a/casic-common/src/main/java/com/casic/missiles/es/ElasticSearchUtil.java +++ b/casic-common/src/main/java/com/casic/missiles/es/ElasticSearchUtil.java @@ -117,7 +117,7 @@ /** * 根据条件查询返回分页 */ - public static Page searchQueryPage(Page page, String index, String type, ElasticSearchQuery query) throws IOException { + public static Page searchQueryPage(Page page, String index, String type, ElasticSearchQuery query) throws IOException { String method = "POST"; String entPoint = index.concat("/").concat(type).concat("/").concat("_search"); logger.debug(query.getBody().toString()); @@ -134,7 +134,7 @@ /** * 根据条件进行滚动查询 */ - public static List searchQueryScroll(String index, String type, ElasticSearchQuery query) throws IOException { + public static List searchQueryScroll(String index, String type, ElasticSearchQuery query) throws IOException { // 首次查询,提交查询条件,endpoint增加‘?scroll=1m’ List results = new ArrayList<>(); String method = "POST"; 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 d6dd6e8..02d043b 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 @@ -7,7 +7,8 @@ */ public enum ExportEnum { ALARM_EXPORT("alarmRecordData", "alarmRecordData", "报警记录"), - DEVICE_EXPORT("monitorDeviceInfo", "monitorDeviceInfo", "设备信息"); + DEVICE_EXPORT("monitorDeviceInfo", "monitorDeviceInfo", "设备信息"), + BUSPATROL_LOG_EXPORT("BusPatrolLog", "BusPatrolLog", "巡检日志"); ExportEnum(String fileName, String sheetName, String description) { this.fileName = fileName; diff --git a/casic-common/src/main/java/com/casic/missiles/es/ElasticSearchUtil.java b/casic-common/src/main/java/com/casic/missiles/es/ElasticSearchUtil.java index cf7c98c..cf1ac24 100644 --- a/casic-common/src/main/java/com/casic/missiles/es/ElasticSearchUtil.java +++ b/casic-common/src/main/java/com/casic/missiles/es/ElasticSearchUtil.java @@ -117,7 +117,7 @@ /** * 根据条件查询返回分页 */ - public static Page searchQueryPage(Page page, String index, String type, ElasticSearchQuery query) throws IOException { + public static Page searchQueryPage(Page page, String index, String type, ElasticSearchQuery query) throws IOException { String method = "POST"; String entPoint = index.concat("/").concat(type).concat("/").concat("_search"); logger.debug(query.getBody().toString()); @@ -134,7 +134,7 @@ /** * 根据条件进行滚动查询 */ - public static List searchQueryScroll(String index, String type, ElasticSearchQuery query) throws IOException { + public static List searchQueryScroll(String index, String type, ElasticSearchQuery query) throws IOException { // 首次查询,提交查询条件,endpoint增加‘?scroll=1m’ List results = new ArrayList<>(); String method = "POST"; 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 bffd90c..defff59 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 @@ -4,19 +4,21 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.page.PageFactory; -import com.casic.missiles.dto.IdDTO; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.system.dto.BusPatrolLogDTO; +import com.casic.missiles.modular.system.dto.BusPatrolLogResponse; +import com.casic.missiles.modular.system.model.BusPatrolLog; import com.casic.missiles.modular.system.service.IBusPatrolLogService; -import org.apache.poi.ss.formula.functions.T; import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.RestController; +import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; import java.io.IOException; @@ -42,11 +44,20 @@ 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()))); } + + /** + * 获取巡检日志分页列表 + */ + @PostMapping("/export") + public void export(@RequestBody @Valid BusPatrolLogDTO busPatrolLogDTO, HttpServletResponse response) { + busPatrolLogService.export(busPatrolLogDTO, 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 d6dd6e8..02d043b 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 @@ -7,7 +7,8 @@ */ public enum ExportEnum { ALARM_EXPORT("alarmRecordData", "alarmRecordData", "报警记录"), - DEVICE_EXPORT("monitorDeviceInfo", "monitorDeviceInfo", "设备信息"); + DEVICE_EXPORT("monitorDeviceInfo", "monitorDeviceInfo", "设备信息"), + BUSPATROL_LOG_EXPORT("BusPatrolLog", "BusPatrolLog", "巡检日志"); ExportEnum(String fileName, String sheetName, String description) { this.fileName = fileName; diff --git a/casic-common/src/main/java/com/casic/missiles/es/ElasticSearchUtil.java b/casic-common/src/main/java/com/casic/missiles/es/ElasticSearchUtil.java index cf7c98c..cf1ac24 100644 --- a/casic-common/src/main/java/com/casic/missiles/es/ElasticSearchUtil.java +++ b/casic-common/src/main/java/com/casic/missiles/es/ElasticSearchUtil.java @@ -117,7 +117,7 @@ /** * 根据条件查询返回分页 */ - public static Page searchQueryPage(Page page, String index, String type, ElasticSearchQuery query) throws IOException { + public static Page searchQueryPage(Page page, String index, String type, ElasticSearchQuery query) throws IOException { String method = "POST"; String entPoint = index.concat("/").concat(type).concat("/").concat("_search"); logger.debug(query.getBody().toString()); @@ -134,7 +134,7 @@ /** * 根据条件进行滚动查询 */ - public static List searchQueryScroll(String index, String type, ElasticSearchQuery query) throws IOException { + public static List searchQueryScroll(String index, String type, ElasticSearchQuery query) throws IOException { // 首次查询,提交查询条件,endpoint增加‘?scroll=1m’ List results = new ArrayList<>(); String method = "POST"; 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 bffd90c..defff59 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 @@ -4,19 +4,21 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.page.PageFactory; -import com.casic.missiles.dto.IdDTO; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.system.dto.BusPatrolLogDTO; +import com.casic.missiles.modular.system.dto.BusPatrolLogResponse; +import com.casic.missiles.modular.system.model.BusPatrolLog; import com.casic.missiles.modular.system.service.IBusPatrolLogService; -import org.apache.poi.ss.formula.functions.T; import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.RestController; +import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; import java.io.IOException; @@ -42,11 +44,20 @@ 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()))); } + + /** + * 获取巡检日志分页列表 + */ + @PostMapping("/export") + public void export(@RequestBody @Valid BusPatrolLogDTO busPatrolLogDTO, HttpServletResponse response) { + busPatrolLogService.export(busPatrolLogDTO, response); + } + /** * 删除巡检日志 */ 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 new file mode 100644 index 0000000..73244f2 --- /dev/null +++ b/casic-data/src/main/java/com/casic/missiles/modular/system/dto/BusPatrolLogResponse.java @@ -0,0 +1,45 @@ +package com.casic.missiles.modular.system.dto; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import lombok.Data; + +/** + * @author cz + * @date 20323-6-14 + */ + +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@Data +public class BusPatrolLogResponse extends Model { + + private static final long serialVersionUID = 1L; + private Long monitorId; + private String devcode; + @ExcelProperty(value = "设备名称", order = 0) + private String monitorName; + @ExcelProperty(value = "浓度", order = 4) + private String concentration; + @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) + private String direction; + @ExcelProperty(value = "创建时间", order =6 ) + private String logTime; + private String stationId; + +} 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 d6dd6e8..02d043b 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 @@ -7,7 +7,8 @@ */ public enum ExportEnum { ALARM_EXPORT("alarmRecordData", "alarmRecordData", "报警记录"), - DEVICE_EXPORT("monitorDeviceInfo", "monitorDeviceInfo", "设备信息"); + DEVICE_EXPORT("monitorDeviceInfo", "monitorDeviceInfo", "设备信息"), + BUSPATROL_LOG_EXPORT("BusPatrolLog", "BusPatrolLog", "巡检日志"); ExportEnum(String fileName, String sheetName, String description) { this.fileName = fileName; diff --git a/casic-common/src/main/java/com/casic/missiles/es/ElasticSearchUtil.java b/casic-common/src/main/java/com/casic/missiles/es/ElasticSearchUtil.java index cf7c98c..cf1ac24 100644 --- a/casic-common/src/main/java/com/casic/missiles/es/ElasticSearchUtil.java +++ b/casic-common/src/main/java/com/casic/missiles/es/ElasticSearchUtil.java @@ -117,7 +117,7 @@ /** * 根据条件查询返回分页 */ - public static Page searchQueryPage(Page page, String index, String type, ElasticSearchQuery query) throws IOException { + public static Page searchQueryPage(Page page, String index, String type, ElasticSearchQuery query) throws IOException { String method = "POST"; String entPoint = index.concat("/").concat(type).concat("/").concat("_search"); logger.debug(query.getBody().toString()); @@ -134,7 +134,7 @@ /** * 根据条件进行滚动查询 */ - public static List searchQueryScroll(String index, String type, ElasticSearchQuery query) throws IOException { + public static List searchQueryScroll(String index, String type, ElasticSearchQuery query) throws IOException { // 首次查询,提交查询条件,endpoint增加‘?scroll=1m’ List results = new ArrayList<>(); String method = "POST"; 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 bffd90c..defff59 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 @@ -4,19 +4,21 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.page.PageFactory; -import com.casic.missiles.dto.IdDTO; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.system.dto.BusPatrolLogDTO; +import com.casic.missiles.modular.system.dto.BusPatrolLogResponse; +import com.casic.missiles.modular.system.model.BusPatrolLog; import com.casic.missiles.modular.system.service.IBusPatrolLogService; -import org.apache.poi.ss.formula.functions.T; import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.RestController; +import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; import java.io.IOException; @@ -42,11 +44,20 @@ 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()))); } + + /** + * 获取巡检日志分页列表 + */ + @PostMapping("/export") + public void export(@RequestBody @Valid BusPatrolLogDTO busPatrolLogDTO, HttpServletResponse response) { + busPatrolLogService.export(busPatrolLogDTO, response); + } + /** * 删除巡检日志 */ 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 new file mode 100644 index 0000000..73244f2 --- /dev/null +++ b/casic-data/src/main/java/com/casic/missiles/modular/system/dto/BusPatrolLogResponse.java @@ -0,0 +1,45 @@ +package com.casic.missiles.modular.system.dto; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import lombok.Data; + +/** + * @author cz + * @date 20323-6-14 + */ + +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@Data +public class BusPatrolLogResponse extends Model { + + private static final long serialVersionUID = 1L; + private Long monitorId; + private String devcode; + @ExcelProperty(value = "设备名称", order = 0) + private String monitorName; + @ExcelProperty(value = "浓度", order = 4) + private String concentration; + @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) + private String direction; + @ExcelProperty(value = "创建时间", order =6 ) + private String logTime; + private String stationId; + +} diff --git a/casic-data/src/main/java/com/casic/missiles/modular/system/service/IAlarmRecordService.java b/casic-data/src/main/java/com/casic/missiles/modular/system/service/IAlarmRecordService.java index 83fec02..bc25acf 100644 --- a/casic-data/src/main/java/com/casic/missiles/modular/system/service/IAlarmRecordService.java +++ b/casic-data/src/main/java/com/casic/missiles/modular/system/service/IAlarmRecordService.java @@ -22,7 +22,7 @@ List pageList(Page page, AlarmRecordRequest request); - List export(AlarmRecordRequest request, HttpServletResponse response); + void export(AlarmRecordRequest request, HttpServletResponse response); boolean cancel(AlarmCancelRequest alarmCancelRequest); 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 d6dd6e8..02d043b 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 @@ -7,7 +7,8 @@ */ public enum ExportEnum { ALARM_EXPORT("alarmRecordData", "alarmRecordData", "报警记录"), - DEVICE_EXPORT("monitorDeviceInfo", "monitorDeviceInfo", "设备信息"); + DEVICE_EXPORT("monitorDeviceInfo", "monitorDeviceInfo", "设备信息"), + BUSPATROL_LOG_EXPORT("BusPatrolLog", "BusPatrolLog", "巡检日志"); ExportEnum(String fileName, String sheetName, String description) { this.fileName = fileName; diff --git a/casic-common/src/main/java/com/casic/missiles/es/ElasticSearchUtil.java b/casic-common/src/main/java/com/casic/missiles/es/ElasticSearchUtil.java index cf7c98c..cf1ac24 100644 --- a/casic-common/src/main/java/com/casic/missiles/es/ElasticSearchUtil.java +++ b/casic-common/src/main/java/com/casic/missiles/es/ElasticSearchUtil.java @@ -117,7 +117,7 @@ /** * 根据条件查询返回分页 */ - public static Page searchQueryPage(Page page, String index, String type, ElasticSearchQuery query) throws IOException { + public static Page searchQueryPage(Page page, String index, String type, ElasticSearchQuery query) throws IOException { String method = "POST"; String entPoint = index.concat("/").concat(type).concat("/").concat("_search"); logger.debug(query.getBody().toString()); @@ -134,7 +134,7 @@ /** * 根据条件进行滚动查询 */ - public static List searchQueryScroll(String index, String type, ElasticSearchQuery query) throws IOException { + public static List searchQueryScroll(String index, String type, ElasticSearchQuery query) throws IOException { // 首次查询,提交查询条件,endpoint增加‘?scroll=1m’ List results = new ArrayList<>(); String method = "POST"; 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 bffd90c..defff59 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 @@ -4,19 +4,21 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.page.PageFactory; -import com.casic.missiles.dto.IdDTO; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.system.dto.BusPatrolLogDTO; +import com.casic.missiles.modular.system.dto.BusPatrolLogResponse; +import com.casic.missiles.modular.system.model.BusPatrolLog; import com.casic.missiles.modular.system.service.IBusPatrolLogService; -import org.apache.poi.ss.formula.functions.T; import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.RestController; +import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; import java.io.IOException; @@ -42,11 +44,20 @@ 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()))); } + + /** + * 获取巡检日志分页列表 + */ + @PostMapping("/export") + public void export(@RequestBody @Valid BusPatrolLogDTO busPatrolLogDTO, HttpServletResponse response) { + busPatrolLogService.export(busPatrolLogDTO, response); + } + /** * 删除巡检日志 */ 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 new file mode 100644 index 0000000..73244f2 --- /dev/null +++ b/casic-data/src/main/java/com/casic/missiles/modular/system/dto/BusPatrolLogResponse.java @@ -0,0 +1,45 @@ +package com.casic.missiles.modular.system.dto; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import lombok.Data; + +/** + * @author cz + * @date 20323-6-14 + */ + +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@Data +public class BusPatrolLogResponse extends Model { + + private static final long serialVersionUID = 1L; + private Long monitorId; + private String devcode; + @ExcelProperty(value = "设备名称", order = 0) + private String monitorName; + @ExcelProperty(value = "浓度", order = 4) + private String concentration; + @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) + private String direction; + @ExcelProperty(value = "创建时间", order =6 ) + private String logTime; + private String stationId; + +} diff --git a/casic-data/src/main/java/com/casic/missiles/modular/system/service/IAlarmRecordService.java b/casic-data/src/main/java/com/casic/missiles/modular/system/service/IAlarmRecordService.java index 83fec02..bc25acf 100644 --- a/casic-data/src/main/java/com/casic/missiles/modular/system/service/IAlarmRecordService.java +++ b/casic-data/src/main/java/com/casic/missiles/modular/system/service/IAlarmRecordService.java @@ -22,7 +22,7 @@ List pageList(Page page, AlarmRecordRequest request); - List export(AlarmRecordRequest request, HttpServletResponse response); + void export(AlarmRecordRequest request, HttpServletResponse response); boolean cancel(AlarmCancelRequest alarmCancelRequest); 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 0d6f531..0870181 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 @@ -2,10 +2,16 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.model.response.ResponseData; +import com.casic.missiles.modular.system.dto.BusPatrolLogDTO; +import com.casic.missiles.modular.system.dto.BusPatrolLogResponse; import com.casic.missiles.modular.system.model.BusPatrolLog; import com.baomidou.mybatisplus.extension.service.IService; import org.apache.poi.ss.formula.functions.T; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.RequestBody; +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; import java.io.IOException; /** @@ -18,8 +24,9 @@ */ public interface IBusPatrolLogService extends IService { - Page patrolLogListPage(Page page, Long monitorId, String startTime, String endTime) throws IOException; + Page patrolLogListPage(Page page, Long monitorId, String startTime, String endTime) throws IOException; + void export(BusPatrolLogDTO busPatrolLogDTO, HttpServletResponse response); ResponseData deletePatrolLog(Long monitorId, String startTime, String endTime); 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 d6dd6e8..02d043b 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 @@ -7,7 +7,8 @@ */ public enum ExportEnum { ALARM_EXPORT("alarmRecordData", "alarmRecordData", "报警记录"), - DEVICE_EXPORT("monitorDeviceInfo", "monitorDeviceInfo", "设备信息"); + DEVICE_EXPORT("monitorDeviceInfo", "monitorDeviceInfo", "设备信息"), + BUSPATROL_LOG_EXPORT("BusPatrolLog", "BusPatrolLog", "巡检日志"); ExportEnum(String fileName, String sheetName, String description) { this.fileName = fileName; diff --git a/casic-common/src/main/java/com/casic/missiles/es/ElasticSearchUtil.java b/casic-common/src/main/java/com/casic/missiles/es/ElasticSearchUtil.java index cf7c98c..cf1ac24 100644 --- a/casic-common/src/main/java/com/casic/missiles/es/ElasticSearchUtil.java +++ b/casic-common/src/main/java/com/casic/missiles/es/ElasticSearchUtil.java @@ -117,7 +117,7 @@ /** * 根据条件查询返回分页 */ - public static Page searchQueryPage(Page page, String index, String type, ElasticSearchQuery query) throws IOException { + public static Page searchQueryPage(Page page, String index, String type, ElasticSearchQuery query) throws IOException { String method = "POST"; String entPoint = index.concat("/").concat(type).concat("/").concat("_search"); logger.debug(query.getBody().toString()); @@ -134,7 +134,7 @@ /** * 根据条件进行滚动查询 */ - public static List searchQueryScroll(String index, String type, ElasticSearchQuery query) throws IOException { + public static List searchQueryScroll(String index, String type, ElasticSearchQuery query) throws IOException { // 首次查询,提交查询条件,endpoint增加‘?scroll=1m’ List results = new ArrayList<>(); String method = "POST"; 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 bffd90c..defff59 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 @@ -4,19 +4,21 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.page.PageFactory; -import com.casic.missiles.dto.IdDTO; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.system.dto.BusPatrolLogDTO; +import com.casic.missiles.modular.system.dto.BusPatrolLogResponse; +import com.casic.missiles.modular.system.model.BusPatrolLog; import com.casic.missiles.modular.system.service.IBusPatrolLogService; -import org.apache.poi.ss.formula.functions.T; import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.RestController; +import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; import java.io.IOException; @@ -42,11 +44,20 @@ 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()))); } + + /** + * 获取巡检日志分页列表 + */ + @PostMapping("/export") + public void export(@RequestBody @Valid BusPatrolLogDTO busPatrolLogDTO, HttpServletResponse response) { + busPatrolLogService.export(busPatrolLogDTO, response); + } + /** * 删除巡检日志 */ 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 new file mode 100644 index 0000000..73244f2 --- /dev/null +++ b/casic-data/src/main/java/com/casic/missiles/modular/system/dto/BusPatrolLogResponse.java @@ -0,0 +1,45 @@ +package com.casic.missiles.modular.system.dto; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import lombok.Data; + +/** + * @author cz + * @date 20323-6-14 + */ + +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@Data +public class BusPatrolLogResponse extends Model { + + private static final long serialVersionUID = 1L; + private Long monitorId; + private String devcode; + @ExcelProperty(value = "设备名称", order = 0) + private String monitorName; + @ExcelProperty(value = "浓度", order = 4) + private String concentration; + @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) + private String direction; + @ExcelProperty(value = "创建时间", order =6 ) + private String logTime; + private String stationId; + +} diff --git a/casic-data/src/main/java/com/casic/missiles/modular/system/service/IAlarmRecordService.java b/casic-data/src/main/java/com/casic/missiles/modular/system/service/IAlarmRecordService.java index 83fec02..bc25acf 100644 --- a/casic-data/src/main/java/com/casic/missiles/modular/system/service/IAlarmRecordService.java +++ b/casic-data/src/main/java/com/casic/missiles/modular/system/service/IAlarmRecordService.java @@ -22,7 +22,7 @@ List pageList(Page page, AlarmRecordRequest request); - List export(AlarmRecordRequest request, HttpServletResponse response); + void export(AlarmRecordRequest request, HttpServletResponse response); boolean cancel(AlarmCancelRequest alarmCancelRequest); 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 0d6f531..0870181 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 @@ -2,10 +2,16 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.model.response.ResponseData; +import com.casic.missiles.modular.system.dto.BusPatrolLogDTO; +import com.casic.missiles.modular.system.dto.BusPatrolLogResponse; import com.casic.missiles.modular.system.model.BusPatrolLog; import com.baomidou.mybatisplus.extension.service.IService; import org.apache.poi.ss.formula.functions.T; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.RequestBody; +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; import java.io.IOException; /** @@ -18,8 +24,9 @@ */ public interface IBusPatrolLogService extends IService { - Page patrolLogListPage(Page page, Long monitorId, String startTime, String endTime) throws IOException; + Page patrolLogListPage(Page page, Long monitorId, String startTime, String endTime) throws IOException; + void export(BusPatrolLogDTO busPatrolLogDTO, HttpServletResponse response); ResponseData deletePatrolLog(Long monitorId, String startTime, String endTime); diff --git a/casic-data/src/main/java/com/casic/missiles/modular/system/service/impl/AlarmRecordServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/system/service/impl/AlarmRecordServiceImpl.java index c38ccca..5168560 100644 --- a/casic-data/src/main/java/com/casic/missiles/modular/system/service/impl/AlarmRecordServiceImpl.java +++ b/casic-data/src/main/java/com/casic/missiles/modular/system/service/impl/AlarmRecordServiceImpl.java @@ -73,7 +73,7 @@ } @Override - public List export(AlarmRecordRequest request, HttpServletResponse response) { + public void export(AlarmRecordRequest request, HttpServletResponse response) { Page page = PageFactory.defaultPage(); page.setCurrent(1); page.setSearchCount(false); @@ -94,7 +94,6 @@ } catch (Exception e) { log.error("报警记录导出异常,异常信息为{}", e); } - return alarmRecordList; } @Override 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 d6dd6e8..02d043b 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 @@ -7,7 +7,8 @@ */ public enum ExportEnum { ALARM_EXPORT("alarmRecordData", "alarmRecordData", "报警记录"), - DEVICE_EXPORT("monitorDeviceInfo", "monitorDeviceInfo", "设备信息"); + DEVICE_EXPORT("monitorDeviceInfo", "monitorDeviceInfo", "设备信息"), + BUSPATROL_LOG_EXPORT("BusPatrolLog", "BusPatrolLog", "巡检日志"); ExportEnum(String fileName, String sheetName, String description) { this.fileName = fileName; diff --git a/casic-common/src/main/java/com/casic/missiles/es/ElasticSearchUtil.java b/casic-common/src/main/java/com/casic/missiles/es/ElasticSearchUtil.java index cf7c98c..cf1ac24 100644 --- a/casic-common/src/main/java/com/casic/missiles/es/ElasticSearchUtil.java +++ b/casic-common/src/main/java/com/casic/missiles/es/ElasticSearchUtil.java @@ -117,7 +117,7 @@ /** * 根据条件查询返回分页 */ - public static Page searchQueryPage(Page page, String index, String type, ElasticSearchQuery query) throws IOException { + public static Page searchQueryPage(Page page, String index, String type, ElasticSearchQuery query) throws IOException { String method = "POST"; String entPoint = index.concat("/").concat(type).concat("/").concat("_search"); logger.debug(query.getBody().toString()); @@ -134,7 +134,7 @@ /** * 根据条件进行滚动查询 */ - public static List searchQueryScroll(String index, String type, ElasticSearchQuery query) throws IOException { + public static List searchQueryScroll(String index, String type, ElasticSearchQuery query) throws IOException { // 首次查询,提交查询条件,endpoint增加‘?scroll=1m’ List results = new ArrayList<>(); String method = "POST"; 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 bffd90c..defff59 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 @@ -4,19 +4,21 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.page.PageFactory; -import com.casic.missiles.dto.IdDTO; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.system.dto.BusPatrolLogDTO; +import com.casic.missiles.modular.system.dto.BusPatrolLogResponse; +import com.casic.missiles.modular.system.model.BusPatrolLog; import com.casic.missiles.modular.system.service.IBusPatrolLogService; -import org.apache.poi.ss.formula.functions.T; import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.RestController; +import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; import java.io.IOException; @@ -42,11 +44,20 @@ 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()))); } + + /** + * 获取巡检日志分页列表 + */ + @PostMapping("/export") + public void export(@RequestBody @Valid BusPatrolLogDTO busPatrolLogDTO, HttpServletResponse response) { + busPatrolLogService.export(busPatrolLogDTO, response); + } + /** * 删除巡检日志 */ 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 new file mode 100644 index 0000000..73244f2 --- /dev/null +++ b/casic-data/src/main/java/com/casic/missiles/modular/system/dto/BusPatrolLogResponse.java @@ -0,0 +1,45 @@ +package com.casic.missiles.modular.system.dto; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import lombok.Data; + +/** + * @author cz + * @date 20323-6-14 + */ + +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@Data +public class BusPatrolLogResponse extends Model { + + private static final long serialVersionUID = 1L; + private Long monitorId; + private String devcode; + @ExcelProperty(value = "设备名称", order = 0) + private String monitorName; + @ExcelProperty(value = "浓度", order = 4) + private String concentration; + @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) + private String direction; + @ExcelProperty(value = "创建时间", order =6 ) + private String logTime; + private String stationId; + +} diff --git a/casic-data/src/main/java/com/casic/missiles/modular/system/service/IAlarmRecordService.java b/casic-data/src/main/java/com/casic/missiles/modular/system/service/IAlarmRecordService.java index 83fec02..bc25acf 100644 --- a/casic-data/src/main/java/com/casic/missiles/modular/system/service/IAlarmRecordService.java +++ b/casic-data/src/main/java/com/casic/missiles/modular/system/service/IAlarmRecordService.java @@ -22,7 +22,7 @@ List pageList(Page page, AlarmRecordRequest request); - List export(AlarmRecordRequest request, HttpServletResponse response); + void export(AlarmRecordRequest request, HttpServletResponse response); boolean cancel(AlarmCancelRequest alarmCancelRequest); 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 0d6f531..0870181 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 @@ -2,10 +2,16 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.model.response.ResponseData; +import com.casic.missiles.modular.system.dto.BusPatrolLogDTO; +import com.casic.missiles.modular.system.dto.BusPatrolLogResponse; import com.casic.missiles.modular.system.model.BusPatrolLog; import com.baomidou.mybatisplus.extension.service.IService; import org.apache.poi.ss.formula.functions.T; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.RequestBody; +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; import java.io.IOException; /** @@ -18,8 +24,9 @@ */ public interface IBusPatrolLogService extends IService { - Page patrolLogListPage(Page page, Long monitorId, String startTime, String endTime) throws IOException; + Page patrolLogListPage(Page page, Long monitorId, String startTime, String endTime) throws IOException; + void export(BusPatrolLogDTO busPatrolLogDTO, HttpServletResponse response); ResponseData deletePatrolLog(Long monitorId, String startTime, String endTime); diff --git a/casic-data/src/main/java/com/casic/missiles/modular/system/service/impl/AlarmRecordServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/system/service/impl/AlarmRecordServiceImpl.java index c38ccca..5168560 100644 --- a/casic-data/src/main/java/com/casic/missiles/modular/system/service/impl/AlarmRecordServiceImpl.java +++ b/casic-data/src/main/java/com/casic/missiles/modular/system/service/impl/AlarmRecordServiceImpl.java @@ -73,7 +73,7 @@ } @Override - public List export(AlarmRecordRequest request, HttpServletResponse response) { + public void export(AlarmRecordRequest request, HttpServletResponse response) { Page page = PageFactory.defaultPage(); page.setCurrent(1); page.setSearchCount(false); @@ -94,7 +94,6 @@ } catch (Exception e) { log.error("报警记录导出异常,异常信息为{}", e); } - return alarmRecordList; } @Override 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 d7db028..0233d29 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 @@ -5,23 +5,27 @@ import com.baomidou.mybatisplus.core.toolkit.ObjectUtils; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.application.context.AbstractPermissionContext; +import com.casic.missiles.core.base.service.IBaseExportService; import com.casic.missiles.core.datascope.DataScope; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.es.ElasticSearchQuery; import com.casic.missiles.es.ElasticSearchUtil; import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.system.consts.DataConst; import com.casic.missiles.modular.system.dao.BusObserpoiInfoMapper; +import com.casic.missiles.modular.system.dto.BusPatrolLogDTO; +import com.casic.missiles.modular.system.dto.BusPatrolLogResponse; import com.casic.missiles.modular.system.model.BusObserpoiInfo; import com.casic.missiles.modular.system.model.BusPatrolLog; import com.casic.missiles.modular.system.dao.BusPatrolLogMapper; import com.casic.missiles.modular.system.service.IBusPatrolLogService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import lombok.AllArgsConstructor; -import org.apache.poi.ss.formula.functions.T; -import org.springframework.beans.factory.annotation.Autowired; +import lombok.RequiredArgsConstructor; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; +import javax.servlet.http.HttpServletResponse; import java.io.IOException; import java.util.List; @@ -34,18 +38,19 @@ * @since 2023-04-18 */ @Service +@RequiredArgsConstructor public class BusPatrolLogServiceImpl extends ServiceImpl implements IBusPatrolLogService { @Value("${casic.error-point}") private Float endpoint; - @Autowired - private AbstractPermissionContext permissionContext; - @Autowired - private BusObserpoiInfoMapper obserpoiInfoMapper; + + private final AbstractPermissionContext permissionContext; + private final BusObserpoiInfoMapper obserpoiInfoMapper; + 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); @@ -69,6 +74,20 @@ } @Override + public void export(BusPatrolLogDTO busPatrolLogDTO, HttpServletResponse response) { + 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()); + } catch (Exception e) { + log.error("巡检日志导出异常,异常信息为{}", e); + } + } + + @Override public ResponseData deletePatrolLog(Long monitorId, String startTime, String endTime) { DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); dataScope.setScopeName("DEPT_ID");