diff --git a/ruoyi-admin/src/main/java/org/dromara/web/controller/app/EqDeviceController.java b/ruoyi-admin/src/main/java/org/dromara/web/controller/app/EqDeviceController.java index 9214ba13c..5dbe6b596 100644 --- a/ruoyi-admin/src/main/java/org/dromara/web/controller/app/EqDeviceController.java +++ b/ruoyi-admin/src/main/java/org/dromara/web/controller/app/EqDeviceController.java @@ -135,7 +135,7 @@ public class EqDeviceController extends BaseController { * @return todo */ @GetMapping("/getDeviceLogs") - public Map> getDeviceLogs(EqAppHomeBo bo,PageQuery pageQuery){ + public Map> getDeviceLogs(EqAppHomeBo bo,String createdYearDay,PageQuery pageQuery){ if (bo.getEquipmentId() == null) throw new ServiceException("设备ID不能为空"); String zoneId = bo.getZoneId(); if (StringUtils.isEmpty(zoneId)) throw new ServiceException("时区zoneId(如 UTC+08:00)不能为空"); @@ -149,6 +149,7 @@ public class EqDeviceController extends BaseController { EqEquipmentLogBo eqEquipmentLogBo = new EqEquipmentLogBo(); eqEquipmentLogBo.setEquipmentId(bo.getEquipmentId()); BeanUtil.copyProperties(bo, eqEquipmentLogBo); + eqEquipmentLogBo.setCreatedYearDay(createdYearDay); TableDataInfo data = logService.queryPageList(eqEquipmentLogBo, pageQuery); List rows = data.getRows(); if (CollUtil.isEmpty(rows)) return new HashMap<>(); diff --git a/ruoyi-admin/src/main/java/org/dromara/web/domain/bo/EqEquipmentLogBo.java b/ruoyi-admin/src/main/java/org/dromara/web/domain/bo/EqEquipmentLogBo.java index bdf146fd2..6feae46f0 100644 --- a/ruoyi-admin/src/main/java/org/dromara/web/domain/bo/EqEquipmentLogBo.java +++ b/ruoyi-admin/src/main/java/org/dromara/web/domain/bo/EqEquipmentLogBo.java @@ -63,6 +63,7 @@ public class EqEquipmentLogBo extends BaseEntity { /** * 状态 eq_status_log_type + * * 0.停止中 stop * 1.关闭中 closing * 2.开启中 openning @@ -87,6 +88,9 @@ public class EqEquipmentLogBo extends BaseEntity { * 112.门体手动开启提醒 * 113.半开门运行提醒 * 114.门体停止运行提醒 + * + * 500.设备离线 offline + * 501.设备在线 online */ // @NotNull(message = "状态不能为空", groups = { AddGroup.class, EditGroup.class }) private Integer status;