From 845848661108dbce3759753a6005fb55f68dd188 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期三, 05 二月 2025 14:49:53 +0800
Subject: [PATCH] 取水口综合信息中基本信息查询返回结果数据结构变更
---
pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/allRound/Ar4RemoteSv.java | 31 ++++++++++++++++++++++---------
1 files changed, 22 insertions(+), 9 deletions(-)
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/allRound/Ar4RemoteSv.java b/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/allRound/Ar4RemoteSv.java
index 52d1d71..ec8ca1b 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/allRound/Ar4RemoteSv.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/allRound/Ar4RemoteSv.java
@@ -8,9 +8,9 @@
import com.dy.pipIrrGlobal.VoAllRound.VoArIntakeRemote;
import com.dy.pipIrrGlobal.daoAllRound.Ar4BaseMapper;
import com.dy.pipIrrGlobal.daoAllRound.Ar4RemoteMapper;
+import com.dy.pipIrrGlobal.daoAllRound.Ar4StatisticsMapper;
import com.dy.pipIrrGlobal.rtuMw.CodeLocal;
import com.dy.pipIrrGlobal.rtuMw.Web2RtuMw;
-import com.dy.pipIrrGlobal.voPr.VoOnLineIntake;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.core.env.Environment;
@@ -45,13 +45,14 @@
* 鍙栨按鍙ｅ熀鏈俊鎭�
* @return 鍙栨按鍙ｅ熀鏈俊鎭�
*/
- public QueryResultVo<VoArIntakeRemote> intakeInfo(Long intakeId){
+ public VoArIntakeRemote intakeInfo(Long intakeId){
VoArIntakeRemote rVo = new VoArIntakeRemote() ;
String rtuAddr = this.getRtuAddr(intakeId);
this.getRtuOnLine(intakeId, rtuAddr, rVo);
- this.getAlarmInfo(intakeId, rtuAddr, rVo);
- this.getOpenCloseValveInfo(intakeId, rtuAddr, rVo);
- return null ;
+ this.getAlarmLastInfo(intakeId, rtuAddr, rVo);
+ this.getOpenCloseValveLastInfo(intakeId, rtuAddr, rVo);
+ this.getLossAmountLastInfo(intakeId, rtuAddr, rVo);
+ return rVo ;
}
/**
@@ -107,8 +108,8 @@
* 寰楀埌鍙栨按鍙ｆ渶鏂版姤璀︿俊鎭�
* @param intakeId
*/
- private void getAlarmInfo(Long intakeId, String rtuAddr, VoArIntakeRemote rVo){
- List<VoArIntakeRemote> list = remoteDao.alarmInfo(intakeId);
+ private void getAlarmLastInfo(Long intakeId, String rtuAddr, VoArIntakeRemote rVo){
+ List<VoArIntakeRemote> list = remoteDao.alarmLastInfo(intakeId);
if(list != null && list.size() > 0){
VoArIntakeRemote vo = list.get(0) ;
rVo.alarm = vo.alarm ;
@@ -119,12 +120,24 @@
* 寰楀埌鍙栨按鍙ｆ渶鏂板紑鍏抽榾淇℃伅
* @param intakeId
*/
- private void getOpenCloseValveInfo(Long intakeId, String rtuAddr, VoArIntakeRemote rVo){
- List<VoArIntakeRemote> list = remoteDao.openCloseValveInfo(intakeId);
+ private void getOpenCloseValveLastInfo(Long intakeId, String rtuAddr, VoArIntakeRemote rVo){
+ List<VoArIntakeRemote> list = remoteDao.openCloseValveLastInfo(intakeId);
if(list != null && list.size() > 0){
VoArIntakeRemote vo = list.get(0) ;
rVo.lastOpenDt = vo.lastOpenDt ;
rVo.lastCloseDt = vo.lastCloseDt ;
}
}
+ /**
+ * 寰楀埌鍙栨按鍙ｆ渶鏂版紡鎹熶俊鎭�
+ * @param intakeId
+ */
+ private void getLossAmountLastInfo(Long intakeId, String rtuAddr, VoArIntakeRemote rVo){
+ List<VoArIntakeRemote> list = remoteDao.lossLastInfo(intakeId);
+ if(list != null && list.size() > 0){
+ VoArIntakeRemote vo = list.get(0) ;
+ rVo.lossDt = vo.lossDt ;
+ rVo.lossAmount = vo.lossAmount ;
+ }
+ }
}
--
Gitblit v1.8.0