diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeptPermissionController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeptPermissionController.java index 74f2550..312d276 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeptPermissionController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeptPermissionController.java @@ -26,7 +26,7 @@ * @Date 2019-05-28 15:08:56 */ @Controller -@RequestMapping("/config") +@RequestMapping("/sys/config") public class DeptPermissionController extends BaseController { diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeptPermissionController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeptPermissionController.java index 74f2550..312d276 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeptPermissionController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeptPermissionController.java @@ -26,7 +26,7 @@ * @Date 2019-05-28 15:08:56 */ @Controller -@RequestMapping("/config") +@RequestMapping("/sys/config") public class DeptPermissionController extends BaseController { diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BatchExportDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BatchExportDataDto.java index b5f4079..c3b382a 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BatchExportDataDto.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BatchExportDataDto.java @@ -1,21 +1,47 @@ 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 lombok.Data; +/** + * @author lwh + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated @Data public class BatchExportDataDto { + /** + * 序号 + */ + private Long id; + @ExcelProperty("井编号") + private String wellCode; + @ExcelProperty("井名称") + private String wellName; + @ExcelProperty("井深") + private Integer deep; + @ExcelProperty("详细地址") + private String position; + private String wellType; + @ExcelProperty("井类型") + private String wellTypeName; - private Long id;//序号 - private String wellCode;//闸井编号 - private String wellName;//闸井名称 - private Integer deep;//井深 - private String position;//详细地址 - private String wellType;//闸井类型 - private String wellTypeName;//闸井类型名称 - private String deptId;//权属单位 - private String deptName;//权属单位 - private Integer deviceCount;//设备数量 - private String bfzt;//布防状态 - private String bfztName;//布防状态名称 + private String deptId; + @ExcelProperty("权属单位") + private String deptName; + @ExcelProperty("设备数量") + private Integer deviceCount; + private String bfzt; + @ExcelProperty("布防状态") + private String bfztName; } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeptPermissionController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeptPermissionController.java index 74f2550..312d276 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeptPermissionController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeptPermissionController.java @@ -26,7 +26,7 @@ * @Date 2019-05-28 15:08:56 */ @Controller -@RequestMapping("/config") +@RequestMapping("/sys/config") public class DeptPermissionController extends BaseController { diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BatchExportDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BatchExportDataDto.java index b5f4079..c3b382a 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BatchExportDataDto.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BatchExportDataDto.java @@ -1,21 +1,47 @@ 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 lombok.Data; +/** + * @author lwh + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated @Data public class BatchExportDataDto { + /** + * 序号 + */ + private Long id; + @ExcelProperty("井编号") + private String wellCode; + @ExcelProperty("井名称") + private String wellName; + @ExcelProperty("井深") + private Integer deep; + @ExcelProperty("详细地址") + private String position; + private String wellType; + @ExcelProperty("井类型") + private String wellTypeName; - private Long id;//序号 - private String wellCode;//闸井编号 - private String wellName;//闸井名称 - private Integer deep;//井深 - private String position;//详细地址 - private String wellType;//闸井类型 - private String wellTypeName;//闸井类型名称 - private String deptId;//权属单位 - private String deptName;//权属单位 - private Integer deviceCount;//设备数量 - private String bfzt;//布防状态 - private String bfztName;//布防状态名称 + private String deptId; + @ExcelProperty("权属单位") + private String deptName; + @ExcelProperty("设备数量") + private Integer deviceCount; + private String bfzt; + @ExcelProperty("布防状态") + private String bfztName; } diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusWellInfoController.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusWellInfoController.java index ef5a8a8..a8ffec3 100644 --- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusWellInfoController.java +++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusWellInfoController.java @@ -331,7 +331,7 @@ // add(new Header("设备数量", "deviceCount")); // add(new Header("布防状态", "bfztName")); // }}, "sluicewell.xlsx", "井数据导出");SluicewellExportEnum.DEVICE_EXPORT - super.exportExcel(BatchExportDataDto.class, list,""); + super.exportExcel(BatchExportDataDto.class, list,"闸井列表"); //super.exportExcel(SluicewellExportEnum.SLUICEWELLDATA_EXPORT, list, response); }