From ee6e575076ba17c1fc8f4ba33253b7ea0fba45f8 Mon Sep 17 00:00:00 2001
From: wuzeyu <1223318623@qq.com>
Date: 星期四, 30 十一月 2023 10:25:04 +0800
Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV
---
pipIrr-platform/pipIrr-mw/pipIrr-mw-accept/src/main/java/com/dy/aceMw/server/busi/deal/p206V1_0_0/TkPreGenObjs.java | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mw-accept/src/main/java/com/dy/aceMw/server/busi/deal/p206V1_0_0/TkPreGenObjs.java b/pipIrr-platform/pipIrr-mw/pipIrr-mw-accept/src/main/java/com/dy/aceMw/server/busi/deal/p206V1_0_0/TkPreGenObjs.java
index 11ad57a..8ef9515 100644
--- a/pipIrr-platform/pipIrr-mw/pipIrr-mw-accept/src/main/java/com/dy/aceMw/server/busi/deal/p206V1_0_0/TkPreGenObjs.java
+++ b/pipIrr-platform/pipIrr-mw/pipIrr-mw-accept/src/main/java/com/dy/aceMw/server/busi/deal/p206V1_0_0/TkPreGenObjs.java
@@ -35,7 +35,7 @@
if(orgBusi == null){
log.error("涓ラ噸閿欒锛屾湭鑳藉緱鍒版爣绛句负" + nbRtu.orgTag + "鐨勪緵姘存満鏋勬暟鎹簱涓氬姟Busi");
}else{
- BaMeter meter = DbOrgBuzi.getMeterByImeiAndNo(orgBusi, imei, meterNo) ;
+ BaMeter meter = DbOrgBuzi.getMeterByImeiAndNo(orgBusi, imei, rtuAddr) ;
//鍙兘鏈煡璇㈠埌meter锛屽嵆浠嶆槸娴佹氮鑰匯TU锛屼絾浠嶈鍚庣画澶勭悊锛氾紙1锛夈�佷粛鑳借瘑鍒嚭娴佹氮鑰匯TU锛岋紙2锛夈�佷粛瑕佽褰曞叾涓婃姤鏁版嵁
if(meter != null){
String protocol = d.getProtocol() ;
@@ -57,9 +57,9 @@
}else{
//NB浜у搧锛圧TU瀹炰綋锛夋湭鍒嗛厤缁欏叿浣撶殑渚涙按鏈烘瀯
//娴佹氮鑰匯TU
- rtuTramp = DbSyBuzi.getSyRtuTramp(baseBusi, imei, meterNo) ;
+ rtuTramp = DbSyBuzi.getSyRtuTramp(baseBusi, imei, rtuAddr) ;
if(rtuTramp == null){
- rtuTramp = new SyRtuTramp(imei, meterNo) ;
+ rtuTramp = new SyRtuTramp(imei, rtuAddr) ;
}
this.taskResult = new Object[]{baseBusi, orgBusi, nbRtu, rtuTramp, null} ;
this.toNextOneTask(data, TkDealRtuTramp.taskId);
@@ -67,9 +67,9 @@
}else{
//鏁版嵁搴撲腑鏈煡璇㈠埌NB浜у搧锛圧TU瀹炰綋锛�
//娴佹氮鑰匯TU
- rtuTramp = DbSyBuzi.getSyRtuTramp(baseBusi, imei, meterNo) ;
+ rtuTramp = DbSyBuzi.getSyRtuTramp(baseBusi, imei, rtuAddr) ;
if(rtuTramp == null){
- rtuTramp = new SyRtuTramp(imei, meterNo) ;
+ rtuTramp = new SyRtuTramp(imei, rtuAddr) ;
}
this.taskResult = new Object[]{baseBusi, orgBusi, nbRtu, rtuTramp, null} ;
this.toNextOneTask(data, TkDealRtuTramp.taskId);
--
Gitblit v1.8.0