From fbd4cf5aeb4274938c12030e5d235c65c20c19c3 Mon Sep 17 00:00:00 2001
From: wuzeyu <1223318623@qq.com>
Date: 星期三, 15 五月 2024 16:36:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V202404/TkDealAlarmStatusV202404.java | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V202404/TkDealAlarmStatusV202405.java b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V202404/TkDealAlarmStatusV202404.java
similarity index 94%
rename from pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V202404/TkDealAlarmStatusV202405.java
rename to pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V202404/TkDealAlarmStatusV202404.java
index 03be447..bcf46fc 100644
--- a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V202404/TkDealAlarmStatusV202405.java
+++ b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V202404/TkDealAlarmStatusV202404.java
@@ -14,12 +14,12 @@
* @Author liurunyu
* @Date 2024/5/8 14:18
*/
-public class TkDealAlarmStatusV202405 extends TaskSurpport {
+public class TkDealAlarmStatusV202404 extends TaskSurpport {
- private static final Logger log = LogManager.getLogger(TkDealAlarmStatusV202405.class.getName()) ;
+ private static final Logger log = LogManager.getLogger(TkDealAlarmStatusV202404.class.getName()) ;
//绫籌D锛屼竴瀹氫笌Tree.xml閰嶇疆鏂囦欢涓厤缃竴鑷�
- public static final String taskId = "TkDealAlarmStatusV202405" ;
+ public static final String taskId = "TkDealAlarmStatusV202404" ;
/**
* 鎵ц鑺傜偣浠诲姟锛氭姤璀﹀強鐘舵��
@@ -35,7 +35,7 @@
Object cdObj = dV202404.subData ;
if(cdObj != null){
try{
- Object[] objs = this.getTaskResults(TkPreGenObjsV202405.taskId) ;
+ Object[] objs = this.getTaskResults(TkPreGenObjsV202404.taskId) ;
DbSv sv = (DbSv)objs[0] ;
PrController controller = (PrController)objs[1] ;
if(cdObj instanceof DataCd81Vo){
@@ -48,9 +48,9 @@
DataCd80_5BVo cdData = (DataCd80_5BVo)(cdObj) ;
this.saveOrUpdateLast(sv, controller, d.getRtuAddr(), cdData.rtuDt, cdData, null, null, null, null) ;
this.saveHistory(sv, controller, d.getRtuAddr(), cdData.rtuDt, cdData, null, null, null, null) ;
- }else if(cdObj instanceof DataCd93_A3_85Vo){
+ }else if(cdObj instanceof DataCd93_A3Vo){
//骞冲彴/APP杩滅▼鍏抽棴姘存车/闃�闂� + 鍒峰崱鍏虫车/闃�涓婃姤
- DataCd93_A3_85Vo cdData = (DataCd93_A3_85Vo)(cdObj) ;
+ DataCd93_A3Vo cdData = (DataCd93_A3Vo)(cdObj) ;
this.saveOrUpdateLast(sv, controller, d.getRtuAddr(), cdData.endDt, null, cdData, null, null, null) ;
this.saveHistory(sv, controller, d.getRtuAddr(), cdData.endDt, null, cdData, null, null, null) ;
}else if(cdObj instanceof DataCd84Vo){
@@ -86,7 +86,7 @@
String rtuAddr,
String rtuDt,
DataCd80_5BVo vo80_5B,
- DataCd93_A3_85Vo vo93_A3_85,
+ DataCd93_A3Vo vo93_A3_85,
DataCd81Vo vo81,
DataCd84Vo vo84,
DataCdC2Vo voC2) throws Exception {
@@ -120,7 +120,7 @@
String rtuAddr,
String rtuDt,
DataCd80_5BVo vo80_5B,
- DataCd93_A3_85Vo vo93_A3_85,
+ DataCd93_A3Vo vo93_A3_85,
DataCd81Vo vo81,
DataCd84Vo vo84,
DataCdC2Vo voC2) throws Exception {
@@ -138,7 +138,7 @@
RmAlarmStateLast po,
String rtuDt,
DataCd80_5BVo vo80_5B,
- DataCd93_A3_85Vo vo93_A3_85,
+ DataCd93_A3Vo vo93_A3_85,
DataCd81Vo vo81,
DataCd84Vo vo84,
DataCdC2Vo voC2) throws Exception {
--
Gitblit v1.8.0