diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java index 154c7fe..c91f067 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java @@ -15,6 +15,7 @@ import com.casic.missiles.modular.system.model.DeptPermission; import com.casic.missiles.modular.system.service.IDeptPermissionService; import lombok.extern.slf4j.Slf4j; +import org.apache.ibatis.jdbc.Null; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.*; @@ -94,7 +95,9 @@ levelMap.put("name", name); levelMap.put("deviceType", deviceType); levelMap.put("deviceTypeName", deviceTypeName); - + if(level == null){ + continue; + } if (ObjectUtil.isEmpty(level.get("openAlarm"))) { levelMap.put("openAlarm", ""); } else { diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java index 154c7fe..c91f067 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java @@ -15,6 +15,7 @@ import com.casic.missiles.modular.system.model.DeptPermission; import com.casic.missiles.modular.system.service.IDeptPermissionService; import lombok.extern.slf4j.Slf4j; +import org.apache.ibatis.jdbc.Null; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.*; @@ -94,7 +95,9 @@ levelMap.put("name", name); levelMap.put("deviceType", deviceType); levelMap.put("deviceTypeName", deviceTypeName); - + if(level == null){ + continue; + } if (ObjectUtil.isEmpty(level.get("openAlarm"))) { levelMap.put("openAlarm", ""); } else { diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/JobExcelDto.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/JobExcelDto.java index 52378f0..af4f7cb 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/JobExcelDto.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/JobExcelDto.java @@ -1,5 +1,6 @@ package com.casic.missiles.modular.alarm.model; +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; @@ -17,6 +18,7 @@ @HeadRowHeight(15) @ContentRowHeight(20) @ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated @Data @NoArgsConstructor public class JobExcelDto { @@ -24,10 +26,6 @@ private String jobCode; @ExcelProperty("点位编号") private String wellCode; - @ExcelProperty("设备编号") - private String devcode; - @ExcelProperty("部门名称") - private String deptName; @ExcelProperty("详细地址") private String position; @ExcelProperty("告警类型") @@ -44,4 +42,11 @@ private String handleJobPerson; @ExcelProperty("接单时间") private String getJobTime; + +// @ExcelProperty("设备编号") + private String devcode; +// @ExcelProperty("部门名称") + private String deptName; + + } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java index 154c7fe..c91f067 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java @@ -15,6 +15,7 @@ import com.casic.missiles.modular.system.model.DeptPermission; import com.casic.missiles.modular.system.service.IDeptPermissionService; import lombok.extern.slf4j.Slf4j; +import org.apache.ibatis.jdbc.Null; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.*; @@ -94,7 +95,9 @@ levelMap.put("name", name); levelMap.put("deviceType", deviceType); levelMap.put("deviceTypeName", deviceTypeName); - + if(level == null){ + continue; + } if (ObjectUtil.isEmpty(level.get("openAlarm"))) { levelMap.put("openAlarm", ""); } else { diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/JobExcelDto.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/JobExcelDto.java index 52378f0..af4f7cb 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/JobExcelDto.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/JobExcelDto.java @@ -1,5 +1,6 @@ package com.casic.missiles.modular.alarm.model; +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; @@ -17,6 +18,7 @@ @HeadRowHeight(15) @ContentRowHeight(20) @ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated @Data @NoArgsConstructor public class JobExcelDto { @@ -24,10 +26,6 @@ private String jobCode; @ExcelProperty("点位编号") private String wellCode; - @ExcelProperty("设备编号") - private String devcode; - @ExcelProperty("部门名称") - private String deptName; @ExcelProperty("详细地址") private String position; @ExcelProperty("告警类型") @@ -44,4 +42,11 @@ private String handleJobPerson; @ExcelProperty("接单时间") private String getJobTime; + +// @ExcelProperty("设备编号") + private String devcode; +// @ExcelProperty("部门名称") + private String deptName; + + } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/RecordExcelDto.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/RecordExcelDto.java index 4514412..61a690e 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/RecordExcelDto.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/RecordExcelDto.java @@ -24,8 +24,6 @@ private String wellCode; @ExcelProperty("设备编号") private String devcode; - @ExcelProperty("权属单位") - private String deptName; @ExcelProperty("详细地址") private String position; @ExcelProperty("告警类型") @@ -36,6 +34,8 @@ private String alarmLevel; @ExcelProperty("告警数值") private String alarmValue; + @ExcelProperty("权属单位") + private String deptName; @ExcelProperty("告警时间") private String logTime; } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java index 154c7fe..c91f067 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java @@ -15,6 +15,7 @@ import com.casic.missiles.modular.system.model.DeptPermission; import com.casic.missiles.modular.system.service.IDeptPermissionService; import lombok.extern.slf4j.Slf4j; +import org.apache.ibatis.jdbc.Null; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.*; @@ -94,7 +95,9 @@ levelMap.put("name", name); levelMap.put("deviceType", deviceType); levelMap.put("deviceTypeName", deviceTypeName); - + if(level == null){ + continue; + } if (ObjectUtil.isEmpty(level.get("openAlarm"))) { levelMap.put("openAlarm", ""); } else { diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/JobExcelDto.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/JobExcelDto.java index 52378f0..af4f7cb 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/JobExcelDto.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/JobExcelDto.java @@ -1,5 +1,6 @@ package com.casic.missiles.modular.alarm.model; +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; @@ -17,6 +18,7 @@ @HeadRowHeight(15) @ContentRowHeight(20) @ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated @Data @NoArgsConstructor public class JobExcelDto { @@ -24,10 +26,6 @@ private String jobCode; @ExcelProperty("点位编号") private String wellCode; - @ExcelProperty("设备编号") - private String devcode; - @ExcelProperty("部门名称") - private String deptName; @ExcelProperty("详细地址") private String position; @ExcelProperty("告警类型") @@ -44,4 +42,11 @@ private String handleJobPerson; @ExcelProperty("接单时间") private String getJobTime; + +// @ExcelProperty("设备编号") + private String devcode; +// @ExcelProperty("部门名称") + private String deptName; + + } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/RecordExcelDto.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/RecordExcelDto.java index 4514412..61a690e 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/RecordExcelDto.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/RecordExcelDto.java @@ -24,8 +24,6 @@ private String wellCode; @ExcelProperty("设备编号") private String devcode; - @ExcelProperty("权属单位") - private String deptName; @ExcelProperty("详细地址") private String position; @ExcelProperty("告警类型") @@ -36,6 +34,8 @@ private String alarmLevel; @ExcelProperty("告警数值") private String alarmValue; + @ExcelProperty("权属单位") + private String deptName; @ExcelProperty("告警时间") private String logTime; } diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java index b43c3d8..06bcc50 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java @@ -55,8 +55,9 @@ private String devcode; private String deviceName; private Long deviceType;//设备类型 + @ExcelProperty("设备类型") private String deviceTypeName;//设备类型名称 - @ExcelProperty("监控内容") +// @ExcelProperty("监控内容") private String watchType; private String communication; private Long modelId; @@ -64,22 +65,22 @@ private String deptid; @ExcelProperty("权属单位") private String deptName; - @ExcelProperty("安装时间") + @ExcelProperty("设备安装日期") private String installDate; @ExcelProperty("设备位置") private String position; private Long concenId; - @ExcelProperty("集中器编号") +// @ExcelProperty("集中器编号") private String concenCode; private String onlineState; - @ExcelProperty("在线状态") +// @ExcelProperty("在线状态") private String onlineStateName; private String valid; private String ts; private String bfzt; private String bfztName; private String wellId; - @ExcelProperty("安装高度") + @ExcelProperty("设备安装高度") private String installHeight; } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java index 154c7fe..c91f067 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java @@ -15,6 +15,7 @@ import com.casic.missiles.modular.system.model.DeptPermission; import com.casic.missiles.modular.system.service.IDeptPermissionService; import lombok.extern.slf4j.Slf4j; +import org.apache.ibatis.jdbc.Null; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.*; @@ -94,7 +95,9 @@ levelMap.put("name", name); levelMap.put("deviceType", deviceType); levelMap.put("deviceTypeName", deviceTypeName); - + if(level == null){ + continue; + } if (ObjectUtil.isEmpty(level.get("openAlarm"))) { levelMap.put("openAlarm", ""); } else { diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/JobExcelDto.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/JobExcelDto.java index 52378f0..af4f7cb 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/JobExcelDto.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/JobExcelDto.java @@ -1,5 +1,6 @@ package com.casic.missiles.modular.alarm.model; +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; @@ -17,6 +18,7 @@ @HeadRowHeight(15) @ContentRowHeight(20) @ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated @Data @NoArgsConstructor public class JobExcelDto { @@ -24,10 +26,6 @@ private String jobCode; @ExcelProperty("点位编号") private String wellCode; - @ExcelProperty("设备编号") - private String devcode; - @ExcelProperty("部门名称") - private String deptName; @ExcelProperty("详细地址") private String position; @ExcelProperty("告警类型") @@ -44,4 +42,11 @@ private String handleJobPerson; @ExcelProperty("接单时间") private String getJobTime; + +// @ExcelProperty("设备编号") + private String devcode; +// @ExcelProperty("部门名称") + private String deptName; + + } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/RecordExcelDto.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/RecordExcelDto.java index 4514412..61a690e 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/RecordExcelDto.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/RecordExcelDto.java @@ -24,8 +24,6 @@ private String wellCode; @ExcelProperty("设备编号") private String devcode; - @ExcelProperty("权属单位") - private String deptName; @ExcelProperty("详细地址") private String position; @ExcelProperty("告警类型") @@ -36,6 +34,8 @@ private String alarmLevel; @ExcelProperty("告警数值") private String alarmValue; + @ExcelProperty("权属单位") + private String deptName; @ExcelProperty("告警时间") private String logTime; } diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java index b43c3d8..06bcc50 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java @@ -55,8 +55,9 @@ private String devcode; private String deviceName; private Long deviceType;//设备类型 + @ExcelProperty("设备类型") private String deviceTypeName;//设备类型名称 - @ExcelProperty("监控内容") +// @ExcelProperty("监控内容") private String watchType; private String communication; private Long modelId; @@ -64,22 +65,22 @@ private String deptid; @ExcelProperty("权属单位") private String deptName; - @ExcelProperty("安装时间") + @ExcelProperty("设备安装日期") private String installDate; @ExcelProperty("设备位置") private String position; private Long concenId; - @ExcelProperty("集中器编号") +// @ExcelProperty("集中器编号") private String concenCode; private String onlineState; - @ExcelProperty("在线状态") +// @ExcelProperty("在线状态") private String onlineStateName; private String valid; private String ts; private String bfzt; private String bfztName; private String wellId; - @ExcelProperty("安装高度") + @ExcelProperty("设备安装高度") private String installHeight; } diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/WellCoverDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/WellCoverDataDto.java index adf4b5a..61fb97d 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/WellCoverDataDto.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/WellCoverDataDto.java @@ -1,5 +1,6 @@ package com.casic.missiles.modular.system.dto.ExcelModel; +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; @@ -19,6 +20,7 @@ @ContentRowHeight(20) @ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) @Data +@ExcelIgnoreUnannotated @NoArgsConstructor public class WellCoverDataDto { @@ -38,20 +40,22 @@ */ @ExcelProperty("设备编号") private String devcode; - @ExcelProperty("设备类型") - private Long deviceType; - @ExcelProperty("设备类型名称") - private String deviceTypeName; - private Long deptid; - @ExcelProperty("部门名称") - private String deptName; @ExcelProperty("点位编号") private String wellCode; + @ExcelProperty("设备类型") + private Long deviceType; @ExcelProperty("状态描述") private String descn; - @ExcelProperty("日志时间") +// @ExcelProperty("设备类型名称") + private String deviceTypeName; + private Long deptid; + @ExcelProperty("权属单位") + private String deptName; + +// @ExcelProperty("日志时间") + @ExcelProperty("上传时间") private String logtime; - @ExcelProperty("状态") +// @ExcelProperty("状态") private String status; } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java index 154c7fe..c91f067 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java @@ -15,6 +15,7 @@ import com.casic.missiles.modular.system.model.DeptPermission; import com.casic.missiles.modular.system.service.IDeptPermissionService; import lombok.extern.slf4j.Slf4j; +import org.apache.ibatis.jdbc.Null; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.*; @@ -94,7 +95,9 @@ levelMap.put("name", name); levelMap.put("deviceType", deviceType); levelMap.put("deviceTypeName", deviceTypeName); - + if(level == null){ + continue; + } if (ObjectUtil.isEmpty(level.get("openAlarm"))) { levelMap.put("openAlarm", ""); } else { diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/JobExcelDto.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/JobExcelDto.java index 52378f0..af4f7cb 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/JobExcelDto.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/JobExcelDto.java @@ -1,5 +1,6 @@ package com.casic.missiles.modular.alarm.model; +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; @@ -17,6 +18,7 @@ @HeadRowHeight(15) @ContentRowHeight(20) @ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated @Data @NoArgsConstructor public class JobExcelDto { @@ -24,10 +26,6 @@ private String jobCode; @ExcelProperty("点位编号") private String wellCode; - @ExcelProperty("设备编号") - private String devcode; - @ExcelProperty("部门名称") - private String deptName; @ExcelProperty("详细地址") private String position; @ExcelProperty("告警类型") @@ -44,4 +42,11 @@ private String handleJobPerson; @ExcelProperty("接单时间") private String getJobTime; + +// @ExcelProperty("设备编号") + private String devcode; +// @ExcelProperty("部门名称") + private String deptName; + + } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/RecordExcelDto.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/RecordExcelDto.java index 4514412..61a690e 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/RecordExcelDto.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/RecordExcelDto.java @@ -24,8 +24,6 @@ private String wellCode; @ExcelProperty("设备编号") private String devcode; - @ExcelProperty("权属单位") - private String deptName; @ExcelProperty("详细地址") private String position; @ExcelProperty("告警类型") @@ -36,6 +34,8 @@ private String alarmLevel; @ExcelProperty("告警数值") private String alarmValue; + @ExcelProperty("权属单位") + private String deptName; @ExcelProperty("告警时间") private String logTime; } diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java index b43c3d8..06bcc50 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java @@ -55,8 +55,9 @@ private String devcode; private String deviceName; private Long deviceType;//设备类型 + @ExcelProperty("设备类型") private String deviceTypeName;//设备类型名称 - @ExcelProperty("监控内容") +// @ExcelProperty("监控内容") private String watchType; private String communication; private Long modelId; @@ -64,22 +65,22 @@ private String deptid; @ExcelProperty("权属单位") private String deptName; - @ExcelProperty("安装时间") + @ExcelProperty("设备安装日期") private String installDate; @ExcelProperty("设备位置") private String position; private Long concenId; - @ExcelProperty("集中器编号") +// @ExcelProperty("集中器编号") private String concenCode; private String onlineState; - @ExcelProperty("在线状态") +// @ExcelProperty("在线状态") private String onlineStateName; private String valid; private String ts; private String bfzt; private String bfztName; private String wellId; - @ExcelProperty("安装高度") + @ExcelProperty("设备安装高度") private String installHeight; } diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/WellCoverDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/WellCoverDataDto.java index adf4b5a..61fb97d 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/WellCoverDataDto.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/WellCoverDataDto.java @@ -1,5 +1,6 @@ package com.casic.missiles.modular.system.dto.ExcelModel; +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; @@ -19,6 +20,7 @@ @ContentRowHeight(20) @ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) @Data +@ExcelIgnoreUnannotated @NoArgsConstructor public class WellCoverDataDto { @@ -38,20 +40,22 @@ */ @ExcelProperty("设备编号") private String devcode; - @ExcelProperty("设备类型") - private Long deviceType; - @ExcelProperty("设备类型名称") - private String deviceTypeName; - private Long deptid; - @ExcelProperty("部门名称") - private String deptName; @ExcelProperty("点位编号") private String wellCode; + @ExcelProperty("设备类型") + private Long deviceType; @ExcelProperty("状态描述") private String descn; - @ExcelProperty("日志时间") +// @ExcelProperty("设备类型名称") + private String deviceTypeName; + private Long deptid; + @ExcelProperty("权属单位") + private String deptName; + +// @ExcelProperty("日志时间") + @ExcelProperty("上传时间") private String logtime; - @ExcelProperty("状态") +// @ExcelProperty("状态") private String status; } diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusConcentrator.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusConcentrator.java index bb21265..d459da3 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusConcentrator.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusConcentrator.java @@ -67,10 +67,14 @@ @Digits(integer = 14, fraction = 0, message = "SIM卡号为14位") @TableField("SIMID") private String simid; + + @ExcelProperty("权属单位") + @TableField(exist = false) + private String deptName; + /** * 部门 */ - @ExcelProperty("权属单位") @TableField("DEPTID") private Long deptid; /** @@ -79,18 +83,24 @@ @ExcelProperty("安装位置") @TableField("POSITION") private String position; + + @ExcelProperty("在线状态") + @TableField(exist = false) + private String statusName; + + /** * 纬度 */ // @Digits(integer = 3,fraction = 14,message = "经度必须为正数且最多14位小数") - @ExcelProperty("纬度") +// @ExcelProperty("纬度") @TableField("LAT") private String lat; /** * 经度 */ // @Digits(integer = 3,fraction = 14,message = "纬度必须为正数且最多14位小数") - @ExcelProperty("经度") +// @ExcelProperty("经度") @TableField("LNG") private String lng; /** @@ -123,12 +133,7 @@ */ @TableField("STATUS") private String status; - /** - * 最后上传时间 - */ - @TableField("LASTTIME") - @JSONField(format = "yyyy-MM-dd HH:mm:ss") - private Date lasttime; + /** * 是否有效 */ @@ -146,17 +151,24 @@ @TableField("TS") private Date ts; + @ExcelProperty("设备数量") @TableField(exist = false) private int devices; - @ExcelProperty("状态") - @TableField(exist = false) - private String statusName; - @ExcelProperty("权属单位名称") - @TableField(exist = false) - private String deptName; + + + @TableField(exist = false) private String lasttimeFormat; - @ExcelProperty("安装时间") + + /** + * 最后上传时间 + */ + @ExcelProperty("最新在线时间") + @TableField("LASTTIME") + @JSONField(format = "yyyy-MM-dd HH:mm:ss") + private Date lasttime; + + @ExcelProperty("安装日期") @TableField(exist = false) private String setupdateFormat;