pipIrr-SV.git - Gitblit

File was renamed from pipIrr-platform/pipIrr-mw/pipIrr-mw-accept/src/main/java/com/dy/aceMw/server/busi/deal/p206V1_0_0/TkPreGenObjs.java
			@@ -1,6 +1,6 @@
			package com.dy.aceMw.server.busi.deal.p206V1_0_0;
			package com.dy.aceMw.server.rtuData.p206V1_0_0;

			import com.dy.aceMw.server.busi.deal.TaskSurpport;
			import com.dy.aceMw.server.rtuData.TaskSurpport;
			import com.dy.common.mw.protocol.Data;
			import org.apache.logging.log4j.LogManager;
			import org.apache.logging.log4j.Logger;
			@@ -20,6 +20,7 @@
			public void execute(Object data) {
			Data d = (Data)data ;
			String rtuAddr = d.getRtuAddr() ;
			log.info("RTU" + rtuAddr + "数据到此，还未实现处理:" + data.toString());
			//得到本地RTU 数据，以备后面节点应用
			/*
			BuziInterface baseBusi = BuziGeter.getBaseBusi() ;
			@@ -35,7 +36,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，即仍是流浪者RTU，但仍要后续处理：（1）、仍能识别出流浪者RTU，（2）、仍要记录其上报数据
			if(meter != null){
			String protocol = d.getProtocol() ;
			@@ -57,9 +58,9 @@
			}else{
			//NB产品（RTU实体）未分配给具体的供水机构
			//流浪者RTU
			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 +68,9 @@
			}else{
			//数据库中未查询到NB产品（RTU实体）
			//流浪者RTU
			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);