From a878b7de900ceac72320d58330f5246909137314 Mon Sep 17 00:00:00 2001
From: zzc <1278921369@qq.com>
Date: Tue, 20 Aug 2024 22:21:24 +0800
Subject: [PATCH] =?UTF-8?q?=E8=8E=B7=E5=8F=96=E6=97=A5=E5=BF=97=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E5=B9=B4=E6=9C=88=E6=97=A5=E5=8F=82=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../org/dromara/web/controller/app/EqDeviceController.java    | 3 ++-
 .../main/java/org/dromara/web/domain/bo/EqEquipmentLogBo.java | 4 ++++
 2 files changed, 6 insertions(+), 1 deletion(-)

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<String, List<EqEquipmentLogVo>> getDeviceLogs(EqAppHomeBo bo,PageQuery pageQuery){
+    public Map<String, List<EqEquipmentLogVo>> 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<EqEquipmentLogVo> data = logService.queryPageList(eqEquipmentLogBo, pageQuery);
         List<EqEquipmentLogVo> 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;