opensource/RuoYi-Vue-Plus
2
0
Fork 1
mirror of https://gitee.com/dromara/RuoYi-Vue-Plus.git synced 2026-09-18 17:38:48 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

获取日志增加年月日参数

Browse Source
This commit is contained in:
zzc 2024-08-20 22:21:24 +08:00
parent 46c34efcc1
commit a878b7de90
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ruoyi-admin/src/main/java/org/dromara/web/controller/app/EqDeviceController.java
View File

@ -135,7 +135,7 @@ public class EqDeviceController extends BaseController {
* @return todo * @return todo
*/ */
@GetMapping("/getDeviceLogs") @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不能为空"); if (bo.getEquipmentId() == null) throw new ServiceException("设备ID不能为空");
String zoneId = bo.getZoneId(); String zoneId = bo.getZoneId();
if (StringUtils.isEmpty(zoneId)) throw new ServiceException("时区zoneId(如 UTC+08:00)不能为空"); 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 eqEquipmentLogBo = new EqEquipmentLogBo();
eqEquipmentLogBo.setEquipmentId(bo.getEquipmentId()); eqEquipmentLogBo.setEquipmentId(bo.getEquipmentId());
BeanUtil.copyProperties(bo, eqEquipmentLogBo); BeanUtil.copyProperties(bo, eqEquipmentLogBo);
eqEquipmentLogBo.setCreatedYearDay(createdYearDay);
TableDataInfo<EqEquipmentLogVo> data = logService.queryPageList(eqEquipmentLogBo, pageQuery); TableDataInfo<EqEquipmentLogVo> data = logService.queryPageList(eqEquipmentLogBo, pageQuery);
List<EqEquipmentLogVo> rows = data.getRows(); List<EqEquipmentLogVo> rows = data.getRows();
if (CollUtil.isEmpty(rows)) return new HashMap<>(); if (CollUtil.isEmpty(rows)) return new HashMap<>();

4
ruoyi-admin/src/main/java/org/dromara/web/domain/bo/EqEquipmentLogBo.java
View File

@ -63,6 +63,7 @@ public class EqEquipmentLogBo extends BaseEntity {
/** /**
* 状态 eq_status_log_type * 状态 eq_status_log_type
*
* 0.停止中 stop * 0.停止中 stop
* 1.关闭中 closing * 1.关闭中 closing
* 2.开启中 openning * 2.开启中 openning
@ -87,6 +88,9 @@ public class EqEquipmentLogBo extends BaseEntity {
* 112.门体手动开启提醒 * 112.门体手动开启提醒
* 113.半开门运行提醒 * 113.半开门运行提醒
* 114.门体停止运行提醒 * 114.门体停止运行提醒
*
* 500.设备离线 offline
* 501.设备在线 online
*/ */
// @NotNull(message = "状态不能为空", groups = { AddGroup.class, EditGroup.class }) // @NotNull(message = "状态不能为空", groups = { AddGroup.class, EditGroup.class })
private Integer status; private Integer status;