From 618d7684ddaf2449461b18b1c834d2f8e8f7da1c Mon Sep 17 00:00:00 2001 From: liurunyu <lry9898@163.com> Date: 星期三, 26 三月 2025 10:03:56 +0800 Subject: [PATCH] 1、通信中间件配置方式进行调整,以方便修改; 2、增加文档《打包发布配置修改》。 --- pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/records/controllerAlarmState/ControllerAlarmStateSv.java | 21 ++++++++++++++++++++- 1 files changed, 20 insertions(+), 1 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 0221272..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,26 @@ * @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); + + QueryResultVo<List<VoControllerAlarmState>> rsVo = new QueryResultVo<>(); + rsVo.pageSize = vo.pageSize; + rsVo.pageCurr = vo.pageCurr; + + rsVo.calculateAndSet(itemTotal, params); + rsVo.obj = rmAlarmStateHistoryMapper.getControllerAlarmStateHistory(params); + return rsVo; + } + /** + * 鑾峰緱涓�椤典竴涓彇姘村彛鎺у埗鍣ㄦ姤璀︿笌鐘舵�佽褰�(鍘嗗彶) + * @param vo + * @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); @@ -56,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