From c42614978ff12013a1eabebd0289b27169a5784f Mon Sep 17 00:00:00 2001 From: liurunyu <lry9898@163.com> Date: 星期二, 06 五月 2025 17:25:56 +0800 Subject: [PATCH] 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 | 91 +++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 91 insertions(+), 0 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 new file mode 100644 index 0000000..7f5862a --- /dev/null +++ b/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/records/controllerAlarmState/ControllerAlarmStateSv.java @@ -0,0 +1,91 @@ +package com.dy.pipIrrRemote.records.controllerAlarmState; + +import com.dy.common.webUtil.QueryResultVo; +import com.dy.pipIrrGlobal.daoRm.RmAlarmStateHistoryMapper; +import com.dy.pipIrrGlobal.daoRm.RmAlarmStateLastMapper; +import com.dy.pipIrrGlobal.voRm.VoControllerAlarmState; +import lombok.extern.slf4j.Slf4j; +import org.apache.dubbo.common.utils.PojoUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; +import java.util.Map; + +/** + * @author :WuZeYu + * @Date :2024/7/24 14:22 + * @LastEditTime :2024/7/24 14:22 + * @Description + */ +@Slf4j +@Service +public class ControllerAlarmStateSv { + + @Autowired + private RmAlarmStateHistoryMapper rmAlarmStateHistoryMapper; + @Autowired + private RmAlarmStateLastMapper rmAlarmStateLastMapper; + + + + /** + * 鑾峰緱涓�椤垫帶鍒跺櫒鎶ヨ涓庣姸鎬佽褰�(鍘嗗彶) + * @param vo + * @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); + + 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>> getControllerAlarmStateLast(ControllerAlarmStateQueryVo vo) { + vo.completionTime(); + Map<String, Object> params = (Map<String, Object>) PojoUtils.generalize(vo); + + Long itemTotal = rmAlarmStateLastMapper.getRecordCount(params); + + QueryResultVo<List<VoControllerAlarmState>> rsVo = new QueryResultVo<>(); + rsVo.pageSize = vo.pageSize; + rsVo.pageCurr = vo.pageCurr; + + rsVo.calculateAndSet(itemTotal, params); + rsVo.obj = rmAlarmStateLastMapper.getControllerAlarmStateLast(params); + return rsVo; + } +} -- Gitblit v1.8.0