From e5025d27ea3bbaad002227c7f4b2871f0d9e12df Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期三, 27 八月 2025 17:02:23 +0800
Subject: [PATCH] 1、作物蒸腾量定时计算任务修改逻辑，以保证数据源准确性；2、修改null值bug。
---
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoRm/RmAlarmStateLast.java | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoRm/RmAlarmStateLast.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoRm/RmAlarmStateLast.java
index 399cc59..d5bdda0 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoRm/RmAlarmStateLast.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoRm/RmAlarmStateLast.java
@@ -220,10 +220,10 @@
this.dt = DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(dV1.dt) ;
this.rtuDt = DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(rtuDt) ;
if(alarmVo != null){
- this.alarmBatteryVolt = alarmVo.batteryVolt ;
- this.alarmLoss = alarmVo.loss ;
- this.alarmWaterMeterBreak = alarmVo.meter ;
- this.alarmValve = alarmVo.valve ;
+ this.alarmWaterMeterFault = alarmVo==null?null:alarmVo.meter; // 娴侀噺璁℃晠闅�(1锛氭姤璀︼紝0锛氭甯�)
+ this.alarmLoss = alarmVo==null?null:alarmVo.loss; // 婕忔崯(鍋锋按)鎶ヨ(1锛氭姤璀︼紝 0锛氭甯�)
+ this.alarmBatteryVolt = alarmVo==null?null:alarmVo.batteryVolt; //鐢垫睜鐢靛帇(1锛氭姤璀︼紝0锛氭甯�)
+ this.alarmValve = alarmVo==null?null:alarmVo.valve; //闃�闂ㄦ姤璀�(1锛氭姤璀︼紝0锛氭甯�)
}/*else{
this.alarmBatteryVolt = null ;
this.alarmLoss = null ;
@@ -249,10 +249,10 @@
this.dt = DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(dV2.dt) ;
this.rtuDt = DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(rtuDt) ;
if(alarmVo != null){
- this.alarmBatteryVolt = alarmVo.batteryVolt ;
- this.alarmLoss = alarmVo.loss ;
- this.alarmWaterMeterBreak = alarmVo.meter ;
- this.alarmValve = alarmVo.valve ;
+ this.alarmWaterMeterFault = alarmVo==null?null:alarmVo.meter; // 娴侀噺璁℃晠闅�(1锛氭姤璀︼紝0锛氭甯�)
+ this.alarmLoss = alarmVo==null?null:alarmVo.loss; // 婕忔崯(鍋锋按)鎶ヨ(1锛氭姤璀︼紝 0锛氭甯�)
+ this.alarmBatteryVolt = alarmVo==null?null:alarmVo.batteryVolt; //鐢垫睜鐢靛帇(1锛氭姤璀︼紝0锛氭甯�)
+ this.alarmValve = alarmVo==null?null:alarmVo.valve; //闃�闂ㄦ姤璀�(1锛氭姤璀︼紝0锛氭甯�)
}/*else{
this.alarmBatteryVolt = null ;
this.alarmLoss = null ;
--
Gitblit v1.8.0