diff --git a/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/dto/DeviceExcelExportDTO.java b/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/dto/DeviceExcelExportDTO.java index 7388b50ec..8a819e900 100644 --- a/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/dto/DeviceExcelExportDTO.java +++ b/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/dto/DeviceExcelExportDTO.java @@ -22,9 +22,6 @@ public class DeviceExcelExportDTO { // @ExcelProperty("ID") // private Long id; - @ExcelProperty("设备类型") - @ColumnWidth(20) - private String typeName; // @ExcelProperty("设备类型") // private Long deviceType; @@ -55,12 +52,25 @@ public class DeviceExcelExportDTO { @ColumnWidth(20) private String deviceImei; + @ExcelProperty("设备类型") + @ColumnWidth(20) + private String typeName; + // @ExcelProperty("经度") // private String longitude; // @ExcelProperty("纬度") // private String latitude; + /** + * 绑定状态 + * 0 未绑定 + * 1 已绑定 + */ + @ExcelProperty("绑定状态") + @ColumnWidth(20) + private String bindingStatus; + @ExcelProperty("备注") @ColumnWidth(30) private String remark; diff --git a/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/service/impl/DeviceExportService.java b/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/service/impl/DeviceExportService.java index 4ce31b521..551b81117 100644 --- a/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/service/impl/DeviceExportService.java +++ b/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/service/impl/DeviceExportService.java @@ -53,7 +53,9 @@ public class DeviceExportService { dto.setTypeName(device.getTypeName()); dto.setCreateBy(device.getCreateByName()); Integer deviceStatus = device.getDeviceStatus(); + Integer bindingStatus = device.getBindingStatus(); // dto.setDeviceStatus(deviceStatus == 1 ? "正常" : "失效"); + dto.setBindingStatus(bindingStatus == 1 ? "已绑定" : "未绑定"); // 时间戳转换 dto.setCreateTime(DateUtils.format(device.getCreateTime(), "yyyy-MM-dd HH:mm:ss")); diff --git a/fys-modules/fys-equipment/src/main/resources/mapper/equipment/DeviceAlarmMapper.xml b/fys-modules/fys-equipment/src/main/resources/mapper/equipment/DeviceAlarmMapper.xml index 4e79b654a..1fbbf5208 100644 --- a/fys-modules/fys-equipment/src/main/resources/mapper/equipment/DeviceAlarmMapper.xml +++ b/fys-modules/fys-equipment/src/main/resources/mapper/equipment/DeviceAlarmMapper.xml @@ -29,9 +29,10 @@ and da.treatment_state = #{bo.treatmentState} - and da.start_time between #{bo.queryTime1} and #{bo.queryTime2} + and da.start_time BETWEEN #{bo.queryTime1} AND #{bo.queryTime2} + order by da.create_time DESC