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/RecordsSv.java | 58 ++++++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 52 insertions(+), 6 deletions(-)
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/records/RecordsSv.java b/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/records/RecordsSv.java
index b5c94a7..0ef668a 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/records/RecordsSv.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/records/RecordsSv.java
@@ -1,12 +1,13 @@
package com.dy.pipIrrRemote.records;
import com.dy.common.webUtil.QueryResultVo;
-import com.dy.pipIrrGlobal.daoRm.RmAlarmStateHistoryMapper;
-import com.dy.pipIrrGlobal.daoRm.RmAlarmStateLastMapper;
-import com.dy.pipIrrGlobal.daoRm.RmClientAmountDayLastMapper;
-import com.dy.pipIrrGlobal.daoRm.RmClientAmountDayMapper;
+import com.dy.pipIrrGlobal.daoRm.*;
import com.dy.pipIrrGlobal.voRm.VoClientAmountDay;
import com.dy.pipIrrGlobal.voRm.VoControllerAlarmState;
+import com.dy.pipIrrGlobal.voRm.VoIntakeAmountDay;
+import com.dy.pipIrrRemote.records.clientAmountDay.ClientAmountDayQueryVo;
+import com.dy.pipIrrRemote.records.controllerAlarmState.ControllerAlarmStateQueryVo;
+import com.dy.pipIrrRemote.records.intakeAmountDay.IntakeAmountDayQueryVo;
import lombok.extern.slf4j.Slf4j;
import org.apache.dubbo.common.utils.PojoUtils;
import org.springframework.beans.factory.annotation.Autowired;
@@ -30,9 +31,14 @@
private RmAlarmStateLastMapper rmAlarmStateLastMapper;
@Autowired
- private RmClientAmountDayLastMapper rmClientAmountDayLastMapper;
- @Autowired
private RmClientAmountDayMapper rmClientAmountDayMapper;
+ @Autowired
+ private RmClientAmountDayLastMapper rmClientAmountDayLastMapper;
+
+ @Autowired
+ private RmIntakeAmountDayMapper rmIntakeAmountDayMapper;
+ @Autowired
+ private RmIntakeAmountDayLastMapper rmIntakeAmountDayLastMapper;
/**
@@ -118,4 +124,44 @@
rsVo.obj = rmClientAmountDayLastMapper.getClientAmountDayLast(params);
return rsVo;
}
+
+ /**
+ * 鑾峰緱涓�椤靛彇姘村彛鏃ュ彇姘撮噺婕忔崯璁板綍(鍘嗗彶)
+ * @param vo
+ * @return
+ */
+ public QueryResultVo<List<VoIntakeAmountDay>> getIntakeAmountDayHistory(IntakeAmountDayQueryVo vo) {
+
+ Map<String, Object> params = (Map<String, Object>) PojoUtils.generalize(vo);
+
+ Long itemTotal = rmIntakeAmountDayMapper.getRecordCount(params);
+
+ QueryResultVo<List<VoIntakeAmountDay>> rsVo = new QueryResultVo<>();
+ rsVo.pageSize = vo.pageSize;
+ rsVo.pageCurr = vo.pageCurr;
+
+ rsVo.calculateAndSet(itemTotal, params);
+ rsVo.obj = rmIntakeAmountDayMapper.getIntakeAmountDayHistory(params);
+ return rsVo;
+ }
+
+ /**
+ * 鑾峰緱涓�椤靛彇姘村彛鏃ュ彇姘撮噺婕忔崯璁板綍(鏈�鏂�)
+ * @param vo
+ * @return
+ */
+ public QueryResultVo<List<VoIntakeAmountDay>> getIntakeAmountDayLast(IntakeAmountDayQueryVo vo) {
+
+ Map<String, Object> params = (Map<String, Object>) PojoUtils.generalize(vo);
+
+ Long itemTotal = rmIntakeAmountDayLastMapper.getRecordCount(params);
+
+ QueryResultVo<List<VoIntakeAmountDay>> rsVo = new QueryResultVo<>();
+ rsVo.pageSize = vo.pageSize;
+ rsVo.pageCurr = vo.pageCurr;
+
+ rsVo.calculateAndSet(itemTotal, params);
+ rsVo.obj = rmIntakeAmountDayLastMapper.getIntakeAmountDayLast(params);
+ return rsVo;
+ }
}
--
Gitblit v1.8.0