From 862f9b89734b572e24d4710990f6e7d8de0ca64b Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期三, 05 二月 2025 15:16:30 +0800
Subject: [PATCH] 取水口综合信息-基本信息中增加地址属性(JSON)
---
pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/allRound/Ar4RemoteSv.java | 72 +++++++++++++++++++++++++++++++++---
1 files changed, 66 insertions(+), 6 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 990d0a9..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
@@ -7,9 +7,10 @@
import com.dy.common.webUtil.QueryResultVo;
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;
@@ -32,6 +33,9 @@
private Ar4BaseMapper baseDao;
@Autowired
+ private Ar4RemoteMapper remoteDao;
+
+ @Autowired
private Environment env;
@Autowired
@@ -41,14 +45,36 @@
* 鍙栨按鍙ｅ熀鏈俊鎭�
* @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.getAlarmLastInfo(intakeId, rtuAddr, rVo);
+ this.getOpenCloseValveLastInfo(intakeId, rtuAddr, rVo);
+ this.getLossAmountLastInfo(intakeId, rtuAddr, rVo);
+ return rVo ;
+ }
- String rtuAddr = null ;
+ /**
+ * 鑾峰彇鍙栨按鍙ｅ搴旂殑RTU鍦板潃
+ * @param intakeId 鍙栨按鍙D
+ * @return RTU鍦板潃
+ */
+ private String getRtuAddr(Long intakeId){
List<String> rtuAddrs = baseDao.intakeRtuAddr(intakeId) ;
if(rtuAddrs != null && rtuAddrs.size() > 0){
- rtuAddr = rtuAddrs.get(0) ;
+ return rtuAddrs.get(0) ;
}
+ return null ;
+ }
+
+ /**
+ * 寰楀埌鍙栨按RTU鍦ㄧ嚎鎯呭喌
+ * @param intakeId
+ * @param rtuAddr
+ * @param rVo
+ */
+ private void getRtuOnLine(Long intakeId, String rtuAddr, VoArIntakeRemote rVo){
if(rtuAddr != null){
//鍚戦�氫俊涓棿浠跺彂鍏冲懡浠わ紝鏌ヨ閮ㄥ垎RTU鍦ㄧ嚎鎯呭喌
Command com = this.createInnerCommand(CodeLocal.onLinePart);
@@ -77,7 +103,41 @@
log.error("閫氫俊涓棿浠惰繑鍥炲唴閮ㄥ懡浠ょ粨鏋滀负null");
}
}
-
- return null ;
+ }
+ /**
+ * 寰楀埌鍙栨按鍙ｆ渶鏂版姤璀︿俊鎭�
+ * @param 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 ;
+ rVo.alarmDt = vo.alarmDt ;
+ }
+ }
+ /**
+ * 寰楀埌鍙栨按鍙ｆ渶鏂板紑鍏抽榾淇℃伅
+ * @param 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