From ea58523b67ad59002a1191c3c564258c5b81f6f2 Mon Sep 17 00:00:00 2001 From: liurunyu <lry9898@163.com> Date: 星期二, 06 五月 2025 17:35:16 +0800 Subject: [PATCH] Revert "1、实现万用token(0000-0000-1234-9876-5); 2、web端单独实现命令结果等待器,并修改相关部分; 3、web端实现透传命令; 4、修改一些不当注释; 5、优化一些代码。" --- pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/records/controllerAlarmState/ControllerAlarmStateSv.java | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/records/controllerAlarmState/ControllerAlarmStateSv.java b/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/records/controllerAlarmState/ControllerAlarmStateSv.java index 8f44dfe..7f5862a 100644 --- a/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/records/controllerAlarmState/ControllerAlarmStateSv.java +++ b/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/records/controllerAlarmState/ControllerAlarmStateSv.java @@ -35,7 +35,7 @@ * @return */ public QueryResultVo<List<VoControllerAlarmState>> getControllerAlarmStateHistory(ControllerAlarmStateQueryVo vo) { - + vo.completionTime(); Map<String, Object> params = (Map<String, Object>) PojoUtils.generalize(vo); Long itemTotal = rmAlarmStateHistoryMapper.getRecordCount(params); @@ -54,6 +54,7 @@ * @return */ public QueryResultVo<List<VoControllerAlarmState>> getOneControllerAlarmStateHistory(ControllerAlarmStateQueryVo vo) { + vo.completionTime(); Map<String, Object> params = (Map<String, Object>) PojoUtils.generalize(vo); Long itemTotal = rmAlarmStateHistoryMapper.getRecordCount(params); @@ -74,7 +75,7 @@ * @return */ public QueryResultVo<List<VoControllerAlarmState>> getControllerAlarmStateLast(ControllerAlarmStateQueryVo vo) { - + vo.completionTime(); Map<String, Object> params = (Map<String, Object>) PojoUtils.generalize(vo); Long itemTotal = rmAlarmStateLastMapper.getRecordCount(params); -- Gitblit v1.8.0