From 9a1ea7a666a5c9acb189ddad066bd43312291251 Mon Sep 17 00:00:00 2001
From: Administrator <zhubaomin>
Date: 星期三, 17 一月 2024 14:02:37 +0800
Subject: [PATCH] 2024-01-16 朱宝民 取水口与控制器的绑定与解绑
---
pipIrr-platform/pipIrr-mw/pipIrr-mw-accept/src/main/java/com/dy/aceMw/server/rtuData/p206V1_0_0/TkDealAlarmStatus.java | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mw-accept/src/main/java/com/dy/aceMw/server/rtuData/p206V1_0_0/TkDealAlarmStatus.java b/pipIrr-platform/pipIrr-mw/pipIrr-mw-accept/src/main/java/com/dy/aceMw/server/rtuData/p206V1_0_0/TkDealAlarmStatus.java
index defaeea..4f2a5f1 100644
--- a/pipIrr-platform/pipIrr-mw/pipIrr-mw-accept/src/main/java/com/dy/aceMw/server/rtuData/p206V1_0_0/TkDealAlarmStatus.java
+++ b/pipIrr-platform/pipIrr-mw/pipIrr-mw-accept/src/main/java/com/dy/aceMw/server/rtuData/p206V1_0_0/TkDealAlarmStatus.java
@@ -70,14 +70,14 @@
private void saveOrUpdateLast(DbSv sv, PrController controller, String rtuAddr, DataAlarmVo alarmVo, DataStateVo stateVo){
RmAlarmStateLast po = sv.getRmLastAlarmState(rtuAddr) ;
if(po == null){
- po = new RmAlarmStateLast(null, controller.getId(), controller.getId(),
+ po = new RmAlarmStateLast(null, controller==null?null:controller.getId(), controller==null?null:controller.getIntakeId(),
rtuAddr,
new Date(),
alarmVo==null?null:alarmVo.batteryVolt, alarmVo==null?null:alarmVo.loss, alarmVo==null?null:alarmVo.meter, alarmVo==null?null:alarmVo.valve,
stateVo==null?null:stateVo.icCard, stateVo==null?null:stateVo.working, stateVo==null?null:stateVo.valve) ;
sv.saveRmAlarmStateLast(po) ;
}else{
- po = this.update(po, alarmVo, stateVo) ;
+ po = this.update(controller, po, alarmVo, stateVo) ;
sv.saveRmAlarmStateLast(po);
}
}
@@ -91,7 +91,7 @@
* @param stateVo 鐘舵�佸璞�
*/
private void saveHistory(DbSv sv, PrController controller, String rtuAddr, DataAlarmVo alarmVo, DataStateVo stateVo){
- RmAlarmStateHistory po = new RmAlarmStateHistory(null, controller.getId(), controller.getId(),
+ RmAlarmStateHistory po = new RmAlarmStateHistory(null, controller==null?null:controller.getId(), controller==null?null:controller.getIntakeId(),
rtuAddr,
new Date(),
alarmVo==null?null:alarmVo.batteryVolt, alarmVo==null?null:alarmVo.loss, alarmVo==null?null:alarmVo.meter, alarmVo==null?null:alarmVo.valve,
@@ -100,7 +100,9 @@
}
- private RmAlarmStateLast update(RmAlarmStateLast po, DataAlarmVo alarmVo, DataStateVo stateVo){
+ private RmAlarmStateLast update(PrController controller, RmAlarmStateLast po, DataAlarmVo alarmVo, DataStateVo stateVo){
+ po.controllerid = controller==null?null:controller.getId() ;
+
po.dt = new Date() ;
if(alarmVo != null){
po.bateryvolt = alarmVo.batteryVolt ;
--
Gitblit v1.8.0