From f5a10d5ae1290d8ceefee143815555d59be6ff9a Mon Sep 17 00:00:00 2001
From: Administrator <zhubaomin>
Date: 星期四, 23 五月 2024 08:50:58 +0800
Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV
---
pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V1_0_0/TkDealAlarmStatus.java | 91 +++++++++++++++++++++++----------------------
1 files changed, 46 insertions(+), 45 deletions(-)
diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V1_0_0/TkDealAlarmStatus.java b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V1_0_0/TkDealAlarmStatus.java
index 5d5c027..55cede3 100644
--- a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V1_0_0/TkDealAlarmStatus.java
+++ b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V1_0_0/TkDealAlarmStatus.java
@@ -72,19 +72,19 @@
* @param stateVo 鐘舵�佸璞�
*/
private void saveOrUpdateLast(DbSv sv, PrController controller, String rtuAddr, String rtuDt, DataV1_0_1 dV1_0_1, DataAlarmVo alarmVo, DataStateVo stateVo) throws Exception {
- RmAlarmStateLast po = sv.getRmAlarmStateLast(rtuAddr) ;
- if(po == null){
- po = new RmAlarmStateLast(null, controller==null?null:controller.getId(), controller==null?null:controller.getIntakeId(),
- rtuAddr,
- DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(dV1_0_1.dt),
- DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(rtuDt),
- 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(controller, po, rtuDt, dV1_0_1, alarmVo, stateVo) ;
- sv.updateRmAlarmStateLast(po);
- }
+// RmAlarmStateLast po = sv.getRmAlarmStateLast(rtuAddr) ;
+// if(po == null){
+// po = new RmAlarmStateLast(null, controller==null?null:controller.getId(), controller==null?null:controller.getIntakeId(),
+// rtuAddr,
+// DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(dV1_0_1.dt),
+// DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(rtuDt),
+// 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(controller, po, rtuDt, dV1_0_1, alarmVo, stateVo) ;
+// sv.updateRmAlarmStateLast(po);
+// }
}
/**
@@ -97,42 +97,43 @@
* @param stateVo 鐘舵�佸璞�
*/
private void saveHistory(DbSv sv, PrController controller, String rtuAddr, String rtuDt, DataV1_0_1 dV1_0_1, DataAlarmVo alarmVo, DataStateVo stateVo) throws Exception {
- RmAlarmStateHistory po = new RmAlarmStateHistory(null, controller==null?null:controller.getId(), controller==null?null:controller.getIntakeId(),
- rtuAddr,
- DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(dV1_0_1.dt),
- DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(rtuDt),
- 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.saveRmAlarmStateHistory(po) ;
+// RmAlarmStateHistory po = new RmAlarmStateHistory(null, controller==null?null:controller.getId(), controller==null?null:controller.getIntakeId(),
+// rtuAddr,
+// DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(dV1_0_1.dt),
+// DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(rtuDt),
+// 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.saveRmAlarmStateHistory(po) ;
}
private RmAlarmStateLast update(PrController controller, RmAlarmStateLast po, String rtuDt, DataV1_0_1 dV1_0_1, DataAlarmVo alarmVo, DataStateVo stateVo) throws Exception {
- po.controllerid = controller==null?null:controller.getId() ;
- po.intakeid = controller==null?null:controller.getIntakeId() ;
-
- po.dt = DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(dV1_0_1.dt) ;
- po.rtudt = DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(rtuDt) ;
- if(alarmVo != null){
- po.bateryvolt = alarmVo.batteryVolt ;
- po.loss = alarmVo.loss ;
- po.meter = alarmVo.meter ;
- po.valve = alarmVo.valve ;
- }else{
- po.bateryvolt = null ;
- po.loss = null ;
- po.meter = null ;
- po.valve = null ;
- }
- if(stateVo != null){
- po.iccard = stateVo.icCard ;
- po.working = stateVo.working ;
- po.valvestate = stateVo.valve ;
- }else{
- po.iccard = null ;
- po.working = null ;
- po.valvestate = null ;
- }
+// po.controllerid = controller==null?null:controller.getId() ;
+// po.intakeid = controller==null?null:controller.getIntakeId() ;
+//
+// po.dt = DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(dV1_0_1.dt) ;
+// po.rtudt = DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(rtuDt) ;
+// if(alarmVo != null){
+// po.bateryvolt = alarmVo.batteryVolt ;
+// po.loss = alarmVo.loss ;
+// po.meter = alarmVo.meter ;
+// po.valve = alarmVo.valve ;
+// }else{
+// po.bateryvolt = null ;
+// po.loss = null ;
+// po.meter = null ;
+// po.valve = null ;
+// }
+// if(stateVo != null){
+// po.iccard = stateVo.icCard ;
+// po.working = stateVo.working ;
+// po.valvestate = stateVo.valve ;
+// }else{
+// po.iccard = null ;
+// po.working = null ;
+// po.valvestate = null ;
+// }
return po ;
+
}
}
--
Gitblit v1.8.0