diff --git a/ruoyi-admin/src/main/java/org/dromara/web/service/impl/EqEquipmentLogServiceImpl.java b/ruoyi-admin/src/main/java/org/dromara/web/service/impl/EqEquipmentLogServiceImpl.java index 28c1285ab..6542c10ae 100644 --- a/ruoyi-admin/src/main/java/org/dromara/web/service/impl/EqEquipmentLogServiceImpl.java +++ b/ruoyi-admin/src/main/java/org/dromara/web/service/impl/EqEquipmentLogServiceImpl.java @@ -8,6 +8,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import lombok.RequiredArgsConstructor; +import org.dromara.system.domain.SysOperLog; import org.springframework.stereotype.Service; import org.dromara.web.domain.bo.EqEquipmentLogBo; import org.dromara.web.domain.vo.EqEquipmentLogVo; @@ -80,6 +81,8 @@ public class EqEquipmentLogServiceImpl implements IEqEquipmentLogService { lqw.eq(bo.getCreatedYearDay() != null, EqEquipmentLog::getCreatedYearDay, bo.getCreatedYearDay()); lqw.eq(bo.getCreatedHourSecond() != null, EqEquipmentLog::getCreatedHourSecond, bo.getCreatedHourSecond()); lqw.eq(bo.getDayOfWeek() != null, EqEquipmentLog::getDayOfWeek, bo.getDayOfWeek()); + lqw.between(params.get("beginTime") != null && params.get("endTime") != null, + EqEquipmentLog::getCreateTime, params.get("beginTime"), params.get("endTime")); return lqw; } diff --git a/ruoyi-admin/src/main/resources/i18n/messages_en_US.properties b/ruoyi-admin/src/main/resources/i18n/messages_en_US.properties index 578d18751..9ecba0bf1 100644 --- a/ruoyi-admin/src/main/resources/i18n/messages_en_US.properties +++ b/ruoyi-admin/src/main/resources/i18n/messages_en_US.properties @@ -61,25 +61,6 @@ tenant.blocked=Sorry, your tenant is disabled. Please contact the administrator tenant.expired=Sorry, your tenant has expired. Please contact the administrator. -noinit.name0= details -noinit.name1= Stroke uncalibrated -noinit.name2= If the device is not calibrated, the device cannot be controlled -noinit.name3= Stroke calibration tutorial -noinit.name4= Please perform the operation on the device -noinit.name5= Set the opening position: -noinit.name6= 1. Hold down the SET key -noinit.name7= Observation: The display displays "1" flashing -noinit.name8= 2. Press the "SET" key again -noinit.name9= Observe: The monitor is "1" on -noinit.name10= 3. Long press the "UP" button to make the door to the maximum opening position and then release the hand to stop -noinit.name11= Observation: The door runs in the direction of opening the door, when the door reaches the maximum opening position -noinit.name12= Set the door closing position: -noinit.name13= 4. Press the "SET" button again -noinit.name14= Observe: The display is "2" steady on -noinit.name15= 5. Press and hold the Down key to close the button and release -noinit.name16= Observation: The door runs in the direction of closing, and stops when the door reaches the closed position -noinit.name17= Automatic check: -noinit.name18= 6. Press the "SET" button again ## "Login" @@ -210,6 +191,28 @@ setCommon.alert= alert setCommon.cancel= cancel setCommon.confirm= Confirm +##《未设置详情》noinit +noinit.name0= details +noinit.name1= Stroke uncalibrated +noinit.name2= If the device is not calibrated, the device cannot be controlled +noinit.name3= Stroke calibration tutorial +noinit.name4= Please perform the operation on the device +noinit.name5= Set the opening position: +noinit.name6= 1. Hold down the SET key +noinit.name7= Observation: The display displays "1" flashing +noinit.name8= 2. Press the "SET" key again +noinit.name9= Observe: The monitor is "1" on +noinit.name10= 3. Long press the "UP" button to make the door to the maximum opening position and then release the hand to stop +noinit.name11= Observation: The door runs in the direction of opening the door, when the door reaches the maximum opening position +noinit.name12= Set the door closing position: +noinit.name13= 4. Press the "SET" button again +noinit.name14= Observe: The display is "2" steady on +noinit.name15= 5. Press and hold the Down key to close the button and release +noinit.name16= Observation: The door runs in the direction of closing, and stops when the door reaches the closed position +noinit.name17= Automatic check: +noinit.name18= 6. Press the "SET" button again + + ## "Change Device Name" setEqname.name0= Changes the device name setEqname.name1= Please enter a name diff --git a/ruoyi-admin/src/main/resources/i18n/messages_zh_CN.properties b/ruoyi-admin/src/main/resources/i18n/messages_zh_CN.properties index 7a3a552a0..f64826d9c 100644 --- a/ruoyi-admin/src/main/resources/i18n/messages_zh_CN.properties +++ b/ruoyi-admin/src/main/resources/i18n/messages_zh_CN.properties @@ -60,69 +60,51 @@ tenant.not.exists=对不起, 您的租户不存在,请联系管理员 tenant.blocked=对不起,您的租户已禁用,请联系管理员 tenant.expired=对不起,您的租户已过期,请联系管理员 -noinit.name0=详情 -noinit.name1=行程未校准 -noinit.name2=设备未校准行程,将不能进行设备控制 -noinit.name3=行程校准教程 -noinit.name4=请在设备上操作 -noinit.name5=设置开门位置: -noinit.name6=1.请长按“SET”键 -noinit.name7=观察:显示器显示”1”闪烁 -noinit.name8=2.再次按下"SET"键 -noinit.name9=观察:显示器显示为”1”常亮 -noinit.name10=3.长按"UP"键,使门至最大开门位置后松手停止 -noinit.name11=观察:门向开门方向运行,当门达到最大开门位置后 -noinit.name12=设置关门位置: -noinit.name13=4.再次按下”SET"键 -noinit.name14=观察:显示器显示为”2”常亮 -noinit.name15=5.长按“向下”键至关闭位置后松手 -noinit.name16=观察:门向关门方向运行,当门达到关闭位置后停止 -noinit.name17=自动校验: -noinit.name18=6.再次按下"SET"键 -##《登录》 + +##《登录》login login.name0=登录 login.name1=请输入账号 login.name2=请输入密码 login.name3=我已阅读并同意签署 login.name4=立即注册 -##《注册》 +##《注册》register register.name0=注册 register.name1=注册账号 register.name2=请输入账号 register.name3=请输入密码 register.name4=请再次输入密码 -##《注册成功》 +##《注册成功》registerSuccess registerSuccess.name0=注册成功 registerSuccess.name1=您的登录账号 registerSuccess.name2=您的密码 registerSuccess.name3=立即登录 -##《首页》 +##《首页》homepage homepage.name0=首页 homepage.name1=状态 homepage.name2=已关闭 homepage.name3=打开 -##《关门提醒》 +##《关门提醒》warningClose warningClose.name0=关门提醒 warningClose.name1=设备-deviceName-已开门-num-分钟了,请记得关门 warningClose.name2=关门 warningClose.name3=我知道了 -##《添加设备》 +##《添加设备》add add.name0=添加设备 add.name1=请输入设备编码 add.name2=请输入 add.name3=添加 -## 《添加成功》 +## 《添加成功》addSuccess addSuccess.name0=添加成功 addSuccess.name1=返回 addSuccess.name2=继续搜索 -##《添加失败》 +##《添加失败》addFailure addFailure.name0=添加失败 addFailure.name1=请正确的设备编号后再试 addFailure.name2=返回 addFailure.name3=重新添加 -##《设备详情》 +##《设备详情》detail detail.name0=详情 ##(已关闭 打开10% 打开100%) detail.name1=状态 @@ -143,11 +125,11 @@ detail.name15=操作次数 detail.name16=数据日志 detail.name17=清码 detail.name18=对码 -##《倒计时设置》 +##《倒计时设置》countdown countdown.name0=倒计时设置 countdown.name1=取消 countdown.name2=确认 -##《数据日志》 +##《数据日志》log log.name0=数据日志 log.name1=选择日期 log.name2=今天 @@ -159,12 +141,12 @@ log.name7=周四 log.name8=周五 log.name9=周六 log.name10=开门提醒 -##《对码》 +##《对码》checkcode checkcode.name0=对码 checkcode.name1=对码中 checkcode.name2=对码成功 checkcode.name3=对码失败请重试 -##《清码》 +##《清码》clearcode clearcode.name0=提示 clearcode.name1=请输入登录密码 clearcode.name2=请输入登录密码才能进行设备清码 @@ -172,11 +154,11 @@ clearcode.name3=取消 clearcode.name4=确认 clearcode.name5=密码错误请重试 -##《设备掉线详情》 +##《设备掉线详情》offDetail offDetail.name0=详情 offDetail.name1=设备已离线 -##《优化-设置》 +##《优化-设置》set set.name0=设置 set.name1=设备名称 set.name2=设备位置 @@ -200,7 +182,7 @@ set.name19=模组版本 set.name20=MCU版本 set.name21=删除设备 -##《通用》 +##《通用》setCommon setCommon.detail=详情 setCommon.add=添加 setCommon.edit=编辑 @@ -209,30 +191,52 @@ setCommon.alert=提示 setCommon.cancel=取消 setCommon.confirm=确认 -##《修改设备名称》 +##《未设置详情》noinit +noinit.name0=详情 +noinit.name1=行程未校准 +noinit.name2=设备未校准行程,将不能进行设备控制 +noinit.name3=行程校准教程 +noinit.name4=请在设备上操作 +noinit.name5=设置开门位置: +noinit.name6=1.请长按“SET”键 +noinit.name7=观察:显示器显示”1”闪烁 +noinit.name8=2.再次按下"SET"键 +noinit.name9=观察:显示器显示为”1”常亮 +noinit.name10=3.长按"UP"键,使门至最大开门位置后松手停止 +noinit.name11=观察:门向开门方向运行,当门达到最大开门位置后 +noinit.name12=设置关门位置: +noinit.name13=4.再次按下”SET"键 +noinit.name14=观察:显示器显示为”2”常亮 +noinit.name15=5.长按“向下”键至关闭位置后松手 +noinit.name16=观察:门向关门方向运行,当门达到关闭位置后停止 +noinit.name17=自动校验: +noinit.name18=6.再次按下"SET"键 + + +##《修改设备名称》setEqname setEqname.name0=修改设备名称 setEqname.name1=请输入名称 setEqname.name2=上一页 setEqname.name3=确认 -##《设备位置修改》 +##《设备位置修改》setEqarea setEqarea.name0=修改设备位置 setEqarea.name1=上一页 setEqarea.name2=确认 -##《反弹力设置》 +##《反弹力设置》setRebound setRebound.name0=电机反弹力 setRebound.name1=调节反弹力 setRebound.name2=电机在开门时,若开门的力超出设定范围值,门会立即停止开门; setRebound.name3=若关门的力超出设定范围值,门会立即停止关闭并开门,此功能可以调整开/关门感应力的范围值。 -##《删除设备》 +##《删除设备》setDelete setDelete.name0=删除设备 setDelete.name1=提示 setDelete.name2=删除设备后,将不能管理设备请谨慎操作! setDelete.name3=取消 setDelete.name4=确认删除 -##《时区设置》 +##《时区设置》setZone setZone.name0=时区 setZone.name1=时间格式 -##《wifi网络》 +##《wifi网络》setWifi setWifi.name0=wifi网络 setWifi.name1=提示 setWifi.name2=已链接WiFi:XXXXXXXX