From f998cf767ab317e10834b5ea05cc37358a73da11 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期三, 05 二月 2025 16:01:58 +0800
Subject: [PATCH] 取水口综合信息-远程监测信息逻辑处理模块完善
---
pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/allRound/Ar4RemoteSv.java | 40 ++++++++++++++++++++++++++++------------
1 files changed, 28 insertions(+), 12 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..51cb12d 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,15 @@
* 鍙栨按鍙ｅ熀鏈俊鎭�
* @return 鍙栨按鍙ｅ熀鏈俊鎭�
*/
- public QueryResultVo<VoArIntakeRemote> intakeInfo(Long intakeId){
+ public VoArIntakeRemote intakeInfo(Long intakeId){
VoArIntakeRemote rVo = new VoArIntakeRemote() ;
+ rVo.intakeId = intakeId ;
String rtuAddr = this.getRtuAddr(intakeId);
- this.getRtuOnLine(intakeId, rtuAddr, rVo);
- this.getAlarmInfo(intakeId, rtuAddr, rVo);
- this.getOpenCloseValveInfo(intakeId, rtuAddr, rVo);
- return null ;
+ this.getRtuOnLine(rtuAddr, rVo);
+ this.getAlarmLastInfo(intakeId, rVo);
+ this.getOpenCloseValveLastInfo(intakeId, rVo);
+ this.getLossAmountLastInfo(intakeId, rVo);
+ return rVo ;
}
/**
@@ -69,11 +71,10 @@
/**
* 寰楀埌鍙栨按RTU鍦ㄧ嚎鎯呭喌
- * @param intakeId
* @param rtuAddr
* @param rVo
*/
- private void getRtuOnLine(Long intakeId, String rtuAddr, VoArIntakeRemote rVo){
+ private void getRtuOnLine(String rtuAddr, VoArIntakeRemote rVo){
if(rtuAddr != null){
//鍚戦�氫俊涓棿浠跺彂鍏冲懡浠わ紝鏌ヨ閮ㄥ垎RTU鍦ㄧ嚎鎯呭喌
Command com = this.createInnerCommand(CodeLocal.onLinePart);
@@ -106,9 +107,10 @@
/**
* 寰楀埌鍙栨按鍙ｆ渶鏂版姤璀︿俊鎭�
* @param intakeId
+ * @param rVo
*/
- private void getAlarmInfo(Long intakeId, String rtuAddr, VoArIntakeRemote rVo){
- List<VoArIntakeRemote> list = remoteDao.alarmInfo(intakeId);
+ private void getAlarmLastInfo(Long intakeId, VoArIntakeRemote rVo){
+ List<VoArIntakeRemote> list = remoteDao.alarmLastInfo(intakeId);
if(list != null && list.size() > 0){
VoArIntakeRemote vo = list.get(0) ;
rVo.alarm = vo.alarm ;
@@ -118,13 +120,27 @@
/**
* 寰楀埌鍙栨按鍙ｆ渶鏂板紑鍏抽榾淇℃伅
* @param intakeId
+ * @param rVo
*/
- private void getOpenCloseValveInfo(Long intakeId, String rtuAddr, VoArIntakeRemote rVo){
- List<VoArIntakeRemote> list = remoteDao.openCloseValveInfo(intakeId);
+ private void getOpenCloseValveLastInfo(Long intakeId, 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
+ * @param rVo
+ */
+ private void getLossAmountLastInfo(Long intakeId, 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