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-global/src/main/java/com/dy/pipIrrGlobal/VoAllRound/VoArIntakeRemote.java | 27 ++-------------------------
pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/allRound/Ar4RemoteSv.java | 23 +++++++++++++----------
2 files changed, 15 insertions(+), 35 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/VoAllRound/VoArIntakeRemote.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/VoAllRound/VoArIntakeRemote.java
index f3419b5..3189a23 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/VoAllRound/VoArIntakeRemote.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/VoAllRound/VoArIntakeRemote.java
@@ -20,12 +20,12 @@
* @Description
*/
@Data
-@JsonPropertyOrder({"id", "onLine", "alarm", "alarmDt", "lastOpenDt", "lastCloseDt", "lossAmount", "lossDt"})
+@JsonPropertyOrder({"intakeId", "onLine", "alarm", "alarmDt", "lastOpenDt", "lastCloseDt", "lossAmount", "lossDt"})
public class VoArIntakeRemote {
private static final long serialVersionUID = 202501141703001L;
@JSONField(serializeUsing= ObjectWriterImplToString.class)
- public Long id;
+ public Long intakeId;
/**
* 鍦ㄧ嚎鎯呭喌, true鍦ㄧ嚎锛宖alse绂荤嚎锛宯ull鏈煡
@@ -66,29 +66,6 @@
@JsonFormat(pattern = "yyyy-MM-dd")
public Date lossDt ;
- /**
- * 寮�鍏抽榾璁板綍
- */
- public List<VoOpenCloseValve> openCloseRecords ;
- /**
- * 鏃ユ紡鎹熻褰�
- */
- public List<VoDayLoss> lossDayRecords ;
-
- /**
- * 鏈堟紡鎹熻褰�
- */
- public List<VoMonthAmount> lossMonthRecords ;
-
- /**
- * 鏃ョ敤姘寸粺璁¤褰�
- */
- public List<VoDayIntakeAmount> amountDayRecords ;
-
- /**
- * 鏈堢敤姘寸粺璁¤褰�
- */
- public List<VoMonthAmount> amountMonthRecords ;
}
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..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
@@ -47,11 +47,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 +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);
@@ -107,8 +107,9 @@
/**
* 寰楀埌鍙栨按鍙ｆ渶鏂版姤璀︿俊鎭�
* @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) ;
@@ -119,8 +120,9 @@
/**
* 寰楀埌鍙栨按鍙ｆ渶鏂板紑鍏抽榾淇℃伅
* @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 +133,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