From 0639f7feede9614a98f64450792cc83f58f80a84 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期三, 14 五月 2025 17:00:54 +0800
Subject: [PATCH] 与测控一体阀兼容
---
pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/allRound/Ar4RemoteSv.java | 30 +++++++++++++++++-------------
1 files changed, 17 insertions(+), 13 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 ec8ca1b..b0e1d2e 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
@@ -4,11 +4,9 @@
import com.dy.common.mw.protocol.Command;
import com.dy.common.mw.protocol.CommandBackParam;
import com.dy.common.webUtil.BaseResponse;
-import com.dy.common.webUtil.QueryResultVo;
-import com.dy.pipIrrGlobal.VoAllRound.VoArIntakeRemote;
+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 lombok.extern.slf4j.Slf4j;
@@ -47,11 +45,12 @@
*/
public VoArIntakeRemote intakeInfo(Long intakeId){
VoArIntakeRemote rVo = new VoArIntakeRemote() ;
+ rVo.intakeId = intakeId ;
String rtuAddr = this.getRtuAddr(intakeId);
- this.getRtuOnLine(intakeId, rtuAddr, rVo);
- this.getAlarmLastInfo(intakeId, rtuAddr, rVo);
- this.getOpenCloseValveLastInfo(intakeId, rtuAddr, rVo);
- this.getLossAmountLastInfo(intakeId, rtuAddr, rVo);
+ this.getRtuOnLine(rtuAddr, rVo);
+ this.getAlarmLastInfo(intakeId, rVo);
+ this.getOpenCloseValveLastInfo(intakeId, rVo);
+ this.getLossAmountLastInfo(intakeId, rVo);
return rVo ;
}
@@ -70,11 +69,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);
@@ -107,20 +105,25 @@
/**
* 寰楀埌鍙栨按鍙ｆ渶鏂版姤璀︿俊鎭�
* @param intakeId
+ * @param rVo
*/
- private void getAlarmLastInfo(Long intakeId, String rtuAddr, VoArIntakeRemote rVo){
+ 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 ;
+ if(rVo.alarm == null || rVo.alarm.trim().equals("")){
+ rVo.alarm = "鏃犳姤璀�" ;
+ }
rVo.alarmDt = vo.alarmDt ;
}
}
/**
* 寰楀埌鍙栨按鍙ｆ渶鏂板紑鍏抽榾淇℃伅
* @param intakeId
+ * @param rVo
*/
- private void getOpenCloseValveLastInfo(Long intakeId, String rtuAddr, VoArIntakeRemote rVo){
+ private void getOpenCloseValveLastInfo(Long intakeId, VoArIntakeRemote rVo){
List<VoArIntakeRemote> list = remoteDao.openCloseValveLastInfo(intakeId);
if(list != null && list.size() > 0){
VoArIntakeRemote vo = list.get(0) ;
@@ -131,8 +134,9 @@
/**
* 寰楀埌鍙栨按鍙ｆ渶鏂版紡鎹熶俊鎭�
* @param intakeId
- */
- private void getLossAmountLastInfo(Long intakeId, String rtuAddr, VoArIntakeRemote rVo){
+ * @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) ;
--
Gitblit v1.8.0